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

Nikolay Sivov : oledb32: Added IConnectionPoint stub for IRowPositionChange notification.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: b4bab7679228ef8b3ce4c57cb89117855e9098c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bab7679228ef8b3ce4c57cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 2 09:50:29 2013 +0400 oledb32: Added IConnectionPoint stub for IRowPositionChange notification. --- dlls/oledb32/oledb_private.h | 10 ++++ dlls/oledb32/rowpos.c | 102 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 3 deletions(-) diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 3ff8d1d..1570529 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -21,3 +21,13 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_data_init(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_error_info(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index 88cdb6e..96a36a5 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -30,14 +30,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); +typedef struct rowpos rowpos; typedef struct { + IConnectionPoint IConnectionPoint_iface; + rowpos *container; +} rowpos_cp; + +struct rowpos +{ IRowPosition IRowPosition_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IRowset *rowset; -} rowpos; + rowpos_cp cp; +}; static inline rowpos *impl_from_IRowPosition(IRowPosition *iface) { @@ -49,6 +57,11 @@ static inline rowpos *impl_from_IConnectionPointContainer(IConnectionPointContai return CONTAINING_RECORD(iface, rowpos, IConnectionPointContainer_iface); } +static inline rowpos_cp *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return CONTAINING_RECORD(iface, rowpos_cp, IConnectionPoint_iface); +} + static HRESULT WINAPI rowpos_QueryInterface(IRowPosition* iface, REFIID riid, void **obj) { rowpos *This = impl_from_IRowPosition(iface); @@ -94,7 +107,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) if (ref == 0) { if (This->rowset) IRowset_Release(This->rowset); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -194,6 +207,88 @@ static const struct IConnectionPointContainerVtbl rowpos_cpc_vtbl = cpc_FindConnectionPoint }; +static HRESULT WINAPI rowpos_cp_QueryInterface(IConnectionPoint *iface, REFIID riid, void **obj) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_QueryInterface(&This->container->IConnectionPointContainer_iface, riid, obj); +} + +static ULONG WINAPI rowpos_cp_AddRef(IConnectionPoint *iface) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_AddRef(&This->container->IConnectionPointContainer_iface); +} + +static ULONG WINAPI rowpos_cp_Release(IConnectionPoint *iface) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_Release(&This->container->IConnectionPointContainer_iface); +} + +static HRESULT WINAPI rowpos_cp_GetConnectionInterface(IConnectionPoint *iface, IID *iid) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + + TRACE("(%p)->(%p)\n", This, iid); + + if (!iid) return E_POINTER; + + *iid = IID_IRowPositionChange; + return S_OK; +} + +static HRESULT WINAPI rowpos_cp_GetConnectionPointContainer(IConnectionPoint *iface, IConnectionPointContainer **container) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + + TRACE("(%p)->(%p)\n", This, container); + + if (!container) return E_POINTER; + + *container = &This->container->IConnectionPointContainer_iface; + IConnectionPointContainer_AddRef(*container); + return S_OK; +} + +static HRESULT WINAPI rowpos_cp_Advise(IConnectionPoint *iface, IUnknown *sink, DWORD *cookie) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p %p): stub\n", This, sink, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_cp_Unadvise(IConnectionPoint *iface, DWORD cookie) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%d): stub\n", This, cookie); + return E_NOTIMPL; +} + +static HRESULT WINAPI rowpos_cp_EnumConnections(IConnectionPoint *iface, IEnumConnections **enum_c) +{ + rowpos_cp *This = impl_from_IConnectionPoint(iface); + FIXME("(%p)->(%p): stub\n", This, enum_c); + return E_NOTIMPL; +} + +static const struct IConnectionPointVtbl rowpos_cp_vtbl = +{ + rowpos_cp_QueryInterface, + rowpos_cp_AddRef, + rowpos_cp_Release, + rowpos_cp_GetConnectionInterface, + rowpos_cp_GetConnectionPointContainer, + rowpos_cp_Advise, + rowpos_cp_Unadvise, + rowpos_cp_EnumConnections +}; + +static void rowposchange_cp_init(rowpos_cp *cp, rowpos *container) +{ + cp->IConnectionPoint_iface.lpVtbl = &rowpos_cp_vtbl; + cp->container = container; +} + HRESULT create_oledb_rowpos(IUnknown *outer, void **obj) { rowpos *This; @@ -204,13 +299,14 @@ HRESULT create_oledb_rowpos(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->IRowPosition_iface.lpVtbl = &rowpos_vtbl; This->IConnectionPointContainer_iface.lpVtbl = &rowpos_cpc_vtbl; This->ref = 1; This->rowset = NULL; + rowposchange_cp_init(&This->cp, This); *obj = &This->IRowPosition_iface;

1 0

Jeff Klein : mmdevapi/tests: Test in-proc marshal of IAudioClient.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

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

Jeff Klein : winecoreaudio.drv: Implement IMarshal for IAudioClient.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

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

Rico Schüller : d3dx9: Warn when submitting invalid flags to ID3DXEffect::Begin().
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

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: Use d3dx_parameter instead of D3DXHANDLE.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

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

Jeff Klein : wineoss.drv: Implement IMarshal for IAudioClient.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

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

Dmitry Timoshkov : cabarc: Fix compilation under Windows.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: 452a64e3a76ab92c9591115080fc93e6daf79d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=452a64e3a76ab92c959111508… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 2 12:22:24 2013 +0900 cabarc: Fix compilation under Windows. --- programs/cabarc/cabarc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 02213f6..032aab2 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _O_RDONLY 0 #define _O_WRONLY 1 #define _O_RDWR 2 -#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) #define _O_APPEND 0x0008 #define _O_RANDOM 0x0010 #define _O_SEQUENTIAL 0x0020 @@ -53,6 +52,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabarc); #define _O_BINARY 0x8000 #endif +#ifndef _O_ACCMODE +#define _O_ACCMODE (_O_RDONLY|_O_WRONLY|_O_RDWR) +#endif + #ifndef _SH_COMPAT #define _SH_COMPAT 0x00 #define _SH_DENYRW 0x10

1 0

Detlef Riekenberg : faultrep/tests: Fix a test failure when the user has limited access rights.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

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

Nikolay Sivov : ntdll: Implement compatible FindActCtxSectionString() for window class section.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: 5ce01b3597d5dd9aaa510b846dd2fc3db42ab792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce01b3597d5dd9aaa510b846… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 2 15:45:46 2013 +0400 ntdll: Implement compatible FindActCtxSectionString() for window class section. --- dlls/kernel32/tests/actctx.c | 92 ++++++++------ dlls/ntdll/actctx.c | 273 ++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/ntdll_misc.h | 2 + 3 files changed, 317 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ce01b3597d5dd9aaa510…

1 0

Bruno Jesus : ws2_32/tests: Add and update WSASocketA() tests.
by Alexandre Julliard Aug. 2, 2013

Aug. 2, 2013

Module: wine Branch: master Commit: ce0e3158b2e8ac9c2e946f700727ef79537ff972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0e3158b2e8ac9c2e946f700… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 1 21:51:31 2013 -0300 ws2_32/tests: Add and update WSASocketA() tests. --- dlls/ws2_32/tests/sock.c | 58 +++++++++++++++++++++++++++++++++++++++------ include/winsock2.h | 6 ++++ 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7e70449..5ce4959 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1701,6 +1701,22 @@ todo_wine ok(sock != INVALID_SOCKET, "WSASocketA should have succeeded\n"); closesocket(sock); + /* SOCK_STREAM does not support IPPROTO_UDP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_UDP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + + /* SOCK_DGRAM does not support IPPROTO_TCP */ + SetLastError(0xdeadbeef); + ok(WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_TCP, NULL, 0, 0) == INVALID_SOCKET, + "WSASocketA should have failed\n"); + err = WSAGetLastError(); +todo_wine + ok(err == WSAEPROTONOSUPPORT, "Expected 10043, received %d\n", err); + /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) * to avoid a crash on win98. */ @@ -1739,6 +1755,18 @@ todo_wine pi[0].iProtocol = IPPROTO_UDP; pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET; + sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); +todo_wine { + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", + SOCK_DGRAM, socktype); + closesocket(sock); +} sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); @@ -1771,7 +1799,9 @@ todo_wine ok(items != SOCKET_ERROR, "WSAEnumProtocolsA failed, last error is %d\n", WSAGetLastError()); - /* when no protocol is specified the first socket type from WSAEnumProtocols is returned */ + /* when no protocol and socket type are specified the first entry + * from WSAEnumProtocols that has the flag PFL_MATCHES_PROTOCOL_ZERO + * is returned */ sock = WSASocketA(AF_INET, 0, 0, NULL, 0, 0); todo_wine ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", @@ -1782,12 +1812,21 @@ todo_wine { socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == pi[0].iSocketType, "Wrong socket type, expected %d received %d\n", - pi[0].iSocketType, socktype); + for(i = 0; i < items; i++) + { + if(pi[i].dwProviderFlags & PFL_MATCHES_PROTOCOL_ZERO) + { + ok(socktype == pi[i].iSocketType, "Wrong socket type, expected %d received %d\n", + pi[i].iSocketType, socktype); + break; + } + } + ok(i != items, "Creating a socket without protocol and socket type didn't work\n"); } closesocket(sock); - /* when the protocol is specified the first socket type that matches the protocol is returned */ + /* when no socket type is specified the first entry from WSAEnumProtocols + * that matches the protocol is returned */ for (i = 0; i < sizeof(autoprotocols) / sizeof(autoprotocols[0]); i++) { sock = WSASocketA(0, 0, autoprotocols[i], NULL, 0, 0); @@ -1801,18 +1840,21 @@ todo_wine todo_wine ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - for (j = 0; j < items; j++) + for (err = 1, j = 0; j < items; j++) { if (pi[j].iProtocol == autoprotocols[i]) { + if (socktype == pi[j].iSocketType) + err = 0; + else todo_wine - ok(socktype == pi[j].iSocketType, "Wrong socket type, expected %d received %d\n", - pi[j].iSocketType, socktype); + ok(0, "Wrong socket type, expected %d received %d\n", + pi[j].iSocketType, socktype); break; } } todo_wine - ok(socktype != 0xdead, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); + ok(!err, "Protocol %d not found in WSAEnumProtocols\n", autoprotocols[i]); closesocket(sock); } diff --git a/include/winsock2.h b/include/winsock2.h index 3e060e5..7516d25 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -213,6 +213,12 @@ typedef struct _WSAPROTOCOLCHAIN DWORD ChainEntries[MAX_PROTOCOL_CHAIN]; /* a list of dwCatalogEntryIds */ } WSAPROTOCOLCHAIN, * LPWSAPROTOCOLCHAIN; +/* constants used in dwProviderFlags from struct WSAPROTOCOL_INFO */ +#define PFL_MULTIPLE_PROTO_ENTRIES 0x00000001 +#define PFL_RECOMMENDED_PROTO_ENTRY 0x00000002 +#define PFL_HIDDEN 0x00000004 +#define PFL_MATCHES_PROTOCOL_ZERO 0x00000008 + #define XP1_CONNECTIONLESS 0x00000001 #define XP1_GUARANTEED_DELIVERY 0x00000002 #define XP1_GUARANTEED_ORDER 0x00000004

1 0