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

Alexandre Julliard : winex11: Store the DC bounds rectangle as a pointer.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: bc6f2f86151458a041ce3baf076de12530ed65d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6f2f86151458a041ce3baf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 25 13:18:28 2012 +0200 winex11: Store the DC bounds rectangle as a pointer. --- dlls/winex11.drv/graphics.c | 1 + dlls/winex11.drv/init.c | 28 +++++++--------------------- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index b9149bc..0d1e49b 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -109,6 +109,7 @@ static void add_pen_device_bounds( X11DRV_PDEVICE *dev, const POINT *points, int RECT bounds, rect; int width = 0; + if (!dev->bounds) return; reset_bounds( &bounds ); if (dev->pen.type & PS_GEOMETRIC || dev->pen.width > 1) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 70f792b..ea0befa 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -118,7 +118,6 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) if (!(physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ))) return NULL; - reset_bounds( &physDev->bounds ); wine_tsx11_lock(); physDev->drawable = drawable; physDev->gc = XCreateGC( gdi_display, drawable, 0, NULL ); @@ -192,37 +191,24 @@ void add_device_bounds( X11DRV_PDEVICE *dev, const RECT *rect ) { RECT rc; + if (!dev->bounds) return; if (dev->region && GetRgnBox( dev->region, &rc )) { - if (IntersectRect( &rc, &rc, rect )) add_bounds_rect( &dev->bounds, &rc ); + if (IntersectRect( &rc, &rc, rect )) add_bounds_rect( dev->bounds, &rc ); } - else add_bounds_rect( &dev->bounds, rect ); + else add_bounds_rect( dev->bounds, rect ); } /*********************************************************************** - * dibdrv_GetBoundsRect - */ -static UINT X11DRV_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) -{ - X11DRV_PDEVICE *pdev = get_x11drv_dev( dev ); - - if (IsRectEmpty( &pdev->bounds )) return DCB_RESET; - if (rect) *rect = pdev->bounds; - if (flags & DCB_RESET) reset_bounds( &pdev->bounds ); - return DCB_SET; -} - - -/*********************************************************************** * X11DRV_SetBoundsRect */ static UINT X11DRV_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { X11DRV_PDEVICE *pdev = get_x11drv_dev( dev ); - if (IsRectEmpty( &pdev->bounds )) return DCB_RESET; - if (flags & DCB_RESET) reset_bounds( &pdev->bounds ); - return DCB_SET; + if (flags & DCB_DISABLE) pdev->bounds = NULL; + else if (flags & DCB_ENABLE) pdev->bounds = rect; + return DCB_RESET; /* we don't have device-specific bounds */ } @@ -516,7 +502,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ - X11DRV_GetBoundsRect, /* pGetBoundsRect */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 28040f6..2548155 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -123,7 +123,7 @@ typedef struct Drawable drawable; RECT dc_rect; /* DC rectangle relative to drawable */ RECT drawable_rect; /* Drawable rectangle relative to screen */ - RECT bounds; /* Graphics bounds */ + RECT *bounds; /* Graphics bounds */ HRGN region; /* Device region (visible region & clip region) */ X_PHYSPEN pen; X_PHYSBRUSH brush;

1 0

Christian Costa : dmusic: Add tests for IDirectMusicBuffer.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 0a588385fb0651fc646f5d7a4f49e7a93ee28011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a588385fb0651fc646f5d7a4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:18 2012 +0200 dmusic: Add tests for IDirectMusicBuffer. --- dlls/dmusic/tests/dmusic.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index c537afa..1e55961 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "initguid.h" #include "dmusici.h" +#include "dmksctrl.h" static inline char* debugstr_guid(CONST GUID *id) { @@ -103,11 +104,48 @@ static void test_dmusic(void) IDirectMusic_Release(dmusic); } +static void test_dmbuffer(void) +{ + IDirectMusic *dmusic; + IDirectMusicBuffer *dmbuffer = NULL; + HRESULT hr; + DMUS_BUFFERDESC desc; + GUID format; + DWORD size; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); + if (hr != S_OK) + { + skip("Cannot create DirectMusic object (%x)\n", hr); + return; + } + + desc.dwSize = sizeof(DMUS_BUFFERDESC); + desc.dwFlags = 0; + desc.cbBuffer = 1023; + memcpy(&desc.guidBufferFormat, &GUID_NULL, sizeof(GUID)); + + hr = IDirectMusic_CreateMusicBuffer(dmusic, &desc, &dmbuffer, NULL); + ok(hr == S_OK, "IDirectMusic_CreateMusicBuffer return %x\n", hr); + + hr = IDirectMusicBuffer_GetBufferFormat(dmbuffer, &format); + ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %x\n", hr); + todo_wine ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); + hr = IDirectMusicBuffer_GetMaxBytes(dmbuffer, &size); + ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); + ok(size == 1024, "Buffer size is %u instead of 1024\n", size); + + if (dmbuffer) + IDirectMusicBuffer_Release(dmbuffer); + IDirectMusic_Release(dmusic); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); test_dmusic(); + test_dmbuffer(); CoUninitialize(); }

1 0

Christian Costa : dmusic: Handle GUID_NULL when creating IDirectMusicBuffer .
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 51942db8116dabd670854211e2bf4677b15eccc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51942db8116dabd670854211e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:26 2012 +0200 dmusic: Handle GUID_NULL when creating IDirectMusicBuffer. --- dlls/dmusic/buffer.c | 7 ++++++- dlls/dmusic/tests/dmusic.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 838ceee..0626276 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -18,6 +18,8 @@ */ #include "dmusic_private.h" +#include "initguid.h" +#include "dmksctrl.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -242,7 +244,10 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; dmbuffer->ref = 0; /* Will be inited by QueryInterface */ - memcpy(&dmbuffer->format, &desc->guidBufferFormat, sizeof(GUID)); + if (IsEqualGUID(&desc->guidBufferFormat, &GUID_NULL)) + dmbuffer->format = KSDATAFORMAT_SUBTYPE_MIDI; + else + dmbuffer->format = desc->guidBufferFormat; dmbuffer->size = (desc->cbBuffer + 3) & ~3; /* Buffer size must be multiple of 4 bytes */ dmbuffer->data = HeapAlloc(GetProcessHeap(), 0, dmbuffer->size); diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 1e55961..21607cb 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -130,7 +130,7 @@ static void test_dmbuffer(void) hr = IDirectMusicBuffer_GetBufferFormat(dmbuffer, &format); ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %x\n", hr); - todo_wine ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); + ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); hr = IDirectMusicBuffer_GetMaxBytes(dmbuffer, &size); ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); ok(size == 1024, "Buffer size is %u instead of 1024\n", size);

1 0

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_PackStructured.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: fbd0aba73975d850c6677bd2ca55e7e9575ee064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd0aba73975d850c6677bd2c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:34 2012 +0200 dmusic: Implement IDirectMusicBufferImpl_PackStructured. --- dlls/dmusic/buffer.c | 26 ++++++++++++++++++++++++-- dlls/dmusic/dmusic_private.h | 1 + dlls/dmusic/tests/dmusic.c | 5 +++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 0626276..fd1d217 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -96,11 +96,33 @@ static HRESULT WINAPI IDirectMusicBufferImpl_TotalTime(LPDIRECTMUSICBUFFER iface return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) +static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME ref_time, DWORD channel_group, DWORD channel_message) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + DWORD new_write_pos = This->write_pos + sizeof(DMUS_EVENTHEADER) + sizeof(DWORD); + DMUS_EVENTHEADER header; - FIXME("(%p, 0x%s, %d, %d): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, dwChannelMessage); + TRACE("(%p)->(0x%s, %u, 0x%x)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message); + + if (new_write_pos > This->size) + return DMUS_E_BUFFER_FULL; + + /* Channel_message 0xZZYYXX is a midi message where XX = status byte, YY = byte 1 and ZZ = byte 2 */ + + if (!(channel_message & 0x80)) + { + /* Status byte MSB is always set */ + return DMUS_E_INVALID_EVENT; + } + + header.cbEvent = sizeof(channel_message); + header.dwChannelGroup = channel_group; + header.rtDelta = ref_time; + header.dwFlags = DMUS_EVENT_STRUCTURED; + + memcpy(This->data + This->write_pos, &header, sizeof(header)); + *(DWORD*)(This->data + This->write_pos + sizeof(header)) = channel_message; + This->write_pos = new_write_pos; return S_OK; } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1001bf5..f4897ac 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -113,6 +113,7 @@ struct IDirectMusicBufferImpl { GUID format; DWORD size; LPBYTE data; + DWORD write_pos; }; /***************************************************************************** diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 21607cb..c6d4ad3 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -135,6 +135,11 @@ static void test_dmbuffer(void) ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); ok(size == 1024, "Buffer size is %u instead of 1024\n", size); + hr = IDirectMusicBuffer_PackStructured(dmbuffer, 10, 0, 0); + ok(hr == DMUS_E_INVALID_EVENT, "IDirectMusicBuffer_PackStructured returned %x\n", hr); + hr = IDirectMusicBuffer_PackStructured(dmbuffer, 10, 0, 0x000090); /* note on : chan 0, note 0 & vel 0 */ + ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr); + if (dmbuffer) IDirectMusicBuffer_Release(dmbuffer); IDirectMusic_Release(dmusic);

1 0

Christian Costa : dmusic: IDirectMusicBufferImpl_GetUsedBytes.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 5c5ed245aa080189e09bfc175453b687d8a9286d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5ed245aa080189e09bfc175… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:43 2012 +0200 dmusic: IDirectMusicBufferImpl_GetUsedBytes. --- dlls/dmusic/buffer.c | 9 +++++++-- dlls/dmusic/tests/dmusic.c | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index fd1d217..f4ea22c 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -177,11 +177,16 @@ static HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime(LPDIRECTMUSICBUFFER if return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes(LPDIRECTMUSICBUFFER iface, LPDWORD pcb) +static HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes(LPDIRECTMUSICBUFFER iface, LPDWORD used_bytes) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %p): stub\n", This, pcb); + TRACE("(%p)->(%p)\n", iface, used_bytes); + + if (!used_bytes) + return E_POINTER; + + *used_bytes = This->write_pos; return S_OK; } diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index c6d4ad3..71e89fd 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -112,6 +112,7 @@ static void test_dmbuffer(void) DMUS_BUFFERDESC desc; GUID format; DWORD size; + DWORD bytes; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); if (hr != S_OK) @@ -139,6 +140,9 @@ static void test_dmbuffer(void) ok(hr == DMUS_E_INVALID_EVENT, "IDirectMusicBuffer_PackStructured returned %x\n", hr); hr = IDirectMusicBuffer_PackStructured(dmbuffer, 10, 0, 0x000090); /* note on : chan 0, note 0 & vel 0 */ ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr); + hr = IDirectMusicBuffer_GetUsedBytes(dmbuffer, &bytes); + ok(hr == S_OK, "IDirectMusicBuffer_GetUsedBytes returned %x\n", hr); + ok(bytes == 24, "Buffer size is %u instead of 0\n", bytes); if (dmbuffer) IDirectMusicBuffer_Release(dmbuffer);

1 0

Christian Costa : dmusic: Implement IDirectMusicBuffer_GetStartTime and IDirectMusicBuffer_SetStartTime .
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 09a2dd6a3fe440d7ae887e2de16e1db7f3c3f712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a2dd6a3fe440d7ae887e2de… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:51 2012 +0200 dmusic: Implement IDirectMusicBuffer_GetStartTime and IDirectMusicBuffer_SetStartTime. --- dlls/dmusic/buffer.c | 22 +++++++++++++++++----- dlls/dmusic/dmusic_private.h | 1 + dlls/dmusic/tests/dmusic.c | 21 +++++++++++++++++++-- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index f4ea22c..ca53db3 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -115,9 +115,12 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER return DMUS_E_INVALID_EVENT; } + if (!This->write_pos) + This->start_time = ref_time; + header.cbEvent = sizeof(channel_message); header.dwChannelGroup = channel_group; - header.rtDelta = ref_time; + header.rtDelta = ref_time - This->start_time; header.dwFlags = DMUS_EVENT_STRUCTURED; memcpy(This->data + This->write_pos, &header, sizeof(header)); @@ -168,11 +171,18 @@ static HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr(LPDIRECTMUSICBUFFER return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt) +static HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME ref_time) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %p): stub\n", This, prt); + TRACE("(%p)->(%p)\n", iface, ref_time); + + if (!ref_time) + return E_POINTER; + if (!This->write_pos) + return DMUS_E_BUFFER_EMPTY; + + *ref_time = This->start_time; return S_OK; } @@ -218,11 +228,13 @@ static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat(LPDIRECTMUSICBUFFER return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) +static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME ref_time) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, 0x%s): stub\n", This, wine_dbgstr_longlong(rt)); + TRACE("(%p)->(0x%s)\n", This, wine_dbgstr_longlong(ref_time)); + + This->start_time = ref_time; return S_OK; } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index f4897ac..23d010d 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -114,6 +114,7 @@ struct IDirectMusicBufferImpl { DWORD size; LPBYTE data; DWORD write_pos; + REFERENCE_TIME start_time; }; /***************************************************************************** diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 71e89fd..a05afcc 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -113,6 +113,7 @@ static void test_dmbuffer(void) GUID format; DWORD size; DWORD bytes; + REFERENCE_TIME time; hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); if (hr != S_OK) @@ -136,14 +137,30 @@ static void test_dmbuffer(void) ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); ok(size == 1024, "Buffer size is %u instead of 1024\n", size); - hr = IDirectMusicBuffer_PackStructured(dmbuffer, 10, 0, 0); + hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time); + ok(hr == DMUS_E_BUFFER_EMPTY, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); + hr = IDirectMusicBuffer_SetStartTime(dmbuffer, 10); + ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); + hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time); + ok(hr == DMUS_E_BUFFER_EMPTY, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); + + hr = IDirectMusicBuffer_PackStructured(dmbuffer, 20, 0, 0); ok(hr == DMUS_E_INVALID_EVENT, "IDirectMusicBuffer_PackStructured returned %x\n", hr); - hr = IDirectMusicBuffer_PackStructured(dmbuffer, 10, 0, 0x000090); /* note on : chan 0, note 0 & vel 0 */ + hr = IDirectMusicBuffer_PackStructured(dmbuffer, 20, 0, 0x000090); /* note on : chan 0, note 0 & vel 0 */ ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr); hr = IDirectMusicBuffer_GetUsedBytes(dmbuffer, &bytes); ok(hr == S_OK, "IDirectMusicBuffer_GetUsedBytes returned %x\n", hr); ok(bytes == 24, "Buffer size is %u instead of 0\n", bytes); + hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time); + ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); + ok(time == 20, "Buffer start time is wrong\n"); + hr = IDirectMusicBuffer_SetStartTime(dmbuffer, 30); + ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); + hr = IDirectMusicBuffer_GetStartTime(dmbuffer, &time); + ok(hr == S_OK, "IDirectMusicBuffer_GetStartTime returned %x\n", hr); + ok(time == 30, "Buffer start time is wrong\n"); + if (dmbuffer) IDirectMusicBuffer_Release(dmbuffer); IDirectMusic_Release(dmusic);

1 0

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_Flush.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: cb804ce88484efe3dfb19c49054b9521e7bbf83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb804ce88484efe3dfb19c490… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:09:01 2012 +0200 dmusic: Implement IDirectMusicBufferImpl_Flush. --- dlls/dmusic/buffer.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index ca53db3..bf60470 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -82,7 +82,9 @@ static HRESULT WINAPI IDirectMusicBufferImpl_Flush(LPDIRECTMUSICBUFFER iface) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p): stub\n", This); + TRACE("(%p)->()\n", iface); + + This->write_pos = 0; return S_OK; }

1 0

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

27 Apr '12

Module: wine Branch: master Commit: a495b7af486619d501589305a81d5ba61fa742da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a495b7af486619d501589305a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 26 21:11:51 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetVertexDeclaration(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c5dc834..d4f1eea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2129,6 +2129,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9 { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_vertex_declaration *wined3d_declaration = NULL; + IDirect3DVertexDeclaration9Impl *declaration_impl; HRESULT hr; TRACE("iface %p, declaration %p.\n", iface, declaration); @@ -2139,7 +2140,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(IDirect3DDevice9 hr = wined3d_device_get_vertex_declaration(This->wined3d_device, &wined3d_declaration); if (SUCCEEDED(hr) && wined3d_declaration) { - *declaration = wined3d_vertex_declaration_get_parent(wined3d_declaration); + declaration_impl = wined3d_vertex_declaration_get_parent(wined3d_declaration); + *declaration = &declaration_impl->IDirect3DVertexDeclaration9_iface; IDirect3DVertexDeclaration9_AddRef(*declaration); wined3d_vertex_declaration_decref(wined3d_declaration); }

1 0

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

27 Apr '12

Module: wine Branch: master Commit: 722e60ab2e3ad231924ba202d12abaa98652bff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=722e60ab2e3ad231924ba202d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 26 21:11:52 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetVertexShader(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4f1eea..1f0f809 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2339,6 +2339,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(IDirect3DDevice9Ex *i IDirect3DVertexShader9 **shader) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DVertexShader9Impl *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2347,7 +2348,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(IDirect3DDevice9Ex *i wined3d_shader = wined3d_device_get_vertex_shader(This->wined3d_device); if (wined3d_shader) { - *shader = wined3d_shader_get_parent(wined3d_shader); + shader_impl = wined3d_shader_get_parent(wined3d_shader); + *shader = &shader_impl->IDirect3DVertexShader9_iface; IDirect3DVertexShader9_AddRef(*shader); wined3d_shader_decref(wined3d_shader); }

1 0

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

27 Apr '12

Module: wine Branch: master Commit: c638aab2b47447b47fb5a532812000cfe9c6e6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c638aab2b47447b47fb5a5328… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 26 21:11:53 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetPixelShader(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1f0f809..987867c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2652,6 +2652,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *if IDirect3DPixelShader9 **shader) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DPixelShader9Impl *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2662,7 +2663,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *if wined3d_shader = wined3d_device_get_pixel_shader(This->wined3d_device); if (wined3d_shader) { - *shader = wined3d_shader_get_parent(wined3d_shader); + shader_impl = wined3d_shader_get_parent(wined3d_shader); + *shader = &shader_impl->IDirect3DPixelShader9_iface; IDirect3DPixelShader9_AddRef(*shader); wined3d_shader_decref(wined3d_shader); }

1 0