Implementation of ICreateTypeInfo2_SetHelpContext,

ICreateTypeInfo2_SetTypeDescAlias, ITypeLib2_GetTypeInfoCount, ITypeLib2_GetTypeInfoType, and ITypeLib2_IsName. Fix to ICreateTypeInfo2_SetVarName to fix a case where multiple instances of the same name are used in the same typelib.

Implementation of ICreateTypeInfo2_SetHelpContext,
04e4f3ca · Alastair Bridgewater · Alexandre Julliard · 6e500f65 · 04e4f3ca
Commit 04e4f3ca authored Mar 15, 2004 by Alastair Bridgewater Committed by Alexandre Julliard Mar 15, 2004
Show whitespace changes
Inline Side-by-side

Showing with 61 additions and 13 deletions

typelib2.c dlls/oleaut32/typelib2.c +61 -13

No files found.
--- a/dlls/oleaut32/typelib2.c
+++ b/dlls/oleaut32/typelib2.c
@@ -1283,8 +1283,13 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext(
        ICreateTypeInfo2* iface,
        DWORD dwHelpContext)
 {
-    FIXME("(%p,%ld), stub!\n", iface, dwHelpContext);
-    return E_OUTOFMEMORY;
+    ICOM_THIS(ICreateTypeInfo2Impl, iface);
+
+    TRACE("(%p,%ld)\n", iface, dwHelpContext);
+
+    This->typeinfo->helpcontext = dwHelpContext;
+
+    return S_OK;
 }

 /******************************************************************************
@@ -1742,8 +1747,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName(
    if (offset == -1) return E_OUTOFMEMORY;

    namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset;
+    if (*((INT *)namedata) == -1) {
 	*((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16];
-    namedata[9] = 0x10;
+	namedata[9] |= 0x10;
+    }
    if ((This->typeinfo->typekind & 15) == TKIND_ENUM) {
 	namedata[9] |= 0x20;
    }
@@ -1761,8 +1768,25 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias(
        ICreateTypeInfo2* iface,
        TYPEDESC* pTDescAlias)
 {
-    FIXME("(%p,%p), stub!\n", iface, pTDescAlias);
+    ICOM_THIS(ICreateTypeInfo2Impl, iface);
+
+    int encoded_typedesc;
+    int width;
+
+    if ((This->typeinfo->typekind & 15) != TKIND_ALIAS) {
+	return TYPE_E_WRONGTYPEKIND;
+    }
+
+    FIXME("(%p,%p), hack!\n", iface, pTDescAlias);
+
+    if (ctl2_encode_typedesc(This->typelib, pTDescAlias, &encoded_typedesc, &width, NULL, NULL) == -1) {
 	return E_OUTOFMEMORY;
+    }
+
+    This->typeinfo->size = width;
+    This->typeinfo->datatype1 = encoded_typedesc;
+
+    return S_OK;
 }

 /******************************************************************************
@@ -3440,11 +3464,11 @@ static ULONG WINAPI ITypeLib2_fnRelease(ITypeLib2 * iface)
 static UINT WINAPI ITypeLib2_fnGetTypeInfoCount(
        ITypeLib2 * iface)
 {
-/*     ICOM_THIS_From_ITypeLib2(ICreateTypeLib2Impl, iface); */
+    ICOM_THIS_From_ITypeLib2(ICreateTypeLib2Impl, iface);

-    FIXME("(%p), stub!\n", iface);
+    TRACE("(%p)\n", iface);

-    return 0;
+    return This->typelib_header.nrtypeinfos;
 }

 /******************************************************************************
@@ -3478,11 +3502,17 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType(
        UINT index,
        TYPEKIND* pTKind)
 {
-/*     ICOM_THIS_From_ITypeLib2(ICreateTypeLib2Impl, iface); */
+    ICOM_THIS_From_ITypeLib2(ICreateTypeLib2Impl, iface);

-    FIXME("(%p,%d,%p), stub!\n", iface, index, pTKind);
+    TRACE("(%p,%d,%p)\n", iface, index, pTKind);

-    return E_OUTOFMEMORY;
+    if ((index < 0) || (index >= This->typelib_header.nrtypeinfos)) {
+	return TYPE_E_ELEMENTNOTFOUND;
+    }
+
+    *pTKind = (This->typelib_segment_data[MSFT_SEG_TYPEINFO][This->typelib_typeinfo_offsets[index]]) & 15;
+
+    return S_OK;
 }

 /******************************************************************************
@@ -3574,11 +3604,29 @@ static HRESULT WINAPI ITypeLib2_fnIsName(
        ULONG lHashVal,
        BOOL* pfName)
 {
-/*     ICOM_THIS_From_ITypeLib2(ICreateTypeLib2Impl, iface); */
+    ICOM_THIS_From_ITypeLib2(ICreateTypeLib2Impl, iface);

-    FIXME("(%p,%s,%lx,%p), stub!\n", iface, debugstr_w(szNameBuf), lHashVal, pfName);
+    char *encoded_name;
+    int nameoffset;
+    MSFT_NameIntro *nameintro;

-    return E_OUTOFMEMORY;
+    TRACE("(%p,%s,%lx,%p)\n", iface, debugstr_w(szNameBuf), lHashVal, pfName);
+
+    ctl2_encode_name(This, szNameBuf, &encoded_name);
+    nameoffset = ctl2_find_name(This, encoded_name);
+
+    *pfName = 0;
+
+    if (nameoffset == -1) return S_OK;
+
+    nameintro = (MSFT_NameIntro *)(&This->typelib_segment_data[MSFT_SEG_NAME][nameoffset]);
+    if (nameintro->hreftype == -1) return S_OK;
+
+    *pfName = 1;
+
+    FIXME("Should be decoding our copy of the name over szNameBuf.\n");
+
+    return S_OK;
 }

 /******************************************************************************