Changeset 59519 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Jan 29, 2016 10:32:47 AM (9 years ago)

Author:

vboxsync

Message:

IPRT: r3/win/process-win.cpp: Error checking.

File:

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

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

@@ -609 +609 @@
 static int rtProcWinUserLogon(PRTUTF16 pwszUser, PRTUTF16 pwszPassword, HANDLE *phToken)
 {
-    AssertPtrReturn(pwszUser, VERR_INVALID_POINTER);
+    AssertPtrReturn(pwszUser,     VERR_INVALID_POINTER);
     AssertPtrReturn(pwszPassword, VERR_INVALID_POINTER);
+    AssertPtrReturn(phToken,      VERR_INVALID_POINTER);
 
     /*
@@ -1330 +1331 @@
             if (pSid)
             {
-                cwcDomain = fRc ? cwcDomain + 2 : _512K;
+                cwcDomain = fRc ? cwcDomain + 2 : _4K;
                 PRTUTF16 pwszDomain = (PRTUTF16)RTMemAllocZ(cwcDomain * sizeof(RTUTF16));
                 if (pwszDomain)
                 {
-                    /* Note: Also supports FQDNs! */
-                    if (   LookupAccountNameW(NULL /*lpSystemName*/, pwszUser, pSid, &cbSid, pwszDomain, &cwcDomain, &SidNameUse)
-                        && IsValidSid(pSid))
+                    /* Note: Just pass in the UPN (User Principal Name), e.g. [email protected] */
+                    if (LookupAccountNameW(NULL /*lpSystemName*/, pwszUser, pSid, &cbSid, pwszDomain, &cwcDomain, &SidNameUse))
                     {
-                        /* Array of process names we want to look for. */
-                        static const char * const s_papszProcNames[] =
+                        if (IsValidSid(pSid))
                         {
-#ifdef VBOX                 /* The explorer entry is a fallback in case GA aren't installed. */
-                            { "VBoxTray.exe" },
+                            /* Array of process names we want to look for. */
+                            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 = rtProcWinFindTokenByProcess(s_papszProcNames, pSid, &hTokenUserDesktop);
+                                { "explorer.exe" },
+                                NULL
+                            };
+                            fFound = rtProcWinFindTokenByProcess(s_papszProcNames, pSid, &hTokenUserDesktop);
+                        }
+                        else
+                        {
+                            dwErr = GetLastError();
+                            rc = dwErr != NO_ERROR ? RTErrConvertFromWin32(dwErr) : VERR_INTERNAL_ERROR_4;
+                        }
                     }
                     else
@@ -1356 +1364 @@
                     RTMemFree(pwszDomain);
                 }
+                else
+                    rc = VERR_NO_MEMORY;
+
                 RTMemFree(pSid);
             }
+            else
+                rc = VERR_NO_MEMORY;
         }
         /* else: !RTPROC_FLAGS_SERVICE: Nothing to do here right now. */
@@ -1486 +1499 @@
         if (hTokenUserDesktop != INVALID_HANDLE_VALUE)
             CloseHandle(hTokenUserDesktop);
-        CloseHandle(hTokenLogon);
+        if (hTokenLogon != INVALID_HANDLE_VALUE)
+            CloseHandle(hTokenLogon);
 
         if (rc == VERR_UNRESOLVED_ERROR)
@@ -1618 +1632 @@
     else
     {
-        RTENV  hEnvToUse = NIL_RTENV;
-        HANDLE hToken;
-        rc = rtProcWinUserLogon(pwszUser, pwszPassword, &hToken);
+        RTENV  hEnvToUse   = NIL_RTENV;
+        HANDLE hTokenLogon = INVALID_HANDLE_VALUE;
+        rc = rtProcWinUserLogon(pwszUser, pwszPassword, &hTokenLogon);
         if (RT_SUCCESS(rc))
         {
@@ -1632 +1646 @@
             ProfileInfo.dwFlags    = PI_NOUI; /* Prevents the display of profile error messages. */
 
-            if (g_pfnLoadUserProfileW(hToken, &ProfileInfo))
+            if (g_pfnLoadUserProfileW(hTokenLogon, &ProfileInfo))
             {
                 /*
                  * Do what we need to do.  Don't keep any temp environment object.
                  */
-                rc = rtProcWinCreateEnvFromToken(hToken, hEnv, fFlags, &hEnvToUse);
+                rc = rtProcWinCreateEnvFromToken(hTokenLogon, hEnv, fFlags, &hEnvToUse);
                 if (RT_SUCCESS(rc))
                 {
@@ -1647 +1661 @@
                 }
 
-                if (!g_pfnUnloadUserProfile(hToken, ProfileInfo.hProfile))
+                if (!g_pfnUnloadUserProfile(hTokenLogon, ProfileInfo.hProfile))
                     AssertFailed();
             }
             else
                 rc = RTErrConvertFromWin32(GetLastError());
-            CloseHandle(hToken);
+
+            if (hTokenLogon != INVALID_HANDLE_VALUE)
+                CloseHandle(hTokenLogon);
         }
     }