[ros-diffs] [sserapion] 44463: Fix building some modules.

Author: sserapion
Date: Tue Dec  8 00:11:49 2009
New Revision: 44463
URL: http://svn.reactos.org/svn/reactos?rev=44463&view=rev
Log:
Fix building some modules.
Modified:
    branches/ros-amd64-bringup/rosapps/applications/devutils/gdihv/handlelist.c
    branches/ros-amd64-bringup/rosapps/applications/screensavers/cylfrac/cylfrac.c
    branches/ros-amd64-bringup/rosapps/applications/screensavers/mazescr/scrnsave.c
    branches/ros-amd64-bringup/rosapps/applications/sysutils/ctm/ctm.c
    branches/ros-amd64-bringup/rosapps/applications/sysutils/pedump/pedump.c
Modified: branches/ros-amd64-bringup/rosapps/applications/devutils/gdihv/handlelist.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rosapps/appli…
==============================================================================
--- branches/ros-amd64-bringup/rosapps/applications/devutils/gdihv/handlelist.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/rosapps/applications/devutils/gdihv/handlelist.c
[iso-8859-1] Tue Dec  8 00:11:49 2009
@@ -87,9 +87,9 @@
                      (ProcessId == (HANDLE)2) )
                {
                        if (ProcessId == (HANDLE)1 || ProcessId == (HANDLE)2 ||
-                           ((LONG)ProcessId & 0xfffc) == ((ULONG)pEntry->ProcessId
& 0xfffc))
+                           ((LONG_PTR)ProcessId & 0xfffc) ==
((ULONG_PTR)pEntry->ProcessId & 0xfffc))
                        {
-                               handle = GDI_HANDLE_CREATE(i, pEntry->Type);
+                               handle = GDI_HANDLE_CREATE(i, (ULONG_PTR)pEntry->Type);
                                index = ListView_GetItemCount(hHandleListCtrl);
                                item.iItem = index;
                                item.iSubItem = 0;
@@ -107,13 +107,13 @@
                                str2 = GetTypeName(handle);
                                ListView_SetItemText(hHandleListCtrl, index, 3, str2);
-                               wsprintf(strText, L"%#08x",
(UINT)pEntry->ProcessId);
+                               wsprintf(strText, L"%#08x",
(UINT_PTR)pEntry->ProcessId);
                                ListView_SetItemText(hHandleListCtrl, index, 4, strText);
-                               wsprintf(strText, L"%#08x",
(UINT)pEntry->KernelData);
+                               wsprintf(strText, L"%#08x",
(UINT_PTR)pEntry->KernelData);
                                ListView_SetItemText(hHandleListCtrl, index, 5, strText);
-                               wsprintf(strText, L"%#08x",
(UINT)pEntry->UserData);
+                               wsprintf(strText, L"%#08x",
(UINT_PTR)pEntry->UserData);
                                ListView_SetItemText(hHandleListCtrl, index, 6, strText);
                                wsprintf(strText, L"%#08x",
(UINT)pEntry->Type);
Modified: branches/ros-amd64-bringup/rosapps/applications/screensavers/cylfrac/cylfrac.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rosapps/appli…
==============================================================================
--- branches/ros-amd64-bringup/rosapps/applications/screensavers/cylfrac/cylfrac.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/rosapps/applications/screensavers/cylfrac/cylfrac.c
[iso-8859-1] Tue Dec  8 00:11:49 2009
@@ -111,7 +111,7 @@
        EndPaint(hwnd, &ps);
 }
-void CALLBACK TimeProc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
+void CALLBACK TimeProc(UINT uID, UINT uMsg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR
dw2)
 {
        InvalidateRect((HWND)dwUser, NULL, 0);
 }
@@ -155,7 +155,7 @@
                        GetCursorPos(&initpoint);
                        InitGL(hwnd);
                        oldticks = GetTickCount();
-                       TimerID = timeSetEvent (timerdelay, 0, TimeProc, (DWORD)hwnd,
TIME_PERIODIC);
+                       TimerID = timeSetEvent (timerdelay, 0, TimeProc, (DWORD_PTR)hwnd,
TIME_PERIODIC);
                        break;
                case WM_PAINT:
                {
@@ -268,7 +268,7 @@
        if(isdigit(ch))
        {
                unsigned int i = _wtoi(szCmdLine - 1);
-               *hwndParent = (HWND)i;
+               *hwndParent = (HWND)(ULONG_PTR)i;
        }
        else
                *hwndParent = NULL;
Modified: branches/ros-amd64-bringup/rosapps/applications/screensavers/mazescr/scrnsave.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rosapps/appli…
==============================================================================
--- branches/ros-amd64-bringup/rosapps/applications/screensavers/mazescr/scrnsave.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/rosapps/applications/screensavers/mazescr/scrnsave.c
[iso-8859-1] Tue Dec  8 00:11:49 2009
@@ -167,7 +167,7 @@
        if(isdigit(ch))
        {
                unsigned int i = atoi(szCmdLine - 1);
-               *hwndParent = (HWND)i;
+               *hwndParent = (HWND)(ULONG_PTR)i;
        }
        else
                *hwndParent = 0;
Modified: branches/ros-amd64-bringup/rosapps/applications/sysutils/ctm/ctm.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rosapps/appli…
==============================================================================
--- branches/ros-amd64-bringup/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/rosapps/applications/sysutils/ctm/ctm.c [iso-8859-1] Tue
Dec  8 00:11:49 2009
@@ -493,7 +493,7 @@
                // so that we can establish delta values
                pPDOld = NULL;
                for (Idx2=0; Idx2<ProcessCountOld; Idx2++) {
-                       if (pPerfDataOld[Idx2].ProcessId ==
(ULONG)(pSPI->UniqueProcessId) &&
+                       if (pPerfDataOld[Idx2].ProcessId ==
(ULONG_PTR)(pSPI->UniqueProcessId) &&
                            /* check also for the creation time, a new process may have an
id of an old one */
                            pPerfDataOld[Idx2].CreateTime.QuadPart ==
pSPI->CreateTime.QuadPart) {
                                pPDOld = &pPerfDataOld[Idx2];
@@ -517,7 +517,7 @@
 #endif
                }
-               pPerfData[Idx].ProcessId = (ULONG)(pSPI->UniqueProcessId);
+               pPerfData[Idx].ProcessId = (ULONG_PTR)(pSPI->UniqueProcessId);
                pPerfData[Idx].CreateTime = pSPI->CreateTime;
                if (pPDOld)     {
Modified: branches/ros-amd64-bringup/rosapps/applications/sysutils/pedump/pedump.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/rosapps/appli…
==============================================================================
--- branches/ros-amd64-bringup/rosapps/applications/sysutils/pedump/pedump.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/rosapps/applications/sysutils/pedump/pedump.c [iso-8859-1]
Tue Dec  8 00:11:49 2009
@@ -1011,7 +1011,7 @@
   PIMAGE_OPTIONAL_HEADER poh = (PIMAGE_OPTIONAL_HEADER) OPTHDROFFSET (lpFile);
   if (poh != NULL)
-    return (LPVOID) (poh->AddressOfEntryPoint);
+    return (LPVOID)(ULONG_PTR)(poh->AddressOfEntryPoint);
   else
     return NULL;
 }