Changeset 45837 in vbox

Timestamp:

Apr 30, 2013 12:42:28 PM (12 years ago)

Author:

vboxsync

Message:

VBoxTray/seamless: more fixes

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxTray.cpp (modified) (8 diffs)
• VBoxTray.h (modified) (1 diff)

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

@@ -67 +67 @@
 static BOOL vboxStHandleEvent(WPARAM EventID, LPARAM SessionID);
 static BOOL vboxStIsActiveConsole();
+static BOOL vboxStCheckTimer(WPARAM wEvent);
 
 /*
@@ -915 +916 @@
             if (VBoxCapsCheckTimer(wParam))
                 return 0;
-            if(vboxDtCheckTimer(wParam))
+            if (vboxDtCheckTimer(wParam))
+                return 0;
+            if (vboxStCheckTimer(wParam))
                 return 0;
 
@@ -1007 +1010 @@
     BOOL fIsConsole;
     WTS_CONNECTSTATE_CLASS enmConnectState;
+    UINT_PTR idDelayedInitTimer;
     BOOL (WINAPI * pfnWTSRegisterSessionNotification)(HWND hWnd, DWORD dwFlags);
     BOOL (WINAPI * pfnWTSUnRegisterSessionNotification)(HWND hWnd);
@@ -1026 +1030 @@
             gVBoxSt.fIsConsole = (*pProtocolType == 0);
             gVBoxSt.enmConnectState = *penmConnectState;
+            return VINF_SUCCESS;
         }
         else
@@ -1040 +1045 @@
         rc = RTErrConvertFromWin32(dwErr);
     }
+
+    /* failure branch, set to "console-active" state */
+    gVBoxSt.fIsConsole = TRUE;
+    gVBoxSt.enmConnectState = WTSActive;
+
     return rc;
 }
@@ -1083 +1093 @@
                 DWORD dwErr = GetLastError();
                 WARN(("VBoxTray: WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
+                if (dwErr == RPC_S_INVALID_BINDING)
+                {
+                    gVBoxSt.idDelayedInitTimer = SetTimer(gVBoxSt.hWTSAPIWnd, TIMERID_VBOXTRAY_ST_DELAYED_INIT_TIMER, 500, (TIMERPROC)NULL);
+                }
                 rc = RTErrConvertFromWin32(dwErr);
             }
@@ -1110 +1124 @@
     }
 
-    if (!gVBoxSt.pfnWTSUnRegisterSessionNotification(gVBoxSt.hWTSAPIWnd))
-    {
-        DWORD dwErr = GetLastError();
-        WARN(("VBoxTray: WTSAPI32 load failed, error = %08X\n", dwErr));
+    if (gVBoxSt.idDelayedInitTimer)
+    {
+        /* notification is not registered, just kill timer */
+        KillTimer(gVBoxSt.hWTSAPIWnd, gVBoxSt.idDelayedInitTimer);
+        gVBoxSt.idDelayedInitTimer = 0;
+    }
+    else
+    {
+        if (!gVBoxSt.pfnWTSUnRegisterSessionNotification(gVBoxSt.hWTSAPIWnd))
+        {
+            DWORD dwErr = GetLastError();
+            WARN(("VBoxTray: WTSAPI32 load failed, error = %08X\n", dwErr));
+        }
     }
 
@@ -1140 +1163 @@
     }
 }
+
+static BOOL vboxStCheckTimer(WPARAM wEvent)
+{
+    if (wEvent != gVBoxSt.idDelayedInitTimer)
+        return FALSE;
+
+    if (gVBoxSt.pfnWTSRegisterSessionNotification(gVBoxSt.hWTSAPIWnd, NOTIFY_FOR_THIS_SESSION))
+    {
+        KillTimer(gVBoxSt.hWTSAPIWnd, gVBoxSt.idDelayedInitTimer);
+        gVBoxSt.idDelayedInitTimer = 0;
+    }
+    else
+    {
+        DWORD dwErr = GetLastError();
+        WARN(("VBoxTray: timer WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
+    }
+
+    vboxStCheckState();
+}
+
 
 static BOOL vboxStHandleEvent(WPARAM wEvent, LPARAM SessionID)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

@@ -83 +83 @@
 #define TIMERID_VBOXTRAY_CAPS_TIMER             1001
 #define TIMERID_VBOXTRAY_DT_TIMER               1002
+#define TIMERID_VBOXTRAY_ST_DELAYED_INIT_TIMER  1003
 
 /* The environment information for services. */