Maarten Lankhorst : wineoss.drv: Clean up DriverProc.
Alexandre Julliard
julliard at winehq.org
Wed Apr 21 10:40:26 CDT 2010
Module: wine
Branch: master
Commit: d54dcdfedb9ca86bee9ead6c5265329aae8dcdaf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d54dcdfedb9ca86bee9ead6c5265329aae8dcdaf
Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Wed Apr 21 13:45:28 2010 +0200
wineoss.drv: Clean up DriverProc.
---
dlls/wineoss.drv/oss.c | 36 ++++++++++--------------------------
1 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index 2632cd4..1d80272 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -61,24 +61,6 @@ static LRESULT OSS_drvFree(void)
return 1;
}
-/**************************************************************************
- * OSS_drvOpen [internal]
- */
-static LRESULT OSS_drvOpen(LPSTR str)
-{
- TRACE("(%s)\n", str);
- return 1;
-}
-
-/**************************************************************************
- * OSS_drvClose [internal]
- */
-static LRESULT OSS_drvClose(DWORD_PTR dwDevID)
-{
- TRACE("(%08lx)\n", dwDevID);
- return 1;
-}
-
#endif
@@ -95,16 +77,18 @@ LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
#ifdef HAVE_OSS
case DRV_LOAD: return OSS_drvLoad();
case DRV_FREE: return OSS_drvFree();
- case DRV_OPEN: return OSS_drvOpen((LPSTR)dwParam1);
- case DRV_CLOSE: return OSS_drvClose(dwDevID);
- case DRV_ENABLE: return 1;
- case DRV_DISABLE: return 1;
- case DRV_QUERYCONFIGURE: return 1;
+ case DRV_OPEN:
+ case DRV_CLOSE:
+ case DRV_ENABLE:
+ case DRV_DISABLE:
+ case DRV_QUERYCONFIGURE:
+ return 1;
case DRV_CONFIGURE: MessageBoxA(0, "OSS MultiMedia Driver !", "OSS 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