August 2009 - Wine-Commits - list.winehq.org

André Hentschel : hhctrl.ocx: Update German translation.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 73bb3c878929aa3081e76d370c290eff82e2207b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bb3c878929aa3081e76d370… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 14:24:21 2009 +0200 hhctrl.ocx: Update German translation. --- dlls/hhctrl.ocx/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/De.rc b/dlls/hhctrl.ocx/De.rc index 2bd2170..20b20f8 100644 --- a/dlls/hhctrl.ocx/De.rc +++ b/dlls/hhctrl.ocx/De.rc @@ -37,7 +37,7 @@ STRINGTABLE BEGIN IDTB_EXPAND "Anzeigen" IDTB_CONTRACT "Verstecken" - IDTB_STOP "Stop" + IDTB_STOP "Stopp" IDTB_REFRESH "Aktualisieren" IDTB_BACK "Zurück" IDTB_HOME "Startseite"

1 0

André Hentschel : gphoto2.ds: Update German translation.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 882de655cc2800052d609f3bf86f8696d2812d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882de655cc2800052d609f3bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 14:24:17 2009 +0200 gphoto2.ds: Update German translation. --- dlls/gphoto2.ds/gphoto2_De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_De.rc b/dlls/gphoto2.ds/gphoto2_De.rc index 25e5307..b4e9402 100644 --- a/dlls/gphoto2.ds/gphoto2_De.rc +++ b/dlls/gphoto2.ds/gphoto2_De.rc @@ -33,9 +33,9 @@ BEGIN CONTROL "List1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 DEFPUSHBUTTON "Gewählte importieren",IDC_IMPORT,152,252,72,14 - PUSHBUTTON "Preview",IDC_FETCH,7,252,64,14 + PUSHBUTTON "Vorschau",IDC_FETCH,7,252,64,14 PUSHBUTTON "Alle importieren",IDC_IMPORTALL,80,252,64,14 - CONTROL "Skip This Dialog",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + CONTROL "Dialog überspringen",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 PUSHBUTTON "Beenden",IDC_EXIT,315,252,50,14 END

1 0

André Hentschel : crypt32: Update German translation.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: aea7ecca959349333a72d047850a9660dc807b4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea7ecca959349333a72d0478… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 14:24:13 2009 +0200 crypt32: Update German translation. --- dlls/crypt32/crypt32_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index aa3a456..9c2c91e 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -41,7 +41,7 @@ STRINGTABLE DISCARDABLE IDS_ENHANCED_KEY_USAGE "Erweiterte Schlüsselbenutzung" IDS_AUTHORITY_INFO_ACCESS "Autoritätsinformationszugriff" IDS_CERT_EXTENSIONS "Zertifikatserweiterung" - IDS_NEXT_UPDATE_LOCATION "Next Update Location" + IDS_NEXT_UPDATE_LOCATION "nächster Aktualisierungsort" IDS_YES_OR_NO_TRUST "Vertrauen oder nicht vertrauen" IDS_EMAIL_ADDRESS "E-Mail-Adresse" IDS_UNSTRUCTURED_NAME "Unstrukturierter Name"

1 0

André Hentschel : avifil32: Update German translation.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: b2272fb768b4636cddc9b387ecf68408783b6f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2272fb768b4636cddc9b387e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 12 14:23:56 2009 +0200 avifil32: Update German translation. --- dlls/avifil32/avifile_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/avifile_De.rc b/dlls/avifil32/avifile_De.rc index b0f0bab..0730046 100644 --- a/dlls/avifil32/avifile_De.rc +++ b/dlls/avifil32/avifile_De.rc @@ -35,7 +35,7 @@ BEGIN EDITTEXT IDC_INTERLEAVEEVERY,81,41,32,12,ES_AUTOHSCROLL LTEXT "Einzelbilder",-1,119,43,36,9 LTEXT "Aktuelles Format:",-1,3,56,73,9 - LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 + LTEXT "Platzhalter",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,170,61,50,14 END

1 0

Alexandre Julliard : kernel32: Check the 64-bit flag when starting a process.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: a9feb3d2717b0a0e8f785e48fcdd4ba58e7a3fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9feb3d2717b0a0e8f785e48f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 12 15:58:39 2009 +0200 kernel32: Check the 64-bit flag when starting a process. --- dlls/kernel32/process.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4a3a49e..e007c2a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1512,7 +1512,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, LPPROCESS_INFORMATION info, LPCSTR unixdir, - void *res_start, void *res_end, int exec_only ) + void *res_start, void *res_end, DWORD binary_type, int exec_only ) { BOOL ret, success = FALSE; HANDLE process_info, hstdin, hstdout; @@ -1524,6 +1524,13 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW pid_t pid; int err; + if (sizeof(void *) == sizeof(int) && !is_wow64 && (binary_type & BINARY_FLAG_64BIT)) + { + ERR( "starting 64-bit process %s not supported on this platform\n", debugstr_w(filename) ); + SetLastError( ERROR_BAD_EXE_FORMAT ); + return FALSE; + } + if (!env) RtlAcquirePebLock(); if (!(params = create_user_params( filename, cmd_line, cur_dir, env, flags, startup ))) @@ -1716,7 +1723,8 @@ error: static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, - LPPROCESS_INFORMATION info, LPCSTR unixdir, int exec_only ) + LPPROCESS_INFORMATION info, LPCSTR unixdir, + DWORD binary_type, int exec_only ) { static const WCHAR argsW[] = {'%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; @@ -1731,7 +1739,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L } sprintfW( new_cmd_line, argsW, winevdmW, filename, cmd_line ); ret = create_process( 0, winevdmW, new_cmd_line, env, cur_dir, psa, tsa, inherit, - flags, startup, info, unixdir, NULL, NULL, exec_only ); + flags, startup, info, unixdir, NULL, NULL, binary_type, exec_only ); HeapFree( GetProcessHeap(), 0, new_cmd_line ); return ret; } @@ -1963,7 +1971,8 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB { TRACE( "starting %s as Winelib app\n", debugstr_w(name) ); retv = create_process( 0, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, NULL, NULL, FALSE ); + inherit, flags, startup_info, info, unixdir, NULL, NULL, + BINARY_UNIX_LIB, FALSE ); goto done; } @@ -1978,19 +1987,21 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB case BINARY_PE: TRACE( "starting %s as Win32 binary (%p-%p)\n", debugstr_w(name), res_start, res_end ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, res_start, res_end, FALSE ); + inherit, flags, startup_info, info, unixdir, + res_start, res_end, binary_type, FALSE ); break; case BINARY_OS216: case BINARY_WIN16: case BINARY_DOS: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, FALSE ); + inherit, flags, startup_info, info, unixdir, binary_type, FALSE ); break; case BINARY_UNIX_LIB: TRACE( "%s is a Unix library, starting 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, NULL, NULL, FALSE ); + inherit, flags, startup_info, info, unixdir, + NULL, NULL, binary_type, FALSE ); break; case BINARY_UNKNOWN: /* check for .com or .bat extension */ @@ -2000,7 +2011,8 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB { TRACE( "starting %s as DOS binary\n", debugstr_w(name) ); retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, FALSE ); + inherit, flags, startup_info, info, unixdir, + binary_type, FALSE ); break; } if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) ) @@ -2066,12 +2078,12 @@ static void exec_process( LPCWSTR name ) case BINARY_PE: TRACE( "starting %s as Win32 binary (%p-%p)\n", debugstr_w(name), res_start, res_end ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, - FALSE, 0, &startup_info, &info, NULL, res_start, res_end, TRUE ); + FALSE, 0, &startup_info, &info, NULL, res_start, res_end, binary_type, TRUE ); break; case BINARY_UNIX_LIB: TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, - FALSE, 0, &startup_info, &info, NULL, NULL, NULL, TRUE ); + FALSE, 0, &startup_info, &info, NULL, NULL, NULL, binary_type, TRUE ); break; case BINARY_UNKNOWN: /* check for .com or .pif extension */ @@ -2083,7 +2095,7 @@ static void exec_process( LPCWSTR name ) case BINARY_DOS: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); create_vdm_process( name, GetCommandLineW(), NULL, NULL, NULL, NULL, - FALSE, 0, &startup_info, &info, NULL, TRUE ); + FALSE, 0, &startup_info, &info, NULL, binary_type, TRUE ); break; default: break;

1 0

Alexandre Julliard : kernel32: Add a 64-bit flag to the MODULE_GetBinaryType return value.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 8c11d71f0f9c6aa58f9671f00414d226d1e2db3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c11d71f0f9c6aa58f9671f00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 12 15:50:47 2009 +0200 kernel32: Add a 64-bit flag to the MODULE_GetBinaryType return value. --- dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/module.c | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 03819d2..386bab2 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -92,6 +92,7 @@ extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); #define BINARY_UNIX_LIB 0x06 #define BINARY_TYPE_MASK 0x0f #define BINARY_FLAG_DLL 0x10 +#define BINARY_FLAG_64BIT 0x20 /* module.c */ extern WCHAR *MODULE_get_dll_load_path( LPCWSTR module ); diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index f93580c..ddb8fe2 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -233,15 +233,19 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) struct { unsigned char magic[4]; - unsigned char ignored[12]; + unsigned char class; + unsigned char data; + unsigned char version; + unsigned char ignored[9]; unsigned short type; + unsigned short machine; } elf; struct { - unsigned long magic; - unsigned long cputype; - unsigned long cpusubtype; - unsigned long filetype; + unsigned int magic; + unsigned int cputype; + unsigned int cpusubtype; + unsigned int filetype; } macho; IMAGE_DOS_HEADER mz; } header; @@ -256,11 +260,12 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) if (!memcmp( header.elf.magic, "\177ELF", 4 )) { + DWORD flags = (header.elf.class == 2) ? BINARY_FLAG_64BIT : 0; /* FIXME: we don't bother to check byte order, architecture, etc. */ switch(header.elf.type) { - case 2: return BINARY_UNIX_EXE; - case 3: return BINARY_UNIX_LIB; + case 2: return flags | BINARY_UNIX_EXE; + case 3: return flags | BINARY_UNIX_LIB; } return BINARY_UNKNOWN; } @@ -268,9 +273,11 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) /* Mach-o File with Endian set to Big Endian or Little Endian */ if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe) { + DWORD flags = (header.macho.cputype >> 24) == 1 ? BINARY_FLAG_64BIT : 0; switch(header.macho.filetype) { - case 0x8: /* MH_BUNDLE */ return BINARY_UNIX_LIB; + case 2: return flags | BINARY_UNIX_EXE; + case 8: return flags | BINARY_UNIX_LIB; } return BINARY_UNKNOWN; } @@ -321,7 +328,7 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) case IMAGE_NT_OPTIONAL_HDR64_MAGIC: if (res_start) *res_start = NULL; if (res_end) *res_end = NULL; - return ret; + return ret | BINARY_FLAG_64BIT; } } return BINARY_DOS;

1 0

Alexandre Julliard : kernel32: Check for a 32-bit NT header before getting module address range in MODULE_GetBinaryType .
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 4a59ac76f19c6df4a32b88584a2488ce6f659ccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a59ac76f19c6df4a32b88584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 12 15:47:57 2009 +0200 kernel32: Check for a 32-bit NT header before getting module address range in MODULE_GetBinaryType. --- dlls/kernel32/module.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 4d0a810..f93580c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -282,7 +282,7 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) union { IMAGE_OS2_HEADER os2; - IMAGE_NT_HEADERS nt; + IMAGE_NT_HEADERS32 nt; } ext_header; /* We do have a DOS image so we will now try to seek into @@ -311,7 +311,18 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + ext_header.nt.OptionalHeader.SizeOfImage); - return ret; + switch (ext_header.nt.OptionalHeader.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; + if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + + ext_header.nt.OptionalHeader.SizeOfImage); + return ret; + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + if (res_start) *res_start = NULL; + if (res_end) *res_end = NULL; + return ret; + } } return BINARY_DOS; }

1 0

Alexandre Julliard : kernel32: Return the dll flag in MODULE_GetBinaryType for 16-bit modules too.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 5e4f0cf5cae2f719d7e352ec1b52a6e6b38bb807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4f0cf5cae2f719d7e352ec1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 12 15:43:35 2009 +0200 kernel32: Return the dll flag in MODULE_GetBinaryType for 16-bit modules too. --- dlls/kernel32/module.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 02cfc2c..4d0a810 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -325,15 +325,16 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) */ if (len >= sizeof(ext_header.os2)) { + DWORD flags = (ext_header.os2.ne_flags & NE_FFLAGS_LIBMODULE) ? BINARY_FLAG_DLL : 0; switch ( ext_header.os2.ne_exetyp ) { - case 1: return BINARY_OS216; /* OS/2 */ - case 2: return BINARY_WIN16; /* Windows */ - case 3: return BINARY_DOS; /* European MS-DOS 4.x */ - case 4: return BINARY_WIN16; /* Windows 386; FIXME: is this 32bit??? */ - case 5: return BINARY_DOS; /* BOSS, Borland Operating System Services */ + case 1: return flags | BINARY_OS216; /* OS/2 */ + case 2: return flags | BINARY_WIN16; /* Windows */ + case 3: return flags | BINARY_DOS; /* European MS-DOS 4.x */ + case 4: return flags | BINARY_WIN16; /* Windows 386; FIXME: is this 32bit??? */ + case 5: return flags | BINARY_DOS; /* BOSS, Borland Operating System Services */ /* other types, e.g. 0 is: "unknown" */ - default: return MODULE_Decide_OS2_OldWin(hfile, &header.mz, &ext_header.os2); + default: return flags | MODULE_Decide_OS2_OldWin(hfile, &header.mz, &ext_header.os2); } } /* Couldn't read header, so abort. */

1 0

Alexandre Julliard : kernel32: Change MODULE_GetBinaryType return value to make dll a flag instead of a type .
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: f274d1d03f010c267d121e2a147739dc28783b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f274d1d03f010c267d121e2a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 12 15:43:08 2009 +0200 kernel32: Change MODULE_GetBinaryType return value to make dll a flag instead of a type. --- dlls/kernel32/kernel_private.h | 22 ++++++++++------------ dlls/kernel32/module.c | 19 ++++++++++--------- dlls/kernel32/process.c | 22 ++++++++++++++-------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 20f6399..03819d2 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -83,21 +83,19 @@ extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *conte extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); /* return values for MODULE_GetBinaryType */ -enum binary_type -{ - BINARY_UNKNOWN, - BINARY_PE_EXE, - BINARY_PE_DLL, - BINARY_WIN16, - BINARY_OS216, - BINARY_DOS, - BINARY_UNIX_EXE, - BINARY_UNIX_LIB -}; +#define BINARY_UNKNOWN 0x00 +#define BINARY_PE 0x01 +#define BINARY_WIN16 0x02 +#define BINARY_OS216 0x03 +#define BINARY_DOS 0x04 +#define BINARY_UNIX_EXE 0x05 +#define BINARY_UNIX_LIB 0x06 +#define BINARY_TYPE_MASK 0x0f +#define BINARY_FLAG_DLL 0x10 /* module.c */ extern WCHAR *MODULE_get_dll_load_path( LPCWSTR module ); -extern enum binary_type MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ); +extern DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ); extern BOOL NLS_IsUnicodeOnlyLcid(LCID); diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 86675b6..02cfc2c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -178,11 +178,10 @@ BOOL WINAPI DisableThreadLibraryCalls( HMODULE hModule ) * FIXME: is reading the module imports the only way of discerning * old Windows binaries from OS/2 ones ? At least it seems so... */ -static enum binary_type MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, - const IMAGE_OS2_HEADER *ne) +static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, const IMAGE_OS2_HEADER *ne) { DWORD currpos = SetFilePointer( hfile, 0, NULL, SEEK_CUR); - enum binary_type ret = BINARY_OS216; + DWORD ret = BINARY_OS216; LPWORD modtab = NULL; LPSTR nametab = NULL; DWORD len; @@ -227,7 +226,7 @@ good: /*********************************************************************** * MODULE_GetBinaryType */ -enum binary_type MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) +DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) { union { @@ -305,13 +304,14 @@ enum binary_type MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **re { if (len >= sizeof(ext_header.nt.FileHeader)) { + DWORD ret = BINARY_PE; + if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) ret |= BINARY_FLAG_DLL; if (len < sizeof(ext_header.nt)) /* clear remaining part of header if missing */ memset( (char *)&ext_header.nt + len, 0, sizeof(ext_header.nt) - len ); if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + ext_header.nt.OptionalHeader.SizeOfImage); - if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) return BINARY_PE_DLL; - return BINARY_PE_EXE; + return ret; } return BINARY_DOS; } @@ -384,6 +384,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType ) { BOOL ret = FALSE; HANDLE hfile; + DWORD binary_type; TRACE("%s\n", debugstr_w(lpApplicationName) ); @@ -401,7 +402,8 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType ) /* Check binary type */ - switch(MODULE_GetBinaryType( hfile, NULL, NULL )) + binary_type = MODULE_GetBinaryType( hfile, NULL, NULL ); + switch (binary_type & BINARY_TYPE_MASK) { case BINARY_UNKNOWN: { @@ -424,8 +426,7 @@ BOOL WINAPI GetBinaryTypeW( LPCWSTR lpApplicationName, LPDWORD lpBinaryType ) } break; } - case BINARY_PE_EXE: - case BINARY_PE_DLL: + case BINARY_PE: *lpBinaryType = SCS_32BIT_BINARY; ret = TRUE; break; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f90b294..4a3a49e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1909,6 +1909,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB WCHAR name[MAX_PATH]; WCHAR *tidy_cmdline, *p, *envW = env; void *res_start, *res_end; + DWORD binary_type; /* Process the AppName and/or CmdLine to get module name and path */ @@ -1966,9 +1967,15 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB goto done; } - switch( MODULE_GetBinaryType( hFile, &res_start, &res_end )) + binary_type = MODULE_GetBinaryType( hFile, &res_start, &res_end ); + if (binary_type & BINARY_FLAG_DLL) { - case BINARY_PE_EXE: + TRACE( "not starting %s since it is a dll\n", debugstr_w(name) ); + SetLastError( ERROR_BAD_EXE_FORMAT ); + } + else switch (binary_type & BINARY_TYPE_MASK) + { + case BINARY_PE: TRACE( "starting %s as Win32 binary (%p-%p)\n", debugstr_w(name), res_start, res_end ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, res_start, res_end, FALSE ); @@ -1980,10 +1987,6 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, FALSE ); break; - case BINARY_PE_DLL: - TRACE( "not starting %s since it is a dll\n", debugstr_w(name) ); - SetLastError( ERROR_BAD_EXE_FORMAT ); - break; case BINARY_UNIX_LIB: TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, @@ -2046,6 +2049,7 @@ static void exec_process( LPCWSTR name ) void *res_start, *res_end; STARTUPINFOW startup_info; PROCESS_INFORMATION info; + DWORD binary_type; hFile = open_exe_file( name ); if (!hFile || hFile == INVALID_HANDLE_VALUE) return; @@ -2055,9 +2059,11 @@ static void exec_process( LPCWSTR name ) /* Determine executable type */ - switch( MODULE_GetBinaryType( hFile, &res_start, &res_end )) + binary_type = MODULE_GetBinaryType( hFile, &res_start, &res_end ); + if (binary_type & BINARY_FLAG_DLL) return; + switch (binary_type & BINARY_TYPE_MASK) { - case BINARY_PE_EXE: + case BINARY_PE: TRACE( "starting %s as Win32 binary (%p-%p)\n", debugstr_w(name), res_start, res_end ); create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL, FALSE, 0, &startup_info, &info, NULL, res_start, res_end, TRUE );

1 0

Piotr Caban : jscript: Fixed Object.toLocaleString implementation.
by Alexandre Julliard Aug. 12, 2009

Aug. 12, 2009

Module: wine Branch: master Commit: 5323a454c8e0b5110a4fc0a16ea25b9952aff00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5323a454c8e0b5110a4fc0a16… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Aug 12 12:48:58 2009 +0200 jscript: Fixed Object.toLocaleString implementation. --- dlls/jscript/dispex.c | 17 +++++++++++++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/object.c | 5 ++++- dlls/jscript/tests/api.js | 8 ++++++++ 4 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 509fb50..12fcb3a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -844,6 +844,23 @@ HRESULT jsdisp_call(DispatchEx *disp, DISPID id, LCID lcid, WORD flags, DISPPARA return invoke_prop_func(disp, disp, prop, lcid, flags, dp, retv, ei, caller); } +HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, + jsexcept_t *ei, IServiceProvider *caller) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(disp, name, TRUE, &prop); + if(FAILED(hres)) + return hres; + + memset(ei, 0, sizeof(*ei)); + if(retv) + V_VT(retv) = VT_EMPTY; + + return invoke_prop_func(disp, disp, prop, lcid, flags, dp, retv, ei, caller); +} + HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a585b4f..bd7e711 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -131,6 +131,7 @@ DispatchEx *iface_to_jsdisp(IUnknown*); HRESULT disp_call(IDispatch*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_call_value(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_call(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); +HRESULT jsdisp_call_name(DispatchEx*,const WCHAR*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propget(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT disp_propput(IDispatch*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); HRESULT jsdisp_propget(DispatchEx*,DISPID,LCID,VARIANT*,jsexcept_t*,IServiceProvider*); diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 737230a..f5ce564 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -74,8 +74,11 @@ static HRESULT Object_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA static HRESULT Object_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { + DISPPARAMS params = {NULL, NULL, 0, 0}; + TRACE("\n"); - return Object_toString(dispex, lcid, flags, dp, retv, ei, sp); + + return jsdisp_call_name(dispex, toStringW, lcid, DISPATCH_METHOD, &params, retv, ei, sp); } static HRESULT Object_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 88df15a..f0719f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -77,6 +77,14 @@ ok(tmp.f() === "[object RegExp]", "tmp.f() = " + tmp.f()); (tmp = new String).f = Object.prototype.toString; ok(tmp.f() === "[object String]", "tmp.f() = " + tmp.f()); +var obj = new Object(); +obj.toString = function (x) { + ok(arguments.length === 0, "arguments.length = " + arguments.length); + return "test"; +}; +ok((tmp = obj.toLocaleString()) === "test", "obj.toLocaleString() = " + tmp); +ok((tmp = obj.toLocaleString(1)) === "test", "obj.toLocaleString(1) = " + tmp); + ok("".length === 0, "\"\".length = " + "".length); ok(getVT("".length) == "VT_I4", "\"\".length = " + "".length); ok("abc".length === 3, "\"abc\".length = " + "abc".length);

1 0