August 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : combase: Move CoFreeUnusedLibraries().
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 5ce66030babbc8331dec91f4e9067c71b7d06825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce66030babbc8331dec91f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 08:29:34 2020 +0100 combase: Move CoFreeUnusedLibraries(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 8 ++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 17 ----------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 4e15bd970e..5752d90d5c 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1350,3 +1350,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *o return return_multi_qi(unk, count, results, TRUE); } + +/*********************************************************************** + * CoFreeUnusedLibraries (combase.@) + */ +void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void) +{ + CoFreeUnusedLibrariesEx(INFINITE, 0); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 0daf321d69..3214f54550 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -92,7 +92,7 @@ @ stdcall CoDisconnectObject(ptr long) ole32.CoDisconnectObject @ stdcall CoEnableCallCancellation(ptr) ole32.CoEnableCallCancellation @ stdcall CoFileTimeNow(ptr) -@ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries +@ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx @ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index dd51542af5..f983b07f20 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3006,23 +3006,6 @@ void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibrariesEx(DWORD dwUnloadDelay, DWORD apartment_freeunusedlibraries(apt, dwUnloadDelay); } -/*********************************************************************** - * CoFreeUnusedLibraries [OLE32.@] - * - * Frees any unused libraries. Unused are identified as those that return - * S_OK from their DllCanUnloadNow function. - * - * RETURNS - * Nothing. - * - * SEE ALSO - * CoLoadLibrary, CoFreeAllLibraries, CoFreeLibrary - */ -void WINAPI DECLSPEC_HOTPATCH CoFreeUnusedLibraries(void) -{ - CoFreeUnusedLibrariesEx(INFINITE, 0); -} - /****************************************************************************** * CoLockObjectExternal [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 57db6e38b7..a19264127f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -23,7 +23,7 @@ @ stdcall CoFileTimeToDosDateTime(ptr ptr ptr) kernel32.FileTimeToDosDateTime @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long) -@ stdcall CoFreeUnusedLibraries() +@ stdcall CoFreeUnusedLibraries() combase.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) @ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState @ stdcall CoGetApartmentType(ptr ptr)

1 0

Zhiyi Zhang : user32/tests: Remove some todo_wines.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 34a5f0428681bfd28855119a42ff6a0f23678588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a5f0428681bfd28855119a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 13 17:52:37 2020 +0800 user32/tests: Remove some todo_wines. Monitor positions are now correctly reported by the XRandR 1.4 display settings handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index f544e1a4df..d49d69989f 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3099,11 +3099,10 @@ static BOOL get_primary_adapter_name(CHAR *name) static BOOL CALLBACK test_enum_display_settings(HMONITOR hmonitor, HDC hdc, LPRECT rect, LPARAM lparam) { - CHAR primary_adapter[CCHDEVICENAME]; INT width, height; - BOOL primary, ret; MONITORINFOEXA mi; DEVMODEA dm; + BOOL ret; memset(&mi, 0, sizeof(mi)); mi.cbSize = sizeof(mi); @@ -3117,19 +3116,11 @@ static BOOL CALLBACK test_enum_display_settings(HMONITOR hmonitor, HDC hdc, LPRE ok((dm.dmFields & (DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT)) == (DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT), "Unexpected dmFields %#x.\n", dm.dmFields); - /* Wine currently reports primary adapter positions for all adapters, same for other todo_wines in this function */ - ret = get_primary_adapter_name(primary_adapter); - ok(ret, "get_primary_adapter_name failed\n"); - primary = !lstrcmpA(primary_adapter, mi.szDevice); - todo_wine_if(!primary && dm.dmPosition.x != mi.rcMonitor.left) ok(dm.dmPosition.x == mi.rcMonitor.left, "Expect dmPosition.x %d, got %d\n", mi.rcMonitor.left, dm.dmPosition.x); - todo_wine_if(!primary && dm.dmPosition.y != mi.rcMonitor.top) ok(dm.dmPosition.y == mi.rcMonitor.top, "Expect dmPosition.y %d, got %d\n", mi.rcMonitor.top, dm.dmPosition.y); width = mi.rcMonitor.right - mi.rcMonitor.left; - todo_wine_if(!primary && dm.dmPelsWidth != width) ok(dm.dmPelsWidth == width, "Expect dmPelsWidth %d, got %d\n", width, dm.dmPelsWidth); height = mi.rcMonitor.bottom - mi.rcMonitor.top; - todo_wine_if(!primary && dm.dmPelsHeight != height) ok(dm.dmPelsHeight == height, "Expect dmPelsHeight %d, got %d\n", height, dm.dmPelsHeight); return TRUE;

1 0

Zhiyi Zhang : user32/tests: Fix a failing test on Windows 10 1909.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 0fa4613811feaa2df886ff857b4ab5c9f489c3e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fa4613811feaa2df886ff85… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Aug 13 17:53:02 2020 +0800 user32/tests: Fix a failing test on Windows 10 1909. Although most of the older Windows versions allow changing to a 1Hz display mode, it returns failure on Windows 10 1909+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 57d2ec0008..b151721533 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -257,7 +257,7 @@ struct vid_mode static const struct vid_mode vid_modes_test[] = { {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, - {1024, 768, 0, 1, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, + {1024, 768, 0, 1, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, {1024, 768, 0, 0, DM_BITSPERPEL , 0},

1 0

Paul Gofman : ntdll/tests: Always remove hook trampoline in test_kiuserexceptiondispatcher().
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: d4052e0d709d7fddcb6a4adc10e98a8e65c8218e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4052e0d709d7fddcb6a4adc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 13 12:59:18 2020 +0300 ntdll/tests: Always remove hook trampoline in test_kiuserexceptiondispatcher(). As it is not removed by the hook itself if the hook is not called in the last test. Fixes test failures on Win 2003. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 175c7f6183..d5b8040857 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1886,6 +1886,9 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called || broken(!hook_called) /* 2003 */, "Hook was not called.\n"); + memcpy(pKiUserExceptionDispatcher, saved_KiUserExceptionDispatcher_bytes, + sizeof(saved_KiUserExceptionDispatcher_bytes)); + RemoveVectoredExceptionHandler(vectored_handler); ret = VirtualProtect(pKiUserExceptionDispatcher, sizeof(saved_KiUserExceptionDispatcher_bytes), old_protect2, &old_protect2);

1 0

Nikolay Sivov : ole32: Remove registration for Global Interface Table class.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 8b4d41d667a1c250ce080764f6ba2395622fd293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b4d41d667a1c250ce080764… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 08:29:29 2020 +0100 ole32: Remove registration for Global Interface Table class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole32_objidl.idl | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index d2c1a9999e..0cc3ccea9e 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -105,12 +105,6 @@ coclass ClassMoniker { interface IMoniker; } ] coclass PSFactoryBuffer { interface IFactoryBuffer; } -[ - threading(apartment), - uuid(00000323-0000-0000-c000-000000000046) -] -coclass StdGlobalInterfaceTable { interface IGlobalInterfaceTable; } - [ helpstring("Component Categories Manager"), threading(both),

1 0

Nikolay Sivov : ole32: Move more built-in classes to CoGetClassObject().
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 42f6be11330b0be8a4c6af33f292024cf4654e2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=42f6be11330b0be8a4c6af33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 08:29:30 2020 +0100 ole32: Move more built-in classes to CoGetClassObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 26 +++++--------------------- dlls/ole32/compobj_private.h | 1 + dlls/ole32/ole32.spec | 1 + dlls/ole32/oleproxy.c | 17 +++++++++++++++++ dlls/ole32/tests/marshal.c | 8 ++++++++ 5 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 8e78519dc8..f84c12243f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2755,13 +2755,14 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetClassObject( if (CLSCTX_INPROC_SERVER & dwClsContext) { - if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler) || + IsEqualCLSID(rclsid, &CLSID_GlobalOptions) || + IsEqualCLSID(rclsid, &CLSID_ManualResetEvent) || + IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) { apartment_release(apt); - return FTMarshalCF_Create(iid, ppv); + return Ole32DllGetClassObject(rclsid, iid, ppv); } - if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) - return IClassFactory_QueryInterface(&GlobalOptionsCF, iid, ppv); } if (CLSCTX_INPROC & dwClsContext) @@ -2993,23 +2994,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( } apartment_release(apt); - /* - * The Standard Global Interface Table (GIT) object is a process-wide singleton. - */ - if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) - { - IGlobalInterfaceTable *git = get_std_git(); - TRACE("Retrieving GIT\n"); - return return_multi_qi((IUnknown*)git, cmq, pResults, FALSE); - } - - if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) { - hres = ManualResetEvent_CreateInstance(&ManualResetEventCF, pUnkOuter, pResults[0].pIID, (void**)&unk); - if (FAILED(hres)) - return hres; - return return_multi_qi(unk, cmq, pResults, TRUE); - } - /* * Get a class factory to construct the object we want. */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 974c230ddc..1b7aa5640c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -325,6 +325,7 @@ extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN; extern HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) DECLSPEC_HIDDEN; extern IClassFactory ManualResetEventCF DECLSPEC_HIDDEN; +extern HRESULT WINAPI Ole32DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c83f0b2716..a8101df80b 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -182,6 +182,7 @@ @ stdcall MkParseDisplayName(ptr wstr ptr ptr) @ stdcall MonikerCommonPrefixWith(ptr ptr ptr) @ stub MonikerRelativePathTo +@ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) @ stub OleConvertIStorageToOLESTREAMEx diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 29cd391e12..0429e0f549 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -220,3 +220,20 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return Handler_DllGetClassObject(rclsid, iid, ppv); } + +/*********************************************************************** + * Ole32DllGetClassObject [OLE32.@] + */ +HRESULT WINAPI Ole32DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + if (IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) + return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return IClassFactory_QueryInterface(&ManualResetEventCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_GlobalOptions)) + return IClassFactory_QueryInterface(&GlobalOptionsCF, riid, obj); + else if (IsEqualCLSID(rclsid, &CLSID_InProcFreeMarshaler)) + return FTMarshalCF_Create(riid, obj); + else + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index ef608e66d0..a6811b9d24 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4000,6 +4000,10 @@ static void test_globalinterfacetable(void) ok_no_locks(); IGlobalInterfaceTable_Release(git); + + hr = CoGetClassObject(&CLSID_StdGlobalInterfaceTable, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&cf); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IClassFactory_Release(cf); } static void test_manualresetevent(void) @@ -4016,6 +4020,10 @@ static void test_manualresetevent(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IClassFactory_Release(factory); + hr = CoGetClassObject(&CLSID_ManualResetEvent, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void **)&factory); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IClassFactory_Release(factory); + hr = CoCreateInstance(&CLSID_ManualResetEvent, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&punk); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(!!punk, "Got NULL.\n");

1 0

Nikolay Sivov : ole32: Remove now unused helper.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 0efea8489dc1adc4c503b26e28aaa01f72bcbcea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0efea8489dc1adc4c503b26e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 08:29:31 2020 +0100 ole32: Remove now unused helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 1 - dlls/ole32/git.c | 55 ++++++++++++++++++-------------------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 1b7aa5640c..b64dfbf4f4 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -187,7 +187,6 @@ struct oletls /* Global Interface Table Functions */ -extern IGlobalInterfaceTable *get_std_git(void) DECLSPEC_HIDDEN; extern void release_std_git(void) DECLSPEC_HIDDEN; extern HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index e761c99b77..fe6b5e5812 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -290,47 +290,38 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( return S_OK; } -HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) -{ - IGlobalInterfaceTable *git = get_std_git(); - HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, obj); - IGlobalInterfaceTable_Release(git); - return hr; -} - -/* Virtual function table */ static const IGlobalInterfaceTableVtbl StdGlobalInterfaceTableImpl_Vtbl = { - StdGlobalInterfaceTable_QueryInterface, - StdGlobalInterfaceTable_AddRef, - StdGlobalInterfaceTable_Release, - StdGlobalInterfaceTable_RegisterInterfaceInGlobal, - StdGlobalInterfaceTable_RevokeInterfaceFromGlobal, - StdGlobalInterfaceTable_GetInterfaceFromGlobal + StdGlobalInterfaceTable_QueryInterface, + StdGlobalInterfaceTable_AddRef, + StdGlobalInterfaceTable_Release, + StdGlobalInterfaceTable_RegisterInterfaceInGlobal, + StdGlobalInterfaceTable_RevokeInterfaceFromGlobal, + StdGlobalInterfaceTable_GetInterfaceFromGlobal }; -IGlobalInterfaceTable* get_std_git(void) +HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - if (!std_git) - { - StdGlobalInterfaceTableImpl* newGIT; - - newGIT = HeapAlloc(GetProcessHeap(), 0, sizeof(StdGlobalInterfaceTableImpl)); - if (!newGIT) return NULL; + StdGlobalInterfaceTableImpl *git; - newGIT->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; - list_init(&newGIT->list); - newGIT->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ - - if (InterlockedCompareExchangePointer((void**)&std_git, &newGIT->IGlobalInterfaceTable_iface, NULL)) + if (!std_git) { - HeapFree(GetProcessHeap(), 0, newGIT); + git = heap_alloc(sizeof(*git)); + if (!git) return E_OUTOFMEMORY; + + git->IGlobalInterfaceTable_iface.lpVtbl = &StdGlobalInterfaceTableImpl_Vtbl; + list_init(&git->list); + git->nextCookie = 0xf100; /* that's where windows starts, so that's where we start */ + + if (InterlockedCompareExchangePointer((void **)&std_git, &git->IGlobalInterfaceTable_iface, NULL)) + { + heap_free(git); + } + else + TRACE("Created the GIT %p\n", git); } - else - TRACE("Created the GIT at %p\n", newGIT); - } - return std_git; + return IGlobalInterfaceTable_QueryInterface(std_git, riid, obj); } void release_std_git(void)

1 0

Nikolay Sivov : ole32: Remove initialized state test in CoCreateInstanceEx().
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 32de02209308f642f89670852eba235a0c0ac722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32de02209308f642f8967085… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 08:29:32 2020 +0100 ole32: Remove initialized state test in CoCreateInstanceEx(). We only have same machine case working, CoGetClassObject() checks already cover that. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f84c12243f..cf1feeb3f4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2969,7 +2969,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( { IUnknown *unk = NULL; IClassFactory *cf; - APARTMENT *apt; CLSID clsid; HRESULT hres; @@ -2987,13 +2986,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( if(FAILED(hres)) clsid = *rclsid; - if (!(apt = apartment_get_current_or_mta())) - { - ERR("apartment not initialised\n"); - return CO_E_NOTINITIALIZED; - } - apartment_release(apt); - /* * Get a class factory to construct the object we want. */

1 0

Nikolay Sivov : combase: Move CoCreateInstanceEx().
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: wine Branch: master Commit: 81694b629269f05d146695bec6c34c781bca11e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81694b629269f05d146695be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 13 08:29:33 2020 +0100 combase: Move CoCreateInstanceEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 44 ++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 94 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 46 insertions(+), 96 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index edd6ac0b28..4e15bd970e 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1306,3 +1306,47 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(REFCLSID rclsid, IUnknown *out *obj = multi_qi.pItf; return hr; } + +/*********************************************************************** + * CoCreateInstanceEx (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx(REFCLSID rclsid, IUnknown *outer, DWORD cls_context, + COSERVERINFO *server_info, ULONG count, MULTI_QI *results) +{ + IClassFactory *factory; + IUnknown *unk = NULL; + CLSID clsid; + HRESULT hr; + + TRACE("%s, %p, %#x, %p, %u, %p\n", debugstr_guid(rclsid), outer, cls_context, server_info, count, results); + + if (!count || !results) + return E_INVALIDARG; + + if (server_info) + FIXME("Server info is not supported.\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + hr = CoGetTreatAsClass(rclsid, &clsid); + if (FAILED(hr)) + clsid = *rclsid; + + hr = CoGetClassObject(&clsid, cls_context, NULL, &IID_IClassFactory, (void **)&factory); + if (FAILED(hr)) + return hr; + + hr = IClassFactory_CreateInstance(factory, outer, results[0].pIID, (void **)&unk); + IClassFactory_Release(factory); + if (FAILED(hr)) + { + if (hr == CLASS_E_NOAGGREGATION && outer) + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); + else + FIXME("no instance created for interface %s of class %s, hr %#x.\n", + debugstr_guid(results[0].pIID), debugstr_guid(&clsid), hr); + return hr; + } + + return return_multi_qi(unk, count, results, TRUE); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6698c23c76..0daf321d69 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -81,7 +81,7 @@ @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) -@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stub CoCreateInstanceFromApp @ stub CoCreateObjectInContext @ stub CoDeactivateObject diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index cf1feeb3f4..dd51542af5 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2918,100 +2918,6 @@ HRESULT WINAPI CoResumeClassObjects(void) return S_OK; } -static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) -{ - ULONG i; - - for (i = 0; i < count; i++) - { - mqi[i].pItf = NULL; - mqi[i].hr = hr; - } -} - -static HRESULT return_multi_qi(IUnknown *unk, DWORD count, MULTI_QI *mqi, BOOL include_unk) -{ - ULONG index = 0, fetched = 0; - - if (include_unk) - { - mqi[0].hr = S_OK; - mqi[0].pItf = unk; - index = fetched = 1; - } - - for (; index < count; index++) - { - mqi[index].hr = IUnknown_QueryInterface(unk, mqi[index].pIID, (void**)&mqi[index].pItf); - if (mqi[index].hr == S_OK) - fetched++; - } - - if (!include_unk) - IUnknown_Release(unk); - - if (fetched == 0) - return E_NOINTERFACE; - - return fetched == count ? S_OK : CO_S_NOTALLINTERFACES; -} - -/*********************************************************************** - * CoCreateInstanceEx [OLE32.@] - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( - REFCLSID rclsid, - LPUNKNOWN pUnkOuter, - DWORD dwClsContext, - COSERVERINFO* pServerInfo, - ULONG cmq, - MULTI_QI* pResults) -{ - IUnknown *unk = NULL; - IClassFactory *cf; - CLSID clsid; - HRESULT hres; - - TRACE("(%s %p %x %p %u %p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, pServerInfo, cmq, pResults); - - if (!cmq || !pResults) - return E_INVALIDARG; - - if (pServerInfo) - FIXME("() non-NULL pServerInfo not supported!\n"); - - init_multi_qi(cmq, pResults, E_NOINTERFACE); - - hres = CoGetTreatAsClass(rclsid, &clsid); - if(FAILED(hres)) - clsid = *rclsid; - - /* - * Get a class factory to construct the object we want. - */ - hres = CoGetClassObject(&clsid, dwClsContext, NULL, &IID_IClassFactory, (void**)&cf); - if (FAILED(hres)) - return hres; - - /* - * Create the object and don't forget to release the factory - */ - hres = IClassFactory_CreateInstance(cf, pUnkOuter, pResults[0].pIID, (void**)&unk); - IClassFactory_Release(cf); - if (FAILED(hres)) - { - if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) - FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); - else - FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", - debugstr_guid(pResults[0].pIID), - debugstr_guid(&clsid),hres); - return hres; - } - - return return_multi_qi(unk, cmq, pResults, TRUE); -} - /*********************************************************************** * CoLoadLibrary (OLE32.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index a8101df80b..57db6e38b7 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -13,7 +13,7 @@ @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) combase.CoCreateFreeThreadedMarshaler @ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) combase.CoCreateInstance -@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) +@ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) combase.CoCreateInstanceEx @ stdcall CoDecrementMTAUsage(ptr) @ stdcall CoDisableCallCancellation(ptr) @ stdcall CoDisconnectObject(ptr long)

1 0

Henri Verbeet : build: Assume the soname is <library>.dll when building for MinGW hosts.
by Alexandre Julliard 13 Aug '20

13 Aug '20

Module: vkd3d Branch: master Commit: a5daebbda9177b4e02f276a32c8f91f855b26e11 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5daebbda9177b4e02f276a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 13 17:55:36 2020 +0430 build: Assume the soname is <library>.dll when building for MinGW hosts. That's not strictly true, but the only case we care about is the Vulkan DLL on Windows, for which the official import library is called vulkan-1.lib, and the DLL is called vulkan-1.dll. We can do something more elaborate once it becomes relevant. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- m4/check-soname.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 index f195341..584095f 100644 --- a/m4/check-soname.m4 +++ b/m4/check-soname.m4 @@ -39,6 +39,7 @@ AC_CACHE_VAL(ac_Lib, AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], [AS_CASE(["$host_os"], [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [mingw*], [AS_VAR_SET(ac_Lib,[$1.dll])], [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[[[^ ]]*\$\\).*$/\1/"';2,$d'`]) AS_VAR_IF([ac_Lib],[], [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[" | sed -e "s/^.*$]ac_lib_pattern[[[^ ]]*$.*$/\1/"';2,$d'`])])])])

1 0