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

Timestamp:

May 22, 2000, 9:08:01 PM (25 years ago)

Author:

sandervl

Message:

GetFileTime bugfix + FindResource(Ex)A/W changes + setup thread security objects during creation

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.36 2000-05-18 09:08:38 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.37 2000-05-22 19:08:00 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 #define BITMAP_TYPENAME2    "DIB"
 
+#define RESERR_SUCCESS          0
+#define RESERR_IDNOTFOUND       1
+#define RESERR_TYPENOTFOUND     2
+#define RESERR_LANGNOTFOUND     3
+
 //******************************************************************************
 //Assuming names are case insensitive
@@ -40 +45 @@
 //******************************************************************************
 PIMAGE_RESOURCE_DATA_ENTRY
- Win32ImageBase::getPEResourceEntry(ULONG id, ULONG type, ULONG lang)
+ Win32ImageBase::getPEResourceEntry(ULONG id, ULONG type, ULONG lang, int *error)
 {
  PIMAGE_RESOURCE_DIRECTORY       prdType;
@@ -48 +53 @@
  ULONG  nodeData[3], i, j, nameOffset;
  BOOL  fFound = FALSE, fNumType;
+
+  *error = RESERR_TYPENOTFOUND;
 
   //PH: our system LX DLLs might not have a resource segment
@@ -120 +127 @@
     if(fFound) {
         if((ULONG)prdType & 0x80000000) {//subdirectory?
-            pData = ProcessResSubDir(prdType, &nodeData[0], 2);
+            pData = ProcessResSubDir(prdType, &nodeData[0], 2, error);
         }
         else {
@@ -131 +138 @@
     prde++;
   }
+  if(pData) {
+        *error = RESERR_SUCCESS; //found it
+  }
   return pData;
 }
@@ -139 +149 @@
 PIMAGE_RESOURCE_DATA_ENTRY
     Win32ImageBase::ProcessResSubDir(PIMAGE_RESOURCE_DIRECTORY prdType,
-                                     ULONG *nodeData, int level)
+                                     ULONG *nodeData, int level, int *error)
 {
  PIMAGE_RESOURCE_DIRECTORY       prdType2;
@@ -158 +168 @@
   prde    = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((DWORD)prdType + sizeof(IMAGE_RESOURCE_DIRECTORY));
 
+  if(level == 2) {
+        *error = RESERR_IDNOTFOUND;
+  }
+  else {
+        *error = RESERR_LANGNOTFOUND;
+  }
   //level 2 (id)   -> get first id?
   //level 3 (lang) -> get first language?
@@ -204 +220 @@
         if(fFound) {
             if((ULONG)prdType2 & 0x80000000) {//subdirectory?
-                    return ProcessResSubDir(prdType2, nodeData+1, 3);
+                    return ProcessResSubDir(prdType2, nodeData+1, 3, error);
             }
             else {
@@ -222 +238 @@
 ULONG Win32ImageBase::getPEResourceSize(ULONG id, ULONG type, ULONG lang)
 {
- PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
+ PIMAGE_RESOURCE_DATA_ENTRY pData = NULL;
+ int                        error;
 
     switch(lang) {
@@ -237 +254 @@
     }
 
-    pData = getPEResourceEntry(id, type, lang);
+    pData = getPEResourceEntry(id, type, lang, &error);
     if(pData == NULL) {
         dprintf(("Win32ImageBase::getPEResourceSize: couldn't find resource %d (type %d, lang %x)", id, type, lang));
@@ -246 +263 @@
 //******************************************************************************
 //******************************************************************************
-HRSRC Win32ImageBase::findResourceA(LPCSTR lpszName, LPSTR lpszType, ULONG lang)
+HRSRC Win32ImageBase::findResourceA(LPCSTR lpszName, LPSTR lpszType, ULONG langid)
 {
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
@@ -252 +269 @@
  BOOL   fNumType;
  char  *winres = NULL;
- ULONG  id, type;
- int    i, j;
+ ULONG  id, type, lang;
+ int    i, j, error;
 
     fNumType = TRUE;    //assume numeric
@@ -275 +292 @@
     else  type = (ULONG)lpszType;
 
-    switch(lang) {
+    switch(langid) {
     case LOCALE_SYSTEM_DEFAULT:
         lang = GetSystemDefaultLangID();
@@ -285 +302 @@
         //TODO: Not correct; should take language associated with current thread
         lang = IDLANG_GETFIRST;
-        break;    
+        break; 
+    case IDLANG_GETFIRST:
+        lang = GetUserDefaultLangID();
+        break;   
     }
     id = (ULONG)lpszName;
 
-    pData = getPEResourceEntry(id, type, lang);
+    pData = getPEResourceEntry(id, type, lang, &error);
     if(pData == NULL) {
-        if(HIWORD(id)) {
-                dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %s (type %d, lang %x)", szModule, id, type, lang));
-        }
-        else    dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %d (type %d, lang %x)", szModule, id, type, lang));
-        return 0;
+        //TODO: Optimize this; check if language wasn't found
+        //try system default language
+        if(error == RESERR_LANGNOTFOUND) {
+                pData = getPEResourceEntry(id, type, GetSystemDefaultLangID(), &error);
+        }
+        if(pData == NULL) {
+                //finally try first available language
+                if(error == RESERR_LANGNOTFOUND) {
+                        pData = getPEResourceEntry(id, type, IDLANG_GETFIRST, &error);
+                }
+                if(pData == NULL) {
+                        if(HIWORD(id)) {
+                                dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %s (type %d, lang %x)", szModule, id, type, lang));
+                        }
+                        else    dprintf(("Win32ImageBase::getPEResource %s: couldn't find resource %d (type %d, lang %x)", szModule, id, type, lang));
+                        return 0;
+                }
+        }
     }
     if(HIWORD(id)) {
@@ -374 +407 @@
 {
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
+ int                             error;
 
     if(verstruct == NULL || bufLength == 0) {
@@ -379 +413 @@
         return FALSE;
     }
-    pData = getPEResourceEntry(ID_GETFIRST, NTRT_VERSION);
+    pData = getPEResourceEntry(ID_GETFIRST, NTRT_VERSION, IDLANG_GETFIRST, &error);
     if(pData == NULL) {
         dprintf(("Win32PeLdrImage::getVersionStruct: couldn't find version resource!"));