wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Alexandre Julliard : gdi32: Add bounds tracking to all the DIB engine entry points.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 34457aa4c3bf445c7c95bf048422d37ac07a6bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34457aa4c3bf445c7c95bf048… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 11 14:49:30 2012 +0200 gdi32: Add bounds tracking to all the DIB engine entry points. --- dlls/gdi32/dibdrv/bitblt.c | 5 +++ dlls/gdi32/dibdrv/dc.c | 31 +++++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/graphics.c | 71 ++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/dc.c | 18 +++++----- dlls/gdi32/tests/dib.c | 16 ++------- 6 files changed, 118 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34457aa4c3bf445c7c95b…

1 0

Alexandre Julliard : gdi32: Add a GetBoundsRect driver entry point.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 582a2f511f23f4677434a8ffff70b1ba8a0a8567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582a2f511f23f4677434a8fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 16:17:14 2012 +0200 gdi32: Add a GetBoundsRect driver entry point. --- dlls/gdi32/dc.c | 28 ++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 1 + dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/freetype.c | 1 + dlls/gdi32/mfdrv/init.c | 10 ++++++++++ dlls/gdi32/path.c | 1 + dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 12 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c256f26..a35e4fa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -222,6 +222,22 @@ void update_dc( DC *dc ) /*********************************************************************** + * fetch_device_bounds + * + * Fetch and clear the device-specific bounds, and add them to the DC if necessary. + */ +static BOOL fetch_device_bounds( DC *dc ) +{ + RECT rect; + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetBoundsRect ); + UINT ret = physdev->funcs->pGetBoundsRect( physdev, &rect, DCB_RESET ); + + if (dc->bounds_enabled && ret == DCB_SET) add_bounds_rect( &dc->bounds, &rect ); + return ret; +} + + +/*********************************************************************** * DC_DeleteObject */ static BOOL DC_DeleteObject( HGDIOBJ handle ) @@ -1316,6 +1332,12 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) if ( !dc ) return 0; + if (!fetch_device_bounds( dc )) + { + release_dc_ptr( dc ); + return 0; + } + if (rect) { if (is_rect_empty( &dc->bounds )) @@ -1351,6 +1373,12 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) if ((flags & DCB_ENABLE) && (flags & DCB_DISABLE)) return 0; if (!(dc = get_dc_ptr( hdc ))) return 0; + if (!fetch_device_bounds( dc )) + { + release_dc_ptr( dc ); + return 0; + } + ret = (dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE) | (is_rect_empty( &dc->bounds ) ? DCB_RESET : DCB_SET); diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 9f1a633..af4f6e7 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -599,6 +599,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 36bf48f..43dcc20 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -311,6 +311,11 @@ static BOOL nulldrv_GdiRealizationInfo( PHYSDEV dev, void *info ) return FALSE; } +static UINT nulldrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +{ + return DCB_RESET; +} + static BOOL nulldrv_GetCharABCWidths( PHYSDEV dev, UINT first, UINT last, LPABC abc ) { return FALSE; @@ -758,6 +763,7 @@ const struct gdi_dc_funcs null_driver = nulldrv_FrameRgn, /* pFrameRgn */ nulldrv_GdiComment, /* pGdiComment */ nulldrv_GdiRealizationInfo, /* pGdiRealizationInfo */ + nulldrv_GetBoundsRect, /* pGetBoundsRect */ nulldrv_GetCharABCWidths, /* pGetCharABCWidths */ nulldrv_GetCharABCWidthsI, /* pGetCharABCWidthsI */ nulldrv_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 883ca5a..3356911 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -75,6 +75,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_FrameRgn, /* pFrameRgn */ EMFDRV_GdiComment, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0a5d3c3..3875e4f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7772,6 +7772,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ freetype_GdiRealizationInfo, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ freetype_GetCharABCWidths, /* pGetCharABCWidths */ freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index e02c6be..6ccbfe4 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -60,6 +60,15 @@ static INT MFDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_da /****************************************************************** + * MFDRV_GetBoundsRect + */ +static UINT MFDRV_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) +{ + return 0; +} + + +/****************************************************************** * MFDRV_GetDeviceCaps * *A very simple implementation that returns DT_METAFILE @@ -120,6 +129,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = MFDRV_FrameRgn, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + MFDRV_GetBoundsRect, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 058a48a..ec6348c 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2274,6 +2274,7 @@ const struct gdi_dc_funcs path_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 4b8567d..bc03b25 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -367,7 +367,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) SetMapMode( hdc, MM_TEXT ); Rectangle( hdc, 2, 2, 5, 5 ); type = GetBoundsRect( hdc, &rect, DCB_RESET ); - todo_wine ok( !type, "GetBoundsRect succeeded on %s\n", descr ); } else diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index b2597d7..c51a7e3 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -857,6 +857,7 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ PSDRV_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index de0d029..324e3f0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -491,6 +491,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ X11DRV_GetCharWidth, /* pGetCharWidth */ diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7c763fc..7cd87d9 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2684,6 +2684,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index eb64b36..01e2ebb 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -101,6 +101,7 @@ struct gdi_dc_funcs BOOL (*pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); BOOL (*pGdiComment)(PHYSDEV,UINT,CONST BYTE*); BOOL (*pGdiRealizationInfo)(PHYSDEV,void*); + UINT (*pGetBoundsRect)(PHYSDEV,RECT*,UINT); BOOL (*pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (*pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); BOOL (*pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); @@ -211,7 +212,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 24 +#define WINE_GDI_DRIVER_VERSION 25 static inline PHYSDEV get_physdev_entry_point( PHYSDEV dev, size_t offset ) {

1 0

Alexandre Julliard : gdi32: Add helper functions for manipulating bounds rectangles.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: b1ccff1a9c7bd3028821ae1745de83ef111daa28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ccff1a9c7bd3028821ae174… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 16:04:39 2012 +0200 gdi32: Add helper functions for manipulating bounds rectangles. --- dlls/gdi32/bitblt.c | 3 +- dlls/gdi32/dc.c | 52 +++++++++++++++++---------------------------- dlls/gdi32/font.c | 16 +++++++------- dlls/gdi32/gdi_private.h | 18 +++++++++++++++- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 71b8e8f..a97231c 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -408,8 +408,7 @@ BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, LPtoDP( dev->hdc, pts, nvert ); /* compute bounding rect of all the rectangles/triangles */ - dst.visrect.left = dst.visrect.top = INT_MAX; - dst.visrect.right = dst.visrect.bottom = INT_MIN; + reset_bounds( &dst.visrect ); for (i = 0; i < ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); i++) { ULONG v = ((ULONG *)grad_array)[i]; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 478100d..c256f26 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -114,6 +114,8 @@ DC *alloc_dc_ptr( WORD magic ) dc->xformVport2World = dc->xformWorld2Wnd; dc->vport2WorldValid = TRUE; + reset_bounds( &dc->bounds ); + if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) { HeapFree( GetProcessHeap(), 0, dc ); @@ -1316,21 +1318,23 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) if (rect) { - *rect = dc->BoundsRect; - ret = is_rect_empty( rect ) ? DCB_RESET : DCB_SET; - rect->left = max( rect->left, 0 ); - rect->top = max( rect->top, 0 ); - rect->right = min( rect->right, dc->vis_rect.right - dc->vis_rect.left ); - rect->bottom = min( rect->bottom, dc->vis_rect.bottom - dc->vis_rect.top ); + if (is_rect_empty( &dc->bounds )) + { + rect->left = rect->top = rect->right = rect->bottom = 0; + ret = DCB_RESET; + } + else + { + *rect = dc->bounds; + rect->left = max( rect->left, 0 ); + rect->top = max( rect->top, 0 ); + rect->right = min( rect->right, dc->vis_rect.right - dc->vis_rect.left ); + rect->bottom = min( rect->bottom, dc->vis_rect.bottom - dc->vis_rect.top ); + ret = DCB_SET; + } DPtoLP( hdc, (POINT *)rect, 2 ); } - if (flags & DCB_RESET) - { - dc->BoundsRect.left = 0; - dc->BoundsRect.top = 0; - dc->BoundsRect.right = 0; - dc->BoundsRect.bottom = 0; - } + if (flags & DCB_RESET) reset_bounds( &dc->bounds ); release_dc_ptr( dc ); return ret; } @@ -1348,32 +1352,16 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) if (!(dc = get_dc_ptr( hdc ))) return 0; ret = (dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE) | - (is_rect_empty( &dc->BoundsRect ) ? DCB_RESET : DCB_SET); + (is_rect_empty( &dc->bounds ) ? DCB_RESET : DCB_SET); - if (flags & DCB_RESET) - { - dc->BoundsRect.left = 0; - dc->BoundsRect.top = 0; - dc->BoundsRect.right = 0; - dc->BoundsRect.bottom = 0; - } + if (flags & DCB_RESET) reset_bounds( &dc->bounds ); if ((flags & DCB_ACCUMULATE) && rect) { RECT rc = *rect; LPtoDP( hdc, (POINT *)&rc, 2 ); - if (!is_rect_empty( &rc )) - { - if (!is_rect_empty( &dc->BoundsRect)) - { - dc->BoundsRect.left = min( dc->BoundsRect.left, rc.left ); - dc->BoundsRect.top = min( dc->BoundsRect.top, rc.top ); - dc->BoundsRect.right = max( dc->BoundsRect.right, rc.right ); - dc->BoundsRect.bottom = max( dc->BoundsRect.bottom, rc.bottom ); - } - else dc->BoundsRect = rc; - } + add_bounds_rect( &dc->bounds, &rc ); } if (flags & DCB_ENABLE) dc->bounds_enabled = TRUE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f5c44d8..d9c16a4 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1761,20 +1761,20 @@ static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) { int i; - RECT rect; + RECT rect, bounds; - rect.left = rect.top = INT_MAX; - rect.right = rect.bottom = INT_MIN; + reset_bounds( &bounds ); for (i = 0; i < count; i++) { GLYPHMETRICS metrics; if (get_glyph_bitmap( hdc, (UINT)str[i], aa_flags, &metrics, NULL )) continue; - rect.left = min( rect.left, x + metrics.gmptGlyphOrigin.x ); - rect.top = min( rect.top, y - metrics.gmptGlyphOrigin.y ); - rect.right = max( rect.right, x + metrics.gmptGlyphOrigin.x + (int)metrics.gmBlackBoxX ); - rect.bottom = max( rect.bottom, y - metrics.gmptGlyphOrigin.y + (int)metrics.gmBlackBoxY ); + rect.left = x + metrics.gmptGlyphOrigin.x; + rect.top = y - metrics.gmptGlyphOrigin.y; + rect.right = rect.left + metrics.gmBlackBoxX; + rect.bottom = rect.top + metrics.gmBlackBoxY; + add_bounds_rect( &bounds, &rect ); if (dx) { @@ -1791,7 +1791,7 @@ static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, y += metrics.gmCellIncY; } } - return rect; + return bounds; } /* helper for nulldrv_ExtTextOut */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5728a53..20b522d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -21,6 +21,7 @@ #ifndef __WINE_GDI_PRIVATE_H #define __WINE_GDI_PRIVATE_H +#include <limits.h> #include <math.h> #include <stdlib.h> #include <stdarg.h> @@ -149,7 +150,7 @@ typedef struct tagDC XFORM xformWorld2Vport; /* World-to-viewport transformation */ XFORM xformVport2World; /* Inverse of the above transformation */ BOOL vport2WorldValid; /* Is xformVport2World valid? */ - RECT BoundsRect; /* Current bounding rect */ + RECT bounds; /* Current bounding rect */ } DC; /* Certain functions will do no further processing if the driver returns this. @@ -457,6 +458,21 @@ static inline void get_bounding_rect( RECT *rect, int x, int y, int width, int h } } +static inline void reset_bounds( RECT *bounds ) +{ + bounds->left = bounds->top = INT_MAX; + bounds->right = bounds->bottom = INT_MIN; +} + +static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) +{ + if (is_rect_empty( rect )) return; + bounds->left = min( bounds->left, rect->left ); + bounds->top = min( bounds->top, rect->top ); + bounds->right = max( bounds->right, rect->right ); + bounds->bottom = max( bounds->bottom, rect->bottom ); +} + static inline int get_bitmap_stride( int width, int bpp ) { return ((width * bpp + 15) >> 3) & ~1;

1 0

Alexandre Julliard : po: Fix a msgid in the Danish translation.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: baa7c3b18ad912193927e37ccb7ce1df5abf816b URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa7c3b18ad912193927e37cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 12:09:32 2012 +0200 po: Fix a msgid in the Danish translation. --- po/da.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/da.po b/po/da.po index 3fea860..eb28626 100644 --- a/po/da.po +++ b/po/da.po @@ -3946,7 +3946,7 @@ msgid "Drive is already JOINed.\n" msgstr "Drev er allerede JOINed.\n" #: winerror.mc:541 -msgid "Drive is already SUBST-ed.\n" +msgid "Drive is already SUBSTed.\n" msgstr "Drev er allerede erstattet.\n" #: winerror.mc:546

1 0

Jacek Caban : jscript: Make sure to jump out of switch before entering implicit default clausule.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 05d59abc1c7a0463a90fc121252b0e342a3609d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d59abc1c7a0463a90fc1212… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 16 11:25:25 2012 +0200 jscript: Make sure to jump out of switch before entering implicit default clausule. --- dlls/jscript/compile.c | 3 +++ dlls/jscript/tests/lang.js | 10 ++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0a66348..b14c50b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1516,6 +1516,9 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t assert(i == case_cnt); if(!have_default) { + hres = push_instr_uint(ctx, OP_jmp, stat_ctx.break_label); + if(FAILED(hres)) + return hres; instr_ptr(ctx, default_jmp)->arg1.uint = ctx->code_off; if(!push_instr(ctx, OP_undefined)) return E_OUTOFMEMORY; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 41374e2..4d2efa3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -726,6 +726,16 @@ case 3: ok(false, "unexpected case 3"); } +(function() { + var i=0; + + switch(1) { + case 1: + i++; + } + return i; +})(); + tmp = eval("1"); ok(tmp === 1, "eval(\"1\") !== 1"); eval("{ ok(tmp === 1, 'eval: tmp !== 1'); } tmp = 2;");

1 0

Marcus Meissner : dmusic: Remove useless NULL check (Coverity).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: af5c45aac0f2725f200ca78d147043d9fac6f259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5c45aac0f2725f200ca78d1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 16 09:12:40 2012 +0200 dmusic: Remove useless NULL check (Coverity). --- dlls/dmusic/tests/dmusic.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 29ad642..c537afa 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -100,8 +100,7 @@ static void test_dmusic(void) if (port) IDirectMusicPort_Release(port); - if (dmusic) - IDirectMusic_Release(dmusic); + IDirectMusic_Release(dmusic); } START_TEST(dmusic)

1 0

Marcus Meissner : strmbase: Use correct *ppv (Coverity).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: b964758543d9d58b6f29d0c52716a358bee7dd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b964758543d9d58b6f29d0c52… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 16 08:53:47 2012 +0200 strmbase: Use correct *ppv (Coverity). --- dlls/strmbase/qualitycontrol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index b73f912..f6c9ea7 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); HRESULT QualityControlImpl_Create(IPin *input, IBaseFilter *self, QualityControlImpl **ppv) { QualityControlImpl *This; *ppv = HeapAlloc(GetProcessHeap(),0,sizeof(QualityControlImpl)); - if (!ppv) + if (!*ppv) return E_OUTOFMEMORY; This = *ppv; This->input = input;

1 0

Michael Stefaniuc : riched20/tests: Don't cast NULL to an integer.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 25ed3b9572a3b381887ed8563799aaefbe598a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ed3b9572a3b381887ed8563… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 22:02:17 2012 +0200 riched20/tests: Don't cast NULL to an integer. --- dlls/riched20/tests/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 83c24f8..9347ed7 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -6366,7 +6366,7 @@ static void test_format_rect(void) /* Reset to default rect and check how the format rect adjusts to window * resize and how it copes with very small windows */ - SendMessageA(hwnd, EM_SETRECT, 0, (LPARAM)NULL); + SendMessageA(hwnd, EM_SETRECT, 0, 0); MoveWindow(hwnd, 0, 0, 100, 30, FALSE); GetClientRect(hwnd, &clientRect);

1 0

Michael Stefaniuc : ntdll/tests: Avoid casting zero.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 6ea39eed8d2c603a1442828e97840c731a2caffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea39eed8d2c603a1442828e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:58:50 2012 +0200 ntdll/tests: Avoid casting zero. --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 63bc813..5ba577d 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1154,7 +1154,7 @@ static void test_RtlIpv4AddressToString(void) CHAR buffer[20]; CHAR *res; IN_ADDR ip; - DWORD len; + DWORD_PTR len; if (!pRtlIpv4AddressToStringA) { @@ -1175,7 +1175,7 @@ static void test_RtlIpv4AddressToString(void) res = pRtlIpv4AddressToStringA(&ip, NULL); ok( (res == (char *)~0) || - broken(res == (char *)0 + len), /* XP and w2003 */ + broken(res == (char *)len), /* XP and w2003 */ "got %p (expected ~0)\n", res); if (0) {

1 0

Michael Stefaniuc : gdi32/tests: Fix typo (comparison with itself).
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 7f293b00e874d51cf155938baebcb1f48c515173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f293b00e874d51cf155938ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:57:27 2012 +0200 gdi32/tests: Fix typo (comparison with itself). --- dlls/gdi32/tests/metafile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 0bbf9c3..df263c3 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1640,7 +1640,7 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr eto1 = (EMRPOLYBEZIER16*)emr1; eto2 = (EMRPOLYBEZIER16*)emr2; - diff = eto1->cpts != eto1->cpts; + diff = eto1->cpts != eto2->cpts; if(!diff) diff = memcmp(eto1->apts, eto2->apts, eto1->cpts * sizeof(POINTS)); } @@ -1651,7 +1651,7 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr eto1 = (EMRPOLYBEZIER*)emr1; eto2 = (EMRPOLYBEZIER*)emr2; - diff = eto1->cptl != eto1->cptl; + diff = eto1->cptl != eto2->cptl; if(!diff) diff = memcmp(eto1->aptl, eto2->aptl, eto1->cptl * sizeof(POINTL)); }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
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