Changeset 46404 in vbox for trunk

Timestamp:

Jun 6, 2013 11:59:11 AM (12 years ago)

Author:

vboxsync

Message:

Forward ported r86229, r86230 + r86234 (IPRT/process-win.cpp: If there's an unresolved native error, we want to know it via release logging. Shouldn't happen by default of course. Handle ERROR_ACCOUNT_DISABLED. VERR_AUTHENTICATION_FAILURE -> VERR_ACCOUNT_RESTRICTED).

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -51 +51 @@
 #include <iprt/initterm.h>
 #include <iprt/ldr.h>
+#include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/once.h>
@@ -294 +295 @@
         case ERROR_ACCOUNT_RESTRICTION: /* See: http://support.microsoft.com/kb/303846/ */
         case ERROR_PASSWORD_RESTRICTION:
-            rc = VERR_AUTHENTICATION_FAILURE;
+        case ERROR_ACCOUNT_DISABLED:    /* See: http://support.microsoft.com/kb/263936 */
+            rc = VERR_ACCOUNT_RESTRICTED;
             break;
 
@@ -602 +604 @@
                           phToken);
     if (!fRc)
-        return rtProcWinMapErrorCodes(GetLastError());
+    {
+        DWORD dwErr = GetLastError();
+        int rc = rtProcWinMapErrorCodes(dwErr);
+        if (rc == VERR_UNRESOLVED_ERROR)
+            LogRelFunc(("dwErr=%u (%#x), rc=%Rrc\n", dwErr, dwErr, rc));
+        return rc;
+    }
     return VINF_SUCCESS;
 }
@@ -951 +959 @@
     if (   RT_SUCCESS(rc)
         && dwErr != NO_ERROR)
+    {
         rc = rtProcWinMapErrorCodes(dwErr);
+        if (rc == VERR_UNRESOLVED_ERROR)
+            LogRelFunc(("dwErr=%u (%#x), rc=%Rrc\n", dwErr, dwErr, rc));
+    }
     return rc;
 }
@@ -992 +1004 @@
                                                       pProcInfo);
                 if (!fRc)
-                    rc = rtProcWinMapErrorCodes(GetLastError());
+                {
+                    DWORD dwErr = GetLastError();
+                    rc = rtProcWinMapErrorCodes(dwErr);
+                    if (rc == VERR_UNRESOLVED_ERROR)
+                        LogRelFunc(("pfnCreateProcessWithLogonW (%p) failed: dwErr=%u (%#x), rc=%Rrc\n",
+                                    pfnCreateProcessWithLogonW, dwErr, dwErr, rc));
+                }
                 rtProcWinDestroyEnv(pwszzBlock);
             }