Konrad Wartke : wineboot: Added more architectures in create_enviroment_registry_keys.
Alexandre Julliard
julliard at winehq.org
Mon Aug 16 12:25:01 CDT 2010
Module: wine
Branch: master
Commit: 8ac60d56b6d02a773b915e6e1389c5c070bfa633
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac60d56b6d02a773b915e6e1389c5c070bfa633
Author: Konrad Wartke <kwartke at gmail.com>
Date: Sun Aug 15 18:54:47 2010 +0200
wineboot: Added more architectures in create_enviroment_registry_keys.
---
programs/wineboot/wineboot.c | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 02d3746..90dd779 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -261,6 +261,8 @@ static void create_environment_registry_keys( void )
static const WCHAR NumProcW[] = {'N','U','M','B','E','R','_','O','F','_','P','R','O','C','E','S','S','O','R','S',0};
static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0};
static const WCHAR x86W[] = {'x','8','6',0};
+ static const WCHAR IA64W[] = {'I','A','6','4',0};
+ static const WCHAR AMD64W[] = {'A','M','D','6','4',0};
static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0};
static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0};
static const WCHAR ProcRevW[] = {'P','R','O','C','E','S','S','O','R','_','R','E','V','I','S','I','O','N',0};
@@ -280,8 +282,19 @@ static void create_environment_registry_keys( void )
sprintfW( buffer, PercentDW, NtCurrentTeb()->Peb->NumberOfProcessors );
set_reg_value( env_key, NumProcW, buffer );
- /* TODO: currently hardcoded x86, add different processors */
- set_reg_value( env_key, ProcArchW, x86W );
+ switch(sci.Architecture)
+ {
+ case PROCESSOR_ARCHITECTURE_AMD64:
+ set_reg_value( env_key, ProcArchW, AMD64W );
+ break;
+ case PROCESSOR_ARCHITECTURE_IA64:
+ set_reg_value( env_key, ProcArchW, IA64W );
+ break;
+ case PROCESSOR_ARCHITECTURE_INTEL:
+ default:
+ set_reg_value( env_key, ProcArchW, x86W );
+ break;
+ }
/* TODO: currently hardcoded Intel, add different processors */
sprintfW( buffer, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) );
More information about the wine-cvs
mailing list