Paul Gofman : wineps.drv: Use stricmp() instead of _strnicmp(..., -1).
Alexandre Julliard
julliard at winehq.org
Fri Mar 27 16:14:37 CDT 2020
Module: wine
Branch: master
Commit: e0dcc8df14a243dbaa1fb3e0b4394ef2a9d325f3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0dcc8df14a243dbaa1fb3e0b4394ef2a9d325f3
Author: Paul Gofman <gofmanp at gmail.com>
Date: Fri Mar 27 13:31:39 2020 +0300
wineps.drv: Use stricmp() instead of _strnicmp(..., -1).
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wineps.drv/builtin.c | 2 +-
dlls/wineps.drv/font.c | 4 ++--
dlls/wineps.drv/mkagl.c | 2 +-
dlls/wineps.drv/ppd.c | 20 ++++++++++----------
dlls/wineps.drv/type1afm.c | 4 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c
index 7617a46946..22397567aa 100644
--- a/dlls/wineps.drv/builtin.c
+++ b/dlls/wineps.drv/builtin.c
@@ -169,7 +169,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont,
/* Look for a matching font family */
for(family = physDev->pi->Fonts; family; family = family->next) {
- if(!_strnicmp(FaceName, family->FamilyName, -1))
+ if(!stricmp(FaceName, family->FamilyName))
break;
}
diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c
index d6e330159c..cfb3669fd3 100644
--- a/dlls/wineps.drv/font.c
+++ b/dlls/wineps.drv/font.c
@@ -94,8 +94,8 @@ HFONT CDECL PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags )
for (i = 0; i < physDev->pi->FontSubTableSize; ++i)
{
- if (!_strnicmp (FaceName,
- physDev->pi->FontSubTable[i].pValueName, -1))
+ if (!stricmp (FaceName,
+ physDev->pi->FontSubTable[i].pValueName))
{
TRACE ("substituting facename '%s' for '%s'\n",
(LPSTR) physDev->pi->FontSubTable[i].pData, FaceName);
diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c
index 788fb6ee77..d3ca67ee37 100644
--- a/dlls/wineps.drv/mkagl.c
+++ b/dlls/wineps.drv/mkagl.c
@@ -191,7 +191,7 @@ static void read_afms(FILE *f_c, FILE *f_h)
int i, num_metrics;
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;
f = fopen(de->d_name, "r");
diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c
index 662dbe6db7..03267c4370 100644
--- a/dlls/wineps.drv/ppd.c
+++ b/dlls/wineps.drv/ppd.c
@@ -746,7 +746,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
}
else if(!strcmp("*ColorDevice", tuple.key)) {
- if(!_strnicmp(tuple.value, "true", -1))
+ if(!stricmp(tuple.value, "true"))
ppd->ColorDevice = CD_True;
else
ppd->ColorDevice = CD_False;
@@ -964,13 +964,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
}
else if(!strcmp("*TTRasterizer", tuple.key)) {
- if(!_strnicmp("None", tuple.value, -1))
+ if(!stricmp("None", tuple.value))
ppd->TTRasterizer = RO_None;
- else if(!_strnicmp("Accept68K", tuple.value, -1))
+ else if(!stricmp("Accept68K", tuple.value))
ppd->TTRasterizer = RO_Accept68K;
- else if(!_strnicmp("Type42", tuple.value, -1))
+ else if(!stricmp("Type42", tuple.value))
ppd->TTRasterizer = RO_Type42;
- else if(!_strnicmp("TrueImage", tuple.value, -1))
+ else if(!stricmp("TrueImage", tuple.value))
ppd->TTRasterizer = RO_TrueImage;
else {
FIXME("Unknown option %s for *TTRasterizer\n",
@@ -986,14 +986,14 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer )
duplex->Name = tuple.option;
duplex->FullName = tuple.opttrans;
duplex->InvocationString = tuple.value;
- if(!_strnicmp("None", tuple.option, -1) || !_strnicmp("False", tuple.option, -1)
- || !_strnicmp("Simplex", tuple.option, -1))
+ if(!stricmp("None", tuple.option) || !stricmp("False", tuple.option)
+ || !stricmp("Simplex", tuple.option))
duplex->WinDuplex = DMDUP_SIMPLEX;
- else if(!_strnicmp("DuplexNoTumble", tuple.option, -1))
+ else if(!stricmp("DuplexNoTumble", tuple.option))
duplex->WinDuplex = DMDUP_VERTICAL;
- else if(!_strnicmp("DuplexTumble", tuple.option, -1))
+ else if(!stricmp("DuplexTumble", tuple.option))
duplex->WinDuplex = DMDUP_HORIZONTAL;
- else if(!_strnicmp("Notcapable", tuple.option, -1))
+ else if(!stricmp("Notcapable", tuple.option))
duplex->WinDuplex = 0;
else {
FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option);
diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c
index f29369b433..68cf6537b1 100644
--- a/dlls/wineps.drv/type1afm.c
+++ b/dlls/wineps.drv/type1afm.c
@@ -457,7 +457,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm,
return TRUE;
}
- if (_strnicmp(sz, "false", -1) == 0)
+ if (stricmp(sz, "false") == 0)
{
afm->IsFixedPitch = FALSE;
*p_found = TRUE;
@@ -465,7 +465,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm,
return TRUE;
}
- if (_strnicmp(sz, "true", -1) == 0)
+ if (stricmp(sz, "true") == 0)
{
afm->IsFixedPitch = TRUE;
*p_found = TRUE;
More information about the wine-cvs
mailing list