ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert to spec.

Browse Source 
Sprinkle IntToPtr all over mouse.c

svn path=/branches/ros-amd64-bringup/; revision=36458
This commit is contained in:
Samuel Serapion
2008-09-24 10:05:05 +00:00
parent 3a756711d4
commit cadf2f6abb
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/cpl/main/main.def
-6
View File
@@ -1,6 +0,0 @@
LIBRARY main.cpl
EXPORTS
CPlApplet@16
; EOF
reactos/dll/cpl/main/main.rbuild
+2 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes">
<importlibrary definition="main.def" />
<importlibrary definition="main.spec.def" />
<include base="main">.</include>
<define name="_WIN32_IE">0x600</define>
<define name="_WIN32_WINNT">0x501</define>
@@ -17,4 +17,5 @@
<file>main.c</file>
<file>mouse.c</file>
<file>main.rc</file>
<file>main.spec</file>
</module>
reactos/dll/cpl/main/main.spec
+1
View File
@@ -0,0 +1 @@
@ stdcall CPlApplet(ptr long ptr ptr)
reactos/dll/cpl/main/mouse.c
+12 -12
View File
@@ -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