September 2023 - Wine-commits

Paul Gofman : kernelbase: Support masks suggesting no extension in FindNextFile().
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 9ff0569667e2eaa84ddbb99303231ecd1d6e0d99 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ff0569667e2eaa84ddbb99303231e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 30 21:07:19 2023 -0600 kernelbase: Support masks suggesting no extension in FindNextFile(). --- dlls/kernel32/tests/file.c | 12 ++++++------ dlls/kernelbase/file.c | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index af2347504e0..65164d7f2a4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2974,21 +2974,21 @@ static void test_FindFirstFile_wildcards(void) {0, ".*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, {0, "*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {0, ".*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, - {1, "*.", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "*.", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {0, "*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {1, "*..*", ", '.', '..', '..a', '..a.a', '.a..a', 'a..a'"}, - {1, "*..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "*..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, ".*.", ", '.', '..', '.a', '.aaa'"}, {0, "..*", ", '.', '..', '..a', '..a.a'"}, {0, "**", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {0, "**.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {0, "*. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, - {1, "* .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "* .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {0, "* . ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, - {1, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {1, " *..", ""}, + {0, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, " *..", ""}, {0, "..* ", ", '.', '..', '..a', '..a.a'"}, {1, "a*.", ", '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, {0, "*a ", ", '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index f6d5087aa2b..aaa549bfd85 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1347,6 +1347,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *da } +/*********************************************************************** + * name_has_ext + * + * Check if the file name has extension (skipping leading dots). + */ +static BOOL name_has_ext( const WCHAR *name, const WCHAR *name_end ) +{ + while (name != name_end && *name == '.') ++name; + while (name != name_end && *name != '.') ++name; + return name != name_end; +} + + /*********************************************************************** * match_filename * @@ -1359,6 +1372,14 @@ static BOOL match_filename( const WCHAR *name, int length, const WCHAR *mask ) const WCHAR *mask_end = mask + lstrlenW( mask ); const WCHAR *lastjoker = NULL; const WCHAR *next_to_retry = NULL; + const WCHAR *asterisk; + + if (mask != mask_end && mask_end[-1] == '.' && (asterisk = wcschr( mask, '*' )) && asterisk == wcsrchr( mask, '*' ) + && name_has_ext( name, name_end )) + { + /* Single '*' mask ending with '.' only matches files without extension. */ + return FALSE; + } while (name < name_end && mask < mask_end) {

1 0

Rémi Bernon : dmsynth/tests: Avoid dynamic format string.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 40dcb5954bf9ff6161222ce703c6fc60a22c6b53 URL: https://gitlab.winehq.org/wine/wine/-/commit/40dcb5954bf9ff6161222ce703c6fc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 24 15:59:50 2023 +0200 dmsynth/tests: Avoid dynamic format string. --- dlls/dmsynth/tests/dmsynth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index f21e543705a..a948cf08b53 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -57,7 +57,7 @@ static void test_synth_getformat(IDirectMusicSynth *synth, DMUS_PORTPARAMS *para DWORD size; HRESULT hr; - winetest_push_context(context); + winetest_push_context("%s", context); size = sizeof(format); hr = IDirectMusicSynth_GetFormat(synth, &format, &size);

1 0

Rémi Bernon : dmsynth/tests: Import and use a check_interface helper.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: e477e3e30daf1c78c28c39b1c7948e12f84fce7d URL: https://gitlab.winehq.org/wine/wine/-/commit/e477e3e30daf1c78c28c39b1c7948e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 10 16:00:22 2023 +0200 dmsynth/tests: Import and use a check_interface helper. --- dlls/dmsynth/tests/dmsynth.c | 72 +++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 41 deletions(-) diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index a948cf08b53..09279f5dd8d 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -51,6 +51,27 @@ static ULONG get_refcount(void *iface) return IUnknown_Release(unknown); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + ULONG expect_ref = get_refcount(iface_ptr); + IUnknown *iface = iface_ptr; + HRESULT hr, expected; + IUnknown *unk; + + expected = supported ? S_OK : E_NOINTERFACE; + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected, "got hr %#lx, expected %#lx.\n", hr, expected); + if (SUCCEEDED(hr)) + { + LONG ref = get_refcount(unk); + ok_(__FILE__, line)(ref == expect_ref + 1, "got %ld\n", ref); + IUnknown_Release(unk); + ref = get_refcount(iface_ptr); + ok_(__FILE__, line)(ref == expect_ref, "got %ld\n", ref); + } +} + static void test_synth_getformat(IDirectMusicSynth *synth, DMUS_PORTPARAMS *params, const char *context) { WAVEFORMATEX format; @@ -317,9 +338,6 @@ static void test_dmsynth(void) static void test_COM(void) { IDirectMusicSynth8 *dms8 = (IDirectMusicSynth8*)0xdeadbeef; - IKsControl *iksc; - IUnknown *unk; - ULONG refcount; HRESULT hr; /* COM aggregation */ @@ -334,40 +352,23 @@ static void test_COM(void) &IID_IDirectMusicObject, (void**)&dms8); ok(hr == E_NOINTERFACE, "DirectMusicSynth create failed: %#lx, expected E_NOINTERFACE\n", hr); - /* Same refcount for all DirectMusicSynth interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&dms8); ok(hr == S_OK, "DirectMusicSynth create failed: %#lx, expected S_OK\n", hr); - refcount = IDirectMusicSynth8_AddRef(dms8); - ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); - - hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IKsControl, (void**)&iksc); - ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %#lx\n", hr); - refcount = IKsControl_AddRef(iksc); - ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); - IKsControl_Release(iksc); - hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); - refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); - IUnknown_Release(unk); + check_interface(dms8, &IID_IUnknown, TRUE); + check_interface(dms8, &IID_IKsControl, TRUE); /* Unsupported interfaces */ - hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IDirectMusicSynthSink, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicSynthSink failed: %#lx\n", hr); - hr = IDirectMusicSynth8_QueryInterface(dms8, &IID_IReferenceClock, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %#lx\n", hr); + check_interface(dms8, &IID_IDirectMusicSynthSink, FALSE); + check_interface(dms8, &IID_IReferenceClock, FALSE); - while (IDirectMusicSynth8_Release(dms8)); + IDirectMusicSynth8_Release(dms8); } static void test_COM_synthsink(void) { IDirectMusicSynthSink *dmss = (IDirectMusicSynthSink*)0xdeadbeef; - IKsControl *iksc; - IUnknown *unk; - ULONG refcount; HRESULT hr; /* COM aggregation */ @@ -386,27 +387,16 @@ static void test_COM_synthsink(void) hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (void**)&dmss); ok(hr == S_OK, "DirectMusicSynthSink create failed: %#lx, expected S_OK\n", hr); - refcount = IDirectMusicSynthSink_AddRef(dmss); - ok(refcount == 2, "refcount == %lu, expected 2\n", refcount); - - hr = IDirectMusicSynthSink_QueryInterface(dmss, &IID_IKsControl, (void**)&iksc); - ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %#lx\n", hr); - refcount = IKsControl_AddRef(iksc); - ok(refcount == 4, "refcount == %lu, expected 4\n", refcount); - IKsControl_Release(iksc); - hr = IDirectMusicSynthSink_QueryInterface(dmss, &IID_IUnknown, (void**)&unk); - ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %#lx\n", hr); - refcount = IUnknown_AddRef(unk); - ok(refcount == 5, "refcount == %lu, expected 5\n", refcount); - IUnknown_Release(unk); + check_interface(dmss, &IID_IUnknown, TRUE); + check_interface(dmss, &IID_IKsControl, TRUE); /* Unsupported interfaces */ - hr = IDirectMusicSynthSink_QueryInterface(dmss, &IID_IReferenceClock, (void**)&unk); - ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %#lx\n", hr); + check_interface(dmss, &IID_IReferenceClock, FALSE); - while (IDirectMusicSynthSink_Release(dmss)); + IDirectMusicSynthSink_Release(dmss); } + START_TEST(dmsynth) { CoInitializeEx(NULL, COINIT_MULTITHREADED);

1 0

Rémi Bernon : dmsynth/tests: Test DirectMusicSynthSink class in isolation.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: a2dac48f6c6f75da2f0bb3d7a374b58f2ef9fb45 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2dac48f6c6f75da2f0bb3d7a374b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Aug 27 13:54:19 2023 +0200 dmsynth/tests: Test DirectMusicSynthSink class in isolation. --- dlls/dmsynth/tests/Makefile.in | 2 +- dlls/dmsynth/tests/dmsynth.c | 387 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 388 insertions(+), 1 deletion(-)

1 0

Rémi Bernon : dmsynth/tests: Test DirectMusicSynth class in isolation.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: ce40b4d8fcb08d54df7ada430bc8dfe53392bd23 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce40b4d8fcb08d54df7ada430bc8df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Aug 27 16:17:15 2023 +0200 dmsynth/tests: Test DirectMusicSynth class in isolation. And more specifically how generating samples with Render works. --- dlls/dmsynth/tests/dmsynth.c | 543 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 543 insertions(+)

1 0

Alex Henrie : cmd: Handle `if exist` with an empty string argument.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 859d5e68ddec5156f49efb3c1126db02691416af URL: https://gitlab.winehq.org/wine/wine/-/commit/859d5e68ddec5156f49efb3c1126db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Sep 2 18:45:30 2023 -0600 cmd: Handle `if exist` with an empty string argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55505 --- programs/cmd/builtins.c | 15 +++++++++------ programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 419e812103a..ca703af52ec 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2841,13 +2841,16 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); int len = lstrlenW(param); - if (!len) goto syntax_err; - /* FindFirstFile does not like a directory path ending in '\' or '/', append a '.' */ - if (param[len-1] == '\\' || param[len-1] == '/') lstrcatW(param, L"."); + if (!len) { + *test = FALSE; + } else { + /* FindFirstFile does not like a directory path ending in '\' or '/', so append a '.' */ + if (param[len-1] == '\\' || param[len-1] == '/') wcscat(param, L"."); - hff = FindFirstFileW(param, &fd); - *test = (hff != INVALID_HANDLE_VALUE ); - if (*test) FindClose(hff); + hff = FindFirstFileW(param, &fd); + *test = (hff != INVALID_HANDLE_VALUE); + if (*test) FindClose(hff); + } WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 28b935ad521..08595933622 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1176,6 +1176,11 @@ if exist "subdir/" ( ) else ( echo ERROR exist subdir with / and quotes not working ) +if not exist "" ( + echo exist empty string works +) else ( + echo exist empty string broken +) del foo subdir\bar rd subdir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 57e72a77387..85e734b048a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -833,6 +833,7 @@ exist subdir with \ and quotes ok exist subdir with /. ok exist subdir with / ok exist subdir with / and quotes ok +exist empty string works ------ for numbers negative numbers handled negative numbers handled

1 0

Billy Laws : include: Add CHPEV2 CPU area definitions.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 23736e69ce7b70af74c441a23530483ff7fa1d0a URL: https://gitlab.winehq.org/wine/wine/-/commit/23736e69ce7b70af74c441a2353048… Author: Billy Laws <blaws05(a)gmail.com> Date: Sun Sep 3 15:44:17 2023 +0100 include: Add CHPEV2 CPU area definitions. --- include/winternl.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index bb0eee70ef3..d3537cc774d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -296,6 +296,19 @@ typedef struct _TEB_FLS_DATA void **fls_data_chunks[8]; } TEB_FLS_DATA, *PTEB_FLS_DATA; +typedef struct _CHPE_V2_CPU_AREA_INFO +{ + BOOLEAN InSimulation; /* 000 */ + BOOLEAN InSyscallCallback; /* 001 */ + ULONG64 EmulatorStackBase; /* 008 */ + ULONG64 EmulatorStackLimit; /* 010 */ + ARM64EC_NT_CONTEXT *ContextAmd64; /* 018 */ + ULONG *SuspendDoorbell; /* 020 */ + ULONG64 LoadingModuleModflag; /* 028 */ + void *EmulatorData[4]; /* 030 */ + ULONG64 EmulatorDataInline; /* 050 */ +} CHPE_V2_CPU_AREA_INFO, *PCHPE_V2_CPU_AREA_INFO; + #define TEB_ACTIVE_FRAME_CONTEXT_FLAG_EXTENDED 0x00000001 #define TEB_ACTIVE_FRAME_FLAG_EXTENDED 0x00000001 @@ -507,7 +520,10 @@ typedef struct _TEB PVOID ThreadPoolData; /* f90/1778 */ PVOID *TlsExpansionSlots; /* f94/1780 */ #ifdef _WIN64 - PVOID DeallocationBStore; /* /1788 */ + union { + PVOID DeallocationBStore; /* /1788 */ + CHPE_V2_CPU_AREA_INFO *ChpeV2CpuAreaInfo; /* /1788 */ + } DUMMYUNIONNAME; PVOID BStoreLimit; /* /1790 */ #endif ULONG MuiGeneration; /* f98/1798 */ @@ -1140,7 +1156,10 @@ typedef struct _TEB64 ULONG64 ReservedForCodeCoverage; /* 1770 */ ULONG64 ThreadPoolData; /* 1778 */ ULONG64 TlsExpansionSlots; /* 1780 */ - ULONG64 DeallocationBStore; /* 1788 */ + union { + ULONG64 DeallocationBStore; /* 1788 */ + ULONG64 ChpeV2CpuAreaInfo; /* 1788 */ + } DUMMYUNIONNAME; ULONG64 BStoreLimit; /* 1790 */ ULONG MuiGeneration; /* 1798 */ ULONG IsImpersonating; /* 179c */

1 0

Jinoh Kang : user32/tests: Isolate window update region tests in a temporary desktop.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: fa038c3c3714cd1293e4de6aad44c1440ab845b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa038c3c3714cd1293e4de6aad44c1… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Sep 1 00:45:10 2023 +0900 user32/tests: Isolate window update region tests in a temporary desktop. Today, user32:msg window update region tests may fail if there are visible topmost windows in the current desktop, which conceals test windows and thus affects update regions. Fix this by introducing a temporary desktop to isolate fragile tests in. Take a precaution to check for unexpected USER environment. user32 tests are often hard to debug due to its graphical nature, especially in batch WineTest runs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55465 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55374 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54202 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53891 --- dlls/user32/tests/msg.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 153 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b4a5410622c..53f8953902a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9706,6 +9706,155 @@ static void test_hvredraw(void) DestroyWindow( htoplevel ); } +struct run_in_temp_desktop_args +{ + const char *file; + int line; + const char *name; + void (*test_func)(void); +}; + +static DWORD WINAPI run_in_temp_desktop_thread_func(LPVOID param) +{ + HDESK prev_thr_desktop, prev_inp_desktop, post_inp_desktop, temp_desktop; + char temp_desktop_name[1024], curr_desktop_name[1024]; + struct run_in_temp_desktop_args *args = param; + const char *file = args->file; + int line = args->line; + LARGE_INTEGER qpc; + DWORD length; + int result; + + result = QueryPerformanceCounter( &qpc ); + ok_(file, line)( result, "QueryPerformanceCounter error %lu\n", GetLastError() ); + + /* + * Temporary desktops from previous runs may leak due to a Windows bug. + * Generate a unique name that is unlikely to collide with previous runs. + */ + result = snprintf( temp_desktop_name, ARRAY_SIZE(temp_desktop_name), + "WineTest-%08lX-%08lX-%08lX%08lX-%s", + GetCurrentProcessId(), GetCurrentThreadId(), + qpc.HighPart, qpc.LowPart, args->name ); + ok_(file, line)( result > 0 && result < ARRAY_SIZE(temp_desktop_name), + "sprintf returned %d (out of memory, or name too long?)\n", result ); + + if (winetest_debug > 1) + trace_(file, line)( "creating desktop: %s\n", debugstr_a( temp_desktop_name ) ); + + temp_desktop = CreateDesktopA( temp_desktop_name, NULL, NULL, 0, GENERIC_ALL, NULL ); + ok_(file, line)( temp_desktop != NULL, "CreateDesktopA(%s, ..) error %lu\n", + debugstr_a( temp_desktop_name ), GetLastError() ); + + prev_inp_desktop = OpenInputDesktop( 0, FALSE, DESKTOP_SWITCHDESKTOP ); + ok_(file, line)( prev_inp_desktop != NULL, "OpenInputDesktop [prev] error %lu\n", GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "sanity check: no concurrent WineTest desktop\n" ); + + /* + * Check if the desktop has not been properly restored. This is done to + * avoid any possible hard-to-debug failures due to unexpected desktop. + */ + result = GetUserObjectInformationA( prev_inp_desktop, UOI_NAME, + curr_desktop_name, sizeof(curr_desktop_name), &length ); + ok_(file, line)( result, "GetUserObjectInformationA error %lu [rl = %lu]\n", + GetLastError(), length ); + ok_(file, line)( _strnicmp( curr_desktop_name, temp_desktop_name, 8 ) != 0, + "unexpected input desktop name %s (concurrent WineTest run?)\n", + debugstr_a( curr_desktop_name ) ); + + if (winetest_debug > 1) + trace_(file, line)( "switching desktop to: %s (%p)\n", debugstr_a( temp_desktop_name ), temp_desktop ); + + result = SwitchDesktop( temp_desktop ); + ok_(file, line)( result, "SwitchDesktop(temp_desktop=%p) error %lu\n", + temp_desktop, GetLastError() ); + + prev_thr_desktop = GetThreadDesktop( GetCurrentThreadId() ); + ok_(file, line)( prev_thr_desktop != NULL, "GetThreadDesktop error %lu\n", GetLastError() ); + + result = SetThreadDesktop( temp_desktop ); + ok_(file, line)( result, "SetThreadDesktop(temp_desktop=%p) error %lu\n", + temp_desktop, GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "running test function %s()\n", args->name ); + + args->test_func(); + + if (winetest_debug > 1) + trace_(file, line)( "sanity check: input desktop has not been changed\n" ); + + /* + * Check if the input desktop has been tampered with. This is done to + * avoid any possible hard-to-debug failures due to unexpected desktop. + */ + post_inp_desktop = OpenInputDesktop( 0, FALSE, DESKTOP_ENUMERATE ); + ok_(file, line)( post_inp_desktop != NULL, "OpenInputDesktop [post] error %lu\n", GetLastError() ); + + result = GetUserObjectInformationA( post_inp_desktop, UOI_NAME, + curr_desktop_name, sizeof(curr_desktop_name), &length ); + ok_(file, line)( result, "GetUserObjectInformationA(post_inp_desktop=%p) error %lu [rl = %lu]\n", + post_inp_desktop, GetLastError(), length ); + todo_wine + ok_(file, line)( strcmp( curr_desktop_name, temp_desktop_name ) == 0, + "different desktop name: %s != %s (no switch or concurrent WineTest run?)\n", + debugstr_a( curr_desktop_name ), debugstr_a( temp_desktop_name ) ); + + result = CloseDesktop( post_inp_desktop ); + ok_(file, line)( result, "CloseDesktop(post_inp_desktop=%p) error %lu\n", + post_inp_desktop, GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "restoring previous desktop\n" ); + + result = SetThreadDesktop( prev_thr_desktop ); + ok_(file, line)( result || broken( GetLastError() == ERROR_BUSY ) /* == W10 */, + "SetThreadDesktop(prev_thr_desktop=%p) error %lu\n", + prev_thr_desktop, GetLastError() ); + + result = SwitchDesktop( prev_inp_desktop ); + ok_(file, line)( result, "SwitchDesktop(prev_inp_desktop=%p) error %lu\n", + prev_inp_desktop, GetLastError() ); + + result = CloseDesktop( prev_inp_desktop ); + ok_(file, line)( result, "CloseDesktop(prev_inp_desktop=%p) error %lu\n", + prev_inp_desktop, GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "closing desktop: %s (%p)\n", debugstr_a( temp_desktop_name ), temp_desktop ); + + result = CloseDesktop( temp_desktop ); + ok_(file, line)( result || broken( GetLastError() == ERROR_BUSY ) /* == W10 */, + "CloseDesktop(temp_desktop=%p) error %lu\n", + temp_desktop, GetLastError() ); + + return 0; +} + +#define run_in_temp_desktop(f) run_in_temp_desktop_(__FILE__, __LINE__, #f, f) +static void run_in_temp_desktop_(const char *file, int line, const char *name, void (*test_func)(void)) +{ + struct run_in_temp_desktop_args args; + HANDLE thread; + DWORD result; + + args.file = file; + args.line = line; + args.name = name; + args.test_func = test_func; + + thread = CreateThread( NULL, 0, run_in_temp_desktop_thread_func, &args, 0, NULL ); + ok_(file, line)( thread != NULL, "CreateThread error %lu\n", GetLastError() ); + + result = WaitForSingleObject( thread, INFINITE ); + ok_(file, line)( result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu, error %lu\n", + result, GetLastError() ); + + CloseHandle( thread ); +} + struct wnd_event { HWND hwnd; @@ -19893,10 +20042,10 @@ START_TEST(msg) test_combobox_messages(); test_wmime_keydown_message(); test_paint_messages(); - test_swp_paint_regions(); - test_swp_paint_region_on_show(); - test_swp_paint_region_on_extend_zerosize(); - test_hvredraw(); + run_in_temp_desktop(test_swp_paint_regions); + run_in_temp_desktop(test_swp_paint_region_on_show); + run_in_temp_desktop(test_swp_paint_region_on_extend_zerosize); + run_in_temp_desktop(test_hvredraw); test_interthread_messages(); test_message_conversion(); test_accelerators();

1 0

Hans Leidekker : wtsapi/tests: Use a heap buffer for the user SID.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 9c238a5dc00c941ec90d2b146bc22c355d367638 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c238a5dc00c941ec90d2b146bc22c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 11 14:27:33 2023 +0200 wtsapi/tests: Use a heap buffer for the user SID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55227 --- dlls/wtsapi32/tests/wtsapi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 6e8de7b232d..5be1764b6b3 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -68,8 +68,7 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) for (i = 0; i < count; i++) { - char sid_buffer[50]; - SID_AND_ATTRIBUTES *sid = (SID_AND_ATTRIBUTES *)sid_buffer; + SID_AND_ATTRIBUTES *sid; const SYSTEM_PROCESS_INFORMATION *nt_process; HANDLE process, token; DWORD size; @@ -88,11 +87,13 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, info[i].ProcessId))) { + sid = malloc(50); ret = OpenProcessToken(process, TOKEN_QUERY, &token); ok(ret, "failed to open token, error %lu\n", GetLastError()); - ret = GetTokenInformation(token, TokenUser, sid_buffer, sizeof(sid_buffer), &size); + ret = GetTokenInformation(token, TokenUser, sid, 50, &size); ok(ret, "failed to get token user, error %lu\n", GetLastError()); ok(EqualSid(info[i].pUserSid, sid->Sid), "SID did not match\n"); + free(sid); CloseHandle(token); CloseHandle(process); }

1 0

Alex Henrie : shcore: Use CRT allocation functions.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 294be173709708ce98cc83d8a1d51b014a068da0 URL: https://gitlab.winehq.org/wine/wine/-/commit/294be173709708ce98cc83d8a1d51b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Sep 1 21:19:39 2023 -0600 shcore: Use CRT allocation functions. --- dlls/shcore/main.c | 61 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 278eeb82fd5..a195d8f307a 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -33,7 +33,6 @@ #include "shlwapi.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(shcore); @@ -588,8 +587,8 @@ static ULONG WINAPI memstream_Release(IStream *iface) if (!refcount) { - heap_free(stream->u.mem.buffer); - heap_free(stream); + free(stream->u.mem.buffer); + free(stream); } return refcount; @@ -634,7 +633,7 @@ static HRESULT WINAPI memstream_Write(IStream *iface, const void *buff, ULONG bu if (length > stream->u.mem.length) { - BYTE *buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + BYTE *buffer = _recalloc(stream->u.mem.buffer, 1, length); if (!buffer) return STG_E_INSUFFICIENTMEMORY; @@ -687,7 +686,7 @@ static HRESULT WINAPI memstream_SetSize(IStream *iface, ULARGE_INTEGER new_size) /* we cut off the high part here */ length = new_size.u.LowPart; - buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + buffer = _recalloc(stream->u.mem.buffer, 1, length); if (!buffer) return STG_E_INSUFFICIENTMEMORY; @@ -836,13 +835,13 @@ static struct shstream *shstream_create(const IStreamVtbl *vtbl, const BYTE *dat if (!data) data_len = 0; - stream = heap_alloc(sizeof(*stream)); + stream = malloc(sizeof(*stream)); stream->IStream_iface.lpVtbl = vtbl; stream->refcount = 1; - stream->u.mem.buffer = heap_alloc(data_len); + stream->u.mem.buffer = malloc(data_len); if (!stream->u.mem.buffer) { - heap_free(stream); + free(stream); return NULL; } memcpy(stream->u.mem.buffer, data, data_len); @@ -888,8 +887,8 @@ static ULONG WINAPI filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->u.file.handle); - heap_free(stream->u.file.path); - heap_free(stream); + free(stream->u.file.path); + free(stream); } return refcount; @@ -1157,14 +1156,14 @@ HRESULT WINAPI SHCreateStreamOnFileEx(const WCHAR *path, DWORD mode, DWORD attri if (hFile == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); - stream = heap_alloc(sizeof(*stream)); + stream = malloc(sizeof(*stream)); stream->IStream_iface.lpVtbl = &filestreamvtbl; stream->refcount = 1; stream->u.file.handle = hFile; stream->u.file.mode = mode; len = lstrlenW(path); - stream->u.file.path = heap_alloc((len + 1) * sizeof(WCHAR)); + stream->u.file.path = malloc((len + 1) * sizeof(WCHAR)); memcpy(stream->u.file.path, path, (len + 1) * sizeof(WCHAR)); *ret = &stream->IStream_iface; @@ -1203,13 +1202,13 @@ HRESULT WINAPI SHCreateStreamOnFileA(const char *path, DWORD mode, IStream **str return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); len = MultiByteToWideChar(CP_ACP, 0, path, -1, NULL, 0); - pathW = heap_alloc(len * sizeof(WCHAR)); + pathW = malloc(len * sizeof(WCHAR)); if (!pathW) return E_OUTOFMEMORY; MultiByteToWideChar(CP_ACP, 0, path, -1, pathW, len); hr = SHCreateStreamOnFileW(pathW, mode, stream); - heap_free(pathW); + free(pathW); return hr; } @@ -1233,8 +1232,8 @@ static ULONG WINAPI regstream_Release(IStream *iface) RegCloseKey(stream->u.mem.hkey); } CoTaskMemFree(stream->u.mem.valuename); - heap_free(stream->u.mem.buffer); - heap_free(stream); + free(stream->u.mem.buffer); + free(stream); } return refcount; @@ -1284,16 +1283,16 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, const WCHAR *subkey, const WCHAR * ret = RegQueryValueExW(hStrKey, value, 0, 0, 0, &length); if (ret == ERROR_SUCCESS && length) { - buff = heap_alloc(length); + buff = malloc(length); RegQueryValueExW(hStrKey, value, 0, 0, buff, &length); } } if (!length) - buff = heap_alloc(length); + buff = malloc(length); stream = shstream_create(&regstreamvtbl, buff, length); - heap_free(buff); + free(buff); if (stream) { stream->u.mem.hkey = hStrKey; @@ -1458,7 +1457,7 @@ static ULONG WINAPI threadref_Release(IUnknown *iface) TRACE("%p, refcount %ld.\n", threadref, refcount); if (!refcount) - heap_free(threadref); + free(threadref); return refcount; } @@ -1484,7 +1483,7 @@ HRESULT WINAPI SHCreateThreadRef(LONG *refcount, IUnknown **out) *out = NULL; - threadref = heap_alloc(sizeof(*threadref)); + threadref = malloc(sizeof(*threadref)); if (!threadref) return E_OUTOFMEMORY; threadref->IUnknown_iface.lpVtbl = &threadrefvtbl; @@ -1993,10 +1992,10 @@ DWORD WINAPI SHCopyKeyW(HKEY hkey_src, const WCHAR *subkey, HKEY hkey_dst, DWORD max_key_len = max(max_key_len, max_value_len); if (max_key_len++ > MAX_PATH - 1) - ptr_name = heap_alloc(max_key_len * sizeof(WCHAR)); + ptr_name = malloc(max_key_len * sizeof(WCHAR)); if (max_data_len > sizeof(buff)) - ptr = heap_alloc(max_data_len); + ptr = malloc(max_data_len); if (!ptr_name || !ptr) ret = ERROR_NOT_ENOUGH_MEMORY; @@ -2040,9 +2039,9 @@ DWORD WINAPI SHCopyKeyW(HKEY hkey_src, const WCHAR *subkey, HKEY hkey_dst, DWORD /* Free buffers if allocated */ if (ptr_name != name) - heap_free(ptr_name); + free(ptr_name); if (ptr != buff) - heap_free(ptr); + free(ptr); if (subkey && hkey_src) RegCloseKey(hkey_src); @@ -2118,20 +2117,20 @@ DWORD WINAPI SHQueryValueExW(HKEY hkey, const WCHAR *name, DWORD *reserved, DWOR if (!buff || ret == ERROR_MORE_DATA) { length = data_len; - value = heap_alloc(length); + value = malloc(length); RegQueryValueExW(hkey, name, reserved, NULL, (BYTE *)value, &length); length = ExpandEnvironmentStringsW(value, NULL, 0); } else { length = (lstrlenW(buff) + 1) * sizeof(WCHAR); - value = heap_alloc(length); + value = malloc(length); memcpy(value, buff, length); length = ExpandEnvironmentStringsW(value, buff, *buff_len / sizeof(WCHAR)); if (length > *buff_len) ret = ERROR_MORE_DATA; } data_len = max(data_len, length); - heap_free(value); + free(value); } if (type) @@ -2166,20 +2165,20 @@ DWORD WINAPI SHQueryValueExA(HKEY hkey, const char *name, DWORD *reserved, DWORD if (!buff || ret == ERROR_MORE_DATA) { length = data_len; - value = heap_alloc(length); + value = malloc(length); RegQueryValueExA(hkey, name, reserved, NULL, (BYTE *)value, &length); length = ExpandEnvironmentStringsA(value, NULL, 0); } else { length = strlen(buff) + 1; - value = heap_alloc(length); + value = malloc(length); memcpy(value, buff, length); length = ExpandEnvironmentStringsA(value, buff, *buff_len); if (length > *buff_len) ret = ERROR_MORE_DATA; } data_len = max(data_len, length); - heap_free(value); + free(value); } if (type)

1 0