Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-28 01:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

sync riched20 with wine 1.1.12

Browse source 
svn path=/trunk/; revision=38558
This commit is contained in:
Christoph von Wittich 2009-01-04 11:42:09 +00:00
parent 7d6f7e3e2f
commit e346ebb655
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/riched20/editor.c
View file

@ -1616,7 +1616,7 @@ ME_StreamInRTFString(ME_TextEditor *editor, BOOL selection, char *string)
data.string = string; data.string = string;
data.length = strlen(string); data.length = strlen(string);
data.pos = 0; data.pos = 0;
es.dwCookie = (DWORD)&data; es.dwCookie = (DWORD_PTR)&data;
es.pfnCallback = ME_ReadFromRTFString; es.pfnCallback = ME_ReadFromRTFString;
ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE);
} }
@ -2065,7 +2065,7 @@ static BOOL ME_Paste(ME_TextEditor *editor)
return FALSE; return FALSE;
gds.hData = GetClipboardData(cf); gds.hData = GetClipboardData(cf);
gds.nLength = 0; gds.nLength = 0;
es.dwCookie = (DWORD)&gds; es.dwCookie = (DWORD_PTR)&gds;
es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode;
ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE);
@ -2685,6 +2685,7 @@ void ME_DestroyEditor(ME_TextEditor *editor)
DeleteObject(editor->hbrBackground); DeleteObject(editor->hbrBackground);
if(editor->lpOleCallback) if(editor->lpOleCallback)
IUnknown_Release(editor->lpOleCallback); IUnknown_Release(editor->lpOleCallback);
SetWindowLongPtrW(editor->hWnd, 0, 0);
OleUninitialize(); OleUninitialize();
FREE_OBJ(editor->pBuffer); FREE_OBJ(editor->pBuffer);
@ -3821,7 +3822,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
} }
case WM_DESTROY: case WM_DESTROY:
ME_DestroyEditor(editor); ME_DestroyEditor(editor);
SetWindowLongPtrW(editor->hWnd, 0, 0);
return 0; return 0;
case WM_SETCURSOR: case WM_SETCURSOR:
{ {

5
reactos/dll/win32/riched20/table.c
View file

@ -54,8 +54,7 @@
#include "editor.h" #include "editor.h"
#include "rtf.h" #include "rtf.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists);
WINE_DECLARE_DEBUG_CHANNEL(richedit_lists);
static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor,
int nCursor, int nCursor,
@ -176,7 +175,7 @@ void ME_CheckTablesForCorruption(ME_TextEditor *editor)
{ {
if(TRACE_ON(richedit_lists)) if(TRACE_ON(richedit_lists))
{ {
TRACE_(richedit_lists)("---\n"); TRACE("---\n");
ME_DumpDocument(editor->pBuffer); ME_DumpDocument(editor->pBuffer);
} }
#ifndef NDEBUG #ifndef NDEBUG