Replaced lstrlen/lstrcmp by libc equivalents everywhere we don't need
to trap exceptions.
diff --git a/windows/driver.c b/windows/driver.c
index 859b6f5..4fbb356 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -82,7 +82,7 @@
HDRVR16 hDrv;
LPSTR ptr;
- for (ptr = str; lstrlenA(ptr) != 0; ptr += lstrlenA(ptr) + 1) {
+ for (ptr = str; *ptr; ptr += strlen(ptr) + 1) {
TRACE("str='%s'\n", ptr);
hDrv = OpenDriver16(ptr, "drivers", 0L);
TRACE("hDrv=%04x\n", hDrv);
@@ -732,7 +732,7 @@
TRACE("('%s', %08lX, %d);\n", lpFileName, lParam, bCallFrom32);
- if (lstrlenA(lpFileName) < 1)
+ if (strlen(lpFileName) < 1)
return 0;
lpSFN = strrchr(lpFileName, '\\');
@@ -766,7 +766,7 @@
TRACE("('%s', %08lX, %d);\n", lpFileName, lParam, bCallFrom32);
- if (lstrlenA(lpFileName) < 1)
+ if (strlen(lpFileName) < 1)
return 0;
lpSFN = strrchr(lpFileName, '\\');
diff --git a/windows/painting.c b/windows/painting.c
index 7bc2e10..7d7061a 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -1485,9 +1485,9 @@
if(unicode)
len = lstrlenW((LPWSTR)lp);
else if(_32bit)
- len = lstrlenA((LPSTR)lp);
+ len = strlen((LPSTR)lp);
else
- len = lstrlenA((LPSTR)PTR_SEG_TO_LIN(lp));
+ len = strlen((LPSTR)PTR_SEG_TO_LIN(lp));
}
/* Find out what size the image has if not given by caller */
diff --git a/windows/win.c b/windows/win.c
index 99acd4b..7d5b896 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -10,6 +10,7 @@
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
+#include "wine/unicode.h"
#include "options.h"
#include "class.h"
#include "win.h"
@@ -1556,7 +1557,7 @@
retvalue = pWnd->hwndSelf;
goto end;
}
- if (pWnd->text && !lstrcmpW( pWnd->text, title ))
+ if (pWnd->text && !strcmpW( pWnd->text, title ))
{
retvalue = pWnd->hwndSelf;
goto end;
