Alexandre Julliard : winmm/tests: Fix handle casting warnings on 64-bit.
Alexandre Julliard
julliard at winehq.org
Sun Jan 4 09:08:57 CST 2009
Module: wine
Branch: master
Commit: 94d9cfadb0b5b417640bfc1ba1be77b56f9d0753
URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d9cfadb0b5b417640bfc1ba1be77b56f9d0753
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Jan 3 20:15:25 2009 +0100
winmm/tests: Fix handle casting warnings on 64-bit.
---
dlls/winmm/tests/capture.c | 6 +++---
dlls/winmm/tests/wave.c | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c
index f6155e9..c46d35a 100644
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -148,7 +148,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format,
return;
win=NULL;
- rc=waveInOpen(&win,device,pwfx,(DWORD)hevent,0,CALLBACK_EVENT|flags);
+ rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags);
/* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID ||
rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER ||
@@ -255,7 +255,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format,
HWAVEOUT wout;
trace("Playing back recorded sound\n");
- rc=waveOutOpen(&wout,WAVE_MAPPER,pwfx,(DWORD)hevent,0,CALLBACK_EVENT);
+ rc=waveOutOpen(&wout,WAVE_MAPPER,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT);
ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID ||
rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER ||
rc==MMSYSERR_ALLOCATED ||
@@ -295,7 +295,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format,
CloseHandle(hevent);
}
-static void wave_in_test_device(int device)
+static void wave_in_test_device(UINT_PTR device)
{
WAVEINCAPSA capsA;
WAVEINCAPSW capsW;
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index fc6f0ff..b2b3d7c 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -604,8 +604,8 @@ static void wave_out_test_deviceOut(int device, double duration,
BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE;
double paused = 0.0;
double actual;
- DWORD callback = 0;
- DWORD callback_instance = 0;
+ DWORD_PTR callback = 0;
+ DWORD_PTR callback_instance = 0;
HANDLE thread = 0;
DWORD thread_id;
char * buffer;
@@ -619,11 +619,11 @@ static void wave_out_test_deviceOut(int device, double duration,
return;
if ((flags & CALLBACK_TYPEMASK) == CALLBACK_EVENT) {
- callback = (DWORD)hevent;
+ callback = (DWORD_PTR)hevent;
callback_instance = 0;
} else if ((flags & CALLBACK_TYPEMASK) == CALLBACK_FUNCTION) {
- callback = (DWORD)callback_func;
- callback_instance = (DWORD)hevent;
+ callback = (DWORD_PTR)callback_func;
+ callback_instance = (DWORD_PTR)hevent;
} else if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) {
thread = CreateThread(NULL, 0, callback_thread, hevent, 0, &thread_id);
if (thread) {
@@ -827,7 +827,7 @@ EXIT:
HeapFree(GetProcessHeap(), 0, frags);
}
-static void wave_out_test_device(int device)
+static void wave_out_test_device(UINT_PTR device)
{
WAVEOUTCAPSA capsA;
WAVEOUTCAPSW capsW;
More information about the wine-cvs
mailing list