Add PhGetFileText UTF8 support

Author: dmex

phlib/include/phutil.h

@@ -1311,17 +1311,19 @@ PhLoadAllImportsForDll(
     );
 
 PHLIBAPI
-PPH_STRING
+PVOID
 NTAPI
 PhGetFileText(
-    _In_ HANDLE FileHandle
+    _In_ HANDLE FileHandle,
+    _In_ BOOLEAN Unicode
     );
 
 PHLIBAPI
-PPH_STRING
+PVOID
 NTAPI
 PhFileReadAllText(
-    _In_ PWSTR FileName
+    _In_ PWSTR FileName,
+    _In_ BOOLEAN Unicode
     );
 
 PHLIBAPI

phlib/lsasup.c

@@ -673,7 +673,7 @@ VOID PhInitializeCapabilitySidCache(
         capabilityListFileName = PhConcatStringRefZ(&applicationDirectory->sr, L"capslist.txt");
         PhDereferenceObject(applicationDirectory);
 
-        capabilityListString = PhFileReadAllText(capabilityListFileName->Buffer);
+        capabilityListString = PhFileReadAllText(capabilityListFileName->Buffer, TRUE);
         PhDereferenceObject(capabilityListFileName);      
     }
 

phlib/util.c

@@ -6664,11 +6664,12 @@ PPH_STRING PhGetExportNameFromOrdinal(
     return NULL;
 }
 
-PPH_STRING PhGetFileText(
-    _In_ HANDLE FileHandle
+PVOID PhGetFileText(
+    _In_ HANDLE FileHandle,
+    _In_ BOOLEAN Unicode
     )
 {
-    PPH_STRING string = NULL;
+    PVOID string = NULL;
     PSTR data;
     ULONG allocatedLength;
     ULONG dataLength;
@@ -6717,19 +6718,24 @@ PPH_STRING PhGetFileText(
     if (dataLength > 0)
     {
         data[dataLength] = ANSI_NULL;
-        string = PhConvertUtf8ToUtf16Ex(data, dataLength);
+
+        if (Unicode)
+            string = PhConvertUtf8ToUtf16Ex(data, dataLength);
+        else
+            string = PhCreateBytesEx(data, dataLength);
     }
 
     PhFree(data);
 
     return string;
 }
 
-PPH_STRING PhFileReadAllText(
-    _In_ PWSTR FileName
+PVOID PhFileReadAllText(
+    _In_ PWSTR FileName,
+    _In_ BOOLEAN Unicode
     )
 {
-    PPH_STRING string = NULL;
+    PVOID string = NULL;
     HANDLE fileHandle;
 
     if (NT_SUCCESS(PhCreateFileWin32(
@@ -6742,7 +6748,7 @@ PPH_STRING PhFileReadAllText(
         FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT
         )))
     {
-        string = PhGetFileText(fileHandle);
+        string = PhGetFileText(fileHandle, Unicode);
         NtClose(fileHandle);
     }
 

phlib/wslsup.c

@@ -384,7 +384,7 @@ ULONG PhCreateProcessLxss(
     NtClose(outputWriteHandle);
 
     // Read the pipe data. (dmex)
-    lxssOutputString = PhGetFileText(outputReadHandle);
+    lxssOutputString = PhGetFileText(outputReadHandle, TRUE);
 
     // Get the exit code after we finish reading the data from the pipe. (dmex)
     if (NT_SUCCESS(status = PhGetProcessBasicInformation(processHandle, &basicInfo)))