From d89cb3dc2975e958837a88906418b8d2c993b9d9 Mon Sep 17 00:00:00 2001 From: winesync Date: Thu, 14 Sep 2023 22:08:41 +0200 Subject: [PATCH] [WINESYNC] setupapi/tests: Don't test function directly when reporting GetLastError(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wine commit id 4b09ed1486b4c880c7ed1cbbfd3d9b1335f4d4ab by André Zwing --- modules/rostests/winetests/setupapi/install.c | 6 ++++-- sdk/tools/winesync/setupapi.cfg | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/rostests/winetests/setupapi/install.c b/modules/rostests/winetests/setupapi/install.c index f53740a8824..2bbcbec88dc 100644 --- a/modules/rostests/winetests/setupapi/install.c +++ b/modules/rostests/winetests/setupapi/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"; diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg index 8cc790115da..3b490e409fa 100644 --- a/sdk/tools/winesync/setupapi.cfg +++ b/sdk/tools/winesync/setupapi.cfg @@ -10,4 +10,4 @@ files: dlls/setupapi/setupcab.c: dll/win32/setupapi/setupcab.c dlls/setupapi/stringtable.c: dll/win32/setupapi/stringtable_wine.c tags: - wine: 1172e66e5b7fa96decf89f8866e71b77e5773ec7 + wine: 4b09ed1486b4c880c7ed1cbbfd3d9b1335f4d4ab