[reactos] 01/02: [NTDLL] Mark 2k3 only functions and improve some arch specific definitions - Ros-diffs

9 Sep 2020

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aaa7dda94565083c50074…

commit aaa7dda94565083c500746452395a7e34612e467
Author:     Timo Kreuzer &lt;timo.kreuzer(a)reactos.org&gt;
AuthorDate: Sat Sep 21 19:31:40 2019 +0200
Commit:     Timo Kreuzer &lt;timo.kreuzer(a)reactos.org&gt;
CommitDate: Wed Sep 9 19:33:29 2020 +0200

    [NTDLL] Mark 2k3 only functions and improve some arch specific definitions
---
 dll/ntdll/def/ntdll.spec | 96 +++++++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec
index 00e2ee107ad..83bba18322d 100644
--- a/dll/ntdll/def/ntdll.spec
+++ b/dll/ntdll/def/ntdll.spec
@@ -1,11 +1,11 @@
-@ stdcall PropertyLengthAsVariant(ptr long long long)
-@ stdcall RtlConvertPropertyToVariant(ptr long ptr ptr)
-@ stdcall RtlConvertVariantToProperty(ptr long ptr ptr ptr long ptr)
-@ fastcall RtlActivateActivationContextUnsafeFast(ptr ptr)
-@ fastcall RtlDeactivateActivationContextUnsafeFast(ptr)
-@ fastcall RtlInterlockedPushListSList(ptr ptr ptr long)
+@ stdcall -version=0x502 PropertyLengthAsVariant(ptr long long long)
+@ stdcall -version=0x502 RtlConvertPropertyToVariant(ptr long ptr ptr)
+@ stdcall -version=0x502 RtlConvertVariantToProperty(ptr long ptr ptr ptr long ptr)
+@ fastcall -arch=i386 RtlActivateActivationContextUnsafeFast(ptr ptr)
+@ fastcall -arch=i386 RtlDeactivateActivationContextUnsafeFast(ptr)
+@ fastcall -arch=i386 RtlInterlockedPushListSList(ptr ptr ptr long)
 @ fastcall -arch=i386 RtlUlongByteSwap(long)
-@ fastcall -ret64 RtlUlonglongByteSwap(double)
+@ fastcall -arch=i386 -ret64 RtlUlonglongByteSwap(double)
 @ fastcall -arch=i386 RtlUshortByteSwap(long)
 @ stdcall -arch=i386 ExpInterlockedPopEntrySListEnd()
 @ stdcall -arch=i386 ExpInterlockedPopEntrySListFault()
@@ -21,9 +21,9 @@
 @ stdcall CsrFreeCaptureBuffer(ptr)
 @ stdcall CsrGetProcessId()
 @ stdcall CsrIdentifyAlertableThread()
-@ stdcall CsrNewThread()
-@ stdcall CsrProbeForRead(ptr long long)
-@ stdcall CsrProbeForWrite(ptr long long)
+@ stdcall -version=0x502 CsrNewThread()
+@ stdcall -version=0x502 CsrProbeForRead(ptr long long)
+@ stdcall -version=0x502 CsrProbeForWrite(ptr long long)
 @ stdcall CsrSetPriorityClass(ptr ptr)
 @ stdcall DbgBreakPoint()
 @ varargs DbgPrint(str)
@@ -43,39 +43,39 @@
 @ stdcall DbgUiStopDebugging(ptr)
 @ stdcall DbgUiWaitStateChange(ptr ptr)
 @ stdcall DbgUserBreakPoint()
-@ stdcall EtwControlTraceA(double str ptr long)
-@ stdcall EtwControlTraceW(double wstr ptr long)
+@ stdcall -version=0x502 EtwControlTraceA(double str ptr long)
+@ stdcall -version=0x502 EtwControlTraceW(double wstr ptr long)
 @ stdcall -stub EtwCreateTraceInstanceId(ptr ptr)
-@ stdcall EtwEnableTrace(long long long ptr double)
-@ stdcall -stub EtwEnumerateTraceGuids(ptr long ptr)
-@ stdcall EtwFlushTraceA(double str ptr)
-@ stdcall EtwFlushTraceW(double wstr ptr)
+@ stdcall -version=0x502 EtwEnableTrace(long long long ptr double)
+@ stdcall -stub -version=0x502 EtwEnumerateTraceGuids(ptr long ptr)
+@ stdcall -version=0x502 EtwFlushTraceA(double str ptr)
+@ stdcall -version=0x502 EtwFlushTraceW(double wstr ptr)
 @ stdcall EtwGetTraceEnableFlags(double)
 @ stdcall EtwGetTraceEnableLevel(double)
 @ stdcall EtwGetTraceLoggerHandle(ptr)
-@ stdcall -stub EtwNotificationRegistrationA(ptr long ptr long long)
-@ stdcall -stub EtwNotificationRegistrationW(ptr long ptr long long)
-@ stdcall EtwQueryAllTracesA(ptr long ptr)
-@ stdcall EtwQueryAllTracesW(ptr long ptr)
-@ stdcall EtwQueryTraceA(double str ptr)
-@ stdcall EtwQueryTraceW(double wstr ptr)
-@ stdcall -stub EtwReceiveNotificationsA(long long long long)
-@ stdcall -stub EtwReceiveNotificationsW(long long long long)
+@ stdcall -stub -version=0x502 EtwNotificationRegistrationA(ptr long ptr long long)
+@ stdcall -stub -version=0x502 EtwNotificationRegistrationW(ptr long ptr long long)
+@ stdcall -version=0x502 EtwQueryAllTracesA(ptr long ptr)
+@ stdcall -version=0x502 EtwQueryAllTracesW(ptr long ptr)
+@ stdcall -version=0x502 EtwQueryTraceA(double str ptr)
+@ stdcall -version=0x502 EtwQueryTraceW(double wstr ptr)
+@ stdcall -stub -version=0x502 EtwReceiveNotificationsA(long long long long)
+@ stdcall -stub -version=0x502 EtwReceiveNotificationsW(long long long long)
 @ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr)
 @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr)
-@ stdcall EtwStartTraceA(ptr str ptr)
-@ stdcall EtwStartTraceW(ptr wstr ptr)
-@ stdcall EtwStopTraceA(double str ptr)
-@ stdcall EtwStopTraceW(double wstr ptr)
-@ stdcall EtwTraceEvent(double ptr)
+@ stdcall -version=0x502 EtwStartTraceA(ptr str ptr)
+@ stdcall -version=0x502 EtwStartTraceW(ptr wstr ptr)
+@ stdcall -version=0x502 EtwStopTraceA(double str ptr)
+@ stdcall -version=0x502 EtwStopTraceW(double wstr ptr)
+@ stdcall -version=0x502 EtwTraceEvent(double ptr)
 @ stdcall -stub EtwTraceEventInstance(double ptr ptr ptr)
 @ varargs EtwTraceMessage(ptr long ptr long)
 @ stdcall -stub EtwTraceMessageVa(double long ptr long ptr)
 @ stdcall EtwUnregisterTraceGuids(double)
-@ stdcall EtwUpdateTraceA(double str ptr)
-@ stdcall EtwUpdateTraceW(double wstr ptr)
-@ stdcall -stub EtwpGetTraceBuffer(long long long long)
-@ stdcall -stub EtwpSetHWConfigFunction(ptr long)
+@ stdcall -version=0x502 EtwUpdateTraceA(double str ptr)
+@ stdcall -version=0x502 EtwUpdateTraceW(double wstr ptr)
+@ stdcall -stub -version=0x502 EtwpGetTraceBuffer(long long long long)
+@ stdcall -stub -version=0x502 EtwpSetHWConfigFunction(ptr long)
 @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListEnd()
 @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListFault()
 @ stdcall -arch=x86_64 ExpInterlockedPopEntrySListResume()
@@ -86,16 +86,16 @@
 @ stdcall KiUserApcDispatcher(ptr ptr ptr ptr)
 @ stdcall KiUserCallbackDispatcher(ptr ptr long) ; CHECKME
 @ stdcall KiUserExceptionDispatcher(ptr ptr)
-@ stdcall LdrAccessOutOfProcessResource(ptr ptr ptr ptr ptr)
+@ stdcall -version=0x502 LdrAccessOutOfProcessResource(ptr ptr ptr ptr ptr)
 @ stdcall LdrAccessResource(long ptr ptr ptr)
 @ stdcall LdrAddRefDll(long ptr)
-@ stdcall LdrAlternateResourcesEnabled()
-@ stdcall LdrCreateOutOfProcessImage(long ptr ptr ptr)
-@ stdcall LdrDestroyOutOfProcessImage(ptr)
+@ stdcall -version=0x502 LdrAlternateResourcesEnabled()
+@ stdcall -version=0x502 LdrCreateOutOfProcessImage(long ptr ptr ptr)
+@ stdcall -version=0x502 LdrDestroyOutOfProcessImage(ptr)
 @ stdcall LdrDisableThreadCalloutsForDll(long)
 @ stdcall LdrEnumResources(ptr ptr long ptr ptr)
 @ stdcall LdrEnumerateLoadedModules(long ptr long)
-@ stdcall LdrFindCreateProcessManifest(long ptr ptr long ptr) ; 5.1 and 5.2 only
+@ stdcall -version=0x501-0x502 LdrFindCreateProcessManifest(long ptr ptr long ptr)
 @ stdcall LdrFindEntryForAddress(ptr ptr)
 @ stdcall LdrFindResourceDirectory_U(long ptr long ptr)
 @ stdcall -stub LdrFindResourceEx_U(ptr ptr ptr ptr ptr) ; 5.1 and higher
@@ -437,6 +437,7 @@
 @ stdcall RtlAcquireResourceShared(ptr long)
 @ stdcall RtlActivateActivationContext(long ptr ptr)
 @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr)
+@ stdcall -arch=x86_64 RtlActivateActivationContextUnsafeFast(ptr ptr)
 @ stdcall RtlAddAccessAllowedAce(ptr long long ptr)
 @ stdcall RtlAddAccessAllowedAceEx(ptr long long long ptr)
 @ stdcall RtlAddAccessAllowedObjectAce(ptr long long long ptr ptr ptr)
@@ -484,7 +485,7 @@
 @ stdcall -stub -arch=i386 RtlCaptureStackContext(ptr ptr ptr)
 @ stdcall RtlCharToInteger(ptr long ptr)
 @ stdcall RtlCheckForOrphanedCriticalSections(ptr)
-@ stdcall -stub RtlCheckProcessParameters(ptr ptr ptr ptr)
+@ stdcall -stub -version=0x502 RtlCheckProcessParameters(ptr ptr ptr ptr)
 @ stdcall RtlCheckRegistryKey(long ptr)
 @ stdcall RtlClearAllBits(ptr)
 @ stdcall RtlClearBits(ptr long long)
@@ -528,7 +529,7 @@
 @ stdcall RtlCreateQueryDebugBuffer(long long)
 @ stdcall RtlCreateRegistryKey(long wstr)
 @ stdcall RtlCreateSecurityDescriptor(ptr long)
-@ stdcall RtlCreateServiceSid(ptr ptr ptr)
+@ stdcall RtlCreateServiceSid(ptr ptr ptr) # Exists in Windows 2003 SP 2
 @ stdcall RtlCreateSystemVolumeInformationFolder(ptr)
 @ stdcall RtlCreateTagHeap(ptr long str str)
 @ stdcall RtlCreateTimer(ptr ptr ptr ptr long long long)
@@ -542,6 +543,7 @@
 @ stdcall RtlCutoverTimeToSystemTime(ptr ptr ptr long)
 @ stdcall RtlDeNormalizeProcessParams(ptr)
 @ stdcall RtlDeactivateActivationContext(long long)
+@ stdcall -arch=x86_64 RtlDeactivateActivationContextUnsafeFast(ptr)
 @ stdcall -stub RtlDebugPrintTimes()
 @ stdcall RtlDecodePointer(ptr)
 @ stdcall RtlDecodeSystemPointer(ptr)
@@ -609,7 +611,7 @@
 @ stdcall RtlEraseUnicodeString(ptr)
 @ stdcall RtlExitUserThread(long)
 @ stdcall RtlExpandEnvironmentStrings_U(ptr ptr ptr ptr)
-@ stdcall RtlExtendHeap(ptr long ptr ptr)
+@ stdcall -version=0x502 RtlExtendHeap(ptr long ptr ptr)
 @ stdcall -arch=win32 -ret64 RtlExtendedIntegerMultiply(double long)
 @ stdcall -arch=win32 -ret64 RtlExtendedLargeIntegerDivide(double long ptr)
 @ stdcall -arch=win32 -ret64 RtlExtendedMagicDivide(double double long)
@@ -644,7 +646,7 @@
 @ stdcall RtlFreeSid(long)
 @ stdcall RtlFreeThreadActivationContextStack()
 @ stdcall RtlFreeUnicodeString(ptr)
-@ stdcall RtlFreeUserThreadStack(ptr ptr) ; 4.0 to 5.2 only
+@ stdcall -version=0x502 RtlFreeUserThreadStack(ptr ptr)
 @ stdcall RtlGUIDFromString(ptr ptr)
 @ stdcall RtlGenerate8dot3Name(ptr ptr long ptr)
 @ stdcall RtlGetAce(ptr long ptr)
@@ -723,6 +725,7 @@
 @ stdcall RtlInterlockedFlushSList(ptr)
 @ stdcall RtlInterlockedPopEntrySList(ptr)
 @ stdcall RtlInterlockedPushEntrySList(ptr ptr)
+@ stdcall -arch=x86_64 RtlInterlockedPushListSList(ptr ptr ptr long)
 @ stdcall RtlIpv4AddressToStringA(ptr ptr)
 @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr)
 @ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr)
@@ -773,6 +776,7 @@
 @ stdcall RtlLookupElementGenericTableFull(ptr ptr ptr long)
 @ stdcall RtlLookupElementGenericTableFullAvl(ptr ptr ptr long)
 @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr)
+@ stdcall -arch=x86_64 RtlLookupFunctionTable(int64 ptr ptr)
 @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr)
 @ stdcall RtlMapGenericMask(long ptr)
 @ stdcall RtlMapSecurityErrorToNtStatus(long)
@@ -884,7 +888,7 @@
 @ stdcall RtlSetTimeZoneInformation(ptr)
 @ stdcall RtlSetTimer(ptr ptr ptr ptr long long long)
 @ stdcall RtlSetUnhandledExceptionFilter(ptr)
-@ stdcall -stub RtlSetUnicodeCallouts(ptr)
+@ stdcall -stub -version=0x502 RtlSetUnicodeCallouts(ptr)
 @ stdcall RtlSetUserFlagsHeap(ptr long ptr long long)
 @ stdcall RtlSetUserValueHeap(ptr long ptr ptr)
 @ stdcall RtlSizeHeap(long long ptr)
@@ -940,7 +944,7 @@
 @ stdcall RtlUpdateTimer(ptr ptr long long)
 @ stdcall RtlUpperChar(long)
 @ stdcall RtlUpperString(ptr ptr)
-@ stdcall RtlUsageHeap(ptr long ptr)
+@ stdcall -version=0x502 RtlUsageHeap(ptr long ptr)
 @ stdcall RtlValidAcl(ptr)
 @ stdcall RtlValidRelativeSecurityDescriptor(ptr long long)
 @ stdcall RtlValidSecurityDescriptor(ptr)
@@ -1318,8 +1322,8 @@
 @ cdecl _strlwr(str)
 @ cdecl _strnicmp(str str long)
 @ cdecl _strupr(str)
-@ cdecl _tolower(long)
-@ cdecl _toupper(long)
+@ cdecl -version=0x502 _tolower(long)
+@ cdecl -version=0x502 _toupper(long)
 @ cdecl _ui64toa(double ptr long)
 @ cdecl _ui64tow(double ptr long)
 @ cdecl _ultoa(long ptr long)


    