ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTDLL_WINETESTS] Section name query test is broken on W2K3 and will lead to a crash

Browse Source 
Comment out the test for now and add a more "appropriate" test code for now
This commit is contained in:
Pierre Schweitzer
2019-09-29 14:13:55 +02:00
parent a66bee2837
commit ad547c960f
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/rostests/winetests/ntdll/info.c
+10
View File
@@ -1883,7 +1883,9 @@ static void test_queryvirtualmemory(void)
{ {
NTSTATUS status; NTSTATUS status;
SIZE_T readcount; SIZE_T readcount;
#ifndef __REACTOS__
static const WCHAR windowsW[] = {'w','i','n','d','o','w','s'}; static const WCHAR windowsW[] = {'w','i','n','d','o','w','s'};
#endif
static const char teststring[] = "test string"; static const char teststring[] = "test string";
static char datatestbuf[42] = "abc"; static char datatestbuf[42] = "abc";
static char rwtestbuf[42]; static char rwtestbuf[42];
@@ -1892,8 +1894,10 @@ static void test_queryvirtualmemory(void)
HMODULE module; HMODULE module;
char buffer_name[sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)]; char buffer_name[sizeof(MEMORY_SECTION_NAME) + MAX_PATH * sizeof(WCHAR)];
MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name; MEMORY_SECTION_NAME *msn = (MEMORY_SECTION_NAME *)buffer_name;
#ifndef __REACTOS__
BOOL found; BOOL found;
int i; int i;
#endif
module = GetModuleHandleA( "ntdll.dll" ); module = GetModuleHandleA( "ntdll.dll" );
trace("Check flags of the PE header of NTDLL.DLL at %p\n", module); trace("Check flags of the PE header of NTDLL.DLL at %p\n", module);
@@ -1994,6 +1998,7 @@ static void test_queryvirtualmemory(void)
memset(buffer_name, 0x77, sizeof(buffer_name)); memset(buffer_name, 0x77, sizeof(buffer_name));
readcount = 0; readcount = 0;
status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemorySectionName, msn, sizeof(buffer_name), &readcount); status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemorySectionName, msn, sizeof(buffer_name), &readcount);
#ifndef __REACTOS__
ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
ok( readcount > 0, "Expected readcount to be > 0\n"); ok( readcount > 0, "Expected readcount to be > 0\n");
trace ("Section Name: %s\n", wine_dbgstr_w(msn->SectionFileName.Buffer)); trace ("Section Name: %s\n", wine_dbgstr_w(msn->SectionFileName.Buffer));
@@ -2001,6 +2006,11 @@ static void test_queryvirtualmemory(void)
for (found = FALSE, i = (msn->SectionFileName.Length - sizeof(windowsW)) / sizeof(WCHAR); i >= 0; i--) for (found = FALSE, i = (msn->SectionFileName.Length - sizeof(windowsW)) / sizeof(WCHAR); i >= 0; i--)
found |= !memcmp( &msn->SectionFileName.Buffer[i], windowsW, sizeof(windowsW) ); found |= !memcmp( &msn->SectionFileName.Buffer[i], windowsW, sizeof(windowsW) );
ok( found, "Section name does not contain \"Windows\"\n"); ok( found, "Section name does not contain \"Windows\"\n");
#else
/* W2K3 will return this, because the buffer is not ULONG-aligned */
ok( status == STATUS_DATATYPE_MISALIGNMENT, "Expected STATUS_DATATYPE_MISALIGNMENT, got %08x\n", status);
ok( readcount == 0, "Expected readcount to be 0: %ld\n", readcount);
#endif
trace("Check section name of non mapped memory\n"); trace("Check section name of non mapped memory\n");
memset(msn, 0, sizeof(*msn)); memset(msn, 0, sizeof(*msn));