Changeset 22123 for branches/swt/src/kernel32/heapstring.cpp

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'.

File:

• branches/swt/src/kernel32/heapstring.cpp (modified) (6 diffs)

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",