[PATCH 0/3] MR1891: Gle fixes

[PATCH 1/3] advapi32/tests: Don't test function directly when reporting GetLastError()

[André Zwing]

From: André Zwing

---
 dlls/advapi32/tests/registry.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index b4f0398b358..480e96ef6ee 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -1672,7 +1672,8 @@ static void test_reg_load_app_key(void)
     RegCloseKey(appkey);

wait_file_available(hivefilepath);
-    ok(DeleteFileA(hivefilepath), "couldn't delete hive file %ld\n", GetLastError());
+    ret = DeleteFileA(hivefilepath);
+    ok(ret, "couldn't delete hive file %ld\n", GetLastError());
 }

/* tests that show that RegConnectRegistry and

[PATCH 2/3] kernel32/tests: Don't test function directly when reporting GetLastError()

[André Zwing]

From: André Zwing

---
 dlls/kernel32/tests/virtual.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index 644c060c66f..c54fb16ba15 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -4224,6 +4224,7 @@ static void test_PrefetchVirtualMemory(void)
     char stackmem[] = "Test stack mem";
     static char testmem[] = "Test memory range data";
     unsigned int page_size = si.dwPageSize;
+    BOOL ret;

if (!pPrefetchVirtualMemory)
     {
@@ -4236,28 +4237,28 @@ static void test_PrefetchVirtualMemory(void)

entries[0].VirtualAddress = ULongToPtr(PtrToUlong(testmem) & -(ULONG_PTR)page_size);
     entries[0].NumberOfBytes = page_size;
-    ok( pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ) ||
-        broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
+    ret = pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 );
+    ok( ret || broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
         "PrefetchVirtualMemory unexpected status on 1 page-aligned entry: %ld\n", GetLastError() );

entries[0].VirtualAddress = testmem;
     entries[0].NumberOfBytes = sizeof(testmem);
-    ok( pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ) ||
-        broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
+    ret = pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 );
+    ok( ret || broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
         "PrefetchVirtualMemory unexpected status on 1 entry: %ld\n", GetLastError() );

entries[0].VirtualAddress = NULL;
     entries[0].NumberOfBytes = page_size;
-    ok( pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 ) ||
-        broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
+    ret = pPrefetchVirtualMemory( GetCurrentProcess(), 1, entries, 0 );
+    ok( ret ||broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
         "PrefetchVirtualMemory unexpected status on 1 unmapped entry: %ld\n", GetLastError() );

entries[0].VirtualAddress = ULongToPtr(PtrToUlong(testmem) & -(ULONG_PTR)page_size);
     entries[0].NumberOfBytes = page_size;
     entries[1].VirtualAddress = ULongToPtr(PtrToUlong(stackmem) & -(ULONG_PTR)page_size);
     entries[1].NumberOfBytes = page_size;
-    ok( pPrefetchVirtualMemory( GetCurrentProcess(), 2, entries, 0 ) ||
-        broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
+    ret = pPrefetchVirtualMemory( GetCurrentProcess(), 2, entries, 0 );
+    ok( ret ||broken( is_wow64 && GetLastError() == ERROR_INVALID_PARAMETER ) /* win10 1507 */,
         "PrefetchVirtualMemory unexpected status on 2 page-aligned entries: %ld\n", GetLastError() );
 }

[PATCH 3/3] setupapi/tests: Don't test function directly when reporting GetLastError()

[André Zwing]

From: André Zwing

---
 dlls/setupapi/tests/install.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index f53740a8824..2bbcbec88dc 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -2291,8 +2291,10 @@ static void test_rename(void)
     ok(delete_file("a/six.txt"), "File should exist.\n");
     SetupCloseFileQueue(queue);

-    ok(delete_file("a/"), "Failed to delete directory, error %lu.\n", GetLastError());
-    ok(delete_file("b/"), "Failed to delete directory, error %lu.\n", GetLastError());
+    ret = delete_file("a/");
+    ok(ret, "Failed to delete directory, error %lu.\n", GetLastError());
+    ret = delete_file("b/");
+    ok(ret, "Failed to delete directory, error %lu.\n", GetLastError());
 }

static WCHAR service_name[] = L"Wine Test Service";