From f9e3448f168cf3c82642a613e7c21b09ec104dea Mon Sep 17 00:00:00 2001
From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com>
Date: Sat, 11 Jul 2026 23:47:53 +0200
Subject: [PATCH] [BOOT][ROSTESTS][SHELL32][USERENV] Fix 'StartUp' typo (#8304)

CORE-18893
---
 boot/boot_images.cmake                        |  4 ++--
 dll/win32/shell32/lang/ca-ES.rc               |  2 +-
 dll/win32/shell32/lang/el-GR.rc               |  2 +-
 dll/win32/shell32/lang/en-GB.rc               |  2 +-
 dll/win32/shell32/lang/en-US.rc               |  2 +-
 dll/win32/shell32/lang/et-EE.rc               |  2 +-
 dll/win32/shell32/lang/id-ID.rc               |  2 +-
 dll/win32/shell32/lang/ko-KR.rc               |  2 +-
 dll/win32/shell32/lang/nl-NL.rc               |  2 +-
 dll/win32/shell32/lang/sl-SI.rc               |  2 +-
 dll/win32/userenv/lang/id-ID.rc               |  2 +-
 .../unittests/interop/LocaleTests.cpp         |  6 ++---
 .../rostests/winetests/shell32/shellpath.c    | 24 +++++++++++++++++++
 13 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/boot/boot_images.cmake b/boot/boot_images.cmake
index baabd7f96ac..c12e5138bf0 100644
--- a/boot/boot_images.cmake
+++ b/boot/boot_images.cmake
@@ -112,7 +112,7 @@ function(add_allusers_profile_dirs _image_filelist _rootdir)
     file(APPEND ${_image_filelist} "${_rootdir}/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
     file(APPEND ${_image_filelist} "${_rootdir}/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
     file(APPEND ${_image_filelist} "${_rootdir}/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-    file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+    file(APPEND ${_image_filelist} "${_rootdir}/All Users/Start Menu/Programs/Startup=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
     file(APPEND ${_image_filelist} "${_rootdir}/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 endfunction()
 function(add_user_profile_dirs _image_filelist _rootdir _username)
@@ -134,7 +134,7 @@ function(add_user_profile_dirs _image_filelist _rootdir _username)
     file(APPEND ${_image_filelist} "${_rootdir}/${_username}/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
     file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
     file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
-    file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
+    file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Start Menu/Programs/Startup=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
     file(APPEND ${_image_filelist} "${_rootdir}/${_username}/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n")
 endfunction()
 
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index 369a8180350..0bc457f59a2 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -871,7 +871,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Recent"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menu"
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index ff0b3eb4046..1a82764c934 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -871,7 +871,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "Τα έγγραφά μου"
     IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Recent"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menu"
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index 634b26854f7..7669ce72f33 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -871,7 +871,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Recent"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menu"
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index 43a4173204d..80cb9f96dde 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -871,7 +871,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Recent"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menu"
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index 85be2f6a209..04b66e82826 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -878,7 +878,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "Minu dokumendid"
     IDS_FAVORITES "Lemmikud"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Hiljutised"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menüü"
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index 50b185a23ae..f75abbe9ee5 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -868,7 +868,7 @@ BEGIN
     IDS_PROGRAMS "Menu Mulai\\Program"
     IDS_PERSONAL "Dokumen Saya"
     IDS_FAVORITES "Favorit"
-    IDS_STARTUP "Menu Mulai\\Program\\StartUp"
+    IDS_STARTUP "Menu Mulai\\Program\\Startup"
     IDS_RECENT "Baru-baru Ini"
     IDS_SENDTO "Kirim Ke"
     IDS_STARTMENU "Menu Mulai"
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index e2dae02bdcd..e6b1fc1f7e2 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -878,7 +878,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "내 문서"
     IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Recent"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menu"
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index 8dda41fd2be..e42ff601688 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -871,7 +871,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Recent"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menu"
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index b63fad068eb..710e23c07ab 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -871,7 +871,7 @@ BEGIN
     IDS_PROGRAMS "Start Menu\\Programs"
     IDS_PERSONAL "My Documents"
     IDS_FAVORITES "Favorites"
-    IDS_STARTUP "Start Menu\\Programs\\StartUp"
+    IDS_STARTUP "Start Menu\\Programs\\Startup"
     IDS_RECENT "Recent"
     IDS_SENDTO "SendTo"
     IDS_STARTMENU "Start Menu"
diff --git a/dll/win32/userenv/lang/id-ID.rc b/dll/win32/userenv/lang/id-ID.rc
index 4bd2e619206..96e0575b846 100644
--- a/dll/win32/userenv/lang/id-ID.rc
+++ b/dll/win32/userenv/lang/id-ID.rc
@@ -27,7 +27,7 @@ BEGIN
     IDS_TEMPLATES "Template"
     IDS_STARTMENU "Menu Mulai"
     IDS_PROGRAMS "Menu Mulai\\Program"
-    IDS_STARTUP "Menu Mulai\\Program\\StartUp"
+    IDS_STARTUP "Menu Mulai\\Program\\Startup"
     IDS_LOCALSETTINGS "Setelan Lokal"
     IDS_LOCALAPPDATA "Setelan Lokal\\Data Aplikasi"
     IDS_TEMP "Setelan Lokal\\Temp" /* See also TEMP_DIR in boot/bootdata/hivedef.inf */
diff --git a/modules/rostests/unittests/interop/LocaleTests.cpp b/modules/rostests/unittests/interop/LocaleTests.cpp
index ccd58b1cc29..647e73fda7a 100644
--- a/modules/rostests/unittests/interop/LocaleTests.cpp
+++ b/modules/rostests/unittests/interop/LocaleTests.cpp
@@ -80,14 +80,14 @@ static void InitParts(void)
     {
         // { eString, { eModule, id, nParts } }
         { SH32_PROGRAMS, { shell32, 45 /* IDS_PROGRAMS "Start Menu\Programs" */, 2 } },
-        { SH32_STARTUP, { shell32, 48 /* IDS_STARTUP "Start Menu\Programs\StartUp" */, 3 } },
+        { SH32_STARTUP, { shell32, 48 /* IDS_STARTUP "Start Menu\Programs\Startup" */, 3 } },
         { SH32_STARTMENU, { shell32, 51 /* IDS_STARTMENU "Start Menu" */, 1 } },
         { SH32_PROGRAM_FILES, { shell32, 63 /* IDS_PROGRAM_FILES "Program Files" */, 1 } },
         { SH32_PROGRAM_FILES_COMMON, { shell32, 65 /* IDS_PROGRAM_FILES_COMMON "Program Files\Common Files" */, 2 } },
         { SH32_ADMINTOOLS, { shell32, 67 /* IDS_ADMINTOOLS "Start Menu\Programs\Administrative Tools" */, 3 } },
         { UENV_STARTMENU, { userenv, 11 /* IDS_STARTMENU "Start Menu" */, 1 } },
         { UENV_PROGRAMS, { userenv, 12 /* IDS_PROGRAMS "Start Menu\Programs" */, 2 } },
-        { UENV_STARTUP, { userenv, 13 /* IDS_STARTUP "Start Menu\Programs\StartUp" */, 3 } },
+        { UENV_STARTUP, { userenv, 13 /* IDS_STARTUP "Start Menu\Programs\Startup" */, 3 } },
         { SYSS_PROGRAMFILES, { syssetup, 3600 /* IDS_PROGRAMFILES "%SystemDrive%\Program Files" */, 2 } },
         { SYSS_COMMONFILES, { syssetup, 3601 /* IDS_COMMONFILES "Common Files" */, 1 } },
         { MMSY_STARTMENU, { mmsys, 5851 /* IDS_STARTMENU "Start Menu" */, 1 } },
@@ -112,7 +112,7 @@ static PART_MATCH PartMatches[] =
     { { SH32_PROGRAMS, 1 }, { SH32_ADMINTOOLS, 1 } },
     { { SH32_PROGRAMS, 1 }, { UENV_PROGRAMS, 1 } },
     { { SH32_PROGRAMS, 1 }, { UENV_STARTUP, 1 } },
-    // StartUp
+    // Startup
     { { SH32_STARTUP, 2 }, { UENV_STARTUP, 2 } },
     // Program Files
     { { SH32_PROGRAM_FILES, 0 }, { SH32_PROGRAM_FILES_COMMON, 0 } },
diff --git a/modules/rostests/winetests/shell32/shellpath.c b/modules/rostests/winetests/shell32/shellpath.c
index f768f44c8b7..a40e352817a 100644
--- a/modules/rostests/winetests/shell32/shellpath.c
+++ b/modules/rostests/winetests/shell32/shellpath.c
@@ -425,6 +425,7 @@ static const struct knownFolderDef known_folders[] = {
                  NULL,
                  FILE_ATTRIBUTE_READONLY,
                  KFDF_PRECREATE),
+#ifndef __REACTOS__
     KNOWN_FOLDER(FOLDERID_CommonStartup,
                  CSIDL_COMMON_STARTUP,
                  "Common Startup",
@@ -434,6 +435,17 @@ static const struct knownFolderDef known_folders[] = {
                  NULL,
                  FILE_ATTRIBUTE_READONLY,
                  KFDF_PRECREATE),
+#else // s/StartUp/Startup/
+    KNOWN_FOLDER(FOLDERID_CommonStartup,
+                 CSIDL_COMMON_STARTUP,
+                 "Common Startup",
+                 KF_CATEGORY_COMMON,
+                 FOLDERID_CommonPrograms, GUID_NULL,
+                 "Startup",
+                 NULL,
+                 FILE_ATTRIBUTE_READONLY,
+                 KFDF_PRECREATE),
+#endif
     KNOWN_FOLDER(FOLDERID_CommonTemplates,
                  CSIDL_COMMON_TEMPLATES,
                  "Common Templates",
@@ -1123,6 +1135,7 @@ static const struct knownFolderDef known_folders[] = {
                  NULL,
                  FILE_ATTRIBUTE_READONLY,
                  KFDF_PRECREATE),
+#ifndef __REACTOS__
     KNOWN_FOLDER(FOLDERID_Startup,
                  CSIDL_STARTUP,
                  "Startup",
@@ -1132,6 +1145,17 @@ static const struct knownFolderDef known_folders[] = {
                  NULL,
                  FILE_ATTRIBUTE_READONLY,
                  KFDF_PRECREATE),
+#else // s/StartUp/Startup/
+    KNOWN_FOLDER(FOLDERID_Startup,
+                 CSIDL_STARTUP,
+                 "Startup",
+                 KF_CATEGORY_PERUSER,
+                 FOLDERID_Programs, GUID_NULL,
+                 "Startup\0",
+                 NULL,
+                 FILE_ATTRIBUTE_READONLY,
+                 KFDF_PRECREATE),
+#endif
     KNOWN_FOLDER(FOLDERID_SyncManagerFolder,
                  NO_CSIDL,
                  "SyncCenterFolder",