From 75d5313a426f26e1dcc505b44406a89a0c5321cd Mon Sep 17 00:00:00 2001 From: "Matthias Huetsch [mhu]" Date: Mon, 2 Aug 2010 19:01:49 +0200 Subject: mhu23 #i113531# use recommended Windows linker flags and DLL search path. --- sal/osl/w32/salinit.cxx | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx index 23e3ce834..43b7b8a16 100644 --- a/sal/osl/w32/salinit.cxx +++ b/sal/osl/w32/salinit.cxx @@ -40,6 +40,26 @@ extern "C" { void SAL_CALL sal_detail_initialize(int argc, char ** argv) { + // SetProcessDEPPolicy(PROCESS_DEP_ENABLE); + // SetDllDirectoryW(L""); + // SetSearchPathMode( + // BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT); + HMODULE h = GetModuleHandleW(L"kernel32.dll"); + if (h != 0) { + FARPROC p = GetProcAddress(h, "SetProcessDEPPolicy"); + if (p != 0) { + reinterpret_cast< BOOL (WINAPI *)(DWORD) >(p)(0x00000001); + } + p = GetProcAddress(h, "SetDllDirectoryW"); + if (p != 0) { + reinterpret_cast< BOOL (WINAPI *)(LPCWSTR) >(p)(L""); + } + p = GetProcAddress(h, "SetSearchPathMode"); + if (p != 0) { + reinterpret_cast< BOOL (WINAPI *)(DWORD) >(p)(0x8001); + } + } + WSADATA wsaData; int error; WORD wVersionRequested; -- cgit v1.2.3