Jörg Höhle : winmm: Audio drivers unconditionally invoke DriverCallback.

[Alexandre Julliard]

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

Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date:   Tue Mar  8 09:28:58 2011 +0100

winmm: Audio drivers unconditionally invoke DriverCallback.

---

 dlls/winealsa.drv/wavein.c     |    7 ++-----
 dlls/winealsa.drv/waveout.c    |    7 ++-----
 dlls/winecoreaudio.drv/audio.c |   20 ++++++--------------
 dlls/wineoss.drv/audio.c       |   18 ++++++------------
 4 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c
index 3a2fad8..67759a6 100644
--- a/dlls/winealsa.drv/wavein.c
+++ b/dlls/winealsa.drv/wavein.c
@@ -74,11 +74,8 @@ static void widNotifyClient(WINE_WAVEDEV* wwi, WORD wMsg, DWORD_PTR dwParam1, DW
    case WIM_OPEN:
    case WIM_CLOSE:
    case WIM_DATA:
-       if (wwi->wFlags != DCB_NULL &&
-	   !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave,
-			   wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2)) {
-	   WARN("can't notify client !\n");
-       }
+       DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags, (HDRVR)wwi->waveDesc.hWave,
+                      wMsg, wwi->waveDesc.dwInstance, dwParam1, dwParam2);
        break;
    default:
        FIXME("Unknown callback message %u\n", wMsg);
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 127e50e..9290778 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -75,11 +75,8 @@ static void wodNotifyClient(WINE_WAVEDEV* wwo, WORD wMsg, DWORD_PTR dwParam1, DW
     case WOM_OPEN:
     case WOM_CLOSE:
     case WOM_DONE:
-	if (wwo->wFlags != DCB_NULL &&
-	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave,
-			    wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2)) {
-	    WARN("can't notify client !\n");
-	}
+        DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags, (HDRVR)wwo->waveDesc.hWave,
+                       wMsg, wwo->waveDesc.dwInstance, dwParam1, dwParam2);
 	break;
     default:
 	FIXME("Unknown callback message %u\n", wMsg);
diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c
index faf4f54..43420b1 100644
--- a/dlls/winecoreaudio.drv/audio.c
+++ b/dlls/winecoreaudio.drv/audio.c
@@ -792,13 +792,9 @@ static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD_PTR dwP
         case WOM_OPEN:
         case WOM_CLOSE:
         case WOM_DONE:
-            if (wwo->wFlags != DCB_NULL &&
-                !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags,
-                                (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance,
-                                dwParam1, dwParam2))
-            {
-                WARN("can't notify client !\n");
-            }
+            DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags,
+                           (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance,
+                           dwParam1, dwParam2);
             break;
         default:
             FIXME("Unknown callback message %u\n", wMsg);
@@ -1752,13 +1748,9 @@ static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWO
         case WIM_OPEN:
         case WIM_CLOSE:
         case WIM_DATA:
-            if (wwi->wFlags != DCB_NULL &&
-                !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags,
-                                (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance,
-                                dwParam1, dwParam2))
-            {
-                WARN("can't notify client !\n");
-            }
+            DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags,
+                           (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance,
+                           dwParam1, dwParam2);
             break;
         default:
             FIXME("Unknown callback message %u\n", wMsg);
diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c
index 7e1ca43..0e27e21 100644
--- a/dlls/wineoss.drv/audio.c
+++ b/dlls/wineoss.drv/audio.c
@@ -1444,12 +1444,9 @@ static void wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DW
     case WOM_OPEN:
     case WOM_CLOSE:
     case WOM_DONE:
-	if (wwo->wFlags != DCB_NULL &&
-	    !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags,
-			    (HDRVR)wwo->waveDesc.hWave, wMsg,
-			    wwo->waveDesc.dwInstance, dwParam1, dwParam2)) {
-	    WARN("can't notify client !\n");
-	}
+        DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags,
+                       (HDRVR)wwo->waveDesc.hWave, wMsg,
+                       wwo->waveDesc.dwInstance, dwParam1, dwParam2);
 	break;
     default:
 	FIXME("Unknown callback message %u\n", wMsg);
@@ -2478,12 +2475,9 @@ static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWO
     case WIM_OPEN:
     case WIM_CLOSE:
     case WIM_DATA:
-	if (wwi->wFlags != DCB_NULL &&
-	    !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags,
-			    (HDRVR)wwi->waveDesc.hWave, wMsg,
-			    wwi->waveDesc.dwInstance, dwParam1, dwParam2)) {
-	    WARN("can't notify client !\n");
-	}
+        DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags,
+                       (HDRVR)wwi->waveDesc.hWave, wMsg,
+                       wwi->waveDesc.dwInstance, dwParam1, dwParam2);
 	break;
     default:
 	FIXME("Unknown callback message %u\n", wMsg);