From 1649785bec36564ddae4e6821ba2f240e981f60e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 10 Sep 2021 22:49:34 +0200 Subject: [PATCH] Revert "ntdll: Stub power request APIs." This reverts commit ca2b7012496c4a97d7c03bc34b388592fd1157f5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51741 Signed-off-by: Alexandre Julliard --- dlls/ntdll/ntdll.spec | 6 ------ dlls/ntdll/unix/loader.c | 3 --- dlls/ntdll/unix/system.c | 30 ------------------------------ dlls/wow64/sync.c | 37 ------------------------------------- dlls/wow64/syscall.h | 3 --- include/winternl.h | 20 -------------------- 6 files changed, 99 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c3d17d989ac..9837b09fd51 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -151,7 +151,6 @@ @ stdcall -syscall NtCancelIoFileEx(long ptr ptr) @ stdcall -syscall NtCancelTimer(long ptr) @ stdcall -syscall NtClearEvent(long) -@ stdcall -syscall NtClearPowerRequest(long long) @ stdcall -syscall NtClose(long) # @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys @@ -177,7 +176,6 @@ @ stdcall -syscall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) @ stdcall -syscall NtCreatePagingFile(ptr ptr ptr ptr) @ stdcall -syscall NtCreatePort(ptr ptr long long ptr) -@ stdcall -syscall NtCreatePowerRequest(ptr ptr) # @ stub NtCreateProcess # @ stub NtCreateProcessEx # @ stub NtCreateProfile @@ -389,7 +387,6 @@ # @ stub NtSetLowEventPair # @ stub NtSetLowWaitHighEventPair # @ stub NtSetLowWaitHighThread -@ stdcall -syscall NtSetPowerRequest(long long) # @ stub NtSetQuotaInformationFile @ stdcall -syscall NtSetSecurityObject(long long ptr) # @ stub NtSetSystemEnvironmentValue @@ -1175,7 +1172,6 @@ @ stdcall -private -syscall ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @ stdcall -private -syscall ZwCancelTimer(long ptr) NtCancelTimer @ stdcall -private -syscall ZwClearEvent(long) NtClearEvent -@ stdcall -private -syscall ZwClearPowerRequest(long long) NtClearPowerRequest @ stdcall -private -syscall ZwClose(long) NtClose # @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys @@ -1201,7 +1197,6 @@ @ stdcall -private -syscall ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) NtCreateNamedPipeFile @ stdcall -private -syscall ZwCreatePagingFile(ptr ptr ptr ptr) NtCreatePagingFile @ stdcall -private -syscall ZwCreatePort(ptr ptr long long ptr) NtCreatePort -@ stdcall -private -syscall ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest # @ stub ZwCreateProcess # @ stub ZwCreateProcessEx # @ stub ZwCreateProfile @@ -1411,7 +1406,6 @@ # @ stub ZwSetLowEventPair # @ stub ZwSetLowWaitHighEventPair # @ stub ZwSetLowWaitHighThread -@ stdcall -private -syscall ZwSetPowerRequest(long long) NtSetPowerRequest # @ stub ZwSetQuotaInformationFile @ stdcall -private -syscall ZwSetSecurityObject(long long ptr) NtSetSecurityObject # @ stub ZwSetSystemEnvironmentValue diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index defa61909a1..6fbd112be01 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -137,7 +137,6 @@ static void * const syscalls[] = NtCancelIoFileEx, NtCancelTimer, NtClearEvent, - NtClearPowerRequest, NtClose, NtCompleteConnectPort, NtConnectPort, @@ -157,7 +156,6 @@ static void * const syscalls[] = NtCreateNamedPipeFile, NtCreatePagingFile, NtCreatePort, - NtCreatePowerRequest, NtCreateSection, NtCreateSemaphore, NtCreateSymbolicLinkObject, @@ -307,7 +305,6 @@ static void * const syscalls[] = NtSetIntervalProfile, NtSetIoCompletion, NtSetLdtEntries, - NtSetPowerRequest, NtSetSecurityObject, NtSetSystemInformation, NtSetSystemTime, diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index cc4b283ffc7..2cdc6278f3d 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3479,36 +3479,6 @@ NTSTATUS WINAPI NtInitiatePowerAction( POWER_ACTION action, SYSTEM_POWER_STATE s } -/****************************************************************************** - * NtCreatePowerRequest (NTDLL.@) - */ -NTSTATUS WINAPI NtCreatePowerRequest( HANDLE *handle, COUNTED_REASON_CONTEXT *context ) -{ - FIXME( "(%p, %p): stub\n", handle, context ); - return STATUS_NOT_IMPLEMENTED; -} - - -/****************************************************************************** - * NtSetPowerRequest (NTDLL.@) - */ -NTSTATUS WINAPI NtSetPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) -{ - FIXME( "(%p, %u): stub\n", handle, type ); - return STATUS_NOT_IMPLEMENTED; -} - - -/****************************************************************************** - * NtClearPowerRequest (NTDLL.@) - */ -NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) -{ - FIXME( "(%p, %u): stub\n", handle, type ); - return STATUS_NOT_IMPLEMENTED; -} - - /****************************************************************************** * NtSetThreadExecutionState (NTDLL.@) */ diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 0078508fc7f..e2e9468a727 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -169,18 +169,6 @@ NTSTATUS WINAPI wow64_NtClearEvent( UINT *args ) } -/********************************************************************** - * wow64_NtClearPowerRequest - */ -NTSTATUS WINAPI wow64_NtClearPowerRequest( UINT *args ) -{ - HANDLE handle = get_handle( &args ); - POWER_REQUEST_TYPE type = get_ulong( &args ); - - return NtClearPowerRequest( handle, type ); -} - - /********************************************************************** * wow64_NtCompleteConnectPort */ @@ -380,19 +368,6 @@ NTSTATUS WINAPI wow64_NtCreatePort( UINT *args ) } -/********************************************************************** - * wow64_NtCreatePowerRequest - */ -NTSTATUS WINAPI wow64_NtCreatePowerRequest( UINT *args ) -{ - ULONG *handle_ptr = get_ptr( &args ); - COUNTED_REASON_CONTEXT *context = get_ptr( &args ); - - FIXME( "%p %p: stub\n", handle_ptr, context ); - return STATUS_NOT_IMPLEMENTED; -} - - /********************************************************************** * wow64_NtCreateSection */ @@ -1403,18 +1378,6 @@ NTSTATUS WINAPI wow64_NtSetIoCompletion( UINT *args ) } -/********************************************************************** - * wow64_NtSetPowerRequest - */ -NTSTATUS WINAPI wow64_NtSetPowerRequest( UINT *args ) -{ - HANDLE handle = get_handle( &args ); - POWER_REQUEST_TYPE type = get_ulong( &args ); - - return NtSetPowerRequest( handle, type ); -} - - /********************************************************************** * wow64_NtSetTimer */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index a565e9cda3a..be0ca780b9b 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -40,7 +40,6 @@ SYSCALL_ENTRY( NtCancelIoFileEx ) \ SYSCALL_ENTRY( NtCancelTimer ) \ SYSCALL_ENTRY( NtClearEvent ) \ - SYSCALL_ENTRY( NtClearPowerRequest ) \ SYSCALL_ENTRY( NtClose ) \ SYSCALL_ENTRY( NtCompleteConnectPort ) \ SYSCALL_ENTRY( NtConnectPort ) \ @@ -60,7 +59,6 @@ SYSCALL_ENTRY( NtCreateNamedPipeFile ) \ SYSCALL_ENTRY( NtCreatePagingFile ) \ SYSCALL_ENTRY( NtCreatePort ) \ - SYSCALL_ENTRY( NtCreatePowerRequest ) \ SYSCALL_ENTRY( NtCreateSection ) \ SYSCALL_ENTRY( NtCreateSemaphore ) \ SYSCALL_ENTRY( NtCreateSymbolicLinkObject ) \ @@ -210,7 +208,6 @@ SYSCALL_ENTRY( NtSetIntervalProfile ) \ SYSCALL_ENTRY( NtSetIoCompletion ) \ SYSCALL_ENTRY( NtSetLdtEntries ) \ - SYSCALL_ENTRY( NtSetPowerRequest ) \ SYSCALL_ENTRY( NtSetSecurityObject ) \ SYSCALL_ENTRY( NtSetSystemInformation ) \ SYSCALL_ENTRY( NtSetSystemTime ) \ diff --git a/include/winternl.h b/include/winternl.h index 798127aee90..9e96591ad8e 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3105,23 +3105,6 @@ typedef enum _SHUTDOWN_ACTION { ShutdownPowerOff } SHUTDOWN_ACTION, *PSHUTDOWN_ACTION; -typedef struct _COUNTED_REASON_CONTEXT -{ - ULONG Version; - ULONG Flags; - union - { - struct - { - UNICODE_STRING ResourceFileName; - USHORT ResourceReasonId; - ULONG StringCount; - UNICODE_STRING *ReasonStrings; - } DUMMYSTRUCTNAME; - UNICODE_STRING SimpleString; - } DUMMYUNIONNAME; -} COUNTED_REASON_CONTEXT, *PCOUNTED_REASON_CONTEXT; - typedef enum _KPROFILE_SOURCE { ProfileTime, ProfileAlignmentFixup, @@ -3830,7 +3813,6 @@ NTSYSAPI NTSTATUS WINAPI NtCancelIoFile(HANDLE,PIO_STATUS_BLOCK); NTSYSAPI NTSTATUS WINAPI NtCancelIoFileEx(HANDLE,PIO_STATUS_BLOCK,PIO_STATUS_BLOCK); NTSYSAPI NTSTATUS WINAPI NtCancelTimer(HANDLE, BOOLEAN*); NTSYSAPI NTSTATUS WINAPI NtClearEvent(HANDLE); -NTSYSAPI NTSTATUS WINAPI NtClearPowerRequest(HANDLE,POWER_REQUEST_TYPE); NTSYSAPI NTSTATUS WINAPI NtClose(HANDLE); NTSYSAPI NTSTATUS WINAPI NtCloseObjectAuditAlarm(PUNICODE_STRING,HANDLE,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCompleteConnectPort(HANDLE); @@ -3852,7 +3834,6 @@ NTSYSAPI NTSTATUS WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIB NTSYSAPI NTSTATUS WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreatePagingFile(PUNICODE_STRING,PLARGE_INTEGER,PLARGE_INTEGER,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreatePort(PHANDLE,POBJECT_ATTRIBUTES,ULONG,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtCreatePowerRequest(HANDLE*,COUNTED_REASON_CONTEXT*); NTSYSAPI NTSTATUS WINAPI NtCreateProcess(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,BOOLEAN,HANDLE,HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtCreateProfile(PHANDLE,HANDLE,PVOID,ULONG,ULONG,PVOID,ULONG,KPROFILE_SOURCE,KAFFINITY); NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); @@ -4031,7 +4012,6 @@ NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY); NTSYSAPI NTSTATUS WINAPI NtSetLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighThread(VOID); -NTSYSAPI NTSTATUS WINAPI NtSetPowerRequest(HANDLE,POWER_REQUEST_TYPE); NTSYSAPI NTSTATUS WINAPI NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); NTSYSAPI NTSTATUS WINAPI NtSetSystemEnvironmentValue(PUNICODE_STRING,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG);