Changeset 57597 in vbox

Timestamp:

Sep 2, 2015 3:09:12 PM (9 years ago)

Author:

vboxsync

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

102458

Message:

IPRT/fileio-win.cpp: Fixed support for RTFileQueryInfo() in combination with (pseudo) handles like stdin, stdout and stderr on Win7 and earlier.

File:

• trunk/src/VBox/Runtime/r3/win/fileio-win.cpp (modified) (2 diffs)

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

@@ -824 +824 @@
      * Query file info.
      */
+    HANDLE hHandle = (HANDLE)RTFileToNative(hFile);
+
     BY_HANDLE_FILE_INFORMATION Data;
-    if (!GetFileInformationByHandle((HANDLE)RTFileToNative(hFile), &Data))
+    if (!GetFileInformationByHandle(hHandle, &Data))
     {
         DWORD dwErr = GetLastError();
@@ -831 +833 @@
          * everything else is fine here ... */
         if (dwErr == ERROR_INVALID_HANDLE)
-            return RTErrConvertFromWin32(dwErr);
+        {
+            /*
+             * On Windows 7 or earlier certain standard handles such as
+             * stin, stdout and stderr were ring-3 pseudo handles which the
+             * kernel didn't know about.
+             *
+             * So simply ignore the ERROR_INVALID_HANDLE in that case to not
+             * break other parts which rely on this function.
+             */
+            OSVERSIONINFOEX OSInfoEx = { 0 };
+            OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+            bool fIgnoreError = false;
+
+            /* Windows 7 or  earlier? */
+            if (   GetVersionEx((LPOSVERSIONINFO) &OSInfoEx)
+                && (OSInfoEx.dwPlatformId == VER_PLATFORM_WIN32_NT)
+                && (OSInfoEx.dwMajorVersion <= 6)
+                && (OSInfoEx.dwMajorVersion <= 1))
+            {
+                /* Do we want to query file information for one of the pseudo handles? Then skip. */
+                if (   hHandle == GetStdHandle(STD_INPUT_HANDLE)
+                    || hHandle == GetStdHandle(STD_OUTPUT_HANDLE)
+                    || hHandle == GetStdHandle(STD_ERROR_HANDLE))
+                {
+                    fIgnoreError = true;
+                }
+            }
+
+            if (!fIgnoreError)
+                return RTErrConvertFromWin32(dwErr);
+        }
         RT_ZERO(Data);
         Data.dwFileAttributes = RTFS_DOS_NT_DEVICE;