Commit 6f4339be3a

@@ -10,10 +10,6 @@
 #define _DLL
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <oscalls.h>
 #include <internal.h>
 #include <stdlib.h>
@@ -44,12 +40,6 @@ extern _CRTALLOC(".CRT$XIZ") _PIFV __xi_z[];
 extern _CRTALLOC(".CRT$XCA") _PVFV __xc_a[];
 extern _CRTALLOC(".CRT$XCZ") _PVFV __xc_z[];
 
-#ifndef HAVE_CTOR_LIST
-__attribute__ (( __section__ (".ctors"), __used__ , aligned(sizeof(void *)))) const void * __CTOR_LIST__ = (void *) -1;
-__attribute__ (( __section__ (".dtors"), __used__ , aligned(sizeof(void *)))) const void * __DTOR_LIST__ = (void *) -1;
-__attribute__ (( __section__ (".ctors.99999"), __used__ , aligned(sizeof(void *)))) const void * __CTOR_END__ = (void *) 0;
-__attribute__ (( __section__ (".dtors.99999"), __used__ , aligned(sizeof(void *)))) const void * __DTOR_END__ = (void *) 0;
-#endif
 
 /* TLS initialization hook.  */
 extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback;

@@ -9,10 +9,6 @@
 #define _DLL
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define SPECIAL_CRTEXE
 
 #include <oscalls.h>
@@ -34,7 +30,7 @@ extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv);
 #define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv))
 #endif
 
-#if !defined(__initenv) && !defined(__arm__) && !defined(__aarch64__)
+#if !defined(__initenv)
 extern char *** __MINGW_IMP_SYMBOL(__initenv);
 #define __initenv (* __MINGW_IMP_SYMBOL(__initenv))
 #endif
@@ -66,12 +62,6 @@ extern _CRTALLOC(".CRT$XIZ") _PIFV __xi_z[];
 extern _CRTALLOC(".CRT$XCA") _PVFV __xc_a[];
 extern _CRTALLOC(".CRT$XCZ") _PVFV __xc_z[];
 
-#ifndef HAVE_CTOR_LIST
-__attribute__ (( __section__ (".ctors"), __used__ , aligned(sizeof(void *)))) const void * __CTOR_LIST__ = (void *) -1;
-__attribute__ (( __section__ (".dtors"), __used__ , aligned(sizeof(void *)))) const void * __DTOR_LIST__ = (void *) -1;
-__attribute__ (( __section__ (".ctors.99999"), __used__ , aligned(sizeof(void *)))) const void * __CTOR_END__ = (void *) 0;
-__attribute__ (( __section__ (".dtors.99999"), __used__ , aligned(sizeof(void *)))) const void * __DTOR_END__ = (void *) 0;
-#endif
 
 /* TLS initialization hook.  */
 extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback;
@@ -327,9 +317,7 @@ __tmainCRTStartup (void)
        gcc inserts this call automatically for a function called main, but not for wmain.  */
     mainret = wmain (argc, argv, envp);
 #else
-#if !defined(__arm__) && !defined(__aarch64__)
     __initenv = envp;
-#endif
     mainret = main (argc, argv, envp);
 #endif
     if (!managedapp)

@@ -8,10 +8,6 @@
 #include <stdlib.h>
 #include <setjmp.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 typedef void (*func_ptr) (void);
 extern func_ptr __CTOR_LIST__[];
 extern func_ptr __DTOR_LIST__[];
@@ -32,25 +28,6 @@ __do_global_dtors (void)
     }
 }
 
-#ifndef HAVE_CTOR_LIST
-// If the linker didn't provide __CTOR_LIST__, we provided it ourselves,
-// and then we also know we have __CTOR_END__ available.
-extern func_ptr __CTOR_END__[];
-extern func_ptr __DTOR_END__[];
-
-void __do_global_ctors (void)
-{
-  static func_ptr *p = __CTOR_END__ - 1;
-  while (*p != (func_ptr) -1) {
-    (*(p))();
-    p--;
-  }
-  atexit (__do_global_dtors);
-}
-
-#else
-// old method that iterates the list twice because old linker scripts do not have __CTOR_END__
-
 void
 __do_global_ctors (void)
 {
@@ -70,8 +47,6 @@ __do_global_ctors (void)
   atexit (__do_global_dtors);
 }
 
-#endif
-
 static int initialized = 0;
 
 void

@@ -35,7 +35,7 @@ extern char __mingw_module_is_dll;
 static CRITICAL_SECTION lock;
 static int inited = 0;
 static dtor_obj *global_dtors = NULL;
-static __thread dtor_obj *tls_dtors = NULL;
+static DWORD tls_dtors_slot = TLS_OUT_OF_INDEXES;
 
 int __mingw_cxa_atexit(dtor_fn dtor, void *obj, void *dso) {
   if (!inited)
@@ -73,24 +73,29 @@ int __mingw_cxa_thread_atexit(dtor_fn dtor, void *obj, void *dso) {
     return 1;
   handler->dtor = dtor;
   handler->obj = obj;
-  handler->next = tls_dtors;
-  tls_dtors = handler;
+  handler->next = (dtor_obj *)TlsGetValue(tls_dtors_slot);
+  TlsSetValue(tls_dtors_slot, handler);
   return 0;
 }
 
 static void WINAPI tls_atexit_callback(HANDLE __UNUSED_PARAM(hDllHandle), DWORD dwReason, LPVOID __UNUSED_PARAM(lpReserved)) {
   if (dwReason == DLL_PROCESS_DETACH) {
-    run_dtor_list(&tls_dtors);
+    dtor_obj * p = (dtor_obj *)TlsGetValue(tls_dtors_slot);
+    run_dtor_list(&p);
+    TlsSetValue(tls_dtors_slot, p);
+    TlsFree(tls_dtors_slot);
     run_dtor_list(&global_dtors);
   }
 }
 
 static void WINAPI tls_callback(HANDLE hDllHandle, DWORD dwReason, LPVOID __UNUSED_PARAM(lpReserved)) {
+  dtor_obj * p;
   switch (dwReason) {
   case DLL_PROCESS_ATTACH:
     if (inited == 0) {
       InitializeCriticalSection(&lock);
       __dso_handle = hDllHandle;
+      tls_dtors_slot = TlsAlloc();
       /*
        * We can only call _register_thread_local_exe_atexit_callback once
        * in a process; if we call it a second time the process terminates.
@@ -124,16 +129,19 @@ static void WINAPI tls_callback(HANDLE hDllHandle, DWORD dwReason, LPVOID __UNUS
      * main, or when a DLL is unloaded), and when exiting bypassing some of
      * the cleanup, by calling _exit or ExitProcess. In the latter cases,
      * destructors (both TLS and global) in loaded DLLs still get called,
-     * but only TLS destructors get called for the main executable, global
-     * variables' destructors don't run. (This matches what MSVC does with
-     * a dynamically linked CRT.)
+     * but none get called for the main executable. This matches what the
+     * standard says, but differs from what MSVC does with a dynamically
+     * linked CRT (which still runs TLS destructors for the main thread).
      */
-    run_dtor_list(&tls_dtors);
     if (__mingw_module_is_dll) {
+      p = (dtor_obj *)TlsGetValue(tls_dtors_slot);
+      run_dtor_list(&p);
+      TlsSetValue(tls_dtors_slot, p);
       /* For DLLs, run dtors when detached. For EXEs, run dtors via the
        * thread local atexit callback, to make sure they don't run when
        * exiting the process with _exit or ExitProcess. */
       run_dtor_list(&global_dtors);
+      TlsFree(tls_dtors_slot);
     }
     if (inited == 1) {
       inited = 0;
@@ -143,9 +151,11 @@ static void WINAPI tls_callback(HANDLE hDllHandle, DWORD dwReason, LPVOID __UNUS
   case DLL_THREAD_ATTACH:
     break;
   case DLL_THREAD_DETACH:
-    run_dtor_list(&tls_dtors);
+    p = (dtor_obj *)TlsGetValue(tls_dtors_slot);
+    run_dtor_list(&p);
+    TlsSetValue(tls_dtors_slot, p);
     break;
   }
 }
 
-_CRTALLOC(".CRT$XLE") PIMAGE_TLS_CALLBACK __xl_e = (PIMAGE_TLS_CALLBACK) tls_callback;
+_CRTALLOC(".CRT$XLB") PIMAGE_TLS_CALLBACK __xl_b = (PIMAGE_TLS_CALLBACK) tls_callback;

@@ -101,7 +101,7 @@ extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv);
 #define __winitenv (* __MINGW_IMP_SYMBOL(__winitenv))
 #endif
 
-#if !defined(__initenv) && !defined(__arm__)
+#if !defined(__initenv)
 extern char *** __MINGW_IMP_SYMBOL(__initenv);
 #define __initenv (* __MINGW_IMP_SYMBOL(__initenv))
 #endif

@@ -34,6 +34,7 @@ BCryptGenerateKeyPair
 BCryptGenerateSymmetricKey
 BCryptGetFipsAlgorithmMode
 BCryptGetProperty
+BCryptHash
 BCryptHashData
 BCryptImportKey
 BCryptImportKeyPair

@@ -1,5 +1,6 @@
 LIBRARY "dxgi.dll"
 EXPORTS
+ApplyCompatResolutionQuirking
 CompatString
 CompatValue
 D3DKMTCloseAdapter
@@ -13,10 +14,14 @@ D3DKMTSignalSynchronizationObject
 D3DKMTUnlock
 D3DKMTWaitForSynchronizationObject
 DXGIDumpJournal
+PIXBeginCapture
+PIXEndCapture
+PIXGetCaptureState
 DXGIRevertToSxS
 OpenAdapter10
 OpenAdapter10_2
 SetAppCompatStringPointer
+UpdateHMDEmulationStatus
 CreateDXGIFactory
 CreateDXGIFactory1
 CreateDXGIFactory2
@@ -50,5 +55,6 @@ DXGID3D10CreateLayeredDevice
 DXGID3D10ETWRundown
 DXGID3D10GetLayeredDeviceSize
 DXGID3D10RegisterLayers
+DXGIDeclareAdapterRemovalSupport
 DXGIGetDebugInterface1
 DXGIReportAdapterConfiguration

@@ -9,6 +9,11 @@ AppendPropVariant
 ConvertPropVariant
 CopyPropertyStore
 CreateNamedPropertyStore
+; DllCanUnloadNow
+; DllGetActivationFactory
+; DllGetClassObject
+; DllRegisterServer
+; DllUnregisterServer
 ExtractPropVariant
 MFCreate3GPMediaSink
 MFCreateAC3MediaSink
@@ -36,6 +41,7 @@ MFCreateCredentialCache
 MFCreateDeviceSource
 MFCreateDeviceSourceActivate
 MFCreateDrmNetNDSchemePlugin
+MFCreateEncryptedMediaExtensionsStoreActivate
 MFCreateFMPEG4MediaSink
 MFCreateFileBlockMap
 MFCreateFileSchemePlugin

@@ -9,14 +9,24 @@ AppendPropVariant
 ConvertPropVariant
 CopyPropertyStore
 CreateNamedPropertyStore
+; DllCanUnloadNow
+; DllGetActivationFactory
+; DllGetClassObject
+; DllRegisterServer
+; DllUnregisterServer
 ExtractPropVariant
 MFCopyMFMetadata
+MFCopyPropertyStore
+MFCopyStreamMetadata
 MFCreateAggregateSource
 MFCreateAppSourceProxy
 MFCreateAudioRenderer
 MFCreateAudioRendererActivate
 MFCreateDeviceSource
 MFCreateDeviceSourceActivate
+MFCreateEncryptedMediaExtensionsStoreActivate
+MFCreateExtendedCameraIntrinsicModel
+MFCreateExtendedCameraIntrinsics
 MFCreateFileSchemePlugin
 MFCreateMFMetadataOnPropertyStore
 MFCreateMediaProcessor
@@ -25,6 +35,7 @@ MFCreatePMPHost
 MFCreatePMPMediaSession
 MFCreatePMPServer
 MFCreatePresentationClock
+MFCreatePresentationClockAsyncTimeSource
 MFCreateSampleCopierMFT
 MFCreateSampleGrabberSinkActivate
 MFCreateSequencerSegmentOffset

@@ -1,3 +1,8 @@
+;
+; Definition file of MFPlat.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
 LIBRARY "MFPlat.DLL"
 EXPORTS
 FormatTagFromWfx
@@ -35,9 +40,15 @@ MFBeginUnregisterWorkQueueWithMMCSS
 MFBlockThread
 MFCalculateBitmapImageSize
 MFCalculateImageSize
+MFCallStackTracingClearSnapshot
+MFCallStackTracingLogSessionErrors
+MFCallStackTracingRestoreSnapshot
+MFCallStackTracingTakeSnapshot
 MFCancelCreateFile
 MFCancelWorkItem
+MFCheckEnabledViaAppService
 MFClearLocalMFTs
+MFCombineSamples
 MFCompareFullToPartialMediaType
 MFCompareSockaddrAddresses
 MFConvertColorInfoFromDXVA
@@ -46,19 +57,27 @@ MFConvertFromFP16Array
 MFConvertToFP16Array
 MFCopyImage
 MFCreate2DMediaBuffer
+MFCreate2DMediaBufferOn1DMediaBuffer
 MFCreateAMMediaTypeFromMFMediaType
 MFCreateAlignedMemoryBuffer
+MFCreateAlignedSharedMemoryBuffer
 MFCreateAsyncResult
 MFCreateAttributes
 MFCreateAudioMediaType
+MFCreateByteStreamHandlerAppServiceActivate
 MFCreateCollection
+MFCreateContentDecryptorContext
+MFCreateContentProtectionDevice
+MFCreateD3D12SynchronizationObject
 MFCreateDXGIDeviceManager
 MFCreateDXGISurfaceBuffer
 MFCreateDXSurfaceBuffer
+MFCreateEMEStoreObject
 MFCreateEventQueue
 MFCreateFile
 MFCreateFileFromHandle
 MFCreateLegacyMediaBufferOnMFMediaBuffer
+MFCreateMFByteStreamOnIStreamWithFlags
 MFCreateMFByteStreamOnStream
 MFCreateMFByteStreamOnStreamEx
 MFCreateMFByteStreamWrapper
@@ -69,30 +88,44 @@ MFCreateMediaEvent
 MFCreateMediaEventResult
 MFCreateMediaExtensionActivate
 MFCreateMediaExtensionActivateNoInit
+MFCreateMediaExtensionAppServiceActivate
+MFCreateMediaExtensionInprocActivate
 MFCreateMediaType
 MFCreateMediaTypeFromProperties
 MFCreateMediaTypeFromRepresentation
 MFCreateMemoryBuffer
+MFCreateMemoryBufferFromRawBuffer
 MFCreateMemoryStream
+MFCreateMuxStreamAttributes
+MFCreateMuxStreamMediaType
+MFCreateMuxStreamSample
+MFCreateOOPMFTProxy
+MFCreateOOPMFTRemote
 MFCreatePathFromURL
 MFCreatePresentationDescriptor
 MFCreatePropertiesFromMediaType
 MFCreateReusableByteStream
+MFCreateReusableByteStreamWithSharedLock
 MFCreateSample
+MFCreateSecureBufferAllocator
+MFCreateSharedMemoryMediaBufferFromMediaType
 MFCreateSocket
 MFCreateSocketListener
 MFCreateSourceResolver
 MFCreateSourceResolverInternal
+MFCreateStagingSurfaceWrapper
 MFCreateStreamDescriptor
 MFCreateStreamOnMFByteStream
 MFCreateStreamOnMFByteStreamEx
 MFCreateSystemTimeSource
 MFCreateSystemUnderlyingClock
+MFCreateTelemetrySession
 MFCreateTempFile
 MFCreateTrackedSample
 MFCreateTransformActivate
 MFCreateURLFromPath
 MFCreateUdpSockets
+MFCreateVideoDecryptorContext
 MFCreateVideoMediaType
 MFCreateVideoMediaTypeFromBitMapInfoHeader
 MFCreateVideoMediaTypeFromBitMapInfoHeaderEx
@@ -101,6 +134,7 @@ MFCreateVideoMediaTypeFromVideoInfoHeader
 MFCreateVideoMediaTypeFromVideoInfoHeader2
 MFCreateVideoSampleAllocatorEx
 MFCreateWICBitmapBuffer
+MFCreateWICDecoderProxy
 MFCreateWaveFormatExFromMFMediaType
 MFDeserializeAttributesFromStream
 MFDeserializeEvent
@@ -115,6 +149,7 @@ MFFreeAdaptersAddresses
 MFGetAdaptersAddresses
 MFGetAttributesAsBlob
 MFGetAttributesAsBlobSize
+MFGetCallStackTracingWeakReference
 MFGetConfigurationDWORD
 MFGetConfigurationPolicy
 MFGetConfigurationStore
@@ -136,6 +171,8 @@ MFGetUncompressedVideoFormat
 MFGetWorkQueueMMCSSClass
 MFGetWorkQueueMMCSSPriority
 MFGetWorkQueueMMCSSTaskId
+MFHasLocallyRegisteredByteStreamHandlers
+MFHasLocallyRegisteredSchemeHandlers
 MFHeapAlloc
 MFHeapFree
 MFInitAMMediaTypeFromMFMediaType
@@ -149,10 +186,13 @@ MFInitMediaTypeFromVideoInfoHeader2
 MFInitMediaTypeFromWaveFormatEx
 MFInitVideoFormat
 MFInitVideoFormat_RGB
+MFInvalidateMFTEnumCache
 MFInvokeCallback
 MFJoinIoPort
 MFIsBottomUpFormat
+MFIsContentProtectionDeviceSupported
 MFIsLocallyRegisteredMimeType
+MFIsLocallyRegisteredSchemeHandler
 MFJoinWorkQueue
 MFLockDXGIDeviceManager
 MFLockPlatform
@@ -176,11 +216,15 @@ MFSerializeAttributesToStream
 MFSerializeEvent
 MFSerializeMediaTypeToStream
 MFSerializePresentationDescriptor
+MFSetMinimumMemoryAlignment
 MFSetSockaddrAny
+MFSetWindowForContentProtection
 MFShutdown
+MFSplitSample
 MFStartup
 MFStreamDescriptorProtectMediaType
 MFTEnum
+MFTEnum2
 MFTEnumEx
 MFTGetInfo
 MFTRegister
@@ -200,6 +244,7 @@ MFUnregisterPlatformFromMMCSS
 MFUnwrapMediaType
 MFValidateMediaTypeSize
 MFWrapMediaType
+MFWrapSocket
 MFllMulDiv
 PropVariantFromStream
 PropVariantToStream

@@ -5,5 +5,9 @@
 ;
 LIBRARY "MFPlay.DLL"
 EXPORTS
+; DllCanUnloadNow
+; DllGetClassObject
+; DllRegisterServer
+; DllUnregisterServer
 MFPCreateMediaPlayer
 MFPCreateMediaPlayerEx

@@ -1015,6 +1015,7 @@ _stricmp_l
 _stricoll
 _stricoll_l
 _strlwr
+strlwr == _strlwr
 _strlwr_l
 _strlwr_s
 _strlwr_s_l
@@ -1161,6 +1162,7 @@ _wcsicmp_l
 _wcsicoll
 _wcsicoll_l
 _wcslwr
+wcslwr == _wcslwr
 _wcslwr_l
 _wcslwr_s
 _wcslwr_s_l

@@ -38,6 +38,7 @@ BCryptGenerateKeyPair
 BCryptGenerateSymmetricKey
 BCryptGetFipsAlgorithmMode
 BCryptGetProperty
+BCryptHash
 BCryptHashData
 BCryptImportKey
 BCryptImportKeyPair
@@ -65,6 +66,7 @@ GetKeyStorageInterface
 GetSChannelInterface
 NCryptCloseKeyProtector
 NCryptCloseProtectionDescriptor
+NCryptCreateClaim
 NCryptCreatePersistedKey
 NCryptCreateProtectionDescriptor
 NCryptDecrypt
@@ -100,27 +102,45 @@ NCryptSignHash
 NCryptStreamClose
 NCryptStreamOpenToProtect
 NCryptStreamOpenToUnprotect
+NCryptStreamOpenToUnprotectEx
 NCryptStreamUpdate
 NCryptTranslateHandle
 NCryptUnprotectKey
 NCryptUnprotectSecret
+NCryptVerifyClaim
 NCryptVerifySignature
 SslChangeNotify
 SslComputeClientAuthHash
 SslComputeEapKeyBlock
 SslComputeFinishedHash
+SslComputeSessionHash
 SslCreateClientAuthHash
 SslCreateEphemeralKey
 SslCreateHandshakeHash
 SslDecrementProviderReferenceCount
 SslDecryptPacket
+SslDuplicateTranscriptHash
 SslEncryptPacket
 SslEnumCipherSuites
+SslEnumCipherSuitesEx
+SslEnumEccCurves
 SslEnumProtocolProviders
+SslExpandBinderKey
+SslExpandExporterMasterKey
+SslExpandNextGenTrafficKey
+SslExpandPreSharedKey
+SslExpandResumptionMasterKey
+SslExpandTrafficKeys
+SslExpandWriteKey
 SslExportKey
+SslExportKeyingMaterial
+SslExtractEarlyKey
+SslExtractHandshakeKey
+SslExtractMasterKey
 SslFreeBuffer
 SslFreeObject
 SslGenerateMasterKey
+SslGeneratePreMasterKey
 SslGenerateSessionKeys
 SslGetCipherSuitePRFHashAlgorithm
 SslGetKeyProperty

@@ -1,13 +1,12 @@
-;
-; Definition file of ntdll.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008
-;
+#include "func.def.in"
+
 LIBRARY "ntdll.dll"
 EXPORTS
+#ifdef DEF_X64
 PropertyLengthAsVariant
 RtlConvertPropertyToVariant
 RtlConvertVariantToProperty
+#endif
 A_SHAFinal
 A_SHAInit
 A_SHAUpdate
@@ -39,9 +38,11 @@ CsrClientConnectToServer
 CsrFreeCaptureBuffer
 CsrGetProcessId
 CsrIdentifyAlertableThread
+#if defined(DEF_I386) || defined(DEF_X64)
 CsrNewThread
 CsrProbeForRead
 CsrProbeForWrite
+#endif
 CsrSetPriorityClass
 CsrVerifyRegion
 DbgBreakPoint
@@ -64,13 +65,17 @@ DbgUiStopDebugging
 DbgUiWaitStateChange
 DbgUserBreakPoint
 EtwCheckCoverage
+#ifdef DEF_X64
 EtwControlTraceA
 EtwControlTraceW
+#endif
 EtwCreateTraceInstanceId
+#ifdef DEF_X64
 EtwEnableTrace
 EtwEnumerateTraceGuids
 EtwFlushTraceA
 EtwFlushTraceW
+#endif
 EtwDeliverDataBlock
 EtwEnumerateProcessRegGuids
 EtwEventActivityIdControl
@@ -90,6 +95,7 @@ EtwEventWriteTransfer
 EtwGetTraceEnableFlags
 EtwGetTraceEnableLevel
 EtwGetTraceLoggerHandle
+#ifdef DEF_X64
 EtwNotificationRegistrationA
 EtwNotificationRegistrationW
 EtwQueryAllTracesA
@@ -98,6 +104,7 @@ EtwQueryTraceA
 EtwQueryTraceW
 EtwReceiveNotificationsA
 EtwReceiveNotificationsW
+#endif
 EtwLogTraceEvent
 EtwNotificationRegister
 EtwNotificationUnregister
@@ -105,11 +112,13 @@ EtwProcessPrivateLoggerRequest
 EtwRegisterSecurityProvider
 EtwRegisterTraceGuidsA
 EtwRegisterTraceGuidsW
+#ifdef DEF_X64
 EtwStartTraceA
 EtwStartTraceW
 EtwStopTraceA
 EtwStopTraceW
 EtwTraceEvent
+#endif
 EtwReplyNotification
 EtwSendNotification
 EtwSetMark
@@ -117,45 +126,50 @@ EtwTraceEventInstance
 EtwTraceMessage
 EtwTraceMessageVa
 EtwUnregisterTraceGuids
+#ifdef DEF_X64
 EtwUpdateTraceA
 EtwUpdateTraceW
 EtwpGetTraceBuffer
 EtwpSetHWConfigFunction
+#endif
 EtwWriteUMSecurityEvent
 EtwpCreateEtwThread
 EtwpGetCpuSpeed
-EtwpNotificationThread
+F_X64(EtwpNotificationThread)
 EvtIntReportAuthzEventAndSourceAsync
 EvtIntReportEventAndSourceAsync
+#ifndef DEF_ARM32
 ExpInterlockedPopEntrySListEnd
-ExpInterlockedPopEntrySListEnd16
+F_X64(ExpInterlockedPopEntrySListEnd16)
 ExpInterlockedPopEntrySListFault
-ExpInterlockedPopEntrySListFault16
+F_X64(ExpInterlockedPopEntrySListFault16)
 ExpInterlockedPopEntrySListResume
-ExpInterlockedPopEntrySListResume16
+F_X64(ExpInterlockedPopEntrySListResume16)
+#endif
 KiRaiseUserExceptionDispatcher
 KiUserApcDispatcher
 KiUserCallbackDispatcher
+F_ARM_ANY(KiUserCallbackDispatcherReturn)
 KiUserExceptionDispatcher
-KiUserInvertedFunctionTable
-LdrAccessOutOfProcessResource
+KiUserInvertedFunctionTable F_ARM_ANY(DATA)
+F_X64(LdrAccessOutOfProcessResource)
 LdrAccessResource
 LdrAddDllDirectory
 LdrAddLoadAsDataTable
 LdrAddRefDll
-LdrAlternateResourcesEnabled
+F_X86_ANY(LdrAlternateResourcesEnabled)
 LdrAppxHandleIntegrityFailure
 LdrCallEnclave
 LdrControlFlowGuardEnforced
 LdrCreateEnclave
-LdrCreateOutOfProcessImage
+F_X64(LdrCreateOutOfProcessImage)
 LdrDeleteEnclave
-LdrDestroyOutOfProcessImage
+F_X64(LdrDestroyOutOfProcessImage)
 LdrDisableThreadCalloutsForDll
 LdrEnumResources
 LdrEnumerateLoadedModules
 LdrFastFailInLoaderCallout
-LdrFindCreateProcessManifest
+F_X64(LdrFindCreateProcessManifest)
 LdrFindEntryForAddress
 LdrFindResourceDirectory_U
 LdrFindResourceEx_U
@@ -170,11 +184,11 @@ LdrGetDllHandleEx
 LdrGetDllPath
 LdrGetFailureData
 LdrGetFileNameFromLoadAsDataTable
-LdrGetKnownDllSectionHandle
+F64(LdrGetKnownDllSectionHandle)
 LdrGetProcedureAddress
 LdrGetProcedureAddressEx
 LdrGetProcedureAddressForCaller
-LdrHotPatchRoutine
+F_X86_ANY(LdrHotPatchRoutine)
 LdrInitShimEngineDynamic
 LdrInitializeEnclave
 LdrInitializeThunk
@@ -185,7 +199,7 @@ LdrLoadDll
 LdrLoadEnclaveModule
 LdrLockLoaderLock
 LdrOpenImageFileOptionsKey
-LdrProcessInitializationComplete
+F64(LdrProcessInitializationComplete)
 LdrProcessRelocationBlock
 LdrProcessRelocationBlockEx
 LdrQueryImageFileExecutionOptions
@@ -214,7 +228,7 @@ LdrSetMUICacheType
 LdrShutdownProcess
 LdrShutdownThread
 LdrStandardizeSystemPath
-LdrSystemDllInitBlock
+LdrSystemDllInitBlock F_ARM_ANY(DATA)
 LdrUnloadAlternateResourceModule
 LdrUnloadAlternateResourceModuleEx
 LdrUnloadDll
@@ -256,7 +270,7 @@ NtAlertThreadByThreadId
 NtAllocateLocallyUniqueId
 NtAllocateReserveObject
 NtAllocateUserPhysicalPages
-NtAllocateUserPhysicalPagesEx
+F_X86_ANY(NtAllocateUserPhysicalPagesEx)
 NtAllocateUuids
 NtAllocateVirtualMemory
 NtAllocateVirtualMemoryEx
@@ -289,7 +303,7 @@ NtAssignProcessToJobObject
 NtAssociateWaitCompletionPacket
 NtCallEnclave
 NtCallbackReturn
-NtCancelDeviceWakeupRequest
+F_X86_ANY(NtCancelDeviceWakeupRequest)
 NtCancelIoFile
 NtCancelIoFileEx
 NtCancelSynchronousIoFile
@@ -414,7 +428,7 @@ NtGetNextProcess
 NtGetNextThread
 NtGetNlsSectionPtr
 NtGetNotificationResourceManager
-NtGetPlugPlayEvent
+F_X86_ANY(NtGetPlugPlayEvent)
 NtGetTickCount
 NtGetWriteWatch
 NtImpersonateAnonymousToken
@@ -432,6 +446,7 @@ NtLoadDriver
 NtLoadEnclaveData
 NtLoadKey
 NtLoadKey2
+F_ARM_ANY(NtLoadKey3)
 NtLoadKeyEx
 NtLockFile
 NtLockProductActivationKeys
@@ -496,7 +511,7 @@ NtPrivilegedServiceAuditAlarm
 NtPropagationComplete
 NtPropagationFailed
 NtProtectVirtualMemory
-NtPssCaptureVaSpaceBulk
+F_X86_ANY(NtPssCaptureVaSpaceBulk)
 NtPulseEvent
 NtQueryAttributesFile
 NtQueryAuxiliaryCounterFrequency
@@ -585,10 +600,10 @@ NtReplyPort
 NtReplyWaitReceivePort
 NtReplyWaitReceivePortEx
 NtReplyWaitReplyPort
-NtRequestDeviceWakeup
+F_X86_ANY(NtRequestDeviceWakeup)
 NtRequestPort
 NtRequestWaitReplyPort
-NtRequestWakeupLatency
+F_X86_ANY(NtRequestWakeupLatency)
 NtResetEvent
 NtResetWriteWatch
 NtRestoreKey
@@ -700,6 +715,27 @@ NtWaitForWorkViaWorkerFactory
 NtWaitHighEventPair
 NtWaitLowEventPair
 NtWorkerFactoryWorkerReady
+#ifdef DEF_ARM32
+NtWow64AllocateVirtualMemory64
+NtWow64CallFunction64
+NtWow64CsrAllocateCaptureBuffer
+NtWow64CsrAllocateMessagePointer
+NtWow64CsrCaptureMessageBuffer
+NtWow64CsrCaptureMessageString
+NtWow64CsrClientCallServer
+NtWow64CsrClientConnectToServer
+NtWow64CsrFreeCaptureBuffer
+NtWow64CsrGetProcessId
+NtWow64CsrIdentifyAlertableThread
+NtWow64CsrVerifyRegion
+NtWow64DebuggerCall
+NtWow64GetCurrentProcessorNumberEx
+NtWow64GetNativeSystemInformation
+NtWow64IsProcessorFeaturePresent
+NtWow64QueryInformationProcess64
+NtWow64ReadVirtualMemory64
+NtWow64WriteVirtualMemory64
+#endif
 NtWriteFile
 NtWriteFileGather
 NtWriteRequestData
@@ -721,6 +757,7 @@ PssNtFreeWalkMarker
 PssNtQuerySnapshot
 PssNtValidateDescriptor
 PssNtWalkSnapshot
+F_ARM32(ReadTimeStampCounter)
 RtlAbortRXact
 RtlAbsoluteToSelfRelativeSD
 RtlAcquirePebLock
@@ -785,7 +822,7 @@ RtlAppxIsFileOwnedByTrustedInstaller
 RtlAreAllAccessesGranted
 RtlAreAnyAccessesGranted
 RtlAreBitsClear
-RtlAreBitsClearEx
+F_X64(RtlAreBitsClearEx)
 RtlAreBitsSet
 RtlAreLongPathsEnabled
 RtlAssert
@@ -793,7 +830,7 @@ RtlAvlInsertNodeEx
 RtlAvlRemoveNode
 RtlBarrier
 RtlBarrierForDelete
-RtlCallEnclaveReturn
+F_X64(RtlCallEnclaveReturn)
 RtlCancelTimer
 RtlCanonicalizeDomainName
 RtlCapabilityCheck
@@ -804,7 +841,7 @@ RtlCharToInteger
 RtlCheckBootStatusIntegrity
 RtlCheckForOrphanedCriticalSections
 RtlCheckPortableOperatingSystem
-RtlCheckProcessParameters
+F_X64(RtlCheckProcessParameters)
 RtlCheckRegistryKey
 RtlCheckSandboxedToken
 RtlCheckSystemBootStatusIntegrity
@@ -813,11 +850,11 @@ RtlCheckTokenMembership
 RtlCheckTokenMembershipEx
 RtlCleanUpTEBLangLists
 RtlClearAllBits
-RtlClearAllBitsEx
+F_X64(RtlClearAllBitsEx)
 RtlClearBit
-RtlClearBitEx
+F_X64(RtlClearBitEx)
 RtlClearBits
-RtlClearBitsEx
+F_X64(RtlClearBitsEx)
 RtlClearThreadWorkOnBehalfTicket
 RtlCloneMemoryStream
 RtlCloneUserProcess
@@ -832,7 +869,7 @@ RtlCompareMemoryUlong
 RtlCompareString
 RtlCompareUnicodeString
 RtlCompareUnicodeStrings
-RtlCompleteProcessCloning
+F64(RtlCompleteProcessCloning)
 RtlCompressBuffer
 RtlComputeCrc32
 RtlComputeImportTableHash
@@ -848,7 +885,7 @@ RtlConvertSRWLockExclusiveToShared
 RtlConvertSharedToExclusive
 RtlConvertSidToUnicodeString
 RtlConvertToAutoInheritSecurityObject
-RtlConvertUiListToApiList
+F_X86_ANY(RtlConvertUiListToApiList)
 RtlCopyBitMap
 RtlCopyContext
 RtlCopyExtendedContext
@@ -856,7 +893,7 @@ RtlCopyLuid
 RtlCopyLuidAndAttributesArray
 RtlCopyMappedMemory
 RtlCopyMemory
-RtlCopyMemoryNonTemporal
+F_X64(RtlCopyMemoryNonTemporal)
 RtlCopyMemoryStreamTo
 RtlCopyOutOfProcessMemoryStreamTo
 RtlCopySecurityDescriptor
@@ -891,12 +928,14 @@ RtlCreateSystemVolumeInformationFolder
 RtlCreateTagHeap
 RtlCreateTimer
 RtlCreateTimerQueue
+#ifdef DEF_X64
 RtlCreateUmsCompletionList
 RtlCreateUmsThread
 RtlCreateUmsThreadContext
+#endif
 RtlCreateUnicodeString
 RtlCreateUnicodeStringFromAsciiz
-RtlCreateUserFiberShadowStack
+F_X64(RtlCreateUserFiberShadowStack)
 RtlCreateUserProcess
 RtlCreateUserProcessEx
 RtlCreateUserSecurityObject
@@ -937,9 +976,11 @@ RtlDeleteSecurityObject
 RtlDeleteTimer
 RtlDeleteTimerQueue
 RtlDeleteTimerQueueEx
+#ifdef DEF_X64
 RtlDeleteUmsCompletionList
 RtlDeleteUmsThreadContext
 RtlDequeueUmsCompletionListItems
+#endif
 RtlDeregisterSecureMemoryCacheCallback
 RtlDeregisterWait
 RtlDeregisterWaitEx
@@ -970,14 +1011,14 @@ RtlDosSearchPath_U
 RtlDosSearchPath_Ustr
 RtlDowncaseUnicodeChar
 RtlDowncaseUnicodeString
-RtlDrainNonVolatileFlush
+F64(RtlDrainNonVolatileFlush)
 RtlDumpResource
 RtlDuplicateUnicodeString
 RtlEmptyAtomTable
 RtlEnableEarlyCriticalSectionEventCreation
 RtlEnableThreadProfiling
-RtlEnclaveCallDispatch
-RtlEnclaveCallDispatchReturn
+F_X64(RtlEnclaveCallDispatch)
+F_X64(RtlEnclaveCallDispatchReturn)
 RtlEncodePointer
 RtlEncodeRemotePointer
 RtlEncodeSystemPointer
@@ -985,7 +1026,7 @@ RtlEndEnumerationHashTable
 RtlEndStrongEnumerationHashTable
 RtlEndWeakEnumerationHashTable
 RtlEnterCriticalSection
-RtlEnterUmsSchedulingMode
+F_X64(RtlEnterUmsSchedulingMode)
 RtlEnumProcessHeaps
 RtlEnumerateEntryHashTable
 RtlEnumerateGenericTable
@@ -1006,20 +1047,23 @@ RtlEthernetAddressToStringA
 RtlEthernetAddressToStringW
 RtlEthernetStringToAddressA
 RtlEthernetStringToAddressW
-RtlExecuteUmsThread
+F_X64(RtlExecuteUmsThread)
 RtlExitUserProcess
 RtlExitUserThread
 RtlExpandEnvironmentStrings
 RtlExpandEnvironmentStrings_U
-RtlExtendHeap
+F_X86_ANY(RtlExtendHeap)
 RtlExpandHashTable
 RtlExtendCorrelationVector
 RtlExtendMemoryBlockLookaside
 RtlExtendMemoryZone
+F_ARM32(RtlExtendedMagicDivide)
 RtlExtractBitMap
 RtlFillMemory
-RtlFillMemoryNonTemporal
-RtlFillNonVolatileMemory
+F_X64(RtlFillMemoryNonTemporal)
+F_ARM_ANY(RtlFillMemoryUlong)
+F_ARM_ANY(RtlFillMemoryUlonglong)
+F64(RtlFillNonVolatileMemory)
 RtlFinalReleaseOutOfProcessMemoryStream
 RtlFindAceByType
 RtlFindActivationContextSectionGuid
@@ -1027,7 +1071,7 @@ RtlFindActivationContextSectionString
 RtlFindCharInUnicodeString
 RtlFindClearBits
 RtlFindClearBitsAndSet
-RtlFindClearBitsEx
+F_X64(RtlFindClearBitsEx)
 RtlFindClearRuns
 RtlFindClosestEncodableLength
 RtlFindExportedRoutineByName
@@ -1039,8 +1083,8 @@ RtlFindMostSignificantBit
 RtlFindNextForwardRunClear
 RtlFindSetBits
 RtlFindSetBitsAndClear
-RtlFindSetBitsAndClearEx
-RtlFindSetBitsEx
+F_X64(RtlFindSetBitsAndClearEx)
+F_X64(RtlFindSetBitsEx)
 RtlFindUnicodeSubstring
 RtlFirstEntrySList
 RtlFirstFreeAce
@@ -1049,8 +1093,8 @@ RtlFlsFree
 RtlFlsGetValue
 RtlFlsSetValue
 RtlFlushHeaps
-RtlFlushNonVolatileMemory
-RtlFlushNonVolatileMemoryRanges
+F64(RtlFlushNonVolatileMemory)
+F64(RtlFlushNonVolatileMemoryRanges)
 RtlFlushSecureMemoryCache
 RtlFormatCurrentUserKeyPath
 RtlFormatMessage
@@ -1060,14 +1104,14 @@ RtlFreeAnsiString
 RtlFreeHandle
 RtlFreeHeap
 RtlFreeMemoryBlockLookaside
-RtlFreeNonVolatileToken
+F64(RtlFreeNonVolatileToken)
 RtlFreeOemString
 RtlFreeSid
 RtlFreeThreadActivationContextStack
-RtlFreeUTF8String
+F_X86_ANY(RtlFreeUTF8String)
 RtlFreeUnicodeString
-RtlFreeUserFiberShadowStack
-RtlFreeUserThreadStack
+F_X64(RtlFreeUserFiberShadowStack)
+F_X86_ANY(RtlFreeUserThreadStack)
 RtlFreeUserStack
 RtlGUIDFromString
 RtlGenerate8dot3Name
@@ -1088,7 +1132,7 @@ RtlGetCurrentProcessorNumber
 RtlGetCurrentProcessorNumberEx
 RtlGetCurrentServiceSessionId
 RtlGetCurrentTransaction
-RtlGetCurrentUmsThread
+F_X64(RtlGetCurrentUmsThread)
 RtlGetDaclSecurityDescriptor
 RtlGetDeviceFamilyInfoEnum
 RtlGetElementGenericTable
@@ -1116,8 +1160,8 @@ RtlGetLongestNtPathLength
 RtlGetMultiTimePrecise
 RtlGetNativeSystemInformation
 RtlGetNextEntryHashTable
-RtlGetNextUmsListItem
-RtlGetNonVolatileToken
+F_X64(RtlGetNextUmsListItem)
+F64(RtlGetNonVolatileToken)
 RtlGetNtGlobalFlags
 RtlGetNtProductType
 RtlGetNtSystemRoot
@@ -1144,7 +1188,7 @@ RtlGetThreadPreferredUILanguages
 RtlGetThreadWorkOnBehalfTicket
 RtlGetTokenNamedObjectPath
 RtlGetUILanguageInfo
-RtlGetUmsCompletionListEvent
+F_X64(RtlGetUmsCompletionListEvent)
 RtlGetUnloadEventTrace
 RtlGetUnloadEventTraceEx
 RtlGetUserInfoHeap
@@ -1177,14 +1221,14 @@ RtlInitOutOfProcessMemoryStream
 RtlInitString
 RtlInitStringEx
 RtlInitStrongEnumerationHashTable
-RtlInitUTF8String
-RtlInitUTF8StringEx
+F_X86_ANY(RtlInitUTF8String)
+F_X86_ANY(RtlInitUTF8StringEx)
 RtlInitUnicodeString
 RtlInitUnicodeStringEx
 RtlInitWeakEnumerationHashTable
 RtlInitializeAtomPackage
 RtlInitializeBitMap
-RtlInitializeBitMapEx
+F64(RtlInitializeBitMapEx)
 RtlInitializeConditionVariable
 RtlInitializeContext
 RtlInitializeCorrelationVector
@@ -1270,7 +1314,7 @@ RtlIsValidHandle
 RtlIsValidIndexHandle
 RtlIsValidLocaleName
 RtlIsValidProcessTrustLabelSid
-RtlIsZeroMemory
+F_X86_ANY(RtlIsZeroMemory)
 RtlKnownExceptionFilter
 RtlLCIDToCultureName
 RtlLargeIntegerToChar
@@ -1318,19 +1362,19 @@ RtlNewSecurityObject
 RtlNewSecurityObjectEx
 RtlNewSecurityObjectWithMultipleInheritance
 RtlNormalizeProcessParams
-RtlNormalizeSecurityDescriptor
+F_X86_ANY(RtlNormalizeSecurityDescriptor)
 RtlNormalizeString
 RtlNtPathNameToDosPathName
 RtlNtStatusToDosError
 RtlNtStatusToDosErrorNoTeb
-RtlNtdllName DATA
+F64(RtlNtdllName DATA)
 RtlNumberGenericTableElements
 RtlNumberGenericTableElementsAvl
 RtlNumberOfClearBits
-RtlNumberOfClearBitsEx
+F_X64(RtlNumberOfClearBitsEx)
 RtlNumberOfClearBitsInRange
 RtlNumberOfSetBits
-RtlNumberOfSetBitsEx
+F_X64(RtlNumberOfSetBitsEx)
 RtlNumberOfSetBitsInRange
 RtlNumberOfSetBitsUlongPtr
 RtlOemStringToUnicodeSize
@@ -1344,7 +1388,7 @@ RtlPinAtomInAtomTable
 RtlPopFrame
 RtlPrefixString
 RtlPrefixUnicodeString
-RtlPrepareForProcessCloning
+F64(RtlPrepareForProcessCloning)
 RtlProcessFlsData
 RtlProtectHeap
 RtlPublishWnfStateData
@@ -1385,7 +1429,7 @@ RtlQueryThreadPlaceholderCompatibilityMode
 RtlQueryThreadProfiling
 RtlQueryTimeZoneInformation
 RtlQueryTokenHostIdAsUlong64
-RtlQueryUmsThreadInformation
+F_X64(RtlQueryUmsThreadInformation)
 RtlQueryUnbiasedInterruptTime
 RtlQueryValidationRunlevel
 RtlQueryWnfMetaNotification
@@ -1438,7 +1482,7 @@ RtlRestoreBootStatusDefaults
 RtlRestoreContext
 RtlRestoreLastWin32Error
 RtlRestoreSystemBootStatusDefaults
-RtlRestoreThreadPreferredUILanguages
+F_X86_ANY(RtlRestoreThreadPreferredUILanguages)
 RtlRetrieveNtUserPfn
 RtlRevertMemoryStream
 RtlRunDecodeUnicodeString
@@ -1454,12 +1498,12 @@ RtlSelfRelativeToAbsoluteSD
 RtlSelfRelativeToAbsoluteSD2
 RtlSendMsgToSm
 RtlSetAllBits
-RtlSetAllBitsEx
+F_X64(RtlSetAllBitsEx)
 RtlSetAttributesSecurityDescriptor
 RtlSetBit
-RtlSetBitEx
+F_X64(RtlSetBitEx)
 RtlSetBits
-RtlSetBitsEx
+F_X64(RtlSetBitsEx)
 RtlSetControlSecurityDescriptor
 RtlSetCriticalSectionSpinCount
 RtlSetCurrentDirectory_U
@@ -1499,14 +1543,15 @@ RtlSetThreadIsCritical
 RtlSetThreadPlaceholderCompatibilityMode
 RtlSetThreadPoolStartFunc
 RtlSetThreadPreferredUILanguages
-RtlSetThreadPreferredUILanguages2
+F_X86_ANY(RtlSetThreadPreferredUILanguages2)
 RtlSetThreadSubProcessTag
 RtlSetThreadWorkOnBehalfTicket
 RtlSetTimeZoneInformation
 RtlSetTimer
-RtlSetUmsThreadInformation
+F_X64(RtlSetUmsThreadInformation)
 RtlSetUnhandledExceptionFilter
-RtlSetUnicodeCallouts
+F_X64(RtlSetUnicodeCallouts)
+F32(RtlSetUserCallbackExceptionFilter)
 RtlSetUserFlagsHeap
 RtlSetUserValueHeap
 RtlSidDominates
@@ -1533,7 +1578,7 @@ RtlSwitchedVVI
 RtlSystemTimeToLocalTime
 RtlTestAndPublishWnfStateData
 RtlTestBit
-RtlTestBitEx
+F64(RtlTestBitEx)
 RtlTestProtectedAccess
 RtlTimeFieldsToTime
 RtlTimeToElapsedTimeFields
@@ -1553,10 +1598,12 @@ RtlTryAcquireSRWLockExclusive
 RtlTryAcquireSRWLockShared
 RtlTryConvertSRWLockSharedToExclusiveOrRelease
 RtlTryEnterCriticalSection
-RtlUTF8StringToUnicodeString
+F_X86_ANY(RtlUTF8StringToUnicodeString)
 RtlUTF8ToUnicodeN
 RtlUdiv128
-RtlUmsThreadYield
+F_X64(RtlUmsThreadYield)
+F_ARM_ANY(RtlUlongByteSwap)
+F_ARM_ANY(RtlUlonglongByteSwap)
 RtlUnhandledExceptionFilter
 RtlUnhandledExceptionFilter2
 RtlUnicodeStringToAnsiSize
@@ -1565,7 +1612,7 @@ RtlUnicodeStringToCountedOemString
 RtlUnicodeStringToInteger
 RtlUnicodeStringToOemSize
 RtlUnicodeStringToOemString
-RtlUnicodeStringToUTF8String
+F_X86_ANY(RtlUnicodeStringToUTF8String)
 RtlUnicodeToCustomCPN
 RtlUnicodeToMultiByteN
 RtlUnicodeToMultiByteSize
@@ -1597,9 +1644,10 @@ RtlUpdateClonedSRWLock
 RtlUpdateTimer
 RtlUpperChar
 RtlUpperString
-RtlUsageHeap
+F_X86_ANY(RtlUsageHeap)
 RtlUserFiberStart
 RtlUserThreadStart
+F_ARM_ANY(RtlUshortByteSwap)
 RtlValidAcl
 RtlValidProcessProtection
 RtlValidRelativeSecurityDescriptor
@@ -1628,16 +1676,17 @@ RtlWnfDllUnloadCallback
 RtlWow64CallFunction64
 RtlWow64EnableFsRedirection
 RtlWow64EnableFsRedirectionEx
-RtlWow64GetCpuAreaInfo
-RtlWow64GetCurrentCpuArea
+F64(RtlWow64GetCpuAreaInfo)
+F64(RtlWow64GetCurrentCpuArea)
 RtlWow64GetCurrentMachine
 RtlWow64GetEquivalentMachineCHPE
 RtlWow64GetProcessMachines
 RtlWow64GetSharedInfoProcess
-RtlWow64GetThreadContext
-RtlWow64GetThreadSelectorEntry
+F64(RtlWow64GetThreadContext)
+F64(RtlWow64GetThreadSelectorEntry)
 RtlWow64IsWowGuestMachineSupported
 RtlWow64LogMessageInEventLogger
+#if defined(DEF_X64) || defined(DEF_ARM64)
 RtlWow64PopAllCrossProcessWorkFromWorkList
 RtlWow64PopCrossProcessWorkFromFreeList
 RtlWow64PushCrossProcessWorkOntoFreeList
@@ -1646,8 +1695,9 @@ RtlWow64RequestCrossProcessHeavyFlush
 RtlWow64SetThreadContext
 RtlWow64SuspendProcess
 RtlWow64SuspendThread
+#endif
 RtlWriteMemoryStream
-RtlWriteNonVolatileMemory
+F64(RtlWriteNonVolatileMemory)
 RtlWriteRegistryValue
 RtlZeroHeap
 RtlZeroMemory
@@ -1661,8 +1711,8 @@ RtlpConvertLCIDsToCultureNames
 RtlpConvertRelativeToAbsoluteSecurityAttribute
 RtlpCreateProcessRegistryInfo
 RtlpEnsureBufferSize
-RtlpExecuteUmsThread
-RtlpFreezeTimeBias
+F_X64(RtlpExecuteUmsThread)
+RtlpFreezeTimeBias F_ARM_ANY(DATA)
 RtlpGetDeviceFamilyInfoEnum
 RtlpGetLCIDFromLangInfoNode
 RtlpGetNameFromLangInfoNode
@@ -1685,7 +1735,7 @@ RtlpNtOpenKey
 RtlpNtQueryValueKey
 RtlpNtSetValueKey
 RtlpQueryDefaultUILanguage
-RtlpQueryProcessDebugInformationFromWow64
+F64(RtlpQueryProcessDebugInformationFromWow64)
 RtlpQueryProcessDebugInformationRemote
 RtlpRefreshCachedUILanguage
 RtlpSetInstallLanguage
@@ -1693,14 +1743,17 @@ RtlpSetPreferredUILanguages
 RtlpSetUserPreferredUILanguages
 RtlpTimeFieldsToTime
 RtlpTimeToTimeFields
-RtlpUmsExecuteYieldThreadEnd
-RtlpUmsThreadYield
+F_X64(RtlpUmsExecuteYieldThreadEnd)
+F_X64(RtlpUmsThreadYield)
 RtlpUnWaitCriticalSection
 RtlpVerifyAndCommitUILanguageSettings
 RtlpWaitForCriticalSection
+#ifdef DEF_X64
 RtlpWow64CtxFromAmd64
 RtlpWow64GetContextOnAmd64
 RtlpWow64SetContextOnAmd64
+#endif
+F_ARM64(RtlpWow64CtxFromArm64)
 RtlxAnsiStringToUnicodeSize
 RtlxOemStringToUnicodeSize
 RtlxUnicodeStringToAnsiSize
@@ -1736,12 +1789,12 @@ TpCancelAsyncIoOperation
 TpCaptureCaller
 TpCheckTerminateWorker
 TpDbgDumpHeapUsage
-TpDbgGetFreeInfo
+F_X86_ANY(TpDbgGetFreeInfo)
 TpDbgSetLogRoutine
 TpDisablePoolCallbackChecks
 TpDisassociateCallback
 TpIsTimerSet
-TpPoolFreeUnusedNodes
+F_X86_ANY(TpPoolFreeUnusedNodes)
 TpPostWork
 TpQueryPoolStackInformation
 TpReleaseAlpcCompletion
@@ -1831,7 +1884,7 @@ ZwAlertThreadByThreadId
 ZwAllocateLocallyUniqueId
 ZwAllocateReserveObject
 ZwAllocateUserPhysicalPages
-ZwAllocateUserPhysicalPagesEx
+F_X86_ANY(ZwAllocateUserPhysicalPagesEx)
 ZwAllocateUuids
 ZwAllocateVirtualMemory
 ZwAllocateVirtualMemoryEx
@@ -1864,7 +1917,7 @@ ZwAssignProcessToJobObject
 ZwAssociateWaitCompletionPacket
 ZwCallEnclave
 ZwCallbackReturn
-ZwCancelDeviceWakeupRequest
+F_X86_ANY(ZwCancelDeviceWakeupRequest)
 ZwCancelIoFile
 ZwCancelIoFileEx
 ZwCancelSynchronousIoFile
@@ -1989,7 +2042,7 @@ ZwGetNextProcess
 ZwGetNextThread
 ZwGetNlsSectionPtr
 ZwGetNotificationResourceManager
-ZwGetPlugPlayEvent
+F_X86_ANY(ZwGetPlugPlayEvent)
 ZwGetWriteWatch
 ZwImpersonateAnonymousToken
 ZwImpersonateClientOfPort
@@ -2006,6 +2059,7 @@ ZwLoadDriver
 ZwLoadEnclaveData
 ZwLoadKey
 ZwLoadKey2
+F_ARM_ANY(ZwLoadKey3)
 ZwLoadKeyEx
 ZwLockFile
 ZwLockProductActivationKeys
@@ -2070,7 +2124,7 @@ ZwPrivilegedServiceAuditAlarm
 ZwPropagationComplete
 ZwPropagationFailed
 ZwProtectVirtualMemory
-ZwPssCaptureVaSpaceBulk
+F_X86_ANY(ZwPssCaptureVaSpaceBulk)
 ZwPulseEvent
 ZwQueryAttributesFile
 ZwQueryAuxiliaryCounterFrequency
@@ -2159,10 +2213,10 @@ ZwReplyPort
 ZwReplyWaitReceivePort
 ZwReplyWaitReceivePortEx
 ZwReplyWaitReplyPort
-ZwRequestDeviceWakeup
+F_X86_ANY(ZwRequestDeviceWakeup)
 ZwRequestPort
 ZwRequestWaitReplyPort
-ZwRequestWakeupLatency
+F_X86_ANY(ZwRequestWakeupLatency)
 ZwResetEvent
 ZwResetWriteWatch
 ZwRestoreKey
@@ -2274,8 +2328,31 @@ ZwWaitForWorkViaWorkerFactory
 ZwWaitHighEventPair
 ZwWaitLowEventPair
 ZwWorkerFactoryWorkerReady
+#ifdef DEF_ARM32
+ZwWow64AllocateVirtualMemory64
+ZwWow64CallFunction64
+ZwWow64CsrAllocateCaptureBuffer
+ZwWow64CsrAllocateMessagePointer
+ZwWow64CsrCaptureMessageBuffer
+ZwWow64CsrCaptureMessageString
+ZwWow64CsrClientCallServer
+ZwWow64CsrClientConnectToServer
+ZwWow64CsrFreeCaptureBuffer
+ZwWow64CsrGetProcessId
+ZwWow64CsrIdentifyAlertableThread
+ZwWow64CsrVerifyRegion
+ZwWow64DebuggerCall
+ZwWow64GetCurrentProcessorNumberEx
+ZwWow64GetNativeSystemInformation
+ZwWow64IsProcessorFeaturePresent
+ZwWow64QueryInformationProcess64
+ZwWow64ReadVirtualMemory64
+ZwWow64WriteVirtualMemory64
+#endif
 ZwWriteFile
 ZwWriteFileGather
 ZwWriteRequestData
 ZwWriteVirtualMemory
 ZwYieldExecution
+vDbgPrintEx
+vDbgPrintExWithPrefix

@@ -28,6 +28,11 @@ MergeLegacyPwrScheme
 PowerApplyPowerRequestOverride
 PowerApplySettingChanges
 PowerCanRestoreIndividualDefaultPowerScheme
+PowerCleanupOverrides
+PowerClearUserAwayPrediction
+PowerCloseEnvironmentalMonitor
+PowerCloseLimitsMitigation
+PowerCloseLimitsPolicy
 PowerCreatePossibleSetting
 PowerCreateSetting
 PowerCustomizePlatformPowerSettings
@@ -42,7 +47,14 @@ PowerDeterminePlatformRole
 PowerDeterminePlatformRoleEx
 PowerDuplicateScheme
 PowerEnumerate
+PowerEnumerateSettings
 PowerGetActiveScheme
+PowerGetActualOverlayScheme
+PowerGetAdaptiveStandbyDiagnostics
+PowerGetEffectiveOverlayScheme
+PowerGetOverlaySchemes
+PowerGetProfiles
+PowerGetUserAwayMinPredictionConfidence
 PowerImportPowerScheme
 PowerInternalDeleteScheme
 PowerInternalDuplicateScheme
@@ -59,38 +71,58 @@ PowerPolicyToGUIDFormat
 PowerReadACDefaultIndex
 PowerReadACValue
 PowerReadACValueIndex
+PowerReadACValueIndexEx
 PowerReadDCDefaultIndex
 PowerReadDCValue
 PowerReadDCValueIndex
+PowerReadDCValueIndexEx
 PowerReadDescription
 PowerReadFriendlyName
 PowerReadIconResourceSpecifier
 PowerReadPossibleDescription
 PowerReadPossibleFriendlyName
 PowerReadPossibleValue
+PowerReadProfileAlias
 PowerReadSecurityDescriptor
 PowerReadSettingAttributes
 PowerReadValueIncrement
 PowerReadValueMax
 PowerReadValueMin
 PowerReadValueUnitsSpecifier
+PowerReapplyActiveScheme
+PowerRegisterEnvironmentalMonitor
+PowerRegisterForEffectivePowerModeNotifications
+PowerRegisterLimitsMitigation
+PowerRegisterLimitsPolicy
 PowerRegisterSuspendResumeNotification
 PowerRemovePowerSetting
 PowerReplaceDefaultPowerSchemes
+PowerReportLimitsEvent
 PowerReportThermalEvent
+PowerRestoreACDefaultIndex
+PowerRestoreDCDefaultIndex
 PowerRestoreDefaultPowerSchemes
 PowerRestoreIndividualDefaultPowerScheme
+PowerSetActiveOverlayScheme
 PowerSetActiveScheme
 PowerSetAlsBrightnessOffset
+PowerSetBrightnessAndTransitionTimes
+PowerSetUserAwayPrediction
 PowerSettingAccessCheck
 PowerSettingAccessCheckEx
 PowerSettingRegisterNotification
 PowerSettingRegisterNotificationEx
 PowerSettingUnregisterNotification
+PowerUnregisterFromEffectivePowerModeNotifications
 PowerUnregisterSuspendResumeNotification
+PowerUpdateEnvironmentalMonitorState
+PowerUpdateEnvironmentalMonitorThresholds
+PowerUpdateLimitsMitigation
 PowerWriteACDefaultIndex
+PowerWriteACProfileIndex
 PowerWriteACValueIndex
 PowerWriteDCDefaultIndex
+PowerWriteDCProfileIndex
 PowerWriteDCValueIndex
 PowerWriteDescription
 PowerWriteFriendlyName

@@ -1,14 +1,18 @@
 ;
 ; Definition file of WOFUTIL.dll
 ; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
+; written by Kai Tietz 2008
 ;
 LIBRARY "WOFUTIL.dll"
 EXPORTS
 WofEnumEntries
+WofFileEnumFiles
+WofGetDriverVersion
 WofIsExternalFile
 WofSetFileDataLocation
+WofShouldCompressBinaries
 WofWimAddEntry
 WofWimEnumFiles
 WofWimRemoveEntry
+WofWimSuspendEntry
 WofWimUpdateEntry

@@ -12,8 +12,8 @@ PackageFullNameFromId@12
 PackageIdFromFullName@16
 PackageNameAndPublisherIdFromFamilyName@20
 ParseApplicationUserModelId@20
-VerifyApplicationUserModelId@
-VerifyPackageFamilyName@
-VerifyPackageFullName@
-VerifyPackageId@
-VerifyPackageRelativeApplicationId@
+VerifyApplicationUserModelId@4
+VerifyPackageFamilyName@4
+VerifyPackageFullName@4
+VerifyPackageId@4
+VerifyPackageRelativeApplicationId@4

@@ -2,14 +2,14 @@ LIBRARY api-ms-win-core-file-fromapp-l1-1-0
 
 EXPORTS
 
-CopyFileFromAppW@
-CreateDirectoryFromAppW@
-CreateFile2FromAppW@
-CreateFileFromAppW@
-DeleteFileFromAppW@
-FindFirstFileExFromAppW@
-GetFileAttributesExFromAppW@
-MoveFileFromAppW@
-RemoveDirectoryFromAppW@
-ReplaceFileFromAppW@
-SetFileAttributesFromAppW@
+CopyFileFromAppW@12
+CreateDirectoryFromAppW@8
+CreateFile2FromAppW@20
+CreateFileFromAppW@28
+DeleteFileFromAppW@4
+FindFirstFileExFromAppW@24
+GetFileAttributesExFromAppW@12
+MoveFileFromAppW@8
+RemoveDirectoryFromAppW@4
+ReplaceFileFromAppW@24
+SetFileAttributesFromAppW@8

@@ -18,7 +18,7 @@ OpenFileMappingW@12
 ReadProcessMemory@20
 ReclaimVirtualMemory@8
 ResetWriteWatch@8
-SetProcessValidCallTargets
+SetProcessValidCallTargets@20
 SetProcessWorkingSetSizeEx@16
 UnmapViewOfFile@4
 UnmapViewOfFileEx@8

@@ -18,7 +18,7 @@ OpenFileMappingW@12
 ReadProcessMemory@20
 ReclaimVirtualMemory@8
 ResetWriteWatch@8
-SetProcessValidCallTargets
+SetProcessValidCallTargets@20
 SetProcessWorkingSetSizeEx@16
 UnmapViewOfFile@4
 UnmapViewOfFileEx@8

@@ -33,5 +33,5 @@ VirtualProtectFromApp@16
 VirtualQuery@12
 VirtualQueryEx@16
 VirtualUnlock@8
-VirtualUnlockEx@
+VirtualUnlockEx@12
 WriteProcessMemory@20

@@ -10,7 +10,7 @@ GetLargePageMinimum@0
 GetProcessWorkingSetSizeEx@16
 GetWriteWatch@24
 MapViewOfFile@20
-MapViewOfFile3FromApp@
+MapViewOfFile3FromApp@40
 MapViewOfFileEx@24
 MapViewOfFileFromApp@20
 OfferVirtualMemory@12
@@ -19,13 +19,13 @@ OpenFileMappingW@12
 ReadProcessMemory@20
 ReclaimVirtualMemory@8
 ResetWriteWatch@8
-SetProcessValidCallTargets
+SetProcessValidCallTargets@20
 SetProcessWorkingSetSizeEx@16
 UnmapViewOfFile@4
-UnmapViewOfFile2@
+UnmapViewOfFile2@12
 UnmapViewOfFileEx@8
 VirtualAlloc@16
-VirtualAlloc2FromApp@
+VirtualAlloc2FromApp@28
 VirtualAllocFromApp@16
 VirtualFree@12
 VirtualFreeEx@16
@@ -35,5 +35,5 @@ VirtualProtectFromApp@16
 VirtualQuery@12
 VirtualQueryEx@16
 VirtualUnlock@8
-VirtualUnlockEx@
+VirtualUnlockEx@12
 WriteProcessMemory@20

@@ -10,7 +10,7 @@ GetLargePageMinimum@0
 GetProcessWorkingSetSizeEx@16
 GetWriteWatch@24
 MapViewOfFile@20
-MapViewOfFile3FromApp@
+MapViewOfFile3FromApp@40
 MapViewOfFileEx@24
 MapViewOfFileFromApp@20
 OfferVirtualMemory@12
@@ -19,14 +19,14 @@ OpenFileMappingW@12
 ReadProcessMemory@20
 ReclaimVirtualMemory@8
 ResetWriteWatch@8
-SetProcessValidCallTargets
-SetProcessValidCallTargetsForMappedView@
+SetProcessValidCallTargets@20
+SetProcessValidCallTargetsForMappedView@32
 SetProcessWorkingSetSizeEx@16
 UnmapViewOfFile@4
-UnmapViewOfFile2@
+UnmapViewOfFile2@12
 UnmapViewOfFileEx@8
 VirtualAlloc@16
-VirtualAlloc2FromApp@
+VirtualAlloc2FromApp@28
 VirtualAllocFromApp@16
 VirtualFree@12
 VirtualFreeEx@16
@@ -36,5 +36,5 @@ VirtualProtectFromApp@16
 VirtualQuery@12
 VirtualQueryEx@16
 VirtualUnlock@8
-VirtualUnlockEx@
+VirtualUnlockEx@12
 WriteProcessMemory@20

@@ -2,25 +2,25 @@ LIBRARY api-ms-win-core-path-l1-1-0
 
 EXPORTS
 
-PathAllocCanonicalize@
-PathAllocCombine@
-PathCchAddBackslash@
-PathCchAddBackslashEx@
-PathCchAddExtension@
-PathCchAppend@
-PathCchAppendEx@
-PathCchCanonicalize@
-PathCchCanonicalizeEx@
-PathCchCombine@
-PathCchCombineEx@
-PathCchFindExtension@
-PathCchIsRoot@
-PathCchRemoveBackslash@
-PathCchRemoveBackslashEx@
-PathCchRemoveExtension@
-PathCchRemoveFileSpec@
-PathCchRenameExtension@
-PathCchSkipRoot@
-PathCchStripPrefix@
-PathCchStripToRoot@
-PathIsUNCEx@
+PathAllocCanonicalize@12
+PathAllocCombine@16
+PathCchAddBackslash@8
+PathCchAddBackslashEx@16
+PathCchAddExtension@12
+PathCchAppend@12
+PathCchAppendEx@16
+PathCchCanonicalize@12
+PathCchCanonicalizeEx@16
+PathCchCombine@16
+PathCchCombineEx@20
+PathCchFindExtension@12
+PathCchIsRoot@4
+PathCchRemoveBackslash@8
+PathCchRemoveBackslashEx@16
+PathCchRemoveExtension@8
+PathCchRemoveFileSpec@8
+PathCchRenameExtension@12
+PathCchSkipRoot@8
+PathCchStripPrefix@8
+PathCchStripToRoot@8
+PathIsUNCEx@8

@@ -2,5 +2,5 @@ LIBRARY api-ms-win-core-psm-appnotify-l1-1-0
 
 EXPORTS
 
-RegisterAppStateChangeNotification@
-UnregisterAppStateChangeNotification@
+RegisterAppStateChangeNotification@12
+UnregisterAppStateChangeNotification@4

@@ -2,8 +2,8 @@ LIBRARY api-ms-win-core-realtime-l1-1-2
 
 EXPORTS
 
-ConvertAuxiliaryCounterToPerformanceCounter@
-ConvertPerformanceCounterToAuxiliaryCounter@
+ConvertAuxiliaryCounterToPerformanceCounter@16
+ConvertPerformanceCounterToAuxiliaryCounter@16
 QueryAuxiliaryCounterFrequency@
 QueryInterruptTime@4
 QueryInterruptTimePrecise@4

@@ -2,16 +2,16 @@ LIBRARY api-ms-win-devices-config-l1-1-1
 
 EXPORTS
 
-CM_Get_Device_ID_List_SizeW@
-CM_Get_Device_ID_ListW@
-CM_Get_Device_IDW@
-CM_Get_Device_Interface_List_SizeW@
-CM_Get_Device_Interface_ListW@
-CM_Get_Device_Interface_PropertyW@
-CM_Get_DevNode_PropertyW@
-CM_Get_DevNode_Status@
-CM_Get_Parent@
-CM_Locate_DevNodeW@
-CM_MapCrToWin32Err@
-CM_Register_Notification@
-CM_Unregister_Notification@
+CM_Get_Device_ID_List_SizeW@12
+CM_Get_Device_ID_ListW@16
+CM_Get_Device_IDW@16
+CM_Get_Device_Interface_List_SizeW@16
+CM_Get_Device_Interface_ListW@20
+CM_Get_Device_Interface_PropertyW@24
+CM_Get_DevNode_PropertyW@24
+CM_Get_DevNode_Status@16
+CM_Get_Parent@12
+CM_Locate_DevNodeW@12
+CM_MapCrToWin32Err@8
+CM_Register_Notification@16
+CM_Unregister_Notification@4

@@ -2,4 +2,4 @@ LIBRARY api-ms-win-gaming-deviceinformation-l1-1-0
 
 EXPORTS
 
-GetGamingDeviceModelInformation@
+GetGamingDeviceModelInformation@4

@@ -2,6 +2,6 @@ LIBRARY api-ms-win-gaming-expandedresources-l1-1-0
 
 EXPORTS
 
-GetExpandedResourceExclusiveCpuCount@
-HasExpandedResources@
-ReleaseExclusiveCpuSets@
+GetExpandedResourceExclusiveCpuCount@4
+HasExpandedResources@4
+ReleaseExclusiveCpuSets@0

@@ -11,8 +11,8 @@ ShowChangeFriendRelationshipUI@12
 ShowChangeFriendRelationshipUIForUser@16
 ShowGameInviteUI@24
 ShowGameInviteUIForUser@28
-ShowGameInviteUIWithContext@
-ShowGameInviteUIWithContextForUser@
+ShowGameInviteUIWithContext@28
+ShowGameInviteUIWithContextForUser@32
 ShowPlayerPickerUI@36
 ShowPlayerPickerUIForUser@40
 ShowProfileCardUI@12

@@ -10,21 +10,21 @@ ProcessPendingGameUI@4
 ShowChangeFriendRelationshipUI@12
 ShowChangeFriendRelationshipUIForUser@16
 ShowCustomizeUserProfileUI@
-ShowCustomizeUserProfileUIForUser@
-ShowFindFriendsUI@
-ShowFindFriendsUIForUser@
-ShowGameInfoUI@
-ShowGameInfoUIForUser@
+ShowCustomizeUserProfileUIForUser@12
+ShowFindFriendsUI@8
+ShowFindFriendsUIForUser@12
+ShowGameInfoUI@12
+ShowGameInfoUIForUser@16
 ShowGameInviteUI@24
 ShowGameInviteUIForUser@28
-ShowGameInviteUIWithContext@
-ShowGameInviteUIWithContextForUser@
+ShowGameInviteUIWithContext@28
+ShowGameInviteUIWithContextForUser@32
 ShowPlayerPickerUI@36
 ShowPlayerPickerUIForUser@40
 ShowProfileCardUI@12
 ShowProfileCardUIForUser@16
 ShowTitleAchievementsUI@12
 ShowTitleAchievementsUIForUser@16
-ShowUserSettingsUI@
-ShowUserSettingsUIForUser@
+ShowUserSettingsUI@8
+ShowUserSettingsUIForUser@12
 TryCancelPendingGameUI@0

@@ -12,6 +12,7 @@ BCryptConfigureContext@12
 BCryptConfigureContextFunction@20
 BCryptCreateContext@12
 BCryptCreateHash@28
+BCryptCreateMultiHash@32
 BCryptDecrypt@40
 BCryptDeleteContext@8
 BCryptDeriveKey@28
@@ -38,10 +39,13 @@ BCryptGenerateKeyPair@16
 BCryptGenerateSymmetricKey@28
 BCryptGetFipsAlgorithmMode@4
 BCryptGetProperty@24
+BCryptHash@28
 BCryptHashData@16
 BCryptImportKey@36
 BCryptImportKeyPair@28
+BCryptKeyDerivation@24
 BCryptOpenAlgorithmProvider@16
+BCryptProcessMultiOperations@20
 BCryptQueryContextConfiguration@16
 BCryptQueryContextFunctionConfiguration@24
 BCryptQueryContextFunctionProperty@28

@@ -5,6 +5,9 @@
 ;
 LIBRARY "dxgi.dll"
 EXPORTS
+ApplyCompatResolutionQuirking@8
+CompatString@16
+CompatValue@8
 D3DKMTCloseAdapter@4
 D3DKMTDestroyAllocation@4
 D3DKMTDestroyContext@4
@@ -14,10 +17,18 @@ D3DKMTQueryAdapterInfo@4
 D3DKMTSetDisplayPrivateDriverFormat@4
 D3DKMTSignalSynchronizationObject@4
 D3DKMTUnlock@4
+D3DKMTWaitForSynchronizationObject@0
 DXGIDumpJournal@4
+PIXBeginCapture@8
+PIXEndCapture@4
+PIXGetCaptureState@0
+DXGIRevertToSxS@0
 OpenAdapter10@4
 OpenAdapter10_2@4
+SetAppCompatStringPointer@8
+UpdateHMDEmulationStatus@4
 CreateDXGIFactory1@8
+CreateDXGIFactory2@12
 CreateDXGIFactory@8
 D3DKMTCreateAllocation@4
 D3DKMTCreateContext@4
@@ -46,6 +57,9 @@ D3DKMTWaitForSynchronizationObject@4
 D3DKMTWaitForVerticalBlankEvent@4
 DXGID3D10CreateDevice@24
 DXGID3D10CreateLayeredDevice@20
+DXGID3D10ETWRundown@0
 DXGID3D10GetLayeredDeviceSize@8
 DXGID3D10RegisterLayers@8
+DXGIDeclareAdapterRemovalSupport@0
+DXGIGetDebugInterface1@12
 DXGIReportAdapterConfiguration@4

@@ -9,11 +9,15 @@ AppendPropVariant@8
 ConvertPropVariant@8
 CopyPropertyStore@12
 CreateNamedPropertyStore@4
-DllCanUnloadNow@0
-DllGetClassObject@12
-DllRegisterServer@0
-DllUnregisterServer@0
+; DllCanUnloadNow@0
+; DllGetActivationFactory@8
+; DllGetClassObject@12
+; DllRegisterServer@0
+; DllUnregisterServer@0
 ExtractPropVariant@12
+MFCreate3GPMediaSink@16
+MFCreateAC3MediaSink@12
+MFCreateADTSMediaSink@12
 MFCreateASFByteStreamPlugin@8
 MFCreateASFContentInfo@4
 MFCreateASFIndexer@4
@@ -25,49 +29,75 @@ MFCreateASFProfile@4
 MFCreateASFProfileFromPresentationDescriptor@8
 MFCreateASFSplitter@4
 MFCreateASFStreamSelector@8
+MFCreateASFStreamingMediaSink@8
+MFCreateASFStreamingMediaSinkActivate@12
+MFCreateAggregateSource@8
 MFCreateAppSourceProxy@12
 MFCreateAudioRenderer@8
 MFCreateAudioRendererActivate@4
 MFCreateByteCacheFile@8
 MFCreateCacheManager@8
 MFCreateCredentialCache@4
+MFCreateDeviceSource@8
+MFCreateDeviceSourceActivate@8
 MFCreateDrmNetNDSchemePlugin@8
+MFCreateEncryptedMediaExtensionsStoreActivate@16
+MFCreateFMPEG4MediaSink@16
 MFCreateFileBlockMap@32
 MFCreateFileSchemePlugin@8
 MFCreateHttpSchemePlugin@8
 MFCreateLPCMByteStreamPlugin@8
 MFCreateMP3ByteStreamPlugin@8
+MFCreateMP3MediaSink@8
+MFCreateMPEG4MediaSink@16
 MFCreateMediaProcessor@4
 MFCreateMediaSession@8
+MFCreateMuxSink@28
+MFCreateNSCByteStreamPlugin@8
 MFCreateNetSchemePlugin@8
 MFCreatePMPHost@12
 MFCreatePMPMediaSession@16
 MFCreatePMPServer@8
 MFCreatePresentationClock@4
 MFCreatePresentationDescriptorFromASFProfile@8
+MFCreateProtectedEnvironmentAccess@4
 MFCreateProxyLocator@12
 MFCreateRemoteDesktopPlugin@4
 MFCreateSAMIByteStreamPlugin@8
+MFCreateSampleCopierMFT@4
 MFCreateSampleGrabberSinkActivate@12
 MFCreateSecureHttpSchemePlugin@8
 MFCreateSequencerSegmentOffset@16
 MFCreateSequencerSource@8
 MFCreateSequencerSourceRemoteStream@12
 MFCreateSimpleTypeHandler@4
+MFCreateSoundEventSchemePlugin@8
 MFCreateSourceResolver@4
 MFCreateStandardQualityManager@4
 MFCreateTopoLoader@4
 MFCreateTopology@4
 MFCreateTopologyNode@8
+MFCreateTranscodeProfile@4
+MFCreateTranscodeSinkActivate@4
+MFCreateTranscodeTopology@16
+MFCreateTranscodeTopologyFromByteStream@16
+MFCreateUrlmonSchemePlugin@8
 MFCreateVideoRenderer@8
 MFCreateVideoRendererActivate@8
 MFCreateWMAEncoderActivate@12
 MFCreateWMVEncoderActivate@12
+MFEnumDeviceSources@12
+MFGetLocalId@12
 MFGetMultipleServiceProviders@16
 MFGetService@16
 MFGetSupportedMimeTypes@4
 MFGetSupportedSchemes@4
+MFGetSystemId@4
+MFGetTopoNodeCurrentType@16
+MFLoadSignedLibrary@8
+MFRR_CreateActivate@8
 MFReadSequencerSegmentOffset@12
 MFRequireProtectedEnvironment@4
 MFShutdownObject@4
+MFTranscodeGetAudioOutputAvailableTypes@16
 MergePropertyStore@12

@@ -0,0 +1,60 @@
+;
+; Definition file of MFCORE.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "MFCORE.dll"
+EXPORTS
+AppendPropVariant@8
+ConvertPropVariant@8
+CopyPropertyStore@12
+CreateNamedPropertyStore@4
+; DllCanUnloadNow@0
+; DllGetActivationFactory@8
+; DllGetClassObject@12
+; DllRegisterServer@0
+; DllUnregisterServer@0
+ExtractPropVariant@12
+MFCopyMFMetadata@16
+MFCopyPropertyStore@8
+MFCopyStreamMetadata@12
+MFCreateAggregateSource@8
+MFCreateAppSourceProxy@12
+MFCreateAudioRenderer@8
+MFCreateAudioRendererActivate@4
+MFCreateDeviceSource@8
+MFCreateDeviceSourceActivate@8
+MFCreateEncryptedMediaExtensionsStoreActivate@16
+MFCreateExtendedCameraIntrinsicModel@8
+MFCreateExtendedCameraIntrinsics@4
+MFCreateFileSchemePlugin@8
+MFCreateMFMetadataOnPropertyStore@8
+MFCreateMediaProcessor@4
+MFCreateMediaSession@8
+MFCreatePMPHost@12
+MFCreatePMPMediaSession@16
+MFCreatePMPServer@8
+MFCreatePresentationClock@4
+MFCreatePresentationClockAsyncTimeSource@4
+MFCreateSampleCopierMFT@4
+MFCreateSampleGrabberSinkActivate@12
+MFCreateSequencerSegmentOffset@16
+MFCreateSequencerSource@8
+MFCreateSequencerSourceRemoteStream@12
+MFCreateSimpleTypeHandler@4
+MFCreateSoundEventSchemePlugin@8
+MFCreateStandardQualityManager@4
+MFCreateTopoLoader@4
+MFCreateTopology@4
+MFCreateTopologyNode@8
+MFCreateTransformWrapper@12
+MFCreateWMAEncoderActivate@12
+MFCreateWMVEncoderActivate@12
+MFEnumDeviceSources@12
+MFGetMultipleServiceProviders@16
+MFGetService@16
+MFGetTopoNodeCurrentType@16
+MFReadSequencerSegmentOffset@12
+MFRequireProtectedEnvironment@4
+MFShutdownObject@4
+MergePropertyStore@12

@@ -8,7 +8,11 @@ EXPORTS
 FormatTagFromWfx@4
 MFCreateGuid@4
 MFGetIoPortHandle@0
+MFEnumLocalMFTRegistrations@4
+MFGetPlatformFlags@0
+MFGetPlatformVersion@0
 MFGetRandomNumber@8
+MFIsFeatureEnabled@4
 MFIsQueueThread@4
 MFPlatformBigEndian@0
 MFPlatformLittleEndian@0
@@ -19,49 +23,118 @@ CopyPropVariant@12
 CreatePropVariant@16
 CreatePropertyStore@4
 DestroyPropVariant@4
+GetAMSubtypeFromD3DFormat@8
+GetD3DFormatFromMFSubtype@4
 LFGetGlobalPool@8
 MFAddPeriodicCallback@12
+MFAllocateSerialWorkQueue@8
 MFAllocateWorkQueue@4
+MFAllocateWorkQueueEx@8
 MFAppendCollection@8
 MFAverageTimePerFrameToFrameRate@16
 MFBeginCreateFile@28
 MFBeginGetHostByName@12
 MFBeginRegisterWorkQueueWithMMCSS@20
+MFBeginRegisterWorkQueueWithMMCSSEx@24
 MFBeginUnregisterWorkQueueWithMMCSS@12
 MFBlockThread@0
 MFCalculateBitmapImageSize@16
 MFCalculateImageSize@16
+MFCallStackTracingClearSnapshot@4
+MFCallStackTracingLogSessionErrors@28
+MFCallStackTracingRestoreSnapshot@4
+MFCallStackTracingTakeSnapshot@4
 MFCancelCreateFile@4
 MFCancelWorkItem@8
+MFCheckEnabledViaAppService@12
+MFClearLocalMFTs@0
+MFCombineSamples@16
 MFCompareFullToPartialMediaType@8
 MFCompareSockaddrAddresses@8
+MFConvertColorInfoFromDXVA@8
+MFConvertColorInfoToDXVA@8
+MFConvertFromFP16Array@12
+MFConvertToFP16Array@12
+MFCopyImage@24
+MFCreate2DMediaBuffer@20
+MFCreate2DMediaBufferOn1DMediaBuffer@28
 MFCreateAMMediaTypeFromMFMediaType@24
 MFCreateAlignedMemoryBuffer@12
+MFCreateAlignedSharedMemoryBuffer@20
 MFCreateAsyncResult@16
 MFCreateAttributes@8
 MFCreateAudioMediaType@8
+MFCreateByteStreamHandlerAppServiceActivate@4
 MFCreateCollection@4
+MFCreateContentDecryptorContext@16
+MFCreateContentProtectionDevice@8
+MFCreateD3D12SynchronizationObject@12
+MFCreateDXGIDeviceManager@8
+MFCreateDXGISurfaceBuffer@20
+MFCreateDXSurfaceBuffer@16
+MFCreateEMEStoreObject@4
 MFCreateEventQueue@4
 MFCreateFile@20
+MFCreateFileFromHandle@24
 MFCreateLegacyMediaBufferOnMFMediaBuffer@16
+MFCreateMFByteStreamOnIStreamWithFlags@12
+MFCreateMFByteStreamOnStream@8
+MFCreateMFByteStreamOnStreamEx@8
+MFCreateMFByteStreamWrapper@8
 MFCreateMFVideoFormatFromMFMediaType@12
+MFCreateMediaBufferFromMediaType@24
 MFCreateMediaBufferWrapper@16
 MFCreateMediaEvent@20
+MFCreateMediaEventResult@8
+MFCreateMediaExtensionActivate@16
+MFCreateMediaExtensionActivateNoInit@8
+MFCreateMediaExtensionAppServiceActivate@4
+MFCreateMediaExtensionInprocActivate@4
 MFCreateMediaType@4
+MFCreateMediaTypeFromProperties@8
 MFCreateMediaTypeFromRepresentation@24
 MFCreateMemoryBuffer@8
+MFCreateMemoryBufferFromRawBuffer@24
 MFCreateMemoryStream@16
+MFCreateMuxStreamAttributes@8
+MFCreateMuxStreamMediaType@8
+MFCreateMuxStreamSample@8
+MFCreateOOPMFTProxy@16
+MFCreateOOPMFTRemote@8
 MFCreatePathFromURL@8
 MFCreatePresentationDescriptor@12
+MFCreatePropertiesFromMediaType@12
+MFCreateReusableByteStream@8
+MFCreateReusableByteStreamWithSharedLock@12
 MFCreateSample@4
+MFCreateSecureBufferAllocator@4
+MFCreateSharedMemoryMediaBufferFromMediaType@32
 MFCreateSocket@16
 MFCreateSocketListener@12
+MFCreateSourceResolver@4
+MFCreateSourceResolverInternal@4
+MFCreateStagingSurfaceWrapper@12
 MFCreateStreamDescriptor@16
+MFCreateStreamOnMFByteStream@8
+MFCreateStreamOnMFByteStreamEx@12
 MFCreateSystemTimeSource@4
 MFCreateSystemUnderlyingClock@4
+MFCreateTelemetrySession@36
 MFCreateTempFile@16
+MFCreateTrackedSample@4
+MFCreateTransformActivate@4
 MFCreateURLFromPath@8
 MFCreateUdpSockets@36
+MFCreateVideoDecryptorContext@16
+MFCreateVideoMediaType@8
+MFCreateVideoMediaTypeFromBitMapInfoHeader@48
+MFCreateVideoMediaTypeFromBitMapInfoHeaderEx@44
+MFCreateVideoMediaTypeFromSubtype@8
+MFCreateVideoMediaTypeFromVideoInfoHeader@36
+MFCreateVideoMediaTypeFromVideoInfoHeader2@24
+MFCreateVideoSampleAllocatorEx@8
+MFCreateWICBitmapBuffer@12
+MFCreateWICDecoderProxy@24
 MFCreateWaveFormatExFromMFMediaType@16
 MFDeserializeAttributesFromStream@12
 MFDeserializeEvent@12
@@ -76,18 +149,30 @@ MFFreeAdaptersAddresses@4
 MFGetAdaptersAddresses@8
 MFGetAttributesAsBlob@12
 MFGetAttributesAsBlobSize@8
+MFGetCallStackTracingWeakReference@0
 MFGetConfigurationDWORD@12
 MFGetConfigurationPolicy@16
 MFGetConfigurationStore@16
 MFGetConfigurationString@16
+MFGetContentProtectionSystemCLSID@8
+MFGetMFTMerit@16
 MFGetNumericNameFromSockaddr@20
+MFGetPlaneSize@16
 MFGetPlatform@0
+MFGetPluginControl@4
 MFGetPrivateWorkqueues@4
 MFGetSockaddrFromNumericName@12
+MFGetStrideForBitmapInfoHeader@12
+MFGetSupportedMimeTypes@4
+MFGetSupportedSchemes@4
 MFGetSystemTime@0
 MFGetTimerPeriodicity@4
+MFGetUncompressedVideoFormat@4
 MFGetWorkQueueMMCSSClass@12
+MFGetWorkQueueMMCSSPriority@8
 MFGetWorkQueueMMCSSTaskId@8
+MFHasLocallyRegisteredByteStreamHandlers@4
+MFHasLocallyRegisteredSchemeHandlers@4
 MFHeapAlloc@20
 MFHeapFree@4
 MFInitAMMediaTypeFromMFMediaType@24
@@ -96,16 +181,34 @@ MFInitMediaTypeFromAMMediaType@8
 MFInitMediaTypeFromMFVideoFormat@12
 MFInitMediaTypeFromMPEG1VideoInfo@16
 MFInitMediaTypeFromMPEG2VideoInfo@16
-MFInitMediaTypeFromVideoInfoHeader2@16
 MFInitMediaTypeFromVideoInfoHeader@16
+MFInitMediaTypeFromVideoInfoHeader2@16
 MFInitMediaTypeFromWaveFormatEx@12
+MFInitVideoFormat@8
+MFInitVideoFormat_RGB@16
+MFInvalidateMFTEnumCache@0
 MFInvokeCallback@4
 MFJoinIoPort@4
+MFIsBottomUpFormat@8
+MFIsContentProtectionDeviceSupported@8
+MFIsLocallyRegisteredMimeType@8
+MFIsLocallyRegisteredSchemeHandler@8
+MFJoinWorkQueue@0
+MFLockDXGIDeviceManager@8
 MFLockPlatform@0
+MFLockSharedWorkQueue@16
 MFLockWorkQueue@4
+MFMapDX9FormatToDXGIFormat@4
+MFMapDXGIFormatToDX9Format@4
+MFPutWaitingWorkItem@16
 MFPutWorkItem@12
+MFPutWorkItem2@16
 MFPutWorkItemEx@8
+MFPutWorkItemEx2@12
 MFRecordError@4
+MFRegisterLocalByteStreamHandler@12
+MFRegisterLocalSchemeHandler@8
+MFRegisterPlatformWithMMCSS@12
 MFRemovePeriodicCallback@4
 MFScheduleWorkItem@20
 MFScheduleWorkItemEx@16
@@ -113,21 +216,35 @@ MFSerializeAttributesToStream@12
 MFSerializeEvent@12
 MFSerializeMediaTypeToStream@8
 MFSerializePresentationDescriptor@12
+MFSetMinimumMemoryAlignment@4
 MFSetSockaddrAny@8
+MFSetWindowForContentProtection@4
 MFShutdown@0
+MFSplitSample@16
 MFStartup@8
 MFStreamDescriptorProtectMediaType@8
 MFTEnum@40
+MFTEnum2@40
 MFTEnumEx@36
 MFTGetInfo@40
 MFTRegister@60
+MFTRegisterLocal@32
+MFTRegisterLocalByCLSID@32
 MFTUnregister@16
+MFTUnregisterLocal@4
+MFTUnregisterLocalByCLSID@16
+MFTraceError@24
 MFTraceFuncEnter@16
 MFUnblockThread@0
+MFUnjoinWorkQueue@0
+MFUnlockDXGIDeviceManager@0
 MFUnlockPlatform@0
 MFUnlockWorkQueue@4
+MFUnregisterPlatformFromMMCSS@0
 MFUnwrapMediaType@8
 MFValidateMediaTypeSize@24
 MFWrapMediaType@16
+MFWrapSocket@28
+MFllMulDiv@32
 PropVariantFromStream@8
 PropVariantToStream@8

@@ -0,0 +1,13 @@
+;
+; Definition file of MFPlay.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "MFPlay.DLL"
+EXPORTS
+; DllCanUnloadNow@0
+; DllGetClassObject@12
+; DllRegisterServer@0
+; DllUnregisterServer@0
+MFPCreateMediaPlayer@24
+MFPCreateMediaPlayerEx@28

@@ -5,13 +5,74 @@
 ;
 LIBRARY "ncrypt.dll"
 EXPORTS
+BCryptAddContextFunction@20
+BCryptAddContextFunctionProvider@24
+BCryptCloseAlgorithmProvider@8
+BCryptConfigureContext@12
+BCryptConfigureContextFunction@20
+BCryptCreateContext@12
+BCryptCreateHash@28
+BCryptDecrypt@40
+BCryptDeleteContext@8
+BCryptDeriveKey@28
+BCryptDeriveKeyCapi@20
+BCryptDeriveKeyPBKDF2@40
+BCryptDestroyHash@4
+BCryptDestroyKey@4
+BCryptDestroySecret@4
+BCryptDuplicateHash@20
+BCryptDuplicateKey@20
+BCryptEncrypt@40
+BCryptEnumAlgorithms@16
+BCryptEnumContextFunctionProviders@24
+BCryptEnumContextFunctions@20
+BCryptEnumContexts@12
+BCryptEnumProviders@16
+BCryptEnumRegisteredProviders@8
+BCryptExportKey@28
+BCryptFinalizeKeyPair@8
+BCryptFinishHash@16
+BCryptFreeBuffer@4
+BCryptGenRandom@16
+BCryptGenerateKeyPair@16
+BCryptGenerateSymmetricKey@28
+BCryptGetFipsAlgorithmMode@4
+BCryptGetProperty@24
+BCryptHash@28
+BCryptHashData@16
+BCryptImportKey@36
+BCryptImportKeyPair@28
+BCryptKeyDerivation@24
+BCryptOpenAlgorithmProvider@16
+BCryptQueryContextConfiguration@16
+BCryptQueryContextFunctionConfiguration@24
+BCryptQueryContextFunctionProperty@28
+BCryptQueryProviderRegistration@20
+BCryptRegisterConfigChangeNotify@4
+BCryptRegisterProvider@12
+BCryptRemoveContextFunction@16
+BCryptRemoveContextFunctionProvider@20
+BCryptResolveProviders@32
+BCryptSecretAgreement@16
+BCryptSetAuditingInterface@4
+BCryptSetContextFunctionProperty@28
+BCryptSetProperty@20
+BCryptSignHash@32
+BCryptUnregisterConfigChangeNotify@4
+BCryptUnregisterProvider@4
+BCryptVerifySignature@28
 GetIsolationServerInterface@12
 GetKeyStorageInterface@12
 GetSChannelInterface@12
+NCryptCloseKeyProtector@4
+NCryptCloseProtectionDescriptor@4
+NCryptCreateClaim@32
 NCryptCreatePersistedKey@24
+NCryptCreateProtectionDescriptor@12
 NCryptDecrypt@32
 NCryptDeleteKey@8
 NCryptDeriveKey@28
+NCryptDuplicateKeyProtectorHandle@12
 NCryptEncrypt@32
 NCryptEnumAlgorithms@20
 NCryptEnumKeys@20
@@ -21,41 +82,76 @@ NCryptFinalizeKey@8
 NCryptFreeBuffer@4
 NCryptFreeObject@4
 NCryptGetProperty@24
+NCryptGetProtectionDescriptorInfo@16
 NCryptImportKey@32
 NCryptIsAlgSupported@12
 NCryptIsKeyHandle@4
+NCryptKeyDerivation@24
 NCryptNotifyChangeKey@12
 NCryptOpenKey@20
+NCryptOpenKeyProtector@12
 NCryptOpenStorageProvider@12
+NCryptProtectKey@32
+NCryptProtectSecret@32
+NCryptQueryProtectionDescriptorName@16
+NCryptRegisterProtectionDescriptorName@12
 NCryptSecretAgreement@16
 NCryptSetAuditingInterface@4
 NCryptSetProperty@20
 NCryptSignHash@32
+NCryptStreamClose@4
+NCryptStreamOpenToProtect@20
+NCryptStreamOpenToUnprotect@16
+NCryptStreamOpenToUnprotectEx@16
+NCryptStreamUpdate@16
 NCryptTranslateHandle@24
+NCryptUnprotectKey@28
+NCryptUnprotectSecret@32
+NCryptVerifyClaim@32
 NCryptVerifySignature@28
 SslChangeNotify@8
 SslComputeClientAuthHash@32
 SslComputeEapKeyBlock@32
 SslComputeFinishedHash@24
+SslComputeSessionHash@28
+SslCreateClientAuthHash@24
 SslCreateEphemeralKey@36
 SslCreateHandshakeHash@20
 SslDecrementProviderReferenceCount@4
 SslDecryptPacket@40
+SslDuplicateTranscriptHash@16
 SslEncryptPacket@44
 SslEnumCipherSuites@20
+SslEnumCipherSuitesEx@20
+SslEnumEccCurves@16
 SslEnumProtocolProviders@12
+SslExpandBinderKey@20
+SslExpandExporterMasterKey@24
+SslExpandNextGenTrafficKey@20
+SslExpandPreSharedKey@28
+SslExpandResumptionMasterKey@24
+SslExpandTrafficKeys@28
+SslExpandWriteKey@20
 SslExportKey@28
+SslExportKeyingMaterial@40
+SslExtractEarlyKey@28
+SslExtractHandshakeKey@28
+SslExtractMasterKey@20
 SslFreeBuffer@4
 SslFreeObject@8
 SslGenerateMasterKey@44
+SslGeneratePreMasterKey@40
 SslGenerateSessionKeys@24
+SslGetCipherSuitePRFHashAlgorithm@24
 SslGetKeyProperty@20
 SslGetProviderProperty@24
 SslHashHandshake@20
 SslImportKey@24
 SslImportMasterKey@36
 SslIncrementProviderReferenceCount@4
+SslLookupCipherLengths@28
 SslLookupCipherSuiteInfo@24
 SslOpenPrivateKey@16
 SslOpenProvider@12
 SslSignHash@32
+SslVerifySignature@28

@@ -8,7 +8,7 @@ EXPORTS
 CallNtPowerInformation@20
 CanUserWritePwrScheme@0
 DeletePwrScheme@4
-DevicePowerClose
+DevicePowerClose@0
 DevicePowerEnumDevices@20
 DevicePowerOpen@4
 DevicePowerSetDeviceState@12
@@ -25,7 +25,14 @@ IsPwrShutdownAllowed@0
 IsPwrSuspendAllowed@0
 LoadCurrentPwrScheme@16
 MergeLegacyPwrScheme@16
+PowerApplyPowerRequestOverride@0
+PowerApplySettingChanges@8
 PowerCanRestoreIndividualDefaultPowerScheme@4
+PowerCleanupOverrides@0
+PowerClearUserAwayPrediction@4
+PowerCloseEnvironmentalMonitor@4
+PowerCloseLimitsMitigation@4
+PowerCloseLimitsPolicy@4
 PowerCreatePossibleSetting@16
 PowerCreateSetting@12
 PowerCustomizePlatformPowerSettings@0
@@ -37,10 +44,20 @@ PowerDebugDumpSystemPowerCapabilities@12
 PowerDebugDumpSystemPowerPolicy@12
 PowerDeleteScheme@8
 PowerDeterminePlatformRole@0
+PowerDeterminePlatformRoleEx@4
 PowerDuplicateScheme@12
 PowerEnumerate@28
+PowerEnumerateSettings@8
 PowerGetActiveScheme@8
+PowerGetActualOverlayScheme@4
+PowerGetAdaptiveStandbyDiagnostics@12
+PowerGetEffectiveOverlayScheme@4
+PowerGetOverlaySchemes@12
+PowerGetProfiles@8
+PowerGetUserAwayMinPredictionConfidence@4
 PowerImportPowerScheme@12
+PowerInformationWithPrivileges@20
+PowerIsSettingRangeDefined@8
 PowerInternalDeleteScheme@8
 PowerInternalDuplicateScheme@12
 PowerInternalImportPowerScheme@12
@@ -54,30 +71,58 @@ PowerPolicyToGUIDFormat@8
 PowerReadACDefaultIndex@20
 PowerReadACValue@28
 PowerReadACValueIndex@20
+PowerReadACValueIndexEx@28
 PowerReadDCDefaultIndex@20
 PowerReadDCValue@28
 PowerReadDCValueIndex@20
+PowerReadDCValueIndexEx@28
 PowerReadDescription@24
 PowerReadFriendlyName@24
 PowerReadIconResourceSpecifier@24
 PowerReadPossibleDescription@24
 PowerReadPossibleFriendlyName@24
 PowerReadPossibleValue@28
+PowerReadProfileAlias@16
 PowerReadSecurityDescriptor@12
 PowerReadSettingAttributes@8
 PowerReadValueIncrement@16
 PowerReadValueMax@16
 PowerReadValueMin@16
 PowerReadValueUnitsSpecifier@20
+PowerReapplyActiveScheme@0
+PowerRegisterEnvironmentalMonitor@8
+PowerRegisterForEffectivePowerModeNotifications@16
+PowerRegisterLimitsMitigation@8
+PowerRegisterLimitsPolicy@8
+PowerRegisterSuspendResumeNotification@12
 PowerRemovePowerSetting@8
 PowerReplaceDefaultPowerSchemes@0
+PowerReportLimitsEvent@4
+PowerReportThermalEvent@4
+PowerRestoreACDefaultIndex@20
+PowerRestoreDCDefaultIndex@20
 PowerRestoreDefaultPowerSchemes@0
 PowerRestoreIndividualDefaultPowerScheme@4
+PowerSetActiveOverlayScheme@4
 PowerSetActiveScheme@8
+PowerSetAlsBrightnessOffset@4
+PowerSetBrightnessAndTransitionTimes@4
+PowerSetUserAwayPrediction@16
 PowerSettingAccessCheck@8
+PowerSettingAccessCheckEx@12
+PowerSettingRegisterNotification@16
+PowerSettingRegisterNotificationEx@20
+PowerSettingUnregisterNotification@4
+PowerUnregisterFromEffectivePowerModeNotifications@4
+PowerUnregisterSuspendResumeNotification@4
+PowerUpdateEnvironmentalMonitorState@12
+PowerUpdateEnvironmentalMonitorThresholds@12
+PowerUpdateLimitsMitigation@8
 PowerWriteACDefaultIndex@20
+PowerWriteACProfileIndex@16
 PowerWriteACValueIndex@20
 PowerWriteDCDefaultIndex@20
+PowerWriteDCProfileIndex@16
 PowerWriteDCValueIndex@20
 PowerWriteDescription@24
 PowerWriteFriendlyName@24