Ros-diffs July 2024

ros-diffs@reactos.org

7 participants
31 discussions

[reactos] 01/01: [SETUPLIB][ROSTESTS] Move setuplib unittests to rostests directory.
by Hermès Bélusca-Maïto 31 Jul '24

31 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d8c2cd8dcc9199d6072a… commit 2d8c2cd8dcc9199d6072a43560d70db4002863f5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jul 31 13:07:38 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 31 13:46:00 2024 +0200 [SETUPLIB][ROSTESTS] Move setuplib unittests to rostests directory. Addendum to commit 6289183dcd ; fixes our MSVC_x64 builder. --- base/setup/lib/CMakeLists.txt | 6 ------ modules/rostests/CMakeLists.txt | 1 + modules/rostests/unittests/CMakeLists.txt | 1 + .../rostests/unittests/setuplib}/CMakeLists.txt | 11 ++++++----- .../rostests/unittests/setuplib}/IsValidInstallDirectory.c | 0 .../rostests/unittests/setuplib}/precomp.h | 3 +-- .../rostests/unittests/setuplib}/testlist.c | 0 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index acd7cd5e01a..cc79ec83ef8 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -33,9 +33,3 @@ list(APPEND SOURCE add_library(setuplib ${SOURCE}) add_pch(setuplib precomp.h SOURCE) add_dependencies(setuplib xdk) # psdk - - -## Unit-tests -if(ENABLE_ROSTESTS) - add_subdirectory(unittests) -endif() diff --git a/modules/rostests/CMakeLists.txt b/modules/rostests/CMakeLists.txt index a5066959372..47b8be3aece 100644 --- a/modules/rostests/CMakeLists.txt +++ b/modules/rostests/CMakeLists.txt @@ -17,6 +17,7 @@ endif() #add_subdirectory(regtests) add_subdirectory(rosautotest) add_subdirectory(tests) +add_subdirectory(unittests) add_subdirectory(win32) add_subdirectory(winetests) diff --git a/modules/rostests/unittests/CMakeLists.txt b/modules/rostests/unittests/CMakeLists.txt new file mode 100644 index 00000000000..4578836648e --- /dev/null +++ b/modules/rostests/unittests/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(setuplib) diff --git a/base/setup/lib/unittests/CMakeLists.txt b/modules/rostests/unittests/setuplib/CMakeLists.txt similarity index 56% rename from base/setup/lib/unittests/CMakeLists.txt rename to modules/rostests/unittests/setuplib/CMakeLists.txt index 199e31e2dd1..de454898e67 100644 --- a/base/setup/lib/unittests/CMakeLists.txt +++ b/modules/rostests/unittests/setuplib/CMakeLists.txt @@ -1,17 +1,18 @@ PROJECT(setuplib_unittest) -include_directories(${REACTOS_SOURCE_DIR}/modules/rostests/apitests/include) +include_directories( + ${REACTOS_SOURCE_DIR}/modules/rostests/apitests/include + ${REACTOS_SOURCE_DIR}/base/setup/lib) -list(APPEND TEST_SOURCE +list(APPEND SOURCE IsValidInstallDirectory.c testlist.c precomp.h) -add_executable(setuplib_unittest ${TEST_SOURCE}) - +add_executable(setuplib_unittest ${SOURCE}) target_link_libraries(setuplib_unittest setuplib ${PSEH_LIB}) set_module_type(setuplib_unittest win32cui) add_importlibs(setuplib_unittest msvcrt kernel32 ntdll) -#add_pch(setuplib_unittest precomp.h TEST_SOURCE) +#add_pch(setuplib_unittest precomp.h SOURCE) add_rostests_file(TARGET setuplib_unittest) diff --git a/base/setup/lib/unittests/IsValidInstallDirectory.c b/modules/rostests/unittests/setuplib/IsValidInstallDirectory.c similarity index 100% rename from base/setup/lib/unittests/IsValidInstallDirectory.c rename to modules/rostests/unittests/setuplib/IsValidInstallDirectory.c diff --git a/base/setup/lib/unittests/precomp.h b/modules/rostests/unittests/setuplib/precomp.h similarity index 91% rename from base/setup/lib/unittests/precomp.h rename to modules/rostests/unittests/setuplib/precomp.h index 8cb8823d5ec..4de1c3296e7 100644 --- a/base/setup/lib/unittests/precomp.h +++ b/modules/rostests/unittests/setuplib/precomp.h @@ -19,11 +19,10 @@ #include <windef.h> #include <winbase.h> -//#include <strsafe.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> -#include <../setuplib.h> +#include <setuplib.h> /* EOF */ diff --git a/base/setup/lib/unittests/testlist.c b/modules/rostests/unittests/setuplib/testlist.c similarity index 100% rename from base/setup/lib/unittests/testlist.c rename to modules/rostests/unittests/setuplib/testlist.c

1 0

[reactos] 02/02: [NTOS:CC] Protect CcFlushCache call with a mutex
by Thamatip Chitpong 31 Jul '24

31 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf4138fa2433373081854… commit cf4138fa2433373081854b44c4bb76541d4fe0cc Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Jul 25 23:09:17 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Wed Jul 31 18:07:49 2024 +0700 [NTOS:CC] Protect CcFlushCache call with a mutex Fix crash when the function was called concurrently for the same file by BTRFS driver. CORE-19664 --- ntoskrnl/cc/view.c | 9 +++++++-- ntoskrnl/include/internal/cc.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 90b644560e2..7c13afb3220 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1142,6 +1142,8 @@ CcFlushCache ( IoStatus->Information = 0; } + KeAcquireGuardedMutex(&SharedCacheMap->FlushCacheLock); + /* * We flush the VACBs that we find here. * If there is no (dirty) VACB, it doesn't mean that there is no data to flush, so we call Mm to be sure. @@ -1161,7 +1163,7 @@ CcFlushCache ( if (!NT_SUCCESS(Status)) { CcRosReleaseVacb(SharedCacheMap, vacb, FALSE, FALSE); - goto quit; + break; } DirtyVacb = TRUE; @@ -1191,7 +1193,7 @@ CcFlushCache ( } if (!NT_SUCCESS(Status)) - goto quit; + break; if (IoStatus) IoStatus->Information += MmIosb.Information; @@ -1211,6 +1213,8 @@ CcFlushCache ( FlushStart -= FlushStart % VACB_MAPPING_GRANULARITY; } + KeReleaseGuardedMutex(&SharedCacheMap->FlushCacheLock); + quit: if (IoStatus) { @@ -1319,6 +1323,7 @@ CcRosInitializeFileCache ( KeInitializeSpinLock(&SharedCacheMap->CacheMapLock); InitializeListHead(&SharedCacheMap->CacheMapVacbListHead); InitializeListHead(&SharedCacheMap->BcbList); + KeInitializeGuardedMutex(&SharedCacheMap->FlushCacheLock); SharedCacheMap->Flags = SHARED_CACHE_MAP_IN_CREATION; diff --git a/ntoskrnl/include/internal/cc.h b/ntoskrnl/include/internal/cc.h index 90c315901d1..b37c5478f05 100644 --- a/ntoskrnl/include/internal/cc.h +++ b/ntoskrnl/include/internal/cc.h @@ -193,6 +193,7 @@ typedef struct _ROS_SHARED_CACHE_MAP LIST_ENTRY CacheMapVacbListHead; BOOLEAN PinAccess; KSPIN_LOCK CacheMapLock; + KGUARDED_MUTEX FlushCacheLock; #if DBG BOOLEAN Trace; /* enable extra trace output for this cache map and it's VACBs */ #endif

1 0

[reactos] 01/02: [NTOS:CC] CcFlushCache: Call CcRosReleaseVacb when CcRosFlushVacb fails
by Thamatip Chitpong 31 Jul '24

31 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0899f4b2b174f04c88c7d… commit 0899f4b2b174f04c88c7dedac2854a9d10d5e738 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Fri Jun 28 21:16:14 2024 +0700 Commit: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> CommitDate: Wed Jul 31 18:07:49 2024 +0700 [NTOS:CC] CcFlushCache: Call CcRosReleaseVacb when CcRosFlushVacb fails CcRosLookupVacb adds a refcount. --- ntoskrnl/cc/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 4e72ca6b040..90b644560e2 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -1160,6 +1160,7 @@ CcFlushCache ( Status = CcRosFlushVacb(vacb, &VacbIosb); if (!NT_SUCCESS(Status)) { + CcRosReleaseVacb(SharedCacheMap, vacb, FALSE, FALSE); goto quit; } DirtyVacb = TRUE;

1 0

[reactos] 02/02: [SETUPLIB][USETUP] Improve IsValidInstallDirectory() behaviour (#7187)
by Hermès Bélusca-Maïto 31 Jul '24

31 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71197535a1031eb137700… commit 71197535a1031eb137700d9ba0821210edeb51be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 25 18:57:23 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 31 11:41:24 2024 +0200 [SETUPLIB][USETUP] Improve IsValidInstallDirectory() behaviour (#7187) CORE-6149, CORE-6179, CORE-9529 See also commits d329fbebf (r66995), 7c3f4c94a (r68307), and 16daf6700. The function verifies that each path component of the directory is a valid 8.3 name, not . or .. nor empty. This behaviour is compatible with what can be observed from Windows XP/2003 installer. (To reliably test this with the Windows installer, you need to modify the TXTSETUP.SIF DefaultPath value in the [SetupData] section.) --- base/setup/lib/setuplib.c | 100 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 74 insertions(+), 26 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 22ec4afc3fe..9fb91b24f80 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -712,51 +712,99 @@ InitSystemPartition( return TRUE; } + +#define IS_PATH_SEPARATOR(c) ((c) == L'\\' || (c) == L'/') + +/** + * @brief + * Verify whether the given directory is suitable for ReactOS installation. + * Each path component must be a valid 8.3 name. + **/ BOOLEAN IsValidInstallDirectory( _In_ PCWSTR InstallDir) { - UINT i, Length; + PCWCH p; + + /* As with the NT installer, fail if the path is empty or "\\" */ + p = InstallDir; + if (!*p || (IS_PATH_SEPARATOR(*p) && !*(p + 1))) + return FALSE; - Length = wcslen(InstallDir); + /* The path must contain only valid characters (alpha-numeric, + * '.', '\\', '-' and '_'). Spaces are not accepted. */ + for (p = InstallDir; *p; ++p) + { + if (!IS_VALID_INSTALL_PATH_CHAR(*p)) + return FALSE; + } - // TODO: Add check for 8.3 too. + /* + * Loop over each path component and verify that each is a valid 8.3 name. + */ + for (p = InstallDir; *p;) + { + PCWSTR Path; + SIZE_T Length; + UNICODE_STRING Name; + BOOLEAN IsNameLegal, SpacesInName; + + /* Skip any first separator */ + if (IS_PATH_SEPARATOR(*p)) + ++p; + + /* Now skip past the path component until we reach the next separator */ + Path = p; + while (*p && !IS_PATH_SEPARATOR(*p)) + ++p; + if (p == Path) + { + /* Succeed if nothing else follows this separator; otherwise + * it's a separator and consecutive ones are not supported */ + return (!*p); + } - /* Path must be at least 2 characters long */ -// if (Length < 2) -// return FALSE; + /* Calculate the path component length */ + Length = p - Path; - /* Path must start with a backslash */ -// if (InstallDir[0] != L'\\') -// return FALSE; + /* As with the NT installer, fail for '.' and '..'; + * RtlIsNameLegalDOS8Dot3() would succeed otherwise */ + if ((Length == 1 && *Path == '.') || (Length == 2 && *Path == '.' && *(Path + 1) == '.')) + return FALSE; - /* Path must not end with a backslash */ - if (InstallDir[Length - 1] == L'\\') - return FALSE; + /* As with the NT installer, allow _only ONE trailing_ dot in + * the path component (but not 2 or more), by reducing Length + * in that case; RtlIsNameLegalDOS8Dot3() would fail otherwise */ + if (Length > 1 && *(p - 2) != L'.' && *(p - 1) == L'.') + --Length; - /* Path must not contain whitespace characters */ - for (i = 0; i < Length; i++) - { - if (iswspace(InstallDir[i])) + if (Length == 0) return FALSE; - } - /* Path component must not end with a dot */ - for (i = 0; i < Length; i++) - { - if (InstallDir[i] == L'\\' && i > 0) + /* Verify that the path component is a valid 8.3 name */ + // if (Length > 8+1+3) + // return FALSE; + Name.Length = Name.MaximumLength = (USHORT)(Length * sizeof(WCHAR)); + Name.Buffer = (PWCHAR)Path; + SpacesInName = FALSE; + IsNameLegal = RtlIsNameLegalDOS8Dot3(&Name, NULL, &SpacesInName); + + /* If it isn't legal or contain spaces, fail */ + if (!IsNameLegal || SpacesInName) { - if (InstallDir[i - 1] == L'.') - return FALSE; + DPRINT("'%wZ' is %s 8.3 filename %s spaces\n", + &Name, + (IsNameLegal ? "a valid" : "an invalid"), + (SpacesInName ? "with" : "without")); + return FALSE; } + /* Go to the next path component */ } - if (InstallDir[Length - 1] == L'.') - return FALSE; - return TRUE; } + NTSTATUS InitDestinationPaths( IN OUT PUSETUP_DATA pSetupData,

1 0

[reactos] 01/02: [SETUPLIB_UNITTEST] Add unit-tests for the setuplib (#7187)
by Hermès Bélusca-Maïto 31 Jul '24

31 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6289183dcd72673cac232… commit 6289183dcd72673cac232f15c7b636a84d9afb28 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 25 21:12:33 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 31 11:41:23 2024 +0200 [SETUPLIB_UNITTEST] Add unit-tests for the setuplib (#7187) --- base/setup/lib/CMakeLists.txt | 6 ++ base/setup/lib/unittests/CMakeLists.txt | 17 ++++ base/setup/lib/unittests/IsValidInstallDirectory.c | 110 +++++++++++++++++++++ base/setup/lib/unittests/precomp.h | 29 ++++++ base/setup/lib/unittests/testlist.c | 10 ++ 5 files changed, 172 insertions(+) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index cc79ec83ef8..acd7cd5e01a 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -33,3 +33,9 @@ list(APPEND SOURCE add_library(setuplib ${SOURCE}) add_pch(setuplib precomp.h SOURCE) add_dependencies(setuplib xdk) # psdk + + +## Unit-tests +if(ENABLE_ROSTESTS) + add_subdirectory(unittests) +endif() diff --git a/base/setup/lib/unittests/CMakeLists.txt b/base/setup/lib/unittests/CMakeLists.txt new file mode 100644 index 00000000000..199e31e2dd1 --- /dev/null +++ b/base/setup/lib/unittests/CMakeLists.txt @@ -0,0 +1,17 @@ + +PROJECT(setuplib_unittest) + +include_directories(${REACTOS_SOURCE_DIR}/modules/rostests/apitests/include) + +list(APPEND TEST_SOURCE + IsValidInstallDirectory.c + testlist.c + precomp.h) + +add_executable(setuplib_unittest ${TEST_SOURCE}) + +target_link_libraries(setuplib_unittest setuplib ${PSEH_LIB}) +set_module_type(setuplib_unittest win32cui) +add_importlibs(setuplib_unittest msvcrt kernel32 ntdll) +#add_pch(setuplib_unittest precomp.h TEST_SOURCE) +add_rostests_file(TARGET setuplib_unittest) diff --git a/base/setup/lib/unittests/IsValidInstallDirectory.c b/base/setup/lib/unittests/IsValidInstallDirectory.c new file mode 100644 index 00000000000..c7f3a599271 --- /dev/null +++ b/base/setup/lib/unittests/IsValidInstallDirectory.c @@ -0,0 +1,110 @@ +/* + * PROJECT: ReactOS Setup Library - Unit-tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Test for IsValidInstallDirectory + * COPYRIGHT: Copyright 2024 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +#include "precomp.h" + +// +// FIXME: Temporary symbols defined to make linking work. +// They will be defined to something once INF file testing is implemented. +// +pSpInfCloseInfFile SpInfCloseInfFile = NULL; +pSpInfFindFirstLine SpInfFindFirstLine = NULL; +pSpInfFindNextLine SpInfFindNextLine = NULL; +pSpInfGetFieldCount SpInfGetFieldCount = NULL; +pSpInfGetBinaryField SpInfGetBinaryField = NULL; +pSpInfGetIntField SpInfGetIntField = NULL; +pSpInfGetMultiSzField SpInfGetMultiSzField = NULL; +pSpInfGetStringField SpInfGetStringField = NULL; +pSpInfGetField SpInfGetField = NULL; +pSpInfOpenInfFile SpInfOpenInfFile = NULL; + +BOOLEAN IsUnattendedSetup = FALSE; +HANDLE ProcessHeap; + + +START_TEST(IsValidInstallDirectory) +{ + static const struct + { + PCWSTR path; + BOOLEAN result; + } tests[] = + { + { L"", FALSE }, + { L" ", FALSE }, + { L"\\", FALSE }, + { L"\\\\", FALSE }, + { L".", FALSE }, + { L"..", FALSE }, + { L"...", FALSE }, + { L"....", FALSE }, + { L" WINNT", FALSE }, + { L"WINNT ", FALSE }, + { L".WINNT", FALSE }, + { L"..WINNT", FALSE }, + { L"W.INNT", FALSE }, + { L"WI.NNT", TRUE }, + { L"WIN.NT", TRUE }, + { L"WINNT.", TRUE }, + { L"WINNT..", FALSE }, + { L"WINNT. ", FALSE }, + { L"WINNT.e e", FALSE }, + { L"WIN^`NT", FALSE }, + + { L"WINNT", TRUE }, + { L"\\WINNT", TRUE }, + { L"\\WINNT\\", TRUE }, + { L"\\WINNT\\.", FALSE }, + { L"WIN\\NT", TRUE }, + { L"WIN\\NT.", TRUE }, + { L"\\WIN\\NT\\", TRUE }, + { L"\\WIN\\NT.\\", TRUE }, + { L"\\WIN.\\NT52", TRUE }, + { L"\\WIN\\.\\NT52", FALSE }, + { L"\\WIN\\..\\NT52", FALSE }, + { L"\\WIN\\...\\NT52", FALSE }, + { L"\\WIN\\....\\NT52", FALSE }, + + { L"win.nt.5", FALSE }, + { L"win.ntX5", FALSE }, + { L"winn.tX5", TRUE }, + { L"winnt.X5", TRUE }, + { L"winntX.5", TRUE }, + { L"winntX5.", TRUE }, + { L"filenamee.xte", FALSE }, + { L"filenamee.xt", FALSE }, + { L"filename.ext", TRUE }, + { L"file.ame.ext", FALSE }, + { L"filenam.eext", FALSE }, + + { L"1 3 5 7 .abc", FALSE }, + { L"12345678. c", FALSE }, + { L"123456789.a", FALSE }, + { L"12345.abcd", FALSE }, + { L"12345.ab d", FALSE }, + { L".abc", FALSE }, + { L"12.abc.d", FALSE }, + { L"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", FALSE }, + }; + +#define BOOL_TO_STR(b) ((b) ? "TRUE" : "FALSE") + + ProcessHeap = GetProcessHeap(); + + UINT i; + for (i = 0; i < _countof(tests); ++i) + { + BOOLEAN ret = IsValidInstallDirectory(tests[i].path); + ok(ret == tests[i].result, + "Unexpected result for '%S', got %s, expected %s\n", + tests[i].path, BOOL_TO_STR(ret), BOOL_TO_STR(tests[i].result)); + } + +#undef BOOL_TO_STR +} + +/* EOF */ diff --git a/base/setup/lib/unittests/precomp.h b/base/setup/lib/unittests/precomp.h new file mode 100644 index 00000000000..8cb8823d5ec --- /dev/null +++ b/base/setup/lib/unittests/precomp.h @@ -0,0 +1,29 @@ +/* + * PROJECT: ReactOS Setup Library - Unit-tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Precompiled header + * COPYRIGHT: Copyright 2024 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +#pragma once + +#include <apitest.h> + +/* C Headers */ +#include <stdio.h> + +/* PSDK/NDK */ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +//#include <strsafe.h> + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> + +#include <../setuplib.h> + +/* EOF */ diff --git a/base/setup/lib/unittests/testlist.c b/base/setup/lib/unittests/testlist.c new file mode 100644 index 00000000000..f2600910505 --- /dev/null +++ b/base/setup/lib/unittests/testlist.c @@ -0,0 +1,10 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_IsValidInstallDirectory(void); + +const struct test winetest_testlist[] = +{ + { "IsValidInstallDirectory", func_IsValidInstallDirectory }, + { 0, 0 } +};

1 0

[reactos] 01/01: [SETUPLIB][USETUP] Move IsValidPath() back into setuplib for reusability (#7186)
by Hermès Bélusca-Maïto 31 Jul '24

31 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=785cc2159853702aad4ab… commit 785cc2159853702aad4abad22167f220d55a0f64 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 25 18:57:23 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Jul 31 11:40:21 2024 +0200 [SETUPLIB][USETUP] Move IsValidPath() back into setuplib for reusability (#7186) Reverts the IsValidPath() move done in commit 9c64b57dc. - Turn IsValidPath() into a IsValidInstallDirectory() helper function available in the setuplib, so that it can also be used in the GUI setup. - Introduce a IS_VALID_INSTALL_PATH_CHAR() macro. --- base/setup/lib/setuplib.c | 45 +++++++++++++++++++++++++++++++++++++ base/setup/lib/setuplib.h | 7 ++++++ base/setup/usetup/usetup.c | 55 +++++----------------------------------------- 3 files changed, 58 insertions(+), 49 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 2e915c52580..22ec4afc3fe 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -712,6 +712,51 @@ InitSystemPartition( return TRUE; } +BOOLEAN +IsValidInstallDirectory( + _In_ PCWSTR InstallDir) +{ + UINT i, Length; + + Length = wcslen(InstallDir); + + // TODO: Add check for 8.3 too. + + /* Path must be at least 2 characters long */ +// if (Length < 2) +// return FALSE; + + /* Path must start with a backslash */ +// if (InstallDir[0] != L'\\') +// return FALSE; + + /* Path must not end with a backslash */ + if (InstallDir[Length - 1] == L'\\') + return FALSE; + + /* Path must not contain whitespace characters */ + for (i = 0; i < Length; i++) + { + if (iswspace(InstallDir[i])) + return FALSE; + } + + /* Path component must not end with a dot */ + for (i = 0; i < Length; i++) + { + if (InstallDir[i] == L'\\' && i > 0) + { + if (InstallDir[i - 1] == L'.') + return FALSE; + } + } + + if (InstallDir[Length - 1] == L'.') + return FALSE; + + return TRUE; +} + NTSTATUS InitDestinationPaths( IN OUT PUSETUP_DATA pSetupData, diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 411b810232a..43fe3a866f9 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -177,6 +177,13 @@ InitSystemPartition( _In_opt_ PFSVOL_CALLBACK FsVolCallback, _In_opt_ PVOID Context); +#define IS_VALID_INSTALL_PATH_CHAR(c) \ + (iswalnum(c) || (c) == L'.' || (c) == L'\\' || (c) == L'-' || (c) == L'_') + +BOOLEAN +IsValidInstallDirectory( + _In_ PCWSTR InstallDir); + NTSTATUS InitDestinationPaths( IN OUT PUSETUP_DATA pSetupData, diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index f765ce6f180..204c92715c1 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2866,52 +2866,6 @@ FsVolCallback( } -static BOOLEAN -IsValidPath( - IN PCWSTR InstallDir) -{ - UINT i, Length; - - Length = wcslen(InstallDir); - - // TODO: Add check for 8.3 too. - - /* Path must be at least 2 characters long */ -// if (Length < 2) -// return FALSE; - - /* Path must start with a backslash */ -// if (InstallDir[0] != L'\\') -// return FALSE; - - /* Path must not end with a backslash */ - if (InstallDir[Length - 1] == L'\\') - return FALSE; - - /* Path must not contain whitespace characters */ - for (i = 0; i < Length; i++) - { - if (iswspace(InstallDir[i])) - return FALSE; - } - - /* Path component must not end with a dot */ - for (i = 0; i < Length; i++) - { - if (InstallDir[i] == L'\\' && i > 0) - { - if (InstallDir[i - 1] == L'.') - return FALSE; - } - } - - if (InstallDir[Length - 1] == L'.') - return FALSE; - - return TRUE; -} - - /* * Displays the InstallDirectoryPage. * @@ -2951,7 +2905,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) * of an invalid path, or we are in regular setup), display the UI and allow * the user to specify a new installation path. */ - if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidPath(InstallDir)) + if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidInstallDirectory(InstallDir)) { Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) @@ -3059,7 +3013,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) * Check for the validity of the installation directory and pop up * an error if it is not the case. Then the user can fix its input. */ - if (!IsValidPath(InstallDir)) + if (!IsValidInstallDirectory(InstallDir)) { MUIDisplayError(ERROR_DIRECTORY_NAME, Ir, POPUP_WAIT_ENTER); return INSTALL_DIRECTORY_PAGE; @@ -3106,8 +3060,11 @@ InstallDirectoryPage(PINPUT_RECORD Ir) { if (Length < 50) { + /* Only accept valid characters for installation path + * (alpha-numeric, '.', '\', '-' and '_'). Note that + * spaces are not accepted. */ c = (WCHAR)Ir->Event.KeyEvent.uChar.AsciiChar; - if (iswalpha(c) || iswdigit(c) || c == '.' || c == '\\' || c == '-' || c == '_') + if (IS_VALID_INSTALL_PATH_CHAR(c)) { if (Pos < Length) memmove(&InstallDir[Pos + 1],

1 0

[reactos] 01/01: [RASDLG] ro-RO.rc: Fix 2 compiler warnings (#7197)
by Joachim Henze 31 Jul '24

31 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a532a68d40feee2422baa… commit a532a68d40feee2422baac4d092ce8ce829e293b Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Wed Jul 31 03:48:09 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 31 03:48:09 2024 +0200 [RASDLG] ro-RO.rc: Fix 2 compiler warnings (#7197) which have been introduced during 0.4.15-dev'ing when romanian resources were updated. C:\buildbot_config\worker\Build_MSVC_x86\build\dll\win32\rasdlg\lang/ro-RO.rc(508) : warning RC4206 : title string too long; truncated at 256 C:\buildbot_config\worker\Build_MSVC_x86\build\dll\win32\rasdlg\lang/ro-RO.rc(521) : warning RC4206 : title string too long; truncated at 256 see MSVC builder https://build.reactos.org/#builders/1/builds/24117 The fix respects the rule 1 of the Romania translation notes also, same as Andreis commit did. Also fix a few places where ". " was the case (unintended double-space) --- dll/win32/rasdlg/lang/ro-RO.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/rasdlg/lang/ro-RO.rc b/dll/win32/rasdlg/lang/ro-RO.rc index 466691fb793..ec74e04a6fa 100644 --- a/dll/win32/rasdlg/lang/ro-RO.rc +++ b/dll/win32/rasdlg/lang/ro-RO.rc @@ -145,7 +145,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Apelare inversă" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Aveţi pe server privilegiul de apelare inversă 'Stabilit de apelant'. Apăsaţi pe OK, iar serverul vă va apela la numărul de mai jos. Pentru a ignora apelarea inversă, apăsaţi pe Revocare.", 1066, 5, 5, 221, 39, SS_NOPREFIX + LTEXT "Aveţi pe server privilegiul de apelare inversă 'Stabilit de apelant'. Apăsaţi pe OK, iar serverul vă va apela la numărul de mai jos. Pentru a ignora apelarea inversă, apăsaţi pe Revocare.", 1066, 5, 5, 221, 39, SS_NOPREFIX LTEXT "&Introduceţi numărul de telefon al modemului:", 1067, 5, 46, 222, 8, NOT WS_GROUP EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP @@ -423,7 +423,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION CAPTION "Formarea manuală a numărului" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ridicaţi receptorul şi formaţi numărul (sau cereţi operatorului să îl formeze). După ce apelarea s-a terminat, faceţi clic pe OK. Ascultaţi la receptor până devine silenţios, apoi suspendaţi.", 1281, 8, 8, 219, 32 + LTEXT "Ridicaţi receptorul şi formaţi numărul (sau cereţi operatorului să îl formeze). După ce apelarea s-a terminat, faceţi clic pe OK. Ascultaţi la receptor până devine silenţios, apoi suspendaţi.", 1281, 8, 8, 219, 32 LTEXT "Număr de telefon:", 1282, 8, 46, 91, 8 LTEXT "", 1283, 103, 46, 126, 8, NOT WS_GROUP DEFPUSHBUTTON "OK", 1, 104, 70, 60, 14, WS_GROUP @@ -505,7 +505,7 @@ END STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Este necesar să stabiliţi acreditările pentru apeluri dinspre exterior, pe care le vor utiliza distribuitoarele la distanţă când se conectează la interfaţă. Cu informaţiile pe care le introduceţi aici se creează un cont utilizator pentru acest distribuitor.", 1094, 8, 5, 307, 35 + LTEXT "Este necesară stabilirea datelor de autentificare pe care serverul de redirecţionare le va folosi pentru conectarea la această interfaţă. În consecinţă, din informaţiile oferite aici va fi creat un nou cont de utilizator în serverul de redirecţionare.", 1094, 8, 5, 307, 35 LTEXT "Nume &utilizator:", 1078, 8, 47, 124, 8, NOT WS_GROUP EDITTEXT 1074, 135, 45, 175, 12, ES_AUTOHSCROLL | WS_DISABLED LTEXT "&Parolă:", 1077, 8, 68, 124, 8, NOT WS_GROUP @@ -518,7 +518,7 @@ END STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Este necesar să stabiliţi acreditările pentru apeluri dinspre interior, pe care le va utiliza interfaţa când se conectează la distribuitorul la distanţă. Aceste acreditări trebuie să concorde cu acreditările pentru apeluri dinspre exterior configurate pe distribuitorul la distanţă.", 1094, 8, 5, 308, 33 + LTEXT "Este necesară stabilirea datelor de autentificare pe care această interfaţă le va folosi pentru conectarea la serverul de redirecţionare. Aceste date trebuie să corespundă cu datele de autentificare configurate în serverul de redirecţionare.", 1094, 8, 5, 308, 33 LTEXT "Nume &utilizator:", 1096, 8, 43, 130, 8, NOT WS_GROUP EDITTEXT 1091, 140, 40, 175, 12, ES_AUTOHSCROLL LTEXT "&Domeniu:", 1093, 8, 63, 130, 8, NOT WS_GROUP @@ -1865,7 +1865,7 @@ BEGIN 215 "Fişiere de comandă rapidă pentru apelare (*.rnk)\0" 216 "*.rnk\0" 217 "Creare comandă rapidă pentru apelare\0" - 218 "Legarea la %1 nu a reuşit. Reconectare în aşteptare…\0" + 218 "Legarea la %1 nu a reuşit. Reconectare în aşteptare…\0" 219 "Imposibil de regăsit informaţiile de încadrare.\0" 220 "Imposibil de regăsit informaţiile port-ului.\0" 221 "Imposibil de regăsit informaţiile proiecţiei.\0" @@ -1955,7 +1955,7 @@ BEGIN 305 "Nu s-a selectat nici o agendă telefonică alternativă.\0" 306 "Imposibil de configurat dinamic acel dispozitiv.\0" 307 "Imposibil de şters intrarea deoarece este conectată.\0" - 308 "Nu este selectată nici o intrare. Pentru a crea o intrare apăsaţi pe butonul Nou.\0" + 308 "Nu este selectată nici o intrare. Pentru a crea o intrare apăsaţi pe butonul Nou.\0" 309 "Când se selectează 'specificarea unei adrese IP' este necesar să furnizaţi o adresă IP diferită de zero.\0" 310 "Se solicită o adresă X.25 atunci când se selectează o reţea de apelare X.25 sau un dispozitiv X.25.\0" 311 "(nici una)\0" @@ -2213,11 +2213,11 @@ BEGIN 1567 " (criptare activată)\0" 1568 "Informaţii cont Internet\0" 1569 "Aveţi nevoie de nume de cont şi parolă pentru a semna la intrarea în contul Internet.\0" - 1570 "Pachetul EAP selectat nu oferă chei de criptare. Selectaţi un pachet EAP care furnizează chei sau selectaţi să nu se cripteze.\0" + 1570 "Pachetul EAP selectat nu oferă chei de criptare. Selectaţi un pachet EAP care furnizează chei sau selectaţi să nu se cripteze.\0" 1571 "Selecţia curentă de criptare solicită metode de securitate la Log on de tip EAP sau unele versiuni ale MS-CHAP.\0" 1572 "Protocoale şi securitate\0" 1573 "Selectaţi opţiunile de transport şi securitate pentru această conexiune.\0" - 1574 "Protocoalele selectate includ PAP, SPAP şi/sau CHAP. Dacă se trece peste unul din ele, nu se va face criptarea datelor. Păstraţi aceste setări?\0" + 1574 "Protocoalele selectate includ PAP, SPAP şi/sau CHAP. Dacă se trece peste unul din ele, nu se va face criptarea datelor. Păstraţi aceste setări?\0" 1575 "Pentru a vă conecta la '%1', mai întâi trebuie să fiţi conectat la '%2'. Vă conectaţi la '%2' acum?\0" 1576 "Conectare pe cablu paralel…\0" 1577 "Conectare pe infraroşu…\0" @@ -2244,7 +2244,7 @@ BEGIN 1612 "Aţi selectat utilizarea unei chei pre-distribuite dar nu aţi introdus nici una.\nIntroduceţi cheia pre-distribuită.\0" 1613 "Imposibil de angajat acreditările\0" 1634 "Deoarece serviciul Instrumentaţie de management ReactOS (WMI) s-a dezactivat, ReactOS nu afişează proprietăţile acestei conexiuni sau reţeaua de pornire.\n\nPentru a configura proprietăţile acestei conexiuni sau ale reţelei de la domiciliu, este necesar să activaţi mai întâi serviciul WMI. Pentru a realiza acest lucru, în Instrumente administrative din Panoul de control faceţi dublu clic pe Servicii, faceţi clic cu butonul din dreapta pe Instrumentaţia de management ReactOS, ap [...] - 1635 "ReactOS nu afişează proprietăţile acestei conexiuni. Este posibil ca informaţiile din Instrumentaţia de management ReactOS (WMI) să fie deteriorate. Pentru a corecta aceasta, utilizaţi Restabilire sistem pentru a restabili ReactOS la un moment anterior (numit punct de restabilire). Restabilire sistem este amplasat în folderul Instrumente sistem din Accesorii.\0" + 1635 "ReactOS nu afişează proprietăţile acestei conexiuni. Este posibil ca informaţiile din Instrumentaţia de management ReactOS (WMI) să fie deteriorate. Pentru a corecta aceasta, utilizaţi Restabilire sistem pentru a restabili ReactOS la un moment anterior (numit punct de restabilire). Restabilire sistem este amplasat în folderul Instrumente sistem din Accesorii.\0" 1646 "Se permite solicitare ecou la sosire\0" 1647 "Se permite solicitare marcă de timp de intrare\0" 1648 "Se permite solicitare mască de intrare\0" @@ -2270,7 +2270,7 @@ BEGIN 1672 "Când computerul renunţă la o transmisie de date incompletă deoarece transmisia completă a solicitat mai mult timp decât este permis, el va răspunde expeditorului cu un mesaj ""timp expirat"".\0" 1673 "Datele trimise din acest computer vor fi redistribuite dacă se schimbă calea implicită.\0" 1675 "Valoarea introdusă pentru dimensiunea fişierului jurnal nu este corectă. Introduceţi o valoare între 1 şi 32767 k.\0" - 1685 "Contul utilizator nu are permisiunea de a utiliza această conexiune. De obicei, acest lucru se întâmplă deoarece aţi făcut Log on ca Vizitator.\0" + 1685 "Contul utilizator nu are permisiunea de a utiliza această conexiune. De obicei, acest lucru se întâmplă deoarece aţi făcut Log on ca Vizitator.\0" 1686 "Tastaţi numele contului şi parola. (Dacă aţi uitat numele contului sau parola, contactaţi administratorul reţelei.)\0" 1687 "&Nume computer\0" 1688 "&Nume furnizor ISP\0"

1 0

[reactos] 01/01: [USER32] Simplify CliSaveImeHotKey (#7199)
by Katayama Hirofumi MZ 30 Jul '24

30 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=063e5e251412e01b70301… commit 063e5e251412e01b70301451b75ae15bb3106a13 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jul 31 03:50:29 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jul 31 03:50:29 2024 +0900 [USER32] Simplify CliSaveImeHotKey (#7199) Code diet. RegCreateKeyExW will create sub-keys recursively, so this code is okay. JIRA issue: CORE-19268 Simplify registry key creation code. --- win32ss/user/user32/windows/input.c | 63 ++++++++++++------------------------- 1 file changed, 20 insertions(+), 43 deletions(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index dc6ddaff5f7..988254d2fae 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -211,68 +211,45 @@ CliSaveImeHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKL, BOOL bD { WCHAR szName[MAX_PATH]; LONG error; - HKEY hControlPanel = NULL, hInputMethod = NULL, hHotKeys = NULL, hKey = NULL; + HKEY hKey; BOOL ret = FALSE, bRevertOnFailure = FALSE; + StringCchPrintfW(szName, _countof(szName), + L"Control Panel\\Input Method\\Hot Keys\\%08lX", dwID); + if (bDelete) { - StringCchPrintfW(szName, _countof(szName), - L"Control Panel\\Input Method\\Hot Keys\\%08lX", dwID); error = RegDeleteKeyW(HKEY_CURRENT_USER, szName); return (error == ERROR_SUCCESS); } - // Open "Control Panel" - error = RegCreateKeyExW(HKEY_CURRENT_USER, L"Control Panel", 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &hControlPanel, NULL); + error = RegCreateKeyExW(HKEY_CURRENT_USER, szName, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL); if (error == ERROR_SUCCESS) { - // Open "Input Method" - error = RegCreateKeyExW(hControlPanel, L"Input Method", 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &hInputMethod, NULL); + bRevertOnFailure = TRUE; + + // Set "Virtual Key" + error = RegSetValueExW(hKey, L"Virtual Key", 0, REG_BINARY, + (LPBYTE)&uVirtualKey, sizeof(uVirtualKey)); if (error == ERROR_SUCCESS) { - // Open "Hot Keys" - error = RegCreateKeyExW(hInputMethod, L"Hot Keys", 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &hHotKeys, NULL); + // Set "Key Modifiers" + error = RegSetValueExW(hKey, L"Key Modifiers", 0, REG_BINARY, + (LPBYTE)&uModifiers, sizeof(uModifiers)); if (error == ERROR_SUCCESS) { - // Open "Key" - StringCchPrintfW(szName, _countof(szName), L"%08lX", dwID); - error = RegCreateKeyExW(hHotKeys, szName, 0, NULL, 0, KEY_ALL_ACCESS, - NULL, &hKey, NULL); + // Set "Target IME" + error = RegSetValueExW(hKey, L"Target IME", 0, REG_BINARY, + (LPBYTE)&hKL, sizeof(hKL)); if (error == ERROR_SUCCESS) { - bRevertOnFailure = TRUE; - - // Set "Virtual Key" - error = RegSetValueExW(hKey, L"Virtual Key", 0, REG_BINARY, - (LPBYTE)&uVirtualKey, sizeof(uVirtualKey)); - if (error == ERROR_SUCCESS) - { - // Set "Key Modifiers" - error = RegSetValueExW(hKey, L"Key Modifiers", 0, REG_BINARY, - (LPBYTE)&uModifiers, sizeof(uModifiers)); - if (error == ERROR_SUCCESS) - { - // Set "Target IME" - error = RegSetValueExW(hKey, L"Target IME", 0, REG_BINARY, - (LPBYTE)&hKL, sizeof(hKL)); - if (error == ERROR_SUCCESS) - { - // Success! - ret = TRUE; - bRevertOnFailure = FALSE; - } - } - } - RegCloseKey(hKey); + // Success! + ret = TRUE; + bRevertOnFailure = FALSE; } - RegCloseKey(hHotKeys); } - RegCloseKey(hInputMethod); } - RegCloseKey(hControlPanel); + RegCloseKey(hKey); } if (bRevertOnFailure)

1 0

[reactos] 01/01: [IMM32][SDK][USER32] Fix ImmFreeLayout parameter (#7195)
by Katayama Hirofumi MZ 30 Jul '24

30 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcf0788f595ba4eb73fa3… commit dcf0788f595ba4eb73fa368a7be91999588d58b4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 30 11:45:23 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 30 11:45:23 2024 +0900 [IMM32][SDK][USER32] Fix ImmFreeLayout parameter (#7195) JIRA issue: CORE-19268 - Define ImmFreeLayout parameter special values (HKL_SWITCH_TO_NON_IME and HKL_RELEASE_IME) at <imm32_undoc.h>. - Make ImmFreeLayout parameter an HKL. --- dll/win32/imm32/imm.c | 17 +++++++++-------- dll/win32/imm32/imm32.spec | 2 +- sdk/include/reactos/imm32_undoc.h | 4 ++++ win32ss/user/user32/include/immtable.h | 2 +- win32ss/user/user32/misc/imm.c | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index edbc4bcdb4e..117cb52eaa9 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -111,20 +111,22 @@ BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) /*********************************************************************** * ImmFreeLayout (IMM32.@) + * + * NOTE: HKL_SWITCH_TO_NON_IME and HKL_RELEASE_IME are special values for hKL. */ -BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) +BOOL WINAPI ImmFreeLayout(HKL hKL) { WCHAR szKBD[KL_NAMELENGTH]; UINT iKL, cKLs; - HKL hOldKL, hNewKL, *pList; + HKL hOldKL, *pList; PIMEDPI pImeDpi; LANGID LangID; - TRACE("(0x%lX)\n", dwUnknown); + TRACE("(%p)\n", hKL); hOldKL = GetKeyboardLayout(0); - if (dwUnknown == 1) + if (hKL == HKL_SWITCH_TO_NON_IME) { if (!IS_IME_HKL(hOldKL)) return TRUE; @@ -158,7 +160,7 @@ BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) LoadKeyboardLayoutW(L"00000409", KLF_ACTIVATE | 0x200); } } - else if (dwUnknown == 2) + else if (hKL == HKL_RELEASE_IME) { RtlEnterCriticalSection(&gcsImeDpi); Retry: @@ -171,9 +173,8 @@ Retry: } else { - hNewKL = UlongToHandle(dwUnknown); - if (IS_IME_HKL(hNewKL) && hNewKL != hOldKL) - Imm32ReleaseIME(hNewKL); + if (IS_IME_HKL(hKL) && hKL != hOldKL) + Imm32ReleaseIME(hKL); } return TRUE; diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 03ba666c074..83c435a7a5e 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -38,7 +38,7 @@ @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) @ stdcall ImmEscapeA(long ptr long ptr) @ stdcall ImmEscapeW(long ptr long ptr) -@ stdcall ImmFreeLayout(long) +@ stdcall ImmFreeLayout(ptr) @ stdcall ImmGenerateMessage(ptr) @ stdcall ImmGetAppCompatFlags(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 184f6e13eac..eea17b6841c 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -24,6 +24,10 @@ extern "C" { #define IS_IME_KLID(dwKLID) ((((ULONG)(dwKLID)) & 0xF0000000) == IME_MASK) #define IS_SUBST_KLID(dwKLID) ((((ULONG)(dwKLID)) & 0xF0000000) == SUBST_MASK) +/* The special values for ImmFreeLayout hKL */ +#define HKL_SWITCH_TO_NON_IME ((HKL)UlongToHandle(1)) +#define HKL_RELEASE_IME ((HKL)UlongToHandle(2)) + typedef struct tagIMEINFOEX { HKL hkl; diff --git a/win32ss/user/user32/include/immtable.h b/win32ss/user/user32/include/immtable.h index ad178c8282d..8657d6c4706 100644 --- a/win32ss/user/user32/include/immtable.h +++ b/win32ss/user/user32/include/immtable.h @@ -30,7 +30,7 @@ DEFINE_IMM_ENTRY(/*PINPUTCONTEXT*/ LPVOID, ImmLockIMC, (HIMC hIMC), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmUnlockIMC, (HIMC hIMC), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmLoadIME, (HKL hKL), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetOpenStatus, (HIMC hIMC, BOOL bOpen), 0, NONVOID) -DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (DWORD dwFlags), 0, NONVOID) +DEFINE_IMM_ENTRY(BOOL, ImmFreeLayout, (HKL hKL), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmActivateLayout, (HKL hKL), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmGetCandidateWindow, (HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandForm), 0, NONVOID) DEFINE_IMM_ENTRY(BOOL, ImmSetCandidateWindow, (HIMC hIMC, LPCANDIDATEFORM lpCandForm), 0, NONVOID) diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 640902bbabf..89d473632ec 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -717,7 +717,7 @@ static LRESULT ImeWnd_OnImeSystem(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) break; case IMS_FREELAYOUT: - ret = IMM_FN(ImmFreeLayout)((DWORD)lParam); + ret = IMM_FN(ImmFreeLayout)((HKL)lParam); break; case 0x13:

1 0

[reactos] 01/01: [NOTEVIL] Addendum to last commit.
by Joachim Henze 29 Jul '24

29 Jul '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68a2322ad466763a5f1e9… commit 68a2322ad466763a5f1e9a9ed2e20fcd857b8cb3 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Jul 29 22:23:00 2024 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Jul 29 22:23:00 2024 +0200 [NOTEVIL] Addendum to last commit. It did compile with GCC8.4.0, but not with MSVC2019 --- modules/rosapps/applications/notevil/notevil.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rosapps/applications/notevil/notevil.rc b/modules/rosapps/applications/notevil/notevil.rc index bcb0a82abfc..cb36ff75b18 100644 --- a/modules/rosapps/applications/notevil/notevil.rc +++ b/modules/rosapps/applications/notevil/notevil.rc @@ -88,7 +88,7 @@ BEGIN 48, "Gunnar Andre' Dalsnes" 49, "Hans Kremer" 50, "Hartmut Birr" - 41, "Hermès Bélusca-Maïto" + 51, "Hermès Bélusca-Maïto" 52, "Hernan Ochoa" 53, "Hervé Poussineau" 54, "Iwan Fatahi"

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2024