Changeset 2201 for trunk/src/user32

Timestamp:

Dec 24, 1999, 7:51:55 PM (26 years ago)

Author:

sandervl

Message:

Message handling rewrite

Location:

trunk/src/user32

Files:

• Makefile (modified) (3 diffs)
• oslibwin.cpp (modified) (2 diffs)
• winmouse.cpp (modified) (3 diffs)
• winmouse.h (modified) (2 diffs)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.50 1999-12-19 20:16:46 sandervl Exp $
+# $Id: Makefile,v 1.51 1999-12-24 18:51:55 sandervl Exp $
 
 #
@@ -42 +42 @@
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj win32wbasepos.obj \
         oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
-        caret.obj resource.obj winproc.obj text.obj \
+        caret.obj resource.obj winproc.obj text.obj oslibmsgtranslate.obj \
         windlgmsg.obj windlg.obj win32wdesktop.obj
 
@@ -141 +141 @@
 oslibutil.obj:  oslibutil.cpp oslibutil.h $(PDWIN32_INCLUDE)\wprocess.h oslibmsg.h
 oslibmsg.obj:   oslibmsg.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h
+oslibmsgtranslate.obj: oslibmsgtranslate.cpp oslibmsg.h timer.h win32wbase.h win32wnd.h
 oslibmenu.obj:  oslibmenu.cpp oslibmenu.h
 oslibgdi.obj:   oslibgdi.cpp oslibgdi.h win32wbase.h

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.50 1999-12-05 16:37:57 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.51 1999-12-24 18:51:55 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -1087 +1087 @@
       WinSetParent(WinWindowFromID(hwnd, FID_SYSMENU), HWND_OBJECT, FALSE);
 
-  if(OSFrameStyle & FCF_MINBUTTON | OSFrameStyle & FCF_MAXBUTTON)
+  if((OSFrameStyle & FCF_MINBUTTON) || (OSFrameStyle & FCF_MAXBUTTON))
       WinSetParent(OSLibWinObjectWindowFromID(hwnd, FID_MINMAX), hwnd, FALSE);
   else

trunk/src/user32/winmouse.cpp

@@ -1 @@
-/* $Id: winmouse.cpp,v 1.1 1999-11-08 13:44:40 sandervl Exp $ */
+/* $Id: winmouse.cpp,v 1.2 1999-12-24 18:51:55 sandervl Exp $ */
 /*
  * Mouse handler for DINPUT
@@ -30 +30 @@
 //******************************************************************************
 //******************************************************************************
-BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y, ULONG info)
+BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y)
 {
  WINE_MOUSEEVENT mouseEvent;
@@ -44 +44 @@
   if(msg == MOUSEMSG_BUTTON) 
   {
-        switch(info) 
+        switch(msg) 
         {
-        case BUTTON_LEFTDOWN:
+        case WM_LBUTTONDOWN:
                 dwFlags |= MOUSEEVENTF_LEFTDOWN;
                 break;
-        case BUTTON_LEFTUP:
+        case WM_LBUTTONUP:
                 dwFlags |= MOUSEEVENTF_LEFTUP;
                 break;
-        case BUTTON_RIGHTUP:
+        case WM_RBUTTONUP:
                 dwFlags |= MOUSEEVENTF_RIGHTUP;
                 break;
-        case BUTTON_RIGHTDOWN:
+        case WM_RBUTTONDOWN:
                 dwFlags |= MOUSEEVENTF_RIGHTDOWN;
                 break;
-        case BUTTON_MIDDLEUP:
+        case WM_MBUTTONUP:
                 dwFlags |= MOUSEEVENTF_MIDDLEUP;
                 break;
-        case BUTTON_MIDDLEDOWN:
+        case WM_MBUTTONDOWN:
                 dwFlags |= MOUSEEVENTF_MIDDLEDOWN;
                 break;

trunk/src/user32/winmouse.h

@@ -1 @@
-/* $Id: winmouse.h,v 1.1 1999-11-08 13:44:41 sandervl Exp $ */
+/* $Id: winmouse.h,v 1.2 1999-12-24 18:51:55 sandervl Exp $ */
 /*
  * Mouse handler for DINPUT
@@ -21 +21 @@
 #define MOUSEMSG_MOVE   1
 
-BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y, ULONG info);
+BOOL DInputMouseHandler(HWND hwnd, ULONG msg, ULONG x, ULONG y);
 
 #endif //__WINMOUSE_H__