Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetDocumentation.

Alexandre Julliard julliard at winehq.org
Wed Dec 11 16:35:07 CST 2019


Module: wine
Branch: master
Commit: 0fee1c759bddf174b06537d9774953dba56803fa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0fee1c759bddf174b06537d9774953dba56803fa

Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date:   Wed Dec 11 18:19:40 2019 +0100

vbscript: Implement ScriptTypeInfo_GetDocumentation.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/vbscript/vbdisp.c | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index a6436125a3..94c68733cc 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -891,10 +891,46 @@ static HRESULT WINAPI ScriptTypeInfo_GetDocumentation(ITypeInfo *iface, MEMBERID
         BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile)
 {
     ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface);
+    ITypeInfo *disp_typeinfo;
+    function_t *func;
+    HRESULT hr;
 
-    FIXME("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
+    TRACE("(%p)->(%d %p %p %p %p)\n", This, memid, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile);
 
-    return E_NOTIMPL;
+    if (pBstrDocString) *pBstrDocString = NULL;
+    if (pdwHelpContext) *pdwHelpContext = 0;
+    if (pBstrHelpFile) *pBstrHelpFile = NULL;
+
+    if (memid == MEMBERID_NIL)
+    {
+        if (pBstrName && !(*pBstrName = SysAllocString(L"VBScriptTypeInfo")))
+            return E_OUTOFMEMORY;
+        if (pBstrDocString &&
+            !(*pBstrDocString = SysAllocString(L"Visual Basic Scripting Type Info")))
+        {
+            if (pBstrName) SysFreeString(*pBstrName);
+            return E_OUTOFMEMORY;
+        }
+        return S_OK;
+    }
+    if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND;
+
+    func = get_func_from_memid(This, memid);
+    if (!func && memid > This->num_vars)
+    {
+        hr = get_dispatch_typeinfo(&disp_typeinfo);
+        if (FAILED(hr)) return hr;
+
+        return ITypeInfo_GetDocumentation(disp_typeinfo, memid, pBstrName, pBstrDocString,
+                                          pdwHelpContext, pBstrHelpFile);
+    }
+
+    if (pBstrName)
+    {
+        *pBstrName = SysAllocString(func ? func->name : This->disp->global_vars[memid - 1]->name);
+        if (!*pBstrName) return E_OUTOFMEMORY;
+    }
+    return S_OK;
 }
 
 static HRESULT WINAPI ScriptTypeInfo_GetDllEntry(ITypeInfo *iface, MEMBERID memid, INVOKEKIND invKind,




More information about the wine-cvs mailing list