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

svn path=/trunk/; revision=70923

diff --git a/reactos/dll/win32/riched20/editor.c b/reactos/dll/win32/riched20/editor.c
index 6af6924..afeccaa 100644 (file)
--- a/reactos/dll/win32/riched20/editor.c
+++ b/reactos/dll/win32/riched20/editor.c
@@ -544,7 +544,8 @@ void ME_RTFParAttrHook(RTF_Info *info)
   PARAFORMAT2 fmt;
   fmt.cbSize = sizeof(fmt);
   fmt.dwMask = 0;
   PARAFORMAT2 fmt;
   fmt.cbSize = sizeof(fmt);
   fmt.dwMask = 0;

-  
+  fmt.wEffects = 0;
+

   switch(info->rtfMinor)
   {
   case rtfParDef: /* restores default paragraph attributes */
   switch(info->rtfMinor)
   {
   case rtfParDef: /* restores default paragraph attributes */


@@ -939,7 +940,7 @@ void ME_RTFTblAttrHook(RTF_Info *info)
         ME_DisplayItem *para = info->editor->pCursors[0].pPara;
         PARAFORMAT2 *pFmt = para->member.para.pFmt;
         pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF;
         ME_DisplayItem *para = info->editor->pCursors[0].pPara;
         PARAFORMAT2 *pFmt = para->member.para.pFmt;
         pFmt->rgxTabs[cellNum] &= ~0x00FFFFFF;

-        pFmt->rgxTabs[cellNum] = 0x00FFFFFF & info->rtfParam;
+        pFmt->rgxTabs[cellNum] |= 0x00FFFFFF & info->rtfParam;

       }
       info->tableDef->numCellsDefined++;
       break;
       }
       info->tableDef->numCellsDefined++;
       break;

diff --git a/reactos/dll/win32/riched20/run.c b/reactos/dll/win32/riched20/run.c
index f3b4db6..f79e81e 100644 (file)
--- a/reactos/dll/win32/riched20/run.c
+++ b/reactos/dll/win32/riched20/run.c
@@ -102,6 +102,8 @@ void ME_CheckCharOffsets(ME_TextEditor *editor)
 {
   ME_DisplayItem *p = editor->pBuffer->pFirst;
   int ofs = 0, ofsp = 0;
 {
   ME_DisplayItem *p = editor->pBuffer->pFirst;
   int ofs = 0, ofsp = 0;

+
+  TRACE_(richedit_check)("Checking begin\n");

   if(TRACE_ON(richedit_lists))
   {
     TRACE_(richedit_lists)("---\n");
   if(TRACE_ON(richedit_lists))
   {
     TRACE_(richedit_lists)("---\n");


@@ -113,6 +115,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor)
       case diTextEnd:
         TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs);
         assert(ofsp+ofs == p->member.para.nCharOfs);
       case diTextEnd:
         TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs);
         assert(ofsp+ofs == p->member.para.nCharOfs);

+        TRACE_(richedit_check)("Checking finished\n");

         return;
       case diParagraph:
         TRACE_(richedit_check)("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs);
         return;
       case diParagraph:
         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);
     }
   } while(1);
         assert(0);
     }
   } 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_DestroyDisplayItem(pNext);
   ME_UpdateRunFlags(editor, &p->member.run);
   ME_Remove(pNext);
   ME_DestroyDisplayItem(pNext);
   ME_UpdateRunFlags(editor, &p->member.run);

-  if(TRACE_ON(richedit))
-  {
-    TRACE("Before check after join\n");
+  if(TRACE_ON(richedit_check))

     ME_CheckCharOffsets(editor);
     ME_CheckCharOffsets(editor);

-    TRACE("After check after join\n");
-  }

 }
 
 /******************************************************************************
 }
 
 /******************************************************************************

diff --git a/reactos/dll/win32/riched20/wrap.c b/reactos/dll/win32/riched20/wrap.c
index 6c9f2e3..e8575fd 100644 (file)
--- a/reactos/dll/win32/riched20/wrap.c
+++ b/reactos/dll/win32/riched20/wrap.c
@@ -23,6 +23,7 @@
 #include "editor.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
 #include "editor.h"
 
 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};
 
   assert(item->member.run.nCharOfs != -1);
   ME_Cursor cursor = {wc->pPara, item, nVChar};
 
   assert(item->member.run.nCharOfs != -1);

-  if(TRACE_ON(richedit))
-  {
-    TRACE("Before check before split\n");
+  if(TRACE_ON(richedit_check))

     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.y = run->pt.y;
 
   run2->pt.x = run->pt.x+run->nWidth;
   run2->pt.y = run->pt.y;
 

-  if(TRACE_ON(richedit))
-  {
-    TRACE("Before check after split\n");
+  if(TRACE_ON(richedit_check))

     ME_CheckCharOffsets(editor);
     ME_CheckCharOffsets(editor);

-    TRACE("After check after split\n");
-    TRACE("After split: %s(%d, %d), %s(%d, %d)\n",
-      debugstr_run( run ), run->pt.x, run->pt.y,
-      debugstr_run( run2 ), run2->pt.x, run2->pt.y);
-  }
+
+  TRACE("After split: %s(%d, %d), %s(%d, %d)\n",
+        debugstr_run( run ), run->pt.x, run->pt.y,
+        debugstr_run( run2 ), run2->pt.x, run2->pt.y);

 
   return cursor.pRun;
 }
 
   return cursor.pRun;
 }

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index da71da3..ca51bfb 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -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/rasapi32            # Synced to WineStaging-1.9.4
 reactos/dll/win32/resutils            # 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/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/rpcrt4              # Synced to WineStaging-1.7.55
 reactos/dll/win32/rsabase             # 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/rsabase             # Synced to WineStaging-1.7.55