Now using manifest constant instead of raw values for all the

DRV_QUERY??? values.
This commit is contained in:
Eric Pouech 2001-01-04 19:53:51 +00:00 committed by Alexandre Julliard
parent 97c781aac2
commit ad250aac34
4 changed files with 21 additions and 10 deletions

View File

@ -39,6 +39,7 @@
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "mmddk.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "debugtools.h" #include "debugtools.h"
#include "dsound.h" #include "dsound.h"
@ -3119,8 +3120,8 @@ HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND *ppDS,IUnknown *pU
wod = 0; wod = 0;
/* Get output device caps */ /* Get output device caps */
waveOutGetDevCapsA(wod, &wcaps, sizeof(wcaps)); waveOutGetDevCapsA(wod, &wcaps, sizeof(wcaps));
/* 0x810 is a "Wine extension" to get the DSound interface */ /* DRV_QUERYDSOUNDIFACE is a "Wine extension" to get the DSound interface */
waveOutMessage(wod, 0x810, (DWORD)&drv, 0); waveOutMessage(wod, DRV_QUERYDSOUNDIFACE, (DWORD)&drv, 0);
/* Allocate memory */ /* Allocate memory */
*ippDS = (IDirectSoundImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectSoundImpl)); *ippDS = (IDirectSoundImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectSoundImpl));

View File

@ -2258,26 +2258,26 @@ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, DWORD dwParam1,
/* all those function calls are undocumented */ /* all those function calls are undocumented */
switch (uMsg) { switch (uMsg) {
case 0x801: /* DRV_QUERYDRVENTRY */ case DRV_QUERYDRVENTRY:
lstrcpynA((LPSTR)dwParam1, lpDrv->name, LOWORD(dwParam2)); lstrcpynA((LPSTR)dwParam1, lpDrv->name, LOWORD(dwParam2));
break; break;
case 0x802: /* DRV_QUERYDEVNODE */ case DRV_QUERYDEVNODE:
*(LPDWORD)dwParam1 = 0L; /* should be DevNode */ *(LPDWORD)dwParam1 = 0L; /* should be DevNode */
break; break;
case 0x803: /* DRV_QUERYNAME */ case DRV_QUERYNAME:
WARN("NIY 0x803\n"); WARN("NIY QueryName\n");
break; break;
case 0x804: /* DRV_QUERYDRIVERIDS */ case DRV_QUERYDRIVERIDS:
WARN("NIY call VxD\n"); WARN("NIY call VxD\n");
/* should call VxD MMDEVLDR with (DevNode, dwParam1 and dwParam2) as pmts /* should call VxD MMDEVLDR with (DevNode, dwParam1 and dwParam2) as pmts
* dwParam1 is buffer and dwParam2 is sizeof buffer * dwParam1 is buffer and dwParam2 is sizeof buffer
* I don't know where the result is stored though * I don't know where the result is stored though
*/ */
break; break;
case 0x805: /* DRV_QUERYMAPPABLE */ case DRV_QUERYMAPPABLE:
return (lpDrv->bIsMapper) ? 2 : 0; 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); return MMDRV_Message(mld, uMsg, dwParam1, dwParam2, TRUE);
default: default:

View File

@ -1254,7 +1254,8 @@ DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
case WODM_SETVOLUME: return wodSetVolume (wDevID, dwParam1); case WODM_SETVOLUME: return wodSetVolume (wDevID, dwParam1);
case WODM_RESTART: return wodRestart (wDevID); case WODM_RESTART: return wodRestart (wDevID);
case WODM_RESET: return wodReset (wDevID); case WODM_RESET: return wodReset (wDevID);
case 0x810: return wodDsCreate(wDevID, (PIDSDRIVER*)dwParam1);
case DRV_QUERYDSOUNDIFACE: return wodDsCreate(wDevID, (PIDSDRIVER*)dwParam1);
default: default:
FIXME("unknown message %d!\n", wMsg); FIXME("unknown message %d!\n", wMsg);
} }

View File

@ -62,6 +62,15 @@ typedef struct {
#define DRVM_MAPPER_STATUS (DRVM_MAPPER+0) #define DRVM_MAPPER_STATUS (DRVM_MAPPER+0)
#define DRVM_MAPPER_RECONFIGURE (DRVM_MAPPER+1) #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_INIT DRVM_INIT
#define WODM_GETNUMDEVS 3 #define WODM_GETNUMDEVS 3
#define WODM_GETDEVCAPS 4 #define WODM_GETDEVCAPS 4