From 16bd6cdb6a70bb82dd75421f3b38e8317fc7bb3e Mon Sep 17 00:00:00 2001 From: wj32 Date: Mon, 1 Jun 2015 08:37:44 +0000 Subject: [PATCH] Use PH_EXECUTING_IN_WOW64 define instead git-svn-id: svn://svn.code.sf.net/p/processhacker/code@6014 21ef857c-d57f-4fe0-8362-d861dc6d29cd --- 2.x/trunk/ProcessHacker/include/phapp.h | 6 ++++++ 2.x/trunk/ProcessHacker/main.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/2.x/trunk/ProcessHacker/include/phapp.h b/2.x/trunk/ProcessHacker/include/phapp.h index 6f7020d78..e2997c72f 100644 --- a/2.x/trunk/ProcessHacker/include/phapp.h +++ b/2.x/trunk/ProcessHacker/include/phapp.h @@ -44,6 +44,12 @@ extern COLORREF PhSysWindowColor; // main +#ifdef _WIN64 +#define PH_EXECUTING_IN_WOW64 (FALSE) +#else +#define PH_EXECUTING_IN_WOW64 (USER_SHARED_DATA->NativeProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) +#endif + typedef struct _PH_STARTUP_PARAMETERS { union diff --git a/2.x/trunk/ProcessHacker/main.c b/2.x/trunk/ProcessHacker/main.c index b354b9f17..a5de4a47d 100644 --- a/2.x/trunk/ProcessHacker/main.c +++ b/2.x/trunk/ProcessHacker/main.c @@ -245,8 +245,7 @@ INT WINAPI wWinMain( RtlExitUserProcess(STATUS_SUCCESS); } -#ifndef _WIN64 - if (USER_SHARED_DATA->NativeProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + if (PH_EXECUTING_IN_WOW64) { PhShowWarning( NULL, @@ -255,7 +254,6 @@ INT WINAPI wWinMain( L"Please run the 64-bit version of Process Hacker instead." ); } -#endif PhPluginsEnabled = PhGetIntegerSetting(L"EnablePlugins") && !PhStartupParameters.NoPlugins;