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

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_Flush.
by Alexandre Julliard April 27, 2012

April 27, 2012

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

Christian Costa : dmusic: Implement IDirectMusicBuffer_GetStartTime and IDirectMusicBuffer_SetStartTime .
by Alexandre Julliard April 27, 2012

April 27, 2012

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: IDirectMusicBufferImpl_GetUsedBytes.
by Alexandre Julliard April 27, 2012

April 27, 2012

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

Alexandre Julliard : gdi32: Add a SetBoundsRect driver entry point.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 3009e03df7eb31c1b23b12d3e0de9cb36884e9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3009e03df7eb31c1b23b12d3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 25 12:26:44 2012 +0200 gdi32: Add a SetBoundsRect driver entry point. --- dlls/gdi32/dc.c | 36 ++++++++++++++++-------------------- dlls/gdi32/dibdrv/dc.c | 13 +++++++++++++ dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/mfdrv/init.c | 10 ++++++++++ dlls/gdi32/tests/dc.c | 5 ++++- dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 14 ++++++++++++++ dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 10 files changed, 68 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3009e03df7eb31c1b23b1…

1 0

Jacek Caban : jscript: Removed unused do_*_tag_format arguments.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 30acd235dd509fcbbf97c254a29a6dd67d31de01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30acd235dd509fcbbf97c254a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 10:49:36 2012 +0200 jscript: Removed unused do_*_tag_format arguments. --- dlls/jscript/string.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e8b279c..b629d57 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -158,8 +158,8 @@ static HRESULT String_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI return stringobj_to_string(jsthis, retv); } -static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, const WCHAR *tagname) +static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, VARIANT *retv, + jsexcept_t *ei, const WCHAR *tagname) { const WCHAR *str; DWORD length; @@ -189,9 +189,8 @@ static HRESULT do_attributeless_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } -static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, - DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, - const WCHAR *tagname, const WCHAR *attr) +static HRESULT do_attribute_tag_format(script_ctx_t *ctx, vdisp_t *jsthis, DISPPARAMS *dp, VARIANT *retv, + jsexcept_t *ei, const WCHAR *tagname, const WCHAR *attr) { static const WCHAR tagfmtW[] = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; @@ -262,28 +261,28 @@ static HRESULT String_anchor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS static const WCHAR fontW[] = {'A',0}; static const WCHAR colorW[] = {'N','A','M','E',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } static HRESULT String_big(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR bigtagW[] = {'B','I','G',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, bigtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, bigtagW); } static HRESULT String_blink(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR blinktagW[] = {'B','L','I','N','K',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, blinktagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, blinktagW); } static HRESULT String_bold(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR boldtagW[] = {'B',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, boldtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, boldtagW); } /* ECMA-262 3rd Edition 15.5.4.5 */ @@ -442,7 +441,7 @@ static HRESULT String_fixed(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP VARIANT *retv, jsexcept_t *ei) { static const WCHAR fixedtagW[] = {'T','T',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, fixedtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, fixedtagW); } static HRESULT String_fontcolor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -451,7 +450,7 @@ static HRESULT String_fontcolor(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static const WCHAR fontW[] = {'F','O','N','T',0}; static const WCHAR colorW[] = {'C','O','L','O','R',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -460,7 +459,7 @@ static HRESULT String_fontsize(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D static const WCHAR fontW[] = {'F','O','N','T',0}; static const WCHAR colorW[] = {'S','I','Z','E',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -533,7 +532,7 @@ static HRESULT String_italics(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI VARIANT *retv, jsexcept_t *ei) { static const WCHAR italicstagW[] = {'I',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, italicstagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, italicstagW); } /* ECMA-262 3rd Edition 15.5.4.8 */ @@ -614,7 +613,7 @@ static HRESULT String_link(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPP static const WCHAR fontW[] = {'A',0}; static const WCHAR colorW[] = {'H','R','E','F',0}; - return do_attribute_tag_format(ctx, jsthis, flags, dp, retv, ei, fontW, colorW); + return do_attribute_tag_format(ctx, jsthis, dp, retv, ei, fontW, colorW); } /* ECMA-262 3rd Edition 15.5.4.10 */ @@ -1153,7 +1152,7 @@ static HRESULT String_small(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP VARIANT *retv, jsexcept_t *ei) { static const WCHAR smalltagW[] = {'S','M','A','L','L',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, smalltagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, smalltagW); } static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -1285,14 +1284,14 @@ static HRESULT String_strike(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS VARIANT *retv, jsexcept_t *ei) { static const WCHAR striketagW[] = {'S','T','R','I','K','E',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, striketagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, striketagW); } static HRESULT String_sub(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { static const WCHAR subtagW[] = {'S','U','B',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, subtagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, subtagW); } /* ECMA-262 3rd Edition 15.5.4.15 */ @@ -1439,7 +1438,7 @@ static HRESULT String_sup(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA VARIANT *retv, jsexcept_t *ei) { static const WCHAR suptagW[] = {'S','U','P',0}; - return do_attributeless_tag_format(ctx, jsthis, flags, dp, retv, ei, suptagW); + return do_attributeless_tag_format(ctx, jsthis, retv, ei, suptagW); } static HRESULT String_toLowerCase(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,

1 0

Jacek Caban : jscript: Use stack_push_int in interp_bneg.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 424b63119c06796b75f60653c9850d97bf3951a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424b63119c06796b75f60653c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 10:49:26 2012 +0200 jscript: Use stack_push_int in interp_bneg. --- dlls/jscript/engine.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 35339c8..e15ef52 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2268,7 +2268,7 @@ static HRESULT interp_gteq(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.8 */ static HRESULT interp_bneg(exec_ctx_t *ctx) { - VARIANT *v, r; + VARIANT *v; INT i; HRESULT hres; @@ -2280,9 +2280,7 @@ static HRESULT interp_bneg(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - V_VT(&r) = VT_I4; - V_I4(&r) = ~i; - return stack_push(ctx, &r); + return stack_push_int(ctx, ~i); } /* ECMA-262 3rd Edition 11.4.9 */

1 0

Alexandre Julliard : winex11: Store the DC bounds rectangle as a pointer.
by Alexandre Julliard April 27, 2012

April 27, 2012

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

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetVertexDeclaration ().
by Alexandre Julliard April 27, 2012

April 27, 2012

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

Bruno Jesus : regedit: Allows semicolon comments.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 1fba4a6886821ec783fc24bf3a6d77dc6d5698f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fba4a6886821ec783fc24bf3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Apr 27 01:40:47 2012 -0300 regedit: Allows semicolon comments. --- programs/regedit/regproc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f82d793..7065bfd 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -610,7 +610,7 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode) /****************************************************************************** * Processes a registry file. - * Correctly processes comments (in # form), line continuation. + * Correctly processes comments (in # and ; form), line continuation. * * Parameters: * in - input stream to read from @@ -710,7 +710,7 @@ static void processRegLinesA(FILE *in, char* first_chars) } /* If it is a comment line then discard it and go around again */ - if (line [0] == '#') { + if (line [0] == '#' || line [0] == ';') { s = line; continue; } @@ -837,7 +837,7 @@ static void processRegLinesW(FILE *in) } /* If it is a comment line then discard it and go around again */ - if (*line == '#') { + if (*line == '#' || *line == ';') { if (*s_eol == '\r' && *(s_eol+1) == '\n') line = s_eol + 2; else

1 0

Bruno Jesus : regedit: Fix item text reading in regedit.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: c3821f6c6389e8087a916b6a313d94c39e08abf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3821f6c6389e8087a916b6a3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 26 23:51:08 2012 -0300 regedit: Fix item text reading in regedit. --- programs/regedit/listview.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index bbd5dd6..6559116 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -58,20 +58,17 @@ LPWSTR GetItemText(HWND hwndLV, UINT item) { LPWSTR newStr, curStr; unsigned int maxLen = 128; + if (item == 0) return NULL; /* first item is ALWAYS a default */ curStr = HeapAlloc(GetProcessHeap(), 0, maxLen * sizeof(WCHAR)); if (!curStr) return NULL; - if (item == 0) { /* first item is ALWAYS a default */ - HeapFree(GetProcessHeap(), 0, curStr); - return NULL; - } do { - ListView_GetItemTextW(hwndLV, item, 0, curStr, maxLen * sizeof(WCHAR)); + ListView_GetItemTextW(hwndLV, item, 0, curStr, maxLen); if (lstrlenW(curStr) < maxLen - 1) return curStr; - newStr = HeapReAlloc(GetProcessHeap(), 0, curStr, maxLen * 2 * sizeof(WCHAR)); + maxLen *= 2; + newStr = HeapReAlloc(GetProcessHeap(), 0, curStr, maxLen * sizeof(WCHAR)); if (!newStr) break; curStr = newStr; - maxLen *= 2; } while (TRUE); HeapFree(GetProcessHeap(), 0, curStr); return NULL;

1 0