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

Timestamp:

Nov 22, 2010 3:23:32 PM (14 years ago)

Author:

vboxsync

Message:

IPRT/process-win: Added mapping function for specific Windows error codes.

File:

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

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

@@ -264 +264 @@
                           NULL /*pszAsUser*/, NULL /* pszPassword*/,
                           pProcess);
+}
+
+
+/**
+ * Map some important or much used Windows error codes
+ * to our error codes.
+ *
+ * @return  Mapped IPRT status code.
+ * @param   dwError                         Windows error code to map to IPRT code.
+ */
+static int rtProcMapErrorCodes(DWORD dwError)
+{
+    int rc;
+    switch (dwError)
+    {
+        case ERROR_NOACCESS:
+        case ERROR_PRIVILEGE_NOT_HELD:
+            rc = VERR_PERMISSION_DENIED;
+            break;
+
+        case ERROR_PASSWORD_EXPIRED:
+        case ERROR_ACCOUNT_RESTRICTION: /* See: http://support.microsoft.com/kb/303846/ */
+        case ERROR_PASSWORD_RESTRICTION:
+            rc = VERR_AUTHENTICATION_FAILURE;
+            break;
+
+        default:
+            /* Could trigger a debug assertion! */
+            rc = RTErrConvertFromWin32(dwError);
+            break;
+    }
+    return rc;
 }
 
@@ -505 +537 @@
 static int rtProcUserLogon(PRTUTF16 pwszUser, PRTUTF16 pwszPassword, PRTUTF16 pwszDomain, HANDLE *phToken)
 {
-    int rc = VINF_SUCCESS;
     /** @todo Add domain support! */
     BOOL fRc = LogonUserW(pwszUser,
@@ -521 +552 @@
                           phToken);
     if (!fRc)
-        rc = RTErrConvertFromWin32(GetLastError());
-    return rc;
+        return rtProcMapErrorCodes(GetLastError());
+    return VINF_SUCCESS;
 }
 
@@ -904 +935 @@
         && dwErr != NO_ERROR)
     {
-        /*
-         * Map some important or much used Windows error codes
-         * to our error codes.
-         */
-        switch (dwErr)
-        {
-            case ERROR_NOACCESS:
-            case ERROR_PRIVILEGE_NOT_HELD:
-                rc = VERR_PERMISSION_DENIED;
-                break;
-
-            case ERROR_PASSWORD_EXPIRED:
-            case ERROR_ACCOUNT_RESTRICTION: /* See: http://support.microsoft.com/kb/303846/ */
-                rc = VERR_AUTHENTICATION_FAILURE;
-                break;
-
-            default:
-                /* Could trigger a debug assertion! */
-                rc = RTErrConvertFromWin32(dwErr);
-                break;
-        }
+        rc = rtProcMapErrorCodes(dwErr);
     }
     return rc;