wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Paul Gofman : wbemprox: Prepare for multiple namespaces.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 73d8cc328140e79ad4004851ee3033d93124f3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=73d8cc328140e79ad4004851… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 13 17:13:27 2021 +0300 wbemprox: Prepare for multiple namespaces. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 58 +++++++++++++++++++++++++++++++--------- dlls/wbemprox/class.c | 38 ++++++++++++++------------ dlls/wbemprox/main.c | 2 +- dlls/wbemprox/process.c | 4 +-- dlls/wbemprox/qualifier.c | 22 ++++++++------- dlls/wbemprox/query.c | 42 ++++++++++++++++------------- dlls/wbemprox/reg.c | 14 +++++----- dlls/wbemprox/security.c | 4 +-- dlls/wbemprox/service.c | 8 +++--- dlls/wbemprox/services.c | 48 ++++++++++++++++++++------------- dlls/wbemprox/sysrestore.c | 2 +- dlls/wbemprox/table.c | 18 ++++++++----- dlls/wbemprox/wbemlocator.c | 4 +-- dlls/wbemprox/wbemprox_private.h | 35 +++++++++++++++--------- dlls/wbemprox/wql.y | 14 +++++----- 15 files changed, 190 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=73d8cc328140e79ad400…

1 0

Paul Gofman : wbemprox: Propagate create_view() error code from parser.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 3113d64f73eeeeb1b8315fd07224e25aea350bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=3113d64f73eeeeb1b8315fd0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 13 17:13:26 2021 +0300 wbemprox: Propagate create_view() error code from parser. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wql.y | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 95c8d8fe817..4d9333f9c17 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -291,7 +291,10 @@ associatorsof: hr = create_view( VIEW_TYPE_ASSOCIATORS, $3, NULL, NULL, NULL, NULL, &view ); if (hr != S_OK) + { + ctx->error = hr; YYABORT; + } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); } @@ -303,7 +306,10 @@ associatorsof: hr = create_view( VIEW_TYPE_ASSOCIATORS, $3, $5, NULL, NULL, NULL, &view ); if (hr != S_OK) + { + ctx->error = hr; YYABORT; + } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); } @@ -318,7 +324,10 @@ select: hr = create_view( VIEW_TYPE_SELECT, NULL, NULL, $3, NULL, NULL, &view ); if (hr != S_OK) + { + ctx->error = hr; YYABORT; + } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); } @@ -330,7 +339,10 @@ select: hr = create_view( VIEW_TYPE_SELECT, NULL, NULL, $4, $2, NULL, &view ); if (hr != S_OK) + { + ctx->error = hr; YYABORT; + } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); } @@ -342,7 +354,10 @@ select: hr = create_view( VIEW_TYPE_SELECT, NULL, NULL, $4, $2, $6, &view ); if (hr != S_OK) + { + ctx->error = hr; YYABORT; + } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); }

1 0

Paul Gofman : wbemprox: Copy correct substring to *namespace in parse_resource().
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 1ba57ce5ad8ef38e75fa73c8ecdf9ca26774873f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba57ce5ad8ef38e75fa73c8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 13 17:13:25 2021 +0300 wbemprox: Copy correct substring to *namespace in parse_resource(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemlocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 5e86f2be86d..161d9845ca9 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -139,7 +139,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else { - memcpy( *namespace, p, len * sizeof(WCHAR) ); + memcpy( *namespace, q, len * sizeof(WCHAR) ); (*namespace)[len] = 0; hr = S_OK; }

1 0

Nikolay Sivov : d3dx10: Handle null filename for W->A conversion explicitly in D3DX10CreateEffectFromResourceW().
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 613044fab7656288ab50c1ef2d71e6c3ecc9ea60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=613044fab7656288ab50c1ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 11:22:41 2021 +0300 d3dx10: Handle null filename for W->A conversion explicitly in D3DX10CreateEffectFromResourceW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/compiler.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 2a306fa8f57..0083ab267f1 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -176,7 +176,7 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) { - char *filename; + char *filename = NULL; HRSRC resinfo; void *data; DWORD size; @@ -195,10 +195,13 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *reso if (FAILED(hr = get_resource_data(module, resinfo, &data, &size))) return hr; - len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = heap_alloc(len))) - return E_OUTOFMEMORY; - WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + if (filenameW) + { + len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (!(filename = heap_alloc(len))) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + } hr = D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult);

1 0

Nikolay Sivov : d3dx10_37/tests: Enable tests.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 0727bba57fd6166a8f53d8ba1b317e96ae6b860a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0727bba57fd6166a8f53d8ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 09:07:17 2021 +0300 d3dx10_37/tests: Enable tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_37/Makefile.in | 1 + dlls/d3dx10_37/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 5fe632fdc09..1adbf1789f3 100755 --- a/configure +++ b/configure @@ -20375,6 +20375,7 @@ wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 +wine_fn_config_makefile dlls/d3dx10_37/tests enable_tests wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_38/tests enable_tests wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 diff --git a/configure.ac b/configure.ac index 15b7c2add2a..eb970972936 100644 --- a/configure.ac +++ b/configure.ac @@ -3074,6 +3074,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_37/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in index f4ea9ee460c..3d429b53ab0 100644 --- a/dlls/d3dx10_37/Makefile.in +++ b/dlls/d3dx10_37/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_37.dll +IMPORTLIB = d3dx10_37 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_37/tests/Makefile.in b/dlls/d3dx10_37/tests/Makefile.in new file mode 100644 index 00000000000..271d0722f48 --- /dev/null +++ b/dlls/d3dx10_37/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_37.dll +IMPORTS = d3dx10_37 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Alistair Leslie-Hughes : include: Add icodecapi.idl.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 9de0a20e30d3c724b4ec5946b8fa53b42530c787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9de0a20e30d3c724b4ec5946… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Sep 12 16:19:58 2021 +1000 include: Add icodecapi.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/icodecapi.idl | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 43a4fd98a42..eac1c2e0570 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -338,6 +338,7 @@ SOURCES = \ icftypes.idl \ icm.h \ icmpapi.h \ + icodecapi.idl \ idispids.h \ ieautomation.idl \ iextag.idl \ diff --git a/include/icodecapi.idl b/include/icodecapi.idl new file mode 100644 index 00000000000..7954b3fc2f6 --- /dev/null +++ b/include/icodecapi.idl @@ -0,0 +1,64 @@ +/* + * Copyright 2021 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +import "unknwn.idl"; +import "oaidl.idl"; + +interface IStream; + +struct CodecAPIEventData +{ + GUID guid; + DWORD dataLength; + DWORD reserved[3]; +}; + +[ + uuid(901db4c7-31ce-41a2-85dc-8fa0bf41b8da), + local, + object, + pointer_default(unique) +] +interface ICodecAPI : IUnknown +{ + HRESULT IsSupported ([in] const GUID *api); + HRESULT IsModifiable ([in] const GUID *api); + + HRESULT GetParameterRange ([in] const GUID *api, [out] VARIANT *min, [out] VARIANT *max, [out] VARIANT *delta); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetDefaultValue ([in] const GUID *api, [out] VARIANT *value); + + HRESULT GetValue ([in] const GUID *api, [out] VARIANT *value); + HRESULT SetValue ([in] const GUID *api, [in] VARIANT *value); + + HRESULT RegisterForEvent ([in] const GUID *api, [in] LONG_PTR userData); + HRESULT UnregisterForEvent ([in] const GUID *api); + + HRESULT SetAllDefaults(void); + + HRESULT SetValueWithNotify ([in] const GUID *api, [in] VARIANT *value, [out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT SetAllDefaultsWithNotify([out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT GetAllSettings([in] IStream *stream); + HRESULT SetAllSettings([in] IStream *stream); + + HRESULT SetAllSettingsWithNotify([in] IStream* stream, [out, size_is(,*count)] GUID **param, [out] ULONG *count); +}

1 0

Rémi Bernon : winebus.sys: Remove the now useless get_string callback.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 56a4aaf419d20474711223b7b9b84219714ee828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56a4aaf419d20474711223b7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 13:01:49 2021 +0200 winebus.sys: Remove the now useless get_string callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 27 ----------------- dlls/winebus.sys/bus_sdl.c | 19 ------------ dlls/winebus.sys/bus_udev.c | 65 ----------------------------------------- dlls/winebus.sys/main.c | 15 ---------- dlls/winebus.sys/unix_private.h | 1 - dlls/winebus.sys/unixlib.c | 20 ------------- dlls/winebus.sys/unixlib.h | 9 ------ 7 files changed, 156 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56a4aaf419d204747112…

1 0

Rémi Bernon : winebus.sys: Query serialnumber string on device creation.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: ff0d402efa65dd11ecd2bfc43a5171b1a0e000b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0d402efa65dd11ecd2bfc4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 13:01:48 2021 +0200 winebus.sys: Query serialnumber string on device creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 9 +++----- dlls/winebus.sys/bus_sdl.c | 9 ++------ dlls/winebus.sys/bus_udev.c | 50 ++++++++------------------------------------ dlls/winebus.sys/main.c | 11 ++++++++-- dlls/winebus.sys/unixlib.c | 4 ++-- dlls/winebus.sys/unixlib.h | 6 +++--- 6 files changed, 28 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff0d402efa65dd11ecd2…

1 0

Rémi Bernon : winebus.sys: Query product string on device creation.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 093c13e3337c979f2357e69d24df051f89ab21d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=093c13e3337c979f2357e69d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 13:01:47 2021 +0200 winebus.sys: Query product string on device creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 5 ++--- dlls/winebus.sys/bus_sdl.c | 10 +++------- dlls/winebus.sys/bus_udev.c | 26 +++++++++++--------------- dlls/winebus.sys/main.c | 7 +++++++ dlls/winebus.sys/unixlib.c | 18 ++++-------------- dlls/winebus.sys/unixlib.h | 1 + 6 files changed, 28 insertions(+), 39 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 8969e59f252..274d104e1f4 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -190,9 +190,6 @@ static NTSTATUS iohid_device_get_string(struct unix_device *iface, DWORD index, CFStringRef str; switch (index) { - case HID_STRING_ID_IPRODUCT: - str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDProductKey)); - break; case HID_STRING_ID_ISERIALNUMBER: str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDSerialNumberKey)); break; @@ -312,6 +309,8 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDManufacturerKey)); if (str) lstrcpynA(desc.manufacturer, str, sizeof(desc.manufacturer)); + str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductKey)); + if (str) lstrcpynA(desc.product, str, sizeof(desc.product)); if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1f4098dcb40..534cb5da6f5 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -517,17 +517,10 @@ static NTSTATUS sdl_device_get_reportdescriptor(struct unix_device *iface, BYTE static NTSTATUS sdl_device_get_string(struct unix_device *iface, DWORD index, WCHAR *buffer, DWORD length) { - struct platform_private *ext = impl_from_unix_device(iface); const char* str = NULL; switch (index) { - case HID_STRING_ID_IPRODUCT: - if (ext->sdl_controller) - str = pSDL_GameControllerName(ext->sdl_controller); - else - str = pSDL_JoystickName(ext->sdl_joystick); - break; case HID_STRING_ID_ISERIALNUMBER: str = "000000"; break; @@ -755,6 +748,9 @@ static void sdl_add_device(unsigned int index) if (options.map_controllers && pSDL_IsGameController(index)) controller = pSDL_GameControllerOpen(index); + if (controller) lstrcpynA(desc.product, pSDL_GameControllerName(controller), sizeof(desc.product)); + else lstrcpynA(desc.product, pSDL_JoystickName(joystick), sizeof(desc.product)); + id = pSDL_JoystickInstanceID(joystick); if (pSDL_JoystickGetProductVersion != NULL) { diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b5b478b2d3d..859363512dc 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -674,9 +674,6 @@ static NTSTATUS hidraw_device_get_string(struct unix_device *iface, DWORD index, { switch (index) { - case HID_STRING_ID_IPRODUCT: - str = get_sysattr_string(usbdev, "product"); - break; case HID_STRING_ID_ISERIALNUMBER: str = get_sysattr_string(usbdev, "serial"); break; @@ -690,15 +687,6 @@ static NTSTATUS hidraw_device_get_string(struct unix_device *iface, DWORD index, #ifdef HAVE_LINUX_HIDRAW_H switch (index) { - case HID_STRING_ID_IPRODUCT: - { - char buf[MAX_PATH]; - if (ioctl(private->device_fd, HIDIOCGRAWNAME(MAX_PATH), buf) == -1) - WARN("ioctl(HIDIOCGRAWNAME) failed: %d %s\n", errno, strerror(errno)); - else - str = strdupAtoW(buf); - break; - } case HID_STRING_ID_ISERIALNUMBER: break; default: @@ -961,9 +949,6 @@ static NTSTATUS lnxev_device_get_string(struct unix_device *iface, DWORD index, str[0] = 0; switch (index) { - case HID_STRING_ID_IPRODUCT: - ioctl(ext->base.device_fd, EVIOCGNAME(sizeof(str)), str); - break; case HID_STRING_ID_ISERIALNUMBER: ioctl(ext->base.device_fd, EVIOCGUNIQ(sizeof(str)), str); break; @@ -1083,6 +1068,9 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!desc->manufacturer[0] && (tmp = udev_device_get_sysattr_value(dev, "manufacturer"))) lstrcpynA(desc->manufacturer, tmp, sizeof(desc->manufacturer)); + + if (!desc->product[0] && (tmp = udev_device_get_sysattr_value(dev, "product"))) + lstrcpynA(desc->product, tmp, sizeof(desc->product)); } static void udev_add_device(struct udev_device *dev) @@ -1129,6 +1117,11 @@ static void udev_add_device(struct udev_device *dev) { desc.busid = hidraw_busidW; if (!desc.manufacturer[0]) strcpy(desc.manufacturer, "hidraw"); + +#ifdef HAVE_LINUX_HIDRAW_H + if (!desc.product[0] && ioctl(fd, HIDIOCGRAWNAME(sizeof(desc.product) - 1), desc.product) < 0) + desc.product[0] = 0; +#endif } #ifdef HAS_PROPER_INPUT_HEADER else if (!strcmp(subsystem, "input")) @@ -1152,6 +1145,9 @@ static void udev_add_device(struct udev_device *dev) MultiByteToWideChar(CP_UNIXCP, 0, device_uid, -1, desc.serial, ARRAY_SIZE(desc.serial)); if (!desc.manufacturer[0]) strcpy(desc.manufacturer, "evdev"); + + if (!desc.product[0] && ioctl(fd, EVIOCGNAME(sizeof(desc.product) - 1), desc.product) <= 0) + desc.product[0] = 0; } #endif diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2e355be0d99..9da2c83082a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -112,6 +112,7 @@ struct device_extension DWORD index; WCHAR manufacturer[MAX_PATH]; + WCHAR product[MAX_PATH]; BYTE *last_report; DWORD last_report_size; @@ -367,6 +368,7 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni ext->unix_device = unix_device; MultiByteToWideChar(CP_UNIXCP, 0, ext->desc.manufacturer, -1, ext->manufacturer, MAX_PATH); + MultiByteToWideChar(CP_UNIXCP, 0, ext->desc.product, -1, ext->product, MAX_PATH); InitializeListHead(&ext->irp_queue); InitializeCriticalSection(&ext->cs); @@ -831,6 +833,11 @@ static NTSTATUS hid_get_device_string(DEVICE_OBJECT *device, DWORD index, WCHAR if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; else memcpy(buffer, ext->manufacturer, len); return STATUS_SUCCESS; + case HID_STRING_ID_IPRODUCT: + len = (strlenW(ext->product) + 1) * sizeof(WCHAR); + if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; + else memcpy(buffer, ext->product, len); + return STATUS_SUCCESS; } return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 357a327ef37..80d42ab278d 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -71,13 +71,7 @@ static NTSTATUS mouse_get_report_descriptor(struct unix_device *iface, BYTE *buf static NTSTATUS mouse_get_string(struct unix_device *iface, DWORD index, WCHAR *buffer, DWORD length) { - static const WCHAR nameW[] = {'W','i','n','e',' ','H','I','D',' ','m','o','u','s','e',0}; - if (index != HID_STRING_ID_IPRODUCT) - return STATUS_NOT_IMPLEMENTED; - if (length < ARRAY_SIZE(nameW)) - return STATUS_BUFFER_TOO_SMALL; - lstrcpyW(buffer, nameW); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } static void mouse_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) @@ -120,6 +114,7 @@ static const struct device_desc mouse_device_desc = .input = -1, .serial = {'0','0','0','0',0}, .manufacturer = {"The Wine Project"}, + .product = {"Wine HID mouse"}, }; static struct unix_device mouse_device = {.vtbl = &mouse_vtbl}; @@ -165,13 +160,7 @@ static NTSTATUS keyboard_get_report_descriptor(struct unix_device *iface, BYTE * static NTSTATUS keyboard_get_string(struct unix_device *iface, DWORD index, WCHAR *buffer, DWORD length) { - static const WCHAR nameW[] = {'W','i','n','e',' ','H','I','D',' ','k','e','y','b','o','a','r','d',0}; - if (index != HID_STRING_ID_IPRODUCT) - return STATUS_NOT_IMPLEMENTED; - if (length < ARRAY_SIZE(nameW)) - return STATUS_BUFFER_TOO_SMALL; - lstrcpyW(buffer, nameW); - return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } static void keyboard_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) @@ -214,6 +203,7 @@ static const struct device_desc keyboard_device_desc = .input = -1, .serial = {'0','0','0','0',0}, .manufacturer = {"The Wine Project"}, + .product = {"Wine HID keyboard"}, }; static struct unix_device keyboard_device = {.vtbl = &keyboard_vtbl}; diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index cedee183507..142ef13f6b9 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -44,6 +44,7 @@ struct device_desc BOOL is_gamepad; char manufacturer[MAX_PATH]; + char product[MAX_PATH]; }; struct sdl_bus_options

1 0

Rémi Bernon : winebus.sys: Query manufacturer string on device creation.
by Alexandre Julliard 13 Sep '21

13 Sep '21

Module: wine Branch: master Commit: 9d4b70473c147b148039f34bfb63c07adb54638e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4b70473c147b148039f34b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 13 13:01:46 2021 +0200 winebus.sys: Query manufacturer string on device creation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 6 +++--- dlls/winebus.sys/bus_sdl.c | 4 +--- dlls/winebus.sys/bus_udev.c | 14 ++++++-------- dlls/winebus.sys/main.c | 25 ++++++++++++++++++++++++- dlls/winebus.sys/unixlib.c | 2 ++ dlls/winebus.sys/unixlib.h | 2 ++ 6 files changed, 38 insertions(+), 15 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 3df60a1b516..8969e59f252 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -193,9 +193,6 @@ static NTSTATUS iohid_device_get_string(struct unix_device *iface, DWORD index, case HID_STRING_ID_IPRODUCT: str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDProductKey)); break; - case HID_STRING_ID_IMANUFACTURER: - str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDManufacturerKey)); - break; case HID_STRING_ID_ISERIALNUMBER: str = IOHIDDeviceGetProperty(private->device, CFSTR(kIOHIDSerialNumberKey)); break; @@ -313,6 +310,9 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * } IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDManufacturerKey)); + if (str) lstrcpynA(desc.manufacturer, str, sizeof(desc.manufacturer)); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 80252e7e6b1..1f4098dcb40 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -528,9 +528,6 @@ static NTSTATUS sdl_device_get_string(struct unix_device *iface, DWORD index, WC else str = pSDL_JoystickName(ext->sdl_joystick); break; - case HID_STRING_ID_IMANUFACTURER: - str = "SDL"; - break; case HID_STRING_ID_ISERIALNUMBER: str = "000000"; break; @@ -739,6 +736,7 @@ static void sdl_add_device(unsigned int index) .busid = sdl_busidW, .input = -1, .serial = {'0','0','0','0',0}, + .manufacturer = {"SDL"}, }; struct platform_private *private; char guid_str[34]; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 78e74de842a..b5b478b2d3d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -677,9 +677,6 @@ static NTSTATUS hidraw_device_get_string(struct unix_device *iface, DWORD index, case HID_STRING_ID_IPRODUCT: str = get_sysattr_string(usbdev, "product"); break; - case HID_STRING_ID_IMANUFACTURER: - str = get_sysattr_string(usbdev, "manufacturer"); - break; case HID_STRING_ID_ISERIALNUMBER: str = get_sysattr_string(usbdev, "serial"); break; @@ -702,8 +699,6 @@ static NTSTATUS hidraw_device_get_string(struct unix_device *iface, DWORD index, str = strdupAtoW(buf); break; } - case HID_STRING_ID_IMANUFACTURER: - break; case HID_STRING_ID_ISERIALNUMBER: break; default: @@ -969,9 +964,6 @@ static NTSTATUS lnxev_device_get_string(struct unix_device *iface, DWORD index, case HID_STRING_ID_IPRODUCT: ioctl(ext->base.device_fd, EVIOCGNAME(sizeof(str)), str); break; - case HID_STRING_ID_IMANUFACTURER: - strcpy(str,"evdev"); - break; case HID_STRING_ID_ISERIALNUMBER: ioctl(ext->base.device_fd, EVIOCGUNIQ(sizeof(str)), str); break; @@ -1088,6 +1080,9 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy } } } + + if (!desc->manufacturer[0] && (tmp = udev_device_get_sysattr_value(dev, "manufacturer"))) + lstrcpynA(desc->manufacturer, tmp, sizeof(desc->manufacturer)); } static void udev_add_device(struct udev_device *dev) @@ -1133,6 +1128,7 @@ static void udev_add_device(struct udev_device *dev) if (!strcmp(subsystem, "hidraw")) { desc.busid = hidraw_busidW; + if (!desc.manufacturer[0]) strcpy(desc.manufacturer, "hidraw"); } #ifdef HAS_PROPER_INPUT_HEADER else if (!strcmp(subsystem, "input")) @@ -1154,6 +1150,8 @@ static void udev_add_device(struct udev_device *dev) device_uid[0] = 0; if (ioctl(fd, EVIOCGUNIQ(254), device_uid) >= 0 && device_uid[0]) MultiByteToWideChar(CP_UNIXCP, 0, device_uid, -1, desc.serial, ARRAY_SIZE(desc.serial)); + + if (!desc.manufacturer[0]) strcpy(desc.manufacturer, "evdev"); } #endif diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 53f6ac032e8..2e355be0d99 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -111,6 +111,8 @@ struct device_extension struct device_desc desc; DWORD index; + WCHAR manufacturer[MAX_PATH]; + BYTE *last_report; DWORD last_report_size; BOOL last_report_read; @@ -364,6 +366,8 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni ext->buffer_size = 0; ext->unix_device = unix_device; + MultiByteToWideChar(CP_UNIXCP, 0, ext->desc.manufacturer, -1, ext->manufacturer, MAX_PATH); + InitializeListHead(&ext->irp_queue); InitializeCriticalSection(&ext->cs); ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -815,6 +819,23 @@ static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_l } } +static NTSTATUS hid_get_device_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD buffer_len) +{ + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + DWORD len; + + switch (index) + { + case HID_STRING_ID_IMANUFACTURER: + len = (strlenW(ext->manufacturer) + 1) * sizeof(WCHAR); + if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; + else memcpy(buffer, ext->manufacturer, len); + return STATUS_SUCCESS; + } + + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); @@ -906,7 +927,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer; TRACE("IOCTL_HID_GET_STRING[%08x]\n", index); - irp->IoStatus.Status = unix_device_get_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); + irp->IoStatus.Status = hid_get_device_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len); + if (irp->IoStatus.Status != STATUS_SUCCESS) + irp->IoStatus.Status = unix_device_get_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); if (irp->IoStatus.Status == STATUS_SUCCESS) irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); break; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 9b0ccc0ae1a..357a327ef37 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -119,6 +119,7 @@ static const struct device_desc mouse_device_desc = .busid = mouse_bus_id, .input = -1, .serial = {'0','0','0','0',0}, + .manufacturer = {"The Wine Project"}, }; static struct unix_device mouse_device = {.vtbl = &mouse_vtbl}; @@ -212,6 +213,7 @@ static const struct device_desc keyboard_device_desc = .busid = keyboard_bus_id, .input = -1, .serial = {'0','0','0','0',0}, + .manufacturer = {"The Wine Project"}, }; static struct unix_device keyboard_device = {.vtbl = &keyboard_vtbl}; diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 85a03dd17ee..cedee183507 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -42,6 +42,8 @@ struct device_desc DWORD uid; WCHAR serial[256]; BOOL is_gamepad; + + char manufacturer[MAX_PATH]; }; struct sdl_bus_options

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021