Changeset 70345 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 26, 2017 3:51:56 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: More NT 3.1 compatibility tweaking.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• r3/init.cpp (modified) (1 diff)
• r3/win/init-win.cpp (modified) (3 diffs)
• r3/win/internal-r3-win.h (modified) (1 diff)
• r3/win/process-win.cpp (modified) (5 diffs)
• r3/win/time2-win.cpp (modified) (2 diffs)
• r3/win/vcc100-kernel32-fakes.cpp (modified) (3 diffs)
• r3/win/vcc100-kernel32-fakesA.asm (modified) (2 diffs)
• r3/win/vcc100-shell32-fakes.cpp (added)
• r3/win/vcc100-shell32-fakesA.asm (added)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1555 +1555 @@
         r3/win/vcc100-ntdll-fakesA.asm \
         r3/win/vcc100-ws2_32-fakes.cpp \
-        r3/win/vcc100-ws2_32-fakesA.asm
+        r3/win/vcc100-ws2_32-fakesA.asm \
+        r3/win/vcc100-shell32-fakes.cpp \
+        r3/win/vcc100-shell32-fakesA.asm \
 
 #

trunk/src/VBox/Runtime/r3/init.cpp

@@ -292 +292 @@
                unicode main function.  So, we have to use CommandLineToArgvW to get
                something similar. It should do the same conversion... :-) */
+            /** @todo Replace this CommandLineToArgvW call with a call into
+             *        getoptargv.cpp so we don't depend on shell32 and an API not present
+             *        in NT 3.1.  */
             int    cArgsW     = -1;
             PWSTR *papwszArgs = NULL;

trunk/src/VBox/Runtime/r3/win/init-win.cpp

@@ -75 +75 @@
 /** The previous unhandled exception filter. */
 static LPTOP_LEVEL_EXCEPTION_FILTER         g_pfnUnhandledXcptFilter = NULL;
+/** SystemTimeToTzSpecificLocalTime. */
+decltype(SystemTimeToTzSpecificLocalTime)  *g_pfnSystemTimeToTzSpecificLocalTime = NULL;
 
 /** The native ntdll.dll handle. */
@@ -525 +527 @@
     if (g_pfnGetSystemWindowsDirectoryW)
         g_pfnGetSystemWindowsDirectoryW = (PFNGETWINSYSDIR)GetProcAddress(g_hModKernel32, "GetWindowsDirectoryW");
+    g_pfnSystemTimeToTzSpecificLocalTime = (decltype(SystemTimeToTzSpecificLocalTime) *)GetProcAddress(g_hModKernel32, "SystemTimeToTzSpecificLocalTime");
 
     /*
@@ -531 +534 @@
     g_pfnNtQueryFullAttributesFile = (PFNNTQUERYFULLATTRIBUTESFILE)GetProcAddress(g_hModNtDll, "NtQueryFullAttributesFile");
     g_pfnNtDuplicateToken          = (PFNNTDUPLICATETOKEN)GetProcAddress(         g_hModNtDll, "NtDuplicateToken");
+
 
     /*

trunk/src/VBox/Runtime/r3/win/internal-r3-win.h

@@ -97 +97 @@
 extern DECLHIDDEN(RTWINOSTYPE)      g_enmWinVer;
 #ifdef _WINDEF_
-extern DECLHIDDEN(HMODULE)          g_hModKernel32;
+extern DECLHIDDEN(OSVERSIONINFOEXW) g_WinOsInfoEx;
+
+extern DECLHIDDEN(HMODULE)                         g_hModKernel32;
+typedef UINT (WINAPI *PFNGETWINSYSDIR)(LPWSTR,UINT);
+extern DECLHIDDEN(PFNGETWINSYSDIR)                 g_pfnGetSystemWindowsDirectoryW;
+extern decltype(SystemTimeToTzSpecificLocalTime)  *g_pfnSystemTimeToTzSpecificLocalTime;
+
 extern DECLHIDDEN(HMODULE)          g_hModNtDll;
-
-extern DECLHIDDEN(OSVERSIONINFOEXW) g_WinOsInfoEx;
-typedef UINT (WINAPI *PFNGETWINSYSDIR)(LPWSTR,UINT);
-extern DECLHIDDEN(PFNGETWINSYSDIR)  g_pfnGetSystemWindowsDirectoryW;
 typedef NTSTATUS (NTAPI *PFNNTQUERYFULLATTRIBUTESFILE)(struct _OBJECT_ATTRIBUTES *, struct _FILE_NETWORK_OPEN_INFORMATION *);
 extern DECLHIDDEN(PFNNTQUERYFULLATTRIBUTESFILE) g_pfnNtQueryFullAttributesFile;
 typedef NTSTATUS (NTAPI *PFNNTDUPLICATETOKEN)(HANDLE, ACCESS_MASK, struct _OBJECT_ATTRIBUTES *, BOOLEAN, TOKEN_TYPE, PHANDLE);
-extern DECLHIDDEN(PFNNTDUPLICATETOKEN)          g_pfnNtDuplicateToken;
+extern DECLHIDDEN(PFNNTDUPLICATETOKEN)             g_pfnNtDuplicateToken;
 
 extern DECLHIDDEN(HMODULE)                         g_hModWinSock;

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -144 +144 @@
 static decltype(CreateProcessAsUserW)  *g_pfnCreateProcessAsUserW       = NULL;
 static decltype(LsaNtStatusToWinError) *g_pfnLsaNtStatusToWinError      = NULL;
+/* user32.dll: */
+static decltype(OpenWindowStationW)    *g_pfnOpenWindowStationW         = NULL;
+static decltype(CloseWindowStation)    *g_pfnCloseWindowStation        = NULL;
 /* userenv.dll: */
 static PFNCREATEENVIRONMENTBLOCK        g_pfnCreateEnvironmentBlock     = NULL;
@@ -361 +364 @@
         rc = RTLdrGetSymbol(hMod, "LsaNtStatusToWinError", (void **)&g_pfnLsaNtStatusToWinError);
         if (RT_FAILURE(rc)) { g_pfnLsaNtStatusToWinError = NULL; Assert(g_enmWinVer <= kRTWinOSType_NT350); }
+
+        RTLdrClose(hMod);
+    }
+
+    /*
+     * user32.dll APIs.
+     */
+    rc = RTLdrLoadSystem("user32.dll", true /*fNoUnload*/, &hMod);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTLdrGetSymbol(hMod, "OpenWindowStationW", (void **)&g_pfnOpenWindowStationW);
+        if (RT_FAILURE(rc)) { g_pfnOpenWindowStationW = NULL; Assert(g_enmWinVer <= kRTWinOSType_NT310); }
+
+        rc = RTLdrGetSymbol(hMod, "CloseWindowStation", (void **)&g_pfnCloseWindowStation);
+        if (RT_FAILURE(rc)) { g_pfnCloseWindowStation = NULL; Assert(g_enmWinVer <= kRTWinOSType_NT310); }
 
         RTLdrClose(hMod);
@@ -1299 +1317 @@
     /** @todo Always mess with the interactive one? Maybe it's not there...  */
     *phWinStationOld = GetProcessWindowStation();
-    HWINSTA hWinStation0 = OpenWindowStationW(L"winsta0", FALSE /*fInherit*/, READ_CONTROL | WRITE_DAC);
+    HWINSTA hWinStation0;
+    if (g_pfnOpenWindowStationW)
+        hWinStation0 = g_pfnOpenWindowStationW(L"winsta0", FALSE /*fInherit*/, READ_CONTROL | WRITE_DAC);
+    else
+        hWinStation0 = OpenWindowStationA("winsta0", FALSE /*fInherit*/, READ_CONTROL | WRITE_DAC); /* (for NT3.1) */
     if (hWinStation0)
     {
@@ -1326 +1348 @@
         else
             AssertFailed();
-        CloseWindowStation(hWinStation0);
+        if (g_pfnCloseWindowStation)
+            g_pfnCloseWindowStation(hWinStation0);
     }
     else
@@ -1711 +1734 @@
                             {
                                 HWINSTA hOldWinStation = NULL;
-                                if (!fFound && g_enmWinVer <= kRTWinOSType_NT4) /** @todo test newer versions... */
+                                if (   !fFound
+                                    && g_enmWinVer <= kRTWinOSType_NT4) /** @todo test newer versions... */
                                     rtProcWinStationPrep(hTokenToUse, pStartupInfo, &hOldWinStation);
 

trunk/src/VBox/Runtime/r3/win/time2-win.cpp

@@ -39 +39 @@
 #include "internal/time.h"
 
+#include "internal-r3-win.h"
 
 
@@ -56 +57 @@
 RTDECL(PRTTIME) RTTimeLocalExplode(PRTTIME pTime, PCRTTIMESPEC pTimeSpec)
 {
-    /*
-     * FileTimeToLocalFileTime does not do the right thing, so we'll have
-     * to convert to system time and SystemTimeToTzSpecificLocalTime instead.
-     */
     RTTIMESPEC LocalTime;
-    SYSTEMTIME SystemTimeIn;
-    FILETIME FileTime;
-    if (FileTimeToSystemTime(RTTimeSpecGetNtFileTime(pTimeSpec, &FileTime), &SystemTimeIn))
+    if (g_pfnSystemTimeToTzSpecificLocalTime)
     {
-        SYSTEMTIME SystemTimeOut;
-        if (SystemTimeToTzSpecificLocalTime(NULL /* use current TZI */,
-                                            &SystemTimeIn,
-                                            &SystemTimeOut))
+        /*
+         * FileTimeToLocalFileTime does not do the right thing, so we'll have
+         * to convert to system time and SystemTimeToTzSpecificLocalTime instead.
+         */
+        SYSTEMTIME SystemTimeIn;
+        FILETIME FileTime;
+        if (FileTimeToSystemTime(RTTimeSpecGetNtFileTime(pTimeSpec, &FileTime), &SystemTimeIn))
         {
-            if (SystemTimeToFileTime(&SystemTimeOut, &FileTime))
+            SYSTEMTIME SystemTimeOut;
+            if (g_pfnSystemTimeToTzSpecificLocalTime(NULL /* use current TZI */, &SystemTimeIn, &SystemTimeOut))
             {
-                RTTimeSpecSetNtFileTime(&LocalTime, &FileTime);
-                pTime = RTTimeExplode(pTime, &LocalTime);
-                if (pTime)
-                    pTime->fFlags = (pTime->fFlags & ~RTTIME_FLAGS_TYPE_MASK) | RTTIME_FLAGS_TYPE_LOCAL;
-                return pTime;
+                if (SystemTimeToFileTime(&SystemTimeOut, &FileTime))
+                {
+                    RTTimeSpecSetNtFileTime(&LocalTime, &FileTime);
+                    pTime = RTTimeExplode(pTime, &LocalTime);
+                    if (pTime)
+                        pTime->fFlags = (pTime->fFlags & ~RTTIME_FLAGS_TYPE_MASK) | RTTIME_FLAGS_TYPE_LOCAL;
+                    return pTime;
+                }
             }
         }

trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp

@@ -68 +68 @@
 #define SetThreadAffinityMask                   Ignore_SetThreadAffinityMask
 #define GetProcessAffinityMask                  Ignore_GetProcessAffinityMask
-#define CommandLineToArgvW                      Ignore_CommandLineToArgvW
+#define GetHandleInformation                    Ignore_GetHandleInformation
+#define SetHandleInformation                    Ignore_SetHandleInformation
 
 #include <iprt/nt/nt-and-windows.h>
@@ -100 +101 @@
 #undef SetThreadAffinityMask
 #undef GetProcessAffinityMask
-#undef CommandLineToArgvW
+#undef GetHandleInformation
+#undef SetHandleInformation
 
 
@@ -745 +747 @@
 
 
-/** @todo This is actually in SHELL32. */
-DECL_KERNEL32(LPWSTR *) CommandLineToArgvW(LPCWSTR pwszCmdLine, int *pcArgs)
-{
-    RESOLVE_ME(CommandLineToArgvW);
-    if (pfnApi)
-        return pfnApi(pwszCmdLine, pcArgs);
-
-    *pcArgs = 0;
-    return NULL;
+DECL_KERNEL32(BOOL) GetHandleInformation(HANDLE hObject, DWORD *pfFlags)
+{
+    RESOLVE_ME(GetHandleInformation);
+    if (pfnApi)
+        return pfnApi(hObject, pfFlags);
+
+
+    OBJECT_HANDLE_FLAG_INFORMATION  Info  = { 0, 0 };
+    DWORD                           cbRet = sizeof(Info);
+    NTSTATUS rcNt = NtQueryObject(hObject, ObjectHandleFlagInformation, &Info, sizeof(Info), &cbRet);
+    if (NT_SUCCESS(rcNt))
+    {
+        *pfFlags = (Info.Inherit          ? HANDLE_FLAG_INHERIT : 0)
+                 | (Info.ProtectFromClose ? HANDLE_FLAG_PROTECT_FROM_CLOSE : 0);
+        return TRUE;
+    }
+    *pfFlags = 0;
+    AssertMsg(rcNt == STATUS_INVALID_HANDLE, ("rcNt=%#x\n", rcNt));
+    SetLastError(rcNt == STATUS_INVALID_HANDLE ? ERROR_INVALID_HANDLE : ERROR_INVALID_FUNCTION);
+    return FALSE;
+}
+
+
+DECL_KERNEL32(BOOL) SetHandleInformation(HANDLE hObject, DWORD fMask, DWORD fFlags)
+{
+    RESOLVE_ME(SetHandleInformation);
+    if (pfnApi)
+        return pfnApi(hObject, fMask, fFlags);
+
+    SetLastError(ERROR_INVALID_FUNCTION);
+    return FALSE;
 }
 

trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakesA.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; IPRT - Wrappers for kernel32 APIs misisng NT4.
+; IPRT - Wrappers for kernel32 APIs missing in NT4 and earlier.
 ;
 
@@ -77 +77 @@
 MAKE_IMPORT_ENTRY SetThreadAffinityMask, 8
 MAKE_IMPORT_ENTRY GetProcessAffinityMask, 12
-MAKE_IMPORT_ENTRY CommandLineToArgvW, 8 ; Lazy bird: this lives in shell32.
+MAKE_IMPORT_ENTRY GetHandleInformation, 8
+MAKE_IMPORT_ENTRY SetHandleInformation, 12