Author: tkreuzer Date: Sun Aug 21 21:55:30 2011 New Revision: 53362
URL: http://svn.reactos.org/svn/reactos?rev=53362&view=rev Log: [NTOSKRNL] Update exports for amd64 to match win2k3
Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec
Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sun Aug 21 21:55:30 2011 @@ -548,12 +548,17 @@ @ stdcall -arch=i386 Ke386SetIoAccessMap(long ptr) @ fastcall KeAcquireGuardedMutex(ptr) @ fastcall KeAcquireGuardedMutexUnsafe(ptr) +@ cdecl -arch=x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) @ fastcall KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @ fastcall KeAcquireInStackQueuedSpinLockForDpc(ptr ptr) +@ cdecl -arch=x86_64 KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr) @ stdcall KeAcquireInterruptSpinLock(ptr) +@ cdecl -arch=x86_64 KeAcquireQueuedSpinLock(long) +@ cdecl -arch=x86_64 KeAcquireQueuedSpinLockRaiseToSynch(long) @ stdcall KeAcquireSpinLockAtDpcLevel(ptr) @ fastcall KeAcquireSpinLockForDpc(ptr) @ stdcall -arch=x86_64 KeAcquireSpinLockRaiseToDpc(ptr) +@ stdcall -arch=x86_64 KeAcquireSpinLockRaiseToSynch(ptr) @ stdcall KeAddSystemServiceTable(ptr ptr long ptr long) @ stdcall KeAreAllApcsDisabled() @ stdcall KeAreApcsDisabled() @@ -573,6 +578,7 @@ @ stdcall KeEnterCriticalRegion() _KeEnterCriticalRegion @ stdcall KeEnterGuardedRegion() _KeEnterGuardedRegion @ stdcall KeEnterKernelDebugger() +;@ stdcall -arch=x86_64 KeExpandKernelStackAndCallout(ptr ptr double) @ stdcall KeFindConfigurationEntry(ptr long long ptr) @ stdcall KeFindConfigurationNextEntry(ptr long long ptr ptr) @ stdcall KeFlushEntireTb(long long) @@ -581,7 +587,7 @@ @ stdcall KeGetCurrentThread() @ stdcall KeGetPreviousMode() @ stdcall KeGetRecommendedSharedDataAlignment() -;KeI386AbiosCall +; -arch=i386 KeI386AbiosCall @ stdcall -arch=i386 KeI386AllocateGdtSelectors(ptr long) ; -arch=i386 KeI386Call16BitCStyleFunction ; -arch=i386 KeI386Call16BitFunction @@ -615,22 +621,27 @@ @ stdcall KeInvalidateAllCaches() @ stdcall KeIpiGenericCall(ptr ptr) @ stdcall KeIsAttachedProcess() -@ stdcall KeIsExecutingDpc() +@ stdcall -arch=i386,arm KeIsExecutingDpc() ;KeIsWaitListEmpty +;@ cdecl -arch=x86_64 KeLastBranchMSR() @ stdcall KeLeaveCriticalRegion() _KeLeaveCriticalRegion @ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion @ extern KeLoaderBlock +@ cdecl -arch=x86_64 KeLowerIrql(long) @ extern KeNumberProcessors -@ stdcall KeProfileInterrupt(ptr) +@ stdcall -arch=i386,arm KeProfileInterrupt(ptr) @ stdcall KeProfileInterruptWithSource(ptr long) @ stdcall KePulseEvent(ptr long long) @ stdcall KeQueryActiveProcessors() @ stdcall -arch=i386,arm KeQueryInterruptTime() +;@ cdecl -arch=x86_64 KeQueryMultiThreadProcessorSet +;@ cdecl -arch=x86_64 KeQueryPrcbAddress @ stdcall KeQueryPriorityThread(ptr) @ stdcall KeQueryRuntimeThread(ptr ptr) @ stdcall -arch=i386,arm KeQuerySystemTime(ptr) -@ stdcall KeQueryTickCount(ptr) +@ stdcall -arch=i386,arm KeQueryTickCount(ptr) @ stdcall KeQueryTimeIncrement() +@ cdecl -arch=x86_64 KeRaiseIrqlToDpcLevel() @ stdcall KeRaiseUserException(long) @ stdcall KeReadStateEvent(ptr) @ stdcall KeReadStateMutant(ptr) @@ -644,10 +655,12 @@ @ fastcall KeReleaseGuardedMutex(ptr) @ fastcall KeReleaseGuardedMutexUnsafe(ptr) @ fastcall KeReleaseInStackQueuedSpinLockForDpc(ptr) +@ cdecl -arch=x86_64 KeReleaseInStackQueuedSpinLockForDpc(ptr) @ fastcall KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stdcall KeReleaseInterruptSpinLock(ptr long) @ stdcall KeReleaseMutant(ptr long long long) @ stdcall KeReleaseMutex(ptr long) +@ cdecl -arch=x86_64 KeReleaseQueuedSpinLock(long long) @ stdcall KeReleaseSemaphore(ptr long long long) @ stdcall -arch=x86_64 KeReleaseSpinLock(ptr long) @ fastcall KeReleaseSpinLockForDpc(ptr long) @@ -687,8 +700,10 @@ @ stdcall KeSynchronizeExecution(ptr ptr ptr) @ stdcall KeTerminateThread(long) @ fastcall KeTestSpinLock(ptr) -@ extern KeTickCount +@ extern -arch=i386,arm KeTickCount @ fastcall KeTryToAcquireGuardedMutex(ptr) +@ cdecl -arch=x86_64 KeTryToAcquireQueuedSpinLock(long long) +@ cdecl -arch=x86_64 KeTryToAcquireQueuedSpinLockRaiseToSynch(long long) @ fastcall KeTryToAcquireSpinLockAtDpcLevel(ptr) @ stdcall KeUnstackDetachProcess(ptr) @ stdcall KeUpdateRunTime(ptr long) @@ -697,21 +712,23 @@ @ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) @ stdcall KeWaitForMutexObject(ptr long long long ptr) KeWaitForSingleObject @ stdcall KeWaitForSingleObject(ptr long long long ptr) -@ fastcall KefAcquireSpinLockAtDpcLevel(ptr) -@ fastcall KefReleaseSpinLockFromDpcLevel(ptr) +@ fastcall -arch=i386,arm KefAcquireSpinLockAtDpcLevel(ptr) +@ fastcall -arch=i386,arm KefReleaseSpinLockFromDpcLevel(ptr) @ stdcall -arch=i386 Kei386EoiHelper() +@ cdecl -arch=x86_64 KfRaiseIrql(long) @ fastcall -arch=i386 KiEoiHelper(ptr) -@ fastcall KiAcquireSpinLock(ptr) +@ fastcall -arch=i386,arm KiAcquireSpinLock(ptr) @ extern KiBugCheckData @ stdcall KiCheckForKernelApcDelivery() -;KiCheckForSListAddress +;-arch=i386,arm KiCheckForSListAddress @ stdcall -arch=i386 KiCoprocessorError() -@ stdcall KiDeliverApc(long ptr ptr) +;@ cdecl -arch=x86_64 KiCpuId() +@ stdcall -arch=i386,arm KiDeliverApc(long ptr ptr) @ stdcall -arch=i386 KiDispatchInterrupt() -@ extern KiEnableTimerWatchdog -@ stdcall KiIpiServiceRoutine(ptr ptr) -@ fastcall KiReleaseSpinLock(ptr) -@ cdecl KiUnexpectedInterrupt() +@ extern -arch=i386,arm KiEnableTimerWatchdog +@ stdcall -arch=i386,arm KiIpiServiceRoutine(ptr ptr) +@ fastcall -arch=i386,arm KiReleaseSpinLock(ptr) +@ cdecl -arch=i386,arm KiUnexpectedInterrupt() @ stdcall -arch=i386 Kii386SpinOnSpinLock(ptr long) @ stdcall LdrAccessResource(ptr ptr ptr ptr) @ stdcall LdrEnumResources(ptr ptr long ptr ptr) @@ -814,7 +831,7 @@ @ extern NlsOemLeadByteInfo _NlsOemLeadByteInfo @ stdcall NtAddAtom(wstr long ptr) @ stdcall NtAdjustPrivilegesToken(ptr long ptr long ptr ptr) -@ stdcall NtAlertThread(ptr) +@ stdcall -arch=i386,arm NtAlertThread(ptr) @ stdcall NtAllocateLocallyUniqueId(ptr) @ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(ptr ptr long ptr long long) @@ -824,7 +841,7 @@ @ stdcall NtCreateEvent(ptr long ptr long long) @ stdcall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) @ stdcall NtCreateSection(ptr long ptr ptr long long ptr) -@ stdcall NtCreateTimer(ptr long ptr long) +@ stdcall -arch=i386,arm NtCreateTimer(ptr long ptr long) @ stdcall NtDeleteAtom(ptr) @ stdcall NtDeleteFile(ptr) @ stdcall NtDeviceIoControlFile(ptr ptr ptr ptr ptr long ptr long ptr long) @@ -838,7 +855,7 @@ @ stdcall NtMakePermanentObject(ptr) @ stdcall NtMapViewOfSection(ptr ptr ptr long long ptr ptr long long long) @ stdcall NtNotifyChangeDirectoryFile(ptr ptr ptr ptr ptr ptr long long long) -@ stdcall NtOpenEvent(ptr long ptr) +@ stdcall -arch=i386,arm NtOpenEvent(ptr long ptr) @ stdcall NtOpenFile(ptr long ptr ptr long long) @ stdcall NtOpenProcess(ptr long ptr ptr) @ stdcall NtOpenProcessToken(ptr long ptr) @@ -882,12 +899,12 @@ @ stdcall ObCreateObjectType(ptr ptr ptr ptr) ;ObDeleteCapturedInsertInfo @ stdcall ObDereferenceObject(ptr) -@ stdcall ObDereferenceObjectDeferDelete(ptr) +@ stdcall -arch=i386,arm ObDereferenceObjectDeferDelete(ptr) @ stdcall ObDereferenceSecurityDescriptor(ptr long) @ stdcall ObFindHandleForObject(ptr ptr ptr ptr ptr) @ stdcall ObGetObjectSecurity(ptr ptr ptr) @ stdcall ObInsertObject(ptr ptr long long ptr ptr) -@ stdcall ObIsKernelHandle(ptr) +@ stdcall -arch=i386,arm ObIsKernelHandle(ptr) @ stdcall ObLogSecurityDescriptor(ptr ptr long) @ stdcall ObMakeTemporaryObject(ptr) @ stdcall ObOpenObjectByName(ptr ptr long ptr long ptr ptr) @@ -940,6 +957,7 @@ @ stdcall PsGetCurrentProcessId() @ stdcall PsGetCurrentProcessSessionId() @ stdcall PsGetCurrentProcessWin32Process() +;@ cdecl -arch=x86_64 PsGetCurrentProcessWow64Process() @ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stdcall PsGetCurrentThreadPreviousMode() @@ -970,6 +988,7 @@ ;PsGetProcessSessionIdEx @ stdcall PsGetProcessWin32Process(ptr) @ stdcall PsGetProcessWin32WindowStation(ptr) +;@ cdecl -arch=x86_64 PsGetProcessWow64Process() @ stdcall PsGetThreadFreezeCount(ptr) @ stdcall PsGetThreadHardErrorsAreDisabled(ptr) @ stdcall PsGetThreadId(ptr) @@ -1029,7 +1048,7 @@ @ stdcall RtlAddAce(ptr long long ptr long) @ stdcall RtlAddAtomToAtomTable(ptr wstr ptr) @ stdcall RtlAddRange(ptr long long long long long long ptr ptr) -@ stdcall RtlAllocateAndInitializeSid(ptr long long long long long long long long long ptr) +@ stdcall -arch=i386,arm RtlAllocateAndInitializeSid(ptr long long long long long long long long long ptr) @ stdcall RtlAllocateHeap(ptr long long) @ stdcall RtlAnsiCharToUnicodeChar(ptr) @ stdcall RtlAnsiStringToUnicodeSize(ptr) RtlxAnsiStringToUnicodeSize @@ -1089,9 +1108,9 @@ @ stdcall RtlDestroyHeap(ptr) @ stdcall RtlDowncaseUnicodeString(ptr ptr long) @ stdcall RtlEmptyAtomTable(ptr long) -@ stdcall RtlEnlargedIntegerMultiply(long long) -@ stdcall RtlEnlargedUnsignedDivide(long long long ptr) -@ stdcall RtlEnlargedUnsignedMultiply(long long) +@ stdcall -arch=win32 RtlEnlargedIntegerMultiply(long long) +@ stdcall -arch=win32 RtlEnlargedUnsignedDivide(long long long ptr) +@ stdcall -arch=win32 RtlEnlargedUnsignedMultiply(long long) @ stdcall RtlEnumerateGenericTable(ptr long) @ stdcall RtlEnumerateGenericTableAvl(ptr long) @ stdcall RtlEnumerateGenericTableLikeADirectory(ptr ptr ptr long ptr ptr ptr) @@ -1101,11 +1120,11 @@ @ stdcall RtlEqualSid(ptr ptr) @ stdcall RtlEqualString(ptr ptr long) @ stdcall RtlEqualUnicodeString(ptr ptr long) -@ stdcall RtlExtendedIntegerMultiply(long long long) -@ stdcall RtlExtendedLargeIntegerDivide(long long long ptr) -@ stdcall RtlExtendedMagicDivide(long long long long long) +@ stdcall -arch=win32 RtlExtendedIntegerMultiply(long long long) +@ stdcall -arch=win32 RtlExtendedLargeIntegerDivide(long long long ptr) +@ stdcall -arch=win32 RtlExtendedMagicDivide(long long long long long) @ stdcall RtlFillMemory(ptr long long) -@ stdcall RtlFillMemoryUlong(ptr long long) +@ stdcall -arch=i386,arm RtlFillMemoryUlong(ptr long long) @ stdcall RtlFindClearBits(ptr long long) @ stdcall RtlFindClearBitsAndSet(ptr long long) @ stdcall RtlFindClearRuns(ptr ptr long long) @@ -1189,13 +1208,13 @@ @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) @ stdcall RtlIsRangeAvailable(ptr long long long long long long ptr ptr ptr) @ stdcall RtlIsValidOemCharacter(ptr) -@ stdcall RtlLargeIntegerAdd(long long long long) -@ stdcall RtlLargeIntegerArithmeticShift(long long long) -@ stdcall RtlLargeIntegerDivide(long long long long ptr) -@ stdcall RtlLargeIntegerNegate(long long) -@ stdcall RtlLargeIntegerShiftLeft(long long long) -@ stdcall RtlLargeIntegerShiftRight(long long long) -@ stdcall RtlLargeIntegerSubtract(long long long long) +@ stdcall -arch=win32 RtlLargeIntegerAdd(long long long long) +@ stdcall -arch=win32 RtlLargeIntegerArithmeticShift(long long long) +@ stdcall -arch=win32 RtlLargeIntegerDivide(long long long long ptr) +@ stdcall -arch=win32 RtlLargeIntegerNegate(long long) +@ stdcall -arch=win32 RtlLargeIntegerShiftLeft(long long long) +@ stdcall -arch=win32 RtlLargeIntegerShiftRight(long long long) +@ stdcall -arch=win32 RtlLargeIntegerSubtract(long long long long) @ stdcall RtlLengthRequiredSid(long) @ stdcall RtlLengthSecurityDescriptor(ptr) @ stdcall RtlLengthSid(ptr) @@ -1205,6 +1224,7 @@ @ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stdcall RtlLookupElementGenericTableFull(ptr ptr ptr ptr) @ stdcall RtlLookupElementGenericTableFullAvl(ptr ptr ptr ptr) +@ cdecl -arch=x86_64 RtlLookupFunctionEntry(double ptr ptr) @ stdcall RtlMapGenericMask(ptr ptr) @ stdcall RtlMapSecurityErrorToNtStatus(long) @ stdcall RtlMergeRangeLists(ptr ptr ptr long) @@ -1222,6 +1242,7 @@ @ stdcall RtlOemStringToUnicodeSize(ptr) RtlxOemStringToUnicodeSize @ stdcall RtlOemStringToUnicodeString(ptr ptr long) @ stdcall RtlOemToUnicodeN(wstr long ptr ptr long) +@ cdecl -arch=x86_64 RtlPcToFileHeader(ptr ptr) @ stdcall RtlPinAtomInAtomTable(ptr ptr) @ fastcall RtlPrefetchMemoryNonTemporal(ptr long) @ stdcall RtlPrefixString(ptr ptr long) @@ -1236,6 +1257,7 @@ @ stdcall RtlRealSuccessor(ptr) @ stdcall RtlRemoveUnicodePrefix(ptr ptr) @ stdcall RtlReserveChunk(long ptr ptr ptr long) +@ cdecl -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) @ stdcall RtlSelfRelativeToAbsoluteSD(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @@ -1283,6 +1305,7 @@ @ stdcall RtlUnicodeToOemN(ptr long ptr wstr long) @ stdcall RtlUnlockBootStatusData(ptr) @ stdcall RtlUnwind(ptr ptr ptr ptr) +@ cdecl -arch=x86_64 RtlUnwindEx(double double ptr ptr ptr ptr) @ stdcall RtlUpcaseUnicodeChar(long) @ stdcall RtlUpcaseUnicodeString(ptr ptr long) @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) @@ -1298,6 +1321,7 @@ @ stdcall RtlValidSecurityDescriptor(ptr) @ stdcall RtlValidSid(ptr) @ stdcall RtlVerifyVersionInfo(ptr long long long) +@ cdecl -arch=x86_64 RtlVirtualUnwind(long double double ptr ptr ptr ptr ptr) @ stdcall RtlVolumeDeviceToDosName(ptr ptr) @ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWriteRegistryValue(long wstr wstr long ptr long) @@ -1345,6 +1369,7 @@ @ stdcall SeRegisterLogonSessionTerminatedRoutine(ptr) @ stdcall SeReleaseSecurityDescriptor(ptr long long) @ stdcall SeReleaseSubjectContext(ptr) +;@ cdecl -arch=x86_64 SeReportSecurityEvent @ stdcall SeSetAccessStateGenericMapping(ptr ptr) ;SeSetAuditParameter @ stdcall SeSetSecurityDescriptorInfo(ptr ptr ptr ptr long ptr) @@ -1454,7 +1479,7 @@ @ stdcall ZwQueryDriverEntryOrder(ptr ptr) @ stdcall ZwQueryEaFile(ptr ptr ptr long long ptr long ptr long) @ stdcall ZwQueryFullAttributesFile(ptr ptr) -@ stdcall ZwQueryInformationAtom(ptr long ptr long ptr) +@ stdcall -arch=i386,arm ZwQueryInformationAtom(ptr long ptr long ptr) @ stdcall ZwQueryInformationFile(ptr ptr ptr long long) @ stdcall ZwQueryInformationJobObject(ptr long ptr long ptr) @ stdcall ZwQueryInformationProcess(ptr long ptr long ptr) @@ -1505,9 +1530,12 @@ @ stdcall ZwWaitForSingleObject(ptr long ptr) @ stdcall ZwWriteFile(ptr ptr ptr ptr ptr ptr long ptr ptr) @ stdcall ZwYieldExecution() -;_CIcos -;_CIsin -;_CIsqrt +@ cdecl -arch=x86_64 __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=x86_64 __chkstk() +;@ cdecl -arch=x86_64 __misaligned_access() +;@ cdecl -arch=i386 _CIcos +;@ cdecl -arch=i386 _CIsin +;@ cdecl -arch=i386 _CIsqrt @ cdecl -arch=i386,arm _abnormal_termination() @ cdecl -arch=i386 _alldiv() @ cdecl -arch=i386 _alldvrm() @@ -1526,7 +1554,10 @@ @ cdecl _itoa() @ cdecl _itow() @ cdecl -arch=i386,arm _local_unwind2() +@ cdecl -arch=x86_64 _local_unwind() @ cdecl _purecall() +@ cdecl -arch=x86_64 _setjmp(ptr ptr) +@ cdecl -arch=x86_64 _setjmpex(ptr ptr) @ cdecl _snprintf() @ cdecl _snwprintf() @ cdecl _stricmp() @@ -1552,9 +1583,11 @@ @ cdecl isspace() @ cdecl isupper() @ cdecl isxdigit() +@ cdecl -arch=x86_64 longjmp(ptr long) @ cdecl mbstowcs() @ cdecl mbtowc() @ cdecl memchr() +@ cdecl -arch=x86_64 memcmp() @ cdecl memcpy() @ cdecl memmove() @ cdecl memset()