dsound tests: Fix compilation with the MS DirectX headers

[Francois Gouget]

As of DirectX 9.0b, the DirectX headers don't define DSBCAPS_CTRLDEFAULT 
and DSBCAPS_CTRLALL, although these are still mentionned in the MSDN.

Unfortunately a recent patch added a reference to DSBCAPS_CTRLALL in the 
ds3d.c conformance test, thus causing a compilation error on Windows.

Now, this reference is in a function which simply dumps the buffer 
capabilities. But since the above macros are just a combination of other 
capabilities their use in the dumping function is redundant. So this 
patch simply removes them from two such functions.


Changelog:

  * dlls/dsound/dsound.c
    dlls/dsound/tests/ds3d.c

    Francois Gouget <fgouget at codeweavers.com>
    Don't use DSBCAPS_{CTRLDEFAULT,CTRLALL} in capability-dumping 
functions since they are nothing but a combination of other flags and 
are thus redundant.
    Fixes a compilation error with the Microsoft DirectX headers.

-- 
Francois Gouget
fgouget at codeweavers.com

-------------- next part --------------
Index: dlls/dsound/dsound.c
===================================================================
RCS file: /var/cvs/wine/dlls/dsound/dsound.c,v
retrieving revision 1.17
diff -u -r1.17 dsound.c
--- dlls/dsound/dsound.c	25 Aug 2004 02:09:00 -0000	1.17
+++ dlls/dsound/dsound.c	31 Aug 2004 13:57:03 -0000
@@ -117,8 +117,6 @@
         FE(DSBCAPS_CTRLPAN)
         FE(DSBCAPS_CTRLVOLUME)
         FE(DSBCAPS_CTRLPOSITIONNOTIFY)
-        FE(DSBCAPS_CTRLDEFAULT)
-        FE(DSBCAPS_CTRLALL)
         FE(DSBCAPS_STICKYFOCUS)
         FE(DSBCAPS_GLOBALFOCUS)
         FE(DSBCAPS_GETCURRENTPOSITION2)
Index: dlls/dsound/tests/ds3d.c
===================================================================
RCS file: /var/cvs/wine/dlls/dsound/tests/ds3d.c,v
retrieving revision 1.12
diff -u -r1.12 ds3d.c
--- dlls/dsound/tests/ds3d.c	25 Aug 2004 02:09:00 -0000	1.12
+++ dlls/dsound/tests/ds3d.c	31 Aug 2004 13:54:07 -0000
@@ -86,7 +86,6 @@
         FE(DSBCAPS_CTRLPAN)
         FE(DSBCAPS_CTRLVOLUME)
         FE(DSBCAPS_CTRLPOSITIONNOTIFY)
-        FE(DSBCAPS_CTRLALL)
         FE(DSBCAPS_STICKYFOCUS)
         FE(DSBCAPS_GLOBALFOCUS)
         FE(DSBCAPS_GETCURRENTPOSITION2)