September 2021 - Wine-Commits

Nikolay Sivov : ole32: Handle extra class moniker data on load/save.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 44d57a615f2d2ca16b45f346f868a04b608cccdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=44d57a615f2d2ca16b45f346… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:56 2021 +0300 ole32: Handle extra class moniker data on load/save. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 60 +++++++++++++++++++++++++++------------------- dlls/ole32/tests/moniker.c | 56 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 25 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index ac4854347c8..86c2639e8ec 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "winuser.h" #include "wine/debug.h" +#include "wine/heap.h" #include "ole2.h" #include "moniker.h" @@ -49,6 +50,7 @@ typedef struct ClassMoniker CLSID clsid; DWORD data_len; } header; + WCHAR *data; IUnknown *pMarshal; /* custom marshaler */ } ClassMoniker; @@ -126,23 +128,18 @@ static ULONG WINAPI ClassMoniker_AddRef(IMoniker* iface) return InterlockedIncrement(&This->ref); } -/****************************************************************************** - * ClassMoniker_Release - ******************************************************************************/ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) { - ClassMoniker *This = impl_from_IMoniker(iface); - ULONG ref; - - TRACE("(%p)\n",This); + ClassMoniker *moniker = impl_from_IMoniker(iface); + ULONG ref = InterlockedDecrement(&moniker->ref); - ref = InterlockedDecrement(&This->ref); + TRACE("%p refcount %d\n", iface, ref); - /* destroy the object if there are no more references to it */ - if (ref == 0) + if (!ref) { - if (This->pMarshal) IUnknown_Release(This->pMarshal); - HeapFree(GetProcessHeap(),0,This); + if (moniker->pMarshal) IUnknown_Release(moniker->pMarshal); + heap_free(moniker->data); + heap_free(moniker); } return ref; @@ -190,8 +187,15 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) if (moniker->header.data_len) { - FIXME("Moniker data of length %u was ignored.\n", moniker->header.data_len); - moniker->header.data_len = 0; + heap_free(moniker->data); + if (!(moniker->data = heap_alloc(moniker->header.data_len))) + { + WARN("Failed to allocate moniker data of size %u.\n", moniker->header.data_len); + moniker->header.data_len = 0; + return E_OUTOFMEMORY; + } + hr = IStream_Read(stream, moniker->data, moniker->header.data_len, &length); + if (hr != S_OK || length != moniker->header.data_len) return STG_E_READFAULT; } return S_OK; @@ -200,21 +204,25 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker *iface, IStream *stream) static HRESULT WINAPI ClassMoniker_Save(IMoniker *iface, IStream *stream, BOOL clear_dirty) { ClassMoniker *moniker = impl_from_IMoniker(iface); + HRESULT hr; TRACE("%p, %p, %d\n", iface, stream, clear_dirty); - return IStream_Write(stream, &moniker->header, sizeof(moniker->header), NULL); + hr = IStream_Write(stream, &moniker->header, sizeof(moniker->header), NULL); + + if (SUCCEEDED(hr) && moniker->header.data_len) + hr = IStream_Write(stream, moniker->data, moniker->header.data_len, NULL); + + return hr; } -/****************************************************************************** - * ClassMoniker_GetSizeMax - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_GetSizeMax(IMoniker* iface, - ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ +static HRESULT WINAPI ClassMoniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *size) { - TRACE("(%p)\n", pcbSize); + ClassMoniker *moniker = impl_from_IMoniker(iface); + + TRACE("%p, %p\n", iface, size); - pcbSize->QuadPart = sizeof(CLSID) + sizeof(DWORD); + size->QuadPart = sizeof(moniker->header) + moniker->header.data_len; return S_OK; } @@ -500,13 +508,17 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker *iface, if (pmkToLeft) return E_INVALIDARG; - if (!(*name = CoTaskMemAlloc(name_len * sizeof(WCHAR)))) + if (!(*name = CoTaskMemAlloc(name_len * sizeof(WCHAR) + moniker->header.data_len))) return E_OUTOFMEMORY; - swprintf(*name, name_len, L"clsid:%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X:", + swprintf(*name, name_len, L"clsid:%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + if (moniker->header.data_len) + lstrcatW(*name, moniker->data); + lstrcatW(*name, L":"); + TRACE("Returning %s\n", debugstr_w(*name)); return S_OK; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 86b47e28b89..afe40980dd9 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1769,12 +1769,17 @@ static void test_class_moniker(void) { IMoniker *moniker, *moniker2, *inverse, *reduced, *anti; IEnumMoniker *enummoniker; + ULONG length, eaten; + ULARGE_INTEGER size; + LARGE_INTEGER pos; + IROTData *rotdata; HRESULT hr; DWORD hash; IBindCtx *bindctx; IUnknown *unknown; FILETIME filetime; - ULONG eaten; + IStream *stream; + BYTE buffer[100]; hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1792,6 +1797,9 @@ todo_wine TEST_DISPLAY_NAME(moniker, L"clsid:11111111-0000-0000-2222-444444444444;extra data:"); TEST_MONIKER_TYPE(moniker, MKSYS_CLASSMONIKER); + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.LowPart == 44, "Unexpected size %u.\n", size.LowPart); TEST_MONIKER_TYPE(moniker2, MKSYS_CLASSMONIKER); @@ -1805,9 +1813,55 @@ todo_wine IMoniker_Release(moniker); } + /* From persistent state */ + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = CreateClassMoniker(&GUID_NULL, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.QuadPart == 20, "Unexpected size %u.\n", size.LowPart); + + hr = IStream_Write(stream, &CLSID_StdComponentCategoriesMgr, sizeof(CLSID), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + length = 5 * sizeof(WCHAR); + hr = IStream_Write(stream, &length, sizeof(length), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IStream_Write(stream, L"data", length, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Load(moniker, stream); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.QuadPart == 30, "Unexpected size %u.\n", size.LowPart); + TEST_DISPLAY_NAME(moniker, L"clsid:0002E005-0000-0000-C000-000000000046data:"); + + /* Extra data does not affect comparison */ + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IROTData_GetComparisonData(rotdata, buffer, sizeof(buffer), &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(length == sizeof(expected_class_moniker_comparison_data), "Unexpected comparison data length %u.\n", length); + ok(!memcmp(buffer, expected_class_moniker_comparison_data, length), "Unexpected data.\n"); + IROTData_Release(rotdata); + + IStream_Release(stream); + IMoniker_Release(moniker); + hr = CreateClassMoniker(&CLSID_StdComponentCategoriesMgr, &moniker); ok_ole_success(hr, CreateClassMoniker); + hr = IMoniker_GetSizeMax(moniker, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.LowPart == 20, "Unexpected size %u.\n", size.LowPart); + hr = IMoniker_QueryInterface(moniker, &CLSID_ClassMoniker, (void **)&unknown); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n");

1 0

Nikolay Sivov : ole32: Simplify CreateClassMoniker().
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 5e1a8ada72c55d5b4243ad16b843edc4730ad8e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e1a8ada72c55d5b4243ad16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:52 2021 +0300 ole32: Simplify CreateClassMoniker(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 5f303be037c..c52aaa9fbcf 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -656,48 +656,26 @@ static const IROTDataVtbl ROTDataVtbl = ClassMonikerROTData_GetComparisonData }; -/****************************************************************************** - * ClassMoniker_Construct (local function) - *******************************************************************************/ -static HRESULT ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid) -{ - TRACE("(%p,%s)\n",This,debugstr_guid(rclsid)); - - /* Initialize the virtual function table. */ - This->IMoniker_iface.lpVtbl = &ClassMonikerVtbl; - This->IROTData_iface.lpVtbl = &ROTDataVtbl; - This->ref = 0; - This->clsid = *rclsid; - This->pMarshal = NULL; - - return S_OK; -} - /****************************************************************************** * CreateClassMoniker [OLE32.@] ******************************************************************************/ -HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker **ppmk) +HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker **moniker) { - ClassMoniker* newClassMoniker; - HRESULT hr; + ClassMoniker *object; - TRACE("(%s,%p)\n", debugstr_guid(rclsid), ppmk); + TRACE("%s, %p\n", debugstr_guid(rclsid), moniker); - newClassMoniker = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassMoniker)); + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; - if (!newClassMoniker) - return STG_E_INSUFFICIENTMEMORY; + object->IMoniker_iface.lpVtbl = &ClassMonikerVtbl; + object->IROTData_iface.lpVtbl = &ROTDataVtbl; + object->ref = 1; + object->clsid = *rclsid; - hr = ClassMoniker_Construct(newClassMoniker, rclsid); + *moniker = &object->IMoniker_iface; - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, newClassMoniker); - return hr; - } - - return ClassMoniker_QueryInterface(&newClassMoniker->IMoniker_iface, &IID_IMoniker, - (void**)ppmk); + return S_OK; } HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LPDWORD pchEaten,

1 0

Rémi Bernon : winebus.sys: Use helpers to create and destroy unix devices.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

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

Paul Gofman : wbemprox: Propagate create_view() error code from parser.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

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

Nikolay Sivov : ole32: Simplify GetDisplayName() for class moniker.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: c79678ed31fc02cf5ad6f3de5dfab68b62e4f0fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c79678ed31fc02cf5ad6f3de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 11:47:50 2021 +0300 ole32: Simplify GetDisplayName() 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 | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 662baa3cd39..8149b8e2edc 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -510,37 +510,30 @@ static HRESULT WINAPI ClassMoniker_RelativePathTo(IMoniker* iface,IMoniker* pmOt return MK_E_NOTBINDABLE; } -/****************************************************************************** - * ClassMoniker_GetDisplayName - ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR *ppszDisplayName) +static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker *iface, + IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *name) { - ClassMoniker *This = impl_from_IMoniker(iface); - static const WCHAR wszClsidPrefix[] = L"clsid:"; + ClassMoniker *moniker = impl_from_IMoniker(iface); + static const int name_len = CHARS_IN_GUID + 5 /* prefix */; + const GUID *guid = &moniker->clsid; - TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, ppszDisplayName); + TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, name); - if (!ppszDisplayName) + if (!name) return E_POINTER; if (pmkToLeft) return E_INVALIDARG; - *ppszDisplayName = CoTaskMemAlloc(sizeof(wszClsidPrefix) + (CHARS_IN_GUID-2) * sizeof(WCHAR)); - - StringFromGUID2(&This->clsid, *ppszDisplayName+ARRAY_SIZE(wszClsidPrefix)-2, CHARS_IN_GUID); + if (!(*name = CoTaskMemAlloc(name_len * sizeof(WCHAR)))) + return E_OUTOFMEMORY; - /* note: this overwrites the opening curly bracket of the CLSID string generated above */ - memcpy(*ppszDisplayName, wszClsidPrefix, sizeof(wszClsidPrefix)-sizeof(WCHAR)); + swprintf(*name, name_len, L"clsid:%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X:", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - /* note: this overwrites the closing curly bracket of the CLSID string generated above */ - (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-2] = ':'; - (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-1] = '\0'; + TRACE("Returning %s\n", debugstr_w(*name)); - TRACE("string is %s\n", debugstr_w(*ppszDisplayName)); return S_OK; }

1 0

Rémi Bernon : winebus.sys: Allocate mouse and keyboard devices dynamically.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

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

Paul Gofman : wbemprox: Return WBEM_E_INVALID_CLASS from create_view() if namespace is empty.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

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: Copy correct substring to *namespace in parse_resource().
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

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: Add Microsoft\\Windows\\Storage namespace.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

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: Free unix device in unix_device_remove.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: 1f12b2160dd5cc76cc1cd15a1d68606f304fc9e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f12b2160dd5cc76cc1cd15a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 14 08:58:24 2021 +0200 winebus.sys: Free unix device in unix_device_remove. 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 | 1 - dlls/winebus.sys/bus_sdl.c | 1 - dlls/winebus.sys/bus_udev.c | 4 ---- dlls/winebus.sys/unix_private.h | 1 - dlls/winebus.sys/unixlib.c | 8 +------- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 93b3605f8d2..d9de7059be3 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -139,7 +139,6 @@ static void handle_IOHIDDeviceIOHIDReportCallback(void *context, static void iohid_device_destroy(struct unix_device *iface) { - unix_device_destroy(iface); } static int iohid_device_compare(struct unix_device *iface, void *context) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index cda9e9bdcd9..a0b44283182 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -480,7 +480,6 @@ failed: static void sdl_device_destroy(struct unix_device *iface) { - unix_device_destroy(iface); } static int sdl_device_compare(struct unix_device *iface, void *context) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 004bbb379c4..e26e11c720d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -560,8 +560,6 @@ static void hidraw_device_destroy(struct unix_device *iface) close(private->device_fd); udev_device_unref(private->udev_device); - - unix_device_destroy(iface); } static int udev_device_compare(struct unix_device *iface, void *platform_dev) @@ -814,8 +812,6 @@ static void lnxev_device_destroy(struct unix_device *iface) close(ext->base.device_fd); udev_device_unref(ext->base.udev_device); - - unix_device_destroy(iface); } static DWORD CALLBACK lnxev_device_report_thread(void *args); diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 3b0375bb761..6234c2c7bbc 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -48,7 +48,6 @@ struct unix_device }; 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; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index b433c0dcbdf..ade38c19854 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -49,7 +49,6 @@ 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) @@ -154,7 +153,6 @@ 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) @@ -254,16 +252,12 @@ void *unix_device_create(const struct unix_device_vtbl *vtbl, SIZE_T size) 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; iface->vtbl->stop(iface); iface->vtbl->destroy(iface); + HeapFree(GetProcessHeap(), 0, iface); return STATUS_SUCCESS; }

1 0