- Wine-Commits - list.winehq.org

Alex Henrie : tbs: Add GetDeviceIDString stub.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: 2586ddc5dc61826d13029854d7aaa1082e1d506f URL: https://gitlab.winehq.org/wine/wine/-/commit/2586ddc5dc61826d13029854d7aaa1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 20 01:30:51 2023 -0700 tbs: Add GetDeviceIDString stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56054 --- dlls/tbs/tbs.c | 6 ++++++ dlls/tbs/tbs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/tbs/tbs.c b/dlls/tbs/tbs.c index cb18d01fa2c..986a3c4e4a7 100644 --- a/dlls/tbs/tbs.c +++ b/dlls/tbs/tbs.c @@ -35,3 +35,9 @@ TBS_RESULT WINAPI Tbsi_GetDeviceInfo(UINT32 size, void *info) FIXME("(%u, %p) stub\n", size, info); return TBS_E_TPM_NOT_FOUND; } + +HRESULT WINAPI GetDeviceIDString(WCHAR *out, UINT32 size, UINT32 *used, BOOL *tpm) +{ + FIXME("(%p, %u, %p, %p) stub\n", out, size, used, tpm); + return E_NOTIMPL; +} diff --git a/dlls/tbs/tbs.spec b/dlls/tbs/tbs.spec index 5fa68007254..54e23cbc292 100644 --- a/dlls/tbs/tbs.spec +++ b/dlls/tbs/tbs.spec @@ -1,7 +1,7 @@ @ stub Tbsi_Create_Attestation_From_Log @ stub Tbsi_Get_TCG_Logs @ stub GetDeviceID -@ stub GetDeviceIDString +@ stdcall GetDeviceIDString(ptr long ptr ptr) @ stub GetDeviceIDWithTimeout @ stdcall Tbsi_Context_Create(ptr ptr) @ stub Tbsi_Create_Windows_Key

1 0

Haidong Yu : loader: Associate folder with explorer.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: 7a941fd59af6377c1e30012e4a0eaea711dd61f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a941fd59af6377c1e30012e4a0eae… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Thu Dec 14 10:13:40 2023 +0800 loader: Associate folder with explorer. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 40549bb34aa..68eac159456 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -289,6 +289,7 @@ HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,exefile\shell\runas\command,,2,"""%1"" %*" +HKCR,folder\shell\explore\command,,2,"explorer ""%1""" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders"

1 0

Alex Henrie : uiautomationcore/tests: Use CRT allocation functions.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: 53724c2eb6254b4b8a6d9b0aca768577fb5f3e36 URL: https://gitlab.winehq.org/wine/wine/-/commit/53724c2eb6254b4b8a6d9b0aca7685… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 13 00:26:08 2023 -0700 uiautomationcore/tests: Use CRT allocation functions. --- dlls/uiautomationcore/tests/uiautomation.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 67dcb04dadc..25271ebe743 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -1823,7 +1823,7 @@ static struct prov_method_sequence *sequence; static void flush_method_sequence(void) { - HeapFree(GetProcessHeap(), 0, sequence); + free(sequence); sequence = NULL; sequence_cnt = sequence_size = 0; } @@ -1836,15 +1836,10 @@ static void add_method_call(struct Provider *prov, int method) if (!method_sequences_enabled) return; - if (!sequence) - { - sequence_size = 10; - sequence = HeapAlloc(GetProcessHeap(), 0, sequence_size * sizeof(*sequence)); - } if (sequence_cnt == sequence_size) { - sequence_size *= 2; - sequence = HeapReAlloc(GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence)); + sequence_size = sequence_size ? sequence_size * 2 : 10; + sequence = realloc(sequence, sequence_size * sizeof(*sequence)); } prov_method.prov = prov; @@ -8859,7 +8854,7 @@ static ULONG WINAPI ClientSideProvider_Release(IRawElementProviderSimple *iface) ULONG ref = InterlockedDecrement(&This->ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + free(This); return ref; } @@ -8931,7 +8926,7 @@ static IRawElementProviderSimpleVtbl ClientSideProviderVtbl = { static IRawElementProviderSimple *create_temporary_clientside_provider(HWND hwnd, enum ProviderType prov_type) { - struct ClientSideProvider *prov = HeapAlloc(GetProcessHeap(), 0, sizeof(*prov)); + struct ClientSideProvider *prov = malloc(sizeof(*prov)); if (!prov) {

1 0

Bartosz Kosiorek : gdiplus: Partially implement GdipDrawImageFX.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: b12078d928cfe6767fd52c7419c45d71136f8194 URL: https://gitlab.winehq.org/wine/wine/-/commit/b12078d928cfe6767fd52c7419c45d… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Dec 7 00:19:38 2023 +0100 gdiplus: Partially implement GdipDrawImageFX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55945 --- dlls/gdiplus/graphics.c | 44 +++++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/graphics.c | 5 ----- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5101378d0e1..9fd399e3cde 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2947,13 +2947,49 @@ GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, 0.0, 0.0, (REAL)width, (REAL)height, UnitPixel); } -GpStatus WINGDIPAPI GdipDrawImageFX(GpGraphics *graphics, GpImage *image, GpRectF *src, +GpStatus WINGDIPAPI GdipDrawImageFX(GpGraphics *graphics, GpImage *image, GpRectF *src_rect, GpMatrix *transform, CGpEffect *effect, GpImageAttributes *imageattr, - GpUnit srcUnit) + GpUnit src_unit) { - FIXME("(%p, %p, %p, %p, %p, %p, %d): stub\n", graphics, image, src, transform, effect, imageattr, srcUnit); + GpRectF src_rect_buf; + GpPointF points[3]; + GpStatus status; - return NotImplemented; + TRACE("(%p, %p, %p, %p, %p, %p, %d)\n", graphics, image, src_rect, transform, effect, imageattr, src_unit); + + if (!graphics || !image) + return InvalidParameter; + + if (effect) + FIXME("effect not implemented\n"); + + if (!src_rect) + { + if ((status = GdipGetImageBounds(image, &src_rect_buf, &src_unit)) != Ok) + return status; + + /* Metafiles may have different left-top coordinates */ + if (src_rect_buf.X != 0.0 || src_rect_buf.Y != 0.0) + { + FIXME("image bounds %s left-top not at origin", debugstr_rectf(&src_rect_buf)); + /* TODO: only use width and height (force origin)? */ + } + + src_rect = &src_rect_buf; + } + + points[0].X = points[2].X = src_rect->X; + points[0].Y = points[1].Y = src_rect->Y; + points[1].X = src_rect->X + src_rect->Width; + points[2].Y = src_rect->Y + src_rect->Height; + + if (transform) + GdipTransformMatrixPoints(transform, points, 3); + + return GdipDrawImagePointsRect(graphics, image, points, 3, + src_rect->X, src_rect->Y, + src_rect->Width, src_rect->Height, + src_unit, imageattr, NULL, NULL); } GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 96bc5df7c6f..54960beabb3 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1332,17 +1332,14 @@ static void test_GdipDrawImageFX(void) /* DrawImageFX with source rectangle */ status = GdipDrawImageFX(graphics, NULL, &source, NULL, NULL, NULL, UnitPixel); - todo_wine expect(InvalidParameter, status); /* DrawImageFX with source bitmap */ status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, NULL, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); /* DrawImageFX with source bitmap and transform */ status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, transform, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); /* DrawImageFX with source bitmap and source rectangle */ @@ -1350,12 +1347,10 @@ static void test_GdipDrawImageFX(void) source.Height = source.Width = 10.0; status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, NULL, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); /* DrawImageFX with source bitmap, source rectangle, and transform */ status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, transform, NULL, NULL, UnitPixel); - todo_wine expect(Ok, status); GdipDeleteMatrix(transform);

1 0

Rémi Bernon : dinput: Add a description to the dinput worker thread.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: 4885bdda95faec235d7c8bd70a455b094997dc9c URL: https://gitlab.winehq.org/wine/wine/-/commit/4885bdda95faec235d7c8bd70a455b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 22 16:08:46 2023 +0100 dinput: Add a description to the dinput worker thread. --- dlls/dinput/dinput_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index f99ebbc2404..a3ff8283561 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -363,6 +363,8 @@ static DWORD WINAPI dinput_thread_proc( void *params ) DWORD ret; MSG msg; + SetThreadDescription( GetCurrentThread(), L"wine_dinput_worker" ); + di_em_win = CreateWindowW( L"DIEmWin", L"DIEmWin", 0, 0, 0, 0, 0, HWND_MESSAGE, 0, DINPUT_instance, NULL ); input_thread_state = &state; SetEvent( start_event );

1 0

Bartosz Kosiorek : gdiplus/tests: Add GdipDrawImageFX tests except effects or attributes.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: bc56fc1b871edbdb684c1d7a11d49839cf19ea7b URL: https://gitlab.winehq.org/wine/wine/-/commit/bc56fc1b871edbdb684c1d7a11d498… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Thu Dec 7 00:19:38 2023 +0100 gdiplus/tests: Add GdipDrawImageFX tests except effects or attributes. --- dlls/gdiplus/tests/graphics.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index d71bc78c2ae..96bc5df7c6f 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1307,6 +1307,63 @@ static void test_GdipDrawLineI(void) ReleaseDC(hwnd, hdc); } +static void test_GdipDrawImageFX(void) +{ + GpGraphics *graphics = NULL; + GpMatrix *transform; + GpBitmap *bm = NULL; + GpStatus status; + GpRectF source; + BYTE buff[400]; + HDC hdc; + + if (!(hdc = GetDC( hwnd ))) + return; + + memset(buff, 0, sizeof(buff)); + status = GdipCreateBitmapFromScan0(10, 10, 40, PixelFormat32bppRGB, buff, &bm); + expect(Ok, status); + ok(NULL != bm, "Expected bitmap to be initialized\n"); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateMatrix2(2.0, 0.0, 0.0, 1.0, 10.0, 20.0, &transform); + expect(Ok, status); + + /* DrawImageFX with source rectangle */ + status = GdipDrawImageFX(graphics, NULL, &source, NULL, NULL, NULL, UnitPixel); + todo_wine + expect(InvalidParameter, status); + + /* DrawImageFX with source bitmap */ + status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, NULL, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + /* DrawImageFX with source bitmap and transform */ + status = GdipDrawImageFX(graphics, (GpImage*)bm, NULL, transform, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + /* DrawImageFX with source bitmap and source rectangle */ + source.X = source.Y = 0.0; + source.Height = source.Width = 10.0; + + status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, NULL, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + /* DrawImageFX with source bitmap, source rectangle, and transform */ + status = GdipDrawImageFX(graphics, (GpImage*)bm, &source, transform, NULL, NULL, UnitPixel); + todo_wine + expect(Ok, status); + + GdipDeleteMatrix(transform); + GdipDeleteGraphics(graphics); + GdipDisposeImage((GpImage*)bm); + ReleaseDC(hwnd, hdc); +} + static void test_GdipDrawImagePointsRect(void) { GpStatus status; @@ -7395,6 +7452,7 @@ START_TEST(graphics) test_GdipDrawCurve3I(); test_GdipDrawLineI(); test_GdipDrawLinesI(); + test_GdipDrawImageFX(); test_GdipDrawImagePointsRect(); test_GdipFillClosedCurve(); test_GdipFillClosedCurveI();

1 0

Rémi Bernon : windows.gaming.input: Add a description to the monitor thread.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: aa92cabd67c3d34fbc7b733438a52af61779e79b URL: https://gitlab.winehq.org/wine/wine/-/commit/aa92cabd67c3d34fbc7b733438a52a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 22 16:07:48 2023 +0100 windows.gaming.input: Add a description to the monitor thread. --- dlls/windows.gaming.input/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index a20630cd20b..39c0540aace 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -116,6 +116,8 @@ static DWORD WINAPI monitor_thread_proc( void *param ) HWND hwnd; MSG msg; + SetThreadDescription( GetCurrentThread(), L"wine_wginput_worker" ); + GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (void *)windows_gaming_input, &module ); RegisterClassExW( &wndclass ); hwnd = CreateWindowExW( 0, wndclass.lpszClassName, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL );

1 0

Rémi Bernon : winexinput: Demote BusContainerId FIXME message to WARN.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: 08a422bf17d846d4aff93a28c61ece7463e67bf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/08a422bf17d846d4aff93a28c61ece… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 12:02:21 2024 +0100 winexinput: Demote BusContainerId FIXME message to WARN. --- dlls/winexinput.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 6d33b740e46..f07e6b31bd5 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -526,7 +526,7 @@ static NTSTATUS WINAPI pdo_pnp(DEVICE_OBJECT *device, IRP *irp) else status = STATUS_SUCCESS; break; default: - FIXME("IRP_MN_QUERY_ID type %u, not implemented!\n", type); + WARN("IRP_MN_QUERY_ID type %u, not implemented!\n", type); status = irp->IoStatus.Status; break; }

1 0

Rémi Bernon : winebus: Demote BusContainerId FIXME message to WARN.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: c43d3964e35af1a786ad0e986e907792732fc9e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/c43d3964e35af1a786ad0e986e9077… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 12:02:21 2024 +0100 winebus: Demote BusContainerId FIXME message to WARN. --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index b0252b438ea..2476e3a9cdb 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -543,7 +543,7 @@ static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = (ULONG_PTR)get_instance_id(device); break; default: - FIXME("Unhandled type %08x\n", type); + WARN("Unhandled type %08x\n", type); return status; }

1 0

Rémi Bernon : winebus: Allow specific devices to prefer hidraw backend.
by Alexandre Julliard Jan. 18, 2024

Jan. 18, 2024

Module: wine Branch: master Commit: 814d2c176d23c581353ba5679977415d2218d0c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/814d2c176d23c581353ba567997741… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 11:53:20 2024 +0100 winebus: Allow specific devices to prefer hidraw backend. And use SDL otherwise in priority over evdev for abstracted HID device implementation. --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_udev.c | 33 +------------------------ dlls/winebus.sys/main.c | 59 ++++++++++++++++++++++++++++++++++++++------ dlls/winebus.sys/unixlib.h | 5 ++-- 4 files changed, 57 insertions(+), 42 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 99334d141bb..7c8c3cc3529 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -271,7 +271,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * { struct device_desc desc = { - .input = -1, + .input = -1, .is_hidraw = TRUE, .serialnumber = {'0','0','0','0',0}, }; struct iohid_device *impl; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 34b3305ed88..c8620352766 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -530,29 +530,6 @@ static const struct raw_device_vtbl hidraw_device_vtbl = #ifdef HAS_PROPER_INPUT_HEADER -static const char *get_device_syspath(struct udev_device *dev) -{ - struct udev_device *parent; - - if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "hid", NULL))) - return udev_device_get_syspath(parent); - - if ((parent = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_device"))) - return udev_device_get_syspath(parent); - - return ""; -} - -static struct base_device *find_device_from_syspath(const char *path) -{ - struct base_device *impl; - - LIST_FOR_EACH_ENTRY(impl, &device_list, struct base_device, unix_device.entry) - if (!strcmp(get_device_syspath(impl->udev_device), path)) return impl; - - return NULL; -} - #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) static const USAGE_AND_PAGE *what_am_I(struct udev_device *dev, int fd) @@ -1312,15 +1289,6 @@ static void udev_add_device(struct udev_device *dev, int fd) TRACE("udev %s syspath %s\n", debugstr_a(devnode), udev_device_get_syspath(dev)); -#ifdef HAS_PROPER_INPUT_HEADER - if ((impl = find_device_from_syspath(get_device_syspath(dev)))) - { - TRACE("duplicate device found, not adding the new one\n"); - close(fd); - return; - } -#endif - get_device_subsystem_info(dev, "hid", &desc, &bus); get_device_subsystem_info(dev, "input", &desc, &bus); get_device_subsystem_info(dev, "usb", &desc, &bus); @@ -1334,6 +1302,7 @@ static void udev_add_device(struct udev_device *dev, int fd) #endif if (!desc.manufacturer[0]) memcpy(desc.manufacturer, hidraw, sizeof(hidraw)); + desc.is_hidraw = TRUE; #ifdef HAVE_LINUX_HIDRAW_H if (!desc.product[0] && ioctl(fd, HIDIOCGRAWNAME(sizeof(product) - 1), product) >= 0) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index be635632e80..b19b1f1cb96 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -401,6 +401,36 @@ static DWORD check_bus_option(const WCHAR *option, DWORD default_value) return default_value; } +static BOOL is_hidraw_enabled(WORD vid, WORD pid) +{ + char buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[1024])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + WCHAR vidpid[MAX_PATH], *tmp; + BOOL prefer_hidraw = FALSE; + UNICODE_STRING str; + DWORD size; + + if (check_bus_option(L"DisableHidraw", FALSE)) return FALSE; + + RtlInitUnicodeString(&str, L"EnableHidraw"); + if (!NtQueryValueKey(driver_key, &str, KeyValuePartialInformation, info, + sizeof(buffer) - sizeof(WCHAR), &size)) + { + UINT len = swprintf(vidpid, ARRAY_SIZE(vidpid), L"%04X:%04X", vid, pid); + size -= FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); + tmp = (WCHAR *)info->Data; + + while (size >= len * sizeof(WCHAR)) + { + if (!wcsnicmp(tmp, vidpid, len)) prefer_hidraw = TRUE; + size -= (len + 1) * sizeof(WCHAR); + tmp += len + 1; + } + } + + return prefer_hidraw; +} + static BOOL deliver_next_report(struct device_extension *ext, IRP *irp) { struct hid_report *report; @@ -580,6 +610,14 @@ static DWORD CALLBACK bus_main_thread(void *args) IoInvalidateDeviceRelations(bus_pdo, BusRelations); break; case BUS_EVENT_TYPE_DEVICE_CREATED: + { + const struct device_desc *desc = &event->device_created.desc; + if (!desc->is_hidraw != !is_hidraw_enabled(desc->vid, desc->pid)) + { + WARN("ignoring %shidraw device %04x:%04x\n", desc->is_hidraw ? "" : "non-", desc->vid, desc->pid); + break; + } + device = bus_create_hid_device(&event->device_created.desc, event->device); if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); else @@ -589,6 +627,7 @@ static DWORD CALLBACK bus_main_thread(void *args) winebus_call(device_remove, &params); } break; + } case BUS_EVENT_TYPE_INPUT_REPORT: RtlEnterCriticalSection(&device_list_cs); device = bus_find_unix_device(event->device); @@ -739,7 +778,7 @@ static NTSTATUS sdl_driver_init(void) return status; } -static NTSTATUS udev_driver_init(void) +static NTSTATUS udev_driver_init(BOOL enable_sdl) { struct udev_bus_options bus_options; struct bus_main_params bus = @@ -752,7 +791,7 @@ static NTSTATUS udev_driver_init(void) bus_options.disable_hidraw = check_bus_option(L"DisableHidraw", 0); if (bus_options.disable_hidraw) TRACE("UDEV hidraw devices disabled in registry\n"); - bus_options.disable_input = check_bus_option(L"DisableInput", 0); + bus_options.disable_input = check_bus_option(L"DisableInput", 0) || enable_sdl; if (bus_options.disable_input) TRACE("UDEV input devices disabled in registry\n"); bus_options.disable_udevd = check_bus_option(L"DisableUdevd", 0); if (bus_options.disable_udevd) TRACE("UDEV udevd use disabled in registry\n"); @@ -771,12 +810,19 @@ static NTSTATUS iohid_driver_init(void) .wait_code = iohid_wait, }; + if (check_bus_option(L"DisableHidraw", FALSE)) + { + TRACE("IOHID hidraw devices disabled in registry\n"); + return STATUS_SUCCESS; + } + return bus_main_thread_start(&bus); } static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + BOOL enable_sdl; NTSTATUS ret; switch (irpsp->MinorFunction) @@ -788,11 +834,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) mouse_device_create(); keyboard_device_create(); - if (!check_bus_option(L"Enable SDL", 1) || sdl_driver_init()) - { - udev_driver_init(); - iohid_driver_init(); - } + if ((enable_sdl = check_bus_option(L"Enable SDL", 1))) + enable_sdl = !sdl_driver_init(); + udev_driver_init(enable_sdl); + iohid_driver_init(); irp->IoStatus.Status = STATUS_SUCCESS; break; diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 731745bb9a4..2425484b33f 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -38,6 +38,7 @@ struct device_desc UINT input; UINT uid; BOOL is_gamepad; + BOOL is_hidraw; WCHAR manufacturer[MAX_PATH]; WCHAR product[MAX_PATH]; @@ -147,8 +148,8 @@ enum unix_funcs static inline const char *debugstr_device_desc(struct device_desc *desc) { if (!desc) return "(null)"; - return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, is_gamepad %u}", - desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->is_gamepad); + return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, is_gamepad %u, is_hidraw %u}", + desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->is_gamepad, desc->is_hidraw); } #endif /* __WINEBUS_UNIXLIB_H */

1 0