From 7ee2f77158fc93281fbf01206e6de1ebaab0e9a6 Mon Sep 17 00:00:00 2001
From: Andrew Talbot <Andrew.Talbot@talbotville.com>
Date: Thu, 14 Sep 2006 01:00:38 +0100
Subject: [PATCH] gdi: Cast-qual warnings fix.

---
 dlls/gdi/font.c     | 6 +++---
 dlls/gdi/printdrv.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c
index ec9074d5b0d..a4327de29b2 100644
--- a/dlls/gdi/font.c
+++ b/dlls/gdi/font.c
@@ -245,7 +245,7 @@ static void FONT_LogFontWToA( const LOGFONTW *fontW, LPLOGFONTA fontA )
 
 static void FONT_EnumLogFontExWTo16( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEX16 font16 )
 {
-    FONT_LogFontWTo16( (LPLOGFONTW)fontW, (LPLOGFONT16)font16);
+    FONT_LogFontWTo16( (const LOGFONTW *)fontW, (LPLOGFONT16)font16);
 
     WideCharToMultiByte( CP_ACP, 0, fontW->elfFullName, -1,
 			 (LPSTR) font16->elfFullName, LF_FULLFACESIZE, NULL, NULL );
@@ -260,7 +260,7 @@ static void FONT_EnumLogFontExWTo16( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTE
 
 static void FONT_EnumLogFontExWToA( const ENUMLOGFONTEXW *fontW, LPENUMLOGFONTEXA fontA )
 {
-    FONT_LogFontWToA( (LPLOGFONTW)fontW, (LPLOGFONTA)fontA);
+    FONT_LogFontWToA( (const LOGFONTW *)fontW, (LPLOGFONTA)fontA);
 
     WideCharToMultiByte( CP_ACP, 0, fontW->elfFullName, -1,
 			 (LPSTR) fontA->elfFullName, LF_FULLFACESIZE, NULL, NULL );
@@ -332,7 +332,7 @@ static void FONT_NewTextMetricExWTo16(const NEWTEXTMETRICEXW *ptmW, LPNEWTEXTMET
 
 static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRICEXA *ptmA )
 {
-    FONT_TextMetricWToA((LPTEXTMETRICW)ptmW, (LPTEXTMETRICA)ptmA);
+    FONT_TextMetricWToA((const TEXTMETRICW *)ptmW, (LPTEXTMETRICA)ptmA);
     ptmA->ntmTm.ntmFlags = ptmW->ntmTm.ntmFlags;
     ptmA->ntmTm.ntmSizeEM = ptmW->ntmTm.ntmSizeEM;
     ptmA->ntmTm.ntmCellHeight = ptmW->ntmTm.ntmCellHeight;
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index 57e7d3947e8..5be3370340f 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -452,7 +452,7 @@ static int CreateSpoolFile(LPCSTR pszOutput)
 {
     int fd=-1;
     char psCmd[1024];
-    char *psCmdP = psCmd;
+    const char *psCmdP = psCmd;
     HKEY hkey;
 
     /* TTD convert the 'output device' into a spool file name */
@@ -474,7 +474,7 @@ static int CreateSpoolFile(LPCSTR pszOutput)
     TRACE("Got printerSpoolCommand '%s' for output device '%s'\n",
 	  psCmd, pszOutput);
     if (!*psCmd)
-        psCmdP = (char *)pszOutput;
+        psCmdP = pszOutput;
     else
     {
         while (*psCmdP && isspace(*psCmdP))