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

Timestamp:

Oct 4, 1999, 10:52:34 PM (26 years ago)

Author:

sandervl

Message:

version fixes, resource lookup change + lstrcmpniW added

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.18 1999-10-04 09:55:57 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.19 1999-10-04 20:52:34 sandervl Exp $ */
 
 /*
@@ -10 +10 @@
  *
  * TODO: Check created resource objects before loading the resource!
- * 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
@@ -143 +142 @@
   prde    = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((DWORD)prdType + sizeof(IMAGE_RESOURCE_DIRECTORY));
 
-  if(level == 3 && *nodeData == LANG_GETFIRST) {
+  //level 2 (id)   -> get first id?
+  //level 3 (lang) -> get first language?
+  if(*nodeData == IDLANG_GETFIRST) {
         nrres  = prdType->NumberOfNamedEntries + prdType->NumberOfIdEntries;
         fNumId = (prdType->NumberOfNamedEntries == 0);
@@ -150 +151 @@
         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
@@ -161 +162 @@
         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;
@@ -180 +185 @@
                         fFound = TRUE;
         }
-        if(*nodeData == LANG_GETFIRST)
-                fFound = TRUE;
 
         if(fFound) {
@@ -474 +477 @@
         return FALSE;
   }
-  pData = getPEResourceEntry(1, NTRT_VERSION);
+  pData = getPEResourceEntry(ID_GETFIRST, NTRT_VERSION);
   if(pData == NULL) {
         dprintf(("Win32PeLdrImage::getVersionStruct: couldn't find version resource!"));