wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Juan Lang : mshtml: Pass bytes written pointer to WriteFile.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 55b504cc880b57daecc9c061c50bfa0784b98edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b504cc880b57daecc9c061c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 4 09:20:22 2009 -0800 mshtml: Pass bytes written pointer to WriteFile. --- dlls/mshtml/install.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 605fa05..736fee0 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -383,10 +383,12 @@ static HRESULT WINAPI InstallCallback_OnDataAvailable(IBindStatusCallback *iface HRESULT hres; do { + DWORD written; + size = 0; hres = IStream_Read(str, buf, sizeof(buf), &size); if(size) - WriteFile(tmp_file, buf, size, NULL, NULL); + WriteFile(tmp_file, buf, size, &written, NULL); }while(hres == S_OK); return S_OK;

1 0

Juan Lang : shell32: Remove an obsolete comment.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 69cf059e8bd3a5efeb1410a23dad5f363903a1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69cf059e8bd3a5efeb1410a23… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 4 08:38:43 2009 -0800 shell32: Remove an obsolete comment. --- dlls/shell32/tests/shellpath.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 9078040..71c236b 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -19,9 +19,6 @@ * This is a test program for the SHGet{Special}Folder{Path|Location} functions * of shell32, that get either a filesystem path or a LPITEMIDLIST (shell * namespace) path for a given folder (CSIDL value). - * - * FIXME: - * - Need to verify on more systems. */ #define COBJMACROS

1 0

Juan Lang : shell32: Use the normal list checks for CSIDL_PERSONAL.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 5c39ea4509275935265aaddc5964dc5c69d8073a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c39ea4509275935265aaddc5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 3 10:15:35 2009 -0800 shell32: Use the normal list checks for CSIDL_PERSONAL. --- dlls/shell32/tests/shellpath.c | 28 ++-------------------------- 1 files changed, 2 insertions(+), 26 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 901b662..9078040 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -95,6 +95,7 @@ static const BYTE controlPanelType[] = { PT_SHELLEXT, PT_GUID }; static const BYTE folderType[] = { PT_FOLDER }; static const BYTE favoritesType[] = { PT_FOLDER, 0 }; static const BYTE folderOrSpecialType[] = { PT_FOLDER, PT_IESPECIAL2 }; +static const BYTE personalType[] = { PT_FOLDER, PT_GUID, PT_DRIVE, 0xff /* Win9x */ }; /* FIXME: don't know the type of 0x71 returned by Vista/2008 for printers */ static const BYTE printersType[] = { PT_YAGUID, PT_SHELLEXT, 0x71 }; static const BYTE ieSpecialType[] = { PT_IESPECIAL2 }; @@ -115,6 +116,7 @@ static const struct shellExpectedValues requiredShellValues[] = { DECLARE_TYPE(CSIDL_INTERNET, guidType), DECLARE_TYPE(CSIDL_NETHOOD, folderType), DECLARE_TYPE(CSIDL_NETWORK, guidType), + DECLARE_TYPE(CSIDL_PERSONAL, personalType), DECLARE_TYPE(CSIDL_PRINTERS, printersType), DECLARE_TYPE(CSIDL_PRINTHOOD, folderType), DECLARE_TYPE(CSIDL_PROGRAMS, folderType), @@ -587,36 +589,10 @@ static void testDesktop(void) testSHGetSpecialFolderLocation(FALSE, CSIDL_DESKTOP); } -static void testPersonal(void) -{ - BYTE type; - - /* The pidl may be a real folder, or a virtual directory, or a drive if the - * home directory is set to the root directory of a drive. - */ - if (pSHGetFolderLocation) - { - type = testSHGetFolderLocation(FALSE, CSIDL_PERSONAL); - ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE || - broken(type == 0xff) /* Win9x */, - "CSIDL_PERSONAL returned invalid type 0x%02x, " - "expected PT_FOLDER or PT_GUID or PT_DRIVE\n", type); - if (type == PT_FOLDER) - testSHGetFolderPath(FALSE, CSIDL_PERSONAL); - } - type = testSHGetSpecialFolderLocation(FALSE, CSIDL_PERSONAL); - ok(type == PT_FOLDER || type == PT_GUID || type == PT_DRIVE, - "CSIDL_PERSONAL returned invalid type 0x%02x, " - "expected PT_FOLDER or PT_GUID\n", type); - if (type == PT_FOLDER) - testSHGetSpecialFolderPath(FALSE, CSIDL_PERSONAL); -} - /* Checks the PIDL type of all the known values. */ static void testPidlTypes(void) { testDesktop(); - testPersonal(); testShellValues(requiredShellValues, ARRAY_SIZE(requiredShellValues), FALSE); testShellValues(optionalShellValues, ARRAY_SIZE(optionalShellValues),

1 0

Alexandre Julliard : winegcc: Pass the -m32/-m64 options to winebuild too.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 64e43b619286dbc3a347dad5d6ad6f981803348c URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e43b619286dbc3a347dad5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 20:10:49 2009 +0100 winegcc: Pass the -m32/-m64 options to winebuild too. --- tools/winegcc/winegcc.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e0b03b1..b288ed0 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -202,6 +202,7 @@ struct options int gui_app; int unicode_app; int compile_only; + int force_pointer_size; const char* wine_objdir; const char* output_name; const char* image_base; @@ -643,6 +644,8 @@ static void build(struct options* opts) strarray_add(spec_args, "--target"); strarray_add(spec_args, opts->target); } + if (opts->force_pointer_size) + strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); strarray_add(spec_args, "--as-cmd"); strarray_add(spec_args, AS); strarray_add(spec_args, "--ld-cmd"); @@ -1064,8 +1067,16 @@ int main(int argc, char **argv) opts.gui_app = 0; else if (strcmp("-municode", argv[i]) == 0) opts.unicode_app = 1; - else if (strcmp("-m32", argv[i]) == 0 || strcmp("-m64", argv[i]) == 0) + else if (strcmp("-m32", argv[i]) == 0) + { + opts.force_pointer_size = 4; raw_linker_arg = 1; + } + else if (strcmp("-m64", argv[i]) == 0) + { + opts.force_pointer_size = 8; + raw_linker_arg = 1; + } break; case 'n': if (strcmp("-nostdinc", argv[i]) == 0)

1 0

Alexandre Julliard : winebuild: Search for the as/ld/ nm tools in the PATH under various names.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: dca163290d5ec104859aa620d171f2e923461ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca163290d5ec104859aa620d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 19:37:13 2009 +0100 winebuild: Search for the as/ld/nm tools in the PATH under various names. --- tools/winebuild/utils.c | 62 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 59 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1828e40..b5ac1b9 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -193,6 +193,59 @@ int output( const char *format, ... ) return ret; } +/* find a build tool in the path, trying the various names */ +char *find_tool( const char * const *names ) +{ + static char **dirs; + static unsigned int count, maxlen; + + char *p, *file; + unsigned int i, len; + struct stat st; + + if (!dirs) + { + char *path; + + /* split the path in directories */ + + if (!getenv( "PATH" )) return NULL; + path = xstrdup( getenv( "PATH" )); + for (p = path, count = 2; *p; p++) if (*p == ':') count++; + dirs = xmalloc( count * sizeof(*dirs) ); + count = 0; + dirs[count++] = p = path; + while (*p) + { + while (*p && *p != ':') p++; + if (!*p) break; + *p++ = 0; + dirs[count++] = p; + } + for (i = 0; i < count; i++) maxlen = max( maxlen, strlen(dirs[i])+2 ); + } + + while (*names) + { + len = strlen(*names) + 1; + file = xmalloc( maxlen + len ); + + for (i = 0; i < count; i++) + { + strcpy( file, dirs[i] ); + p = file + strlen(file); + if (p == file) *p++ = '.'; + if (p[-1] != '/') *p++ = '/'; + strcpy( p, *names ); + + if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) return file; + } + free( file ); + names++; + } + return NULL; +} + const char *get_as_command(void) { if (!as_command) @@ -205,7 +258,8 @@ const char *get_as_command(void) } else { - as_command = xstrdup( "as" ); + static const char * const commands[] = { "gas", "as", NULL }; + if (!(as_command = find_tool( commands ))) as_command = xstrdup("as"); } if (force_pointer_size) @@ -230,7 +284,8 @@ const char *get_ld_command(void) } else { - ld_command = xstrdup( "ld" ); + static const char * const commands[] = { "ld", "gld", NULL }; + if (!(ld_command = find_tool( commands ))) ld_command = xstrdup("ld"); } if (force_pointer_size) @@ -255,7 +310,8 @@ const char *get_nm_command(void) } else { - nm_command = xstrdup( "nm" ); + static const char * const commands[] = { "nm", "gnm", NULL }; + if (!(nm_command = find_tool( commands ))) nm_command = xstrdup("nm"); } } return nm_command;

1 0

Alexandre Julliard : winebuild: Append the correct options for as and ld when forcing a 32/64-bit build.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: 0e954b14ebcbff10d86673ef7d5d0549b32400f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e954b14ebcbff10d86673ef7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 19:33:49 2009 +0100 winebuild: Append the correct options for as and ld when forcing a 32/64-bit build. --- tools/winebuild/utils.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d9126d8..1828e40 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -207,6 +207,13 @@ const char *get_as_command(void) { as_command = xstrdup( "as" ); } + + if (force_pointer_size) + { + const char *args = (force_pointer_size == 8) ? " --64" : " --32"; + as_command = xrealloc( as_command, strlen(as_command) + strlen(args) + 1 ); + strcat( as_command, args ); + } } return as_command; } @@ -225,6 +232,13 @@ const char *get_ld_command(void) { ld_command = xstrdup( "ld" ); } + + if (force_pointer_size) + { + const char *args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"; + ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 ); + strcat( ld_command, args ); + } } return ld_command; }

1 0

Alexandre Julliard : winebuild: Determine the appropriate as/ld/ nm commands at the time they are needed.
by Alexandre Julliard 05 Feb '09

05 Feb '09

Module: wine Branch: master Commit: d07f67acbcb45a85d6d221333a60bdac5783a32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07f67acbcb45a85d6d221333… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 19:31:54 2009 +0100 winebuild: Determine the appropriate as/ld/nm commands at the time they are needed. --- tools/winebuild/build.h | 4 +++ tools/winebuild/import.c | 14 +++++----- tools/winebuild/main.c | 22 ++-------------- tools/winebuild/utils.c | 62 +++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 72 insertions(+), 30 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 0ee7bde..d9df1ce 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -119,6 +119,7 @@ enum target_platform PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS }; +extern char *target_alias; extern enum target_cpu target_cpu; extern enum target_platform target_platform; @@ -168,6 +169,9 @@ extern void warning( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern int output( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); +extern const char *get_as_command(void); +extern const char *get_ld_command(void); +extern const char *get_nm_command(void); extern char *get_temp_file_name( const char *prefix, const char *suffix ); extern void output_standard_file_header(void); extern FILE *open_input_file( const char *srcdir, const char *name ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index dca18ab..bd56a00 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -527,21 +527,21 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) static const char *ldcombine_files( DLLSPEC *spec, char **argv ) { unsigned int i, len = 0; + const char *prog = get_ld_command(); char *cmd, *p, *ld_tmp_file, *undef_file; int err; undef_file = create_undef_symbols_file( spec ); len += strlen(undef_file) + 1; ld_tmp_file = get_temp_file_name( output_file_name, ".o" ); - if (!ld_command) ld_command = xstrdup("ld"); for (i = 0; argv[i]; i++) len += strlen(argv[i]) + 1; - cmd = p = xmalloc( len + strlen(ld_tmp_file) + 8 + strlen(ld_command) ); - p += sprintf( cmd, "%s -r -o %s %s", ld_command, ld_tmp_file, undef_file ); + cmd = p = xmalloc( len + strlen(ld_tmp_file) + 8 + strlen(prog) ); + p += sprintf( cmd, "%s -r -o %s %s", prog, ld_tmp_file, undef_file ); for (i = 0; argv[i]; i++) p += sprintf( p, " %s", argv[i] ); if (verbose) fprintf( stderr, "%s\n", cmd ); err = system( cmd ); - if (err) fatal_error( "%s -r failed with status %d\n", ld_command, err ); + if (err) fatal_error( "%s -r failed with status %d\n", prog, err ); free( cmd ); return ld_tmp_file; } @@ -551,6 +551,7 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) { size_t prefix_len; FILE *f; + const char *prog = get_nm_command(); char *cmd, buffer[1024], name_prefix[16]; int err; const char *name; @@ -564,9 +565,8 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) name = ldcombine_files( spec, argv ); - if (!nm_command) nm_command = xstrdup("nm"); - cmd = xmalloc( strlen(nm_command) + strlen(name) + 5 ); - sprintf( cmd, "%s -u %s", nm_command, name ); + cmd = xmalloc( strlen(prog) + strlen(name) + 5 ); + sprintf( cmd, "%s -u %s", prog, name ); if (!(f = popen( cmd, "r" ))) fatal_error( "Cannot execute '%s'\n", cmd ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 126b999..47cb266 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -74,6 +74,7 @@ enum target_platform target_platform = PLATFORM_WINDOWS; enum target_platform target_platform = PLATFORM_UNSPECIFIED; #endif +char *target_alias = NULL; char **lib_path = NULL; char *input_file_name = NULL; @@ -162,6 +163,8 @@ static void set_target( const char *target ) /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ + target_alias = xstrdup( target ); + /* get the CPU part */ if (!(p = strchr( spec, '-' ))) fatal_error( "Invalid target specification '%s'\n", target ); @@ -184,25 +187,6 @@ static void set_target( const char *target ) } free( spec ); - - if (!as_command) - { - as_command = xmalloc( strlen(target) + sizeof("-as") ); - strcpy( as_command, target ); - strcat( as_command, "-as" ); - } - if (!ld_command) - { - ld_command = xmalloc( strlen(target) + sizeof("-ld") ); - strcpy( ld_command, target ); - strcat( ld_command, "-ld" ); - } - if (!nm_command) - { - nm_command = xmalloc( strlen(target) + sizeof("-nm") ); - strcpy( nm_command, target ); - strcat( nm_command, "-nm" ); - } } /* cleanup on program exit */ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 39162fa..d9126d8 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -193,6 +193,60 @@ int output( const char *format, ... ) return ret; } +const char *get_as_command(void) +{ + if (!as_command) + { + if (target_alias) + { + as_command = xmalloc( strlen(target_alias) + sizeof("-as") ); + strcpy( as_command, target_alias ); + strcat( as_command, "-as" ); + } + else + { + as_command = xstrdup( "as" ); + } + } + return as_command; +} + +const char *get_ld_command(void) +{ + if (!ld_command) + { + if (target_alias) + { + ld_command = xmalloc( strlen(target_alias) + sizeof("-ld") ); + strcpy( ld_command, target_alias ); + strcat( ld_command, "-ld" ); + } + else + { + ld_command = xstrdup( "ld" ); + } + } + return ld_command; +} + +const char *get_nm_command(void) +{ + if (!nm_command) + { + if (target_alias) + { + nm_command = xmalloc( strlen(target_alias) + sizeof("-nm") ); + strcpy( nm_command, target_alias ); + strcat( nm_command, "-nm" ); + } + else + { + nm_command = xstrdup( "nm" ); + } + } + return nm_command; +} + /* get a name for a temp file, automatically cleaned up on exit */ char *get_temp_file_name( const char *prefix, const char *suffix ) { @@ -315,15 +369,15 @@ int remove_stdcall_decoration( char *name ) */ void assemble_file( const char *src_file, const char *obj_file ) { + const char *prog = get_as_command(); char *cmd; int err; - if (!as_command) as_command = xstrdup("as"); - cmd = xmalloc( strlen(as_command) + strlen(obj_file) + strlen(src_file) + 6 ); - sprintf( cmd, "%s -o %s %s", as_command, obj_file, src_file ); + cmd = xmalloc( strlen(prog) + strlen(obj_file) + strlen(src_file) + 6 ); + sprintf( cmd, "%s -o %s %s", prog, obj_file, src_file ); if (verbose) fprintf( stderr, "%s\n", cmd ); err = system( cmd ); - if (err) fatal_error( "%s failed with status %d\n", as_command, err ); + if (err) fatal_error( "%s failed with status %d\n", prog, err ); free( cmd ); }

1 0

Jeremy Newman : fix relative url var
by Jeremy Newman 05 Feb '09

05 Feb '09

Module: website Branch: master Commit: 9a35525bde8060370e908703f7c0753b6cb6cf20 URL: http://source.winehq.org/git/website.git/?a=commit;h=9a35525bde8060370e9087… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Feb 5 09:19:00 2009 -0600 fix relative url var --- news/en/2009020401.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/news/en/2009020401.xml b/news/en/2009020401.xml index f5cc1b5..73709fa 100644 --- a/news/en/2009020401.xml +++ b/news/en/2009020401.xml @@ -2,14 +2,14 @@ <date>February 04, 2009</date> <title>World Wine News Issue 356</title> <body> - <a href="{}/wwn/356">WWN Issue 356</a> was released today. + <a href="{$root}/wwn/356">WWN Issue 356</a> was released today. <ul> -<li><a href="{}/wwn/356#News: Wine Releases and Slashdotting">News: Wine Releases and Slashdotting</a></li> -<li><a href="{}/wwn/356#Wine Test Suite passing on Windows!">Wine Test Suite passing on Windows!</a></li> -<li><a href="{}/wwn/356#Wine running IE7">Wine running IE7</a></li> -<li><a href="{}/wwn/356#Finding static functions">Finding static functions</a></li> -<li><a href="{}/wwn/356#Wine and Python">Wine and Python</a></li> -<li><a href="{}/wwn/356#Fixing AppDB Ratings">Fixing AppDB Ratings</a></li> +<li><a href="{$root}/wwn/356#News: Wine Releases and Slashdotting">News: Wine Releases and Slashdotting</a></li> +<li><a href="{$root}/wwn/356#Wine Test Suite passing on Windows!">Wine Test Suite passing on Windows!</a></li> +<li><a href="{$root}/wwn/356#Wine running IE7">Wine running IE7</a></li> +<li><a href="{$root}/wwn/356#Finding static functions">Finding static functions</a></li> +<li><a href="{$root}/wwn/356#Wine and Python">Wine and Python</a></li> +<li><a href="{$root}/wwn/356#Fixing AppDB Ratings">Fixing AppDB Ratings</a></li> </ul> </body> </news>

1 0

Zachary Goldberg : WWN 356
by Jeremy Newman 05 Feb '09

05 Feb '09

Module: website Branch: master Commit: 5476685bb0748beb3be0201b00d4d8818741b653 URL: http://source.winehq.org/git/website.git/?a=commit;h=5476685bb0748beb3be020… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Wed Feb 4 19:55:58 2009 -0500 WWN 356 --- news/en/2009020401.xml | 15 + wwn/en/wn20090204_356.xml | 4867 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 4882 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5476685bb0748beb3b…

1 0

Juan Lang : shell32: Remove a test that fails on Win64.
by Alexandre Julliard 04 Feb '09

04 Feb '09

Module: wine Branch: master Commit: 63abc12461a6a3dc79f413a659f02a0681a4409d URL: http://source.winehq.org/git/wine.git/?a=commit;h=63abc12461a6a3dc79f413a65… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 2 13:45:18 2009 -0800 shell32: Remove a test that fails on Win64. --- dlls/shell32/tests/shellpath.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bf125b0..901b662 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -693,8 +693,8 @@ static void testWinDir(void) } } -/* Verifies the shell path for CSIDL_SYSTEM and CSIDL_SYSTEMX86 matches the - * return from GetSystemDirectory. If SHGetSpecialFolderPath fails, no harm, +/* Verifies the shell path for CSIDL_SYSTEM matches the return from + * GetSystemDirectory. If SHGetSpecialFolderPath fails, no harm, * no foul--not every shell32 version supports CSIDL_SYSTEM. */ static void testSystemDir(void) @@ -712,16 +712,10 @@ static void testSystemDir(void) "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", systemDir, systemShellPath); } - /* check CSIDL_SYSTEMX86; note that this isn't always present, so don't - * worry if it fails + /* CSIDL_SYSTEMX86 isn't checked in the same way, since it's different + * on Win64 (and non-x86 Windows systems, if there are any still in + * existence) than on Win32. */ - if (pSHGetSpecialFolderPathA(NULL, systemShellPath, CSIDL_SYSTEMX86, FALSE)) - { - myPathRemoveBackslashA(systemShellPath); - ok(!lstrcmpiA(systemDir, systemShellPath), - "GetSystemDirectory returns %s SHGetSpecialFolderPath returns %s\n", - systemDir, systemShellPath); - } } /* Globals used by subprocesses */

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
97
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 February 2009