May 2008 - Wine-commits - list.winehq.org

Andrej Sinicyn : taskmgr: German translation.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: a3e181812ebeab2984c6286eccc149b75a8ee34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e181812ebeab2984c6286ec… Author: Andrej Sinicyn <Andrej.Sinicyn(a)gmx.de> Date: Tue May 13 15:58:02 2008 +0200 taskmgr: German translation. --- programs/taskmgr/De.rc | 134 ++++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3e181812ebeab2984c62…

1 0

Huw Davies : gdi32: Move a couple of TRACEs to the beginning of functions.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 68420896eb1ff57ba7bd9736310c0aa76ef29115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68420896eb1ff57ba7bd97363… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 13 11:48:24 2008 +0100 gdi32: Move a couple of TRACEs to the beginning of functions. --- dlls/gdi32/bitblt.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index e91ae53..813deff 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -65,6 +65,9 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, BOOL ret = FALSE; DC *dcDst, *dcSrc; + TRACE("hdcSrc=%p %d,%d -> hdcDest=%p %d,%d %dx%d rop=%06x\n", + hdcSrc, xSrc, ySrc, hdcDst, xDst, yDst, width, height, rop); + if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; if (dcDst->funcs->pBitBlt) @@ -72,8 +75,6 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width, update_dc( dcDst ); dcSrc = get_dc_ptr( hdcSrc ); if (dcSrc) update_dc( dcSrc ); - TRACE("hdcSrc=%p %d,%d -> hdcDest=%p %d,%d %dx%d rop=%06x\n", - hdcSrc, xSrc, ySrc, hdcDst, xDst, yDst, width, height, rop); ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, dcSrc ? dcSrc->physDev : NULL, xSrc, ySrc, rop ); @@ -143,6 +144,11 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, BOOL ret = FALSE; DC *dcDst, *dcSrc; + TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06x\n", + hdcSrc, xSrc, ySrc, widthSrc, heightSrc, + hdcDst, xDst, yDst, widthDst, heightDst, rop ); + + if (!(dcDst = get_dc_ptr( hdcDst ))) return FALSE; if (dcDst->funcs->pStretchBlt) @@ -152,10 +158,6 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst, update_dc( dcDst ); update_dc( dcSrc ); - TRACE("%p %d,%d %dx%d -> %p %d,%d %dx%d rop=%06x\n", - hdcSrc, xSrc, ySrc, widthSrc, heightSrc, - hdcDst, xDst, yDst, widthDst, heightDst, rop ); - ret = dcDst->funcs->pStretchBlt( dcDst->physDev, xDst, yDst, widthDst, heightDst, dcSrc->physDev, xSrc, ySrc, widthSrc, heightSrc, rop );

1 0

Dmitry Timoshkov : gdi32: Add more font substitution tests, make them pass under Wine.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: a5d288f08c08dc19d217093fdf8622605c92a4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d288f08c08dc19d217093fd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 13 22:10:05 2008 +0900 gdi32: Add more font substitution tests, make them pass under Wine. --- dlls/gdi32/freetype.c | 5 ++- dlls/gdi32/tests/font.c | 86 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 414a85e..643191b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2965,7 +2965,7 @@ static void calc_hash(FONT_DESC *pfd) return; } -static GdiFont *find_in_cache(HFONT hfont, LOGFONTW *plf, XFORM *pxf, BOOL can_use_bitmap) +static GdiFont *find_in_cache(HFONT hfont, const LOGFONTW *plf, const XFORM *pxf, BOOL can_use_bitmap) { GdiFont *ret; FONT_DESC fd; @@ -3288,7 +3288,8 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) /* If requested charset was DEFAULT_CHARSET then try using charset corresponding to the current ansi codepage */ - if(!csi.fs.fsCsb[0]) { + if (!csi.fs.fsCsb[0] || lf.lfWeight == FW_DONTCARE) + { INT acp = GetACP(); if(!TranslateCharsetInfo((DWORD*)(INT_PTR)acp, &csi, TCI_SRCCODEPAGE)) { FIXME("TCI failed on codepage %d\n", acp); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c627521..d4abc8c 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1778,14 +1778,26 @@ static void test_nonexistent_font(void) LOGFONTA lf; HDC hdc; HFONT hfont; + CHARSETINFO csi; + INT cs, expected_cs; char buf[LF_FACESIZE]; - if (!is_truetype_font_installed("Arial Black")) + if (!is_truetype_font_installed("Arial") || + !is_truetype_font_installed("Times New Roman")) { - skip("Arial not installed\n"); + skip("Arial or Times New Roman not installed\n"); return; } + expected_cs = GetACP(); + if (!TranslateCharsetInfo(ULongToPtr(expected_cs), &csi, TCI_SRCCODEPAGE)) + { + skip("TranslateCharsetInfo failed for code page %d\n", expected_cs); + return; + } + expected_cs = csi.ciCharset; + trace("ACP %d -> charset %d\n", GetACP(), expected_cs); + hdc = GetDC(0); memset(&lf, 0, sizeof(lf)); @@ -1794,12 +1806,80 @@ static void test_nonexistent_font(void) lf.lfCharSet = ANSI_CHARSET; lf.lfPitchAndFamily = FF_SWISS; strcpy(lf.lfFaceName, "Nonexistent font"); - hfont = CreateFontIndirectA(&lf); hfont = SelectObject(hdc, hfont); GetTextFaceA(hdc, sizeof(buf), buf); ok(!lstrcmpiA(buf, "Arial"), "Got %s\n", buf); + cs = GetTextCharset(hdc); + ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs); DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -13; + lf.lfWeight = FW_DONTCARE; + strcpy(lf.lfFaceName, "Nonexistent font"); + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + GetTextFaceA(hdc, sizeof(buf), buf); +todo_wine /* Wine uses Arial for all substitutions */ + ok(!lstrcmpiA(buf, "Nonexistent font") /* XP, Vista */ || + !lstrcmpiA(buf, "MS Serif") /* Win9x */, "Got %s\n", buf); + cs = GetTextCharset(hdc); + ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -13; + lf.lfWeight = FW_REGULAR; + strcpy(lf.lfFaceName, "Nonexistent font"); + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + GetTextFaceA(hdc, sizeof(buf), buf); + ok(!lstrcmpiA(buf, "Arial") /* XP, Vista */ || + !lstrcmpiA(buf, "Times New Roman") /* Win9x */, "Got %s\n", buf); + cs = GetTextCharset(hdc); + ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -13; + lf.lfWeight = FW_DONTCARE; + strcpy(lf.lfFaceName, "Times New Roman CE"); + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + GetTextFaceA(hdc, sizeof(buf), buf); +todo_wine /* Wine uses Arial for all substitutions */ + ok(!lstrcmpiA(buf, "Times New Roman CE") /* XP, Vista */ || + !lstrcmpiA(buf, "MS Serif") /* Win9x */, "Got %s\n", buf); + cs = GetTextCharset(hdc); + ok(cs == expected_cs, "expected %d, got %d\n", expected_cs, cs); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -13; + lf.lfWeight = FW_DONTCARE; + strcpy(lf.lfFaceName, "Times New Roman"); + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + GetTextFaceA(hdc, sizeof(buf), buf); + ok(!lstrcmpiA(buf, "Times New Roman"), "Got %s\n", buf); + cs = GetTextCharset(hdc); + ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -13; + lf.lfWeight = FW_REGULAR; + strcpy(lf.lfFaceName, "Times New Roman CE"); + hfont = CreateFontIndirectA(&lf); + hfont = SelectObject(hdc, hfont); + GetTextFaceA(hdc, sizeof(buf), buf); + ok(!lstrcmpiA(buf, "Arial") /* XP, Vista */ || + !lstrcmpiA(buf, "Times New Roman") /* Win9x */, "Got %s\n", buf); + cs = GetTextCharset(hdc); + ok(cs == ANSI_CHARSET, "expected ANSI_CHARSET, got %d\n", cs); + DeleteObject(SelectObject(hdc, hfont)); + ReleaseDC(0, hdc); }

1 0

Vitaliy Margolen : dinput: Clamp joystick position values to min-max range.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: f2bdd8d96c5b0f3cf1f12568677d2ff57e7e6c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2bdd8d96c5b0f3cf1f125686… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue May 13 07:33:31 2008 -0600 dinput: Clamp joystick position values to min-max range. --- dlls/dinput/joystick_linuxinput.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 50befd9..13bc1fb 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -110,6 +110,10 @@ LONG joystick_map_axis(ObjProps *props, int val) ret = MulDiv( val, props->lMax - props->lMin, dev_range ) + (props->lMin + props->lMax) / 2; + /* Clamp in case or rounding errors */ + if (ret > props->lMax) ret = props->lMax; + else if (ret < props->lMin) ret = props->lMin; + TRACE( "(%d <%d> %d) -> (%d <%d> %d): val=%d ret=%d\n", props->lDevMin, dead_zone, props->lDevMax, props->lMin, props->lDeadZone, props->lMax,

1 0

Alexandre Julliard : winhelp.exe: Renamed to winhlp32.exe.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: a795f36af7c63d21d7d848d78993c83c66096b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a795f36af7c63d21d7d848d78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 18:43:27 2008 +0200 winhelp.exe: Renamed to winhlp32.exe. --- .gitignore | 4 ++-- Makefile.in | 4 ++-- configure | 4 ++-- configure.ac | 2 +- dlls/user32/winhelp.c | 4 ++-- programs/Makefile.in | 7 +++---- programs/{winhelp => winhlp32}/Bg.rc | 0 programs/{winhelp => winhlp32}/Cs.rc | 0 programs/{winhelp => winhlp32}/Da.rc | 0 programs/{winhelp => winhlp32}/De.rc | 0 programs/{winhelp => winhlp32}/En.rc | 0 programs/{winhelp => winhlp32}/Eo.rc | 0 programs/{winhelp => winhlp32}/Es.rc | 0 programs/{winhelp => winhlp32}/Fi.rc | 0 programs/{winhelp => winhlp32}/Fr.rc | 0 programs/{winhelp => winhlp32}/Hu.rc | 0 programs/{winhelp => winhlp32}/It.rc | 0 programs/{winhelp => winhlp32}/Ko.rc | 0 programs/{winhelp => winhlp32}/Makefile.in | 2 +- programs/{winhelp => winhlp32}/Nl.rc | 0 programs/{winhelp => winhlp32}/No.rc | 0 programs/{winhelp => winhlp32}/Pl.rc | 0 programs/{winhelp => winhlp32}/Pt.rc | 0 programs/{winhelp => winhlp32}/Rm.rc | 0 programs/{winhelp => winhlp32}/Ru.rc | 0 programs/{winhelp => winhlp32}/Si.rc | 0 programs/{winhelp => winhlp32}/Sk.rc | 0 programs/{winhelp => winhlp32}/Sv.rc | 0 programs/{winhelp => winhlp32}/Tr.rc | 0 programs/{winhelp => winhlp32}/Wa.rc | 0 programs/{winhelp => winhlp32}/Zh.rc | 0 programs/{winhelp => winhlp32}/callback.c | 0 programs/{winhelp => winhlp32}/hlpfile.c | 0 programs/{winhelp => winhlp32}/hlpfile.h | 0 programs/{winhelp => winhlp32}/macro.c | 0 programs/{winhelp => winhlp32}/macro.h | 0 programs/{winhelp => winhlp32}/macro.lex.l | 0 programs/{winhelp => winhlp32}/rsrc.rc | 0 programs/{winhelp => winhlp32}/string.c | 0 programs/{winhelp => winhlp32}/winhelp.c | 0 programs/{winhelp => winhlp32}/winhelp.h | 0 programs/{winhelp => winhlp32}/winhelp.ico | Bin 15086 -> 15086 bytes programs/{winhelp => winhlp32}/winhelp.svg | 0 programs/{winhelp => winhlp32}/winhelp_res.h | 0 tools/make_makefiles | 1 - tools/wine.inf.in | 4 +++- 46 files changed, 16 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a795f36af7c63d21d7d84…

1 0

Alexandre Julliard : kernel32: Add a builtin 16-bit winhelp.exe.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 4d1cf9c8c4f7d7e903b513b407f7b3e69afb328f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d1cf9c8c4f7d7e903b513b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 18:50:50 2008 +0200 kernel32: Add a builtin 16-bit winhelp.exe. This should be moved to winhlp32.exe once we support 16-bit modules in executables. --- .gitignore | 1 + dlls/Makefile.in | 3 +- dlls/kernel32/Makefile.in | 5 +++- dlls/kernel32/kernel16.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aaef463..9d9d24d 100644 --- a/.gitignore +++ b/.gitignore @@ -446,6 +446,7 @@ dlls/wined3d/libwined3d.def dlls/winedos/libwinedos.def dlls/wineps16.drv16 dlls/wing.dll16 +dlls/winhelp.exe16 dlls/wininet/libwininet.def dlls/wininet/tests/*.ok dlls/wininet/tests/testlist.c diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 755c75a..155db3b 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -426,6 +426,7 @@ WIN16_FILES = \ windebug.dll16 \ wineps16.drv16 \ wing.dll16 \ + winhelp.exe16 \ winnls.dll16 \ winoldap.mod16 \ winsock.dll16 \ @@ -455,7 +456,7 @@ dispdib.dll16 gdi.exe16 wing.dll16: imm.dll16: echo "imm32.dll" >$@ -comm.drv16 krnl386.exe16 stress.dll16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16 winoldap.mod16: +comm.drv16 krnl386.exe16 stress.dll16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16 winhelp.exe16 winoldap.mod16: echo "kernel32.dll" >$@ lzexpand.dll16: diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 3ac2567..b317953 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -96,7 +96,7 @@ MC_SRCS = \ nls/winerr_kor.mc EXTRA_OBJS = relay16asm.o -EXTRA_OBJS16 = winoldap.mod.o +EXTRA_OBJS16 = winhelp.exe.o winoldap.mod.o EXTRASUBDIRS = nls @@ -110,6 +110,9 @@ relay16asm.o: $(WINEBUILD) winoldap.mod.o: $(WINEBUILD) $(WINEBUILD) $(WINEBUILDFLAGS) --exe -o $@ --main-module $(MODULE) --entry WINOLDAP_EntryPoint +winhelp.exe.o: $(WINEBUILD) + $(WINEBUILD) $(WINEBUILDFLAGS) --exe -o $@ --main-module $(MODULE) --entry WINHELP_EntryPoint + # Special rules for 16-bit resource and spec files krnl386.exe.spec.o: krnl386.exe.spec version16.res diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index a330e57..01b5624 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -206,3 +206,61 @@ void WINAPI WINOLDAP_EntryPoint( CONTEXT86 *context ) HeapFree( GetProcessHeap(), 0, cmdline ); ExitThread( exit_code ); } + + +/************************************************************************** + * WINHELP entry point + * + * FIXME: should go into winhlp32.exe, but we don't support 16-bit modules in executables yet. + */ +void WINAPI WINHELP_EntryPoint( CONTEXT86 *context ) +{ + static const WCHAR winhlp32W[] = {'\\','w','i','n','h','l','p','3','2','.','e','x','e',0}; + PDB16 *psp; + INT len, total; + WCHAR *cmdline, *p; + PROCESS_INFORMATION info; + STARTUPINFOW startup; + DWORD count, exit_code = 1; + + InitTask16( context ); + + TRACE( "(ds=%x es=%x fs=%x gs=%x, bx=%04x cx=%04x di=%04x si=%x)\n", + context->SegDs, context->SegEs, context->SegFs, context->SegGs, + context->Ebx, context->Ecx, context->Edi, context->Esi ); + + psp = GlobalLock16( context->SegEs ); + len = MultiByteToWideChar( CP_ACP, 0, (char *)psp->cmdLine + 1, psp->cmdLine[0], NULL, 0 ); + total = (GetSystemDirectoryW( NULL, 0 ) + len + 1) * sizeof(WCHAR) + sizeof(winhlp32W); + cmdline = HeapAlloc( GetProcessHeap(), 0, total ); + GetSystemDirectoryW( cmdline, total ); + lstrcatW( cmdline, winhlp32W ); + p = cmdline + lstrlenW(cmdline); + if (len) + { + *p++ = ' '; + MultiByteToWideChar( CP_ACP, 0, (char *)psp->cmdLine + 1, psp->cmdLine[0], p, len ); + p[len] = 0; + } + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + + if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info )) + { + /* Give 10 seconds to the app to come up */ + if (wait_input_idle( info.hProcess, 10000 ) == WAIT_FAILED) + WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); + ReleaseThunkLock( &count ); + + WaitForSingleObject( info.hProcess, INFINITE ); + GetExitCodeProcess( info.hProcess, &exit_code ); + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); + } + else + ReleaseThunkLock( &count ); + + HeapFree( GetProcessHeap(), 0, cmdline ); + ExitThread( exit_code ); +}

1 0

Nikolay Sivov : gdiplus: Added GdipAddPathRectangle with tests.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: b5046c28cad7bbdcd17378de72ca4baafb71a465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5046c28cad7bbdcd17378de7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 13 01:33:34 2008 +0400 gdiplus: Added GdipAddPathRectangle with tests. --- dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/graphicspath.c | 50 +++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 29 +++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6b088b1..f2eb2b3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -25,8 +25,8 @@ @ stub GdipAddPathPieI @ stub GdipAddPathPolygon @ stub GdipAddPathPolygonI -@ stub GdipAddPathRectangle -@ stub GdipAddPathRectangleI +@ stdcall GdipAddPathRectangle(ptr long long long long) +@ stdcall GdipAddPathRectangleI(ptr long long long long) @ stub GdipAddPathRectangles @ stub GdipAddPathRectanglesI @ stub GdipAddPathString diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 84446aa..3b09e04 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -708,3 +708,53 @@ GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) return GdipTransformMatrixPoints(matrix, path->pathdata.Points, path->pathdata.Count); } + +GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, + REAL width, REAL height) +{ + GpPath *backup; + GpPointF ptf[2]; + GpStatus retstat; + BOOL old_new; + + if(!path || width < 0.0 || height < 0.0) + return InvalidParameter; + + /* make a backup copy of path data */ + if((retstat = GdipClonePath(path, &backup)) != Ok) + return retstat; + + /* rectangle should start as new path */ + old_new = path->newfigure; + path->newfigure = TRUE; + if((retstat = GdipAddPathLine(path,x,y,x+width,y)) != Ok){ + path->newfigure = old_new; + goto fail; + } + + ptf[0].X = x+width; + ptf[0].Y = y+height; + ptf[1].X = x; + ptf[1].Y = y+height; + + if((retstat = GdipAddPathLine2(path,(GDIPCONST GpPointF*)&ptf,2)) != Ok) goto fail; + path->pathdata.Types[path->pathdata.Count-1] |= PathPointTypeCloseSubpath; + + /* free backup */ + GdipDeletePath(backup); + return Ok; + +fail: + /* reverting */ + GdipDeletePath(path); + GdipClonePath(backup, &path); + GdipDeletePath(backup); + + return retstat; +} + +GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath *path, INT x, INT y, + INT width, INT height) +{ + return GdipAddPathRectangle(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 3860a2e..e797b44 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -545,6 +545,34 @@ static void test_linei(void) GdipDeletePath(path); } +static path_test_t rect_path[] = { + {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ + {105.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ + {105.0, 55.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 55.0, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0}, /*3*/ + + {100.0, 50.0, PathPointTypeStart, 0, 0}, /*4*/ + {220.0, 50.0, PathPointTypeLine, 0, 0}, /*5*/ + {220.0, 80.0, PathPointTypeLine, 0, 0}, /*6*/ + {100.0, 80.0, PathPointTypeLine | PathPointTypeCloseSubpath, 0, 0} /*7*/ + }; + +static void test_rect(void) +{ + GpStatus status; + GpPath *path; + + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathRectangle(path, 5.0, 5.0, 100.0, 50.0); + expect(Ok, status); + status = GdipAddPathRectangle(path, 100.0, 50.0, 120.0, 30.0); + expect(Ok, status); + + ok_path(path, rect_path, sizeof(rect_path)/sizeof(path_test_t), FALSE); + + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -564,6 +592,7 @@ START_TEST(graphicspath) test_pathpath(); test_ellipse(); test_linei(); + test_rect(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 835b290..0d21c82 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -213,6 +213,8 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath*,GDIPCONST GpPoint*,INT); GpStatus WINGDIPAPI GdipAddPathLineI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); +GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL); +GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*); GpStatus WINGDIPAPI GdipClosePathFigures(GpPath*);

1 0

Dan Kegel : d3d9: shademode_test: Increase slop in color comparison.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 7d989b7f7199b3551976bcdeace91e9a18550361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d989b7f7199b3551976bcdea… Author: Dan Kegel <dank(a)kegel.com> Date: Mon May 12 13:54:18 2008 -0700 d3d9: shademode_test: Increase slop in color comparison. --- dlls/d3d9/tests/visual.c | 43 +++++++++++++++++++++++++------------------ 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 998dcda..978e4f3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6367,13 +6367,32 @@ out: IDirect3D9_Release(d3d); } +/* Return true if color is near the expected value */ +static int color_near(DWORD color, DWORD expected) +{ + const BYTE slop = 1; + + BYTE r, g, b; + BYTE rx, gx, bx; + r = (color & 0x00ff0000) >> 16; + g = (color & 0x0000ff00) >> 8; + b = (color & 0x000000ff); + rx = (expected & 0x00ff0000) >> 16; + gx = (expected & 0x0000ff00) >> 8; + bx = (expected & 0x000000ff); + + return + ((r >= (rx - slop)) && (r <= (rx + slop))) && + ((g >= (gx - slop)) && (g <= (gx + slop))) && + ((b >= (bx - slop)) && (b <= (bx + slop))); +} + static void shademode_test(IDirect3DDevice9 *device) { /* Render a quad and try all of the different fixed function shading models. */ HRESULT hr; DWORD color0, color1; DWORD color0_gouraud = 0, color1_gouraud = 0; - BYTE r, g, b; DWORD shademode = D3DSHADE_FLAT; DWORD primtype = D3DPT_TRIANGLESTRIP; LPVOID data = NULL; @@ -6469,15 +6488,9 @@ static void shademode_test(IDirect3DDevice9 *device) case D3DSHADE_GOURAUD: /* Should be an interpolated blend */ - r = (color0 & 0x00ff0000) >> 16; - g = (color0 & 0x0000ff00) >> 8; - b = (color0 & 0x000000ff); - ok(r >= 0x0c && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, - "GOURAUD shading has color0 %08x, expected 0x000dca28\n", color0); - r = (color1 & 0x00ff0000) >> 16; - g = (color1 & 0x0000ff00) >> 8; - b = (color1 & 0x000000ff); - ok(r >= 0x0c && r <= 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + ok(color_near(color0, 0x000dca28), + "GOURAUD shading has color0 %08x, expected 0x00dca28\n", color0); + ok(color_near(color1, 0x000d45c7), "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); color0_gouraud = color0; @@ -6487,15 +6500,9 @@ static void shademode_test(IDirect3DDevice9 *device) break; case D3DSHADE_PHONG: /* Should be the same as GOURAUD, since no hardware implements this */ - r = (color0 & 0x00ff0000) >> 16; - g = (color0 & 0x0000ff00) >> 8; - b = (color0 & 0x000000ff); - ok(r >= 0x0c && r <= 0x0e && g == 0xca && b >= 0x27 && b <= 0x28, + ok(color_near(color0, 0x000dca28), "PHONG shading has color0 %08x, expected 0x000dca28\n", color0); - r = (color1 & 0x00ff0000) >> 16; - g = (color1 & 0x0000ff00) >> 8; - b = (color1 & 0x000000ff); - ok(r >= 0x0c && r <= 0x0d && g >= 0x44 && g <= 0x45 && b >= 0xc7 && b <= 0xc8, + ok(color_near(color1, 0x000d45c7), "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); ok(color0 == color0_gouraud, "difference between GOURAUD and PHONG shading detected: %08x %08x\n",

1 0

Nikolay Sivov : gdiplus: Make GdipSetPenDashArray return OutOfMemory on ( count <= 0).
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 22c6e576375296c96ff974a9c8b3a3da7dad11e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c6e576375296c96ff974a9c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 13 02:35:17 2008 +0400 gdiplus: Make GdipSetPenDashArray return OutOfMemory on (count <= 0). --- dlls/gdiplus/pen.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 7a692e3..9ef1482 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -251,6 +251,9 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, if(!pen || !dash) return InvalidParameter; + if(count <= 0) + return OutOfMemory; + for(i = 0; i < count; i++){ sum += dash[i]; if(dash[i] < 0.0)

1 0

Nikolay Sivov : gdiplus: Check count argument in GdipVectorTransformMatrixPoints.
by Alexandre Julliard 13 May '08

13 May '08

Module: wine Branch: master Commit: 2d6ae5dec6941f03e6c8014df5b0c89cab82788a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d6ae5dec6941f03e6c8014df… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 13 02:12:57 2008 +0400 gdiplus: Check count argument in GdipVectorTransformMatrixPoints. --- dlls/gdiplus/matrix.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index cf8b44b..eb83884 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -317,7 +317,7 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPoints(GpMatrix *matrix, GpPointF * REAL x, y; INT i; - if(!matrix || !pts) + if(!matrix || !pts || count <= 0) return InvalidParameter; for(i = 0; i < count; i++) @@ -338,6 +338,9 @@ GpStatus WINGDIPAPI GdipVectorTransformMatrixPointsI(GpMatrix *matrix, GpPoint * GpStatus ret; INT i; + if(count <= 0) + return InvalidParameter; + ptsF = GdipAlloc(sizeof(GpPointF) * count); if(!ptsF) return OutOfMemory;

1 0