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

Timestamp:

Oct 6, 1999, 1:26:02 AM (26 years ago)

Author:

phaller

Message:

Fix: problems while initializing SHELL32/NEW

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.19 1999-10-04 20:52:34 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.20 1999-10-05 23:24:31 phaller Exp $ */
 
 /*
@@ -10 +10 @@
  *
  * TODO: Check created resource objects before loading the resource!
- * TODO: Once the resource handling in PE2LX/win32k is changed, 
+ * TODO: Is the name id of the version resource always 1?
+ * TODO: Once the resource handling in PE2LX/win32k is changed,
  *       getVersionStruct/Size can be moved into the Win32ImageBase class
  *
@@ -35 +36 @@
 //PE spec says names & ids are sorted; keep on searching just to be sure
 //******************************************************************************
-PIMAGE_RESOURCE_DATA_ENTRY 
+PIMAGE_RESOURCE_DATA_ENTRY
  Win32ImageBase::getPEResourceEntry(ULONG id, ULONG type, ULONG lang)
 {
@@ -44 +45 @@
  ULONG  nodeData[3], i, j, nameOffset;
  BOOL  fFound = FALSE, fNumType;
+
+  //PH: our system LX DLLs might not have a resource segment
+  if (pResDir == NULL)
+    return NULL;
 
   /* set pointer to first resource type entry */
@@ -72 +77 @@
     prdType = (PIMAGE_RESOURCE_DIRECTORY)((int)pResDir + (int)prde->u2.OffsetToData);
 
-    if(i < pResDir->NumberOfNamedEntries) 
+    if(i < pResDir->NumberOfNamedEntries)
     {//name or id entry?
         //SvL: 30-10-'97, high bit is set, so clear to get real offset
@@ -81 +86 @@
         lstrcpynWtoA(typename, pstring->NameString, pstring->Length+1);
         typename[pstring->Length] = 0;
-        
+
         if(!fNumType) {
             if(stricmp(typename, (char *)type) == 0) {
@@ -142 +147 @@
   prde    = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((DWORD)prdType + sizeof(IMAGE_RESOURCE_DIRECTORY));
 
-  //level 2 (id)   -> get first id?
-  //level 3 (lang) -> get first language?
-  if(*nodeData == IDLANG_GETFIRST) {
+  if(level == 3 && *nodeData == LANG_GETFIRST) {
         nrres  = prdType->NumberOfNamedEntries + prdType->NumberOfIdEntries;
         fNumId = (prdType->NumberOfNamedEntries == 0);
@@ -151 +154 @@
         fNumId = HIWORD(*nodeData) == 0;
 
-        if(fNumId) {//numeric or string id?
+        if(fNumId) {//numeric or string id?
                 nrres = prdType->NumberOfIdEntries;
                 prde += prdType->NumberOfNamedEntries;  //skip name entries
@@ -162 +165 @@
         prdType2 = (PIMAGE_RESOURCE_DIRECTORY)((ULONG)pResDir + (ULONG)prde->u2.OffsetToData);
 
-        if(*nodeData == IDLANG_GETFIRST) {
-                fFound = TRUE; //always take the first one
-        }
-        else
         if(!fNumId) {//name or id entry?
                 nameOffset = prde->u1.Name;
@@ -185 +184 @@
                         fFound = TRUE;
         }
+        if(*nodeData == LANG_GETFIRST)
+                fFound = TRUE;
 
         if(fFound) {
@@ -393 +394 @@
     if(HIWORD(lpszType) != 0) {
                 astring2 = UnicodeToAsciiString(lpszType);
-    } 
+    }
     else        astring2 = (char *)lpszType;
 
@@ -431 +432 @@
     if(HIWORD(lpszType) != 0) {
                 astring2 = UnicodeToAsciiString(lpszType);
-    } 
+    }
     else        astring2 = (char *)lpszType;
 
@@ -477 +478 @@
         return FALSE;
   }
-  pData = getPEResourceEntry(ID_GETFIRST, NTRT_VERSION);
+  pData = getPEResourceEntry(1, NTRT_VERSION);
   if(pData == NULL) {
         dprintf(("Win32PeLdrImage::getVersionStruct: couldn't find version resource!"));