Fix whitespace.

wixtoolset · Jan 3, 2015 · c8b1483 · c8b1483
1 parent be430c1
commit c8b1483
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/ext/ca/wixca/dll/RestartManager.cpp b/src/ext/ca/wixca/dll/RestartManager.cpp
@@ -52,7 +52,6 @@ extern "C" UINT __stdcall WixRegisterRestartResources(
     __in MSIHANDLE hInstall
     )
 {
-
     HRESULT hr = S_OK;
     UINT er = ERROR_SUCCESS;
 
@@ -153,10 +152,10 @@ extern "C" UINT __stdcall WixRegisterRestartResources(
             {
                 // ERROR_ACCESS_DENIED was returned when trying to register this process.
                 // Since other instances may have been registered, log a message and continue the setup rather than failing.
-                WcaLog(LOGMSG_STANDARD, "The process, %ls, could not be registered with the Restart Manager (probably because the setup is not elevated and the process is in another user context.  A reboot may be requested later.", wzResource);
+                WcaLog(LOGMSG_STANDARD, "The process, %ls, could not be registered with the Restart Manager (probably because the setup is not elevated and the process is in another user context). A reboot may be requested later.", wzResource);
                 hr = S_OK;
             }
-                else
+            else
             {
                 ExitOnFailure(hr, "Failed to register the process name with the Restart Manager session.");
             }

diff --git a/src/libs/dutil/rmutil.cpp b/src/libs/dutil/rmutil.cpp
@@ -197,16 +197,16 @@ extern "C" HRESULT DAPI RmuAddProcessById(
                 ExitWithLastError(hr, "Failed to get debug privilege LUID.");
             }
         }
-        
+
         fAdjustedPrivileges = TRUE;
     }
 
     hProcess = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, dwProcessId);
-    if (NULL != hProcess)
+    if (hProcess)
     {
         if (!::GetProcessTimes(hProcess, &CreationTime, &ExitTime, &KernelTime, &UserTime))
         {
-        ExitWithLastError(hr, "Failed to get the process times for process ID %d.", dwProcessId);
+            ExitWithLastError(hr, "Failed to get the process times for process ID %d.", dwProcessId);
         }
 
         ::EnterCriticalSection(&pSession->cs);
@@ -220,7 +220,7 @@ extern "C" HRESULT DAPI RmuAddProcessById(
         if (ERROR_ACCESS_DENIED == er)
         {
             // OpenProcess will fail when not elevated and the target process is in another user context. Let the caller log and continue.
-			hr = E_NOTFOUND;
+            hr = E_NOTFOUND;
         }
         else
         {
@@ -238,6 +238,7 @@ extern "C" HRESULT DAPI RmuAddProcessById(
     {
         ::AdjustTokenPrivileges(hToken, FALSE, pPrevPriv, 0, NULL, NULL);
     }
+
     ReleaseMem(pPrevPriv);
     ReleaseHandle(hToken);
 
@@ -273,15 +274,15 @@ extern "C" HRESULT DAPI RmuAddProcessesByName(
     for (DWORD i = 0; i < cProcessIds; ++i)
     {
         hr = RmuAddProcessById(pSession, pdwProcessIds[i]);
-    if (E_NOTFOUND == hr)
-    {
-        // RmuAddProcessById returns E_NOTFOUND when this setup is not elevated and OpenProcess returned access denied (target process running under another user account). 
-        fNotFound = TRUE;
-    }
-    else
-    {
-        ExitOnFailure(hr, "Failed to add process %ls (%d) to the Restart Manager session.", wzProcessName, pdwProcessIds[i]);
-    }
+        if (E_NOTFOUND == hr)
+        {
+            // RmuAddProcessById returns E_NOTFOUND when this setup is not elevated and OpenProcess returned access denied (target process running under another user account). 
+            fNotFound = TRUE;
+        }
+        else
+        {
+            ExitOnFailure(hr, "Failed to add process %ls (%d) to the Restart Manager session.", wzProcessName, pdwProcessIds[i]);
+        }
     }
 
     // If one or more calls to RmuAddProcessById returned E_NOTFOUND, then return E_NOTFOUND even if other calls succeeded, so that caller can log the issue.