From 0f08667c8a7fdf8ff47acc2e23c9d58a77209087 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Sun, 12 Nov 2006 14:39:11 +0100 Subject: [PATCH] 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 ca4932c90a3..cb14457ea98 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -445,7 +445,7 @@ void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq); 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 92f4914e616..2f88e464a42 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -1107,7 +1107,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) } } -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();