From 83334f01d14ea4b561c3f8ba9105afed144c2bf7 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 7 Oct 2016 22:08:48 +0200
Subject: [PATCH] Make sure we don't accidentally propagate bad GetLastError()
 values

* When relevant we do SetLastError(S_OK) before calling the 'real'
  function, and likewise do GetLastError() to preserve the result if
  we're doing work after the real function.
---
 renderdoc/os/win32/win32_hook.cpp | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp
index e7c3ccca4..9c287a82a 100644
--- a/renderdoc/os/win32/win32_hook.cpp
+++ b/renderdoc/os/win32/win32_hook.cpp
@@ -428,13 +428,19 @@ HMODULE WINAPI Hooked_LoadLibraryExA(LPCSTR lpLibFileName, HANDLE fileHandle, DW
   if(flags == 0 && GetModuleHandleA(lpLibFileName))
     dohook = false;
 
+  SetLastError(S_OK);
+
   // we can use the function naked, as when setting up the hook for LoadLibraryExA, our own module
   // was excluded from IAT patching
   HMODULE mod = LoadLibraryExA(lpLibFileName, fileHandle, flags);
 
+  DWORD err = GetLastError();
+
   if(dohook)
     HookAllModules();
 
+  SetLastError(err);
+
   return mod;
 }
 
@@ -444,13 +450,19 @@ HMODULE WINAPI Hooked_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE fileHandle, D
   if(flags == 0 && GetModuleHandleW(lpLibFileName))
     dohook = false;
 
+  SetLastError(S_OK);
+
   // we can use the function naked, as when setting up the hook for LoadLibraryExA, our own module
   // was excluded from IAT patching
   HMODULE mod = LoadLibraryExW(lpLibFileName, fileHandle, flags);
 
+  DWORD err = GetLastError();
+
   if(dohook)
     HookAllModules();
 
+  SetLastError(err);
+
   return mod;
 }
 
@@ -492,6 +504,8 @@ FARPROC WINAPI Hooked_GetProcAddress(HMODULE mod, LPCSTR func)
         {
           RDCERR("Unexpected ordinal - lower than ordinalbase %u for %s",
                  (uint32_t)it->second.OrdinalBase, it->first.c_str());
+
+          SetLastError(S_OK);
           return GetProcAddress(mod, func);
         }
 
@@ -501,6 +515,8 @@ FARPROC WINAPI Hooked_GetProcAddress(HMODULE mod, LPCSTR func)
         {
           RDCERR("Unexpected ordinal - higher than fetched ordinal names (%u) for %s",
                  (uint32_t)it->second.OrdinalNames.size(), it->first.c_str());
+
+          SetLastError(S_OK);
           return GetProcAddress(mod, func);
         }
 
@@ -516,6 +532,8 @@ FARPROC WINAPI Hooked_GetProcAddress(HMODULE mod, LPCSTR func)
         if(found->origptr && *found->origptr == NULL)
           *found->origptr = (void *)GetProcAddress(mod, func);
 
+        SetLastError(S_OK);
+
         if(found->origptr && *found->origptr == NULL)
           return NULL;
 
@@ -524,6 +542,8 @@ FARPROC WINAPI Hooked_GetProcAddress(HMODULE mod, LPCSTR func)
     }
   }
 
+  SetLastError(S_OK);
+
   return GetProcAddress(mod, func);
 }