Changeset 1613 for trunk/src

Timestamp:

Nov 5, 1999, 1:54:50 PM (26 years ago)

Author:

sandervl

Message:

string resource loading changes

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.25 1999-10-26 11:15:33 sandervl Exp $ */
+/* $Id: winimgres.cpp,v 1.26 1999-11-05 12:54:50 sandervl Exp $ */
 
 /*
@@ -238 +238 @@
  char  *winres = NULL;
  ULONG  id, type;
- int    i, stringid = -1, j;
+ int    i, j;
 
     fNumType = TRUE;    //assume numeric
@@ -260 +260 @@
     else  type = (ULONG)lpszType;
 
-    //String format: tables of 16 strings stored as one resource
-    //upper 12 bits of resource id passed by user determines block (res id)
-    //lower 4 bits are an index into the string table
-    if(fNumType) {
-        if(type == NTRT_STRING) {
-            stringid = (ULONG)lpszName & 0xF;
-            id       = (((ULONG)lpszName) >> 4)+1;
-        }
-        else id = (ULONG)lpszName;
-    }
-    else {
-        if(stricmp((char *)type, ResTypes[NTRT_STRING]) == 0) {
-            stringid = (ULONG)lpszName & 0xF;
-            id       = (((ULONG)lpszName) >> 4)+1;
-        }
-        else id = (ULONG)lpszName;
-    }
+    id = (ULONG)lpszName;
 
     pData = getPEResourceEntry(id, type, lang);
@@ -290 +274 @@
     //For LX images, this is 0 as OffsetToData contains a relative offset
     char *resdata = (char *)((char *)pResDir + pData->OffsetToData - pResourceSectionStart);
-    if(stringid != -1) {//search for string in table
-        USHORT *unicodestr = (USHORT *)resdata;
-
-        for(i=0;i<stringid;i++) {
-            unicodestr += *unicodestr+1;
-        }
-        res = new Win32Resource(this, id, NTRT_STRING, (*unicodestr+1)*sizeof(WCHAR),
-                                (char *)(unicodestr+1));
-        if(res == NULL) {
-            dprintf(("new Win32Resource failed!\n"));
-            return(NULL);
-        }
-    }
-    else
-    {
-        res = new Win32Resource(this, id, type, pData->Size, resdata);
-    }
+    res = new Win32Resource(this, id, type, pData->Size, resdata);
 
     return (HRSRC) res;