Fix build regression on Win7

Author: dmex

phlib/include/phconfig.h

@@ -82,6 +82,7 @@ PhIsExecutingInWow64(
     VOID
     );
 
+// 
 DECLSPEC_NORETURN
 FORCEINLINE
 VOID
@@ -92,7 +93,7 @@ PhExitApplication(
 #if (PHNT_VERSION >= PHNT_WIN7)
     RtlExitUserProcess(Status);
 #else
-    PhTerminateProcess(NtCurrentProcess(), Status);
+    ExitProcess(Status);
 #endif
 }
 

phlib/util.c

@@ -1700,19 +1700,31 @@ PVOID PhGetFileVersionInfo(
     _In_ PWSTR FileName
     )
 {
-    PVOID imageBaseAddress;
-    PVOID imageVersionInfo;
+    PVOID libraryModule;
+    PVOID versionInfo;
 
-    if (!NT_SUCCESS(PhLoadLibraryAsImageResource(FileName, &imageBaseAddress)))
+    libraryModule = LoadLibraryEx(
+        FileName,
+        NULL,
+        LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE
+        );
+
+    if (!libraryModule)
         return NULL;
 
-    if (PhLoadResource(imageBaseAddress, MAKEINTRESOURCE(VS_VERSION_INFO), VS_FILE_INFO, NULL, &imageVersionInfo))
+    if (PhLoadResource(
+        libraryModule,
+        MAKEINTRESOURCE(VS_VERSION_INFO),
+        VS_FILE_INFO,
+        NULL,
+        &versionInfo
+        ))
     {
-        PhFreeLibraryAsImageResource(imageBaseAddress);
-        return imageVersionInfo;
+        FreeLibrary(libraryModule);
+        return versionInfo;
     }
 
-    PhFreeLibraryAsImageResource(imageBaseAddress);
+    FreeLibrary(libraryModule);
     return NULL;
 }
 

tools/peview/main.c

@@ -94,7 +94,7 @@ INT WINAPI wWinMain(
             L"Most features will not work correctly.\n\n"
             L"Please run the 64-bit version of PE Viewer instead."
             );
-        RtlExitUserProcess(STATUS_IMAGE_SUBSYSTEM_NOT_PRESENT);
+        PhExitApplication(STATUS_IMAGE_SUBSYSTEM_NOT_PRESENT);
     }
 #endif
 
@@ -154,7 +154,7 @@ INT WINAPI wWinMain(
                         NULL
                         ))
                     {
-                        RtlExitUserProcess(STATUS_SUCCESS);
+                        PhExitApplication(STATUS_SUCCESS);
                     }
 
                     PhDereferenceObject(applicationFileName);