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

Timestamp:

May 9, 2000, 8:56:59 PM (25 years ago)

Author:

sandervl

Message:

lots of changes/fixes

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.34 2000-03-29 17:17:18 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.35 2000-05-09 18:56:10 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
  */
 #include <os2win.h>
+#include <winnls.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -151 +152 @@
   if(*nodeData == 0xFFFFFFFF) {//shouldn't happen!
         dprintf(("ProcessResSubDir: *nodeData == 0xFFFFFFFF!\n"));
+        DebugInt3();
         return(NULL);
   }
@@ -159 +161 @@
   //level 3 (lang) -> get first language?
   if(*nodeData == IDLANG_GETFIRST) {
-    nrres  = prdType->NumberOfNamedEntries + prdType->NumberOfIdEntries;
-    fNumId = (prdType->NumberOfNamedEntries == 0);
+        nrres  = prdType->NumberOfNamedEntries + prdType->NumberOfIdEntries;
+        fNumId = (prdType->NumberOfNamedEntries == 0);
   }
   else {
-    fNumId = HIWORD(*nodeData) == 0;
-
-    if(fNumId) {//numeric or string id?
-        nrres = prdType->NumberOfIdEntries;
-        prde += prdType->NumberOfNamedEntries;  //skip name entries
-    }
-    else    nrres = prdType->NumberOfNamedEntries;
+        fNumId = HIWORD(*nodeData) == 0;
+
+        if(fNumId) {//numeric or string id?
+                nrres = prdType->NumberOfIdEntries;
+                prde += prdType->NumberOfNamedEntries;  //skip name entries
+        }
+        else    nrres = prdType->NumberOfNamedEntries;
   }
 
@@ -177 +179 @@
 
         if(*nodeData == IDLANG_GETFIRST) {
-        fFound = TRUE; //always take the first one
-    }
-    else
+                fFound = TRUE; //always take the first one
+        }
+        else
         if(!fNumId) {//name or id entry?
             nameOffset = prde->u1.Name;
@@ -222 +224 @@
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
 
+    switch(lang) {
+    case LOCALE_SYSTEM_DEFAULT:
+        lang = GetSystemDefaultLangID();
+        break;    
+    case LOCALE_USER_DEFAULT:
+        lang = GetUserDefaultLangID();
+        break;    
+    case LOCALE_NEUTRAL:
+        //TODO: Not correct; should take language associated with current thread
+        lang = IDLANG_GETFIRST;
+        break;    
+    }
+
     pData = getPEResourceEntry(id, type, lang);
     if(pData == NULL) {
@@ -260 +275 @@
     else  type = (ULONG)lpszType;
 
+    switch(lang) {
+    case LOCALE_SYSTEM_DEFAULT:
+        lang = GetSystemDefaultLangID();
+        break;    
+    case LOCALE_USER_DEFAULT:
+        lang = GetUserDefaultLangID();
+        break;    
+    case LOCALE_NEUTRAL:
+        //TODO: Not correct; should take language associated with current thread
+        lang = IDLANG_GETFIRST;
+        break;    
+    }
     id = (ULONG)lpszName;