* include/ddk/ntapi.h: Add NtXxx equivalent to ZwXxx where missing

	and vice versa.
	* include/ddk/ntifs.h: Ditto.
	* include/ddk/winddk.h: Ditto.
	* lib/ntdll.def (NtPlugPlayControl, NtQueryInstallUILanguage,
	ZwPlugPlayControl, ZwQueryInstallUILanguage): Add entry points defined
	in header, but missing in lib.  Omit NT4-only entry points.

1 files changed, 212 insertions, 0 deletions

diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h
index 964aeefaf..4b8f78226 100644
--- a/winsup/w32api/include/ddk/winddk.h
+++ b/winsup/w32api/include/ddk/winddk.h
@@ -8576,6 +8576,13 @@ NtQueryInformationProcess(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtCancelTimer(
+  /*IN*/ HANDLE  TimerHandle,
+  /*OUT*/ PBOOLEAN  CurrentState  /*OPTIONAL*/);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwCancelTimer(
   /*IN*/ HANDLE  TimerHandle,
   /*OUT*/ PBOOLEAN  CurrentState  /*OPTIONAL*/);
@@ -8595,6 +8602,14 @@ ZwClose(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtCreateDirectoryObject(
+  /*OUT*/ PHANDLE  DirectoryHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwCreateDirectoryObject(
   /*OUT*/ PHANDLE  DirectoryHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8623,6 +8638,22 @@ ZwCreateEvent(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtCreateFile(
+  /*OUT*/ PHANDLE  FileHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes,
+  /*OUT*/ PIO_STATUS_BLOCK  IoStatusBlock,
+  /*IN*/ PLARGE_INTEGER  AllocationSize  /*OPTIONAL*/,
+  /*IN*/ ULONG  FileAttributes,
+  /*IN*/ ULONG  ShareAccess,
+  /*IN*/ ULONG  CreateDisposition,
+  /*IN*/ ULONG  CreateOptions,
+  /*IN*/ PVOID  EaBuffer  /*OPTIONAL*/,
+  /*IN*/ ULONG  EaLength);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwCreateFile(
   /*OUT*/ PHANDLE  FileHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8639,6 +8670,18 @@ ZwCreateFile(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtCreateKey(
+  /*OUT*/ PHANDLE  KeyHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes,
+  /*IN*/ ULONG  TitleIndex,
+  /*IN*/ PUNICODE_STRING  Class  /*OPTIONAL*/,
+  /*IN*/ ULONG  CreateOptions,
+  /*OUT*/ PULONG  Disposition  /*OPTIONAL*/);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwCreateKey(
   /*OUT*/ PHANDLE  KeyHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8651,6 +8694,15 @@ ZwCreateKey(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtCreateTimer(
+  /*OUT*/ PHANDLE  TimerHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes  /*OPTIONAL*/,
+  /*IN*/ TIMER_TYPE  TimerType);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwCreateTimer(
   /*OUT*/ PHANDLE  TimerHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8660,12 +8712,25 @@ ZwCreateTimer(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtDeleteKey(
+  /*IN*/ HANDLE  KeyHandle);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwDeleteKey(
   /*IN*/ HANDLE  KeyHandle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtDeleteValueKey(
+  /*IN*/ HANDLE  KeyHandle,
+  /*IN*/ PUNICODE_STRING  ValueName);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwDeleteValueKey(
   /*IN*/ HANDLE  KeyHandle,
   /*IN*/ PUNICODE_STRING  ValueName);
@@ -8703,6 +8768,17 @@ ZwDeviceIoControlFile(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtEnumerateKey(
+  /*IN*/ HANDLE  KeyHandle,
+  /*IN*/ ULONG  Index,
+  /*IN*/ KEY_INFORMATION_CLASS  KeyInformationClass,
+  /*OUT*/ PVOID  KeyInformation,
+  /*IN*/ ULONG  Length,
+  /*OUT*/ PULONG  ResultLength);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwEnumerateKey(
   /*IN*/ HANDLE  KeyHandle,
   /*IN*/ ULONG  Index,
@@ -8714,6 +8790,17 @@ ZwEnumerateKey(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtEnumerateValueKey(
+  /*IN*/ HANDLE  KeyHandle,
+  /*IN*/ ULONG  Index,
+  /*IN*/ KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
+  /*OUT*/ PVOID  KeyValueInformation,
+  /*IN*/ ULONG  Length,
+  /*OUT*/ PULONG  ResultLength);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwEnumerateValueKey(
   /*IN*/ HANDLE  KeyHandle,
   /*IN*/ ULONG  Index,
@@ -8725,12 +8812,24 @@ ZwEnumerateValueKey(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtFlushKey(
+  /*IN*/ HANDLE  KeyHandle);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwFlushKey(
   /*IN*/ HANDLE  KeyHandle);
 
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtMakeTemporaryObject(
+  /*IN*/ HANDLE  Handle);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwMakeTemporaryObject(
   /*IN*/ HANDLE  Handle);
 
@@ -8789,6 +8888,14 @@ ZwOpenFile(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtOpenKey(
+  /*OUT*/ PHANDLE  KeyHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwOpenKey(
   /*OUT*/ PHANDLE  KeyHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8797,6 +8904,14 @@ ZwOpenKey(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtOpenSection(
+  /*OUT*/ PHANDLE  SectionHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwOpenSection(
   /*OUT*/ PHANDLE  SectionHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8805,6 +8920,14 @@ ZwOpenSection(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtOpenSymbolicLinkObject(
+  /*OUT*/ PHANDLE  LinkHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwOpenSymbolicLinkObject(
   /*OUT*/ PHANDLE  LinkHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8813,6 +8936,14 @@ ZwOpenSymbolicLinkObject(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtOpenTimer(
+  /*OUT*/ PHANDLE  TimerHandle,
+  /*IN*/ ACCESS_MASK  DesiredAccess,
+  /*IN*/ POBJECT_ATTRIBUTES  ObjectAttributes);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwOpenTimer(
   /*OUT*/ PHANDLE  TimerHandle,
   /*IN*/ ACCESS_MASK  DesiredAccess,
@@ -8821,6 +8952,16 @@ ZwOpenTimer(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtQueryInformationFile(
+  /*IN*/ HANDLE  FileHandle,
+  /*OUT*/ PIO_STATUS_BLOCK  IoStatusBlock,
+  /*OUT*/ PVOID  FileInformation,
+  /*IN*/ ULONG  Length,
+  /*IN*/ FILE_INFORMATION_CLASS  FileInformationClass);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwQueryInformationFile(
   /*IN*/ HANDLE  FileHandle,
   /*OUT*/ PIO_STATUS_BLOCK  IoStatusBlock,
@@ -8831,6 +8972,16 @@ ZwQueryInformationFile(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtQueryKey(
+  /*IN*/ HANDLE  KeyHandle,
+  /*IN*/ KEY_INFORMATION_CLASS  KeyInformationClass,
+  /*OUT*/ PVOID  KeyInformation,
+  /*IN*/ ULONG  Length,
+  /*OUT*/ PULONG  ResultLength);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwQueryKey(
   /*IN*/ HANDLE  KeyHandle,
   /*IN*/ KEY_INFORMATION_CLASS  KeyInformationClass,
@@ -8841,6 +8992,14 @@ ZwQueryKey(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtQuerySymbolicLinkObject(
+  /*IN*/ HANDLE  LinkHandle,
+  /*IN OUT*/ PUNICODE_STRING  LinkTarget,
+  /*OUT*/ PULONG  ReturnedLength  /*OPTIONAL*/);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwQuerySymbolicLinkObject(
   /*IN*/ HANDLE  LinkHandle,
   /*IN OUT*/ PUNICODE_STRING  LinkTarget,
@@ -8849,6 +9008,17 @@ ZwQuerySymbolicLinkObject(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtQueryValueKey(
+  /*IN*/ HANDLE  KeyHandle,
+  /*IN*/ PUNICODE_STRING  ValueName,
+  /*IN*/ KEY_VALUE_INFORMATION_CLASS  KeyValueInformationClass,
+  /*OUT*/ PVOID  KeyValueInformation,
+  /*IN*/ ULONG  Length,
+  /*OUT*/ PULONG  ResultLength);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwQueryValueKey(
   /*IN*/ HANDLE  KeyHandle,
   /*IN*/ PUNICODE_STRING  ValueName,
@@ -8902,6 +9072,16 @@ ZwSetEvent(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtSetInformationFile(
+  /*IN*/ HANDLE  FileHandle,
+  /*OUT*/ PIO_STATUS_BLOCK  IoStatusBlock,
+  /*IN*/ PVOID  FileInformation,
+  /*IN*/ ULONG  Length,
+  /*IN*/ FILE_INFORMATION_CLASS  FileInformationClass);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwSetInformationFile(
   /*IN*/ HANDLE  FileHandle,
   /*OUT*/ PIO_STATUS_BLOCK  IoStatusBlock,
@@ -8912,6 +9092,15 @@ ZwSetInformationFile(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtSetInformationThread(
+  /*IN*/ HANDLE  ThreadHandle,
+  /*IN*/ THREADINFOCLASS  ThreadInformationClass,
+  /*IN*/ PVOID  ThreadInformation,
+  /*IN*/ ULONG  ThreadInformationLength);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwSetInformationThread(
   /*IN*/ HANDLE  ThreadHandle,
   /*IN*/ THREADINFOCLASS  ThreadInformationClass,
@@ -8921,6 +9110,18 @@ ZwSetInformationThread(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtSetTimer(
+  /*IN*/ HANDLE  TimerHandle,
+  /*IN*/ PLARGE_INTEGER  DueTime,
+  /*IN*/ PTIMER_APC_ROUTINE  TimerApcRoutine  /*OPTIONAL*/,
+  /*IN*/ PVOID  TimerContext  /*OPTIONAL*/,
+  /*IN*/ BOOLEAN  WakeTimer,
+  /*IN*/ LONG  Period  /*OPTIONAL*/,
+  /*OUT*/ PBOOLEAN  PreviousState  /*OPTIONAL*/);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwSetTimer(
   /*IN*/ HANDLE  TimerHandle,
   /*IN*/ PLARGE_INTEGER  DueTime,
@@ -8933,6 +9134,17 @@ ZwSetTimer(
 NTOSAPI
 NTSTATUS
 DDKAPI
+NtSetValueKey(
+  /*IN*/ HANDLE  KeyHandle,
+  /*IN*/ PUNICODE_STRING  ValueName,
+  /*IN*/ ULONG  TitleIndex  /*OPTIONAL*/,
+  /*IN*/ ULONG  Type,
+  /*IN*/ PVOID  Data,
+  /*IN*/ ULONG  DataSize);
+
+NTOSAPI
+NTSTATUS
+DDKAPI
 ZwSetValueKey(
   /*IN*/ HANDLE  KeyHandle,
   /*IN*/ PUNICODE_STRING  ValueName,