From 801cb5a6f168b734eb034eec084c929540aadf40 Mon Sep 17 00:00:00 2001
From: Rein Klazes <rklazes@xs4all.nl>
Date: Wed, 26 Nov 2003 03:38:39 +0000
Subject: [PATCH] Fix "sample" box drawing by adding some needed coordinate and
 size transformations.

---
 dlls/commdlg/fontdlg.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index 589b4cc1df5..89355920845 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -916,6 +916,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
 
                     if( GetWindowInfo( GetDlgItem( hDlg, stc5), &wininfo ) )
 		    {
+                        MapWindowPoints( 0, hDlg, (LPPOINT) &wininfo.rcWindow, 2);
                         InvalidateRect( hDlg, &wininfo.rcWindow, TRUE );
 		    }
                   }
@@ -932,6 +933,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
 
                     if( GetWindowInfo( GetDlgItem( hDlg, stc5), &wininfo ) )
 		    {
+                        MapWindowPoints( 0, hDlg, (LPPOINT) &wininfo.rcWindow, 2);
                         InvalidateRect( hDlg, &wininfo.rcWindow, TRUE );
 		    }
 		  }
@@ -983,8 +985,10 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
         HFONT hOrigFont;
         COLORREF rgbPrev;
         WCHAR sample[SAMPLE_EXTLEN+5]={'A','a','B','b'};
+        LOGFONTA lf = *(lpcf->lpLogFont);
         /* Always start with this basic sample */
 
+        MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
         hdc=BeginPaint( hDlg, &ps );
 
         /* Paint frame */
@@ -1006,7 +1010,8 @@ static LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
         info.rcWindow.bottom--;
         info.rcWindow.top++;
         info.rcWindow.left++;
-        hOrigFont=SelectObject( hdc, CreateFontIndirectA( lpcf->lpLogFont ) );
+        lf.lfHeight = MulDiv(lf.lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 72);
+        hOrigFont = SelectObject( hdc, CreateFontIndirectA( &lf ) );
         rgbPrev=SetTextColor( hdc, lpcf->rgbColors );
 
         DrawTextW( hdc, sample, -1, &info.rcWindow, DT_CENTER|DT_VCENTER|DT_SINGLELINE );