Rebase against 4dfd5f22f4032efdc283adf861d82e43c3b08d42

This commit is contained in:
Paul Gofman
2020-03-12 02:21:27 +03:00
parent 789f5c7c64
commit d14250ab03
5 changed files with 24 additions and 106 deletions

View File

@@ -1,4 +1,4 @@
From ace7d4f4d6f6de1e2ba60c43d8e79d2b54d03523 Mon Sep 17 00:00:00 2001
From 0d410dfc4dea7a5f7422d4c066c2f1d66d7d7f7c 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.
@@ -8,7 +8,7 @@ Subject: ntdll/tests: Add test to ensure section name is full path.
1 file changed, 9 insertions(+)
diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 1b54bd41320..4bd4b755de5 100644
index 4ad639ca81..44d1213b98 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -22,6 +22,7 @@
@@ -17,17 +17,17 @@ index 1b54bd41320..4bd4b755de5 100644
+static NTSTATUS (WINAPI * pRtlDowncaseUnicodeString)(UNICODE_STRING *, const UNICODE_STRING *, BOOLEAN);
static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
static NTSTATUS (WINAPI * pNtQuerySystemInformationEx)(SYSTEM_INFORMATION_CLASS, void*, ULONG, void*, ULONG, ULONG*);
static NTSTATUS (WINAPI * pNtPowerInformation)(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG);
@@ -66,6 +67,7 @@ static BOOL InitFunctionPtrs(void)
@@ -75,6 +76,7 @@ static BOOL InitFunctionPtrs(void)
return FALSE;
}
+ NTDLL_GET_PROC(RtlDowncaseUnicodeString);
NTDLL_GET_PROC(NtQuerySystemInformation);
NTDLL_GET_PROC(RtlGetNativeSystemInformation);
NTDLL_GET_PROC(NtPowerInformation);
NTDLL_GET_PROC(NtQueryInformationProcess);
@@ -1745,6 +1747,7 @@ static void test_queryvirtualmemory(void)
@@ -2120,6 +2122,7 @@ static void test_queryvirtualmemory(void)
{
NTSTATUS status;
SIZE_T readcount;
@@ -35,7 +35,7 @@ index 1b54bd41320..4bd4b755de5 100644
static const char teststring[] = "test string";
static char datatestbuf[42] = "abc";
static char rwtestbuf[42];
@@ -1753,6 +1756,8 @@ static void test_queryvirtualmemory(void)
@@ -2128,6 +2131,8 @@ static void test_queryvirtualmemory(void)
HMODULE module;
char buffer_name[sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)];
MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name;
@@ -44,7 +44,7 @@ index 1b54bd41320..4bd4b755de5 100644
module = GetModuleHandleA( "ntdll.dll" );
trace("Check flags of the PE header of NTDLL.DLL at %p\n", module);
@@ -1852,6 +1857,10 @@ static void test_queryvirtualmemory(void)
@@ -2234,6 +2239,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 1b54bd41320..4bd4b755de5 100644
trace("Check section name of non mapped memory\n");
memset(msn, 0, sizeof(*msn));
--
2.12.2
2.24.1