From 4e160328572dad63ed9e028c59a57ceb8dab3876 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Thu, 18 Jan 2007 17:12:49 +0000
Subject: [PATCH] fix some warnings

svn path=/trunk/; revision=25513
---
 reactos/base/applications/games/solitaire/solitaire.cpp     | 2 +-
 reactos/base/applications/ibrowser/utility/xmlstorage.h     | 6 +++---
 reactos/include/psdk/winuser.h                              | 4 ++--
 reactos/lib/mingw/mingw.rbuild                              | 4 ++--
 .../tools/rbuild/backend/dependencymap/dependencymap.cpp    | 2 +-
 reactos/tools/wrc/newstruc.c                                | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp
index cda7203bea1..4fc86c0574d 100644
--- a/reactos/base/applications/games/solitaire/solitaire.cpp
+++ b/reactos/base/applications/games/solitaire/solitaire.cpp
@@ -21,7 +21,7 @@ CardWindow SolWnd;
 
 LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam);
 
-void MakePath(TCHAR *szDest, UINT nDestLen, TCHAR *szExt)
+void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt)
 {
     TCHAR *ptr;
     
diff --git a/reactos/base/applications/ibrowser/utility/xmlstorage.h b/reactos/base/applications/ibrowser/utility/xmlstorage.h
index 0eadea679b1..369726986e3 100644
--- a/reactos/base/applications/ibrowser/utility/xmlstorage.h
+++ b/reactos/base/applications/ibrowser/utility/xmlstorage.h
@@ -707,7 +707,7 @@ struct XMLNode : public XS_String
 			return super::find(x);
 		}
 
-		XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const
+		XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const
 		{
 			const_iterator found = find(x);
 
@@ -720,7 +720,7 @@ struct XMLNode : public XS_String
 #else
 	struct AttributeMap : public std::map<XS_String, XS_String>
 	{
-		XS_String get(const char* x, LPXSSTR def=XS_EMPTY_STR) const
+		XS_String get(const char* x, LPCXSSTR def=XS_EMPTY_STR) const
 		{
 			const_iterator found = find(x);
 
@@ -840,7 +840,7 @@ struct XMLNode : public XS_String
 	}
 
 	 /// read only access to an attribute
-	template<typename T> XS_String get(const T& attr_name, LPXSSTR def=XS_EMPTY_STR) const
+	template<typename T> XS_String get(const T& attr_name, LPCXSSTR def=XS_EMPTY_STR) const
 	{
 		AttributeMap::const_iterator found = _attributes.find(attr_name);
 
diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index 1ed7318e88e..339627844e8 100644
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -540,8 +540,8 @@ extern "C" {
 #define SB_BOTTOM	7
 #define SB_TOP	6
 #define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0)
-#define MAKEINTRESOURCEA(i) (LPSTR)((DWORD)((WORD)(i)))
-#define MAKEINTRESOURCEW(i) (LPWSTR)((DWORD)((WORD)(i)))
+#define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i)))
+#define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i)))
 #ifndef XFree86Server
 # define RT_CURSOR MAKEINTRESOURCE(1)
 # define RT_FONT MAKEINTRESOURCE(8)
diff --git a/reactos/lib/mingw/mingw.rbuild b/reactos/lib/mingw/mingw.rbuild
index 475212d7f95..0662377a5cf 100644
--- a/reactos/lib/mingw/mingw.rbuild
+++ b/reactos/lib/mingw/mingw.rbuild
@@ -22,7 +22,7 @@
 	<file>wcscmpi.c</file>
 	<file>_wgetopt.c</file>
 </module>
-<module name="mingw_main" type="staticlibrary" isstartuplib="true">
+<module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true">
 	<include base="ReactOS">include/crt</include>
 	<include base="ReactOS">include/psdk</include>
 	<include base="mingw_common">include</include>
@@ -30,7 +30,7 @@
 	<file>crt1.c</file>
 	<file>main.c</file>
 </module>
-<module name="mingw_wmain" type="staticlibrary" isstartuplib="true">
+<module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true">
 	<include base="ReactOS">include/crt</include>
 	<include base="ReactOS">include/psdk</include>
 	<include base="mingw_common">include</include>
diff --git a/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp b/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
index 957cedf2ed5..e3630ce196a 100644
--- a/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
+++ b/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp
@@ -164,7 +164,7 @@ DepMapBackend::_generate_depmap ( FILE* OUT )
 			
 			
 
-			fprintf ( m_DepMapFile, "<component name=\"%s\" base=\"%s\" ref_count=\"%u\" library_count=\"%u\">\r\n", module.name.c_str(), module.GetBasePath ().c_str (), data->references.size (), data->libraries.size () );
+			fprintf ( m_DepMapFile, "<component name=\"%s\" base=\"%s\" ref_count=\"%u\" library_count=\"%u\">\r\n", module.name.c_str(), module.GetBasePath ().c_str (), (unsigned int) data->references.size (), (unsigned int) data->libraries.size () );
 			
 			if ( data->references.size () )
 			{
diff --git a/reactos/tools/wrc/newstruc.c b/reactos/tools/wrc/newstruc.c
index 8589b3c008c..4786e9a91b5 100644
--- a/reactos/tools/wrc/newstruc.c
+++ b/reactos/tools/wrc/newstruc.c
@@ -819,7 +819,7 @@ static void handle_ani_list(riff_tag_t *lst, enum res_e type, int isswapped)
 				       isprint(rtp->tag[2]) ? rtp->tag[2] : '.',
 				       isprint(rtp->tag[3]) ? rtp->tag[3] : '.');
 
-		if((UINT_PTR)rtp & 1)
+		if((LONG_PTR)rtp & 1)
 			rtp = SKIP_TAG(rtp,1);
 	}
 }
@@ -929,7 +929,7 @@ ani_curico_t *new_ani_curico(enum res_e type, raw_data_t *rd, int *memopt)
 				       isprint(rtp->tag[2]) ? rtp->tag[2] : '.',
 				       isprint(rtp->tag[3]) ? rtp->tag[3] : '.');
 
-			if((UINT_PTR)rtp & 1)
+			if((LONG_PTR)rtp & 1)
 				rtp = SKIP_TAG(rtp,1);
 		}