From 3508a3fbd12b93e0414acb7996417dd91f369170 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 2 May 2015 18:54:00 +0200 Subject: win32: move platform specifics to osdep This will probably disable this code for Cygwin. I don't know if this matters, since Cygwin should strictly behave like a Unix anyway. --- osdep/main-fn-win.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'osdep') diff --git a/osdep/main-fn-win.c b/osdep/main-fn-win.c index d8dbcd5a8b..5b0f22058d 100644 --- a/osdep/main-fn-win.c +++ b/osdep/main-fn-win.c @@ -1,5 +1,9 @@ #include +#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE +#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE (0x0001) +#endif + #include "config.h" #include "common/common.h" @@ -25,8 +29,32 @@ static bool has_redirected_stdio(void) is_valid_handle(GetStdHandle(STD_ERROR_HANDLE)); } +static void microsoft_nonsense(void) +{ + // stop Windows from showing all kinds of annoying error dialogs + SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); + + // Enable heap corruption detection + HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); + + HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll"); + WINBOOL (WINAPI *pSetDllDirectory)(LPCWSTR lpPathName) = + (WINBOOL (WINAPI *)(LPCWSTR))GetProcAddress(kernel32, "SetDllDirectoryW"); + WINBOOL (WINAPI *pSetSearchPathMode)(DWORD Flags) = + (WINBOOL (WINAPI *)(DWORD))GetProcAddress(kernel32, "SetSearchPathMode"); + + // Always use safe search paths for DLLs and other files, ie. never use the + // current directory + if (pSetSearchPathMode) + pSetDllDirectory(L""); + if (pSetSearchPathMode) + pSetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE); +} + int wmain(int argc, wchar_t *argv[]) { + microsoft_nonsense(); + // If started from the console wrapper (see osdep/win32-console-wrapper.c), // attach to the console and set up the standard IO handles bool has_console = terminal_try_attach(); -- cgit v1.2.3