[PATCH 0/2] MR7726: Don't test function directly when reporting GetLastError()

[André Zwing]

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

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

[André Zwing]

From: André Zwing <nerv(a)dawncrow.de>

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

diff --git a/dlls/bluetoothapis/tests/device.c b/dlls/bluetoothapis/tests/device.c
index ef79913f558..a6ee6c6f1d5 100644
--- a/dlls/bluetoothapis/tests/device.c
+++ b/dlls/bluetoothapis/tests/device.c
@@ -171,7 +171,8 @@ void test_radio_BluetoothFindNextDevice( HANDLE radio, void *data )
             break;
     }
 
-    ok( BluetoothFindDeviceClose( hfind ), "BluetoothFindDeviceClose failed: %lu\n", GetLastError() );
+    success = BluetoothFindDeviceClose( hfind );
+    ok( success, "BluetoothFindDeviceClose failed: %lu\n", GetLastError() );
 }
 
 void test_BluetoothFindNextDevice( void )
-- 
GitLab


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

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

[André Zwing]

From: André Zwing <nerv(a)dawncrow.de>

---
 dlls/kernel32/tests/file.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 38c68297097..cf0c40d5cd6 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -3343,6 +3343,8 @@ static void test_async_file_errors(void)
     HANDLE hFile;
     LPVOID lpBuffer = HeapAlloc(GetProcessHeap(), 0, 4096);
     OVERLAPPED ovl;
+    BOOL res;
+
     ovl.Offset = 0;
     ovl.OffsetHigh = 0;
     ovl.hEvent = hSem;
@@ -3358,7 +3360,6 @@ static void test_async_file_errors(void)
     ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA(%s ...) failed\n", szFile);
     while (TRUE)
     {
-        BOOL res;
         DWORD count;
         while (WaitForSingleObjectEx(hSem, INFINITE, TRUE) == WAIT_IO_COMPLETION)
             ;
@@ -3378,8 +3379,10 @@ static void test_async_file_errors(void)
     /*printf("Error = %ld\n", GetLastError());*/
 
     SleepEx(0, TRUE); /* Flush pending APCs */
-    ok(CloseHandle(hFile), "CloseHandle: error %ld\n", GetLastError());
-    ok(CloseHandle(hSem), "CloseHandle: error %ld\n", GetLastError());
+    res = CloseHandle(hFile);
+    ok(res, "CloseHandle: error %ld\n", GetLastError());
+    res = CloseHandle(hSem);
+    ok(res, "CloseHandle: error %ld\n", GetLastError());
     HeapFree(GetProcessHeap(), 0, lpBuffer);
 }
 
-- 
GitLab

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