From cadf2f6abb8a9afb80f25feb27bd05d02a1d6eea Mon Sep 17 00:00:00 2001 From: Samuel Serapion Date: Wed, 24 Sep 2008 10:05:05 +0000 Subject: [PATCH] Convert to spec. Sprinkle IntToPtr all over mouse.c svn path=/branches/ros-amd64-bringup/; revision=36458 --- reactos/dll/cpl/main/main.def | 6 ------ reactos/dll/cpl/main/main.rbuild | 3 ++- reactos/dll/cpl/main/main.spec | 1 + reactos/dll/cpl/main/mouse.c | 24 ++++++++++++------------ 4 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 reactos/dll/cpl/main/main.def create mode 100644 reactos/dll/cpl/main/main.spec diff --git a/reactos/dll/cpl/main/main.def b/reactos/dll/cpl/main/main.def deleted file mode 100644 index bcdd1dd2402..00000000000 --- a/reactos/dll/cpl/main/main.def +++ /dev/null @@ -1,6 +0,0 @@ -LIBRARY main.cpl - -EXPORTS -CPlApplet@16 - -; EOF diff --git a/reactos/dll/cpl/main/main.rbuild b/reactos/dll/cpl/main/main.rbuild index 6867590fc24..b48a6b6c891 100644 --- a/reactos/dll/cpl/main/main.rbuild +++ b/reactos/dll/cpl/main/main.rbuild @@ -1,7 +1,7 @@ - + . 0x600 0x501 @@ -17,4 +17,5 @@ main.c mouse.c main.rc + main.spec diff --git a/reactos/dll/cpl/main/main.spec b/reactos/dll/cpl/main/main.spec new file mode 100644 index 00000000000..9e552162fb0 --- /dev/null +++ b/reactos/dll/cpl/main/main.spec @@ -0,0 +1 @@ +@ stdcall CPlApplet(ptr long ptr ptr) diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c index 424c7ce94d2..8efec21fe87 100644 --- a/reactos/dll/cpl/main/mouse.c +++ b/reactos/dll/cpl/main/mouse.c @@ -1260,7 +1260,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 @@ -1269,7 +1269,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; @@ -1368,7 +1368,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; @@ -1552,7 +1552,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: @@ -1566,7 +1566,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; } @@ -1580,7 +1580,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; } @@ -1610,14 +1610,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; @@ -1625,12 +1625,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; @@ -1647,7 +1647,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