Jörg Höhle : mciwave: Stop must not reset current position.

[Alexandre Julliard]

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

Author: Jörg Höhle 
Date:   Thu Oct 22 09:26:28 2009 +0200

mciwave: Stop must not reset current position.

---

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

diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c
index b8f394e..266fa1b 100644
--- a/dlls/mciwave/mciwave.c
+++ b/dlls/mciwave/mciwave.c
@@ -614,8 +614,6 @@ static DWORD WAVE_mciStop(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS
    break;
     }

-    wmw->dwPosition = 0;
-
     /* sanity resets */
     wmw->dwStatus = MCI_MODE_STOP;

diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c
index e5c7815..f5bdba0 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -446,7 +446,7 @@ static void test_asyncWAVE(HWND hwnd)
     trace("position once stopped: %sms\n",buf);
     p2 = atoi(buf);
     /* An XP machine let the position increase slightly after pause. */
-    todo_wine ok(p2>=p1 && p2<=p1+16,"position changed from %ums to %ums\n",p1,p2);
+    ok(p2>=p1 && p2<=p1+16,"position changed from %ums to %ums\n",p1,p2);

/* No Resume once stopped (waveaudio, sequencer and cdaudio differ). */
     err = mciSendString("resume mysound wait", NULL, 0, NULL);