Changeset 1066 for trunk/src

Timestamp:

Sep 26, 1999, 6:09:04 PM (26 years ago)

Author:

dengert

Message:

SetTimer/KillTimer implemented

Location:

trunk/src/user32

Files:

• Makefile (modified) (4 diffs)
• oslibmsg.cpp (modified) (5 diffs)
• timer.cpp (added)
• timer.h (added)
• user32.cpp (modified) (3 diffs)

trunk/src/user32/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.22 1999-09-26 10:09:59 sandervl Exp $
+# $Id: Makefile,v 1.23 1999-09-26 16:09:04 dengert Exp $
 
 #
@@ -34 +34 @@
         oslibutil.obj oslibmsg.obj dib.obj oslibdos.obj win32wmdichild.obj \
         winprop.obj wingdi.obj oslibgdi.obj winaccel.obj \
-        nativerc.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj\
+        nativerc.obj oslibres.obj dummy.obj oslibmenu.obj dc.obj timer.obj \
         windlgmsg.obj windlg.obj win32wdesktop.obj
 
@@ -106 +106 @@
 win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h
 win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
-win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h 
-win32wndchild.obj: win32wndchild.cpp win32wndchild.h gen_object.h 
-win32wmdiclient.obj: win32wmdiclient.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h 
-win32wmdichild.obj: win32wmdichild.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h 
-win32wdesktop.obj: win32wdesktop.cpp win32wbase.h win32wdesktop.h gen_object.h 
+win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h
+win32wndchild.obj: win32wndchild.cpp win32wndchild.h gen_object.h
+win32wmdiclient.obj: win32wmdiclient.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h
+win32wmdichild.obj: win32wmdichild.cpp win32wbase.h win32wmdiclient.h win32wmdichild.h gen_object.h
+win32wdesktop.obj: win32wdesktop.cpp win32wbase.h win32wdesktop.h gen_object.h
 gen_object.obj: gen_object.cpp gen_object.h heapshared.h
 oslibwin.obj:   oslibwin.cpp oslibwin.h oslibutil.h oslibgdi.h $(PDWIN32_INCLUDE)\winconst.h
 oslibutil.obj:  oslibutil.cpp oslibutil.h $(PDWIN32_INCLUDE)\wprocess.h oslibmsg.h
-oslibmsg.obj:   oslibmsg.cpp oslibmsg.h
+oslibmsg.obj:   oslibmsg.cpp oslibmsg.h timer.h
 oslibmenu.obj:  oslibmenu.cpp oslibmenu.h
 oslibgdi.obj:   oslibgdi.cpp oslibgdi.h win32wbase.h
@@ -120 +120 @@
 oslibdos.obj:   oslibdos.cpp oslibdos.h
 dc.obj:         dc.cpp win32wbase.h dc.h
+timer.obj:      timer.cpp win32wbase.h timer.h
 
 clipboard.obj:  clipboard.cpp

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.1 1999-09-15 23:18:54 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.2 1999-09-26 16:09:04 dengert Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -22 +22 @@
 #include <win32wnd.h>
 #include "oslibutil.h"
+#include "timer.h"
 
 QMSG *MsgThreadPtr = 0;
@@ -29 +30 @@
 BOOL OSLibInitMsgQueue()
 {
-   if(DosAllocThreadLocalMemory(sizeof(QMSG)/sizeof(ULONG), (PULONG *)&MsgThreadPtr) != 0) 
+   if(DosAllocThreadLocalMemory(sizeof(QMSG)/sizeof(ULONG), (PULONG *)&MsgThreadPtr) != 0)
    {
-        dprintf(("OSLibInitMsgQueue: local thread memory alloc failed!!"));
-        DebugInt3();
-        return FALSE;
+        dprintf(("OSLibInitMsgQueue: local thread memory alloc failed!!"));
+        DebugInt3();
+        return FALSE;
    }
    return TRUE;
@@ -70 +71 @@
 //TODO: What to do if app changed msg? (translate)
 //  WinToOS2MsgTranslate(msg, &qmsg, isUnicode);
-  
+
   return (LONG)WinDispatchMsg(GetThreadHAB(), MsgThreadPtr);
 }
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinGetMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax, 
+BOOL OSLibWinGetMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
                     BOOL isUnicode)
 {
- BOOL rc;
+ BOOL rc, eaten;
 
-  rc = WinGetMsg(GetThreadHAB(), MsgThreadPtr, TranslateWinMsg(uMsgFilterMin), TranslateWinMsg(uMsgFilterMax), 0);
+  do {
+    eaten = FALSE;
+    rc = WinGetMsg(GetThreadHAB(), MsgThreadPtr, TranslateWinMsg(uMsgFilterMin), TranslateWinMsg(uMsgFilterMax), 0);
+    if (MsgThreadPtr->msg == WM_TIMER)
+      eaten = TIMER_HandleTimer (MsgThreadPtr);
+  } while (eaten);
+
   OS2ToWinMsgTranslate(MsgThreadPtr, pMsg, isUnicode);
   return rc;
@@ -86 +93 @@
 //******************************************************************************
 //******************************************************************************
-BOOL  OSLibWinPeekMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax, 
+BOOL  OSLibWinPeekMsg(LPMSG pMsg, HWND hwnd, UINT uMsgFilterMin, UINT uMsgFilterMax,
                       BOOL fRemove, BOOL isUnicode)
 {
  BOOL rc;
 
-  rc = WinPeekMsg(GetThreadHAB(), MsgThreadPtr, hwnd, TranslateWinMsg(uMsgFilterMin), 
+  rc = WinPeekMsg(GetThreadHAB(), MsgThreadPtr, hwnd, TranslateWinMsg(uMsgFilterMin),
                   TranslateWinMsg(uMsgFilterMax), (fRemove == MSG_REMOVE) ? PM_REMOVE : PM_NOREMOVE);
   OS2ToWinMsgTranslate(MsgThreadPtr, pMsg, isUnicode);

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.32 1999-09-26 10:10:00 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.33 1999-09-26 16:09:03 dengert Exp $ */
 
 /*
@@ -878 +878 @@
 //******************************************************************************
 //******************************************************************************
+#if 0
 UINT WIN32API SetTimer( HWND hwnd, UINT idTimer, UINT uTimeout, TIMERPROC  tmprc)
 {
@@ -900 +901 @@
     return O32_KillTimer(hWnd,uIDEvent);
 }
+#endif
 //******************************************************************************
 //******************************************************************************