Changeset 6994 in vbox

Timestamp:

Feb 18, 2008 2:02:10 PM (17 years ago)

Author:

vboxsync

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

28189

Message:

Restrict RTFILE_O_NOT_CONTENT_INDEXED to file creation. Rearranged the reorder the code a bit.

File:

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

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

@@ -227 +227 @@
                               dwFlagsAndAttributes,
                               NULL);
-    if (hFile == INVALID_HANDLE_VALUE)
-        return RTErrConvertFromWin32(GetLastError());
-
-    /*
-     * Turn off indexing of directory through Windows Indexing Service.
-     */
-    if (fOpen & RTFILE_O_NOT_CONTENT_INDEXED)
-    {
-        if (!SetFileAttributes(pszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
-        {
-            rc = RTErrConvertFromWin32(GetLastError());
-            CloseHandle(hFile);
-            return rc;
-        }
-    }
 #else
-
     PRTUCS2 pwszFilename;
     rc = RTStrToUtf16(pszFilename, &pwszFilename);
@@ -256 +240 @@
                                dwFlagsAndAttributes,
                                NULL);
-    if (hFile == INVALID_HANDLE_VALUE)
-    {
-        rc = RTErrConvertFromWin32(GetLastError()); /* get error first! */
-        RTUtf16Free(pwszFilename);
-        return rc;
-    }
-
-    /*
-     * Turn off indexing of directory through Windows Indexing Service.
-     */
-    if (fOpen & RTFILE_O_NOT_CONTENT_INDEXED)
-    {
-        if (!SetFileAttributesW(pwszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
+#endif
+    if (hFile != INVALID_HANDLE_VALUE)
+    {
+        bool fCreated = dwCreationDisposition == CREATE_ALWAYS
+                     || dwCreationDisposition == CREATE_NEW
+                     || (dwCreationDisposition == OPEN_ALWAYS && GetLastError() == 0);
+
+        /*
+         * Turn off indexing of directory through Windows Indexing Service.
+         */
+        if (    fCreated
+            &&  (fOpen & RTFILE_O_NOT_CONTENT_INDEXED))
         {
-            rc = RTErrConvertFromWin32(GetLastError());
-            CloseHandle(hFile);
+#ifdef RT_DONT_CONVERT_FILENAMES
+            if (!SetFileAttributes(pszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
+#else
+            if (!SetFileAttributesW(pwszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
+#endif
+                rc = RTErrConvertFromWin32(GetLastError());
+        }
+        /*
+         * Do we need to truncate the file?
+         */
+        else if (    !fCreated
+                 &&     (fOpen & (RTFILE_O_TRUNCATE | RTFILE_O_ACTION_MASK))
+                     == (RTFILE_O_TRUNCATE | RTFILE_O_OPEN_CREATE))
+        {
+            if (!SetEndOfFile(hFile))
+                rc = RTErrConvertFromWin32(GetLastError());
+        }
+        if (RT_SUCCESS(rc))
+        {
+            *pFile = (RTFILE)hFile;
+            Assert((HANDLE)*pFile == hFile);
+#ifndef RT_DONT_CONVERT_FILENAMES
             RTUtf16Free(pwszFilename);
-            return rc;
+#endif
+            return VINF_SUCCESS;
         }
-    }
-
+
+        CloseHandle(hFile);
+    }
+    else
+        rc = RTErrConvertFromWin32(GetLastError());
+#ifndef RT_DONT_CONVERT_FILENAMES
     RTUtf16Free(pwszFilename);
 #endif
-
-    /*
-     * Do we need to truncate the file?
-     */
-    if (    (fOpen & (RTFILE_O_TRUNCATE | RTFILE_O_ACTION_MASK))
-        ==  (RTFILE_O_TRUNCATE | RTFILE_O_OPEN_CREATE))
-    {
-        if (!SetEndOfFile(hFile))
-        {
-            rc = RTErrConvertFromWin32(GetLastError()); /* get error first! */
-            CloseHandle(hFile);
-            return rc;
-        }
-    }
-
-    *pFile = (RTFILE)hFile;
-    Assert((HANDLE)*pFile == hFile);
-    return VINF_SUCCESS;
+    return rc;
 }