Changeset 8512 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 30, 2008 3:13:02 PM (17 years ago)

Author:

vboxsync

Message:

Disabled file locking for windows hosts. Open read/write file in DENY_WRITE mode too.

File:

• trunk/src/VBox/Devices/Storage/VDICore.cpp (modified) (16 diffs)

trunk/src/VBox/Devices/Storage/VDICore.cpp

@@ -441 +441 @@
             }
         }
-
+#ifndef RT_OS_WINDOWS
         rc = RTFileLock(pImage->File,
                         RTFILE_LOCK_WRITE | RTFILE_LOCK_IMMEDIATELY, 0, cbLock);
@@ -449 +449 @@
             goto l_create_failed;
         }
-
+#endif
         if (enmType == VDI_IMAGE_TYPE_FIXED)
         {
@@ -542 +542 @@
     l_create_failed:
 
+#ifndef RT_OS_WINDOWS
         if (cbLock)
             RTFileUnlock(pImage->File, 0, cbLock);
-
+#endif
         RTFileClose(pImage->File);
 
@@ -601 +602 @@
                         fOpen & VDI_OPEN_FLAGS_READONLY
                         ? RTFILE_O_READ      | RTFILE_O_OPEN | RTFILE_O_DENY_NONE
-                        : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+                        : RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_WRITE);
     if (VBOX_FAILURE(rc))
     {
@@ -622 +623 @@
     pImage->fReadOnly = !!(pImage->fOpen & VDI_OPEN_FLAGS_READONLY);
 
+#ifndef RT_OS_WINDOWS
     /*
      * Set initial file lock for reading header only.
@@ -633 +635 @@
         goto l_open_failed;
     }
+#endif
 
     /* Read pre-header. */
@@ -734 +737 @@
     pImage->fModified = VDI_IMAGE_MODIFIED_FIRST;
 
+#ifndef RT_OS_WINDOWS
     /* Image is validated, set working file lock on it. */
     rc = RTFileUnlock(pImage->File, 0, cbLock);
@@ -759 +763 @@
         goto l_open_failed;
     }
+#endif
 
     /* Allocate memory for blocks array. */
@@ -785 +790 @@
     if (pImage->paBlocks)
         RTMemFree(pImage->paBlocks);
+#ifndef RT_OS_WINDOWS
     if (cbLock)
         RTFileUnlock(pImage->File, 0, cbLock);
+#endif
     RTFileClose(pImage->File);
     RTMemFree(pImage);
@@ -964 +971 @@
 
     VDIFlushImage(pImage);
+#ifndef RT_OS_WINDOWS
     RTFileUnlock(pImage->File,
                  0,
                  pImage->offStartData
                + ((uint64_t)getImageBlocks(&pImage->Header) << pImage->uShiftIndex2Offset));
+#endif
     RTFileClose(pImage->File);
 
@@ -1946 +1955 @@
     if (VBOX_SUCCESS(rc))
     {
+#ifndef RT_OS_WINDOWS
         /* lock new image exclusively to close any wrong access by VDI API calls. */
         rc = RTFileLock(File, RTFILE_LOCK_WRITE | RTFILE_LOCK_IMMEDIATELY, 0, cbFile);
         if (VBOX_SUCCESS(rc))
+#endif
         {
             /* Set the size of a new file. */
@@ -2038 +2049 @@
             }
 
+#ifndef RT_OS_WINDOWS
             RTFileUnlock(File, 0, cbFile);
+#endif
         }
 
@@ -3319 +3332 @@
     VDIFlushImage(pImage);
 
+#ifdef RT_OS_WINDOWS
+    int rc = VINF_SUCCESS;
+#else
     /* Change image locking. */
     uint64_t cbLock = pImage->offStartData
@@ -3328 +3344 @@
                               0,
                               cbLock);
+#endif
     if (VBOX_SUCCESS(rc))
     {
@@ -3336 +3353 @@
     }
 
+#ifndef RT_OS_WINDOWS
     /* Check for the most bad error in the world. Damn! It must never happens in real life! */
     if (rc == VERR_FILE_LOCK_LOST)
@@ -3352 +3370 @@
             rc = VERR_FILE_LOCK_VIOLATION;
     }
+#endif
 
     Log(("vdiChangeImageMode: Image \"%s\" mode change failed with rc=%Vrc, mode is %s\n",