ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Fix the failing loader tests.

This commit is contained in:
Alexandre Julliard 2006-12-07 15:34:36 +01:00
parent 34c40097a5
commit 94ac989534
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/kernel32/tests/loader.c
View File

@ -294,16 +294,12 @@ START_TEST(loader)
{ {
ok(info.BaseAddress == (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize), "%d: %p != %p\n", ok(info.BaseAddress == (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize), "%d: %p != %p\n",
i, info.BaseAddress, (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize)); i, info.BaseAddress, (char *)hlib + ALIGN_SIZE(nt_header.OptionalHeader.SizeOfImage, si.dwPageSize));
todo_wine {
ok(info.AllocationBase == 0, "%d: %p != 0\n", i, info.AllocationBase); ok(info.AllocationBase == 0, "%d: %p != 0\n", i, info.AllocationBase);
}
ok(info.AllocationProtect == 0, "%d: %x != 0\n", i, info.AllocationProtect); ok(info.AllocationProtect == 0, "%d: %x != 0\n", i, info.AllocationProtect);
/*ok(info.RegionSize == not_practical_value, "%d: %lx != not_practical_value\n", i, info.RegionSize);*/ /*ok(info.RegionSize == not_practical_value, "%d: %lx != not_practical_value\n", i, info.RegionSize);*/
ok(info.State == MEM_FREE, "%d: %x != MEM_FREE\n", i, info.State); ok(info.State == MEM_FREE, "%d: %x != MEM_FREE\n", i, info.State);
ok(info.Type == 0, "%d: %x != 0\n", i, info.Type); ok(info.Type == 0, "%d: %x != 0\n", i, info.Type);
todo_wine {
ok(info.Protect == PAGE_NOACCESS, "%d: %x != PAGE_NOACCESS\n", i, info.Protect); ok(info.Protect == PAGE_NOACCESS, "%d: %x != PAGE_NOACCESS\n", i, info.Protect);
}
} }
else else
{ {
@ -322,14 +318,6 @@ todo_wine {
} }
else else
{ /* LoadLibrary has failed */ { /* LoadLibrary has failed */
if (hlib) /* remove completely once Wine is fixed */
{
todo_wine ok(!hlib, "%d: LoadLibrary should fail\n", i);
FreeLibrary(hlib);
DeleteFile(dll_name);
continue;
}
ok(!hlib, "%d: LoadLibrary should fail\n", i); ok(!hlib, "%d: LoadLibrary should fail\n", i);
if (GetLastError() == ERROR_GEN_FAILURE) /* Win9x, broken behaviour */ if (GetLastError() == ERROR_GEN_FAILURE) /* Win9x, broken behaviour */

8
dlls/ntdll/virtual.c
View File

@ -1021,6 +1021,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
removable ) != STATUS_SUCCESS) goto error; removable ) != STATUS_SUCCESS) goto error;
/* check that all sections are loaded at the right offset */ /* check that all sections are loaded at the right offset */
if (nt->OptionalHeader.FileAlignment != nt->OptionalHeader.SectionAlignment) goto error;
for (i = 0; i < nt->FileHeader.NumberOfSections; i++) for (i = 0; i < nt->FileHeader.NumberOfSections; i++)
{ {
if (sec[i].VirtualAddress != sec[i].PointerToRawData) if (sec[i].VirtualAddress != sec[i].PointerToRawData)
@ -1710,7 +1711,8 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr,
if (!view) if (!view)
{ {
info->State = MEM_FREE; info->State = MEM_FREE;
info->Protect = 0; info->Protect = PAGE_NOACCESS;
info->AllocationBase = 0;
info->AllocationProtect = 0; info->AllocationProtect = 0;
info->Type = 0; info->Type = 0;
} }
@ -1719,6 +1721,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr,
BYTE vprot = view->prot[(base - alloc_base) >> page_shift]; BYTE vprot = view->prot[(base - alloc_base) >> page_shift];
info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE;
info->Protect = VIRTUAL_GetWin32Prot( vprot ); info->Protect = VIRTUAL_GetWin32Prot( vprot );
info->AllocationBase = alloc_base;
info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect ); info->AllocationProtect = VIRTUAL_GetWin32Prot( view->protect );
if (view->protect & VPROT_IMAGE) info->Type = MEM_IMAGE; if (view->protect & VPROT_IMAGE) info->Type = MEM_IMAGE;
else if (view->flags & VFLAG_VALLOC) info->Type = MEM_PRIVATE; else if (view->flags & VFLAG_VALLOC) info->Type = MEM_PRIVATE;
@ -1728,8 +1731,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr,
} }
RtlLeaveCriticalSection(&csVirtual); RtlLeaveCriticalSection(&csVirtual);
info->BaseAddress = (LPVOID)base; info->BaseAddress = base;
info->AllocationBase = (LPVOID)alloc_base;
info->RegionSize = size - (base - alloc_base); info->RegionSize = size - (base - alloc_base);
if (res_len) *res_len = sizeof(*info); if (res_len) *res_len = sizeof(*info);
return STATUS_SUCCESS; return STATUS_SUCCESS;