Changeset 58987 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

Timestamp:

Dec 4, 2015 2:23:37 PM (9 years ago)

Author:

vboxsync

Message:

VBoxDTrace: Extpack conversion fix.

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_open.c (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/lib/libdtrace/common/dt_open.c

@@ -57 +57 @@
 # include <iprt/path.h>
 # include <iprt/stream.h>
+# include <iprt/buildconfig.h>
+# include "../../../../../Main/include/ExtPackUtil.h"
 #endif /* VBOX */
 
@@ -972 +974 @@
         }
 
-        /** @todo this needs to be changed if this becomes and extension pack. */
         rc = RTPathAppPrivateArch(szModPath, sizeof(szModPath));
+        if (RT_SUCCESS(rc))
+                rc = RTPathAppend(szModPath, sizeof(szModPath),
+                                  VBOX_EXTPACK_INSTALL_DIR RTPATH_SLASH_STR VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME);
+        if (RT_SUCCESS(rc))
+                rc = RTPathAppend(szModPath, sizeof(szModPath), RTBldCfgTargetDotArch());
+        if (RT_SUCCESS(rc))
+                rc = RTPathAppend(szModPath, sizeof(szModPath), "VBoxDTraceR0.r0");
         if (RT_SUCCESS(rc)) {
-                rc = RTPathAppend(szModPath, sizeof(szModPath), "VBoxDTraceR0.r0");
-                if (RT_SUCCESS(rc))
-                {
-                        PRTERRINFO pErrInfo = RTErrInfoAlloc(1024);
-                        rc = SUPR3LoadModule(szModPath, "VBoxDTraceR0.r0", &pvImageBase, pErrInfo);
-                        if (RT_FAILURE(rc)) {
-                                RTStrmPrintf(g_pStdErr, "SUPR3LoadModule: %s -> %Rrc; %s\n", szModPath, rc, pErrInfo->pszMsg);
-                                RTErrInfoFree(pErrInfo);
-                                return (set_open_errno(dtp, errp, EDT_NOTLOADED));
-                        }
+                PRTERRINFO pErrInfo = RTErrInfoAlloc(1024);
+                rc = SUPR3LoadModule(szModPath, "VBoxDTraceR0.r0", &pvImageBase, pErrInfo);
+                if (RT_FAILURE(rc)) {
+                        RTStrmPrintf(g_pStdErr, "SUPR3LoadModule: %s -> %Rrc; %s\n", szModPath, rc, pErrInfo->pszMsg);
                         RTErrInfoFree(pErrInfo);
+                        return (set_open_errno(dtp, errp, EDT_NOTLOADED));
                 }
+                RTErrInfoFree(pErrInfo);
         }
         if (RT_FAILURE(rc)) {