From ad250aac34488e5e89af920fc87f3196b3bfe319 Mon Sep 17 00:00:00 2001
From: Eric Pouech <Eric.Pouech@wanadoo.fr>
Date: Thu, 4 Jan 2001 19:53:51 +0000
Subject: [PATCH] Now using manifest constant instead of raw values for all the
 DRV_QUERY??? values.

---
 dlls/dsound/dsound_main.c  |  5 +++--
 dlls/winmm/lolvldrv.c      | 14 +++++++-------
 dlls/winmm/wineoss/audio.c |  3 ++-
 include/mmddk.h            |  9 +++++++++
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 80b6c2506d1..22291128a84 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -39,6 +39,7 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "mmsystem.h"
+#include "mmddk.h"
 #include "wine/windef16.h"
 #include "debugtools.h"
 #include "dsound.h"
@@ -3119,8 +3120,8 @@ HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND *ppDS,IUnknown *pU
 	wod = 0;
 	/* Get output device caps */
 	waveOutGetDevCapsA(wod, &wcaps, sizeof(wcaps));
-	/* 0x810 is a "Wine extension" to get the DSound interface */
-	waveOutMessage(wod, 0x810, (DWORD)&drv, 0);
+	/* DRV_QUERYDSOUNDIFACE is a "Wine extension" to get the DSound interface */
+	waveOutMessage(wod, DRV_QUERYDSOUNDIFACE, (DWORD)&drv, 0);
 
 	/* Allocate memory */
 	*ippDS = (IDirectSoundImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectSoundImpl));
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index b13917ec211..f1b25e90c36 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -2258,26 +2258,26 @@ UINT	MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1,
 
     /* all those function calls are undocumented */
     switch (uMsg) {
-    case 0x801: /* DRV_QUERYDRVENTRY */
+    case DRV_QUERYDRVENTRY:
 	lstrcpynA((LPSTR)dwParam1, lpDrv->name, LOWORD(dwParam2));
 	break;
-    case 0x802: /* DRV_QUERYDEVNODE */
+    case DRV_QUERYDEVNODE:
 	*(LPDWORD)dwParam1 = 0L; /* should be DevNode */
 	break;
-    case 0x803:	/* DRV_QUERYNAME */
-	WARN("NIY 0x803\n");
+    case DRV_QUERYNAME:
+	WARN("NIY QueryName\n");
 	break;
-    case 0x804: /* DRV_QUERYDRIVERIDS */
+    case DRV_QUERYDRIVERIDS:
 	WARN("NIY call VxD\n");
 	/* should call VxD MMDEVLDR with (DevNode, dwParam1 and dwParam2) as pmts
 	 * dwParam1 is buffer and dwParam2 is sizeof buffer
 	 * I don't know where the result is stored though
 	 */
 	break;
-    case 0x805: /* DRV_QUERYMAPPABLE */
+    case DRV_QUERYMAPPABLE:
 	return (lpDrv->bIsMapper) ? 2 : 0;
 
-    case 0x810: /* Wine-specific: Retrieve DirectSound interface */
+    case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */
 	return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
 
     default:
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 9b59667f1c8..c0f71a8bb19 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -1254,7 +1254,8 @@ DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
     case WODM_SETVOLUME:	return wodSetVolume	(wDevID, dwParam1);
     case WODM_RESTART:		return wodRestart	(wDevID);
     case WODM_RESET:		return wodReset		(wDevID);
-    case 0x810:			return wodDsCreate(wDevID, (PIDSDRIVER*)dwParam1);
+
+    case DRV_QUERYDSOUNDIFACE:	return wodDsCreate(wDevID, (PIDSDRIVER*)dwParam1);
     default:
 	FIXME("unknown message %d!\n", wMsg);
     }
diff --git a/include/mmddk.h b/include/mmddk.h
index 53b517dae2d..67e69e6daad 100644
--- a/include/mmddk.h
+++ b/include/mmddk.h
@@ -62,6 +62,15 @@ typedef struct {
 #define DRVM_MAPPER_STATUS      (DRVM_MAPPER+0)
 #define DRVM_MAPPER_RECONFIGURE (DRVM_MAPPER+1)
 
+#define DRV_QUERYDRVENTRY	(DRV_RESERVED + 1)
+#define DRV_QUERYDEVNODE	(DRV_RESERVED + 2)
+#define DRV_QUERYNAME		(DRV_RESERVED + 3)
+#define DRV_QUERYDRIVERIDS	(DRV_RESERVED + 4)
+#define DRV_QUERYMAPPABLE	(DRV_RESERVED + 5)
+#ifdef __WINE__
+#define DRV_QUERYDSOUNDIFACE	(DRV_RESERVED + 10)
+#endif
+
 #define WODM_INIT		DRVM_INIT
 #define WODM_GETNUMDEVS		 3
 #define WODM_GETDEVCAPS		 4