Module: wine Branch: master Commit: be90ae2fc3174c8e7c4894427cc0f09b3a92f1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90ae2fc3174c8e7c4894427c...
Author: Michael Karcher wine@mkarcher.dialup.fu-berlin.de Date: Sat Sep 12 01:27:42 2009 +0200
ntdll: Fix DEP status initialization.
---
dlls/ntdll/loader.c | 3 ++- dlls/ntdll/process.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index df4bb01..76f0e5d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -809,8 +809,9 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename )
if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) { + ULONG flags = MEM_EXECUTE_OPTION_ENABLE; WARN( "disabling no-exec because of %s\n", debugstr_w(wm->ldr.BaseDllName.Buffer) ); - VIRTUAL_SetForceExec( TRUE ); + NtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); } return wm; } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 2f86e2d..573ee86 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -37,7 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
-static ULONG execute_flags = MEM_EXECUTE_OPTION_ENABLE; +static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE;
/* * Process object