[ros-diffs] [tkreuzer] 47878: [USER32] - Use UlongToHandle instead of LongToHandle - case to ULONG_PTR instead of using HandleToUlong - SetSysColorsTemp: don't truncate the pointer sized n value, remove a comment - IntGetClsWndProc: fix a bug - IntGetWindowLong: pass !unicode to IntGetWndProc

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Sun Jun 27 21:30:39 2010
New Revision: 47878

URL: http://svn.reactos.org/svn/reactos?rev=47878&view=rev
Log:
[USER32]
- Use UlongToHandle instead of LongToHandle
- case to ULONG_PTR instead of using HandleToUlong
- SetSysColorsTemp: don't truncate the pointer sized n value, remove a comment
- IntGetClsWndProc: fix a bug
- IntGetWindowLong: pass !unicode to IntGetWndProc

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c
    branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c
    branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c
    branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c
    branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c

Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c?rev=47878&r1=47877&r2=47878&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] Sun Jun 27 21:30:39 2010
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/* 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/exit.c
@@ -101,7 +100,7 @@
   NTSTATUS Status;
 
   CsrRequest = MAKE_CSR_API(REGISTER_SERVICES_PROCESS, CSR_GUI);
-  Request.Data.RegisterServicesProcessRequest.ProcessId = LongToHandle(ServicesProcessId);
+  Request.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId);
 
   Status = CsrClientCallServer(&Request,
                    NULL,

Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c?rev=47878&r1=47877&r2=47878&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Sun Jun 27 21:30:39 2010
@@ -174,7 +174,7 @@
         return FALSE;
     }
 
-    ConfigRet  = UnRegNotify( HandleToUlong(Handle) );
+    ConfigRet  = UnRegNotify((ULONG_PTR)Handle );
     if (ConfigRet != CR_SUCCESS)
     {
         switch (ConfigRet)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c?rev=47878&r1=47877&r2=47878&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sun Jun 27 21:30:39 2010
@@ -197,7 +197,7 @@
     }
     if (!pPens && !pBrushes) /* "restore" call */
     {
-        LPVOID pOldCol = LongToPtr(n); /* FIXME: not 64-bit safe */
+        LPVOID pOldCol = (LPVOID)n;
         LPVOID p = pOldCol;
         DWORD nCount = *(DWORD *)p;
         p = (char*)p + sizeof(DWORD);

Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c?rev=47878&r1=47877&r2=47878&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] Sun Jun 27 21:30:39 2010
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+/* 
  * PROJECT:         ReactOS user32.dll
  * FILE:            lib/user32/misc/winhelp.c
  * PURPOSE:         WinHelp
@@ -51,7 +50,7 @@
  */
 BOOL
 WINAPI
-WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, ULONG_PTR dwData)
+WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, DWORD_PTR dwData)
 {
 	static WORD WM_WINHELP = 0;
 	HWND hDest;
@@ -137,7 +136,7 @@
  */
 BOOL
 WINAPI
-WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, ULONG_PTR dwData)
+WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, DWORD_PTR dwData)
 {
     INT len;
     LPSTR file;

Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c?rev=47878&r1=47877&r2=47878&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun Jun 27 21:30:39 2010
@@ -325,7 +325,7 @@
 
   gcpd = (WNDPROC)NtUserGetCPD( UserHMGetHandle(pWnd),
                                 (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWindow,
-                                (ULONG_PTR)&Ret);
+                                (ULONG_PTR)Ret);
 
   return (gcpd ? gcpd : Ret);
 }
@@ -701,7 +701,7 @@
 			SetLastError(ERROR_ACCESS_DENIED);
 			retvalue = 0;
 		}
-		retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, unicode);
+		retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, !unicode);
         break;
 	}
     default: