Commit 2142bde3 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

oleaut32: Add support for best version argument in LoadRegTypeLib.

parent dcd9b8ea
...@@ -5676,6 +5676,20 @@ static void test_LoadRegTypeLib(void) ...@@ -5676,6 +5676,20 @@ static void test_LoadRegTypeLib(void)
hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl); hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 7, LOCALE_NEUTRAL, &tl);
ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr); ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr);
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);
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);
DeleteFileA("test_actctx_tlb.tlb"); DeleteFileA("test_actctx_tlb.tlb");
DeleteFileA("test_actctx_tlb2.tlb"); DeleteFileA("test_actctx_tlb2.tlb");
......
...@@ -536,7 +536,7 @@ HRESULT WINAPI LoadRegTypeLib( ...@@ -536,7 +536,7 @@ HRESULT WINAPI LoadRegTypeLib(
res= LoadTypeLib(bstr, ppTLib); res= LoadTypeLib(bstr, ppTLib);
SysFreeString(bstr); SysFreeString(bstr);
if (*ppTLib) if ((wVerMajor!=0xffff || wVerMinor!=0xffff) && *ppTLib)
{ {
TLIBATTR *attr; TLIBATTR *attr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment