Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [CMAKE] Use C_STANDARD property instead of command line option
by Victor Perevertkin 05 Dec '20

05 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16e5ce8fb1a2522c796cb… commit 16e5ce8fb1a2522c796cb05b4039274dd5649543 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Dec 5 13:14:28 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Dec 5 15:35:06 2020 +0300 [CMAKE] Use C_STANDARD property instead of command line option Addendum to 64211aa6964a8ca1627f2ce7244b8270003e6770 and 19779b3f96dd2905a09c827a871f32a9bfb431c6 --- drivers/filesystems/cdfs/CMakeLists.txt | 7 +------ drivers/filesystems/ext2/CMakeLists.txt | 5 ++--- drivers/filesystems/nfs/CMakeLists.txt | 5 +---- sdk/cmake/gcc.cmake | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 3e35991bfa0..552224c2058 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -36,11 +36,6 @@ add_library(cdfs MODULE ${SOURCE} cdfs.rc) set_module_type(cdfs kernelmodedriver) target_link_libraries(cdfs ${PSEH_LIB} memcmp) add_importlibs(cdfs ntoskrnl hal) +set_property(TARGET cdfs PROPERTY C_STANDARD 90) add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(cdfs_reg.inf) - -if (CLANG AND GCC) - # Make __inline work as expected - target_compile_options(cdfs PRIVATE -std=gnu89) -endif() - diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index dbd8cc84925..dadf04c06b7 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -113,9 +113,6 @@ if(CLANG) -Wno-unused-value -Wno-parentheses-equality -Wno-incompatible-pointer-types-discards-qualifiers "-Wno-#pragma-messages;-Wno-cast-calling-convention") - if (GCC) - target_compile_options(ext2fs PRIVATE -std=gnu89) - endif() endif() target_link_libraries(ext2fs memcmp ${PSEH_LIB}) @@ -123,6 +120,8 @@ add_definitions(-D__KERNEL__ -D_CRT_NO_POSIX_ERROR_CODES) set_module_type(ext2fs kernelmodedriver) add_importlibs(ext2fs ntoskrnl hal) +set_property(TARGET ext2fs PROPERTY C_STANDARD 90) + if(NOT USE_CLANG_CL) # The fallback we have above prevents cl and clang-cl from using the same PCH add_pch(ext2fs inc/ext2fs.h SOURCE) diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 3d05ff676c6..91ad25761d0 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -18,11 +18,8 @@ if(GCC OR CLANG) target_compile_options(nfs41_driver PRIVATE "-Wno-switch") if(CLANG) target_compile_options(nfs41_driver PRIVATE "-Wno-unused-value") - if(GCC) - # When CLang mimicks GCC, it uses C17 as default, which breaks __inline - target_compile_options(nfs41_driver PRIVATE "-std=gnu89") - endif() endif() endif() +set_property(TARGET nfs41_driver PROPERTY C_STANDARD 90) add_cd_file(TARGET nfs41_driver DESTINATION reactos/system32/drivers FOR all) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index acde67d9203..938bc0e2454 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -53,7 +53,7 @@ if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options("$<$<COMPILE_LANGUAGE:C>:-Wold-style-declaration>") endif() else() - add_compile_options("$<$<COMPILE_LANGUAGE:C>:-std=gnu99;-Wno-microsoft>") + add_compile_options("$<$<COMPILE_LANGUAGE:C>:-Wno-microsoft>") add_compile_options(-Wno-pragma-pack) add_compile_options(-fno-associative-math) add_compile_options(-fcommon)

1 0

[reactos] 01/01: [NTOSKRNL:FSRTL] Fix memory corruption when pruning tunnel cache
by Jérôme Gardou 04 Dec '20

04 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0db79d4aa9d625a91ddb6… commit 0db79d4aa9d625a91ddb6f9b3ff9f830cd796672 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 4 16:02:26 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Dec 4 16:08:14 2020 +0100 [NTOSKRNL:FSRTL] Fix memory corruption when pruning tunnel cache --- ntoskrnl/fsrtl/tunnel.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/fsrtl/tunnel.c b/ntoskrnl/fsrtl/tunnel.c index 7f40f466192..a14acc5e02a 100644 --- a/ntoskrnl/fsrtl/tunnel.c +++ b/ntoskrnl/fsrtl/tunnel.c @@ -42,7 +42,7 @@ FsRtlFreeTunnelNode( { if (PoolList) { - /* divert the linked list entry, it's not required anymore, but we need it */ + /* divert the linked list entry, it's not required anymore, but we need it */ InsertHeadList(PoolList, &CurEntry->TimerQueueEntry); return; } @@ -124,7 +124,8 @@ FsRtlPruneTunnelCache( /* If we have too many entries */ while (Cache->NumEntries > TunnelMaxEntries) { - CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + ASSERT(!IsListEmpty(&Cache->TimerQueue)); + CurEntry = CONTAINING_RECORD(Cache->TimerQueue.Flink, TUNNEL_NODE_ENTRY, TimerQueueEntry); FsRtlRemoveNodeFromTunnel(Cache, CurEntry, PoolList, &Rebalance); } } @@ -477,7 +478,7 @@ FsRtlAddToTunnelCache(IN PTUNNEL Cache, RtlInsertAsRightChild(RtlParent(CurEntry), NodeEntry); } } - + /* remove entry */ RemoveEntryList(&((PTUNNEL_NODE_ENTRY)CurEntry)->TimerQueueEntry);

1 0

[reactos] 01/01: [BTRFS] Fix wrong condition check
by Jérôme Gardou 04 Dec '20

04 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ec3e1a7f6e810b10862f… commit 3ec3e1a7f6e810b10862ffc329795217a04f4aec Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Dec 4 15:44:11 2020 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Dec 4 15:49:39 2020 +0100 [BTRFS] Fix wrong condition check --- drivers/filesystems/btrfs/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/btrfs/security.c b/drivers/filesystems/btrfs/security.c index 7f429e27274..f6769d05606 100644 --- a/drivers/filesystems/btrfs/security.c +++ b/drivers/filesystems/btrfs/security.c @@ -180,7 +180,7 @@ void add_group_mapping(WCHAR* sidstring, ULONG sidstringlength, uint32_t gid) { while (sidstringlength > 0) { val = 0; i = 0; - while (sidstring[i] != '-' && i < sidstringlength) { + while (i < sidstringlength && sidstring[i] != '-') { if (sidstring[i] >= '0' && sidstring[i] <= '9') { val *= 10; val += sidstring[i] - '0';

1 0

[reactos] 01/01: [CMAKE] Our C code base is C99, so mark it as such.
by Hervé Poussineau 01 Dec '20

01 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19779b3f96dd2905a09c8… commit 19779b3f96dd2905a09c827a871f32a9bfb431c6 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 20:42:22 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 20:42:41 2020 +0100 [CMAKE] Our C code base is C99, so mark it as such. This fixes 64211aa6964a8ca1627f2ce7244b8270003e6770, which mistakenly declared C11 as default. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e60e3fae3e..b91387178d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) set(CMAKE_POSITION_INDEPENDENT_CODE OFF) -set(CMAKE_C_STANDARD 11) +set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 11) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)

1 0

[reactos] 01/01: [DDK] Use FORCEINLINE instead of __inline, as in other DDK headers
by Hervé Poussineau 01 Dec '20

01 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06a6eda0a16fbf45886d1… commit 06a6eda0a16fbf45886d1d02aa87201a237b9463 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 18:55:29 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 18:56:02 2020 +0100 [DDK] Use FORCEINLINE instead of __inline, as in other DDK headers --- sdk/include/ddk/classpnp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ddk/classpnp.h b/sdk/include/ddk/classpnp.h index e8fda74498f..65cd35fe81f 100644 --- a/sdk/include/ddk/classpnp.h +++ b/sdk/include/ddk/classpnp.h @@ -1432,7 +1432,7 @@ ClassSendNotification( #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ -__inline +FORCEINLINE UCHAR GET_FDO_EXTENSON_SENSE_DATA_LENGTH ( _In_ PFUNCTIONAL_DEVICE_EXTENSION FdoExtension)

1 0

[reactos] 03/03: [UMPNPMGR] Remove invalid prototype of inline function
by Hervé Poussineau 01 Dec '20

01 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b483be4af27c43f76da3c… commit b483be4af27c43f76da3c087a2e2ce9746e34012 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 18:45:41 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 18:51:42 2020 +0100 [UMPNPMGR] Remove invalid prototype of inline function This fixes eede1b9b7a258a9094cafef5615b9ed8c3877081. --- base/services/umpnpmgr/precomp.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/base/services/umpnpmgr/precomp.h b/base/services/umpnpmgr/precomp.h index d24a760884a..82035203441 100644 --- a/base/services/umpnpmgr/precomp.h +++ b/base/services/umpnpmgr/precomp.h @@ -53,10 +53,6 @@ extern HANDLE hDeviceInstallListNotEmpty; BOOL SetupIsActive(VOID); -FORCEINLINE -BOOL -IsUISuppressionAllowed(VOID); - DWORD WINAPI DeviceInstallThread(

1 0

[reactos] 02/03: [CMAKE] Declare that we want to use C11/C++11
by Hervé Poussineau 01 Dec '20

01 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64211aa6964a8ca1627f2… commit 64211aa6964a8ca1627f2ce7244b8270003e6770 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 18:48:36 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 18:51:42 2020 +0100 [CMAKE] Declare that we want to use C11/C++11 That way, we won't use whatever standard is the default on whatever compiler we are using. This should also prevent using more recent features without warning. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3dff10c6c1..3e60e3fae3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,8 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE) set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE) set(CMAKE_COLOR_MAKEFILE OFF) set(CMAKE_POSITION_INDEPENDENT_CODE OFF) +set(CMAKE_C_STANDARD 11) +set(CMAKE_CXX_STANDARD 11) #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF) if(NOT ARCH)

1 0

[reactos] 01/03: [CMAKE] Disable compression of debug sections in GCC <= 7.0
by Hervé Poussineau 01 Dec '20

01 Dec '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4469ab362047b5849bc58… commit 4469ab362047b5849bc58eb330f287af77a03e11 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Dec 1 18:41:59 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Tue Dec 1 18:44:53 2020 +0100 [CMAKE] Disable compression of debug sections in GCC <= 7.0 We use MSVC, Clang or GCC > 7.0 these days. --- sdk/cmake/gcc.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 278e8b5f092..acde67d9203 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -241,13 +241,6 @@ set(CMAKE_EXE_LINKER_FLAGS "-nostdlib -Wl,--enable-auto-image-base,--disable-aut set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") -if((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND - (NOT CMAKE_BUILD_TYPE STREQUAL "Release") AND - (NOT CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)) - # FIXME: Set this once Clang toolchain works with it - set(_compress_debug_sections_flag "-Wa,--compress-debug-sections") -endif() - set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${_compress_debug_sections_flag} <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>") # FIXME: Once the GCC toolchain bugs are fixed, add _compress_debug_sections_flag to CXX too set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT> -c <SOURCE>")

1 0

[reactos] 01/01: [SHELL32] Hide "This version of ReactOS is registered to:" text on condition (#3325)
by Riley Bell 30 Nov '20

30 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30144179190c11519add8… commit 30144179190c11519add8c1f4fe13afed52cb997 Author: Riley Bell <rileyjb9(a)gmail.com> AuthorDate: Tue Oct 27 05:02:35 2020 -0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Mon Nov 30 03:12:32 2020 +0300 [SHELL32] Hide "This version of ReactOS is registered to:" text on condition (#3325) When the system is not installed yet (e.g. LiveCD or 2nd installation stage) there is no registered user and organization, so no need to show this text label in the shell about dialog. Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/de-DE.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/es-ES.rc | 2 +- dll/win32/shell32/lang/et-EE.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/fr-FR.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/hi-IN.rc | 2 +- dll/win32/shell32/lang/hu-HU.rc | 2 +- dll/win32/shell32/lang/id-ID.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ja-JP.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/pt-PT.rc | 2 +- dll/win32/shell32/lang/ro-RO.rc | 2 +- dll/win32/shell32/lang/ru-RU.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- dll/win32/shell32/lang/tr-TR.rc | 2 +- dll/win32/shell32/lang/uk-UA.rc | 2 +- dll/win32/shell32/lang/zh-CN.rc | 2 +- dll/win32/shell32/lang/zh-TW.rc | 2 +- dll/win32/shell32/shresdef.h | 1 + dll/win32/shell32/wine/shell32_main.c | 7 +++++++ 36 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index a4189880a22..ee4d85bd4d7 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -141,7 +141,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Тази версия на РеактОС е записана на:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Тази версия на РеактОС е записана на:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index c4a7f66b1ce..0efaba8e9fc 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 4776320d3c0..bd35687c51d 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -146,7 +146,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Tato verze ReactOS je zaregistrována na:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Tato verze ReactOS je zaregistrována na:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 18825835a7f..6a62e89fc92 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -146,7 +146,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 841973d5b28..a88cb99ddc4 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Das ReactOS Team\0", IDC_STATIC, 105, 75, 70, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Diese ReactOS-Version wurde registriert auf:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Diese ReactOS-Version wurde registriert auf:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 4513166c9a9..8717da29146 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Αυτή η έκδοση του ReactOS είναι καταχωρημένη στον :", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Αυτή η έκδοση του ReactOS είναι καταχωρημένη στον :", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 576daf044ab..f14f2006474 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index ddcedb8b2ea..0dbe4c0b75a 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index acef0a2aa29..bd497687819 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -149,7 +149,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " El equipo de ReactOS\0", IDC_STATIC, 105, 75, 100, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Esta versión de ReactOS está registrada a nombre de:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Esta versión de ReactOS está registrada a nombre de:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 1f9497e51b4..93bb2e9d8b8 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -147,7 +147,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "See ReactOS versioon on registreeritud üksusele:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "See ReactOS versioon on registreeritud üksusele:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 322457ad802..007a086d95e 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 108872f06d8..6a95cfd000e 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Cette version de ReactOS est enregistrée à :", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Cette version de ReactOS est enregistrée à :", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 669b3e827c8..628830d04eb 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -142,7 +142,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות ReactOS\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "גירסה זו של ReactOS רשומה עבור:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "גירסה זו של ReactOS רשומה עבור:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 79ee61403d2..c13f2730c19 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "यह रिऐक्ट ओएस वर्ज़न पंजीकृत है:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "यह रिऐक्ट ओएस वर्ज़न पंजीकृत है:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index dfd77d701be..5f6c86a7e0f 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "A ReactOS ezen verziója az alábbi névre van regisztrálva:", IDC_STATIC, 35, 115, 200, 10 + LTEXT "A ReactOS ezen verziója az alábbi névre van regisztrálva:", IDC_ABOUT_REG_TO, 35, 115, 200, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index d8506fbe52c..b89c71a6b4b 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Tim ReactOS\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Versi ReactOS ini terdaftar kepada:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Versi ReactOS ini terdaftar kepada:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 3a537c8a81d..c442b3c82bf 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Questa versione di ReactOS è registrata a nome di:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Questa versione di ReactOS è registrata a nome di:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index a0ca7140350..8a3997f3d12 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "この ReactOS のバージョンは次の方に登録されています:", IDC_STATIC, 35, 105, 180, 10 + LTEXT "この ReactOS のバージョンは次の方に登録されています:", IDC_ABOUT_REG_TO, 35, 105, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 125, 180, 10 LTEXT "", IDC_STATIC, 35, 125, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 2fc91428a2d..139a5226fe8 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 9e1434b5f06..f598cfef746 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 07dd8b29350..4058056a405 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Denne ReactOS versjonen er registert til:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Denne ReactOS versjonen er registert til:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 0f900b4163f..f2421fd7a1b 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -146,7 +146,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Ta kopia systemu ReactOS jest zarejestrowana na:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Ta kopia systemu ReactOS jest zarejestrowana na:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 36af8175910..d128f0eda74 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Esta versão do ReactOS está registrado para:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Esta versão do ReactOS está registrado para:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 5f6df026596..b09f19dd217 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Esta versão do ReactOS é registada a:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Esta versão do ReactOS é registada a:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 3b3e965ffce..d1fca5dd7d2 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -142,7 +142,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa ReactOS\0", IDC_STATIC, 120, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Versiune înregistrată pentru:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Versiune înregistrată pentru:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 2983cf2e9d3..a56cc801e23 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -147,7 +147,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Команда ReactOS\0", IDC_STATIC, 105, 75, 65, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Данная версия ReactOS зарегистрирована на:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Данная версия ReactOS зарегистрирована на:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 02ec1c7f2d4..1174b80aaa8 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Táto verzia systému ReactOS je registrovaná pre:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Táto verzia systému ReactOS je registrovaná pre:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 0e7e5215a94..9d612c7b886 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "This ReactOS version is registered to:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 22f4fd02397..1e17a5b072f 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -144,7 +144,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Ekipi ReactOS\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Ky version ReactOS është i regjistruar për:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Ky version ReactOS është i regjistruar për:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index e4c7d0192ea..4a4498c32d4 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS-gruppen\0", IDC_STATIC, 105, 75, 60, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Den här versionen av ReactOS är registrerad till:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Den här versionen av ReactOS är registrerad till:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index cf7bb2e7111..ffb79b82628 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -142,7 +142,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Takımı\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Bu ReactOS sürümü şuna kayıtlıdır:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Bu ReactOS sürümü şuna kayıtlıdır:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index e1ff4ace012..d96037feef1 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -140,7 +140,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Ця версія ReactOS зареєстрована на:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Ця версія ReactOS зареєстрована на:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index da607ce1762..853eb50f76d 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -150,7 +150,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "这个 ReactOS 版本注册到:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "这个 ReactOS 版本注册到:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 33dcb7ff313..4d5fd292a0b 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -150,7 +150,7 @@ BEGIN LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "此版本授權予:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "此版本授權予:", IDC_ABOUT_REG_TO, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 821d4d05a85..d2de59071fe 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -325,6 +325,7 @@ #define IDS_ABOUT_VERSION_STRING 0x3501 #define IDC_ABOUT_VERSION 0x3502 #define IDC_ABOUT_OTHERSTUFF 0x350D +#define IDC_ABOUT_REG_TO 0x3506 #define IDC_ABOUT_REG_USERNAME 0x3507 #define IDC_ABOUT_REG_ORGNAME 0x3508 #define IDC_ABOUT_PHYSMEM 0x3503 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index fdd02477b2a..a89999c4774 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -1192,6 +1192,13 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM { SetRegTextData( hWnd, hRegKey, L"RegisteredOwner", IDC_ABOUT_REG_USERNAME ); SetRegTextData( hWnd, hRegKey, L"RegisteredOrganization", IDC_ABOUT_REG_ORGNAME ); +#ifdef __REACTOS__ + if(GetWindowTextLengthW( GetDlgItem( hWnd, IDC_ABOUT_REG_USERNAME ) ) == 0 && + GetWindowTextLengthW( GetDlgItem( hWnd, IDC_ABOUT_REG_ORGNAME ) ) == 0) + { + ShowWindow( GetDlgItem( hWnd, IDC_ABOUT_REG_TO ), SW_HIDE ); + } +#endif RegCloseKey( hRegKey ); }

1 0

[reactos] 01/01: [MSGINA] Improve exports for all stubbed functions (#3256)
by Oleg Dubinskiy 28 Nov '20

28 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bf7f83b2ad2a4fff109c… commit 6bf7f83b2ad2a4fff109cdbf1d21d37764b64a7b Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Sat Nov 28 16:32:53 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 28 17:32:53 2020 +0300 [MSGINA] Improve exports for all stubbed functions (#3256) Since they are completely undocumented and unlikely will be implemented in ROS, stubbing them only in spec file seems to be a better solution than adding wrong prototypes. Use `stdcall -stub` instead of `stub` and enable parameters of the functions. This allows to properly load our msgina.dll in Windows XP/2003. Although it still doesn't boot to desktop with dll replaced, but nevertheless the system crash that was caused by stubbed functions does no longer happen. --- dll/win32/msgina/msgina.spec | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dll/win32/msgina/msgina.spec b/dll/win32/msgina/msgina.spec index 53de1e66eaf..44c2181d3e8 100644 --- a/dll/win32/msgina/msgina.spec +++ b/dll/win32/msgina/msgina.spec @@ -1,31 +1,31 @@ -1 stub -noname ShellGetUserList ; (long long long) -2 stub -noname ShellStatusHostEnd ; (long) +1 stdcall -stub -noname ShellGetUserList(long long long) +2 stdcall -stub -noname ShellStatusHostEnd(long) 3 stdcall -noname ShellIsFriendlyUIActive() -4 stub -noname ShellIsSuspendAllowed ; () -5 stub -noname ShellIsRemoteConnectionsEnabled ; () -6 stub -noname ShellEnableFriendlyUI ; (long) -7 stub -noname ShellEnableMultipleUsers ; (long) -8 stub -noname ShellEnableRemoteConnections ; (long) +4 stdcall -stub -noname ShellIsSuspendAllowed() +5 stdcall -stub -noname ShellIsRemoteConnectionsEnabled() +6 stdcall -stub -noname ShellEnableFriendlyUI(long) +7 stdcall -stub -noname ShellEnableMultipleUsers(long) +8 stdcall -stub -noname ShellEnableRemoteConnections(long) 9 stdcall -noname ShellTurnOffDialog(ptr) -10 stub -noname ShellIsMultipleUsersEnabled ; () -11 stub -noname ShellACPIPowerButtonPressed ; (long long long) -12 stub -noname ShellIsSingleUserNoPassword ; (wstr wstr) -13 stub -noname ShellStatusHostShuttingDown ; () -14 stub -noname ShellNotifyThemeUserChange ; (long long) -15 stub -noname ShellSwitchWhenInteractiveReady ; (long long) +10 stdcall -stub -noname ShellIsMultipleUsersEnabled() +11 stdcall -stub -noname ShellACPIPowerButtonPressed(long long long) +12 stdcall -stub -noname ShellIsSingleUserNoPassword(wstr wstr) +13 stdcall -stub -noname ShellStatusHostShuttingDown() +14 stdcall -stub -noname ShellNotifyThemeUserChange(long long) +15 stdcall -stub -noname ShellSwitchWhenInteractiveReady(long long) 16 stdcall -noname ShellDimScreen(ptr ptr) -17 stub -noname ShellInstallAccountFilterData ; () -18 stub -noname ShellStatusHostBegin ; (long) -19 stub -noname ShellIsUserInteractiveLogonAllowed ; (long) -20 stub -noname ShellSwitchUser ; (long) -21 stub -noname ShellReturnToWelcome ; (long) -22 stub -noname ShellStatusHostPowerEvent ; () -23 stub -noname ShellStartCredentialServer ; (wstr long long long) -24 stub -noname ShellAcquireLogonMutex ; () -25 stub -noname ShellReleaseLogonMutex ; (long) -26 stub -noname ShellSignalShutdown ; () -27 stub -noname ShellStatusHostHide ; () -28 stub -noname ShellStatusHostShow ; () +17 stdcall -stub -noname ShellInstallAccountFilterData() +18 stdcall -stub -noname ShellStatusHostBegin(long) +19 stdcall -stub -noname ShellIsUserInteractiveLogonAllowed(long) +20 stdcall -stub -noname ShellSwitchUser(long) +21 stdcall -stub -noname ShellReturnToWelcome(long) +22 stdcall -stub -noname ShellStatusHostPowerEvent() +23 stdcall -stub -noname ShellStartCredentialServer(wstr long long long) +24 stdcall -stub -noname ShellAcquireLogonMutex() +25 stdcall -stub -noname ShellReleaseLogonMutex(long) +26 stdcall -stub -noname ShellSignalShutdown() +27 stdcall -stub -noname ShellStatusHostHide() +28 stdcall -stub -noname ShellStatusHostShow() @ stdcall ShellShutdownDialog(ptr wstr long) @ stdcall WlxActivateUserShell(ptr wstr wstr ptr) @ stdcall WlxDisconnectNotify(ptr) @@ -42,7 +42,7 @@ @ stdcall WlxLogoff(ptr) @ stdcall WlxNegotiate(long ptr) @ stdcall WlxNetworkProviderLoad(ptr ptr) -@ stub WlxReconnectNotify ; (long) +@ stdcall -stub WlxReconnectNotify(long) @ stdcall WlxRemoveStatusMessage(ptr) @ stdcall WlxScreenSaverNotify(ptr ptr) @ stdcall WlxShutdown(ptr long)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs