Changeset 7866 for trunk/src

Timestamp:

Feb 11, 2002, 2:48:43 PM (24 years ago)

Author:

sandervl

Message:

logging changes, window title fix (codepage), keyboard fixes

Location:

trunk/src/user32

Files:

• Makefile (modified) (3 diffs)
• dbglocal.cpp (modified) (2 diffs)
• dbglocal.h (modified) (2 diffs)
• dbgwrap.cpp (added)
• dde.cpp (modified) (6 diffs)
• oslibmsgtranslate.cpp (modified) (3 diffs)
• oslibwin.cpp (modified) (3 diffs)
• user32.cpp (modified) (4 diffs)
• win32wmdiclient.cpp (modified) (3 diffs)
• window.cpp (modified) (2 diffs)
• winevent.cpp (modified) (2 diffs)
• winkeyboard.cpp (modified) (2 diffs)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.99 2002-02-05 17:58:58 sandervl Exp $
+# $Id: Makefile,v 1.100 2002-02-11 13:48:39 sandervl Exp $
 
 #
@@ -11 +11 @@
 # Compiler, tools, and interference rules.
 #
+!if "$(DEBUG)" == "1"
+DEFFILE    = user32dbg.def
+ORGDEFFILE = user32.def
+!endif
+
 WRC_PREFIX_RESOURCE=1
 !include ../../makefile.inc
@@ -103 +108 @@
 $(OBJDIR)\user32rsrc.obj \
 $(OBJDIR)\oslibprf.obj \
+!ifdef DEBUG
+$(OBJDIR)\dbgwrap.obj \
+!endif
 $(OBJDIR)\stats.obj
 

trunk/src/user32/dbglocal.cpp

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.8 2002-02-05 17:58:58 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.9 2002-02-11 13:48:40 sandervl Exp $ */
 
 /*
@@ -89 +89 @@
 "win32wbaseprop",
 "dcrgn",
-"message"
+"message",
+"trace"
 };
 //******************************************************************************

trunk/src/user32/dbglocal.h

@@ -1 @@
-/* $Id: dbglocal.h,v 1.7 2002-02-05 17:58:59 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.8 2002-02-11 13:48:40 sandervl Exp $ */
 
 /*
@@ -89 +89 @@
 #define DBG_dcrgn                67
 #define DBG_message              68
-#define DBG_MAXFILES             69
+#define DBG_trace                69
+#define DBG_MAXFILES             70
 
 extern USHORT DbgEnabledUSER32[DBG_MAXFILES];

trunk/src/user32/dde.cpp

@@ -1 @@
-/* $Id: dde.cpp,v 1.14 2001-08-11 12:03:35 sandervl Exp $ */
+/* $Id: dde.cpp,v 1.15 2002-02-11 13:48:40 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 //******************************************************************************
 //******************************************************************************
-HDDEDATA WIN32API DdeAddData( HDDEDATA arg1, PVOID arg2, DWORD arg3, DWORD  arg4)
+HDDEDATA WIN32API DdeAddData( HDDEDATA arg1, LPBYTE arg2, DWORD arg3, DWORD  arg4)
 {
     dprintf(("USER32: DdeAddData %x %x %x %x", arg1, arg2, arg3, arg4));
-    return O32_DdeAddData(arg1, arg2, arg3, arg4);
-}
-//******************************************************************************
-//******************************************************************************
-HDDEDATA WIN32API DdeClientTransaction(PVOID arg1, DWORD arg2, HCONV arg3, 
+    return O32_DdeAddData(arg1, (PVOID)arg2, arg3, arg4);
+}
+//******************************************************************************
+//******************************************************************************
+HDDEDATA WIN32API DdeClientTransaction(LPBYTE arg1, DWORD arg2, HCONV arg3, 
                                        HSZ arg4, UINT arg5, UINT arg6, DWORD arg7, 
-                                       PDWORD  arg8)
+                                       LPDWORD arg8)
 {
     dprintf(("USER32: DdeClientTransaction %x %x %x %x %x %x %x %x", arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8));
 
-    return O32_DdeClientTransaction(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
+    return O32_DdeClientTransaction((PVOID)arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
 }
 //******************************************************************************
@@ -78 +78 @@
 //******************************************************************************
 //******************************************************************************
-HDDEDATA WIN32API DdeCreateDataHandle(DWORD arg1, PVOID arg2, DWORD arg3, DWORD arg4, 
+HDDEDATA WIN32API DdeCreateDataHandle(DWORD arg1, LPBYTE arg2, DWORD arg3, DWORD arg4, 
                                       HSZ arg5, UINT arg6, UINT  arg7)
 {
     dprintf(("USER32: DdeCreateDataHandle %x %x %x %x %x %x %x", arg1, arg2, arg3, arg4, arg5, arg6, arg7));
-    return O32_DdeCreateDataHandle(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    return O32_DdeCreateDataHandle(arg1, (PVOID)arg2, arg3, arg4, arg5, arg6, arg7);
 }
 //******************************************************************************
@@ -148 +148 @@
 //******************************************************************************
 //******************************************************************************
-DWORD WIN32API DdeGetData( HDDEDATA arg1, PVOID arg2, DWORD arg3, DWORD  arg4)
+DWORD WIN32API DdeGetData( HDDEDATA arg1, LPBYTE arg2, DWORD arg3, DWORD  arg4)
 {
     dprintf(("USER32: DdeGetData %x %x %x %x", arg1, arg2, arg3, arg4));
 
-    return O32_DdeGetData(arg1, arg2, arg3, arg4);
+    return O32_DdeGetData(arg1, (PVOID)arg2, arg3, arg4);
 }
 //******************************************************************************
@@ -324 +324 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API ReuseDDElParam( UINT arg1, UINT arg2, UINT arg3, UINT arg4, UINT arg5)
+UINT WIN32API ReuseDDElParam(LPARAM arg1, UINT arg2, UINT arg3, UINT arg4, UINT arg5)
 {
     dprintf(("USER32:  ReuseDDElParam\n"));
@@ -332 +332 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API UnpackDDElParam(UINT arg1, UINT arg2, LPUINT arg3, LPUINT  arg4)
+BOOL WIN32API UnpackDDElParam(UINT arg1, LPARAM arg2, PUINT arg3, PUINT arg4)
 {
     dprintf(("USER32:  UnpackDDElParam\n"));

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.80 2002-02-08 09:58:42 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.81 2002-02-11 13:48:40 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -667 +667 @@
             winMsg->lParam |= WIN_KEY_PREVSTATE;                    // bit 30, previous state, always 1 for a WM_KEYUP message
             winMsg->lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP
-
+          }
+          else 
+          { // send WM_KEYDOWN message
+            winMsg->message = WINWM_KEYDOWN;
+            if (keyWasPressed)
+              winMsg->lParam |= WIN_KEY_PREVSTATE;                  // bit 30, previous state, 1 means key was pressed
+             
             //Shift-Enter and possibly others need to have special handling
-             if (flags & KC_SHIFT)
-             {
+            if (flags & KC_SHIFT)
+            {
                 if(fMsgRemoved && !(teb->o.odin.fTranslated))
                 {                    
@@ -680 +686 @@
     
                     extramsg.message = WINWM_CHAR;
-                    extramsg.lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP 
 
                     // insert message into the queue
                     setThreadQueueExtraCharMessage(teb, &extramsg);
-
-                    winMsg->message = WINWM_KEYDOWN;
                     winMsg->lParam &= 0x3FFFFFFF;
                   }
                } // else ???
             } // KC_SHIFT
-          }
-          else 
-          {
-            // send WM_KEYDOWN message
-            winMsg->message = WINWM_KEYDOWN;
-            if (keyWasPressed)
-              winMsg->lParam |= WIN_KEY_PREVSTATE;                  // bit 30, previous state, 1 means key was pressed
+            else
+            {
+              // in case we handle Enter directly through PMKBDHOOK
+              if ((os2Msg->msg == WM_CHAR_SPECIAL) && (winMsg->wParam == VK_RETURN_W)
+                   && (fMsgRemoved && !(teb->o.odin.fTranslated)))
+              {
+                    MSG extramsg;
+                    memcpy(&extramsg, winMsg, sizeof(MSG));
+    
+                    extramsg.message = WINWM_CHAR;
+
+                    // insert message into the queue
+                    setThreadQueueExtraCharMessage(teb, &extramsg);
+              }
+            }
           }
         }

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.113 2002-01-20 15:26:20 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.114 2002-02-11 13:48:41 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -1035 +1035 @@
     swctrl.bProgType     = PROG_PM;
     if(title) {
-        strncpy(swctrl.szSwtitle, title, MAXNAMEL+4);
+//        strncpy(swctrl.szSwtitle, title, MAXNAMEL+4);
+        CharToOemBuffA( title, swctrl.szSwtitle, MAXNAMEL+4 );
         swctrl.szSwtitle[MAXNAMEL+4-1] = 0;
     }
@@ -1060 +1061 @@
     swctrl.bProgType     = PROG_PM;
     if(title) {
-        strncpy(swctrl.szSwtitle, title, MAXNAMEL+4);
+//        strncpy(swctrl.szSwtitle, title, MAXNAMEL+4);
+        CharToOemBuffA( title, swctrl.szSwtitle, MAXNAMEL+4 );
         swctrl.szSwtitle[MAXNAMEL+4-1] = 0;
     }

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.119 2002-02-05 17:58:59 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.120 2002-02-11 13:48:41 sandervl Exp $ */
 
 /*
@@ -2058 +2058 @@
  * Author    : Patrick Haller [Wed, 1998/06/16 11:55]
  *****************************************************************************/
-BOOL WIN32API EndTask(DWORD x1,
-                         DWORD x2,
-                         DWORD x3)
+BOOL WIN32API EndTask(DWORD x1, DWORD x2, DWORD x3)
 {
   dprintf(("USER32: EndTask(%08xh,%08xh,%08xh) not implemented.\n",
@@ -2080 +2078 @@
  * Author    : Patrick Haller [Wed, 1998/06/16 11:55]
  *****************************************************************************/
-BOOL WIN32API GetNextQueueWindow(DWORD x1,
-                                    DWORD x2)
+BOOL WIN32API GetNextQueueWindow(DWORD x1, DWORD x2)
 {
   dprintf(("USER32: GetNextQueueWindow(%08xh,%08xh) not implemented.\n",
@@ -2178 +2175 @@
                                 DWORD x4)
 {
-  dprintf(("USER32: SysErrorBox(%08xh,%08xh,%08xh,%08xh) not implemented.\n",
+  dprintf(("USER32: UserSignalProc(%08xh,%08xh,%08xh,%08xh) not implemented.\n",
            x1,
            x2,

trunk/src/user32/win32wmdiclient.cpp

@@ -1 @@
-/* $Id: win32wmdiclient.cpp,v 1.39 2001-09-19 15:39:51 sandervl Exp $ */
+/* $Id: win32wmdiclient.cpp,v 1.40 2002-02-11 13:48:42 sandervl Exp $ */
 /*
  * Win32 MDI Client Window Class for OS/2
@@ -99 +99 @@
  * Author    : Patrick Haller [Wed, 1998/06/16 11:55]
  *****************************************************************************/
-BOOL WIN32API CascadeChildWindows(DWORD x1,
-                                     DWORD x2)
+BOOL WIN32API CascadeChildWindows(HWND x1, DWORD x2)
 {
   dprintf(("USER32: CascadeChildWindows(%08xh,%08xh) not implemented.\n",
@@ -120 +119 @@
  * Author    : Patrick Haller [Wed, 1998/06/16 11:55]
  *****************************************************************************/
-BOOL WIN32API TileChildWindows(DWORD x1,
-                                  DWORD x2)
+BOOL WIN32API TileChildWindows(HWND x1, DWORD x2)
 {
   dprintf(("USER32: TileChildWindows(%08xh,%08xh) not implemented.\n",

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.116 2002-02-06 16:31:48 sandervl Exp $ */
+/* $Id: window.cpp,v 1.117 2002-02-11 13:48:42 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -593 +593 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION2(BOOL, ShowWindowAsync,
-              HWND, hwnd,
-              int,  nCmdShow)
+BOOL WIN32API ShowWindowAsync(HWND hwnd, int nCmdShow)
 {
   dprintf(("USER32:ShowWindowAsync (%08xh,%08x) not correctly implemented.\n",

trunk/src/user32/winevent.cpp

@@ -1 @@
-/* $Id: winevent.cpp,v 1.1 2001-08-31 20:31:03 phaller Exp $ */
+/* $Id: winevent.cpp,v 1.2 2002-02-11 13:48:42 sandervl Exp $ */
 
 /*
@@ -62 +62 @@
  *****************************************************************************/
 
-ODINPROCEDURE4(NotifyWinEvent,
-               DWORD, event,
-               HWND,  hwnd,
-               LONG,  idObjectType,
-               LONG,  idObject)
+void WIN32API NotifyWinEvent(DWORD event, HWND hwnd, LONG idObjectType, LONG idObject)
 {
   /*

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.29 2002-01-02 18:37:09 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.30 2002-02-11 13:48:43 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -1772 +1772 @@
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
  *****************************************************************************/
-ODINFUNCTION1(BOOL, UnloadKeyboardLayout,
-              HKL,  hkl)
+BOOL WIN32API UnloadKeyboardLayout(HKL hkl)
 {
   dprintf(("not implemented.\n"));