[RICHED20] Sync with Wine Staging 1.7.55. CORE-10536

[reactos.git] / reactos / dll / win32 / riched20 / editstr.h

diff --git a/reactos/dll/win32/riched20/editstr.h b/reactos/dll/win32/riched20/editstr.h
index cecd552..cf09010 100644 (file)
--- a/reactos/dll/win32/riched20/editstr.h
+++ b/reactos/dll/win32/riched20/editstr.h
@@ -31,14 +31,25 @@ typedef struct tagME_String
   int nLen, nBuffer;
 } ME_String;
 
+typedef struct tagME_FontCacheItem
+{
+  LOGFONTW lfSpecs;
+  HFONT hFont;
+  int nRefs;
+  int nAge;
+} ME_FontCacheItem;
+
+#define HFONT_CACHE_SIZE 10
+
 typedef struct tagME_Style
 {
   CHARFORMAT2W fmt;
 
-  HFONT hFont; /* cached font for the style */
+  ME_FontCacheItem *font_cache; /* cached font for the style */
   TEXTMETRICW tm; /* cached font metrics for the style */
   int nRefs; /* reference count */
   SCRIPT_CACHE script_cache;
+  struct list entry;
 } ME_Style;
 
 typedef enum {
@@ -343,16 +354,6 @@ typedef struct tagME_OutStream {
   UINT nNestingLevel;
 } ME_OutStream;
 
-typedef struct tagME_FontCacheItem
-{
-  LOGFONTW lfSpecs;
-  HFONT hFont;
-  int nRefs;
-  int nAge;
-} ME_FontCacheItem;
-
-#define HFONT_CACHE_SIZE 10
-
 typedef struct tagME_TextEditor
 {
   HWND hWnd, hwndParent;
@@ -362,6 +363,7 @@ typedef struct tagME_TextEditor
   ME_TextBuffer *pBuffer;
   ME_Cursor *pCursors;
   DWORD styleFlags;
+  DWORD alignStyle;
   DWORD exStyleFlags;
   int nCursors;
   SIZE sizeWindow;
@@ -414,6 +416,7 @@ typedef struct tagME_TextEditor
 
   BOOL bMouseCaptured;
   int wheel_remain;
+  struct list style_list;
 } ME_TextEditor;
 
 typedef struct tagME_Context