Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [RTL] Update CountOfOwnedCriticalSections in the TEB

by Timo Kreuzer

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)

9 months, 3 weeks

[reactos] 02/02: [SHLWAPI][WINESYNC] Import PathRemoveBlanks wine fix + adaptation for ReactOS (#7636)

by Esme Povirk

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(); }

9 months, 3 weeks

[reactos] 01/02: [SHLWAPI][WINESYNC] Import PathUndecorate wine fix + adaptation for ReactOS (#7636)

by Jacek Caban

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(); }

9 months, 3 weeks

[reactos] 01/01: [BROWSEUI_APITEST] Don't hardcode C:\Windows (#7634)

by Katayama Hirofumi MZ

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 },

9 months, 3 weeks

[reactos] 01/01: [FREETYPE][NTGDI] Fix ftGdiGetTextMetricsW return for raster fonts (#7635)

by Katayama Hirofumi MZ

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 */ }

9 months, 3 weeks

[reactos] 01/01: [SHELL32][SHELL32_APITEST][SDK] Implement ShellExec_RunDLL (#7615)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dad3a0938afd502831a8e… commit dad3a0938afd502831a8e401aae2b6b5a7fc3c92 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jan 17 22:51:18 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jan 17 22:51:18 2025 +0900 [SHELL32][SHELL32_APITEST][SDK] Implement ShellExec_RunDLL (#7615) Implementing missing features... JIRA issue: CORE-19278 - Modify shell32.spec. - Move function definitions from stubs.cpp into shlexec.cpp. - Add prototypes to <undocshell.h>. --- dll/win32/shell32/shell32.spec | 2 +- dll/win32/shell32/shlexec.cpp | 85 ++++++++++++++++++++++ dll/win32/shell32/stubs.cpp | 30 -------- modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/ShellExec_RunDLL.cpp | 61 ++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 21 ++++++ 7 files changed, 171 insertions(+), 31 deletions(-) diff --git a/dll/win32/shell32/shell32.spec b/dll/win32/shell32/shell32.spec index 759f4676e94..9a4f8b07c43 100644 --- a/dll/win32/shell32/shell32.spec +++ b/dll/win32/shell32/shell32.spec @@ -354,7 +354,7 @@ 354 stdcall SheShortenPathW(wstr long) 355 stdcall ShellAboutA(long str str long) 356 stdcall ShellAboutW(long wstr wstr long) -357 stdcall ShellExec_RunDLL(ptr ptr wstr long) +357 stdcall ShellExec_RunDLL(ptr ptr str long) ShellExec_RunDLLA 358 stdcall ShellExec_RunDLLA(ptr ptr str long) 359 stdcall ShellExec_RunDLLW(ptr ptr wstr long) 360 stdcall ShellExecuteA(long str str str str long) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index f03db3de0e7..646a2a6c84c 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2986,3 +2986,88 @@ RealShellExecuteW( lphProcess, 0); } + +// The common helper of ShellExec_RunDLLA and ShellExec_RunDLLW +static VOID +ShellExec_RunDLL_Helper( + _In_opt_ HWND hwnd, + _In_opt_ HINSTANCE hInstance, + _In_ PCWSTR pszCmdLine, + _In_ INT nCmdShow) +{ + TRACE("(%p, %p, %s, 0x%X)\n", hwnd, hInstance, wine_dbgstr_w(pszCmdLine), nCmdShow); + + if (!pszCmdLine || !*pszCmdLine) + return; + + // '?' enables us to specify the additional mask value + ULONG fNewMask = SEE_MASK_NOASYNC; + if (*pszCmdLine == L'?') // 1st question + { + INT MaskValue; + if (StrToIntExW(pszCmdLine + 1, STIF_SUPPORT_HEX, &MaskValue)) + fNewMask |= MaskValue; + + PCWSTR pch2ndQuestion = StrChrW(pszCmdLine + 1, L'?'); // 2nd question + if (pch2ndQuestion) + pszCmdLine = pch2ndQuestion + 1; + } + + WCHAR szPath[2 * MAX_PATH]; + if (PathProcessCommandAW(pszCmdLine, szPath, _countof(szPath), L'C') == -1) + StrCpyNW(szPath, pszCmdLine, _countof(szPath)); + + // Split arguments from the path + LPWSTR Args = PathGetArgsW(szPath); + if (*Args) + *(Args - 1) = UNICODE_NULL; + + PathUnquoteSpacesW(szPath); + + // Execute + SHELLEXECUTEINFOW execInfo = { sizeof(execInfo) }; + execInfo.fMask = fNewMask; + execInfo.hwnd = hwnd; + execInfo.lpFile = szPath; + execInfo.lpParameters = Args; + execInfo.nShow = nCmdShow; + if (!ShellExecuteExW(&execInfo)) + { + DWORD dwError = GetLastError(); + if (SHELL_InRunDllProcess()) // Is it a RUNDLL process? + ExitProcess(dwError); // Terminate it now + } +} + +/************************************************************************* + * ShellExec_RunDLLA [SHELL32.358] + * + * @see https://www.hexacorn.com/blog/2024/11/30/1-little-known-secret-of-shellexec… + */ +EXTERN_C +VOID WINAPI +ShellExec_RunDLLA( + _In_opt_ HWND hwnd, + _In_opt_ HINSTANCE hInstance, + _In_ PCSTR pszCmdLine, + _In_ INT nCmdShow) +{ + CStringW strCmdLine = pszCmdLine; // Keep + ShellExec_RunDLL_Helper(hwnd, hInstance, strCmdLine, nCmdShow); +} + +/************************************************************************* + * ShellExec_RunDLLW [SHELL32.359] + * + * @see https://www.hexacorn.com/blog/2024/11/30/1-little-known-secret-of-shellexec… + */ +EXTERN_C +VOID WINAPI +ShellExec_RunDLLW( + _In_opt_ HWND hwnd, + _In_opt_ HINSTANCE hInstance, + _In_ PCWSTR pszCmdLine, + _In_ INT nCmdShow) +{ + ShellExec_RunDLL_Helper(hwnd, hInstance, pszCmdLine, nCmdShow); +} diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index d54e80c14af..5fec3d1e342 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -297,36 +297,6 @@ ShellHookProc(INT iCode, WPARAM wParam, LPARAM lParam) return 0; } -/* - * Unimplemented - */ -EXTERN_C VOID -WINAPI -ShellExec_RunDLL(HWND hwnd, HINSTANCE hInstance, LPWSTR pszCmdLine, int nCmdShow) -{ - FIXME("ShellExec_RunDLL() stub\n"); -} - -/* - * Unimplemented - */ -EXTERN_C VOID -WINAPI -ShellExec_RunDLLA(HWND hwnd, HINSTANCE hInstance, LPSTR pszCmdLine, int nCmdShow) -{ - FIXME("ShellExec_RunDLLA() stub\n"); -} - -/* - * Unimplemented - */ -EXTERN_C VOID -WINAPI -ShellExec_RunDLLW(HWND hwnd, HINSTANCE hInstance, LPWSTR pszCmdLine, int nCmdShow) -{ - FIXME("ShellExec_RunDLLW() stub\n"); -} - /* * Unimplemented */ diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 10ef4004e7c..39f1092027e 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -35,6 +35,7 @@ list(APPEND SOURCE SHRestricted.cpp SHShouldShowWizards.cpp She.cpp + ShellExec_RunDLL.cpp ShellExecCmdLine.cpp ShellExecuteEx.cpp ShellExecuteW.cpp diff --git a/modules/rostests/apitests/shell32/ShellExec_RunDLL.cpp b/modules/rostests/apitests/shell32/ShellExec_RunDLL.cpp new file mode 100644 index 00000000000..bea1d8b0682 --- /dev/null +++ b/modules/rostests/apitests/shell32/ShellExec_RunDLL.cpp @@ -0,0 +1,61 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for ShellExec_RunDLL + * COPYRIGHT: Copyright 2025 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "shelltest.h" +#include "closewnd.h" +#include <undocshell.h> + +static WINDOW_LIST s_List1, s_List2; + +static VOID TEST_ShellExec_RunDLL(VOID) +{ + ShellExec_RunDLL(NULL, NULL, "?0?notepad.exe", SW_SHOWNORMAL); +} + +static VOID TEST_ShellExec_RunDLLA(VOID) +{ + ShellExec_RunDLLA(NULL, NULL, "?0?notepad.exe", SW_SHOWNORMAL); +} + +static VOID TEST_ShellExec_RunDLLW(VOID) +{ + ShellExec_RunDLLW(NULL, NULL, L"?0?notepad.exe", SW_SHOWNORMAL); +} + +static VOID CleanupWindowList(VOID) +{ + GetWindowListForClose(&s_List2); + CloseNewWindows(&s_List1, &s_List2); + FreeWindowList(&s_List1); + FreeWindowList(&s_List2); +} + +START_TEST(ShellExec_RunDLL) +{ + HWND hwndNotepad; + + GetWindowList(&s_List1); + TEST_ShellExec_RunDLL(); + Sleep(1000); + hwndNotepad = FindWindowW(L"Notepad", NULL); + ok(hwndNotepad != NULL, "Notepad not found\n"); + CleanupWindowList(); + + GetWindowList(&s_List1); + TEST_ShellExec_RunDLLA(); + Sleep(1000); + hwndNotepad = FindWindowW(L"Notepad", NULL); + ok(hwndNotepad != NULL, "Notepad not found\n"); + CleanupWindowList(); + + GetWindowList(&s_List1); + TEST_ShellExec_RunDLLW(); + Sleep(1000); + hwndNotepad = FindWindowW(L"Notepad", NULL); + ok(hwndNotepad != NULL, "Notepad not found\n"); + CleanupWindowList(); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 0da5972b358..134f01a7838 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -35,6 +35,7 @@ extern void func_SHCreateDataObject(void); extern void func_SHCreateFileDataObject(void); extern void func_SHCreateFileExtractIconW(void); extern void func_She(void); +extern void func_ShellExec_RunDLL(void); extern void func_ShellExecCmdLine(void); extern void func_ShellExecuteEx(void); extern void func_ShellExecuteW(void); @@ -83,6 +84,7 @@ const struct test winetest_testlist[] = { "SHCreateFileDataObject", func_SHCreateFileDataObject }, { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, { "She", func_She }, + { "ShellExec_RunDLL", func_ShellExec_RunDLL }, { "ShellExecCmdLine", func_ShellExecCmdLine }, { "ShellExecuteEx", func_ShellExecuteEx }, { "ShellExecuteW", func_ShellExecuteW }, diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index 3e685e08046..beb840c89e2 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -712,6 +712,27 @@ RealShellExecuteExW( _Out_opt_ PHANDLE lphProcess, _In_ DWORD dwFlags); +VOID WINAPI +ShellExec_RunDLL( + _In_opt_ HWND hwnd, + _In_opt_ HINSTANCE hInstance, + _In_ PCSTR pszCmdLine, + _In_ INT nCmdShow); + +VOID WINAPI +ShellExec_RunDLLA( + _In_opt_ HWND hwnd, + _In_opt_ HINSTANCE hInstance, + _In_ PCSTR pszCmdLine, + _In_ INT nCmdShow); + +VOID WINAPI +ShellExec_RunDLLW( + _In_opt_ HWND hwnd, + _In_opt_ HINSTANCE hInstance, + _In_ PCWSTR pszCmdLine, + _In_ INT nCmdShow); + /* RegisterShellHook types */ #define RSH_DEREGISTER 0 #define RSH_REGISTER 1

9 months, 3 weeks

[reactos] 04/04: [WKSSVC] Stubplement support for level 1101 in NetrWkstaUserGetInfo

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a25e7ee9d71d41038f93c… commit a25e7ee9d71d41038f93c545394417f186820a1a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jan 15 08:44:10 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jan 17 12:54:29 2025 +0200 [WKSSVC] Stubplement support for level 1101 in NetrWkstaUserGetInfo Fixes crash in netapi32_winetest:wksta introduced in 45b008d --- base/services/wkssvc/rpcserver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index d50eced610b..c51d8fda49e 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -847,7 +847,19 @@ NetrWkstaUserGetInfo( break; case 1101: + pUserInfo = midl_user_allocate(sizeof(WKSTA_USER_INFO_1101)); + if (pUserInfo == NULL) + { + ERR("Failed to allocate WKSTA_USER_INFO_1101\n"); + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + ZeroMemory(pUserInfo, sizeof(WKSTA_USER_INFO_1101)); + /* FIXME: wkui1101_oth_domains */ + + *UserInfo = pUserInfo; break; default:

9 months, 3 weeks

[reactos] 03/04: [WKSSVC] Plug memory leaks in NetrWkstaUserGetInfo

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=132d571fe2c5b7487954e… commit 132d571fe2c5b7487954e1b4c06cd56819900704 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jan 15 08:41:26 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jan 17 12:54:29 2025 +0200 [WKSSVC] Plug memory leaks in NetrWkstaUserGetInfo --- base/services/wkssvc/rpcserver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index a8a5abc2312..d50eced610b 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -762,6 +762,7 @@ NetrWkstaUserGetInfo( if (pUserInfo->UserInfo0.wkui0_username == NULL) { ERR("\n"); + midl_user_free(pUserInfo); dwResult = ERROR_NOT_ENOUGH_MEMORY; break; } @@ -792,6 +793,7 @@ NetrWkstaUserGetInfo( if (pUserInfo->UserInfo1.wkui1_username == NULL) { ERR("\n"); + midl_user_free(pUserInfo); dwResult = ERROR_NOT_ENOUGH_MEMORY; break; } @@ -808,6 +810,8 @@ NetrWkstaUserGetInfo( if (pUserInfo->UserInfo1.wkui1_logon_domain == NULL) { ERR("\n"); + midl_user_free(pUserInfo->UserInfo1.wkui1_username); + midl_user_free(pUserInfo); dwResult = ERROR_NOT_ENOUGH_MEMORY; break; } @@ -826,6 +830,9 @@ NetrWkstaUserGetInfo( if (pUserInfo->UserInfo1.wkui1_logon_server == NULL) { ERR("\n"); + midl_user_free(pUserInfo->UserInfo1.wkui1_username); + midl_user_free(pUserInfo->UserInfo1.wkui1_logon_domain); + midl_user_free(pUserInfo); dwResult = ERROR_NOT_ENOUGH_MEMORY; break; }

9 months, 3 weeks

[reactos] 02/04: [WKSSVC] Fix returned error value in NetrWkstaUserGetInfo

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c1c4e5d945245c77994d… commit 1c1c4e5d945245c77994d6157cc1b3392c4fcf2a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jan 15 08:43:57 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jan 17 12:54:29 2025 +0200 [WKSSVC] Fix returned error value in NetrWkstaUserGetInfo --- base/services/wkssvc/rpcserver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index b74f3bc8fba..a8a5abc2312 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -845,6 +845,7 @@ NetrWkstaUserGetInfo( default: ERR("\n"); + dwResult = ERROR_INVALID_LEVEL; break; }

9 months, 3 weeks

[reactos] 01/04: [WKSSVC] Improve formatting

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e7f8711e9cb743b1d68b… commit 2e7f8711e9cb743b1d68bde1ea52946eab20a445 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Jan 15 08:40:27 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Jan 17 12:54:29 2025 +0200 [WKSSVC] Improve formatting --- base/services/wkssvc/rpcserver.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index b27e98f7973..b74f3bc8fba 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -757,7 +757,8 @@ NetrWkstaUserGetInfo( ZeroMemory(pUserInfo, sizeof(WKSTA_USER_INFO_0)); /* User Name */ - pUserInfo->UserInfo0.wkui0_username = midl_user_allocate(UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + pUserInfo->UserInfo0.wkui0_username = + midl_user_allocate(UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); if (pUserInfo->UserInfo0.wkui0_username == NULL) { ERR("\n"); @@ -765,8 +766,11 @@ NetrWkstaUserGetInfo( break; } - ZeroMemory(pUserInfo->UserInfo0.wkui0_username, UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); - CopyMemory(pUserInfo->UserInfo0.wkui0_username, UserInfoResponseBuffer->UserName.Buffer, UserInfoResponseBuffer->UserName.Length); + ZeroMemory(pUserInfo->UserInfo0.wkui0_username, + UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo0.wkui0_username, + UserInfoResponseBuffer->UserName.Buffer, + UserInfoResponseBuffer->UserName.Length); *UserInfo = pUserInfo; break; @@ -783,7 +787,8 @@ NetrWkstaUserGetInfo( ZeroMemory(pUserInfo, sizeof(WKSTA_USER_INFO_1)); /* User Name */ - pUserInfo->UserInfo1.wkui1_username = midl_user_allocate(UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + pUserInfo->UserInfo1.wkui1_username = + midl_user_allocate(UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); if (pUserInfo->UserInfo1.wkui1_username == NULL) { ERR("\n"); @@ -791,11 +796,15 @@ NetrWkstaUserGetInfo( break; } - ZeroMemory(pUserInfo->UserInfo1.wkui1_username, UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); - CopyMemory(pUserInfo->UserInfo1.wkui1_username, UserInfoResponseBuffer->UserName.Buffer, UserInfoResponseBuffer->UserName.Length); + ZeroMemory(pUserInfo->UserInfo1.wkui1_username, + UserInfoResponseBuffer->UserName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo1.wkui1_username, + UserInfoResponseBuffer->UserName.Buffer, + UserInfoResponseBuffer->UserName.Length); /* Logon Domain Name */ - pUserInfo->UserInfo1.wkui1_logon_domain = midl_user_allocate(UserInfoResponseBuffer->LogonDomainName.Length + sizeof(WCHAR)); + pUserInfo->UserInfo1.wkui1_logon_domain = + midl_user_allocate(UserInfoResponseBuffer->LogonDomainName.Length + sizeof(WCHAR)); if (pUserInfo->UserInfo1.wkui1_logon_domain == NULL) { ERR("\n"); @@ -803,13 +812,17 @@ NetrWkstaUserGetInfo( break; } - ZeroMemory(pUserInfo->UserInfo1.wkui1_logon_domain, UserInfoResponseBuffer->LogonDomainName.Length + sizeof(WCHAR)); - CopyMemory(pUserInfo->UserInfo1.wkui1_logon_domain, UserInfoResponseBuffer->LogonDomainName.Buffer, UserInfoResponseBuffer->LogonDomainName.Length); + ZeroMemory(pUserInfo->UserInfo1.wkui1_logon_domain, + UserInfoResponseBuffer->LogonDomainName.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo1.wkui1_logon_domain, + UserInfoResponseBuffer->LogonDomainName.Buffer, + UserInfoResponseBuffer->LogonDomainName.Length); /* FIXME: wkui1_oth_domains */ /* Logon Server */ - pUserInfo->UserInfo1.wkui1_logon_server = midl_user_allocate(UserInfoResponseBuffer->LogonServer.Length + sizeof(WCHAR)); + pUserInfo->UserInfo1.wkui1_logon_server = + midl_user_allocate(UserInfoResponseBuffer->LogonServer.Length + sizeof(WCHAR)); if (pUserInfo->UserInfo1.wkui1_logon_server == NULL) { ERR("\n"); @@ -817,8 +830,11 @@ NetrWkstaUserGetInfo( break; } - ZeroMemory(pUserInfo->UserInfo1.wkui1_logon_server, UserInfoResponseBuffer->LogonServer.Length + sizeof(WCHAR)); - CopyMemory(pUserInfo->UserInfo1.wkui1_logon_server, UserInfoResponseBuffer->LogonServer.Buffer, UserInfoResponseBuffer->LogonServer.Length); + ZeroMemory(pUserInfo->UserInfo1.wkui1_logon_server, + UserInfoResponseBuffer->LogonServer.Length + sizeof(WCHAR)); + CopyMemory(pUserInfo->UserInfo1.wkui1_logon_server, + UserInfoResponseBuffer->LogonServer.Buffer, + UserInfoResponseBuffer->LogonServer.Length); *UserInfo = pUserInfo; break;

9 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs