gdi: Cast-qual warnings fix (3 of 3)
Andrew Talbot
Andrew.Talbot at talbotville.com
Wed Sep 13 19:00:38 CDT 2006
Changelog:
gdi: Cast-qual warnings fix.
diff -urN a/dlls/gdi/font.c b/dlls/gdi/font.c
--- a/dlls/gdi/font.c 2006-08-10 10:44:05.000000000 +0100
+++ b/dlls/gdi/font.c 2006-09-14 00:53:29.000000000 +0100
@@ -245,7 +245,7 @@
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_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_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 -urN a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
--- a/dlls/gdi/printdrv.c 2006-05-23 13:47:58.000000000 +0100
+++ b/dlls/gdi/printdrv.c 2006-09-13 22:17:54.000000000 +0100
@@ -452,7 +452,7 @@
{
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 @@
TRACE("Got printerSpoolCommand '%s' for output device '%s'\n",
psCmd, pszOutput);
if (!*psCmd)
- psCmdP = (char *)pszOutput;
+ psCmdP = pszOutput;
else
{
while (*psCmdP && isspace(*psCmdP))
More information about the wine-patches
mailing list