Changeset 95965 in vbox

Timestamp:

Aug 1, 2022 2:34:03 PM (2 years ago)

Author:

vboxsync

Message:

Additions/VBoxTray: Moved the session tracking code into an own module. VBoxTray.cpp only should contain the main / sub service handling (if possible).

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxSessionTracking.cpp (added)
• VBoxTray.cpp (modified) (3 diffs)
• VBoxTrayInternal.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -41 +41 @@
         VBoxDispIf.cpp \
         VBoxSeamless.cpp \
+        VBoxSessionTracking.cpp \
         VBoxDisplay.cpp \
         VBoxVRDP.cpp \

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

@@ -24 +24 @@
 
 #include "VBoxTray.h"
+#include "VBoxTrayInternal.h"
 #include "VBoxTrayMsg.h"
 #include "VBoxHelpers.h"
@@ -54 +55 @@
 #include <VBox/err.h>
 
-/* Default desktop state tracking */
-#include <Wtsapi32.h>
-
-/*
- * St (session [state] tracking) functionality API
- *
- * !!!NOTE: this API is NOT thread-safe!!!
- * it is supposed to be called & used from within the window message handler thread
- * of the window passed to vboxStInit */
-static int vboxStInit(HWND hWnd);
-static void vboxStTerm(void);
-/* @returns true on "IsActiveConsole" state change */
-static BOOL vboxStHandleEvent(WPARAM EventID);
-static BOOL vboxStIsActiveConsole();
-static BOOL vboxStCheckTimer(WPARAM wEvent);
+
+
 
 /*
@@ -1390 +1378 @@
 }
 
-/* St (session [state] tracking) functionality API impl */
-
-typedef struct VBOXST
-{
-    HWND hWTSAPIWnd;
-    RTLDRMOD hLdrModWTSAPI32;
-    BOOL fIsConsole;
-    WTS_CONNECTSTATE_CLASS enmConnectState;
-    UINT_PTR idDelayedInitTimer;
-    BOOL (WINAPI * pfnWTSRegisterSessionNotification)(HWND hWnd, DWORD dwFlags);
-    BOOL (WINAPI * pfnWTSUnRegisterSessionNotification)(HWND hWnd);
-    BOOL (WINAPI * pfnWTSQuerySessionInformationA)(HANDLE hServer, DWORD SessionId, WTS_INFO_CLASS WTSInfoClass, LPTSTR *ppBuffer, DWORD *pBytesReturned);
-} VBOXST;
-
-static VBOXST gVBoxSt;
-
-static int vboxStCheckState()
-{
-    int rc = VINF_SUCCESS;
-    WTS_CONNECTSTATE_CLASS *penmConnectState = NULL;
-    USHORT *pProtocolType = NULL;
-    DWORD cbBuf = 0;
-    if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSConnectState,
-                                               (LPTSTR *)&penmConnectState, &cbBuf))
-    {
-        if (gVBoxSt.pfnWTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSClientProtocolType,
-                                                   (LPTSTR *)&pProtocolType, &cbBuf))
-        {
-            gVBoxSt.fIsConsole = (*pProtocolType == 0);
-            gVBoxSt.enmConnectState = *penmConnectState;
-            return VINF_SUCCESS;
-        }
-
-        DWORD dwErr = GetLastError();
-        LogFlowFunc(("WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
-        rc = RTErrConvertFromWin32(dwErr);
-    }
-    else
-    {
-        DWORD dwErr = GetLastError();
-        LogFlowFunc(("WTSQuerySessionInformationA WTSConnectState failed, error = %08X\n", dwErr));
-        rc = RTErrConvertFromWin32(dwErr);
-    }
-
-    /* failure branch, set to "console-active" state */
-    gVBoxSt.fIsConsole = TRUE;
-    gVBoxSt.enmConnectState = WTSActive;
-
-    return rc;
-}
-
-static int vboxStInit(HWND hWnd)
-{
-    RT_ZERO(gVBoxSt);
-    int rc = RTLdrLoadSystem("WTSAPI32.DLL", false /*fNoUnload*/, &gVBoxSt.hLdrModWTSAPI32);
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSRegisterSessionNotification",
-                            (void **)&gVBoxSt.pfnWTSRegisterSessionNotification);
-        if (RT_SUCCESS(rc))
-        {
-            rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSUnRegisterSessionNotification",
-                                (void **)&gVBoxSt.pfnWTSUnRegisterSessionNotification);
-            if (RT_SUCCESS(rc))
-            {
-                rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSQuerySessionInformationA",
-                                    (void **)&gVBoxSt.pfnWTSQuerySessionInformationA);
-                if (RT_FAILURE(rc))
-                    LogFlowFunc(("WTSQuerySessionInformationA not found\n"));
-            }
-            else
-                LogFlowFunc(("WTSUnRegisterSessionNotification not found\n"));
-        }
-        else
-            LogFlowFunc(("WTSRegisterSessionNotification not found\n"));
-        if (RT_SUCCESS(rc))
-        {
-            gVBoxSt.hWTSAPIWnd = hWnd;
-            if (gVBoxSt.pfnWTSRegisterSessionNotification(gVBoxSt.hWTSAPIWnd, NOTIFY_FOR_THIS_SESSION))
-                vboxStCheckState();
-            else
-            {
-                DWORD dwErr = GetLastError();
-                LogFlowFunc(("WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
-                if (dwErr == RPC_S_INVALID_BINDING)
-                {
-                    gVBoxSt.idDelayedInitTimer = SetTimer(gVBoxSt.hWTSAPIWnd, TIMERID_VBOXTRAY_ST_DELAYED_INIT_TIMER,
-                                                          2000, (TIMERPROC)NULL);
-                    gVBoxSt.fIsConsole = TRUE;
-                    gVBoxSt.enmConnectState = WTSActive;
-                    rc = VINF_SUCCESS;
-                }
-                else
-                    rc = RTErrConvertFromWin32(dwErr);
-            }
-
-            if (RT_SUCCESS(rc))
-                return VINF_SUCCESS;
-        }
-
-        RTLdrClose(gVBoxSt.hLdrModWTSAPI32);
-    }
-    else
-        LogFlowFunc(("WTSAPI32 load failed, rc = %Rrc\n", rc));
-
-    RT_ZERO(gVBoxSt);
-    gVBoxSt.fIsConsole = TRUE;
-    gVBoxSt.enmConnectState = WTSActive;
-    return rc;
-}
-
-static void vboxStTerm(void)
-{
-    if (!gVBoxSt.hWTSAPIWnd)
-    {
-        LogFlowFunc(("vboxStTerm called for non-initialized St\n"));
-        return;
-    }
-
-    if (gVBoxSt.idDelayedInitTimer)
-    {
-        /* notification is not registered, just kill timer */
-        KillTimer(gVBoxSt.hWTSAPIWnd, gVBoxSt.idDelayedInitTimer);
-        gVBoxSt.idDelayedInitTimer = 0;
-    }
-    else
-    {
-        if (!gVBoxSt.pfnWTSUnRegisterSessionNotification(gVBoxSt.hWTSAPIWnd))
-        {
-            LogFlowFunc(("WTSAPI32 load failed, error = %08X\n", GetLastError()));
-        }
-    }
-
-    RTLdrClose(gVBoxSt.hLdrModWTSAPI32);
-    RT_ZERO(gVBoxSt);
-}
-
-#define VBOXST_DBG_MAKECASE(_val) case _val: return #_val;
-
-static const char* vboxStDbgGetString(DWORD val)
-{
-    switch (val)
-    {
-        VBOXST_DBG_MAKECASE(WTS_CONSOLE_CONNECT);
-        VBOXST_DBG_MAKECASE(WTS_CONSOLE_DISCONNECT);
-        VBOXST_DBG_MAKECASE(WTS_REMOTE_CONNECT);
-        VBOXST_DBG_MAKECASE(WTS_REMOTE_DISCONNECT);
-        VBOXST_DBG_MAKECASE(WTS_SESSION_LOGON);
-        VBOXST_DBG_MAKECASE(WTS_SESSION_LOGOFF);
-        VBOXST_DBG_MAKECASE(WTS_SESSION_LOCK);
-        VBOXST_DBG_MAKECASE(WTS_SESSION_UNLOCK);
-        VBOXST_DBG_MAKECASE(WTS_SESSION_REMOTE_CONTROL);
-        default:
-            LogFlowFunc(("invalid WTS state %d\n", val));
-            return "Unknown";
-    }
-}
-
-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;
-        vboxStCheckState();
-    }
-    else
-    {
-        LogFlowFunc(("timer WTSRegisterSessionNotification failed, error = %08X\n", GetLastError()));
-        Assert(gVBoxSt.fIsConsole == TRUE);
-        Assert(gVBoxSt.enmConnectState == WTSActive);
-    }
-
-    return TRUE;
-}
-
-
-static BOOL vboxStHandleEvent(WPARAM wEvent)
-{
-    RT_NOREF(wEvent);
-    LogFlowFunc(("WTS Event: %s\n", vboxStDbgGetString(wEvent)));
-    BOOL fOldIsActiveConsole = vboxStIsActiveConsole();
-
-    vboxStCheckState();
-
-    return !vboxStIsActiveConsole() != !fOldIsActiveConsole;
-}
-
-static BOOL vboxStIsActiveConsole(void)
-{
-    return (gVBoxSt.enmConnectState == WTSActive && gVBoxSt.fIsConsole);
-}
-
 /*
  * Dt (desktop [state] tracking) functionality API impl

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

@@ -21 +21 @@
 # pragma once
 #endif
+/*
+ * St (session [state] tracking) functionality API
+ *
+ * !!!NOTE: this API is NOT thread-safe!!!
+ * it is supposed to be called & used from within the window message handler thread
+ * of the window passed to vboxStInit */
+int vboxStInit(HWND hWnd);
+void vboxStTerm(void);
+/* @returns true on "IsActiveConsole" state change */
+BOOL vboxStHandleEvent(WPARAM EventID);
+BOOL vboxStIsActiveConsole();
+BOOL vboxStCheckTimer(WPARAM wEvent);
 
 DWORD VBoxDisplayGetCount();