Changeset 4964 for trunk/src/kernel32/unicode.cpp

Timestamp:

Jan 18, 2001, 7:14:16 PM (25 years ago)

Author:

sandervl

Message:

MultiByteToWideChar & lstrcpynA bugfixes; added cdaudio system.ini section

File:

• trunk/src/kernel32/unicode.cpp (modified) (2 diffs)

trunk/src/kernel32/unicode.cpp

@@ -1 @@
-/* $Id: unicode.cpp,v 1.23 2000-04-29 18:26:59 sandervl Exp $ */
+/* $Id: unicode.cpp,v 1.24 2001-01-18 18:14:16 sandervl Exp $ */
 
 /*
@@ -83 +83 @@
 
     dprintf2(("MultiByteToWideChar: %d %x (%s %d) (%x %d)", page, flags, src, srclen, dst, dstlen));
+
+    if (!src || (!dst && dstlen))
+    {
+        SetLastError( ERROR_INVALID_PARAMETER );
+        return 0;
+    }
+    //-1 means the input string is null terminated and we need to calculate
+    //its length
     if (srclen == -1)
         srclen = lstrlenA(src)+1;
-    if (!dstlen || !dst)
-        return srclen;
+
+    if (!dstlen)
+        return srclen;
 
     ret = srclen;