Changeset 22123 for branches

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

Files:

• include/heapstring.h (modified) (2 diffs)
• include/win/winbase.h (modified) (1 diff)
• src/kernel32/heapstring.cpp (modified) (6 diffs)

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)
 

branches/swt/src/kernel32/heapstring.cpp

@@ -198 +198 @@
  *****************************************************************************/
 
-int WIN32API lstrncmpA(LPCSTR arg1, LPCSTR arg2, int l)
+int WIN32API lstrncmpA(LPCSTR arg1, LPCSTR arg2, size_t l)
 {
   dprintf2(("KERNEL32: lstrncmpA(%s,%s,%d)\n",
@@ -219 +219 @@
  * Author    : Przemyslaw Dobrowolski
  *****************************************************************************/
-int WIN32API lstrncmpiA(LPCSTR str1, LPCSTR str2, INT n )
+int WIN32API lstrncmpiA(LPCSTR str1, LPCSTR str2, size_t l)
 {
   INT firstch,lastch;
   INT result = 0;
 
-  if (n)
+  if (l)
   {
     do
@@ -232 +232 @@
       str1++;
       str2++;
-    } while (--n && *str1 && *str2 && firstch == lastch);
+    } while (--l && *str1 && *str2 && firstch == lastch);
 
     result = firstch - lastch;
@@ -240 +240 @@
 }
 //TODO: Don't know if this is completely correct
-int WIN32API lstrncmpiW(LPCWSTR str1, LPCWSTR str2, int n)
+int WIN32API lstrncmpiW(LPCWSTR str1, LPCWSTR str2, size_t l)
 {
   INT firstch,lastch;
   INT result = 0;
 
-  if (n)
+  if (l)
   {
     do
@@ -253 +253 @@
       str1++;
       str2++;
-    } while (--n && *str1 && *str2 && firstch == lastch);
+    } while (--l && *str1 && *str2 && firstch == lastch);
 
     result = firstch - lastch;
@@ -300 +300 @@
  *****************************************************************************/
 
-int WIN32API lstrncmpW(LPCWSTR arg1, LPCWSTR arg2, int l)
+int WIN32API lstrncmpW(LPCWSTR arg1, LPCWSTR arg2, size_t l)
 {
   dprintf2(("KERNEL32: lstrncmpW(%08xh,%08xh,%d)\n",