September 2021 - Wine-Devel

[PATCH 1/2] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov Sept. 3, 2021

Sept. 3, 2021

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EEID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 ++- dlls/winex11.drv/display.c | 13 ++++++-- dlls/winex11.drv/x11drv.h | 6 +++- dlls/winex11.drv/x11drv_main.c | 3 +- dlls/winex11.drv/xinerama.c | 4 ++- dlls/winex11.drv/xrandr.c | 58 +++++++++++++++++++++++++++++++++- 6 files changed, 80 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..16769021aa8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,7 @@ static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +258,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +612,12 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + if(monitor->edid) { + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + RegCloseKey(hkey); + } + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +775,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +795,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..78aaf4f5a01 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,8 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRListOutputProperties) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +114,8 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRListOutputProperties); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +470,50 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static BOOL get_edid(XRROutputInfo *info, RROutput output, unsigned char **prop, unsigned long *len) +{ + BOOL prop_found = FALSE; + Atom *properties; + int i, nprops; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + *prop = NULL; + *len = 0; + + properties = pXRRListOutputProperties(gdi_display, output, &nprops); + for(i = 0; i < nprops; i++) { + + if(properties[i] == x11drv_atom(EDID)) { + prop_found = TRUE; + break; + } + } + XFree(properties); + + if(!prop_found) { + WARN("EDID property not found.\n"); + return FALSE; + } + + pXRRGetOutputProperty(gdi_display, + output, + x11drv_atom(EDID), + 0, + 128, + FALSE, + FALSE, + AnyPropertyType, + &actual_type, + &actual_format, + len, + &bytes_after, + prop + ); + return TRUE; +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1084,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid(output_info, adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1140,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid(enum_output_info, screen_resources->outputs[i], + &monitors[monitor_count].edid, &monitors[monitor_count].edid_len); monitor_count++; } @@ -1137,8 +1189,12 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for(i = 0; i < count; i++) { + XFree(monitors[i].edid); + } heap_free( monitors ); } -- 2.25.1

2 4

[PATCH v1] opengl32: Fix unexpected format PIPE_FORMAT_R8G8B8_UNORM
by Shen Fusheng Sept. 3, 2021

Sept. 3, 2021

By reading the mesa source code, a value not in the enumeration is used in the mesa code to create a rendering memory. It is found that the value is derived from the result of matching using wglChoosePixel, so I modified this piece by referring to the wglChoosePixelFormat in mesa. Signed-off-by: Shen Fusheng <shenfusheng(a)uniontech.com> --- dlls/opengl32/wgl.c | 110 ++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cf46c6dfa8a..0b15c6fce89 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -453,6 +453,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) PIXELFORMATDESCRIPTOR format, best; int i, count, best_format; int bestDBuffer = -1, bestStereo = -1; + uint bestdelta = ~0U; TRACE_(wgl)( "%p %p: size %u version %u flags %u type %u color %u %u,%u,%u,%u " "accum %u depth %u stencil %u aux %u\n", @@ -473,6 +474,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) for (i = 1; i <= count; i++) { + uint delta = 0; if (!wglDescribePixelFormat( hdc, i, sizeof(format), &format )) continue; if ((ppfd->iPixelType == PFD_TYPE_COLORINDEX) != (format.iPixelType == PFD_TYPE_COLORINDEX)) @@ -512,24 +514,34 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) { if (((ppfd->dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) && ((format.dwFlags & PFD_DOUBLEBUFFER) == (ppfd->dwFlags & PFD_DOUBLEBUFFER))) - goto found; + { + delta = 0; + goto found; + } if (bestDBuffer != -1 && (format.dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) continue; } else if (!best_format) + { goto found; + } /* Stereo, see the comments above. */ if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)) { if (((ppfd->dwFlags & PFD_STEREO) != bestStereo) && ((format.dwFlags & PFD_STEREO) == (ppfd->dwFlags & PFD_STEREO))) - goto found; + { + delta = 0; + goto found; + } if (bestStereo != -1 && (format.dwFlags & PFD_STEREO) != bestStereo) continue; } else if (!best_format) + { goto found; + } /* Below we will do a number of checks to select the 'best' pixelformat. * We assume the precedence cColorBits > cAlphaBits > cDepthBits > cStencilBits -> cAuxBuffers. @@ -541,74 +553,62 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) if (ppfd->cColorBits) { - if (((ppfd->cColorBits > best.cColorBits) && (format.cColorBits > best.cColorBits)) || - ((format.cColorBits >= ppfd->cColorBits) && (format.cColorBits < best.cColorBits))) - goto found; - - if (best.cColorBits != format.cColorBits) /* Do further checks if the format is compatible */ - { - TRACE( "color mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cColorBits && format.cColorBits) + delta += 10000; + else if (ppfd->cColorBits > format.cColorBits) + delta += 100; + else if (ppfd->cColorBits < format.cColorBits) + delta++; } + if (ppfd->cAlphaBits) { - if (((ppfd->cAlphaBits > best.cAlphaBits) && (format.cAlphaBits > best.cAlphaBits)) || - ((format.cAlphaBits >= ppfd->cAlphaBits) && (format.cAlphaBits < best.cAlphaBits))) - goto found; - - if (best.cAlphaBits != format.cAlphaBits) - { - TRACE( "alpha mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cAlphaBits && !format.cAlphaBits) + delta += 10000; + else if (ppfd->cAlphaBits > format.cAlphaBits) + delta += 100; + else if (ppfd->cAlphaBits < format.cAlphaBits) + delta++; } + if (ppfd->cDepthBits && !(ppfd->dwFlags & PFD_DEPTH_DONTCARE)) { - if (((ppfd->cDepthBits > best.cDepthBits) && (format.cDepthBits > best.cDepthBits)) || - ((format.cDepthBits >= ppfd->cDepthBits) && (format.cDepthBits < best.cDepthBits))) - goto found; - - if (best.cDepthBits != format.cDepthBits) - { - TRACE( "depth mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cDepthBits && !format.cDepthBits) + delta += 10000; + else if (ppfd->cDepthBits > format.cDepthBits) + delta += 200; + else if (ppfd->cDepthBits < format.cDepthBits) + delta += 2; } + if (ppfd->cStencilBits) { - if (((ppfd->cStencilBits > best.cStencilBits) && (format.cStencilBits > best.cStencilBits)) || - ((format.cStencilBits >= ppfd->cStencilBits) && (format.cStencilBits < best.cStencilBits))) - goto found; - - if (best.cStencilBits != format.cStencilBits) - { - TRACE( "stencil mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cStencilBits && !format.cStencilBits) + delta += 10000; + else if (ppfd->cStencilBits > format.cStencilBits) + delta += 400; + else if (ppfd->cStencilBits < format.cStencilBits) + delta++; } + if (ppfd->cAuxBuffers) { - if (((ppfd->cAuxBuffers > best.cAuxBuffers) && (format.cAuxBuffers > best.cAuxBuffers)) || - ((format.cAuxBuffers >= ppfd->cAuxBuffers) && (format.cAuxBuffers < best.cAuxBuffers))) - goto found; - - if (best.cAuxBuffers != format.cAuxBuffers) - { - TRACE( "aux mismatch for iPixelFormat=%d\n", i ); - continue; - } + if (ppfd->cAuxBuffers && !format.cAuxBuffers) + delta += 10000; + else if (ppfd->cAuxBuffers > format.cAuxBuffers) + delta += 400; + else if (ppfd->cAuxBuffers < format.cAuxBuffers) + delta++; } - if (ppfd->dwFlags & PFD_DEPTH_DONTCARE && format.cDepthBits < best.cDepthBits) - goto found; - - continue; found: - best_format = i; - best = format; - bestDBuffer = format.dwFlags & PFD_DOUBLEBUFFER; - bestStereo = format.dwFlags & PFD_STEREO; + if (delta < bestdelta) + { + best_format = i; + bestdelta = delta; + if (bestdelta == 0) + break; + } } TRACE( "returning %u\n", best_format ); -- 2.20.1

3 2

[PATCH] dwrite: Silence warning for name entries with platform 1/encoding 20.
by Aurélien Inacio Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Aurélien Inacio <aur36(a)mailo.com> --- dlls/gdi32/opentype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/opentype.c b/dlls/gdi32/opentype.c index 10234c6d5aa..a1017def5b6 100644 --- a/dlls/gdi32/opentype.c +++ b/dlls/gdi32/opentype.c @@ -323,6 +323,8 @@ static UINT get_name_record_codepage( enum OPENTYPE_PLATFORM_ID platform, USHORT case OPENTYPE_PLATFORM_MAC: switch (encoding) { + case TT_NAME_MAC_ENCODING_KHMER: + return 0; case TT_NAME_MAC_ENCODING_ROMAN: return 10000; case TT_NAME_MAC_ENCODING_JAPANESE: -- 2.30.2

2 1

[PATCH] dbghelp: Limit module name lookup to 32 characters.
by Alistair Leslie-Hughes Sept. 3, 2021

Sept. 3, 2021

When a module like ext-ms-win-kernel32-package-current-l1-1-0 is loaded, it is never matched since the Module buffer is only 32 cahracters. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c278a627d37..c7b0f59ca4c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -249,7 +249,7 @@ struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name for (module = pcs->lmodules; module; module = module->next) { - if (!wcsicmp(name, module->module.ModuleName)) return module; + if (!wcsnicmp(name, module->module.ModuleName, ARRAYSIZE(module->module.ModuleName))) return module; } SetLastError(ERROR_INVALID_NAME); return NULL; -- 2.33.0

2 1

Re: [PATCH 1/2 v6] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi-Hoareau Sept. 3, 2021

Sept. 3, 2021

I'm a bit confused, how the code is supposed to work if the generated files that are part of the repository are not committed? Le 3 sept. 2021 09:05, Dmitry Timoshkov <dmitry(a)baikal.ru> a écrit : > > Guillaume Charifi <guillaume.charifi(a)sfr.fr> wrote: > > > --- a/server/sock.c > > +++ b/server/sock.c > > @@ -128,12 +128,14 @@ struct poll_req > > struct async *async; > > struct iosb *iosb; > > struct timeout_user *timeout; > > + char exclusive; > > This one should probably be 'int' as well. Also, the size of the patch > could be reduced by avoiding generated parts. > > -- > Dmitry.

2 1

[PATCH 1/8] winexinput.sys: Don't set RawDeviceOk in IRP_MN_QUERY_CAPABILITIES.
by Rémi Bernon Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index a0b6c9bf0eb..386b4bbb228 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -220,12 +220,8 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_QUERY_CAPABILITIES: - { - DEVICE_CAPABILITIES *caps = stack->Parameters.DeviceCapabilities.Capabilities; - caps->RawDeviceOK = 1; status = STATUS_SUCCESS; break; - } default: FIXME("code %#x, not implemented!\n", code); -- 2.33.0

1 8

[PATCH 1/4] winebus.sys: Create devices using a struct device_desc descriptor.
by Rémi Bernon Sept. 3, 2021

Sept. 3, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 5 +-- dlls/winebus.sys/bus_iohid.c | 34 ++++++++------- dlls/winebus.sys/bus_sdl.c | 44 +++++++++---------- dlls/winebus.sys/bus_udev.c | 73 +++++++++++++++---------------- dlls/winebus.sys/main.c | 84 ++++++++++++------------------------ dlls/winebus.sys/unixlib.c | 16 +++++++ dlls/winebus.sys/unixlib.h | 22 ++++++++++ 7 files changed, 143 insertions(+), 135 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 8f36959d4e1..05f53daab3c 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -45,9 +45,8 @@ typedef struct struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; /* HID Plug and Play Bus */ -DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, - DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const platform_vtbl *vtbl, struct unix_device *unix_device) DECLSPEC_HIDDEN; +DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, 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 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 9531607f16d..6256e0d7f80 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -294,25 +294,26 @@ static const platform_vtbl iohid_vtbl = static void handle_DeviceMatchingCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice) { + struct device_desc desc = + { + .busid = busidW, + .input = -1, + .serial = {'0','0','0','0',0}, + }; struct platform_private *private; DEVICE_OBJECT *device; - DWORD vid, pid, version, uid; CFStringRef str = NULL; - WCHAR serial_string[256]; - BOOL is_gamepad = FALSE; - - TRACE("OS/X IOHID Device Added %p\n", IOHIDDevice); - vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); - pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); - version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); + desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); + desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); + desc.version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); - if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); - uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (str) CFStringToWSTR(str, desc.serial, ARRAY_SIZE(desc.serial)); + desc.uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) { - ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, vid, pid); + ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, desc.vid, desc.pid); return; } IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); @@ -320,8 +321,8 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { - if (is_xbox_gamepad(vid, pid)) - is_gamepad = TRUE; + if (is_xbox_gamepad(desc.vid, desc.pid)) + desc.is_gamepad = TRUE; else { int axes=0, buttons=0; @@ -358,15 +359,16 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * } CFRelease(element_array); } - is_gamepad = (axes == 6 && buttons >= 14); + desc.is_gamepad = (axes == 6 && buttons >= 14); } } + TRACE("dev %p, desc %s.\n", IOHIDDevice, debugstr_device_desc(&desc)); + if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) return; - device = bus_create_hid_device(busidW, vid, pid, -1, version, uid, str ? serial_string : NULL, - is_gamepad, &iohid_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &iohid_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); else { diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e8ae69633c0..120b7a2d966 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -731,14 +731,17 @@ static BOOL set_mapped_report_from_event(DEVICE_OBJECT *device, SDL_Event *event return FALSE; } -static void try_add_device(unsigned int index) +static void sdl_add_device(unsigned int index) { - DWORD vid = 0, pid = 0, version = 0; + struct device_desc desc = + { + .busid = sdl_busidW, + .input = -1, + .serial = {'0','0','0','0',0}, + }; struct platform_private *private; DEVICE_OBJECT *device = NULL; - WCHAR serial[34] = {0}; char guid_str[34]; - BOOL is_xbox_gamepad; SDL_Joystick* joystick; SDL_JoystickID id; @@ -757,43 +760,36 @@ static void try_add_device(unsigned int index) id = pSDL_JoystickInstanceID(joystick); if (pSDL_JoystickGetProductVersion != NULL) { - vid = pSDL_JoystickGetVendor(joystick); - pid = pSDL_JoystickGetProduct(joystick); - version = pSDL_JoystickGetProductVersion(joystick); + desc.vid = pSDL_JoystickGetVendor(joystick); + desc.pid = pSDL_JoystickGetProduct(joystick); + desc.version = pSDL_JoystickGetProductVersion(joystick); } else { - vid = 0x01; - pid = pSDL_JoystickInstanceID(joystick) + 1; - version = 0; + desc.vid = 0x01; + desc.pid = pSDL_JoystickInstanceID(joystick) + 1; + desc.version = 0; } guid = pSDL_JoystickGetGUID(joystick); pSDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str)); - MultiByteToWideChar(CP_ACP, 0, guid_str, -1, serial, sizeof(guid_str)); + MultiByteToWideChar(CP_ACP, 0, guid_str, -1, desc.serial, sizeof(guid_str)); - if (controller) - { - TRACE("Found sdl game controller %i (vid %04x, pid %04x, version %u, serial %s)\n", - id, vid, pid, version, debugstr_w(serial)); - is_xbox_gamepad = TRUE; - } + if (controller) desc.is_gamepad = TRUE; else { int button_count, axis_count; - TRACE("Found sdl device %i (vid %04x, pid %04x, version %u, serial %s)\n", - id, vid, pid, version, debugstr_w(serial)); - axis_count = pSDL_JoystickNumAxes(joystick); button_count = pSDL_JoystickNumButtons(joystick); - is_xbox_gamepad = (axis_count == 6 && button_count >= 14); + desc.is_gamepad = (axis_count == 6 && button_count >= 14); } + TRACE("%s id %d, desc %s.\n", controller ? "controller" : "joystick", id, debugstr_device_desc(&desc)); + if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*private)))) return; - device = bus_create_hid_device(sdl_busidW, vid, pid, -1, version, index, serial, is_xbox_gamepad, - &sdl_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &sdl_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); else { @@ -812,7 +808,7 @@ static void process_device_event(SDL_Event *event) TRACE_(hid_report)("Received action %x\n", event->type); if (event->type == SDL_JOYDEVICEADDED) - try_add_device(((SDL_JoyDeviceEvent*)event)->which); + sdl_add_device(((SDL_JoyDeviceEvent *)event)->which); else if (event->type == SDL_JOYDEVICEREMOVED) { id = ((SDL_JoyDeviceEvent *)event)->which; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c954e6b2128..4329e54a0b9 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1014,8 +1014,7 @@ static int check_device_syspath(DEVICE_OBJECT *device, void* context) return strcmp(get_device_syspath(private->udev_device), context); } -static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, DWORD *vendor_id, - DWORD *product_id, DWORD *input, DWORD *version, WCHAR **serial_number) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; @@ -1035,41 +1034,42 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!strncmp(ptr, "HID_UNIQ=", 9)) { if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) != 1 || !*buffer) continue; - if (!*serial_number) *serial_number = strdupAtoW(buffer); + if (!desc->serial[0]) MultiByteToWideChar(CP_UNIXCP, 0, buffer, -1, desc->serial, ARRAY_SIZE(desc->serial)); } if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6)) { if (!(tmp = strstr(ptr, "/input")) || tmp >= next) continue; - if (*input == -1) sscanf(tmp, "/input%d\n", input); + if (desc->input == -1) sscanf(tmp, "/input%d\n", &desc->input); } if (!strncmp(ptr, "HID_ID=", 7)) { - if (bus || *vendor_id || *product_id) continue; - sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, vendor_id, product_id); + if (bus || desc->vid || desc->pid) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, &desc->vid, &desc->pid); } if (!strncmp(ptr, "PRODUCT=", 8)) { - if (*version) continue; + if (desc->version) continue; if (!strcmp(subsystem, "usb")) - sscanf(ptr, "PRODUCT=%x/%x/%x\n", vendor_id, product_id, version); + sscanf(ptr, "PRODUCT=%x/%x/%x\n", &desc->vid, &desc->pid, &desc->version); else - sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, vendor_id, product_id, version); + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, &desc->vid, &desc->pid, &desc->version); } } } } -static void try_add_device(struct udev_device *dev) +static void udev_add_device(struct udev_device *dev) { - DWORD vid = 0, pid = 0, version = 0, input = -1; + static const WCHAR base_serial[] = {'0','0','0','0',0}; + struct device_desc desc = + { + .input = -1, + }; struct platform_private *private; DEVICE_OBJECT *device = NULL; const char *subsystem; const char *devnode; - WCHAR *serial = NULL; - BOOL is_gamepad = FALSE; int fd; - static const CHAR *base_serial = "0000"; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1093,55 +1093,59 @@ static void try_add_device(struct udev_device *dev) } #endif - get_device_subsystem_info(dev, "hid", &vid, &pid, &input, &version, &serial); - get_device_subsystem_info(dev, "input", &vid, &pid, &input, &version, &serial); - get_device_subsystem_info(dev, "usb", &vid, &pid, &input, &version, &serial); + get_device_subsystem_info(dev, "hid", &desc); + get_device_subsystem_info(dev, "input", &desc); + get_device_subsystem_info(dev, "usb", &desc); subsystem = udev_device_get_subsystem(dev); + if (!strcmp(subsystem, "hidraw")) + { + desc.busid = hidraw_busidW; + } #ifdef HAS_PROPER_INPUT_HEADER - if (!strcmp(subsystem, "input")) + else if (!strcmp(subsystem, "input")) { struct input_id device_id = {0}; char device_uid[255]; + desc.busid = lnxev_busidW; + if (ioctl(fd, EVIOCGID, &device_id) < 0) WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); else { - vid = device_id.vendor; - pid = device_id.product; - version = device_id.version; + desc.vid = device_id.vendor; + desc.pid = device_id.product; + desc.version = device_id.version; } device_uid[0] = 0; if (ioctl(fd, EVIOCGUNIQ(254), device_uid) >= 0 && device_uid[0]) - serial = strdupAtoW(device_uid); + MultiByteToWideChar(CP_UNIXCP, 0, device_uid, -1, desc.serial, ARRAY_SIZE(desc.serial)); } #endif - if (serial == NULL) serial = strdupAtoW(base_serial); + if (!desc.serial[0]) lstrcpyW(desc.serial, base_serial); - if (is_xbox_gamepad(vid, pid)) - is_gamepad = TRUE; + if (is_xbox_gamepad(desc.vid, desc.pid)) + desc.is_gamepad = TRUE; #ifdef HAS_PROPER_INPUT_HEADER else { int axes=0, buttons=0; axes = count_abs_axis(fd); buttons = count_buttons(fd, NULL); - is_gamepad = (axes == 6 && buttons >= 14); + desc.is_gamepad = (axes == 6 && buttons >= 14); } #endif - TRACE("Found udev device %s (vid %04x, pid %04x, version %04x, input %d, serial %s)\n", - debugstr_a(devnode), vid, pid, version, input, debugstr_w(serial)); + TRACE("dev %p, node %s, desc %s.\n", dev, debugstr_a(devnode), debugstr_device_desc(&desc)); if (strcmp(subsystem, "hidraw") == 0) { if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) return; - device = bus_create_hid_device(hidraw_busidW, vid, pid, input, version, 0, serial, - is_gamepad, &hidraw_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &hidraw_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); } #ifdef HAS_PROPER_INPUT_HEADER @@ -1149,8 +1153,7 @@ static void try_add_device(struct udev_device *dev) { if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct wine_input_private)))) return; - device = bus_create_hid_device(lnxev_busidW, vid, pid, input, version, 0, serial, - is_gamepad, &lnxev_vtbl, &private->unix_device); + device = bus_create_hid_device(&desc, &lnxev_vtbl, &private->unix_device); if (!device) HeapFree(GetProcessHeap(), 0, private); } #endif @@ -1166,8 +1169,6 @@ static void try_add_device(struct udev_device *dev) WARN("Ignoring device %s with subsystem %s\n", debugstr_a(devnode), subsystem); close(fd); } - - HeapFree(GetProcessHeap(), 0, serial); } static void try_remove_device(struct udev_device *dev) @@ -1213,7 +1214,7 @@ static void build_initial_deviceset(void) path = udev_list_entry_get_name(dev_list_entry); if ((dev = udev_device_new_from_syspath(udev_context, path))) { - try_add_device(dev); + udev_add_device(dev); udev_device_unref(dev); } } @@ -1286,7 +1287,7 @@ static void process_monitor_event(struct udev_monitor *monitor) if (!action) WARN("No action received\n"); else if (strcmp(action, "add") == 0) - try_add_device(dev); + udev_add_device(dev); else if (strcmp(action, "remove") == 0) try_remove_device(dev); else diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 0f92f64dea2..4727c4b043d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -118,11 +118,8 @@ struct device_extension CRITICAL_SECTION cs; enum device_state state; - WORD vid, pid, input; - DWORD uid, version, index; - BOOL is_gamepad; - WCHAR *serial; - const WCHAR *busid; /* Expected to be a static constant */ + struct device_desc desc; + DWORD index; const platform_vtbl *vtbl; @@ -146,36 +143,25 @@ static CRITICAL_SECTION device_list_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static struct list device_list = LIST_INIT(device_list); -static const WCHAR zero_serialW[]= {'0','0','0','0',0}; - static NTSTATUS winebus_call(unsigned int code, void *args) { return __wine_unix_call_funcs[code]( args ); } -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dst; - if (!src) return NULL; - dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1)*sizeof(WCHAR)); - if (dst) strcpyW(dst, src); - return dst; -} - struct unix_device *get_unix_device(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; return ext->unix_device; } -static DWORD get_device_index(WORD vid, WORD pid, WORD input) +static DWORD get_device_index(struct device_desc *desc) { struct device_extension *ext; DWORD index = 0; LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) { - if (ext->vid == vid && ext->pid == pid && ext->input == input) + if (ext->desc.vid == desc->vid && ext->desc.pid == desc->pid && ext->desc.input == desc->input) index = max(ext->index + 1, index); } @@ -186,12 +172,11 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) { static const WCHAR formatW[] = {'%','i','&','%','s','&','%','x','&','%','i',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - const WCHAR *serial = ext->serial ? ext->serial : zero_serialW; - DWORD len = strlenW(serial) + 33; + DWORD len = strlenW(ext->desc.serial) + 33; WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) - sprintfW(dst, formatW, ext->version, serial, ext->uid, ext->index); + sprintfW(dst, formatW, ext->desc.version, ext->desc.serial, ext->desc.uid, ext->index); return dst; } @@ -202,13 +187,13 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x', '&','p','i','d','_','%','0','4','x',0}; struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - DWORD len = strlenW(ext->busid) + 34; + DWORD len = strlenW(ext->desc.busid) + 34; WCHAR *dst, *tmp; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { - tmp = dst + sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid); - if (ext->input != (WORD)-1) sprintfW(tmp, input_formatW, ext->input); + tmp = dst + sprintfW(dst, formatW, ext->desc.busid, ext->desc.vid, ext->desc.pid); + if (ext->desc.input != -1) sprintfW(tmp, input_formatW, ext->desc.input); } return dst; @@ -219,9 +204,9 @@ static WCHAR *get_hardware_ids(DEVICE_OBJECT *device) struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; - if ((dst = ExAllocatePool(PagedPool, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, (strlenW(ext->desc.busid) + 2) * sizeof(WCHAR)))) { - strcpyW(dst, ext->busid); + strcpyW(dst, ext->desc.busid); dst[strlenW(dst) + 1] = 0; } @@ -242,11 +227,11 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) DWORD size = sizeof(hid_compat); WCHAR *dst; - if (ext->is_gamepad) size += sizeof(xinput_compat); + if (ext->desc.is_gamepad) size += sizeof(xinput_compat); if ((dst = ExAllocatePool(PagedPool, size + sizeof(WCHAR)))) { - if (ext->is_gamepad) memcpy(dst, xinput_compat, sizeof(xinput_compat)); + if (ext->desc.is_gamepad) memcpy(dst, xinput_compat, sizeof(xinput_compat)); memcpy((char *)dst + size - sizeof(hid_compat), hid_compat, sizeof(hid_compat)); dst[size / sizeof(WCHAR)] = 0; } @@ -268,9 +253,8 @@ static void remove_pending_irps(DEVICE_OBJECT *device) } } -DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WORD input, - DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad, - const platform_vtbl *vtbl, struct unix_device *unix_device) +DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, const platform_vtbl *vtbl, + struct unix_device *unix_device) { static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e','\\','%','s','#','%','p',0}; struct device_extension *ext; @@ -279,11 +263,9 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO WCHAR dev_name[256]; NTSTATUS status; - TRACE("bus_id %s, vid %04x, pid %04x, input %04x, version %u, uid %u, serial %s, " - "is_gamepad %u, vtbl %p, unix_device %p\n", debugstr_w(busidW), vid, pid, input, - version, uid, debugstr_w(serialW), is_gamepad, vtbl, unix_device); + TRACE("desc %s, vtbl %p, unix_device %p\n", debugstr_device_desc(desc), vtbl, unix_device); - sprintfW(dev_name, device_name_fmtW, busidW, unix_device); + sprintfW(dev_name, device_name_fmtW, desc->busid, unix_device); RtlInitUnicodeString(&nameW, dev_name); status = IoCreateDevice(driver_obj, sizeof(struct device_extension), &nameW, 0, 0, FALSE, &device); if (status) @@ -297,15 +279,8 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO /* fill out device_extension struct */ ext = (struct device_extension *)device->DeviceExtension; ext->device = device; - ext->vid = vid; - ext->pid = pid; - ext->input = input; - ext->uid = uid; - ext->version = version; - ext->index = get_device_index(vid, pid, input); - ext->is_gamepad = is_gamepad; - ext->serial = strdupW(serialW); - ext->busid = busidW; + ext->desc = *desc; + ext->index = get_device_index(desc); ext->vtbl = vtbl; ext->last_report = NULL; ext->last_report_size = 0; @@ -334,7 +309,7 @@ DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) { - if (strcmpW(ext->busid, bus_id)) continue; + if (strcmpW(ext->desc.busid, bus_id)) continue; if (ext->vtbl->compare_platform_device(ext->device, platform_dev) == 0) { ret = ext->device; @@ -358,7 +333,7 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function EnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY_SAFE(ext, next, &device_list, struct device_extension, entry) { - if (strcmpW(ext->busid, bus_id)) continue; + if (strcmpW(ext->desc.busid, bus_id)) continue; LeaveCriticalSection(&device_list_cs); cont = function(ext->device, context); EnterCriticalSection(&device_list_cs); @@ -483,21 +458,19 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) static void mouse_device_create(void) { - static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; struct device_create_params params = {0}; if (winebus_call(mouse_create, &params)) return; - mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &mouse_vtbl, params.device); + mouse_obj = bus_create_hid_device(&params.desc, &mouse_vtbl, params.device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); } static void keyboard_device_create(void) { - static const WCHAR busidW[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; struct device_create_params params = {0}; if (winebus_call(keyboard_create, &params)) return; - keyboard_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &keyboard_vtbl, params.device); + keyboard_obj = bus_create_hid_device(&params.desc, &keyboard_vtbl, params.device); IoInvalidateDeviceRelations(bus_pdo, BusRelations); } @@ -737,7 +710,6 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) ext->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ext->cs); - HeapFree(GetProcessHeap(), 0, ext->serial); HeapFree(GetProcessHeap(), 0, ext->last_report); irp->IoStatus.Status = STATUS_SUCCESS; @@ -788,7 +760,7 @@ static NTSTATUS hid_get_native_string(DEVICE_OBJECT *device, DWORD index, WCHAR const struct product_desc *vendor_products; unsigned int i, vendor_products_size = 0; - if (ext->vid == VID_MICROSOFT) + if (ext->desc.vid == VID_MICROSOFT) { vendor_products = XBOX_CONTROLLERS; vendor_products_size = ARRAY_SIZE(XBOX_CONTROLLERS); @@ -796,7 +768,7 @@ static NTSTATUS hid_get_native_string(DEVICE_OBJECT *device, DWORD index, WCHAR for (i = 0; i < vendor_products_size; i++) { - if (ext->pid == vendor_products[i].pid) + if (ext->desc.pid == vendor_products[i].pid) break; } @@ -871,9 +843,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) memset(attr, 0, sizeof(*attr)); attr->Size = sizeof(*attr); - attr->VendorID = ext->vid; - attr->ProductID = ext->pid; - attr->VersionNumber = ext->version; + attr->VendorID = ext->desc.vid; + attr->ProductID = ext->desc.pid; + attr->VersionNumber = ext->desc.version; irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = sizeof(*attr); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index fdfdcc52dcb..9759bf9d911 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -108,11 +108,19 @@ const platform_vtbl mouse_vtbl = .set_feature_report = mouse_set_feature_report, }; +static const WCHAR mouse_bus_id[] = {'W','I','N','E','M','O','U','S','E',0}; +static const struct device_desc mouse_device_desc = +{ + .busid = mouse_bus_id, + .input = -1, + .serial = {'0','0','0','0',0}, +}; static struct unix_device mouse_device; static NTSTATUS mouse_device_create(void *args) { struct device_create_params *params = args; + params->desc = mouse_device_desc; params->device = &mouse_device; return STATUS_SUCCESS; } @@ -187,11 +195,19 @@ const platform_vtbl keyboard_vtbl = .set_feature_report = keyboard_set_feature_report, }; +static const WCHAR keyboard_bus_id[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; +static const struct device_desc keyboard_device_desc = +{ + .busid = keyboard_bus_id, + .input = -1, + .serial = {'0','0','0','0',0}, +}; static struct unix_device keyboard_device; static NTSTATUS keyboard_device_create(void *args) { struct device_create_params *params = args; + params->desc = keyboard_device_desc; params->device = &keyboard_device; return STATUS_SUCCESS; } diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index d70dedecb2c..d321c208885 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -27,9 +27,22 @@ #include <ddk/wdm.h> #include <hidusage.h> +#include "wine/debug.h" #include "wine/list.h" #include "wine/unixlib.h" +struct device_desc +{ + const WCHAR *busid; + DWORD vid; + DWORD pid; + DWORD version; + DWORD input; + DWORD uid; + WCHAR serial[256]; + BOOL is_gamepad; +}; + struct sdl_bus_options { BOOL map_controllers; @@ -70,6 +83,7 @@ struct bus_event struct device_create_params { + struct device_desc desc; struct unix_device *device; }; @@ -90,4 +104,12 @@ enum unix_funcs extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; +static inline const char *debugstr_device_desc(struct device_desc *desc) +{ + if (!desc) return "(null)"; + return wine_dbg_sprintf("{busid %s, vid %04x, pid %04x, version %04x, input %d, uid %08x, serial %s, is_gamepad %u}", + debugstr_w(desc->busid), desc->vid, desc->pid, desc->version, + desc->input, desc->uid, debugstr_w(desc->serial), desc->is_gamepad); +} + #endif /* __WINEBUS_UNIXLIB_H */ -- 2.33.0

1 3

[PATCH 1/2 v6] ntdll/socket: Implement exclusive flag for IOCTL_AFD_POLL.
by Guillaume Charifi Sept. 3, 2021

Sept. 3, 2021

v6: Rewrite to match the test results. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/ntdll/unix/socket.c | 6 ++-- include/wine/afd.h | 2 +- include/wine/server_protocol.h | 4 +-- server/protocol.def | 1 + server/request.h | 1 + server/sock.c | 54 ++++++++++++++++++++++++++++++++-- server/trace.c | 3 +- 7 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 8469def786a..b1b90b363ee 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -747,12 +747,11 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi || in_size < offsetof( struct afd_poll_params, sockets[params->count] )) return STATUS_INVALID_PARAMETER; - TRACE( "timeout %s, count %u, unknown %#x, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", - wine_dbgstr_longlong(params->timeout), params->count, params->unknown, + TRACE( "timeout %s, count %u, exclusive %u, padding (%#x, %#x, %#x), sockets[0] {%04lx, %#x}\n", + wine_dbgstr_longlong(params->timeout), params->count, params->exclusive, params->padding[0], params->padding[1], params->padding[2], params->sockets[0].socket, params->sockets[0].flags ); - if (params->unknown) FIXME( "unknown boolean is %#x\n", params->unknown ); if (params->padding[0]) FIXME( "padding[0] is %#x\n", params->padding[0] ); if (params->padding[1]) FIXME( "padding[1] is %#x\n", params->padding[1] ); if (params->padding[2]) FIXME( "padding[2] is %#x\n", params->padding[2] ); @@ -793,6 +792,7 @@ static NTSTATUS sock_poll( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi SERVER_START_REQ( poll_socket ) { req->async = server_async( handle, &async->io, event, apc, apc_user, iosb_client_ptr(io) ); + req->exclusive = !!params->exclusive; req->timeout = params->timeout; wine_server_add_data( req, input, params->count * sizeof(*input) ); wine_server_set_reply( req, async->sockets, params->count * sizeof(async->sockets[0]) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index e67ecae25a9..f4682f464e8 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -104,7 +104,7 @@ struct afd_poll_params { LONGLONG timeout; unsigned int count; - BOOLEAN unknown; + BOOLEAN exclusive; BOOLEAN padding[3]; struct { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index bb4862c9669..fc9c8ed8111 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1761,7 +1761,7 @@ struct poll_socket_output struct poll_socket_request { struct request_header __header; - char __pad_12[4]; + int exclusive; async_data_t async; timeout_t timeout; /* VARARG(sockets,poll_socket_input); */ @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 726 +#define SERVER_PROTOCOL_VERSION 727 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 133d6ad0552..c6da8576f39 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1450,6 +1450,7 @@ struct poll_socket_output /* Perform an async poll on a socket */ @REQ(poll_socket) + int exclusive; async_data_t async; /* async I/O parameters */ timeout_t timeout; /* timeout */ VARARG(sockets,poll_socket_input); /* list of sockets to poll */ diff --git a/server/request.h b/server/request.h index 18a6a2df3c7..f1c8f1c5432 100644 --- a/server/request.h +++ b/server/request.h @@ -1045,6 +1045,7 @@ C_ASSERT( sizeof(struct recv_socket_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, wait) == 8 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_reply, options) == 12 ); C_ASSERT( sizeof(struct recv_socket_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct poll_socket_request, exclusive) == 12 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct poll_socket_request, timeout) == 56 ); C_ASSERT( sizeof(struct poll_socket_request) == 64 ); diff --git a/server/sock.c b/server/sock.c index 50bfc08e145..a5a96fea722 100644 --- a/server/sock.c +++ b/server/sock.c @@ -128,12 +128,14 @@ struct poll_req struct async *async; struct iosb *iosb; struct timeout_user *timeout; + char exclusive; unsigned int count; struct poll_socket_output *output; struct { struct sock *sock; int flags; + int main; } sockets[1]; }; @@ -2853,8 +2855,51 @@ static int poll_single_socket( struct sock *sock, int mask ) return get_poll_flags( sock, pollfd.revents ) & mask; } -static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t timeout, - unsigned int count, const struct poll_socket_input *input ) +static void poll_handle_exclusive(struct poll_req *req) +{ + struct poll_req *areq; + unsigned int i, j; + + for (i = 0; i < req->count; ++i) + { + int has_main = FALSE; + + LIST_FOR_EACH_ENTRY(areq, &poll_list, struct poll_req, entry) + { + for (j = 0; j < areq->count; ++j) + { + if (areq->sockets[j].sock != req->sockets[i].sock) + continue; + + if (!areq->sockets[j].main) + continue; + + has_main = TRUE; + + if (areq->exclusive && req->exclusive) + { + /* Previous exclusive main poll replaced by new exclusive poll */ + areq->sockets[j].main = FALSE; + + areq->iosb->status = STATUS_SUCCESS; + areq->iosb->out_data = areq->output; + areq->iosb->out_size = areq->count * sizeof(*areq->output); + async_terminate(areq->async, STATUS_ALERTED); + + has_main = FALSE; + } + + goto next; + } + } + + next: + req->sockets[i].main = !has_main; + } +} + +static int poll_socket( struct sock *poll_sock, struct async *async, char exclusive, + timeout_t timeout, unsigned int count, const struct poll_socket_input *input ) { struct poll_socket_output *output; struct poll_req *req; @@ -2893,11 +2938,14 @@ static int poll_socket( struct sock *poll_sock, struct async *async, timeout_t t req->sockets[i].flags = input[i].flags; } + req->exclusive = exclusive; req->count = count; req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->output = output; + poll_handle_exclusive(req); + list_add_tail( &poll_list, &req->entry ); async_set_completion_callback( async, free_poll_req, req ); queue_async( &poll_sock->poll_q, async ); @@ -3312,7 +3360,7 @@ DECL_HANDLER(poll_socket) if ((async = create_request_async( sock->fd, get_fd_comp_flags( sock->fd ), &req->async ))) { - reply->wait = async_handoff( async, poll_socket( sock, async, req->timeout, count, input ), NULL, 0 ); + reply->wait = async_handoff( async, poll_socket( sock, async, req->exclusive, req->timeout, count, input ), NULL, 0 ); reply->options = get_fd_options( sock->fd ); release_object( async ); } diff --git a/server/trace.c b/server/trace.c index 4e91d933a5d..f144d88094f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2122,7 +2122,8 @@ static void dump_recv_socket_reply( const struct recv_socket_reply *req ) static void dump_poll_socket_request( const struct poll_socket_request *req ) { - dump_async_data( " async=", &req->async ); + fprintf( stderr, " exclusive=%d", req->exclusive ); + dump_async_data( ", async=", &req->async ); dump_timeout( ", timeout=", &req->timeout ); dump_varargs_poll_socket_input( ", sockets=", cur_size ); } -- 2.33.0

3 3

[PATCH] dbghelp: handle the case where loader isn't what WINELOADER reports
by Eric Pouech Sept. 3, 2021

Sept. 3, 2021

use case, in a WoW setup: wine programs/winedbg/winedbg.exe.so notepad.exe where both winedbg and notepad are 64bit exec:s in this case, dbghelp (loaded from winedbg) reads '<...>/wine' from WINELOADER windows env block inside notepad (but the unix env block is correctly set to wine64 by the tweak in ntdll/unix/loader.c) as a consequence dbghelp doesn't get the ELF information (it tries to read 32bit ELF entities, and fails); hence misses all the loaded ELF libraries winedbg's command 'info share' only reports the PE modules note: the 'dual' case wine64 programs/winedbg/winedbg.exe.so c:\\windows\\syswow64\\notepad.exe where winedbg is a 64bit exec and notepad a 32bit shows the same failures workaround this in dbghelp by tweaking the value of WINELOADER whether the debuggee is 32 or 64bit V2: - remove const qualifier Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/elf_module.c | 10 ++++++++-- dlls/dbghelp/macho_module.c | 10 +++++++++- dlls/dbghelp/module.c | 30 ++++++++++++++++++++++++++---- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2b0365bc386..c04a82cd46a 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -639,7 +639,7 @@ extern void module_reset_debug_info(struct module* module) DECLSPEC_HIDD extern BOOL module_remove(struct process* pcs, struct module* module) DECLSPEC_HIDDEN; extern void module_set_module(struct module* module, const WCHAR* name) DECLSPEC_HIDDEN; -extern const WCHAR *get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; +extern WCHAR* get_wine_loader_name(struct process *pcs) DECLSPEC_HIDDEN; /* msc.c */ extern BOOL pe_load_debug_directory(const struct process* pcs, diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index d1a4454e043..7be7e8efce6 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1752,10 +1752,16 @@ static const struct loader_ops elf_loader_ops = BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr) { struct elf_info elf_info; - BOOL ret; + BOOL ret = FALSE; + WCHAR* loader; elf_info.flags = ELF_INFO_DEBUG_HEADER | ELF_INFO_MODULE; - ret = elf_search_and_load_file(pcs, get_wine_loader_name(pcs), addr, 0, &elf_info); + loader = get_wine_loader_name(pcs); + if (loader) + { + ret = elf_search_and_load_file(pcs, loader, addr, 0, &elf_info); + HeapFree(GetProcessHeap(), 0, loader); + } if (!ret || !elf_info.dbg_hdr_addr) return FALSE; TRACE("Found ELF debug header %#lx\n", elf_info.dbg_hdr_addr); diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 602f7e45c14..7b0b80c4900 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1885,7 +1885,15 @@ static BOOL macho_search_loader(struct process* pcs, struct macho_info* macho_in } } - if (!ret) ret = macho_search_and_load_file(pcs, get_wine_loader_name(pcs), 0, macho_info); + if (!ret) + { + WCHAR* loader = get_wine_loader_name(pcs); + if (loader) + { + ret = macho_search_and_load_file(pcs, loader, 0, macho_info); + HeapFree(GetProcessHeap(), 0, loader); + } + } return ret; } diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c278a627d37..3bc2a9e143a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -138,12 +138,34 @@ void module_set_module(struct module* module, const WCHAR* name) } /* Returned string must be freed by caller */ -const WCHAR *get_wine_loader_name(struct process *pcs) +WCHAR *get_wine_loader_name(struct process *pcs) { - const WCHAR *name = process_getenv(pcs, L"WINELOADER"); + const WCHAR *name; + WCHAR* altname; + unsigned len; + + name = process_getenv(pcs, L"WINELOADER"); if (!name) name = pcs->is_64bit ? L"wine64" : L"wine"; - TRACE("returning %s\n", debugstr_w(name)); - return name; + len = lstrlenW(name); + + /* WINELOADER isn't properly updated in Wow64 process calling inside Windows env block + * (it's updated in ELF env block though) + * So do the adaptation ourselves. + */ + altname = HeapAlloc(GetProcessHeap(), 0, (len + 2 + 1) * sizeof(WCHAR)); + if (altname) + { + memcpy(altname, name, len * sizeof(WCHAR)); + if (pcs->is_64bit && len >= 2 && memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR)) != 0) + lstrcpyW(altname + len, L"64"); + else if (!pcs->is_64bit && len >= 2 && !memcmp(name + len - 2, L"64", 2 * sizeof(WCHAR))) + altname[len - 2] = '\0'; + else + altname[len] = '\0'; + } + + TRACE("returning %s\n", debugstr_w(altname)); + return altname; } static const char* get_module_type(enum module_type type, BOOL virtual)

1 0

[PATCH 1/9] server: Use a separate function and flag to communicate that the initial status of an async is not known yet.
by Zebediah Figura Sept. 3, 2021

Sept. 3, 2021

Mostly just to simplify the interface, so that we don't need to use the return value to communicate this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/async.c | 23 +++++++++++++++++------ server/device.c | 4 ++-- server/file.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/server/async.c b/server/async.c index e8d95a62d4b..4e9f3253759 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ unsigned int terminated :1; /* async has been terminated */ + unsigned int unknown_status :1; /* initial status is not known yet */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -258,6 +259,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->direct_result = 0; async->alerted = 0; async->terminated = 0; + async->unknown_status = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -284,6 +286,7 @@ void set_async_pending( struct async *async, int signal ) if (!async->terminated) { async->pending = 1; + async->unknown_status = 0; if (signal && !async->signaled) { async->signaled = 1; @@ -295,14 +298,15 @@ void set_async_pending( struct async *async, int signal ) /* return async object status and wait handle to client */ obj_handle_t async_handoff( struct async *async, int success, data_size_t *result, int force_blocking ) { + if (async->unknown_status) + { + /* even the initial status is not known yet */ + set_error( STATUS_PENDING ); + return async->wait_handle; + } + if (!success) { - if (get_error() == STATUS_PENDING) - { - /* we don't know the result yet, so client needs to wait */ - async->direct_result = 0; - return async->wait_handle; - } close_handle( async->thread->process, async->wait_handle ); async->wait_handle = 0; return 0; @@ -381,6 +385,13 @@ void async_request_complete_alloc( struct async *async, unsigned int status, dat async_request_complete( async, status, result, out_size, out_data_copy ); } +/* mark an async as having unknown initial status */ +void async_set_unknown_status( struct async *async ) +{ + async->unknown_status = 1; + async->direct_result = 0; +} + /* set the timeout of an async operation */ void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ) { diff --git a/server/device.c b/server/device.c index 29b36845e68..8892651d048 100644 --- a/server/device.c +++ b/server/device.c @@ -605,8 +605,8 @@ static int queue_irp( struct device_file *file, const irp_params_t *params, stru irp->async = (struct async *)grab_object( async ); add_irp_to_queue( file->device->manager, irp, current ); release_object( irp ); - set_error( STATUS_PENDING ); - return 0; + async_set_unknown_status( async ); + return 1; } static enum server_fd_type device_file_get_fd_type( struct fd *fd ) diff --git a/server/file.h b/server/file.h index 8e42cd3704e..9b8a620359e 100644 --- a/server/file.h +++ b/server/file.h @@ -224,6 +224,7 @@ extern void queue_async( struct async_queue *queue, struct async *async ); extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned int status ); extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); extern void async_set_completion_callback( struct async *async, async_completion_callback func, void *private ); +extern void async_set_unknown_status( struct async *async ); extern void set_async_pending( struct async *async, int signal ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); -- 2.33.0

1 8