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

Timestamp:

Mar 22, 2010 9:39:11 AM (15 years ago)

Author:

vboxsync

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

59101

Message:

IPRT/testcase: Added logon failure error, test some more stuff.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstRTProcCreateEx.cpp (modified) (6 diffs)
• win/RTErrConvertFromWin32.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1023 +1023 @@
 VBoxRT_LIBS.win                = \
         $(PATH_SDK_W2K3DDK_LIB)/vccomsup.lib \
-        $(PATH_SDK_W2K3DDK_LIB)/wbemuuid.lib \
-        $(PATH_SDK_W2K3DDK_LIB)/Userenv.lib
+        $(PATH_SDK_W2K3DDK_LIB)/wbemuuid.lib
 VBoxRT_LDFLAGS.darwin          = -framework IOKit -framework CoreFoundation -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
 ifdef VBOX_USE_VCC80

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -394 +394 @@
 tstRTProcCreateEx_TEMPLATE = VBOXR3TSTEXE
 tstRTProcCreateEx_SOURCES = tstRTProcCreateEx.cpp
-tstRTProcCreateEx_LIBS.win += Secur32.lib
 
 tstRTProcWait_SOURCES = tstRTProcWait.cpp

trunk/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp

@@ -83 +83 @@
 
 #ifdef RT_OS_WINDOWS
-# if 0 /** @todo Something here drags in Secur32.dll and prevents the testcase from being run on NT4. Add this stuff to IPRT and dynamically resolve the problematic bits, please. */
     char szUser[_1K];
     DWORD cbLen = sizeof(szUser);
     /** @todo Does not yet handle ERROR_MORE_DATA for user names longer than 32767. */
-    if (!GetUserNameEx(NameSamCompatible, szUser, &cbLen))
-    {
-        RTPrintf("GetUserNameEx failed with last error=%ld\n", GetLastError());
+    if (!GetUserName(szUser, &cbLen))
+    {
+        RTPrintf("GetUserName failed with last error=%ld\n", GetLastError());
         return VERR_AUTHENTICATION_FAILURE;
     }
     else
     {
+/* Does not work on NT4 (yet). */
+#if 0
         DWORD cbSid = 0;
         DWORD cbDomain = 0;
@@ -134 +135 @@
         RTMemFree(pSid);
         RTMemFree(pszDomain);
-    }
-# endif
+#endif
+    }
 #else
     /** @todo Lookup UID/effective UID, maybe GID? */
@@ -154 +155 @@
 
     RTPROCESS hProc;
+
+    /* Test for invalid logons. */
+    RTTESTI_CHECK_RC_RETV(RTProcCreateEx(g_szExecName, apszArgs, RTENV_DEFAULT, 0 /*fFlags*/, NULL,
+                                         NULL, NULL, "not-existing-user", "wrong-password", &hProc), VERR_LOGON_FAILURE);
+    /* Test for invalid application. */
+    RTTESTI_CHECK_RC_RETV(RTProcCreateEx("not-existing-app", apszArgs, RTENV_DEFAULT, 0 /*fFlags*/, NULL,
+                                         NULL, NULL, NULL, NULL, &hProc), VERR_PATH_NOT_FOUND);
+    /* Test a (hopefully) valid user/password logon (given by parameters of this function). */
     RTTESTI_CHECK_RC_RETV(RTProcCreateEx(g_szExecName, apszArgs, RTENV_DEFAULT, 0 /*fFlags*/, NULL,
                                          NULL, NULL, pszUser, pszPassword, &hProc), VINF_SUCCESS);
@@ -164 +173 @@
         RTTestIPassed(NULL);
 }
-
+    
 
 static int tstRTCreateProcEx4Child(int argc, char **argv)
@@ -422 +431 @@
             return 99;
         pszAsUser   = argv[2];
-        pszPassword = argv[4];
+        pszPassword = argv[3];
     }
 
@@ -442 +451 @@
     tstRTCreateProcEx4();
     if (pszAsUser)
-    {
-        /** @todo Do not run tstRTCreateProcEx5 on NT4, may not work (?) */
         tstRTCreateProcEx5(pszAsUser, pszPassword);
-    }
     /** @todo Cover files, ++ */
 

trunk/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp

@@ -191 +191 @@
         case ERROR_CANCELLED:               return VERR_CANCELLED;
         case ERROR_DIRECTORY:               return VERR_NOT_A_DIRECTORY;
+
+        case ERROR_LOGON_FAILURE:           return VERR_LOGON_FAILURE;
 
         /*