From 72df7bbfe8542a57fb84d7fb0c6d849aae4c8d2a Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Tue, 6 Jul 2010 11:08:12 +0000
Subject: [PATCH] CreateFile -> PhCreateFileWin32

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@3283 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 2.x/trunk/ProcessHacker/mdump.c | 14 +++++++-------
 2.x/trunk/phlib/mapimg.c        | 14 +++++++-------
 2.x/trunk/phlib/verify.c        | 14 ++++++--------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/2.x/trunk/ProcessHacker/mdump.c b/2.x/trunk/ProcessHacker/mdump.c
index cfc134577..0247f1f55 100644
--- a/2.x/trunk/ProcessHacker/mdump.c
+++ b/2.x/trunk/ProcessHacker/mdump.c
@@ -125,19 +125,19 @@ BOOLEAN PhpCreateProcessMiniDumpWithProgress(
         return FALSE;
     }
 
-    context.FileHandle = CreateFile(
+    status = PhCreateFileWin32(
+        &context.FileHandle,
         FileName,
         FILE_GENERIC_WRITE,
         0,
-        NULL,
-        CREATE_ALWAYS,
-        FILE_ATTRIBUTE_NORMAL,
-        NULL
+        0,
+        FILE_OVERWRITE_IF,
+        FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT
         );
 
-    if (context.FileHandle == INVALID_HANDLE_VALUE)
+    if (!NT_SUCCESS(status))
     {
-        PhShowStatus(hWnd, L"Unable to access the dump file", 0, GetLastError());
+        PhShowStatus(hWnd, L"Unable to access the dump file", status, 0);
         NtClose(context.ProcessHandle);
         return FALSE;
     }
diff --git a/2.x/trunk/phlib/mapimg.c b/2.x/trunk/phlib/mapimg.c
index 8d9728553..0e5655847 100644
--- a/2.x/trunk/phlib/mapimg.c
+++ b/2.x/trunk/phlib/mapimg.c
@@ -190,19 +190,19 @@ NTSTATUS PhMapViewOfEntireFile(
     // Open the file if we weren't supplied a file handle.
     if (!FileHandle)
     {
-        FileHandle = CreateFile(
+        status = PhCreateFileWin32(
+            &FileHandle,
             FileName,
             (FILE_EXECUTE | FILE_READ_ATTRIBUTES | FILE_READ_DATA) |
             (!ReadOnly ? (FILE_APPEND_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_DATA) : 0),
+            0,
             FILE_SHARE_READ,
-            NULL,
-            OPEN_EXISTING,
-            FILE_ATTRIBUTE_NORMAL,
-            NULL
+            FILE_OPEN,
+            FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT
             );
 
-        if (FileHandle == INVALID_HANDLE_VALUE)
-            return NTSTATUS_FROM_WIN32(GetLastError());
+        if (!NT_SUCCESS(status))
+            return status;
 
         openedFile = TRUE;
     }
diff --git a/2.x/trunk/phlib/verify.c b/2.x/trunk/phlib/verify.c
index df60fb58e..e8131f427 100644
--- a/2.x/trunk/phlib/verify.c
+++ b/2.x/trunk/phlib/verify.c
@@ -299,17 +299,15 @@ VERIFY_RESULT PhpVerifyFileFromCatalog(
     HANDLE catInfoHandle = NULL;
     ULONG i;
 
-    fileHandle = CreateFile(
+    if (!NT_SUCCESS(PhCreateFileWin32(
+        &fileHandle,
         FileName,
         GENERIC_READ,
+        0,
         FILE_SHARE_READ,
-        NULL,
-        OPEN_EXISTING,
-        FILE_ATTRIBUTE_NORMAL,
-        NULL
-        );
-
-    if (fileHandle == INVALID_HANDLE_VALUE)
+        FILE_OPEN,
+        FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT
+        )))
         return VrNoSignature;
 
     // Don't try to hash files over 32 MB in size.