kernel32/tests: Get rid of assert() in loader.c
André Hentschel
nerv at dawncrow.de
Fri Feb 21 15:07:48 CST 2014
---
dlls/kernel32/tests/loader.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index e749238..3b953af 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -21,7 +21,6 @@
#define NONAMELESSUNION
#include <stdarg.h>
#include <stdio.h>
-#include <assert.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
@@ -184,14 +183,13 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size,
if (nt_header->FileHeader.SizeOfOptionalHeader > sizeof(IMAGE_OPTIONAL_HEADER))
{
file_align = nt_header->FileHeader.SizeOfOptionalHeader - sizeof(IMAGE_OPTIONAL_HEADER);
- assert(file_align < sizeof(filler));
+ ok(file_align < sizeof(filler), "Filler too small\n");
SetLastError(0xdeadbeef);
ret = WriteFile(hfile, filler, file_align, &dummy, NULL);
ok(ret, "WriteFile error %d\n", GetLastError());
}
}
- assert(nt_header->FileHeader.NumberOfSections <= 1);
if (nt_header->FileHeader.NumberOfSections)
{
if (nt_header->OptionalHeader.SectionAlignment >= page_size)
@@ -216,6 +214,9 @@ static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size,
ret = WriteFile(hfile, section_data, sizeof(section_data), &dummy, NULL);
ok(ret, "WriteFile error %d\n", GetLastError());
}
+ else if (nt_header->FileHeader.NumberOfSections > 0)
+ ok(0, "Add support for more than one section!\n");
+
size = GetFileSize(hfile, NULL);
CloseHandle(hfile);
return size;
@@ -698,7 +699,6 @@ static void test_ImportDescriptors(void)
/* Load kernel32 module */
kernel32_module = GetModuleHandleA("kernel32.dll");
- assert( kernel32_module != NULL );
/* Get PE header info from module image */
d_header = (PIMAGE_DOS_HEADER) kernel32_module;
@@ -1093,7 +1093,7 @@ static void test_section_access(void)
ok(ret, "WriteFile error %d\n", GetLastError());
file_align = nt_header.OptionalHeader.FileAlignment - nt_header.OptionalHeader.SizeOfHeaders;
- assert(file_align < sizeof(filler));
+ ok(file_align < sizeof(filler), "Filler too small\n");
SetLastError(0xdeadbeef);
ret = WriteFile(hfile, filler, file_align, &dummy, NULL);
ok(ret, "WriteFile error %d\n", GetLastError());
@@ -1943,7 +1943,7 @@ static void child_process(const char *dll_name, DWORD target_offset)
break;
default:
- assert(0);
+ ok(0, "Unexpected phase: %i\n", test_dll_phase);
break;
}
@@ -2081,7 +2081,7 @@ static void test_ExitProcess(void)
ok(ret, "WriteFile error %d\n", GetLastError());
file_align = nt_header.OptionalHeader.FileAlignment - nt_header.OptionalHeader.SizeOfHeaders;
- assert(file_align < sizeof(filler));
+ ok(file_align < sizeof(filler), "Filler too small\n");
SetLastError(0xdeadbeef);
ret = WriteFile(file, filler, file_align, &dummy, NULL);
ok(ret, "WriteFile error %d\n", GetLastError());
--
1.8.1.2
More information about the wine-patches
mailing list