The API for WideCharToMultiByte says that the src-string has only to be

treated as NULL-terminated if srclen is -1.

The API for WideCharToMultiByte says that the src-string has only to be
cd11f29c · Uwe Bonnes · Alexandre Julliard · 0fbe1de1 · cd11f29c
Commit cd11f29c authored Nov 06, 1998 by Uwe Bonnes Committed by Alexandre Julliard Nov 06, 1998
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

code_page.c win32/code_page.c +5 -1

No files found.
--- a/win32/code_page.c
+++ b/win32/code_page.c
@@ -178,6 +178,7 @@ INT32 WINAPI WideCharToMultiByte(UINT32 page, DWORD flags, LPCWSTR src,
 {
    int count = 0;
    int eos = 0;
+    int care_for_eos=0;
    int dont_copy= (dstlen==0);

    if ((!src) | ((!dst) && (!dont_copy)) )
@@ -194,7 +195,10 @@ INT32 WINAPI WideCharToMultiByte(UINT32 page, DWORD flags, LPCWSTR src,
    if(used)
 	*used=0;
    if (srclen == -1)
+      {
 	srclen = lstrlen32W(src)+1;
+	 care_for_eos=1;
+      }
    while(srclen && (dont_copy || dstlen))
    {
 	if(!dont_copy){
@@ -215,7 +219,7 @@ INT32 WINAPI WideCharToMultiByte(UINT32 page, DWORD flags, LPCWSTR src,
 	}
 	count++;
 	srclen--;
-	if(!*src) {
+	if((!*src) && care_for_eos) {
 	    eos = 1;
 	    break;
 	}