Changeset 599 for trunk/src

Timestamp:

Aug 20, 1999, 5:03:41 PM (26 years ago)

Author:

sandervl

Message:

* empty log message *

Location:

trunk/src

Files:

• kernel32/winres.cpp (modified) (3 diffs)
• user32/new/loadres.cpp (modified) (9 diffs)

trunk/src/kernel32/winres.cpp

@@ -1 @@
-/* $Id: winres.cpp,v 1.10 1999-08-20 11:52:44 sandervl Exp $ */
+/* $Id: winres.cpp,v 1.11 1999-08-20 15:03:31 sandervl Exp $ */
 
 /*
@@ -133 +133 @@
   OS2ResHandle = 0;
 
-  rc = DosQueryResourceSize(module->hinstance, type, id, &ressize);
+  rc = DosQueryResourceSize(module->hinstance, orgos2type, id, &ressize);
   if(rc) {
     dprintf(("Win32Resource ctor: DosQueryResourceSize %x %d %d returned %X\n", module->hinstance, type, id, rc));
@@ -248 +248 @@
             return(NULL);
         }
-        winresdata = (char *)malloc(ressize);
+        winresdata = malloc(ressize+sizeof(WCHAR));
         memcpy(winresdata, resdata, ressize);
+        *(USHORT *)(&((char *)winresdata)[ressize]) = 0;
         DosFreeResource(resdata);
         return((PVOID)((ULONG)winresdata+2));   //skip length word

trunk/src/user32/new/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.5 1999-08-20 11:52:18 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.6 1999-08-20 15:03:41 sandervl Exp $ */
 
 /*
@@ -11 +11 @@
  */
 #include <os2win.h>
-#include <string.h>
 #include <user32.h>
 #include <winres.h>
@@ -34 +33 @@
         resstrlen = min(lstrlenW(resstring)+1, cchBuffer);
         lstrcpynWtoA(lpBuffer, resstring, resstrlen);
-        lpBuffer[cchBuffer-1] = 0;
-        dprintf(("LoadStringA %s", lpBuffer));
+        lpBuffer[resstrlen-1] = 0;
+        resstrlen--;
+        dprintf(("LoadStringA (%d) %s", resstrlen, lpBuffer));
     }
     delete winres;
@@ -60 +60 @@
         resstrlen = min(lstrlenW(resstring)+1, cchBuffer);
         lstrcpynW(lpBuffer, resstring, resstrlen);
-        lpBuffer[cchBuffer-1] = 0;
+        lpBuffer[resstrlen-1] = 0;
+        resstrlen--;
     }
     delete winres;
@@ -68 +69 @@
 }
 //******************************************************************************
-//TODO: Standard windows icons!
 //******************************************************************************
 HICON WIN32API LoadIconA(HINSTANCE hinst, LPCSTR lpszIcon)
@@ -75 +75 @@
 
     rc = (HICON)FindResourceA(hinst, lpszIcon, RT_ICONA);
-    if(rc == 0) {
-        rc = (HICON)FindResourceA(hinst, lpszIcon, RT_GROUP_ICONA);
-    }
     dprintf(("LoadIconA (%X) returned %d\n", hinst, rc));
     return(rc);
 }
 //******************************************************************************
-//TODO: Standard windows icons!
 //******************************************************************************
 HICON WIN32API LoadIconW(HINSTANCE hinst, LPCWSTR lpszIcon)
@@ -89 +85 @@
 
     rc = (HICON)FindResourceW(hinst, lpszIcon, RT_ICONW);
-    if(rc == 0) {
-        rc = (HICON)FindResourceW(hinst, lpszIcon, RT_GROUP_ICONW);
-    }
     dprintf(("LoadIconW (%X) returned %d\n", hinst, rc));
     return(rc);
 }
 //******************************************************************************
-//TODO: Standard windows cursors!
 //******************************************************************************
 HCURSOR WIN32API LoadCursorA(HINSTANCE hinst, LPCSTR lpszCursor)
@@ -102 +94 @@
  HCURSOR rc;
 
-    rc = (HCURSOR) FindResourceA(hinst, lpszCursor, RT_CURSORA);
+    if((int)lpszCursor >> 16 != 0) {//convert string name identifier to numeric id
+         dprintf(("LoadCursor %s\n", lpszCursor));
+         lpszCursor = (LPCSTR)ConvertNameId(hinst, (char *)lpszCursor);
+    }
+    else dprintf(("LoadCursor %d\n", (int)lpszCursor));
+
+    rc = O32_LoadCursor(hinst, lpszCursor);
 
     dprintf(("LoadCursor from %X returned %d\n", hinst, rc));
@@ -108 +106 @@
 }
 //******************************************************************************
-//TODO: Standard windows cursors!
+//******************************************************************************
+HBITMAP WIN32API LoadBitmapA(HINSTANCE hinst, LPCSTR lpszBitmap)
+{
+ HBITMAP rc;
+
+  if((int)lpszBitmap >> 16 != 0) 
+  {  //convert string name identifier to numeric id
+    dprintf(("lpszBitmap [%s]\n",
+             lpszBitmap));
+    
+    lpszBitmap = (LPCSTR)ConvertNameId(hinst, 
+                                       (char *)lpszBitmap);
+  }
+  else 
+    dprintf(("lpszBitmap %08xh\n",
+             (int)lpszBitmap));
+
+  rc = O32_LoadBitmap(hinst, lpszBitmap);
+
+  dprintf(("LoadBitmapA returned %08xh\n",
+           rc));
+  
+  return(rc);
+}
+//******************************************************************************
+//******************************************************************************
+HBITMAP WIN32API LoadBitmapW(HINSTANCE hinst, LPCWSTR lpszBitmap)
+{
+ char   *astring = NULL;
+ HBITMAP rc;
+
+    if((int)lpszBitmap >> 16 != 0) {//convert string name identifier to numeric id
+         astring = UnicodeToAsciiString((LPWSTR)lpszBitmap);
+         dprintf(("lpszBitmap %s\n", astring));
+
+         lpszBitmap = (LPWSTR)ConvertNameId(hinst, (char *)astring);
+    }
+    else dprintf(("lpszBitmap %d\n", (int)lpszBitmap));
+
+    rc = O32_LoadBitmap(hinst, (char *)lpszBitmap);
+    if(astring)
+        FreeAsciiString(astring);
+
+    dprintf(("LoadBitmapW returned %d\n", rc));
+    return(rc);
+}
+//******************************************************************************
 //******************************************************************************
 HCURSOR WIN32API LoadCursorW(HINSTANCE hinst, LPCWSTR lpszCursor)
 {
+ char   *astring = NULL;
  HCURSOR rc;
 
-    rc = (HCURSOR) FindResourceW(hinst, lpszCursor, RT_CURSORW);
-
-    dprintf(("LoadCursorW from %X returned %d\n", hinst, rc));
-    return(rc);
-}
-//******************************************************************************
-//TODO: Standard windows bitmaps!
-//******************************************************************************
-HBITMAP WIN32API LoadBitmapA(HINSTANCE hinst, LPCSTR lpszBitmap)
-{
- HBITMAP rc;
-
-    rc = (HBITMAP) FindResourceA(hinst, lpszBitmap, RT_BITMAPA);
-
-    dprintf(("LoadBitmapA from %X returned %d\n", hinst, rc));
-    return(rc);
-}
-//******************************************************************************
-//TODO: Standard windows bitmaps!
-//******************************************************************************
-HBITMAP WIN32API LoadBitmapW(HINSTANCE hinst, LPCWSTR lpszBitmap)
-{
- HBITMAP rc;
-
-    rc = (HBITMAP) FindResourceW(hinst, lpszBitmap, RT_BITMAPW);
-
-    dprintf(("LoadBitmapW from %X returned %d\n", hinst, rc));
+    if((int)lpszCursor >> 16 != 0) {//convert string name identifier to numeric id
+         astring = UnicodeToAsciiString((LPWSTR)lpszCursor);
+         dprintf(("lpszCursor %s\n", astring));
+         lpszCursor = (LPWSTR)ConvertNameId(hinst, (char *)astring);
+    }
+    else dprintf(("lpszCursor %d\n", (int)lpszCursor));
+
+    rc = O32_LoadCursor(hinst, (char *)lpszCursor);
+    if(astring)
+        FreeAsciiString(astring);
+
+    dprintf(("LoadCursorW returned %d\n", rc));
     return(rc);
 }