March 2010 - Wine-Commits - list.winehq.org

Justin Chevrier : gdiplus: Add GdipGetPathGradientSurroundColorCount stub with tests.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 402781376436347d098417c4830145e37f795967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402781376436347d098417c48… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Sat Mar 27 17:55:27 2010 -0400 gdiplus: Add GdipGetPathGradientSurroundColorCount stub with tests. --- dlls/gdiplus/brush.c | 10 ++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/tests/brush.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 5582a95..8994b87 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1167,6 +1167,16 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient *brush, INT *count) +{ + TRACE("(%p, %p)\n", brush, count); + + if (!brush || !count) + return InvalidParameter; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient *brush, GpWrapMode *wrapmode) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e6cea5a..14e7fbf 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -338,7 +338,7 @@ @ stub GdipGetPathGradientPresetBlendCount @ stdcall GdipGetPathGradientRect(ptr ptr) @ stdcall GdipGetPathGradientRectI(ptr ptr) -@ stub GdipGetPathGradientSurroundColorCount +@ stdcall GdipGetPathGradientSurroundColorCount(ptr ptr) @ stdcall GdipGetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipGetPathGradientTransform @ stdcall GdipGetPathGradientWrapMode(ptr ptr) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 0ee4dd4..0effcf4 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -646,6 +646,61 @@ static void test_linelinearblend(void) expect(Ok, status); } +static void test_gradientsurroundcolorcount(void) +{ + GpStatus status; + GpPathGradient *grad; + ARGB *color; + INT count = 3; + + status = GdipCreatePathGradient(blendcount_ptf, 2, WrapModeClamp, &grad); + expect(Ok, status); + + color = GdipAlloc(sizeof(ARGB[3])); + + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(InvalidParameter, status); + GdipFree(color); + + count = 2; + + color = GdipAlloc(sizeof(ARGB[2])); + + color[0] = 0x00ff0000; + color[1] = 0x0000ff00; + + status = GdipSetPathGradientSurroundColorsWithCount(NULL, color, &count); + expect(InvalidParameter, status); + + status = GdipSetPathGradientSurroundColorsWithCount(grad, NULL, &count); + expect(InvalidParameter, status); + + /* WinXP crashes on this test */ + if(0) + { + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, NULL); + expect(InvalidParameter, status); + } + + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + todo_wine expect(Ok, status); + expect(2, count); + + status = GdipGetPathGradientSurroundColorCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientSurroundColorCount(grad, NULL); + expect(InvalidParameter, status); + + count = 0; + status = GdipGetPathGradientSurroundColorCount(grad, &count); + todo_wine expect(Ok, status); + todo_wine expect(2, count); + + GdipFree(color); + GdipDeleteBrush((GpBrush*)grad); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -669,6 +724,7 @@ START_TEST(brush) test_gradientgetrect(); test_lineblend(); test_linelinearblend(); + test_gradientsurroundcolorcount(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 9672367..8312e16 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -563,6 +563,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient*,REAL,REAL); GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient*, GDIPCONST ARGB*,INT*); GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode); +GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient*,INT*); /* PathIterator */ GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator**,GpPath*);

1 0

Piotr Caban : msvcrt: Avoid using scalb function.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 8a57f501c84410f8478c930698d37ea7601cd55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a57f501c84410f8478c93069… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 29 00:01:13 2010 +0200 msvcrt: Avoid using scalb function. --- dlls/msvcrt/math.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ae408b9..317c8eb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -465,10 +465,8 @@ unsigned int CDECL _rotr(unsigned int num, int shift) */ double CDECL MSVCRT__scalb(double num, MSVCRT_long power) { - /* Note - Can't forward directly as libc expects y as double */ - double dblpower = (double)power; if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return scalb(num, dblpower); + return ldexp(num, power); } /*********************************************************************

1 0

Alexandre Julliard : ole32: Always start the 64-bit version of rpcss. exe on Wow64.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: a8e2f4327fa0204dfcf4222444643f2a4cf1242b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e2f4327fa0204dfcf422244… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 15:47:52 2010 +0200 ole32: Always start the 64-bit version of rpcss.exe on Wow64. --- dlls/ole32/moniker.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index a7c5a11..2fb03ae 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -127,6 +127,7 @@ static BOOL start_rpcss(void) WCHAR cmd[MAX_PATH]; static const WCHAR rpcss[] = {'\\','r','p','c','s','s','.','e','x','e',0}; BOOL rslt; + void *redir; TRACE("\n"); @@ -135,7 +136,9 @@ static BOOL start_rpcss(void) GetSystemDirectoryW( cmd, MAX_PATH - sizeof(rpcss)/sizeof(WCHAR) ); strcatW( cmd, rpcss ); + Wow64DisableWow64FsRedirection( &redir ); rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + Wow64RevertWow64FsRedirection( redir ); if (rslt) {

1 0

Alexandre Julliard : user32: Always start the 64-bit version of wineboot. exe on Wow64.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: bb0c660ed0d45325d15776210643dad66656a7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb0c660ed0d45325d15776210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 15:48:25 2010 +0200 user32: Always start the 64-bit version of wineboot.exe on Wow64. --- dlls/user32/user_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 19482e4..2c2b256 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -357,6 +357,7 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) WCHAR cmdline[MAX_PATH + 64]; PROCESS_INFORMATION pi; STARTUPINFOW si; + void *redir; GetSystemDirectoryW( app, MAX_PATH - sizeof(winebootW)/sizeof(WCHAR) ); strcatW( app, winebootW ); @@ -372,11 +373,14 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) memset( &si, 0, sizeof si ); si.cb = sizeof si; + Wow64DisableWow64FsRedirection( &redir ); if (!CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { + Wow64RevertWow64FsRedirection( redir ); ERR( "Failed to run %s\n", debugstr_w(cmdline) ); return FALSE; } + Wow64RevertWow64FsRedirection( redir ); CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); return TRUE;

1 0

Alexandre Julliard : start: Pass a valid filename argument to FormatMessage .
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 0f01be47ee915228627d9cfd1a055b55919b527c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f01be47ee915228627d9cfd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 12:26:55 2010 +0200 start: Pass a valid filename argument to FormatMessage. --- programs/start/start.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 0c26cbc..81c1d27 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -70,8 +70,9 @@ static void output(const WCHAR *message) then terminate. */ -static void fatal_error(const WCHAR *msg, DWORD error_code) +static void fatal_error(const WCHAR *msg, DWORD error_code, const WCHAR *filename) { + DWORD_PTR args[1]; LPVOID lpMsgBuf; int status; static const WCHAR colonsW[] = { ':', ' ', 0 }; @@ -79,7 +80,9 @@ static void fatal_error(const WCHAR *msg, DWORD error_code) output(msg); output(colonsW); - status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPWSTR) & lpMsgBuf, 0, NULL); + args[0] = (DWORD_PTR)filename; + status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, + NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, (__ms_va_list *)args ); if (!status) { WINE_ERR("FormatMessage failed\n"); @@ -92,7 +95,7 @@ static void fatal_error(const WCHAR *msg, DWORD error_code) ExitProcess(1); } -static void fatal_string_error(int which, DWORD error_code) +static void fatal_string_error(int which, DWORD error_code, const WCHAR *filename) { WCHAR msg[2048]; @@ -100,7 +103,7 @@ static void fatal_string_error(int which, DWORD error_code) msg, sizeof(msg)/sizeof(WCHAR))) WINE_ERR("LoadString failed, error %d\n", GetLastError()); - fatal_error(msg, error_code); + fatal_error(msg, error_code, filename); } static void fatal_string(int which) @@ -332,7 +335,7 @@ int wmain (int argc, WCHAR *argv[]) &startup_info, /* lpStartupInfo */ &process_information /* lpProcessInformation */ )) { - fatal_string_error(STRING_EXECFAIL, GetLastError()); + fatal_string_error(STRING_EXECFAIL, GetLastError(), sei.lpFile); } sei.hProcess = process_information.hProcess; goto done; @@ -340,7 +343,7 @@ int wmain (int argc, WCHAR *argv[]) } if (!ShellExecuteExW(&sei)) - fatal_string_error(STRING_EXECFAIL, GetLastError()); + fatal_string_error(STRING_EXECFAIL, GetLastError(), sei.lpFile); done: HeapFree( GetProcessHeap(), 0, args );

1 0

Vincent Povirk : gdiplus: Store a reference to the image in image graphics contexts.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: af7b8efc94fa3f9db80ceb064e90fff5a16b708f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7b8efc94fa3f9db80ceb064… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Mar 28 20:05:04 2010 -0500 gdiplus: Store a reference to the image in image graphics contexts. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/image.c | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index ca1cba6..fb2c1f5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -112,6 +112,7 @@ struct GpGraphics{ HDC hdc; HWND hwnd; BOOL owndc; + GpImage *image; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1af73da..8736b23 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1946,6 +1946,7 @@ GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, GpGraphics **graphics) { HDC hdc; + GpStatus stat; TRACE("%p %p\n", image, graphics); @@ -1965,7 +1966,12 @@ GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, ((GpBitmap*)image)->hdc = hdc; } - return GdipCreateFromHDC(hdc, graphics); + stat = GdipCreateFromHDC(hdc, graphics); + + if (stat == Ok) + (*graphics)->image = image; + + return stat; } GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height)

1 0

Alexandre Julliard : shdocvw: Always start the 64-bit version of winemenubuilder.exe on Wow64.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 3397a8b44b9cb1c270418f198201d7d30386fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3397a8b44b9cb1c270418f198… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 15:48:17 2010 +0200 shdocvw: Always start the 64-bit version of winemenubuilder.exe on Wow64. --- dlls/shdocvw/intshcut.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index b389ec3..32dab6d 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -74,6 +74,7 @@ static BOOL run_winemenubuilder( const WCHAR *args ) PROCESS_INFORMATION pi; BOOL ret; WCHAR app[MAX_PATH]; + void *redir; GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); strcatW( app, menubuilder ); @@ -91,7 +92,9 @@ static BOOL run_winemenubuilder( const WCHAR *args ) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); + Wow64DisableWow64FsRedirection( &redir ); ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + Wow64RevertWow64FsRedirection( redir ); heap_free( buffer );

1 0

Piotr Caban : msvcrt: Rename functions conflicting with mingw headers.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: b90320652d94f31d0e4d8722568ca2826cf929c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90320652d94f31d0e4d87225… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 29 00:00:26 2010 +0200 msvcrt: Rename functions conflicting with mingw headers. --- dlls/msvcrt/file.c | 10 +++++----- dlls/msvcrt/math.c | 6 +++--- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 7 ++++--- dlls/msvcrt/msvcrt.spec | 20 ++++++++++---------- dlls/msvcrt/process.c | 14 +++++++------- dlls/msvcrt/string.c | 2 +- dlls/msvcrt/wcs.c | 2 +- 8 files changed, 32 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b90320652d94f31d0e4d8…

1 0

Alexandre Julliard : shell32: Always start the 64-bit version of winemenubuilder.exe on Wow64.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: 3bac3fb712c28844bea5ad39cad55936d80e7d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bac3fb712c28844bea5ad39c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 15:48:11 2010 +0200 shell32: Always start the 64-bit version of winemenubuilder.exe on Wow64. --- dlls/shell32/shelllink.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 88a188f..a7eb7f9 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -415,6 +415,7 @@ BOOL run_winemenubuilder( const WCHAR *args ) PROCESS_INFORMATION pi; BOOL ret; WCHAR app[MAX_PATH]; + void *redir; GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); strcatW( app, menubuilder ); @@ -432,7 +433,9 @@ BOOL run_winemenubuilder( const WCHAR *args ) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); + Wow64DisableWow64FsRedirection( &redir ); ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + Wow64RevertWow64FsRedirection( redir ); HeapFree( GetProcessHeap(), 0, buffer );

1 0

Alexandre Julliard : rpcrt4: Always start the 64-bit version of rpcss. exe on Wow64.
by Alexandre Julliard March 29, 2010

March 29, 2010

Module: wine Branch: master Commit: d1c7029b34d1de78774325fe3336580801e064ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c7029b34d1de78774325fe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 15:47:58 2010 +0200 rpcrt4: Always start the 64-bit version of rpcss.exe on Wow64. --- dlls/rpcrt4/rpc_epmap.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index b81367e..ac7f25b 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -82,6 +82,7 @@ static BOOL start_rpcss(void) WCHAR cmd[MAX_PATH]; static const WCHAR rpcss[] = {'\\','r','p','c','s','s','.','e','x','e',0}; BOOL rslt; + void *redir; TRACE("\n"); @@ -90,7 +91,9 @@ static BOOL start_rpcss(void) GetSystemDirectoryW( cmd, MAX_PATH - sizeof(rpcss)/sizeof(WCHAR) ); lstrcatW( cmd, rpcss ); + Wow64DisableWow64FsRedirection( &redir ); rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + Wow64RevertWow64FsRedirection( redir ); if (rslt) {

1 0