Changeset 917 in vbox

Timestamp:

Feb 15, 2007 1:55:55 AM (18 years ago)

Author:

vboxsync

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

18645

Message:

Allow mixing of platform code.

File:

• trunk/src/VBox/Runtime/testcase/tstLdr-4.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/testcase/tstLdr-4.cpp

@@ -49 +49 @@
 static DECLCALLBACK(int) testGetImport(RTLDRMOD hLdrMod, const char *pszModule, const char *pszSymbol, unsigned uSymbol, RTUINTPTR *pValue, void *pvUser)
 {
-    if (!strcmp(pszSymbol, "AssertMsg1"))
+    if (     !strcmp(pszSymbol, "AssertMsg1")           || !strcmp(pszSymbol, "_AssertMsg1"))
         *pValue = (uintptr_t)AssertMsg1;
-    else if (!strcmp(pszSymbol, "AssertMsg2"))
+    else if (!strcmp(pszSymbol, "AssertMsg2")           || !strcmp(pszSymbol, "_AssertMsg2"))
         *pValue = (uintptr_t)AssertMsg2;
-    else if (!strcmp(pszSymbol, "RTLogDefaultInstance"))
+    else if (!strcmp(pszSymbol, "RTLogDefaultInstance") || !strcmp(pszSymbol, "_RTLogDefaultInstance"))
         *pValue = (uintptr_t)RTLogDefaultInstance;
-    else if (!strcmp(pszSymbol, "MyPrintf"))
+    else if (!strcmp(pszSymbol, "MyPrintf")             || !strcmp(pszSymbol, "_MyPrintf"))
         *pValue = (uintptr_t)RTPrintf;
     else
@@ -154 +154 @@
             RTUINTPTR Value;
             rc = RTLdrGetSymbolEx(aLoads[i].hLdrMod, aLoads[i].pvBits, (uintptr_t)aLoads[i].pvBits, "DisasmTest1", &Value);
+            if (rc == VERR_SYMBOL_NOT_FOUND)
+                rc = RTLdrGetSymbolEx(aLoads[i].hLdrMod, aLoads[i].pvBits, (uintptr_t)aLoads[i].pvBits, "_DisasmTest1", &Value);
             if (RT_FAILURE(rc))
             {