December 2022 - Wine-Commits

Rémi Bernon : user32/tests: Use %d to print last_bpp instead of %u.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: c20d32d392a49dca527f57ab6b84a82e5f0ad527 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20d32d392a49dca527f57ab6b84a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 16 16:38:55 2022 +0100 user32/tests: Use %d to print last_bpp instead of %u. --- dlls/user32/tests/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index debe05c42a3..5c199a07769 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2475,7 +2475,7 @@ static void test_WM_DISPLAYCHANGE(void) todo_wine ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); todo_wine - ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); displaychange_ok = FALSE; for (i = 0; i < ARRAY_SIZE(test_bpps); i++) @@ -2496,7 +2496,7 @@ static void test_WM_DISPLAYCHANGE(void) /* Wait quite long for the message, screen setting changes can take some time */ res = WaitForSingleObject( displaychange_sem, 10000 ); ok( !res, "WaitForSingleObject returned %#lx\n", res ); - ok( last_bpp == bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == bpp, "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); } else { @@ -2504,7 +2504,7 @@ static void test_WM_DISPLAYCHANGE(void) win_skip( "ChangeDisplaySettingsExW returned %ld\n", res ); ok( res == DISP_CHANGE_BADMODE || broken( DISP_CHANGE_FAILED && bpp == 8 ), "ChangeDisplaySettingsExW returned %ld\n", res ); - ok( last_bpp == -1, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == -1, "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); } displaychange_ok = FALSE; @@ -2525,7 +2525,7 @@ static void test_WM_DISPLAYCHANGE(void) todo_wine ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); todo_wine - ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %d\n", last_bpp ); displaychange_ok = FALSE; CloseHandle( displaychange_sem );

1 0

Rémi Bernon : user32/tests: Don't expect WM_DISPLAYCHANGE with the default display mode.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: e2bc3bc40d52310e178e38bd2d26f66417454576 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2bc3bc40d52310e178e38bd2d26f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 16 15:30:01 2022 +0100 user32/tests: Don't expect WM_DISPLAYCHANGE with the default display mode. It looks like the behavior changes when only this test is run vs when it is run as part of the winetest suite. This is probably because ChangeDisplaySettingsExW only sends the message the first time it is called (since boot?). Having other tests run before it, one of them probably changed display settings already and we're not getting the message anymore. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53894 --- dlls/user32/tests/sysparams.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a53c43b391a..debe05c42a3 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2463,16 +2463,19 @@ static void test_WM_DISPLAYCHANGE(void) ok( settings.dmBitsPerPel == 32, "got dmBitsPerPel %lu\n", settings.dmBitsPerPel ); default_bpp = settings.dmBitsPerPel; - /* setting the default mode here sends a WM_DISPLAYCHANGE */ + /* setting default mode most of the time doesn't send WM_DISPLAYCHANGE, + * it only does the first time ChangeDisplaySettingsExW is called */ last_bpp = -1; change_counter = 0; displaychange_ok = TRUE; res = ChangeDisplaySettingsExW( NULL, &settings, NULL, 0, NULL ); ok( !res, "ChangeDisplaySettingsExW returned %ld\n", res ); - res = WaitForSingleObject( displaychange_sem, 10000 ); - ok( !res, "WaitForSingleObject returned %#lx\n", res ); - ok( last_bpp == default_bpp, "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); + res = WaitForSingleObject( displaychange_sem, 1000 ); + todo_wine + ok( res == WAIT_TIMEOUT || broken( !res ), "WaitForSingleObject returned %#lx\n", res ); + todo_wine + ok( last_bpp == -1 || broken( last_bpp == default_bpp ), "got WM_DISPLAYCHANGE bpp %u\n", last_bpp ); displaychange_ok = FALSE; for (i = 0; i < ARRAY_SIZE(test_bpps); i++)

1 0

Piotr Caban : shell32: Fix SHChangeNotify test failures.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: b7380acb6c053ffacc96ee49bda8fc4cda1ef1c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7380acb6c053ffacc96ee49bda8fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 13:24:50 2022 +0100 shell32: Fix SHChangeNotify test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53222 --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 98064140107..dc0b6cb2ee2 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5133,7 +5133,7 @@ static void test_SHChangeNotify(BOOL test_new_delivery) entries[0].fRecursive = TRUE; notifyID = SHChangeNotifyRegister(wnd, !test_new_delivery ? SHCNRF_ShellLevel : SHCNRF_ShellLevel|SHCNRF_NewDelivery, - SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); + SHCNE_MKDIR | SHCNE_CREATE | SHCNE_RMDIR, WM_USER_NOTIFY, 1, entries); ok(notifyID != 0, "Failed to register a window for change notifications\n"); for (i = 0; i < ARRAY_SIZE(chnotify_tests); ++i)

1 0

Eric Pouech : ntdll: Fix export and calling convention of RtlUlonglongByteSwap().
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 495711c251bad8d39e13af7addfaccc938a2a670 URL: https://gitlab.winehq.org/wine/wine/-/commit/495711c251bad8d39e13af7addfacc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 12 16:58:12 2022 +0100 ntdll: Fix export and calling convention of RtlUlonglongByteSwap(). The RtlU*ByteSwap() family: - has FASTCALL calling convention - is only exported from ntdll and ntoskrnl.exe in 32bit mode (didn't check ARM though) Wine's support for RtlUlonglongByteSwap() doesn't follow these constraints. Note: in __fastcall, 64bit paramaters are passed on the stack, to RtlUlonglongByteSwap() calling convention acts as __stdcall. So: - fix ntdll.spec (resp. ntoskrnl.exe.spec) to only export (resp. forward) RtlUlonglongByteSwap for i386 - always provide an inline implementation in winternl.h - reimplement ntdll.RtlUlonglongByteSwap() for i386 with __fastcall calling convention. - fix ntdll/tests/rtl.c to use correct calling convention. - add test in ntdll/tests/rtl.c for inlined version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53536 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 12 ++++++++---- dlls/ntdll/tests/rtl.c | 24 ++++++++++++++---------- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 15 +++++++-------- 6 files changed, 44 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1e6576a5422..5b4cbbaa7fe 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1039,7 +1039,7 @@ @ stdcall RtlTryEnterCriticalSection(ptr) @ stdcall RtlUTF8ToUnicodeN(ptr long ptr ptr long) @ cdecl -i386 -norelay RtlUlongByteSwap() NTDLL_RtlUlongByteSwap -@ cdecl -ret64 RtlUlonglongByteSwap(int64) +@ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) # @ stub RtlUnhandledExceptionFilter2 # @ stub RtlUnhandledExceptionFilter @ stdcall RtlUnicodeStringToAnsiSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 5ff6205fe05..00bc16bbfa5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -641,10 +641,14 @@ DWORD WINAPI RtlComputeCrc32(DWORD dwInitial, const BYTE *pData, INT iLen) * RETURNS * The value with its bytes swapped. */ -ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG i) -{ - return ((ULONGLONG)RtlUlongByteSwap(i) << 32) | RtlUlongByteSwap(i>>32); -} +#ifdef __i386__ +__ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, + "movl 4(%esp),%edx\n\t" + "bswap %edx\n\t" + "movl 8(%esp),%eax\n\t" + "bswap %eax\n\t" + "ret $8") +#endif /************************************************************************* * RtlUlongByteSwap [NTDLL.@] diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 2e0bfb650e4..8f698454957 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -68,7 +68,7 @@ static VOID (WINAPI *pRtlMoveMemory)(LPVOID,LPCVOID,SIZE_T); static VOID (WINAPI *pRtlFillMemory)(LPVOID,SIZE_T,BYTE); static VOID (WINAPI *pRtlFillMemoryUlong)(LPVOID,SIZE_T,ULONG); static VOID (WINAPI *pRtlZeroMemory)(LPVOID,SIZE_T); -static ULONGLONG (WINAPIV *pRtlUlonglongByteSwap)(ULONGLONG source); +static ULONGLONG (FASTCALL *pRtlUlonglongByteSwap)(ULONGLONG source); static DWORD (WINAPI *pRtlGetThreadErrorMode)(void); static NTSTATUS (WINAPI *pRtlSetThreadErrorMode)(DWORD, LPDWORD); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); @@ -319,18 +319,22 @@ static void test_RtlZeroMemory(void) static void test_RtlUlonglongByteSwap(void) { - ULONGLONG result; + ULONGLONG llresult; - if ( !pRtlUlonglongByteSwap ) +#ifdef _WIN64 + /* the Rtl*ByteSwap() are always inlined and not exported from ntdll on 64bit */ + llresult = RtlUlonglongByteSwap( 0x7654321087654321ull ); + ok( 0x2143658710325476 == llresult, + "inlined RtlUlonglongByteSwap() returns %#I64x\n", llresult ); +#else + ok( pRtlUlonglongByteSwap != NULL, "RtlUlonglongByteSwap is not available\n"); + if ( pRtlUlonglongByteSwap ) { - win_skip("RtlUlonglongByteSwap is not available\n"); - return; + llresult = pRtlUlonglongByteSwap( 0x7654321087654321ull ); + ok( 0x2143658710325476ull == llresult, + "ntdll.RtlUlonglongByteSwap() returns %#I64x\n", llresult ); } - - result = pRtlUlonglongByteSwap( ((ULONGLONG)0x76543210 << 32) | 0x87654321 ); - ok( (((ULONGLONG)0x21436587 << 32) | 0x10325476) == result, - "RtlUlonglongByteSwap(0x7654321087654321) returns 0x%s, expected 0x2143658710325476\n", - wine_dbgstr_longlong(result)); +#endif } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ce92f6805ab..9548eb98542 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2185,6 +2185,19 @@ LONG FASTCALL NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) return InterlockedIncrement( dest ); } +#ifdef __i386__ + +/************************************************************************* + * RtlUlonglongByteSwap (NTOSKRNL.EXE.@) + */ +__ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, + "movl 4(%esp),%edx\n\t" + "bswap %edx\n\t" + "movl 8(%esp),%eax\n\t" + "bswap %eax\n\t" + "ret $8") + +#endif /* __i386__ */ /*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0a484829ca3..321083e5ac4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -68,7 +68,7 @@ @ stdcall -fastcall ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal @ cdecl -i386 -norelay RtlUlongByteSwap() -@ cdecl -ret64 RtlUlonglongByteSwap(int64) +@ stdcall -fastcall -arch=i386 -norelay RtlUlonglongByteSwap(int64) @ cdecl -i386 -norelay RtlUshortByteSwap() @ stub WmiGetClock @ stub Kei386EoiHelper diff --git a/include/winternl.h b/include/winternl.h index 5a99827fe65..c720d962933 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4567,7 +4567,6 @@ NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockExclusive(RTL_SRWLOCK *); NTSYSAPI BOOLEAN WINAPI RtlTryAcquireSRWLockShared(RTL_SRWLOCK *); NTSYSAPI BOOL WINAPI RtlTryEnterCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlUTF8ToUnicodeN(WCHAR*,DWORD,DWORD*,const char*,DWORD); -NTSYSAPI ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG); NTSYSAPI DWORD WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING,PCUNICODE_STRING,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlUnicodeStringToInteger(const UNICODE_STRING *,ULONG,ULONG *); @@ -4733,20 +4732,20 @@ static inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) return FALSE; } -/* These are implemented as __fastcall, so we can't let Winelib apps link with them */ +/* These are implemented as __fastcall, so we can't let Winelib apps link with them. + * Moreover, they're always inlined and not exported on 64bit systems. + */ static inline USHORT RtlUshortByteSwap(USHORT s) { return (s >> 8) | (s << 8); } static inline ULONG RtlUlongByteSwap(ULONG i) { -#if defined(__i386__) && defined(__GNUC__) - ULONG ret; - __asm__("bswap %0" : "=r" (ret) : "0" (i) ); - return ret; -#else return ((ULONG)RtlUshortByteSwap((USHORT)i) << 16) | RtlUshortByteSwap((USHORT)(i >> 16)); -#endif +} +static inline ULONGLONG RtlUlonglongByteSwap(ULONGLONG i) +{ + return ((ULONGLONG)RtlUlongByteSwap((ULONG)i) << 32) | RtlUlongByteSwap((ULONG)(i >> 32)); } /* list manipulation macros */

1 0

Piotr Caban : shell32: Add partial ControlPanel GetAttributesOf implementation.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 68e57283c3f68c69b5277e4a522bf295be223b3a URL: https://gitlab.winehq.org/wine/wine/-/commit/68e57283c3f68c69b5277e4a522bf2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 21:45:01 2022 +0100 shell32: Add partial ControlPanel GetAttributesOf implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52394 --- dlls/shell32/cpanelfolder.c | 39 ++++++++++++++++++++++++++++--- dlls/shell32/tests/shlfolder.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 9619128d8b0..a45d36f35b0 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -536,6 +536,34 @@ static HRESULT WINAPI ISF_ControlPanel_fnCreateViewObject(IShellFolder2 *iface, return hr; } +static BOOL validate_name_space(const ITEMIDLIST *pidl) +{ + HKEY hkey, hitem; + WCHAR *guidW; + GUID *guid; + LSTATUS r; + + if (!_ILIsPidlSimple(pidl)) + return FALSE; + + guid = _ILGetGUIDPointer(pidl); + if (!guid) + return FALSE; + if (StringFromCLSID(guid, &guidW) != S_OK) + return FALSE; + + r = RegOpenKeyW(HKEY_LOCAL_MACHINE, name_spaceW, &hkey); + if (r == ERROR_SUCCESS) + { + r = RegOpenKeyW(hkey, guidW, &hitem); + if (r == ERROR_SUCCESS) + RegCloseKey(hitem); + RegCloseKey(hkey); + } + CoTaskMemFree(guidW); + return r == ERROR_SUCCESS; +} + /************************************************************************** * ISF_ControlPanel_fnGetAttributesOf */ @@ -559,12 +587,17 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 *iface, U while(cidl > 0 && *apidl) { pdump(*apidl); - SHELL32_GetItemAttributes(&This->IShellFolder2_iface, *apidl, rgfInOut); + + /* TODO: panel with GUID can contain sub-items but we don't support it yet */ + if (!(*rgfInOut & SFGAO_VALIDATE) || _ILGetCPanelPointer(*apidl) + || validate_name_space(*apidl)) + *rgfInOut &= SFGAO_CANLINK; + else + *rgfInOut &= SFGAO_VALIDATE; + apidl++; cidl--; } - /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ - *rgfInOut &= ~SFGAO_VALIDATE; TRACE("-- result=0x%08lx\n", *rgfInOut); return hr; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 248fbd1df62..98064140107 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -956,6 +956,8 @@ static void test_GetAttributesOf(void) static WCHAR cTestDirW[] = {'t','e','s','t','d','i','r',0}; IShellFolder *IDesktopFolder, *testIShellFolder; ITEMIDLIST *newPIDL; + IEnumIDList *list; + ULONG fetch; int len; hr = SHGetDesktopFolder(&psfDesktop); @@ -1070,6 +1072,57 @@ static void test_GetAttributesOf(void) Cleanup(); + /* test Control Panel elements */ + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, + (WCHAR *)L"::{21EC2020-3AEA-1069-A2DD-08002B30309D}", NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr); + hr = IShellFolder_BindToObject(IDesktopFolder, newPIDL, NULL, + &IID_IShellFolder, (void**)&testIShellFolder); + ok(hr == S_OK, "BindToObject failed %08lx\n", hr); + ILFree(newPIDL); + + hr = IShellFolder_EnumObjects(testIShellFolder, NULL, SHCONTF_NONFOLDERS, &list); + ok(hr == S_OK, "EnumObjects failed %08lx\n", hr); + + while (IEnumIDList_Next(list, 1, &newPIDL, &fetch) == S_OK) + { + WCHAR name[256]; + STRRET strret; + + hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_FORPARSING, &strret); + ok(hr == S_OK, "GetDisplayNameOf failed %08lx\n", hr); + StrRetToBufW(&strret, newPIDL, name, ARRAY_SIZE(name)); + + dwFlags = ~0; + hr = IShellFolder_GetAttributesOf(testIShellFolder, 1, + (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok(hr == S_OK, "ControlPanel->GetAttributesOf failed %08lx\n", hr); + ok(dwFlags == SFGAO_CANLINK || + broken(!wcsncmp(L"::{26EE0668-A00A-44D7-9371-BEB064C98683}\\", name, 41) + && dwFlags == SFGAO_VALIDATE), + "%s dwFlags = %08lx\n", debugstr_w(name), dwFlags); + ILFree(newPIDL); + } + IEnumIDList_Release(list); + + hr = IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, + (WCHAR*)L"c:\\", NULL, &newPIDL, 0); + ok(hr == S_OK, "ParseDisplayName failed %08lx\n", hr); + + dwFlags = ~0; + hr = IShellFolder_GetAttributesOf(testIShellFolder, 1, + (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok(hr == S_OK, "ControlPanel->GetAttributesOf failed %08lx\n", hr); + ok(dwFlags == SFGAO_VALIDATE, "dwFlags = %08lx\n", dwFlags); + + dwFlags = ~0 & ~SFGAO_VALIDATE; + hr = IShellFolder_GetAttributesOf(testIShellFolder, 1, + (LPCITEMIDLIST*)&newPIDL, &dwFlags); + ok(hr == S_OK, "ControlPanel->GetAttributesOf failed %08lx\n", hr); + ok(dwFlags == SFGAO_CANLINK, "dwFlags = %08lx\n", dwFlags); + + ILFree(newPIDL); + IShellFolder_Release(testIShellFolder); IShellFolder_Release(IDesktopFolder); }

1 0

Piotr Caban : shell32: Store NameSpace registry path in global variable.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: e5c47b6a79c8a212057eda08691893743a3036a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c47b6a79c8a212057eda08691893… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 15 21:40:27 2022 +0100 shell32: Store NameSpace registry path in global variable. --- dlls/shell32/cpanelfolder.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 122c3180dd4..9619128d8b0 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -66,6 +66,8 @@ typedef struct { int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } ICPanelImpl; +static const WCHAR name_spaceW[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"; + static const IShellFolder2Vtbl vt_ShellFolder2; static const IPersistFolder2Vtbl vt_PersistFolder2; static const IShellExecuteHookWVtbl vt_ShellExecuteHookW; @@ -355,14 +357,14 @@ static int SHELL_RegisterRegistryCPanelApps(IEnumIDListImpl *list, HKEY hkey_roo return cnt; } -static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, LPCSTR szRepPath) +static int SHELL_RegisterCPanelFolders(IEnumIDListImpl *list, HKEY hkey_root, const WCHAR *reg_path) { char name[MAX_PATH]; HKEY hkey; int cnt = 0; - if (RegOpenKeyA(hkey_root, szRepPath, &hkey) == ERROR_SUCCESS) + if (RegOpenKeyW(hkey_root, reg_path, &hkey) == ERROR_SUCCESS) { int idx = 0; for(;; ++idx) @@ -398,8 +400,7 @@ static BOOL CreateCPanelEnumList(IEnumIDListImpl *list, DWORD dwFlags) /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) - SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace"); + SHELL_RegisterCPanelFolders(list, HKEY_LOCAL_MACHINE, name_spaceW); /* enumerate the control panel applets */ if (dwFlags & SHCONTF_NONFOLDERS)

1 0

Alexandre Julliard : winebuild: Disable relay for non-standard fastcall parameters.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: cb86bb92d2c35ed0d42c5f5677d5068a52b49203 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb86bb92d2c35ed0d42c5f5677d506… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 17:07:28 2022 +0100 winebuild: Disable relay for non-standard fastcall parameters. --- tools/winebuild/parser.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 11b422bd435..141ed80eb26 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -309,16 +309,9 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) error( "A fastcall function must use the stdcall convention\n" ); return 0; } - if (!i || (odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG)) - { - error( "First argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } - if (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG) - { - error( "Second argument of a fastcall function must be a pointer or integer\n" ); - return 0; - } + if ((i && odp->u.func.args[0] != ARG_PTR && odp->u.func.args[0] != ARG_LONG) || + (i > 1 && odp->u.func.args[1] != ARG_PTR && odp->u.func.args[1] != ARG_LONG)) + odp->flags |= FLAG_NORELAY; /* no relay debug possible for non-standard fastcall args */ } if (odp->flags & FLAG_SYSCALL) {

1 0

Alexandre Julliard : winegcc: Check for Mingw-style .dll.a import libraries.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: 3c235e053c7ca472b9169d0ef07b82c77843a549 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c235e053c7ca472b9169d0ef07b82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 15:49:00 2022 +0100 winegcc: Check for Mingw-style .dll.a import libraries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53918 --- tools/winegcc/utils.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index a93db878379..f79bfdf5877 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -138,7 +138,15 @@ static file_type guess_lib_type(struct target target, const char* dir, if ((*file = try_lib_path(dir, "", prefix, library, ".def", file_def))) return file_dll; } - else arch_dir = get_arch_dir( target ); + else + { + arch_dir = get_arch_dir( target ); + if (!strcmp( suffix, ".a" )) /* try Mingw-style .dll.a import lib */ + { + if ((*file = try_lib_path(dir, arch_dir, prefix, library, ".dll.a", file_arh))) + return file_arh; + } + } /* static archives */ if ((*file = try_lib_path(dir, arch_dir, prefix, library, suffix, file_arh)))

1 0

Alexandre Julliard : winebuild: Use new ELF tag ids also on 64-bit.
by Alexandre Julliard Dec. 16, 2022

Dec. 16, 2022

Module: wine Branch: master Commit: df31d3c7fe6365f0fc4098487311e93e186b0417 URL: https://gitlab.winehq.org/wine/wine/-/commit/df31d3c7fe6365f0fc4098487311e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 10:36:44 2022 +0100 winebuild: Use new ELF tag ids also on 64-bit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53912 --- tools/winebuild/spec32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 97022996c95..0cf8d783633 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1517,9 +1517,9 @@ static void fixup_elf64( const char *name, int fd, void *header, size_t header_s { switch (dyn[i].d_tag) { - case 25: dyn[i].d_tag = 0x60009990; break; /* DT_INIT_ARRAY */ - case 27: dyn[i].d_tag = 0x60009991; break; /* DT_INIT_ARRAYSZ */ - case 12: dyn[i].d_tag = 0x60009992; break; /* DT_INIT */ + case 25: dyn[i].d_tag = 0x60009994; break; /* DT_INIT_ARRAY */ + case 27: dyn[i].d_tag = 0x60009995; break; /* DT_INIT_ARRAYSZ */ + case 12: dyn[i].d_tag = 0x60009996; break; /* DT_INIT */ } } lseek( fd, phdr->p_offset, SEEK_SET );

1 0

Eric Pouech : kernel32/tests: Fix a debugger test failing on Windows.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 6e19585112fd358470e7cf62be18fd6a1a5e7605 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e19585112fd358470e7cf62be18fd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Dec 15 17:36:32 2022 +0100 kernel32/tests: Fix a debugger test failing on Windows. Testing: kernel32:debugger, there's sometimes the following error: debugger.c:1760: Test failed: unexpected instruction pointer 778B2A0C Current test code has a workaround when this happens on last thread, but this is clearly not sufficient. Fix the test so that it grabs the thread context only in a place we're sure it's in stopped state at breakpoint instruction. (Current code likely catches cases where the thread is in bp signal handling). Rewrote the test to be in more logical order. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53143 --- dlls/kernel32/tests/debugger.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index abd59c93f88..1dc5bd5fb46 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -318,16 +318,6 @@ static void set_thread_context_(unsigned line, struct debugger_context *ctx, str ok_(__FILE__,line)(ret, "SetThreadContext failed: %lu\n", GetLastError()); } -static void fetch_process_context(struct debugger_context *ctx) -{ - struct debuggee_thread *thread; - - WINE_RB_FOR_EACH_ENTRY(thread, &ctx->threads, struct debuggee_thread, entry) - { - fetch_thread_context(thread); - } -} - #define WAIT_EVENT_TIMEOUT 20000 #define POLL_EVENT_TIMEOUT 200 @@ -1706,8 +1696,6 @@ static void test_debugger(const char *argv0) if (sizeof(loop_code) > 1) { - struct debuggee_thread *prev_thread; - memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); @@ -1735,9 +1723,6 @@ static void test_debugger(const char *argv0) expect_breakpoint_exception(&ctx, thread_proc + 1); exception_cnt = 1; - prev_thread = ctx.current_thread; - fetch_process_context(&ctx); - byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); ok(ret, "WriteProcessMemory failed: %lu\n", GetLastError()); @@ -1746,6 +1731,10 @@ static void test_debugger(const char *argv0) { DEBUG_EVENT ev; + fetch_thread_context(ctx.current_thread); + ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2 + || broken(get_ip(&ctx.current_thread->ctx) == thread_proc), /* sometimes observed on win10 */ + "unexpected instruction pointer2 %p (%p)\n", get_ip(&ctx.current_thread->ctx), thread_proc); /* even when there are more pending events, they are not reported until current event is continued */ ret = WaitForDebugEvent(&ev, 10); ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%lu)\n", ret, GetLastError()); @@ -1757,18 +1746,9 @@ static void test_debugger(const char *argv0) ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); - ok(get_ip(&prev_thread->ctx) == thread_proc + 2 - || broken(get_ip(&prev_thread->ctx) == thread_proc), /* sometimes observed on win10 */ - "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - prev_thread = ctx.current_thread; exception_cnt++; } - /* for some reason sometimes on Windows one thread has a different address. this is always the thread - * with the last reported exception, so we simply skip the check for the last exception unless it's the only one. */ - if (exception_cnt == 1) - ok(get_ip(&prev_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); - trace("received %u exceptions\n", exception_cnt); for (;;)

1 0

Alexandre Julliard : d3d9/tests: Mark a few more message tests as flaky.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d3fa1962a07fbb35c742caeb2586cdbf5858d0e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3fa1962a07fbb35c742caeb2586cd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 15 18:38:29 2022 +0100 d3d9/tests: Mark a few more message tests as flaky. --- dlls/d3d9/tests/d3d9ex.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d1ea5587f3a..41f930a2408 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3094,6 +3094,7 @@ static void test_wndproc(void) expect_messages = focus_loss_messages_filtered; windowposchanged_received = 0; SetForegroundWindow(GetDesktopWindow()); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); flaky_if(i == 0 || i == 1) @@ -3112,8 +3113,10 @@ static void test_wndproc(void) syscommand_received = 0; expect_messages = sc_restore_messages; SendMessageA(focus_window, WM_SYSCOMMAND, SC_RESTORE, 0); + flaky_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky ok(syscommand_received == 1, "Got unexpected number of WM_SYSCOMMAND messages: %ld.\n", syscommand_received); expect_messages = NULL; flush_events();

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: ed0e5d9fc6b918d81136ee81cfd0d16790c35dfa URL: https://gitlab.winehq.org/wine/wine/-/commit/ed0e5d9fc6b918d81136ee81cfd0d1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Dec 15 12:32:51 2022 -0700 po: Update Catalan translation. --- po/ca.po | 162 ++++++++++++++++++--------------------------------------------- 1 file changed, 46 insertions(+), 116 deletions(-)

1 0

Fabian Maurer : urlmon: Pass correct parameter to realloc and simplify code (Coverity).
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 7a6eeb8c34d714241a65dc7c254e700eaf374c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/7a6eeb8c34d714241a65dc7c254e70… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 20:29:58 2022 +0100 urlmon: Pass correct parameter to realloc and simplify code (Coverity). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/urlmon/sec_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e6d1864b1e7..78e4c96fd60 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -1276,13 +1276,12 @@ static LPDWORD build_zonemap_from_reg(void) if (used == allocated) { LPDWORD new_data; + allocated *= 2; new_data = realloc(data, allocated * sizeof(DWORD)); if (!new_data) goto cleanup; - memset(new_data + allocated, 0, allocated * sizeof(DWORD)); data = new_data; - allocated *= 2; } data[used] = wcstol(name, NULL, 10); }

1 0

Paul Gofman : bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: a88cc503653c06b612429d98e4e6174278687b94 URL: https://gitlab.winehq.org/wine/wine/-/commit/a88cc503653c06b612429d98e4e617… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 20:13:03 2022 -0600 bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt(). --- dlls/bcrypt/tests/bcrypt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3bcdda0cf47..5d1a80f330b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2262,6 +2262,14 @@ static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] = 0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd }; +static const UCHAR rsa_encrypted_no_padding[] = +{ + 0x4a, 0xc1, 0xfa, 0x4f, 0xe0, 0x3f, 0x36, 0x9a, 0x64, 0xbf, 0x2e, 0x00, 0xb4, 0xb5, 0x40, 0xbe, + 0x2d, 0x9a, 0x14, 0xf6, 0x8f, 0xa5, 0xc2, 0xe2, 0x20, 0xaf, 0x21, 0x79, 0xc6, 0x32, 0x7e, 0xea, + 0x73, 0x00, 0x01, 0xbb, 0x9a, 0x19, 0x73, 0x41, 0x96, 0xae, 0x88, 0x6e, 0x36, 0x56, 0xe9, 0x9c, + 0xac, 0x04, 0x82, 0xa8, 0x00, 0xdb, 0x4e, 0x29, 0x61, 0x7e, 0xaf, 0x64, 0xdb, 0xa2, 0x70, 0x0f, +}; + static void test_rsa_encrypt(void) { static UCHAR input[] = "Hello World!"; @@ -2287,7 +2295,15 @@ static void test_rsa_encrypt(void) /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); - BCryptFinalizeKeyPair(key, 0); + BCryptDestroyKey(key); + + /* Import a different public key first to make sure a public key from private key improted next + * overrides it. */ + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsaPublicBlob, sizeof(rsaPublicBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); todo_wine { /* No padding */ @@ -2313,6 +2329,7 @@ static void test_rsa_encrypt(void) ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); ok(!memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs should be the same\n"); + ok(!memcmp(encrypted_b, rsa_encrypted_no_padding, encrypted_size), "Data mismatch.\n"); BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE); decrypted = malloc(decrypted_size);

1 0

Paul Gofman : bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 6f455e10afaf95f64008f45cdb5b794308275504 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f455e10afaf95f64008f45cdb5b79… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Dec 15 09:25:40 2022 -0600 bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing. --- dlls/bcrypt/gnutls.c | 2 ++ dlls/bcrypt/tests/bcrypt.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index bb79e885652..a67030a3ae0 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -2205,6 +2205,8 @@ static NTSTATUS key_asymmetric_encrypt( void *args ) NTSTATUS status = STATUS_SUCCESS; int ret; + if (!key_data(params->key)->a.pubkey) return STATUS_INVALID_HANDLE; + d.data = params->input; d.size = params->input_len; if ((ret = pgnutls_pubkey_encrypt_data(key_data(params->key)->a.pubkey, 0, &d, &e))) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 39cdd015c90..3bcdda0cf47 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2284,12 +2284,12 @@ static void test_rsa_encrypt(void) ret = BCryptGenerateKeyPair(rsa, &key, 512, 0); ok(ret == STATUS_SUCCESS, "got %lx\n", ret); - todo_wine { /* Not finalized key */ ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0); ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret); BCryptFinalizeKeyPair(key, 0); + todo_wine { /* No padding */ memset(input_no_padding, 0, sizeof(input_no_padding)); strcpy((char *)input_no_padding, "Hello World");

1 0

Paul Gofman : bcrypt: Set pubkey from privkey in key_asymmetric_import().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: e1fb63168756c73ebd97a8c7f3b3aba00c52e444 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1fb63168756c73ebd97a8c7f3b3ab… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 14 20:02:28 2022 -0600 bcrypt: Set pubkey from privkey in key_asymmetric_import(). --- dlls/bcrypt/gnutls.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index a67030a3ae0..89e5c91776d 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -713,8 +713,6 @@ static NTSTATUS key_export_rsa_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_rsa_raw( key_data(key)->a.pubkey, &m, &e ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_rsa_raw( key_data(key)->a.privkey, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ); else return STATUS_INVALID_PARAMETER; @@ -781,8 +779,6 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_ecc_raw( key_data(key)->a.pubkey, &curve, &x, &y ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ); else return STATUS_INVALID_PARAMETER; @@ -831,8 +827,6 @@ static NTSTATUS key_export_dsa_public( struct key *key, UCHAR *buf, ULONG len, U if (key_data(key)->a.pubkey) ret = pgnutls_pubkey_export_dsa_raw( key_data(key)->a.pubkey, &p, &q, &g, &y ); - else if (key_data(key)->a.privkey) - ret = pgnutls_privkey_export_dsa_raw( key_data(key)->a.privkey, &p, &q, &g, &y, NULL ); else return STATUS_INVALID_PARAMETER; @@ -1574,6 +1568,8 @@ static NTSTATUS key_asymmetric_import( void *args ) const struct key_asymmetric_import_params *params = args; struct key *key = params->key; unsigned flags = params->flags; + gnutls_pubkey_t pubkey; + NTSTATUS ret; switch (key->alg_id) { @@ -1583,13 +1579,15 @@ static NTSTATUS key_asymmetric_import( void *args ) case ALG_ID_ECDSA_P384: if (flags & KEY_IMPORT_FLAG_PUBLIC) return key_import_ecc_public( key, params->buf, params->len ); - return key_import_ecc( key, params->buf, params->len ); + ret = key_import_ecc( key, params->buf, params->len ); + break; case ALG_ID_RSA: case ALG_ID_RSA_SIGN: if (flags & KEY_IMPORT_FLAG_PUBLIC) return key_import_rsa_public( key, params->buf, params->len ); - return key_import_rsa( key, params->buf, params->len ); + ret = key_import_rsa( key, params->buf, params->len ); + break; case ALG_ID_DSA: if (flags & KEY_IMPORT_FLAG_PUBLIC) @@ -1599,7 +1597,10 @@ static NTSTATUS key_asymmetric_import( void *args ) return key_import_dsa_public( key, params->buf, params->len ); } if (key->u.a.flags & KEY_FLAG_LEGACY_DSA_V2) - return key_import_dsa_capi( key, params->buf, params->len ); + { + ret = key_import_dsa_capi( key, params->buf, params->len ); + break; + } FIXME( "DSA private key not supported\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1607,6 +1608,26 @@ static NTSTATUS key_asymmetric_import( void *args ) FIXME( "algorithm %u not yet supported\n", key->alg_id ); return STATUS_NOT_IMPLEMENTED; } + + if (ret) return ret; + + if ((ret = pgnutls_pubkey_init( &pubkey ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (pgnutls_pubkey_import_privkey( pubkey, key_data(params->key)->a.privkey, 0, 0 )) + { + /* Imported private key may be legitimately missing public key, so ignore the failure here. */ + pgnutls_pubkey_deinit( pubkey ); + } + else + { + if (key_data(key)->a.pubkey) pgnutls_pubkey_deinit( key_data(key)->a.pubkey ); + key_data(key)->a.pubkey = pubkey; + } + return STATUS_SUCCESS; } static NTSTATUS prepare_gnutls_signature_dsa( struct key *key, UCHAR *signature, ULONG signature_len,

1 0

Paul Gofman : bcrypt: Use SecureZeroMemory() to zero magic values before free.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: a7efc770f7b1e1da959367e3186d871dce50c6e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a7efc770f7b1e1da959367e3186d87… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Dec 14 21:13:12 2022 -0600 bcrypt: Use SecureZeroMemory() to zero magic values before free. The compiler may optimize out the assignment before free and then second free on the bcrypt handle finds magic values in the freed memory. --- dlls/bcrypt/bcrypt_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 72501faf90e..cf05e8b4d44 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -397,7 +397,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, const WC static void destroy_object( struct object *obj ) { - obj->magic = 0; + SecureZeroMemory( &obj->magic, sizeof(obj->magic) ); free( obj ); }

1 0

Zebediah Figura : win32u: Set the width and height when creating a caret from an existing bitmap.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 30398d6f3350914fc1bc127eaa43279d5e30bd0e URL: https://gitlab.winehq.org/wine/wine/-/commit/30398d6f3350914fc1bc127eaa4327… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 14 14:13:45 2022 -0600 win32u: Set the width and height when creating a caret from an existing bitmap. This was omitted in b8732c80b11. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53485 --- dlls/win32u/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index eaad697a63e..fd16d03f733 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1843,6 +1843,8 @@ BOOL WINAPI NtUserCreateCaret( HWND hwnd, HBITMAP bitmap, int width, int height BITMAP bitmap_data; if (!NtGdiExtGetObjectW( bitmap, sizeof(bitmap_data), &bitmap_data )) return FALSE; + width = bitmap_data.bmWidth; + height = bitmap_data.bmHeight; caret_bitmap = NtGdiCreateBitmap( bitmap_data.bmWidth, bitmap_data.bmHeight, bitmap_data.bmPlanes, bitmap_data.bmBitsPixel, NULL ); if (caret_bitmap)

1 0

Sven Baars : win32u: Account for 16-bit instances in find_class().
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d904f84ed01edc7ec56fbd736c3610057c5173b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/d904f84ed01edc7ec56fbd736c3610… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Dec 14 17:17:12 2022 +0100 win32u: Account for 16-bit instances in find_class(). This mimics the condition in the server. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53384 --- dlls/win32u/class.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index b18fd69edfc..9f3b4251e65 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -353,8 +353,9 @@ static void release_class_ptr( CLASS *ptr ) static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) { ATOM atom = get_int_atom_value( name ); - ULONG_PTR instance = (UINT_PTR)module & ~0xffff; + ULONG_PTR instance = (UINT_PTR)module; CLASS *class; + int is_win16; user_lock(); LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry ) @@ -368,7 +369,9 @@ static CLASS *find_class( HINSTANCE module, UNICODE_STRING *name ) if (wcsnicmp( class->name, name->Buffer, name->Length / sizeof(WCHAR) ) || class->name[name->Length / sizeof(WCHAR)]) continue; } - if (!class->local || !module || (class->instance & ~0xffff) == instance) + is_win16 = !(class->instance >> 16); + if (!instance || !class->local || class->instance == instance || + (!is_win16 && ((class->instance & ~0xffff) == (instance & ~0xffff)))) { TRACE( "%s %lx -> %p\n", debugstr_us(name), instance, class ); return class;

1 0

Gabriel Ivăncescu : jscript: Fix array ref leak when setting element.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d1f176b49749dafd42c2ff349ff228d9a2b052d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1f176b49749dafd42c2ff349ff228… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Fix array ref leak when setting element. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 28ada7e53bd..b0557065e69 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1684,7 +1684,7 @@ static HRESULT interp_carray_set(script_ctx_t *ctx) array = stack_top(ctx); assert(is_object_instance(array)); - hres = jsdisp_propput_idx(iface_to_jsdisp(get_object(array)), index, value); + hres = jsdisp_propput_idx(to_jsdisp(get_object(array)), index, value); jsval_release(value); return hres; }

1 0

Gabriel Ivăncescu : jscript: Fix refcount trace's long type format specifier.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: b77255f88b1f54c4ceea5713367f2fc82030f2bc URL: https://gitlab.winehq.org/wine/wine/-/commit/b77255f88b1f54c4ceea5713367f2f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Fix refcount trace's long type format specifier. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 06e44fcb129..2c35f2ae9cc 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2247,7 +2247,7 @@ void jsdisp_free(jsdisp_t *obj) jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) { ULONG ref = ++jsdisp->ref; - TRACE("(%p) ref=%d\n", jsdisp, ref); + TRACE("(%p) ref=%ld\n", jsdisp, ref); return jsdisp; } @@ -2255,7 +2255,7 @@ void jsdisp_release(jsdisp_t *jsdisp) { ULONG ref = --jsdisp->ref; - TRACE("(%p) ref=%d\n", jsdisp, ref); + TRACE("(%p) ref=%ld\n", jsdisp, ref); if(!ref) jsdisp_free(jsdisp);

1 0

Gabriel Ivăncescu : jscript: Release converted args after invoking.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 2ecf699dca93c44dd14ee93cc4d47617dd7b6479 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ecf699dca93c44dd14ee93cc4d476… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 jscript: Release converted args after invoking. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 04632f4c755..06e44fcb129 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1937,6 +1937,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc else hres = jsdisp_call_value(This, passed_this ? jsval_disp(passed_this) : jsval_undefined(), wFlags, argc, argv, pvarRes ? &r : NULL); + while(argc--) + jsval_release(argv[argc]); if(argv != buf) free(argv); if(SUCCEEDED(hres) && pvarRes) {

1 0

Gabriel Ivăncescu : mshtml: Fix document fragment's inner window leak.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: d38c1c1076d04089eedc47fa532ed8ec0e69a5ee URL: https://gitlab.winehq.org/wine/wine/-/commit/d38c1c1076d04089eedc47fa532ed8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 mshtml: Fix document fragment's inner window leak. Document fragments own reference to the inner window, so it must be unlinked. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 49640cff9da..90c4706abee 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5846,12 +5846,6 @@ void detach_document_node(HTMLDocumentNode *doc) doc->catmgr = NULL; } - if(!doc->dom_document && doc->window) { - /* document fragments own reference to inner window */ - IHTMLWindow2_Release(&doc->window->base.IHTMLWindow2_iface); - doc->window = NULL; - } - if(doc->browser) { list_remove(&doc->browser_entry); doc->browser = NULL; @@ -5935,6 +5929,19 @@ static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode return S_OK; } +static void HTMLDocumentFragment_unlink(HTMLDOMNode *iface) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + + if(This->window) { + detach_document_node(This); + + /* document fragments own reference to inner window */ + IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); + This->window = NULL; + } +} + static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); @@ -6134,7 +6141,21 @@ static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { HTMLDocumentNode_QI, HTMLDocumentNode_destructor, HTMLDocumentNode_cpc, - HTMLDocumentFragment_clone + HTMLDocumentFragment_clone, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLDocumentFragment_unlink }; static const tid_t HTMLDocumentNode_iface_tids[] = {

1 0

Gabriel Ivăncescu : mshtml: Fix previous EventObj leak.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: wine Branch: master Commit: 10a6b80811af5965a393cfb62bb4e057f30184dd URL: https://gitlab.winehq.org/wine/wine/-/commit/10a6b80811af5965a393cfb62bb4e0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 14 22:06:07 2022 +0200 mshtml: Fix previous EventObj leak. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 45db4719b10..bcde9f38bba 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3683,11 +3683,14 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, *r = variant_bool(!event->prevent_default); if(target_vtbl && target_vtbl->set_current_event) { - prev_event = target_vtbl->set_current_event(&event_target->dispex, prev_event); - if(prev_event) - IHTMLEventObj_Release(prev_event); + IHTMLEventObj *prev = target_vtbl->set_current_event(&event_target->dispex, prev_event); + if(prev) + IHTMLEventObj_Release(prev); } + if(prev_event) + IHTMLEventObj_Release(prev_event); + if(event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS) { BOOL prevent_default = event->prevent_default; for(i = 0; !prevent_default && i < chain_cnt; i++) {

1 0

Francois Gouget : winetest/build-patterns: Fix the summary pattern for the success case.
by Alexandre Julliard Dec. 15, 2022

Dec. 15, 2022

Module: tools Branch: master Commit: e2c6973cac94d42664f786b94387ce21a3116d3a URL: https://gitlab.winehq.org/winehq/tools/-/commit/e2c6973cac94d42664f786b9438… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Dec 11 04:07:17 2022 +0100 winetest/build-patterns: Fix the summary pattern for the success case. The data for the summary pattern is stored under the "0" pseudo-test name. But that pseudo-test was never marked as present so that if no other test failed it would be marked as 'missing in this build' instead of as 'successful run'. --- winetest/build-patterns | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index 14b1917c..d541d5a2 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -366,6 +366,7 @@ foreach my $build (@sortedbuilds) $reports{$reportdir} = $report; } $build->{hasreport}->{$reportdir} = 1; + $build->{hastest}->{0} = 1; # summary results are present in all builds } while (my $line = <$fh>)

1 0