April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetStreamSource ().
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: d9000aeec38649a7af723ffd165bcf4c57472cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9000aeec38649a7af723ffd1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 23 21:24:54 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetStreamSource(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3dfd8f4..577401a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2690,6 +2690,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(IDirect3DDevice8 *ifa UINT StreamNumber, IDirect3DVertexBuffer8 **pStream, UINT *pStride) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); + IDirect3DVertexBuffer8Impl *buffer_impl; struct wined3d_buffer *retStream = NULL; HRESULT hr; @@ -2705,7 +2706,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(IDirect3DDevice8 *ifa &retStream, 0 /* Offset in bytes */, pStride); if (SUCCEEDED(hr) && retStream) { - *pStream = wined3d_buffer_get_parent(retStream); + buffer_impl = wined3d_buffer_get_parent(retStream); + *pStream = &buffer_impl->IDirect3DVertexBuffer8_iface; IDirect3DVertexBuffer8_AddRef(*pStream); wined3d_buffer_decref(retStream); }

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DSwapChain9Impl_GetBackBuffer ().
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 7efbfe494e8b109b66547c957ee97c68ed320679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efbfe494e8b109b66547c957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 23 21:24:55 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DSwapChain9Impl_GetBackBuffer(). --- dlls/d3d9/swapchain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index c0f5093..973ebde 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -129,6 +129,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(IDirect3DSwapChain9 { IDirect3DSwapChain9Impl *swapchain = impl_from_IDirect3DSwapChain9(iface); struct wined3d_surface *wined3d_surface = NULL; + IDirect3DSurface9Impl *surface_impl; HRESULT hr; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -139,7 +140,8 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(IDirect3DSwapChain9 iBackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface) { - *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppBackBuffer = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*ppBackBuffer); wined3d_surface_decref(wined3d_surface); }

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVolumeTexture9Impl.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 7da2dc747ce45b52ded7d02e7ca240380754aeca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da2dc747ce45b52ded7d02e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 23 21:24:56 2012 +0200 d3d9: Get rid of IDirect3DVolumeTexture9Impl. --- dlls/d3d9/d3d9_private.h | 18 +--- dlls/d3d9/device.c | 4 +- dlls/d3d9/volumetexture.c | 245 ++++++++++++++++++++++----------------------- 3 files changed, 123 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7da2dc747ce45b52ded7d…

1 0

Henri Verbeet : d3d9: Merge cubetexture.c into texture.c.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 5f38a1e1f7e528991fa8bfd29105060fea13e32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f38a1e1f7e528991fa8bfd29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 23 21:24:57 2012 +0200 d3d9: Merge cubetexture.c into texture.c. --- dlls/d3d9/Makefile.in | 1 - dlls/d3d9/cubetexture.c | 481 ----------------------------------------------- dlls/d3d9/texture.c | 446 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 444 insertions(+), 484 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f38a1e1f7e528991fa8b…

1 0

Aric Stewart : strmbase: We cannot hold the RenderLock during QualityControlRender_WaitFor.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 209bc696c1d0049a2e2eef26c2ac0d23f71d6249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=209bc696c1d0049a2e2eef26c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 23 11:24:53 2012 -0500 strmbase: We cannot hold the RenderLock during QualityControlRender_WaitFor. --- dlls/strmbase/renderer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index afce8fd..c2a7e83 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -385,7 +385,9 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (This->pFuncsTable->pfnOnWaitStart) This->pFuncsTable->pfnOnWaitStart(This); + LeaveCriticalSection(&This->csRenderLock); hr = QualityControlRender_WaitFor(This->qcimpl, pSample, This->RenderEvent); + EnterCriticalSection(&This->csRenderLock); if (This->pFuncsTable->pfnOnWaitEnd) This->pFuncsTable->pfnOnWaitEnd(This);

1 0

Christian Costa : dmusic: Pass creation parameters to DMUSIC_CreateDirectMusicBufferImpl then allocate data buffer and set format accordingly .
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 1b33b1d5cde935ff0d77e343f1d9dc6ad80b16fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b33b1d5cde935ff0d77e343f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:25:53 2012 +0200 dmusic: Pass creation parameters to DMUSIC_CreateDirectMusicBufferImpl then allocate data buffer and set format accordingly. --- dlls/dmusic/buffer.c | 47 ++++++++++++++++++++++++++++++----------- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_private.h | 22 ++++++++++++------- 3 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index c8c7ca1..7bb41c3 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -53,6 +53,7 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) { TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); if (!refCount) { + HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); } @@ -159,17 +160,37 @@ static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { IDirectMusicBufferImpl_SetUsedBytes }; -/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicBufferImpl* dmbuff; - - dmbuff = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBufferImpl)); - if (NULL == dmbuff) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dmbuff->lpVtbl = &DirectMusicBuffer_Vtbl; - dmbuff->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicBufferImpl_QueryInterface ((LPDIRECTMUSICBUFFER)dmbuff, lpcGUID, ppobj); +HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) +{ + IDirectMusicBufferImpl* dmbuffer; + HRESULT hr; + + TRACE("(%p, %p)\n", desc, ret_iface); + + *ret_iface = NULL; + + dmbuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBufferImpl)); + if (!dmbuffer) + return E_OUTOFMEMORY; + + dmbuffer->lpVtbl = &DirectMusicBuffer_Vtbl; + dmbuffer->ref = 0; /* Will be inited by QueryInterface */ + + memcpy(&dmbuffer->format, &desc->guidBufferFormat, sizeof(GUID)); + dmbuffer->size = (desc->cbBuffer + 3) & ~3; /* Buffer size must be multiple of 4 bytes */ + + dmbuffer->data = HeapAlloc(GetProcessHeap(), 0, dmbuffer->size); + if (!dmbuffer->data) { + HeapFree(GetProcessHeap(), 0, dmbuffer); + return E_OUTOFMEMORY; + } + + hr = IDirectMusicBufferImpl_QueryInterface((LPDIRECTMUSICBUFFER)dmbuffer, &IID_IDirectMusicBuffer, ret_iface); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, dmbuffer->data); + HeapFree(GetProcessHeap(), 0, dmbuffer); + } + + return hr; } diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index f6b7e04..3f22fe0 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -165,7 +165,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, if (!pBufferDesc || !ppBuffer) return E_POINTER; - return DMUSIC_CreateDirectMusicBufferImpl(&IID_IDirectMusicBuffer, (LPVOID)ppBuffer, NULL); + return DMUSIC_CreateDirectMusicBufferImpl(pBufferDesc, (LPVOID)ppBuffer); } static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index cffea34..069df24 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -75,13 +75,16 @@ typedef struct DMUSIC_PRIVATE_CHANNEL_GROUP_ { /***************************************************************************** * ClassFactory */ + +/* CLSID */ extern HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; + +/* Internal */ +extern HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; - -extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** @@ -102,11 +105,14 @@ struct IDirectMusic8Impl { * IDirectMusicBufferImpl implementation structure */ struct IDirectMusicBufferImpl { - /* IUnknown fields */ - const IDirectMusicBufferVtbl *lpVtbl; - LONG ref; - - /* IDirectMusicBufferImpl fields */ + /* IUnknown fields */ + const IDirectMusicBufferVtbl *lpVtbl; + LONG ref; + + /* IDirectMusicBufferImpl fields */ + GUID format; + DWORD size; + LPBYTE data; }; /*****************************************************************************

1 0

Christian Costa : dmusic: COM clean-up of IDirectMusicBuffer.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 46884bfcbe93bd4f0702f1beff166790b9a783e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46884bfcbe93bd4f0702f1bef… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:26:02 2012 +0200 dmusic: COM clean-up of IDirectMusicBuffer. --- dlls/dmusic/buffer.c | 165 +++++++++++++++++++++++++++--------------- dlls/dmusic/dmusic_private.h | 2 +- 2 files changed, 107 insertions(+), 60 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 7bb41c3..a56a8f0 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -21,9 +21,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicBufferImpl, IDirectMusicBuffer_iface); +} + /* IDirectMusicBufferImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; +static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface(LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); TRACE("(%p, (%s, %p)\n",This,debugstr_dmguid(riid),ppobj); if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicBuffer)) { @@ -35,8 +41,9 @@ static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; +static ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -46,8 +53,9 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) { return refCount; } -static ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; +static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -63,82 +71,121 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) { } /* IDirectMusicBufferImpl IDirectMusicBuffer part: */ -static HRESULT WINAPI IDirectMusicBufferImpl_Flush (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p): stub\n", This); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_Flush(LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p): stub\n", This); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_TotalTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prtTime) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, prtTime); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_TotalTime(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prtTime) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, prtTime); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, 0x%s, %d, %d): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, dwChannelMessage); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, 0x%s, %d, %d): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, dwChannelMessage); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, 0x%s, %d, %d, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, 0x%s, %d, %d, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_ResetReadPtr (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p): stub\n", This); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_ResetReadPtr(LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p): stub\n", This); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt, LPDWORD pdwChannelGroup, LPDWORD pdwLength, LPBYTE* ppData) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p, %p, %p, %p): stub\n", This, prt, pdwChannelGroup, pdwLength, ppData); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt, LPDWORD pdwChannelGroup, LPDWORD pdwLength, LPBYTE* ppData) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p, %p, %p, %p): stub\n", This, prt, pdwChannelGroup, pdwLength, ppData); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr (LPDIRECTMUSICBUFFER iface, LPBYTE* ppData) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, ppData); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr(LPDIRECTMUSICBUFFER iface, LPBYTE* ppData) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, ppData); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, prt); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, prt); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, pcb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes(LPDIRECTMUSICBUFFER iface, LPDWORD pcb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, pcb); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, pcb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes(LPDIRECTMUSICBUFFER iface, LPDWORD pcb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, pcb); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat (LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, pGuidFormat); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat(LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, pGuidFormat); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, 0x%s): stub\n", This, wine_dbgstr_longlong(rt)); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, 0x%s): stub\n", This, wine_dbgstr_longlong(rt)); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %d): stub\n", This, cb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %d): stub\n", This, cb); + + return S_OK; } static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { @@ -173,7 +220,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID if (!dmbuffer) return E_OUTOFMEMORY; - dmbuffer->lpVtbl = &DirectMusicBuffer_Vtbl; + dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; dmbuffer->ref = 0; /* Will be inited by QueryInterface */ memcpy(&dmbuffer->format, &desc->guidBufferFormat, sizeof(GUID)); diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 069df24..2f351de 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -106,7 +106,7 @@ struct IDirectMusic8Impl { */ struct IDirectMusicBufferImpl { /* IUnknown fields */ - const IDirectMusicBufferVtbl *lpVtbl; + IDirectMusicBuffer IDirectMusicBuffer_iface; LONG ref; /* IDirectMusicBufferImpl fields */

1 0

Christian Costa : include: Add dmksctrl. h with definition of KSDATAFORMAT_SUBTYPE_DIRECTMUSIC needed by DirectMusic .
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 15a60db06e68e21afa3b299fda40a0cfb7b8f889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a60db06e68e21afa3b299fd… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:26:24 2012 +0200 include: Add dmksctrl.h with definition of KSDATAFORMAT_SUBTYPE_DIRECTMUSIC needed by DirectMusic. --- include/Makefile.in | 1 + include/dmksctrl.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index a83e56d..e55b548 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -239,6 +239,7 @@ SRCDIR_INCLUDES = \ dls2.h \ dmdls.h \ dmerror.h \ + dmksctrl.h \ dmo.h \ dmoreg.h \ dmort.h \ diff --git a/include/dmksctrl.h b/include/dmksctrl.h new file mode 100644 index 0000000..47142fd --- /dev/null +++ b/include/dmksctrl.h @@ -0,0 +1,31 @@ +/* + * Definition of IKsControl + * + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _DMKSCTRL_ +#define _DMKSCTRL_ + +#ifndef _KSMEDIA_ + +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI, 0x1d262760, 0xe957, 0x11cf, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DIRECTMUSIC, 0x1a82f8bc, 0x3f8b, 0x11d2, 0xb7, 0x74, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); + +#endif + +#endif /* _DMKSCTRL_ */

1 0

Alexandre Julliard : dmusic: Internal functions don't need to be WINAPI.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 87e75a03499e1b6d5a97ee5b20664b8aeed2c097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e75a03499e1b6d5a97ee5b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 24 11:37:20 2012 +0200 dmusic: Internal functions don't need to be WINAPI. --- dlls/dmusic/buffer.c | 2 +- dlls/dmusic/clock.c | 2 +- dlls/dmusic/dmusic_private.h | 14 +++++++------- dlls/dmusic/download.c | 2 +- dlls/dmusic/downloadedinstrument.c | 2 +- dlls/dmusic/instrument.c | 4 ++-- dlls/dmusic/port.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index a56a8f0..49609c0 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -207,7 +207,7 @@ static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { IDirectMusicBufferImpl_SetUsedBytes }; -HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) +HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) { IDirectMusicBufferImpl* dmbuffer; HRESULT hr; diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 4505876..c54992c 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -99,7 +99,7 @@ static const IReferenceClockVtbl ReferenceClock_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) { IReferenceClockImpl* clock; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 2f351de..1001bf5 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -81,11 +81,11 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppo extern HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /* Internal */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusic8Impl implementation structure @@ -158,7 +158,7 @@ struct IDirectMusicPortImpl { }; /** Internal factory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) DECLSPEC_HIDDEN; +extern HRESULT DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) DECLSPEC_HIDDEN; /***************************************************************************** * IReferenceClockImpl implementation structure @@ -225,7 +225,7 @@ struct IDirectMusicInstrumentImpl { }; /* custom :) */ -extern HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM pStm) DECLSPEC_HIDDEN; +extern HRESULT IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM pStm) DECLSPEC_HIDDEN; /********************************************************************** * Dll lifetime tracking declaration for dmusic.dll diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index a4b4ae0..11ab117 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -77,7 +77,7 @@ static const IDirectMusicDownloadVtbl DirectMusicDownload_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicDownloadImpl* dmdl; dmdl = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadImpl)); diff --git a/dlls/dmusic/downloadedinstrument.c b/dlls/dmusic/downloadedinstrument.c index 2a71a3e..b64d8ac 100644 --- a/dlls/dmusic/downloadedinstrument.c +++ b/dlls/dmusic/downloadedinstrument.c @@ -73,7 +73,7 @@ static const IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrumen }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicDownloadedInstrumentImpl* dmdlinst; dmdlinst = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicDownloadedInstrumentImpl)); diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 32c983a..1726b3b 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -125,7 +125,7 @@ static const IDirectMusicInstrumentVtbl DirectMusicInstrument_Instrument_Vtbl = }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicInstrumentImpl* dminst; dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl)); @@ -238,7 +238,7 @@ static HRESULT load_instrument(IDirectMusicInstrumentImpl *This, IStream *stream /* aux. function that completely loads instrument; my tests indicate that it's called somewhere around IDirectMusicCollection_GetInstrument */ -HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM stream) +HRESULT IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT iface, LPSTREAM stream) { ICOM_THIS_MULTI(IDirectMusicInstrumentImpl, InstrumentVtbl, iface); LARGE_INTEGER move; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index d0bbd9a..4cff782 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -361,7 +361,7 @@ static const IDirectMusicThruVtbl DirectMusicThru_Vtbl = { IDirectMusicThruImpl_ThruChannel }; -HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) { +HRESULT DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) { IDirectMusicPortImpl *obj; HRESULT hr = E_FAIL; UINT j;

1 0

Vincent Povirk : mscoree: Always call mono_thread_attach before invoking managed code.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 3b4d278026486d42d67190649ad3b86ae4b61a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4d278026486d42d67190649… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 23 14:55:52 2012 -0500 mscoree: Always call mono_thread_attach before invoking managed code. --- dlls/mscoree/corruntimehost.c | 12 +++++++++++- dlls/mscoree/metahost.c | 1 + dlls/mscoree/mscoree_private.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ff789d4..1750f12 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -148,6 +148,8 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d MonoObject *appdomain_object; IUnknown *unk; + This->mono->mono_thread_attach(domain); + assembly = This->mono->mono_domain_assembly_open(domain, "mscorlib"); if (!assembly) { @@ -560,6 +562,8 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* hr = E_FAIL; + This->mono->mono_thread_attach(domain); + filenameA = WtoA(pwzAssemblyPath); assembly = This->mono->mono_domain_assembly_open(domain, filenameA); if (!assembly) @@ -658,6 +662,8 @@ HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, if (SUCCEEDED(hr)) { + This->mono->mono_thread_attach(domain); + type = This->mono->mono_reflection_type_from_name(nameA, NULL); if (!type) { @@ -705,7 +711,9 @@ HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, * * NOTE: The IUnknown* is created with a reference to the object. * Until they have a reference, objects must be in the stack to prevent the - * garbage collector from freeing them. */ + * garbage collector from freeing them. + * + * mono_thread_attach must have already been called for this thread. */ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) { @@ -1025,6 +1033,8 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) hr = CLASS_E_CLASSNOTAVAILABLE; + host->mono->mono_thread_attach(domain); + filenameA = WtoA(filename); assembly = host->mono->mono_domain_assembly_open(domain, filenameA); HeapFree(GetProcessHeap(), 0, filenameA); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f877b1e..1296e37 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -186,6 +186,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); + LOAD_MONO_FUNCTION(mono_thread_attach); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index d033275..62cf240 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -44,6 +44,7 @@ typedef struct _MonoObject MonoObject; typedef struct _MonoString MonoString; typedef struct _MonoMethod MonoMethod; typedef struct _MonoProfiler MonoProfiler; +typedef struct _MonoThread MonoThread; typedef struct loaded_mono loaded_mono; typedef struct RuntimeHost RuntimeHost; @@ -163,6 +164,7 @@ struct loaded_mono void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); + MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); }; /* loaded runtime interfaces */

1 0