ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll/tests: Skip the map protect tests if we can't disable no-exec. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2018-07-09 11:12:56 +01:00 committed by Alexandre Julliard
parent 61d92d1317
commit 986d5a9958
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/ntdll/tests/info.c
View File

@ -1776,20 +1776,30 @@ static void test_mapprotection(void)
NTSTATUS status;
SIZE_T retlen, count;
void (*f)(void);
BOOL reset_flags = FALSE;
if (!pNtClose) {
skip("No NtClose ... Win98\n");
return;
}
/* Switch to being a noexec unaware process */
status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof (oldflags), &flagsize);
if (status == STATUS_INVALID_PARAMETER) {
skip("Invalid Parameter on ProcessExecuteFlags query?\n");
if (status == STATUS_INVALID_PARAMETER)
{
skip("Unable to query process execute flags on this platform\n");
return;
}
ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status);
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) );
ok( (status == STATUS_SUCCESS) || (status == STATUS_INVALID_INFO_CLASS), "Expected STATUS_SUCCESS, got %08x\n", status);
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
trace("Process execute flags %08x\n", oldflags);
if (oldflags & MEM_EXECUTE_OPTION_DISABLE)
{
if (oldflags & MEM_EXECUTE_OPTION_PERMANENT)
{
skip("Unable to turn off noexec\n");
return;
}
status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) );
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status );
reset_flags = TRUE;
}
size.u.LowPart = 0x2000;
size.u.HighPart = 0;
@ -1832,8 +1842,8 @@ static void test_mapprotection(void)
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
pNtClose (h);
/* Switch back */
pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) );
if (reset_flags)
pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &oldflags, sizeof(oldflags) );
}
static void test_queryvirtualmemory(void)