Changeset 7670 for trunk/src/kernel32/winimagepeldr.cpp

Timestamp:

Dec 22, 2001, 1:34:06 PM (24 years ago)

Author:

sandervl

Message:

More information about about missing api

File:

• trunk/src/kernel32/winimagepeldr.cpp (modified) (6 diffs)

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.93 2001-12-20 15:08:56 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.94 2001-12-22 12:34:06 sandervl Exp $ */
 
 /*
@@ -76 +76 @@
 #endif
 
-ULONG WIN32API MissingApiOrd(char *dllname, int ordinal);
-ULONG WIN32API MissingApiName(char *dllname, char *functionname);
+ULONG WIN32API MissingApiOrd(char *parentimage, char *dllname, int ordinal);
+ULONG WIN32API MissingApiName(char *parentimage, char *dllname, char *functionname);
 ULONG WIN32API MissingApi(char *message);
 
@@ -1278 +1278 @@
 }
 //******************************************************************************
-#define MISSINGOFFSET_PUSHORDINAL    1
-#define MISSINGOFFSET_PUSHNAME       1
-#define MISSINGOFFSET_PUSHDLLNAME    6
-#define MISSINGOFFSET_FUNCTION       11
-
-char missingapicode[18] = {
+#define MISSINGOFFSET_PUSHNAME        1
+#define MISSINGOFFSET_PUSHORDINAL     1
+#define MISSINGOFFSET_PUSHDLLNAME     6
+#define MISSINGOFFSET_PUSHIMPORTIMAGE 11
+#define MISSINGOFFSET_FUNCTION        16
+
+char missingapicode[23] = {
+//push  ordinal/name
+        0x68, 0x00, 0x00, 0x00, 0x00,
 //push  dllname
         0x68, 0x00, 0x00, 0x00, 0x00,
-//push  ordinal/name
+//push  image loading api
         0x68, 0x00, 0x00, 0x00, 0x00,
 //mov   ecx, MissingApiOrd/Name
@@ -1313 +1316 @@
 
         memcpy(code, missingapicode, sizeof(missingapicode));
+        *(DWORD *)&code[MISSINGOFFSET_PUSHIMPORTIMAGE] = (DWORD)getModuleName();
         *(DWORD *)&code[MISSINGOFFSET_PUSHDLLNAME] = (DWORD)WinImage->getModuleName();
         *(DWORD *)&code[MISSINGOFFSET_PUSHORDINAL] = ordinal;
@@ -1340 +1344 @@
 
         memcpy(code, missingapicode, sizeof(missingapicode));
+        *(DWORD *)&code[MISSINGOFFSET_PUSHIMPORTIMAGE] = (DWORD)getModuleName();
         *(DWORD *)&code[MISSINGOFFSET_PUSHDLLNAME] = (DWORD)WinImage->getModuleName();
         *(DWORD *)&code[MISSINGOFFSET_PUSHNAME]    = (DWORD)impname;
@@ -2027 +2032 @@
 //******************************************************************************
 //******************************************************************************
-ULONG WIN32API MissingApiOrd(char *dllname, int ordinal)
-{
-   char message[128];
-
-   sprintf(message, "The application has called the non-existing api %s->%d", dllname, ordinal);
+ULONG WIN32API MissingApiOrd(char *parentimage, char *dllname, int ordinal)
+{
+   char message[256];
+
+   sprintf(message, "The application has called the non-existing api %s->%d (loaded by %s)", dllname, ordinal, parentimage);
    return MissingApi(message);
 }
 //******************************************************************************
 //******************************************************************************
-ULONG WIN32API MissingApiName(char *dllname, char *functionname)
-{
-   char message[128];
-
-   sprintf(message, "The application has called the non-existing api %s->%s", dllname, functionname);
+ULONG WIN32API MissingApiName(char *parentimage, char *dllname, char *functionname)
+{
+   char message[256];
+
+   sprintf(message, "The application has called the non-existing api %s->%s (loaded by %s)", dllname, functionname, parentimage);
    return MissingApi(message);
 }