February 2009 - Wine-commits

Dylan Smith : hhctrl.ocx: Handle quoted filenames in doWinMain.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 68e887004a40db5442a73c71780ae07eca3d0a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e887004a40db5442a73c717… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Feb 16 12:35:56 2009 -0500 hhctrl.ocx: Handle quoted filenames in doWinMain. --- dlls/hhctrl.ocx/hhctrl.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index a224b64..5e707b9 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -249,11 +249,28 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) { MSG msg; + int len, buflen; + WCHAR *filename; + char *endq = NULL; hh_process = TRUE; /* FIXME: Check szCmdLine for bad arguments */ - HtmlHelpA(GetDesktopWindow(), szCmdLine, HH_DISPLAY_TOPIC, 0); + if (*szCmdLine == '\"') + endq = strchr(++szCmdLine, '\"'); + + if (endq) + len = endq - szCmdLine; + else + len = strlen(szCmdLine); + buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1; + filename = heap_alloc(buflen * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen); + filename[buflen-1] = 0; + + HtmlHelpW(GetDesktopWindow(), filename, HH_DISPLAY_TOPIC, 0); + + heap_free(filename); while (GetMessageW(&msg, 0, 0, 0)) {

1 0

Michael Stefaniuc : gdi32: SetAbortProc is not a 16bit function but a 32bit one.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 056359cc4eddecb0aa3cfd1b459ee5ae93ecebe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056359cc4eddecb0aa3cfd1b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 16 22:09:01 2009 +0100 gdi32: SetAbortProc is not a 16bit function but a 32bit one. --- dlls/gdi32/printdrv.c | 15 +++++++++++++++ dlls/gdi32/printdrv16.c | 14 -------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 7d2cb42..18f9db7 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -197,3 +197,18 @@ INT WINAPI AbortDoc(HDC hdc) release_dc_ptr( dc ); return ret; } + + +/********************************************************************** + * SetAbortProc (GDI32.@) + * + */ +INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc) +{ + DC *dc = get_dc_ptr( hdc ); + + if (!dc) return FALSE; + dc->pAbortProc = abrtprc; + release_dc_ptr( dc ); + return TRUE; +} diff --git a/dlls/gdi32/printdrv16.c b/dlls/gdi32/printdrv16.c index 03043c1..e7954ee 100644 --- a/dlls/gdi32/printdrv16.c +++ b/dlls/gdi32/printdrv16.c @@ -122,20 +122,6 @@ INT16 WINAPI SetAbortProc16(HDC16 hdc16, ABORTPROC16 abrtprc) return TRUE; } -/********************************************************************** - * SetAbortProc (GDI32.@) - * - */ -INT WINAPI SetAbortProc(HDC hdc, ABORTPROC abrtprc) -{ - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return FALSE; - dc->pAbortProc = abrtprc; - release_dc_ptr( dc ); - return TRUE; -} - /****************** misc. printer related functions */

1 0

Alistair Leslie-Hughes : urlmon: Fix PutProperty_CLASSIDPROP check under win98 to w2k.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: ef2f455cdf08eb371c30535483aa498f208b7bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2f455cdf08eb371c3053548… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 17 20:06:18 2009 +1100 urlmon: Fix PutProperty_CLASSIDPROP check under win98 to w2k. --- dlls/urlmon/tests/url.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index e5895c4..094d21d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -69,6 +69,12 @@ DEFINE_GUID(IID_IBindStatusCallbackHolder,0x79eac9cc,0xbaf9,0x11ce,0x8c,0x82,0x0 expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + #define CLEAR_CALLED(func) \ expect_ ## func = called_ ## func = FALSE @@ -313,7 +319,7 @@ static DWORD WINAPI thread_proc(PVOID arg) CHECK_CALLED(Obj_OnProgress_BEGINSYNCOPERATION); CHECK_CALLED(CreateInstance); CHECK_CALLED(PutProperty_MIMETYPEPROP); - CHECK_CALLED(PutProperty_CLASSIDPROP); + CHECK_CALLED_BROKEN(PutProperty_CLASSIDPROP); CHECK_CALLED(Load); CHECK_CALLED(Obj_OnProgress_ENDSYNCOPERATION); CHECK_CALLED(OnObjectAvailable); @@ -612,7 +618,7 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, CHECK_CALLED(Obj_OnProgress_BEGINSYNCOPERATION); CHECK_CALLED(CreateInstance); CHECK_CALLED(PutProperty_MIMETYPEPROP); - CHECK_CALLED(PutProperty_CLASSIDPROP); + CHECK_CALLED_BROKEN(PutProperty_CLASSIDPROP); CHECK_CALLED(Load); CHECK_CALLED(Obj_OnProgress_ENDSYNCOPERATION); CHECK_CALLED(OnObjectAvailable);

1 0

Nikolay Sivov : gdiplus: Fix a docheader typo, add some missed headers.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: a3048451d9a1f019a90aeac3628a60bb9d30eabf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3048451d9a1f019a90aeac36… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Feb 17 12:29:47 2009 +0300 gdiplus: Fix a docheader typo, add some missed headers. --- dlls/gdiplus/region.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index e42c5cd..8fe5e26 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -339,6 +339,9 @@ GpStatus WINGDIPAPI GdipCombineRegionRectI(GpRegion *region, return GdipCombineRegionRect(region, &rectf, mode); } +/***************************************************************************** + * GdipCombineRegionRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCombineRegionRegion(GpRegion *region1, GpRegion *region2, CombineMode mode) { @@ -544,6 +547,9 @@ GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, return Ok; } +/***************************************************************************** + * GdipCreateRegionRectI [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipCreateRegionRectI(GDIPCONST GpRect *rect, GpRegion **region) { @@ -621,6 +627,9 @@ GpStatus WINGDIPAPI GdipCreateRegionHrgn(HRGN hrgn, GpRegion **region) return stat; } +/***************************************************************************** + * GdipDeleteRegion [GDIPLUS.@] + */ GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) { TRACE("%p\n", region); @@ -799,7 +808,7 @@ static void write_element(const region_element* element, DWORD *buffer, * * RETURNS * SUCCESS: Ok - * FAILURE: InvalidParamter + * FAILURE: InvalidParameter * * NOTES * The header contains the size, a checksum, a version string, and the number

1 0

Alexandre Julliard : makefiles: Do not install progman, uninstaller and winebrowser in the bin directory.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: 2274fc1ade49e736b5e7c40e4ebd484b771959f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2274fc1ade49e736b5e7c40e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 17 12:46:08 2009 +0100 makefiles: Do not install progman, uninstaller and winebrowser in the bin directory. --- configure | 3 --- configure.ac | 6 +++--- tools/make_makefiles | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure b/configure index ad96f4b..5a91b4e 100755 --- a/configure +++ b/configure @@ -27629,7 +27629,6 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/progman/Makefile" test "x$enable_progman" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ progman" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ - progman" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ progman" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/progman/Makefile: programs/progman/Makefile.in programs/Makeprog.rules" @@ -27740,7 +27739,6 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/uninstaller/Makefile" test "x$enable_uninstaller" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ uninstaller" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ - uninstaller" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ uninstaller" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/uninstaller/Makefile: programs/uninstaller/Makefile.in programs/Makeprog.rules" @@ -27777,7 +27775,6 @@ ALL_MAKEFILES="$ALL_MAKEFILES \\ programs/winebrowser/Makefile" test "x$enable_winebrowser" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\ winebrowser" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\ - winebrowser" && ALL_PROGRAM_BIN_INSTALL_DIRS="$ALL_PROGRAM_BIN_INSTALL_DIRS \\ winebrowser" ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS programs/winebrowser/Makefile: programs/winebrowser/Makefile.in programs/Makeprog.rules" diff --git a/configure.ac b/configure.ac index 4453592..d1c8d7a 100644 --- a/configure.ac +++ b/configure.ac @@ -2282,7 +2282,7 @@ WINE_CONFIG_MAKEFILE([programs/msiexec/Makefile],[programs/Makeprog.rules],[prog WINE_CONFIG_MAKEFILE([programs/net/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/notepad/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/oleview/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) -WINE_CONFIG_MAKEFILE([programs/progman/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/progman/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/reg/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/regedit/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/regsvr32/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) @@ -2294,11 +2294,11 @@ WINE_CONFIG_MAKEFILE([programs/spoolsv/Makefile],[programs/Makeprog.rules],[prog WINE_CONFIG_MAKEFILE([programs/start/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/svchost/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/taskmgr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) -WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/uninstaller/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/unlodctr/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/view/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS]) WINE_CONFIG_MAKEFILE([programs/wineboot/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) -WINE_CONFIG_MAKEFILE([programs/winebrowser/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) +WINE_CONFIG_MAKEFILE([programs/winebrowser/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/winecfg/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/wineconsole/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) WINE_CONFIG_MAKEFILE([programs/winedbg/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS]) diff --git a/tools/make_makefiles b/tools/make_makefiles index d134d8e..e73fabb 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -34,12 +34,9 @@ my %bin_install = ( "msiexec" => 1, "notepad" => 1, - "progman" => 1, "regedit" => 1, "regsvr32" => 1, - "uninstaller" => 1, "wineboot" => 1, - "winebrowser" => 1, "winecfg" => 1, "wineconsole" => 1, "winedbg" => 1,

1 0

Alexandre Julliard : ntdll/tests: Don' t pass uninitialized object attributes to symlink functions.
by Alexandre Julliard 17 Feb '09

17 Feb '09

Module: wine Branch: master Commit: c1a8484089a0203ca105388c497d7bc2819f77ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a8484089a0203ca105388c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 17 12:46:44 2009 +0100 ntdll/tests: Don't pass uninitialized object attributes to symlink functions. --- dlls/ntdll/tests/om.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index bde6032..ed3eb46 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -536,6 +536,7 @@ static void test_symboliclink(void) IO_STATUS_BLOCK iosb; /* No name and/or no attributes */ + InitializeObjectAttributes(&attr, NULL, 0, 0, NULL); SYMLNK_TEST_CREATE_OPEN_FAILURE2(NULL, "", "", STATUS_ACCESS_VIOLATION, STATUS_INVALID_PARAMETER) status = pNtCreateSymbolicLinkObject(&h, SYMBOLIC_LINK_QUERY, NULL, NULL);

1 0

Alexandre Julliard : user32: Make sure to not corrupt last error in the message spy.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 2b87a5dbc222f66eafaa03f3daaab43e57e946fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b87a5dbc222f66eafaa03f3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 16 15:02:32 2009 +0100 user32: Make sure to not corrupt last error in the message spy. --- dlls/user32/spy.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index beb21fc..8cd926b 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2080,10 +2080,6 @@ const char *SPY_GetClassLongOffsetName( INT offset ) */ static void SPY_GetClassName( SPY_INSTANCE *sp_e ) { - DWORD save_error; - - /* save and restore error code over the next call */ - save_error = GetLastError(); /* special code to detect a property sheet dialog */ if ((GetClassLongW(sp_e->msg_hwnd, GCW_ATOM) == WC_DIALOG) && (GetPropW(sp_e->msg_hwnd, PropSheetInfoStr))) { @@ -2092,7 +2088,6 @@ static void SPY_GetClassName( SPY_INSTANCE *sp_e ) else { GetClassNameW(sp_e->msg_hwnd, sp_e->wnd_class, sizeof(sp_e->wnd_class)/sizeof(WCHAR)); } - SetLastError(save_error); } /*********************************************************************** @@ -2190,6 +2185,7 @@ static void SPY_GetWndName( SPY_INSTANCE *sp_e ) const char *SPY_GetMsgName( UINT msg, HWND hWnd ) { SPY_INSTANCE ext_sp_e; + DWORD save_error = GetLastError(); ext_sp_e.msgnum = msg; ext_sp_e.msg_hwnd = hWnd; @@ -2197,6 +2193,7 @@ const char *SPY_GetMsgName( UINT msg, HWND hWnd ) ext_sp_e.wParam = 0; ext_sp_e.wnd_class[0] = 0; SPY_GetMsgStuff(&ext_sp_e); + SetLastError( save_error ); return wine_dbg_sprintf("%s", ext_sp_e.msg_name); } @@ -2519,6 +2516,7 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg, { SPY_INSTANCE sp_e; int indent; + DWORD save_error = GetLastError(); if (!TRACE_ON(message) || SPY_EXCLUDE(msg)) return; @@ -2581,6 +2579,7 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg, break; } set_indent_level( indent + SPY_INDENT_UNIT ); + SetLastError( save_error ); } @@ -2592,6 +2591,7 @@ void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn, { SPY_INSTANCE sp_e; int indent; + DWORD save_error = GetLastError(); if (!TRACE_ON(message) || SPY_EXCLUDE(msg) || (SPY_ExcludeDWP && (iFlag == SPY_RESULT_DEFWND16 || iFlag == SPY_RESULT_DEFWND)) ) @@ -2645,7 +2645,8 @@ void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn, indent, "", hWnd, debugstr_w(sp_e.wnd_name), msg, sp_e.msg_name ); break; - } + } + SetLastError( save_error ); }

1 0

Aurimas Fischer : winecfg: Add Lithuanian translation.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: b18f5ee51bb0ffa928075117e065739acf0b63a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18f5ee51bb0ffa928075117e… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Mon Feb 16 15:31:22 2009 +0200 winecfg: Add Lithuanian translation. --- programs/winecfg/Lt.rc | 329 +++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/winecfg.rc | 1 + 2 files changed, 330 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b18f5ee51bb0ffa928075…

1 0

Huw Davies : gdi32/tests: Only test the lowest byte of GdiRealizationInfo flags so that the test passes on Vista .
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 3fa05ae6a7c08f9534badfeffbe02db9e00ab47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa05ae6a7c08f9534badfeff… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 16 14:07:29 2009 +0000 gdi32/tests: Only test the lowest byte of GdiRealizationInfo flags so that the test passes on Vista. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index cc80265..cf6d3f9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2580,7 +2580,7 @@ static void test_GdiRealizationInfo(void) memset(info, 0xcc, sizeof(info)); r = pGdiRealizationInfo(hdc, info); ok(r != 0, "ret 0\n"); - ok(info[0] == 1, "info[0] = %x for the system font\n", info[0]); + ok((info[0] & 0xf) == 1, "info[0] = %x for the system font\n", info[0]); ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); if (!is_truetype_font_installed("Arial")) @@ -2599,7 +2599,7 @@ static void test_GdiRealizationInfo(void) memset(info, 0xcc, sizeof(info)); r = pGdiRealizationInfo(hdc, info); ok(r != 0, "ret 0\n"); - ok(info[0] == 3, "info[0] = %x for arial\n", info[0]); + ok((info[0] & 0xf) == 3, "info[0] = %x for arial\n", info[0]); ok(info[3] == 0xcccccccc, "structure longer than 3 dwords\n"); DeleteObject(SelectObject(hdc, hfont_old));

1 0

Nikolay Sivov : gdiplus/tests: Use expectf macro for floating point tests.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: ba42bf380a77b73f8e747ec2369f92e376d97ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba42bf380a77b73f8e747ec23… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Feb 12 04:29:09 2009 +0300 gdiplus/tests: Use expectf macro for floating point tests. --- dlls/gdiplus/tests/image.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 84a67d4..f6a3bab 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -28,6 +28,7 @@ #include "wine/test.h" #define expect(expected, got) ok(((UINT)got) == ((UINT)expected), "Expected %.8x, got %.8x\n", (UINT)expected, (UINT)got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo) { @@ -167,8 +168,8 @@ static void test_GetImageDimension(void) h = -1; stat = GdipGetImageDimension((GpImage*)bm,&w,&h); expect(Ok, stat); - ok(fabs(WIDTH - w) < 0.0001, "Width wrong\n"); - ok(fabs(HEIGHT - h) < 0.0001, "Height wrong\n"); + expectf(WIDTH, w); + expectf(HEIGHT, h); GdipDisposeImage((GpImage*)bm); } @@ -274,8 +275,8 @@ static void test_SavingImages(void) stat = GdipGetImageDimension((GpImage*)bm, &w, &h); if (stat != Ok) goto cleanup; - ok((fabs(w - WIDTH) < 0.01) && (fabs(h - HEIGHT) < 0.01), - "Saved image dimensions are different!\n"); + expectf(WIDTH, w); + expectf(HEIGHT, h); cleanup: GdipFree(codecs); @@ -471,8 +472,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); expect(Ok, stat); expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); - ok(fabs(WIDTH1 - width) < .0001, "width wrong\n"); - ok(fabs(HEIGHT1 - height) < .0001, "height wrong\n"); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); GlobalFree(hbm); @@ -484,8 +485,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)gpbm, __LINE__, TRUE); expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); - ok(fabs(WIDTH2 - width) < .0001, "width wrong\n"); - ok(fabs(HEIGHT2 - height) < .0001, "height wrong\n"); + expectf(WIDTH2, width); + expectf(HEIGHT2, height); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); GlobalFree(hbm); @@ -505,8 +506,8 @@ static void test_GdipCreateBitmapFromHBITMAP(void) stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); expect(Ok, stat); expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); - ok(fabs(WIDTH1 - width) < .0001, "width wrong\n"); - ok(fabs(HEIGHT1 - height) < .0001, "height wrong\n"); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); @@ -572,8 +573,8 @@ static void test_GdipCloneImage(void) expect(Ok, stat); /* Treat FP values carefully */ - ok(fabsf(rectF.Width-WIDTH)<1e-5, "Expected: %d, got %.05f\n", WIDTH, rectF.Width); - ok(fabsf(rectF.Height-HEIGHT)<1e-5, "Expected: %d, got %.05f\n", HEIGHT, rectF.Height); + expectf((REAL)WIDTH, rectF.Width); + expectf((REAL)HEIGHT, rectF.Height); stat = GdipDisposeImage(image_dest); expect(Ok, stat);

1 0