Author: sserapion
Date: Wed Sep 24 05:18:20 2008
New Revision: 36460
URL:
http://svn.reactos.org/svn/reactos?rev=36460&view=rev
Log:
Minor 64bit fixes.
Modified:
branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c
branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Wed Sep 24
05:18:20 2008
@@ -107,7 +107,7 @@
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;
Modified: branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Wed Sep 24
05:18:20 2008
@@ -237,14 +237,14 @@
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 @@
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);
}