[ros-diffs] [sserapion] 36458: Convert to spec. Sprinkle IntToPtr all over mouse.c

Author: sserapion
Date: Wed Sep 24 05:05:05 2008
New Revision: 36458

URL: http://svn.reactos.org/svn/reactos?rev=36458&view=rev
Log:
Convert to spec.
Sprinkle IntToPtr all over mouse.c

Added:
    branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec   (contents, props changed)
      - copied, changed from r36423,
branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def
Removed:
    branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def
Modified:
    branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild
    branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c

Removed: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def (removed)
@@ -1,6 +1,0 @@
-LIBRARY main.cpl
-
-EXPORTS
-CPlApplet@16
-
-; EOF

Modified: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/cpl/main/main.rbuild [iso-8859-1] Wed Sep 24
05:05:05 2008
@@ -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>

Copied: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec (from r36423,
branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def)
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/cpl/main/main.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec [iso-8859-1] Wed Sep 24
05:05:05 2008
@@ -1,6 +1,1 @@
-LIBRARY main.cpl
-
-EXPORTS
-CPlApplet@16
-
-; EOF
+@ stdcall CPlApplet(ptr long ptr ptr)

Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec
------------------------------------------------------------------------------
    svn:keywords = author date id revision

Propchange: branches/ros-amd64-bringup/reactos/dll/cpl/main/main.spec
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/cpl/main/mouse.c [iso-8859-1] Wed Sep 24
05:05:05 2008
@@ -1260,7 +1260,7 @@
 //#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 @@
             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 @@
                         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 @@
                         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 @@
                         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 @@
                 /* 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 @@
                 /* 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 @@
             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 @@
                     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