Alexandre Julliard : ntdll: Fix the RtlCreateTimer() argument order.

Alexandre Julliard julliard at winehq.org
Tue Dec 14 15:34:33 CST 2021


Module: wine
Branch: master
Commit: 8125687441923e11ffb8918b89f3c0d85040b8e2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8125687441923e11ffb8918b89f3c0d85040b8e2

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Dec 14 21:48:44 2021 +0100

ntdll: Fix the RtlCreateTimer() argument order.

Found by Dávid Török.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernelbase/sync.c  | 2 +-
 dlls/ntdll/threadpool.c | 4 ++--
 include/winternl.h      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c
index ab963c62221..1ae72c770eb 100644
--- a/dlls/kernelbase/sync.c
+++ b/dlls/kernelbase/sync.c
@@ -818,7 +818,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateTimerQueueTimer( PHANDLE timer, HANDLE queue
                                                      WAITORTIMERCALLBACK callback, PVOID arg,
                                                      DWORD when, DWORD period, ULONG flags )
 {
-    return set_ntstatus( RtlCreateTimer( timer, queue, callback, arg, when, period, flags ));
+    return set_ntstatus( RtlCreateTimer( queue, timer, callback, arg, when, period, flags ));
 }
 
 
diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c
index ca323919d05..827232b2143 100644
--- a/dlls/ntdll/threadpool.c
+++ b/dlls/ntdll/threadpool.c
@@ -887,8 +887,8 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue)
  * Creates a new timer associated with the given queue.
  *
  * PARAMS
- *  NewTimer   [O] The newly created timer.
  *  TimerQueue [I] The queue to hold the timer.
+ *  NewTimer   [O] The newly created timer.
  *  Callback   [I] The callback to fire.
  *  Parameter  [I] The argument for the callback.
  *  DueTime    [I] The delay, in milliseconds, before first firing the
@@ -906,7 +906,7 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue)
  *  Success: STATUS_SUCCESS.
  *  Failure: Any NTSTATUS code.
  */
-NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue,
+NTSTATUS WINAPI RtlCreateTimer(HANDLE TimerQueue, HANDLE *NewTimer,
                                RTL_WAITORTIMERCALLBACKFUNC Callback,
                                PVOID Parameter, DWORD DueTime, DWORD Period,
                                ULONG Flags)
diff --git a/include/winternl.h b/include/winternl.h
index 7c3a0c3cf57..0e23fdd97bf 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -4200,7 +4200,7 @@ NTSYSAPI NTSTATUS  WINAPI RtlCreateProcessParameters(RTL_USER_PROCESS_PARAMETERS
 NTSYSAPI NTSTATUS  WINAPI RtlCreateProcessParametersEx(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,ULONG);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateTimerQueue(PHANDLE);
-NTSYSAPI NTSTATUS  WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG);
+NTSYSAPI NTSTATUS  WINAPI RtlCreateTimer(HANDLE,HANDLE*,RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG);
 NTSYSAPI BOOLEAN   WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR);
 NTSYSAPI BOOLEAN   WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR);
 NTSYSAPI NTSTATUS  WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*);




More information about the wine-cvs mailing list