You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 26b26a2e0efcb776e7b0115f15580d2507b10400.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 97f429aab4d3763b2b41f4badbacb5421caf0f75 Mon Sep 17 00:00:00 2001
|
||||
From a100b0b789c767230ef98eb2201e5ae5a272e907 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Sun, 28 May 2017 10:30:43 +0200
|
||||
Subject: [PATCH] ntdll/tests: Add tests for
|
||||
@@ -9,19 +9,19 @@ Subject: [PATCH] ntdll/tests: Add tests for
|
||||
1 file changed, 35 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
|
||||
index 5f27d8b..7b470cd 100644
|
||||
index 7a641f8b84e..e335e758175 100644
|
||||
--- a/dlls/ntdll/tests/info.c
|
||||
+++ b/dlls/ntdll/tests/info.c
|
||||
@@ -1928,6 +1928,8 @@ static void test_queryvirtualmemory(void)
|
||||
MEMORY_BASIC_INFORMATION mbi;
|
||||
@@ -2182,6 +2182,8 @@ static void test_queryvirtualmemory(void)
|
||||
char stackbuf[42];
|
||||
HMODULE module;
|
||||
void *user_shared_data = (void *)0x7ffe0000;
|
||||
+ char buffer_name[sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)];
|
||||
+ MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name;
|
||||
|
||||
module = GetModuleHandleA( "ntdll.dll" );
|
||||
trace("Check flags of the PE header of NTDLL.DLL at %p\n", module);
|
||||
@@ -2008,6 +2010,39 @@ static void test_queryvirtualmemory(void)
|
||||
@@ -2274,6 +2276,39 @@ static void test_queryvirtualmemory(void)
|
||||
/* check error code when len is less than MEMORY_BASIC_INFORMATION size */
|
||||
status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount);
|
||||
ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status);
|
||||
@@ -62,5 +62,5 @@ index 5f27d8b..7b470cd 100644
|
||||
|
||||
static void test_affinity(void)
|
||||
--
|
||||
1.9.1
|
||||
2.26.2
|
||||
|
||||
|
@@ -1,14 +1,14 @@
|
||||
From 0d410dfc4dea7a5f7422d4c066c2f1d66d7d7f7c Mon Sep 17 00:00:00 2001
|
||||
From e088b03ac3d6419ba2c6b825b5b14de8527acbe4 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 28 May 2017 10:33:40 +0200
|
||||
Subject: ntdll/tests: Add test to ensure section name is full path.
|
||||
Subject: [PATCH] ntdll/tests: Add test to ensure section name is full path.
|
||||
|
||||
---
|
||||
dlls/ntdll/tests/info.c | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
|
||||
index 4ad639ca81..44d1213b98 100644
|
||||
index e335e758175..66c5e81830d 100644
|
||||
--- a/dlls/ntdll/tests/info.c
|
||||
+++ b/dlls/ntdll/tests/info.c
|
||||
@@ -22,6 +22,7 @@
|
||||
@@ -27,7 +27,7 @@ index 4ad639ca81..44d1213b98 100644
|
||||
NTDLL_GET_PROC(NtQuerySystemInformation);
|
||||
NTDLL_GET_PROC(RtlGetNativeSystemInformation);
|
||||
NTDLL_GET_PROC(NtPowerInformation);
|
||||
@@ -2120,6 +2122,7 @@ static void test_queryvirtualmemory(void)
|
||||
@@ -2175,6 +2177,7 @@ static void test_queryvirtualmemory(void)
|
||||
{
|
||||
NTSTATUS status;
|
||||
SIZE_T readcount;
|
||||
@@ -35,8 +35,8 @@ index 4ad639ca81..44d1213b98 100644
|
||||
static const char teststring[] = "test string";
|
||||
static char datatestbuf[42] = "abc";
|
||||
static char rwtestbuf[42];
|
||||
@@ -2128,6 +2131,8 @@ static void test_queryvirtualmemory(void)
|
||||
HMODULE module;
|
||||
@@ -2184,6 +2187,8 @@ static void test_queryvirtualmemory(void)
|
||||
void *user_shared_data = (void *)0x7ffe0000;
|
||||
char buffer_name[sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)];
|
||||
MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name;
|
||||
+ BOOL found;
|
||||
@@ -44,7 +44,7 @@ index 4ad639ca81..44d1213b98 100644
|
||||
|
||||
module = GetModuleHandleA( "ntdll.dll" );
|
||||
trace("Check flags of the PE header of NTDLL.DLL at %p\n", module);
|
||||
@@ -2234,6 +2239,10 @@ static void test_queryvirtualmemory(void)
|
||||
@@ -2302,6 +2307,10 @@ static void test_queryvirtualmemory(void)
|
||||
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
|
||||
ok( readcount > 0, "Expected readcount to be > 0\n");
|
||||
trace ("Section Name: %s\n", wine_dbgstr_w(msn->SectionFileName.Buffer));
|
||||
@@ -56,5 +56,5 @@ index 4ad639ca81..44d1213b98 100644
|
||||
trace("Check section name of non mapped memory\n");
|
||||
memset(msn, 0, sizeof(*msn));
|
||||
--
|
||||
2.24.1
|
||||
2.26.2
|
||||
|
||||
|
Reference in New Issue
Block a user