Changeset 12458

Timestamp:

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

Author:

bird

Message:

Implemented EnumResourceNamesA/W.

Location:

tags/trunk

Files:

• include/winimagebase.h (modified) (7 diffs)
• src/kernel32/makefile (modified) (2 diffs)
• src/kernel32/resource.cpp (modified) (5 diffs)
• src/kernel32/stubs.cpp (modified) (2 diffs)
• src/kernel32/winimagebase.cpp (modified) (9 diffs)
• src/kernel32/winimagelx.cpp (modified) (5 diffs)
• src/kernel32/winimagepe2lx.cpp (modified) (4 diffs)
• src/kernel32/winimagepeldr.cpp (modified) (21 diffs)
• src/kernel32/winimgres.cpp (modified) (4 diffs)

tags/trunk/include/winimagebase.h ¶

@@ -1 @@
-/* $Id: winimagebase.h,v 1.5 1999-11-26 00:04:33 sandervl Exp $ */
+/* $Id: winimagebase.h,v 1.6 1999-11-29 00:05:03 bird Exp $ */
 
 /*
@@ -24 +24 @@
 #define ID_GETFIRST             LANG_GETFIRST
 #define IDLANG_GETFIRST         LANG_GETFIRST
+
+#ifndef ENUMRESNAMEPROC
+    typedef BOOL (* CALLBACK ENUMRESTYPEPROCA)(HMODULE,LPSTR,LONG);
+    typedef BOOL (* CALLBACK ENUMRESTYPEPROCW)(HMODULE,LPWSTR,LONG);
+    typedef BOOL (* CALLBACK ENUMRESNAMEPROCA)(HMODULE,LPCSTR,LPSTR,LONG);
+    typedef BOOL (* CALLBACK ENUMRESNAMEPROCW)(HMODULE,LPCWSTR,LPWSTR,LONG);
+    typedef BOOL (* CALLBACK ENUMRESLANGPROCA)(HMODULE,LPCSTR,LPCSTR,WORD,LONG);
+    typedef BOOL (* CALLBACK ENUMRESLANGPROCW)(HMODULE,LPCWSTR,LPCWSTR,WORD,LONG);
+#endif
 
 class Win32Resource;
@@ -59 +68 @@
 virtual ULONG getResourceSizeA(LPCSTR lpszName, LPSTR lpszType, ULONG lang = LANG_GETFIRST);
         ULONG getResourceSizeW(LPCWSTR lpszName, LPWSTR lpszType, ULONG lang = LANG_GETFIRST);
+virtual BOOL  enumResourceNamesA(HMODULE hmod, LPCTSTR  lpszType, ENUMRESNAMEPROCA lpEnumFunc, LONG lParam);
+virtual BOOL  enumResourceNamesW(HMODULE hmod, LPCWSTR  lpszType, ENUMRESNAMEPROCW lpEnumFunc, LONG lParam);
 
 virtual ULONG getVersionSize();
@@ -71 +82 @@
         void  setTLSInitSize(ULONG dwTlsSize)           { tlsInitSize = dwTlsSize; };
         void  setTLSTotalSize(ULONG dwTlsSize)          { tlsTotalSize = dwTlsSize; };
-        void  setTLSCallBackAddr(PIMAGE_TLS_CALLBACK *dwTlsCallBackAddr)        
+        void  setTLSCallBackAddr(PIMAGE_TLS_CALLBACK *dwTlsCallBackAddr)
         {
            tlsCallBackAddr = dwTlsCallBackAddr;
@@ -83 +94 @@
 
 virtual BOOL  isDll() = 0;
+
+static Win32ImageBase * findModule(HMODULE hModule);
 
 protected:
@@ -110 +123 @@
         PIMAGE_RESOURCE_DATA_ENTRY ProcessResSubDir(PIMAGE_RESOURCE_DIRECTORY prdType,
                                                     ULONG *nodeData, int level);
+        PIMAGE_RESOURCE_DIRECTORY  getResSubDirW(PIMAGE_RESOURCE_DIRECTORY pResDir, LPCWSTR lpszName);
+        PIMAGE_RESOURCE_DIRECTORY  getResSubDirA(PIMAGE_RESOURCE_DIRECTORY pResDir, LPCTSTR lpszName);
+
         PIMAGE_RESOURCE_DIRECTORY pResDir;
 
         //substracted from RVA data offsets
-        ULONG                     pResourceSectionStart;
+        ULONG                     ulRVAResourceSection;
 
 private:
@@ -121 +137 @@
 };
 
-//SvL: This structure is placed at the end of the first page of the image (header 
+//SvL: This structure is placed at the end of the first page of the image (header
 //     page), so we can determine the Win32Image pointer from a HINSTANCE variable
 //     (which is actually the address of the win32 module)
-typedef struct 
+typedef struct
 {
-  ULONG           magic1; 
+  ULONG           magic1;
   Win32ImageBase *image;
-  ULONG           magic2; 
+  ULONG           magic2;
 } WINIMAGE_LOOKUP;
 

tags/trunk/src/kernel32/makefile ¶

@@ -1 @@
-# $Id: makefile,v 1.63 1999-11-26 08:17:40 achimha Exp $
+# $Id: makefile,v 1.64 1999-11-29 00:04:05 bird Exp $
 
 #
@@ -70 +70 @@
         @echo Creating file <<$(@B).lrf
 $(OBJS)
+$(PDWIN32_LIB)\odincrt.lib
 $(PDWIN32_LIB)\PMWINX.LIB
 $(PDWIN32_LIB)\LIBULS.LIB
 $(PDWIN32_LIB)\LIBCONV.LIB
-$(PDWIN32_LIB)\odincrt.lib
 OS2386.LIB
 $(RTLLIB_O)

tags/trunk/src/kernel32/resource.cpp ¶

@@ -1 @@
-/* $Id: resource.cpp,v 1.9 1999-09-15 23:38:01 sandervl Exp $ */
+/* $Id: resource.cpp,v 1.10 1999-11-29 00:04:05 bird Exp $ */
 
 /*
@@ -27 +27 @@
 
     dprintf(("FindResourceA %X", hModule));
-    if(hModule == 0 || hModule == -1 || (WinExe != NULL && hModule ==
-       WinExe->getInstanceHandle()))
-    {
-         module = (Win32ImageBase *)WinExe;
-    }
-    else module = (Win32ImageBase *)Win32DllBase::findModule(hModule);
-
+    module = Win32ImageBase::findModule(hModule);
     if(module == NULL)
-        return(NULL);
+      return(NULL);
 
     return module->findResourceA(lpszName, (LPSTR)lpszType);
@@ -42 +36 @@
 //******************************************************************************
 HRSRC WIN32API FindResourceW(HINSTANCE hModule, LPCWSTR lpszName,
-                             LPCWSTR lpszType)
+                          LPCWSTR lpszType)
 {
  Win32ImageBase *module;
 
     dprintf(("FindResourceW %X", hModule));
-    if(hModule == 0 || hModule == -1 || (WinExe != NULL && hModule ==
-       WinExe->getInstanceHandle()))
-    {
-         module = (Win32ImageBase *)WinExe;
-    }
-    else module = (Win32ImageBase *)Win32DllBase::findModule(hModule);
-
+    module = Win32ImageBase::findModule(hModule);
     if(module == NULL)
-        return(NULL);
+        return(NULL);
 
     return module->findResourceW((LPWSTR)lpszName, (LPWSTR)lpszType);
@@ -77 +65 @@
   /* @@@PH */
   if (HIWORD(res) == NULL) {
-        dprintf(("LoadResource %x: invalid hRes %x", hModule, hRes));
-        return 0;
+   dprintf(("LoadResource %x: invalid hRes %x", hModule, hRes));
+   return 0;
   }
   else  return (HGLOBAL)res->lockResource();
@@ -96 +84 @@
 }
 //******************************************************************************
-//******************************************************************************
-BOOL WIN32API EnumResourceNamesA(HINSTANCE hModule, LPCTSTR lpszType,
-                    ENUMRESNAMEPROCA lpEnumFunc, LONG lParam)
+
+
+
+/**
+ * The EnumResourceNames function searches a module for each
+ * resource of the specified type and passes the name of each
+ * resource it locates to an application-defined callback function
+ *
+ * @returns  If the function succeeds, the return value is nonzero.
+ *           If the function fails, the return value is zero
+ * @param    hModule       resource-module handling
+ * @param    lpszType      pointer to resource type
+ * @param    lpEnumFunc    pointer to callback function
+ * @param    lParam        application-defined parameter
+ * @status   stub
+ * @author   knut st. osmundsen
+ * @remark   The EnumResourceNames function continues to enumerate resource
+ *           names until the callback function returns FALSE or all resource
+ *           names have been enumerated
+ */
+BOOL WIN32API EnumResourceNamesA(HINSTANCE        hModule,
+                                 LPCTSTR          lpszType,
+                                 ENUMRESNAMEPROCA lpEnumFunc,
+                                 LONG             lParam)
 {
-    dprintf(("OS2EnumResourceNamesA - stub\n"));
-    return(FALSE);
+    Win32ImageBase *pModule;
+
+    dprintf(("KERNEL32:EnumResourceNamesA(%08x,%08x,%08x,%08x) not implemented\n",
+              hModule, lpszType, lpEnumFunc, lParam
+             ));
+
+    pModule = Win32ImageBase::findModule(hModule);
+    if (pModule == NULL)
+    {
+        SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
+        return FALSE;
+    }
+
+    return pModule->enumResourceNamesA(hModule, lpszType, lpEnumFunc, lParam);
 }
-//******************************************************************************
-//******************************************************************************
+
+
+/**
+ * The EnumResourceNames function searches a module for each
+ * resource of the specified type and passes the name of each
+ * resource it locates to an application-defined callback function
+ *
+ * @returns  If the function succeeds, the return value is nonzero.
+ *           If the function fails, the return value is zero
+ * @param    hModule       resource-module handling
+ * @param    lpszType      pointer to resource type
+ * @param    lpEnumFunc    pointer to callback function
+ * @param    lParam        application-defined parameter
+ * @status   stub
+ * @author   knut st. osmundsen
+ * @remark   The EnumResourceNames function continues to enumerate resource
+ *           names until the callback function returns FALSE or all resource
+ *           names have been enumerated
+ */
+BOOL WIN32API EnumResourceNamesW(HMODULE          hModule,
+                                 LPCWSTR          lpszType,
+                                 ENUMRESNAMEPROCW lpEnumFunc,
+                                 LONG             lParam)
+{
+    Win32ImageBase *pModule;
+
+    dprintf(("KERNEL32:EnumResourceNamesW(%08x,%08x,%08x,%08x)\n",
+              hModule, lpszType, lpEnumFunc, lParam));
+
+    pModule = Win32ImageBase::findModule(hModule);
+    if (pModule == NULL)
+    {
+        SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
+        return FALSE;
+    }
+
+    return pModule->enumResourceNamesW(hModule, lpszType, lpEnumFunc, lParam);
+}
+

tags/trunk/src/kernel32/stubs.cpp ¶

@@ -1 @@
-/* $Id: stubs.cpp,v 1.7 1999-08-21 16:29:28 sandervl Exp $ */
+/* $Id: stubs.cpp,v 1.8 1999-11-29 00:04:05 bird Exp $ */
 
 /*
@@ -1518 +1518 @@
 
 
-/*****************************************************************************
- * Name      : BOOL WIN32API EnumResourceNamesW
- * Purpose   : The EnumResourceNames function searches a module for each
- *             resource of the specified type and passes the name of each
- *             resource it locates to an application-defined callback function
- * Parameters: HINSTANCE hModule             resource-module handling
- *             LPCTSTR lpszType              pointer to resource type
- *             ENUMRESNAMEPROC lpEnumFunc    pointer to callback function
- *             LONG lParam                   application-defined parameter
- * Variables :
- * Result    : If the function succeeds, the return value is nonzero.
- *             If the function fails, the return value is zero
- * Remark    : The EnumResourceNames function continues to enumerate resource
- *             names until the callback function returns FALSE or all resource
- *             names have been enumerated
- * Status    : UNTESTED STUB
- *
- * Author    : Markus Montkowski [Tha, 1998/05/21 17:46]
- *****************************************************************************/
-
-BOOL WIN32API EnumResourceNamesW(HMODULE          hModule,
-                                 LPCWSTR          lpszType,
-                                 ENUMRESNAMEPROCW lpEnumFunc,
-                                 LONG             lParam)
-{
-
-  dprintf(("KERNEL32:EnumResourceNamesW(%08x,%08x,%08x,%08x) not implemented\n",
-           hModule,
-           lpszType,
-           lpEnumFunc,
-           lParam
-          ));
-
-  return (FALSE);
-}
 
 /*****************************************************************************

tags/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;
+}
+
+

tags/trunk/src/kernel32/winimagelx.cpp ¶

@@ -1 @@
-/* $Id: winimagelx.cpp,v 1.4 1999-11-26 00:05:19 sandervl Exp $ */
+/* $Id: winimagelx.cpp,v 1.5 1999-11-29 00:04:06 bird Exp $ */
 
 /*
@@ -40 +40 @@
 //******************************************************************************
 //******************************************************************************
-Win32LxImage::Win32LxImage(HINSTANCE hInstance, PVOID pResData) 
+Win32LxImage::Win32LxImage(HINSTANCE hInstance, PVOID pResData)
                : Win32ImageBase(hInstance)
 {
@@ -56 +56 @@
   pResDir = (PIMAGE_RESOURCE_DIRECTORY)pResData;
 
-  //pResourceSectionStart contains the virtual address of the imagebase in the PE header
+  //ulRVAResourceSection contains the virtual address of the imagebase in the PE header
   //for the resource section (images loaded by the pe.exe)
   //For LX images, this is 0 as OffsetToData contains a relative offset
-  pResourceSectionStart = 0;
+  ulRVAResourceSection = 0;
 }
 //******************************************************************************
@@ -74 +74 @@
 
   rc = DosQueryProcAddr(hinstance, 0, name, (PFN *)&apiaddr);
-  if(rc)  
+  if(rc)
   {
-        if(rc == ERROR_INVALID_HANDLE) 
+        if(rc == ERROR_INVALID_HANDLE)
         {//handle invalid for some silly reason, so load module again (initterm entrypoint not called twice)
                 char szErrName[CCHMAXPATH];
@@ -97 +97 @@
   rc = DosQueryProcAddr(hinstance, ordinal, NULL, (PFN *)&apiaddr);
   if(rc) {
-        if(rc == ERROR_INVALID_HANDLE) 
-        {//handle invalid for some silly reason, so load module again (initterm entrypoint not called twice)
+        if(rc == ERROR_INVALID_HANDLE)
+        {//SvL(?): handle invalid for some silly reason, so load module again (initterm entrypoint not called twice)
+         //KSO: AFAIK you'll have to load the module calling DosLoadModule to use it's handle in API calls.
+         //     CPREF->DosGetResource->hmod: ... A value other than zero is a module handle that was returned by DosLoadModule.
+         //     You may consider adding a DosLoadModule call during RegisterLxDll or somewhere.
                 char szErrName[CCHMAXPATH];
 

tags/trunk/src/kernel32/winimagepe2lx.cpp ¶

@@ -1 @@
-/* $Id: winimagepe2lx.cpp,v 1.6 1999-11-26 00:05:19 sandervl Exp $ */
+/* $Id: winimagepe2lx.cpp,v 1.7 1999-11-29 00:04:06 bird Exp $ */
 
 /*
@@ -16 +16 @@
 #define INCL_DOSERRORS          /* DOS Error values */
 #define INCL_DOSPROFILE         /* DosQuerySysState (Toolkit 4.5) */
-#define INCL_DOSMODULEMGR   /* DOS Module management */
+#define INCL_DOSMODULEMGR       /* DOS Module management */
 
 #define ALIGN(a, alignment) (((a) + (alignment - 1UL)) & ~(alignment - 1UL))
@@ -152 +152 @@
  *            Read the PE section table the set the RVAs in paSections.
  *            Locate and set the entrypoint.
- *            Locate the resource directory (if any). (pResDir, pResourceSectionStart)
+ *            Locate the resource directory (if any). (pResDir, ulRVAResourceSection)
  *            TLS - FIXME!
  * @status    completely implemented.
@@ -236 +236 @@
         && pNtHdrs->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress > 0UL)
     {
-        pResourceSectionStart = pNtHdrs->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;
-        pResDir = (PIMAGE_RESOURCE_DIRECTORY)getPointerFromRVA(pResourceSectionStart);
+        ulRVAResourceSection = pNtHdrs->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress;
+        pResDir = (PIMAGE_RESOURCE_DIRECTORY)getPointerFromRVA(ulRVAResourceSection);
     }
 

tags/trunk/src/kernel32/winimagepeldr.cpp ¶

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.18 1999-11-27 00:05:39 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.19 1999-11-29 00:04:06 bird Exp $ */
 
 /*
@@ -279 +279 @@
   nSections = NR_SECTIONS(win32file);
 
-  if(loadType == REAL_LOAD) 
+  if(loadType == REAL_LOAD)
   {
    imageSize = 0;
@@ -389 +389 @@
   }
   else {
-        if(GetSectionHdrByName (win32file, &sh, ".rsrc")) 
+        if(GetSectionHdrByName (win32file, &sh, ".rsrc"))
         {
             addSection(SECTION_RESOURCE, sh.PointerToRawData,
@@ -407 +407 @@
         imageSize = imageVirtEnd - oh.ImageBase;
   }
-  if(imageSize < oh.SizeOfImage) { 
+  if(imageSize < oh.SizeOfImage) {
         imageSize = oh.SizeOfImage;
   }
@@ -416 +416 @@
   }
   else {
-        fout << "EntryPoint == NULL" << endl; 
+        fout << "EntryPoint == NULL" << endl;
         entryPoint = NULL;
   }
@@ -426 +426 @@
   }
 
-  if(loadType == REAL_LOAD) 
+  if(loadType == REAL_LOAD)
   {
    if(tlsDir != NULL) {
@@ -485 +485 @@
         //get offset in resource object of directory entry
         pResDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);
-        pResourceSectionStart = sh.VirtualAddress;
-  }
-
-  if (loadType == REAL_LOAD) 
+        ulRVAResourceSection = sh.VirtualAddress;
+  }
+
+  if (loadType == REAL_LOAD)
   {
    if(processImports((char *)win32file) == FALSE) {
@@ -495 +495 @@
    }
   }
- 
+
   return(TRUE);
 failure:
@@ -543 +543 @@
                 fileoffset = section->rawoffset + section->rawsize + offset;
         }
-  }  
+  }
   else {
         protflags   = section->pageflags;
@@ -552 +552 @@
                 size = 0;
                 fileoffset = -1;
-        }  
+        }
         else {
                 size = section->rawsize-offset;
@@ -709 +709 @@
         }
   }
-  if(index == -1) 
+  if(index == -1)
         return NULL;
 
@@ -804 +804 @@
 
   for(i=0;i<nrsections;i++) {
-        switch(section[i].type) 
+        switch(section[i].type)
         {
         case SECTION_CODE:
@@ -855 +855 @@
                         int fixupsize = 0;
 
-                        switch(type) 
+                        switch(type)
                         {
                         case IMAGE_REL_BASED_HIGHLOW:
@@ -864 +864 @@
                                 fixupsize = 2;
                                 break;
-                        }                       
-                        //If the fixup crosses the final page boundary, 
-                        //then we have to load another page 
-                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size) 
+                        }
+                        //If the fixup crosses the final page boundary,
+                        //then we have to load another page
+                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size)
                         {
                                 newpage  = realBaseAddress + prel->VirtualAddress + offset + fixupsize;
@@ -877 +877 @@
                                         dprintf(("::setFixups -> section == NULL!!"));
                                         return FALSE;
-                                }               
+                                }
                                 //SvL: Read page from disk
                                 commitPage(newpage, TRUE, SINGLE_PAGE);
@@ -885 +885 @@
                         }
 
-                        switch(type) 
+                        switch(type)
                         {
                         case IMAGE_REL_BASED_ABSOLUTE:
@@ -903 +903 @@
                                 break;
                         }
-                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size) 
+                        if(prel->VirtualAddress + offset + fixupsize > virtAddress + size)
                         {
                                 //SvL: Restore original page protection flags
@@ -1308 +1308 @@
     {  //not found, so load it
         char modname[CCHMAXPATH];
-        
+
         strcpy(modname, pszCurModule);
         //rename dll if necessary (i.e. OLE32 -> OLE32OS2)
@@ -1441 +1441 @@
   NameExport *curexport;
   ULONG       ulAPIOrdinal;                      /* api requested by ordinal */
-  
+
   apilen = strlen(name) + 1;
-  if(apilen < 4) 
+  if(apilen < 4)
   {
         *(ULONG *)tmp = 0;
@@ -1452 +1452 @@
 
   curexport = nameexports;
-  for(i=0; i<nrNameExports; i++) 
+  for(i=0; i<nrNameExports; i++)
   {
-    if(apilen == curexport->nlength && 
-       *(ULONG *)curexport->name == *(ULONG *)name) 
+    if(apilen == curexport->nlength &&
+       *(ULONG *)curexport->name == *(ULONG *)name)
     {
-        if(strcmp(curexport->name, name) == 0) 
+        if(strcmp(curexport->name, name) == 0)
                 return(curexport->virtaddr);
     }
@@ -1478 +1478 @@
         curexport++;
   }
-  //Name exports also contain an ordinal, so check this 
+  //Name exports also contain an ordinal, so check this
   nexport = nameexports;
   for(i=0;i<nrNameExports;i++) {

tags/trunk/src/kernel32/winimgres.cpp ¶

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.26 1999-11-05 12:54:50 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.27 1999-11-29 00:04:07 bird Exp $ */
 
 /*
@@ -22 +22 @@
 #include <misc.h>
 #include <winimagebase.h>
-#include <winimagepe2lx.h>
-#include <winimagepeldr.h>
-#include <winimagelx.h>
 #include <winres.h>
 #include <unicode.h>
@@ -270 +267 @@
         return 0;
     }
-    //pResourceSectionStart contains the virtual address of the imagebase in the PE header
-    //for the resource section (images loaded by the pe.exe)
+    //ulRVAResourceSection contains the relative virtual address (relative to the start of the image)
+    //for the resource section (images loaded by the pe.exe and pe2lx/win32k)
     //For LX images, this is 0 as OffsetToData contains a relative offset
-    char *resdata = (char *)((char *)pResDir + pData->OffsetToData - pResourceSectionStart);
+    char *resdata = (char *)((char *)pResDir + pData->OffsetToData - ulRVAResourceSection);
     res = new Win32Resource(this, id, type, pData->Size, resdata);
 
@@ -385 +382 @@
         return 0;
     }
-    char *resdata = (char *)((char *)pResDir + pData->OffsetToData - pResourceSectionStart);
+    char *resdata = (char *)((char *)pResDir + pData->OffsetToData - ulRVAResourceSection);
     memcpy(verstruct, resdata, min(bufLength, pData->Size));
     return TRUE;
 }
-//******************************************************************************
-//******************************************************************************
+
+
+/**
+ * The EnumResourceNames function searches a module for each
+ * resource of the specified type and passes the name of each
+ * resource it locates to an application-defined callback function
+ *
+ * @returns   If the function succeeds, the return value is nonzero.
+ *            If the function fails, the return value is zero
+ * @param     hmod          The specified module handle.
+ * @param     lpszType      pointer to resource type
+ * @param     lpEnumFunc    pointer to callback function
+ * @param     lParam        application-defined parameter
+ * @sketch    IF not resources in module THEN return fail.
+ *            Validate parameters.
+ *            Get the subdirectory for the specified type.
+ *            IF found THEN
+ *            BEGIN
+ *                Find the number of directory entries.
+ *                Find directory entries.
+ *                LOOP thru all entries while the callback function returns true
+ *                BEGIN
+ *                    Name = pointer to ASCII name string or Id.
+ *                    call callback function.
+ *                END
+ *            END
+ *            ELSE
+ *                fail.
+ *            return
+ * @status    completely implemented and tested.
+ * @author    knut st. osmundsen
+ * @remark    The EnumResourceNames function continues to enumerate resource
+ *            names until the callback function returns FALSE or all resource
+ *            names have been enumerated
+ */
+BOOL Win32ImageBase::enumResourceNamesA(HMODULE hmod,
+                                        LPCTSTR  lpszType,
+                                        ENUMRESNAMEPROCA lpEnumFunc,
+                                        LONG lParam)
+{
+    BOOL                            fRet;
+    PIMAGE_RESOURCE_DIRECTORY       pResDirOurType;
+    PIMAGE_RESOURCE_DIRECTORY_ENTRY paResDirEntries;
+
+    if (pResDir == NULL)
+    {
+        /* SetLastError(?);? */
+        return FALSE;
+    }
+
+    /* validate parameters - FIXME... Exception handler??? */
+    if ((unsigned)lpszType >= 0xc0000000) //....
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    if ((unsigned)lpEnumFunc < 0x10000 || (unsigned)lpEnumFunc >= 0xc0000000)
+    {
+        SetLastError(ERROR_NOACCESS);
+        return FALSE;
+    }
+
+    //reminder:
+    //1st level -> types
+    //2nd level -> names
+    //3rd level -> language
+
+    pResDirOurType = getResSubDirA(pResDir, lpszType);
+    if (pResDirOurType != NULL)
+    {
+        char     *pszASCII = NULL;
+        unsigned  cch = 0;
+        unsigned  cResEntries;
+        unsigned  i;
+
+        fRet = TRUE;
+        cResEntries = pResDirOurType->NumberOfNamedEntries + pResDirOurType->NumberOfIdEntries;
+        paResDirEntries = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((unsigned)pResDirOurType + sizeof(*pResDirOurType));
+        for (i = 0; i < cResEntries && fRet; i++)
+        {
+            LPSTR lpszName;
+
+            if (paResDirEntries[i].u1.s.NameIsString)
+            {
+                PIMAGE_RESOURCE_DIR_STRING_U pResDirString =
+                    (PIMAGE_RESOURCE_DIR_STRING_U)(paResDirEntries[i].u1.s.NameOffset + (unsigned)pResDir);
+
+                /* ASCII buffer allocation/adjustment? */
+                if (cch <= pResDirString->Length)
+                {
+                    void *pszTmp;
+                    cch = max(pResDirString->Length + 1, 32);
+                    pszTmp = pszASCII != NULL ? realloc(pszASCII, cch) : malloc(cch);
+                    if (pszTmp == NULL)
+                    {
+                        fRet = FALSE;
+                        break;
+                    }
+                    pszASCII = (char*)pszTmp;
+                }
+                UnicodeToAsciiN(pResDirString->NameString, pszASCII, pResDirString->Length);
+                lpszName = pszASCII;
+            }
+            else
+                lpszName = (LPSTR)paResDirEntries[i].u1.Id;
+
+            fRet = lpEnumFunc(hmod, lpszType, lpszName, lParam);
+        }
+
+        if (pszASCII != NULL)
+            free(pszASCII);
+    }
+    else
+    {
+        SetLastError(ERROR_RESOURCE_TYPE_NOT_FOUND);
+        fRet = FALSE;
+    }
+
+    return fRet > 0 ? TRUE : FALSE;
+}
+
+
+/**
+ * The EnumResourceNames function searches a module for each
+ * resource of the specified type and passes the name of each
+ * resource it locates to an application-defined callback function
+ *
+ * @returns   If the function succeeds, the return value is nonzero.
+ *            If the function fails, the return value is zero
+ * @param     hmod          The specified module handle.
+ * @param     lpszType      pointer to resource type
+ * @param     lpEnumFunc    pointer to callback function
+ * @param     lParam        application-defined parameter
+ * @sketch    IF not resources in module THEN return fail.
+ *            Validate parameters.
+ *            Get the subdirectory for the specified type.
+ *            IF found THEN
+ *            BEGIN
+ *                Find the number of directory entries.
+ *                Find directory entries.
+ *                LOOP thru all entries while the callback function returns true
+ *                BEGIN
+ *                    Name = pointer to ASCII name string or Id.
+ *                    call callback function.
+ *                END
+ *            END
+ *            ELSE
+ *                fail.
+ *            return
+ * @status    completely implemented and tested.
+ * @author    knut st. osmundsen
+ * @remark    The EnumResourceNames function continues to enumerate resource
+ *            names until the callback function returns FALSE or all resource
+ *            names have been enumerated
+ */
+BOOL Win32ImageBase::enumResourceNamesW(HMODULE hmod,
+                                        LPCWSTR  lpszType,
+                                        ENUMRESNAMEPROCW lpEnumFunc,
+                                        LONG lParam)
+{
+    BOOL                            fRet;
+    PIMAGE_RESOURCE_DIRECTORY       pResDirOurType;
+    PIMAGE_RESOURCE_DIRECTORY_ENTRY paResDirEntries;
+
+    if (pResDir == NULL)
+    {
+        SetLastError(ERROR_RESOURCE_DATA_NOT_FOUND);
+        return FALSE;
+    }
+
+    /* validate parameters - FIXME... Exception handler??? */
+    if ((unsigned)lpszType >= 0xc0000000) //....
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    if ((unsigned)lpEnumFunc < 0x10000 || (unsigned)lpEnumFunc >= 0xc0000000)
+    {
+        SetLastError(ERROR_NOACCESS);
+        return FALSE;
+    }
+
+
+    //reminder:
+    //1st level -> types
+    //2nd level -> names
+    //3rd level -> language
+
+    pResDirOurType = getResSubDirW(pResDir, lpszType);
+    if (pResDirOurType != NULL)
+    {
+        unsigned  cResEntries;
+        unsigned  i;
+
+        fRet = TRUE;
+        cResEntries = pResDirOurType->NumberOfNamedEntries + pResDirOurType->NumberOfIdEntries;
+        paResDirEntries = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((unsigned)pResDirOurType + sizeof(*pResDirOurType));
+        for (i = 0; i < cResEntries && fRet; i++)
+        {
+            LPWSTR lpszName;
+
+            if (paResDirEntries[i].u1.s.NameIsString)
+                lpszName = (LPWSTR)(paResDirEntries[i].u1.s.NameOffset + (unsigned)pResDir + 2);
+            else
+                lpszName = (LPWSTR)paResDirEntries[i].u1.Id;
+
+            fRet = lpEnumFunc(hmod, lpszType, lpszName, lParam);
+        }
+    }
+    else
+    {
+        SetLastError(ERROR_RESOURCE_TYPE_NOT_FOUND);
+        fRet = FALSE;
+    }
+
+    return fRet > 0;
+}
+
+
+
+/**
+ * This function finds a resource (sub)directory within a given resource directory.
+ * @returns   Pointer to resource directory. NULL if not found or not a directory.
+ * @param     pResDirToSearch  Pointer to resource directory to search. (any level)
+ * @param     lpszName         Resource ID string.
+ * @sketch
+ * @status    completely implemented
+ * @author    knut st. osmundsen
+ */
+PIMAGE_RESOURCE_DIRECTORY Win32ImageBase::getResSubDirW(PIMAGE_RESOURCE_DIRECTORY pResDirToSearch, LPCWSTR lpszName)
+{
+    PIMAGE_RESOURCE_DIRECTORY_ENTRY paResDirEntries;
+    int     i;
+    int     idName = -1;
+
+    /* lpszName */
+    if (HIWORD(lpszName) != 0)
+    {
+        if (lpszName[0] == '#')
+        {
+            char szBuf[10];
+            lstrcpynWtoA(szBuf, (WCHAR*)(lpszName + 1), sizeof(szBuf));
+            idName = atoi(szBuf);
+        }
+    }
+    else
+        idName = (int)lpszName;
+
+    paResDirEntries = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((unsigned)pResDirToSearch + sizeof(*pResDirToSearch));
+    if (idName != -1)
+    {   /* idName */
+        paResDirEntries += pResDirToSearch->NumberOfNamedEntries;
+
+        for (i = 0; i < pResDirToSearch->NumberOfIdEntries; i++)
+            if (paResDirEntries[i].u1.Id == (WORD)idName)
+                return paResDirEntries[i].u2.s.DataIsDirectory ?
+                    (PIMAGE_RESOURCE_DIRECTORY) (paResDirEntries[i].u2.s.OffsetToDirectory + (unsigned)pResDir /*?*/
+                                                 /*- ulRVAResourceSection*/)
+                    : NULL;
+    }
+    else
+    {   /* string name */
+        int cusName = lstrlenW(lpszName);
+
+        for (i = 0; i < pResDirToSearch->NumberOfNamedEntries; i++)
+        {
+            PIMAGE_RESOURCE_DIR_STRING_U pResDirStr =
+                (PIMAGE_RESOURCE_DIR_STRING_U)(paResDirEntries[i].u1.s.NameOffset + (unsigned)pResDir /*?*/);
+
+            if (pResDirStr->Length == cusName
+                && UniStrncmp(pResDirStr->NameString, lpszName, cusName) == 0)
+            {
+                return paResDirEntries[i].u2.s.DataIsDirectory ?
+                    (PIMAGE_RESOURCE_DIRECTORY) (paResDirEntries[i].u2.s.OffsetToDirectory + (unsigned)pResDir
+                                                 /*- ulRVAResourceSection*/)
+                    : NULL;
+            }
+        }
+    }
+
+    return NULL;
+}
+
+/**
+ * This function finds a resource (sub)directory within a given resource directory.
+ * @returns   Pointer to resource directory. NULL if not found or not a directory.
+ * @param     pResDirToSearch  Pointer to resource directory to search. (any level)
+ * @param     lpszName         Resource ID string.
+ * @sketch
+ * @status    completely implemented
+ * @author    knut st. osmundsen
+ */
+PIMAGE_RESOURCE_DIRECTORY Win32ImageBase::getResSubDirA(PIMAGE_RESOURCE_DIRECTORY pResDirToSearch, LPCTSTR lpszName)
+{
+    PIMAGE_RESOURCE_DIRECTORY   pResDirRet;
+    LPCWSTR                     lpszwName;
+
+    /* lpszName */
+    if (HIWORD(lpszName) != 0)
+    {
+        lpszwName = AsciiToUnicodeString((char*)lpszName);
+        if (lpszwName == NULL)
+            return NULL;
+    }
+    else
+        lpszwName = (LPWSTR)lpszName;
+
+    pResDirRet = getResSubDirW(pResDirToSearch, lpszwName);
+
+    if (HIWORD(lpszwName) != 0)
+        free((void*)lpszwName);
+
+    return pResDirRet;
+}
+