marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineps.drv: Use stricmp() instead of _strnicmp(..., -1). 

Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Paul Gofman 2020-03-27 13:31:39 +03:00 committed by Alexandre Julliard
parent 55be879320
commit e0dcc8df14
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wineps.drv/builtin.c
View File

@ -169,7 +169,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont,
/* Look for a matching font family */ /* Look for a matching font family */
for(family = physDev->pi->Fonts; family; family = family->next) { for(family = physDev->pi->Fonts; family; family = family->next) {
if(!_strnicmp(FaceName, family->FamilyName, -1)) if(!stricmp(FaceName, family->FamilyName))
break; break;
} }

4
dlls/wineps.drv/font.c
View File

@ -94,8 +94,8 @@ HFONT CDECL PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags )
for (i = 0; i < physDev->pi->FontSubTableSize; ++i) for (i = 0; i < physDev->pi->FontSubTableSize; ++i)
{ {
if (!_strnicmp (FaceName, if (!stricmp (FaceName,
physDev->pi->FontSubTable[i].pValueName, -1)) physDev->pi->FontSubTable[i].pValueName))
{ {
TRACE ("substituting facename '%s' for '%s'\n", TRACE ("substituting facename '%s' for '%s'\n",
(LPSTR) physDev->pi->FontSubTable[i].pData, FaceName); (LPSTR) physDev->pi->FontSubTable[i].pData, FaceName);

2
dlls/wineps.drv/mkagl.c
View File

@ -191,7 +191,7 @@ static void read_afms(FILE *f_c, FILE *f_h)
int i, num_metrics; int i, num_metrics;
cp = strrchr(de->d_name, '.'); /* Does it end in */ cp = strrchr(de->d_name, '.'); /* Does it end in */
if (cp == NULL || _strnicmp(cp, ".afm", -1) != 0) /* .afm or .AFM? */ if (cp == NULL || stricmp(cp, ".afm") != 0) /* .afm or .AFM? */
continue; continue;
f = fopen(de->d_name, "r"); f = fopen(de->d_name, "r");

20
dlls/wineps.drv/ppd.c
View File

@ -746,7 +746,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
} }
else if(!strcmp("*ColorDevice", tuple.key)) { else if(!strcmp("*ColorDevice", tuple.key)) {
if(!_strnicmp(tuple.value, "true", -1)) if(!stricmp(tuple.value, "true"))
ppd->ColorDevice = CD_True; ppd->ColorDevice = CD_True;
else else
ppd->ColorDevice = CD_False; ppd->ColorDevice = CD_False;
@ -964,13 +964,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
} }
else if(!strcmp("*TTRasterizer", tuple.key)) { else if(!strcmp("*TTRasterizer", tuple.key)) {
if(!_strnicmp("None", tuple.value, -1)) if(!stricmp("None", tuple.value))
ppd->TTRasterizer = RO_None; ppd->TTRasterizer = RO_None;
else if(!_strnicmp("Accept68K", tuple.value, -1)) else if(!stricmp("Accept68K", tuple.value))
ppd->TTRasterizer = RO_Accept68K; ppd->TTRasterizer = RO_Accept68K;
else if(!_strnicmp("Type42", tuple.value, -1)) else if(!stricmp("Type42", tuple.value))
ppd->TTRasterizer = RO_Type42; ppd->TTRasterizer = RO_Type42;
else if(!_strnicmp("TrueImage", tuple.value, -1)) else if(!stricmp("TrueImage", tuple.value))
ppd->TTRasterizer = RO_TrueImage; ppd->TTRasterizer = RO_TrueImage;
else { else {
FIXME("Unknown option %s for *TTRasterizer\n", FIXME("Unknown option %s for *TTRasterizer\n",
@ -986,14 +986,14 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
duplex->Name = tuple.option; duplex->Name = tuple.option;
duplex->FullName = tuple.opttrans; duplex->FullName = tuple.opttrans;
duplex->InvocationString = tuple.value; duplex->InvocationString = tuple.value;
if(!_strnicmp("None", tuple.option, -1) || !_strnicmp("False", tuple.option, -1) if(!stricmp("None", tuple.option) || !stricmp("False", tuple.option)
|| !_strnicmp("Simplex", tuple.option, -1)) || !stricmp("Simplex", tuple.option))
duplex->WinDuplex = DMDUP_SIMPLEX; duplex->WinDuplex = DMDUP_SIMPLEX;
else if(!_strnicmp("DuplexNoTumble", tuple.option, -1)) else if(!stricmp("DuplexNoTumble", tuple.option))
duplex->WinDuplex = DMDUP_VERTICAL; duplex->WinDuplex = DMDUP_VERTICAL;
else if(!_strnicmp("DuplexTumble", tuple.option, -1)) else if(!stricmp("DuplexTumble", tuple.option))
duplex->WinDuplex = DMDUP_HORIZONTAL; duplex->WinDuplex = DMDUP_HORIZONTAL;
else if(!_strnicmp("Notcapable", tuple.option, -1)) else if(!stricmp("Notcapable", tuple.option))
duplex->WinDuplex = 0; duplex->WinDuplex = 0;
else { else {
FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option);

4
dlls/wineps.drv/type1afm.c
View File

@ -457,7 +457,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm,
return TRUE; return TRUE;
} }
if (_strnicmp(sz, "false", -1) == 0) if (stricmp(sz, "false") == 0)
{ {
afm->IsFixedPitch = FALSE; afm->IsFixedPitch = FALSE;
*p_found = TRUE; *p_found = TRUE;
@ -465,7 +465,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm,
return TRUE; return TRUE;
} }
if (_strnicmp(sz, "true", -1) == 0) if (stricmp(sz, "true") == 0)
{ {
afm->IsFixedPitch = TRUE; afm->IsFixedPitch = TRUE;
*p_found = TRUE; *p_found = TRUE;