Changeset 30093 in vbox for trunk/src/VBox/Runtime/r3/win/process-win.cpp

Timestamp:

Jun 8, 2010 2:30:17 PM (15 years ago)

Author:

vboxsync

Message:

IPRT: Removed VERR_LOGON_FAILURE in favor of VERR_AUTHENTICATION_FAILURE. Cleaned up nits in process-win.cpp and adding some missing function docs. Hope it compiles...

File:

• trunk/src/VBox/Runtime/r3/win/process-win.cpp (modified) (16 diffs)

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -254 +254 @@
 
 
+/**
+ * Get the process token (not the process handle like the name might indicate)
+ * of the process indicated by @a dwPID if the @a pSID matches.
+ *
+ * @returns IPRT status code.
+ *
+ * @param   dwPID           The process identifier.
+ * @param   pSID            The secure identifier of the user.
+ * @param   phToken         Where to return the token handle - duplicate,
+ *                          caller closes it on success.
+ */
 static int rtProcGetProcessHandle(DWORD dwPID, PSID pSID, PHANDLE phToken)
 {
@@ -261 +272 @@
     DWORD dwErr;
     BOOL fRc;
-    BOOL fFound = FALSE;
+    bool fFound = false;
     HANDLE hProc = OpenProcess(MAXIMUM_ALLOWED, TRUE, dwPID);
     if (hProc != NULL)
@@ -267 +278 @@
         HANDLE hTokenProc;
         fRc = OpenProcessToken(hProc,
-                               TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY | TOKEN_DUPLICATE |
-                               TOKEN_ASSIGN_PRIMARY | TOKEN_ADJUST_SESSIONID | TOKEN_READ | TOKEN_WRITE,
+                               TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY | TOKEN_DUPLICATE
+                               | TOKEN_ASSIGN_PRIMARY | TOKEN_ADJUST_SESSIONID | TOKEN_READ | TOKEN_WRITE,
                                &hTokenProc);
         if (fRc)
@@ -300 +311 @@
                              * the actual CreateProcessAsUserW() call then.
                              */
-                            fFound = TRUE;
+                            fFound = true;
                         }
                         else
@@ -328 +339 @@
 
 
-static BOOL rtProcFindProcessByName(const char * const *papszNames, PSID pSID, PHANDLE phToken)
+/**
+ * Finds a one of the processes in @a papszNames running with user @a pSID and
+ * returns a duplicate handle to its token.
+ *
+ * @returns Success indicator.
+ * @param   papszNames      The process candidates, in prioritized order.
+ * @param   pSID            The secure identifier of the user.
+ * @param   phToken         Where to return the token handle - duplicate,
+ *                          caller closes it on success.
+ */
+static bool rtProcFindProcessByName(const char * const *papszNames, PSID pSID, PHANDLE phToken)
 {
     AssertPtr(papszNames);
@@ -335 +356 @@
 
     DWORD dwErr = NO_ERROR;
-    BOOL fFound = FALSE;
+    bool fFound = false;
 
     /*
@@ -365 +386 @@
                             procEntry.dwSize = sizeof(PROCESSENTRY32);
                             if (pfnProcess32First(hSnap, &procEntry))
-                            {   
+                            {
                                 do
                                 {
@@ -371 +392 @@
                                         && RT_SUCCESS(rtProcGetProcessHandle(procEntry.th32ProcessID, pSID, phToken)))
                                     {
-                                        fFound = TRUE;
+                                        fFound = true;
+                                        break;
                                     }
-                                } while (pfnProcess32Next(hSnap, &procEntry) && !fFound);
+                                } while (pfnProcess32Next(hSnap, &procEntry));
                             }
                             else /* Process32First */
@@ -407 +429 @@
                     {
                         /** @todo Retry if pBytesReturned equals cbBytes! */
-                        DWORD dwPIDs[4096]; /* Should be sufficient for now. */
+                        DWORD adwPIDs[4096]; /* Should be sufficient for now. */
                         DWORD cbBytes = 0;
-                        if (pfnEnumProcesses(dwPIDs, sizeof(dwPIDs), &cbBytes))
+                        if (pfnEnumProcesses(adwPIDs, sizeof(adwPIDs), &cbBytes))
                         {
                             for (size_t i = 0; papszNames[i] && !fFound; i++)
@@ -416 +438 @@
                                 {
                                     HANDLE hProc = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
-                                                               FALSE, dwPIDs[dwIdx]);
+                                                               FALSE, adwPIDs[dwIdx]);
                                     if (hProc)
                                     {
@@ -429 +451 @@
                                                 break;
                                         } while (GetLastError() == ERROR_INSUFFICIENT_BUFFER);
-    
+
                                         if (pszProcName)
                                         {
                                             if (   _stricmp(pszProcName, papszNames[i]) == 0
-                                                && RT_SUCCESS(rtProcGetProcessHandle(dwPIDs[dwIdx], pSID, phToken)))
+                                                && RT_SUCCESS(rtProcGetProcessHandle(adwPIDs[dwIdx], pSID, phToken)))
                                             {
-                                                fFound = TRUE;
+                                                fFound = true;
                                             }
                                         }
@@ -552 +574 @@
                          &hTokenLogon);
 
-        BOOL fFound = FALSE;
+        bool fFound = false;
         HANDLE hTokenUserDesktop = INVALID_HANDLE_VALUE;
         if (fRc)
@@ -598 +620 @@
                     {
                         /* Array of process names we want to look for. */
-                        char *papszProcNames[] = 
-#ifdef VBOX
-                        /*
-                         * Add lookup for "explorer.exe" as a fallback in case the VBox
-                         * Guest Additions are not (yet) installed, but prefer looking
-                         * up "VBoxTray.exe" in the first place.
-                         */
-                            { { "VBoxTray.exe" },
-                              { "explorer.exe" },
-                              NULL 
-                            };
-#else
-                            { { "explorer.exe" },
-                              NULL 
-                            };
-#endif                        
-                        fFound = rtProcFindProcessByName(papszProcNames,
-                                                         pSID, &hTokenUserDesktop);
+                        static const char * const s_papszProcNames[] =
+                        {
+#ifdef VBOX                 /* The explorer entry is a fallback in case GA aren't installed. */
+                            { "VBoxTray.exe" },
+#endif
+                            { "explorer.exe" },
+                            NULL
+                        };
+                        fFound = rtProcFindProcessByName(s_papszProcNames, pSID, &hTokenUserDesktop);
                     }
                     else
@@ -638 +651 @@
             /*
              * Useful KB articles:
-             * http://support.microsoft.com/kb/165194/
-             * http://support.microsoft.com/kb/184802/
-             * http://support.microsoft.com/kb/327618/
+             *      http://support.microsoft.com/kb/165194/
+             *      http://support.microsoft.com/kb/184802/
+             *      http://support.microsoft.com/kb/327618/
              */
             fRc = CreateProcessAsUserW(*phToken,
@@ -681 +694 @@
             case ERROR_PASSWORD_EXPIRED:
             case ERROR_ACCOUNT_RESTRICTION: /* See: http://support.microsoft.com/kb/303846/ */
-                rc = VERR_LOGON_FAILURE;
+                rc = VERR_AUTHENTICATION_FAILURE;
                 break;
 
@@ -818 +831 @@
                  * Get going...
                  */
+                PROCESS_INFORMATION ProcInfo;
+                RT_ZERO(ProcInfo);
                 DWORD               dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
                 if (fFlags & RTPROC_FLAGS_DETACHED)
                     dwCreationFlags |= DETACHED_PROCESS;
-
-                PROCESS_INFORMATION ProcInfo;
-                RT_ZERO(ProcInfo);
 
                 /*