Michael Stefaniuc : dsound: Fix the declaration/definition of
DSOUND_timer( ).
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 13 06:29:39 CST 2006
Module: wine
Branch: master
Commit: 0f08667c8a7fdf8ff47acc2e23c9d58a77209087
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f08667c8a7fdf8ff47acc2e23c9d58a77209087
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Sun Nov 12 14:39:11 2006 +0100
dsound: Fix the declaration/definition of DSOUND_timer().
---
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();
More information about the wine-cvs
mailing list