Replaced lstrlen/lstrcmp by libc equivalents everywhere we don't need
to trap exceptions.
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 0c4782d..bfb605d 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -968,7 +968,7 @@
/* Check if the file exists and use the existing file name */
if ( DOSFS_GetFullName ( tmpshortpath, TRUE, &full_name ) ) {
lstrcpyA ( tmpshortpath+sp, strrchr ( full_name.short_name, '\\' ) + 1 );
- sp += lstrlenA ( tmpshortpath+sp );
+ sp += strlen ( tmpshortpath+sp );
lp += tmplen;
continue;
}
@@ -981,7 +981,7 @@
lstrcpynA ( shortpath, tmpshortpath, shortlen );
TRACE("returning %s\n", debugstr_a(shortpath) );
- tmplen = lstrlenA ( tmpshortpath );
+ tmplen = strlen ( tmpshortpath );
HeapFree ( GetProcessHeap(), 0, tmpshortpath );
return tmplen;
diff --git a/files/drive.c b/files/drive.c
index 8f5f010..3480c9a 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -1244,9 +1244,9 @@
return ret;
}
GetLongPathNameA(shortname, longname, MAX_PATHNAME_LEN);
- ret = lstrlenA( longname ) + 1;
+ ret = strlen( longname ) + 1;
if (ret > buflen) return ret;
- lstrcpyA(buf, longname);
+ strcpy(buf, longname);
return ret - 1;
}
diff --git a/files/file.c b/files/file.c
index 77ce52f..206f460 100644
--- a/files/file.c
+++ b/files/file.c
@@ -463,8 +463,8 @@
return HFILE_ERROR;
/* Open a console for CONIN$ or CONOUT$ */
- if (!lstrcmpiA(filename, "CONIN$")) return CONSOLE_OpenHandle( FALSE, access, sa );
- if (!lstrcmpiA(filename, "CONOUT$")) return CONSOLE_OpenHandle( TRUE, access, sa );
+ if (!strcasecmp(filename, "CONIN$")) return CONSOLE_OpenHandle( FALSE, access, sa );
+ if (!strcasecmp(filename, "CONOUT$")) return CONSOLE_OpenHandle( TRUE, access, sa );
if (DOSFS_GetDevice( filename ))
{
