Changeset 2893 for trunk/kLdr/kLdrModNative.c

Timestamp:

Dec 22, 2006, 7:01:38 PM (19 years ago)

Author:

bird

Message:

made it compile again.

File:

• trunk/kLdr/kLdrModNative.c (modified) (4 diffs)

trunk/kLdr/kLdrModNative.c

@@ -511 +511 @@
 /** @copydoc kLdrModQuerySymbol */
 static int kldrModNativeQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
-                                    const char *pszSymbol, PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser,
-                                    PKLDRADDR puValue, uint32_t *pfKind)
+                                    const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
+                                    PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind)
 {
     PKLDRMODNATIVE pModNative = (PKLDRMODNATIVE)pMod->pvData;
+    const char *pszSymbol = pchSymbol;
 #ifdef __OS2__
     APIRET rc;
     PFN pfn;
-
-    if (!pszSymbol && iSymbol >= 0x10000)
+#elif defined(__WIN__)
+    FARPROC pfn;
+#else
+# error "Port me"
+#endif
+
+    /* make stack copy of the symbol if it isn't zero terminated. */
+    if (pszSymbol && pszSymbol[cchSymbol])
+    {
+        char *pszCopy = kLdrHlpAllocA(cchSymbol + 1);
+        kLdrHlpMemCopy(pszCopy, pchSymbol, cchSymbol);
+        pszCopy[cchSymbol] = '\0';
+        pszSymbol = pszCopy;
+    }
+
+#ifdef __OS2__
+    if (!pchSymbol && iSymbol >= 0x10000)
         return KLDR_ERR_SYMBOL_NOT_FOUND;
 
@@ -550 +566 @@
 
 #elif defined(__WIN__)
-    FARPROC pfn;
-
     if (!pszSymbol && iSymbol >= 0x10000)
         return KLDR_ERR_SYMBOL_NOT_FOUND;
@@ -1023 +1037 @@
     kldrModNativeGetStackInfo,
     kldrModNativeQueryMainEntrypoint,
+    NULL /* fixme */,
+    NULL /* fixme */,
     kldrModNativeEnumDbgInfo,
     kldrModNativeHasDbgInfo,
@@ -1037 +1053 @@
     kldrModNativeGetBits,
     kldrModNativeRelocateBits,
+    NULL /* fixme */,
     42 /* the end */
 };