* autoload.cc (IsProcessorFeaturePresent): Add.

* fhandler_proc.cc (format_proc_cpuinfo): Add case for 9x systems.
This commit is contained in:
Corinna Vinschen 2003-03-13 22:53:16 +00:00
parent c58555c70f
commit 5b186cd999
3 changed files with 15 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2003-03-13 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc (IsProcessorFeaturePresent): Add.
* fhandler_proc.cc (format_proc_cpuinfo): Add case for 9x systems.
2003-03-13 Corinna Vinschen <corinna@vinschen.de> 2003-03-13 Corinna Vinschen <corinna@vinschen.de>
* fhandler_proc.cc (format_proc_cpuinfo): Fix vendor id in cpuid case. * fhandler_proc.cc (format_proc_cpuinfo): Fix vendor id in cpuid case.

View File

@ -503,6 +503,7 @@ LoadDLLfuncEx2 (GetCompressedFileSizeA, 8, kernel32, 1, 0xffffffff)
LoadDLLfuncEx (GetConsoleWindow, 0, kernel32, 1) LoadDLLfuncEx (GetConsoleWindow, 0, kernel32, 1)
LoadDLLfuncEx (GetSystemTimes, 12, kernel32, 1) LoadDLLfuncEx (GetSystemTimes, 12, kernel32, 1)
LoadDLLfuncEx2 (IsDebuggerPresent, 0, kernel32, 1, 1) LoadDLLfuncEx2 (IsDebuggerPresent, 0, kernel32, 1, 1)
LoadDLLfunc (IsProcessorFeaturePresent, 4, kernel32);
LoadDLLfuncEx (Process32First, 8, kernel32, 1) LoadDLLfuncEx (Process32First, 8, kernel32, 1)
LoadDLLfuncEx (Process32Next, 8, kernel32, 1) LoadDLLfuncEx (Process32Next, 8, kernel32, 1)
LoadDLLfuncEx (SignalObjectAndWait, 16, kernel32, 1) LoadDLLfuncEx (SignalObjectAndWait, 16, kernel32, 1)

View File

@ -631,7 +631,15 @@ format_proc_cpuinfo (char *destbuf, size_t maxsize)
debug_printf ("processor does not support CPUID instruction"); debug_printf ("processor does not support CPUID instruction");
} }
if (!has_cpuid) if (!wincap.is_winnt ())
{
bufptr += __small_sprintf (bufptr, "processor : %d\n", cpu_number);
read_value ("VendorIdentifier", REG_SZ);
bufptr += __small_sprintf (bufptr, "vendor id : %s\n", szBuffer);
read_value ("Identifier", REG_SZ);
bufptr += __small_sprintf (bufptr, "identifier : %s\n", szBuffer);
}
else if (!has_cpuid)
{ {
bufptr += __small_sprintf (bufptr, "processor : %d\n", cpu_number); bufptr += __small_sprintf (bufptr, "processor : %d\n", cpu_number);
read_value ("VendorIdentifier", REG_SZ); read_value ("VendorIdentifier", REG_SZ);