[Merge chakra-core/ChakraCore@1548eeaf78] [MERGE #3544 @MikeHolman] f…

…ix bugs in MemoryOperationLastError Merge pull request #3544 from MikeHolman:memlasterror Fixes issues where RecordLastError was not calling GLE correctly, and RecordError was unnecessarily calling HRESULT_FROM_WIN32. OS: 13294698
nodejs · Aug 18, 2017 · f2c4f34 · f2c4f34
1 parent 9a5c085
commit f2c4f34
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/deps/chakrashim/core/lib/Common/Memory/PageAllocator.h b/deps/chakrashim/core/lib/Common/Memory/PageAllocator.h
@@ -397,7 +397,7 @@ class MemoryOperationLastError
 #if ENABLE_OOP_NATIVE_CODEGEN
         if (MemOpLastError == S_OK)
         {
-            MemOpLastError = GetLastError();
+            MemOpLastError = HRESULT_FROM_WIN32(::GetLastError());
         }
 #endif
     }
@@ -407,7 +407,7 @@ class MemoryOperationLastError
 #if ENABLE_OOP_NATIVE_CODEGEN
         if (MemOpLastError == S_OK)
         {
-            MemOpLastError = HRESULT_FROM_WIN32(error);
+            MemOpLastError = error;
         }
 #endif
     }