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

Piotr Caban : msvcrt: Added support for %W and %U format in strftime.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: bfa3045816d2d9caf64b4a13fb06fb77b6361ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa3045816d2d9caf64b4a13f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 12:26:16 2012 +0200 msvcrt: Added support for %W and %U format in strftime. --- dlls/msvcrt/tests/time.c | 26 ++++++++++++++++++++++++++ dlls/msvcrt/time.c | 16 +++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 6fb7491..c6e2a9c 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -704,6 +704,32 @@ static void test_strftime(void) ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "AM"), "got %s\n", bufA); + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + gmt_tm->tm_wday = 0; + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "01"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "00"), "got %s\n", bufA); + + gmt_tm->tm_yday = 365; + retA = strftime(bufA, 256, "%U", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "53"), "got %s\n", bufA); + + retA = strftime(bufA, 256, "%W", gmt_tm); + ok(retA == 2, "expected 2, got %ld\n", retA); + ok(!strcmp(bufA, "52"), "got %s\n", bufA); + gmt_tm->tm_mon = 1; gmt_tm->tm_mday = 30; retA = strftime(bufA, 256, "%c", gmt_tm); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 69bd391..bc68218 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1077,9 +1077,19 @@ MSVCRT_size_t CDECL _Strftime(char *str, MSVCRT_size_t max, const char *format, break; case 'U': case 'W': - FIXME("format %c not yet supported (%x)\n", *format, alternate); - str[0] = 0; - return 0; + if(mstm->tm_wday<0 || mstm->tm_wday>6 || mstm->tm_yday<0 || mstm->tm_yday>365) + goto einval_error; + if(*format == 'U') + tmp = mstm->tm_wday; + else if(!mstm->tm_wday) + tmp = 6; + else + tmp = mstm->tm_wday-1; + + tmp = mstm->tm_yday/7 + (tmp<=mstm->tm_yday%7); + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 53)) + return 0; + break; case '%': str[ret++] = '%'; break;

1 0

Huw Davies : wineps: Add a helper to find an input slot.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 61efdbfd5f1e840d06545bf1c36c1372b145acb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61efdbfd5f1e840d06545bf1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 16 13:18:37 2012 +0100 wineps: Add a helper to find an input slot. --- dlls/wineps.drv/driver.c | 19 +++++++++++++------ dlls/wineps.drv/ps.c | 13 +++---------- dlls/wineps.drv/psdrv.h | 2 ++ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 926daf5..9e2753d 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -45,6 +45,17 @@ static inline int paper_size_from_points( float size ) return size * 254 / 72; } +INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ) +{ + INPUTSLOT *slot; + + LIST_FOR_EACH_ENTRY( slot, &ppd->InputSlots, INPUTSLOT, entry ) + if (slot->WinBin == dm->dmPublic.u1.s1.dmDefaultSource) + return slot; + + return NULL; +} + /************************************************************************ * * PSDRV_MergeDevmodes @@ -117,13 +128,9 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, PSDRV_DEVMODE *dm2, PRINTERINFO *p if (dm2->dmPublic.dmFields & DM_DEFAULTSOURCE) { - INPUTSLOT *slot; - - LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) - if(slot->WinBin == dm2->dmPublic.u1.s1.dmDefaultSource) - break; + INPUTSLOT *slot = find_slot( pi->ppd, dm2 ); - if (&slot->entry != &pi->ppd->InputSlots) + if (slot) { dm1->dmPublic.u1.s1.dmDefaultSource = dm2->dmPublic.u1.s1.dmDefaultSource; TRACE("Changing bin to '%s'\n", slot->FullName); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 1e30736..1501d33 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -301,7 +301,7 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *escaped_title; - INPUTSLOT *slot; + INPUTSLOT *slot = find_slot( physDev->pi->ppd, physDev->Devmode ); PAGESIZE *page; DUPLEX *duplex; int win_duplex; @@ -350,15 +350,8 @@ INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title ) write_spool(dev, copies_buf, strlen(copies_buf)); } - LIST_FOR_EACH_ENTRY( slot, &physDev->pi->ppd->InputSlots, INPUTSLOT, entry ) { - if(slot->WinBin == physDev->Devmode->dmPublic.u1.s1.dmDefaultSource) { - if(slot->InvocationString) { - PSDRV_WriteFeature(dev, "*InputSlot", slot->Name, - slot->InvocationString); - break; - } - } - } + if (slot && slot->InvocationString) + PSDRV_WriteFeature( dev, "*InputSlot", slot->Name, slot->InvocationString ); LIST_FOR_EACH_ENTRY(page, &physDev->pi->ppd->PageSizes, PAGESIZE, entry) { if(page->WinPage == physDev->Devmode->dmPublic.u1.s1.dmPaperSize) { diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 2ffe28a..911c1e4 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -401,6 +401,8 @@ extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; +extern INPUTSLOT *find_slot( PPD *ppd, PSDRV_DEVMODE *dm ); + /* GDI driver functions */ extern BOOL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : riched20/tests: Don't cast NULL to an integer.
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Henri Verbeet : wined3d: Move the present() back buffer check to the common wined3d_swapchain_present() code.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 3ba95e2f3ea0664de3a6965bb3803914ba611824 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba95e2f3ea0664de3a6965bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:13 2012 +0200 wined3d: Move the present() back buffer check to the common wined3d_swapchain_present() code. --- dlls/wined3d/swapchain.c | 27 ++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 2674ce6..0e363a5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -145,10 +145,17 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), dst_window_override, dirty_region, flags); + if (!swapchain->back_buffers) + { + WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + wined3d_swapchain_set_window(swapchain, dst_window_override); - return swapchain->swapchain_ops->swapchain_present(swapchain, - src_rect, dst_rect, dirty_region, flags); + swapchain->swapchain_ops->swapchain_present(swapchain, src_rect, dst_rect, dirty_region, flags); + + return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, @@ -446,7 +453,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, } } -static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, +static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { struct wined3d_surface *back_buffer = swapchain->back_buffers[0]; @@ -461,7 +468,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R { context_release(context); WARN("Invalid context, skipping present.\n"); - return WINED3D_OK; + return; } gl_info = context->gl_info; @@ -685,9 +692,6 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R } context_release(context); - - TRACE("returning\n"); - return WINED3D_OK; } static const struct wined3d_swapchain_ops swapchain_gl_ops = @@ -740,16 +744,11 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r ReleaseDC(window, dst_dc); } -static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, +static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const RECT *src_rect_in, const RECT *dst_rect_in, const RGNDATA *dirty_region, DWORD flags) { struct wined3d_surface *front, *back; - if (!swapchain->back_buffers) - { - WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } front = swapchain->front_buffer; back = swapchain->back_buffers[0]; @@ -806,8 +805,6 @@ static HRESULT swapchain_gdi_present(struct wined3d_swapchain *swapchain, const } x11_copy_to_screen(swapchain, NULL); - - return WINED3D_OK; } static const struct wined3d_swapchain_ops swapchain_gdi_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 472c21a..bf99835 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2443,7 +2443,7 @@ struct wined3d_rendertarget_view struct wined3d_swapchain_ops { - HRESULT (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, + void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, const RGNDATA *dirty_region, DWORD flags); };

1 0

Alexandre Julliard : gdi32: Add helper functions for manipulating bounds rectangles.
by Alexandre Julliard April 16, 2012

April 16, 2012

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 April 16, 2012

April 16, 2012

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

Michael Stefaniuc : gdi32/tests: Fix typo (comparison with itself).
by Alexandre Julliard April 16, 2012

April 16, 2012

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

Michael Stefaniuc : oleaut32/tests: Compare the correct variants.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: bb83794e2873f50aee3b4f1a8d5fb84a2b1c5e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb83794e2873f50aee3b4f1a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Apr 15 21:50:42 2012 +0200 oleaut32/tests: Compare the correct variants. --- dlls/oleaut32/tests/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 06686e0..4f7b843 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1286,7 +1286,7 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - ok(SafeArrayGetDim(V_ARRAY(&v)) == SafeArrayGetDim(V_ARRAY(&v)), "array dims differ\n"); + ok(SafeArrayGetDim(V_ARRAY(&v)) == SafeArrayGetDim(V_ARRAY(&v2)), "array dims differ\n"); SafeArrayGetLBound(V_ARRAY(&v), 1, &bound); SafeArrayGetLBound(V_ARRAY(&v2), 1, &bound2); ok(bound == bound2, "array lbounds differ\n"); @@ -1329,7 +1329,7 @@ static void test_marshal_VARIANT(void) next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); ok(next == buffer + expected, "got %p expect %p\n", next, buffer + expected); ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); - ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v)), "array dims differ\n"); + ok(SafeArrayGetDim(*V_ARRAYREF(&v)) == SafeArrayGetDim(*V_ARRAYREF(&v2)), "array dims differ\n"); SafeArrayGetLBound(*V_ARRAYREF(&v), 1, &bound); SafeArrayGetLBound(*V_ARRAYREF(&v2), 1, &bound2); ok(bound == bound2, "array lbounds differ\n");

1 0

Henri Verbeet : ddraw/tests: Add a helper function to create a material.
by Alexandre Julliard April 16, 2012

April 16, 2012

Module: wine Branch: master Commit: 3f0af44ffbfdca20d8e0a685ea6155847ecd2162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0af44ffbfdca20d8e0a685e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 15 18:57:15 2012 +0200 ddraw/tests: Add a helper function to create a material. --- dlls/ddraw/tests/ddraw1.c | 102 ++++++++++++++------------------------ dlls/ddraw/tests/ddraw2.c | 121 +++++++++++++++------------------------------ 2 files changed, 78 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f0af44ffbfdca20d8e0a…

1 0

Marcus Meissner : strmbase: Use correct *ppv (Coverity).
by Alexandre Julliard April 16, 2012

April 16, 2012

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