oleaut32: If an error info object was created when the invoked method failed…

oleaut32: If an error info object was created when the invoked method failed then fill in exception info from the error info object.

oleaut32: If an error info object was created when the invoked method failed…
e2108fee · Rob Shearman · Alexandre Julliard · cb9c40a8 · e2108fee
Commit e2108fee authored Feb 06, 2007 by Rob Shearman Committed by Alexandre Julliard Feb 06, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

typelib.c dlls/oleaut32/typelib.c +14 -1

No files found.
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5665,7 +5665,20 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
            {
                WARN("invoked function failed with error 0x%08x\n", V_ERROR(&varresult));
                hres = DISP_E_EXCEPTION;
-                if (pExcepInfo) pExcepInfo->scode = V_ERROR(&varresult);
+                if (pExcepInfo)
+                {
+                    IErrorInfo *pErrorInfo;
+                    pExcepInfo->scode = V_ERROR(&varresult);
+                    if (GetErrorInfo(0, &pErrorInfo) == S_OK)
+                    {
+                        IErrorInfo_GetDescription(pErrorInfo, &pExcepInfo->bstrDescription);
+                        IErrorInfo_GetHelpFile(pErrorInfo, &pExcepInfo->bstrHelpFile);
+                        IErrorInfo_GetSource(pErrorInfo, &pExcepInfo->bstrSource);
+                        IErrorInfo_GetHelpContext(pErrorInfo, &pExcepInfo->dwHelpContext);
+
+                        IErrorInfo_Release(pErrorInfo);
+                    }
+                }
            }

 func_fail: