[DSOUND] dsound patch

[Robert Reif]

Make dumpCooperativeLevel global.  Remove extern from some function 
prototypes.
-------------- next part --------------
Index: dlls/dsound/dsound.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/dsound.c,v
retrieving revision 1.46
diff -p -u -r1.46 dsound.c
--- dlls/dsound/dsound.c	14 Jan 2006 16:58:26 -0000	1.46
+++ dlls/dsound/dsound.c	16 Jan 2006 14:34:17 -0000
@@ -45,7 +45,7 @@ static ULONG WINAPI IDirectSound8_IUnkno
 static ULONG WINAPI IDirectSound8_IDirectSound_AddRef(LPDIRECTSOUND iface);
 static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface);
 
-static const char * dumpCooperativeLevel(DWORD level)
+const char * dumpCooperativeLevel(DWORD level)
 {
     static char unknown[32];
 #define LE(x) case x: return #x
Index: dlls/dsound/dsound_private.h
===================================================================
RCS file: /home/wine/wine/dlls/dsound/dsound_private.h,v
retrieving revision 1.39
diff -p -u -r1.39 dsound_private.h
--- dlls/dsound/dsound_private.h	14 Jan 2006 16:58:26 -0000	1.39
+++ dlls/dsound/dsound_private.h	16 Jan 2006 14:34:18 -0000
@@ -491,9 +491,8 @@ struct IClassFactoryImpl
 extern IClassFactoryImpl DSOUND_CAPTURE_CF;
 extern IClassFactoryImpl DSOUND_FULLDUPLEX_CF;
 
-void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan);
-void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan);
-void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb);
+/*******************************************************************************
+ */
 
 /* dsound.c */
 
@@ -520,6 +519,9 @@ void DSOUND_ForceRemix(IDirectSoundBuffe
 void DSOUND_MixCancelAt(IDirectSoundBufferImpl *dsb, DWORD buf_writepos);
 void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq);
 void DSOUND_PerformMix(DirectSoundDevice *device);
+void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan);
+void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan);
+void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb);
 void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2);
 void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2);
 
@@ -541,6 +543,7 @@ extern GUID DSOUND_renderer_guids[MAXWAV
 extern DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS];
 extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS];
 
-extern HRESULT mmErr(UINT err);
-extern void setup_dsound_options(void);
-extern const char * get_device_id(LPCGUID pGuid);
+HRESULT mmErr(UINT err);
+void setup_dsound_options(void);
+const char * get_device_id(LPCGUID pGuid);
+const char * dumpCooperativeLevel(DWORD level);