diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 28dc60c40a..2ee614fae3 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -93,7 +93,7 @@
 @ extern NlsAnsiCodePage
 @ extern NlsMbCodePageTag
 @ extern NlsMbOemCodePageTag
-@ stdcall NtAcceptConnectPort(ptr long ptr long long ptr)
+@ stdcall NtAcceptConnectPort(ptr long ptr long ptr ptr)
 @ stdcall NtAccessCheck(ptr long long ptr ptr ptr ptr ptr)
 @ stdcall NtAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr)
 # @ stub NtAccessCheckByType
@@ -110,7 +110,7 @@
 @ stdcall NtAllocateLocallyUniqueId(ptr)
 # @ stub NtAllocateUserPhysicalPages
 @ stdcall NtAllocateUuids(ptr ptr ptr)
-@ stdcall NtAllocateVirtualMemory(long ptr ptr ptr long long)
+@ stdcall NtAllocateVirtualMemory(long ptr long ptr long long)
 @ stdcall NtAreMappedFilesTheSame(ptr ptr)
 @ stdcall NtAssignProcessToJobObject(long long)
 @ stub NtCallbackReturn
@@ -135,7 +135,7 @@
 @ stdcall NtCreateIoCompletion(ptr long ptr long)
 @ stdcall NtCreateJobObject(ptr long ptr)
 # @ stub NtCreateJobSet
-@ stdcall NtCreateKey(ptr long ptr long ptr long long)
+@ stdcall NtCreateKey(ptr long ptr long ptr long ptr)
 @ stdcall NtCreateKeyTransacted(ptr long ptr long ptr long long ptr)
 @ stdcall NtCreateKeyedEvent(ptr long ptr long)
 @ stdcall NtCreateMailslotFile(ptr long ptr ptr long long long ptr)
@@ -230,7 +230,7 @@
 @ stdcall NtOpenProcessToken(long long ptr)
 @ stdcall NtOpenProcessTokenEx(long long long ptr)
 @ stdcall NtOpenSection(ptr long ptr)
-@ stdcall NtOpenSemaphore(long long ptr)
+@ stdcall NtOpenSemaphore(ptr long ptr)
 @ stdcall NtOpenSymbolicLinkObject (ptr long ptr)
 @ stdcall NtOpenThread(ptr long ptr ptr)
 @ stdcall NtOpenThreadToken(long long long ptr)
@@ -289,7 +289,7 @@
 @ stdcall NtQueryVolumeInformationFile(long ptr ptr long long)
 @ stdcall NtQueueApcThread(long ptr long long long)
 @ stdcall NtRaiseException(ptr ptr long)
-@ stdcall NtRaiseHardError(long long ptr ptr long long)
+@ stdcall NtRaiseHardError(long long ptr ptr long ptr)
 @ stdcall NtReadFile(long long ptr ptr ptr ptr long ptr ptr)
 @ stdcall NtReadFileScatter(long long ptr ptr ptr ptr long ptr ptr)
 @ stub NtReadRequestData
@@ -343,7 +343,7 @@
 @ stdcall NtSetInformationThread(long long ptr long)
 @ stdcall NtSetInformationToken(long long ptr long)
 @ stdcall NtSetIntervalProfile(long long)
-@ stdcall NtSetIoCompletion(ptr long ptr long long)
+@ stdcall NtSetIoCompletion(ptr long long long long)
 @ stdcall NtSetLdtEntries(long long long long long long)
 @ stub NtSetLowEventPair
 @ stub NtSetLowWaitHighEventPair
@@ -375,7 +375,7 @@
 # @ stub NtTraceEvent
 # @ stub NtTranslateFilePath
 @ stdcall NtUnloadDriver(ptr)
-@ stdcall NtUnloadKey(long)
+@ stdcall NtUnloadKey(ptr)
 @ stub NtUnloadKeyEx
 @ stdcall NtUnlockFile(long ptr ptr ptr ptr)
 @ stdcall NtUnlockVirtualMemory(long ptr ptr long)
@@ -605,8 +605,8 @@
 @ stdcall RtlFindLastBackwardRunClear(ptr long ptr)
 @ stdcall RtlFindLastBackwardRunSet(ptr long ptr)
 @ stdcall RtlFindLeastSignificantBit(int64)
-@ stdcall RtlFindLongestRunClear(ptr long)
-@ stdcall RtlFindLongestRunSet(ptr long)
+@ stdcall RtlFindLongestRunClear(ptr ptr)
+@ stdcall RtlFindLongestRunSet(ptr ptr)
 @ stdcall RtlFindMessage(long long long long ptr)
 @ stdcall RtlFindMostSignificantBit(int64)
 @ stdcall RtlFindNextForwardRunClear(ptr long ptr)
@@ -621,7 +621,7 @@
 # @ stub RtlFlushSecureMemoryCache
 @ stdcall RtlFormatCurrentUserKeyPath(ptr)
 @ stdcall RtlFormatMessage(ptr long long long long ptr ptr long)
-@ stdcall RtlFreeAnsiString(long)
+@ stdcall RtlFreeAnsiString(ptr)
 @ stdcall RtlFreeHandle(ptr ptr)
 @ stdcall RtlFreeHeap(long long ptr)
 @ stdcall RtlFreeOemString(ptr)
@@ -687,7 +687,7 @@
 @ stdcall RtlInitUnicodeString(ptr wstr)
 @ stdcall RtlInitUnicodeStringEx(ptr wstr)
 # @ stub RtlInitializeAtomPackage
-@ stdcall RtlInitializeBitMap(ptr long long)
+@ stdcall RtlInitializeBitMap(ptr ptr long)
 @ stdcall RtlInitializeConditionVariable(ptr)
 @ stub RtlInitializeContext
 @ stdcall RtlInitializeCriticalSection(ptr)
@@ -766,7 +766,7 @@
 # @ stub RtlLookupElementGenericTableAvl
 @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr)
 @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr)
-@ stdcall RtlMapGenericMask(long ptr)
+@ stdcall RtlMapGenericMask(ptr ptr)
 # @ stub RtlMapSecurityErrorToNtStatus
 # @ stub RtlMergeRangeLists
 @ stdcall RtlMoveMemory(ptr ptr long)
@@ -975,7 +975,7 @@
 # @ stub RtlpApplyLengthFunction
 # @ stub RtlpEnsureBufferSize
 # @ stub RtlpNotOwnerCriticalSection
-@ stdcall RtlpNtCreateKey(ptr long ptr long ptr long long)
+@ stdcall RtlpNtCreateKey(ptr long ptr long ptr long ptr)
 @ stdcall RtlpNtEnumerateSubKey(ptr ptr long)
 @ stdcall RtlpNtMakeTemporaryKey(ptr)
 @ stdcall RtlpNtOpenKey(ptr long ptr)
@@ -1019,7 +1019,7 @@
 @ stdcall WinSqmEndSession(long)
 @ stdcall WinSqmIsOptedIn()
 @ stdcall WinSqmStartSession(ptr long long)
-@ stdcall -private ZwAcceptConnectPort(ptr long ptr long long ptr) NtAcceptConnectPort
+@ stdcall -private ZwAcceptConnectPort(ptr long ptr long ptr ptr) NtAcceptConnectPort
 @ stdcall -private ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck
 @ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
 # @ stub ZwAccessCheckByType
@@ -1036,7 +1036,7 @@
 @ stdcall -private ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId
 # @ stub ZwAllocateUserPhysicalPages
 @ stdcall -private ZwAllocateUuids(ptr ptr ptr) NtAllocateUuids
-@ stdcall -private ZwAllocateVirtualMemory(long ptr ptr ptr long long) NtAllocateVirtualMemory
+@ stdcall -private ZwAllocateVirtualMemory(long ptr long ptr long long) NtAllocateVirtualMemory
 @ stdcall -private ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame
 @ stdcall -private ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject
 @ stub ZwCallbackReturn
@@ -1061,7 +1061,7 @@
 @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion
 @ stdcall -private ZwCreateJobObject(ptr long ptr) NtCreateJobObject
 # @ stub ZwCreateJobSet
-@ stdcall -private ZwCreateKey(ptr long ptr long ptr long long) NtCreateKey
+@ stdcall -private ZwCreateKey(ptr long ptr long ptr long ptr) NtCreateKey
 @ stdcall -private ZwCreateKeyTransacted(ptr long ptr long ptr long long ptr) NtCreateKeyTransacted
 @ stdcall -private ZwCreateKeyedEvent(ptr long ptr long) NtCreateKeyedEvent
 @ stdcall -private ZwCreateMailslotFile(ptr long ptr ptr long long long ptr) NtCreateMailslotFile
@@ -1155,7 +1155,7 @@
 @ stdcall -private ZwOpenProcessToken(long long ptr) NtOpenProcessToken
 @ stdcall -private ZwOpenProcessTokenEx(long long long ptr) NtOpenProcessTokenEx
 @ stdcall -private ZwOpenSection(ptr long ptr) NtOpenSection
-@ stdcall -private ZwOpenSemaphore(long long ptr) NtOpenSemaphore
+@ stdcall -private ZwOpenSemaphore(ptr long ptr) NtOpenSemaphore
 @ stdcall -private ZwOpenSymbolicLinkObject (ptr long ptr) NtOpenSymbolicLinkObject
 @ stdcall -private ZwOpenThread(ptr long ptr ptr) NtOpenThread
 @ stdcall -private ZwOpenThreadToken(long long long ptr) NtOpenThreadToken
@@ -1214,7 +1214,7 @@
 @ stdcall -private ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile
 @ stdcall -private ZwQueueApcThread(long ptr long long long) NtQueueApcThread
 @ stdcall -private ZwRaiseException(ptr ptr long) NtRaiseException
-@ stdcall -private ZwRaiseHardError(long long ptr ptr long long) NtRaiseHardError
+@ stdcall -private ZwRaiseHardError(long long ptr ptr long ptr) NtRaiseHardError
 @ stdcall -private ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile
 @ stdcall -private ZwReadFileScatter(long long ptr ptr ptr ptr long ptr ptr) NtReadFileScatter
 @ stub ZwReadRequestData
@@ -1268,7 +1268,7 @@
 @ stdcall -private ZwSetInformationThread(long long ptr long) NtSetInformationThread
 @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken
 @ stdcall -private ZwSetIntervalProfile(long long) NtSetIntervalProfile
-@ stdcall -private ZwSetIoCompletion(ptr long ptr long long) NtSetIoCompletion
+@ stdcall -private ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion
 @ stdcall -private ZwSetLdtEntries(long long long long long long) NtSetLdtEntries
 @ stub ZwSetLowEventPair
 @ stub ZwSetLowWaitHighEventPair
@@ -1300,7 +1300,7 @@
 # @ stub ZwTraceEvent
 # @ stub ZwTranslateFilePath
 @ stdcall -private ZwUnloadDriver(ptr) NtUnloadDriver
-@ stdcall -private ZwUnloadKey(long) NtUnloadKey
+@ stdcall -private ZwUnloadKey(ptr) NtUnloadKey
 @ stub ZwUnloadKeyEx
 @ stdcall -private ZwUnlockFile(long ptr ptr ptr ptr) NtUnlockFile
 @ stdcall -private ZwUnlockVirtualMemory(long ptr ptr long) NtUnlockVirtualMemory
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 62ceaceeea..bc37a765a4 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -737,7 +737,7 @@
 @ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr) ntdll.NtAdjustPrivilegesToken
 @ stdcall NtAllocateLocallyUniqueId(ptr) ntdll.NtAllocateLocallyUniqueId
 @ stdcall NtAllocateUuids(ptr ptr ptr) ntdll.NtAllocateUuids
-@ stdcall NtAllocateVirtualMemory(long ptr ptr ptr long long) ntdll.NtAllocateVirtualMemory
+@ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) ntdll.NtAllocateVirtualMemory
 @ stub NtBuildNumber
 @ stdcall NtClose(long) ntdll.NtClose
 @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) ntdll.NtConnectPort
@@ -1016,7 +1016,7 @@
 @ stub RtlFindFirstRunClear
 @ stdcall RtlFindLastBackwardRunClear(ptr long ptr) ntdll.RtlFindLastBackwardRunClear
 @ stdcall RtlFindLeastSignificantBit(int64) ntdll.RtlFindLeastSignificantBit
-@ stdcall RtlFindLongestRunClear(ptr long) ntdll.RtlFindLongestRunClear
+@ stdcall RtlFindLongestRunClear(ptr ptr) ntdll.RtlFindLongestRunClear
 @ stdcall RtlFindMessage(long long long long ptr) ntdll.RtlFindMessage
 @ stdcall RtlFindMostSignificantBit(int64) ntdll.RtlFindMostSignificantBit
 @ stdcall RtlFindNextForwardRunClear(ptr long ptr) ntdll.RtlFindNextForwardRunClear
@@ -1025,7 +1025,7 @@
 @ stdcall RtlFindSetBitsAndClear(ptr long long) ntdll.RtlFindSetBitsAndClear
 @ stub RtlFindUnicodePrefix
 @ stdcall RtlFormatCurrentUserKeyPath(ptr) ntdll.RtlFormatCurrentUserKeyPath
-@ stdcall RtlFreeAnsiString(long) ntdll.RtlFreeAnsiString
+@ stdcall RtlFreeAnsiString(ptr) ntdll.RtlFreeAnsiString
 @ stdcall RtlFreeHeap(long long ptr) ntdll.RtlFreeHeap
 @ stdcall RtlFreeOemString(ptr) ntdll.RtlFreeOemString
 @ stub RtlFreeRangeList
@@ -1054,7 +1054,7 @@
 @ stub RtlInitCodePageTable
 @ stdcall RtlInitString(ptr str) ntdll.RtlInitString
 @ stdcall RtlInitUnicodeString(ptr wstr) ntdll.RtlInitUnicodeString
-@ stdcall RtlInitializeBitMap(ptr long long) ntdll.RtlInitializeBitMap
+@ stdcall RtlInitializeBitMap(ptr ptr long) ntdll.RtlInitializeBitMap
 @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTable
 @ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTableAvl
 @ stub RtlInitializeRangeList
@@ -1107,7 +1107,7 @@
 @ stub RtlLookupElementGenericTableAvl
 @ stub RtlLookupElementGenericTableFull
 @ stub RtlLookupElementGenericTableFullAvl
-@ stdcall RtlMapGenericMask(long ptr) ntdll.RtlMapGenericMask
+@ stdcall RtlMapGenericMask(ptr ptr) ntdll.RtlMapGenericMask
 @ stub RtlMapSecurityErrorToNtStatus
 @ stub RtlMergeRangeLists
 @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory
@@ -1282,7 +1282,7 @@
 @ stub ZwAddBootEntry
 @ stdcall -private ZwAdjustPrivilegesToken(long long ptr long ptr ptr) ntdll.ZwAdjustPrivilegesToken
 @ stdcall -private ZwAlertThread(long) ntdll.ZwAlertThread
-@ stdcall -private ZwAllocateVirtualMemory(long ptr ptr ptr long long) ntdll.ZwAllocateVirtualMemory
+@ stdcall -private ZwAllocateVirtualMemory(long ptr long ptr long long) ntdll.ZwAllocateVirtualMemory
 @ stdcall -private ZwAssignProcessToJobObject(long long) ntdll.ZwAssignProcessToJobObject
 @ stdcall -private ZwCancelIoFile(long ptr) ntdll.ZwCancelIoFile
 @ stdcall -private ZwCancelTimer(long ptr) ntdll.ZwCancelTimer
@@ -1294,7 +1294,7 @@
 @ stdcall -private ZwCreateEvent(ptr long ptr long long) ntdll.ZwCreateEvent
 @ stdcall -private ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) ntdll.ZwCreateFile
 @ stdcall -private ZwCreateJobObject(ptr long ptr) ntdll.ZwCreateJobObject
-@ stdcall -private ZwCreateKey(ptr long ptr long ptr long long) ntdll.ZwCreateKey
+@ stdcall -private ZwCreateKey(ptr long ptr long ptr long ptr) ntdll.ZwCreateKey
 @ stdcall -private ZwCreateSection(ptr long ptr ptr long long long) ntdll.ZwCreateSection
 @ stdcall -private ZwCreateSymbolicLinkObject(ptr long ptr ptr) ntdll.ZwCreateSymbolicLinkObject
 @ stdcall -private ZwCreateTimer(ptr long ptr long) ntdll.ZwCreateTimer
@@ -1387,7 +1387,7 @@
 @ stdcall -private ZwTerminateProcess(long long) ntdll.ZwTerminateProcess
 @ stub ZwTranslateFilePath
 @ stdcall ZwUnloadDriver(ptr)
-@ stdcall -private ZwUnloadKey(long) ntdll.ZwUnloadKey
+@ stdcall -private ZwUnloadKey(ptr) ntdll.ZwUnloadKey
 @ stdcall -private ZwUnmapViewOfSection(long ptr) ntdll.ZwUnmapViewOfSection
 @ stdcall -private ZwWaitForMultipleObjects(long ptr long long ptr) ntdll.ZwWaitForMultipleObjects
 @ stdcall -private ZwWaitForSingleObject(long long ptr) ntdll.ZwWaitForSingleObject