Changeset 16143 in vbox

Timestamp:

Jan 21, 2009 2:32:58 PM (16 years ago)

Author:

vboxsync

Message:

VBoxGINA: Fixed CTRL-ALT-DEL handling: Now works as expected. Also added some more diagnostic info for further debugging.

File:

• trunk/src/VBox/Additions/WINNT/VBoxGINA/VBoxGINA.cpp (modified) (3 diffs)

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

@@ -328 +328 @@
     HKEY hKey;
     DWORD dwValue = 1;
-    DWORD dwSize;
-    DWORD dwType;
-
-    Log(("VBoxGINA::WlxLoggedOnSAS\n"));
+    DWORD dwSize = 0;
+    DWORD dwType = 0;
+    int iRet = WLX_SAS_ACTION_NONE;
+
+    Log(("VBoxGINA::WlxLoggedOnSAS: SaSType = %ld\n", dwSasType));
 
     /* Winlogon registry path */
@@ -343 +344 @@
     }
     else
-        Log(("VBoxGINA::WlxLoggedOnSAS: could not open registry key! last error: %d\n", GetLastError()));
+    {
+        Log(("VBoxGINA::WlxLoggedOnSAS: Could not open registry key! Last error: %d\n", GetLastError()));
+    }
 
     if (dwValue)
-        return WLX_SAS_ACTION_NONE;
+    {
+        switch (dwSasType)
+        {
+
+        case WLX_SAS_TYPE_CTRL_ALT_DEL:     /* User pressed CTRL-ALT-DEL. */
+
+            /* Show the task list (or whatever the OS wants to do here). */
+            iRet = WLX_SAS_ACTION_TASKLIST;
+            break;
+
+        default:
+            break;
+        }
+    }
     else
-        /* forward call to MSGINA */
+    {
+        /* Forward call to MSGINA. */
+        Log(("VBoxGINA::WlxLoggedOnSAS: Forwarding call to MSGINA ...\n"));
         return GWlxLoggedOnSAS(pWlxContext, dwSasType, pReserved);
+    }
+
+    return iRet;
 }
 
@@ -431 +452 @@
                                 PVOID pEnvironment, PWSTR pszCmdLine)
 {
-    Log(("VBoxGINA::WlxStartApplication\n"));
+    Log(("VBoxGINA::WlxStartApplication: pWlxCtx=%p, pszDesktopName=%ls, pEnvironment=%p, pszCmdLine=%ls\n",
+        pWlxContext, pszDesktopName, pEnvironment, pszCmdLine));
 
     /* forward to MSGINA if present */