Use IntPtr(-1) for INVALID_HANDLE_VALUE instead of IntPtr.Zero (PowerShell#3544)

0xfeeddeadbeef · daxian-dbw · commit 47ec6b2a86f7 · 2017-04-13T17:00:56.000-07:00
- Fix incorrect handling of 'GetCurrentProcess()' API return value in 'IsWow64()' function (MainEntry.cpp)
- Remove unused INVALID_HANDLE_VALUE field from 'ProcessNativeMethods' class (Process.cs)
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -2608,7 +2608,6 @@ internal struct JOBOBJECT_BASIC_PROCESS_ID_LIST
     internal static class ProcessNativeMethods
     {
         // Fields
-        internal static readonly IntPtr INVALID_HANDLE_VALUE = IntPtr.Zero;
         internal static UInt32 GENERIC_READ = 0x80000000;
         internal static UInt32 GENERIC_WRITE = 0x40000000;
         internal static UInt32 FILE_ATTRIBUTE_NORMAL = 0x80000000;
diff --git a/src/System.Management.Automation/utils/PlatformInvokes.cs b/src/System.Management.Automation/utils/PlatformInvokes.cs
@@ -558,7 +558,7 @@ internal struct PRIVILEGE_SET
 #if !UNIX
 
         // Fields
-        internal static readonly IntPtr INVALID_HANDLE_VALUE = IntPtr.Zero;
+        internal static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
         internal static UInt32 GENERIC_READ = 0x80000000;
         internal static UInt32 GENERIC_WRITE = 0x40000000;
         internal static UInt32 FILE_ATTRIBUTE_NORMAL = 0x80000000;
diff --git a/src/powershell-native/nativemsh/pwrshexe/MainEntry.cpp b/src/powershell-native/nativemsh/pwrshexe/MainEntry.cpp
@@ -1139,11 +1139,6 @@ BOOL IsWow64()
 {
     HANDLE hCurrentProc = GetCurrentProcess();
 
-    if (INVALID_HANDLE_VALUE == hCurrentProc)
-    {
-        return false;
-    }
-
     BOOL isWow64Process = FALSE;
     BOOL ret = IsWow64Process(hCurrentProc, &isWow64Process);
 
@@ -1152,7 +1147,7 @@ BOOL IsWow64()
         return isWow64Process;
     }
 
-    return false;
+    return FALSE;
 }
 
 /**********************************************************************

Original file line number	Diff line number	Diff line change
`@@ -2608,7 +2608,6 @@ internal struct JOBOBJECT_BASIC_PROCESS_ID_LIST`
`2608`	`2608`	`internal static class ProcessNativeMethods`
`2609`	`2609`	`{`
`2610`	`2610`	`// Fields`
`2611`		`- internal static readonly IntPtr INVALID_HANDLE_VALUE = IntPtr.Zero;`
`2612`	`2611`	`internal static UInt32 GENERIC_READ = 0x80000000;`
`2613`	`2612`	`internal static UInt32 GENERIC_WRITE = 0x40000000;`
`2614`	`2613`	`internal static UInt32 FILE_ATTRIBUTE_NORMAL = 0x80000000;`
Original file line number	Diff line number	Diff line change
`@@ -1139,11 +1139,6 @@ BOOL IsWow64()`
`1139`	`1139`	`{`
`1140`	`1140`	`HANDLE hCurrentProc = GetCurrentProcess();`
`1141`	`1141`
`1142`		`- if (INVALID_HANDLE_VALUE == hCurrentProc)`
`1143`		`- {`
`1144`		`- return false;`
`1145`		`- }`
`1146`		`-`
`1147`	`1142`	`BOOL isWow64Process = FALSE;`
`1148`	`1143`	`BOOL ret = IsWow64Process(hCurrentProc, &isWow64Process);`
`1149`	`1144`
`@@ -1152,7 +1147,7 @@ BOOL IsWow64()`
`1152`	`1147`	`return isWow64Process;`
`1153`	`1148`	`}`
`1154`	`1149`
`1155`		`- return false;`
	`1150`	`+ return FALSE;`
`1156`	`1151`	`}`
`1157`	`1152`
`1158`	`1153`	`/**********************************************************************`