Changeset 105432 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 22, 2024 6:04:56 PM (7 months ago)

Author:

vboxsync

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

164089

Message:

GA/Windows: Code cleanup in Session state tracker. bugref:10714

File:

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

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

@@ -71 +71 @@
             gVBoxSt.fIsConsole = (*pProtocolType == 0);
             gVBoxSt.enmConnectState = *penmConnectState;
+            LogFlowFunc(("Session information: ProtocolType %d, ConnectState %d", *pProtocolType, *penmConnectState));
             return VINF_SUCCESS;
         }
-
+        else
+        {
+            DWORD dwErr = GetLastError();
+            LogWarnFunc(("WTSQuerySessionInformationA WTSClientProtocolType failed, error = %08X\n", dwErr));
+            rc = RTErrConvertFromWin32(dwErr);
+        }
+    }
+    else
+    {
         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));
+        LogWarnFunc(("WTSQuerySessionInformationA WTSConnectState failed, error = %08X\n", dwErr));
         rc = RTErrConvertFromWin32(dwErr);
     }
@@ -95 +98 @@
 {
     RT_ZERO(gVBoxSt);
-    int rc = RTLdrLoadSystem("WTSAPI32.DLL", false /*fNoUnload*/, &gVBoxSt.hLdrModWTSAPI32);
+    int rc = RTLdrLoadSystem("WTSAPI32.DLL", true /*fNoUnload*/, &gVBoxSt.hLdrModWTSAPI32);
+
     if (RT_SUCCESS(rc))
     {
@@ -101 +105 @@
                             (void **)&gVBoxSt.pfnWTSRegisterSessionNotification);
         if (RT_SUCCESS(rc))
-        {
             rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSUnRegisterSessionNotification",
-                                (void **)&gVBoxSt.pfnWTSUnRegisterSessionNotification);
-            if (RT_SUCCESS(rc))
+                            (void **)&gVBoxSt.pfnWTSUnRegisterSessionNotification);
+        if (RT_SUCCESS(rc))
+            rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSQuerySessionInformationA",
+                             (void **)&gVBoxSt.pfnWTSQuerySessionInformationA);
+
+        AssertRC(rc);
+        RTLdrClose(gVBoxSt.hLdrModWTSAPI32);
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        gVBoxSt.hWTSAPIWnd = hWnd;
+        if (gVBoxSt.pfnWTSRegisterSessionNotification(gVBoxSt.hWTSAPIWnd, NOTIFY_FOR_THIS_SESSION))
+        {
+            LogFunc(("hWnd(%p) registered for WTS session changes\n", gVBoxSt.hWTSAPIWnd));
+            vboxStCheckState();
+        }
+        else
+        {
+            DWORD dwErr = GetLastError();
+            LogRel(("WTSRegisterSessionNotification failed, error = %08X\n", dwErr));
+            if (dwErr == RPC_S_INVALID_BINDING)
             {
-                rc = RTLdrGetSymbol(gVBoxSt.hLdrModWTSAPI32, "WTSQuerySessionInformationA",
-                                    (void **)&gVBoxSt.pfnWTSQuerySessionInformationA);
-                if (RT_FAILURE(rc))
-                    LogFlowFunc(("WTSQuerySessionInformationA not found\n"));
+                gVBoxSt.idDelayedInitTimer = SetTimer(gVBoxSt.hWTSAPIWnd, TIMERID_VBOXTRAY_ST_DELAYED_INIT_TIMER,
+                                                        2000, (TIMERPROC)NULL);
+                gVBoxSt.fIsConsole = TRUE;
+                gVBoxSt.enmConnectState = WTSActive;
+                rc = VINF_SUCCESS;
             }
             else
-                LogFlowFunc(("WTSUnRegisterSessionNotification not found\n"));
-        }
-        else
-            LogFlowFunc(("WTSRegisterSessionNotification not found\n"));
+                rc = RTErrConvertFromWin32(dwErr);
+        }
+
         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));
+            return VINF_SUCCESS;
+    }
+    else
+    {
+        LogRel(("WtsApi32.dll APIs are not available (%Rrc)\n", rc));
+        gVBoxSt.pfnWTSRegisterSessionNotification = NULL;
+        gVBoxSt.pfnWTSUnRegisterSessionNotification = NULL;
+        gVBoxSt.pfnWTSQuerySessionInformationA = NULL;
+    }
 
     RT_ZERO(gVBoxSt);
@@ -154 +158 @@
 void vboxStTerm(void)
 {
-    if (!gVBoxSt.hWTSAPIWnd)
-    {
-        LogFlowFunc(("vboxStTerm called for non-initialized St\n"));
-        return;
-    }
+    AssertReturnVoid(gVBoxSt.hWTSAPIWnd);
 
     if (gVBoxSt.idDelayedInitTimer)
@@ -170 +170 @@
         if (!gVBoxSt.pfnWTSUnRegisterSessionNotification(gVBoxSt.hWTSAPIWnd))
         {
-            LogFlowFunc(("WTSAPI32 load failed, error = %08X\n", GetLastError()));
-        }
-    }
-
-    RTLdrClose(gVBoxSt.hLdrModWTSAPI32);
+            LogWarnFunc(("WTSAPI32 unload failed, error = %08X\n", GetLastError()));
+        }
+    }
+
     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);
+        RT_CASE_RET_STR(WTS_CONSOLE_CONNECT);
+        RT_CASE_RET_STR(WTS_CONSOLE_DISCONNECT);
+        RT_CASE_RET_STR(WTS_REMOTE_CONNECT);
+        RT_CASE_RET_STR(WTS_REMOTE_DISCONNECT);
+        RT_CASE_RET_STR(WTS_SESSION_LOGON);
+        RT_CASE_RET_STR(WTS_SESSION_LOGOFF);
+        RT_CASE_RET_STR(WTS_SESSION_LOCK);
+        RT_CASE_RET_STR(WTS_SESSION_UNLOCK);
+        RT_CASE_RET_STR(WTS_SESSION_REMOTE_CONTROL);
         default:
-            LogFlowFunc(("invalid WTS state %d\n", val));
+            LogWarnFunc(("invalid WTS state %d\n", val));
             return "Unknown";
     }
@@ -212 +209 @@
     else
     {
-        LogFlowFunc(("timer WTSRegisterSessionNotification failed, error = %08X\n", GetLastError()));
+        LogWarnFunc(("timer WTSRegisterSessionNotification failed, error = %08X\n", GetLastError()));
         Assert(gVBoxSt.fIsConsole == TRUE);
         Assert(gVBoxSt.enmConnectState == WTSActive);
@@ -228 +225 @@
 {
     RT_NOREF(wEvent);
-    LogFlowFunc(("WTS Event: %s\n", vboxStDbgGetString(wEvent)));
+    LogFunc(("WTS Event: %s\n", vboxStDbgGetString(wEvent)));
     BOOL fOldIsActiveConsole = vboxStIsActiveConsole();