Dan Kegel : winmm: Don't convert return string in mciSendStringA on error.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ea5a6f2db5e6f05acf38f9257278cbcad58ab898
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ea5a6f2db5e6f05acf38f92572...

Author: Dan Kegel 
Date:   Fri Jul  3 21:52:38 2009 -0700

winmm: Don't convert return string in mciSendStringA on error.

---

dlls/winmm/mci.c       |    2 +-
 dlls/winmm/tests/mci.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 262d62d..6fca013 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -1506,7 +1506,7 @@ DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet,
         }
     }
     ret = mciSendStringW(lpwstrCommand, lpwstrRet, uRetLen, hwndCallback);
-    if (lpwstrRet)
+    if (!ret && lpwstrRet)
         WideCharToMultiByte( CP_ACP, 0, lpwstrRet, -1, lpstrRet, uRetLen, NULL, NULL );
     HeapFree(GetProcessHeap(), 0, lpwstrCommand);
     HeapFree(GetProcessHeap(), 0, lpwstrRet);
diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c
index 8764b30..5f86985 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -53,7 +53,7 @@ START_TEST(mci)
     memset(buf, 0, sizeof(buf));
     err = mciSendString(command_close_all, buf, sizeof(buf), hwnd);
     todo_wine ok(!err,"mciSendString(%s, buf, sizeof(buf) , NULL) returned error: %d\n", command_close_all, err);
-    todo_wine ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf);
+    ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf);

memset(buf, 0, sizeof(buf));
     err = mciSendString(command_sysinfo, buf, sizeof(buf), NULL);