wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Rémi Bernon : hidparse.sys: Split struct hid_value_caps start_bit into start_byte / start_bit.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 6fa0d12724be45407f0a5ccdb9db8bd4b53db6c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fa0d12724be45407f0a5ccd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 17 09:18:54 2021 +0200 hidparse.sys: Split struct hid_value_caps start_bit into start_byte / start_bit. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 63 +++++++++++++++++++++++++++++++++++------------- dlls/hidparse.sys/main.c | 16 ++++++------ include/wine/hid.h | 3 ++- 3 files changed, 57 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6fa0d12724be45407f0a…

1 0

Zhiyi Zhang : setupapi/tests: Add display device interface tests.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 5030f4cf26c31bc709d6565182b51af1165953a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5030f4cf26c31bc709d65651… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Sep 20 08:56:16 2021 +0800 setupapi/tests: Add display device interface tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index f16f310b3f7..10ea7c0cba8 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -28,6 +28,9 @@ #include "winnls.h" #include "winuser.h" #include "winreg.h" +#include "devguid.h" +#include "initguid.h" +#include "ntddvdeo.h" #include "setupapi.h" #include "cfgmgr32.h" @@ -819,6 +822,87 @@ static void test_CM_Get_Version(void) ok(ret == 0x0400, "got version %#x\n", ret); } +#define check_device_interface(a, b) _check_device_interface(__LINE__, a, b) +static void _check_device_interface(int line, const char *instance_id, const GUID *guid) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + BOOL ret; + + devinfo = SetupDiGetClassDevsA(guid, instance_id, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + ret = SetupDiEnumDeviceInfo(devinfo, 0, &device_data); + ok_(__FILE__, line)(ret || broken(!ret) /* <= Win7 */, + "SetupDiEnumDeviceInfo failed, error %u.\n", GetLastError()); + if (!ret) + { + SetupDiDestroyDeviceInfoList(devinfo); + return; + } + ret = SetupDiEnumDeviceInterfaces(devinfo, &device_data, guid, 0, &iface_data); + ok_(__FILE__, line)(ret, "SetupDiEnumDeviceInterfaces failed, error %u.\n", GetLastError()); + ok_(__FILE__, line)(IsEqualGUID(&iface_data.InterfaceClassGuid, guid), + "Expected guid %s, got %s.\n", wine_dbgstr_guid(guid), + wine_dbgstr_guid(&iface_data.InterfaceClassGuid)); + + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void test_device_interfaces(void) +{ + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + char instance_id[MAX_DEVICE_ID_LEN]; + DWORD device_idx = 0, size, error; + HDEVINFO devinfo; + BOOL ret; + + /* GPUs */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("GPU %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_DISPLAY_ADAPTER); + check_device_interface(instance_id, &GUID_DISPLAY_DEVICE_ARRIVAL); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0, "Expected at least one GPU.\n"); + SetupDiDestroyDeviceInfoList(devinfo); + + /* Monitors */ + device_idx = 0; + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, L"DISPLAY", NULL, DIGCF_PRESENT); + ok(devinfo != INVALID_HANDLE_VALUE, "SetupDiGetClassDevsW failed, error %u.\n", GetLastError()); + while ((ret = SetupDiEnumDeviceInfo(devinfo, device_idx, &device_data))) + { + ret = SetupDiGetDeviceInstanceIdA(devinfo, &device_data, instance_id, + ARRAY_SIZE(instance_id), &size); + ok(ret, "SetupDiGetDeviceInstanceIdA failed, error %u.\n", GetLastError()); + + winetest_push_context("Monitor %d", device_idx); + + check_device_interface(instance_id, &GUID_DEVINTERFACE_MONITOR); + + winetest_pop_context(); + ++device_idx; + } + error = GetLastError(); + ok(error == ERROR_NO_MORE_ITEMS, "Expected error %u, got %u.\n", ERROR_NO_MORE_ITEMS, error); + ok(device_idx > 0 || broken(device_idx == 0) /* w7u_2qxl TestBot */, + "Expected at least one monitor.\n"); + SetupDiDestroyDeviceInfoList(devinfo); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -841,4 +925,5 @@ START_TEST(misc) test_defaultcallback(); test_SetupLogError(); test_CM_Get_Version(); + test_device_interfaces(); }

1 0

Zebediah Figura : winegcc: Correctly put the -munix manual section in its own paragraph.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 37ceea6451920e82b5a8c28d27dee1fb7f2c0229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37ceea6451920e82b5a8c28d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 19 22:13:24 2021 -0500 winegcc: Correctly put the -munix manual section in its own paragraph. Use a style consistent with the rest of the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.man.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 831a98323cf..87c1496fd18 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -59,9 +59,8 @@ Set the default entry point of the application to be the Unicode This option adds -lgdi32, -lcomdlg32, and -lshell32 to the list of default libraries, and passes '--subsystem windows' to winebuild to build graphical applications. -.B \-munix +.IP \fB-munix\fR Set when building the Unix counterpart of a builtin module. -.TP .IP \fB-nodefaultlibs\fR Do not use the standard system libraries when linking. These include at a minimum -lkernel32, -luser32, -ladvapi32, and

1 0

Nikolay Sivov : ole32: Remove explicit type check in CommonPrefixWith() for item moniker.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 828a0ae6ea5ba2429a6954cb5e4e4c4c37bca063 URL: https://source.winehq.org/git/wine.git/?a=commit;h=828a0ae6ea5ba2429a6954cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:46 2021 +0300 ole32: Remove explicit type check in CommonPrefixWith() for item moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 28 ++++++++-------------------- dlls/ole32/tests/moniker.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 786d183d598..c42cc75c224 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -753,31 +753,19 @@ static HRESULT WINAPI ItemMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) return CreateAntiMoniker(ppmk); } -/****************************************************************************** - * ItemMoniker_CommonPrefixWith - ******************************************************************************/ -static HRESULT WINAPI ItemMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** ppmkPrefix) +static HRESULT WINAPI ItemMonikerImpl_CommonPrefixWith(IMoniker *iface, IMoniker *other, + IMoniker **prefix) { - DWORD mkSys; - - TRACE("(%p,%p)\n", pmkOther, ppmkPrefix); - - IMoniker_IsSystemMoniker(pmkOther,&mkSys); - /* If the other moniker is an item moniker that is equal to this moniker, this method sets *ppmkPrefix */ - /* to this moniker and returns MK_S_US */ - - if((mkSys==MKSYS_ITEMMONIKER) && (IMoniker_IsEqual(iface,pmkOther)==S_OK) ){ - - *ppmkPrefix=iface; + TRACE("%p, %p, %p\n", iface, other, prefix); + if (IMoniker_IsEqual(iface, other) == S_OK) + { + *prefix = iface; IMoniker_AddRef(iface); - return MK_S_US; } - else - /* otherwise, the method calls the MonikerCommonPrefixWith function. This function correctly handles */ - /* the case where the other moniker is a generic composite. */ - return MonikerCommonPrefixWith(iface,pmkOther,ppmkPrefix); + + return MonikerCommonPrefixWith(iface, other, prefix); } /****************************************************************************** diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index df4b5c7bc88..b584f370d70 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2276,7 +2276,7 @@ static void test_item_moniker(void) "Moniker_IsRunning", NULL }; - IMoniker *moniker, *moniker2, *reduced, *anti, *inverse; + IMoniker *moniker, *moniker2, *moniker3, *reduced, *anti, *inverse; DWORD i, hash, eaten, cookie; HRESULT hr; IBindCtx *bindctx; @@ -2611,6 +2611,34 @@ todo_wine IMoniker_Release(anti); IMoniker_Release(moniker); + + /* CommonPrefixWith */ + hr = CreateItemMoniker(L"!", L"Item", &moniker); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + hr = CreateItemMoniker(L"#", L"Item", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); + ok(hr == MK_S_US, "Unexpected hr %#x.\n", hr); + ok(moniker3 == moniker, "Unexpected object.\n"); + IMoniker_Release(moniker3); + + IMoniker_Release(moniker2); + + hr = CreateItemMoniker(L"!", L"Item2", &moniker2); + ok(hr == S_OK, "Failed to create a moniker, hr %#x.\n", hr); + + moniker3 = (void *)0xdeadbeef; + hr = IMoniker_CommonPrefixWith(moniker, moniker2, &moniker3); +todo_wine +{ + ok(hr == MK_E_NOPREFIX, "Unexpected hr %#x.\n", hr); + ok(!moniker3, "Unexpected object.\n"); +} + + IMoniker_Release(moniker2); + + IMoniker_Release(moniker); } static void stream_write_dword(IStream *stream, DWORD value)

1 0

Nikolay Sivov : ole32: Remove unnecessary helpers to create/destroy bind context.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 1a6659e8e40dcb779a540bc8a6bbbc4beb2cfb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a6659e8e40dcb779a540bc8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:45 2021 +0300 ole32: Remove unnecessary helpers to create/destroy bind context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/bindctx.c | 111 +++++++++++++-------------------------------------- 1 file changed, 27 insertions(+), 84 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 24229568f18..261c6b01c67 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -30,6 +30,7 @@ #include "objbase.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -112,41 +113,21 @@ static ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface) return InterlockedIncrement(&This->ref); } -/****************************************************************************** - * BindCtx_Destroy (local function) - *******************************************************************************/ -static HRESULT BindCtxImpl_Destroy(BindCtxImpl* This) -{ - TRACE("(%p)\n",This); - - /* free the table space memory */ - HeapFree(GetProcessHeap(),0,This->bindCtxTable); - - /* free the bindctx structure */ - HeapFree(GetProcessHeap(),0,This); - - return S_OK; -} - -/****************************************************************************** - * BindCtx_Release - ******************************************************************************/ static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) { - BindCtxImpl *This = impl_from_IBindCtx(iface); - ULONG ref; + BindCtxImpl *context = impl_from_IBindCtx(iface); + ULONG refcount = InterlockedDecrement(&context->ref); - TRACE("(%p)\n",This); + TRACE("%p refcount %d.\n", iface, refcount); - ref = InterlockedDecrement(&This->ref); - if (ref == 0) + if (!refcount) { - /* release all registered objects */ - BindCtxImpl_ReleaseBoundObjects(&This->IBindCtx_iface); - - BindCtxImpl_Destroy(This); + BindCtxImpl_ReleaseBoundObjects(&context->IBindCtx_iface); + heap_free(context->bindCtxTable); + heap_free(context); } - return ref; + + return refcount; } @@ -487,8 +468,6 @@ static HRESULT BindCtxImpl_ExpandTable(BindCtxImpl *This) return S_OK; } - -/* Virtual function table for the BindCtx class. */ static const IBindCtxVtbl VT_BindCtxImpl = { BindCtxImpl_QueryInterface, @@ -506,74 +485,38 @@ static const IBindCtxVtbl VT_BindCtxImpl = BindCtxImpl_RevokeObjectParam }; -/****************************************************************************** - * BindCtx_Construct (local function) - *******************************************************************************/ -static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) -{ - TRACE("(%p)\n",This); - - /* Initialize the virtual function table.*/ - This->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; - This->ref = 0; - - memset(&This->options, 0, sizeof(This->options)); - This->options.cbStruct = sizeof(This->options); - This->options.grfMode = STGM_READWRITE; - This->options.dwClassContext = CLSCTX_SERVER; - This->options.locale = GetThreadLocale(); - - /* Initialize the bindctx table */ - This->bindCtxTableSize=0; - This->bindCtxTableLastIndex=0; - This->bindCtxTable = NULL; - - return S_OK; -} - /****************************************************************************** * CreateBindCtx (OLE32.@) - * - * Creates a bind context. A bind context encompasses information and options - * used when binding to a moniker. - * - * PARAMS - * reserved [I] Reserved. Set to 0. - * ppbc [O] Address that receives the bind context object. - * - * RETURNS - * Success: S_OK. - * Failure: Any HRESULT code. */ -HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) +HRESULT WINAPI CreateBindCtx(DWORD reserved, IBindCtx **bind_context) { - BindCtxImpl* newBindCtx; - HRESULT hr; + BindCtxImpl *object; - TRACE("(%d,%p)\n",reserved,ppbc); + TRACE("%#x, %p\n", reserved, bind_context); - if (!ppbc) return E_INVALIDARG; + if (!bind_context) return E_INVALIDARG; - *ppbc = NULL; + *bind_context = NULL; - if (reserved != 0) + if (reserved) { - ERR("reserved should be 0, not 0x%x\n", reserved); + WARN("reserved should be 0, not 0x%x\n", reserved); return E_INVALIDARG; } - newBindCtx = HeapAlloc(GetProcessHeap(), 0, sizeof(BindCtxImpl)); - if (newBindCtx == 0) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - hr = BindCtxImpl_Construct(newBindCtx); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(),0,newBindCtx); - return hr; - } + object->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; + object->ref = 1; + object->options.cbStruct = sizeof(object->options); + object->options.grfMode = STGM_READWRITE; + object->options.dwClassContext = CLSCTX_SERVER; + object->options.locale = GetThreadLocale(); - return BindCtxImpl_QueryInterface(&newBindCtx->IBindCtx_iface,&IID_IBindCtx,(void**)ppbc); + *bind_context = &object->IBindCtx_iface; + + return S_OK; } /******************************************************************************

1 0

Nikolay Sivov : ole32/tests: Add a test for IBindCtx::GetRunningObjectTable().
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: dd18a63b520b949259444d174c54b81f264432e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd18a63b520b949259444d17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:44 2021 +0300 ole32/tests: Add a test for IBindCtx::GetRunningObjectTable(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 550ba802cfa..df4b5c7bc88 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3240,6 +3240,7 @@ static void test_pointer_moniker(void) static void test_bind_context(void) { + IRunningObjectTable *rot, *rot2; HRESULT hr; IBindCtx *pBindCtx; IEnumString *pEnumString; @@ -3260,6 +3261,18 @@ static void test_bind_context(void) hr = CreateBindCtx(0, &pBindCtx); ok_ole_success(hr, "CreateBindCtx"); + hr = IBindCtx_GetRunningObjectTable(pBindCtx, NULL); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + + hr = IBindCtx_GetRunningObjectTable(pBindCtx, &rot); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = GetRunningObjectTable(0, &rot2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rot == rot2, "Unexpected ROT instance.\n"); + IRunningObjectTable_Release(rot); + IRunningObjectTable_Release(rot2); + bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions");

1 0

Nikolay Sivov : ole32/tests: Get rid of some global variables in moniker tests.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 9253ef3963f90808da5ed8b0d7e7f635525c5239 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9253ef3963f90808da5ed8b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 20 13:08:43 2021 +0300 ole32/tests: Get rid of some global variables in moniker tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 223 +++++++++++++++++++++++---------------------- 1 file changed, 113 insertions(+), 110 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9253ef3963f90808da5e…

1 0

Piotr Caban : oleacc: Remove WINAPI from accessible_create internal type.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: aa63f9c9405fc089e5c82559f0513e8a79f2fbf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa63f9c9405fc089e5c82559… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:46 2021 +0200 oleacc: Remove WINAPI from accessible_create internal type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index beceb2ff1fb..db9f646988c 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(oleacc); static const WCHAR lresult_atom_prefix[] = {'w','i','n','e','_','o','l','e','a','c','c',':'}; -typedef HRESULT (WINAPI *accessible_create)(HWND, const IID*, void**); +typedef HRESULT (*accessible_create)(HWND, const IID*, void**); extern HRESULT WINAPI OLEACC_DllGetClassObject(REFCLSID, REFIID, void**) DECLSPEC_HIDDEN; extern BOOL WINAPI OLEACC_DllMain(HINSTANCE, DWORD, void*) DECLSPEC_HIDDEN;

1 0

Piotr Caban : oleacc: Introduce helper for checking accessibility object hwnd.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 82b8b361d2794f0fdaae07bb715a2e0167bd703c URL: https://source.winehq.org/git/wine.git/?a=commit;h=82b8b361d2794f0fdaae07bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:40 2021 +0200 oleacc: Introduce helper for checking accessibility object hwnd. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7d1c376bc25..98da7eb3ddc 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -896,6 +896,21 @@ static void _check_acc_state(unsigned line, IAccessible *acc, INT state) ok_(__FILE__, line)(V_I4(&v) == state, "V_I4(&v) = %x\n", V_I4(&v)); } +#define check_acc_hwnd(unk, hwnd) _check_acc_hwnd(__LINE__, unk, hwnd) +static void _check_acc_hwnd(unsigned line, IUnknown *unk, HWND exp) +{ + IOleWindow *ow; + HRESULT hr; + HWND hwnd; + + hr = IUnknown_QueryInterface(unk, &IID_IOleWindow, (void**)&ow); + ok_(__FILE__, line)(hr == S_OK, "got %x\n", hr); + hr = IOleWindow_GetWindow(ow, &hwnd); + ok_(__FILE__, line)(hr == S_OK, "got %x\n", hr); + ok_(__FILE__, line)(hwnd == exp, "hwnd = %p, expected %p\n", hwnd, exp); + IOleWindow_Release(ow); +} + static DWORD WINAPI default_client_thread(LPVOID param) { IAccessible *acc = param; @@ -918,7 +933,6 @@ static void test_default_client_accessible_object(void) { IAccessible *acc, *win; IDispatch *disp; - IOleWindow *ow; IEnumVARIANT *ev; HWND chld, chld2, btn, hwnd, hwnd2; HRESULT hr; @@ -989,15 +1003,10 @@ static void test_default_client_accessible_object(void) hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); ok(hr == S_OK, "got %x\n", hr); - hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); + check_acc_hwnd((IUnknown*)acc, hwnd); hr = WindowFromAccessibleObject(acc, &hwnd2); ok(hr == S_OK, "got %x\n", hr); ok(hwnd == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, hwnd); - IOleWindow_Release(ow); hr = IAccessible_get_accChildCount(acc, &l); ok(hr == S_OK, "got %x\n", hr); @@ -1035,13 +1044,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), btn); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr); @@ -1060,13 +1063,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), chld); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr); @@ -1084,13 +1081,7 @@ static void test_default_client_accessible_object(void) ok(hr == S_OK, "hr %#x\n", hr); ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); ok(V_DISPATCH(&v) != NULL, "V_DISPATCH(&v) = %p\n", V_DISPATCH(&v)); - - hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); - ok(hr == S_OK, "got %x\n", hr); - hr = IOleWindow_GetWindow(ow, &hwnd2); - ok(hr == S_OK, "got %x\n", hr); - ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); - IOleWindow_Release(ow); + check_acc_hwnd((IUnknown*)V_DISPATCH(&v), chld2); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); ok(hr == S_OK, "got %x\n", hr);

1 0

Piotr Caban : oleacc: Add Window_OleWindow_GetWindow implementation.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: wine Branch: master Commit: 3e3a2be891fb583f2f1e298033c2a3da31af659e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e3a2be891fb583f2f1e2980… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 20 18:03:36 2021 +0200 oleacc: Add Window_OleWindow_GetWindow implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 12 ++++++------ dlls/oleacc/window.c | 12 +++++++++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 180113b29f9..7d1c376bc25 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1039,8 +1039,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); + ok(hr == S_OK, "got %x\n", hr); + ok(btn == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, btn); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); @@ -1064,8 +1064,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); + ok(hr == S_OK, "got %x\n", hr); + ok(chld == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); @@ -1088,8 +1088,8 @@ static void test_default_client_accessible_object(void) hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IOleWindow, (void**)&ow); ok(hr == S_OK, "got %x\n", hr); hr = IOleWindow_GetWindow(ow, &hwnd2); - todo_wine ok(hr == S_OK, "got %x\n", hr); - todo_wine ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); + ok(hr == S_OK, "got %x\n", hr); + ok(chld2 == hwnd2, "hwnd2 = %p, expected %p\n", hwnd2, chld2); IOleWindow_Release(ow); hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IAccessible, (void**)&win); diff --git a/dlls/oleacc/window.c b/dlls/oleacc/window.c index 5957d49ef1f..387ed4bc9f7 100644 --- a/dlls/oleacc/window.c +++ b/dlls/oleacc/window.c @@ -31,6 +31,8 @@ typedef struct { IEnumVARIANT IEnumVARIANT_iface; LONG ref; + + HWND hwnd; } Window; static inline Window* impl_from_Window(IAccessible *iface) @@ -327,11 +329,14 @@ static ULONG WINAPI Window_OleWindow_Release(IOleWindow *iface) return IAccessible_Release(&This->IAccessible_iface); } -static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *phwnd) +static HRESULT WINAPI Window_OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) { Window *This = impl_from_Window_OleWindow(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, hwnd); + + *hwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI Window_OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL fEnterMode) @@ -427,6 +432,7 @@ HRESULT create_window_object(HWND hwnd, const IID *iid, void **obj) window->IOleWindow_iface.lpVtbl = &WindowOleWindowVtbl; window->IEnumVARIANT_iface.lpVtbl = &WindowEnumVARIANTVtbl; window->ref = 1; + window->hwnd = hwnd; hres = IAccessible_QueryInterface(&window->IAccessible_iface, iid, obj); IAccessible_Release(&window->IAccessible_iface);

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