Changeset 759 for trunk/src/winmm/os2timer.cpp

Timestamp:

Aug 31, 1999, 6:41:48 PM (26 years ago)

Author:

phaller

Message:

Fix: MM-timers should now use correct calling convention

File:

• trunk/src/winmm/os2timer.cpp (modified) (6 diffs)

trunk/src/winmm/os2timer.cpp

@@ -1 @@
-/* $Id: os2timer.cpp,v 1.10 1999-08-31 15:47:48 phaller Exp $ */
+/* $Id: os2timer.cpp,v 1.11 1999-08-31 16:41:48 phaller Exp $ */
 
 /*
@@ -35 +35 @@
 
 
+/***********************************
+ * PH: fixups for missing os2win.h *
+ ***********************************/
+
+extern "C"
+{
+  typedef DWORD (* CALLBACK LPTHREAD_START_ROUTINE)(LPVOID);
+
+  HANDLE WIN32API CreateThread(LPSECURITY_ATTRIBUTES lpsa,
+                               DWORD cbStack,
+                               LPTHREAD_START_ROUTINE lpStartAddr,
+                               LPVOID lpvThreadParm,
+                               DWORD fdwCreate,
+                               LPDWORD lpIDThread);
+}
+
 /****************************************************************************
  * Local Prototypes                                                         *
  ****************************************************************************/
 
-static void _Optlink TimerHlpHandler(void *);
-
+static DWORD _System TimerHlpHandler(LPVOID timer);
 
 
@@ -206 +221 @@
                   clientCallback(NULL), TimerStatus(Stopped), fFatal(FALSE)
 {
- OS2Timer *timer = OS2Timer::timers;
+  OS2Timer *timer = OS2Timer::timers;
 
   if(timer != NULL)
@@ -219 +234 @@
     timers = this;
 
-  TimerThreadID = _beginthread(TimerHlpHandler, NULL, 0x4000, (void *)this);
+  //TimerThreadID = _beginthread(TimerHlpHandler, NULL, 0x4000, (void *)this);
+  hTimerThread = CreateThread(NULL,
+                              0x1000,
+                              (LPTHREAD_START_ROUTINE)TimerHlpHandler,
+                              (LPVOID)this,
+                              0, // thread creation flags
+                              &TimerThreadID);
+
+
+  //@@@PH: CreateThread() should be used instead
   //@@@PH: logic sux ... waits for creation of semaphores
   DosSleep(100);
@@ -329 +353 @@
   {
     dprintf(("WINMM: OS2Timer: DosCreateEventSem failed rc=#%08xh\n", rc));
-      _endthread();
+    return; // terminate thread
   }
 
@@ -352 +376 @@
 //******************************************************************************
 //******************************************************************************
-static void _Optlink TimerHlpHandler(void *timer)
+//static void _Optlink TimerHlpHandler(void *timer)
+static DWORD _System TimerHlpHandler(LPVOID timer)
 {
   ((OS2Timer *)timer)->TimerHandler();
 
-  _endthread();
+  //_endthread(); isn't really required
+  return 0;
 }