From 1b21fe827f385d0cc0cc8b900994ce56de656cad Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Tue, 3 Apr 2012 09:14:16 -0500 Subject: [PATCH] mmddk.h: Remove unused, Wine-specific WinMM defines. --- dlls/dsound/dsound.c | 4 ---- dlls/winmm/lolvldrv.c | 4 ---- include/mmddk.h | 8 -------- 3 files changed, 16 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 444b933238f..91184c9c806 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1203,10 +1203,6 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) return DSERR_OUTOFMEMORY; } - /* We rely on the sound driver to return the actual sound format of - * the device if it does not support 22050x8x2 and is given the - * WAVE_DIRECTSOUND flag. - */ device->pwfx->wFormatTag = WAVE_FORMAT_PCM; device->pwfx->nSamplesPerSec = ds_default_sample_rate; device->pwfx->wBitsPerSample = ds_default_bits_per_sample; diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 820d28b08d7..7081a868235 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -340,10 +340,6 @@ UINT MMDRV_PhysicalFeatures(LPWINE_MLD mld, UINT uMsg, case DRV_QUERYDEVICEINTERFACESIZE: return MMDRV_Message(mld, uMsg, dwParam1, dwParam2); - case DRV_QUERYDSOUNDIFACE: /* Wine-specific: Retrieve DirectSound interface */ - case DRV_QUERYDSOUNDDESC: /* Wine-specific: Retrieve DirectSound driver description*/ - return MMDRV_Message(mld, uMsg, dwParam1, dwParam2); - default: WARN("Unknown call %04x\n", uMsg); return MMSYSERR_INVALPARAM; diff --git a/include/mmddk.h b/include/mmddk.h index d6359ef451a..d4217f2ebef 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -91,10 +91,6 @@ typedef struct { #define DRV_QUERYIDFROMSTRINGID (DRV_RESERVED + 16) #define DRV_QUERYFUNCTIONINSTANCEID (DRV_RESERVED + 17) #define DRV_QUERYFUNCTIONINSTANCEIDSIZE (DRV_RESERVED + 18) -#ifdef __WINESRC__ -#define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) -#define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21) -#endif #define DRVM_MAPPER_PREFERRED_FLAGS_PREFERREDONLY 0x00000001 @@ -466,10 +462,6 @@ BOOL WINAPI mmTaskSignal(DWORD); VOID WINAPI mmTaskYield(VOID); DWORD WINAPI mmGetCurrentTask(VOID); -#ifdef __WINESRC__ -#define WAVE_DIRECTSOUND 0x0080 -#endif - #include #ifdef __cplusplus