Author: gedmurphy Date: Wed Oct 18 03:11:02 2006 New Revision: 24558
URL: http://svn.reactos.org/svn/reactos?rev=24558&view=rev Log: fix a couple of warnings msvc highlighted
Modified: trunk/reactos/base/applications/devmgmt/about.c trunk/reactos/base/applications/devmgmt/enumdevices.c trunk/reactos/base/applications/devmgmt/mainwnd.c trunk/reactos/base/applications/devmgmt/misc.c
Modified: trunk/reactos/base/applications/devmgmt/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/a... ============================================================================== --- trunk/reactos/base/applications/devmgmt/about.c (original) +++ trunk/reactos/base/applications/devmgmt/about.c Wed Oct 18 03:11:02 2006 @@ -20,12 +20,12 @@ { case WM_INITDIALOG:
- hIcon = LoadImage(hInstance, - MAKEINTRESOURCE(IDI_MAIN_ICON), - IMAGE_ICON, - 16, - 16, - 0); + hIcon = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_MAIN_ICON), + IMAGE_ICON, + 16, + 16, + 0);
SendMessage(hDlg, WM_SETICON,
Modified: trunk/reactos/base/applications/devmgmt/enumdevices.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/e... ============================================================================== --- trunk/reactos/base/applications/devmgmt/enumdevices.c (original) +++ trunk/reactos/base/applications/devmgmt/enumdevices.c Wed Oct 18 03:11:02 2006 @@ -235,7 +235,7 @@ { SP_DEVINFO_DATA DeviceInfoData; CONFIGRET cr; - LONG Status, ProblemNumber; + ULONG Status, ProblemNumber; DWORD DevIdSize;
*DeviceName = _T('\0');
Modified: trunk/reactos/base/applications/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/m... ============================================================================== --- trunk/reactos/base/applications/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/devmgmt/mainwnd.c Wed Oct 18 03:11:02 2006 @@ -638,9 +638,9 @@ PMAIN_WND_INFO Info; HWND hMainWnd = NULL;
- Info = HeapAlloc(ProcessHeap, - HEAP_ZERO_MEMORY, - sizeof(MAIN_WND_INFO)); + Info = (PMAIN_WND_INFO)HeapAlloc(ProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(MAIN_WND_INFO));
if (Info != NULL) {
Modified: trunk/reactos/base/applications/devmgmt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/devmgmt/m... ============================================================================== --- trunk/reactos/base/applications/devmgmt/misc.c (original) +++ trunk/reactos/base/applications/devmgmt/misc.c Wed Oct 18 03:11:02 2006 @@ -28,7 +28,7 @@ /* Find the string table block */ if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && (hRes = LoadResource(hInst, hrSrc)) && - (lpStr = LockResource(hRes))) + (lpStr = (LPWSTR)LockResource(hRes))) { UINT x;
@@ -212,12 +212,12 @@ /* Add all icons to the image list */ for (i = StartResource; i <= EndResource; i++) { - hBitmap = LoadImage(hInstance, - MAKEINTRESOURCE(i), - IMAGE_BITMAP, - Width, - Height, - LR_LOADTRANSPARENT); + hBitmap = (HBITMAP)LoadImage(hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + Width, + Height, + LR_LOADTRANSPARENT); if (hBitmap == NULL) return NULL;
@@ -248,13 +248,13 @@ 0, NULL );
- MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR); + MessageBox(NULL, (LPTSTR)lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR);
LocalFree(lpMsgBuf); }
-VOID DisplayString(PTCHAR Msg) +VOID DisplayString(LPTSTR Msg) { MessageBox(NULL, Msg, _T("Note!"), MB_ICONEXCLAMATION|MB_OK); }