diff --git a/reactos/dll/3rdparty/freetype/freetype.rbuild b/reactos/dll/3rdparty/freetype/freetype.rbuild index c091ce05467..d810cc16f50 100644 --- a/reactos/dll/3rdparty/freetype/freetype.rbuild +++ b/reactos/dll/3rdparty/freetype/freetype.rbuild @@ -1,6 +1,6 @@ - + include diff --git a/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c b/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c index 9c05c47a266..647c48cbe8d 100644 --- a/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c +++ b/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c @@ -197,7 +197,7 @@ FT_UInt glyph_index; FT_Int best_point, best_y, best_first, best_last; FT_Vector* points; - FT_Bool round; + FT_Bool round = 0; AF_LOG(( "'%c'", *p )); diff --git a/reactos/lib/3rdparty/libxml2/catalog.c b/reactos/lib/3rdparty/libxml2/catalog.c index af84b7c4bc6..b17563aab17 100644 --- a/reactos/lib/3rdparty/libxml2/catalog.c +++ b/reactos/lib/3rdparty/libxml2/catalog.c @@ -3250,7 +3250,7 @@ xmlLoadCatalogs(const char *pathss) { cur++; path = xmlStrndup((const xmlChar *)paths, cur - paths); #ifdef _WIN32 - iLen = strlen(path); + iLen = strlen((const char *)path); for(i = 0; i < iLen; i++) { if(path[i] == '\\') { path[i] = '/'; diff --git a/reactos/lib/3rdparty/libxml2/libxml2.rbuild b/reactos/lib/3rdparty/libxml2/libxml2.rbuild index 822f8b59729..dd4338aae2a 100644 --- a/reactos/lib/3rdparty/libxml2/libxml2.rbuild +++ b/reactos/lib/3rdparty/libxml2/libxml2.rbuild @@ -1,6 +1,6 @@ - + diff --git a/reactos/lib/3rdparty/libxml2/nanoftp.c b/reactos/lib/3rdparty/libxml2/nanoftp.c index a54b85b3a54..55b9d327bc6 100644 --- a/reactos/lib/3rdparty/libxml2/nanoftp.c +++ b/reactos/lib/3rdparty/libxml2/nanoftp.c @@ -78,11 +78,13 @@ #if defined(__MINGW32__) || defined(_WIN32_WCE) +#ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ +#endif #include #include #undef XML_SOCKLEN_T -#define XML_SOCKLEN_T unsigned int +#define XML_SOCKLEN_T int #endif /** diff --git a/reactos/lib/3rdparty/libxml2/nanohttp.c b/reactos/lib/3rdparty/libxml2/nanohttp.c index 9001ae55118..4d4fa2edbf2 100644 --- a/reactos/lib/3rdparty/libxml2/nanohttp.c +++ b/reactos/lib/3rdparty/libxml2/nanohttp.c @@ -75,11 +75,13 @@ #endif #if defined(__MINGW32__) || defined(_WIN32_WCE) +#ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ +#endif #include #include #undef XML_SOCKLEN_T -#define XML_SOCKLEN_T unsigned int +#define XML_SOCKLEN_T int #endif diff --git a/reactos/lib/3rdparty/libxml2/threads.c b/reactos/lib/3rdparty/libxml2/threads.c index 23cb200ac57..e7dd4179846 100644 --- a/reactos/lib/3rdparty/libxml2/threads.c +++ b/reactos/lib/3rdparty/libxml2/threads.c @@ -453,7 +453,7 @@ __xmlGlobalInitMutexLock(void) /* Swap it into the global_init_lock */ #ifdef InterlockedCompareExchangePointer - InterlockedCompareExchangePointer(&global_init_lock, cs, NULL); + (void)InterlockedCompareExchangePointer(&global_init_lock, cs, NULL); #else /* Use older void* version */ InterlockedCompareExchange((void **) &global_init_lock, (void *) cs, NULL); @@ -936,7 +936,7 @@ xmlOnceInit(void) #if defined(HAVE_WIN32_THREADS) if (!run_once.done) { - if (InterlockedIncrement(&run_once.control) == 1) { + if (InterlockedIncrement((PLONG)&run_once.control) == 1) { #if !defined(HAVE_COMPILER_TLS) globalkey = TlsAlloc(); #endif diff --git a/reactos/lib/3rdparty/libxml2/trionan.c b/reactos/lib/3rdparty/libxml2/trionan.c index 00b2042673e..b7a65578472 100644 --- a/reactos/lib/3rdparty/libxml2/trionan.c +++ b/reactos/lib/3rdparty/libxml2/trionan.c @@ -58,6 +58,7 @@ # endif #endif /* Small ReactOS hack */ +#undef fpclassify #define fpclassify _fpclass #include @@ -213,6 +214,7 @@ TRIO_ARGS2((number, has_mantissa), return is_special_quantity; } +#if 0 /* * trio_is_negative */ @@ -230,6 +232,7 @@ TRIO_ARGS1((number), } return is_negative; } +#endif #endif /* USE_IEEE_754 */ diff --git a/reactos/lib/3rdparty/libxml2/uri.c b/reactos/lib/3rdparty/libxml2/uri.c index 28401c8c26e..33e33d0468b 100644 --- a/reactos/lib/3rdparty/libxml2/uri.c +++ b/reactos/lib/3rdparty/libxml2/uri.c @@ -2453,7 +2453,6 @@ xmlCanonicPath(const xmlChar *path) */ #if defined(_WIN32) && !defined(__CYGWIN__) int len = 0; - int i = 0; xmlChar *p = NULL; #endif xmlURIPtr uri; @@ -2522,7 +2521,7 @@ path_processing: len = xmlStrlen(path); if ((len > 2) && IS_WINDOWS_PATH(path)) { /* make the scheme 'file' */ - uri->scheme = xmlStrdup(BAD_CAST "file"); + uri->scheme = (char*)xmlStrdup(BAD_CAST "file"); /* allocate space for leading '/' + path + string terminator */ uri->path = xmlMallocAtomic(len + 2); if (uri->path == NULL) { @@ -2531,15 +2530,15 @@ path_processing: } /* Put in leading '/' plus path */ uri->path[0] = '/'; - p = uri->path + 1; - strncpy(p, path, len + 1); + p = (xmlChar *)uri->path + 1; + strncpy((char *)p, (const char *)path, len + 1); } else { - uri->path = xmlStrdup(path); + uri->path = (char*)xmlStrdup(path); if (uri->path == NULL) { xmlFreeURI(uri); return(NULL); } - p = uri->path; + p = (xmlChar *)uri->path; } /* Now change all occurences of '\' to '/' */ while (*p != '\0') { diff --git a/reactos/lib/sdk/crt/crt.rbuild b/reactos/lib/sdk/crt/crt.rbuild index b39c50ca7e6..08c2012ff87 100644 --- a/reactos/lib/sdk/crt/crt.rbuild +++ b/reactos/lib/sdk/crt/crt.rbuild @@ -15,7 +15,7 @@ - + chkstk . include diff --git a/reactos/lib/sdk/crt/except/cppexcept.c b/reactos/lib/sdk/crt/except/cppexcept.c index 5e301dae8b5..f84682d61e9 100644 --- a/reactos/lib/sdk/crt/except/cppexcept.c +++ b/reactos/lib/sdk/crt/except/cppexcept.c @@ -105,6 +105,7 @@ static void dump_exception_type( const cxx_exception_type *type ) static void dump_function_descr( const cxx_function_descr *descr ) { +#ifndef WINE_NO_TRACE_MSGS UINT i; int j; @@ -122,6 +123,7 @@ static void dump_function_descr( const cxx_function_descr *descr ) descr->tryblock[i].start_level, descr->tryblock[i].end_level, descr->tryblock[i].catch_level, descr->tryblock[i].catchblock, descr->tryblock[i].catchblock_count ); + for (j = 0; j < descr->tryblock[i].catchblock_count; j++) { const catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; @@ -130,6 +132,7 @@ static void dump_function_descr( const cxx_function_descr *descr ) ptr->type_info, dbgstr_type_info( ptr->type_info ) ); } } +#endif } /* check if the exception type is caught by a given catch block, and return the type that matched */ diff --git a/reactos/tools/mkhive/cmi.c b/reactos/tools/mkhive/cmi.c index 147b20de3b9..72b3908f781 100644 --- a/reactos/tools/mkhive/cmi.c +++ b/reactos/tools/mkhive/cmi.c @@ -241,8 +241,6 @@ CmiAddSubKey( HSTORAGE_TYPE Storage; ULONG i; - DPRINT("CmiAddSubKey(%p '%wZ')\n", RegistryHive, SubKeyName); - VERIFY_KEY_CELL(ParentKeyCell); /* Skip leading backslash */ @@ -523,8 +521,6 @@ CmiScanForSubKey( VERIFY_KEY_CELL(KeyCell); - DPRINT("CmiScanForSubKey('%wZ')\n", SubKeyName); - ASSERT(RegistryHive); *pSubKeyCell = NULL; diff --git a/reactos/tools/mkhive/mkhive.rbuild b/reactos/tools/mkhive/mkhive.rbuild index 341d1dc15c7..d4a95fd99d9 100644 --- a/reactos/tools/mkhive/mkhive.rbuild +++ b/reactos/tools/mkhive/mkhive.rbuild @@ -1,6 +1,6 @@ - + . . . diff --git a/reactos/tools/mkhive/rtl.c b/reactos/tools/mkhive/rtl.c index eec2fc3872e..85fc04b6327 100644 --- a/reactos/tools/mkhive/rtl.c +++ b/reactos/tools/mkhive/rtl.c @@ -7,6 +7,12 @@ #include #include +/* gcc defaults to cdecl */ +#if defined(__GNUC__) +#undef __cdecl +#define __cdecl +#endif + #include "mkhive.h" #include diff --git a/reactos/tools/wmc/wmc.rbuild b/reactos/tools/wmc/wmc.rbuild index 6822c8297c5..f548ac5f512 100644 --- a/reactos/tools/wmc/wmc.rbuild +++ b/reactos/tools/wmc/wmc.rbuild @@ -1,6 +1,6 @@ - + " " . unicode diff --git a/reactos/tools/wmc/wmctypes.h b/reactos/tools/wmc/wmctypes.h index 9fdb3a75b5b..884200375b0 100644 --- a/reactos/tools/wmc/wmctypes.h +++ b/reactos/tools/wmc/wmctypes.h @@ -22,6 +22,7 @@ #define __WMC_WMCTYPES_H #include +#include #include /* Byteordering defines */