Nikolay Sivov : riched20: Added some tom* constants used with ITextFont:: Reset().

Alexandre Julliard julliard at wine.codeweavers.com
Fri May 22 04:48:25 CDT 2015


Module: wine
Branch: master
Commit: 1f55764dfcf67cd09f0dd233f99698961c93d692
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1f55764dfcf67cd09f0dd233f99698961c93d692

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri May 22 11:46:43 2015 +0300

riched20: Added some tom* constants used with ITextFont::Reset().

---

 dlls/riched20/riched_tom.idl | 16 ++++++++++++----
 dlls/riched20/richole.c      |  4 ++--
 include/tom.idl              | 16 ++++++++++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/dlls/riched20/riched_tom.idl b/dlls/riched20/riched_tom.idl
index c5e1fe6..4cacbe0 100644
--- a/dlls/riched20/riched_tom.idl
+++ b/dlls/riched20/riched_tom.idl
@@ -46,10 +46,18 @@ typedef enum tagTomConstants
     tomDefault     = -9999996,
     tomSuspend     = -9999995,
     tomResume      = -9999994,
-    tomApplyNow    = 0,
-    tomApplyLater  = 1,
-    tomTrackParms  = 2,
-    tomCacheParms  = 3,
+
+    /* ITextFont::Reset() modes */
+    tomApplyNow         = 0,
+    tomApplyLater       = 1,
+    tomTrackParms       = 2,
+    tomCacheParms       = 3,
+    tomApplyTmp         = 4,
+    tomDisableSmartFont = 8,
+    tomEnableSmartFont  = 9,
+    tomUsePoints        = 10,
+    tomUseTwips         = 11,
+
     tomBackward    = 0xc0000001,
     tomForward     = 0x3fffffff,
     tomMove        = 0,
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 3a4eb3b..5c6acb4 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1821,14 +1821,14 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret)
 static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *ret)
 {
     ITextFontImpl *This = impl_from_ITextFont(iface);
-    FIXME("(%p)->(%p): stub\n", This, ret);
+    FIXME("(%p)->(%p %p): stub\n", This, font, ret);
     return E_NOTIMPL;
 }
 
 static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value)
 {
     ITextFontImpl *This = impl_from_ITextFont(iface);
-    FIXME("(%p): stub\n", This);
+    FIXME("(%p)->(%d): stub\n", This, value);
     return E_NOTIMPL;
 }
 
diff --git a/include/tom.idl b/include/tom.idl
index 769e31b..343906d 100644
--- a/include/tom.idl
+++ b/include/tom.idl
@@ -33,10 +33,18 @@ typedef enum tagTomConstants
     tomDefault     = -9999996,
     tomSuspend     = -9999995,
     tomResume      = -9999994,
-    tomApplyNow    = 0,
-    tomApplyLater  = 1,
-    tomTrackParms  = 2,
-    tomCacheParms  = 3,
+
+    /* ITextFont::Reset() modes */
+    tomApplyNow         = 0,
+    tomApplyLater       = 1,
+    tomTrackParms       = 2,
+    tomCacheParms       = 3,
+    tomApplyTmp         = 4,
+    tomDisableSmartFont = 8,
+    tomEnableSmartFont  = 9,
+    tomUsePoints        = 10,
+    tomUseTwips         = 11,
+
     tomBackward    = 0xc0000001,
     tomForward     = 0x3fffffff,
     tomMove        = 0,




More information about the wine-cvs mailing list