Changeset 37596 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jun 22, 2011 7:30:06 PM (14 years ago)

Author:

vboxsync

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

72442

Message:

*: RTFILE becomes a pointer, RTFileOpen++ expands it's flags paramter from uint32_t to uint64_t.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -188 +188 @@
         }
     }
-    g_File = hf;
+    g_File = (RTFILE)hf;
 
 #elif defined(VBOX_VBGLR3_XFREE86)
@@ -267 +267 @@
     g_File = NIL_RTFILE;
     AssertReturnVoid(File != NIL_RTFILE);
-    APIRET rc = DosClose(File);
+    APIRET rc = DosClose((uintptr_t)File);
     AssertMsg(!rc, ("%ld\n", rc));
 
@@ -323 +323 @@
     int32_t vrc = VERR_INTERNAL_ERROR;
     ULONG cbOS2Data = sizeof(vrc);
-    APIRET rc = DosDevIOCtl(g_File, VBOXGUEST_IOCTL_CATEGORY, iFunction,
+    APIRET rc = DosDevIOCtl((uintptr_t)g_File, VBOXGUEST_IOCTL_CATEGORY, iFunction,
                             pvData, cbData, &cbOS2Parm,
                             &vrc, sizeof(vrc), &cbOS2Data);
@@ -344 +344 @@
  *        header with an error code return field (much better alternative
  *        actually). */
-    int rc = ioctl((int)g_File, iFunction, &Hdr);
+    int rc = ioctl(RTFileToNative(g_File), iFunction, &Hdr);
     if (rc == -1)
     {
@@ -356 +356 @@
     int rc = xf86ioctl((int)g_File, iFunction, pvData);
 # else
-    int rc = ioctl((int)g_File, iFunction, pvData);
+    int rc = ioctl(RTFileToNative(g_File), iFunction, pvData);
 # endif
     if (RT_LIKELY(rc == 0))