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

Timestamp:

Jan 24, 2012 9:24:52 PM (13 years ago)

Author:

vboxsync

Message:

process-win.cpp: address previous todo, added new ones, some clean up.

File:

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

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

@@ -343 +343 @@
             {
                 PTOKEN_USER pTokenUser = (PTOKEN_USER)RTMemAlloc(dwSize);
-                AssertPtrReturn(pTokenUser, VERR_NO_MEMORY);
+                AssertPtrReturn(pTokenUser, VERR_NO_MEMORY); /** @todo r=bird: Leaking handles when we're out of memory...  */
                 RT_ZERO(*pTokenUser);
                 if (   GetTokenInformation(hTokenProc,
@@ -396 +396 @@
  * @returns Success indicator.
  * @param   papszNames      The process candidates, in prioritized order.
- * @param   pSID            The secure identifier of the user.
+ * @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)
+static bool rtProcFindProcessByName(const char * const *papszNames, PSID pSid, PHANDLE phToken)
 {
     AssertPtr(papszNames);
-    AssertPtr(pSID);
+    AssertPtr(pSid);
     AssertPtr(phToken);
 
@@ -441 +441 @@
                                 {
                                     if (   _stricmp(procEntry.szExeFile, papszNames[i]) == 0
-                                        && RT_SUCCESS(rtProcGetProcessHandle(procEntry.th32ProcessID, pSID, phToken)))
+                                        && RT_SUCCESS(rtProcGetProcessHandle(procEntry.th32ProcessID, pSid, phToken)))
                                     {
                                         fFound = true;
@@ -506 +506 @@
                                         {
                                             if (   _stricmp(pszProcName, papszNames[i]) == 0
-                                                && RT_SUCCESS(rtProcGetProcessHandle(adwPIDs[dwIdx], pSID, phToken)))
+                                                && RT_SUCCESS(rtProcGetProcessHandle(adwPIDs[dwIdx], pSid, phToken)))
                                             {
                                                 fFound = true;
@@ -756 +756 @@
                                                      pProcInfo);
                     if (!fRc)
-                        dwErr = GetLastError();
+                        rc = rtProcMapErrorCodes(GetLastError());
                     rtProcEnvironmentDestroy(pwszzBlock);
                 }
@@ -768 +768 @@
      * we're running as a Windows service?
      */
-    if (   RT_FAILURE(rc) /** @todo r=bird: you don't set rc when pfnCreateProcesswithLogonW fails... Using too many variables to control flow is confusing. */
+    if (   RT_FAILURE(rc)
         || (fFlags & RTPROC_FLAGS_SERVICE))
     {
@@ -807 +807 @@
             if (fFlags & RTPROC_FLAGS_SERVICE)
             {
-                DWORD cbName = 0; /* Must be zero to query size! */
-                DWORD cbDomain = 0;
+                DWORD cbSid = 0; /* Must be zero to query size! */
+                DWORD cchDomain = 0;
                 SID_NAME_USE sidNameUse = SidTypeUser;
                 fRc = LookupAccountNameW(NULL,
                                          pwszUser,
                                          NULL,
-                                         &cbName,
+                                         &cbSid,
                                          NULL,
-                                         &cbDomain,
+                                         &cchDomain,
                                          &sidNameUse);
                 if (!fRc)
@@ -821 +821 @@
                 if (   !fRc
                     && dwErr == ERROR_INSUFFICIENT_BUFFER
-                    && cbName > 0)
+                    && cbSid > 0)
                 {
                     dwErr = NO_ERROR;
 
-                    PSID pSID = (PSID)RTMemAlloc(cbName * sizeof(wchar_t));
-                    AssertPtrReturn(pSID, VERR_NO_MEMORY);
-
-                    /** @todo No way to allocate a PRTUTF16 directly? */
+                    PSID pSid = (PSID)RTMemAlloc(cbSid * sizeof(wchar_t)); /** @todo r=bird: What's the relationship between wchar_t and PSID? */
+                    AssertPtrReturn(pSid, VERR_NO_MEMORY); /** @todo r=bird: Leaking token handles when we're out of memory...  */
+
                     PRTUTF16 pwszDomain = NULL;
-                    if (cbDomain > 0)
+                    if (cchDomain > 0)
                     {
-                        pwszDomain = (PRTUTF16)RTMemAlloc(cbDomain * sizeof(RTUTF16));
-                        AssertPtrReturn(pwszDomain, VERR_NO_MEMORY);
+                        pwszDomain = (PRTUTF16)RTMemAlloc(cchDomain * sizeof(RTUTF16));
+                        AssertPtrReturn(pwszDomain, VERR_NO_MEMORY); /** @todo r=bird: Leaking token handles when we're out of memory...  */
                     }
 
@@ -839 +838 @@
                     if (   LookupAccountNameW(NULL,            /* lpSystemName */
                                               pwszUser,
-                                              pSID,
-                                              &cbName,
+                                              pSid,
+                                              &cbSid,
                                               pwszDomain,
-                                              &cbDomain,
+                                              &cchDomain,
                                               &sidNameUse)
-                        && IsValidSid(pSID))
+                        && IsValidSid(pSid))
                     {
                         /* Array of process names we want to look for. */
@@ -855 +854 @@
                             NULL
                         };
-                        fFound = rtProcFindProcessByName(s_papszProcNames, pSID, &hTokenUserDesktop);
+                        fFound = rtProcFindProcessByName(s_papszProcNames, pSid, &hTokenUserDesktop);
                     }
                     else
                         dwErr = GetLastError(); /* LookupAccountNameW() failed. */
                     RTMemFree(pSID);
-                    if (pwszDomain != NULL)
-                        RTUtf16Free(pwszDomain);
+                    RTMemFree(pwszDomain);
                 }
             }
@@ -897 +895 @@
                             if (!(fFlags & RTPROC_FLAGS_NO_PROFILE))
                             {
-                                ZeroMemory(&profileInfo, sizeof(profileInfo));
+                                RT_ZERO(profileInfo);
                                 profileInfo.dwSize = sizeof(profileInfo);
                                 profileInfo.lpUserName = pwszUser;