Author: cwittich Date: Thu Jan 18 20:12:49 2007 New Revision: 25513
URL: http://svn.reactos.org/svn/reactos?rev=25513&view=rev Log: fix some warnings
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp trunk/reactos/base/applications/ibrowser/utility/xmlstorage.h trunk/reactos/include/psdk/winuser.h trunk/reactos/lib/mingw/mingw.rbuild trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp trunk/reactos/tools/wrc/newstruc.c
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Thu Jan 18 20:12:49 2007 @@ -21,7 +21,7 @@
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;
Modified: trunk/reactos/base/applications/ibrowser/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/ibrowser/... ============================================================================== --- trunk/reactos/base/applications/ibrowser/utility/xmlstorage.h (original) +++ trunk/reactos/base/applications/ibrowser/utility/xmlstorage.h Thu Jan 18 20:12:49 2007 @@ -707,7 +707,7 @@ 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 @@ #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 @@ }
/// 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);
Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Thu Jan 18 20:12:49 2007 @@ -540,8 +540,8 @@ #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)
Modified: trunk/reactos/lib/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/mingw/mingw.rbuild?rev=... ============================================================================== --- trunk/reactos/lib/mingw/mingw.rbuild (original) +++ trunk/reactos/lib/mingw/mingw.rbuild Thu Jan 18 20:12:49 2007 @@ -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>
Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depend... ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp Thu Jan 18 20:12:49 2007 @@ -164,7 +164,7 @@
- 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 () ) {
Modified: trunk/reactos/tools/wrc/newstruc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/newstruc.c?rev=25... ============================================================================== --- trunk/reactos/tools/wrc/newstruc.c (original) +++ trunk/reactos/tools/wrc/newstruc.c Thu Jan 18 20:12:49 2007 @@ -819,7 +819,7 @@ 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 @@ 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); }