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

Timestamp:

Oct 4, 1999, 11:56:04 AM (26 years ago)

Author:

sandervl

Message:

Lots of changes by several people (see changelog for 4 October

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.17 1999-09-23 14:12:14 phaller Exp $ */
+/* $Id: winimgres.cpp,v 1.18 1999-10-04 09:55:57 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
  * 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,
+ * TODO: Once the resource handling in PE2LX/win32k is changed, 
  *       getVersionStruct/Size can be moved into the Win32ImageBase class
  *
@@ -36 +36 @@
 //PE spec says names & ids are sorted; keep on searching just to be sure
 //******************************************************************************
-PIMAGE_RESOURCE_DATA_ENTRY
+PIMAGE_RESOURCE_DATA_ENTRY 
  Win32ImageBase::getPEResourceEntry(ULONG id, ULONG type, ULONG lang)
 {
@@ -73 +73 @@
     prdType = (PIMAGE_RESOURCE_DIRECTORY)((int)pResDir + (int)prde->u2.OffsetToData);
 
-    if(i < pResDir->NumberOfNamedEntries)
+    if(i < pResDir->NumberOfNamedEntries) 
     {//name or id entry?
         //SvL: 30-10-'97, high bit is set, so clear to get real offset
@@ -82 +82 @@
         lstrcpynWtoA(typename, pstring->NameString, pstring->Length+1);
         typename[pstring->Length] = 0;
-
+        
         if(!fNumType) {
             if(stricmp(typename, (char *)type) == 0) {
@@ -380 +380 @@
 HRSRC Win32ImageBase::findResourceW(LPWSTR lpszName, LPWSTR lpszType, ULONG lang)
 {
-  HRSRC hres;
-  char *astring1 = NULL,
-       *astring2 = NULL;
-  BOOL fAllocated1 = FALSE;
-  BOOL fAllocated2 = FALSE;
-
-  if(HIWORD(lpszName) != 0)
-  {
-    astring1 = UnicodeToAsciiString((LPWSTR)lpszName);
-    fAllocated1 = TRUE;
-  }
-  else
-    astring1 = (char *)lpszName;
-
-  if(HIWORD(lpszType) != 0)
-  {
-    astring2 = UnicodeToAsciiString(lpszType);
-    fAllocated2 = TRUE;
-  }
-  else
-    astring2 = (char *)lpszType;
-  hres = (HRSRC) findResourceA(astring1, astring2);
-
-   /* do NOT free untranslated numerical Resource IDs */
-  if(fAllocated1) FreeAsciiString(astring1);
-  if(fAllocated2) FreeAsciiString(astring2);
-
-  return(hres);
+ HRSRC hres;
+ char *astring1 = NULL, *astring2 = NULL;
+
+    if(HIWORD(lpszName) != 0) {
+                astring1 = UnicodeToAsciiString(lpszName);
+    }
+    else        astring1 = (char *)lpszName;
+
+    if(HIWORD(lpszType) != 0) {
+                astring2 = UnicodeToAsciiString(lpszType);
+    } 
+    else        astring2 = (char *)lpszType;
+
+    hres = (HRSRC) findResourceA(astring1, astring2);
+
+    if(HIWORD(astring1)) FreeAsciiString(astring1);
+    if(HIWORD(astring2)) FreeAsciiString(astring2);
+
+    return(hres);
 }
 //******************************************************************************
@@ -427 +418 @@
 ULONG Win32ImageBase::getResourceSizeW(LPCWSTR lpszName, LPWSTR lpszType, ULONG lang)
 {
-  char *astring1 = NULL,
-       *astring2 = NULL;
-  ULONG ressize;
-  BOOL fAllocated1 = FALSE;
-  BOOL fAllocated2 = FALSE;
-
-  if(HIWORD(lpszName) != 0)
-  {
-    astring1 = UnicodeToAsciiString((LPWSTR)lpszName);
-    fAllocated1 = TRUE;
-  }
-  else
-    astring1 = (char *)lpszName;
-
-  if(HIWORD(lpszType) != 0)
-  {
-    astring2 = UnicodeToAsciiString(lpszType);
-    fAllocated2 = TRUE;
-  }
-  else
-    astring2 = (char *)lpszType;
-
-  ressize =  getResourceSizeA(astring1, astring2, lang);
-
-  /* do NOT free untranslated numerical Resource IDs */
-  if(fAllocated1) FreeAsciiString(astring1);
-  if(fAllocated2) FreeAsciiString(astring2);
-
-  return(ressize);
+ char *astring1 = NULL, *astring2 = NULL;
+ ULONG ressize;
+
+    if(HIWORD(lpszName) != 0) {
+                astring1 = UnicodeToAsciiString((LPWSTR)lpszName);
+    }
+    else        astring1 = (char *)lpszName;
+
+    if(HIWORD(lpszType) != 0) {
+                astring2 = UnicodeToAsciiString(lpszType);
+    } 
+    else        astring2 = (char *)lpszType;
+
+    ressize =  getResourceSizeA(astring2, astring1, lang);
+
+    if(HIWORD(astring1)) FreeAsciiString(astring1);
+    if(HIWORD(astring2)) FreeAsciiString(astring2);
+
+    return(ressize);
 }
 //******************************************************************************
@@ -489 +470 @@
  PIMAGE_RESOURCE_DATA_ENTRY      pData = NULL;
 
+  if(verstruct == NULL || bufLength == 0) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+  }
   pData = getPEResourceEntry(1, NTRT_VERSION);
   if(pData == NULL) {
@@ -494 +479 @@
         return 0;
   }
-  return pData->Size;
-}
-//******************************************************************************
-//******************************************************************************
+  char *resdata = (char *)((char *)pResDir + pData->OffsetToData - pResourceSectionStart);
+  memcpy(verstruct, resdata, min(bufLength, pData->Size));
+  return TRUE;
+}
+//******************************************************************************
+//******************************************************************************