Replaced lstrlen/lstrcmp by libc equivalents everywhere we don't need
to trap exceptions.
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c
index 4582d49..54f4308 100644
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -484,7 +484,7 @@
TRACE("%s\n", debugstr_w(lpszPath));
if(lpszFileName)
- RtlMoveMemory(lpszPath, lpszFileName, (lstrlenW(lpszFileName)+1)*sizeof(WCHAR));
+ RtlMoveMemory(lpszPath, lpszFileName, (strlenW(lpszFileName)+1)*sizeof(WCHAR));
}
/*************************************************************************
@@ -612,7 +612,7 @@
if(lpszPath)
{
- len = lstrlenW(lpszPath);
+ len = strlenW(lpszPath);
szTemp = CharPrevW(lpszPath, lpszPath+len);
if (! PathIsRootW(lpszPath))
{
@@ -662,7 +662,7 @@
{
while (*x==' ') x = CharNextW(x);
if (x!=str) lstrcpyW(str,x);
- x=str+lstrlenW(str)-1;
+ x=str+strlenW(str)-1;
while (*x==' ') x = CharPrevW(str, x);
if (*x==' ') *x='\0';
}
@@ -698,7 +698,7 @@
if(StrChrW(lpszPath,' '))
{
- int len = lstrlenW(lpszPath);
+ int len = strlenW(lpszPath);
RtlMoveMemory(lpszPath+1, lpszPath, len*sizeof(WCHAR));
*(lpszPath++) = '"';
lpszPath += len;
@@ -717,7 +717,7 @@
*/
VOID WINAPI PathUnquoteSpacesA(LPSTR str)
{
- DWORD len = lstrlenA(str);
+ DWORD len = strlen(str);
TRACE("%s\n",str);
@@ -1471,7 +1471,7 @@
*/
BOOL WINAPI PathCanonicalizeW(LPWSTR pszBuf, LPCWSTR pszPath)
{
- int OffsetMin = 0, OffsetSrc = 0, OffsetDst = 0, LenSrc = lstrlenW(pszPath);
+ int OffsetMin = 0, OffsetSrc = 0, OffsetDst = 0, LenSrc = strlenW(pszPath);
BOOL bModifyed = FALSE;
TRACE("%p %s\n", pszBuf, debugstr_w(pszPath));
@@ -1574,7 +1574,7 @@
if(!pszPath || !*pszPath) return NULL;
if (!(pos = StrChrW(pszPath, '\\')))
- return (LPWSTR) pszPath + lstrlenW(pszPath);
+ return (LPWSTR) pszPath + strlenW(pszPath);
pos++;
if(pos[0] == '\\') pos++;
return pos;
diff --git a/dlls/user/text.c b/dlls/user/text.c
index e588de0..b8c9b8d 100644
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
@@ -382,9 +382,9 @@
if(unicode)
slen = lstrlenW((LPCWSTR)lp);
else if(_32bit)
- slen = lstrlenA((LPCSTR)lp);
+ slen = strlen((LPCSTR)lp);
else
- slen = lstrlenA((LPCSTR)PTR_SEG_TO_LIN(lp));
+ slen = strlen((LPCSTR)PTR_SEG_TO_LIN(lp));
}
if((cx == 0 || cy == 0) && slen != -1)
