Author: cwittich Date: Sun Jan 4 05:42:09 2009 New Revision: 38558
URL: http://svn.reactos.org/svn/reactos?rev=38558&view=rev Log: sync riched20 with wine 1.1.12
Modified: trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/table.c
Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.c... ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Jan 4 05:42:09 2009 @@ -1616,7 +1616,7 @@ data.string = string; data.length = strlen(string); data.pos = 0; - es.dwCookie = (DWORD)&data; + es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); } @@ -2065,7 +2065,7 @@ return FALSE; gds.hData = GetClipboardData(cf); gds.nLength = 0; - es.dwCookie = (DWORD)&gds; + es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE);
@@ -2685,6 +2685,7 @@ DeleteObject(editor->hbrBackground); if(editor->lpOleCallback) IUnknown_Release(editor->lpOleCallback); + SetWindowLongPtrW(editor->hWnd, 0, 0); OleUninitialize();
FREE_OBJ(editor->pBuffer); @@ -3821,7 +3822,6 @@ } case WM_DESTROY: ME_DestroyEditor(editor); - SetWindowLongPtrW(editor->hWnd, 0, 0); return 0; case WM_SETCURSOR: {
Modified: trunk/reactos/dll/win32/riched20/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/table.c?... ============================================================================== --- trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/table.c [iso-8859-1] Sun Jan 4 05:42:09 2009 @@ -54,8 +54,7 @@ #include "editor.h" #include "rtf.h"
-WINE_DEFAULT_DEBUG_CHANNEL(richedit); -WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); +WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists);
static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, int nCursor, @@ -176,7 +175,7 @@ { if(TRACE_ON(richedit_lists)) { - TRACE_(richedit_lists)("---\n"); + TRACE("---\n"); ME_DumpDocument(editor->pBuffer); } #ifndef NDEBUG