Changeset 45901 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

May 6, 2013 7:28:23 AM (12 years ago)

Author:

vboxsync

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

85524

Message:

VBoxTray/seamless: more corrections

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp (modified) (5 diffs)

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

@@ -1085 +1085 @@
         {
             gVBoxSt.hWTSAPIWnd = hWnd;
-            if (!gVBoxSt.pfnWTSRegisterSessionNotification(gVBoxSt.hWTSAPIWnd, NOTIFY_FOR_THIS_SESSION))
+            if (gVBoxSt.pfnWTSRegisterSessionNotification(gVBoxSt.hWTSAPIWnd, NOTIFY_FOR_THIS_SESSION))
+            {
+                vboxStCheckState();
+            }
+            else
             {
                 DWORD dwErr = GetLastError();
@@ -1093 +1097 @@
                     gVBoxSt.idDelayedInitTimer = SetTimer(gVBoxSt.hWTSAPIWnd, TIMERID_VBOXTRAY_ST_DELAYED_INIT_TIMER, 2000, (TIMERPROC)NULL);
                     rc = VINF_SUCCESS;
+
+                    gVBoxSt.fIsConsole = TRUE;
+                    gVBoxSt.enmConnectState = WTSActive;
                 }
                 else
@@ -1099 +1106 @@
 
             if (RT_SUCCESS(rc))
-            {
-                vboxStCheckState();
                 return VINF_SUCCESS;
-            }
         }
 
@@ -1177 +1181 @@
         KillTimer(gVBoxSt.hWTSAPIWnd, gVBoxSt.idDelayedInitTimer);
         gVBoxSt.idDelayedInitTimer = 0;
+        vboxStCheckState();
     }
     else
@@ -1182 +1187 @@
         DWORD dwErr = GetLastError();
         WARN(("VBoxTray: timer WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
-    }
-
-    vboxStCheckState();
+        Assert(gVBoxSt.fIsConsole == TRUE);
+        Assert(gVBoxSt.enmConnectState == WTSActive);
+    }
+
     return TRUE;
 }