* wincap.h (wincapc::wow64): Change type to BOOL.

* wincap.cc: Remove explicit use of this pointer in wincapc methods.
	(wincapc::init): Fix bug in IsWow64Process handling.
This commit is contained in:
Corinna Vinschen 2008-04-27 16:12:00 +00:00
parent adfa3c85d0
commit 533ce3fb55
3 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,9 @@
2008-04-27 Corinna Vinschen <corinna@vinschen.de>
* wincap.h (wincapc::wow64): Change type to BOOL.
* wincap.cc: Remove explicit use of this pointer in wincapc methods.
(wincapc::init): Fix bug in IsWow64Process handling.
2008-04-26 Corinna Vinschen <corinna@vinschen.de> 2008-04-26 Corinna Vinschen <corinna@vinschen.de>
* dcrt0.cc (dll_crt0_0): Set SEM_NOGPFAULTERRORBOX error mode, too, * dcrt0.cc (dll_crt0_0): Set SEM_NOGPFAULTERRORBOX error mode, too,

View File

@ -392,15 +392,12 @@ wincapc::init ()
} }
if (has_osversioninfoex && version.wProductType != VER_NT_WORKSTATION) if (has_osversioninfoex && version.wProductType != VER_NT_WORKSTATION)
((wincaps *)this->caps)->is_server = true; ((wincaps *)caps)->is_server = true;
BOOL is_wow64_proc = FALSE; if (IsWow64Process (GetCurrentProcess (), &wow64) && !wow64)
if (IsWow64Process (GetCurrentProcess (), &is_wow64_proc))
wow64 = is_wow64_proc;
else
{ {
((wincaps *)this->caps)->needs_count_in_si_lpres2 = false; ((wincaps *)caps)->needs_count_in_si_lpres2 = false;
((wincaps *)this->caps)->has_restricted_stack_args = false; ((wincaps *)caps)->has_restricted_stack_args = false;
} }
__small_sprintf (osnam, "NT-%d.%d", version.dwMajorVersion, __small_sprintf (osnam, "NT-%d.%d", version.dwMajorVersion,
@ -410,5 +407,5 @@ wincapc::init ()
void void
wincapc::set_chunksize (DWORD nchunksize) wincapc::set_chunksize (DWORD nchunksize)
{ {
((wincaps *)this->caps)->chunksize = nchunksize; ((wincaps *)caps)->chunksize = nchunksize;
} }

View File

@ -46,7 +46,7 @@ class wincapc
{ {
OSVERSIONINFOEX version; OSVERSIONINFOEX version;
char osnam[40]; char osnam[40];
bool wow64; BOOL wow64;
void *caps; void *caps;
public: public: