[PATCH 1/2] dsound: Fix the declaration/definition of DSOUND_timer().

[Michael Stefaniuc]

---
 dlls/dsound/dsound_private.h |    2 +-
 dlls/dsound/mixer.c          |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index ca4932c..cb14457 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -445,7 +445,7 @@ void DSOUND_WaveQueue(DirectSoundDevice 
 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_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2);
 void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2);
 
 /* sound3d.c */
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index 92f4914..2f88e46 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -1107,7 +1107,8 @@ #endif
 	}
 }
 
-void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2)
+void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser,
+                           DWORD_PTR dw1, DWORD_PTR dw2)
 {
         DirectSoundDevice * device = (DirectSoundDevice*)dwUser;
 	DWORD start_time =  GetTickCount();
-- 
1.4.2.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061112/6278aeea/attachment.pgp