Changeset 22123 for branches/swt/include

Timestamp:

Feb 14, 2016, 2:29:03 PM (10 years ago)

Author:

rousseau

Message:

Corrected some string related mismatches [odin]

In 'heapstring.h', 'strncasecmp' is mapped to 'lstrncmpiA', but the
latter used 'int' for the length and not 'size_t'. According to the C++
language documentation, 'size_t' is an 'unsigned int'.

Location:

branches/swt/include

Files:

• heapstring.h (modified) (2 diffs)
• win/winbase.h (modified) (1 diff)

branches/swt/include/heapstring.h

@@ -8 +8 @@
 
 #include <odin.h>
-
+#include <string.h>
 #include <wine/unicode.h>
 //SvL: strcase -> case insensitive!
@@ -34 +34 @@
 int    WIN32API lstrcmpA       (LPCSTR arg1, LPCSTR  arg2);
 int    WIN32API lstrcmpW       (LPCWSTR arg1, LPCWSTR arg2);
-int    WIN32API lstrncmpA      (LPCSTR arg1, LPCSTR  arg2, int i);
-int    WIN32API lstrncmpW      (LPCWSTR arg1, LPCWSTR arg2, int i);
-int    WIN32API lstrncmpiA     (LPCSTR arg1, LPCSTR  arg2, int i);
-int    WIN32API lstrncmpiW     (LPCWSTR arg1, LPCWSTR arg2, int i);
+int    WIN32API lstrncmpA      (LPCSTR arg1, LPCSTR  arg2, size_t l);
+int    WIN32API lstrncmpW      (LPCWSTR arg1, LPCWSTR arg2, size_t l);
+int    WIN32API lstrncmpiA     (LPCSTR arg1, LPCSTR  arg2, size_t l);
+int    WIN32API lstrncmpiW     (LPCWSTR arg1, LPCWSTR arg2, size_t l);
 #define lstrcmpniW lstrncmpiW
 LPSTR  WIN32API lstrcpyA       (LPSTR arg1, LPCSTR  arg2);

branches/swt/include/win/winbase.h

@@ -2271 +2271 @@
 INT       WINAPI lstrcmpiW(LPCWSTR,LPCWSTR);
 #define     lstrcmpi WINELIB_NAME_AW(lstrcmpi)
-int       WINAPI lstrncmpiA(LPCSTR, LPCSTR, int);
-int       WINAPI lstrncmpiW(LPCWSTR, LPCWSTR, int);
+int       WINAPI lstrncmpiA(LPCSTR, LPCSTR, size_t);
+int       WINAPI lstrncmpiW(LPCWSTR, LPCWSTR, size_t);
 #define     lstrncmpi WINELIB_NAME_AW(lstrncmpi)