Changeset 40768 in vbox

Timestamp:

Apr 5, 2012 10:12:23 AM (13 years ago)

Author:

vboxsync

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

77264

Message:

VBoxGINA: Use the Windows Notification Package to know when the screensaver stopped.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Installer/VBoxGuestAdditions.nsi (modified) (1 diff)
• Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)
• VBoxGINA/VBoxGINA.cpp (modified) (13 diffs)
• VBoxGINA/VBoxGINA.def (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -719 +719 @@
     !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxGINA.dll" "$g_strSystemDir\VBoxGINA.dll" "$INSTDIR"
     WriteRegStr HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL" "VBoxGINA.dll"
+    ; Add Windows notification package callbacks for VBoxGINA
+    WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\VBoxGINA" "DLLName" "VBoxGINA.dll"
+    WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\VBoxGINA" "Impersonate" 0
+    WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\VBoxGINA" "StopScreenSaver" "WnpScreenSaverStop"
   ${EndIf}
 

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -692 +692 @@
     DeleteRegValue HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon" "GinaDLL"
   ${EndIf}
+  DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\VBoxGINA"
 
   ; Delete VBoxTray

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

@@ -261 +261 @@
 
     /* Forward call */
-    return GWlxInitialize(lpWinsta, hWlx, pvReserved, pWinlogonFunctions, pWlxContext);
+    if (GWlxInitialize)
+        return GWlxInitialize(lpWinsta, hWlx, pvReserved, pWinlogonFunctions, pWlxContext);
+    return TRUE;
 }
 
@@ -283 +285 @@
         VBoxGINACredentialsPollerCreate();
         /* Forward call to MSGINA. */
-        GWlxDisplaySASNotice(pWlxContext);
+        if (GWlxDisplaySASNotice)
+            GWlxDisplaySASNotice(pWlxContext);
     }
 }
@@ -299 +302 @@
         VBoxGINACredentialsPollerCreate();
 
-    int iRet;
-    iRet = GWlxLoggedOutSAS(pWlxContext, dwSasType, pAuthenticationId, pLogonSid,
-                            pdwOptions, phToken, pMprNotifyInfo, pProfile);
-
-    if (iRet == WLX_SAS_ACTION_LOGON)
-    {
-        //
-        // Copy pMprNotifyInfo and pLogonSid for later use
-        //
-
-        // pMprNotifyInfo->pszUserName
-        // pMprNotifyInfo->pszDomain
-        // pMprNotifyInfo->pszPassword
-        // pMprNotifyInfo->pszOldPassword
-    }
-
-    return iRet;
+    if (GWlxLoggedOutSAS)
+    {
+        int iRet;
+        iRet = GWlxLoggedOutSAS(pWlxContext, dwSasType, pAuthenticationId, pLogonSid,
+                                pdwOptions, phToken, pMprNotifyInfo, pProfile);
+
+        if (iRet == WLX_SAS_ACTION_LOGON)
+        {
+            //
+            // Copy pMprNotifyInfo and pLogonSid for later use
+            //
+
+            // pMprNotifyInfo->pszUserName
+            // pMprNotifyInfo->pszDomain
+            // pMprNotifyInfo->pszPassword
+            // pMprNotifyInfo->pszOldPassword
+        }
+
+        return iRet;
+    }
+
+    return WLX_SAS_ACTION_NONE;
 }
 
@@ -334 +342 @@
 
     /* Forward call to MSGINA. */
-    return GWlxActivateUserShell(pWlxContext, pszDesktopName, pszMprLogonScript, pEnvironment);
+    if (GWlxActivateUserShell)
+        return GWlxActivateUserShell(pWlxContext, pszDesktopName, pszMprLogonScript, pEnvironment);
+    return TRUE; /* Activate the user shell. */
 }
 
@@ -350 +360 @@
     /* Forward call to MSGINA. */
     VBoxGINAVerbose(0, "VBoxGINA::WlxLoggedOnSAS: Forwarding call to MSGINA ...\n");
-    return GWlxLoggedOnSAS(pWlxContext, dwSasType, pReserved);
+    if (GWlxLoggedOnSAS)
+        return GWlxLoggedOnSAS(pWlxContext, dwSasType, pReserved);
+    return WLX_SAS_ACTION_NONE;
 }
 
@@ -371 +383 @@
         VBoxGINACredentialsPollerCreate();
         /* Forward call to MSGINA. */
-        GWlxDisplayLockedNotice(pWlxContext);
+        if (GWlxDisplayLockedNotice)
+            GWlxDisplayLockedNotice(pWlxContext);
     }
 }
@@ -382 +395 @@
 {
     VBoxGINAVerbose(0, "VBoxGINA::WlxIsLockOk\n");
+
     /* Forward call to MSGINA. */
-    return GWlxIsLockOk(pWlxContext);
+    if (GWlxIsLockOk)
+        return GWlxIsLockOk(pWlxContext);
+    return TRUE; /* Locking is OK. */
 }
 
@@ -397 +413 @@
 
     /* Forward call to MSGINA. */
-    return GWlxWkstaLockedSAS(pWlxContext, dwSasType);
+    if (GWlxWkstaLockedSAS)
+        return GWlxWkstaLockedSAS(pWlxContext, dwSasType);
+    return WLX_SAS_ACTION_NONE;
 }
 
@@ -405 +423 @@
     VBoxGINAVerbose(0, "VBoxGINA::WlxIsLogoffOk\n");
 
-    return GWlxIsLogoffOk(pWlxContext);
+    if (GWlxIsLogoffOk)
+        return GWlxIsLogoffOk(pWlxContext);
+    return TRUE; /* Log off is OK. */
 }
 
@@ -421 +441 @@
 
     /* Forward call to MSGINA. */
-    GWlxLogoff(pWlxContext);
+    if (GWlxLogoff)
+        GWlxLogoff(pWlxContext);
 }
 
@@ -442 +463 @@
 
     /* Forward call to MSGINA. */
-    GWlxShutdown(pWlxContext, ShutdownType);
+    if (GWlxShutdown)
+        GWlxShutdown(pWlxContext, ShutdownType);
 }
 
@@ -454 +476 @@
                     pSecure ? *pSecure : 0);
 
-    /* Report / set back status to "active" since the screensaver
-     * (Winlogon) does give VBoxGINA yet the chance to hook into dialogs
+    /* Report the status to "init" since the screensaver
+     * (Winlogon) does not give VBoxGINA yet the chance to hook into dialogs
      * which only then in turn would set the status to "active" -- so
-     * do this here explicitly. */
-    VBoxGINAReportStatus(VBoxGuestFacilityStatus_Active);
+     * at least set some status here. */
+    VBoxGINAReportStatus(VBoxGuestFacilityStatus_Init);
 
     /* Note: Disabling the screensaver's grace period is necessary to get
@@ -571 +593 @@
     if (GWlxDisconnectNotify)
         GWlxDisconnectNotify(pWlxContext);
+}
+
+
+/*
+ * Windows Notification Package callbacks
+ */
+void WnpScreenSaverStop(PWLX_NOTIFICATION_INFO pInfo)
+{
+    VBoxGINAVerbose(0, "VBoxGINA::WnpScreenSaverStop\n");
+
+    /*
+     * Because we set the status to "init" in WlxScreenSaverNotify when
+     * the screensaver becomes active we also have to take into account
+     * that in case the screensaver terminates (either within the grace
+     * period or because the lock screen appears) we have to set the
+     * status accordingly.
+     */
+    VBoxGINAReportStatus(VBoxGuestFacilityStatus_Terminated);
 }
 

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

@@ -44 +44 @@
     ; Debug
     VBoxGINADebug
+    ; Windows Notification Package callbacks
+    WnpScreenSaverStop