system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 16:07:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel32: Fix some bad left-over uses of value in the CPU detection code.

Browse source
This commit is contained in:
Francois Gouget 2009-01-20 09:13:12 +01:00 committed by Alexandre Julliard
parent a82cdfc050
commit 89c63fd32b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dlls/kernel32/cpu.c
View file

@ -569,7 +569,7 @@ VOID WINAPI GetSystemInfo(
#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(value); val_len = sizeof(value);
if (sysctl(mib, 2, &value, &val_len, 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
@ -578,7 +578,7 @@ VOID WINAPI GetSystemInfo(
val_len = sizeof(value); val_len = sizeof(value);
if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0)
if (value > cachedsi.dwNumberOfProcessors) if (value > cachedsi.dwNumberOfProcessors)
cachedsi.dwNumberOfProcessors = value[0]; cachedsi.dwNumberOfProcessors = value;
mib[1] = HW_MODEL; mib[1] = HW_MODEL;
val_len = sizeof(model)-1; val_len = sizeof(model)-1;
if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) { if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) {
@ -614,16 +614,17 @@ VOID WINAPI GetSystemInfo(
if (f != NULL) if (f != NULL)
{ {
while (fgets(model, 255, f) != NULL) { while (fgets(model, 255, f) != NULL) {
if (sscanf(model,"cpu%d: features %x<", value, value+1) == 2) { int cpu, features;
if (sscanf(model,"cpu%d: features %x<", &cpu, &features) == 2) {
/* we could scan the string but it is easier /* we could scan the string but it is easier
to test the bits directly */ to test the bits directly */
if (value[1] & 0x1) if (features & 0x1)
PF[PF_FLOATING_POINT_EMULATED] = TRUE; PF[PF_FLOATING_POINT_EMULATED] = TRUE;
if (value[1] & 0x10) if (features & 0x10)
PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE;
if (value[1] & 0x100) if (features & 0x100)
PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
if (value[1] & 0x800000) if (features & 0x800000)
PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE;
break; break;