Changeset 1612 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

InsertMenu & msg translation fixes

Location:

trunk/src/user32

Files:

• loadres.cpp (modified) (4 diffs)
• oslibmsg.cpp (modified) (4 diffs)
• winmenu.cpp (modified) (2 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.13 1999-11-05 09:16:21 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.14 1999-11-05 12:54:10 sandervl Exp $ */
 
 /*
@@ -6 +6 @@
  * Copyright 1998 Sander van Leeuwen
  *
- * Parts based on Wine code (objects\bitmap.c):
+ * Parts based on Wine code (objects\bitmap.c, loader\resource.c):
  *
  * Copyright 1993 Alexandre Julliard
  *           1998 Huw D M Davies
+ *           1993 Robert J. Amstadt
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -25 +26 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API LoadStringA(HINSTANCE hinst, UINT wID, LPSTR lpBuffer, int cchBuffer)
+INT WIN32API LoadStringA(HINSTANCE instance, UINT resource_id,
+                         LPSTR buffer, INT buflen )
+{
+  INT retval;
+  LPWSTR buffer2 = NULL;
+
+    if (buffer && buflen)
+        buffer2 = (LPWSTR)HeapAlloc( GetProcessHeap(), 0, buflen * 2 );
+
+    retval = LoadStringW(instance,resource_id,buffer2,buflen);
+
+    if (buffer2)
+    {
+        if (retval) {
+            lstrcpynWtoA( buffer, buffer2, buflen );
+            retval = lstrlenA( buffer );
+        }
+        else
+            *buffer = 0;
+        HeapFree( GetProcessHeap(), 0, buffer2 );
+    }
+    return retval;
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API LoadStringW(HINSTANCE hinst, UINT wID, LPWSTR lpBuffer, int cchBuffer)
 {
  Win32Resource *winres;
- LPWSTR  resstring;
- int     resstrlen = 0;
-
-    winres = (Win32Resource *)FindResourceA(hinst, (LPSTR)wID, RT_STRINGA);
-    if(winres == NULL) {
-        dprintf(("LoadStringA NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
-//TODO: BAD HACK!
-        if(cchBuffer > 3)
-        {
-          strcpy(lpBuffer, "XXX");
-          return 3;
-        }
-//TODO: BAD HACK!
-        *lpBuffer = 0;
-        return 0;
-    }
-
-    resstring = (LPWSTR)winres->lockResource();
-    if(resstring) {
-        resstrlen = min(lstrlenW(resstring)+1, cchBuffer);
-        lstrcpynWtoA(lpBuffer, resstring, resstrlen);
-        lpBuffer[resstrlen-1] = 0;
-        resstrlen--;
-        dprintf(("LoadStringA (%d) %s", resstrlen, lpBuffer));
-    }
-    delete winres;
-
-    dprintf(("LoadStringA from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
-    return(resstrlen);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API LoadStringW(HINSTANCE hinst, UINT wID, LPWSTR lpBuffer, int cchBuffer)
-{
- Win32Resource *winres;
- LPWSTR resstring;
- int    resstrlen = 0;
-
-    winres = (Win32Resource *)FindResourceW(hinst, (LPWSTR)wID, RT_STRINGW);
+ WCHAR *p;
+ int string_num;
+ int i = 0;
+
+    /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out 
+     * 20 - 31. */
+    winres = (Win32Resource *)FindResourceW(hinst, (LPWSTR)(((wID>>4)&0xffff)+1), RT_STRINGW);
     if(winres == NULL) {
         dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
@@ -73 +67 @@
     }
 
-    resstring = (LPWSTR)winres->lockResource();
-    if(resstring) {
-        resstrlen = min(lstrlenW(resstring)+1, cchBuffer);
-        lstrcpynW(lpBuffer, resstring, resstrlen);
-        lpBuffer[resstrlen-1] = 0;
-        resstrlen--;
+    p = (LPWSTR)winres->lockResource();
+    if(p) {
+        string_num = wID & 0x000f;
+        for (i = 0; i < string_num; i++)
+                p += *p + 1;
+     
+        if (lpBuffer == NULL) return *p;
+        i = min(cchBuffer - 1, *p);
+        if (i > 0) {
+                memcpy(lpBuffer, p + 1, i * sizeof (WCHAR));
+                lpBuffer[i] = (WCHAR) 0;
+        } 
+        else {
+                if (cchBuffer > 1) {
+                        lpBuffer[0] = (WCHAR) 0;
+                        return 0;
+                }
+        }
     }
     delete winres;
 
     dprintf(("LoadStringW from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
-    return(resstrlen);
+    return(i);
 }
 //******************************************************************************

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.7 1999-11-05 09:16:22 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.8 1999-11-05 12:54:10 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -78 +78 @@
    0x020a, 0x020a,   // WM_???,             WM_???
    WM_CHAR,          WINWM_CHAR,
+   
+   //TODO: Needs better translation!
+   WM_CHAR,          WINWM_KEYDOWN,
+   WM_CHAR,          WINWM_KEYUP,
+   WM_CHAR,          WINWM_SYSKEYDOWN,
+   WM_CHAR,          WINWM_SYSKEYUP,
+   WM_CHAR,          WINWM_KEYLAST
 };
 #define MAX_MSGTRANSTAB (sizeof(MsgTransTab)/sizeof(MsgTransTab[0]))
@@ -121 +128 @@
   memcpy(winMsg, os2Msg, sizeof(MSG));
   winMsg->hwnd = Win32Window::OS2ToWin32Handle(os2Msg->hwnd);
+
+  if(os2Msg->msg >= WIN32APP_USERMSGBASE) {
+        winMsg->message = os2Msg->msg - WIN32APP_USERMSGBASE;
+        return;
+  }
   for(i=0;i<MAX_MSGTRANSTAB;i++)
   {
@@ -145 +157 @@
   }
 
-  if(msg >= WIN32APP_USERMSGBASE)
-    return msg - WIN32APP_USERMSGBASE;
+  if(msg >= WINWM_USER)
+    return msg + WIN32APP_USERMSGBASE;
 
   for(int i=0;i<MAX_MSGTRANSTAB;i++)

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.13 1999-11-03 18:16:19 phaller Exp $ */
+/* $Id: winmenu.cpp,v 1.14 1999-11-05 12:54:11 sandervl Exp $ */
 
 /*
@@ -725 +725 @@
               LPCSTR, str)
 {
-    dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
-    if(hMenu == 0)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return 0;
-    }
-
-    if(!str || *str == NULL) {
+    if(IS_STRING_ITEM(flags) && HIWORD(str)) {
+         dprintf(("USER32: InsertMenuA %x %d %x %d %s", hMenu, pos, flags, id, str));
+    }
+    else dprintf(("USER32: InsertMenuA %x %d %x %d %x", hMenu, pos, flags, id, str));
+
+    if(hMenu == 0)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+
+    if(IS_STRING_ITEM(flags) && (!str || *str == NULL)) {
         flags |= MF_SEPARATOR;
     }