Alexandre Julliard : ntdll: Don' t print an error when architecture is set to win64 and the app is 64-bit.

Alexandre Julliard julliard at winehq.org
Tue Mar 1 11:07:16 CST 2011


Module: wine
Branch: master
Commit: 29f57999960c989c13c1dffdaf925e1e070e72bf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=29f57999960c989c13c1dffdaf925e1e070e72bf

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar  1 14:10:16 2011 +0100

ntdll: Don't print an error when architecture is set to win64 and the app is 64-bit.

---

 dlls/ntdll/server.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 270ccd0..2d88f10 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -1122,7 +1122,7 @@ size_t server_init_thread( void *entry_point )
             if (!strcmp( arch, "win32" ) && (is_win64 || is_wow64))
                 fatal_error( "WINEARCH set to win32 but '%s' is a 64-bit installation.\n",
                              wine_get_config_dir() );
-            if (!strcmp( arch, "win64" ) && !is_wow64)
+            if (!strcmp( arch, "win64" ) && !is_win64 && !is_wow64)
                 fatal_error( "WINEARCH set to win64 but '%s' is a 32-bit installation.\n",
                              wine_get_config_dir() );
         }




More information about the wine-cvs mailing list