[ros-diffs] [sserapion] 34787: Fix Warnings

Author: sserapion
Date: Fri Jul 25 11:49:23 2008
New Revision: 34787

URL: http://svn.reactos.org/svn/reactos?rev=34787&view=rev
Log:
Fix Warnings

Modified:
   
branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp
    branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp
    branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h
    branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
    branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
    branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild
    branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c
    branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c

Modified:
branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
---
branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -626,7 +626,7 @@
 
         MoveDragCardTo(hdc, ix, iy);
 
-        if(attarget || ix == idestx && iy == idesty)
+        if(attarget || (ix == idestx && iy == idesty))
             break;
 
         oldx = (int)x;

Modified:
branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -198,7 +198,7 @@
 }
 
 
-BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
@@ -356,7 +356,7 @@
 }
 
 
-BOOL CALLBACK CardBackDlgProc(HWND hDlg,
+INT_PTR CALLBACK CardBackDlgProc(HWND hDlg,
                               UINT uMsg,
                               WPARAM wParam,
                               LPARAM lParam)

Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -183,7 +183,7 @@
                         SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem,
(LPARAM) &item);
                     }
 
-                    switch (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff)
+                    switch (PtrToLong(hRootKey))
                     {
                     case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff):
                         _tcscpy(Path, _T("HKLM\\\0"));

Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/about.c
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -9,7 +9,7 @@
 
 #include "precomp.h"
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HWND  hLicenseEditWnd;

Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/precomp.h
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -34,7 +34,7 @@
 } MAIN_WND_INFO, *PMAIN_WND_INFO;
 
 
-BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 
 /* devmgmt.c */

Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/about.c
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -9,7 +9,7 @@
 
 #include "precomp.h"
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message)

Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -164,7 +164,7 @@
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 CreateHelpDialogProc(HWND hDlg,
                      UINT message,
                      WPARAM wParam,
@@ -221,7 +221,7 @@
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 CreateDialogProc(HWND hDlg,
                  UINT message,
                  WPARAM wParam,

Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/delete.c
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -56,7 +56,7 @@
 }
 
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 DeleteDialogProc(HWND hDlg,
                  UINT message,
                  WPARAM wParam,

Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/precomp.h
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -43,10 +43,10 @@
 } MAIN_WND_INFO, *PMAIN_WND_INFO;
 
 
-BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
lParam);
+INT_PTR CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
lParam);
+INT_PTR CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM
lParam);
 
 
 /* servman.c */

Modified:
branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -56,7 +56,7 @@
     }
 }
 
-BOOL CALLBACK
+INT_PTR CALLBACK
 ProgressDialogProc(HWND hDlg,
                    UINT Message,
                    WPARAM wParam,

Modified: branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -1021,7 +1021,7 @@
 }
 
 
-static BOOL CALLBACK
+static INT_PTR CALLBACK
 DlgProc(HWND hDlg,
         UINT Message,
         WPARAM wParam,

Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/network/ping/ping.rbuild
[iso-8859-1] Fri Jul 25 11:49:23 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="ping" type="win32cui"
installbase="system32" installname="ping.exe">
+<module name="ping" type="win32cui"
installbase="system32" installname="ping.exe"
allowwarnings="true">
 	<include base="ping">.</include>
 	<define name="__USE_W32_SOCKETS" />
 	<define name="_WIN32_IE">0x600</define>

Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c [iso-8859-1] Fri
Jul 25 11:49:23 2008
@@ -842,7 +842,7 @@
             dll->class = dll->handler ? (dll->handler)(DW_WHATMSG, 0, 0) :
DC_NOMSG;
             WINE_TRACE("Got class %x for DLL %s\n", dll->class, dll_name);
             if (dll->class & DC_INITTERM) dll->handler(DW_INIT, 0, 0);
-            if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS,
(DWORD)Callbacks, 0);
+            if (dll->class & DC_CALLBACKS) dll->handler(DW_CALLBACKS,
(DWORD_PTR)Callbacks, 0);
         }
         else WINE_WARN("OOM\n");
     }

Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1]
Fri Jul 25 11:49:23 2008
@@ -27,6 +27,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <assert.h>
+#include <tchar.h>
 
 #include <windows.h>
 #include <richedit.h>
@@ -583,7 +584,7 @@
     fontinfo.lfPitchAndFamily = 0;
 
     EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc,
-                        (LPARAM)hListWnd, 0);
+                        (LPARAM)(UINT_PTR)hListWnd, 0);
 
     ZeroMemory(&fmt, sizeof(fmt));
     fmt.cbSize = sizeof(fmt);
@@ -1115,7 +1116,7 @@
     }
 
     if (opt_print)
-        MessageBox(hMainWnd, "Printing not implemented", "WordPad",
MB_OK);
+        MessageBox(hMainWnd, _T("Printing not implemented"),
_T("WordPad"), MB_OK);
 }
 
 static LRESULT handle_findmsg(LPFINDREPLACEW pFr)
@@ -1279,7 +1280,7 @@
     ZeroMemory(&cbItem, sizeof(cbItem));
     cbItem.mask = CBEIF_TEXT;
     cbItem.iItem = idx;
-    cbItem.pszText = szBuffer;
+    cbItem.pszText = (ULONG_PTR)szBuffer;
     cbItem.cchTextMax = bufferLength-1;
     result = SendMessage(hComboEx, CBEM_GETITEM, 0, (LPARAM)&cbItem);
     if (!result)
@@ -1795,7 +1796,7 @@
 
     if (!hEditorWnd)
     {
-        fprintf(stderr, "Error code %u\n", GetLastError());
+        fprintf(stderr, _T("Error code %d\n"), GetLastError());
         return -1;
     }
     assert(hEditorWnd);
@@ -1987,7 +1988,7 @@
             mi.cbSize = sizeof(MENUITEMINFOW);
             mi.fMask = MIIM_DATA;
             if(GetMenuItemInfoW(hMenu, LOWORD(wParam), FALSE, &mi))
-                DoOpenFile((LPWSTR)mi.dwItemData);
+                DoOpenFile((LPWSTR)(ULONG_PTR)mi.dwItemData);
         }
         break;