Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-28 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge from amd64-branch: (Samuel Serapión)

Browse source 
36464: access.cpl: use IntToPtr instead of casting
36454: console.cpl: use LPARAM instead of LONG
36458: main.cpl: use IntToPtr instead of casting
36460: mmsys.cpl: use IntToPtr instead of casting, use INT_PTR instead of INT
36908: ncpa.cpl: use INT_PTR instead of INT
36466: sysdm.cpl: use INT_PTR instead of INT

svn path=/trunk/; revision=40743
This commit is contained in:
Timo Kreuzer 2009-04-29 22:20:59 +00:00
parent 9976d5ec4f
commit 639e528276
8 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/cpl/access/display.c
View file

@ -255,7 +255,7 @@ DisplayPageProc(HWND hwndDlg,
SetCaretBlinkTime(pGlobalData->uCaretBlinkTime);
SystemParametersInfo(SPI_SETCARETWIDTH,
0,
(PVOID)pGlobalData->uCaretWidth,
IntToPtr(pGlobalData->uCaretWidth),
SPIF_UPDATEINIFILE | SPIF_SENDCHANGE /*0*/);
SystemParametersInfo(SPI_SETHIGHCONTRAST,
sizeof(HIGHCONTRAST),

2
reactos/dll/cpl/console/console.c
View file

@ -12,7 +12,7 @@
#define WM_SETCONSOLE (WM_USER+10)
LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam);
LONG APIENTRY InitApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK FontProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK LayoutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

24
reactos/dll/cpl/main/mouse.c
View file

@ -1257,7 +1257,7 @@ PointerProc(IN HWND hwndDlg,
//#if (WINVER >= 0x0500)
if (pPointerData->bOrigDropShadow != pPointerData->bDropShadow)
{
SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bDropShadow), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
pPointerData->bOrigDropShadow = pPointerData->bDropShadow;
}
//#endif
@ -1266,7 +1266,7 @@ PointerProc(IN HWND hwndDlg,
else if (lppsn->hdr.code == PSN_RESET)
{
//#if (WINVER >= 0x0500)
SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bOrigDropShadow, 0);
SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bOrigDropShadow), 0);
//#endif
}
break;
@ -1365,7 +1365,7 @@ PointerProc(IN HWND hwndDlg,
SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
}
//#if (WINVER >= 0x0500)
SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, 0);
SystemParametersInfo(SPI_SETDROPSHADOW, 0, IntToPtr(pPointerData->bDropShadow), 0);
//#endif
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
break;
@ -1549,7 +1549,7 @@ OptionProc(IN HWND hwndDlg,
pOptionData->bMouseVanish = TRUE;
SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
}
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->bMouseVanish, 0);
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), 0);
break;
case IDC_CHECK_SHOW_POINTER:
@ -1563,7 +1563,7 @@ OptionProc(IN HWND hwndDlg,
pOptionData->bMouseSonar = TRUE;
SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0);
}
SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->bMouseSonar, 0);
SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), 0);
break;
}
@ -1577,7 +1577,7 @@ OptionProc(IN HWND hwndDlg,
/* Set mouse speed */
if (pOptionData->ulOrigMouseSpeed != pOptionData->ulMouseSpeed)
{
SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSpeed, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulMouseSpeed), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
pOptionData->ulOrigMouseSpeed = pOptionData->ulMouseSpeed;
}
@ -1607,14 +1607,14 @@ OptionProc(IN HWND hwndDlg,
/* hide pointer while typing */
if (pOptionData->bOrigMouseVanish != pOptionData->bMouseVanish)
{
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->bMouseVanish, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish;
}
/* show pointer with Ctrl-Key */
if (pOptionData->bOrigMouseSonar != pOptionData->bMouseSonar)
{
SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->bMouseSonar, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar;
}
return TRUE;
@ -1622,12 +1622,12 @@ OptionProc(IN HWND hwndDlg,
else if (lppsn->hdr.code == PSN_RESET)
{
/* Set the original mouse speed */
SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulOrigMouseSpeed, 0);
SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulOrigMouseSpeed), 0);
SystemParametersInfo(SPI_SETMOUSE, 0, &pOptionData->OrigMouseAccel, 0);
SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bOrigSnapToDefaultButton, 0, 0);
SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uOrigMouseTrails, 0, 0);
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->bOrigMouseVanish, 0);
SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->bOrigMouseSonar, 0);
SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bOrigMouseVanish), 0);
SystemParametersInfo(SPI_SETMOUSESONAR, 0,IntToPtr(pOptionData->bOrigMouseSonar), 0);
}
break;
@ -1644,7 +1644,7 @@ OptionProc(IN HWND hwndDlg,
case TB_BOTTOM:
case TB_ENDTRACK:
pOptionData->ulMouseSpeed = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_MOUSE_SPEED, TBM_GETPOS, 0, 0) + 1;
SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSpeed, SPIF_SENDCHANGE);
SystemParametersInfo(SPI_SETMOUSESPEED, 0, IntToPtr(pOptionData->ulMouseSpeed), SPIF_SENDCHANGE);
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
break;
#if 0

2
reactos/dll/cpl/mmsys/audio.c
View file

@ -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;

6
reactos/dll/cpl/mmsys/volume.c
View file

@ -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);
}

2
reactos/dll/cpl/ncpa/ncpa.c
View file

@ -25,7 +25,7 @@ DisplayApplet(VOID)
wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}");
return (int) ShellExecuteW(NULL, L"open", L"explorer.exe", szParameters, NULL, SW_SHOWDEFAULT) > 32;
return (INT_PTR) ShellExecuteW(NULL, L"open", L"explorer.exe", szParameters, NULL, SW_SHOWDEFAULT) > 32;
}
/* Control Panel Callback */

2
reactos/dll/cpl/sysdm/hardware.c
View file

@ -17,7 +17,7 @@ LaunchDeviceManager(HWND hWndParent)
{
/* hack for ROS to start our devmgmt until we have mmc */
#ifdef __REACTOS__
return ((INT)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32);
return ((INT_PTR)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32);
#else
HMODULE hDll;
PDEVMGREXEC DevMgrExec;

4
reactos/dll/cpl/sysdm/startrec.c
View file

@ -437,7 +437,7 @@ DeleteBootRecords(HWND hwndDlg)
for (index = 0; index <lIndex; index++)
{
pRecord = (PBOOTRECORD) SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)index, (LPARAM)0);
if ((INT)pRecord != CB_ERR)
if ((INT_PTR)pRecord != CB_ERR)
{
HeapFree(GetProcessHeap(), 0, pRecord);
}
@ -713,7 +713,7 @@ StartRecDlgProc(HWND hwndDlg,
pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)lResult, (LPARAM)0);
if ((INT)pRecord != CB_ERR)
if ((INT_PTR)pRecord != CB_ERR)
{
if (pStartInfo->iFreeLdrIni == 1) // FreeLdrIni style
{