wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Detlef Riekenberg : faultrep/tests: Fix a test failure when the user has limited access rights.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: c1f9129d7bfa8be0cf39aa267e3d0a2f4fe96568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f9129d7bfa8be0cf39aa267… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 2 06:01:59 2013 +0200 faultrep/tests: Fix a test failure when the user has limited access rights. --- dlls/faultrep/faultrep.c | 8 ++++---- dlls/faultrep/tests/faultrep.c | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index a05dabb..83f9027 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -53,14 +53,13 @@ static const WCHAR SZ_EXCLUSIONLIST_KEY[] = { * Wine doesn't use this data but stores it in the registry (in the same place * as Windows would) in case it will be useful in a future version * - * According to MSDN this function should succeed even if the user has no write - * access to HKLM. This probably means that there is no error checking. */ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) { WCHAR *bslash; DWORD value = 1; HKEY hkey; + LONG res; TRACE("(%s)\n", wine_dbgstr_w(lpAppFileName)); bslash = strrchrW(lpAppFileName, '\\'); @@ -72,13 +71,14 @@ BOOL WINAPI AddERExcludedApplicationW(LPCWSTR lpAppFileName) return FALSE; } - if (!RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey)) + res = RegCreateKeyW(HKEY_LOCAL_MACHINE, SZ_EXCLUSIONLIST_KEY, &hkey); + if (!res) { RegSetValueExW(hkey, lpAppFileName, 0, REG_DWORD, (LPBYTE)&value, sizeof(value)); RegCloseKey(hkey); } - return TRUE; + return !res; } /************************************************************************* diff --git a/dlls/faultrep/tests/faultrep.c b/dlls/faultrep/tests/faultrep.c index dd52928..948310d 100644 --- a/dlls/faultrep/tests/faultrep.c +++ b/dlls/faultrep/tests/faultrep.c @@ -43,7 +43,12 @@ static void test_AddERExcludedApplicationA(void) HKEY hexclude = 0; /* clean state */ - lres = RegOpenKeyExA(HKEY_LOCAL_MACHINE, regpath_root, 0, KEY_WRITE, &hroot); + lres = RegCreateKeyA(HKEY_LOCAL_MACHINE, regpath_root, &hroot); + if (lres == ERROR_ACCESS_DENIED) + { + skip("Not enough access rights\n"); + return; + } if (!lres) lres = RegOpenKeyA(hroot, regpath_exclude, &hexclude); @@ -61,8 +66,7 @@ static void test_AddERExcludedApplicationA(void) ok(!res, "got %d and 0x%x (expected FALSE)\n", res, GetLastError()); SetLastError(0xdeadbeef); - /* access rights to HKLM or existence of the path doesn't matter - this function succeeded */ + /* existence of the path doesn't matter this function succeeded */ res = AddERExcludedApplicationA("winetest_faultrep.exe"); ok(res, "got %d and 0x%x (expected TRUE)\n", res, GetLastError());

1 0

Rico Schüller : d3dx9/tests: Test all registers set by the constant table.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: b9b6b0585f5cfa72d4ed3974a1f5ab9122339111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b6b0585f5cfa72d4ed3974a… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:53:35 2013 +0200 d3dx9/tests: Test all registers set by the constant table. --- dlls/d3dx9_36/tests/shader.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 171d62c..7235fad 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -5912,6 +5912,25 @@ static UINT registerset_compare(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGIST return err; } +static UINT registerset_compare_all(IDirect3DDevice9 *device, BOOL is_vs, D3DXREGISTER_SET regset, + UINT start, UINT in_count, const DWORD *expected) +{ + D3DXREGISTER_SET regsets[] = {D3DXRS_BOOL, D3DXRS_INT4, D3DXRS_FLOAT4}; + UINT err = 0, i; + + for (i = 0; i < sizeof(regsets) / sizeof(*regsets); i++) + { + if (regset == regsets[i]) + err += registerset_compare(device, is_vs, regset, start, in_count, expected); + else + err += registerset_compare(device, is_vs, regsets[i], 0, 0, NULL); + + err += registerset_compare(device, !is_vs, regsets[i], 0, 0, NULL); + } + + return err; +} + static HRESULT registerset_apply(ID3DXConstantTable *ctable, IDirect3DDevice9 *device, D3DXHANDLE constant, UINT index, DWORD count, enum Type type) { @@ -6095,7 +6114,7 @@ static void test_registerset(void) ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i, test->in_count_min, hr, D3D_OK); - ret = registerset_compare(device, is_vs, registerset_data[k].regset, + ret = registerset_compare_all(device, is_vs, registerset_data[k].regset, registerset_data[k].start, test->out_count, test->out); ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_min); @@ -6107,7 +6126,7 @@ static void test_registerset(void) ok(hr == D3D_OK, "Set* \"%s\" index %u, count %u failed, got %x, expected %x\n", tablename, i, test->in_count_max, hr, D3D_OK); - ret = registerset_compare(device, is_vs, registerset_data[k].regset, + ret = registerset_compare_all(device, is_vs, registerset_data[k].regset, registerset_data[k].start, test->out_count, test->out); ok(ret == 0, "Get*ShaderConstant \"%s\" index %u, count %u failed\n", tablename, i, test->in_count_max); }

1 0

Rico Schüller : d3dx9: Use d3dx_parameter instead of D3DXHANDLE.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: fab44cbbfb32e9eb58f56c91ce96de84b8ec6bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab44cbbfb32e9eb58f56c91c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:48:25 2013 +0200 d3dx9: Use d3dx_parameter instead of D3DXHANDLE. --- dlls/d3dx9_36/effect.c | 435 ++++++++++++++++++------------------------------ 1 files changed, 163 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fab44cbbfb32e9eb58f56…

1 0

Rico Schüller : d3dx9: Warn when submitting invalid flags to ID3DXEffect::Begin().
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: d3b4dc92d9f5f37e659dbc75510461c3586000e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b4dc92d9f5f37e659dbc755… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:48:19 2013 +0200 d3dx9: Warn when submitting invalid flags to ID3DXEffect::Begin(). --- dlls/d3dx9_36/effect.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2c8eedf..44957db 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -177,6 +177,7 @@ struct ID3DXEffectImpl struct d3dx_technique *active_technique; struct d3dx_pass *active_pass; BOOL started; + DWORD flags; ID3DXBaseEffect *base_effect; }; @@ -3457,10 +3458,13 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = This->active_technique; - FIXME("iface %p, passes %p, flags %#x partial stub\n", This, passes, flags); + FIXME("iface %p, passes %p, flags %#x partial stub\n", iface, passes, flags); if (passes && technique) { + if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) + WARN("Invalid flags (%#x) specified.\n", flags); + if (This->manager || flags & D3DXFX_DONOTSAVESTATE) { TRACE("State capturing disabled.\n"); @@ -3472,6 +3476,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW *passes = technique->pass_count; This->started = TRUE; + This->flags = flags; return D3D_OK; } @@ -3534,6 +3539,18 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) FIXME("iface %p partial stub\n", iface); + if (!This->started) + return D3D_OK; + + if (This->manager || This->flags & D3DXFX_DONOTSAVESTATE) + { + TRACE("State restoring disabled.\n"); + } + else + { + FIXME("State restoring not supported, yet!\n"); + } + This->started = FALSE; return D3D_OK;

1 0

Rico Schüller : d3dx9: Track ID3DXEffect::Begin/End().
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 3ff2255a83494f4a1b3391d63083e7056d185106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ff2255a83494f4a1b3391d63… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 1 22:48:11 2013 +0200 d3dx9: Track ID3DXEffect::Begin/End(). --- dlls/d3dx9_36/effect.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0be0d1e..2c8eedf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -176,6 +176,7 @@ struct ID3DXEffectImpl struct ID3DXEffectPool *pool; struct d3dx_technique *active_technique; struct d3dx_pass *active_pass; + BOOL started; ID3DXBaseEffect *base_effect; }; @@ -3470,6 +3471,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW } *passes = technique->pass_count; + This->started = TRUE; return D3D_OK; } @@ -3526,13 +3528,15 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface) +static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + FIXME("iface %p partial stub\n", iface); - return E_NOTIMPL; + This->started = FALSE; + + return D3D_OK; } static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device)

1 0

Jeff Klein : wineoss.drv: Implement IMarshal for IAudioClient.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 1582458d705be88e1b5e83469d96a94d2c852a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1582458d705be88e1b5e83469… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Thu Aug 1 21:54:21 2013 -0400 wineoss.drv: Implement IMarshal for IAudioClient. --- dlls/wineoss.drv/mmdevdrv.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0db7bb7..bbc26b1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -101,6 +101,7 @@ struct ACImpl { LONG ref; IMMDevice *parent; + IUnknown *pUnkFTMarshal; WAVEFORMATEX *fmt; @@ -595,6 +596,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, { ACImpl *This; const OSSDevice *oss_dev; + HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -608,6 +610,13 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, + (IUnknown **)&This->pUnkFTMarshal); + if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + if(oss_dev->flow == eRender) This->fd = open(oss_dev->devnode, O_WRONLY | O_NONBLOCK, 0); else if(oss_dev->flow == eCapture) @@ -672,6 +681,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -679,6 +689,8 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, *ppv = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -705,6 +717,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) if(!ref){ IAudioClient_Stop(iface); IMMDevice_Release(This->parent); + IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); close(This->fd); @@ -1750,6 +1763,7 @@ static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioRenderClient_QueryInterface( IAudioRenderClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioRenderClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -1759,6 +1773,8 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioRenderClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -1911,6 +1927,7 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { static HRESULT WINAPI AudioCaptureClient_QueryInterface( IAudioCaptureClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -1920,6 +1937,8 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioCaptureClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK;

1 0

Jeff Klein : winecoreaudio.drv: Implement IMarshal for IAudioClient.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 9d79ca02d3cb2822dad7dc89c519ddf226fc3381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d79ca02d3cb2822dad7dc89c… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Thu Aug 1 21:54:20 2013 -0400 winecoreaudio.drv: Implement IMarshal for IAudioClient. --- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index d4250a7..ab3c2c9 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -120,6 +120,7 @@ struct ACImpl { LONG ref; IMMDevice *parent; + IUnknown *pUnkFTMarshal; WAVEFORMATEX *fmt; @@ -599,6 +600,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient ACImpl *This; AudioDeviceID adevid; EDataFlow dataflow; + HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -629,6 +631,13 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->lock = 0; + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, + (IUnknown **)&This->pUnkFTMarshal); + if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + This->parent = dev; IMMDevice_AddRef(This->parent); @@ -744,6 +753,7 @@ static void avail_update(ACImpl *This) static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -751,6 +761,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, *ppv = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -808,6 +821,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) HeapFree(GetProcessHeap(), 0, This->vols); CoTaskMemFree(This->fmt); IMMDevice_Release(This->parent); + IUnknown_Release(This->pUnkFTMarshal); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -1936,6 +1950,7 @@ static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioRenderClient_QueryInterface( IAudioRenderClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioRenderClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -1945,6 +1960,9 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioRenderClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -2153,6 +2171,7 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { static HRESULT WINAPI AudioCaptureClient_QueryInterface( IAudioCaptureClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -2162,6 +2181,9 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioCaptureClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK;

1 0

Jeff Klein : winealsa.drv: Implement IMarshal for IAudioClient.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 4e565b0ef0ed03accc9993ae7572da9ec38cdaca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e565b0ef0ed03accc9993ae7… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Thu Aug 1 21:54:19 2013 -0400 winealsa.drv: Implement IMarshal for IAudioClient. --- dlls/winealsa.drv/mmdevdrv.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ce4b2c8..ba70b02 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -100,6 +100,7 @@ struct ACImpl { snd_pcm_format_t alsa_format; IMMDevice *parent; + IUnknown *pUnkFTMarshal; EDataFlow dataflow; WAVEFORMATEX *fmt; @@ -772,6 +773,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient static int handle_underrun = 1; char alsa_name[256]; EDataFlow dataflow; + HRESULT hr; TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); @@ -798,6 +800,13 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_UNEXPECTED; } + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, + (IUnknown **)&This->pUnkFTMarshal); + if (FAILED(hr)) { + HeapFree(GetProcessHeap(), 0, This); + return hr; + } + This->dataflow = dataflow; if(handle_underrun && ((lconf = make_handle_underrun_config(alsa_name)))){ err = snd_pcm_open_lconf(&This->pcm_handle, alsa_name, stream, SND_PCM_NONBLOCK, lconf); @@ -848,6 +857,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -855,6 +865,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient *iface, *ppv = NULL; if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -881,6 +894,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) if(!ref){ IAudioClient_Stop(iface); IMMDevice_Release(This->parent); + IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); snd_pcm_drop(This->pcm_handle); @@ -2418,6 +2432,7 @@ static const IAudioClientVtbl AudioClient_Vtbl = static HRESULT WINAPI AudioRenderClient_QueryInterface( IAudioRenderClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioRenderClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -2427,6 +2442,9 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioRenderClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -2582,6 +2600,7 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { static HRESULT WINAPI AudioCaptureClient_QueryInterface( IAudioCaptureClient *iface, REFIID riid, void **ppv) { + ACImpl *This = impl_from_IAudioCaptureClient(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); if(!ppv) @@ -2591,6 +2610,9 @@ static HRESULT WINAPI AudioCaptureClient_QueryInterface( if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioCaptureClient)) *ppv = iface; + else if(IsEqualIID(riid, &IID_IMarshal)) + return IUnknown_QueryInterface(This->pUnkFTMarshal, riid, ppv); + if(*ppv){ IUnknown_AddRef((IUnknown*)*ppv); return S_OK;

1 0

Jeff Klein : mmdevapi/tests: Test in-proc marshal of IAudioClient.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 0f4bc3b945177dd51ec05faa25f730ace346d719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4bc3b945177dd51ec05faa2… Author: Jeff Klein <jeffrey.a.klein(a)gmail.com> Date: Thu Aug 1 21:54:18 2013 -0400 mmdevapi/tests: Test in-proc marshal of IAudioClient. --- dlls/mmdevapi/tests/capture.c | 65 +++++++++++++++++++++++++++++++++++++++ dlls/mmdevapi/tests/render.c | 68 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 1873735..e84fb26 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -39,6 +39,7 @@ #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static IMMDevice *dev = NULL; +static const LARGE_INTEGER ullZero; static void test_uninitialized(IAudioClient *ac) { @@ -1008,6 +1009,69 @@ static void test_volume_dependence(void) IAudioClient_Release(ac); } +static void test_marshal(void) +{ + IStream *pStream; + IAudioClient *ac, *acDest; + IAudioCaptureClient *cc, *ccDest; + WAVEFORMATEX *pwfx; + HRESULT hr; + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, + 0, pwfx, NULL); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + CoTaskMemFree(pwfx); + + hr = IAudioClient_GetService(ac, &IID_IAudioCaptureClient, (void**)&cc); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr != S_OK) { + IAudioClient_Release(ac); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08x\n", hr); + + /* marshal IAudioClient */ + + hr = CoMarshalInterface(pStream, &IID_IAudioClient, (IUnknown*)ac, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08x\n", hr); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IAudioClient, (void **)&acDest); + ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08x\n", hr); + if (hr == S_OK) + IAudioClient_Release(acDest); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* marshal IAudioCaptureClient */ + + hr = CoMarshalInterface(pStream, &IID_IAudioCaptureClient, (IUnknown*)cc, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "CoMarshalInterface IAudioCaptureClient failed 0x%08x\n", hr); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IAudioCaptureClient, (void **)&ccDest); + ok(hr == S_OK, "CoUnmarshalInterface IAudioCaptureClient failed 0x%08x\n", hr); + if (hr == S_OK) + IAudioCaptureClient_Release(ccDest); + + IStream_Release(pStream); + + IAudioClient_Release(ac); + IAudioCaptureClient_Release(cc); + +} + START_TEST(capture) { HRESULT hr; @@ -1037,6 +1101,7 @@ START_TEST(capture) test_channelvolume(); test_simplevolume(); test_volume_dependence(); + test_marshal(); IMMDevice_Release(dev); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index beebfb6..0ee7c8c 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -57,6 +57,8 @@ static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ +static const LARGE_INTEGER ullZero; + static inline const char *dbgstr_guid( const GUID *id ) { static char ret[256]; @@ -2159,6 +2161,71 @@ static void test_worst_case(void) IAudioRenderClient_Release(arc); } +static void test_marshal(void) +{ + IStream *pStream; + IAudioClient *ac, *acDest; + IAudioRenderClient *rc, *rcDest; + WAVEFORMATEX *pwfx; + HRESULT hr; + + /* IAudioRenderClient */ + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, + 0, pwfx, NULL); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + CoTaskMemFree(pwfx); + + hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&rc); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + if(hr != S_OK) { + IAudioClient_Release(ac); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed 0x%08x\n", hr); + + /* marshal IAudioClient */ + + hr = CoMarshalInterface(pStream, &IID_IAudioClient, (IUnknown*)ac, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "CoMarshalInterface IAudioClient failed 0x%08x\n", hr); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IAudioClient, (void **)&acDest); + ok(hr == S_OK, "CoUnmarshalInterface IAudioClient failed 0x%08x\n", hr); + if (hr == S_OK) + IAudioClient_Release(acDest); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + /* marshal IAudioRenderClient */ + + hr = CoMarshalInterface(pStream, &IID_IAudioRenderClient, (IUnknown*)rc, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hr == S_OK, "CoMarshalInterface IAudioRenderClient failed 0x%08x\n", hr); + + IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(pStream, &IID_IAudioRenderClient, (void **)&rcDest); + ok(hr == S_OK, "CoUnmarshalInterface IAudioRenderClient failed 0x%08x\n", hr); + if (hr == S_OK) + IAudioRenderClient_Release(rcDest); + + + IStream_Release(pStream); + + IAudioClient_Release(ac); + IAudioRenderClient_Release(rc); + +} + START_TEST(render) { HRESULT hr; @@ -2186,6 +2253,7 @@ START_TEST(render) test_formats(AUDCLNT_SHAREMODE_EXCLUSIVE); test_formats(AUDCLNT_SHAREMODE_SHARED); test_references(); + test_marshal(); trace("Output to a MS-DOS console is particularly slow and disturbs timing.\n"); trace("Please redirect output to a file.\n"); test_event();

1 0

Nikolay Sivov : oledb32: Use heap helpers for allocation.
by Alexandre Julliard 02 Aug '13

02 Aug '13

Module: wine Branch: master Commit: 75bde26bea637f5bb08a7447dbcf360b4b808c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bde26bea637f5bb08a7447d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 2 09:53:58 2013 +0400 oledb32: Use heap helpers for allocation. --- dlls/oledb32/convert.c | 6 ++---- dlls/oledb32/datainit.c | 12 ++++-------- dlls/oledb32/errorinfo.c | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 8875057..fba9025 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -103,9 +103,7 @@ static ULONG WINAPI convert_Release(IDataConvert* iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -1548,7 +1546,7 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDataConvert_iface.lpVtbl = &convert_vtbl; diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 58bd812..9fe3c4f 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -173,9 +173,7 @@ static ULONG WINAPI dbinit_Release(IDBInitialize *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -215,7 +213,7 @@ static HRESULT create_db_init(void **obj) *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; @@ -266,9 +264,7 @@ static ULONG WINAPI datainit_Release(IDataInitialize *iface) ref = InterlockedDecrement(&This->ref); if(ref == 0) - { - HeapFree(GetProcessHeap(), 0, This); - } + heap_free(This); return ref; } @@ -818,7 +814,7 @@ HRESULT create_data_init(IUnknown *outer, void **obj) *obj = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IDataInitialize_iface.lpVtbl = &datainit_vtbl; diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 4e65ce5..eef2b37 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -117,7 +117,7 @@ static ULONG WINAPI IErrorInfoImpl_Release(IErrorInfo* iface) SysFreeString(This->source); SysFreeString(This->description); SysFreeString(This->help_file); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; } @@ -340,7 +340,7 @@ HRESULT create_error_info(IUnknown *outer, void **obj) if(outer) return CLASS_E_NOAGGREGATION; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if(!This) return E_OUTOFMEMORY; This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl;

1 0

← Newer
1
...
40
41
42
43
44
45
46
47
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 2013