system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

psapi: Make sure that NtQueryVirtualMemory(MemorySectionName) succeeds under Windows 2000 too.

Browse source
This commit is contained in:
Dmitry Timoshkov 2012-02-07 11:17:56 +08:00 committed by Alexandre Julliard
parent c3e2407664
commit 48a2a467cd
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dlls/psapi/tests/psapi_main.c
View file

@ -198,7 +198,7 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW
{ {
MEMORY_SECTION_NAME *section_name; MEMORY_SECTION_NAME *section_name;
WCHAR *buf; WCHAR *buf;
SIZE_T buf_len; SIZE_T buf_len, ret_len;
NTSTATUS status; NTSTATUS status;
if (!pNtQueryVirtualMemory) return FALSE; if (!pNtQueryVirtualMemory) return FALSE;
@ -206,12 +206,16 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW
buf_len = len * sizeof(WCHAR) + sizeof(MEMORY_SECTION_NAME); buf_len = len * sizeof(WCHAR) + sizeof(MEMORY_SECTION_NAME);
buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf_len); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf_len);
status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, NULL); ret_len = 0xdeadbeef;
status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, &ret_len);
todo_wine todo_wine
ok(!status || broken(status == STATUS_ACCESS_VIOLATION) /* win2k */, "NtQueryVirtualMemory error %x\n", status); ok(!status, "NtQueryVirtualMemory error %x\n", status);
/* FIXME: remove once Wine is fixed */
if (status) return FALSE; if (status) return FALSE;
section_name = (MEMORY_SECTION_NAME *)buf; section_name = (MEMORY_SECTION_NAME *)buf;
ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n",
ret_len, section_name->SectionFileName.MaximumLength);
ok((char *)section_name->SectionFileName.Buffer == (char *)section_name + sizeof(*section_name), "got %p, %p\n", ok((char *)section_name->SectionFileName.Buffer == (char *)section_name + sizeof(*section_name), "got %p, %p\n",
section_name, section_name->SectionFileName.Buffer); section_name, section_name->SectionFileName.Buffer);
ok(section_name->SectionFileName.MaximumLength == section_name->SectionFileName.Length + sizeof(WCHAR), "got %u, %u\n", ok(section_name->SectionFileName.MaximumLength == section_name->SectionFileName.Length + sizeof(WCHAR), "got %u, %u\n",