dlls/dsound/dsp/0030_fix_dsound_build.patch

   1 commit fa31ac30722d7ef48790f4544b7291098d467706
   2 Author: Maarten Lankhorst <m.b.lankhorst@gmail.com>
   3 Date:   Sat Jul 23 15:37:38 2011 +0200
   4
   5     fix dsound build
   6
   7 diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
   8 index 917da91..7ba63d4 100644
   9 --- a/dlls/dsound/dsound_main.c
  10 +++ b/dlls/dsound/dsound_main.c
  11 @@ -66,6 +66,7 @@
  12  #include "devpkey.h"
  13
  14  #include "dsound_private.h"
  15 +#include "eax.h"
  16
  17  WINE_DEFAULT_DEBUG_CHANNEL(dsound);
  18
  19 diff --git a/dlls/dsound/eax.h b/dlls/dsound/eax.h
  20 index 7092840..e41e83e 100644
  21 --- a/dlls/dsound/eax.h
  22 +++ b/dlls/dsound/eax.h
  23 @@ -17,6 +17,9 @@
  24   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  25   */
  26
  27 +#ifndef EAX_H
  28 +#define EAX_H
  29 +
  30  extern IID DSPROPSETID_EAX20_ListenerProperties;
  31  typedef enum {
  32      DSPROPERTY_EAXLISTENER_NONE,
  33 @@ -160,3 +163,5 @@ enum {
  34  };
  35
  36  extern const EAXLISTENERPROPERTIES EnvironmentDefaults[EAX_ENVIRONMENT_COUNT];
  37 +
  38 +#endif
  39 diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
  40 index 53add8c..f7d04bb 100644
  41 --- a/dlls/dsound/propset.c
  42 +++ b/dlls/dsound/propset.c
  43 @@ -266,8 +266,6 @@ static HRESULT DSPROPERTY_DescriptionW(
  44          }
  45      }
  46
  47 -    setup_dsound_options();
  48 -
  49      GetDeviceID(&ppd->DeviceId, &dev_guid);
  50
  51      wodn = waveOutGetNumDevs();