Changeset 33437 in vbox for trunk

Timestamp:

Oct 25, 2010 4:28:14 PM (14 years ago)

Author:

vboxsync

Message:

iprt: Made tstRTSymlink work on Windows.

Location:

trunk/src/VBox/Runtime

Files:

• r3/fs.cpp (modified) (1 diff)
• r3/win/path-win.cpp (modified) (3 diffs)
• r3/win/symlink-win.cpp (modified) (6 diffs)
• win/RTErrConvertFromWin32.cpp (modified) (1 diff)

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

@@ -91 +91 @@
         }
     }
+
+    /* Is it really a symbolic link? */
+    if (fMode & RTFS_DOS_NT_REPARSE_POINT)
+        fMode = (fMode & ~RTFS_TYPE_MASK) | RTFS_TYPE_SYMLINK;
+
     /* writable? */
     if (!(fMode & RTFS_DOS_READONLY))

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -224 +224 @@
             }
             FindClose(hDir);
-            Data.dwFileAttributes = FindData.dwFileAttributes;
-            Data.ftCreationTime = FindData.ftCreationTime;
-            Data.ftLastAccessTime = FindData.ftLastAccessTime;
-            Data.ftLastWriteTime = FindData.ftLastWriteTime;
-            Data.nFileSizeHigh = FindData.nFileSizeHigh;
-            Data.nFileSizeLow = FindData.nFileSizeLow;
+
+            Data.dwFileAttributes   = FindData.dwFileAttributes;
+            Data.ftCreationTime     = FindData.ftCreationTime;
+            Data.ftLastAccessTime   = FindData.ftLastAccessTime;
+            Data.ftLastWriteTime    = FindData.ftLastWriteTime;
+            Data.nFileSizeHigh      = FindData.nFileSizeHigh;
+            Data.nFileSizeLow       = FindData.nFileSizeLow;
         }
         else
@@ -238 +239 @@
         }
     }
-    RTUtf16Free(pwszPath);
+
+    /*
+     * Getting the information for the link target is a bit annoying and
+     * subject to the same access violation mess as above.. :/
+     */
+    /** @todo we're too lazy wrt to error paths here... */
     if (   (fFlags & RTPATH_F_FOLLOW_LINK)
         && (Data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT))
     {
-#ifndef DEBUG_sandervl
-        AssertFailed();
-#endif
-        /** @todo Symlinks: RTPathQueryInfoEx is not handling symbolic links
-         *        correctly on Windows.  (Both GetFileAttributesEx and FileFindFirst
-         *        will return info about the symlink.) */
-    }
+        HANDLE hFinal = CreateFileW(pwszPath,
+                                    GENERIC_READ,
+                                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+                                    NULL,
+                                    OPEN_EXISTING,
+                                    FILE_FLAG_BACKUP_SEMANTICS,
+                                    NULL);
+        if (hFinal != INVALID_HANDLE_VALUE)
+        {
+            BY_HANDLE_FILE_INFORMATION FileData;
+            if (GetFileInformationByHandle(hFinal, &FileData))
+            {
+                Data.dwFileAttributes   = FileData.dwFileAttributes;
+                Data.ftCreationTime     = FileData.ftCreationTime;
+                Data.ftLastAccessTime   = FileData.ftLastAccessTime;
+                Data.ftLastWriteTime    = FileData.ftLastWriteTime;
+                Data.nFileSizeHigh      = FileData.nFileSizeHigh;
+                Data.nFileSizeLow       = FileData.nFileSizeLow;
+            }
+            CloseHandle(hFinal);
+        }
+        else if (GetLastError() != ERROR_SHARING_VIOLATION)
+        {
+            rc = RTErrConvertFromWin32(GetLastError());
+            RTUtf16Free(pwszPath);
+            return rc;
+        }
+    }
+
+    RTUtf16Free(pwszPath);
 
     /*

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

@@ -44 +44 @@
 
 
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+typedef struct MY_REPARSE_DATA_BUFFER
+{
+    ULONG           ReparseTag;
+#define MY_IO_REPARSE_TAG_SYMLINK       0xa000000c
+#define MY_IO_REPARSE_TAG_MOUNT_POINT   0xa0000003
+
+    USHORT          ReparseDataLength;
+    USHORT          Reserved;
+    union
+    {
+        struct
+        {
+            USHORT  SubstituteNameOffset;
+            USHORT  SubstituteNameLength;
+            USHORT  PrintNameOffset;
+            USHORT  PrintNameLength;
+            ULONG   Flags;
+#define MY_SYMLINK_FLAG_RELATIVE 1
+            WCHAR   PathBuffer[1];
+        } SymbolicLinkReparseBuffer;
+        struct
+        {
+            USHORT  SubstituteNameOffset;
+            USHORT  SubstituteNameLength;
+            USHORT  PrintNameOffset;
+            USHORT  PrintNameLength;
+            WCHAR   PathBuffer[1];
+        } MountPointReparseBuffer;
+        struct
+        {
+            UCHAR   DataBuffer[1];
+        } GenericReparseBuffer;
+    };
+} MY_REPARSE_DATA_BUFFER;
+#define MY_FSCTL_GET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 42, METHOD_BUFFERED, FILE_ANY_ACCESS)
+
+
 RTDECL(bool) RTSymlinkExists(const char *pszSymlink)
 {
@@ -68 +108 @@
         {
             rc = RTPathQueryInfoEx(pszSymlink, &ObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
-            fRc = RT_SUCCESS(rc);
+            fRc = !RT_SUCCESS_NP(rc);
         }
     }
@@ -126 +166 @@
             size_t cchTarget        = strlen(pszTarget);
             size_t cchVolSpecTarget = rtPathVolumeSpecLen(pszTarget);
+#if 0 /* looks like this isn't needed after all. That makes everything much simper :-) */
             if (   cchTarget > RT_MIN(cchVolSpecTarget, 1)
                 && RTPATH_IS_SLASH(pszTarget[cchTarget - 1]))
@@ -140 +181 @@
                 }
             }
+#endif
 
             if (enmType == RTSYMLINKTYPE_UNKNOWN)
@@ -148 +190 @@
                 else if (cchVolSpecTarget)
                 {
+                    /** @todo this is subject to sharing violations. */
                     DWORD dwAttr = GetFileAttributesW(pwszNativeTarget);
                     if (   dwAttr != INVALID_FILE_ATTRIBUTES
@@ -247 +290 @@
                                       NULL,
                                       OPEN_EXISTING,
-                                      FILE_FLAG_OPEN_REPARSE_POINT,
+                                      FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS,
                                       NULL);
         if (hSymlink != INVALID_HANDLE_VALUE)
         {
-            /** @todo what do we do next? FSCTL_GET_REPARSE_POINT? */
-            rc = VERR_NOT_IMPLEMENTED;
-
+            DWORD cbReturned = 0;
+            union
+            {
+                MY_REPARSE_DATA_BUFFER  Buf;
+                uint8_t                 abBuf[16*_1K + sizeof(WCHAR)];
+            } u;
+            if (DeviceIoControl(hSymlink,
+                                MY_FSCTL_GET_REPARSE_POINT,
+                                NULL /*pInBuffer */,
+                                0 /*cbInBuffer */,
+                                &u.Buf,
+                                sizeof(u) - sizeof(WCHAR),
+                                &cbReturned,
+                                NULL /*pOverlapped*/))
+            {
+                if (u.Buf.ReparseTag == MY_IO_REPARSE_TAG_SYMLINK)
+                {
+                    PWCHAR pwszTarget = &u.Buf.SymbolicLinkReparseBuffer.PathBuffer[0];
+                    pwszTarget += u.Buf.SymbolicLinkReparseBuffer.SubstituteNameOffset / 2;
+                    pwszTarget[u.Buf.SymbolicLinkReparseBuffer.SubstituteNameLength / 2] = 0;
+                    if (   !(u.Buf.SymbolicLinkReparseBuffer.Flags & MY_SYMLINK_FLAG_RELATIVE)
+                        && pwszTarget[0] == '\\'
+                        && pwszTarget[1] == '?'
+                        && pwszTarget[2] == '?'
+                        && pwszTarget[3] == '\\'
+                        && pwszTarget[4] != 0
+                       )
+                        pwszTarget += 4;
+                    rc = RTUtf16ToUtf8(pwszTarget, ppszTarget);
+                }
+                else
+                    rc = VERR_NOT_SYMLINK;
+            }
+            else
+                rc = RTErrConvertFromWin32(GetLastError());
             CloseHandle(hSymlink);
         }

trunk/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp

@@ -396 +396 @@
         //case WSANO_RECOVERY          (WSABASEERR+1003)
         //case WSANO_DATA              (WSABASEERR+1004)
+
+
+#ifndef ERROR_NOT_A_REPARSE_POINT
+# define ERROR_NOT_A_REPARSE_POINT 0x1126
+#endif
+        case ERROR_NOT_A_REPARSE_POINT: return VERR_NOT_SYMLINK;
+
     }