Changeset 21348 for trunk/src

Timestamp:

Nov 9, 2009, 7:22:05 PM (16 years ago)

Author:

vladest

Message:

Fixed double chars in standalone apps
Fixed umlaut and other national characters suppot in inputline

Location:

trunk/src/user32

Files:

• Makefile (modified) (2 diffs)
• cp_cvt.cpp (added)
• pmwindow.cpp (modified) (4 diffs)

trunk/src/user32/Makefile

@@ -114 +114 @@
 $(OBJDIR)\oslibdnd.obj \
 $(OBJDIR)\oslibclipbrd.obj \
+$(OBJDIR)\cp_cvt.obj \
 !ifdef DEBUG
 $(OBJDIR)\dbgwrap.obj \
@@ -130 +131 @@
 $(ODIN32_LIB)/wgss50.lib \
 $(ODIN32_LIB)/libuls.lib \
+$(ODIN32_LIB)/libconv.lib \
 $(ODIN32_LIB)/$(ODINCRT).lib \
 $(ODIN32_LIB)/imm32os2.lib \

trunk/src/user32/pmwindow.cpp

@@ -23 +23 @@
 #include <os2wrap.h>
 #include <odinwrap.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -146 +147 @@
 extern "C" ULONG OSLibImSetMsgQueueProperty( ULONG, ULONG );
 
+int cp2cp(char *cp1, char *cp2, char *src, char *dst, int len);
+
 //******************************************************************************
 // Initialize PM; create hab, message queue and register special Win32 window classes
@@ -597 +600 @@
         }
         pWinMsg = &winMsg;
+
     }
     else {
@@ -940 +944 @@
         {
             MSG extramsg;
+            char cpfrom[10] = {0};
+            char cpto[10] = {0};
+            ULONG       ulCpSize, ulCP;
+
+
             memcpy(&extramsg, pWinMsg, sizeof(MSG));
             extramsg.message = WINWM_CHAR;
-            extramsg.wParam = (ULONG)mp2;
+            DosQueryCp(sizeof(ulCP), &ulCP, &ulCpSize);
+            sprintf(cpfrom,"IBM-%d\0", ulCP);
+            sprintf(cpto,"IBM-%d\0", GetDisplayCodepage());
+            if (cp2cp(cpfrom, cpto, (char*)&mp2, (char*)&extramsg.wParam, 1))
+                extramsg.wParam = (ULONG)mp2;
+
             if(SHORT1FROMMP(mp1) & KC_DEADKEY)
             {
                 extramsg.message++;  //WM_DEADCHAR/WM_SYSDEADCHAR
             }
-            
+
             win32wnd->MsgChar(&extramsg);
-        }
-
+            goto RunDefWndProc;
+        }
         break;