[Wine-patches] mshtml: Fix crashes in html (eterbug #2405)

[Konstantin Kondratyuk]

-- 
Best regards,
Konstantin Kondratyuk.
----------- следующая часть -----------
From 916cccf273f303e67061e3fd68ecb449d2544483 Mon Sep 17 00:00:00 2001
From: Konstantin Kondratyuk <kondratyuk на etersoft.ru>
Date: Wed, 3 Dec 2008 20:19:49 +0300
Subject: [PATCH] mshtml: Fix crashes in html (eterbug #2405)

---
 dlls/mshtml/oleobj.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index 6fd52e7..e7fcfe4 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -766,19 +766,23 @@ static ULONG WINAPI Info_Release(IProvideClassInfo* iface)
 static HRESULT WINAPI Info_GetClassInfo(IProvideClassInfo* iface, ITypeInfo **ppTI)
 {
     HTMLDocument *This = INFO_THIS(iface);
-    FIXME("(%p)->(%p)\n", This, ppTI);
+    HRESULT hres;
 
- /*   HRESULT hres;
+    TRACE("(%p)->(%p)\n", This, ppTI);
 
     hres = IDispatchEx_GetTypeInfo(DISPATCHEX(This), 0, 0, ppTI);
     if (FAILED(hres)) {
-        FIXME("ERROR hres = %08x", hres);
+        FIXME("ERROR hres = %08x\n", hres);
+        return E_FAIL;
     }
-    ITypeInfo_AddRef(*ppTI);*/
+    TRACE("returning %p\n",*ppTI);
+    ITypeInfo_AddRef(*ppTI);
 
-    /*WRONG, BUT FIX BUG #1994*/
+#if 0
+    /* Hack for #1994 - use in WINE School only */
     *ppTI = (ITypeInfo*)HTMLDOC(This);
     ITypeInfo_AddRef(*ppTI);
+#endif
 
     return S_OK;
 }
-- 
1.6.0.2.GIT