Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:03:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RICHED20] Sync with Wine Staging 1.9.4. CORE-10912

Browse source 
svn path=/trunk/; revision=70923
This commit is contained in:
Amine Khaldi 2016-03-05 09:57:50 +00:00
parent 53f7b483b5
commit 465363dbbd
4 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -544,6 +544,7 @@ void ME_RTFParAttrHook(RTF_Info *info)
PARAFORMAT2 fmt; PARAFORMAT2 fmt;
fmt.cbSize = sizeof(fmt); fmt.cbSize = sizeof(fmt);
fmt.dwMask = 0; fmt.dwMask = 0;
fmt.wEffects = 0;
switch(info->rtfMinor) switch(info->rtfMinor)
{ {
@ -939,7 +940,7 @@ void ME_RTFTblAttrHook(RTF_Info *info)
ME_DisplayItem *para = info->editor->pCursors[0].pPara; ME_DisplayItem *para = info->editor->pCursors[0].pPara;
PARAFORMAT2 *pFmt = para->member.para.pFmt; PARAFORMAT2 *pFmt = para->member.para.pFmt;
pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF; pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF;
pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam; pFmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam;
} }
info->tableDef->numCellsDefined++; info->tableDef->numCellsDefined++;
break; break;

10
reactos/dll/win32/riched20/run.c
View file

@ -102,6 +102,8 @@ void ME_CheckCharOffsets(ME_TextEditor *editor)
{ {
ME_DisplayItem *p = editor->pBuffer->pFirst; ME_DisplayItem *p = editor->pBuffer->pFirst;
int ofs = 0, ofsp = 0; int ofs = 0, ofsp = 0;
TRACE_(richedit_check)("Checking begin\n");
if(TRACE_ON(richedit_lists)) if(TRACE_ON(richedit_lists))
{ {
TRACE_(richedit_lists)("---\n"); TRACE_(richedit_lists)("---\n");
@ -113,6 +115,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor)
case diTextEnd: case diTextEnd:
TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs);
assert(ofsp+ofs == p->member.para.nCharOfs); assert(ofsp+ofs == p->member.para.nCharOfs);
TRACE_(richedit_check)("Checking finished\n");
return; return;
case diParagraph: case diParagraph:
TRACE_(richedit_check)("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); TRACE_(richedit_check)("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs);
@ -137,6 +140,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor)
assert(0); assert(0);
} }
} while(1); } while(1);
TRACE_(richedit_check)("Checking finished\n");
} }
/****************************************************************************** /******************************************************************************
@ -239,12 +243,8 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p)
ME_Remove(pNext); ME_Remove(pNext);
ME_DestroyDisplayItem(pNext); ME_DestroyDisplayItem(pNext);
ME_UpdateRunFlags(editor, &p->member.run); ME_UpdateRunFlags(editor, &p->member.run);
if(TRACE_ON(richedit)) if(TRACE_ON(richedit_check))
{
TRACE("Before check after join\n");
ME_CheckCharOffsets(editor); ME_CheckCharOffsets(editor);
TRACE("After check after join\n");
}
} }
/****************************************************************************** /******************************************************************************

20
reactos/dll/win32/riched20/wrap.c
View file

@ -23,6 +23,7 @@
#include "editor.h" #include "editor.h"
WINE_DEFAULT_DEBUG_CHANNEL(richedit); WINE_DEFAULT_DEBUG_CHANNEL(richedit);
WINE_DECLARE_DEBUG_CHANNEL(richedit_check);
/* /*
* Unsolved problems: * Unsolved problems:
@ -123,12 +124,8 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite
ME_Cursor cursor = {wc->pPara, item, nVChar}; ME_Cursor cursor = {wc->pPara, item, nVChar};
assert(item->member.run.nCharOfs != -1); assert(item->member.run.nCharOfs != -1);
if(TRACE_ON(richedit)) if(TRACE_ON(richedit_check))
{
TRACE("Before check before split\n");
ME_CheckCharOffsets(editor); ME_CheckCharOffsets(editor);
TRACE("After check before split\n");
}
run = &item->member.run; run = &item->member.run;
@ -147,15 +144,12 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite
run2->pt.x = run->pt.x+run->nWidth; run2->pt.x = run->pt.x+run->nWidth;
run2->pt.y = run->pt.y; run2->pt.y = run->pt.y;
if(TRACE_ON(richedit)) if(TRACE_ON(richedit_check))
{
TRACE("Before check after split\n");
ME_CheckCharOffsets(editor); ME_CheckCharOffsets(editor);
TRACE("After check after split\n");
TRACE("After split: %s(%d, %d), %s(%d, %d)\n", TRACE("After split: %s(%d, %d), %s(%d, %d)\n",
debugstr_run( run ), run->pt.x, run->pt.y, debugstr_run( run ), run->pt.x, run->pt.y,
debugstr_run( run2 ), run2->pt.x, run2->pt.y); debugstr_run( run2 ), run2->pt.x, run2->pt.y);
}
return cursor.pRun; return cursor.pRun;
} }

2
reactos/media/doc/README.WINE
View file

@ -161,7 +161,7 @@ reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.55
reactos/dll/win32/query # Synced to WineStaging-1.7.55 reactos/dll/win32/query # Synced to WineStaging-1.7.55
reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.9.4
reactos/dll/win32/resutils # Synced to WineStaging-1.7.55 reactos/dll/win32/resutils # Synced to WineStaging-1.7.55
reactos/dll/win32/riched20 # Synced to WineStaging-1.7.55 reactos/dll/win32/riched20 # Synced to WineStaging-1.9.4
reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55 reactos/dll/win32/riched32 # Synced to WineStaging-1.7.55
reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.7.55 reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.7.55
reactos/dll/win32/rsabase # Synced to WineStaging-1.7.55 reactos/dll/win32/rsabase # Synced to WineStaging-1.7.55