[PATCH] oleaut32/tests: Fix a test crash on some XP SP1 VM
Nikolay Sivov
nsivov at codeweavers.com
Wed Mar 23 05:06:37 CDT 2016
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/oleaut32/tests/typelib.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index fcce92e..b795d52 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -5710,19 +5710,23 @@ static void test_LoadRegTypeLib(void)
hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl);
ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr);
+ tl = NULL;
hr = LoadRegTypeLib(&LIBID_TestTypelib, 0xffff, 0xffff, LOCALE_NEUTRAL, &tl);
ok(hr == S_OK, "got 0x%08x\n", hr);
- hr = ITypeLib_GetLibAttr(tl, &attr);
- ok(hr == S_OK, "got 0x%08x\n", hr);
+ if (tl)
+ {
+ hr = ITypeLib_GetLibAttr(tl, &attr);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
- ok(attr->lcid == 0, "got %x\n", attr->lcid);
- ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum);
- ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum);
- ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags);
+ ok(attr->lcid == 0, "got %x\n", attr->lcid);
+ ok(attr->wMajorVerNum == 2, "got %d\n", attr->wMajorVerNum);
+ ok(attr->wMinorVerNum == 5, "got %d\n", attr->wMinorVerNum);
+ ok(attr->wLibFlags == LIBFLAG_FHASDISKIMAGE, "got %x\n", attr->wLibFlags);
- ITypeLib_ReleaseTLibAttr(tl, attr);
- ITypeLib_Release(tl);
+ ITypeLib_ReleaseTLibAttr(tl, attr);
+ ITypeLib_Release(tl);
+ }
DeleteFileA("test_actctx_tlb.tlb");
DeleteFileA("test_actctx_tlb2.tlb");
--
2.7.0
More information about the wine-patches
mailing list