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

[PATCH 4/4] winapi_test: Minor $pointer_size check consistency tweak.
by Serge Gautherie Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to a8e86e35dd1822e62893eb47af14b7b0e8e11b4a. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8c56677..fd80157 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -419,7 +419,7 @@ foreach my $file (@files) { } elsif ($preprocessor =~ /^\#\s*ifdef\s+_WIN64/) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { - push @ifdefs, ($pointer_size == 4); + push @ifdefs, ($pointer_size != 8); } elsif ($preprocessor =~ /^\#\s*elif\s+defined\s*$\s*_WIN64\s*$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { -- 2.10.0.windows.1

2 1

[PATCH 2/4] winapi_test: Escape parentheses in regexp, Allow spaces around them.
by Serge Gautherie Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Fix parsing related to a few *_PTR types from basetsd.h. Addendum to 6b11a3c3f81d7db3794f3320eeaef8001cc99b74. --- tools/winapi/winapi_test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 1ad94a6..e9e5fe4 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -419,7 +419,7 @@ foreach my $file (@files) { push @ifdefs, ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifndef\s+_WIN64/) { push @ifdefs, ($pointer_size == 4); - } elsif ($preprocessor =~ /^\#\s*elif\s+defined(_WIN64)/) { + } elsif ($preprocessor =~ /^\#\s*elif\s+defined\s*$\s*_WIN64\s*$/) { $ifdefs[$#ifdefs] = ($pointer_size == 8); } elsif ($preprocessor =~ /^\#\s*ifdef\s/) { push @ifdefs, 2; -- 2.10.0.windows.1

2 1

[PATCH] mscoree: Use builtin XNA implementation by default.
by Esme Povirk Aug. 13, 2020

Aug. 13, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=32877 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- Proton has been using this setting for a while, and I think it's shown that FNA works very well as an XNA replacement. This is clearly the best option for users, and it can still be overridden with an environment variable or registry key if a developer wants to work on supporting the XNA redist. dlls/mscoree/metahost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 77029942528..e854ec2bdfa 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1502,6 +1502,10 @@ static DWORD get_basename_search_flags(const char *basename, MonoAssemblyName *a return reg_entry.flags; } + if (strcmp(basename, "Microsoft.Xna.Framework.*") == 0) + /* XNA redist is broken in Wine Mono, use FNA instead. */ + return 0; + return ASSEMBLY_SEARCH_UNDEFINED; } -- 2.17.1

4 3

[PATCH] wbemprox: Use empty strings instead of NULL.
by Rémi Bernon Aug. 13, 2020

Aug. 13, 2020

For Win32_PhysicalMemory PartNumber and Serial properties. Injustice 2 calls SysStringLen directly on the value without checking its type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The game also needs better media foundation, but it crashes on startup because of this issue. dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4edda854b58..43268221936 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -2920,8 +2920,8 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e rec->devicelocator = L"DIMM 0"; rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ - rec->partnumber = NULL; - rec->serial = NULL; + rec->partnumber = L""; + rec->serial = L""; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; -- 2.28.0

2 1

[PATCH v2 3/6] ole32: Remove now unused helper.
by Huw Davies Aug. 13, 2020

Aug. 13, 2020

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 1b7aa5640ce..b64dfbf4f4a 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 e761c99b77c..fe6b5e58122 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) -- 2.23.0

2 1

[PATCH v2 1/6] ole32: Remove registration for Global Interface Table class.
by Huw Davies Aug. 13, 2020

Aug. 13, 2020

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 d2c1a9999e6..0cc3ccea9e5 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), -- 2.23.0

2 1

[PATCH 1/6] ole32: Remove registration for Global Interface Table class.
by Nikolay Sivov Aug. 13, 2020

Aug. 13, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It's not registered on Windows. 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 d2c1a9999e6..0cc3ccea9e5 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), -- 2.28.0

3 8

[PATCH v2 6/6] combase: Move CoFreeUnusedLibraries().
by Huw Davies Aug. 13, 2020

Aug. 13, 2020

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 4e15bd970e8..5752d90d5cc 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 0daf321d69b..3214f54550c 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 dd51542af53..f983b07f20b 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 57db6e38b76..a19264127f9 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) -- 2.23.0

1 0

[PATCH v2 5/6] combase: Move CoCreateInstanceEx().
by Huw Davies Aug. 13, 2020

Aug. 13, 2020

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 edd6ac0b285..4e15bd970e8 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 6698c23c76d..0daf321d69b 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 cf1feeb3f41..dd51542af53 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 a8101df80bc..57db6e38b76 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) -- 2.23.0

1 0

[PATCH v2 4/6] ole32: Remove initialized state test in CoCreateInstanceEx().
by Huw Davies Aug. 13, 2020

Aug. 13, 2020

From: Nikolay Sivov <nsivov(a)codeweavers.com> 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> --- dlls/ole32/compobj.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f84c12243f7..cf1feeb3f41 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. */ -- 2.23.0

1 0