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

psapi/tests: Avoid using PROCESS_ALL_ACCESS. 

Since its value changed in Windows Vista.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2018-07-06 00:05:37 +02:00 committed by Alexandre Julliard
parent 06deefdb4c
commit 81242f747e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/psapi/tests/psapi_main.c
View File

@ -56,7 +56,7 @@ static BOOL init_func_ptrs(void)
return TRUE; return TRUE;
} }
static HANDLE hpSR, hpQI, hpVR, hpQV, hpAA; static HANDLE hpSR, hpQI, hpVR, hpQV;
static const HANDLE hBad = (HANDLE)0xdeadbeef; static const HANDLE hBad = (HANDLE)0xdeadbeef;
static void test_EnumProcesses(void) static void test_EnumProcesses(void)
@ -726,10 +726,15 @@ static void test_ws_functions(void)
{ {
PSAPI_WS_WATCH_INFORMATION wswi[4096]; PSAPI_WS_WATCH_INFORMATION wswi[4096];
ULONG_PTR pages[4096]; ULONG_PTR pages[4096];
HANDLE ws_handle;
char *addr; char *addr;
unsigned int i; unsigned int i;
BOOL ret; BOOL ret;
ws_handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_SET_QUOTA |
PROCESS_SET_INFORMATION, FALSE, GetCurrentProcessId());
ok(!!ws_handle, "got error %u\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
EmptyWorkingSet(NULL); EmptyWorkingSet(NULL);
todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError());
@ -739,7 +744,7 @@ static void test_ws_functions(void)
todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError());
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = EmptyWorkingSet(hpAA); ret = EmptyWorkingSet(ws_handle);
ok(ret == 1, "failed with %d\n", GetLastError()); ok(ret == 1, "failed with %d\n", GetLastError());
SetLastError( 0xdeadbeef ); SetLastError( 0xdeadbeef );
@ -755,7 +760,7 @@ static void test_ws_functions(void)
ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() );
} }
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = InitializeProcessForWsWatch(hpAA); ret = InitializeProcessForWsWatch(ws_handle);
ok(ret == 1, "failed with %d\n", GetLastError()); ok(ret == 1, "failed with %d\n", GetLastError());
addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE); addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE);
@ -817,9 +822,8 @@ START_TEST(psapi_main)
hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid); hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid);
hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid);
hpAA = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid);
if(hpSR && hpQI && hpVR && hpQV && hpAA) if(hpSR && hpQI && hpVR && hpQV)
{ {
test_EnumProcesses(); test_EnumProcesses();
test_EnumProcessModules(); test_EnumProcessModules();
@ -837,5 +841,4 @@ START_TEST(psapi_main)
CloseHandle(hpQI); CloseHandle(hpQI);
CloseHandle(hpVR); CloseHandle(hpVR);
CloseHandle(hpQV); CloseHandle(hpQV);
CloseHandle(hpAA);
} }