ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

riched20: Don't create a special richedit ole instance for the RTF parser. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2017-08-21 12:31:47 +01:00 committed by Alexandre Julliard
parent 1bc48be4a7
commit 417c80d6fe
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/riched20/editor.c
View File

@ -1122,7 +1122,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info)
} }
} }
static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbmp, static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HBITMAP hbmp,
const SIZEL* sz) const SIZEL* sz)
{ {
LPOLEOBJECT lpObject = NULL; LPOLEOBJECT lpObject = NULL;
@ -1133,7 +1133,7 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm
STGMEDIUM stgm; STGMEDIUM stgm;
FORMATETC fm; FORMATETC fm;
CLSID clsid; CLSID clsid;
BOOL ret = FALSE; HRESULT hr = E_FAIL;
DWORD conn; DWORD conn;
if (hemf) if (hemf)
@ -1155,13 +1155,14 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm
fm.lindex = -1; fm.lindex = -1;
fm.tymed = stgm.tymed; fm.tymed = stgm.tymed;
if (!info->lpRichEditOle) if (!editor->reOle)
{ {
CreateIRichEditOle(NULL, info->editor, (VOID**)&info->lpRichEditOle); if (!CreateIRichEditOle(NULL, editor, (LPVOID *)&editor->reOle))
return hr;
} }
if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK &&
IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && IRichEditOle_GetClientSite(editor->reOle, &lpClientSite) == S_OK &&
IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK &&
IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && IOleObject_GetUserClassID(lpObject, &clsid) == S_OK &&
IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK &&
@ -1184,8 +1185,8 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm
reobject.dwFlags = 0; /* FIXME */ reobject.dwFlags = 0; /* FIXME */
reobject.dwUser = 0; reobject.dwUser = 0;
ME_InsertOLEFromCursor(info->editor, &reobject, 0); ME_InsertOLEFromCursor(editor, &reobject, 0);
ret = TRUE; hr = S_OK;
} }
if (lpObject) IOleObject_Release(lpObject); if (lpObject) IOleObject_Release(lpObject);
@ -1194,7 +1195,7 @@ static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE hemf, HBITMAP hbm
if (lpDataObject) IDataObject_Release(lpDataObject); if (lpDataObject) IDataObject_Release(lpDataObject);
if (lpOleCache) IOleCache_Release(lpOleCache); if (lpOleCache) IOleCache_Release(lpOleCache);
return ret; return hr;
} }
static void ME_RTFReadShpPictGroup( RTF_Info *info ) static void ME_RTFReadShpPictGroup( RTF_Info *info )
@ -1353,11 +1354,11 @@ static void ME_RTFReadPictGroup(RTF_Info *info)
{ {
case gfx_enhmetafile: case gfx_enhmetafile:
if ((hemf = SetEnhMetaFileBits( size, buffer ))) if ((hemf = SetEnhMetaFileBits( size, buffer )))
ME_RTFInsertOleObject( info, hemf, NULL, &sz ); insert_static_object( info->editor, hemf, NULL, &sz );
break; break;
case gfx_metafile: case gfx_metafile:
if ((hemf = SetWinMetaFileBits( size, buffer, NULL, &mfp ))) if ((hemf = SetWinMetaFileBits( size, buffer, NULL, &mfp )))
ME_RTFInsertOleObject( info, hemf, NULL, &sz ); insert_static_object( info->editor, hemf, NULL, &sz );
break; break;
case gfx_dib: case gfx_dib:
{ {
@ -1371,7 +1372,7 @@ static void ME_RTFReadPictGroup(RTF_Info *info)
if ((hbmp = CreateDIBitmap( hdc, &bi->bmiHeader, if ((hbmp = CreateDIBitmap( hdc, &bi->bmiHeader,
CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD), CBM_INIT, (char*)(bi + 1) + nc * sizeof(RGBQUAD),
bi, DIB_RGB_COLORS)) ) bi, DIB_RGB_COLORS)) )
ME_RTFInsertOleObject( info, NULL, hbmp, &sz ); insert_static_object( info->editor, NULL, hbmp, &sz );
ReleaseDC( 0, hdc ); ReleaseDC( 0, hdc );
break; break;
} }
@ -1727,8 +1728,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
} }
ME_CheckTablesForCorruption(editor); ME_CheckTablesForCorruption(editor);
RTFDestroy(&parser); RTFDestroy(&parser);
if (parser.lpRichEditOle)
IRichEditOle_Release(parser.lpRichEditOle);
if (parser.stackTop > 0) if (parser.stackTop > 0)
{ {

1
dlls/riched20/rtf.h
View File

@ -1175,7 +1175,6 @@ struct _RTF_Info {
RTFState stack[maxStack]; RTFState stack[maxStack];
int stackTop; int stackTop;
BOOL styleChanged; BOOL styleChanged;
LPRICHEDITOLE lpRichEditOle;
RTFTable *tableDef; RTFTable *tableDef;
int nestingLevel; int nestingLevel;