Andrew Eikum : dsound: Eliminate leftover driver structures.

[Alexandre Julliard]

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

Author: Andrew Eikum 
Date:   Tue Sep 27 15:19:04 2011 -0500

dsound: Eliminate leftover driver structures.

---

dlls/dsound/capture.c        |    2 -
 dlls/dsound/dsound.c         |    6 +---
 dlls/dsound/dsound_private.h |   58 +----------------------------------------
 dlls/dsound/primary.c        |    1 -
 4 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 9a56e65..7569254 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -1029,8 +1029,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize(

device->mmdevice = mmdevice;

-    device->drvdesc.dwFlags = 0;
-
     device->drvcaps.dwFlags = 0;

device->drvcaps.dwFormats = 0;
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index 49b39a1..8006f5d 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -1335,10 +1335,8 @@ HRESULT DirectSoundDevice_GetCaps(
     lpDSCaps->dwTotalHwMemBytes                 = device->drvcaps.dwTotalHwMemBytes;
     lpDSCaps->dwFreeHwMemBytes                  = device->drvcaps.dwFreeHwMemBytes;
     lpDSCaps->dwMaxContigFreeHwMemBytes         = device->drvcaps.dwMaxContigFreeHwMemBytes;
-
-    /* driver doesn't have these */
-    lpDSCaps->dwUnlockTransferRateHwBuffers     = 4096; /* But we have none... */
-    lpDSCaps->dwPlayCpuOverheadSwBuffers        = 1;    /* 1% */
+    lpDSCaps->dwUnlockTransferRateHwBuffers     = device->drvcaps.dwUnlockTransferRateHwBuffers;
+    lpDSCaps->dwPlayCpuOverheadSwBuffers        = device->drvcaps.dwPlayCpuOverheadSwBuffers;

return DS_OK;
 }
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index b6f7e7d..075f914 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -65,47 +65,6 @@ extern const mixfunc mixfunctions[4] DECLSPEC_HIDDEN;
 typedef void (*normfunc)(const void *, void *, unsigned);
 extern const normfunc normfunctions[4] DECLSPEC_HIDDEN;

-typedef struct _DSDRIVERDESC
-{
-    DWORD      	dwFlags;
-    CHAR	szDesc[256];
-    CHAR	szDrvname[256];
-    DWORD	dnDevNode;
-    WORD	wVxdId;
-    WORD	wReserved;
-    ULONG	ulDeviceNum;
-    DWORD	dwHeapType;
-    LPVOID	pvDirectDrawHeap;
-    DWORD	dwMemStartAddress;
-    DWORD	dwMemEndAddress;
-    DWORD	dwMemAllocExtra;
-    LPVOID	pvReserved1;
-    LPVOID	pvReserved2;
-} DSDRIVERDESC,*PDSDRIVERDESC;
-
-typedef struct _DSDRIVERCAPS
-{
-    DWORD	dwFlags;
-    DWORD	dwMinSecondarySampleRate;
-    DWORD	dwMaxSecondarySampleRate;
-    DWORD	dwPrimaryBuffers;
-    DWORD	dwMaxHwMixingAllBuffers;
-    DWORD	dwMaxHwMixingStaticBuffers;
-    DWORD	dwMaxHwMixingStreamingBuffers;
-    DWORD	dwFreeHwMixingAllBuffers;
-    DWORD	dwFreeHwMixingStaticBuffers;
-    DWORD	dwFreeHwMixingStreamingBuffers;
-    DWORD	dwMaxHw3DAllBuffers;
-    DWORD	dwMaxHw3DStaticBuffers;
-    DWORD	dwMaxHw3DStreamingBuffers;
-    DWORD	dwFreeHw3DAllBuffers;
-    DWORD	dwFreeHw3DStaticBuffers;
-    DWORD	dwFreeHw3DStreamingBuffers;
-    DWORD	dwTotalHwMemBytes;
-    DWORD	dwFreeHwMemBytes;
-    DWORD	dwMaxContigFreeHwMemBytes;
-} DSDRIVERCAPS,*PDSDRIVERCAPS;
-
 typedef struct _DSVOLUMEPAN
 {
     DWORD	dwTotalLeftAmpFactor;
@@ -117,14 +76,6 @@ typedef struct _DSVOLUMEPAN
     DWORD	dwPanRightAmpFactor;
 } DSVOLUMEPAN,*PDSVOLUMEPAN;

-typedef struct _DSCDRIVERCAPS
-{
-    DWORD	dwSize;
-    DWORD	dwFlags;
-    DWORD	dwFormats;
-    DWORD	dwChannels;
-} DSCDRIVERCAPS,*PDSCDRIVERCAPS;
-
 /*****************************************************************************
  * IDirectSoundDevice implementation structure
  */
@@ -133,8 +84,7 @@ struct DirectSoundDevice
     LONG                        ref;

GUID                        guid;
-    DSDRIVERDESC                drvdesc;
-    DSDRIVERCAPS                drvcaps;
+    DSCAPS                      drvcaps;
     DWORD                       priolevel;
     PWAVEFORMATEX               pwfx;
     UINT                        timerID, pwplay, pwqueue, prebuf, helfrags;
@@ -272,15 +222,11 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN;
  */
 struct DirectSoundCaptureDevice
 {
-    /* IDirectSoundCaptureImpl fields */
     GUID                               guid;
     LONG                               ref;

-    /* DirectSound driver stuff */
-    DSDRIVERDESC                       drvdesc;
-    DSCDRIVERCAPS                      drvcaps;
+    DSCCAPS                            drvcaps;

-    /* more stuff */
     LPBYTE                             buffer;
     DWORD                              buflen, write_pos_bytes;

diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 24db07d..7243cc6 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -105,7 +105,6 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave)
         device->volume = NULL;
     }

-    device->drvdesc.dwFlags = 0;
     hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient,
             CLSCTX_INPROC_SERVER, NULL, (void **)&device->client);
     if(FAILED(hres)){