Changeset 3352 for trunk/src

Timestamp:

Apr 8, 2000, 10:09:42 PM (25 years ago)

Author:

sandervl

Message:

CompareStringW fix

File:

• trunk/src/kernel32/KERNEL32.CPP (modified) (4 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.42 2000-02-16 14:25:29 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.43 2000-04-08 20:09:42 sandervl Exp $ */
 
 /*
@@ -418 +418 @@
   char *string1 = (char *)lpString1, *string2 = (char *)lpString2;
 
+   SetLastError(0);
+
 #ifdef DEBUG
    if(fdwStyle & SORT_STRINGSORT)
@@ -426 +428 @@
          dprintf(("KERNEL32:  NORM_IGNORESYMBOLS not supported!\n"));
 #endif
+
+   if(lpString1 == NULL || lpString2 == NULL)
+   {    
+        dprintf(("CompareStringA: (s1=%s,s2=%s): Invalid NULL string\n", lpString1, lpString2));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+   }
 
    if(cch1 == -1) cch1 = strlen(string1);
@@ -463 +472 @@
  int i;
  int fEqual = TRUE;
- char *string1 = UnicodeToAsciiString((LPWSTR)lpString1);
- char *string2 = UnicodeToAsciiString((LPWSTR)lpString2);
-
-  dprintf2(("KERNEL32:  OS2CompareStringW '%s' - '%s'\n", string1, string2));
-
-  fEqual = CompareStringA(lcid, fdwStyle, string1, cch1, string2, cch2);
-  FreeAsciiString(string1);
-  FreeAsciiString(string2);
-
-  return(fEqual);
+ char *string1;
+ char *string2;
+
+   dprintf2(("KERNEL32:  OS2CompareStringW '%s' - '%s'\n", string1, string2));
+
+   if(lpString1 == NULL || lpString2 == NULL)
+   {    
+        dprintf(("CompareStringW: (s1=%s,s2=%s): Invalid NULL string\n", lpString1, lpString2));
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+   }
+
+   if(cch1 == -1) cch1 = lstrlenW(lpString1);
+   if(cch2 == -1) cch2 = lstrlenW(lpString2);
+
+   string1 = UnicodeToAsciiStringN((LPWSTR)lpString1, cch1);
+   string2 = UnicodeToAsciiStringN((LPWSTR)lpString2, cch2);
+
+   fEqual = CompareStringA(lcid, fdwStyle, string1, cch1, string2, cch2);
+   FreeAsciiString(string1);
+   FreeAsciiString(string2);
+
+   return(fEqual);
 }
 //******************************************************************************