Changeset 25258 in vbox for trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

Timestamp:

Dec 9, 2009 1:52:52 AM (15 years ago)

Author:

vboxsync

Message:

SUPDrv: Sketched out support for native module loading. (OS parts are all stubs and the IOC interface changes disabled.)

File:

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

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

@@ -272 +272 @@
         strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
-        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00100001
-                                   ?  0x00100001
+#ifdef SUPDRV_USE_NATIVE_LOADER
+        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00120000
+                                   ?  0x00120000
                                    :  SUPDRV_IOC_VERSION & 0xffff0000;
+#else
+       const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00100001
+                                       ?  0x00100001
+                                   :  SUPDRV_IOC_VERSION & 0xffff0000;
+#endif
         CookieReq.u.In.u32MinVersion = uMinVersion;
         rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE);
@@ -1644 +1650 @@
 static int supLoadModule(const char *pszFilename, const char *pszModule, const char *pszSrvReqHandler, void **ppvImageBase)
 {
+    int rc;
+
     /*
      * Validate input.
@@ -1651 +1659 @@
     AssertPtrReturn(ppvImageBase, VERR_INVALID_PARAMETER);
     AssertReturn(strlen(pszModule) < RT_SIZEOFMEMB(SUPLDROPEN, u.In.szName), VERR_FILENAME_TOO_LONG);
+#ifdef SUPDRV_USE_NATIVE_LOADER
+    char szAbsFilename[RT_SIZEOFMEMB(SUPLDROPEN, u.In.szFilename)];
+    rc = RTPathAbs(pszFilename, szAbsFilename, sizeof(szAbsFilename));
+    if (RT_FAILURE(rc))
+        return rc;
+    pszFilename = szAbsFilename;
+#endif
 
     const bool fIsVMMR0 = !strcmp(pszModule, "VMMR0.r0");
@@ -1660 +1675 @@
      */
     RTLDRMOD hLdrMod;
-    int rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_HOST, &hLdrMod);
+    rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_HOST, &hLdrMod);
     if (!RT_SUCCESS(rc))
         return rc;
@@ -1673 +1688 @@
         const uint32_t  offSymTab = RT_ALIGN_32(CalcArgs.cbImage, 8);
         const uint32_t  offStrTab = offSymTab + CalcArgs.cSymbols * sizeof(SUPLDRSYM);
-        const uint32_t  cbImage   = RT_ALIGN_32(offStrTab + CalcArgs.cbStrings, 8);
+        const uint32_t  cbImageWithTabs = RT_ALIGN_32(offStrTab + CalcArgs.cbStrings, 8);
 
         /*
@@ -1685 +1700 @@
         OpenReq.Hdr.fFlags = SUPREQHDR_FLAGS_DEFAULT;
         OpenReq.Hdr.rc = VERR_INTERNAL_ERROR;
-        OpenReq.u.In.cbImage = cbImage;
+        OpenReq.u.In.cbImageWithTabs = cbImageWithTabs;
+#ifdef SUPDRV_USE_NATIVE_LOADER
+        OpenReq.u.In.cbImageBits = (uint32_t)CalcArgs.cbImage;
+#endif
         strcpy(OpenReq.u.In.szName, pszModule);
+#ifdef SUPDRV_USE_NATIVE_LOADER
+        strcpy(OpenReq.u.In.szFilename, pszFilename);
+#endif
         if (!g_u32FakeMode)
         {
@@ -1706 +1727 @@
              * Allocate memory for the image bits.
              */
-            PSUPLDRLOAD pLoadReq = (PSUPLDRLOAD)RTMemTmpAlloc(SUP_IOCTL_LDR_LOAD_SIZE(cbImage));
+            PSUPLDRLOAD pLoadReq = (PSUPLDRLOAD)RTMemTmpAlloc(SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithTabs));
             if (pLoadReq)
             {
@@ -1767 +1788 @@
                             pLoadReq->Hdr.u32Cookie = g_u32Cookie;
                             pLoadReq->Hdr.u32SessionCookie = g_u32SessionCookie;
-                            pLoadReq->Hdr.cbIn = SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImage);
+                            pLoadReq->Hdr.cbIn = SUP_IOCTL_LDR_LOAD_SIZE_IN(cbImageWithTabs);
                             pLoadReq->Hdr.cbOut = SUP_IOCTL_LDR_LOAD_SIZE_OUT;
                             pLoadReq->Hdr.fFlags = SUPREQHDR_FLAGS_MAGIC | SUPREQHDR_FLAGS_EXTRA_IN;
@@ -1795 +1816 @@
                             pLoadReq->u.In.cbStrTab                   = (uint32_t)CalcArgs.cbStrings;
                             AssertRelease(pLoadReq->u.In.cbStrTab == CalcArgs.cbStrings);
+#ifdef SUPDRV_USE_NATIVE_LOADER
+                            pLoadReq->u.In.cbImageBits                = (uint32_t)CalcArgs.cbImage;
+#endif
                             pLoadReq->u.In.offSymbols                 = offSymTab;
                             pLoadReq->u.In.cSymbols                   = CalcArgs.cSymbols;
-                            pLoadReq->u.In.cbImage                    = cbImage;
+                            pLoadReq->u.In.cbImageWithTabs            = cbImageWithTabs;
                             pLoadReq->u.In.pvImageBase                = OpenReq.u.Out.pvImageBase;
                             if (!g_u32FakeMode)
                             {
-                                rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_LDR_LOAD, pLoadReq, SUP_IOCTL_LDR_LOAD_SIZE(cbImage));
+                                rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_LDR_LOAD, pLoadReq, SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithTabs));
                                 if (RT_SUCCESS(rc))
                                     rc = pLoadReq->Hdr.rc;
@@ -1834 +1858 @@
             else
             {
-                AssertMsgFailed(("failed to allocated %d bytes for SUPLDRLOAD_IN structure!\n", SUP_IOCTL_LDR_LOAD_SIZE(cbImage)));
+                AssertMsgFailed(("failed to allocated %u bytes for SUPLDRLOAD_IN structure!\n", SUP_IOCTL_LDR_LOAD_SIZE(cbImageWithTabs)));
                 rc = VERR_NO_TMP_MEMORY;
             }