From 58d9659d536030bb0072c5b2b8f3f2583740de39 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Sat, 16 Jan 2021 17:50:29 -0800 Subject: [PATCH] Remove call to SetDefaultDllDirectories (#19) This API isn't present in Windows 7 SP1. --- libc/nt/master.sh | 2 +- libc/runtime/winmain.greg.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libc/nt/master.sh b/libc/nt/master.sh index 237cd12e9..86e34c444 100755 --- a/libc/nt/master.sh +++ b/libc/nt/master.sh @@ -6187,7 +6187,7 @@ imp 'SetDIBitsToDevice' SetDIBitsToDevice gdi32 1883 imp 'SetDebugErrorLevel' SetDebugErrorLevel user32 2324 imp 'SetDefaultCommConfigA' SetDefaultCommConfigA kernel32 1297 imp 'SetDefaultCommConfig' SetDefaultCommConfigW kernel32 1298 -imp 'SetDefaultDllDirectories' SetDefaultDllDirectories kernel32 0 1 # KernelBase +imp 'SetDefaultDllDirectories' SetDefaultDllDirectories kernel32 0 1 # KernelBase, Windows 8+, KB2533623 on Windows 7 imp 'SetDeskWallpaper' SetDeskWallpaper user32 2325 imp 'SetDesktopColorTransform' SetDesktopColorTransform user32 2326 imp 'SetDeviceGammaRamp' SetDeviceGammaRamp gdi32 1884 diff --git a/libc/runtime/winmain.greg.c b/libc/runtime/winmain.greg.c index 8437f9641..4554bd16e 100644 --- a/libc/runtime/winmain.greg.c +++ b/libc/runtime/winmain.greg.c @@ -184,7 +184,6 @@ static textwindows wontreturn void WinMainNew(void) { */ textwindows int64_t WinMain(int64_t hInstance, int64_t hPrevInstance, const char *lpCmdLine, int nCmdShow) { - SetDefaultDllDirectories(kNtLoadLibrarySearchSearchSystem32); if (weaken(winsockinit)) weaken(winsockinit)(); if (weaken(WinMainForked)) weaken(WinMainForked)(); WinMainNew();