fix some warnings

svn path=/trunk/; revision=25513
This commit is contained in:
Christoph von Wittich
2007-01-18 17:12:49 +00:00
parent bdce0f47d1
commit 4e16032857
6 changed files with 11 additions and 11 deletions
@@ -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;
@@ -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);
+2 -2
View File
@@ -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)
+2 -2
View File
@@ -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>
@@ -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 () )
{
+2 -2
View File
@@ -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);
}