Fixed timer issues

svn path=/trunk/; revision=1573

diff --git a/reactos/include/ddk/zwtypes.h b/reactos/include/ddk/zwtypes.h
index 90f4396..31c6af7 100644 (file)
--- a/reactos/include/ddk/zwtypes.h
+++ b/reactos/include/ddk/zwtypes.h
@@ -1192,16 +1192,6 @@ typedef struct _FILE_NOTIFY_INFORMATION {
 */
 
 
-//FIXME: I am a win32 object
-typedef
-VOID
-(*PTIMERAPCROUTINE)(
-       LPVOID lpArgToCompletionRoutine,
-       DWORD dwTimerLowValue,
-       DWORD dwTimerHighValue
-       );
-
-
 // File System Control commands ( related to defragging )
 
 #define        FSCTL_READ_MFT_RECORD                   0x90068 // NTFS only

diff --git a/reactos/include/funcs.h b/reactos/include/funcs.h
index 77c82c2..652e48a 100644 (file)
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@@ -4404,13 +4404,16 @@ SetTimer(
         TIMERPROC lpTimerFunc);
 
 
-BOOL STDCALL SetWaitableTimer( HANDLE Timer,
-                              const LARGE_INTEGER *duetime,
-                              LONG Period,
-                              PTIMERAPCROUTINE Apcroutine,
-                              LPVOID Param,
-                              BOOL Resume );
-  
+WINBOOL
+STDCALL
+SetWaitableTimer(HANDLE hTimer,
+                const LARGE_INTEGER *pDueTime,
+                LONG lPeriod,
+                PTIMERAPCROUTINE pfnCompletionRoutine,
+                LPVOID lpArgToCompletionRoutine,
+                WINBOOL fResume);
+
+
 WINBOOL
 STDCALL
 KillTimer(

diff --git a/reactos/include/ntos/types.h b/reactos/include/ntos/types.h
index 04515bc..6d387e4 100644 (file)
--- a/reactos/include/ntos/types.h
+++ b/reactos/include/ntos/types.h
@@ -343,4 +343,13 @@ typedef struct _SMALL_RECT {
   SHORT Bottom;
 } SMALL_RECT, *PSMALL_RECT;
 
+
+typedef
+VOID
+(*PTIMERAPCROUTINE)(
+       LPVOID lpArgToCompletionRoutine,
+       DWORD dwTimerLowValue,
+       DWORD dwTimerHighValue
+       );
+
 #endif /* __INCLUDE_TYPES_H */

diff --git a/reactos/lib/kernel32/synch/timer.c b/reactos/lib/kernel32/synch/timer.c
index af5ab37..5cb6890 100644 (file)
--- a/reactos/lib/kernel32/synch/timer.c
+++ b/reactos/lib/kernel32/synch/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.6 2000/08/05 18:01:50 dwelch Exp $
+/* $Id: timer.c,v 1.7 2001/01/27 19:35:04 ekohl Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -144,7 +144,7 @@ OpenWaitableTimerA (
 
 WINBOOL STDCALL SetWaitableTimer(
   HANDLE hTimer,
-  LARGE_INTEGER *pDueTime,
+  const LARGE_INTEGER *pDueTime,
   LONG lPeriod,
   PTIMERAPCROUTINE pfnCompletionRoutine,
   LPVOID lpArgToCompletionRoutine,
@@ -154,7 +154,7 @@ WINBOOL STDCALL SetWaitableTimer(
        NTSTATUS errCode;
        BOOLEAN pState;
 
-       errCode = NtSetTimer(hTimer, pDueTime,
+       errCode = NtSetTimer(hTimer, (LARGE_INTEGER *)pDueTime,
                 pfnCompletionRoutine,
                lpArgToCompletionRoutine, fResume, lPeriod, &pState);