Gerald Pfeifer : gdi32: For unsigned types, directly use INTERNAL_YDS

[Alexandre Julliard]

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

Author: Gerald Pfeifer <gerald(a)pfeifer.com>
Date:   Sun Feb 10 22:31:20 2008 +0100

gdi32: For unsigned types, directly use INTERNAL_YDS

---

 dlls/gdi32/font.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 28853fb..3a0beed 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -1690,16 +1690,16 @@ UINT WINAPI GetOutlineTextMetricsW(
 	    output->otmTextMetrics.tmOverhang         = WDPTOLP(output->otmTextMetrics.tmOverhang);
 	    output->otmAscent = HDPTOLP(output->otmAscent);
 	    output->otmDescent = HDPTOLP(output->otmDescent);
-	    output->otmLineGap = HDPTOLP(output->otmLineGap);
-	    output->otmsCapEmHeight = HDPTOLP(output->otmsCapEmHeight);
-	    output->otmsXHeight = HDPTOLP(output->otmsXHeight);
+	    output->otmLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmLineGap));
+	    output->otmsCapEmHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsCapEmHeight));
+	    output->otmsXHeight = abs(INTERNAL_YDSTOWS(dc,output->otmsXHeight));
 	    output->otmrcFontBox.top = HDPTOLP(output->otmrcFontBox.top);
 	    output->otmrcFontBox.bottom = HDPTOLP(output->otmrcFontBox.bottom);
 	    output->otmrcFontBox.left = WDPTOLP(output->otmrcFontBox.left);
 	    output->otmrcFontBox.right = WDPTOLP(output->otmrcFontBox.right);
 	    output->otmMacAscent = HDPTOLP(output->otmMacAscent);
 	    output->otmMacDescent = HDPTOLP(output->otmMacDescent);
-	    output->otmMacLineGap = HDPTOLP(output->otmMacLineGap);
+	    output->otmMacLineGap = abs(INTERNAL_YDSTOWS(dc,output->otmMacLineGap));
 	    output->otmptSubscriptSize.x = WDPTOLP(output->otmptSubscriptSize.x);
 	    output->otmptSubscriptSize.y = HDPTOLP(output->otmptSubscriptSize.y);
 	    output->otmptSubscriptOffset.x = WDPTOLP(output->otmptSubscriptOffset.x);
@@ -1708,7 +1708,7 @@ UINT WINAPI GetOutlineTextMetricsW(
 	    output->otmptSuperscriptSize.y = HDPTOLP(output->otmptSuperscriptSize.y);
 	    output->otmptSuperscriptOffset.x = WDPTOLP(output->otmptSuperscriptOffset.x);
 	    output->otmptSuperscriptOffset.y = HDPTOLP(output->otmptSuperscriptOffset.y);
-	    output->otmsStrikeoutSize = HDPTOLP(output->otmsStrikeoutSize);
+	    output->otmsStrikeoutSize = abs(INTERNAL_YDSTOWS(dc,output->otmsStrikeoutSize));
 	    output->otmsStrikeoutPosition = HDPTOLP(output->otmsStrikeoutPosition);
 	    output->otmsUnderscoreSize = HDPTOLP(output->otmsUnderscoreSize);
 	    output->otmsUnderscorePosition = HDPTOLP(output->otmsUnderscorePosition);