From: Juan Lang <juan.lang@gmail.com>
Date: Fri, 9 Jan 2009 05:06:34 +0000 (-0800)
Subject: cryptui: Fix crash with native riched20.
X-Git-Tag: wine-1.1.13~274
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=e50e78f1cbcb10358c49aa044d63ae9561327482;p=wine%2Feterwine.git

cryptui: Fix crash with native riched20.
---

diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c
index 1abeff4a14..a5fb5808b4 100644
--- a/dlls/cryptui/main.c
+++ b/dlls/cryptui/main.c
@@ -1666,6 +1666,7 @@ static void add_icon_to_control(HWND hwnd, int id)
     HBITMAP bitmap = NULL;
     RECT rect;
     STGMEDIUM stgm;
+    LPOLECLIENTSITE clientSite = NULL;
     REOBJECT reObject;
 
     TRACE("(%p, %d)\n", hwnd, id);
@@ -1693,6 +1694,9 @@ static void add_icon_to_control(HWND hwnd, int id)
         goto end;
     hr = IOleObject_QueryInterface(object, &IID_IDataObject,
      (void**)&dataObject);
+    if (FAILED(hr))
+        goto end;
+    hr = IRichEditOle_GetClientSite(richEditOle, &clientSite);
     if (FAILED(hr))
         goto end;
     bitmap = LoadImageW(hInstance, MAKEINTRESOURCEW(id), IMAGE_BITMAP, 0, 0,
@@ -1714,7 +1718,7 @@ static void add_icon_to_control(HWND hwnd, int id)
     reObject.clsid = clsid;
     reObject.poleobj = object;
     reObject.pstg = NULL;
-    reObject.polesite = NULL;
+    reObject.polesite = clientSite;
     reObject.sizel.cx = reObject.sizel.cy = 0;
     reObject.dvaspect = DVASPECT_CONTENT;
     reObject.dwFlags = 0;
@@ -1723,6 +1727,8 @@ static void add_icon_to_control(HWND hwnd, int id)
     IRichEditOle_InsertObject(richEditOle, &reObject);
 
 end:
+    if (clientSite)
+        IOleClientSite_Release(clientSite);
     if (dataObject)
         IDataObject_Release(dataObject);
     if (oleCache)