Ros-diffs January 2025

ros-diffs@reactos.org

23 participants
278 discussions

[reactos] 04/08: [IERNONCE] Check m_RegKey before deleting a value from it
by Timo Kreuzer 19 Jan '25

19 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40b45515a40bf29cf6ed1… commit 40b45515a40bf29cf6ed1a4ad1eaedf7ad3ae281 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Dec 3 12:40:01 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 19 09:02:58 2025 +0200 [IERNONCE] Check m_RegKey before deleting a value from it This fixes an assert, when _DEBUG is defined. --- dll/win32/iernonce/registry.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/win32/iernonce/registry.cpp b/dll/win32/iernonce/registry.cpp index a5c764b6c58..c497b3d18f5 100644 --- a/dll/win32/iernonce/registry.cpp +++ b/dll/win32/iernonce/registry.cpp @@ -311,8 +311,11 @@ BOOL RunOnceExInstance::Exec(_In_opt_ HWND hwnd) m_SectionList[i].CloseAndDelete(m_RegKey); } - m_RegKey.DeleteValue(L"Title"); - m_RegKey.DeleteValue(L"Flags"); + if (m_RegKey) + { + m_RegKey.DeleteValue(L"Title"); + m_RegKey.DeleteValue(L"Flags"); + } // Notify the dialog all sections are handled. if (hwnd)

1 0

[reactos] 03/08: [CRT] crtdbg.h: Add missing inttrin.h include for __debugbreak()
by Timo Kreuzer 19 Jan '25

19 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6a07059c120ae77f0562… commit a6a07059c120ae77f05620fd6546ade708dbb83e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Nov 4 13:43:26 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 19 09:02:58 2025 +0200 [CRT] crtdbg.h: Add missing inttrin.h include for __debugbreak() --- sdk/include/crt/crtdbg.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index 6b90bc018d5..284cb38114a 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -4,6 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ #include <corecrt.h> +#include <intrin.h> #ifndef _INC_CRTDBG #define _INC_CRTDBG

1 0

[reactos] 02/08: [CMAKE] Build host-tools as release by default
by Timo Kreuzer 19 Jan '25

19 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a63d7e89865ce5c4ef03… commit 8a63d7e89865ce5c4ef03a4dd133b22564382606 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Dec 1 14:29:04 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 19 09:02:58 2025 +0200 [CMAKE] Build host-tools as release by default This setting can be overwritten by defining the CMake variable HOST_BUILD_TYPE. The target build type is passed to the host build as TARGET_BUILD_TYPE CMake variable. This improves time to build cab+iso: MSVC x86: 37s -> 28s GCC x86: 32s -> 16s --- sdk/cmake/host-tools.cmake | 6 ++++++ sdk/tools/CMakeLists.txt | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/sdk/cmake/host-tools.cmake b/sdk/cmake/host-tools.cmake index b7932a82bb8..e2349b8841d 100644 --- a/sdk/cmake/host-tools.cmake +++ b/sdk/cmake/host-tools.cmake @@ -91,6 +91,10 @@ function(setup_host_tools) ) endif() + if(NOT DEFINED HOST_BUILD_TYPE) + set(HOST_BUILD_TYPE Release) + endif() + ExternalProject_Add(host-tools SOURCE_DIR ${REACTOS_SOURCE_DIR} PREFIX ${REACTOS_BINARY_DIR}/host-tools @@ -102,6 +106,8 @@ function(setup_host_tools) -DCMAKE_INSTALL_PREFIX=${REACTOS_BINARY_DIR}/host-tools -DTOOLS_FOLDER=${REACTOS_BINARY_DIR}/host-tools/bin -DTARGET_COMPILER_ID=${CMAKE_C_COMPILER_ID} + -DTARGET_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_BUILD_TYPE=${HOST_BUILD_TYPE} ${CMAKE_HOST_TOOLS_EXTRA_ARGS} BUILD_ALWAYS TRUE INSTALL_COMMAND ${CMAKE_COMMAND} -E true diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index f7f4fd2ccce..0ad7a992d4d 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -48,6 +48,10 @@ if ((ARCH STREQUAL "amd64") AND (TARGET_COMPILER_ID STREQUAL "GNU")) add_subdirectory(gcc_plugin_seh) endif() +if (TARGET_BUILD_TYPE) + # Silence warning about unused variable +endif() + if(NOT MSVC) add_host_tool(pefixup pefixup.c) if (ARCH STREQUAL "amd64" OR ARCH STREQUAL "arm64")

1 0

[reactos] 01/08: [CMAKE] Fix definition of NDEBUG on MSVC release builds
by Timo Kreuzer 19 Jan '25

19 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a15da2a8cad650c414d0… commit 7a15da2a8cad650c414d038eeaaea60f3004f5e2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 16 13:33:01 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jan 19 09:02:58 2025 +0200 [CMAKE] Fix definition of NDEBUG on MSVC release builds Prevents redefinition warnings. --- sdk/cmake/msvc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index eb4973914e0..16f3d3ea159 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -167,7 +167,7 @@ endif() if(NOT (_PREFAST_ OR _VS_ANALYZE_)) add_compile_options($<$<CONFIG:Debug>:/Zi>) endif() -add_compile_definitions($<$<CONFIG:Release>:NDEBUG>) +add_compile_definitions($<$<CONFIG:Release>:NDEBUG=>) # Hotpatchable images if(ARCH STREQUAL "i386")

1 0

[reactos] 01/01: [SHELL32] SHELL_FindExecutable: improve path handling code (#7633)
by Oleg Dubinskiy 18 Jan '25

18 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7d1aa3e92bf3ac643ba1… commit c7d1aa3e92bf3ac643ba138558fcc301b0e28aad Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sat Jan 18 21:51:58 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 18 21:51:58 2025 +0100 [SHELL32] SHELL_FindExecutable: improve path handling code (#7633) Follow-up of 42d5dfd3de5e65da6137413c98b5ab0cbc11325e. - Revert "shell32: Fix ShellExecute for non-filespec paths." https://gitlab.winehq.org/wine/wine/-/commit/0bad544aab9e2c9ee93bbabac0386e…. - Apply "shell32: Look for the file name without extension also for the path search case." https://gitlab.winehq.org/wine/wine/-/commit/38b6640be91047b2cae71c103afed8…. - Clear leading/trailing whitespaces (an improvement by Doug Lyons). - Update the comment for xlpFile buffer definition, to match the current code behaviour. This fixes some failures for the following tests: - shell32_apitest:ShellExecCmdLine: 12 failures less, - shell32_apitest:ShellExecuteEx: 5 failures less, - shell32_winetest:shlexec: crash fixed, now 13 failures as before, - wshom_winetest:wshom: crash fixed, now 2 failures less too (0 failures). I've also tested: the problem which was intended to be fixed by the guilty commit (CORE-19953) still remains fixed after this change. CORE-19964 --- dll/win32/shell32/shlexec.cpp | 66 +++++++++++++------------------------------ 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 646a2a6c84c..b6bb1f3b224 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -748,7 +748,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, WCHAR wBuffer[256]; /* Used to GetProfileString */ UINT retval = SE_ERR_NOASSOC; WCHAR *tok; /* token pointer */ - WCHAR xlpFile[MAX_PATH]; /* result of SearchPath */ + WCHAR xlpFile[MAX_PATH]; /* result of PathResolve */ DWORD attribs; /* file attributes */ WCHAR curdir[MAX_PATH]; const WCHAR *search_paths[3] = {0}; @@ -777,55 +777,29 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, } GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); - if (!PathIsFileSpecW(lpFile)) + if (lpPath && *lpPath) { - BOOL found = FALSE; - if (lpPath && *lpPath) - { - TRACE("lpPath %s\n", debugstr_w(lpPath)); - PathCombineW(xlpFile, lpPath, lpFile); - if (PathFileExistsDefExtW(xlpFile, WHICH_DEFAULT | WHICH_OPTIONAL) || PathFileExistsW(xlpFile)) - { - GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); - found = TRUE; - } - } - if (!found) - { - lstrcpyW(xlpFile, lpFile); - if (PathFileExistsDefExtW(xlpFile, WHICH_DEFAULT | WHICH_OPTIONAL) || PathFileExistsW(xlpFile)) - { - GetFullPathNameW(xlpFile, ARRAY_SIZE(xlpFile), xlpFile, NULL); - found = TRUE; - } - } - if (found) - { - lpFile = xlpFile; - lstrcpyW(lpResult, xlpFile); - } - else - xlpFile[0] = '\0'; + search_paths[0] = lpPath; + search_paths[1] = curdir; } else { - if (lpPath && *lpPath) - { - search_paths[0] = lpPath; - search_paths[1] = curdir; - } - else - search_paths[0] = curdir; - lstrcpyW(xlpFile, lpFile); - if (PathResolveW(xlpFile, search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) - { - TRACE("PathResolveW returned non-zero\n"); - lpFile = xlpFile; - lstrcpyW(lpResult, xlpFile); - /* The file was found in lpPath or one of the directories in the system-wide search path */ - } - else - xlpFile[0] = '\0'; + search_paths[0] = curdir; + } + + lstrcpyW(xlpFile, lpFile); + if (PathResolveW(xlpFile, search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS) || + PathFindOnPathW(xlpFile, search_paths)) + { + TRACE("PathResolveW returned non-zero\n"); + lpFile = xlpFile; + PathRemoveBlanksW(xlpFile); + lstrcpyW(lpResult, xlpFile); + /* The file was found in lpPath or one of the directories in the system-wide search path */ + } + else + { + xlpFile[0] = '\0'; } attribs = GetFileAttributesW(lpFile);

1 0

[reactos] 01/01: [RTL] Update CountOfOwnedCriticalSections in the TEB
by Timo Kreuzer 18 Jan '25

18 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe7a58d92eeb571dffec4… commit fe7a58d92eeb571dffec4ad93efec945b372869a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Dec 12 14:48:29 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jan 18 21:15:17 2025 +0200 [RTL] Update CountOfOwnedCriticalSections in the TEB Useful for debugging. Motivation: With SMP on x64 I found a number of instances where critical sections would be left abandoned, causing lockups. From what I can tell it was exceptions inside rpcrt4, which leave the process in a blocked state. Might or might not be related to x64 / SMP. For real value, you still need to put checks at certain places manually, but this is not super straight forward, because there can be false positives, e.g. when a process is terminated due to an exception, where the abandoned lock is acceptable, and we have this during testing. It's difficult to 100% distinguish this from silent and very bad lock leaks. Problematic code: __try { SomeFunction(); // throws an exception with a CS held, e.g. heap code } __except(1) { DPRINT1("Oops. let's just pretend it's all ok!\n"); } --- sdk/lib/rtl/critical.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index c70ff191bbc..4678230e57b 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -521,6 +521,7 @@ RtlEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) */ CriticalSection->OwningThread = Thread; CriticalSection->RecursionCount = 1; + NtCurrentTeb()->CountOfOwnedCriticalSections++; return STATUS_SUCCESS; } @@ -800,6 +801,7 @@ RtlLeaveCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) * See comment above. */ CriticalSection->OwningThread = 0; + NtCurrentTeb()->CountOfOwnedCriticalSections--; /* Was someone wanting us? This needs to be done atomically. */ if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) @@ -837,8 +839,9 @@ RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { /* It's ours */ - CriticalSection->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; + CriticalSection->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; CriticalSection->RecursionCount = 1; + NtCurrentTeb()->CountOfOwnedCriticalSections++; return TRUE; } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread)

1 0

[reactos] 02/02: [SHLWAPI][WINESYNC] Import PathRemoveBlanks wine fix + adaptation for ReactOS (#7636)
by Esme Povirk 18 Jan '25

18 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=848ad61bba06668e0c58c… commit 848ad61bba06668e0c58cfa76ab5b63eea76a87d Author: Esme Povirk <esme(a)codeweavers.com> AuthorDate: Sat Apr 24 14:12:59 2021 -0500 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 18 16:39:37 2025 +0100 [SHLWAPI][WINESYNC] Import PathRemoveBlanks wine fix + adaptation for ReactOS (#7636) kernelbase: Always remove trailing spaces in PathRemoveBlanks. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 404cd8a92bd99332a7ef8ec96edbf5aeea8cab76 by Esme Povirk <esme(a)codeweavers.com> Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- dll/win32/shlwapi/path.c | 58 +++++++++++++++++-------------- modules/rostests/winetests/shlwapi/path.c | 45 ++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index 09acc200e12..e2f05cff78a 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -891,25 +891,28 @@ LPWSTR WINAPI PathRemoveBackslashW( LPWSTR lpszPath ) * RETURNS * Nothing. */ -VOID WINAPI PathRemoveBlanksA(LPSTR lpszPath) +void WINAPI PathRemoveBlanksA(LPSTR pszPath) { - TRACE("(%s)\n", debugstr_a(lpszPath)); + LPSTR start, first; - if(lpszPath && *lpszPath) - { - LPSTR start = lpszPath; + TRACE("(%s)\n", debugstr_a(pszPath)); - while (*lpszPath == ' ') - lpszPath = CharNextA(lpszPath); + if (!pszPath || !*pszPath) + return; + + start = first = pszPath; - while(*lpszPath) - *start++ = *lpszPath++; + while (*pszPath == ' ') + pszPath = CharNextA(pszPath); + + while (*pszPath) + *start++ = *pszPath++; + + if (start != first) + while (start[-1] == ' ') + start--; - if (start != lpszPath) - while (start[-1] == ' ') - start--; *start = '\0'; - } } /************************************************************************* @@ -917,25 +920,28 @@ VOID WINAPI PathRemoveBlanksA(LPSTR lpszPath) * * See PathRemoveBlanksA. */ -VOID WINAPI PathRemoveBlanksW(LPWSTR lpszPath) +void WINAPI PathRemoveBlanksW(LPWSTR pszPath) { - TRACE("(%s)\n", debugstr_w(lpszPath)); + LPWSTR start, first; - if(lpszPath && *lpszPath) - { - LPWSTR start = lpszPath; + TRACE("(%s)\n", debugstr_w(pszPath)); - while (*lpszPath == ' ') - lpszPath++; + if (!pszPath || !*pszPath) + return; + + start = first = pszPath; - while(*lpszPath) - *start++ = *lpszPath++; + while (*pszPath == ' ') + pszPath++; + + while (*pszPath) + *start++ = *pszPath++; + + if (start != first) + while (start[-1] == ' ') + start--; - if (start != lpszPath) - while (start[-1] == ' ') - start--; *start = '\0'; - } } /************************************************************************* diff --git a/modules/rostests/winetests/shlwapi/path.c b/modules/rostests/winetests/shlwapi/path.c index c5142b992aa..e9f08a902b0 100644 --- a/modules/rostests/winetests/shlwapi/path.c +++ b/modules/rostests/winetests/shlwapi/path.c @@ -1712,6 +1712,50 @@ static void test_PathUndecorate(void) PathUndecorateW(NULL); } +static void test_PathRemoveBlanks(void) +{ + struct remove_blanks_test { + const char* input; + const char* expected; + }; + struct remove_blanks_test tests[] = { + {"", ""}, + {" ", ""}, + {"test", "test"}, + {" test", "test"}, + {" test", "test"}, + {"test ", "test"}, + {"test ", "test"}, + {" test ", "test"}, + {" test ", "test"}}; + char pathA[MAX_PATH]; + WCHAR pathW[MAX_PATH]; + int i, ret; + const UINT CP_ASCII = 20127; + + PathRemoveBlanksW(NULL); + PathRemoveBlanksA(NULL); + + for (i=0; i < ARRAY_SIZE(tests); i++) + { + strcpy(pathA, tests[i].input); + PathRemoveBlanksA(pathA); + ok(strcmp(pathA, tests[i].expected) == 0, "input string '%s', expected '%s', got '%s'\n", + tests[i].input, tests[i].expected, pathA); + + ret = MultiByteToWideChar(CP_ASCII, MB_ERR_INVALID_CHARS, tests[i].input, -1, pathW, MAX_PATH); + ok(ret != 0, "MultiByteToWideChar failed for '%s'\n", tests[i].input); + + PathRemoveBlanksW(pathW); + + ret = WideCharToMultiByte(CP_ASCII, 0, pathW, -1, pathA, MAX_PATH, NULL, NULL); + ok(ret != 0, "WideCharToMultiByte failed for %s from test string '%s'\n", wine_dbgstr_w(pathW), tests[i].input); + + ok(strcmp(pathA, tests[i].expected) == 0, "input string '%s', expected '%s', got '%s'\n", + tests[i].input, tests[i].expected, pathA); + } +} + START_TEST(path) { HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -1759,4 +1803,5 @@ START_TEST(path) test_PathIsRelativeW(); test_PathStripPathA(); test_PathUndecorate(); + test_PathRemoveBlanks(); }

1 0

[reactos] 01/02: [SHLWAPI][WINESYNC] Import PathUndecorate wine fix + adaptation for ReactOS (#7636)
by Jacek Caban 18 Jan '25

18 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f189d8c45461cdfe03801… commit f189d8c45461cdfe03801fdbb8647c3efe1ff3c3 Author: Jacek Caban <jacek(a)codeweavers.com> AuthorDate: Tue Nov 12 21:48:23 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 18 16:39:36 2025 +0100 [SHLWAPI][WINESYNC] Import PathUndecorate wine fix + adaptation for ReactOS (#7636) shlwapi: Fix PathUndecorate[AW] implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f3c1d663a4a4a99b5c07000cb0ad9cc55d1e1c88 by Jacek Caban <jacek(a)codeweavers.com> Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- dll/win32/shlwapi/path.c | 76 ++++++++++++------------------- modules/rostests/winetests/shlwapi/path.c | 41 +++++++++++++++++ 2 files changed, 71 insertions(+), 46 deletions(-) diff --git a/dll/win32/shlwapi/path.c b/dll/win32/shlwapi/path.c index c26263152df..09acc200e12 100644 --- a/dll/win32/shlwapi/path.c +++ b/dll/win32/shlwapi/path.c @@ -4061,31 +4061,23 @@ LPCWSTR WINAPI PathFindSuffixArrayW(LPCWSTR lpszSuffix, LPCWSTR *lppszArray, int * NOTES * A decorations form is "path[n].ext" where "n" is an optional decimal number. */ -VOID WINAPI PathUndecorateA(LPSTR lpszPath) +void WINAPI PathUndecorateA(LPSTR pszPath) { - TRACE("(%s)\n",debugstr_a(lpszPath)); + char *ext, *skip; - if (lpszPath) - { - LPSTR lpszExt = PathFindExtensionA(lpszPath); - if (lpszExt > lpszPath && lpszExt[-1] == ']') - { - LPSTR lpszSkip = lpszExt - 2; - if (*lpszSkip == '[') - lpszSkip++; /* [] (no number) */ - else - while (lpszSkip > lpszPath && isdigit(lpszSkip[-1])) - lpszSkip--; - if (lpszSkip > lpszPath && lpszSkip[-1] == '[' && lpszSkip[-2] != '\\') - { - /* remove the [n] */ - lpszSkip--; - while (*lpszExt) - *lpszSkip++ = *lpszExt++; - *lpszSkip = '\0'; - } - } - } + TRACE("(%s)\n", debugstr_a(pszPath)); + + if (!pszPath) return; + + ext = PathFindExtensionA(pszPath); + if (ext == pszPath || ext[-1] != ']') return; + + skip = ext - 2; + while (skip > pszPath && '0' <= *skip && *skip <= '9') + skip--; + + if (skip > pszPath && *skip == '[' && skip[-1] != '\\') + memmove(skip, ext, strlen(ext) + 1); } /************************************************************************* @@ -4093,31 +4085,23 @@ VOID WINAPI PathUndecorateA(LPSTR lpszPath) * * See PathUndecorateA. */ -VOID WINAPI PathUndecorateW(LPWSTR lpszPath) +void WINAPI PathUndecorateW(LPWSTR pszPath) { - TRACE("(%s)\n",debugstr_w(lpszPath)); + WCHAR *ext, *skip; - if (lpszPath) - { - LPWSTR lpszExt = PathFindExtensionW(lpszPath); - if (lpszExt > lpszPath && lpszExt[-1] == ']') - { - LPWSTR lpszSkip = lpszExt - 2; - if (*lpszSkip == '[') - lpszSkip++; /* [] (no number) */ - else - while (lpszSkip > lpszPath && isdigitW(lpszSkip[-1])) - lpszSkip--; - if (lpszSkip > lpszPath && lpszSkip[-1] == '[' && lpszSkip[-2] != '\\') - { - /* remove the [n] */ - lpszSkip--; - while (*lpszExt) - *lpszSkip++ = *lpszExt++; - *lpszSkip = '\0'; - } - } - } + TRACE("(%s)\n", debugstr_w(pszPath)); + + if (!pszPath) return; + + ext = PathFindExtensionW(pszPath); + if (ext == pszPath || ext[-1] != ']') return; + + skip = ext - 2; + while (skip > pszPath && '0' <= *skip && *skip <= '9') + skip--; + + if (skip > pszPath && *skip == '[' && skip[-1] != '\\') + memmove(skip, ext, (wcslen(ext) + 1) * sizeof(WCHAR)); } /************************************************************************* diff --git a/modules/rostests/winetests/shlwapi/path.c b/modules/rostests/winetests/shlwapi/path.c index 4a6fbd91f6d..c5142b992aa 100644 --- a/modules/rostests/winetests/shlwapi/path.c +++ b/modules/rostests/winetests/shlwapi/path.c @@ -1672,6 +1672,46 @@ static void test_PathStripPathA(void) PathStripPathA((char*)const_path); } +static void test_PathUndecorate(void) +{ + static const struct { + const WCHAR *path; + const WCHAR *expect; + } tests[] = { + { L"c:\\test\\a[123]", L"c:\\test\\a" }, + { L"c:\\test\\a[123].txt", L"c:\\test\\a.txt" }, + { L"c:\\test\\a.txt[123]", L"c:\\test\\a.txt[123]" }, + { L"c:\\test\\a[123a].txt", L"c:\\test\\a[123a].txt" }, + { L"c:\\test\\a[a123].txt", L"c:\\test\\a[a123].txt" }, + { L"c:\\test\\a[12\x0660].txt", L"c:\\test\\a[12\x0660].txt" }, + { L"c:\\test\\a[12]file", L"c:\\test\\a[12]file" }, + { L"c:\\test[123]\\a", L"c:\\test[123]\\a" }, + { L"c:\\test\\[123]", L"c:\\test\\[123]" }, + { L"a[123]", L"a" }, + { L"a[]", L"a" }, + { L"[123]", L"[123]" } + }; + char bufa[MAX_PATH], expect[MAX_PATH]; + WCHAR buf[MAX_PATH]; + unsigned i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + wcscpy(buf, tests[i].path); + PathUndecorateW(buf); + ok(!wcscmp(buf, tests[i].expect), "PathUndecorateW returned %s, expected %s\n", + wine_dbgstr_w(buf), wine_dbgstr_w(tests[i].expect)); + + WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, tests[i].path, -1, bufa, ARRAY_SIZE(bufa), "?", NULL); + WideCharToMultiByte(CP_ACP, WC_NO_BEST_FIT_CHARS, tests[i].expect, -1, expect, ARRAY_SIZE(expect), "?", NULL); + PathUndecorateA(bufa); + ok(!strcmp(bufa, expect), "PathUndecorateA returned %s, expected %s\n", bufa, expect); + } + + PathUndecorateA(NULL); + PathUndecorateW(NULL); +} + START_TEST(path) { HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -1718,4 +1758,5 @@ START_TEST(path) test_PathIsRelativeA(); test_PathIsRelativeW(); test_PathStripPathA(); + test_PathUndecorate(); }

1 0

[reactos] 01/01: [BROWSEUI_APITEST] Don't hardcode C:\Windows (#7634)
by Katayama Hirofumi MZ 18 Jan '25

18 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d1c0efb1fbb75ca946fb… commit 9d1c0efb1fbb75ca946fbec580f1e9599f25fc9d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 18 22:58:05 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 18 22:58:05 2025 +0900 [BROWSEUI_APITEST] Don't hardcode C:\Windows (#7634) Avoid hardcoding and fix tests. JIRA issue: CORE-13235 - Remove hardcoded "C:\\Windows\\system32", using GetSystemDirectoryW call in SHExplorerParseCmdLine testcase. --- .../apitests/browseui/SHExplorerParseCmdLine.c | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c index 652c481fbca..85671932743 100644 --- a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c +++ b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c @@ -260,8 +260,28 @@ _Out_opt_ PUINT PWriteEnd) } } +static WCHAR s_szSystem32[MAX_PATH]; +static WCHAR s_szDriveCSelectSystem32[MAX_PATH]; +static WCHAR s_szSlashSelectSystem32[MAX_PATH]; +static WCHAR s_szEqualSlashSelectSystem32[MAX_PATH]; + START_TEST(SHExplorerParseCmdLine) { + // "C:\\Windows\\system32" + GetSystemDirectoryW(s_szSystem32, _countof(s_szSystem32)); + + // "c:\\=/select=c:\\windows\\system32" + StringCchCopyW(s_szDriveCSelectSystem32, _countof(s_szDriveCSelectSystem32), L"c:\\=/select="); + StringCchCatW(s_szDriveCSelectSystem32, _countof(s_szDriveCSelectSystem32), s_szSystem32); + + // "/select=c:\\windows\\system32" + StringCchCopyW(s_szSlashSelectSystem32, _countof(s_szSlashSelectSystem32), L"/select="); + StringCchCatW(s_szSlashSelectSystem32, _countof(s_szSlashSelectSystem32), s_szSystem32); + + // "=/select=c:\\windows\\system32" + StringCchCopyW(s_szEqualSlashSelectSystem32, _countof(s_szEqualSlashSelectSystem32), L"=/select="); + StringCchCatW(s_szEqualSlashSelectSystem32, _countof(s_szEqualSlashSelectSystem32), s_szSystem32); + static struct { INT TestLine; @@ -390,9 +410,9 @@ START_TEST(SHExplorerParseCmdLine) { __LINE__, L"/select=c:\\Program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\Program Files" }, { __LINE__, L"=,/select,c:\\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\" }, { __LINE__, L"/select,c:\\,=", TRUE, CSIDL_DRIVES, 0x00000240 }, - { __LINE__, L"c:\\=/select=c:\\windows\\system32", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\WINDOWS\\system32" }, - { __LINE__, L"/select=c:\\windows\\system32", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\\WINDOWS\\system32" }, - { __LINE__, L"=/select=c:\\windows\\system32", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\\WINDOWS\\system32" }, + { __LINE__, s_szDriveCSelectSystem32, TRUE, PIDL_IS_PATH, 0x00000240, NULL, s_szSystem32 }, + { __LINE__, s_szSlashSelectSystem32, TRUE, PIDL_IS_PATH, 0x00000200, NULL, s_szSystem32 }, + { __LINE__, s_szEqualSlashSelectSystem32, TRUE, PIDL_IS_PATH, 0x00000240, NULL, s_szSystem32 }, { __LINE__, L"/e,=", TRUE, CSIDL_DRIVES, 0x00000208 }, { __LINE__, L"/e=", TRUE, CSIDL_DRIVES, 0x00000200 }, { __LINE__, L"/e=\"", TRUE, CSIDL_DRIVES, 0x00000200 },

1 0

[reactos] 01/01: [FREETYPE][NTGDI] Fix ftGdiGetTextMetricsW return for raster fonts (#7635)
by Katayama Hirofumi MZ 18 Jan '25

18 Jan '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82b7d4f3da9db3786cf84… commit 82b7d4f3da9db3786cf84820fea4d2768a433e37 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 18 22:33:00 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 18 22:33:00 2025 +0900 [FREETYPE][NTGDI] Fix ftGdiGetTextMetricsW return for raster fonts (#7635) Try to get ready to support raster fonts. JIRA issue: CORE-17327 - Fix the return value of ftGdiGetTextMetricsW function for raster fonts. --- win32ss/gdi/ntgdi/freetype.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 8deb9e6820b..86e3c7a4106 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3164,7 +3164,7 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, Otm->otmSize = Cache->OutlineRequiredSize; - FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &WinFNT : 0); + FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, (Error ? NULL : &WinFNT)); if (!pOS2) goto skip_os2; @@ -5318,25 +5318,26 @@ ftGdiGetTextMetricsW( Status = STATUS_SUCCESS; IntLockFreeType(); + + Error = FT_Get_WinFNT_Header(Face, &Win); pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2); - if (NULL == pOS2) + pHori = FT_Get_Sfnt_Table(Face, ft_sfnt_hhea); + + if (!pOS2 && Error) { DPRINT1("Can't find OS/2 table - not TT font?\n"); Status = STATUS_INTERNAL_ERROR; } - pHori = FT_Get_Sfnt_Table(Face, ft_sfnt_hhea); - if (NULL == pHori) + if (!pHori && Error) { DPRINT1("Can't find HHEA table - not TT font?\n"); Status = STATUS_INTERNAL_ERROR; } - Error = FT_Get_WinFNT_Header(Face, &Win); - - if (NT_SUCCESS(Status) || !Error) + if (NT_SUCCESS(Status)) { - FillTM(&ptmwi->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0); + FillTM(&ptmwi->TextMetric, FontGDI, pOS2, pHori, (Error ? NULL : &Win)); /* FIXME: Fill Diff member */ }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
28
Older →

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 January 2025