Changeset 10185 for trunk/src/user32/windowmsg.cpp

Timestamp:

Jul 28, 2003, 1:35:32 PM (22 years ago)

Author:

sandervl

Message:

Updates

File:

• trunk/src/user32/windowmsg.cpp (modified) (11 diffs)

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.42 2003-05-16 10:59:28 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.43 2003-07-28 11:27:50 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -105 +105 @@
         return FALSE;
     }
-  
+
     // only WM_KEYDOWN, WM_KEYUP, WM_SYSKEYDOWN, WM_SYSKEYUP
     // can go into TranslateMessage
-  
+
     return OSLibWinTranslateMessage((MSG *)msg);
 }
@@ -140 +140 @@
 {
     BOOL fFoundMsg;
- 
+
     dprintf2(("PeekMessageA %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
     fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
@@ -314 +314 @@
  *  when the WM_SETTEXT message has been used to set the icon
  */
-INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM *plparam )
+INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM *pwparam, LPARAM *plparam )
 {
     switch(msg)
@@ -321 +321 @@
         {
             LPARAM *ptr = (LPARAM *)HeapAlloc( GetProcessHeap(), 0,
-                                     wParam * sizeof(WCHAR) + sizeof(LPARAM) );
+                                     *pwparam * sizeof(WCHAR) + sizeof(LPARAM) );
             if (!ptr) return -1;
             *ptr++ = *plparam;  /* Store previous lParam */
@@ -431 +431 @@
         return 1;
 
+    /* kso 2003-07-03: to make password field work, I took this from latest wine code. (winproc.c) */
+    case EM_SETPASSWORDCHAR:
+        {
+            BYTE    ch = LOWORD(*pwparam);
+            WCHAR   wch = 0;
+            MultiByteToWideChar(CP_ACP, 0, (LPCSTR)&ch, 1, &wch, 1);
+            *pwparam = MAKEWPARAM( wch, HIWORD(*pwparam) );
+        }
+        return 0;
+
     case WM_ASKCBFORMATNAME:
     case WM_DEVMODECHANGE:
     case WM_PAINTCLIPBOARD:
     case WM_SIZECLIPBOARD:
-    case EM_SETPASSWORDCHAR:
         // FIXME_(msg)("message %s (0x%x) needs translation, please report\n", SPY_GetMsgName(msg), msg );
         return -1;
@@ -810 +819 @@
     LRESULT result;
 
-    if (WINPROC_MapMsg32ATo32W( hwnd, msg, wParam, &lParam ) == -1) return 0;
+    if (WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam ) == -1) return 0;
     result = func( hwnd, msg, wParam, lParam );
     WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
@@ -911 +920 @@
               //TODO: Ignoring all messages could be dangerous. But processing them,
               //while the app doesn't expect any, isn't safe either.
-              if(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) 
+              if(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE))
               {
                   if (msg.message == WM_QUIT) {
@@ -965 +974 @@
                 //TODO: Ignoring all messages could be dangerous. But processing them,
                 //while the app doesn't expect any, isn't safe either.
-                if(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) 
+                if(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE))
                 {
                     if (msg.message == WM_QUIT) {
@@ -971 +980 @@
                          return WAIT_ABANDONED;
                     }
-   
+
                     /* otherwise dispatch it */
                     DispatchMessageA(&msg);
@@ -1036 +1045 @@
         //TODO: Ignoring all messages could be dangerous. But processing them,
         //while the app doesn't expect any, isn't safe either.
-        if(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) 
+        if(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE))
         {
             if (msg.message == WM_QUIT) {