Changeset 5485 for trunk/src/kernel32/codepage.cpp

Timestamp:

Apr 5, 2001, 9:06:10 PM (24 years ago)

Author:

sandervl

Message:

WideCharToMultiByte/MultiByteToWideChar changes

File:

• trunk/src/kernel32/codepage.cpp (modified) (4 diffs)

trunk/src/kernel32/codepage.cpp

@@ -342 +342 @@
 #endif
 
-    if (!src || (!dst && dstlen))
+    //Docs say source ptr can't be the same as destination (Windows ME, NT4-SP6)
+    if (!src || (!dst && dstlen) || ((void *)src == (void *)dst))
     {
         SetLastError( ERROR_INVALID_PARAMETER );
@@ -348 +349 @@
     }
 
-    if (srclen == -1) srclen = strlen(src) + 1;
+    //Even though the docs claim this only works for -1, testing shows it
+    //is done for any negative value (Windows ME, NT4-SP6)
+    if (srclen <= -1) srclen = strlen(src) + 1;
 
     if (flags & MB_USEGLYPHCHARS) FIXME("MB_USEGLYPHCHARS not supported\n");
@@ -421 +424 @@
 #endif
 
-    if (!src || (!dst && dstlen))
+    //Docs say source ptr can't be the same as destination (Windows ME, NT4-SP6)
+    if (!src || (!dst && dstlen) || ((void *)src == (void *)dst))
     {
         SetLastError( ERROR_INVALID_PARAMETER );
@@ -427 +431 @@
     }
 
-    if (srclen == -1) srclen = strlenW(src) + 1;
+    //Even though the docs claim this only works for -1, testing shows it
+    //is done for any negative value (Windows ME, NT4 - SP6)
+    if (srclen <= -1) srclen = strlenW(src) + 1;
 
     switch(page)