Changeset 38290 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 3, 2011 9:22:12 AM (14 years ago)

Author:

vboxsync

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

73297

Message:

GuestCtrl: Update.

Location:

trunk/src/VBox/Additions/WINNT/VBoxGINA

Files:

• Helper.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (1 diff)
• VBoxGINA.cpp (modified) (1 diff)

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

@@ -17 +17 @@
 
 #include <windows.h>
+#ifndef TARGET_NT4
+# include <Wtsapi32.h>
+#endif
 #include "winwlx.h"
 #include "Helper.h"
@@ -59 +62 @@
 bool isRemoteSession(void)
 {
-    return (0 != GetSystemMetrics(SM_REMOTESESSION)) ? true : false;
+    bool fIsRemote = false;
+
+#if 0
+#ifndef TARGET_NT4
+    WTS_SESSION_INFO *pSessionInfo = NULL;
+    DWORD dwSessions;
+    if (WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE,
+                             0 /* Reserved */,
+                             1 /* Version */,
+                             &pSessionInfo,
+                             &dwSessions))
+    {
+        DWORD dwRemoteSessions = 0;
+        for (DWORD i = 0; i < dwSessions; i++)
+        {
+            switch (pSessionInfo[i].State)
+            {
+                case WTSConnected:
+                case WTSActive:
+                {
+                    LPTSTR pBuffer;
+                    DWORD cbBuffer;
+                    if (  WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE,
+                                                     pSessionInfo[i].SessionId,
+                                                     WTSClientProtocolType,
+                                                     &pBuffer, &cbBuffer)
+                        && pBuffer
+                        && cbBuffer)
+                    {
+                        USHORT uProto = (USHORT)(pBuffer);
+                        /* Only count RDP sessions -- these are the ones we're
+                         * interested in here. */
+                        if (uProto == WTS_PROTOCOL_TYPE_RDP)
+                            dwRemoteSessions++;
+                        WTSFreeMemory(pBuffer);
+#ifndef DEBUG
+                        if (dwRemoteSessions) /* Bail out as soon as possible. */
+                            break;
+#endif
+                    }
+                    break;
+                }
+
+                default:
+                    break;
+            }
+        }
+
+#ifdef DEBUG
+        Log(("VBoxGINA: %s connections detected\n",
+             dwRemoteSessions ? "RDP" : "No RDP"));
+#endif
+        if (pSessionInfo)
+            WTSFreeMemory(pSessionInfo);
+
+        if (dwSessions)
+            fIsRemote = true;
+    }
+#endif
+#else
+    LPTSTR pBuffer;
+    DWORD cbBuffer;
+    if (  WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE,
+                                     WTS_CURRENT_SESSION,
+                                     WTSClientProtocolType,
+                                     &pBuffer, &cbBuffer)
+        && pBuffer
+        && cbBuffer)
+    {
+        USHORT uProto = (USHORT)(pBuffer);
+        /* Only count RDP sessions -- these are the ones we're
+         * interested in here. */
+        fIsRemote = uProto == WTS_PROTOCOL_TYPE_RDP;
+        WTSFreeMemory(pBuffer);
+    }
+    else
+        Log(("VBoxGINA: Error %ld querying session information\n",
+             GetLastError()));
+#endif
+
+#ifdef DEBUG
+    Log(("VBoxGINA: Is remote session: %s\n",
+         fIsRemote ? "Yes" : "No"));
+#endif
+    return fIsRemote;
 }
 

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

@@ -31 +31 @@
         $(VBOX_LIB_IPRT_GUEST_R3) \
         $(VBOX_LIB_VBGL_R3)
+ifndef TARGET_NT4
+ VBoxGINA_LIBS   += \
+        WtsApi32.lib
+endif
 
 include $(KBUILD_PATH)/subfooter.kmk

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

@@ -107 +107 @@
     HINSTANCE hDll;
 
-#ifdef DEBUG
-    /* enable full log output */
-    RTLogGroupSettings(RTLogDefaultInstance(), "all=~0");
+#ifdef DEBUG_andy
+    /* Enable full log output. */
+    RTLogGroupSettings(RTLogRelDefaultInstance(), "+default.e.l.f.l2.l3");
 #endif