[PATCH 07/12] kernel32/tests: Use correct constants for SetFilePointer().

10 Dec 2024

From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com
---
 dlls/kernel32/tests/file.c   | 34 +++++++++++++++++-----------------
 dlls/kernel32/tests/loader.c | 10 +++++-----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index c57edebb316..b651fc1a1ba 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -6121,7 +6121,7 @@ static void test_eof(void)
     ok(ret, "failed to get size, error %lu\n", GetLastError());
     ok(!file_size.QuadPart, "got size %I64d\n", file_size.QuadPart);
-    SetFilePointer(file, 2, NULL, SEEK_SET);
+    SetFilePointer(file, 2, NULL, FILE_BEGIN);
ret = GetFileSizeEx(file, &file_size);
     ok(ret, "failed to get size, error %lu\n", GetLastError());
@@ -6133,7 +6133,7 @@ static void test_eof(void)
     ok(!size, "got size %lu\n", size);
     ok(GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError());
-    SetFilePointer(file, 2, NULL, SEEK_SET);
+    SetFilePointer(file, 2, NULL, FILE_BEGIN);
SetLastError(0xdeadbeef);
     size = 0xdeadbeef;
@@ -6146,7 +6146,7 @@ static void test_eof(void)
        "got status %#lx\n", (NTSTATUS)overlapped.Internal);
     ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh);
-    SetFilePointer(file, 2, NULL, SEEK_SET);
+    SetFilePointer(file, 2, NULL, FILE_BEGIN);
ret = SetEndOfFile(file);
     ok(ret, "failed to set EOF, error %lu\n", GetLastError());
@@ -6163,7 +6163,7 @@ static void test_eof(void)
     ok(ret, "failed to get size, error %lu\n", GetLastError());
     ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart);
-    SetFilePointer(file, 4, NULL, SEEK_SET);
+    SetFilePointer(file, 4, NULL, FILE_BEGIN);
     ret = SetEndOfFile(file);
     ok(ret, "failed to set EOF, error %lu\n", GetLastError());
@@ -6171,13 +6171,13 @@ static void test_eof(void)
     ok(ret, "failed to get size, error %lu\n", GetLastError());
     ok(file_size.QuadPart == 4, "got size %I64d\n", file_size.QuadPart);
-    SetFilePointer(file, 0, NULL, SEEK_SET);
+    SetFilePointer(file, 0, NULL, FILE_BEGIN);
     ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL);
     ok(ret, "failed to read, error %lu\n", GetLastError());
     ok(size == 4, "got size %lu\n", size);
     ok(!memcmp(buffer, "\0\0da", 4), "wrong data\n");
-    SetFilePointer(file, 6, NULL, SEEK_SET);
+    SetFilePointer(file, 6, NULL, FILE_BEGIN);
     ret = SetEndOfFile(file);
     ok(ret, "failed to set EOF, error %lu\n", GetLastError());
@@ -6185,7 +6185,7 @@ static void test_eof(void)
     ok(ret, "failed to get size, error %lu\n", GetLastError());
     ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart);
-    SetFilePointer(file, 0, NULL, SEEK_SET);
+    SetFilePointer(file, 0, NULL, FILE_BEGIN);
     ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL);
     ok(ret, "failed to read, error %lu\n", GetLastError());
     ok(size == 6, "got size %lu\n", size);
@@ -6194,7 +6194,7 @@ static void test_eof(void)
     ret = SetEndOfFile(file);
     ok(ret, "failed to set EOF, error %lu\n", GetLastError());
-    SetFilePointer(file, 2, NULL, SEEK_SET);
+    SetFilePointer(file, 2, NULL, FILE_BEGIN);
     ret = WriteFile(file, "data", 4, &size, NULL);
     ok(ret, "failed to write, error %lu\n", GetLastError());
     ok(size == 4, "got size %lu\n", size);
@@ -6203,7 +6203,7 @@ static void test_eof(void)
     ok(ret, "failed to get size, error %lu\n", GetLastError());
     ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart);
-    SetFilePointer(file, 0, NULL, SEEK_SET);
+    SetFilePointer(file, 0, NULL, FILE_BEGIN);
     ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL);
     ok(ret, "failed to read, error %lu\n", GetLastError());
     ok(size == 6, "got size %lu\n", size);
@@ -6218,14 +6218,14 @@ static void test_eof(void)
         ok(ret, "failed to get size, error %lu\n", GetLastError());
         ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart);
-        SetFilePointer(file, 6, NULL, SEEK_SET);
+        SetFilePointer(file, 6, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(ret, "failed to set EOF, error %lu\n", GetLastError());
         ret = GetFileSizeEx(file, &file_size);
         ok(ret, "failed to get size, error %lu\n", GetLastError());
         ok(file_size.QuadPart == 6, "got size %I64d\n", file_size.QuadPart);
-        SetFilePointer(file, 8, NULL, SEEK_SET);
+        SetFilePointer(file, 8, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(ret, "failed to set EOF, error %lu\n", GetLastError());
         ret = GetFileSizeEx(file, &file_size);
@@ -6233,7 +6233,7 @@ static void test_eof(void)
         ok(file_size.QuadPart == 8, "got size %I64d\n", file_size.QuadPart);
SetLastError(0xdeadbeef);
-        SetFilePointer(file, 6, NULL, SEEK_SET);
+        SetFilePointer(file, 6, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(!ret, "expected failure\n");
         ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %lu\n", GetLastError());
@@ -6241,14 +6241,14 @@ static void test_eof(void)
         ok(ret, "failed to get size, error %lu\n", GetLastError());
         ok(file_size.QuadPart == 8, "got size %I64d\n", file_size.QuadPart);
-        SetFilePointer(file, 8192, NULL, SEEK_SET);
+        SetFilePointer(file, 8192, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(ret, "failed to set EOF, error %lu\n", GetLastError());
         ret = GetFileSizeEx(file, &file_size);
         ok(ret, "failed to get size, error %lu\n", GetLastError());
         ok(file_size.QuadPart == 8192, "got size %I64d\n", file_size.QuadPart);
-        SetFilePointer(file, 8191, NULL, SEEK_SET);
+        SetFilePointer(file, 8191, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(!ret, "expected failure\n");
         ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %lu\n", GetLastError());
@@ -6261,14 +6261,14 @@ static void test_eof(void)
CloseHandle(mapping);
-        SetFilePointer(file, 16384, NULL, SEEK_SET);
+        SetFilePointer(file, 16384, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(ret, "failed to set EOF, error %lu\n", GetLastError());
         ret = GetFileSizeEx(file, &file_size);
         ok(ret, "failed to get size, error %lu\n", GetLastError());
         ok(file_size.QuadPart == 16384, "got size %I64d\n", file_size.QuadPart);
-        SetFilePointer(file, 16383, NULL, SEEK_SET);
+        SetFilePointer(file, 16383, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(!ret, "expected failure\n");
         ok(GetLastError() == ERROR_USER_MAPPED_FILE, "got error %lu\n", GetLastError());
@@ -6279,7 +6279,7 @@ static void test_eof(void)
         ret = UnmapViewOfFile(view);
         ok(ret, "failed to unmap view, error %lu\n", GetLastError());
-        SetFilePointer(file, 6, NULL, SEEK_SET);
+        SetFilePointer(file, 6, NULL, FILE_BEGIN);
         ret = SetEndOfFile(file);
         ok(ret, "failed to set EOF, error %lu\n", GetLastError());
         ret = GetFileSizeEx(file, &file_size);
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index 9b0f8f6bff2..bf52a3b2e77 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -2272,7 +2272,7 @@ static void test_import_resolution(void)
         WriteFile(hfile, &nt, sizeof(nt), &dummy, NULL);
         WriteFile(hfile, &section, sizeof(section), &dummy, NULL);
-        SetFilePointer( hfile, section.PointerToRawData, NULL, SEEK_SET );
+        SetFilePointer( hfile, section.PointerToRawData, NULL, FILE_BEGIN );
         WriteFile(hfile, &data, sizeof(data), &dummy, NULL);
CloseHandle( hfile );
@@ -4300,7 +4300,7 @@ static void test_ResolveDelayLoadedAPI(void)
     ok(ret, "WriteFile error %ld\n", GetLastError());
/* fill up to delay data */
-    SetFilePointer( hfile, nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress, NULL, SEEK_SET );
+    SetFilePointer( hfile, nt_header.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT].VirtualAddress, NULL, FILE_BEGIN );
/* delay data */
     idd.Attributes.AllAttributes = 1;
@@ -4321,7 +4321,7 @@ static void test_ResolveDelayLoadedAPI(void)
     ok(ret, "WriteFile error %ld\n", GetLastError());
/* fill up to extended delay data */
-    SetFilePointer( hfile, idd.DllNameRVA, NULL, SEEK_SET );
+    SetFilePointer( hfile, idd.DllNameRVA, NULL, FILE_BEGIN );
/* extended delay data */
     SetLastError(0xdeadbeef);
@@ -4336,7 +4336,7 @@ static void test_ResolveDelayLoadedAPI(void)
     ret = WriteFile(hfile, test_func, sizeof(test_func), &dummy, NULL);
     ok(ret, "WriteFile error %ld\n", GetLastError());
-    SetFilePointer( hfile, idd.ImportAddressTableRVA, NULL, SEEK_SET );
+    SetFilePointer( hfile, idd.ImportAddressTableRVA, NULL, FILE_BEGIN );
for (i = 0; i < ARRAY_SIZE(td); i++)
     {
@@ -4369,7 +4369,7 @@ static void test_ResolveDelayLoadedAPI(void)
     ok(ret, "WriteFile error %ld\n", GetLastError());
/* fill up to eof */
-    SetFilePointer( hfile, section.VirtualAddress + section.Misc.VirtualSize, NULL, SEEK_SET );
+    SetFilePointer( hfile, section.VirtualAddress + section.Misc.VirtualSize, NULL, FILE_BEGIN );
     SetEndOfFile( hfile );
     CloseHandle(hfile);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/6989

    

2025

2024

2023

2022

[PATCH 07/12] kernel32/tests: Use correct constants for SetFilePointer().