February 2023 - Wine-Commits

Zebediah Figura : user32/tests: Use ok() instead of assert().
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 366b84295d27b363a698f4a8e6779c0f09606b7e URL: https://gitlab.winehq.org/wine/wine/-/commit/366b84295d27b363a698f4a8e6779c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:14:34 2023 -0600 user32/tests: Use ok() instead of assert(). --- dlls/user32/tests/msg.c | 108 ++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 49 deletions(-)

1 0

Zebediah Figura : user32/tests: Test WM_DEVICECHANGE Unicode conversion.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 8675cad31c66b6620150a897545f705c1d17a59f URL: https://gitlab.winehq.org/wine/wine/-/commit/8675cad31c66b6620150a897545f70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:23:08 2023 -0600 user32/tests: Test WM_DEVICECHANGE Unicode conversion. --- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 268ed9d8b8f..cca211cc22a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -22,6 +22,7 @@ #include <limits.h> #include <stdarg.h> +#include <stdbool.h> #include <stdio.h> #include "windef.h" @@ -11038,8 +11039,14 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, static const WCHAR wszUnicode[] = {'U','n','i','c','o','d','e',0}; static const WCHAR wszAnsi[] = {'U',0}; +static const GUID iface_guid = {0x66666666}; +static bool got_device_broadcast; + static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + const DEV_BROADCAST_DEVICEINTERFACE_A *ifaceA = (const void *)lParam; + const DEV_BROADCAST_DEVICEINTERFACE_W *ifaceW = (const void *)lParam; + switch (uMsg) { case CB_FINDSTRINGEXACT: @@ -11048,6 +11055,30 @@ static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, if (!lstrcmpW((LPCWSTR)lParam, wszAnsi)) return 0; return -1; + + case WM_DEVICECHANGE: + if (wParam == DBT_DEVICEARRIVAL && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[strlen(ifaceA->dbcc_name)]); + + ok(ifaceA->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceA->dbcc_size); + ok(ifaceA->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceA->dbcc_devicetype); + ok(!ifaceA->dbcc_reserved, "Got reserved %#lx.\n", ifaceA->dbcc_reserved); + ok(!strcmp(ifaceA->dbcc_name, "test name"), "Got name %s.\n", debugstr_a(ifaceA->dbcc_name)); + return 2; + } + else if (wParam == DBT_CUSTOMEVENT && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen(ifaceW->dbcc_name) + 1]); + + ok(ifaceW->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceW->dbcc_size); + ok(ifaceW->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceW->dbcc_devicetype); + ok(!ifaceW->dbcc_reserved, "Got reserved %#lx.\n", ifaceW->dbcc_reserved); + ok(!wcscmp(ifaceW->dbcc_name, L"test name"), "Got name %s.\n", debugstr_w(ifaceW->dbcc_name)); + got_device_broadcast = true; + } } return DefWindowProcW(hwnd, uMsg, wParam, lParam); } @@ -11079,6 +11110,8 @@ static void test_message_conversion(void) { static const WCHAR wszMsgConversionClass[] = {'M','s','g','C','o','n','v','e','r','s','i','o','n','C','l','a','s','s',0}; + char buffer[200]; + DEV_BROADCAST_DEVICEINTERFACE_A *dev_interface = (void *)buffer; WNDCLASSW cls; LRESULT lRes; HWND hwnd; @@ -11161,6 +11194,20 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError()); + /* Test WM_DEVICECHANGE. */ + + dev_interface->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + dev_interface->dbcc_reserved = 0; + dev_interface->dbcc_classguid = iface_guid; + strcpy(dev_interface->dbcc_name, "test name"); + dev_interface->dbcc_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, + dbcc_name[strlen(dev_interface->dbcc_name)]); + lRes = SendMessageA(hwnd, WM_DEVICECHANGE, DBT_DEVICEARRIVAL, (LPARAM)dev_interface); + ok(lRes == 2, "Got %Id, error %lu.\n", lRes, GetLastError()); + lRes = BroadcastSystemMessageA(0, NULL, WM_DEVICECHANGE, DBT_CUSTOMEVENT, (LPARAM)dev_interface); + todo_wine ok(!lRes, "Got %Id, error %lu.\n", lRes, GetLastError()); + todo_wine ok(got_device_broadcast, "Device broadcast was not received.\n"); + DestroyWindow(hwnd); /* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */

1 0

Zebediah Figura : user32/tests: Avoid leaking a window in test_message_conversion().
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: ea2935add7936472ba091a9f39889ab42d3ae1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea2935add7936472ba091a9f39889a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:22:33 2023 -0600 user32/tests: Avoid leaking a window in test_message_conversion(). --- dlls/user32/tests/msg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e4174ebff2b..268ed9d8b8f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11161,6 +11161,8 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError()); + DestroyWindow(hwnd); + /* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */ hwnd = CreateWindowW (testWindowClassW, wszUnicode,

1 0

Alex Henrie : http: Avoid calling RtlInitUnicodeString on a constant.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 51bc735f7013b50e9b6bb55d9c2e131b657b7e11 URL: https://gitlab.winehq.org/wine/wine/-/commit/51bc735f7013b50e9b6bb55d9c2e13… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Feb 8 21:23:01 2023 -0700 http: Avoid calling RtlInitUnicodeString on a constant. --- dlls/http.sys/http.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 680ef30730c..c2234aa14ad 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1199,19 +1199,18 @@ static void WINAPI unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING string; + UNICODE_STRING device_http = RTL_CONSTANT_STRING(L"\\Device\\Http"); + UNICODE_STRING device_http_req_queue = RTL_CONSTANT_STRING(L"\\Device\\Http\\ReqQueue"); WSADATA wsadata; NTSTATUS ret; TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); - RtlInitUnicodeString(&string, L"\\Device\\Http"); - attr.ObjectName = &string; + attr.ObjectName = &device_http; if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) ERR("Failed to create \\Device\\Http directory, status %#lx.\n", ret); - RtlInitUnicodeString(&string, L"\\Device\\Http\\ReqQueue"); - if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) + if ((ret = IoCreateDevice(driver, 0, &device_http_req_queue, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) { ERR("Failed to create request queue device, status %#lx.\n", ret); NtClose(directory_obj);

1 0

Alexandre Julliard : wow64: Preserve the CPURESERVED flags across user callbacks.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 51c3cfddfe03fa35ab21aeac6230c28d877b20f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/51c3cfddfe03fa35ab21aeac6230c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 13:55:54 2023 +0100 wow64: Preserve the CPURESERVED flags across user callbacks. --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 41860aeb281..d2242134819 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -1044,9 +1044,11 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { + WOW64_CPURESERVED *cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED]; TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); ULONG teb_frame = teb32->Tib.ExceptionList; struct user_callback_frame frame; + USHORT flags = cpu->Flags; frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; frame.temp_list = NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST]; @@ -1115,6 +1117,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, teb32->Tib.ExceptionList = teb_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; + cpu->Flags = flags; return frame.status; }

1 0

Alexandre Julliard : wow64: Call the CPU backend to get/set the current thread context.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: f555ee3b0380acbf5a098ef224e54e7e1d664e7b URL: https://gitlab.winehq.org/wine/wine/-/commit/f555ee3b0380acbf5a098ef224e54e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 12:55:36 2023 +0100 wow64: Call the CPU backend to get/set the current thread context. --- dlls/wow64/syscall.c | 100 +++++++++++++++++++++++---------------------------- dlls/wow64cpu/cpu.c | 4 +-- 2 files changed, 47 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : wow64: Call the thread init entry point in the CPU backend.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 06dc0473460f3667fb24b73cae38b139e46a23f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/06dc0473460f3667fb24b73cae38b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 13:56:43 2023 +0100 wow64: Call the thread init entry point in the CPU backend. --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 7555fdd4ee4..e9b8df76e7c 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -96,6 +96,7 @@ static void * (WINAPI *pBTCpuGetBopCode)(void); static NTSTATUS (WINAPI *pBTCpuGetContext)(HANDLE,HANDLE,void *,void *); static void (WINAPI *pBTCpuProcessInit)(void); static NTSTATUS (WINAPI *pBTCpuSetContext)(HANDLE,HANDLE,void *,void *); +static void (WINAPI *pBTCpuThreadInit)(void); static void (WINAPI *pBTCpuSimulate)(void); static NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ); static void * (WINAPI *p__wine_get_unix_opcode)(void); @@ -771,6 +772,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuGetBopCode ); GET_PTR( BTCpuGetContext ); GET_PTR( BTCpuProcessInit ); + GET_PTR( BTCpuThreadInit ); GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); @@ -802,6 +804,7 @@ static void thread_init(void) void *cpu_area_ctx; RtlWow64GetCurrentCpuArea( NULL, &cpu_area_ctx, NULL ); + if (pBTCpuThreadInit) pBTCpuThreadInit(); /* update initial context to jump to 32-bit LdrInitializeThunk (cf. 32-bit call_init_thunk) */ switch (current_machine)

1 0

Alexandre Julliard : wow64: Move some exception and context functions to syscall.c.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 58ced9adff675ead7ba290388c30dca5ec60f64e URL: https://gitlab.winehq.org/wine/wine/-/commit/58ced9adff675ead7ba290388c30dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 10 12:54:03 2023 +0100 wow64: Move some exception and context functions to syscall.c. --- dlls/wow64/process.c | 263 -------------------------------------------------- dlls/wow64/syscall.c | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 267 insertions(+), 263 deletions(-)

1 0

Jason Millard : vbscript: Fix memory leak in owned safearray iterator.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: a8c319cad691a53cfd333ab72dbbeac4558f7c75 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8c319cad691a53cfd333ab72dbbea… Author: Jason Millard <jsm174(a)gmail.com> Date: Thu Feb 9 13:11:56 2023 -0500 vbscript: Fix memory leak in owned safearray iterator. --- dlls/vbscript/interp.c | 2 +- dlls/vbscript/utils.c | 9 +++++++-- dlls/vbscript/vbscript.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 4881efa9454..eb1dcab5f01 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1487,7 +1487,7 @@ static HRESULT interp_newenum(exec_ctx_t *ctx) case VT_VARIANT|VT_ARRAY|VT_BYREF: { IEnumVARIANT *iter; - hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), &iter); + hres = create_safearray_iter(V_ISBYREF(v.v) ? *V_ARRAYREF(v.v) : V_ARRAY(v.v), v.owned && !V_ISBYREF(v.v), &iter); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/utils.c b/dlls/vbscript/utils.c index 03b1abde481..4bfc2c65a0a 100644 --- a/dlls/vbscript/utils.c +++ b/dlls/vbscript/utils.c @@ -28,6 +28,7 @@ typedef struct { LONG ref; SAFEARRAY *sa; + BOOL owned; ULONG i, size; } safearray_iter; @@ -75,8 +76,11 @@ static ULONG WINAPI safearray_iter_IEnumVARIANT_Release(IEnumVARIANT *iface) TRACE("(%p) ref=%ld\n", iface, ref); if(!ref) { - if(This->sa) + if(This->sa) { SafeArrayUnlock(This->sa); + if(This->owned) + SafeArrayDestroy(This->sa); + } free(This); } @@ -160,7 +164,7 @@ static ULONG get_safearray_size(SAFEARRAY *sa) return ret; } -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) { safearray_iter *iter; HRESULT hres; @@ -185,6 +189,7 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) iter->IEnumVARIANT_iface.lpVtbl = &safearray_iter_EnumVARIANTVtbl; iter->ref = 1; iter->sa = sa; + iter->owned = owned; iter->i = 0; iter->size = get_safearray_size(sa); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5b0a2222767..13bcf704bf0 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -415,7 +415,7 @@ BSTR string_replace(BSTR,BSTR,BSTR,int,int,int) DECLSPEC_HIDDEN; void map_vbs_exception(EXCEPINFO *) DECLSPEC_HIDDEN; -HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; +HRESULT create_safearray_iter(SAFEARRAY *sa, BOOL owned, IEnumVARIANT **ev) DECLSPEC_HIDDEN; #define FACILITY_VBS 0xa #define MAKE_VBSERROR(code) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_VBS, code)

1 0

Hans Leidekker : ntdll: Look at CurrentMajor/MinorVersionNumber registry values before CurrentVersion.
by Alexandre Julliard Feb. 9, 2023

Feb. 9, 2023

Module: wine Branch: master Commit: 0692d07f85f30ee5191a781b8b6f51006f2ae407 URL: https://gitlab.winehq.org/wine/wine/-/commit/0692d07f85f30ee5191a781b8b6f51… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 9 13:45:02 2023 +0100 ntdll: Look at CurrentMajor/MinorVersionNumber registry values before CurrentVersion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54463 --- dlls/ntdll/version.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 3a903c54c6b..9c396598d4e 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -276,18 +276,36 @@ static BOOL get_nt_registry_version( RTL_OSVERSIONINFOEXW *version ) memset( version, 0, sizeof(*version) ); - RtlInitUnicodeString( &valueW, L"CurrentVersion" ); - if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count )) + RtlInitUnicodeString( &valueW, L"CurrentMajorVersionNumber" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ) && + info->Type == REG_DWORD) { - WCHAR *p, *str = (WCHAR *)info->Data; - str[info->DataLength / sizeof(WCHAR)] = 0; - p = wcschr( str, '.' ); - if (p) + version->dwMajorVersion = *(DWORD *)info->Data; + + RtlInitUnicodeString( &valueW, L"CurrentMinorVersionNumber" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count ) && + info->Type == REG_DWORD) { - *p++ = 0; - version->dwMinorVersion = wcstoul( p, NULL, 10 ); + version->dwMinorVersion = *(DWORD *)info->Data; + } + else version->dwMajorVersion = 0; + } + + if (!version->dwMajorVersion) + { + RtlInitUnicodeString( &valueW, L"CurrentVersion" ); + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, tmp, sizeof(tmp)-1, &count )) + { + WCHAR *p, *str = (WCHAR *)info->Data; + str[info->DataLength / sizeof(WCHAR)] = 0; + p = wcschr( str, '.' ); + if (p) + { + *p++ = 0; + version->dwMinorVersion = wcstoul( p, NULL, 10 ); + } + version->dwMajorVersion = wcstoul( str, NULL, 10 ); } - version->dwMajorVersion = wcstoul( str, NULL, 10 ); } if (version->dwMajorVersion) /* we got the main version, now fetch the other fields */

1 0