Merge remote-tracking branch 'refs/remotes/origin/master' into SystemProcessorBrandString

Author: dmex

ProcessHacker/memlist.c

@@ -442,7 +442,7 @@ PPH_STRING PhpFormatSizeIfNonZero(
     )
 {
     if (Size != 0)
-        return PhFormatSize(Size, 1);
+        return PhFormatSize(Size, -1);
     else
         return NULL;
 }
@@ -700,7 +700,7 @@ BOOLEAN NTAPI PhpMemoryTreeNewCallback(
                 }
                 break;
             case PHMMTLC_SIZE:
-                PhMoveReference(&node->SizeText, PhFormatSize(memoryItem->RegionSize, 1));
+                PhMoveReference(&node->SizeText, PhFormatSize(memoryItem->RegionSize, -1));
                 getCellText->Text = PhGetStringRef(node->SizeText);
                 break;
             case PHMMTLC_PROTECTION:

build/sdk/makesdk.ps1

@@ -50,7 +50,7 @@ function CheckBaseDirectory()
         if (!(Test-Path "ProcessHacker.sln"))
         {
             Write-Host "Unable to find project directory... Exiting." -ForegroundColor Red
-            exit 5;
+            exit 5
         }
     }
 }
@@ -80,38 +80,42 @@ function BuildSolution([string] $FileName)
     # Debug builds
     & $msBuild  "/m",
                 "/nologo",
+                "/nodemode:1",
+                "/nodeReuse:true",
                 "/verbosity:quiet",
                 "/p:Configuration=Debug",
                 "/p:Platform=Win32",
-                "/maxcpucount:${env:NUMBER_OF_PROCESSORS}",
                 "/target:Rebuild",
                 "$FileName"
 
     & $msBuild  "/m",
                 "/nologo",
+                "/nodemode:1",
+                "/nodeReuse:true",
                 "/verbosity:quiet",
                 "/p:Configuration=Debug",
                 "/p:Platform=x64",
-                "/maxcpucount:${env:NUMBER_OF_PROCESSORS}",
                 "/target:Rebuild",
                 "$FileName"
 
     # Release builds
     & $msBuild  "/m",
                 "/nologo",
+                "/nodemode:1",
+                "/nodeReuse:true",
                 "/verbosity:quiet",
                 "/p:Configuration=Release",
                 "/p:Platform=Win32",
-                "/maxcpucount:${env:NUMBER_OF_PROCESSORS}",
                 "/target:Rebuild",
                 "$FileName"
 
     & $msBuild  "/m",
                 "/nologo",
+                "/nodemode:1",
+                "/nodeReuse:true",
                 "/verbosity:quiet",
                 "/p:Configuration=Release",
                 "/p:Platform=x64",
-                "/maxcpucount:${env:NUMBER_OF_PROCESSORS}",
                 "/target:Rebuild",
                 "$FileName"
 
@@ -122,6 +126,7 @@ function BuildSolution([string] $FileName)
     else
     {
         Write-Host "`t`t[ERROR]" -ForegroundColor Red
+        exit 1
     }
 }
 
@@ -265,6 +270,7 @@ function BuildPublicHeaders()
     else
     {
         Write-Host "`t`t[ERROR]" -ForegroundColor Red
+        exit 1
     }
 }