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

Timestamp:

Dec 19, 2017 3:24:44 AM (7 years ago)

Author:

vboxsync

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

119798

Message:

VBoxService: Dynamically resolve LsaNtStatusToWinError to make it work on NT 3.50.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService-win.cpp (modified) (3 diffs)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServiceVMInfo-win.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp

@@ -35 +35 @@
 #include <aclapi.h>
 #include <tlhelp32.h>
+#define _NTDEF_
+#include <Ntsecapi.h>
 
 #include "VBoxServiceInternal.h"
@@ -66 +68 @@
 decltype(SetEntriesInAclA)              *g_pfnSetEntriesInAclA;                 /**< NT4+ */
 decltype(SetNamedSecurityInfoA)         *g_pfnSetNamedSecurityInfoA;            /**< NT4+ */
+decltype(LsaNtStatusToWinError)         *g_pfnLsaNtStatusToWinError;            /**< NT3.51+ */
 /** @} */
 
@@ -119 +122 @@
         RESOLVE_SYMBOL(SetEntriesInAclA);
         RESOLVE_SYMBOL(SetNamedSecurityInfoA);
+        RESOLVE_SYMBOL(LsaNtStatusToWinError);
         RTLdrClose(hLdrMod);
     }

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -223 +223 @@
 # endif /* WINSOCK_VERSION */
 
+#ifdef SE_INTERACTIVE_LOGON_NAME
+extern decltype(LsaNtStatusToWinError)         *g_pfnLsaNtStatusToWinError;
+#endif
+
 # ifdef VBOX_WITH_GUEST_PROPS
 extern int                      VGSvcVMInfoWinWriteUsers(PVBOXSERVICEVEPROPCACHE pCache, char **ppszUserList, uint32_t *pcUsersInList);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -749 +749 @@
     if (!pSession)
         return false;
-    if (!g_pfnLsaGetLogonSessionData)
+    if (   !g_pfnLsaGetLogonSessionData
+        || !g_pfnLsaNtStatusToWinError)
         return false;
 
@@ -756 +757 @@
     if (rcNt != STATUS_SUCCESS)
     {
-        ULONG ulError = LsaNtStatusToWinError(rcNt);
+        ULONG ulError = g_pfnLsaNtStatusToWinError(rcNt);
         switch (ulError)
         {
@@ -1086 +1087 @@
     if (RT_FAILURE(rc))
         return rc;
-    if (!g_pfnLsaEnumerateLogonSessions || !g_pfnEnumProcesses)
+    if (!g_pfnLsaEnumerateLogonSessions || !g_pfnEnumProcesses || !g_pfnLsaNtStatusToWinError)
         return VERR_NOT_SUPPORTED;
 
@@ -1102 +1103 @@
     if (rcNt != STATUS_SUCCESS)
     {
-        ULONG uError = LsaNtStatusToWinError(rcNt);
+        ULONG uError = g_pfnLsaNtStatusToWinError(rcNt);
         switch (uError)
         {