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

Timestamp:

Jun 26, 2000, 9:35:56 AM (25 years ago)

Author:

sandervl

Message:

resource type numeric string fix

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.40 2000-06-17 09:03:37 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.41 2000-06-26 07:35:56 sandervl Exp $ */
 
 /*
@@ -65 +65 @@
     return NULL;
 
+  if(HIWORD(type)) {
+        char *lpszName = (char *)type;
+        //"#102" really means numeric id 102
+        if(lpszName[0] == '#') {
+                type = atoi(&lpszName[1]);
+        }
+  }
+
   if(HIWORD(id) && id != IDLANG_GETFIRST) {
         char *lpszName = (char *)id;
@@ -308 +316 @@
 {
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
- BOOL   fNumType;
  char  *winres = NULL;
  ULONG  id, type, lang;
  int    i, j, error;
 
-    fNumType = TRUE;    //assume numeric
+#ifdef DEBUG
     if(HIWORD(lpszType) != 0) {//string id?
         for(i=0;i<MAX_RES;i++) {
@@ -319 +326 @@
                     break;
         }
-//TODO:
-#if 0
-        if(stricmp((char *)lpszType, BITMAP_TYPENAME2) == 0) {
-            i = (int)RT_BITMAPA;
-        }
+        if(i == MAX_RES) {//custom resource type
+            type = (ULONG)lpszType;
+        }
+        else type = i;
+    }
+    else  type = (ULONG)lpszType;
+#else
+    type = (ULONG)lpszType;
 #endif
-        if(i == MAX_RES) {//custom resource type
-            fNumType = FALSE;
-            type = (ULONG)lpszType;
-        }
-        else type = i;
-    }
-    else  type = (ULONG)lpszType;
 
     switch(langid) {