wine-commits August 2020

wine-commits@winehq.org

2 participants
692 discussions

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.149.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 72517ff1875431bd82f21f5f9269a6f949b6845c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72517ff1875431bd82f21f5f… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Thu Aug 6 12:44:09 2020 -0700 winevulkan: Update to VK spec version 1.2.149. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Erik Kurzinger <ekurzinger(a)nvidia.com> Signed-off-by: Jeff Bolz <jbolz(a)nvidia.com> Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 18 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 525 ++++++++++++++++++++-------------------- 4 files changed, 289 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=72517ff1875431bd82f2…

1 0

Nikolay Sivov : combase: Move CoGetInstanceFromFile().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 449d323d25cb4f2956fa4b7a9868c69f8468c06d URL: https://source.winehq.org/git/wine.git/?a=commit;h=449d323d25cb4f2956fa4b7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:48 2020 +0300 combase: Move CoGetInstanceFromFile(). 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 | 98 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 73 ----------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 100 insertions(+), 75 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 1370aa8271..06fc97e17d 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -627,3 +627,101 @@ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD arg2, DWORD *arg3) return E_NOTIMPL; } + +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; +} + +/*********************************************************************** + * CoGetInstanceFromFile (combase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile(COSERVERINFO *server_info, CLSID *rclsid, + IUnknown *outer, DWORD cls_context, DWORD grfmode, OLECHAR *filename, DWORD count, + MULTI_QI *results) +{ + IPersistFile *pf = NULL; + IUnknown *obj = NULL; + CLSID clsid; + HRESULT hr; + + if (!count || !results) + return E_INVALIDARG; + + if (server_info) + FIXME("() non-NULL server_info not supported\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + if (!rclsid) + { + hr = GetClassFile(filename, &clsid); + if (FAILED(hr)) + { + ERR("Failed to get CLSID from a file.\n"); + return hr; + } + + rclsid = &clsid; + } + + hr = CoCreateInstance(rclsid, outer, cls_context, &IID_IUnknown, (void **)&obj); + if (hr != S_OK) + { + init_multi_qi(count, results, hr); + return hr; + } + + /* Init from file */ + hr = IUnknown_QueryInterface(obj, &IID_IPersistFile, (void **)&pf); + if (FAILED(hr)) + { + init_multi_qi(count, results, hr); + IUnknown_Release(obj); + return hr; + } + + hr = IPersistFile_Load(pf, filename, grfmode); + IPersistFile_Release(pf); + if (SUCCEEDED(hr)) + return return_multi_qi(obj, count, results, FALSE); + else + { + init_multi_qi(count, results, hr); + IUnknown_Release(obj); + return hr; + } +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 4f737aeb53..e90df05446 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -107,7 +107,7 @@ @ stdcall CoGetCurrentProcess() ole32.CoGetCurrentProcess @ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext @ stub CoGetErrorInfo -@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) ole32.CoGetInstanceFromFile +@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6a0c518081..1ad8a4b1d1 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3434,79 +3434,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( return return_multi_qi(unk, cmq, pResults, TRUE); } -/*********************************************************************** - * CoGetInstanceFromFile [OLE32.@] - */ -HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile( - COSERVERINFO *server_info, - CLSID *rclsid, - IUnknown *outer, - DWORD cls_context, - DWORD grfmode, - OLECHAR *filename, - DWORD count, - MULTI_QI *results -) -{ - IPersistFile *pf = NULL; - IUnknown* unk = NULL; - CLSID clsid; - HRESULT hr; - - if (count == 0 || !results) - return E_INVALIDARG; - - if (server_info) - FIXME("() non-NULL server_info not supported\n"); - - init_multi_qi(count, results, E_NOINTERFACE); - - /* optionally get CLSID from a file */ - if (!rclsid) - { - hr = GetClassFile(filename, &clsid); - if (FAILED(hr)) - { - ERR("failed to get CLSID from a file\n"); - return hr; - } - - rclsid = &clsid; - } - - hr = CoCreateInstance(rclsid, - outer, - cls_context, - &IID_IUnknown, - (void**)&unk); - - if (hr != S_OK) - { - init_multi_qi(count, results, hr); - return hr; - } - - /* init from file */ - hr = IUnknown_QueryInterface(unk, &IID_IPersistFile, (void**)&pf); - if (FAILED(hr)) - { - init_multi_qi(count, results, hr); - IUnknown_Release(unk); - return hr; - } - - hr = IPersistFile_Load(pf, filename, grfmode); - IPersistFile_Release(pf); - if (SUCCEEDED(hr)) - return return_multi_qi(unk, count, results, FALSE); - else - { - init_multi_qi(count, results, hr); - IUnknown_Release(unk); - return hr; - } -} - /*********************************************************************** * CoGetInstanceFromIStorage [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index ef074bbc26..b1949eec8e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -35,7 +35,7 @@ @ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) -@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) +@ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc

1 0

Nikolay Sivov : combase: Move CoGetActivationState().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: bf4ecef04ca028d3fd6adb7a9cf239a2f123f582 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4ecef04ca028d3fd6adb7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:47 2020 +0300 combase: Move CoGetActivationState(). 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 | 2 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_main.c | 9 --------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7947109fef..1370aa8271 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -617,3 +617,13 @@ HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2) return E_NOTIMPL; } + +/*********************************************************************** + * CoGetActivationState (combase.@) + */ +HRESULT WINAPI CoGetActivationState(GUID guid, DWORD arg2, DWORD *arg3) +{ + FIXME("%s, %x, %p.\n", debugstr_guid(&guid), arg2, arg3); + + return E_NOTIMPL; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index b9ccea5913..4f737aeb53 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -93,7 +93,7 @@ @ stdcall CoFileTimeNow(ptr) @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries @ stdcall CoFreeUnusedLibrariesEx(long long) ole32.CoFreeUnusedLibrariesEx -@ stdcall CoGetActivationState(int128 long ptr) ole32.CoGetActivationState +@ stdcall CoGetActivationState(int128 long ptr) @ stub CoGetApartmentID @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 370a32eeae..ef074bbc26 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -25,7 +25,7 @@ @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() @ stdcall CoFreeUnusedLibrariesEx(long long) -@ stdcall CoGetActivationState(int128 long ptr) +@ stdcall CoGetActivationState(int128 long ptr) combase.CoGetActivationState @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) @ stdcall CoGetCallState(long ptr) combase.CoGetCallState diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 13b3d3681b..daff46864b 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -158,15 +158,6 @@ HGLOBAL WINAPI OleMetafilePictFromIconAndLabel(HICON hIcon, LPOLESTR lpszLabel, return hmem; } -/*********************************************************************** - * CoGetActivationState (ole32.@) - */ -HRESULT WINAPI CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) -{ - FIXME("%s, %x, %p\n", debugstr_guid(&guid), unknown, unknown2); - return E_NOTIMPL; -} - /****************************************************************************** * IsValidInterface [OLE32.@] *

1 0

Nikolay Sivov : combase: Move CoGetCallState().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 90755c8ea353c81e02da4902707b077636e6a2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=90755c8ea353c81e02da4902… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:46 2020 +0300 combase: Move CoGetCallState(). 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 | 2 +- dlls/ole32/ole32.spec | 2 +- dlls/ole32/ole32_main.c | 9 --------- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 752658012c..7947109fef 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -607,3 +607,13 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) return IObjContext_QueryInterface(context, riid, ppv); } + +/*********************************************************************** + * CoGetCallState (combase.@) + */ +HRESULT WINAPI CoGetCallState(int arg1, ULONG *arg2) +{ + FIXME("%d, %p.\n", arg1, arg2); + + return E_NOTIMPL; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c84c10a21f..b9ccea5913 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -97,7 +97,7 @@ @ stub CoGetApartmentID @ stdcall CoGetApartmentType(ptr ptr) ole32.CoGetApartmentType @ stdcall CoGetCallContext(ptr ptr) ole32.CoGetCallContext -@ stdcall CoGetCallState(long ptr) ole32.CoGetCallState +@ stdcall CoGetCallState(long ptr) @ stdcall CoGetCallerTID(ptr) ole32.CoGetCallerTID @ stub CoGetCancelObject @ stdcall CoGetClassObject(ptr long ptr ptr ptr) ole32.CoGetClassObject diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index faccb54292..370a32eeae 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -28,7 +28,7 @@ @ stdcall CoGetActivationState(int128 long ptr) @ stdcall CoGetApartmentType(ptr ptr) @ stdcall CoGetCallContext(ptr ptr) -@ stdcall CoGetCallState(long ptr) +@ stdcall CoGetCallState(long ptr) combase.CoGetCallState @ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c index 414fdf2b36..13b3d3681b 100644 --- a/dlls/ole32/ole32_main.c +++ b/dlls/ole32/ole32_main.c @@ -167,15 +167,6 @@ HRESULT WINAPI CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) return E_NOTIMPL; } -/*********************************************************************** - * CoGetCallState (ole32.@) - */ -HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) -{ - FIXME("%d, %p\n", unknown, unknown2); - return E_NOTIMPL; -} - /****************************************************************************** * IsValidInterface [OLE32.@] *

1 0

Nikolay Sivov : combase: Move CoGetObjectContext().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: b8f21f7607c8d29d13cecc0f9a5f2dee280b507f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f21f7607c8d29d13cecc0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:45 2020 +0300 combase: Move CoGetObjectContext(). 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 | 20 ++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 28 ---------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 7f1d6a6320..752658012c 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -20,6 +20,8 @@ #define COBJMACROS #define NONAMELESSUNION +#define USE_COM_CONTEXT_DEF +#include "objbase.h" #include "oleauto.h" #include "wine/debug.h" @@ -587,3 +589,21 @@ HRESULT WINAPI CoRevertToSelf(void) return hr; } + +/*********************************************************************** + * CoGetObjectContext (combase.@) + */ +HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) +{ + IObjContext *context; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + hr = CoGetContextToken((ULONG_PTR *)&context); + if (FAILED(hr)) + return hr; + + return IObjContext_QueryInterface(context, riid, ppv); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e67e7159bd..c84c10a21f 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -113,7 +113,7 @@ @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax @ stub CoGetModuleType -@ stdcall CoGetObjectContext(ptr ptr) ole32.CoGetObjectContext +@ stdcall CoGetObjectContext(ptr ptr) @ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid @ stub CoGetProcessIdentifier @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) ole32.CoGetStandardMarshal diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 06dd4aefc7..6a0c518081 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4789,34 +4789,6 @@ static const IObjContextVtbl Context_Object_Vtbl = Context_OC_Reserved7 }; -/*********************************************************************** - * CoGetObjectContext [OLE32.@] - * - * Retrieves an object associated with the current context (i.e. apartment). - * - * PARAMS - * riid [I] ID of the interface of the object to retrieve. - * ppv [O] Address where object will be stored on return. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - */ -HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) -{ - IObjContext *context; - HRESULT hr; - - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - - *ppv = NULL; - hr = CoGetContextToken((ULONG_PTR*)&context); - if (FAILED(hr)) - return hr; - - return IObjContext_QueryInterface(context, riid, ppv); -} - /*********************************************************************** * CoGetContextToken [OLE32.@] */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e23c57b404..faccb54292 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -41,7 +41,7 @@ @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stdcall CoGetObject(wstr ptr ptr ptr) -@ stdcall CoGetObjectContext(ptr ptr) +@ stdcall CoGetObjectContext(ptr ptr) combase.CoGetObjectContext @ stdcall CoGetPSClsid(ptr ptr) @ stdcall CoGetStandardMarshal(ptr ptr long ptr long ptr) @ stdcall CoGetState(ptr)

1 0

Nikolay Sivov : combase: Add CoCreateErrorInfo() as an alias for CreateErrorInfo().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 7955d3d33ed05e601587028ecdc97249438160bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7955d3d33ed05e601587028e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:44 2020 +0300 combase: Add CoCreateErrorInfo() as an alias for CreateErrorInfo(). 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 83a3d32aa6..e67e7159bd 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -76,7 +76,7 @@ @ stub CoAllowUnmarshalerCLSID @ stub CoCancelCall @ stdcall CoCopyProxy(ptr ptr) -@ stub CoCreateErrorInfo +@ stdcall CoCreateErrorInfo(ptr) CreateErrorInfo @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler @ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance

1 0

Nikolay Sivov : combase: Move CoRevertToSelf().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 8d6d5a56b8642f6f6171050baba91c1476baa72f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6d5a56b8642f6f6171050b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 7 09:11:43 2020 +0300 combase: Move CoRevertToSelf(). 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 | 20 ++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 33 --------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index e63cce00dd..7f1d6a6320 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -567,3 +567,23 @@ HRESULT WINAPI CoImpersonateClient(void) return hr; } + +/*********************************************************************** + * CoRevertToSelf (combase.@) + */ +HRESULT WINAPI CoRevertToSelf(void) +{ + IServerSecurity *server_security; + HRESULT hr; + + TRACE("\n"); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&server_security); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_RevertToSelf(server_security); + IServerSecurity_Release(server_security); + } + + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3122588d7e..83a3d32aa6 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -149,7 +149,7 @@ @ stdcall CoReleaseServerProcess() ole32.CoReleaseServerProcess @ stdcall CoResumeClassObjects() ole32.CoResumeClassObjects @ stub CoRetireServer -@ stdcall CoRevertToSelf() ole32.CoRevertToSelf +@ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) ole32.CoRevokeClassObject @ stdcall CoRevokeInitializeSpy(int64) ole32.CoRevokeInitializeSpy @ stdcall CoRevokeMallocSpy() diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 507cc451e2..06dd4aefc7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4250,39 +4250,6 @@ HRESULT WINAPI CoSwitchCallContext(IUnknown *pObject, IUnknown **ppOldObject) return S_OK; } -/*********************************************************************** - * CoRevertToSelf [OLE32.@] - * - * Ends the impersonation of the client of the currently executing server - * call in the current thread. - * - * PARAMS - * None. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoImpersonateClient, CoQueryClientBlanket, CoGetCallContext. - */ -HRESULT WINAPI CoRevertToSelf(void) -{ - IServerSecurity *pSrvSec; - HRESULT hr; - - TRACE("\n"); - - hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); - if (SUCCEEDED(hr)) - { - hr = IServerSecurity_RevertToSelf(pSrvSec); - IServerSecurity_Release(pSrvSec); - } - - return hr; -} - static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 049dd0ad61..e23c57b404 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -75,7 +75,7 @@ @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() -@ stdcall CoRevertToSelf() +@ stdcall CoRevertToSelf() combase.CoRevertToSelf @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeInitializeSpy(int64) @ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy

1 0

Alistair Leslie-Hughes : xactengine3_7: Correct callback to windows function.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 9c181981d27ba9eea8afac039f5517fa05f05601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c181981d27ba9eea8afac03… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 7 16:04:51 2020 +1000 xactengine3_7: Correct callback to windows function. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index bd14fc1de7..0ac0d914b3 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -634,6 +634,7 @@ typedef struct _XACT3EngineImpl { XACT_READFILE_CALLBACK pReadFile; XACT_GETOVERLAPPEDRESULT_CALLBACK pGetOverlappedResult; + XACT_NOTIFICATION_CALLBACK notification_callback; } XACT3EngineImpl; typedef struct wrap_readfile_struct { @@ -745,6 +746,25 @@ static HRESULT WINAPI IXACT3EngineImpl_GetFinalMixFormat(IXACT3Engine *iface, (FAudioWaveFormatExtensible*) pFinalMixFormat); } +static void FACTCALL fact_notification_cb(const FACTNotification *notification) +{ + XACT3EngineImpl *engine = (XACT3EngineImpl *)notification->pvContext; + + /* Older versions of FAudio don't pass through the context */ + if (!engine) + { + WARN("Notification context is NULL\n"); + return; + } + + if (notification->type == XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED) + { + FIXME("Callback XACTNOTIFICATIONTYPE_SOUNDBANKDESTROYED\n"); + } + else + FIXME("Unsupported callback type %d\n", notification->type); +} + static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, const XACT_RUNTIME_PARAMETERS *pParams) { @@ -788,6 +808,9 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, GetOverlappedResult; params.fileIOCallbacks.readFileCallback = wrap_readfile; params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult; + params.fnNotificationCallback = fact_notification_cb; + + This->notification_callback = (XACT_NOTIFICATION_CALLBACK)pParams->fnNotificationCallback; ret = FACTAudioEngine_Initialize(This->fact_engine, &params); if (ret != 0) @@ -1062,6 +1085,7 @@ static HRESULT WINAPI IXACT3EngineImpl_RegisterNotification(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pNotificationDesc); unwrap_notificationdesc(&fdesc, pNotificationDesc); + fdesc.pvContext = This; return FACTAudioEngine_RegisterNotification(This->fact_engine, &fdesc); } @@ -1074,6 +1098,7 @@ static HRESULT WINAPI IXACT3EngineImpl_UnRegisterNotification(IXACT3Engine *ifac TRACE("(%p)->(%p)\n", This, pNotificationDesc); unwrap_notificationdesc(&fdesc, pNotificationDesc); + fdesc.pvContext = This; return FACTAudioEngine_UnRegisterNotification(This->fact_engine, &fdesc); }

1 0

Alistair Leslie-Hughes : xactengine3_7: Don't cast interface pointers.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 36366de5645eb06b05c7d870a4469fb67a5b778e URL: https://source.winehq.org/git/wine.git/?a=commit;h=36366de5645eb06b05c7d870… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 7 16:04:50 2020 +1000 xactengine3_7: Don't cast interface pointers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 9f1d905b5e..bd14fc1de7 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -547,7 +547,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; - *ppWave = (IXACT3Wave*)wave; + *ppWave = &wave->IXACT3Wave_iface; TRACE("Created Wave: %p\n", wave); @@ -589,7 +589,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; wave->fact_wave = fwave; - *ppWave = (IXACT3Wave*)wave; + *ppWave = &wave->IXACT3Wave_iface; } return hr; @@ -844,7 +844,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, sb->IXACT3SoundBank_iface.lpVtbl = &XACT3SoundBank_Vtbl; sb->fact_soundbank = fsb; - *ppSoundBank = (IXACT3SoundBank*)sb; + *ppSoundBank = &sb->IXACT3SoundBank_iface; TRACE("Created SoundBank: %p\n", sb); @@ -881,7 +881,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; wb->fact_wavebank = fwb; - *ppWaveBank = (IXACT3WaveBank*)wb; + *ppWaveBank = &wb->IXACT3WaveBank_iface; TRACE("Created in-memory WaveBank: %p\n", wb); @@ -929,7 +929,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; wb->fact_wavebank = fwb; - *ppWaveBank = (IXACT3WaveBank*)wb; + *ppWaveBank = &wb->IXACT3WaveBank_iface; TRACE("Created streaming WaveBank: %p\n", wb);

1 0

Alistair Leslie-Hughes : xactengine3_7: Trace FAudio version being used.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: master Commit: 07f4a7aca878e5afc0b6f0bd53b4d365f0596b54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f4a7aca878e5afc0b6f0bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 7 16:04:49 2020 +1000 xactengine3_7: Trace FAudio version being used. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index cb8aed5f3a..9f1d905b5e 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1277,6 +1277,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) case DLL_PROCESS_ATTACH: instance = hinstDLL; DisableThreadLibraryCalls( hinstDLL ); + +#ifdef HAVE_FAUDIOLINKEDVERSION + TRACE("Using FAudio version %d\n", FAudioLinkedVersion() ); +#endif + break; } return TRUE;

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
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