wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated ntdll-WRITECOPY patchset

Browse Source 
Warning fixes.
This commit is contained in:
Alistair Leslie-Hughes 2022-03-14 10:21:13 +11:00
parent 348ecab0e4
commit d29bc4b9e7
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
patches/ntdll-WRITECOPY/0009-kernel32-tests-psapi-tests-Update-tests.patch
View File

@ -1,15 +1,15 @@
From 8671f494a85acab0f8620bb4462d641f6fd97111 Mon Sep 17 00:00:00 2001
From ada6b6d8363f2eeac8d8ed99d50f61610b047efe Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Date: Mon, 27 Apr 2020 15:32:22 +0300
Subject: [PATCH] kernel32/tests, psapi/tests: Update tests.
---
dlls/kernel32/tests/virtual.c | 25 +++++--------------------
dlls/psapi/tests/psapi_main.c | 5 +++++
2 files changed, 10 insertions(+), 20 deletions(-)
dlls/kernel32/tests/virtual.c | 19 ++-----------------
dlls/psapi/tests/psapi_main.c | 3 +++
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index 365194b9065..6c5d6991737 100644
index 365194b9065..8055e93faa0 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -3604,9 +3604,7 @@ static void test_CreateFileMapping_protection(void)
@ -45,9 +45,8 @@ index 365194b9065..6c5d6991737 100644
prev_prot = actual_prot;
ret = VirtualQuery(base, &info, sizeof(info));
- ok(ret, "%ld: VirtualQuery failed %ld\n", j, GetLastError());
ok(ret, "%ld: VirtualQuery failed %ld\n", j, GetLastError());
- todo_wine_if(readonly && page_prot[k] == PAGE_WRITECOPY && view[j].prot != PAGE_WRITECOPY)
+ ok(ret, "%d: VirtualQuery failed %ld\n", j, GetLastError());
ok(info.Protect == actual_prot,
"VirtualProtect wrong prot, map %#lx, view %#lx, requested prot %#lx got %#lx\n",
page_prot[i], view[j].prot, page_prot[k], info.Protect );
@ -59,9 +58,8 @@ index 365194b9065..6c5d6991737 100644
ok(ret, "VirtualProtect error %ld, map %#lx, view %#lx\n", GetLastError(), page_prot[i], view[j].prot);
if (ret) *(DWORD*)base = 0xdeadbeef;
ret = VirtualQuery(base, &info, sizeof(info));
- ok(ret, "%ld: VirtualQuery failed %ld\n", j, GetLastError());
ok(ret, "%ld: VirtualQuery failed %ld\n", j, GetLastError());
- todo_wine
+ ok(ret, "%d: VirtualQuery failed %ld\n", j, GetLastError());
ok(info.Protect == PAGE_READWRITE, "VirtualProtect wrong prot, map %#lx, view %#lx got %#lx\n",
page_prot[i], view[j].prot, info.Protect );
- todo_wine_if (!(sec_flags & SEC_IMAGE))
@ -86,9 +84,8 @@ index 365194b9065..6c5d6991737 100644
ok(old_prot == prev_prot, "got %#lx, expected %#lx\n", old_prot, prev_prot);
ret = VirtualQuery(base, &info, sizeof(info));
- ok(ret, "%ld: VirtualQuery failed %ld\n", j, GetLastError());
ok(ret, "%ld: VirtualQuery failed %ld\n", j, GetLastError());
- todo_wine_if( map_prot_written( page_prot[k] ) != actual_prot )
+ ok(ret, "%d: VirtualQuery failed %ld\n", j, GetLastError());
ok(info.Protect == map_prot_written( page_prot[k] ),
"VirtualProtect wrong prot, map %#lx, view %#lx, requested prot %#lx got %#lx\n",
page_prot[i], view[j].prot, page_prot[k], info.Protect );
@ -101,19 +98,10 @@ index 365194b9065..6c5d6991737 100644
CloseHandle( hfile );
diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 185a4062092..519e39c3df0 100644
index 185a4062092..1721968395d 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -803,6 +803,8 @@ static void test_QueryWorkingSetEx(void)
DWORD prot;
BOOL ret;
+ static char tmp_data[0x2000] = { 0x41 };
+
if (pQueryWorkingSetEx == NULL)
{
win_skip("QueryWorkingSetEx not found, skipping tests\n");
@@ -821,6 +823,9 @@ static void test_QueryWorkingSetEx(void)
@@ -821,6 +821,9 @@ static void test_QueryWorkingSetEx(void)
check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE);
*(volatile char *)addr;