September 2021 - Wine-commits

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in wined3d_fixup_alpha().
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 554a4a111a0ed9e49ff0461ad0d76c9a3156657a URL: https://source.winehq.org/git/wine.git/?a=commit;h=554a4a111a0ed9e49ff0461a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 10 21:32:51 2021 +0200 wined3d: Use wined3d_mask_from_size() in wined3d_fixup_alpha(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6663e788e9c..08b57cf1a36 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2358,7 +2358,7 @@ static void wined3d_fixup_alpha(const struct wined3d_format *format, const uint8 unsigned int x, y; byte_count = format->byte_count; - alpha_mask = ((1u << format->alpha_size) - 1) << format->alpha_offset; + alpha_mask = wined3d_mask_from_size(format->alpha_size) << format->alpha_offset; switch (byte_count) {

1 0

Nikolay Sivov : ole32: Simplify IsEqual() for class moniker.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 39070fd4f67169ce49ba002f8699b4d459337952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39070fd4f67169ce49ba002f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:51 2021 +0300 ole32: Simplify IsEqual() for class moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 47 ++++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 8149b8e2edc..5f303be037c 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -57,6 +57,15 @@ static inline ClassMoniker *impl_from_IROTData(IROTData *iface) return CONTAINING_RECORD(iface, ClassMoniker, IROTData_iface); } +static const IMonikerVtbl ClassMonikerVtbl; + +static ClassMoniker *unsafe_impl_from_IMoniker(IMoniker *iface) +{ + if (iface->lpVtbl != &ClassMonikerVtbl) + return NULL; + return CONTAINING_RECORD(iface, ClassMoniker, IMoniker_iface); +} + /******************************************************************************* * ClassMoniker_QueryInterface *******************************************************************************/ @@ -373,37 +382,20 @@ static HRESULT WINAPI ClassMoniker_Enum(IMoniker* iface,BOOL fForward, IEnumMoni return S_OK; } -/****************************************************************************** - * ClassMoniker_IsEqual - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) +static HRESULT WINAPI ClassMoniker_IsEqual(IMoniker *iface, IMoniker *other) { + ClassMoniker *moniker = impl_from_IMoniker(iface), *other_moniker; - CLSID clsid; - LPOLESTR dispName1,dispName2; - IBindCtx* bind; - HRESULT res = S_FALSE; - - TRACE("(%p,%p)\n",iface,pmkOtherMoniker); - - if (!pmkOtherMoniker) return S_FALSE; + TRACE("%p, %p.\n", iface, other); + if (!other) + return E_INVALIDARG; - /* check if both are ClassMoniker */ - if(FAILED (IMoniker_GetClassID(pmkOtherMoniker,&clsid))) return S_FALSE; - if(!IsEqualCLSID(&clsid,&CLSID_ClassMoniker)) return S_FALSE; + other_moniker = unsafe_impl_from_IMoniker(other); + if (!other_moniker) + return S_FALSE; - /* check if both displaynames are the same */ - if(SUCCEEDED ((res = CreateBindCtx(0,&bind)))) { - if(SUCCEEDED (IMoniker_GetDisplayName(iface,bind,NULL,&dispName1))) { - if(SUCCEEDED (IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&dispName2))) { - if(wcscmp(dispName1,dispName2)==0) res = S_OK; - CoTaskMemFree(dispName2); - } - CoTaskMemFree(dispName1); - } - } - return res; + return IsEqualGUID(&moniker->clsid, &other_moniker->clsid) ? S_OK : S_FALSE; } /****************************************************************************** @@ -627,9 +619,6 @@ static HRESULT WINAPI ClassMonikerROTData_GetComparisonData(IROTData* iface, return S_OK; } -/********************************************************************************/ -/* Virtual function table for the ClassMoniker class which include IPersist,*/ -/* IPersistStream and IMoniker functions. */ static const IMonikerVtbl ClassMonikerVtbl = { ClassMoniker_QueryInterface,

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

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: 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: Return WBEM_E_INVALID_CLASS from create_view() if namespace is empty.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: 73aab21de686e8a6bf663fc05563a745574b1a85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73aab21de686e8a6bf663fc0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 13 17:13:28 2021 +0300 wbemprox: Return WBEM_E_INVALID_CLASS from create_view() if namespace is empty. 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/query.c | 1 + dlls/wbemprox/tests/query.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 108e3b4ad81..77ed27e105d 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -62,6 +62,7 @@ HRESULT create_view( enum view_type type, enum wbm_namespace ns, const WCHAR *pa heap_free( view ); return hr; } + else if (!table && ns == WBEMPROX_NAMESPACE_LAST) return WBEM_E_INVALID_CLASS; view->proplist = proplist; view->cond = cond; break; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 784ebd3503d..69bb8e7977e 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -2061,6 +2061,33 @@ static void test_Win32_LogicalDisk( IWbemServices *services ) SysFreeString( wql ); } +static void test_empty_namespace( IWbemLocator *locator ) +{ + BSTR path = SysAllocString( L"ROOT" ); + BSTR wql = SysAllocString( L"wql" ); + IEnumWbemClassObject *result; + IWbemServices *services; + BSTR query; + HRESULT hr; + + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + + query = SysAllocString( L"SELECT * FROM __ASSOCIATORS" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_CLASS, "Query failed: %08x\n", hr ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT * FROM Win32_OperatingSystem" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_CLASS, "got %08x\n", hr ); + SysFreeString( query ); + + SysFreeString( wql ); + SysFreeString( path ); + IWbemServices_Release( services ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -2138,6 +2165,7 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); test_SystemRestore( services ); + test_empty_namespace( locator ); SysFreeString( path ); IWbemServices_Release( services );

1 0

Paul Gofman : wbemprox: Add Microsoft\\Windows\\Storage namespace.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: bb727d2e983ba1426ef5de1c5abc3eb2d5ca7361 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb727d2e983ba1426ef5de1c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Sep 13 17:13:29 2021 +0300 wbemprox: Add Microsoft\\Windows\\Storage namespace. Fixes Life is Strange: True Colors error on start. 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 | 1 + dlls/wbemprox/tests/services.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 41 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index ad96182af6b..442a9015951 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4128,6 +4128,7 @@ static const struct builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, + {L"Microsoft\\Windows\\Storage", NULL, 0}, }; void init_table_list( void ) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 5ad73e7a8ec..86ee99c335c 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -247,11 +247,50 @@ todo_wine IWbemContext_Release( context ); } +static void test_namespaces(void) +{ + static const struct + { + const WCHAR *path; + BOOL broken; + } + tests[] = + { + {L"ROOT\\CIMV2"}, + {L"ROOT\\Microsoft\\Windows\\Storage", TRUE /* Before Win8. */}, + }; + IWbemLocator *locator; + IWbemServices *services; + unsigned int i; + BSTR resource; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void **)&locator ); + if (hr != S_OK) + { + win_skip( "can't create instance of WbemLocator.\n" ); + return; + } + + for (i = 0; i < ARRAY_SIZE( tests ); i++) + { + resource = SysAllocString( tests[i].path ); + hr = IWbemLocator_ConnectServer( locator, resource, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK || broken( tests[i].broken && hr == WBEM_E_INVALID_NAMESPACE ), "%u: got %08x\n", i, hr ); + SysFreeString( resource ); + if (hr == S_OK) + IWbemServices_Release( services ); + } + + IWbemLocator_Release( locator ); +} + START_TEST(services) { CoInitialize( NULL ); test_IClientSecurity(); test_IWbemLocator(); test_IWbemContext(); + test_namespaces(); CoUninitialize(); } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index cd655e54243..6b94bbb9ef6 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -23,6 +23,7 @@ enum wbm_namespace { WBEMPROX_NAMESPACE_CIMV2, + WBEMPROX_NAMESPACE_MS_WINDOWS_STORAGE, WBEMPROX_NAMESPACE_LAST, };

1 0

Rémi Bernon : winebus.sys: Split destroy to a separate stop method.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: cd830398dd39ebcd35245fcaea9844246a5f0696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd830398dd39ebcd35245fca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 08:58:21 2021 +0200 winebus.sys: Split destroy to a separate stop method. So we can stop the device when it's removed from the ntoskrnl.exe device list, and then destroy it only when it's not referenced anymore. 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 | 8 ++++++ dlls/winebus.sys/bus_sdl.c | 16 +++++++---- dlls/winebus.sys/bus_udev.c | 64 ++++++++++++++++++++++++----------------- dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 19 +++++++++--- 5 files changed, 72 insertions(+), 36 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 18e318f7789..d362906637a 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -167,6 +167,13 @@ static NTSTATUS iohid_device_start(struct unix_device *iface, DEVICE_OBJECT *dev return STATUS_SUCCESS; } +static void iohid_device_stop(struct unix_device *iface) +{ + struct platform_private *private = impl_from_unix_device(iface); + + IOHIDDeviceRegisterInputReportCallback(private->device, NULL, 0, NULL, NULL); +} + static NTSTATUS iohid_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -246,6 +253,7 @@ static const struct unix_device_vtbl iohid_device_vtbl = iohid_device_destroy, iohid_device_compare, iohid_device_start, + iohid_device_stop, iohid_device_get_report_descriptor, iohid_device_set_output_report, iohid_device_get_feature_report, diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 8d6df3e1f13..73562fec14f 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -482,12 +482,6 @@ static void sdl_device_destroy(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); - pSDL_JoystickClose(ext->sdl_joystick); - if (ext->sdl_controller) - pSDL_GameControllerClose(ext->sdl_controller); - if (ext->sdl_haptic) - pSDL_HapticClose(ext->sdl_haptic); - HeapFree(GetProcessHeap(), 0, ext); } @@ -503,6 +497,15 @@ static NTSTATUS sdl_device_start(struct unix_device *iface, DEVICE_OBJECT *devic return build_report_descriptor(ext); } +static void sdl_device_stop(struct unix_device *iface) +{ + struct platform_private *private = impl_from_unix_device(iface); + + pSDL_JoystickClose(private->sdl_joystick); + if (private->sdl_controller) pSDL_GameControllerClose(private->sdl_controller); + if (private->sdl_haptic) pSDL_HapticClose(private->sdl_haptic); +} + static NTSTATUS sdl_device_get_reportdescriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -579,6 +582,7 @@ static const struct unix_device_vtbl sdl_device_vtbl = sdl_device_destroy, sdl_device_compare, sdl_device_start, + sdl_device_stop, sdl_device_get_reportdescriptor, sdl_device_set_output_report, sdl_device_get_feature_report, diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3010e50ce98..25a408489a4 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -558,19 +558,6 @@ static void hidraw_device_destroy(struct unix_device *iface) { struct platform_private *private = impl_from_unix_device(iface); - EnterCriticalSection(&udev_cs); - list_remove(&private->unix_device.entry); - LeaveCriticalSection(&udev_cs); - - if (private->report_thread) - { - write(private->control_pipe[1], "q", 1); - WaitForSingleObject(private->report_thread, INFINITE); - close(private->control_pipe[0]); - close(private->control_pipe[1]); - CloseHandle(private->report_thread); - } - close(private->device_fd); udev_device_unref(private->udev_device); @@ -608,6 +595,24 @@ static NTSTATUS hidraw_device_start(struct unix_device *iface, DEVICE_OBJECT *de return STATUS_SUCCESS; } +static void hidraw_device_stop(struct unix_device *iface) +{ + struct platform_private *private = impl_from_unix_device(iface); + + EnterCriticalSection(&udev_cs); + list_remove(&private->unix_device.entry); + LeaveCriticalSection(&udev_cs); + + if (private->report_thread) + { + write(private->control_pipe[1], "q", 1); + WaitForSingleObject(private->report_thread, INFINITE); + close(private->control_pipe[0]); + close(private->control_pipe[1]); + CloseHandle(private->report_thread); + } +} + static NTSTATUS hidraw_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -780,6 +785,7 @@ static const struct unix_device_vtbl hidraw_device_vtbl = hidraw_device_destroy, udev_device_compare, hidraw_device_start, + hidraw_device_stop, hidraw_device_get_report_descriptor, hidraw_device_set_output_report, hidraw_device_get_feature_report, @@ -802,19 +808,6 @@ static void lnxev_device_destroy(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); - EnterCriticalSection(&udev_cs); - list_remove(&ext->base.unix_device.entry); - LeaveCriticalSection(&udev_cs); - - if (ext->base.report_thread) - { - write(ext->base.control_pipe[1], "q", 1); - WaitForSingleObject(ext->base.report_thread, INFINITE); - close(ext->base.control_pipe[0]); - close(ext->base.control_pipe[1]); - CloseHandle(ext->base.report_thread); - } - HeapFree(GetProcessHeap(), 0, ext->current_report_buffer); HeapFree(GetProcessHeap(), 0, ext->last_report_buffer); hid_descriptor_free(&ext->desc); @@ -853,6 +846,24 @@ static NTSTATUS lnxev_device_start(struct unix_device *iface, DEVICE_OBJECT *dev return STATUS_SUCCESS; } +static void lnxev_device_stop(struct unix_device *iface) +{ + struct wine_input_private *ext = input_impl_from_unix_device(iface); + + EnterCriticalSection(&udev_cs); + list_remove(&ext->base.unix_device.entry); + LeaveCriticalSection(&udev_cs); + + if (ext->base.report_thread) + { + write(ext->base.control_pipe[1], "q", 1); + WaitForSingleObject(ext->base.report_thread, INFINITE); + close(ext->base.control_pipe[0]); + close(ext->base.control_pipe[1]); + CloseHandle(ext->base.report_thread); + } +} + static NTSTATUS lnxev_device_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length) { @@ -920,6 +931,7 @@ static const struct unix_device_vtbl lnxev_device_vtbl = lnxev_device_destroy, udev_device_compare, lnxev_device_start, + lnxev_device_stop, lnxev_device_get_report_descriptor, lnxev_device_set_output_report, lnxev_device_get_feature_report, diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 767c9335114..2a878cdb583 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -34,6 +34,7 @@ struct unix_device_vtbl void (*destroy)(struct unix_device *iface); int (*compare)(struct unix_device *iface, void *platform_dev); NTSTATUS (*start)(struct unix_device *iface, DEVICE_OBJECT *device); + void (*stop)(struct unix_device *iface); NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length); void (*set_output_report)(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io); void (*get_feature_report)(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 67efb794e4f..2407a2af468 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static struct hid_descriptor mouse_desc; static struct hid_descriptor keyboard_desc; -static void mouse_remove(struct unix_device *iface) +static void mouse_destroy(struct unix_device *iface) { } @@ -58,6 +58,10 @@ static NTSTATUS mouse_start(struct unix_device *iface, DEVICE_OBJECT *device) return STATUS_SUCCESS; } +static void mouse_stop(struct unix_device *iface) +{ +} + static NTSTATUS mouse_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -92,9 +96,10 @@ static void mouse_set_feature_report(struct unix_device *iface, HID_XFER_PACKET static const struct unix_device_vtbl mouse_vtbl = { - mouse_remove, + mouse_destroy, mouse_compare, mouse_start, + mouse_stop, mouse_get_report_descriptor, mouse_set_output_report, mouse_get_feature_report, @@ -120,7 +125,7 @@ static NTSTATUS mouse_device_create(void *args) return STATUS_SUCCESS; } -static void keyboard_remove(struct unix_device *iface) +static void keyboard_destroy(struct unix_device *iface) { } @@ -141,6 +146,10 @@ static NTSTATUS keyboard_start(struct unix_device *iface, DEVICE_OBJECT *device) return STATUS_SUCCESS; } +static void keyboard_stop(struct unix_device *iface) +{ +} + static NTSTATUS keyboard_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -175,9 +184,10 @@ static void keyboard_set_feature_report(struct unix_device *iface, HID_XFER_PACK static const struct unix_device_vtbl keyboard_vtbl = { - keyboard_remove, + keyboard_destroy, keyboard_compare, keyboard_start, + keyboard_stop, keyboard_get_report_descriptor, keyboard_set_output_report, keyboard_get_feature_report, @@ -206,6 +216,7 @@ static NTSTATUS keyboard_device_create(void *args) static NTSTATUS unix_device_remove(void *args) { struct unix_device *iface = args; + iface->vtbl->stop(iface); iface->vtbl->destroy(iface); return STATUS_SUCCESS; }

1 0

Rémi Bernon : winebus.sys: Use helpers to create and destroy unix devices.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: b86eade743c1edd6e181373c7f1876ea0b643169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86eade743c1edd6e181373c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 08:58:22 2021 +0200 winebus.sys: Use helpers to create and destroy unix devices. 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 | 7 ++----- dlls/winebus.sys/bus_sdl.c | 8 ++------ dlls/winebus.sys/bus_udev.c | 12 ++++-------- dlls/winebus.sys/unix_private.h | 3 +++ dlls/winebus.sys/unixlib.c | 15 +++++++++++++++ 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index d362906637a..93b3605f8d2 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -139,8 +139,7 @@ static void handle_IOHIDDeviceIOHIDReportCallback(void *context, static void iohid_device_destroy(struct unix_device *iface) { - struct platform_private *private = impl_from_unix_device(iface); - HeapFree(GetProcessHeap(), 0, private); + unix_device_destroy(iface); } static int iohid_device_compare(struct unix_device *iface, void *context) @@ -337,9 +336,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * TRACE("dev %p, desc %s.\n", IOHIDDevice, debugstr_device_desc(&desc)); - if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) - return; - private->unix_device.vtbl = &iohid_device_vtbl; + if (!(private = unix_device_create(&iohid_device_vtbl, sizeof(struct platform_private)))) return; private->device = IOHIDDevice; private->buffer = NULL; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 73562fec14f..cda9e9bdcd9 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -480,9 +480,7 @@ failed: static void sdl_device_destroy(struct unix_device *iface) { - struct platform_private *ext = impl_from_unix_device(iface); - - HeapFree(GetProcessHeap(), 0, ext); + unix_device_destroy(iface); } static int sdl_device_compare(struct unix_device *iface, void *context) @@ -761,9 +759,7 @@ static void sdl_add_device(unsigned int index) 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; - private->unix_device.vtbl = &sdl_device_vtbl; + if (!(private = unix_device_create(&sdl_device_vtbl, sizeof(struct platform_private)))) return; private->sdl_joystick = joystick; private->sdl_controller = controller; private->id = id; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 25a408489a4..004bbb379c4 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -561,7 +561,7 @@ static void hidraw_device_destroy(struct unix_device *iface) close(private->device_fd); udev_device_unref(private->udev_device); - HeapFree(GetProcessHeap(), 0, private); + unix_device_destroy(iface); } static int udev_device_compare(struct unix_device *iface, void *platform_dev) @@ -815,7 +815,7 @@ static void lnxev_device_destroy(struct unix_device *iface) close(ext->base.device_fd); udev_device_unref(ext->base.udev_device); - HeapFree(GetProcessHeap(), 0, ext); + unix_device_destroy(iface); } static DWORD CALLBACK lnxev_device_report_thread(void *args); @@ -1084,9 +1084,7 @@ static void udev_add_device(struct udev_device *dev) if (strcmp(subsystem, "hidraw") == 0) { - if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct platform_private)))) - return; - private->unix_device.vtbl = &hidraw_device_vtbl; + if (!(private = unix_device_create(&hidraw_device_vtbl, sizeof(struct platform_private)))) return; EnterCriticalSection(&udev_cs); list_add_tail(&device_list, &private->unix_device.entry); LeaveCriticalSection(&udev_cs); @@ -1098,9 +1096,7 @@ static void udev_add_device(struct udev_device *dev) #ifdef HAS_PROPER_INPUT_HEADER else if (strcmp(subsystem, "input") == 0) { - if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct wine_input_private)))) - return; - private->unix_device.vtbl = &lnxev_device_vtbl; + if (!(private = unix_device_create(&lnxev_device_vtbl, sizeof(struct wine_input_private)))) return; EnterCriticalSection(&udev_cs); list_add_tail(&device_list, &private->unix_device.entry); LeaveCriticalSection(&udev_cs); diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 2a878cdb583..3b0375bb761 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -47,6 +47,9 @@ struct unix_device struct list entry; }; +extern void *unix_device_create(const struct unix_device_vtbl *vtbl, SIZE_T size) DECLSPEC_HIDDEN; +extern void unix_device_destroy(struct unix_device *iface) DECLSPEC_HIDDEN; + extern NTSTATUS sdl_bus_init(void *) DECLSPEC_HIDDEN; extern NTSTATUS sdl_bus_wait(void *) DECLSPEC_HIDDEN; extern NTSTATUS sdl_bus_stop(void *) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 2407a2af468..b37d9534540 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -213,6 +213,21 @@ static NTSTATUS keyboard_device_create(void *args) return STATUS_SUCCESS; } +void *unix_device_create(const struct unix_device_vtbl *vtbl, SIZE_T size) +{ + struct unix_device *iface; + + if (!(iface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) return NULL; + iface->vtbl = vtbl; + + return iface; +} + +void unix_device_destroy(struct unix_device *iface) +{ + HeapFree(GetProcessHeap(), 0, iface); +} + static NTSTATUS unix_device_remove(void *args) { struct unix_device *iface = args;

1 0

Rémi Bernon : winebus.sys: Allocate mouse and keyboard devices dynamically.
by Alexandre Julliard 14 Sep '21

14 Sep '21

Module: wine Branch: master Commit: bf1446523cb8592f83fc6e7289371c2cbccb099d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1446523cb8592f83fc6e72… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 08:58:23 2021 +0200 winebus.sys: Allocate mouse and keyboard devices dynamically. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/unixlib.c | 67 +++++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index b37d9534540..b433c0dcbdf 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -34,11 +34,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); -static struct hid_descriptor mouse_desc; -static struct hid_descriptor keyboard_desc; +struct mouse_device +{ + struct unix_device unix_device; + struct hid_descriptor desc; +}; + +static inline struct mouse_device *mouse_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(iface, struct mouse_device, unix_device); +} static void mouse_destroy(struct unix_device *iface) { + struct mouse_device *impl = mouse_from_unix_device(iface); + hid_descriptor_free(&impl->desc); + unix_device_destroy(iface); } static int mouse_compare(struct unix_device *iface, void *context) @@ -48,11 +59,13 @@ static int mouse_compare(struct unix_device *iface, void *context) static NTSTATUS mouse_start(struct unix_device *iface, DEVICE_OBJECT *device) { - if (!hid_descriptor_begin(&mouse_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE)) + struct mouse_device *impl = mouse_from_unix_device(iface); + + if (!hid_descriptor_begin(&impl->desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_buttons(&mouse_desc, HID_USAGE_PAGE_BUTTON, 1, 3)) + if (!hid_descriptor_add_buttons(&impl->desc, HID_USAGE_PAGE_BUTTON, 1, 3)) return STATUS_NO_MEMORY; - if (!hid_descriptor_end(&mouse_desc)) + if (!hid_descriptor_end(&impl->desc)) return STATUS_NO_MEMORY; return STATUS_SUCCESS; @@ -64,12 +77,14 @@ static void mouse_stop(struct unix_device *iface) static NTSTATUS mouse_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *ret_length) { + struct mouse_device *impl = mouse_from_unix_device(iface); + TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = mouse_desc.size; - if (length < mouse_desc.size) return STATUS_BUFFER_TOO_SMALL; + *ret_length = impl->desc.size; + if (length < impl->desc.size) return STATUS_BUFFER_TOO_SMALL; - memcpy(buffer, mouse_desc.data, mouse_desc.size); + memcpy(buffer, impl->desc.data, impl->desc.size); return STATUS_SUCCESS; } @@ -115,18 +130,31 @@ static const struct device_desc mouse_device_desc = .product = {"Wine HID mouse"}, .serialnumber = {"0000"}, }; -static struct unix_device mouse_device = {.vtbl = &mouse_vtbl}; static NTSTATUS mouse_device_create(void *args) { struct device_create_params *params = args; params->desc = mouse_device_desc; - params->device = &mouse_device; + params->device = unix_device_create(&mouse_vtbl, sizeof(struct mouse_device)); return STATUS_SUCCESS; } +struct keyboard_device +{ + struct unix_device unix_device; + struct hid_descriptor desc; +}; + +static inline struct keyboard_device *keyboard_from_unix_device(struct unix_device *iface) +{ + return CONTAINING_RECORD(iface, struct keyboard_device, unix_device); +} + static void keyboard_destroy(struct unix_device *iface) { + struct keyboard_device *impl = keyboard_from_unix_device(iface); + hid_descriptor_free(&impl->desc); + unix_device_destroy(iface); } static int keyboard_compare(struct unix_device *iface, void *context) @@ -136,11 +164,13 @@ static int keyboard_compare(struct unix_device *iface, void *context) static NTSTATUS keyboard_start(struct unix_device *iface, DEVICE_OBJECT *device) { - if (!hid_descriptor_begin(&keyboard_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD)) + struct keyboard_device *impl = keyboard_from_unix_device(iface); + + if (!hid_descriptor_begin(&impl->desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD)) return STATUS_NO_MEMORY; - if (!hid_descriptor_add_buttons(&keyboard_desc, HID_USAGE_PAGE_KEYBOARD, 0, 101)) + if (!hid_descriptor_add_buttons(&impl->desc, HID_USAGE_PAGE_KEYBOARD, 0, 101)) return STATUS_NO_MEMORY; - if (!hid_descriptor_end(&keyboard_desc)) + if (!hid_descriptor_end(&impl->desc)) return STATUS_NO_MEMORY; return STATUS_SUCCESS; @@ -152,12 +182,14 @@ static void keyboard_stop(struct unix_device *iface) static NTSTATUS keyboard_get_report_descriptor(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *ret_length) { + struct keyboard_device *impl = keyboard_from_unix_device(iface); + TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = keyboard_desc.size; - if (length < keyboard_desc.size) return STATUS_BUFFER_TOO_SMALL; + *ret_length = impl->desc.size; + if (length < impl->desc.size) return STATUS_BUFFER_TOO_SMALL; - memcpy(buffer, keyboard_desc.data, keyboard_desc.size); + memcpy(buffer, impl->desc.data, impl->desc.size); return STATUS_SUCCESS; } @@ -203,13 +235,12 @@ static const struct device_desc keyboard_device_desc = .product = {"Wine HID keyboard"}, .serialnumber = {"0000"}, }; -static struct unix_device keyboard_device = {.vtbl = &keyboard_vtbl}; static NTSTATUS keyboard_device_create(void *args) { struct device_create_params *params = args; params->desc = keyboard_device_desc; - params->device = &keyboard_device; + params->device = unix_device_create(&keyboard_vtbl, sizeof(struct keyboard_device)); return STATUS_SUCCESS; }

1 0