Maarten Lankhorst : winealsa.drv: Clean up DriverProc.

Alexandre Julliard julliard at winehq.org
Wed Apr 21 10:40:26 CDT 2010


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

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Wed Apr 21 13:45:27 2010 +0200

winealsa.drv: Clean up DriverProc.

---

 dlls/winealsa.drv/alsa.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 4ea1f1d..5ed7109 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -727,18 +727,19 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
 #ifdef HAVE_ALSA
     case DRV_LOAD:		ALSA_WaveInit();
 				ALSA_MidiInit();
-				return 1;
-    case DRV_FREE:		return 1;
-    case DRV_OPEN:		return 1;
-    case DRV_CLOSE:		return 1;
-    case DRV_ENABLE:		return 1;
-    case DRV_DISABLE:		return 1;
-    case DRV_QUERYCONFIGURE:	return 1;
+    case DRV_FREE:
+    case DRV_OPEN:
+    case DRV_CLOSE:
+    case DRV_ENABLE:
+    case DRV_DISABLE:
+    case DRV_QUERYCONFIGURE:
+        return 1;
     case DRV_CONFIGURE:		MessageBoxA(0, "ALSA MultiMedia Driver !", "ALSA Driver", MB_OK);	return 1;
-    case DRV_INSTALL:		return DRVCNF_RESTART;
-    case DRV_REMOVE:		return DRVCNF_RESTART;
+    case DRV_INSTALL:
+    case DRV_REMOVE:
+        return DRV_SUCCESS;
 #endif
     default:
-	return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2);
+	return 0;
     }
 }




More information about the wine-cvs mailing list