[PATCH] devenum/tests: Accept ERROR_KEY_DOES_NOT_EXIST from IPropertyBag_Read [v2]

Detlef Riekenberg wine.dev at web.de
Wed Mar 20 02:44:10 CDT 2019


Fixes test failures on windows 8.1

Example failures:
http://test.winehq.org/data/3e61c7127ed7eb764a8b308fd8897cbc26a93a4a/win8_cw1-hd6800-t64/devenum:devenum.html

http://test.winehq.org/data/3e61c7127ed7eb764a8b308fd8897cbc26a93a4a/win8_dr-RS740-wow/devenum:devenum.html

v2:
Add missing include

Sorry for the previous broken version.

--
bye bye ...
        ... Detlef

Signed-off-by: Detlef Riekenberg <wine.dev at web.de>
---
 dlls/devenum/tests/devenum.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c
index e31f65c653..9fcfdcf316 100644
--- a/dlls/devenum/tests/devenum.c
+++ b/dlls/devenum/tests/devenum.c
@@ -33,6 +33,7 @@
 #include "mmddk.h"
 #include "vfw.h"
 #include "dmoreg.h"
+#include "setupapi.h"

 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

@@ -122,7 +123,8 @@ static void test_devenum(IBindCtx *bind_ctx)
                 ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr);

                 hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL);
-                ok(hr == S_OK, "IPropertyBag_Read failed: %#x\n", hr);
+                ok((hr == S_OK) | (hr == ERROR_KEY_DOES_NOT_EXIST),
+					"IPropertyBag_Read failed: %#x\n", hr);

                 if (winetest_debug > 1)
                     trace("  %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var)));
--
2.21.0.windows.1




More information about the wine-devel mailing list