wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

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: 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

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

Alexandre Julliard : gdi32: Store the bounds rectangle as a pointer in the DIB driver.
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 3ea711dd7ce7c56b5d6294241d2c41be16c3a9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea711dd7ce7c56b5d6294241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 25 13:15:24 2012 +0200 gdi32: Store the bounds rectangle as a pointer in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 10 +++++----- dlls/gdi32/dibdrv/dc.c | 33 +++++++++++---------------------- dlls/gdi32/dibdrv/dibdrv.h | 4 ++-- dlls/gdi32/dibdrv/graphics.c | 15 ++++++++------- 4 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 2d088c3..e35c4cb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -964,7 +964,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info clip = tmp_rgn; } else if (!clip) clip = pdev->clip; - add_clipped_bounds( &pdev->bounds, &dst->visrect, clip ); + add_clipped_bounds( pdev, &dst->visrect, clip ); } if (!get_clipped_rects( dib, &dst->visrect, clip, &clipped_rects )) @@ -1021,7 +1021,7 @@ DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_b init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); src_dib.bits.is_copy = bits->is_copy; - add_clipped_bounds( &pdev->bounds, &dst->visrect, pdev->clip ); + add_clipped_bounds( pdev, &dst->visrect, pdev->clip ); return blend_rect( &pdev->dib, &dst->visrect, &src_dib, &src->visrect, pdev->clip, blend ); update_format: @@ -1407,7 +1407,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; @@ -1419,7 +1419,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; @@ -1431,7 +1431,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = vert[2].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); if (!gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds )) ret = FALSE; } break; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b861f79..00d6c01 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -298,19 +298,22 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl return clip_rects->count; } -void add_clipped_bounds( RECT *bounds, const RECT *rect, HRGN clip ) +void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) { const WINEREGION *region; RECT rc; + if (!dev->bounds) return; if (clip) { if (!(region = get_wine_region( clip ))) return; - if (!rect) add_bounds_rect( bounds, &region->extents ); - else if (intersect_rect( &rc, rect, &region->extents )) add_bounds_rect( bounds, &rc ); + if (!rect) rc = region->extents; + else intersect_rect( &rc, rect, &region->extents ); release_wine_region( clip ); } - else if (rect) add_bounds_rect( bounds, rect ); + else rc = *rect; + + add_bounds_rect( dev->bounds, &rc ); } /********************************************************************** @@ -325,7 +328,6 @@ static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, clear_dib_info(&pdev->dib); clear_dib_info(&pdev->brush.dib); clear_dib_info(&pdev->pen_brush.dib); - reset_bounds( &pdev->bounds ); push_dc_driver( dev, &pdev->dev, &dib_driver ); return TRUE; } @@ -395,28 +397,15 @@ static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) } /*********************************************************************** - * dibdrv_GetBoundsRect - */ -static UINT dibdrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) -{ - dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - - if (is_rect_empty( &pdev->bounds )) return DCB_RESET; - if (rect) *rect = pdev->bounds; - if (flags & DCB_RESET) reset_bounds( &pdev->bounds ); - return DCB_SET; -} - -/*********************************************************************** * dibdrv_SetBoundsRect */ static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - if (is_rect_empty( &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 */ } /*********************************************************************** @@ -640,7 +629,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ - dibdrv_GetBoundsRect, /* pGetBoundsRect */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7efb882..9431ff0 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -96,7 +96,7 @@ typedef struct dibdrv_physdev dib_brush brush; HRGN clip; - RECT bounds; + RECT *bounds; /* pen */ DWORD pen_style, pen_endcap, pen_join; @@ -247,7 +247,7 @@ extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; -extern void add_clipped_bounds( RECT *bounds, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; +extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e904efd..ddf6205 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -92,6 +92,7 @@ static void add_pen_lines_bounds( dibdrv_physdev *dev, int count, const POINT *p RECT bounds, rect; int width = 0; + if (!dev->bounds) return; reset_bounds( &bounds ); if (dev->pen_uses_region) @@ -127,7 +128,7 @@ static void add_pen_lines_bounds( dibdrv_physdev *dev, int count, const POINT *p points++; } - add_clipped_bounds( &dev->bounds, &bounds, dev->clip ); + add_clipped_bounds( dev, &bounds, dev->clip ); } /* compute the points for the first quadrant of an ellipse, counterclockwise from the x axis */ @@ -703,7 +704,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, origin.y += metrics.gmCellIncY; } } - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); done: free_clipped_rects( &clipped_rects ); @@ -805,7 +806,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; - rgn = CreateRectRgn( 0, 0, 0, 0 ); + if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; row.left = x; row.right = x + 1; row.top = y; @@ -813,7 +814,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) fill_row( &pdev->dib, pdev->clip, &row, pixel, type, rgn ); - add_clipped_bounds( &pdev->bounds, NULL, rgn ); + add_clipped_bounds( pdev, NULL, rgn ); brush_region( pdev, rgn ); DeleteObject( rgn ); @@ -908,7 +909,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); - add_bounds_rect( &pdev->bounds, &dst->visrect ); + add_clipped_bounds( pdev, &dst->visrect, 0 ); return brush_rect( pdev, &pdev->brush, &dst->visrect, pdev->clip, get_rop2_from_rop(rop) ); } @@ -938,7 +939,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) } release_wine_region( rgn ); - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); return TRUE; } @@ -1277,7 +1278,7 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) rect.top = pt.y; rect.right = rect.left + 1; rect.bottom = rect.top + 1; - add_clipped_bounds( &pdev->bounds, &rect, pdev->clip ); + add_clipped_bounds( pdev, &rect, pdev->clip ); /* SetPixel doesn't do the 1bpp massaging like other fg colors */ pixel = get_pixel_color( pdev, color, FALSE );

1 0

Alexandre Julliard : gdi32: Add a SetBoundsRect driver entry point.
by Alexandre Julliard 27 Apr '12

27 Apr '12

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 27 Apr '12

27 Apr '12

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 27 Apr '12

27 Apr '12

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

Bruno Jesus : regedit: Allows semicolon comments.
by Alexandre Julliard 27 Apr '12

27 Apr '12

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 27 Apr '12

27 Apr '12

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

Nikolay Sivov : msxml3: Query for handler interface instead of using what was passed in Variant directly .
by Alexandre Julliard 27 Apr '12

27 Apr '12

Module: wine Branch: master Commit: 28335fb39bb55121d594041ca2d3cfd9a51e6e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28335fb39bb55121d594041ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 26 23:54:22 2012 +0400 msxml3: Query for handler interface instead of using what was passed in Variant directly. --- dlls/msxml3/saxreader.c | 31 ++++++--- dlls/msxml3/tests/saxreader.c | 138 +++++++++++++++++++++++++++++++++-------- 2 files changed, 132 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28335fb39bb55121d5940…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012