Changeset 39863 in vbox for trunk/src/VBox/Runtime

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75889

Message:

process-win.cpp: Do not return failure because UnloadUserProfile failed - we have got a running "child" process! Just assert. Added todo regarding confused flow around pfnCreateProcessWithLogonW.

File:

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

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

@@ -768 +768 @@
      * we're running as a Windows service?
      */
-    if (   RT_FAILURE(rc)
+    if (   RT_FAILURE(rc) /** @todo r=bird: you don't set rc when pfnCreateProcesswithLogonW fails... Using too many variables to control flow is confusing. */
         || (fFlags & RTPROC_FLAGS_SERVICE))
     {
@@ -935 +935 @@
                                     rtProcEnvironmentDestroy(pwszzBlock);
                                 }
-                                else
-                                    dwErr = rc;
 
                                 if (!(fFlags & RTPROC_FLAGS_NO_PROFILE))
                                 {
                                     fRc = pfnUnloadUserProfile(*phToken, profileInfo.hProfile);
+#ifdef RT_STRICT
                                     if (!fRc)
                                     {
-                                        /* In case there were some handles left open, we want to know about
-                                         * that -- can be tricky to debug later! */
                                         DWORD dwErr2 = GetLastError();
-                                        AssertMsgFailed(("Unloading user profile failed with error %u (%#x)", dwErr2, dwErr2));
-                                        if (dwErr == NO_ERROR)
-                                            dwErr = dwErr2;
+                                        AssertMsgFailed(("Unloading user profile failed with error %u (%#x) - Are all handles closed? (dwErr=%u)",
+                                                         dwErr2, dwErr2, dwErr));
                                     }
+#endif
                                 }
                             }