[PATCH 02/13] oleaut32/tests: Fix expect_wstr_acpval(...,NULL).

Puetz Kevin A PuetzKevinA at JohnDeere.com
Thu Aug 6 23:08:36 CDT 2020


A NULL expected value is always a test failure, but printing
the unexpected "wrong" value is more helpful than crashing.

Signed-off-by: Kevin Puetz <PuetzKevinA at JohnDeere.com>
---
I hit this when I had broken the info[] generator, which is of course
fixed, but but it seems worth fixing to not just crash
(strcmp doesn't like NULL)
---
 dlls/oleaut32/tests/typelib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index 3d5aeb0a26..6f68a201ba 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -53,7 +53,7 @@
     { \
         CHAR buf[260]; \
         expect_eq(!WideCharToMultiByte(CP_ACP, 0, (expr), -1, buf, 260, NULL, NULL), 0, int, "%d"); \
-        ok(strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \
+        ok(value && strcmp(value, buf) == 0, #expr " expected \"%s\" got \"%s\"\n", value, buf); \
     }
 
 #define ole_expect(expr, expect) { \



More information about the wine-devel mailing list