From 85cafd0c493902b952cc3c9750d25361209c2877 Mon Sep 17 00:00:00 2001 From: winesync Date: Thu, 14 Sep 2023 22:08:41 +0200 Subject: [PATCH] [WINESYNC] setupapi: Fail installation when trying to append to a registry value of the wrong type. wine commit id 0ab56b88dfdca442ab0820eacc14f6397f628924 by Zebediah Figura --- modules/rostests/winetests/setupapi/install.c | 4 ++-- sdk/tools/winesync/setupapi.cfg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rostests/winetests/setupapi/install.c b/modules/rostests/winetests/setupapi/install.c index 0334450dfce..10c93482ece 100644 --- a/modules/rostests/winetests/setupapi/install.c +++ b/modules/rostests/winetests/setupapi/install.c @@ -2376,8 +2376,8 @@ static void test_append_reg(void) ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); - todo_wine ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); size = sizeof(value); l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg index 7374631a08f..7cd29829e08 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: d7c8279c08c25e2afddb33184522386e928d5497 + wine: 0ab56b88dfdca442ab0820eacc14f6397f628924