wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Piotr Caban : msvcrt: Avoid using localtime_r.
by Alexandre Julliard 29 Mar '10

29 Mar '10

Module: wine Branch: master Commit: 8c954c09574c12a33a83c04d22ed460dc20048eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c954c09574c12a33a83c04d2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 29 00:01:53 2010 +0200 msvcrt: Avoid using localtime_r. --- dlls/msvcrt/time.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 3b7bb71..d5b0227 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -32,6 +32,7 @@ #include <limits.h> #include "msvcrt.h" +#include "mtdll.h" #include "winbase.h" #include "winnls.h" #include "wine/debug.h" @@ -127,16 +128,21 @@ MSVCRT___time32_t CDECL MSVCRT_mktime(struct MSVCRT_tm *mstm) */ struct MSVCRT_tm* CDECL MSVCRT__localtime64(const MSVCRT___time64_t* secs) { - struct tm tm; + struct tm *tm; thread_data_t *data; time_t seconds = *secs; if (seconds < 0) return NULL; - if (!localtime_r( &seconds, &tm )) return NULL; + _mlock(_TIME_LOCK); + if (!(tm = localtime( &seconds))) { + _munlock(_TIME_LOCK); + return NULL; + } data = msvcrt_get_thread_data(); - unix_tm_to_msvcrt( &data->time_buffer, &tm ); + unix_tm_to_msvcrt( &data->time_buffer, tm ); + _munlock(_TIME_LOCK); return &data->time_buffer; } @@ -492,12 +498,15 @@ void CDECL MSVCRT__tzset(void) struct tm *tmp; int zone_january, zone_july; + _mlock(_TIME_LOCK); t = (time(NULL) / seconds_in_year) * seconds_in_year; tmp = localtime(&t); zone_january = -tmp->tm_gmtoff; t += seconds_in_year / 2; tmp = localtime(&t); zone_july = -tmp->tm_gmtoff; + _munlock(_TIME_LOCK); + MSVCRT___daylight = (zone_january != zone_july); MSVCRT___timezone = max(zone_january, zone_july); }

1 0

Piotr Caban : msvcrt: Avoid using scalb function.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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

Piotr Caban : msvcrt: Rename functions conflicting with mingw headers.
by Alexandre Julliard 29 Mar '10

29 Mar '10

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 : 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

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 : 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 : 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 : 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 : 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 : 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

← Newer
1
...
9
10
11
12
13
14
15
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010