From a41608c1c6aba97e997ee901ccaf3204a9dccd07 Mon Sep 17 00:00:00 2001 From: Samuel Serapion Date: Wed, 24 Sep 2008 10:18:20 +0000 Subject: [PATCH] Minor 64bit fixes. svn path=/branches/ros-amd64-bringup/; revision=36460 --- reactos/dll/cpl/mmsys/audio.c | 2 +- reactos/dll/cpl/mmsys/volume.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reactos/dll/cpl/mmsys/audio.c b/reactos/dll/cpl/mmsys/audio.c index 5dd7bb07e7f..778d3dc5d4c 100644 --- a/reactos/dll/cpl/mmsys/audio.c +++ b/reactos/dll/cpl/mmsys/audio.c @@ -107,7 +107,7 @@ GetDevNum(HWND hControl, DWORD Id) if (DevNum == (UINT) CB_ERR) return 0; - if (mixerGetID((HMIXEROBJ) DevNum, &DevNum, Id) != MMSYSERR_NOERROR) + if (mixerGetID((HMIXEROBJ)IntToPtr(DevNum), &DevNum, Id) != MMSYSERR_NOERROR) return 0; return DevNum; diff --git a/reactos/dll/cpl/mmsys/volume.c b/reactos/dll/cpl/mmsys/volume.c index e0db2673c3e..7017e9983a3 100644 --- a/reactos/dll/cpl/mmsys/volume.c +++ b/reactos/dll/cpl/mmsys/volume.c @@ -237,14 +237,14 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) return; } - if (mixerOpen(&pGlobalData->hMixer, 0, (DWORD)hwndDlg, 0, MIXER_OBJECTF_MIXER | CALLBACK_WINDOW) != MMSYSERR_NOERROR) + if (mixerOpen(&pGlobalData->hMixer, 0, PtrToUlong(hwndDlg), 0, MIXER_OBJECTF_MIXER | CALLBACK_WINDOW) != MMSYSERR_NOERROR) { MessageBox(hwndDlg, _T("Cannot open mixer"), NULL, MB_OK); return; } ZeroMemory(&mxc, sizeof(MIXERCAPS)); - if (mixerGetDevCaps((UINT)pGlobalData->hMixer, &mxc, sizeof(MIXERCAPS)) != MMSYSERR_NOERROR) + if (mixerGetDevCaps(PtrToUint(pGlobalData->hMixer), &mxc, sizeof(MIXERCAPS)) != MMSYSERR_NOERROR) { MessageBox(hwndDlg, _T("mixerGetDevCaps failed"), NULL, MB_OK); return; @@ -278,7 +278,7 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) VOID LaunchSoundControl(HWND hwndDlg) { - if ((INT)ShellExecuteW(NULL, L"open", L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL) > 32) + if ((INT_PTR)ShellExecuteW(NULL, L"open", L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL) > 32) return; MessageBox(hwndDlg, _T("Cannot run sndvol32.exe"), NULL, MB_OK); }