Changeset 95874 in vbox for trunk/src/VBox/Additions/WINNT/VBoxGINA

Timestamp:

Jul 27, 2022 8:01:09 AM (3 years ago)

Author:

vboxsync

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

152599

Message:

Add/Nt/VBoxGINA: Made it build in VBOX_WITH_NOCRT_STATIC mode. bugref:10261

Location:

trunk/src/VBox/Additions/WINNT/VBoxGINA

Files:

• Dialog.cpp (modified) (7 diffs)
• VBoxGINA.cpp (modified) (2 diffs)
• testcase/tstVBoxGINA.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/VBoxGINA/Dialog.cpp

@@ -16 +16 @@
  */
 
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <iprt/win/windows.h>
-#include <stdio.h>      /* Needed for swprintf() */
 
 #include <VBox/VBoxGuestLib.h>
 #include <iprt/errcore.h>
+#include <iprt/utf16.h>
 
 #include "Dialog.h"
@@ -28 +31 @@
 
 
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 /*
  * Dialog IDs for legacy Windows OSes (e.g. NT 4.0).
@@ -85 +91 @@
 #define IDT_LOCKEDDLG_POLL                IDT_BASE + 2
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 static DLGPROC g_pfnWlxLoggedOutSASDlgProc = NULL;
 static DLGPROC g_pfnWlxLockedSASDlgProc = NULL;
@@ -90 +100 @@
 static PWLX_DIALOG_BOX_PARAM g_pfnWlxDialogBoxParam = NULL;
 
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
 int WINAPI MyWlxDialogBoxParam (HANDLE, HANDLE, LPWSTR, HWND, DLGPROC, LPARAM);
+
 
 void hookDialogBoxes(PVOID pWinlogonFunctions, DWORD dwWlxVersion)
@@ -190 +205 @@
              *
              */
-            size_t l = wcslen(pwszDomain);
+            size_t l = RTUtf16Len(pwszDomain);
             if (l > 255)
                 VBoxGINAVerbose(0, "VBoxGINA::MyWlxLoggedOutSASDlgProc: Warning! FQDN (domain) is too long (max 255 bytes), will be truncated!\n");
 
-            if (wcslen(pwszUser) > 0) /* We need a user name that we can use in caes of a FQDN */
+            if (*pwszUser) /* We need a user name that we can use in caes of a FQDN */
             {
                 if (l > 16) /* Domain name is longer than 16 chars, cannot be a NetBIOS name anymore */
@@ -202 +217 @@
                 }
                 else if (   l > 0
-                         && wcsstr(pwszDomain, L".") != NULL) /* if we found a dot (.) in the domain name, this has to be a FQDN */
+                         && RTUtf16Chr(pwszDomain, L'.') != NULL) /* if we found a dot (.) in the domain name, this has to be a FQDN */
                 {
                     VBoxGINAVerbose(0, "VBoxGINA::MyWlxLoggedOutSASDlgProc: Domain seems to be a FQDN (dot)!\n");
@@ -210 +225 @@
                 if (bIsFQDN)
                 {
-                    swprintf(szUserFQDN, sizeof(szUserFQDN) / sizeof(wchar_t), L"%s@%s", pwszUser, pwszDomain);
+                    RTUtf16Printf(szUserFQDN, sizeof(szUserFQDN) / sizeof(wchar_t), "%ls@%ls", pwszUser, pwszDomain);
                     VBoxGINAVerbose(0, "VBoxGINA::MyWlxLoggedOutSASDlgProc: FQDN user name is now: %s!\n", szUserFQDN);
                 }

trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp

@@ -16 +16 @@
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <iprt/win/windows.h>
 
@@ -32 +34 @@
 #include "Dialog.h"
 
-/*
- * Global variables.
- */
-
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 /** DLL instance handle. */
 HINSTANCE hDllInstance;

trunk/src/VBox/Additions/WINNT/VBoxGINA/testcase/tstVBoxGINA.cpp

@@ -16 +16 @@
  */
 
-#define UNICODE
 #include <iprt/win/windows.h>
-#include <stdio.h>
+#include <iprt/stream.h>
 
 int main()
@@ -24 +23 @@
     DWORD dwErr;
 
-    /**
+    /*
      * Be sure that:
      * - the debug VBoxGINA gets loaded instead of a maybe installed
@@ -31 +30 @@
 
     HMODULE hMod = LoadLibraryW(L"VBoxGINA.dll");
-    if (!hMod)
+    if (hMod)
     {
-        dwErr = GetLastError();
-        wprintf(L"VBoxGINA.dll not found, error=%ld\n", dwErr);
-    }
-    else
-    {
-        wprintf(L"VBoxGINA found\n");
+        RTPrintf("VBoxGINA found\n");
 
         FARPROC pfnDebug = GetProcAddress(hMod, "VBoxGINADebug");
         if (!pfnDebug)
         {
-            dwErr = GetLastError();
-            wprintf(L"Could not load VBoxGINADebug, error=%ld\n", dwErr);
+            RTPrintf("Calling VBoxGINA ...\n");
+            dwErr = pfnDebug();
         }
         else
         {
-            wprintf(L"Calling VBoxGINA ...\n");
-            dwErr = pfnDebug();
+            dwErr = GetLastError();
+            RTPrintf("Could not load VBoxGINADebug, error=%u\n", dwErr);
         }
 
         FreeLibrary(hMod);
     }
+    else
+    {
+        dwErr = GetLastError();
+        RTPrintf("VBoxGINA.dll not found, error=%u\n", dwErr);
+    }
 
-    wprintf(L"Test returned: %ld\n", dwErr);
-
+    RTPrintf("Test returned: %s (%u)\n", dwErr == ERROR_SUCCESS ? "SUCCESS" : "FAILURE", dwErr);
     return dwErr == ERROR_SUCCESS ? 0 : 1;
 }