Nikolay Sivov : oleaut32: LoadRegTypeLib() should check actual typelib version.
Alexandre Julliard
julliard at winehq.org
Tue Sep 24 15:16:48 CDT 2013
Module: wine
Branch: master
Commit: 1c23b501f75f7ae508851800df251c585492dc5f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c23b501f75f7ae508851800df251c585492dc5f
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Sep 24 12:27:02 2013 +0400
oleaut32: LoadRegTypeLib() should check actual typelib version.
---
dlls/oleaut32/tests/typelib.c | 27 +++++++++++++++++++++++++--
dlls/oleaut32/typelib.c | 14 ++++++++++++++
2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index 2966e9a..7f92051 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -4734,7 +4734,6 @@ static void test_LoadRegTypeLib(void)
if (hr == S_OK) ITypeLib_Release(tl);
hr = LoadRegTypeLib(&LIBID_register_test, 2, 0, LOCALE_NEUTRAL, &tl);
-todo_wine
ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr);
/* manifest version is 2.7, actual is 2.5 */
@@ -4755,7 +4754,6 @@ todo_wine
if (hr == S_OK) ITypeLib_Release(tl);
hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 7, LOCALE_NEUTRAL, &tl);
-todo_wine
ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr);
hr = LoadRegTypeLib(&LIBID_TestTypelib, 2, 5, LOCALE_NEUTRAL, &tl);
@@ -5025,6 +5023,30 @@ static void test_SetTypeDescAlias(SYSKIND kind)
DeleteFileA(filenameA);
}
+static void test_GetLibAttr(void)
+{
+ ULONG ref1, ref2;
+ TLIBATTR *attr;
+ ITypeLib *tl;
+ HRESULT hr;
+
+ hr = LoadTypeLib(wszStdOle2, &tl);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ ref1 = ITypeLib_AddRef(tl);
+ ITypeLib_Release(tl);
+
+ hr = ITypeLib_GetLibAttr(tl, &attr);
+ ok(hr == S_OK, "got 0x%08x\n", hr);
+
+ ref2 = ITypeLib_AddRef(tl);
+ ITypeLib_Release(tl);
+ ok(ref2 == ref1, "got %d, %d\n", ref2, ref1);
+
+ ITypeLib_ReleaseTLibAttr(tl, attr);
+ ITypeLib_Release(tl);
+}
+
START_TEST(typelib)
{
const char *filename;
@@ -5062,4 +5084,5 @@ START_TEST(typelib)
test_LoadTypeLib();
test_TypeInfo2_GetContainingTypeLib();
test_LoadRegTypeLib();
+ test_GetLibAttr();
}
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 616445a..c77bc62 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -536,6 +536,20 @@ HRESULT WINAPI LoadRegTypeLib(
{
res= LoadTypeLib(bstr, ppTLib);
SysFreeString(bstr);
+
+ if (*ppTLib)
+ {
+ TLIBATTR *attr;
+
+ res = ITypeLib_GetLibAttr(*ppTLib, &attr);
+ if (res == S_OK && (attr->wMajorVerNum != wVerMajor || attr->wMinorVerNum < wVerMinor))
+ {
+ ITypeLib_ReleaseTLibAttr(*ppTLib, attr);
+ ITypeLib_Release(*ppTLib);
+ *ppTLib = NULL;
+ res = TYPE_E_LIBNOTREGISTERED;
+ }
+ }
}
TRACE("(IID: %s) load %s (%p)\n",debugstr_guid(rguid), SUCCEEDED(res)? "SUCCESS":"FAILED", *ppTLib);
More information about the wine-cvs
mailing list