Module: wine Branch: master Commit: e7c60141d616b609b99e59a19375fc9759c3e4fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7c60141d616b609b99e59a19...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Jul 17 11:52:26 2020 +0200
ntdll: Move some timer stub functions to the Unix library.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/nt.c | 12 ------------ dlls/ntdll/ntdll.spec | 12 ++++++------ dlls/ntdll/sync.c | 33 --------------------------------- dlls/ntdll/unix/sync.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 51 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ed2f60333a..d27dca4be0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -826,18 +826,6 @@ NTSTATUS WINAPI NtReplyWaitReceivePort( * Misc */
- /****************************************************************************** - * NtSetIntervalProfile [NTDLL.@] - * ZwSetIntervalProfile [NTDLL.@] - */ -NTSTATUS WINAPI NtSetIntervalProfile( - ULONG Interval, - KPROFILE_SOURCE Source) -{ - FIXME("%u,%d\n", Interval, Source); - return STATUS_SUCCESS; -} - /*********************************************************************** * RtlIsProcessorFeaturePresent [NTDLL.@] */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f6d8811ba8..22cb9d1942 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -320,7 +320,7 @@ @ stdcall -syscall NtQuerySystemInformationEx(long ptr long ptr long ptr) @ stdcall -syscall NtQuerySystemTime(ptr) @ stdcall -syscall NtQueryTimer(ptr long ptr long ptr) -@ stdcall NtQueryTimerResolution(ptr ptr ptr) +@ stdcall -syscall NtQueryTimerResolution(ptr ptr ptr) @ stdcall -syscall NtQueryValueKey(long ptr long ptr long ptr) @ stdcall -syscall NtQueryVirtualMemory(long ptr long ptr long ptr) @ stdcall -syscall NtQueryVolumeInformationFile(long ptr ptr long long) @@ -380,7 +380,7 @@ @ stdcall -syscall NtSetInformationProcess(long long ptr long) @ stdcall -syscall NtSetInformationThread(long long ptr long) @ stdcall NtSetInformationToken(long long ptr long) -@ stdcall NtSetIntervalProfile(long long) +@ stdcall -syscall NtSetIntervalProfile(long long) @ stdcall -syscall NtSetIoCompletion(ptr long long long long) @ stdcall -syscall NtSetLdtEntries(long int64 long int64) @ stub NtSetLowEventPair @@ -396,7 +396,7 @@ @ stdcall -syscall NtSetSystemTime(ptr ptr) @ stdcall NtSetThreadExecutionState(long ptr) @ stdcall -syscall NtSetTimer(long ptr ptr ptr long long ptr) -@ stdcall NtSetTimerResolution(long long ptr) +@ stdcall -syscall NtSetTimerResolution(long long ptr) # @ stub NtSetUuidSeed @ stdcall -syscall NtSetValueKey(long ptr long long ptr long) @ stdcall -syscall NtSetVolumeInformationFile(long ptr ptr long long) @@ -1307,7 +1307,7 @@ @ stdcall -private -syscall ZwQuerySystemInformationEx(long ptr long ptr long ptr) NtQuerySystemInformationEx @ stdcall -private -syscall ZwQuerySystemTime(ptr) NtQuerySystemTime @ stdcall -private -syscall ZwQueryTimer(ptr long ptr long ptr) NtQueryTimer -@ stdcall -private ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution +@ stdcall -private -syscall ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution @ stdcall -private -syscall ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey @ stdcall -private -syscall ZwQueryVirtualMemory(long ptr long ptr long ptr) NtQueryVirtualMemory @ stdcall -private -syscall ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile @@ -1367,7 +1367,7 @@ @ stdcall -private -syscall ZwSetInformationProcess(long long ptr long) NtSetInformationProcess @ stdcall -private -syscall ZwSetInformationThread(long long ptr long) NtSetInformationThread @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken -@ stdcall -private ZwSetIntervalProfile(long long) NtSetIntervalProfile +@ stdcall -private -syscall ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall -private -syscall ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion @ stdcall -private -syscall ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries @ stub ZwSetLowEventPair @@ -1383,7 +1383,7 @@ @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime @ stdcall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private -syscall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer -@ stdcall -private ZwSetTimerResolution(long long ptr) NtSetTimerResolution +@ stdcall -private -syscall ZwSetTimerResolution(long long ptr) NtSetTimerResolution # @ stub ZwSetUuidSeed @ stdcall -private -syscall ZwSetValueKey(long ptr long long ptr long) NtSetValueKey @ stdcall -private -syscall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b5768f244d..8aa36c75eb 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -37,8 +37,6 @@ #include "wine/debug.h" #include "ntdll_misc.h"
-WINE_DEFAULT_DEBUG_CHANNEL(sync); - /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) @@ -122,37 +120,6 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a return STATUS_SUCCESS; }
-/* - * Timers - */ - -/****************************************************************************** - * NtQueryTimerResolution [NTDLL.@] - */ -NTSTATUS WINAPI NtQueryTimerResolution(OUT ULONG* min_resolution, - OUT ULONG* max_resolution, - OUT ULONG* current_resolution) -{ - FIXME("(%p,%p,%p), stub!\n", - min_resolution, max_resolution, current_resolution); - - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtSetTimerResolution [NTDLL.@] - */ -NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, - IN BOOLEAN set_resolution, - OUT ULONG* current_resolution ) -{ - FIXME("(%u,%u,%p), stub!\n", - resolution, set_resolution, current_resolution); - - return STATUS_NOT_IMPLEMENTED; -} - -
/****************************************************************** * RtlRunOnceInitialize (NTDLL.@) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7dda01923c..cdfb8295c0 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1424,6 +1424,36 @@ NTSTATUS WINAPI NtSetSystemTime( const LARGE_INTEGER *new, LARGE_INTEGER *old ) }
+/*********************************************************************** + * NtQueryTimerResolution (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryTimerResolution( ULONG *min_res, ULONG *max_res, ULONG *current_res ) +{ + FIXME( "(%p,%p,%p), stub!\n", min_res, max_res, current_res ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * NtSetTimerResolution (NTDLL.@) + */ +NTSTATUS WINAPI NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res ) +{ + FIXME( "(%u,%u,%p), stub!\n", res, set, current_res ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSetIntervalProfile (NTDLL.@) + */ +NTSTATUS WINAPI NtSetIntervalProfile( ULONG interval, KPROFILE_SOURCE source ) +{ + FIXME( "%u,%d\n", interval, source ); + return STATUS_SUCCESS; +} + + /****************************************************************************** * NtGetTickCount (NTDLL.@) */