September 2021 - Wine-Commits

Rémi Bernon : winebus.sys: Return an event from SDL bus wait on device removal.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 6006758ca87d7e38fb4b84bafe917e108524029f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6006758ca87d7e38fb4b84ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 30 11:22:52 2021 +0200 winebus.sys: Return an event from SDL bus wait on device removal. Instead of calling bus_unlink_hid_device or IoInvalidateDeviceRelations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 14 +++++--------- dlls/winebus.sys/main.c | 20 +++++++++++++++++++- dlls/winebus.sys/unix_private.h | 6 ++++++ dlls/winebus.sys/unixlib.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unixlib.h | 12 ++++++++++++ 5 files changed, 81 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8259531779b..e8ae69633c0 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -64,6 +64,7 @@ static struct sdl_bus_options options; static void *sdl_handle = NULL; static UINT quit_event = -1; +static struct list event_queue = LIST_INIT(event_queue); #define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL MAKE_FUNCPTR(SDL_GetError); @@ -730,12 +731,6 @@ static BOOL set_mapped_report_from_event(DEVICE_OBJECT *device, SDL_Event *event return FALSE; } -static void try_remove_device(DEVICE_OBJECT *device) -{ - bus_unlink_hid_device(device); - IoInvalidateDeviceRelations(bus_pdo, BusRelations); -} - static void try_add_device(unsigned int index) { DWORD vid = 0, pid = 0, version = 0; @@ -821,9 +816,7 @@ static void process_device_event(SDL_Event *event) else if (event->type == SDL_JOYDEVICEREMOVED) { id = ((SDL_JoyDeviceEvent *)event)->which; - device = bus_find_hid_device(sdl_busidW, ULongToPtr(id)); - if (device) try_remove_device(device); - else WARN("failed to find device with id %d\n", id); + bus_event_queue_device_removed(&event_queue, sdl_busidW, ULongToPtr(id)); } else if (event->type >= SDL_JOYAXISMOTION && event->type <= SDL_JOYBUTTONUP) { @@ -980,15 +973,18 @@ failed: NTSTATUS sdl_bus_wait(void *args) { + struct bus_event *result = args; SDL_Event event; do { + if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; if (pSDL_WaitEvent(&event) != 0) process_device_event(&event); else WARN("SDL_WaitEvent failed: %s\n", pSDL_GetError()); } while (event.type != quit_event); TRACE("SDL main loop exiting\n"); + bus_event_queue_destroy(&event_queue); dlclose(sdl_handle); sdl_handle = NULL; return STATUS_SUCCESS; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 4c8c84ffe9b..ec5e7715488 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -654,6 +654,7 @@ struct bus_main_params static DWORD CALLBACK bus_main_thread(void *args) { struct bus_main_params bus = *(struct bus_main_params *)args; + DEVICE_OBJECT *device; NTSTATUS status; TRACE("%s main loop starting\n", debugstr_w(bus.name)); @@ -663,7 +664,24 @@ static DWORD CALLBACK bus_main_thread(void *args) bus.bus_event->type = BUS_EVENT_TYPE_NONE; if (status) WARN("%s bus init returned status %#x\n", debugstr_w(bus.name), status); - else while ((status = winebus_call(bus.wait_code, bus.bus_event)) == STATUS_PENDING) {} + else while ((status = winebus_call(bus.wait_code, bus.bus_event)) == STATUS_PENDING) + { + struct bus_event *event = bus.bus_event; + switch (event->type) + { + case BUS_EVENT_TYPE_NONE: break; + case BUS_EVENT_TYPE_DEVICE_REMOVED: + EnterCriticalSection(&device_list_cs); + if (!(device = bus_find_hid_device(event->device_removed.bus_id, event->device_removed.context))) + WARN("could not find removed device matching bus %s, context %p\n", + debugstr_w(event->device_removed.bus_id), event->device_removed.context); + else + bus_unlink_hid_device(device); + LeaveCriticalSection(&device_list_cs); + IoInvalidateDeviceRelations(bus_pdo, BusRelations); + break; + } + } if (status) WARN("%s bus wait returned status %#x\n", debugstr_w(bus.name), status); else TRACE("%s main loop exited\n", debugstr_w(bus.name)); diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index aff1e86263a..f3edef83cb7 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -27,6 +27,8 @@ #include "unixlib.h" +#include "wine/list.h" + struct unix_device { }; @@ -43,4 +45,8 @@ extern NTSTATUS iohid_bus_init(void *) DECLSPEC_HIDDEN; extern NTSTATUS iohid_bus_wait(void *) DECLSPEC_HIDDEN; extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; +extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; +extern BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, void *context) DECLSPEC_HIDDEN; +extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) DECLSPEC_HIDDEN; + #endif /* __WINEBUS_UNIX_PRIVATE_H */ diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index c4090861675..13e2729e0c2 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -26,6 +26,7 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/list.h" #include "wine/unixlib.h" #include "unix_private.h" @@ -42,3 +43,41 @@ const unixlib_entry_t __wine_unix_call_funcs[] = iohid_bus_wait, iohid_bus_stop, }; + +void bus_event_queue_destroy(struct list *queue) +{ + struct bus_event *event, *next; + + LIST_FOR_EACH_ENTRY_SAFE(event, next, queue, struct bus_event, entry) + HeapFree(GetProcessHeap(), 0, event); +} + +BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, void *context) +{ + ULONG size = sizeof(struct bus_event); + struct bus_event *event = HeapAlloc(GetProcessHeap(), 0, size); + if (!event) return FALSE; + + event->type = BUS_EVENT_TYPE_DEVICE_REMOVED; + event->device_removed.bus_id = bus_id; + event->device_removed.context = context; + list_add_tail(queue, &event->entry); + + return TRUE; +} + +BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) +{ + struct list *entry = list_head(queue); + struct bus_event *tmp; + + if (!entry) return FALSE; + + tmp = LIST_ENTRY(entry, struct bus_event, entry); + list_remove(entry); + + memcpy(event, tmp, sizeof(*event)); + HeapFree(GetProcessHeap(), 0, tmp); + + return TRUE; +} diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index e6abd98601f..d9097ba9ca7 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -27,6 +27,7 @@ #include <ddk/wdm.h> #include <hidusage.h> +#include "wine/list.h" #include "wine/unixlib.h" struct sdl_bus_options @@ -49,11 +50,22 @@ struct unix_device; enum bus_event_type { BUS_EVENT_TYPE_NONE, + BUS_EVENT_TYPE_DEVICE_REMOVED, }; struct bus_event { enum bus_event_type type; + struct list entry; + + union + { + struct + { + const WCHAR *bus_id; + void *context; + } device_removed; + }; }; enum unix_funcs

1 0

Rémi Bernon : winebus.sys: Return an event from IOHID bus wait on device removal.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 2457113970a4f59e4ea7cc6695fc06c98e73d781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2457113970a4f59e4ea7cc66… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 30 11:22:54 2021 +0200 winebus.sys: Return an event from IOHID bus wait on device removal. Instead of calling bus_unlink_hid_device or IoInvalidateDeviceRelations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 - dlls/winebus.sys/bus_iohid.c | 17 +++++++++-------- dlls/winebus.sys/main.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 803ffaad132..6d9090d8603 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -47,7 +47,6 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, const platform_vtbl *vtbl, struct unix_device *unix_device) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; -void bus_unlink_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 9b842dc81a5..9531607f16d 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -97,6 +97,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static IOHIDManagerRef hid_manager; static CFRunLoopRef run_loop; +static struct list event_queue = LIST_INIT(event_queue); static const WCHAR busidW[] = {'I','O','H','I','D',0}; static struct iohid_bus_options options; @@ -377,19 +378,13 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) { - DEVICE_OBJECT *device; TRACE("OS/X IOHID Device Removed %p\n", IOHIDDevice); IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); /* Note: Yes, we leak the buffer. But according to research there is no safe way to deallocate that buffer. */ IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); IOHIDDeviceClose(IOHIDDevice, 0); - device = bus_find_hid_device(busidW, IOHIDDevice); - if (device) - { - bus_unlink_hid_device(device); - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - } + bus_event_queue_device_removed(&event_queue, busidW, IOHIDDevice); } NTSTATUS iohid_bus_init(void *args) @@ -415,9 +410,15 @@ NTSTATUS iohid_bus_init(void *args) NTSTATUS iohid_bus_wait(void *args) { - CFRunLoopRun(); + struct bus_event *result = args; + + do + { + if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; + } while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 10, TRUE) != kCFRunLoopRunStopped); TRACE("IOHID main loop exiting\n"); + bus_event_queue_destroy(&event_queue); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); CFRelease(hid_manager); diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ec5e7715488..dcaa42919f6 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -374,7 +374,7 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function return ret; } -void bus_unlink_hid_device(DEVICE_OBJECT *device) +static void bus_unlink_hid_device(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension;

1 0

Francois Gouget : uxtheme/tests: Use the OpenThemeDataForDpi() function pointer.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 568143ff97c80ba0558411b6d2ec0ecba77de2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=568143ff97c80ba0558411b6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 2 10:29:51 2021 +0200 uxtheme/tests: Use the OpenThemeDataForDpi() function pointer. OpenThemeDataForDpi() is not available in Windows 10 1607 and older. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f9bf371e6bf..b088a7a050e 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -657,7 +657,7 @@ static void test_OpenThemeDataForDpi(void) is_theme_active = IsThemeActive(); SetLastError(0xdeadbeef); - htheme = OpenThemeDataForDpi(NULL, WC_BUTTONW, 96); + htheme = pOpenThemeDataForDpi(NULL, WC_BUTTONW, 96); if (is_theme_active) { ok(!!htheme, "Got a NULL handle.\n");

1 0

Jacek Caban : gdi32: Move GdiDllInitialize to objects.c.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: f95687c510e177d3c2b368e0181e9209aa2ac381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95687c510e177d3c2b368e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:12:32 2021 +0200 gdi32: Move GdiDllInitialize to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 12 ------------ dlls/gdi32/objects.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 1294401f15b..ff3dd9807c2 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -685,18 +685,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -/*********************************************************************** - * GdiDllInitialize - * - * Stub entry point, some games (CoD: Black Ops 3) call it directly. - */ -BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - FIXME("stub\n"); - return TRUE; -} - - static const char *gdi_obj_type( unsigned type ) { switch ( type ) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 5bc14090feb..96ab3271034 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -1059,3 +1059,14 @@ BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end, } return TRUE; } + +/*********************************************************************** + * GdiDllInitialize (GDI32.@) + * + * Stub entry point, some games (CoD: Black Ops 3) call it directly. + */ +BOOL WINAPI GdiDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + FIXME( "stub\n" ); + return TRUE; +}

1 0

Jacek Caban : gdi32: Use NtGdiGetRandomRgn for GetClipRgn.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 8217ce0fef83a0aea3c658489c885d9bb69a3056 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8217ce0fef83a0aea3c65848… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:00 2021 +0200 gdi32: Use NtGdiGetRandomRgn for GetClipRgn. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/clipping.c | 36 ++++++++---------------------------- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/tests/clipping.c | 7 ++++++- include/ntgdi.h | 3 +++ 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 28a314b76b9..4f22e6f3cde 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -392,31 +392,6 @@ INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ) } -/*********************************************************************** - * GetClipRgn (GDI32.@) - */ -INT WINAPI GetClipRgn( HDC hdc, HRGN hRgn ) -{ - INT ret = -1; - DC * dc; - if ((dc = get_dc_ptr( hdc ))) - { - if( dc->hClipRgn ) - { - if (NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ) != ERROR) - { - ret = 1; - if (dc->attr->layout & LAYOUT_RTL) - mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); - } - } - else ret = 0; - release_dc_ptr( dc ); - } - return ret; -} - - /*********************************************************************** * GetMetaRgn (GDI32.@) */ @@ -460,11 +435,11 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) if (!dc) return -1; - switch (iCode) + switch (iCode & ~NTGDI_RGN_MIRROR_RTL) { case 1: - if (dc->hClipRgn) NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ); - else ret = 0; + if (!dc->hClipRgn) ret = 0; + else if (!NtGdiCombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY )) ret = -1; break; case 2: if (dc->hMetaRgn) NtGdiCombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); @@ -496,6 +471,11 @@ INT WINAPI NtGdiGetRandomRgn( HDC hDC, HRGN hRgn, INT iCode ) ret = -1; break; } + + /* Wine extension */ + if (ret > 0 && (iCode & NTGDI_RGN_MIRROR_RTL) && (dc->attr->layout & LAYOUT_RTL)) + mirror_region( hRgn, hRgn, dc->attr->vis_rect.right - dc->attr->vis_rect.left ); + release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0be21c75d58..6f534dce061 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1633,6 +1633,14 @@ BOOL WINAPI SelectClipPath( HDC hdc, INT mode ) return NtGdiSelectClipPath( hdc, mode ); } +/*********************************************************************** + * GetClipRgn (GDI32.@) + */ +INT WINAPI GetClipRgn( HDC hdc, HRGN rgn ) +{ + return NtGdiGetRandomRgn( hdc, rgn, NTGDI_RGN_MIRROR_RTL | 1 ); +} + /*********************************************************************** * IntersectClipRect (GDI32.@) */ diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 484430b0cb9..37a96de2bb4 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -42,6 +42,8 @@ static void test_GetRandomRgn(void) ret = GetRandomRgn(hdc, hrgn, 1); ok(ret == 0, "GetRandomRgn rets %d\n", ret); + ret = GetRandomRgn(hdc, NULL, 1); + ok(ret == 0, "GetRandomRgn rets %d\n", ret); ret = GetRandomRgn(hdc, hrgn, 2); ok(ret == 0, "GetRandomRgn rets %d\n", ret); ret = GetRandomRgn(hdc, hrgn, 3); @@ -84,10 +86,13 @@ static void test_GetRandomRgn(void) IntersectClipRect(hdc, rc2.left, rc2.top, rc2.right, rc2.bottom); ret = GetRandomRgn(hdc, hrgn, 1); - ok(ret != 0, "GetRandomRgn rets %d\n", ret); + ok(ret > 0, "GetRandomRgn rets %d\n", ret); GetRgnBox(hrgn, &ret_rc); ok(EqualRect(&rc2, &ret_rc), "GetRandomRgn %s\n", wine_dbgstr_rect(&ret_rc)); + ret = GetRandomRgn(hdc, NULL, 1); + ok(ret == -1, "GetRandomRgn rets %d\n", ret); + ret = GetRandomRgn(hdc, hrgn, 2); ok(ret != 0, "GetRandomRgn rets %d\n", ret); GetRgnBox(hrgn, &ret_rc); diff --git a/include/ntgdi.h b/include/ntgdi.h index 00783975e18..061ed40779c 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -178,6 +178,9 @@ struct font_enum_entry NEWTEXTMETRICEXW tm; }; +/* flag for NtGdiGetRandomRgn to respect LAYOUT_RTL */ +#define NTGDI_RGN_MIRROR_RTL 0x80000000 + #endif /* __WINESRC__ */ struct font_realization_info

1 0

Rémi Bernon : winebus.sys: Return an event from UDEV bus wait on device removal.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 9f09e2a3cbadf89aec91100cb4e0a88041f17e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f09e2a3cbadf89aec91100c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 30 11:22:53 2021 +0200 winebus.sys: Return an event from UDEV bus wait on device removal. Instead of calling bus_unlink_hid_device or IoInvalidateDeviceRelations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 8d631fb928e..c954e6b2128 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -92,6 +92,7 @@ static struct udev *udev_context = NULL; static struct udev_monitor *udev_monitor; static int deviceloop_control[2]; static int udev_monitor_fd; +static struct list event_queue = LIST_INIT(event_queue); static const WCHAR hidraw_busidW[] = {'H','I','D','R','A','W',0}; static const WCHAR lnxev_busidW[] = {'L','N','X','E','V',0}; @@ -1171,16 +1172,10 @@ static void try_add_device(struct udev_device *dev) static void try_remove_device(struct udev_device *dev) { - DEVICE_OBJECT *device = NULL; - - device = bus_find_hid_device(hidraw_busidW, dev); + bus_event_queue_device_removed(&event_queue, hidraw_busidW, dev); #ifdef HAS_PROPER_INPUT_HEADER - if (device == NULL) device = bus_find_hid_device(lnxev_busidW, dev); + bus_event_queue_device_removed(&event_queue, lnxev_busidW, dev); #endif - if (!device) return; - - bus_unlink_hid_device(device); - IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static void build_initial_deviceset(void) @@ -1337,6 +1332,7 @@ error: NTSTATUS udev_bus_wait(void *args) { + struct bus_event *result = args; struct pollfd pfd[2]; pfd[0].fd = udev_monitor_fd; @@ -1348,12 +1344,14 @@ NTSTATUS udev_bus_wait(void *args) while (1) { + if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; if (poll(pfd, 2, -1) <= 0) continue; if (pfd[1].revents) break; process_monitor_event(udev_monitor); } TRACE("UDEV main loop exiting\n"); + bus_event_queue_destroy(&event_queue); udev_monitor_unref(udev_monitor); udev_unref(udev_context); udev_context = NULL;

1 0

Jacek Caban : gdi32: Use ntgdi names for spool functions.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 02d2bc944db2e5132e11a9ffdcad5f3f497b03fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d2bc944db2e5132e11a9ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:14:16 2021 +0200 gdi32: Use ntgdi names for spool functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 4 ++-- dlls/gdi32/printdrv.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 569468bc3c1..da37f8ba643 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -203,9 +203,9 @@ # @ stub GdiGetPageCount # @ stub GdiGetPageHandle # @ stub GdiGetSpoolFileHandle -@ stdcall GdiGetSpoolMessage(ptr long ptr long) +@ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) -@ stdcall GdiInitSpool() +@ stdcall GdiInitSpool() NtGdiInitSpool @ stdcall GdiInitializeLanguagePack(long) @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index d9595ff7abf..c4fcf8ada13 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -35,10 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(print); /****************************************************************** - * GdiGetSpoolMessage [GDI32.@] - * + * NtGdiGetSpoolMessage (win32u.@) */ -DWORD WINAPI GdiGetSpoolMessage(LPVOID ptr1, DWORD data2, LPVOID ptr3, DWORD data4) +DWORD WINAPI NtGdiGetSpoolMessage( void *ptr1, DWORD data2, void *ptr3, DWORD data4 ) { TRACE("(%p 0x%x %p 0x%x) stub\n", ptr1, data2, ptr3, data4); /* avoid 100% cpu usage with spoolsv.exe from w2k @@ -48,10 +47,9 @@ DWORD WINAPI GdiGetSpoolMessage(LPVOID ptr1, DWORD data2, LPVOID ptr3, DWORD dat } /****************************************************************** - * GdiInitSpool [GDI32.@] - * + * NtGdiInitSpool (win32u.@) */ -DWORD WINAPI GdiInitSpool(void) +DWORD WINAPI NtGdiInitSpool(void) { FIXME("stub\n"); return TRUE;

1 0

Jacek Caban : gdi32: Move LineDDA to objects.c.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 66fd792c4d16bb5815b5d796f119e7bf8d946fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66fd792c4d16bb5815b5d796… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 2 14:12:24 2021 +0200 gdi32: Move LineDDA to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/painting.c | 58 --------------------------------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index a79540885c3..5bc14090feb 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -1001,3 +1001,61 @@ BOOL WINAPI CombineTransform( XFORM *result, const XFORM *xform1, const XFORM *x *result = r; return TRUE; } + +/*********************************************************************** + * LineDDA (GDI32.@) + */ +BOOL WINAPI LineDDA( INT x_start, INT y_start, INT x_end, INT y_end, + LINEDDAPROC callback, LPARAM lparam ) +{ + INT xadd = 1, yadd = 1; + INT err,erradd; + INT cnt; + INT dx = x_end - x_start; + INT dy = y_end - y_start; + + TRACE( "(%d, %d), (%d, %d), %p, %lx\n", x_start, y_start, + x_end, y_end, callback, lparam ); + + if (dx < 0) + { + dx = -dx; + xadd = -1; + } + if (dy < 0) + { + dy = -dy; + yadd = -1; + } + if (dx > dy) /* line is "more horizontal" */ + { + err = 2*dy - dx; erradd = 2*dy - 2*dx; + for(cnt = 0;cnt < dx; cnt++) + { + callback( x_start, y_start, lparam ); + if (err > 0) + { + y_start += yadd; + err += erradd; + } + else err += 2*dy; + x_start += xadd; + } + } + else /* line is "more vertical" */ + { + err = 2*dx - dy; erradd = 2*dx - 2*dy; + for(cnt = 0; cnt < dy; cnt++) + { + callback( x_start, y_start, lparam ); + if (err > 0) + { + x_start += xadd; + err += erradd; + } + else err += 2*dx; + y_start += yadd; + } + } + return TRUE; +} diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 9fecce61bd2..1ab977595f8 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -664,64 +664,6 @@ BOOL WINAPI NtGdiPolyDraw( HDC hdc, const POINT *points, const BYTE *types, DWOR } -/********************************************************************** - * LineDDA (GDI32.@) - */ -BOOL WINAPI LineDDA(INT nXStart, INT nYStart, INT nXEnd, INT nYEnd, - LINEDDAPROC callback, LPARAM lParam ) -{ - INT xadd = 1, yadd = 1; - INT err,erradd; - INT cnt; - INT dx = nXEnd - nXStart; - INT dy = nYEnd - nYStart; - - TRACE( "(%d, %d), (%d, %d), %p, %lx\n", nXStart, nYStart, nXEnd, nYEnd, callback, lParam ); - - if (dx < 0) - { - dx = -dx; - xadd = -1; - } - if (dy < 0) - { - dy = -dy; - yadd = -1; - } - if (dx > dy) /* line is "more horizontal" */ - { - err = 2*dy - dx; erradd = 2*dy - 2*dx; - for(cnt = 0;cnt < dx; cnt++) - { - callback(nXStart,nYStart,lParam); - if (err > 0) - { - nYStart += yadd; - err += erradd; - } - else err += 2*dy; - nXStart += xadd; - } - } - else /* line is "more vertical" */ - { - err = 2*dx - dy; erradd = 2*dx - 2*dy; - for(cnt = 0;cnt < dy; cnt++) - { - callback(nXStart,nYStart,lParam); - if (err > 0) - { - nXStart += xadd; - err += erradd; - } - else err += 2*dx; - nYStart += yadd; - } - } - return TRUE; -} - - /****************************************************************** * * *Very* simple bezier drawing code,

1 0

Rémi Bernon : winebus.sys: Report WINEBUS\WINE_COMP_HID compatible id.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: 06ab0d5405f126efc25a38e02b26318896752694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06ab0d5405f126efc25a38e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 1 07:47:25 2021 +0200 winebus.sys: Report WINEBUS\WINE_COMP_HID compatible id. And match it in winehid.sys instead of individual bus ids. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 22 ++++++++++++++++++++-- dlls/winehid.sys/winehid.inf | 7 +------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index e9c85deb846..49385576d62 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -226,7 +226,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) return dst; } -static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; @@ -240,6 +240,24 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) return dst; } +static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) +{ + static const WCHAR hid_compat[] = + { + 'W','I','N','E','B','U','S','\\','W','I','N','E','_','C','O','M','P','_','H','I','D',0 + }; + DWORD size = sizeof(hid_compat); + WCHAR *dst; + + if ((dst = ExAllocatePool(PagedPool, size + sizeof(WCHAR)))) + { + memcpy(dst, hid_compat, sizeof(hid_compat)); + dst[size / sizeof(WCHAR)] = 0; + } + + return dst; +} + static void remove_pending_irps(DEVICE_OBJECT *device) { struct device_extension *ext = device->DeviceExtension; @@ -444,7 +462,7 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) { case BusQueryHardwareIDs: TRACE("BusQueryHardwareIDs\n"); - irp->IoStatus.Information = (ULONG_PTR)get_compatible_ids(device); + irp->IoStatus.Information = (ULONG_PTR)get_hardware_ids(device); break; case BusQueryCompatibleIDs: TRACE("BusQueryCompatibleIDs\n"); diff --git a/dlls/winehid.sys/winehid.inf b/dlls/winehid.sys/winehid.inf index f9ed4091217..c1d8a1cf999 100644 --- a/dlls/winehid.sys/winehid.inf +++ b/dlls/winehid.sys/winehid.inf @@ -7,12 +7,7 @@ Class=HIDClass Wine=mfg_section [mfg_section] -Wine hidraw device=device_section,HIDRAW -Wine IOHID device=device_section,IOHID -Wine libevent device=device_section,LNXEV -Wine SDL HID device=device_section,SDLJOY -Wine mouse device=device_section,WINEMOUSE -Wine keyboard device=device_section,WINEKEYBOARD +Wine HID compatible device=device_section,WINEBUS\WINE_COMP_HID [device_section.Services] AddService = winehid,0x2,svc_section

1 0

Rémi Bernon : winebus.sys: Pass a struct bus_event pointer to bus_wait.
by Alexandre Julliard Sept. 2, 2021

Sept. 2, 2021

Module: wine Branch: master Commit: f6d567d3e34d0a53220847c590a681854b91c667 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6d567d3e34d0a53220847c5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 30 11:22:51 2021 +0200 winebus.sys: Pass a struct bus_event pointer to bus_wait. Allocated on the caller side. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 13 ++++++++++++- dlls/winebus.sys/unixlib.h | 10 ++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 28bbb5ff7a9..4c8c84ffe9b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -648,6 +648,7 @@ struct bus_main_params HANDLE init_done; unsigned int init_code; unsigned int wait_code; + struct bus_event *bus_event; }; static DWORD CALLBACK bus_main_thread(void *args) @@ -660,11 +661,13 @@ static DWORD CALLBACK bus_main_thread(void *args) SetEvent(bus.init_done); TRACE("%s main loop started\n", debugstr_w(bus.name)); + bus.bus_event->type = BUS_EVENT_TYPE_NONE; if (status) WARN("%s bus init returned status %#x\n", debugstr_w(bus.name), status); - else status = winebus_call(bus.wait_code, NULL); + else while ((status = winebus_call(bus.wait_code, bus.bus_event)) == STATUS_PENDING) {} if (status) WARN("%s bus wait returned status %#x\n", debugstr_w(bus.name), status); else TRACE("%s main loop exited\n", debugstr_w(bus.name)); + HeapFree(GetProcessHeap(), 0, bus.bus_event); return status; } @@ -679,6 +682,14 @@ static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) return STATUS_UNSUCCESSFUL; } + if (!(bus->bus_event = HeapAlloc(GetProcessHeap(), 0, sizeof(struct bus_event)))) + { + ERR("failed to allocate %s bus event.\n", debugstr_w(bus->name)); + CloseHandle(bus->init_done); + bus_count--; + return STATUS_UNSUCCESSFUL; + } + if (!(bus_thread[i] = CreateThread(NULL, 0, bus_main_thread, bus, 0, NULL))) { ERR("failed to create %s bus thread.\n", debugstr_w(bus->name)); diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index c0de991d20a..e6abd98601f 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -46,6 +46,16 @@ struct iohid_bus_options struct unix_device; +enum bus_event_type +{ + BUS_EVENT_TYPE_NONE, +}; + +struct bus_event +{ + enum bus_event_type type; +}; + enum unix_funcs { sdl_init,

1 0