From 398cfe48079ce02f0f13f62273b31f5ee0fd1a4b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 17 Jul 2020 11:49:51 +0200 Subject: [PATCH] ntdll: Move some system stub functions to the Unix library. Signed-off-by: Alexandre Julliard --- dlls/ntdll/env.c | 22 ---------------- dlls/ntdll/nt.c | 32 ------------------------ dlls/ntdll/ntdll.spec | 20 +++++++-------- dlls/ntdll/unix/system.c | 54 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 769c58ca0a3..c21e9ec5b13 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -607,28 +607,6 @@ static void build_command_line( WCHAR **argv, UNICODE_STRING *cmdline ) } -/****************************************************************************** - * NtQuerySystemEnvironmentValue [NTDLL.@] - */ -NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING VariableName, - PWCHAR Value, - ULONG ValueBufferLength, - PULONG RequiredLength) -{ - FIXME("(%s, %p, %u, %p), stub\n", debugstr_us(VariableName), Value, ValueBufferLength, RequiredLength); - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtQuerySystemEnvironmentValueEx [NTDLL.@] - */ -NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx(PUNICODE_STRING name, LPGUID vendor, - PVOID value, PULONG retlength, PULONG attrib) -{ - FIXME("(%s, %s, %p, %p, %p), stub\n", debugstr_us(name), debugstr_guid(vendor), value, retlength, attrib); - return STATUS_NOT_IMPLEMENTED; -} - /****************************************************************************** * RtlCreateEnvironment [NTDLL.@] */ diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f23f18ed494..ed2f60333a4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -865,16 +865,6 @@ NTSTATUS WINAPI /* DECLSPEC_HOTPATCH */ RtlGetNativeSystemInformation( return NtQuerySystemInformation( SystemInformationClass, SystemInformation, Length, ResultLength ); } -/****************************************************************************** - * NtSetSystemInformation [NTDLL.@] - * ZwSetSystemInformation [NTDLL.@] - */ -NTSTATUS WINAPI NtSetSystemInformation(SYSTEM_INFORMATION_CLASS SystemInformationClass, PVOID SystemInformation, ULONG Length) -{ - FIXME("(0x%08x,%p,0x%08x) stub\n",SystemInformationClass,SystemInformation,Length); - return STATUS_SUCCESS; -} - /****************************************************************************** * NtCreatePagingFile [NTDLL.@] * ZwCreatePagingFile [NTDLL.@] @@ -972,16 +962,6 @@ NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) return STATUS_NOT_IMPLEMENTED; } -/****************************************************************************** - * NtShutdownSystem [NTDLL.@] - * - */ -NTSTATUS WINAPI NtShutdownSystem(SHUTDOWN_ACTION Action) -{ - FIXME("%d\n",Action); - return STATUS_SUCCESS; -} - /****************************************************************************** * NtAllocateLocallyUniqueId (NTDLL.@) */ @@ -1054,15 +1034,3 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING SubsystemName, HANDLE return STATUS_NOT_IMPLEMENTED; } - -/****************************************************************************** - * NtSystemDebugControl (NTDLL.@) - * ZwSystemDebugControl (NTDLL.@) - */ -NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULONG inbuflength, PVOID outbuffer, - ULONG outbuflength, PULONG retlength) -{ - FIXME("(%d, %p, %d, %p, %d, %p), stub\n", command, inbuffer, inbuflength, outbuffer, outbuflength, retlength); - - return STATUS_NOT_IMPLEMENTED; -} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a412133b022..f6d8811ba8c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -314,8 +314,8 @@ @ stdcall NtQuerySecurityObject(long long ptr long ptr) @ stdcall -syscall NtQuerySemaphore (long long ptr long ptr) @ stdcall -syscall NtQuerySymbolicLinkObject(long ptr ptr) -@ stdcall NtQuerySystemEnvironmentValue(ptr ptr long ptr) -@ stdcall NtQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) +@ stdcall -syscall NtQuerySystemEnvironmentValue(ptr ptr long ptr) +@ stdcall -syscall NtQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) @ stdcall -syscall NtQuerySystemInformation(long ptr long ptr) @ stdcall -syscall NtQuerySystemInformationEx(long ptr long ptr long ptr) @ stdcall -syscall NtQuerySystemTime(ptr) @@ -391,7 +391,7 @@ @ stdcall NtSetSecurityObject(long long ptr) @ stub NtSetSystemEnvironmentValue # @ stub NtSetSystemEnvironmentValueEx -@ stdcall NtSetSystemInformation(long ptr long) +@ stdcall -syscall NtSetSystemInformation(long ptr long) @ stub NtSetSystemPowerState @ stdcall -syscall NtSetSystemTime(ptr ptr) @ stdcall NtSetThreadExecutionState(long ptr) @@ -400,13 +400,13 @@ # @ stub NtSetUuidSeed @ stdcall -syscall NtSetValueKey(long ptr long long ptr long) @ stdcall -syscall NtSetVolumeInformationFile(long ptr ptr long long) -@ stdcall NtShutdownSystem(long) +@ stdcall -syscall NtShutdownSystem(long) @ stdcall -syscall NtSignalAndWaitForSingleObject(long long long ptr) @ stub NtStartProfile @ stub NtStopProfile @ stdcall -syscall NtSuspendProcess(long) @ stdcall -syscall NtSuspendThread(long ptr) -@ stdcall NtSystemDebugControl(long ptr long ptr long ptr) +@ stdcall -syscall NtSystemDebugControl(long ptr long ptr long ptr) @ stdcall -syscall NtTerminateJobObject(long long) @ stdcall -syscall NtTerminateProcess(long long) @ stdcall -syscall NtTerminateThread(long long) @@ -1301,8 +1301,8 @@ @ stdcall -private ZwQuerySecurityObject(long long ptr long ptr) NtQuerySecurityObject @ stdcall -private -syscall ZwQuerySemaphore(long long ptr long ptr) NtQuerySemaphore @ stdcall -private -syscall ZwQuerySymbolicLinkObject(long ptr ptr) NtQuerySymbolicLinkObject -@ stdcall -private ZwQuerySystemEnvironmentValue(ptr ptr long ptr) NtQuerySystemEnvironmentValue -@ stdcall -private ZwQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) NtQuerySystemEnvironmentValueEx +@ stdcall -private -syscall ZwQuerySystemEnvironmentValue(ptr ptr long ptr) NtQuerySystemEnvironmentValue +@ stdcall -private -syscall ZwQuerySystemEnvironmentValueEx(ptr ptr ptr ptr ptr) NtQuerySystemEnvironmentValueEx @ stdcall -private -syscall ZwQuerySystemInformation(long ptr long ptr) NtQuerySystemInformation @ stdcall -private -syscall ZwQuerySystemInformationEx(long ptr long ptr long ptr) NtQuerySystemInformationEx @ stdcall -private -syscall ZwQuerySystemTime(ptr) NtQuerySystemTime @@ -1378,7 +1378,7 @@ @ stdcall -private ZwSetSecurityObject(long long ptr) NtSetSecurityObject @ stub ZwSetSystemEnvironmentValue # @ stub ZwSetSystemEnvironmentValueEx -@ stdcall -private ZwSetSystemInformation(long ptr long) NtSetSystemInformation +@ stdcall -private -syscall ZwSetSystemInformation(long ptr long) NtSetSystemInformation @ stub ZwSetSystemPowerState @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime @ stdcall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @@ -1387,13 +1387,13 @@ # @ stub ZwSetUuidSeed @ stdcall -private -syscall ZwSetValueKey(long ptr long long ptr long) NtSetValueKey @ stdcall -private -syscall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile -@ stdcall -private ZwShutdownSystem(long) NtShutdownSystem +@ stdcall -private -syscall ZwShutdownSystem(long) NtShutdownSystem @ stdcall -private -syscall ZwSignalAndWaitForSingleObject(long long long ptr) NtSignalAndWaitForSingleObject @ stub ZwStartProfile @ stub ZwStopProfile @ stdcall -private -syscall ZwSuspendProcess(long) NtSuspendProcess @ stdcall -private -syscall ZwSuspendThread(long ptr) NtSuspendThread -@ stdcall -private ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl +@ stdcall -private -syscall ZwSystemDebugControl(long ptr long ptr long ptr) NtSystemDebugControl @ stdcall -private -syscall ZwTerminateJobObject(long long) NtTerminateJobObject @ stdcall -private -syscall ZwTerminateProcess(long long) NtTerminateProcess @ stdcall -private -syscall ZwTerminateThread(long long) NtTerminateThread diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index c705f5a8d1d..80478c59edf 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2612,6 +2612,60 @@ NTSTATUS WINAPI NtQuerySystemInformationEx( SYSTEM_INFORMATION_CLASS class, } +/****************************************************************************** + * NtSetSystemInformation (NTDLL.@) + */ +NTSTATUS WINAPI NtSetSystemInformation( SYSTEM_INFORMATION_CLASS class, void *info, ULONG length ) +{ + FIXME( "(0x%08x,%p,0x%08x) stub\n", class, info, length ); + return STATUS_SUCCESS; +} + + +/****************************************************************************** + * NtQuerySystemEnvironmentValue (NTDLL.@) + */ +NTSTATUS WINAPI NtQuerySystemEnvironmentValue( UNICODE_STRING *name, WCHAR *buffer, ULONG length, + ULONG *retlen ) +{ + FIXME( "(%s, %p, %u, %p), stub\n", debugstr_us(name), buffer, length, retlen ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtQuerySystemEnvironmentValueEx (NTDLL.@) + */ +NTSTATUS WINAPI NtQuerySystemEnvironmentValueEx( UNICODE_STRING *name, GUID *vendor, void *buffer, + ULONG *retlen, ULONG *attrib ) +{ + FIXME( "(%s, %s, %p, %p, %p), stub\n", debugstr_us(name), + debugstr_guid(vendor), buffer, retlen, attrib ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSystemDebugControl (NTDLL.@) + */ +NTSTATUS WINAPI NtSystemDebugControl( SYSDBG_COMMAND command, void *in_buff, ULONG in_len, + void *out_buff, ULONG out_len, ULONG *retlen ) +{ + FIXME( "(%d, %p, %d, %p, %d, %p), stub\n", command, in_buff, in_len, out_buff, out_len, retlen ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtShutdownSystem (NTDLL.@) + */ +NTSTATUS WINAPI NtShutdownSystem( SHUTDOWN_ACTION action ) +{ + FIXME( "%d\n", action ); + return STATUS_SUCCESS; +} + + #ifdef linux /* Fallback using /proc/cpuinfo for Linux systems without cpufreq. For