Changeset 345 for trunk/src/user32/new/loadres.cpp

Timestamp:

Jul 20, 1999, 5:46:54 PM (26 years ago)

Author:

sandervl

Message:

Accelerator + icon changes

File:

• trunk/src/user32/new/loadres.cpp (modified) (3 diffs)

trunk/src/user32/new/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.3 1999-07-20 07:42:35 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.4 1999-07-20 15:46:53 sandervl Exp $ */
 
 /*
@@ -37 +37 @@
  HICON rc;
 
-    if((int)lpszIcon >> 16 != 0) {//convert string name identifier to numeric id
-         dprintf(("LoadIcon %s\n", lpszIcon));
-         lpszIcon = (LPCSTR)ConvertNameId(hinst, (char *)lpszIcon);
-    }
-    else dprintf(("LoadIcon %d\n", (int)lpszIcon));
+    rc = (HICON)FindResourceA(hinst, lpszIcon, RT_ICONA);
+    dprintf(("LoadIconA (%X) returned %d\n", hinst, rc));
+    return(rc);
+}
+//******************************************************************************
+//******************************************************************************
+HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
+{
+ HICON rc;
 
-    rc = O32_LoadIcon(hinst, lpszIcon);
-
-    dprintf(("LoadIcon returned %d\n", rc));
+    rc = (HICON)FindResourceW(hinst, lpszIcon, RT_ICONW);
+    dprintf(("LoadIconW (%X) returned %d\n", hinst, rc));
     return(rc);
 }
@@ -134 +137 @@
 }
 //******************************************************************************
-//******************************************************************************
-HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
-{
- char  *astring = NULL;
- HICON rc;
-
-    if((int)lpszIcon >> 16 != 0) {//convert string name identifier to numeric id
-         astring = UnicodeToAsciiString((LPWSTR)lpszIcon);
-
-         dprintf(("lpszIcon %s\n", astring));
-         lpszIcon = (LPWSTR)ConvertNameId(hinst, (char *)astring);
-    }
-    else dprintf(("lpszIcon %d\n", (int)lpszIcon));
-
-    rc = O32_LoadIcon(hinst, (char *)lpszIcon);
-    if(astring)
-        FreeAsciiString(astring);
-
-    dprintf(("LoadIconW returned %d\n", rc));
-    return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-//******************************************************************************
 //TODO: Far from complete, but works for loading resources from exe
 //fuLoad flag ignored