Fix building some modules.

svn path=/branches/ros-amd64-bringup/; revision=44463
This commit is contained in:
Samuel Serapion 2009-12-07 23:11:49 +00:00
parent 0d2d36c7de
commit 20a05a760b
5 changed files with 12 additions and 12 deletions

View file

@ -87,9 +87,9 @@ HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessId)
(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 @@ HandleList_Update(HWND hHandleListCtrl, HANDLE ProcessId)
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);

View file

@ -111,7 +111,7 @@ void DrawScene(HWND hwnd, HDC dc, int ticks)
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 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
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 @@ VOID ParseCommandLine(LPWSTR szCmdLine, UCHAR *chOption, HWND *hwndParent)
if(isdigit(ch))
{
unsigned int i = _wtoi(szCmdLine - 1);
*hwndParent = (HWND)i;
*hwndParent = (HWND)(ULONG_PTR)i;
}
else
*hwndParent = NULL;

View file

@ -167,7 +167,7 @@ void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
if(isdigit(ch))
{
unsigned int i = atoi(szCmdLine - 1);
*hwndParent = (HWND)i;
*hwndParent = (HWND)(ULONG_PTR)i;
}
else
*hwndParent = 0;

View file

@ -493,7 +493,7 @@ void PerfDataRefresh()
// 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 @@ void PerfDataRefresh()
#endif
}
pPerfData[Idx].ProcessId = (ULONG)(pSPI->UniqueProcessId);
pPerfData[Idx].ProcessId = (ULONG_PTR)(pSPI->UniqueProcessId);
pPerfData[Idx].CreateTime = pSPI->CreateTime;
if (pPDOld) {

View file

@ -1011,7 +1011,7 @@ GetModuleEntryPoint (
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;
}