[PATCH 2/2] gdi32: Remove now unused 16bit stuff from font.c.

[Michael Stefaniuc]

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

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 80407e3..2d02b34 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -111,20 +111,6 @@ typedef struct
 
 typedef struct
 {
-  LPLOGFONT16           lpLogFontParam;
-  FONTENUMPROC16        lpEnumFunc;
-  LPARAM                lpData;
-
-  LPNEWTEXTMETRICEX16   lpTextMetric;
-  LPENUMLOGFONTEX16     lpLogFont;
-  SEGPTR                segTextMetric;
-  SEGPTR                segLogFont;
-  DWORD                 dwFlags;
-  HDC                   hdc;
-} fontEnum16;
-
-typedef struct
-{
   LPLOGFONTW          lpLogFontParam;
   FONTENUMPROCW       lpEnumFunc;
   LPARAM              lpData;
@@ -176,48 +162,6 @@ static const CHARSETINFO FONT_tci[MAXTCIINDEX] = {
   { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} }
 };
 
-/***********************************************************************
- *              LOGFONT conversion functions.
- */
-static void FONT_LogFontWTo16( const LOGFONTW* font32, LPLOGFONT16 font16 )
-{
-    font16->lfHeight = font32->lfHeight;
-    font16->lfWidth = font32->lfWidth;
-    font16->lfEscapement = font32->lfEscapement;
-    font16->lfOrientation = font32->lfOrientation;
-    font16->lfWeight = font32->lfWeight;
-    font16->lfItalic = font32->lfItalic;
-    font16->lfUnderline = font32->lfUnderline;
-    font16->lfStrikeOut = font32->lfStrikeOut;
-    font16->lfCharSet = font32->lfCharSet;
-    font16->lfOutPrecision = font32->lfOutPrecision;
-    font16->lfClipPrecision = font32->lfClipPrecision;
-    font16->lfQuality = font32->lfQuality;
-    font16->lfPitchAndFamily = font32->lfPitchAndFamily;
-    WideCharToMultiByte( CP_ACP, 0, font32->lfFaceName, -1,
-                         font16->lfFaceName, LF_FACESIZE, NULL, NULL );
-    font16->lfFaceName[LF_FACESIZE-1] = 0;
-}
-
-static void FONT_LogFont16ToW( const LOGFONT16 *font16, LPLOGFONTW font32 )
-{
-    font32->lfHeight = font16->lfHeight;
-    font32->lfWidth = font16->lfWidth;
-    font32->lfEscapement = font16->lfEscapement;
-    font32->lfOrientation = font16->lfOrientation;
-    font32->lfWeight = font16->lfWeight;
-    font32->lfItalic = font16->lfItalic;
-    font32->lfUnderline = font16->lfUnderline;
-    font32->lfStrikeOut = font16->lfStrikeOut;
-    font32->lfCharSet = font16->lfCharSet;
-    font32->lfOutPrecision = font16->lfOutPrecision;
-    font32->lfClipPrecision = font16->lfClipPrecision;
-    font32->lfQuality = font16->lfQuality;
-    font32->lfPitchAndFamily = font16->lfPitchAndFamily;
-    MultiByteToWideChar( CP_ACP, 0, font16->lfFaceName, -1, font32->lfFaceName, LF_FACESIZE );
-    font32->lfFaceName[LF_FACESIZE-1] = 0;
-}
-
 static void FONT_LogFontAToW( const LOGFONTA *fontA, LPLOGFONTW fontW )
 {
     memcpy(fontW, fontA, sizeof(LOGFONTA) - LF_FACESIZE);
-- 
1.5.4.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20080220/d45388fe/attachment.pgp