[PATCH 1/4] ole32/tests: Get rid of some global variables in moniker tests.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 223 +++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 110 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5221be495f0..550ba802cfa 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -36,8 +36,6 @@ #include "wine/test.h" #include "wine/heap.h" -#define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) -#define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) #define CHECK_EXPECTED_METHOD(method_name) \ @@ -138,18 +136,6 @@ static IMoniker *create_antimoniker(DWORD level) return moniker; } -static LONG cLocks; - -static void LockModule(void) -{ - InterlockedIncrement(&cLocks); -} - -static void UnlockModule(void) -{ - InterlockedDecrement(&cLocks); -} - static SIZE_T round_global_size(SIZE_T size) { static SIZE_T global_size_alignment = -1; @@ -163,7 +149,23 @@ static SIZE_T round_global_size(SIZE_T size) return ((size + global_size_alignment - 1) & ~(global_size_alignment - 1)); } -static DWORD external_connections; +struct test_factory +{ + IClassFactory IClassFactory_iface; + IExternalConnection IExternalConnection_iface; + LONG refcount; + unsigned int external_connections; +}; + +static struct test_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct test_factory, IClassFactory_iface); +} + +static struct test_factory *impl_from_IExternalConnection(IExternalConnection *iface) +{ + return CONTAINING_RECORD(iface, struct test_factory, IExternalConnection_iface); +} static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) { @@ -174,28 +176,31 @@ static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *ifa static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) { - return 2; + struct test_factory *factory = impl_from_IExternalConnection(iface); + return IClassFactory_AddRef(&factory->IClassFactory_iface); } static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) { - return 1; + struct test_factory *factory = impl_from_IExternalConnection(iface); + return IClassFactory_Release(&factory->IClassFactory_iface); } static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) { - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + struct test_factory *factory = impl_from_IExternalConnection(iface); + ok(extconn == EXTCONN_STRONG, "Unexpected connection type %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); - return ++external_connections; + return ++factory->external_connections; } static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved, BOOL fLastReleaseCloses) { - ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + struct test_factory *factory = impl_from_IExternalConnection(iface); + ok(extconn == EXTCONN_STRONG, "Unexpected connection type %d\n", extconn); ok(!reserved, "reserved = %x\n", reserved); - - return --external_connections; + return --factory->external_connections; } static const IExternalConnectionVtbl ExternalConnectionVtbl = { @@ -206,70 +211,70 @@ static const IExternalConnectionVtbl ExternalConnectionVtbl = { ExternalConnection_ReleaseConnection }; -static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; - -static HRESULT WINAPI Test_IClassFactory_QueryInterface( - LPCLASSFACTORY iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI test_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) { - if (ppvObj == NULL) return E_POINTER; + struct test_factory *factory = impl_from_IClassFactory(iface); + + if (!obj) return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = iface; - IClassFactory_AddRef(iface); - return S_OK; + *obj = iface; } - - if(IsEqualGUID(riid, &IID_IExternalConnection)) { - *ppvObj = &ExternalConnection; - return S_OK; + else if (IsEqualGUID(riid, &IID_IExternalConnection)) + { + *obj = &factory->IExternalConnection_iface; + } + else + { + *obj = NULL; + return E_NOINTERFACE; } - *ppvObj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } -static ULONG WINAPI Test_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI test_factory_AddRef(IClassFactory *iface) { - LockModule(); - return 2; /* non-heap-based object */ + struct test_factory *factory = impl_from_IClassFactory(iface); + return InterlockedIncrement(&factory->refcount); } -static ULONG WINAPI Test_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI test_factory_Release(IClassFactory *iface) { - UnlockModule(); - return 1; /* non-heap-based object */ + struct test_factory *factory = impl_from_IClassFactory(iface); + return InterlockedDecrement(&factory->refcount); } -static HRESULT WINAPI Test_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI test_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **obj) { return E_NOTIMPL; } -static HRESULT WINAPI Test_IClassFactory_LockServer( - LPCLASSFACTORY iface, - BOOL fLock) +static HRESULT WINAPI test_factory_LockServer(IClassFactory *iface, BOOL lock) { return S_OK; } -static const IClassFactoryVtbl TestClassFactory_Vtbl = +static const IClassFactoryVtbl test_factory_vtbl = { - Test_IClassFactory_QueryInterface, - Test_IClassFactory_AddRef, - Test_IClassFactory_Release, - Test_IClassFactory_CreateInstance, - Test_IClassFactory_LockServer + test_factory_QueryInterface, + test_factory_AddRef, + test_factory_Release, + test_factory_CreateInstance, + test_factory_LockServer }; -static IClassFactory Test_ClassFactory = { &TestClassFactory_Vtbl }; +static void test_factory_init(struct test_factory *factory) +{ + factory->IClassFactory_iface.lpVtbl = &test_factory_vtbl; + factory->IExternalConnection_iface.lpVtbl = &ExternalConnectionVtbl; + factory->refcount = 1; + factory->external_connections = 0; +} typedef struct { @@ -796,6 +801,7 @@ static void test_ROT(void) IMoniker *pMoniker = NULL; struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; + struct test_factory factory; DWORD dwCookie; static const char *methods_register_no_ROTData[] = { @@ -830,7 +836,7 @@ static void test_ROT(void) NULL }; - cLocks = 0; + test_factory_init(&factory); hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); @@ -839,15 +845,13 @@ static void test_ROT(void) test_moniker->no_IROTData = TRUE; expected_method_list = methods_register_no_ROTData; - external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, &test_moniker->IMoniker_iface, &dwCookie); ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); - ok(external_connections == 1, "external_connections = %d\n", external_connections); - - ok_more_than_one_lock(); + ok(factory.external_connections == 1, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_isrunning_no_ROTData; hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); @@ -856,19 +860,17 @@ static void test_ROT(void) hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - ok(external_connections == 0, "external_connections = %d\n", external_connections); - - ok_no_locks(); + ok(!factory.external_connections, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_register; /* try with our own moniker */ test_moniker->no_IROTData = FALSE; - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); - - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); expected_method_list = methods_isrunning; hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); @@ -877,50 +879,47 @@ static void test_ROT(void) hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = CreateFileMoniker(wszFileName, &pMoniker); ok_ole_success(hr, CreateClassMoniker); /* test flags: 0 */ - external_connections = 0; - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, - pMoniker, &dwCookie); + factory.external_connections = 0; + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); - ok(external_connections == 0, "external_connections = %d\n", external_connections); - - ok_more_than_one_lock(); + ok(!factory.external_connections, "external_connections = %d\n", factory.external_connections); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&factory.IClassFactory_iface, + pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); - - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = IRunningObjectTable_Revoke(pROT, dwCookie); ok_ole_success(hr, IRunningObjectTable_Revoke); - - ok_no_locks(); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); /* test flags: ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT */ /* only succeeds when process is started by SCM and has LocalService * or RunAs AppId values */ - hr = IRunningObjectTable_Register(pROT, - ROTFLAGS_REGISTRATIONKEEPSALIVE|ROTFLAGS_ALLOWANYCLIENT, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE | ROTFLAGS_ALLOWANYCLIENT, + (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); todo_wine { ok(hr == CO_E_WRONG_SERVER_IDENTITY, "Unexpected hr %#x.\n", hr); } + if (SUCCEEDED(hr)) + { + hr = IRunningObjectTable_Revoke(pROT, dwCookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + } - hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, - (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); + hr = IRunningObjectTable_Register(pROT, 0xdeadbeef, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie); ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); @@ -938,6 +937,9 @@ static void test_ROT_multiple_entries(void) IUnknown *pObject = NULL; static const WCHAR moniker_path[] = {'\\', 'w','i','n','d','o','w','s','\\','s','y','s','t','e','m','\\','t','e','s','t','1','.','d','o','c',0}; + struct test_factory factory; + + test_factory_init(&factory); hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); @@ -945,10 +947,10 @@ static void test_ROT_multiple_entries(void) hr = CreateFileMoniker(moniker_path, &pMoniker); ok_ole_success(hr, CreateFileMoniker); - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie1); + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie1); ok_ole_success(hr, IRunningObjectTable_Register); - hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&Test_ClassFactory, pMoniker, &dwCookie2); + hr = IRunningObjectTable_Register(pROT, 0, (IUnknown *)&factory.IClassFactory_iface, pMoniker, &dwCookie2); ok(hr == MK_S_MONIKERALREADYREGISTERED, "IRunningObjectTable_Register should have returned MK_S_MONIKERALREADYREGISTERED instead of 0x%08x\n", hr); ok(dwCookie1 != dwCookie2, "cookie returned for registering duplicate object shouldn't match cookie of original object (0x%x)\n", dwCookie1); @@ -1103,6 +1105,9 @@ static void test_MkParseDisplayName(void) {&pbc, wszEmpty, &eaten, NULL}, {&pbc, wszEmpty, &eaten, &pmk}, }; + struct test_factory factory; + + test_factory_init(&factory); hr = CreateBindCtx(0, &pbc); ok_ole_success(hr, CreateBindCtx); @@ -1143,7 +1148,7 @@ todo_wine ok_ole_success(hr, CreateFileMoniker); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); ok_ole_success(hr, IBindCtx_GetRunningObjectTable); - hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&factory.IClassFactory_iface, pmk, &pdwReg1); ok_ole_success(hr, IRunningObjectTable_Register); IMoniker_Release(pmk); pmk = NULL; @@ -1164,7 +1169,7 @@ todo_wine ok_ole_success(hr, CreateFileMoniker); hr = IBindCtx_GetRunningObjectTable(pbc, &pprot); ok_ole_success(hr, IBindCtx_GetRunningObjectTable); - hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&Test_ClassFactory, pmk, &pdwReg1); + hr = IRunningObjectTable_Register(pprot, 0, (IUnknown *)&factory.IClassFactory_iface, pmk, &pdwReg1); ok_ole_success(hr, IRunningObjectTable_Register); IMoniker_Release(pmk); pmk = NULL; @@ -3032,6 +3037,7 @@ todo_wine static void test_pointer_moniker(void) { IMoniker *moniker, *moniker2, *prefix, *inverse, *anti; + struct test_factory factory; IEnumMoniker *enummoniker; DWORD hash, size; HRESULT hr; @@ -3045,13 +3051,13 @@ static void test_pointer_moniker(void) LARGE_INTEGER pos; CLSID clsid; - cLocks = 0; + test_factory_init(&factory); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, NULL); - ok(hr == E_INVALIDARG, "CreatePointerMoniker(x, NULL) should have returned E_INVALIDARG instead of 0x%08x\n", hr); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); - ok_ole_success(hr, CreatePointerMoniker); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_QueryInterface(moniker, &IID_IMoniker, NULL); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -3089,7 +3095,7 @@ static void test_pointer_moniker(void) IMarshal_Release(marshal); - ok_more_than_one_lock(); + ok(factory.refcount > 1, "Unexpected factory refcount %u.\n", factory.refcount); /* Display Name */ @@ -3122,9 +3128,7 @@ static void test_pointer_moniker(void) /* Hashing */ hr = IMoniker_Hash(moniker, &hash); ok_ole_success(hr, IMoniker_Hash); - ok(hash == PtrToUlong(&Test_ClassFactory), - "Hash value should have been 0x%08x, instead of 0x%08x\n", - PtrToUlong(&Test_ClassFactory), hash); + ok(hash == PtrToUlong(&factory.IClassFactory_iface), "Unexpected hash value %#x.\n", hash); /* IsSystemMoniker test */ TEST_MONIKER_TYPE(moniker, MKSYS_POINTERMONIKER); @@ -3154,8 +3158,7 @@ static void test_pointer_moniker(void) IMoniker_Release(moniker); -todo_wine - ok(cLocks == 0, "Number of locks should be 0, but actually is %d.\n", cLocks); + ok(factory.refcount == 1, "Unexpected factory refcount %u.\n", factory.refcount); hr = CreatePointerMoniker(NULL, &moniker); ok_ole_success(hr, CreatePointerMoniker); @@ -3178,10 +3181,10 @@ todo_wine IMoniker_Release(moniker); /* CommonPrefixWith() */ - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker); ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); - hr = CreatePointerMoniker((IUnknown *)&Test_ClassFactory, &moniker2); + hr = CreatePointerMoniker((IUnknown *)&factory.IClassFactory_iface, &moniker2); ok(hr == S_OK, "Failed to create moniker, hr %#x.\n", hr); hr = IMoniker_IsEqual(moniker, NULL); -- 2.33.0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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"); -- 2.33.0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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; } /****************************************************************************** -- 2.33.0
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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) -- 2.33.0
participants (1)
-
Nikolay Sivov