Changeset 978 for trunk/src/kernel32/winimgres.cpp

Timestamp:

Sep 18, 1999, 7:47:10 PM (26 years ago)

Author:

sandervl

Message:

Changes for LX image resource support

File:

• trunk/src/kernel32/winimgres.cpp (modified) (11 diffs)

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.14 1999-09-15 23:38:02 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.15 1999-09-18 17:47:10 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
 //******************************************************************************
 PIMAGE_RESOURCE_DATA_ENTRY 
- Win32PeLdrImage::getPEResourceEntry(ULONG id, ULONG type, ULONG lang)
+ Win32ImageBase::getPEResourceEntry(ULONG id, ULONG type, ULONG lang)
 {
  PIMAGE_RESOURCE_DIRECTORY       prdType;
@@ -124 +124 @@
 //******************************************************************************
 PIMAGE_RESOURCE_DATA_ENTRY
-    Win32PeLdrImage::ProcessResSubDir(PIMAGE_RESOURCE_DIRECTORY prdType,
-                                 ULONG *nodeData, int level)
+    Win32ImageBase::ProcessResSubDir(PIMAGE_RESOURCE_DIRECTORY prdType,
+                                     ULONG *nodeData, int level)
 {
  PIMAGE_RESOURCE_DIRECTORY       prdType2;
@@ -201 +201 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32PeLdrImage::getPEResourceSize(ULONG id, ULONG type, ULONG lang)
+ULONG Win32ImageBase::getPEResourceSize(ULONG id, ULONG type, ULONG lang)
 {
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
@@ -214 +214 @@
 //******************************************************************************
 //******************************************************************************
-HRSRC Win32PeLdrImage::findResourceA(LPCSTR lpszName, LPSTR lpszType, ULONG lang)
+HRSRC Win32ImageBase::findResourceA(LPCSTR lpszName, LPSTR lpszType, ULONG lang)
 {
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
@@ -263 +263 @@
         return 0;
   }
-
-  char *resdata = (char *)((char *)pResDir + pData->OffsetToData - (pResSection->virtaddr - oh.ImageBase));
+  //pResourceSectionStart 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
+  char *resdata = (char *)((char *)pResDir + pData->OffsetToData - pResourceSectionStart);
   if(stringid != -1) {//search for string in table
         USHORT *unicodestr = (USHORT *)resdata;
@@ -375 +377 @@
 }
 //******************************************************************************
-//TODO:
-//******************************************************************************
-HRSRC Win32LxImage::findResourceA(LPCSTR lpszName, LPSTR lpszType, ULONG lang)
-{
-    return 0;
-}
-//******************************************************************************
 //******************************************************************************
 HRSRC Win32ImageBase::findResourceW(LPWSTR lpszName, LPWSTR lpszType, ULONG lang)
@@ -413 +408 @@
 }
 //******************************************************************************
-//TODO:
-//******************************************************************************
-ULONG Win32LxImage::getResourceSizeA(LPCSTR lpszName, LPSTR lpszType, ULONG lang)
-{
-    DebugInt3();
-    return 0;
-}
-//******************************************************************************
-//******************************************************************************
-ULONG Win32PeLdrImage::getResourceSizeA(LPCSTR lpszName, LPSTR lpszType, ULONG lang)
+//******************************************************************************
+ULONG Win32ImageBase::getResourceSizeA(LPCSTR lpszName, LPSTR lpszType, ULONG lang)
 {
     return getPEResourceSize((ULONG)lpszName, (ULONG)lpszType, lang);
@@ -471 +458 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32PeLdrImage::getVersionSize()
+ULONG Win32ImageBase::getVersionSize()
 {
     return getResourceSizeA((LPCSTR)1, (LPSTR)NTRT_VERSION);
@@ -477 +464 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32PeLdrImage::getVersionStruct(char *verstruct, ULONG bufLength)
+BOOL Win32ImageBase::getVersionStruct(char *verstruct, ULONG bufLength)
 {
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
@@ -490 +477 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32LxImage::getVersionSize()
-{
-//    return getResourceSizeA((LPCSTR)1, (LPSTR)NTRT_VERSION);
-  return 0;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32LxImage::getVersionStruct(char *verstruct, ULONG bufLength)
-{
- PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
-
-//  pData = getPEResourceEntry(1, NTRT_VERSION);
-  if(pData == NULL) {
-        dprintf(("Win32PeLdrImage::getVersionStruct: couldn't find version resource!"));
-        return 0;
-  }
-  return pData->Size;
-}
-//******************************************************************************
-//******************************************************************************