Improve macro usage

Author: dmex

ProcessHacker/appsup.c

@@ -2075,7 +2075,7 @@ BOOLEAN PhShellOpenKey2(
     PhUnicodeStringToStringRef(&valueName, &valueNameSr);
 
     expandedKeyName = PhExpandKeyName(KeyName, TRUE);
-    NtSetValueKey(favoritesKeyHandle, &valueName, 0, REG_SZ, expandedKeyName->Buffer, (ULONG)expandedKeyName->Length + 2);
+    NtSetValueKey(favoritesKeyHandle, &valueName, 0, REG_SZ, expandedKeyName->Buffer, (ULONG)expandedKeyName->Length + sizeof(UNICODE_NULL));
     PhDereferenceObject(expandedKeyName);
 
     // Select our entry in regedit.

ProcessHacker/runas.c

@@ -246,7 +246,7 @@ PPH_STRING GetCurrentWinStaName(
         GetProcessWindowStation(),
         UOI_NAME,
         string->Buffer,
-        (ULONG)string->Length + 2,
+        (ULONG)string->Length + sizeof(UNICODE_NULL),
         NULL
         ))
     {
@@ -1098,8 +1098,8 @@ INT_PTR CALLBACK PhpRunAsDlgProc(
                             createInfo.Password = PhGetStringOrEmpty(password);
 
                             // Whenever we can, try not to set the desktop name; it breaks a lot of things.
-                            if (desktopName->Length != 0 && !PhEqualString2(desktopName, L"WinSta0\\Default", TRUE))
-                                createInfo.DesktopName = desktopName->Buffer;
+                            if (!PhIsNullOrEmptyString(desktopName) && !PhEqualString2(desktopName, L"WinSta0\\Default", TRUE))
+                                createInfo.DesktopName = PhGetString(desktopName);
 
                             PhSetDesktopWinStaAccess();