Fix Windows 7 support (#19)

This change pays off technical debt with the function -> DLL mappings in libc/nt/master.sh, which was originally defined based on binary analysis on Windows 10. It's now been updated so the kernel32/kernelbase/advapi32 imports should be exactly as they are written, on the MSDN documentation and that wouldn't have been easy without Geoff Chappell's work thank him https://www.geoffchappell.com/studies/windows/win32/index.htm
2020-12-28 13:52:02 -08:00
1 parent 12065100e1
commit 0e85b136ae
@@ -42,7 +42,6 @@ LIBC_CALLS_A_DIRECTDEPS =				\
 	LIBC_NEXGEN32E					\
 	LIBC_NT_ADVAPI32				\
 	LIBC_NT_KERNEL32				\
-	LIBC_NT_KERNELBASE				\
 	LIBC_NT_NTDLL					\
 	LIBC_RAND					\
 	LIBC_STR					\
@@ -40,7 +40,7 @@ LIBC_CALLS_HEFTY_A_DIRECTDEPS =				\
 	LIBC_FMT					\
 	LIBC_MEM					\
 	LIBC_NEXGEN32E					\
-	LIBC_NT_KERNELBASE				\
+	LIBC_NT_KERNEL32				\
 	LIBC_RUNTIME					\
 	LIBC_STR					\
 	LIBC_STUBS					\
@@ -37,7 +37,8 @@ LIBC_DNS_A_DIRECTDEPS =				\
 	LIBC_STUBS				\
 	LIBC_STR				\
 	LIBC_SYSV				\
-	LIBC_NT_KERNELBASE
+	LIBC_NT_ADVAPI32			\
+	LIBC_NT_KERNEL32

 LIBC_DNS_A_DEPS :=				\
 	$(call uniq,$(foreach x,$(LIBC_DNS_A_DIRECTDEPS),$($(x))))
@@ -35,7 +35,7 @@ LIBC_FMT_A_CHECKS =				\

 LIBC_FMT_A_DIRECTDEPS =				\
 	LIBC_NEXGEN32E				\
-	LIBC_NT_KERNELBASE			\
+	LIBC_NT_KERNEL32			\
 	LIBC_STR				\
 	LIBC_STUBS				\
 	LIBC_SYSV				\
@@ -34,7 +34,7 @@ LIBC_LOG_A_DIRECTDEPS =					\
 	LIBC_FMT					\
 	LIBC_MEM					\
 	LIBC_NEXGEN32E					\
-	LIBC_NT_KERNELBASE				\
+	LIBC_NT_KERNEL32				\
 	LIBC_NT_NTDLL					\
 	LIBC_RAND					\
 	LIBC_RUNTIME					\
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AccessCheckAndAuditAlarmW,AccessCheckAndAuditAlarmW,3
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AccessCheckByType,AccessCheckByType,4
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AccessCheckByTypeAndAuditAlarmW,AccessCheckByTypeAndAuditAlarmW,5
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AccessCheckByTypeResultList,AccessCheckByTypeResultList,6
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AccessCheckByTypeResultListAndAuditAlarmByHandleW,AccessCheckByTypeResultListAndAuditAlarmByHandleW,7
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AccessCheckByTypeResultListAndAuditAlarmW,AccessCheckByTypeResultListAndAuditAlarmW,8
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ActivateActCtx,ActivateActCtx,12
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAccessAllowedAce,AddAccessAllowedAce,13
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAccessAllowedAceEx,AddAccessAllowedAceEx,14
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAccessAllowedObjectAce,AddAccessAllowedObjectAce,15
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAccessDeniedAce,AddAccessDeniedAce,16
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAccessDeniedAceEx,AddAccessDeniedAceEx,17
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAccessDeniedObjectAce,AddAccessDeniedObjectAce,18
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAce,AddAce,19
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAuditAccessAce,AddAuditAccessAce,20
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAuditAccessAceEx,AddAuditAccessAceEx,21
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddAuditAccessObjectAce,AddAuditAccessObjectAce,22
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddConsoleAliasA,AddConsoleAliasA,23
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddConsoleAliasW,AddConsoleAliasW,24
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddDllDirectory,AddDllDirectory,25
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddMandatoryAce,AddMandatoryAce,27
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddRefActCtx,AddRefActCtx,29
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddResourceAttributeAce,AddResourceAttributeAce,30
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddSIDToBoundaryDescriptor,AddSIDToBoundaryDescriptor,31
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AddScopedPolicyIDAce,AddScopedPolicyIDAce,32
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AdjustTokenGroups,AdjustTokenGroups,35
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AllocateAndInitializeSid,AllocateAndInitializeSid,38
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AllocateLocallyUniqueId,AllocateLocallyUniqueId,39
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AllocateUserPhysicalPages,AllocateUserPhysicalPages,40
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AllocateUserPhysicalPagesNuma,AllocateUserPhysicalPagesNuma,41
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AreAllAccessesGranted,AreAllAccessesGranted,70
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AreAnyAccessesGranted,AreAnyAccessesGranted,71
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_AreFileApisANSI,AreFileApisANSI,72
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_Beep,Beep,96
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CallbackMayRunLong,CallbackMayRunLong,100
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CancelWaitableTimer,CancelWaitableTimer,105
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CeipIsOptedIn,CeipIsOptedIn,106
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ChangeTimerQueueTimer,ChangeTimerQueueTimer,107
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CheckTokenCapability,CheckTokenCapability,126
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CheckTokenMembership,CheckTokenMembership,127
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CheckTokenMembershipEx,CheckTokenMembershipEx,128
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ClearCommBreak,ClearCommBreak,131
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ClearCommError,ClearCommError,132
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ClosePackageInfo,ClosePackageInfo,135
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ClosePrivateNamespace,ClosePrivateNamespace,136
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CompareFileTime,CompareFileTime,150
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CompareStringA,CompareStringA,152
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CompareStringEx,CompareStringEx,153
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CompareStringOrdinal,CompareStringOrdinal,154
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CompareStringW,CompareStringW,155
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ConvertDefaultLocale,ConvertDefaultLocale,159
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ConvertFiberToThread,ConvertFiberToThread,160
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ConvertThreadToFiber,ConvertThreadToFiber,162
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ConvertThreadToFiberEx,ConvertThreadToFiberEx,163
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_ConvertToAutoInheritPrivateObjectSecurity,ConvertToAutoInheritPrivateObjectSecurity,164
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CopyContext,CopyContext,165
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CopyFile2,CopyFile2,166
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CopyFileExW,CopyFileExW,167
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CopySid,CopySid,170
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateActCtxW,CreateActCtxW,172
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateBoundaryDescriptorW,CreateBoundaryDescriptorW,175
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateConsoleScreenBuffer,CreateConsoleScreenBuffer,176
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateDirectoryExW,CreateDirectoryExW,178
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateEventA,CreateEventA,181
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateEventExA,CreateEventExA,182
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateEventExW,CreateEventExW,183
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateEventW,CreateEventW,184
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateFiber,CreateFiber,185
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateFiberEx,CreateFiberEx,186
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateFile2,CreateFile2,187
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateFileMappingFromApp,CreateFileMappingFromApp,189
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateMemoryResourceNotification,CreateMemoryResourceNotification,196
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateMutexA,CreateMutexA,197
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateMutexExA,CreateMutexExA,198
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateMutexExW,CreateMutexExW,199
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateMutexW,CreateMutexW,200
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreatePrivateNamespaceW,CreatePrivateNamespaceW,203
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreatePrivateObjectSecurity,CreatePrivateObjectSecurity,204
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreatePrivateObjectSecurityEx,CreatePrivateObjectSecurityEx,205
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreatePrivateObjectSecurityWithMultipleInheritance,CreatePrivateObjectSecurityWithMultipleInheritance,206
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateProcessAsUserA,CreateProcessAsUserA,208
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateProcessAsUserW,CreateProcessAsUserW,209
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateRemoteThread,CreateRemoteThread,213
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateRemoteThreadEx,CreateRemoteThreadEx,214
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateRestrictedToken,CreateRestrictedToken,215
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateSemaphoreExW,CreateSemaphoreExW,216
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateSemaphoreW,CreateSemaphoreW,217
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateThreadpool,CreateThreadpool,225
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateThreadpoolCleanupGroup,CreateThreadpoolCleanupGroup,226
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateThreadpoolIo,CreateThreadpoolIo,227
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateThreadpoolTimer,CreateThreadpoolTimer,228
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateThreadpoolWait,CreateThreadpoolWait,229
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateThreadpoolWork,CreateThreadpoolWork,230
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateTimerQueue,CreateTimerQueue,231
@@ -1,2 +0,0 @@
-.include "o/libc/nt/codegen.inc"
-.imp	KernelBase,__imp_CreateTimerQueueTimer,CreateTimerQueueTimer,232