diff --git a/rosapps/applications/devutils/syscalldump/syscalldump.c b/rosapps/applications/devutils/syscalldump/syscalldump.c index 0407e685cbe..2a6e89902f1 100644 --- a/rosapps/applications/devutils/syscalldump/syscalldump.c +++ b/rosapps/applications/devutils/syscalldump/syscalldump.c @@ -54,7 +54,7 @@ BOOL CALLBACK EnumSymbolsProc( ULONG SymbolSize, PVOID UserContext) { - if ((UINT)UserContext == -1) + if ((UINT_PTR)UserContext == -1) { printf("%s ", pSymInfo->Name); } @@ -62,11 +62,11 @@ BOOL CALLBACK EnumSymbolsProc( { if (!bX64) { - printf("%s@%d ", pSymInfo->Name, (UINT)UserContext); + printf("%s@%p ", pSymInfo->Name, UserContext); } else { - printf("%s <+ %d> ", pSymInfo->Name, (UINT)UserContext); + printf("%s <+ %p> ", pSymInfo->Name, UserContext); } } return TRUE; @@ -153,9 +153,9 @@ cont: pW32pServiceTable = ImageSymToVa(hProcess, &Sym.Symbol, pModule, "W32pServiceTable"); pW32pServiceLimit = ImageSymToVa(hProcess, &Sym.Symbol, pModule, "W32pServiceLimit"); pW32pArgumentTable = ImageSymToVa(hProcess, &Sym.Symbol, pModule, "W32pArgumentTable"); -// printf("pW32pServiceTable = %p\n", pW32pServiceTable); -// printf("pW32pServiceLimit = %p\n", pW32pServiceLimit); -// printf("pW32pArgumentTable = %p\n", pW32pArgumentTable); + printf("pW32pServiceTable = %p\n", pW32pServiceTable); + printf("pW32pServiceLimit = %p\n", pW32pServiceLimit); + printf("pW32pArgumentTable = %p\n", pW32pArgumentTable); if (!pW32pServiceTable || !pW32pServiceLimit || !pW32pArgumentTable) { @@ -172,7 +172,7 @@ cont: for (i = 0; i < dwServiceLimit; i++) { printf("0x%x:", i+0x1000); - SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries32[i], EnumSymbolsProc, (PVOID)(DWORD)pW32pArgumentTable[i]); + SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries32[i], EnumSymbolsProc, (PVOID)(DWORD_PTR)pW32pArgumentTable[i]); printf("\n"); } } @@ -183,7 +183,7 @@ cont: for (i = 0; i < dwServiceLimit; i++) { printf("0x%x:", i+0x1000); - SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries64[i], EnumSymbolsProc, (PVOID)(DWORD)pW32pArgumentTable[i]); + SymEnumSymbolsForAddr(hProcess, (DWORD64)pdwEntries64[i], EnumSymbolsProc, (PVOID)(DWORD_PTR)pW32pArgumentTable[i]); printf("\n"); } } diff --git a/rosapps/applications/devutils/vgafontedit/editglyphdlg.c b/rosapps/applications/devutils/vgafontedit/editglyphdlg.c index 634554efcbd..c51bc10d929 100644 --- a/rosapps/applications/devutils/vgafontedit/editglyphdlg.c +++ b/rosapps/applications/devutils/vgafontedit/editglyphdlg.c @@ -121,7 +121,7 @@ EditGlyphDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PEDIT_GLYPH_INFO Info; - Info = (PEDIT_GLYPH_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PEDIT_GLYPH_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_INITDIALOG) { @@ -136,9 +136,9 @@ EditGlyphDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Info->hEdit = GetDlgItem(hwnd, IDC_EDIT_GLYPH_EDIT); Info->hPreview = GetDlgItem(hwnd, IDC_EDIT_GLYPH_PREVIEW); - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); - SetWindowLongW(Info->hEdit, GWLP_USERDATA, (LONG)Info); - SetWindowLongW(Info->hPreview, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); + SetWindowLongPtrW(Info->hEdit, GWLP_USERDATA, (LONG_PTR)Info); + SetWindowLongPtrW(Info->hPreview, GWLP_USERDATA, (LONG_PTR)Info); InitToolbox(Info); @@ -154,7 +154,7 @@ EditGlyphEditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PEDIT_GLYPH_INFO Info; - Info = (PEDIT_GLYPH_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PEDIT_GLYPH_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info) { @@ -232,7 +232,7 @@ EditGlyphPreviewWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PEDIT_GLYPH_INFO Info; - Info = (PEDIT_GLYPH_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PEDIT_GLYPH_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info) { diff --git a/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c b/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c index 1dcfeee68f4..9032758b3a1 100644 --- a/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c +++ b/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c @@ -250,7 +250,7 @@ FontBoxesWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PFONT_WND_INFO Info; - Info = (PFONT_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PFONT_WND_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_CREATE) { @@ -258,7 +258,7 @@ FontBoxesWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { case WM_CREATE: Info = (PFONT_WND_INFO)( ( (LPCREATESTRUCT)lParam )->lpCreateParams ); - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); // Set a fixed window size SetWindowPos(hwnd, NULL, 0, 0, FONT_BOXES_WND_WIDTH, FONT_BOXES_WND_HEIGHT, SWP_NOZORDER | SWP_NOMOVE); diff --git a/rosapps/applications/devutils/vgafontedit/fontwnd.c b/rosapps/applications/devutils/vgafontedit/fontwnd.c index edd6dd53dfe..d87aa2ffef5 100644 --- a/rosapps/applications/devutils/vgafontedit/fontwnd.c +++ b/rosapps/applications/devutils/vgafontedit/fontwnd.c @@ -99,7 +99,7 @@ FontWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PFONT_WND_INFO Info; - Info = (PFONT_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PFONT_WND_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_CREATE) { @@ -115,7 +115,7 @@ FontWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Info = (PFONT_WND_INFO)( ( (LPMDICREATESTRUCT) ( (LPCREATESTRUCT)lParam )->lpCreateParams )->lParam ); Info->hSelf = hwnd; - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); CreateFontBoxesWindow(Info); diff --git a/rosapps/applications/devutils/vgafontedit/mainwnd.c b/rosapps/applications/devutils/vgafontedit/mainwnd.c index 38a2bcc4f2b..5c79617ced4 100644 --- a/rosapps/applications/devutils/vgafontedit/mainwnd.c +++ b/rosapps/applications/devutils/vgafontedit/mainwnd.c @@ -443,7 +443,7 @@ MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PMAIN_WND_INFO Info; - Info = (PMAIN_WND_INFO) GetWindowLongW(hwnd, GWLP_USERDATA); + Info = (PMAIN_WND_INFO) GetWindowLongPtrW(hwnd, GWLP_USERDATA); if(Info || uMsg == WM_CREATE) { @@ -490,7 +490,7 @@ MainWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) Info = (PMAIN_WND_INFO)( ( (LPCREATESTRUCT)lParam )->lpCreateParams ); Info->hMainWnd = hwnd; Info->hMenu = GetMenu(hwnd); - SetWindowLongW(hwnd, GWLP_USERDATA, (LONG)Info); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)Info); hNextClipboardViewer = SetClipboardViewer(hwnd); diff --git a/rosapps/applications/net/roshttpd/common/list.cpp b/rosapps/applications/net/roshttpd/common/list.cpp index 29c6912cf55..d0eae4ad814 100644 --- a/rosapps/applications/net/roshttpd/common/list.cpp +++ b/rosapps/applications/net/roshttpd/common/list.cpp @@ -34,7 +34,7 @@ CListNode::CListNode(PVOID element, CListNode *next, CListNode *prev) Prev = prev; } -void* CListNode::operator new(/*size_t*/ UINT size) +void* CListNode::operator new(size_t size) { PVOID p; if (hHeap == NULL) { diff --git a/rosapps/applications/net/roshttpd/include/list.h b/rosapps/applications/net/roshttpd/include/list.h index 914d06ea2cc..cf52f31b27f 100644 --- a/rosapps/applications/net/roshttpd/include/list.h +++ b/rosapps/applications/net/roshttpd/include/list.h @@ -14,7 +14,7 @@ public: CListNode(); CListNode(VOID *element, CListNode *next, CListNode *prev); ~CListNode() {}; - void* operator new(/*size_t s*/ UINT s); + void* operator new(size_t s); VOID operator delete(void* p); VOID SetElement(PVOID element); diff --git a/rosapps/applications/net/tditest/tditest/tditest.c b/rosapps/applications/net/tditest/tditest/tditest.c index 8570f96960b..26eac61658c 100644 --- a/rosapps/applications/net/tditest/tditest/tditest.c +++ b/rosapps/applications/net/tditest/tditest/tditest.c @@ -442,7 +442,7 @@ NTSTATUS TdiQueryAddress( if (SnmpInfo.NumAddr != 1) { /* Skip loopback address */ - *Address = DN2H(((PIPADDR_ENTRY)((ULONG)IpAddress + sizeof(IPADDR_ENTRY)))->Addr); + *Address = DN2H(((PIPADDR_ENTRY)((ULONG_PTR)IpAddress + sizeof(IPADDR_ENTRY)))->Addr); } else { @@ -507,7 +507,7 @@ NTSTATUS TdiSendDatagram( RtlZeroMemory(ConnectInfo, sizeof(TDI_CONNECTION_INFORMATION) + sizeof(TA_IP_ADDRESS)); ConnectInfo->RemoteAddressLength = sizeof(TA_IP_ADDRESS); - ConnectInfo->RemoteAddress = (PUCHAR) ((ULONG)ConnectInfo + sizeof(TDI_CONNECTION_INFORMATION)); + ConnectInfo->RemoteAddress = (PUCHAR) ((ULONG_PTR)ConnectInfo + sizeof(TDI_CONNECTION_INFORMATION)); TA = (PTA_IP_ADDRESS)(ConnectInfo->RemoteAddress); TA->TAAddressCount = 1; @@ -630,9 +630,9 @@ NTSTATUS TdiReceiveDatagram( ReceiveInfo->RemoteAddressLength = 0; ReceiveInfo->RemoteAddress = NULL; - ReturnInfo = (PTDI_CONNECTION_INFORMATION) ((ULONG)ReceiveInfo + sizeof(TDI_CONNECTION_INFORMATION)); + ReturnInfo = (PTDI_CONNECTION_INFORMATION) ((ULONG_PTR)ReceiveInfo + sizeof(TDI_CONNECTION_INFORMATION)); ReturnInfo->RemoteAddressLength = sizeof(TA_IP_ADDRESS); - ReturnInfo->RemoteAddress = (PUCHAR) ((ULONG)ReturnInfo + sizeof(TDI_CONNECTION_INFORMATION)); + ReturnInfo->RemoteAddress = (PUCHAR) ((ULONG_PTR)ReturnInfo + sizeof(TDI_CONNECTION_INFORMATION)); ReturnAddress = (PTA_IP_ADDRESS)(ReturnInfo->RemoteAddress); ReturnAddress->TAAddressCount = 1; diff --git a/rosapps/applications/screensavers/starfield/screensaver.c b/rosapps/applications/screensavers/starfield/screensaver.c index ca53bf2107f..ce18c714489 100644 --- a/rosapps/applications/screensavers/starfield/screensaver.c +++ b/rosapps/applications/screensavers/starfield/screensaver.c @@ -317,7 +317,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; diff --git a/rosapps/applications/sysutils/pedump/pedump.c b/rosapps/applications/sysutils/pedump/pedump.c index 27555cb987f..327a8b6f247 100644 --- a/rosapps/applications/sysutils/pedump/pedump.c +++ b/rosapps/applications/sysutils/pedump/pedump.c @@ -1011,7 +1011,7 @@ GetModuleEntryPoint ( PIMAGE_OPTIONAL_HEADER poh = (PIMAGE_OPTIONAL_HEADER) OPTHDROFFSET (lpFile); if (poh != NULL) - return (LPVOID)(ULONG_PTR)(poh->AddressOfEntryPoint); + return (LPVOID)(poh->AddressOfEntryPoint); else return NULL; } diff --git a/rosapps/applications/sysutils/pedump/pedump.rbuild b/rosapps/applications/sysutils/pedump/pedump.rbuild index 814ed0f7293..c4129d85448 100644 --- a/rosapps/applications/sysutils/pedump/pedump.rbuild +++ b/rosapps/applications/sysutils/pedump/pedump.rbuild @@ -1,4 +1,4 @@ - + ntdll pedump.c pedump.rc diff --git a/rosapps/applications/sysutils/tlist/tlist.c b/rosapps/applications/sysutils/tlist/tlist.c index a4a87547167..49426453424 100644 --- a/rosapps/applications/sysutils/tlist/tlist.c +++ b/rosapps/applications/sysutils/tlist/tlist.c @@ -47,7 +47,7 @@ void *PsaiMalloc(SIZE_T size) NtCurrentProcess(), &pBuf, 0, - (PULONG)&size, + &size, MEM_COMMIT, PAGE_READWRITE ); @@ -58,7 +58,7 @@ void *PsaiMalloc(SIZE_T size) void PsaiFree(void *ptr) { - ULONG nSize = 0; + size_t nSize = 0; NtFreeVirtualMemory(NtCurrentProcess(), &ptr, &nSize, MEM_RELEASE); } @@ -117,7 +117,7 @@ ProcessHasDescendants ( if (NULL == pInfo) return 0; do { - if (ALREADY_PROCESSED != (DWORD)pInfo->InheritedFromUniqueProcessId) + if (ALREADY_PROCESSED != (DWORD_PTR)pInfo->InheritedFromUniqueProcessId) { if ((Pid != (HANDLE)pInfo->UniqueProcessId) && (Pid == (HANDLE)pInfo->InheritedFromUniqueProcessId)) { @@ -183,7 +183,7 @@ PrintProcessAndDescendants ( /* Scan and print possible children */ do { - if (ALREADY_PROCESSED != (DWORD)pInfo->InheritedFromUniqueProcessId) + if (ALREADY_PROCESSED != (DWORD_PTR)pInfo->InheritedFromUniqueProcessId) { if (Pid == pInfo->InheritedFromUniqueProcessId) { @@ -236,7 +236,7 @@ int WINAPI PrintProcessList (BOOL DisplayTree) } else { - if (ALREADY_PROCESSED != (DWORD)pInfo->InheritedFromUniqueProcessId) + if (ALREADY_PROCESSED != (DWORD_PTR)pInfo->InheritedFromUniqueProcessId) { PrintProcessAndDescendants (pInfo, pInfoBase, 0); } @@ -357,7 +357,7 @@ int WINAPI PrintProcess (char * PidStr) CLIENT_ID ClientId = {0, 0}; - ClientId.UniqueProcess = (PVOID) atol (PidStr); + ClientId.UniqueProcess = LongToPtr(atol (PidStr)); if (FALSE == AcquirePrivileges ()) { diff --git a/rosapps/applications/sysutils/tlist/tlist.rbuild b/rosapps/applications/sysutils/tlist/tlist.rbuild index 85797f35d60..e2c3a3d5ec7 100644 --- a/rosapps/applications/sysutils/tlist/tlist.rbuild +++ b/rosapps/applications/sysutils/tlist/tlist.rbuild @@ -1,6 +1,6 @@ epsapi - + user32 ntdll tlist.c diff --git a/rosapps/applications/sysutils/utils/stats/stats.c b/rosapps/applications/sysutils/utils/stats/stats.c index d69b81a1f3f..8940ddccb9a 100644 --- a/rosapps/applications/sysutils/utils/stats/stats.c +++ b/rosapps/applications/sysutils/utils/stats/stats.c @@ -75,14 +75,14 @@ AddExtension(LPTSTR ExtName, PEXTENSION_INFO ExtInfo; PEXTENSION_INFO Info; TCHAR *t; - DWORD ln; + size_t ln; ExtInfo = (PEXTENSION_INFO) HeapAlloc (GetProcessHeap(), 0, sizeof (EXTENSION_INFO)); if (!ExtInfo) return NULL; for(t = ExtName; *t != _T('\0'); t += _tcslen(t) + 1); - ln = (DWORD)t - (DWORD)ExtName; + ln = t - ExtName; ZeroMemory (ExtInfo, sizeof (EXTENSION_INFO)); memcpy (ExtInfo->ExtName, ExtName, ln);