[PATCH 0/1] MR4198: mf/tests: Test hr before checking propvar.pwszVal.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=55588

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

[PATCH 1/1] mf/tests: Test hr before checking propvar.pwszVal.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=55588
---
 dlls/mf/tests/mf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index aefc1b92b4d..428ef00490e 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -6485,8 +6485,8 @@ static void test_scheme_resolvers(void)
         PropVariantInit(&propvar);
         hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, &propvar);
         ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "got hr %#lx\n", hr);
-        ok(!wcsncmp(expect_domain[i], propvar.pwszVal, wcslen(expect_domain[i]))
-                || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */,
+        ok(broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */
+                || !wcsncmp(expect_domain[i], propvar.pwszVal, wcslen(expect_domain[i])),
                 "got url %s\n", debugstr_w(propvar.pwszVal));
         hr = PropVariantClear(&propvar);
         ok(hr == S_OK, "got hr %#lx\n", hr);
-- 
GitLab

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

[Nikolay Sivov (＠nsivov)]

That's fine, but a lot of times we make it more explicit and conditionally check values on success, instead of relying on one side not being evaluated.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4198#note_49958

[PATCH 0/1] MR4198: mf/tests: Test hr before checking propvar.pwszVal. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4198