Use an alternate mechanism for CreateFile calls in Chrome

base/win/iat_patch_function.cc

Index: base/win/iat_patch_function.cc
diff --git a/base/win/iat_patch_function.cc b/base/win/iat_patch_function.cc
index a4a89028b870f34aa089951009ce06c6ac6f426c..42edb35c14d9efb803d58b97763ab692b95e7cf1 100644
--- a/base/win/iat_patch_function.cc
+++ b/base/win/iat_patch_function.cc
@@ -56,11 +56,23 @@ DWORD ModifyCode(void* old_code, void* new_code, int length) {
   }
 
   // Change the page protection so that we can write.
+  MEMORY_BASIC_INFORMATION memory_info;
   DWORD error = NO_ERROR;
   DWORD old_page_protection = 0;
+
+  if (!::VirtualQuery(old_code, &memory_info, sizeof(memory_info))) {

[robertshield, 2014/01/29 17:59:33]

Nit, convention in this file seems to be not to prefix API calls with the scope
operator. I don't much like this convention, but I'd suggest remaining
consistent or updating the file.

+    error = GetLastError();
+    return error;
+  }
+
+  DWORD is_executable = (PAGE_EXECUTE | PAGE_EXECUTE_READ |
+                        PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY) &
+                        memory_info.Protect;
+
   if (VirtualProtect(old_code,
                      length,
-                     PAGE_READWRITE,
+                     is_executable ? PAGE_EXECUTE_READWRITE :
+                                     PAGE_READWRITE,
                      &old_page_protection)) {
 
     // Write the data.
@@ -74,7 +86,6 @@ DWORD ModifyCode(void* old_code, void* new_code, int length) {
                   &old_page_protection);
   } else {
     error = GetLastError();
-    NOTREACHED();
   }
 
   return error;