Changeset 11725 in vbox for trunk/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp

Timestamp:

Aug 27, 2008 10:21:47 PM (17 years ago)

Author:

vboxsync

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

35466

Message:

#3076: Merged in the branch with the alternate driver authentication method. (34468:HEAD)

File:

• trunk/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp (modified) (10 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * SUPLib - Support Library, OS/2 backend.
+ * VirtualBox Support Library - OS/2 specific parts.
  */
 
@@ -29 +29 @@
  */
 
-
 /*******************************************************************************
 *   Header Files                                                               *
@@ -37 +36 @@
 #include <os2.h>
 #undef RT_MAX
+
+#ifdef IN_SUP_HARDENED_R3
+# undef DEBUG /* Warning: disables RT_STRICT */
+# define LOG_DISABLED
+  /** @todo RTLOGREL_DISABLED */
+# include <iprt/log.h>
+# undef LogRelIt
+# define LogRelIt(pvInst, fFlags, iGroup, fmtargs) do { } while (0)
+#endif
 
 #include <VBox/types.h>
@@ -62 +70 @@
 
 
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-/** Handle to the open device. */
-static HFILE    g_hDevice = (HFILE)-1;
-
-
-/*******************************************************************************
-*   Internal Functions                                                         *
-*******************************************************************************/
-
-
-/**
- * Initialize the OS specific part of the library.
- * On Linux this involves:
- *      - loading the module.
- *      - open driver.
- *
- * @returns 0 on success.
- * @returns current -1 on failure but this must be changed to proper error codes.
- * @param   cbReserve   Ignored on OS/2.
- */
-int     suplibOsInit(size_t cbReserve)
+int suplibOsInit(PSUPLIBDATA pThis, bool fPreInited)
 {
     /*
-     * Check if already initialized.
+     * Nothing to do if pre-inited.
      */
-    if (g_hDevice != (HFILE)-1)
-        return 0;
+    if (fPreInited)
+        return VINF_SUCCESS;
 
     /*
@@ -117 +103 @@
         return vrc;
     }
-    g_hDevice = hDevice;
 
-    NOREF(cbReserve);
+    pThis->hDevice = (RTFILE)hDevice;
     return VINF_SUCCESS;
 }
 
 
-int     suplibOsTerm(void)
+#ifndef IN_SUP_HARDENED_R3
+
+int suplibOsTerm(PSUPLIBDATA pThis)
 {
     /*
      * Check if we're initited at all.
      */
-    if (g_hDevice != (HFILE)-1)
+    if (pThis->hDevice != NIL_RTFILE)
     {
-        APIRET rc = DosClose(g_hDevice);
+        APIRET rc = DosClose((HFILE)pThis->hDevice);
         AssertMsg(rc == NO_ERROR, ("%d\n", rc)); NOREF(rc);
-        g_hDevice = (HFILE)-1;
+        pThis->hDevice = NIL_RTFILE;
     }
 
@@ -154 +141 @@
 
 
-int suplibOsIOCtl(uintptr_t uFunction, void *pvReq, size_t cbReq)
+int suplibOsIOCtl(PSUPLIBDATA pThis, uintptr_t uFunction, void *pvReq, size_t cbReq)
 {
-    AssertMsg(g_hDevice != (HFILE)-1, ("SUPLIB not initiated successfully!\n"));
-
     ULONG cbReturned = sizeof(SUPREQHDR);
-    int rc = DosDevIOCtl(g_hDevice, SUP_CTL_CATEGORY, uFunction,
+    int rc = DosDevIOCtl((HFILE)pThis->hDevice, SUP_CTL_CATEGORY, uFunction,
                          pvReq, cbReturned, &cbReturned,
                          NULL, 0, NULL);
@@ -168 +153 @@
 
 
-int suplibOsIOCtlFast(uintptr_t uFunction)
+int suplibOsIOCtlFast(PSUPLIBDATA pThis, uintptr_t uFunction)
 {
     int32_t rcRet = VERR_INTERNAL_ERROR;
-    int rc = DosDevIOCtl(g_hDevice, SUP_CTL_CATEGORY_FAST, uFunction,
+    int rc = DosDevIOCtl((HFILE)pThis->hDevice, SUP_CTL_CATEGORY_FAST, uFunction,
                          NULL, 0, NULL,
                          NULL, 0, NULL);
@@ -182 +167 @@
 
 
-int suplibOsPageAlloc(size_t cPages, void **ppvPages)
+int suplibOsPageAlloc(PSUPLIBDATA pThis, size_t cPages, void **ppvPages)
 {
+    NOREF(pThis);
     *ppvPages = NULL;
     int rc = DosAllocMem(ppvPages, cPages << PAGE_SHIFT, PAG_READ | PAG_WRITE | PAG_EXECUTE | PAG_COMMIT | OBJ_ANY);
@@ -196 +182 @@
 
 
-int suplibOsPageFree(void *pvPages, size_t /* cPages */)
+int suplibOsPageFree(PSUPLIBDATA pThis, void *pvPages, size_t /* cPages */)
 {
+    NOREF(pThis);
     if (pvPages)
     {
@@ -206 +193 @@
 }
 
+#endif /* !IN_SUP_HARDENED_R3 */
+