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

Timestamp:

Sep 23, 1999, 4:12:14 PM (26 years ago)

Author:

phaller

Message:

Fix: additional fix in findResourceW, getResourceSizeW

File:

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

trunk/src/kernel32/winimgres.cpp

@@ -1 @@
-/* $Id: winimgres.cpp,v 1.16 1999-09-23 13:53:38 phaller Exp $ */
+/* $Id: winimgres.cpp,v 1.17 1999-09-23 14:12:14 phaller Exp $ */
 
 /*
@@ -380 +380 @@
 HRSRC Win32ImageBase::findResourceW(LPWSTR lpszName, LPWSTR lpszType, ULONG lang)
 {
- HRSRC hres;
- char *astring1 = NULL,
-      *astring2 = NULL;
-
-    if(HIWORD(lpszType) != 0) astring1 = UnicodeToAsciiString(lpszType);
-    else                      astring1 = (char *)lpszType;
-    if(HIWORD(lpszName) != 0) astring2 = UnicodeToAsciiString(lpszName);
-    else                      astring2 = (char *)lpszName;
-
-    hres = (HRSRC) findResourceA(astring1, astring2);
-
-    /* do NOT free untranslated numerical Resource IDs */
-    if(HIWORD(astring1)) FreeAsciiString(astring1);
-    if(HIWORD(astring2)) FreeAsciiString(astring2);
-
-    return(hres);
+  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);
 }
 //******************************************************************************
@@ -415 +427 @@
 ULONG Win32ImageBase::getResourceSizeW(LPCWSTR lpszName, LPWSTR lpszType, ULONG lang)
 {
- char *astring1 = NULL, *astring2 = NULL;
- ULONG ressize;
-
-    if(HIWORD(lpszType) != 0) {
-                char *resname = UnicodeToAsciiString(lpszType);
-    }
-    else        astring1 = (char *)lpszType;
-
-    if(HIWORD(lpszName) != 0) {
-                astring2 = UnicodeToAsciiString((LPWSTR)lpszName);
-    }
-    else        astring2 = (char *)lpszName;
-
-    ressize =  getResourceSizeA(astring1, astring2, lang);
-    if(astring1) FreeAsciiString(astring1);
-    if(astring2) FreeAsciiString(astring2);
-
-    return(ressize);
+  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);
 }
 //******************************************************************************