[PATCH v4 1/6] kernel32/tests: Call NtFreeVirtualMemory instead of VirtualFree

List overview All Threads

newer

older

[PATCH] ieframe: Prefer built-in...

[PATCH] webservices: Fix misplaced...

Rémi Bernon

28 May 2019 28 May '19

10:15 a.m.

Memory allocated with NtAllocateVirtualMemory should be freed with NtFreeVirtualMemory, for consistency.

Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/kernel32/tests/virtual.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 474955630fd..dcaeb147b04 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -454,7 +454,12 @@ static void test_VirtualAlloc(void) MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); todo_wine ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + }

/* 21 zero bits is valid */ size = 0x1000; @@ -463,7 +468,12 @@ static void test_VirtualAlloc(void) MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + }

/* 22 zero bits is invalid */ size = 0x1000; @@ -471,7 +481,12 @@ static void test_VirtualAlloc(void) status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); - if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + }

/* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef);

-- 2.20.1

Show replies by date

Rémi Bernon

28 May 28 May

10:15 a.m.

New subject: [PATCH v4 2/6] kernel32/tests: Add NtAllocateVirtualMemory tests for zero_bits behavior

The zero_bits parameter doesn't behave as expected, and some 64bit code use it to allocate memory in the lower 32bit address space.

The expected full behaviour is:

* zero_bits == 0: no constraint on address range * 0 < zero_bits <= 15: returned address should have as many upper bits set to 0, starting at bit 31. In 64bit mode, upper 32bits should all be 0 as well. * 15 < zero_bits <= 31: unsure, but probably same as zero_bits == 15. * zero_bits > 31: (64bit/WoW64 only) zero_bits behaves as a bitmask, as if it was set to the number of leading 0 in the bitmask, works in the whole 64bit range.

Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/kernel32/tests/virtual.c | 57 ++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index dcaeb147b04..1778509d2ac 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -228,10 +228,12 @@ static void test_VirtualAllocEx(void) static void test_VirtualAlloc(void) { void *addr1, *addr2; + ULONG zero_bits; DWORD old_prot; MEMORY_BASIC_INFORMATION info; NTSTATUS status; SIZE_T size; + BOOL is_wow64;

SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS); @@ -461,13 +463,16 @@ static void test_VirtualAlloc(void) ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); }

- /* 21 zero bits is valid */ + /* 1 zero bits should zero 63-31 upper bits */ size = 0x1000; addr2 = NULL; - status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); - ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY, - "NtAllocateVirtualMemory returned %08x\n", status); + zero_bits = 1; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 1, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + todo_wine + ok((status == STATUS_SUCCESS || broken(status == STATUS_INVALID_PARAMETER_3) /* winxp */) && + ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %p\n", status, addr2); if (status == STATUS_SUCCESS) { size = 0; @@ -475,6 +480,23 @@ static void test_VirtualAlloc(void) ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); }

+ for (zero_bits = 2; zero_bits <= 21; zero_bits++) + { + size = 0x1000; + addr2 = NULL; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, zero_bits, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + todo_wine + ok((status == STATUS_SUCCESS || status == STATUS_NO_MEMORY) && ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0, + "NtAllocateVirtualMemory with %d zero_bits returned %08x, addr2: %p\n", zero_bits, status, addr2); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + } + /* 22 zero bits is invalid */ size = 0x1000; addr2 = NULL; @@ -488,6 +510,31 @@ static void test_VirtualAlloc(void) ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); }

+ /* zero bits > 31 should be considered as bitmask on 64bit and WoW64 */ + size = 0x1000; + addr2 = NULL; + zero_bits = 0x1fffffff; + status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, zero_bits, &size, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + + if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || + !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) + { + ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status); + } + else + { + todo_wine + ok(status == STATUS_SUCCESS && ((UINT_PTR)addr2 & ~zero_bits) == 0, + "NtAllocateVirtualMemory returned %08x, addr2: %p\n", status, addr2); + if (status == STATUS_SUCCESS) + { + size = 0; + status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); + } + } + /* AT_ROUND_TO_PAGE flag is not supported for VirtualAlloc */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE);

-- 2.20.1

Marvin

10:31 a.m.

New subject: [PATCH v4 2/6] kernel32/tests: Add NtAllocateVirtualMemory tests for zero_bits behavior

Hi,

While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?

Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=52931

Your paranoid android.

=== wvistau64 (32 bit report) ===

kernel32: virtual.c:2863: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2901: Test failed: expected policy flags 0, got 3 virtual.c:2902: Test failed: expected policy permanent FALSE, got 1 virtual.c:2957: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:2971: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3000: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3015: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3063: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3078: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3096: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3114: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3195: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3219: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3259: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3284: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3321: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2863: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2901: Test failed: expected policy flags 1, got 3 virtual.c:2902: Test failed: expected policy permanent FALSE, got 1 virtual.c:3000: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3015: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3063: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3078: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3259: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3284: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3321: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2863: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2902: Test failed: expected policy permanent FALSE, got 1 virtual.c:3321: Test failed: NtSetInformationProcess failed with status c0000022

=== wvistau64_zh_CN (32 bit report) ===

=== wvistau64_fr (32 bit report) ===

=== wvistau64_he (32 bit report) ===

=== w2008s64 (32 bit report) ===

=== w7u (32 bit report) ===

=== w7pro64 (32 bit report) ===

=== w8 (32 bit report) ===

=== w8adm (32 bit report) ===

=== w864 (32 bit report) ===

=== w1064v1507 (32 bit report) ===

=== w1064v1809 (32 bit report) ===

kernel32: virtual.c:490: Test failed: NtAllocateVirtualMemory with 20 zero_bits returned c0000018, addr2: 00000000 virtual.c:490: Test failed: NtAllocateVirtualMemory with 21 zero_bits returned c000000d, addr2: 00000000 virtual.c:2863: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2901: Test failed: expected policy flags 0, got 3 virtual.c:2902: Test failed: expected policy permanent FALSE, got 1 virtual.c:2957: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:2971: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3000: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3015: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3063: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3078: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3096: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3114: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3195: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3219: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3259: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3284: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3321: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2863: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2901: Test failed: expected policy flags 1, got 3 virtual.c:2902: Test failed: expected policy permanent FALSE, got 1 virtual.c:3000: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3015: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3063: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3078: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3259: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3284: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3321: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2863: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2902: Test failed: expected policy permanent FALSE, got 1 virtual.c:3321: Test failed: NtSetInformationProcess failed with status c0000022

=== w1064v1809 (64 bit report) ===

kernel32: virtual.c:490: Test failed: NtAllocateVirtualMemory with 20 zero_bits returned c0000018, addr2: 0000000000000000 virtual.c:490: Test failed: NtAllocateVirtualMemory with 21 zero_bits returned c000000d, addr2: 0000000000000000

=== debian9 (32 bit report) ===

kernel32: virtual.c:473: Test succeeded inside todo block: NtAllocateVirtualMemory returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 2 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 3 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 4 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 5 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 6 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 7 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 8 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 9 zero_bits returned 00000000, addr2: 00223000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 10 zero_bits returned 00000000, addr2: 00223000

=== debian9 (32 bit French report) ===

=== debian9 (32 bit Japanese:Japan report) ===

=== debian9 (32 bit Chinese:China report) ===

=== debian9 (32 bit WoW report) ===

=== debian9 (64 bit WoW report) ===

Huw Davies

29 May 29 May

9:42 a.m.

New subject: [PATCH v4 2/6] kernel32/tests: Add NtAllocateVirtualMemory tests for zero_bits behavior

On Tue, May 28, 2019 at 12:15:14PM +0200, Rémi Bernon wrote:

...

The zero_bits parameter doesn't behave as expected, and some 64bit code use it to allocate memory in the lower 32bit address space.

The expected full behaviour is:

zero_bits == 0: no constraint on address range

0 < zero_bits <= 15: returned address should have as many upper bits set to 0, starting at bit 31. In 64bit mode, upper 32bits should all be 0 as well.

15 < zero_bits <= 31: unsure, but probably same as zero_bits == 15.

zero_bits > 31: (64bit/WoW64 only) zero_bits behaves as a bitmask, as if it was set to the number of leading 0 in the bitmask, works in the whole 64bit range.

Signed-off-by: Rémi Bernon rbernon@codeweavers.com

dlls/kernel32/tests/virtual.c | 57 ++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index dcaeb147b04..1778509d2ac 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -228,10 +228,12 @@ static void test_VirtualAllocEx(void) static void test_VirtualAlloc(void) { void *addr1, *addr2;

ULONG zero_bits; DWORD old_prot; MEMORY_BASIC_INFORMATION info; NTSTATUS status; SIZE_T size;

BOOL is_wow64;

SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS);

@@ -461,13 +463,16 @@ static void test_VirtualAlloc(void) ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); }

/* 21 zero bits is valid */

/* 1 zero bits should zero 63-31 upper bits */ size = 0x1000; addr2 = NULL;
status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size,
                                 MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE);
ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY,
  "NtAllocateVirtualMemory returned %08x\n", status);
zero_bits = 1;

status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 1, &size,
                                 MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
todo_wine

ok((status == STATUS_SUCCESS || broken(status == STATUS_INVALID_PARAMETER_3) /* winxp */) &&
  ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0,
  "NtAllocateVirtualMemory returned %08x, addr2: %p\n", status, addr2);
if (status == STATUS_SUCCESS) { size = 0;
@@ -475,6 +480,23 @@ static void test_VirtualAlloc(void) ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); }
for (zero_bits = 2; zero_bits <= 21; zero_bits++)

{
   size = 0x1000;
   addr2 = NULL;
   status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, zero_bits, &size,
                                     MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
   todo_wine
   ok((status == STATUS_SUCCESS || status == STATUS_NO_MEMORY) && ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0,
      "NtAllocateVirtualMemory with %d zero_bits returned %08x, addr2: %p\n", zero_bits, status, addr2);
   if (status == STATUS_SUCCESS)
   {
       size = 0;
       status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE);
       ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2);
   }
}

Problem is sometimes these actually work (and so fail the todo_wine):

virtual.c:473: Test succeeded inside todo block: NtAllocateVirtualMemory returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 2 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 3 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 4 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 5 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 6 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 7 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 8 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 9 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 10 zero_bits returned 00000000, addr2: 00222000

Also having these tests in kernel32 seems wrong; though short of adding a new virtual.c to the ntdll tests, I couldn't find a sensible place to put them.

Huw.

Rémi Bernon

9:50 a.m.

New subject: [PATCH v4 2/6] kernel32/tests: Add NtAllocateVirtualMemory tests for zero_bits behavior

On Wed, 2019-05-29 at 10:42 +0100, Huw Davies wrote:

...

On Tue, May 28, 2019 at 12:15:14PM +0200, Rémi Bernon wrote:

...
The zero_bits parameter doesn't behave as expected, and some 64bit code use it to allocate memory in the lower 32bit address space.

The expected full behaviour is:

zero_bits == 0: no constraint on address range

0 < zero_bits <= 15: returned address should have as many upper

bits set to 0, starting at bit 31. In 64bit mode, upper 32bits should all be 0 as well.

15 < zero_bits <= 31: unsure, but probably same as zero_bits ==

zero_bits > 31: (64bit/WoW64 only) zero_bits behaves as a

bitmask, as if it was set to the number of leading 0 in the bitmask, works in the whole 64bit range.

Signed-off-by: Rémi Bernon rbernon@codeweavers.com

dlls/kernel32/tests/virtual.c | 57 ++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index dcaeb147b04..1778509d2ac 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -228,10 +228,12 @@ static void test_VirtualAllocEx(void) static void test_VirtualAlloc(void) { void *addr1, *addr2;

ULONG zero_bits; DWORD old_prot; MEMORY_BASIC_INFORMATION info; NTSTATUS status; SIZE_T size;

BOOL is_wow64;

SetLastError(0xdeadbeef); addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS);

@@ -461,13 +463,16 @@ static void test_VirtualAlloc(void) ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); }

/* 21 zero bits is valid */

/* 1 zero bits should zero 63-31 upper bits */ size = 0x1000; addr2 = NULL;

status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2,

21, &size,
                                 MEM_RESERVE | MEM_COMMIT,
PAGE_EXECUTE_READWRITE);
ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY,
  "NtAllocateVirtualMemory returned %08x\n", status);
zero_bits = 1;

status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2,

1, &size,
                                 MEM_RESERVE | MEM_COMMIT,
PAGE_READWRITE);

todo_wine

ok((status == STATUS_SUCCESS || broken(status ==

STATUS_INVALID_PARAMETER_3) /* winxp */) &&
  ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0,
  "NtAllocateVirtualMemory returned %08x, addr2: %p\n",
status, addr2); if (status == STATUS_SUCCESS) { size = 0; @@ -475,6 +480,23 @@ static void test_VirtualAlloc(void) ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2); }
for (zero_bits = 2; zero_bits <= 21; zero_bits++)

{
   size = 0x1000;
   addr2 = NULL;
   status = pNtAllocateVirtualMemory(GetCurrentProcess(),
&addr2, zero_bits, &size,
                                     MEM_RESERVE |
MEM_COMMIT, PAGE_READWRITE);
   todo_wine
   ok((status == STATUS_SUCCESS || status ==
STATUS_NO_MEMORY) && ((UINT_PTR)addr2 >> (32 - zero_bits)) == 0,
      "NtAllocateVirtualMemory with %d zero_bits returned
%08x, addr2: %p\n", zero_bits, status, addr2);
   if (status == STATUS_SUCCESS)
   {
       size = 0;
       status = pNtFreeVirtualMemory(GetCurrentProcess(),
&addr2, &size, MEM_RELEASE);
       ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory
return %08x, addr2: %p\n", status, addr2);
   }
}
Problem is sometimes these actually work (and so fail the todo_wine):

virtual.c:473: Test succeeded inside todo block: NtAllocateVirtualMemory returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 2 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 3 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 4 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 5 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 6 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 7 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 8 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 9 zero_bits returned 00000000, addr2: 00222000 virtual.c:490: Test succeeded inside todo block: NtAllocateVirtualMemory with 10 zero_bits returned 00000000, addr2: 00222000

They work but actually shouldn't, and the later changes will "fix" this. Should I add the todo_wine in the patch that breaks them?

...

Also having these tests in kernel32 seems wrong; though short of adding a new virtual.c to the ntdll tests, I couldn't find a sensible place to put them.

Huw.

It was my initial intuition, but there wasn't any ntdll tests for these functions, whereas there were already some in kernel32. I can maybe move all the related tests to ntdll instead.

Rémi

Rémi Bernon

28 May 28 May

10:15 a.m.

New subject: [PATCH v4 3/6] kernel32/tests: Add tests for NtAllocateVirtualMemory with size_ptr == NULL

Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/kernel32/tests/virtual.c | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 1778509d2ac..79eed345910 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -442,6 +442,11 @@ static void test_VirtualAlloc(void) addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr2 == addr1, "VirtualAlloc returned %p, expected %p\n", addr2, addr1);

+ /* size_ptr should not be NULL */ + status = pNtAllocateVirtualMemory(GetCurrentProcess(), NULL, 0, NULL, + MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(status == STATUS_ACCESS_VIOLATION, "NtAllocateVirtualMemory returned %08x\n", status); + /* allocation conflicts because of 64k align */ size = 0x1000; addr2 = (char *)addr1 + 0x1000;

-- 2.20.1

Marvin

10:49 a.m.

New subject: [PATCH v4 3/6] kernel32/tests: Add tests for NtAllocateVirtualMemory with size_ptr == NULL

Hi,

While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?

Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=52932

Your paranoid android.

=== wvistau64 (32 bit report) ===

kernel32: virtual.c:2868: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2906: Test failed: expected policy flags 0, got 3 virtual.c:2907: Test failed: expected policy permanent FALSE, got 1 virtual.c:2962: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:2976: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3005: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3020: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3068: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3083: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3101: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3119: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3200: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3224: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3264: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3289: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3326: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2868: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2906: Test failed: expected policy flags 1, got 3 virtual.c:2907: Test failed: expected policy permanent FALSE, got 1 virtual.c:3005: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3020: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3068: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3083: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3264: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3289: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3326: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2868: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2907: Test failed: expected policy permanent FALSE, got 1 virtual.c:3326: Test failed: NtSetInformationProcess failed with status c0000022

=== wvistau64_zh_CN (32 bit report) ===

=== wvistau64_fr (32 bit report) ===

=== wvistau64_he (32 bit report) ===

=== w2008s64 (32 bit report) ===

=== w7u (32 bit report) ===

=== w7pro64 (32 bit report) ===

=== w8 (32 bit report) ===

=== w8adm (32 bit report) ===

=== w864 (32 bit report) ===

=== w1064v1507 (32 bit report) ===

=== w1064v1809 (32 bit report) ===

kernel32: virtual.c:495: Test failed: NtAllocateVirtualMemory with 20 zero_bits returned c0000018, addr2: 00000000 virtual.c:495: Test failed: NtAllocateVirtualMemory with 21 zero_bits returned c000000d, addr2: 00000000 virtual.c:2868: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2906: Test failed: expected policy flags 0, got 3 virtual.c:2907: Test failed: expected policy permanent FALSE, got 1 virtual.c:2962: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:2976: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3005: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3020: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3068: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3083: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3101: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3119: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3200: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3224: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3264: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3289: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3326: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2868: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2906: Test failed: expected policy flags 1, got 3 virtual.c:2907: Test failed: expected policy permanent FALSE, got 1 virtual.c:3005: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3020: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3068: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3083: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3264: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3289: Test failed: expected no STATUS_ACCESS_VIOLATION exception, got 1 exceptions virtual.c:3326: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2868: Test failed: NtSetInformationProcess failed with status c0000022 virtual.c:2907: Test failed: expected policy permanent FALSE, got 1 virtual.c:3326: Test failed: NtSetInformationProcess failed with status c0000022

=== w1064v1809 (64 bit report) ===

kernel32: virtual.c:495: Test failed: NtAllocateVirtualMemory with 20 zero_bits returned c0000018, addr2: 0000000000000000 virtual.c:495: Test failed: NtAllocateVirtualMemory with 21 zero_bits returned c000000d, addr2: 0000000000000000

=== debian9 (32 bit report) ===