October 2009 - Wine-commits

Alexandre Julliard : kernel32: Make GetQueuedCompletionStatus return failure for I/O errors, as per MSDN.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: e487b560d9a54a5f21274ca5722bb2b268b9424e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e487b560d9a54a5f21274ca57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 16:52:35 2009 +0100 kernel32: Make GetQueuedCompletionStatus return failure for I/O errors, as per MSDN. --- dlls/kernel32/sync.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index be73c98..8330d4a 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -2127,7 +2127,9 @@ BOOL WINAPI GetQueuedCompletionStatus( HANDLE CompletionPort, LPDWORD lpNumberOf if (status == STATUS_SUCCESS) { *lpNumberOfBytesTransferred = iosb.Information; - return TRUE; + if (iosb.u.Status >= 0) return TRUE; + SetLastError( RtlNtStatusToDosError(iosb.u.Status) ); + return FALSE; } if (status == STATUS_TIMEOUT) SetLastError( WAIT_TIMEOUT );

1 0

Alexandre Julliard : libwine: Reserve some low memory space even without a preloader.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 1aa749d9e7ee54f221373ccb2b47bcb31ef6533f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa749d9e7ee54f221373ccb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 19:06:48 2009 +0100 libwine: Reserve some low memory space even without a preloader. --- libs/wine/mmap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index fc5b1d9..b400189 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -350,6 +350,12 @@ void mmap_init(void) reserve_malloc_space( 8 * 1024 * 1024 ); + if (!list_head( &reserved_areas )) + { + /* if we don't have a preloader, try to reserve some space below 2Gb */ + reserve_area( (void *)0x00110000, (void *)0x40000000 ); + } + /* check for a reserved area starting at the user space limit */ /* to avoid wasting time trying to allocate it again */ LIST_FOR_EACH( ptr, &reserved_areas )

1 0

Alexandre Julliard : ntdll: The meaning of the flag is inverted between RtlWow64EnableFsRedirection and RtlWow64EnableFsRedirectionEx .
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: aadf703fc090190e7db03934a8cb03ad033da27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadf703fc090190e7db03934a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 28 10:54:22 2009 +0100 ntdll: The meaning of the flag is inverted between RtlWow64EnableFsRedirection and RtlWow64EnableFsRedirectionEx. --- dlls/kernel32/path.c | 2 +- dlls/ntdll/directory.c | 6 ++-- dlls/ntdll/tests/directory.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 299db1c..e9463bb 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1583,7 +1583,7 @@ BOOL WINAPI Wow64DisableWow64FsRedirection( PVOID *old_value ) */ BOOL WINAPI Wow64RevertWow64FsRedirection( PVOID old_value ) { - NTSTATUS status = RtlWow64EnableFsRedirection( (UINT_PTR)old_value ); + NTSTATUS status = RtlWow64EnableFsRedirection( !old_value ); if (status) SetLastError( RtlNtStatusToDosError(status) ); return !status; } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 18628fc..e7f1dd4 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2413,11 +2413,11 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) /****************************************************************** * RtlWow64EnableFsRedirectionEx (NTDLL.@) */ -NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG enable, ULONG *old_value ) +NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) { if (!is_wow64) return STATUS_NOT_IMPLEMENTED; - *old_value = ntdll_get_thread_data()->wow64_redir; - ntdll_get_thread_data()->wow64_redir = enable; + *old_value = !ntdll_get_thread_data()->wow64_redir; + ntdll_get_thread_data()->wow64_redir = !disable; return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index ea722dd..60c0158 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -45,6 +45,8 @@ static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRIN static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen, LPCSTR src, DWORD srclen ); +static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirection)( BOOLEAN enable ); +static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG *old_value ); /* The attribute sets to test */ struct testfile_s { @@ -221,6 +223,49 @@ done: tear_down_attribute_test(testdirA); } +static void test_redirection(void) +{ + ULONG old, cur; + NTSTATUS status; + + if (!pRtlWow64EnableFsRedirection || !pRtlWow64EnableFsRedirectionEx) + { + skip( "Wow64 redirection not supported\n" ); + return; + } + status = pRtlWow64EnableFsRedirectionEx( FALSE, &old ); + if (status == STATUS_NOT_IMPLEMENTED) + { + skip( "Wow64 redirection not supported\n" ); + return; + } + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + + status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + + status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + + status = pRtlWow64EnableFsRedirection( TRUE ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, &cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + + status = pRtlWow64EnableFsRedirection( FALSE ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur ); + ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); + ok( cur == 1, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + + pRtlWow64EnableFsRedirectionEx( old, &cur ); +} + START_TEST(directory) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -237,6 +282,9 @@ START_TEST(directory) pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); pRtlInitUnicodeString = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString"); pRtlMultiByteToUnicodeN = (void *)GetProcAddress(hntdll,"RtlMultiByteToUnicodeN"); + pRtlWow64EnableFsRedirection = (void *)GetProcAddress(hntdll,"RtlWow64EnableFsRedirection"); + pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll,"RtlWow64EnableFsRedirectionEx"); test_NtQueryDirectoryFile(); + test_redirection(); }

1 0

Alexandre Julliard : kernel32: Specify the full application path when starting wineboot.exe.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 072b73705949859db4ea81ecc7669f14dbe69269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072b73705949859db4ea81ecc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 20:48:47 2009 +0100 kernel32: Specify the full application path when starting wineboot.exe. --- dlls/kernel32/process.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c2e8e22..3f7ce12 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -917,6 +917,7 @@ static void start_wineboot( HANDLE handles[2] ) PROCESS_INFORMATION pi; DWORD type; void *redir; + WCHAR app[MAX_PATH]; WCHAR cmdline[MAX_PATH + (sizeof(wineboot) + sizeof(args)) / sizeof(WCHAR)]; memset( &si, 0, sizeof(si) ); @@ -926,11 +927,11 @@ static void start_wineboot( HANDLE handles[2] ) si.hStdOutput = 0; si.hStdError = GetStdHandle( STD_ERROR_HANDLE ); - GetSystemDirectoryW( cmdline, MAX_PATH ); - lstrcatW( cmdline, wineboot ); + GetSystemDirectoryW( app, MAX_PATH - sizeof(wineboot)/sizeof(WCHAR) ); + lstrcatW( app, wineboot ); Wow64DisableWow64FsRedirection( &redir ); - if (GetBinaryTypeW( cmdline, &type ) && type != expected_type) + if (GetBinaryTypeW( app, &type ) && type != expected_type) { if (type == SCS_64BIT_BINARY) MESSAGE( "wine: '%s' is a 64-bit prefix, it cannot be used with 32-bit Wine.\n", @@ -941,8 +942,9 @@ static void start_wineboot( HANDLE handles[2] ) ExitProcess( 1 ); } - lstrcatW( cmdline, args ); - if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) + strcpyW( cmdline, app ); + strcatW( cmdline, args ); + if (CreateProcessW( app, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { TRACE( "started wineboot pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); CloseHandle( pi.hThread );

1 0

Alexandre Julliard : kernel32: Add a structure to store all the information about an executable.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 28f13f83a625bc71ca0c16071b0265dc54cd3f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f13f83a625bc71ca0c16071… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 19:30:30 2009 +0100 kernel32: Add a structure to store all the information about an executable. --- dlls/kernel32/kernel_private.h | 33 ++++++++++----- dlls/kernel32/module.c | 87 ++++++++++++++++----------------------- dlls/kernel32/process.c | 55 ++++++++++++------------- 3 files changed, 85 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28f13f83a625bc71ca0c1…

1 0

Alexandre Julliard : kernel32: Set the 64-bit flag for builtin executables based on their load directory.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: c9e25dbe35cc81222c13664134dc5aa69c995e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e25dbe35cc81222c1366413… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 20:40:40 2009 +0100 kernel32: Set the 64-bit flag for builtin executables based on their load directory. --- dlls/kernel32/process.c | 88 +++++++++++++++++++++++++++------------------- 1 files changed, 52 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b33f4b1..a49169e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -125,15 +125,34 @@ static inline int is_special_env_var( const char *var ) } +/*********************************************************************** + * is_path_prefix + */ +static inline unsigned int is_path_prefix( const WCHAR *prefix, const WCHAR *filename ) +{ + unsigned int len = strlenW( prefix ); + + if (strncmpiW( filename, prefix, len ) || filename[len] != '\\') return 0; + while (filename[len] == '\\') len++; + return len; +} + + /*************************************************************************** * get_builtin_path * * Get the path of a builtin module when the native file does not exist. */ -static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *filename, UINT size ) +static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *filename, + UINT size, struct binary_info *binary_info ) { WCHAR *file_part; - UINT len = strlenW( DIR_System ); + UINT len; + void *redir_disabled = 0; + unsigned int flags = (sizeof(void*) > sizeof(int) ? BINARY_FLAG_64BIT : 0); + + if (is_wow64 && Wow64DisableWow64FsRedirection( &redir_disabled )) + Wow64RevertWow64FsRedirection( redir_disabled ); if (contains_path( libname )) { @@ -141,18 +160,27 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil filename, &file_part ) > size * sizeof(WCHAR)) return FALSE; /* too long */ - if (strncmpiW( filename, DIR_System, len ) || filename[len] != '\\') - return FALSE; - while (filename[len] == '\\') len++; + if ((len = is_path_prefix( DIR_System, filename ))) + { + if (is_wow64 && redir_disabled) flags = BINARY_FLAG_64BIT; + } + else if (DIR_SysWow64 && (len = is_path_prefix( DIR_SysWow64, filename ))) + { + flags = 0; + } + else return FALSE; + if (filename + len != file_part) return FALSE; } else { + len = strlenW( DIR_System ); if (strlenW(libname) + len + 2 >= size) return FALSE; /* too long */ memcpy( filename, DIR_System, len * sizeof(WCHAR) ); file_part = filename + len; if (file_part > filename && file_part[-1] != '\\') *file_part++ = '\\'; strcpyW( file_part, libname ); + if (is_wow64 && redir_disabled) flags = BINARY_FLAG_64BIT; } if (ext && !strchrW( file_part, '.' )) { @@ -160,6 +188,10 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil return FALSE; /* too long */ strcatW( file_part, ext ); } + binary_info->type = BINARY_UNIX_LIB; + binary_info->flags = flags; + binary_info->res_start = NULL; + binary_info->res_end = NULL; return TRUE; } @@ -210,14 +242,8 @@ static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info { WCHAR buffer[MAX_PATH]; /* file doesn't exist, check for builtin */ - if (contains_path( name ) && get_builtin_path( name, NULL, buffer, sizeof(buffer) )) - { + if (contains_path( name ) && get_builtin_path( name, NULL, buffer, sizeof(buffer), binary_info )) handle = 0; - binary_info->type = BINARY_UNIX_LIB; - binary_info->flags = 0; - binary_info->res_start = NULL; - binary_info->res_end = NULL; - } } else MODULE_get_binary_info( handle, binary_info ); @@ -241,22 +267,23 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, TRACE("looking for %s\n", debugstr_w(name) ); - if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL ) && - !get_builtin_path( name, exeW, buffer, buflen )) + if (!SearchPathW( NULL, name, exeW, buflen, buffer, NULL )) { - /* no builtin found, try native without extension in case it is a Unix app */ - - if (SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) + if (get_builtin_path( name, exeW, buffer, buflen, binary_info )) { - TRACE( "Trying native/Unix binary %s\n", debugstr_w(buffer) ); - if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, - NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE) + TRACE( "Trying built-in exe %s\n", debugstr_w(buffer) ); + open_builtin_exe_file( buffer, NULL, 0, 1, &file_exists ); + if (file_exists) { - MODULE_get_binary_info( *handle, binary_info ); + *handle = 0; return TRUE; } + return FALSE; } - return FALSE; + + /* no builtin found, try native without extension in case it is a Unix app */ + + if (!SearchPathW( NULL, name, NULL, buflen, buffer, NULL )) return FALSE; } TRACE( "Trying native exe %s\n", debugstr_w(buffer) ); @@ -266,19 +293,6 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, MODULE_get_binary_info( *handle, binary_info ); return TRUE; } - - TRACE( "Trying built-in exe %s\n", debugstr_w(buffer) ); - open_builtin_exe_file( buffer, NULL, 0, 1, &file_exists ); - if (file_exists) - { - *handle = 0; - binary_info->type = BINARY_UNIX_LIB; - binary_info->flags = 0; - binary_info->res_start = NULL; - binary_info->res_end = NULL; - return TRUE; - } - return FALSE; } @@ -1102,8 +1116,10 @@ void CDECL __wine_kernel_init(void) } else { + struct binary_info binary_info; + if (!SearchPathW( NULL, __wine_main_wargv[0], exeW, MAX_PATH, main_exe_name, NULL ) && - !get_builtin_path( __wine_main_wargv[0], exeW, main_exe_name, MAX_PATH )) + !get_builtin_path( __wine_main_wargv[0], exeW, main_exe_name, MAX_PATH, &binary_info )) { MESSAGE( "wine: cannot find '%s'\n", __wine_main_argv[0] ); ExitProcess( GetLastError() );

1 0

Alexandre Julliard : kernel32: Retrieve the executable information as soon as we open the file.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 4313c95526b4a7b1dbfa9a5c61de5c11eded463f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4313c95526b4a7b1dbfa9a5c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 19:41:38 2009 +0100 kernel32: Retrieve the executable information as soon as we open the file. --- dlls/kernel32/process.c | 54 ++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ff52fb3..b33f4b1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -199,7 +199,7 @@ static void *open_builtin_exe_file( const WCHAR *name, char *error, int error_si * Open a specific exe file, taking load order into account. * Returns the file handle or 0 for a builtin exe. */ -static HANDLE open_exe_file( const WCHAR *name ) +static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info ) { HANDLE handle; @@ -211,8 +211,16 @@ static HANDLE open_exe_file( const WCHAR *name ) WCHAR buffer[MAX_PATH]; /* file doesn't exist, check for builtin */ if (contains_path( name ) && get_builtin_path( name, NULL, buffer, sizeof(buffer) )) + { handle = 0; + binary_info->type = BINARY_UNIX_LIB; + binary_info->flags = 0; + binary_info->res_start = NULL; + binary_info->res_end = NULL; + } } + else MODULE_get_binary_info( handle, binary_info ); + return handle; } @@ -225,7 +233,8 @@ static HANDLE open_exe_file( const WCHAR *name ) * If file exists but cannot be opened, returns TRUE and set handle to INVALID_HANDLE_VALUE. * If file is a builtin exe, returns TRUE and sets handle to 0. */ -static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE *handle ) +static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, + HANDLE *handle, struct binary_info *binary_info ) { static const WCHAR exeW[] = {'.','e','x','e',0}; int file_exists; @@ -242,7 +251,10 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE TRACE( "Trying native/Unix binary %s\n", debugstr_w(buffer) ); if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE) + { + MODULE_get_binary_info( *handle, binary_info ); return TRUE; + } } return FALSE; } @@ -250,13 +262,20 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, HANDLE TRACE( "Trying native exe %s\n", debugstr_w(buffer) ); if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE) + { + MODULE_get_binary_info( *handle, binary_info ); return TRUE; + } TRACE( "Trying built-in exe %s\n", debugstr_w(buffer) ); open_builtin_exe_file( buffer, NULL, 0, 1, &file_exists ); if (file_exists) { *handle = 0; + binary_info->type = BINARY_UNIX_LIB; + binary_info->flags = 0; + binary_info->res_start = NULL; + binary_info->res_end = NULL; return TRUE; } @@ -1856,7 +1875,7 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L * Also returns a handle to the opened file if it's a Windows binary. */ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, - int buflen, HANDLE *handle ) + int buflen, HANDLE *handle, struct binary_info *binary_info ) { static const WCHAR quotesW[] = {'"','%','s','"',0}; @@ -1870,7 +1889,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, { /* use the unmodified app name as file name */ lstrcpynW( buffer, appname, buflen ); - *handle = open_exe_file( buffer ); + *handle = open_exe_file( buffer, binary_info ); if (!(ret = cmdline) || !cmdline[0]) { /* no command-line, create one */ @@ -1890,7 +1909,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, memcpy( name, cmdline + 1, len * sizeof(WCHAR) ); name[len] = 0; - if (find_exe_file( name, buffer, buflen, handle )) + if (find_exe_file( name, buffer, buflen, handle, binary_info )) ret = cmdline; /* no change necessary */ goto done; } @@ -1907,7 +1926,7 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, { do *pos++ = *p++; while (*p && *p != ' ' && *p != '\t'); *pos = 0; - if (find_exe_file( name, buffer, buflen, handle )) + if (find_exe_file( name, buffer, buflen, handle, binary_info )) { ret = cmdline; break; @@ -1991,7 +2010,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) ); - if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, sizeof(name)/sizeof(WCHAR), &hFile ))) + if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, sizeof(name)/sizeof(WCHAR), + &hFile, &binary_info ))) return FALSE; if (hFile == INVALID_HANDLE_VALUE) goto done; @@ -2033,19 +2053,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, info->hThread = info->hProcess = 0; info->dwProcessId = info->dwThreadId = 0; - /* Determine executable type */ - - if (!hFile) /* builtin exe */ - { - TRACE( "starting %s as Winelib app\n", debugstr_w(name) ); - memset( &binary_info, 0, sizeof(binary_info) ); - binary_info.type = BINARY_UNIX_LIB; - retv = create_process( 0, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); - goto done; - } - - MODULE_get_binary_info( hFile, &binary_info ); if (binary_info.flags & BINARY_FLAG_DLL) { TRACE( "not starting %s since it is a dll\n", debugstr_w(name) ); @@ -2067,7 +2074,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; case BINARY_UNIX_LIB: - TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) ); + TRACE( "starting %s as Winelib app\n", debugstr_w(name) ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; @@ -2107,7 +2114,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, } break; } - CloseHandle( hFile ); + if (hFile) CloseHandle( hFile ); done: if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline ); @@ -2130,7 +2137,7 @@ static void exec_process( LPCWSTR name ) PROCESS_INFORMATION info; struct binary_info binary_info; - hFile = open_exe_file( name ); + hFile = open_exe_file( name, &binary_info ); if (!hFile || hFile == INVALID_HANDLE_VALUE) return; memset( &startup_info, 0, sizeof(startup_info) ); @@ -2138,7 +2145,6 @@ static void exec_process( LPCWSTR name ) /* Determine executable type */ - MODULE_get_binary_info( hFile, &binary_info ); if (binary_info.flags & BINARY_FLAG_DLL) return; switch (binary_info.type) {

1 0

Vincent Povirk : ole32: Fix the LEFTCHILD and RIGHTCHILD offset defines.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 0359a47d0ddfa768a3a2cb5791385cccc48ef459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0359a47d0ddfa768a3a2cb579… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 27 13:09:16 2009 -0500 ole32: Fix the LEFTCHILD and RIGHTCHILD offset defines. --- dlls/ole32/storage32.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 9356186..8dd44fa 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -54,8 +54,8 @@ static const ULONG OFFSET_BBDEPOTSTART = 0x0000004C; static const ULONG OFFSET_PS_NAME = 0x00000000; static const ULONG OFFSET_PS_NAMELENGTH = 0x00000040; static const ULONG OFFSET_PS_PROPERTYTYPE = 0x00000042; -static const ULONG OFFSET_PS_RIGHTCHILD = 0x00000044; -static const ULONG OFFSET_PS_LEFTCHILD = 0x00000048; +static const ULONG OFFSET_PS_LEFTCHILD = 0x00000044; +static const ULONG OFFSET_PS_RIGHTCHILD = 0x00000048; static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; static const ULONG OFFSET_PS_GUID = 0x00000050; static const ULONG OFFSET_PS_CTIMELOW = 0x00000064;

1 0

Juan Lang : cryptui: Display <None> for a cert' s friendly name if no friendly name property is set.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: 7690ff2f0e9b13b180d6e4448be0dd776f6a5e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7690ff2f0e9b13b180d6e4448… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 27 11:13:00 2009 -0700 cryptui: Display <None> for a cert's friendly name if no friendly name property is set. --- dlls/cryptui/cryptui_De.rc | 1 + dlls/cryptui/cryptui_En.rc | 1 + dlls/cryptui/cryptui_Fr.rc | 1 + dlls/cryptui/cryptui_Ko.rc | 1 + dlls/cryptui/cryptui_Lt.rc | 1 + dlls/cryptui/cryptui_Nl.rc | 1 + dlls/cryptui/cryptui_Pt.rc | 1 + dlls/cryptui/cryptuires.h | 1 + dlls/cryptui/main.c | 14 +++++++++----- 9 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index d34d883..cfaf468 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -119,6 +119,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Sind Sie sicher, dass Sie dieses Zertifikat entfernen möchten?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Sind Sie sicher, dass Sie diese Zertifikate entfernen möchten?" IDS_CERT_MGR "Zertifikate" + IDS_FRIENDLY_NAME_NONE "<Keine>" IDS_PURPOSE_SERVER_AUTH "Garantiert die Identität eines entfernten Computers" IDS_PURPOSE_CLIENT_AUTH "Beweist Ihre Identität für einen entfernten Computers" IDS_PURPOSE_CODE_SIGNING "Schützt Software vor Manipulation nach der Veröffentlichung" diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index eaad679..527ffa5 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -117,6 +117,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Are you sure you want to remove this certificate?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Are you sure you want to remove these certificates?" IDS_CERT_MGR "Certificates" + IDS_FRIENDLY_NAME_NONE "<None>" IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" diff --git a/dlls/cryptui/cryptui_Fr.rc b/dlls/cryptui/cryptui_Fr.rc index 457aae8..5c5ca68 100644 --- a/dlls/cryptui/cryptui_Fr.rc +++ b/dlls/cryptui/cryptui_Fr.rc @@ -120,6 +120,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Voulez-vous réellement supprimer ce certificat ?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Voulez-vous réellement supprimer ces certificats ?" IDS_CERT_MGR "Certificats" + IDS_FRIENDLY_NAME_NONE "<Aucun>" IDS_PURPOSE_SERVER_AUTH "Prouve l'identité d'un ordinateur distant" IDS_PURPOSE_CLIENT_AUTH "Prouve votre identité à un ordinateur distant" IDS_PURPOSE_CODE_SIGNING "Garantit que des logiciels proviennent bien d'un éditeur de logiciels donné\nProtège le logiciel contre toute altération après publication" diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 6606411..eaa6222 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -118,6 +118,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "�� Ÿ� ��ϱ⸦ ��մϱ�?" IDS_WARN_REMOVE_PLURAL_DEFAULT "�� 鸦 ��ϱ⸦ ��մϱ�?" IDS_CERT_MGR "��" + IDS_FRIENDLY_NAME_NONE "<��>" IDS_PURPOSE_SERVER_AUTH "�� ǻ�� ϼ� ��" IDS_PURPOSE_CLIENT_AUTH "�� ſ�� ǻ�ͷ� ��" IDS_PURPOSE_CODE_SIGNING "��Ʈ�� ڷκ�� Ʈ�� \n�� Ʈ�� ��κ�� ȣ" diff --git a/dlls/cryptui/cryptui_Lt.rc b/dlls/cryptui/cryptui_Lt.rc index d4ba0eb..deb5598 100644 --- a/dlls/cryptui/cryptui_Lt.rc +++ b/dlls/cryptui/cryptui_Lt.rc @@ -120,6 +120,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Ar tikrai norite pašalinti šį liudijimą?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Ar tikrai norite pašalinti šiuos liudijimus?" IDS_CERT_MGR "Liudijimai" + IDS_FRIENDLY_NAME_NONE "<jokios>" IDS_PURPOSE_SERVER_AUTH "Garantuoja nutolusio kompiuterio tapatumą" IDS_PURPOSE_CLIENT_AUTH "Įrodo jūsų tapatumą nutolusiam kompiuteriui" IDS_PURPOSE_CODE_SIGNING "Garantuoja, kad programinė įranga yra iš šio leidėjo\nApsaugo programinę įrangą nuo pakeitimų po išleidimo" diff --git a/dlls/cryptui/cryptui_Nl.rc b/dlls/cryptui/cryptui_Nl.rc index faa3210..3a2d2ed 100644 --- a/dlls/cryptui/cryptui_Nl.rc +++ b/dlls/cryptui/cryptui_Nl.rc @@ -119,6 +119,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Weet u zeker dat u dit certificaat wilt verwijderen?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Weet u zeker dat u deze certificaten wilt verwijderen?" IDS_CERT_MGR "Certificaten" + IDS_FRIENDLY_NAME_NONE "<Geen>" IDS_PURPOSE_SERVER_AUTH "Bewijst de identiteit van een remote computer" IDS_PURPOSE_CLIENT_AUTH "Bewijst uw identiteit aan een remote computer" IDS_PURPOSE_CODE_SIGNING "Bewijst dat de software kwam van de software uitgever\nBeschermt software tegen wijzigingen na publicatie" diff --git a/dlls/cryptui/cryptui_Pt.rc b/dlls/cryptui/cryptui_Pt.rc index f879529..4b528b5 100644 --- a/dlls/cryptui/cryptui_Pt.rc +++ b/dlls/cryptui/cryptui_Pt.rc @@ -119,6 +119,7 @@ STRINGTABLE DISCARDABLE IDS_WARN_REMOVE_DEFAULT "Tem a certeza que deseja remover este certificado?" IDS_WARN_REMOVE_PLURAL_DEFAULT "Tem a certeza que deseja remover estes certificados?" IDS_CERT_MGR "Certificados" + IDS_FRIENDLY_NAME_NONE "<Nenhum>" IDS_PURPOSE_SERVER_AUTH "Assegura a identidade de um computador remoto" IDS_PURPOSE_CLIENT_AUTH "Prova a sua identidade a um computador remoto" IDS_PURPOSE_CODE_SIGNING "Assegura que o software veio de uma editora de software\nProtege o software de alterações após publicação" diff --git a/dlls/cryptui/cryptuires.h b/dlls/cryptui/cryptuires.h index 716dba5..df321df 100644 --- a/dlls/cryptui/cryptuires.h +++ b/dlls/cryptui/cryptuires.h @@ -116,6 +116,7 @@ #define IDS_WARN_REMOVE_DEFAULT 1092 #define IDS_WARN_REMOVE_PLURAL_DEFAULT 1093 #define IDS_CERT_MGR 1094 +#define IDS_FRIENDLY_NAME_NONE 1095 #define IDS_PURPOSE_SERVER_AUTH 1100 #define IDS_PURPOSE_CLIENT_AUTH 1101 diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index b02c56a..117257e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -104,6 +104,7 @@ static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, WCHAR dateFmt[80]; /* sufficient for LOCALE_SSHORTDATE */ WCHAR date[80]; SYSTEMTIME sysTime; + LPWSTR none; item.mask = LVIF_IMAGE | LVIF_PARAM | LVIF_TEXT; item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); @@ -155,8 +156,9 @@ static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, item.iSubItem = 2; SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); - len = CertGetNameStringW(cert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, - NULL, 0); + if (!CertGetCertificateContextProperty(cert, CERT_FRIENDLY_NAME_PROP_ID, + NULL, &len)) + len = LoadStringW(hInstance, IDS_FRIENDLY_NAME_NONE, (LPWSTR)&none, 0); if (len > *allocatedLen) { HeapFree(GetProcessHeap(), 0, *str); @@ -166,9 +168,11 @@ static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, } if (*str) { - CertGetNameStringW(cert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, - *str, len); - item.pszText = *str; + if (!CertGetCertificateContextProperty(cert, CERT_FRIENDLY_NAME_PROP_ID, + *str, &len)) + item.pszText = none; + else + item.pszText = *str; item.iSubItem = 3; SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); }

1 0

Jacek Caban : mshtml: Moved nsIDOMEventListener implementations to HTMLDocumentNode.
by Alexandre Julliard 28 Oct '09

28 Oct '09

Module: wine Branch: master Commit: d52f41ba4153ce7976d75fb38e1213e66200c9f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52f41ba4153ce7976d75fb38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 27 21:09:25 2009 +0100 mshtml: Moved nsIDOMEventListener implementations to HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 7 +- dlls/mshtml/mshtml_private.h | 20 ++--- dlls/mshtml/navigate.c | 4 - dlls/mshtml/nsembed.c | 2 - dlls/mshtml/nsevents.c | 179 ++++++++++++++++++++++++++++-------------- 5 files changed, 131 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d52f41ba4153ce7976d75…

1 0