[PATCH v2 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

--
  v2: mf/tests: Avoid crashing if MF_BYTESTREAM_EFFECTIVE_URL is missing.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4198

[PATCH v2 1/1] mf/tests: Avoid crashing if MF_BYTESTREAM_EFFECTIVE_URL is missing.

[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 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c
index aefc1b92b4d..18c97b93593 100644
--- a/dlls/mf/tests/mf.c
+++ b/dlls/mf/tests/mf.c
@@ -6485,9 +6485,11 @@ 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 */,
-                "got url %s\n", debugstr_w(propvar.pwszVal));
+        if (hr == S_OK)
+        {
+            ok(!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

[Rémi Bernon]

You're right, I changed it to a more explicit logic. I missed that the hr was already checked in the previous line.

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