July 2022 - Wine-Commits - list.winehq.org

Claire Girka : ntoskrnl/tests: Add test for getting SPDRP_BASE_CONTAINERID from PnP driver.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: d930a0cc5ee1c0468b5955e8d312ed035c35559e URL: https://gitlab.winehq.org/wine/wine/-/commit/d930a0cc5ee1c0468b5955e8d312ed… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 20:00:54 2022 +0200 ntoskrnl/tests: Add test for getting SPDRP_BASE_CONTAINERID from PnP driver. --- dlls/ntoskrnl.exe/tests/driver_pnp.c | 5 ++++- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_pnp.c b/dlls/ntoskrnl.exe/tests/driver_pnp.c index 1f22c4b9997..9a965f584cd 100644 --- a/dlls/ntoskrnl.exe/tests/driver_pnp.c +++ b/dlls/ntoskrnl.exe/tests/driver_pnp.c @@ -228,7 +228,10 @@ static NTSTATUS query_id(struct device *device, IRP *irp, BUS_QUERY_ID_TYPE type } case BusQueryContainerID: - return STATUS_NOT_SUPPORTED; + if (!(id = ExAllocatePool(PagedPool, 39 * sizeof(WCHAR)))) + return STATUS_NO_MEMORY; + wcscpy(id, L"{12345678-1234-1234-1234-123456789123}"); + break; default: ok(0, "Unexpected ID query type %#x.\n", type); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 64debcbebbf..6d1185301eb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1462,6 +1462,7 @@ static void test_pnp_devices(void) static const char expect_compat_id[] = "winetest_compat\0winetest_compat_1\0"; char buffer[200]; + WCHAR buffer_w[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; @@ -1646,6 +1647,11 @@ static void test_pnp_devices(void) ok(size == sizeof(expect_hardware_id), "got size %lu\n", size); ok(!memcmp(buffer, expect_hardware_id, size), "got hardware IDs %s\n", debugstr_an(buffer, size)); + /* Using the WCHAR variant because Windows returns a WCHAR for this property even when using SetupDiGetDeviceRegistryPropertyA */ + ret = SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_BASE_CONTAINERID, + &type, (BYTE *)buffer_w, sizeof(buffer_w), &size); + todo_wine ok(ret, "got error %#lx\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_COMPATIBLEIDS, &type, (BYTE *)buffer, sizeof(buffer), &size); ok(ret, "got error %#lx\n", GetLastError());

1 0

Claire Girka : setupapi: Add support for SPDRP_BASE_CONTAINERID.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: f7f109d9d301be9062c480a9a2f34774c49e77ca URL: https://gitlab.winehq.org/wine/wine/-/commit/f7f109d9d301be9062c480a9a2f347… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 12:11:40 2022 +0200 setupapi: Add support for SPDRP_BASE_CONTAINERID. --- dlls/setupapi/devinst.c | 2 ++ include/setupapi.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 73e721753aa..901af4650c8 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -96,6 +96,7 @@ static const WCHAR Capabilities[] = {'C','a','p','a','b','i','l','i','t','i','e' static const WCHAR UINumber[] = {'U','I','N','u','m','b','e','r',0}; static const WCHAR UpperFilters[] = {'U','p','p','e','r','F','i','l','t','e','r','s',0}; static const WCHAR LowerFilters[] = {'L','o','w','e','r','F','i','l','t','e','r','s',0}; +static const WCHAR ContainerId[] = {'C','o','n','t','a','i','n','e','r','I','d',0}; static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; @@ -654,6 +655,7 @@ static const struct PropertyMapEntry PropertyMap[] = { { REG_DWORD, "UINumber", UINumber }, { REG_MULTI_SZ, "UpperFilters", UpperFilters }, { REG_MULTI_SZ, "LowerFilters", LowerFilters }, + [SPDRP_BASE_CONTAINERID] = { REG_SZ, "ContainerId", ContainerId }, }; static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, diff --git a/include/setupapi.h b/include/setupapi.h index 14e3774fc42..806df7baaf5 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1315,7 +1315,8 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define SPDRP_REMOVAL_POLICY_HW_DEFAULT 0x00000020 #define SPDRP_REMOVAL_POLICY_OVERRIDE 0x00000021 #define SPDRP_INSTALL_STATE 0x00000022 -#define SPDRP_MAXIMUM_PROPERTY 0x00000023 +#define SPDRP_BASE_CONTAINERID 0x00000024 +#define SPDRP_MAXIMUM_PROPERTY 0x00000025 #define DPROMPT_SUCCESS 0 #define DPROMPT_CANCEL 1

1 0

Claire Girka : hidclass: Expose ContainerID from underlying driver.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: bfb7fe4bfb050ca59dc0dec74a29e70b43b5f74a URL: https://gitlab.winehq.org/wine/wine/-/commit/bfb7fe4bfb050ca59dc0dec74a29e7… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 12:44:39 2022 +0200 hidclass: Expose ContainerID from underlying driver. --- dlls/hidclass.sys/hid.h | 1 + dlls/hidclass.sys/pnp.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index e20f12809eb..b8cec55fb7c 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -81,6 +81,7 @@ typedef struct _BASE_DEVICE_EXTENSION * for convenience. */ WCHAR device_id[MAX_DEVICE_ID_LEN]; WCHAR instance_id[MAX_DEVICE_ID_LEN]; + WCHAR container_id[MAX_GUID_STRING_LEN]; const GUID *class_guid; BOOL is_fdo; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index d2d3dc25b95..91624b40eff 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -173,6 +173,9 @@ static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *b swprintf(ext->device_id, ARRAY_SIZE(ext->device_id), L"HID\\%s", wcsrchr(device_id, '\\') + 1); wcscpy(ext->instance_id, instance_id); + if (get_device_id(bus_pdo, BusQueryContainerID, ext->container_id)) + ext->container_id[0] = 0; + is_xinput_class = !wcsncmp(device_id, L"WINEXINPUT\\", 7) && wcsstr(device_id, L"&XI_") != NULL; if (is_xinput_class) ext->class_guid = &GUID_DEVINTERFACE_WINEXINPUT; else ext->class_guid = &GUID_DEVINTERFACE_HID; @@ -229,6 +232,7 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) KeInitializeSpinLock( &pdo_ext->u.pdo.queues_lock ); wcscpy(pdo_ext->device_id, fdo_ext->device_id); wcscpy(pdo_ext->instance_id, fdo_ext->instance_id); + wcscpy(pdo_ext->container_id, fdo_ext->container_id); pdo_ext->class_guid = fdo_ext->class_guid; pdo_ext->u.pdo.information.VendorID = attr.VendorID; @@ -416,8 +420,19 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = (ULONG_PTR)id; status = STATUS_SUCCESS; break; - case BusQueryContainerID: + if (ext->container_id[0]) + { + lstrcpyW(id, ext->container_id); + irp->IoStatus.Information = (ULONG_PTR)id; + status = STATUS_SUCCESS; + } + else + { + ExFreePool(id); + } + break; + case BusQueryDeviceSerialNumber: FIXME("unimplemented id type %#x\n", irpsp->Parameters.QueryId.IdType); ExFreePool(id);

1 0

Alistair Leslie-Hughes : xactengine3_7: Remove entry after FAudio Destroyed call.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 5f6425f0efa74a44bdeb65f065a9db3a19e9628c URL: https://gitlab.winehq.org/wine/wine/-/commit/5f6425f0efa74a44bdeb65f065a9db… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 12:34:27 2022 +1000 xactengine3_7: Remove entry after FAudio Destroyed call. FACTWaveBank_Destroy will invoke the callback which we attempt to lookup the wavebank. The callback must have a pointer, help states it isn't valid but still points to the wavebank that was destroyed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/tests/xact3.c | 6 ++-- dlls/xactengine3_7/xact_dll.c | 70 ++++++++++++++++++++++------------------ 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 5daa18ca81b..6b66af59ff0 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -172,9 +172,11 @@ static void WINAPI notification_cb(const XACT_NOTIFICATION *notification) data->received = TRUE; ok(notification->type == data->type, "Unexpected notification type %u\n", notification->type); - todo_wine_if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) - ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n", + if(notification->type == XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED) + { + ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n", notification->waveBank.pWaveBank, data->wave_bank); + } ok(thread_id == data->thread_id, "Unexpected thread id %#lx instead of %#lx\n", thread_id, data->thread_id); } diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index f7be480656d..ee559dd4b07 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -60,6 +60,21 @@ struct wrapper_lookup void *xact; }; +typedef struct _XACT3EngineImpl { + IXACT3Engine IXACT3Engine_iface; + + FACTAudioEngine *fact_engine; + + XACT_READFILE_CALLBACK pReadFile; + XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; + XACT_NOTIFICATION_CALLBACK notification_callback; + + void *wb_prepared_context; + void *wb_destroyed_context; + struct wine_rb_tree wb_wrapper_lookup; + CRITICAL_SECTION wb_wrapper_lookup_cs; +} XACT3EngineImpl; + static int wrapper_lookup_compare(const void *key, const struct wine_rb_entry *entry) { struct wrapper_lookup *lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); @@ -74,20 +89,30 @@ static void wrapper_lookup_destroy(struct wine_rb_entry *entry, void *context) HeapFree(GetProcessHeap(), 0, lookup); } -typedef struct _XACT3EngineImpl { - IXACT3Engine IXACT3Engine_iface; +static void wrapper_remove_entry(XACT3EngineImpl *engine, void *key) +{ + struct wrapper_lookup *lookup; + struct wine_rb_entry *entry; - FACTAudioEngine *fact_engine; + EnterCriticalSection(&engine->wb_wrapper_lookup_cs); - XACT_READFILE_CALLBACK pReadFile; - XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; - XACT_NOTIFICATION_CALLBACK notification_callback; + entry = wine_rb_get(&engine->wb_wrapper_lookup, key); + if (!entry) + { + LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); - void *wb_prepared_context; - void *wb_destroyed_context; - struct wine_rb_tree wb_wrapper_lookup; - CRITICAL_SECTION wb_wrapper_lookup_cs; -} XACT3EngineImpl; + WARN("cannot find key in wrapper lookup\n"); + } + else + { + wine_rb_remove(&engine->wb_wrapper_lookup, entry); + + LeaveCriticalSection(&engine->wb_wrapper_lookup_cs); + + lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); + HeapFree(GetProcessHeap(), 0, lookup); + } +} typedef struct _XACT3CueImpl { IXACT3Cue IXACT3Cue_iface; @@ -591,33 +616,14 @@ static inline XACT3WaveBankImpl *impl_from_IXACT3WaveBank(IXACT3WaveBank *iface) static HRESULT WINAPI IXACT3WaveBankImpl_Destroy(IXACT3WaveBank *iface) { XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); - struct wrapper_lookup *lookup; - struct wine_rb_entry *entry; HRESULT hr; TRACE("(%p)\n", This); - EnterCriticalSection(&This->engine->wb_wrapper_lookup_cs); - - entry = wine_rb_get(&This->engine->wb_wrapper_lookup, This->fact_wavebank); - - if (!entry) - { - LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs); - - WARN("cannot find wave bank in wrapper lookup\n"); - } - else - { - wine_rb_remove(&This->engine->wb_wrapper_lookup, entry); + hr = FACTWaveBank_Destroy(This->fact_wavebank); - LeaveCriticalSection(&This->engine->wb_wrapper_lookup_cs); + wrapper_remove_entry(This->engine, This->fact_wavebank); - lookup = WINE_RB_ENTRY_VALUE(entry, struct wrapper_lookup, entry); - HeapFree(GetProcessHeap(), 0, lookup); - } - - hr = FACTWaveBank_Destroy(This->fact_wavebank); HeapFree(GetProcessHeap(), 0, This); return hr; }

1 0

Claire Girka : hidclass: Improve error handling in get_device_id.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 8ed6b1609cb028ee82c01152e3330f1a4036976b URL: https://gitlab.winehq.org/wine/wine/-/commit/8ed6b1609cb028ee82c01152e3330f… Author: Claire Girka <claire(a)sitedethib.com> Date: Tue Jul 12 12:22:43 2022 +0200 hidclass: Improve error handling in get_device_id. Do not assume the underlying driver will return meaningful data, as it may not support BusQueryContainerID which will be queried in a next commit. --- dlls/hidclass.sys/pnp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 873c55c4a67..d2d3dc25b95 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -84,11 +84,16 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH irpsp->MinorFunction = IRP_MN_QUERY_ID; irpsp->Parameters.QueryId.IdType = type; + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; if (IoCallDriver(device, irp) == STATUS_PENDING) KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL); - wcscpy(id, (WCHAR *)irp_status.Information); - ExFreePool((WCHAR *)irp_status.Information); + if (!irp_status.Status) + { + wcscpy(id, (WCHAR *)irp_status.Information); + ExFreePool((WCHAR *)irp_status.Information); + } + return irp_status.Status; }

1 0

Eric Pouech : winedbg: Use CRT allocation functions.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 890e3baaba9e2f13c4c09b005fdf6cc564137bb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/890e3baaba9e2f13c4c09b005fdf6c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jul 20 14:28:42 2022 +0200 winedbg: Use CRT allocation functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/break.c | 10 +++++----- programs/winedbg/crashdlg.c | 10 +++------- programs/winedbg/dbg.y | 14 +++++++------- programs/winedbg/debug.l | 6 +++--- programs/winedbg/debugger.h | 6 ------ programs/winedbg/display.c | 12 ++++++------ programs/winedbg/expr.c | 24 ++++++++++++------------ programs/winedbg/gdbproxy.c | 4 ++-- programs/winedbg/info.c | 16 ++++++++-------- programs/winedbg/memory.c | 8 ++++---- programs/winedbg/source.c | 14 +++++++------- programs/winedbg/stack.c | 6 +++--- programs/winedbg/tgt_active.c | 8 ++++---- programs/winedbg/tgt_minidump.c | 4 ++-- programs/winedbg/tgt_module.c | 4 ++-- programs/winedbg/winedbg.c | 26 +++++++++++--------------- 16 files changed, 79 insertions(+), 93 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserDisableThreadIme.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 43c851c796b06ed54fe093b859134063d457ba27 URL: https://gitlab.winehq.org/wine/wine/-/commit/43c851c796b06ed54fe093b8591340… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 22:25:16 2022 +0200 win32u: Use syscall interface for NtUserDisableThreadIme. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index f7df8f88cb6..d4c9a1a3861 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1140,7 +1140,6 @@ static struct unix_funcs unix_funcs = NtUserDeferWindowPosAndBand, NtUserDestroyMenu, NtUserDestroyWindow, - NtUserDisableThreadIme, NtUserDrawCaptionTemp, NtUserDrawMenuBarTemp, NtUserEnableMenuItem, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 92077671eb6..d04e4dc2cf3 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -132,6 +132,7 @@ static void * const syscalls[] = NtUserDestroyAcceleratorTable, NtUserDestroyCursor, NtUserDestroyInputContext, + NtUserDisableThreadIme, NtUserDispatchMessage, NtUserDragDetect, NtUserDrawIconEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c0ad2866b48..555aaecdfb5 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -837,7 +837,7 @@ @ stdcall NtUserDestroyWindow(long) @ stub NtUserDisableImmersiveOwner @ stub NtUserDisableProcessWindowFiltering -@ stdcall NtUserDisableThreadIme(long) +@ stdcall -syscall NtUserDisableThreadIme(long) @ stub NtUserDiscardPointerFrameMessages @ stdcall -syscall NtUserDispatchMessage(ptr) @ stub NtUserDisplayConfigGetDeviceInfo diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 722bee43944..c7aac2edd75 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -196,7 +196,6 @@ struct unix_funcs UINT flags, UINT unk1, UINT unk2 ); BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle ); BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); - BOOL (WINAPI *pNtUserDisableThreadIme)( DWORD thread_id ); BOOL (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ); DWORD (WINAPI *pNtUserDrawMenuBarTemp)( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 9694c203fcb..f4847d06480 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -758,12 +758,6 @@ BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) return unix_funcs->pNtUserDestroyWindow( hwnd ); } -BOOL WINAPI NtUserDisableThreadIme( DWORD thread_id ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserDisableThreadIme( thread_id ); -} - BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 7bdf8dd32cd..95ceeb9e16d 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -119,6 +119,7 @@ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserDestroyCursor ) \ SYSCALL_ENTRY( NtUserDestroyInputContext ) \ + SYSCALL_ENTRY( NtUserDisableThreadIme ) \ SYSCALL_ENTRY( NtUserDispatchMessage ) \ SYSCALL_ENTRY( NtUserDragDetect ) \ SYSCALL_ENTRY( NtUserDrawIconEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 8c971154448..a3e880c46ed 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -458,6 +458,13 @@ NTSTATUS WINAPI wow64_NtUserDestroyInputContext( UINT *args ) return NtUserDestroyInputContext( handle ); } +NTSTATUS WINAPI wow64_NtUserDisableThreadIme( UINT *args ) +{ + DWORD thread_id = get_ulong( &args ); + + return NtUserDisableThreadIme( thread_id ); +} + NTSTATUS WINAPI wow64_NtUserDispatchMessage( UINT *args ) { const MSG32 *msg32 = get_ptr( &args );

1 0

Jacek Caban : win32u: Use syscall interface for more input functions.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 8ecb3aa5cc3a061b978d645a807a35884749415a URL: https://gitlab.winehq.org/wine/wine/-/commit/8ecb3aa5cc3a061b978d645a807a35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 22:19:14 2022 +0200 win32u: Use syscall interface for more input functions. --- dlls/win32u/gdiobj.c | 8 ----- dlls/win32u/syscall.c | 8 +++++ dlls/win32u/win32u.spec | 16 ++++----- dlls/win32u/win32u_private.h | 8 ----- dlls/win32u/wrappers.c | 48 --------------------------- dlls/wow64win/syscall.h | 8 +++++ dlls/wow64win/user.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 102 insertions(+), 72 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserCreateWindowEx and NtUserDestroyWindow.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: d50112b4b6e82782d3924a8dbd443f82f64e510d URL: https://gitlab.winehq.org/wine/wine/-/commit/d50112b4b6e82782d3924a8dbd443f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 18:49:53 2022 +0200 win32u: Use syscall interface for NtUserCreateWindowEx and NtUserDestroyWindow. --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 6 ------ dlls/win32u/wrappers.c | 18 ------------------ dlls/wow64win/syscall.h | 2 ++ dlls/wow64win/user.c | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 45 insertions(+), 28 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index d4c9a1a3861..b3db2b11531 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1136,10 +1136,8 @@ static struct unix_funcs unix_funcs = NtGdiUnrealizeObject, NtGdiUpdateColors, NtGdiWidenPath, - NtUserCreateWindowEx, NtUserDeferWindowPosAndBand, NtUserDestroyMenu, - NtUserDestroyWindow, NtUserDrawCaptionTemp, NtUserDrawMenuBarTemp, NtUserEnableMenuItem, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d04e4dc2cf3..02a845f1a48 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -127,11 +127,13 @@ static void * const syscalls[] = NtUserCreateCaret, NtUserCreateDesktopEx, NtUserCreateInputContext, + NtUserCreateWindowEx, NtUserCreateWindowStation, NtUserDeleteMenu, NtUserDestroyAcceleratorTable, NtUserDestroyCursor, NtUserDestroyInputContext, + NtUserDestroyWindow, NtUserDisableThreadIme, NtUserDispatchMessage, NtUserDragDetect, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 555aaecdfb5..9d9bec9dfb8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -814,7 +814,7 @@ @ stdcall -syscall NtUserCreateInputContext(ptr) @ stub NtUserCreateLocalMemHandle @ stub NtUserCreatePalmRejectionDelayZone -@ stdcall NtUserCreateWindowEx(long ptr ptr ptr long long long long long long long long ptr long long long long) +@ stdcall -syscall NtUserCreateWindowEx(long ptr ptr ptr long long long long long long long long ptr long long long long) @ stub NtUserCreateWindowGroup @ stdcall -syscall NtUserCreateWindowStation(ptr long long long long long long) @ stub NtUserCtxDisplayIOCtl @@ -834,7 +834,7 @@ @ stdcall -syscall NtUserDestroyInputContext(long) @ stdcall NtUserDestroyMenu(long) @ stub NtUserDestroyPalmRejectionDelayZone -@ stdcall NtUserDestroyWindow(long) +@ stdcall -syscall NtUserDestroyWindow(long) @ stub NtUserDisableImmersiveOwner @ stub NtUserDisableProcessWindowFiltering @ stdcall -syscall NtUserDisableThreadIme(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c7aac2edd75..392c167bf95 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -186,16 +186,10 @@ struct unix_funcs BOOL (WINAPI *pNtGdiUnrealizeObject)( HGDIOBJ obj ); BOOL (WINAPI *pNtGdiUpdateColors)( HDC hdc ); BOOL (WINAPI *pNtGdiWidenPath)( HDC hdc ); - HWND (WINAPI *pNtUserCreateWindowEx)( DWORD ex_style, UNICODE_STRING *class_name, - UNICODE_STRING *version, UNICODE_STRING *window_name, - DWORD style, INT x, INT y, INT width, INT height, - HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ); HDWP (WINAPI *pNtUserDeferWindowPosAndBand)( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ); BOOL (WINAPI *pNtUserDestroyMenu)( HMENU handle ); - BOOL (WINAPI *pNtUserDestroyWindow)( HWND hwnd ); BOOL (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ); DWORD (WINAPI *pNtUserDrawMenuBarTemp)( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index f4847d06480..a3e617fe75f 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -725,18 +725,6 @@ NTSTATUS WINAPI NtGdiDdDDISetVidPnSourceOwner( const D3DKMT_SETVIDPNSOURCEOWNER return unix_funcs->pNtGdiDdDDISetVidPnSourceOwner( desc ); } -HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, - UNICODE_STRING *version, UNICODE_STRING *window_name, - DWORD style, INT x, INT y, INT width, INT height, - HWND parent, HMENU menu, HINSTANCE instance, void *params, - DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserCreateWindowEx( ex_style, class_name, version, window_name, - style, x, y, width, height, parent, menu, - instance, params, flags, cbtc, unk, ansi ); -} - HDWP WINAPI NtUserDeferWindowPosAndBand( HDWP hdwp, HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags, UINT unk1, UINT unk2 ) @@ -752,12 +740,6 @@ BOOL WINAPI NtUserDestroyMenu( HMENU handle ) return unix_funcs->pNtUserDestroyMenu( handle ); } -BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserDestroyWindow( hwnd ); -} - BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font, HICON icon, const WCHAR *str, UINT flags ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 95ceeb9e16d..7125838dd35 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -114,11 +114,13 @@ SYSCALL_ENTRY( NtUserCreateCaret ) \ SYSCALL_ENTRY( NtUserCreateDesktopEx ) \ SYSCALL_ENTRY( NtUserCreateInputContext ) \ + SYSCALL_ENTRY( NtUserCreateWindowEx ) \ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ SYSCALL_ENTRY( NtUserDeleteMenu ) \ SYSCALL_ENTRY( NtUserDestroyAcceleratorTable ) \ SYSCALL_ENTRY( NtUserDestroyCursor ) \ SYSCALL_ENTRY( NtUserDestroyInputContext ) \ + SYSCALL_ENTRY( NtUserDestroyWindow ) \ SYSCALL_ENTRY( NtUserDisableThreadIme ) \ SYSCALL_ENTRY( NtUserDispatchMessage ) \ SYSCALL_ENTRY( NtUserDragDetect ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index a3e880c46ed..20648a6620f 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -411,6 +411,38 @@ NTSTATUS WINAPI wow64_NtUserCreateInputContext( UINT *args ) return HandleToUlong( NtUserCreateInputContext( client_ptr )); } +NTSTATUS WINAPI wow64_NtUserCreateWindowEx( UINT *args ) +{ + DWORD ex_style = get_ulong( &args ); + UNICODE_STRING32 *class_name32 = get_ptr( &args ); + UNICODE_STRING32 *version32 = get_ptr( &args ); + UNICODE_STRING32 *window_name32 = get_ptr( &args ); + DWORD style = get_ulong( &args ); + int x = get_ulong( &args ); + int y = get_ulong( &args ); + int width = get_ulong( &args ); + int height = get_ulong( &args ); + HWND parent = get_handle( &args ); + HMENU menu = get_handle( &args ); + HINSTANCE instance = get_handle( &args ); + void *params = get_ptr( &args ); + DWORD flags = get_ulong( &args ); + void *cbtc = get_ptr( &args ); + DWORD unk = get_ulong( &args ); + BOOL ansi = get_ulong( &args ); + + UNICODE_STRING class_name, version, window_name; + HWND ret; + + ret = NtUserCreateWindowEx( ex_style, + unicode_str_32to64( &class_name, class_name32), + unicode_str_32to64( &version, version32 ), + unicode_str_32to64( &window_name, window_name32 ), + style, x, y, width, height, parent, menu, + instance, params, flags, cbtc, unk, ansi ); + return HandleToUlong( ret ); +} + NTSTATUS WINAPI wow64_NtUserCreateWindowStation( UINT *args ) { OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); @@ -458,6 +490,13 @@ NTSTATUS WINAPI wow64_NtUserDestroyInputContext( UINT *args ) return NtUserDestroyInputContext( handle ); } +NTSTATUS WINAPI wow64_NtUserDestroyWindow( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + + return NtUserDestroyWindow( hwnd ); +} + NTSTATUS WINAPI wow64_NtUserDisableThreadIme( UINT *args ) { DWORD thread_id = get_ulong( &args );

1 0

Jacek Caban : win32u: Use syscall interface for cursor icon functions.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 399dfc2580b2a124d8711b15b6e11fdae49ff910 URL: https://gitlab.winehq.org/wine/wine/-/commit/399dfc2580b2a124d8711b15b6e11f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 10 21:53:49 2022 +0200 win32u: Use syscall interface for cursor icon functions. --- dlls/win32u/gdiobj.c | 7 ---- dlls/win32u/syscall.c | 7 ++++ dlls/win32u/win32u.spec | 14 +++---- dlls/win32u/win32u_private.h | 10 ----- dlls/win32u/wrappers.c | 45 ---------------------- dlls/wow64win/syscall.h | 7 ++++ dlls/wow64win/user.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 109 insertions(+), 69 deletions(-)

1 0