Merge pull request #16 from processhacker/master

[pull] master from processhacker:master
CeruleanSky · Sep 25, 2020 · 54e13f7 · 54e13f7
2 parents 8e5007c + d116646
commit 54e13f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/ProcessHacker/main.c b/ProcessHacker/main.c
@@ -987,6 +987,7 @@ VOID PhpShowKphError(
         PhShowError2(
             NULL,
             Message,
+            L"%s",
             L"You will be unable to use more advanced features, view details about system processes or terminate malicious software."
             );
     }
@@ -1003,15 +1004,16 @@ VOID PhpShowKphError(
                 L"\r\n\r\n",
                 L"You will be unable to use more advanced features, view details about system processes or terminate malicious software."
                 );
-            PhShowError2(NULL, Message, statusMessage->Buffer);
+            PhShowError2(NULL, Message, L"%s", statusMessage->Buffer);
             PhDereferenceObject(statusMessage);
             PhDereferenceObject(errorMessage);
         }
         else
         {
             PhShowError2(
                 NULL, 
-                Message, 
+                Message,
+                L"%s",
                 L"You will be unable to use more advanced features, view details about system processes or terminate malicious software."
                 );
         }

diff --git a/tools/CustomBuildTool/Utils.cs b/tools/CustomBuildTool/Utils.cs
@@ -95,6 +95,9 @@ public static int CreateProcess(string FileName, string Arguments, out string ou
             }
 
             outputstring = output.ToString() + error.ToString();
+            outputstring = outputstring.Replace("\n\n", "\r\n", StringComparison.OrdinalIgnoreCase).Trim();
+            outputstring = outputstring.Replace("\r\n", string.Empty, StringComparison.OrdinalIgnoreCase).Trim();
+
             return exitcode;
         }
 

diff --git a/tools/CustomBuildTool/bin/Release/CustomBuildTool.exe b/tools/CustomBuildTool/bin/Release/CustomBuildTool.exe