Changeset 37596 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLib.cpp (modified) (2 diffs)
• SUPLibInternal.h (modified) (2 diffs)
• SUPR3HardenedMain.cpp (modified) (1 diff)
• darwin/SUPLib-darwin.cpp (modified) (2 diffs)
• freebsd/SUPLib-freebsd.cpp (modified) (1 diff)
• linux/SUPLib-linux.cpp (modified) (3 diffs)
• os2/SUPLib-os2.cpp (modified) (2 diffs)
• solaris/SUPLib-solaris.cpp (modified) (1 diff)
• win/SUPLib-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -97 +97 @@
 SUPLIBDATA                      g_supLibData =
 {
-    NIL_RTFILE
+    SUP_HDEVICE_NIL
 #if   defined(RT_OS_DARWIN)
     , NULL
@@ -185 +185 @@
         return VERR_INVALID_MAGIC;
     if (    !(fFlags & SUPSECMAIN_FLAGS_DONT_OPEN_DEV)
-        &&  pPreInitData->Data.hDevice == NIL_RTFILE)
+        &&  pPreInitData->Data.hDevice == SUP_HDEVICE_NIL)
         return VERR_INVALID_HANDLE;
     if (    (fFlags & SUPSECMAIN_FLAGS_DONT_OPEN_DEV)
-        &&  pPreInitData->Data.hDevice != NIL_RTFILE)
+        &&  pPreInitData->Data.hDevice != SUP_HDEVICE_NIL)
         return VERR_INVALID_PARAMETER;
 

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -185 +185 @@
 {
     /** The device handle. */
-    RTFILE              hDevice;
+#if defined(RT_OS_WINDOWS)
+    void               *hDevice;
+#else
+    int                 hDevice;
+#endif
 #if   defined(RT_OS_DARWIN)
     /** The connection to the VBoxSupDrv service. */
@@ -203 +207 @@
 /** Pointer to const pre-init data. */
 typedef SUPLIBDATA const *PCSUPLIBDATA;
+
+/** The NIL value of SUPLIBDATA::hDevice. */
+#if defined(RT_OS_WINDOWS)
+# define SUP_HDEVICE_NIL NULL
+#else
+# define SUP_HDEVICE_NIL (-1)
+#endif
 
 

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp

@@ -1019 +1019 @@
      */
     g_pszSupLibHardenedProgName = pszProgName;
-    g_SupPreInitData.u32Magic = SUPPREINITDATA_MAGIC;
-    g_SupPreInitData.Data.hDevice = NIL_RTFILE;
-    g_SupPreInitData.u32EndMagic = SUPPREINITDATA_MAGIC;
+    g_SupPreInitData.u32Magic     = SUPPREINITDATA_MAGIC;
+    g_SupPreInitData.Data.hDevice = SUP_HDEVICE_NIL;
+    g_SupPreInitData.u32EndMagic  = SUPPREINITDATA_MAGIC;
 
 #ifdef SUP_HARDENED_SUID

trunk/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp

@@ -194 +194 @@
      * Do the job.
      */
-    Assert(pThis->hDevice == NIL_RTFILE);
+    Assert(pThis->hDevice == (intptr_t)NIL_RTFILE);
     int rc = suplibDarwinOpenService(pThis);
     if (RT_SUCCESS(rc))
@@ -237 +237 @@
      * Check if we're inited at all.
      */
-    if (pThis->hDevice != NIL_RTFILE)
+    if (pThis->hDevice != (intptr_t)NIL_RTFILE)
     {
         if (close(pThis->hDevice))
             AssertFailed();
-        pThis->hDevice = NIL_RTFILE;
+        pThis->hDevice = (intptr_t)NIL_RTFILE;
     }
 

trunk/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp

@@ -133 +133 @@
      * Check if we're inited at all.
      */
-    if (pThis->hDevice != NIL_RTFILE)
+    if (pThis->hDevice != (intptr_t)NIL_RTFILE)
     {
         if (close(pThis->hDevice))
             AssertFailed();
-        pThis->hDevice = NIL_RTFILE;
+        pThis->hDevice = (intptr_t)NIL_RTFILE;
     }
     return VINF_SUCCESS;

trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

@@ -79 +79 @@
     if (fPreInited)
         return VINF_SUCCESS;
-    Assert(pThis->hDevice == NIL_RTFILE);
+    Assert(pThis->hDevice == (intptr_t)NIL_RTFILE);
 
     /*
@@ -145 +145 @@
      * Close the device if it's actually open.
      */
-    if (pThis->hDevice != NIL_RTFILE)
+    if (pThis->hDevice != (intptr_t)NIL_RTFILE)
     {
         if (close(pThis->hDevice))
             AssertFailed();
-        pThis->hDevice = NIL_RTFILE;
+        pThis->hDevice = (intptr_t)NIL_RTFILE;
     }
 
@@ -172 +172 @@
 int suplibOsIOCtl(PSUPLIBDATA pThis, uintptr_t uFunction, void *pvReq, size_t cbReq)
 {
-    AssertMsg(pThis->hDevice != NIL_RTFILE, ("SUPLIB not initiated successfully!\n"));
+    AssertMsg(pThis->hDevice != (intptr_t)NIL_RTFILE, ("SUPLIB not initiated successfully!\n"));
 
     /*

trunk/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp

@@ -100 +100 @@
     }
 
-    pThis->hDevice = (RTFILE)hDevice;
+    pThis->hDevice = hDevice;
     return VINF_SUCCESS;
 }
@@ -112 +112 @@
      * Check if we're inited at all.
      */
-    if (pThis->hDevice != NIL_RTFILE)
+    if (pThis->hDevice != (intptr_t)NIL_RTFILE)
     {
         APIRET rc = DosClose((HFILE)pThis->hDevice);
         AssertMsg(rc == NO_ERROR, ("%d\n", rc)); NOREF(rc);
-        pThis->hDevice = NIL_RTFILE;
+        pThis->hDevice = (intptr_t)NIL_RTFILE;
     }
 

trunk/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp

@@ -162 +162 @@
         if (close(pThis->hDevice))
             AssertFailed();
-        pThis->hDevice = NIL_RTFILE;
+        pThis->hDevice = (intptr_t)NIL_RTFILE;
     }
 

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -139 +139 @@
      * We're done.
      */
-    pThis->hDevice = (RTFILE)hDevice;
+    pThis->hDevice = hDevice;
     return VINF_SUCCESS;
 }
@@ -475 +475 @@
      * Check if we're inited at all.
      */
-    if (pThis->hDevice != NIL_RTFILE)
+    if (pThis->hDevice != NULL)
     {
         if (!CloseHandle((HANDLE)pThis->hDevice))
             AssertFailed();
-        pThis->hDevice = NIL_RTFILE;
+        pThis->hDevice = NIL_RTFILE; /* yes, that's right */
     }