Changeset 1872 for trunk/src/kernel32/winimagebase.cpp

Timestamp:

Nov 29, 1999, 1:05:03 AM (26 years ago)

Author:

bird

Message:

Implemented EnumResourceNamesA/W.

File:

• trunk/src/kernel32/winimagebase.cpp (modified) (9 diffs)

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.4 1999-11-09 14:19:47 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.5 1999-11-29 00:04:06 bird Exp $ */
 
 /*
@@ -42 +42 @@
 Win32ImageBase::Win32ImageBase(HINSTANCE hInstance) :
     errorState(NO_ERROR), entryPoint(0), fullpath(NULL),
-    tlsAddress(0), tlsIndexAddr(0), tlsInitSize(0), tlsTotalSize(0), 
+    tlsAddress(0), tlsIndexAddr(0), tlsInitSize(0), tlsTotalSize(0),
     tlsCallBackAddr(0), tlsIndex(-1), winres(NULL), pResDir(NULL),
-    pResourceSectionStart(0)
+    ulRVAResourceSection(0)
 {
 #ifdef DEBUG
@@ -51 +51 @@
 
   if(hInstance != -1) {
-        this->hinstance = hInstance;
-
-        char *name = OSLibGetDllName(hinstance);
-        strcpy(szFileName, name);
-        strupr(szFileName);
-
-        //rename dll (os/2 -> win32) if necessary (i.e. OLE32OS2 -> OLE32)
-        Win32DllBase::renameDll(szFileName, FALSE);
-
-        name = strrchr(szFileName, '\\')+1;
-        strcpy(szModule, name);
-
-        char *dot = strrchr(szModule, '.');
-        if(dot)
-                *dot = 0;
+    this->hinstance = hInstance;
+
+    char *name = OSLibGetDllName(hinstance);
+    strcpy(szFileName, name);
+    strupr(szFileName);
+
+    //rename dll (os/2 -> win32) if necessary (i.e. OLE32OS2 -> OLE32)
+    Win32DllBase::renameDll(szFileName, FALSE);
+
+    name = strrchr(szFileName, '\\')+1;
+    strcpy(szModule, name);
+
+    char *dot = strrchr(szModule, '.');
+    if(dot)
+        *dot = 0;
   }
   else {
-        szModule[0] = 0;
-        this->hinstance = -1;
+    szModule[0] = 0;
+    this->hinstance = -1;
   }
 }
@@ -80 +80 @@
   while(winres)
   {
-        res    = winres->next;
-        delete(winres);
-        winres = res;
+        res    = winres->next;
+        delete(winres);
+        winres = res;
   }
   if(fullpath)
-        free(fullpath);
+        free(fullpath);
 }
 //******************************************************************************
@@ -116 +116 @@
   strupr(filename);
   if(!strchr(filename, (int)'.')) {
-        strcat(filename,".DLL");
+    strcat(filename,".DLL");
   }
   dllfile = OSLibDosOpen(filename, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
   if(dllfile == NULL) {//search in libpath for dll
-        strcpy(modname, kernel32Path);
-        strcat(modname, filename);
-        strcpy(filename, modname);
-  }
-  else  OSLibDosClose(dllfile);
+    strcpy(modname, kernel32Path);
+    strcat(modname, filename);
+    strcpy(filename, modname);
+  }
+  else  OSLibDosClose(dllfile);
 
   rc = DosOpen(filename,                       /* File path name */
@@ -140 +140 @@
   if (rc != NO_ERROR)
   {
-        dprintf(("KERNEL32:Win32ImageBase::isPEImage(%s) failed with %u\n",
-                  szFileName, rc));
-        return(FALSE);
+        dprintf(("KERNEL32:Win32ImageBase::isPEImage(%s) failed with %u\n",
+                  szFileName, rc));
+        return(FALSE);
   }
 
@@ -150 +150 @@
   IMAGE_DOS_HEADER *pdoshdr = (IMAGE_DOS_HEADER *)malloc(sizeof(IMAGE_DOS_HEADER));
   if(pdoshdr == NULL)   {
-        DosClose(win32handle);                /* Close the file */
-        return(FALSE);
+        DosClose(win32handle);                /* Close the file */
+        return(FALSE);
   }
   rc = DosRead(win32handle, pdoshdr, sizeof(IMAGE_DOS_HEADER), &ulRead);
   if(rc != NO_ERROR) {
-        DosClose(win32handle);                /* Close the file */
-        return(FALSE);
+        DosClose(win32handle);                /* Close the file */
+        return(FALSE);
   }
   ULONG hdrsize = pdoshdr->e_lfanew + SIZE_OF_NT_SIGNATURE + sizeof(IMAGE_FILE_HEADER);
@@ -166 +166 @@
   win32file = malloc(hdrsize);
   if(win32file == NULL) {
-        DosClose(win32handle);                /* Close the file */
-        return(FALSE);
+        DosClose(win32handle);                /* Close the file */
+        return(FALSE);
   }
   rc = DosRead(win32handle, win32file, hdrsize, &ulRead);
   if(rc != NO_ERROR) {
-        goto failure;
+        goto failure;
   }
 
   if(GetPEFileHeader (win32file, &fh) == FALSE) {
-        goto failure;
+        goto failure;
   }
 
   if(!(fh.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) {//not valid
-        goto failure;
+        goto failure;
   }
   if(fh.Machine != IMAGE_FILE_MACHINE_I386) {
-        goto failure;
+        goto failure;
   }
   //IMAGE_FILE_SYSTEM == only drivers (device/file system/video etc)?
   if(fh.Characteristics & IMAGE_FILE_SYSTEM) {
-        goto failure;
+        goto failure;
   }
   DosClose(win32handle);
@@ -198 +198 @@
 //******************************************************************************
 //******************************************************************************
+/**
+ * Static helper which finds the Win32ImageBase object corresponding to hModule.
+ * @returns   Pointer to Win32ImageBase object corresponding to hModule.
+ * @param     hModule  Odin32 modulehandler. 0 and -1 is aliases for the executable module
+ * @status    completely implemented and tested.
+ * @author    knut st. osmundsen
+ */
+Win32ImageBase * Win32ImageBase::findModule(HMODULE hModule)
+{
+    Win32ImageBase *pRet;
+
+    if (hModule == -1 || hModule == 0 ||       /* note: WinNt 4, SP4 don't accept -1 as the EXE handle.*/
+        (WinExe != NULL && hModule == WinExe->getInstanceHandle())
+        )
+        pRet = WinExe;
+    else
+        pRet = Win32DllBase::findModule(hModule);
+
+    if (pRet == NULL)
+    {
+        if (WinExe == NULL)
+            dprintf(("Win32ImageBase::findModule: Module not found. WinExe is NULL, hModule=%#x\n", hModule));
+        else
+            dprintf(("Win32ImageBase::findModule: Module not found, hModule=%#x\n", hModule));
+    }
+
+    return pRet;
+}
+
+