André Hentschel : kernel32/tests: Use SetFilePointer instead of GetFileSize with WriteFile.
Module: wine Branch: master Commit: c5868eed11e3ff49b1f70b28c57431dd68a6fb4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5868eed11e3ff49b1f70b28c5... Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 7 22:15:56 2016 +0200 kernel32/tests: Use SetFilePointer instead of GetFileSize with WriteFile. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f59f674..9aaecc2 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2744,12 +2744,7 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to delay data */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, - nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress - file_size, - &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress, NULL, SEEK_SET ); /* delay data */ idd.Attributes.AllAttributes = 1; @@ -2770,10 +2765,7 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to extended delay data */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, idd.DllNameRVA - file_size, &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, idd.DllNameRVA, NULL, SEEK_SET ); /* extended delay data */ SetLastError(0xdeadbeef); @@ -2810,10 +2802,8 @@ static void test_ResolveDelayLoadedAPI(void) ok(ret, "WriteFile error %d\n", GetLastError()); /* fill up to eof */ - file_size = GetFileSize(hfile, NULL); - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, section.VirtualAddress + section.Misc.VirtualSize - file_size, &dummy, NULL); - ok(ret, "WriteFile error %d\n", GetLastError()); + SetFilePointer( hfile, section.VirtualAddress + section.Misc.VirtualSize, NULL, SEEK_SET ); + SetEndOfFile( hfile ); CloseHandle(hfile); SetLastError(0xdeadbeef);
participants (1)
-
Alexandre Julliard