ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Fix the sysctl() usage and the CPU detection on NetBSD.

This commit is contained in:
Francois Gouget 2009-01-09 09:34:55 +01:00 committed by Alexandre Julliard
parent 5da42336d9
commit b881cfc541
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/kernel32/cpu.c
View File

@ -547,7 +547,8 @@ VOID WINAPI GetSystemInfo(
#elif defined (__NetBSD__) #elif defined (__NetBSD__)
{ {
int mib[2]; int mib[2];
int value[2]; int value;
size_t val_len;
char model[256]; char model[256];
char *cpuclass; char *cpuclass;
FILE *f = fopen ("/var/run/dmesg.boot", "r"); FILE *f = fopen ("/var/run/dmesg.boot", "r");
@ -556,33 +557,33 @@ VOID WINAPI GetSystemInfo(
mib[0] = CTL_MACHDEP; mib[0] = CTL_MACHDEP;
#ifdef CPU_FPU_PRESENT #ifdef CPU_FPU_PRESENT
mib[1] = CPU_FPU_PRESENT; mib[1] = CPU_FPU_PRESENT;
value[1] = sizeof(int); val_len = sizeof(value);
if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0)
if (value) PF[PF_FLOATING_POINT_EMULATED] = FALSE; if (value) PF[PF_FLOATING_POINT_EMULATED] = FALSE;
else PF[PF_FLOATING_POINT_EMULATED] = TRUE; else PF[PF_FLOATING_POINT_EMULATED] = TRUE;
#endif #endif
#ifdef CPU_SSE #ifdef CPU_SSE
mib[1] = CPU_SSE; /* this should imply MMX */ mib[1] = CPU_SSE; /* this should imply MMX */
value[1] = sizeof(int); val_len = sizeof(value);
if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0)
if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;
#endif #endif
#ifdef CPU_SSE2 #ifdef CPU_SSE2
mib[1] = CPU_SSE2; /* this should imply MMX */ mib[1] = CPU_SSE2; /* this should imply MMX */
value[1] = sizeof(int); value[1] = sizeof(value);
if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0)
if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; if (value) PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;
#endif #endif
mib[0] = CTL_HW; mib[0] = CTL_HW;
mib[1] = HW_NCPU; mib[1] = HW_NCPU;
value[1] = sizeof(int); val_len = sizeof(value);
if (sysctl(mib, 2, value, value+1, NULL, 0) >= 0) if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0)
if (value[0] > cachedsi.dwNumberOfProcessors) if (value > cachedsi.dwNumberOfProcessors)
cachedsi.dwNumberOfProcessors = value[0]; cachedsi.dwNumberOfProcessors = value[0];
mib[1] = HW_MODEL; mib[1] = HW_MODEL;
value[1] = 255; val_len = sizeof(model)-1;
if (sysctl(mib, 2, model, value+1, NULL, 0) >= 0) { if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) {
model[value[1]] = '\0'; /* just in case */ model[val_len] = '\0'; /* just in case */
cpuclass = strstr(model, "-class"); cpuclass = strstr(model, "-class");
if (cpuclass != NULL) { if (cpuclass != NULL) {
while(cpuclass > model && cpuclass[0] != '(') cpuclass--; while(cpuclass > model && cpuclass[0] != '(') cpuclass--;
@ -636,7 +637,7 @@ VOID WINAPI GetSystemInfo(
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
{ {
int ret, num; int ret, num;
unsigned len; size_t len;
get_cpuinfo( &cachedsi ); get_cpuinfo( &cachedsi );