Changeset 2984 for trunk/src/kernel32/cpu.cpp

Timestamp:

Mar 3, 2000, 12:16:00 PM (25 years ago)

Author:

sandervl

Message:

moved registry apis into kernel32 + cleanup

File:

• trunk/src/kernel32/cpu.cpp (modified) (8 diffs)

trunk/src/kernel32/cpu.cpp

@@ -1 @@
-/* $Id: cpu.cpp,v 1.6 2000-02-16 14:25:36 sandervl Exp $ */
+/* $Id: cpu.cpp,v 1.7 2000-03-03 11:15:57 sandervl Exp $ */
 /*
  * Odin win32 CPU apis
@@ -21 +21 @@
 #include "debugtools.h"
 #include <cpuhlp.h>
-#include "initsystem.h"
 
 #define DBG_LOCALLOG    DBG_cpu
@@ -102 +101 @@
 
         /* Create this registry key for all systems */
-        if (ADVAPI32_RegCreateKeyA(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor",&hkey)!=ERROR_SUCCESS) {
+        if (RegCreateKeyA(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\CentralProcessor",&hkey)!=ERROR_SUCCESS) {
             dprintf(("Unable to register CPU information\n"));
         }
@@ -113 +112 @@
                 sprintf(buf,"%d",i);
                 if (xhkey)
-                        ADVAPI32_RegCloseKey(xhkey);
-                ADVAPI32_RegCreateKeyA(hkey,buf,&xhkey);
+                        RegCloseKey(xhkey);
+                RegCreateKeyA(hkey,buf,&xhkey);
 
                 signature = GetCPUSignature();
@@ -137 +136 @@
                 sprintf(buf,"CPU %ld",cachedsi.dwProcessorType);
                 if (xhkey) {
-                        ADVAPI32_RegSetValueExA(xhkey,"Identifier",0,REG_SZ,(LPBYTE)buf,strlen(buf));
+                        RegSetValueExA(xhkey,"Identifier",0,REG_SZ,(LPBYTE)buf,strlen(buf));
                         memset(buf, 0, sizeof(buf));
                         GetCPUVendorString(buf);
-                        ADVAPI32_RegSetValueExA(xhkey,"VendorIdentifier",0,REG_SZ,(LPBYTE)buf,strlen(buf));
+                        RegSetValueExA(xhkey,"VendorIdentifier",0,REG_SZ,(LPBYTE)buf,strlen(buf));
                 }
                 cachedsi.wProcessorRevision = signature & 0xf;
@@ -162 +161 @@
                 if (features & CPUID_FPU_PRESENT) {
                         if (i == 0) {
-                                if(ADVAPI32_RegCreateKeyA(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor",&fpukey)!=ERROR_SUCCESS) 
+                                if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor",&fpukey)!=ERROR_SUCCESS) 
                                         dprintf(("Unable to register FPU information\n"));
                         }
@@ -168 +167 @@
                         if(fpukey) {
                                 sprintf(buf,"%d",i);
-                                ADVAPI32_RegCreateKeyA(fpukey,buf,&xhfpukey);
+                                RegCreateKeyA(fpukey,buf,&xhfpukey);
                         }
                 }
@@ -177 +176 @@
 
         if (xhkey)
-                ADVAPI32_RegCloseKey(xhkey);
+                RegCloseKey(xhkey);
         if (hkey)
-                ADVAPI32_RegCloseKey(hkey);
+                RegCloseKey(hkey);
         if (xhfpukey)
-                ADVAPI32_RegCloseKey(xhfpukey);
+                RegCloseKey(xhfpukey);
         if (fpukey)
-                ADVAPI32_RegCloseKey(fpukey);
+                RegCloseKey(fpukey);
 
 }