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

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3Engine::CreateStreamingWaveBank.
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 996e706ad346dc7fd61dc9856764167dc1592712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=996e706ad346dc7fd61dc985… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:44:31 2020 +0200 xactengine3_7: Implement IXACT3Engine::CreateStreamingWaveBank. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> 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 | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 43d2833cd7..dc4d9c01ac 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -690,8 +690,47 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa IXACT3WaveBank **ppWaveBank) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p)->(%p, %p): stub!\n", This, pParms, ppWaveBank); - return E_NOTIMPL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + XACT3WaveBankImpl *wb; + FACTWaveBank *fwb; + UINT ret; + + TRACE("(%p)->(%p, %p)\n", This, pParms, ppWaveBank); + + /* We have to wrap the file to fix up the callbacks! */ + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = pParms->file; + fakeParms.file = fake; + fakeParms.flags = pParms->flags; + fakeParms.offset = pParms->offset; + fakeParms.packetSize = pParms->packetSize; + + ret = FACTAudioEngine_CreateStreamingWaveBank(This->fact_engine, &fakeParms, + &fwb); + if(ret != 0) + { + ERR("Failed to CreateWaveBank: %d\n", ret); + return E_FAIL; + } + + wb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wb)); + if (!wb) + { + FACTWaveBank_Destroy(fwb); + ERR("Failed to allocate XACT3WaveBankImpl!"); + return E_OUTOFMEMORY; + } + + wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; + wb->fact_wavebank = fwb; + *ppWaveBank = (IXACT3WaveBank*)wb; + + TRACE("Created streaming WaveBank: %p\n", wb); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface,

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3WaveBank Interface.
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: da2efd545b276b438e4318476a91549a843cb809 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da2efd545b276b438e431847… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:36:55 2020 +0200 xactengine3_7: Implement IXACT3WaveBank Interface. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> 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 | 137 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 52bf9e5210..43d2833cd7 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -318,6 +318,112 @@ static const IXACT3SoundBankVtbl XACT3SoundBank_Vtbl = IXACT3SoundBankImpl_GetState }; +typedef struct _XACT3WaveBankImpl { + IXACT3WaveBank IXACT3WaveBank_iface; + + FACTWaveBank *fact_wavebank; +} XACT3WaveBankImpl; + +static inline XACT3WaveBankImpl *impl_from_IXACT3WaveBank(IXACT3WaveBank *iface) +{ + return CONTAINING_RECORD(iface, XACT3WaveBankImpl, IXACT3WaveBank_iface); +} + +static HRESULT WINAPI IXACT3WaveBankImpl_Destroy(IXACT3WaveBank *iface) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = FACTWaveBank_Destroy(This->fact_wavebank); + HeapFree(GetProcessHeap(), 0, This); + return hr; +} + +static HRESULT WINAPI IXACT3WaveBankImpl_GetNumWaves(IXACT3WaveBank *iface, + XACTINDEX *pnNumWaves) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + + TRACE("(%p)->(%p)\n", This, pnNumWaves); + + return FACTWaveBank_GetNumWaves(This->fact_wavebank, pnNumWaves); +} + +static XACTINDEX WINAPI IXACT3WaveBankImpl_GetWaveIndex(IXACT3WaveBank *iface, + PCSTR szFriendlyName) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + + TRACE("(%p)->(%s)\n", This, szFriendlyName); + + return FACTWaveBank_GetWaveIndex(This->fact_wavebank, szFriendlyName); +} + +static HRESULT WINAPI IXACT3WaveBankImpl_GetWaveProperties(IXACT3WaveBank *iface, + XACTINDEX nWaveIndex, XACT_WAVE_PROPERTIES *pWaveProperties) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + + TRACE("(%p)->(%u, %p)\n", This, nWaveIndex, pWaveProperties); + + return FACTWaveBank_GetWaveProperties(This->fact_wavebank, nWaveIndex, + (FACTWaveProperties*) pWaveProperties); +} + +static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, + XACTINDEX nWaveIndex, DWORD dwFlags, DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, IXACT3Wave** ppWave) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + FIXME("(%p)->(0x%x, %u, 0x%x, %u, %p): stub!\n", This, nWaveIndex, dwFlags, + dwPlayOffset, nLoopCount, ppWave); + return E_NOTIMPL; +} + +static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, + XACTINDEX nWaveIndex, DWORD dwFlags, DWORD dwPlayOffset, + XACTLOOPCOUNT nLoopCount, IXACT3Wave** ppWave) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + FIXME("(%p)->(0x%x, %u, 0x%x, %u, %p): stub!\n", This, nWaveIndex, dwFlags, dwPlayOffset, + nLoopCount, ppWave); + return E_NOTIMPL; +} + +static HRESULT WINAPI IXACT3WaveBankImpl_Stop(IXACT3WaveBank *iface, + XACTINDEX nWaveIndex, DWORD dwFlags) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + + TRACE("(%p)->(%u, %u)\n", This, nWaveIndex, dwFlags); + + return FACTWaveBank_Stop(This->fact_wavebank, nWaveIndex, dwFlags); +} + +static HRESULT WINAPI IXACT3WaveBankImpl_GetState(IXACT3WaveBank *iface, + DWORD *pdwState) +{ + XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); + + TRACE("(%p)->(%p)\n", This, pdwState); + + return FACTWaveBank_GetState(This->fact_wavebank, pdwState); +} + +static const IXACT3WaveBankVtbl XACT3WaveBank_Vtbl = +{ + IXACT3WaveBankImpl_Destroy, + IXACT3WaveBankImpl_GetNumWaves, + IXACT3WaveBankImpl_GetWaveIndex, + IXACT3WaveBankImpl_GetWaveProperties, + IXACT3WaveBankImpl_Prepare, + IXACT3WaveBankImpl_Play, + IXACT3WaveBankImpl_Stop, + IXACT3WaveBankImpl_GetState +}; + typedef struct _XACT3EngineImpl { IXACT3Engine IXACT3Engine_iface; @@ -547,9 +653,36 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac DWORD dwAllocAttributes, IXACT3WaveBank **ppWaveBank) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p)->(%p, %u, 0x%x, 0x%x, %p): stub!\n", This, pvBuffer, dwSize, dwFlags, + XACT3WaveBankImpl *wb; + FACTWaveBank *fwb; + UINT ret; + + TRACE("(%p)->(%p, %u, 0x%x, 0x%x, %p)\n", This, pvBuffer, dwSize, dwFlags, dwAllocAttributes, ppWaveBank); - return E_NOTIMPL; + + ret = FACTAudioEngine_CreateInMemoryWaveBank(This->fact_engine, pvBuffer, + dwSize, dwFlags, dwAllocAttributes, &fwb); + if(ret != 0) + { + ERR("Failed to CreateWaveBank: %d\n", ret); + return E_FAIL; + } + + wb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wb)); + if (!wb) + { + FACTWaveBank_Destroy(fwb); + ERR("Failed to allocate XACT3WaveBankImpl!"); + return E_OUTOFMEMORY; + } + + wb->IXACT3WaveBank_iface.lpVtbl = &XACT3WaveBank_Vtbl; + wb->fact_wavebank = fwb; + *ppWaveBank = (IXACT3WaveBank*)wb; + + TRACE("Created in-memory WaveBank: %p\n", wb); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *iface,

1 0

Nikolay Sivov : combase: Move CoSetProxyBlanket().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 28f325fd16369a6bc092b71ac6509c244cea4670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28f325fd16369a6bc092b71a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 09:13:06 2020 +0300 combase: Move CoSetProxyBlanket(). 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 | 24 ++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 45 --------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 26 insertions(+), 47 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index c67cf2fbce..b87c6f19ba 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -479,3 +479,27 @@ HRESULT WINAPI CoQueryProxyBlanket(IUnknown *proxy, DWORD *authn_service, if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); return hr; } + +/****************************************************************************** + * CoSetProxyBlanket (combase.@) + */ +HRESULT WINAPI CoSetProxyBlanket(IUnknown *proxy, DWORD authn_service, DWORD authz_service, + OLECHAR *servername, DWORD authn_level, DWORD imp_level, void *auth_info, DWORD capabilities) +{ + IClientSecurity *client_security; + HRESULT hr; + + TRACE("%p, %u, %u, %p, %u, %u, %p, %#x.\n", proxy, authn_service, authz_service, servername, + authn_level, imp_level, auth_info, capabilities); + + hr = IUnknown_QueryInterface(proxy, &IID_IClientSecurity, (void **)&client_security); + if (SUCCEEDED(hr)) + { + hr = IClientSecurity_SetBlanket(client_security, proxy, authn_service, authz_service, servername, authn_level, + imp_level, auth_info, capabilities); + IClientSecurity_Release(client_security); + } + + if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index ed6767263d..88d3adeec9 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -155,7 +155,7 @@ @ stdcall CoRevokeMallocSpy() @ stub CoSetCancelObject @ stub CoSetErrorInfo -@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) ole32.CoSetProxyBlanket +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) @ stdcall CoSuspendClassObjects() ole32.CoSuspendClassObjects @ stdcall CoSwitchCallContext(ptr ptr) ole32.CoSwitchCallContext @ stdcall CoTaskMemAlloc(long) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b96edf99bf..aeb7c4d29c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4192,51 +4192,6 @@ HRESULT WINAPI CoAllowSetForegroundWindow(IUnknown *pUnk, void *pvReserved) return S_OK; } -/*********************************************************************** - * CoSetProxyBlanket [OLE32.@] - * - * Sets the security settings for a proxy. - * - * PARAMS - * pProxy [I] Pointer to the proxy object. - * AuthnSvc [I] The type of authentication service. - * AuthzSvc [I] The type of authorization service. - * pServerPrincName [I] The server prinicple name. - * AuthnLevel [I] The authentication level. - * ImpLevel [I] The impersonation level. - * pAuthInfo [I] Information specific to the authorization/authentication service. - * Capabilities [I] Flags affecting the security behaviour. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoQueryProxyBlanket, CoCopyProxy. - */ -HRESULT WINAPI CoSetProxyBlanket(IUnknown *pProxy, DWORD AuthnSvc, - DWORD AuthzSvc, OLECHAR *pServerPrincName, DWORD AuthnLevel, - DWORD ImpLevel, void *pAuthInfo, DWORD Capabilities) -{ - IClientSecurity *pCliSec; - HRESULT hr; - - TRACE("%p\n", pProxy); - - hr = IUnknown_QueryInterface(pProxy, &IID_IClientSecurity, (void **)&pCliSec); - if (SUCCEEDED(hr)) - { - hr = IClientSecurity_SetBlanket(pCliSec, pProxy, AuthnSvc, - AuthzSvc, pServerPrincName, - AuthnLevel, ImpLevel, pAuthInfo, - Capabilities); - IClientSecurity_Release(pCliSec); - } - - if (FAILED(hr)) ERR("-- failed with 0x%08x\n", hr); - return hr; -} - /*********************************************************************** * CoCopyProxy [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c737b2e386..54725e406a 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -79,7 +79,7 @@ @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeInitializeSpy(int64) @ stdcall CoRevokeMallocSpy() combase.CoRevokeMallocSpy -@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) +@ stdcall CoSetProxyBlanket(ptr long long ptr long long ptr long) combase.CoSetProxyBlanket @ stdcall CoSetState(ptr) @ stdcall CoSuspendClassObjects() @ stdcall CoSwitchCallContext(ptr ptr)

1 0

Nikolay Sivov : combase: Move CoCreateGuid().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 7e39b0056d86dfcba9392f320ae3ae0fe05289a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e39b0056d86dfcba9392f32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 09:13:04 2020 +0300 combase: Move CoCreateGuid(). 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/Makefile.in | 2 +- dlls/combase/combase.c | 14 ++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 26 -------------------------- dlls/ole32/ole32.spec | 2 +- 5 files changed, 17 insertions(+), 29 deletions(-) diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in index 87bb149b59..71537f699b 100644 --- a/dlls/combase/Makefile.in +++ b/dlls/combase/Makefile.in @@ -1,6 +1,6 @@ MODULE = combase.dll IMPORTLIB = combase -IMPORTS = advapi32 ole32 user32 gdi32 uuid +IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4 DELAYIMPORTS = oleaut32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index bf1228a1f2..9bf2252fb8 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -440,3 +440,17 @@ HRESULT WINAPI CoFileTimeNow(FILETIME *filetime) GetSystemTimeAsFileTime(filetime); return S_OK; } + +/****************************************************************************** + * CoCreateGuid (combase.@) + */ +HRESULT WINAPI CoCreateGuid(GUID *guid) +{ + RPC_STATUS status; + + if (!guid) return E_INVALIDARG; + + status = UuidCreate(guid); + if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; + return HRESULT_FROM_WIN32(status); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9940229c46..ddfe5c5ca2 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -78,7 +78,7 @@ @ stdcall CoCopyProxy(ptr ptr) ole32.CoCopyProxy @ stub CoCreateErrorInfo @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) ole32.CoCreateFreeThreadedMarshaler -@ stdcall CoCreateGuid(ptr) ole32.CoCreateGuid +@ stdcall CoCreateGuid(ptr) @ stdcall CoCreateInstance(ptr ptr long ptr ptr) ole32.CoCreateInstance @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) ole32.CoCreateInstanceEx @ stub CoCreateInstanceFromApp diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 29c8ca6e13..f96d69c198 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,32 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; } -/****************************************************************************** - * CoCreateGuid [OLE32.@] - * - * Simply forwards to UuidCreate in RPCRT4. - * - * PARAMS - * pguid [O] Points to the GUID to initialize. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * UuidCreate - */ -HRESULT WINAPI CoCreateGuid(GUID *pguid) -{ - DWORD status; - - if(!pguid) return E_INVALIDARG; - - status = UuidCreate(pguid); - if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) return S_OK; - return HRESULT_FROM_WIN32( status ); -} - static inline BOOL is_valid_hex(WCHAR c) { if (!(((c >= '0') && (c <= '9')) || diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 87c950cf43..0713a989ee 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -11,7 +11,7 @@ @ stdcall CoBuildVersion() @ stdcall CoCopyProxy(ptr ptr) @ stdcall CoCreateFreeThreadedMarshaler(ptr ptr) -@ stdcall CoCreateGuid(ptr) +@ stdcall CoCreateGuid(ptr) combase.CoCreateGuid @ stdcall CoCreateInstance(ptr ptr long ptr ptr) @ stdcall CoCreateInstanceEx(ptr ptr long ptr long ptr) @ stdcall CoDecrementMTAUsage(ptr)

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3SoundBank::Play function.
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 127ef80f0f9370a148357b7c1f001c3477a52264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=127ef80f0f9370a148357b7c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:27:46 2020 +0200 xactengine3_7: Implement IXACT3SoundBank::Play function. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> 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 | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 267863f930..2c7eff08fc 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -269,9 +269,40 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, IXACT3Cue** ppCue) { XACT3SoundBankImpl *This = impl_from_IXACT3SoundBank(iface); - FIXME("(%p)->(%u, 0x%x, %u, %p): stub!\n", This, nCueIndex, dwFlags, timeOffset, + XACT3CueImpl *cue; + FACTCue *fcue; + HRESULT hr; + + TRACE("(%p)->(%u, 0x%x, %u, %p)\n", This, nCueIndex, dwFlags, timeOffset, ppCue); - return E_NOTIMPL; + + /* If the application doesn't want a handle, don't generate one at all. + * Let the engine handle that memory instead. + * -flibit + */ + if (ppCue == NULL){ + hr = FACTSoundBank_Play(This->fact_soundbank, nCueIndex, dwFlags, + timeOffset, NULL); + }else{ + hr = FACTSoundBank_Play(This->fact_soundbank, nCueIndex, dwFlags, + timeOffset, &fcue); + if(FAILED(hr)) + return hr; + + cue = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cue)); + if (!cue) + { + FACTCue_Destroy(fcue); + ERR("Failed to allocate XACT3CueImpl!"); + return E_OUTOFMEMORY; + } + + cue->IXACT3Cue_iface.lpVtbl = &XACT3Cue_Vtbl; + cue->fact_cue = fcue; + *ppCue = (IXACT3Cue*)&cue->IXACT3Cue_iface; + } + + return hr; } static HRESULT WINAPI IXACT3SoundBankImpl_Stop(IXACT3SoundBank *iface,

1 0

Mikołaj Zalewski : ntdll: Return from Thumb to ARM mode after assembling raise_func_trampoline_thumb.
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 9014dae8fb7b78cdd8a200278a1e2a5caccd533a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9014dae8fb7b78cdd8a20027… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Aug 2 20:14:34 2020 +0200 ntdll: Return from Thumb to ARM mode after assembling raise_func_trampoline_thumb. Without it, Raspbian gcc thinks the next function (raise_func_trampoline_arm) is in Thumb and will create its own trampoline to to execute it as Thumb (bad). Signed-off-by: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 17744822f4..73711a5235 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -524,7 +524,8 @@ extern void raise_func_trampoline_thumb( EXCEPTION_RECORD *rec, CONTEXT *context __ASM_GLOBAL_FUNC( raise_func_trampoline_thumb, ".thumb\n\t" "bx r2\n\t" - "bkpt") + "bkpt\n\t" + ".arm") extern void raise_func_trampoline_arm( EXCEPTION_RECORD *rec, CONTEXT *context, void *func ); __ASM_GLOBAL_FUNC( raise_func_trampoline_arm,

1 0

Vijay Kiran Kamuju : xactengine3_7: Implement IXACT3WaveBank::Play function.
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 00c5e09fafa51fe536b300eb02d17a7b9baded24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c5e09fafa51fe536b300eb… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Jul 18 22:54:07 2020 +0200 xactengine3_7: Implement IXACT3WaveBank::Play function. Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> 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 | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 2c7eff08fc..ce9059221a 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -559,9 +559,40 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, XACTLOOPCOUNT nLoopCount, IXACT3Wave** ppWave) { XACT3WaveBankImpl *This = impl_from_IXACT3WaveBank(iface); - FIXME("(%p)->(0x%x, %u, 0x%x, %u, %p): stub!\n", This, nWaveIndex, dwFlags, dwPlayOffset, + XACT3WaveImpl *wave; + FACTWave *fwave; + HRESULT hr; + + TRACE("(%p)->(0x%x, %u, 0x%x, %u, %p)\n", This, nWaveIndex, dwFlags, dwPlayOffset, nLoopCount, ppWave); - return E_NOTIMPL; + + /* If the application doesn't want a handle, don't generate one at all. + * Let the engine handle that memory instead. + * -flibit + */ + if (ppWave == NULL){ + hr = FACTWaveBank_Play(This->fact_wavebank, nWaveIndex, dwFlags, + dwPlayOffset, nLoopCount, NULL); + }else{ + hr = FACTWaveBank_Play(This->fact_wavebank, nWaveIndex, dwFlags, + dwPlayOffset, nLoopCount, &fwave); + if(FAILED(hr)) + return hr; + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = (IXACT3Wave*)wave; + } + + return hr; } static HRESULT WINAPI IXACT3WaveBankImpl_Stop(IXACT3WaveBank *iface,

1 0

Nikolay Sivov : combase: Move CoImpersonateClient().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 12a9547e4f5a50248f112aadd50e1bcdeb9dff7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a9547e4f5a50248f112aad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 09:13:09 2020 +0300 combase: Move CoImpersonateClient(). 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 | 38 -------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 22 insertions(+), 40 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 5af6b3d9ed..e63cce00dd 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -547,3 +547,23 @@ HRESULT WINAPI CoQueryClientBlanket(DWORD *authn_service, DWORD *authz_service, return hr; } + +/*********************************************************************** + * CoImpersonateClient (combase.@) + */ +HRESULT WINAPI CoImpersonateClient(void) +{ + IServerSecurity *server_security; + HRESULT hr; + + TRACE("\n"); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&server_security); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_ImpersonateClient(server_security); + IServerSecurity_Release(server_security); + } + + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 6d13ea6038..3122588d7e 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -120,7 +120,7 @@ @ stub CoGetStdMarshalEx @ stub CoGetSystemSecurityPermissions @ stdcall CoGetTreatAsClass(ptr ptr) ole32.CoGetTreatAsClass -@ stdcall CoImpersonateClient() ole32.CoImpersonateClient +@ stdcall CoImpersonateClient() @ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c4daeb3b3d..507cc451e2 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4250,44 +4250,6 @@ HRESULT WINAPI CoSwitchCallContext(IUnknown *pObject, IUnknown **ppOldObject) return S_OK; } -/*********************************************************************** - * CoImpersonateClient [OLE32.@] - * - * Impersonates the client of the currently executing server call in the - * current thread. - * - * PARAMS - * None. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * NOTES - * If this function fails then the current thread will not be impersonating - * the client and all actions will take place on behalf of the server. - * Therefore, it is important to check the return value from this function. - * - * SEE ALSO - * CoRevertToSelf, CoQueryClientBlanket, CoGetCallContext. - */ -HRESULT WINAPI CoImpersonateClient(void) -{ - IServerSecurity *pSrvSec; - HRESULT hr; - - TRACE("\n"); - - hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); - if (SUCCEEDED(hr)) - { - hr = IServerSecurity_ImpersonateClient(pSrvSec); - IServerSecurity_Release(pSrvSec); - } - - return hr; -} - /*********************************************************************** * CoRevertToSelf [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e08305810f..049dd0ad61 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -47,7 +47,7 @@ @ stdcall CoGetState(ptr) @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) -@ stdcall CoImpersonateClient() +@ stdcall CoImpersonateClient() combase.CoImpersonateClient @ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long)

1 0

Nikolay Sivov : combase: Move CoQueryClientBlanket().
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 6d9056698fd79860389f55e0067994667d9198bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d9056698fd79860389f55e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 09:13:08 2020 +0300 combase: Move CoQueryClientBlanket(). 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 | 23 ++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 50 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 25 insertions(+), 52 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 595a7569b0..5af6b3d9ed 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -524,3 +524,26 @@ HRESULT WINAPI CoCopyProxy(IUnknown *proxy, IUnknown **proxy_copy) if (FAILED(hr)) ERR("-- failed with %#x.\n", hr); return hr; } + +/*********************************************************************** + * CoQueryClientBlanket (combase.@) + */ +HRESULT WINAPI CoQueryClientBlanket(DWORD *authn_service, DWORD *authz_service, OLECHAR **servername, + DWORD *authn_level, DWORD *imp_level, RPC_AUTHZ_HANDLE *privs, DWORD *capabilities) +{ + IServerSecurity *server_security; + HRESULT hr; + + TRACE("%p, %p, %p, %p, %p, %p, %p.\n", authn_service, authz_service, servername, authn_level, imp_level, + privs, capabilities); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&server_security); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_QueryBlanket(server_security, authn_service, authz_service, servername, authn_level, + imp_level, privs, capabilities); + IServerSecurity_Release(server_security); + } + + return hr; +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 669b42486f..6d13ea6038 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -134,7 +134,7 @@ @ stub CoPopServiceDomain @ stub CoPushServiceDomain @ stub CoQueryAuthenticationServices -@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) ole32.CoQueryClientBlanket +@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub CoReactivateObject @ stub CoRegisterActivationFilter diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b1fedf17c8..c4daeb3b3d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4250,56 +4250,6 @@ HRESULT WINAPI CoSwitchCallContext(IUnknown *pObject, IUnknown **ppOldObject) return S_OK; } -/*********************************************************************** - * CoQueryClientBlanket [OLE32.@] - * - * Retrieves the authentication information about the client of the currently - * executing server call in the current thread. - * - * PARAMS - * pAuthnSvc [O] Optional. The type of authentication service. - * pAuthzSvc [O] Optional. The type of authorization service. - * pServerPrincName [O] Optional. The server prinicple name. - * pAuthnLevel [O] Optional. The authentication level. - * pImpLevel [O] Optional. The impersonation level. - * pPrivs [O] Optional. Information about the privileges of the client. - * pCapabilities [IO] Optional. Flags affecting the security behaviour. - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoImpersonateClient, CoRevertToSelf, CoGetCallContext. - */ -HRESULT WINAPI CoQueryClientBlanket( - DWORD *pAuthnSvc, - DWORD *pAuthzSvc, - OLECHAR **pServerPrincName, - DWORD *pAuthnLevel, - DWORD *pImpLevel, - RPC_AUTHZ_HANDLE *pPrivs, - DWORD *pCapabilities) -{ - IServerSecurity *pSrvSec; - HRESULT hr; - - TRACE("(%p, %p, %p, %p, %p, %p, %p)\n", - pAuthnSvc, pAuthzSvc, pServerPrincName, pAuthnLevel, pImpLevel, - pPrivs, pCapabilities); - - hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); - if (SUCCEEDED(hr)) - { - hr = IServerSecurity_QueryBlanket( - pSrvSec, pAuthnSvc, pAuthzSvc, pServerPrincName, pAuthnLevel, - pImpLevel, pPrivs, pCapabilities); - IServerSecurity_Release(pSrvSec); - } - - return hr; -} - /*********************************************************************** * CoImpersonateClient [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index c64392d523..e08305810f 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -61,7 +61,7 @@ @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @ stub CoQueryAuthenticationServices -@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryClientBlanket @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) combase.CoQueryProxyBlanket @ stub CoQueryReleaseObject @ stdcall CoRegisterChannelHook(ptr ptr)

1 0

Daniel Lehman : ntdll/tests: Handle 32 cores.
by Alexandre Julliard Aug. 6, 2020

Aug. 6, 2020

Module: wine Branch: master Commit: 93fa2e0ab82a9506fb71bf0f536fa521f58ea88c URL: https://source.winehq.org/git/wine.git/?a=commit;h=93fa2e0ab82a9506fb71bf0f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Aug 5 22:09:46 2020 -0700 ntdll/tests: Handle 32 cores. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a127c87781..057b855914 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -51,6 +51,12 @@ static BOOL is_wow64; */ static DWORD one_before_last_pid = 0; +static inline DWORD_PTR get_affinity_mask(DWORD num_cpus) +{ + if (num_cpus >= sizeof(DWORD_PTR) * 8) return ~(DWORD_PTR)0; + return ((DWORD_PTR)1 << num_cpus) - 1; +} + #define NTDLL_GET_PROC(func) do { \ p ## func = (void*)GetProcAddress(hntdll, #func); \ if(!p ## func) { \ @@ -2251,8 +2257,8 @@ static void test_affinity(void) status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); proc_affinity = pbi.AffinityMask; - ok( proc_affinity == (1 << si.dwNumberOfProcessors) - 1, "Unexpected process affinity\n" ); - proc_affinity = 1 << si.dwNumberOfProcessors; + ok( proc_affinity == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected process affinity\n" ); + proc_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -2264,8 +2270,8 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); - thread_affinity = 1 << si.dwNumberOfProcessors; + ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); + thread_affinity = (DWORD_PTR)1 << si.dwNumberOfProcessors; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -2319,7 +2325,7 @@ static void test_affinity(void) { status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "unexpected affinity %#lx\n", tbi.AffinityMask ); + ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "unexpected affinity %#lx\n", tbi.AffinityMask ); } else skip("Cannot test thread affinity mask for 'all processors' flag\n"); @@ -2341,13 +2347,13 @@ static void test_affinity(void) ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); - proc_affinity = (1 << si.dwNumberOfProcessors) - 1; + proc_affinity = get_affinity_mask( si.dwNumberOfProcessors ); status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); /* Resetting the process affinity also resets the thread affinity */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, + ok( tbi.AffinityMask == get_affinity_mask( si.dwNumberOfProcessors ), "Unexpected thread affinity\n" ); } @@ -2445,13 +2451,13 @@ static void test_NtGetCurrentProcessorNumber(void) ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); /* allow the test to run on all processors */ - new_mask = (1 << si.dwNumberOfProcessors) - 1; + new_mask = get_affinity_mask( si.dwNumberOfProcessors ); status = pNtSetInformationProcess(GetCurrentProcess(), ProcessAffinityMask, &new_mask, sizeof(new_mask)); ok(status == STATUS_SUCCESS, "got 0x%x (expected STATUS_SUCCESS)\n", status); for (i = 0; i < si.dwNumberOfProcessors; i++) { - new_mask = 1 << i; + new_mask = (DWORD_PTR)1 << i; status = pNtSetInformationThread(GetCurrentThread(), ThreadAffinityMask, &new_mask, sizeof(new_mask)); ok(status == STATUS_SUCCESS, "%d: got 0x%x (expected STATUS_SUCCESS)\n", i, status);

1 0