wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Jacek Caban : urlmon: Remove unused flags argument from parse_host.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: e03d7ca900d9eed1a78504b96bb7a82f69a6ca05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e03d7ca900d9eed1a78504b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 12 14:09:42 2020 +0200 urlmon: Remove unused flags argument from parse_host. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/uri.c | 95 ++++++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e03d7ca900d9eed1a785…

1 0

Nikolay Sivov : ole32: Expose ManualResetEvent as registered class.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: 964a8c909d48419390cb6e28a8f1c826ab8af862 URL: https://source.winehq.org/git/wine.git/?a=commit;h=964a8c909d48419390cb6e28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:32 2020 +0300 ole32: Expose ManualResetEvent as registered 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/compobj.c | 6 +++--- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/oleproxy.c | 13 +++++++++++++ dlls/ole32/tests/marshal.c | 5 +++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 32283e6d95..8e78519dc8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -922,12 +922,12 @@ static const ISynchronizeHandleVtbl SynchronizeHandleVtbl = { SynchronizeHandle_GetHandle }; -static HRESULT ManualResetEvent_Construct(IUnknown *punkouter, REFIID iid, void **ppv) +HRESULT WINAPI ManualResetEvent_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **ppv) { MREImpl *This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MREImpl)); HRESULT hr; - if(punkouter) + if (outer) FIXME("Aggregation not implemented.\n"); This->ref = 1; @@ -3004,7 +3004,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( } if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) { - hres = ManualResetEvent_Construct(pUnkOuter, pResults[0].pIID, (void**)&unk); + hres = ManualResetEvent_CreateInstance(&ManualResetEventCF, pUnkOuter, pResults[0].pIID, (void**)&unk); if (FAILED(hres)) return hres; return return_multi_qi(unk, cmq, pResults, TRUE); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 3156f86f89..974c230ddc 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -322,6 +322,9 @@ extern IClassFactory GlobalOptionsCF DECLSPEC_HIDDEN; extern HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) DECLSPEC_HIDDEN; 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; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 93ff5b0da8..29cd391e12 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -170,6 +170,17 @@ static const IClassFactoryVtbl GlobalInterfaceTableCFVtbl = IClassFactory GlobalInterfaceTableCF = { &GlobalInterfaceTableCFVtbl }; +static const IClassFactoryVtbl ManualResetEventCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ManualResetEvent_CreateInstance, + ClassFactory_LockServer +}; + +IClassFactory ManualResetEventCF = { &ManualResetEventCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -186,6 +197,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) return MARSHAL_GetStandardMarshalCF(ppv); if (IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, iid, ppv); + if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + return IClassFactory_QueryInterface(&ManualResetEventCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e2608ecb76..ef608e66d0 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -4006,11 +4006,16 @@ static void test_manualresetevent(void) { ISynchronizeHandle *sync_handle; ISynchronize *psync1, *psync2; + IClassFactory *factory; IUnknown *punk; HANDLE handle; LONG ref; HRESULT hr; + hr = pDllGetClassObject(&CLSID_ManualResetEvent, &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: Reduce duplication for global interface table factory.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: b59b5da85676e99953dba18acc529fb59cede1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b59b5da85676e99953dba18a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:31 2020 +0300 ole32: Reduce duplication for global interface table factory. 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 | 3 +++ dlls/ole32/git.c | 60 ++++---------------------------------------- dlls/ole32/oleproxy.c | 15 +++++++++-- 3 files changed, 21 insertions(+), 57 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index e151241673..3156f86f89 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -319,6 +319,9 @@ extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) DECLS extern HRESULT WINAPI GlobalOptions_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern IClassFactory GlobalOptionsCF DECLSPEC_HIDDEN; +extern HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, + void **obj) DECLSPEC_HIDDEN; +extern IClassFactory GlobalInterfaceTableCF DECLSPEC_HIDDEN; /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index 8683f3592a..e761c99b77 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -290,62 +290,12 @@ StdGlobalInterfaceTable_GetInterfaceFromGlobal( return S_OK; } -/* Classfactory definition - despite what MSDN says, some programs need this */ - -static HRESULT WINAPI -GITCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI GITCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; -} - -static ULONG WINAPI GITCF_Release(LPCLASSFACTORY iface) -{ - return 1; -} - -static HRESULT WINAPI -GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, - REFIID riid, LPVOID *ppv) +HRESULT WINAPI GlobalInterfaceTable_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) { - IGlobalInterfaceTable *git = get_std_git(); - HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, ppv); - IGlobalInterfaceTable_Release(git); - return hr; -} - -static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl GITClassFactoryVtbl = { - GITCF_QueryInterface, - GITCF_AddRef, - GITCF_Release, - GITCF_CreateInstance, - GITCF_LockServer -}; - -static IClassFactory git_classfactory = { &GITClassFactoryVtbl }; - -HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) -{ - *ppv = &git_classfactory; - TRACE("Returning GIT classfactory\n"); - return S_OK; + IGlobalInterfaceTable *git = get_std_git(); + HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, obj); + IGlobalInterfaceTable_Release(git); + return hr; } /* Virtual function table */ diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index b5c08ff1c5..93ff5b0da8 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -159,6 +159,17 @@ static const IClassFactoryVtbl GlobalOptionsCFVtbl = IClassFactory GlobalOptionsCF = { &GlobalOptionsCFVtbl }; +static const IClassFactoryVtbl GlobalInterfaceTableCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + GlobalInterfaceTable_CreateInstance, + ClassFactory_LockServer +}; + +IClassFactory GlobalInterfaceTableCF = { &GlobalInterfaceTableCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -173,8 +184,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) ) ) return MARSHAL_GetStandardMarshalCF(ppv); - if (IsEqualIID(rclsid,&CLSID_StdGlobalInterfaceTable) && (IsEqualIID(iid,&IID_IClassFactory) || IsEqualIID(iid,&IID_IUnknown))) - return StdGlobalInterfaceTable_GetFactory(ppv); + if (IsEqualCLSID(rclsid, &CLSID_StdGlobalInterfaceTable)) + return IClassFactory_QueryInterface(&GlobalInterfaceTableCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker))

1 0

Nikolay Sivov : combase: Move CLSIDFromProgIDEx().
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: 7f50f877eed401895e4254342a478978bed09e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f50f877eed401895e425434… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:30 2020 +0300 combase: Move CLSIDFromProgIDEx(). 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 | 10 ++++++++++ dlls/combase/combase.spec | 1 + dlls/ole32/compobj.c | 10 ---------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index f7c70e1232..edd6ac0b28 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1063,6 +1063,16 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CLSIDFromProgID(LPCOLESTR progid, CLSID *clsid) return clsid_from_string_reg(progid, clsid); } +/****************************************************************************** + * CLSIDFromProgIDEx (combase.@) + */ +HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, CLSID *clsid) +{ + FIXME("%s, %p: semi-stub\n", debugstr_w(progid), clsid); + + return CLSIDFromProgID(progid, clsid); +} + /****************************************************************************** * CLSIDFromString (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 79410be8be..6698c23c76 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -68,6 +68,7 @@ @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stub CLSIDFromOle1Class @ stdcall CLSIDFromProgID(wstr ptr) +@ stdcall CLSIDFromProgIDEx(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stub CleanupOleStateInAllTls @ stdcall CleanupTlsOleState(ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 33e617cca0..32283e6d95 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2255,16 +2255,6 @@ HRESULT COM_OpenKeyForAppIdFromCLSID(REFCLSID clsid, REGSAM access, HKEY *subkey return S_OK; } -/****************************************************************************** - * CLSIDFromProgIDEx [OLE32.@] - */ -HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid) -{ - FIXME("%s,%p: semi-stub\n", debugstr_w(progid), clsid); - - return CLSIDFromProgID(progid, clsid); -} - static HRESULT get_ps_clsid_from_registry(const WCHAR* path, REGSAM access, CLSID *pclsid) { HKEY hkey; diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d1dedd39c3..c83f0b2716 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -4,7 +4,7 @@ @ stdcall CLIPFORMAT_UserSize(ptr long ptr) combase.CLIPFORMAT_UserSize @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) combase.CLIPFORMAT_UserUnmarshal @ stdcall CLSIDFromProgID(wstr ptr) combase.CLSIDFromProgID -@ stdcall CLSIDFromProgIDEx(wstr ptr) +@ stdcall CLSIDFromProgIDEx(wstr ptr) combase.CLSIDFromProgIDEx @ stdcall CLSIDFromString(wstr ptr) combase.CLSIDFromString @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr)

1 0

Nikolay Sivov : combase: Move CoCreateFreeThreadedMarshaler().
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: 3a413b91b9f432967306b750dd48ef520cc58212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a413b91b9f432967306b750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:29 2020 +0300 combase: Move CoCreateFreeThreadedMarshaler(). 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.spec | 2 +- dlls/combase/marshal.c | 295 +++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ftmarshal.c | 312 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 297 insertions(+), 314 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a413b91b9f432967306…

1 0

Nikolay Sivov : combase: Move CoMarshalInterThreadInterfaceInStream().
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: 0bcbc4693e0ba0fff8a7a69abd0510d03bab5fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bcbc4693e0ba0fff8a7a69a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:28 2020 +0300 combase: Move CoMarshalInterThreadInterfaceInStream(). 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.spec | 2 +- dlls/combase/marshal.c | 29 +++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 45 --------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 31 insertions(+), 47 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 8c471f5ef6..5ee52d950e 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -129,7 +129,7 @@ @ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected @ stdcall CoLockObjectExternal(ptr long long) ole32.CoLockObjectExternal @ stdcall CoMarshalHresult(ptr long) -@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) ole32.CoMarshalInterThreadInterfaceInStream +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) ole32.CoMarshalInterface @ stub CoPopServiceDomain @ stub CoPushServiceDomain diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 54151e21c8..fe4c2f3adf 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -55,3 +55,32 @@ HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void IStream_Release(stream); return hr; } + +/*********************************************************************** + * CoMarshalInterThreadInterfaceInStream (combase.@) + */ +HRESULT WINAPI CoMarshalInterThreadInterfaceInStream(REFIID riid, IUnknown *unk, IStream **stream) +{ + ULARGE_INTEGER xpos; + LARGE_INTEGER seekto; + HRESULT hr; + + TRACE("%s, %p, %p\n", debugstr_guid(riid), unk, stream); + + hr = CreateStreamOnHGlobal(NULL, TRUE, stream); + if (FAILED(hr)) return hr; + hr = CoMarshalInterface(*stream, riid, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + + if (SUCCEEDED(hr)) + { + memset(&seekto, 0, sizeof(seekto)); + IStream_Seek(*stream, seekto, STREAM_SEEK_SET, &xpos); + } + else + { + IStream_Release(*stream); + *stream = NULL; + } + + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 51db5a7e69..cf1e55babe 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2079,51 +2079,6 @@ HRESULT WINAPI CoReleaseMarshalData(IStream *pStream) return hr; } - -/*********************************************************************** - * CoMarshalInterThreadInterfaceInStream [OLE32.@] - * - * Marshal an interface across threads in the same process. - * - * PARAMS - * riid [I] Identifier of the interface to be marshalled. - * pUnk [I] Pointer to IUnknown-derived interface that will be marshalled. - * ppStm [O] Pointer to IStream object that is created and then used to store the marshalled interface. - * - * RETURNS - * Success: S_OK - * Failure: E_OUTOFMEMORY and other COM error codes - * - * SEE ALSO - * CoMarshalInterface(), CoUnmarshalInterface() and CoGetInterfaceAndReleaseStream() - */ -HRESULT WINAPI CoMarshalInterThreadInterfaceInStream( - REFIID riid, LPUNKNOWN pUnk, LPSTREAM * ppStm) -{ - ULARGE_INTEGER xpos; - LARGE_INTEGER seekto; - HRESULT hres; - - TRACE("(%s, %p, %p)\n",debugstr_guid(riid), pUnk, ppStm); - - hres = CreateStreamOnHGlobal(NULL, TRUE, ppStm); - if (FAILED(hres)) return hres; - hres = CoMarshalInterface(*ppStm, riid, pUnk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - - if (SUCCEEDED(hres)) - { - memset(&seekto, 0, sizeof(seekto)); - IStream_Seek(*ppStm, seekto, STREAM_SEEK_SET, &xpos); - } - else - { - IStream_Release(*ppStm); - *ppStm = NULL; - } - - return hres; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d5e5607e03..1587f92638 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -58,7 +58,7 @@ @ stdcall CoLoadLibrary(wstr long) @ stdcall CoLockObjectExternal(ptr long long) @ stdcall CoMarshalHresult(ptr long) combase.CoMarshalHresult -@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) +@ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) combase.CoMarshalInterThreadInterfaceInStream @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @ stub CoQueryAuthenticationServices @ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryClientBlanket

1 0

Nikolay Sivov : combase: Move CoGetInterfaceAndReleaseStream().
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: 4c9db7fa2281fb62660e8e54aa5f2c706d2a0b1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9db7fa2281fb62660e8e54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 11:12:27 2020 +0300 combase: Move CoGetInterfaceAndReleaseStream(). 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.spec | 2 +- dlls/combase/marshal.c | 19 +++++++++++++++++++ dlls/ole32/marshal.c | 30 ------------------------------ dlls/ole32/ole32.spec | 2 +- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 56dc63c4f7..8c471f5ef6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -109,7 +109,7 @@ @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax @ stub CoGetModuleType diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index dfe6426db9..54151e21c8 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -21,6 +21,10 @@ #define COBJMACROS #include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + /*********************************************************************** * CoMarshalHresult (combase.@) */ @@ -36,3 +40,18 @@ HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult) { return IStream_Read(stream, phresult, sizeof(*phresult), NULL); } + +/*********************************************************************** + * CoGetInterfaceAndReleaseStream (combase.@) + */ +HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void **obj) +{ + HRESULT hr; + + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj); + + if (!stream) return E_INVALIDARG; + hr = CoUnmarshalInterface(stream, riid, obj); + IStream_Release(stream); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 90d2480595..51db5a7e69 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2124,36 +2124,6 @@ HRESULT WINAPI CoMarshalInterThreadInterfaceInStream( return hres; } -/*********************************************************************** - * CoGetInterfaceAndReleaseStream [OLE32.@] - * - * Unmarshalls an interface from a stream and then releases the stream. - * - * PARAMS - * pStm [I] Stream that contains the marshalled interface. - * riid [I] Interface identifier of the object to unmarshall. - * ppv [O] Address of pointer where the requested interface object will be stored. - * - * RETURNS - * Success: S_OK - * Failure: A COM error code - * - * SEE ALSO - * CoMarshalInterThreadInterfaceInStream() and CoUnmarshalInterface() - */ -HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID riid, - LPVOID *ppv) -{ - HRESULT hres; - - TRACE("(%p, %s, %p)\n", pStm, debugstr_guid(riid), ppv); - - if(!pStm) return E_INVALIDARG; - hres = CoUnmarshalInterface(pStm, riid, ppv); - IStream_Release(pStm); - return hres; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 001e7b7ad2..d5e5607e03 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -37,7 +37,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) combase.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stdcall CoGetObject(wstr ptr ptr ptr)

1 0

Esme Povirk : mscoree: Use builtin XNA implementation by default.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: f87171c6013603decfc64f405bb039b5c1f1add4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87171c6013603decfc64f40… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Aug 11 22:15:46 2020 -0500 mscoree: Use builtin XNA implementation by default. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32877 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 7702994252..e854ec2bdf 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; }

1 0

Rémi Bernon : ntdll/tests: Run RtlRaiseException tests on x86_64.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: 26c078a2a64e515323bfbb4fcbdaf161150942ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c078a2a64e515323bfbb4f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 12 10:15:02 2020 +0200 ntdll/tests: Run RtlRaiseException tests on x86_64. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 197 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 180 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26c078a2a64e515323bf…

1 0

Rémi Bernon : ntdll/tests: Add broken FltSave results for w2008 / w8.
by Alexandre Julliard 12 Aug '20

12 Aug '20

Module: wine Branch: master Commit: 94ee27097228ac37f1576565c9f93f6186ff66a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94ee27097228ac37f1576565… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 12 10:15:01 2020 +0200 ntdll/tests: Add broken FltSave results for w2008 / w8. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0efe189891..f60327cebf 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3080,6 +3080,7 @@ static void test_thread_context(void) XMM_SAVE_AREA32 FltSave; WORD SegCs, SegDs, SegEs, SegFs, SegGs, SegSs; } expect; + XMM_SAVE_AREA32 broken_fltsave; NTSTATUS (*func_ptr)( void *arg1, void *arg2, struct expected *res, void *func ) = (void *)code_mem; static const BYTE call_func[] = @@ -3240,7 +3241,12 @@ static void test_thread_context(void) COMPARE( SegFs ); COMPARE( SegGs ); COMPARE( SegSs ); - ok( !memcmp( &context.FltSave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )), + + broken_fltsave = context.FltSave; + memset( &broken_fltsave.ErrorOpcode, 0xcc, 0x12 ); + + ok( !memcmp( &context.FltSave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )) || + broken( !memcmp( &broken_fltsave, &expect.FltSave, offsetof( XMM_SAVE_AREA32, XmmRegisters )) ) /* w2008, w8 */, "wrong FltSave\n" ); for (i = 6; i < 16; i++) ok( !memcmp( &context.Xmm0 + i, &expect.FltSave.XmmRegisters[i], sizeof(context.Xmm0) ),

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
70
Older →

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 August 2020