Alexandre Julliard : ntdll: Report the correct processor architecture.

Alexandre Julliard julliard at winehq.org
Fri Apr 16 10:56:06 CDT 2010


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Apr 16 16:59:01 2010 +0200

ntdll: Report the correct processor architecture.

---

 dlls/ntdll/nt.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index b262c1e..e7700a1 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -888,8 +888,18 @@ void fill_cpu_info(void)
     /* choose sensible defaults ...
      * FIXME: perhaps overridable with precompiler flags?
      */
+#ifdef __i386__
     cached_sci.Architecture     = PROCESSOR_ARCHITECTURE_INTEL;
     cached_sci.Level		= 5; /* 586 */
+#elif defined(__x86_64__)
+    cached_sci.Architecture     = PROCESSOR_ARCHITECTURE_AMD64;
+#elif defined(__powerpc__)
+    cached_sci.Architecture     = PROCESSOR_ARCHITECTURE_PPC;
+#elif defined(__ALPHA__)
+    cached_sci.Architecture     = PROCESSOR_ARCHITECTURE_ALPHA;
+#else
+#error Unknown CPU
+#endif
     cached_sci.Revision   	= 0;
     cached_sci.Reserved         = 0;
     cached_sci.FeatureSet       = 0x1fff; /* FIXME: set some sensible defaults out of ProcessFeatures[] */




More information about the wine-cvs mailing list