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

Henri Verbeet : ddrawex: Directly return the ddraw surface in IDirectDraw4Impl_GetSurfaceFromDC().
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 6ae96807c0c0e39d7b17b95b07f6cab645f7770d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae96807c0c0e39d7b17b95b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 29 13:31:08 2010 +0200 ddrawex: Directly return the ddraw surface in IDirectDraw4Impl_GetSurfaceFromDC(). --- dlls/ddrawex/ddraw.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c index 4c757ec..8c6b937 100644 --- a/dlls/ddrawex/ddraw.c +++ b/dlls/ddrawex/ddraw.c @@ -1320,20 +1320,9 @@ IDirectDraw4Impl_GetSurfaceFromDC(IDirectDraw4 *iface, IDirectDrawSurface4 **Surface) { IDirectDrawImpl *This = impl_from_dd4(iface); - IDirectDrawSurface4 *inner; HRESULT hr; TRACE("(%p)->(%p, %p)\n", This, hdc, Surface); - hr = IDirectDraw4_GetSurfaceFromDC(This->parent,hdc, &inner); - if(SUCCEEDED(hr)) - { - *Surface = dds_get_outer(inner); - IDirectDrawSurface4_AddRef(*Surface); - IDirectDrawSurface4_Release(inner); - } - else - { - *Surface = NULL; - } + hr = IDirectDraw4_GetSurfaceFromDC(This->parent,hdc, Surface); return hr; }

1 0

Vincent Povirk : gdiplus: Store a reference to the image in image graphics contexts.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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

Vincent Povirk : gdiplus: Don' t use gdi32 to draw to bitmaps with formats it can't handle.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 5433969ec8f46d3587658723a30aaa884430666c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5433969ec8f46d3587658723a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Mar 28 22:25:20 2010 -0500 gdiplus: Don't use gdi32 to draw to bitmaps with formats it can't handle. --- dlls/gdiplus/gdiplus_private.h | 23 ++++ dlls/gdiplus/graphics.c | 227 +++++++++++++++++++++++++++------------- 2 files changed, 179 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5433969ec8f46d3587658…

1 0

Alexandre Julliard : user32: Always start the 64-bit version of explorer. exe on Wow64.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 7bef6dc8b997af5079ac087454fcd36a468c9d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bef6dc8b997af5079ac08745… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 29 12:26:42 2010 +0200 user32: Always start the 64-bit version of explorer.exe on Wow64. --- dlls/user32/win.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3a61fc1..74ea0b3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1785,6 +1785,7 @@ HWND WINAPI GetDesktopWindow(void) WCHAR windir[MAX_PATH]; WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; + void *redir; memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); @@ -1793,11 +1794,13 @@ HWND WINAPI GetDesktopWindow(void) si.hStdOutput = 0; si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - GetWindowsDirectoryW( windir, MAX_PATH ); + GetSystemDirectoryW( windir, MAX_PATH ); strcpyW( app, windir ); strcatW( app, explorer ); strcpyW( cmdline, app ); strcatW( cmdline, args ); + + Wow64DisableWow64FsRedirection( &redir ); if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, windir, &si, &pi )) { @@ -1807,6 +1810,7 @@ HWND WINAPI GetDesktopWindow(void) CloseHandle( pi.hProcess ); } else WARN( "failed to start explorer, err %d\n", GetLastError() ); + Wow64RevertWow64FsRedirection( redir ); } else TRACE( "not starting explorer since winstation is not visible\n" );

1 0

Alexandre Julliard : ole32: Always start the 64-bit version of rpcss. exe on Wow64.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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 : rpcrt4: Always start the 64-bit version of rpcss. exe on Wow64.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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

Alexandre Julliard : shell32: Always start the 64-bit version of winemenubuilder.exe on Wow64.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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 : shdocvw: Always start the 64-bit version of winemenubuilder.exe on Wow64.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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

Alexandre Julliard : user32: Always start the 64-bit version of wineboot. exe on Wow64.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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 29 Mar '10

29 Mar '10

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