[ros-diffs] [sginsberg] 38911: - Fix WMC and mkhive warnings - Fix the unitialized variable warning in freetype (done the same way in freetype trunk) - Make CRT compile warning-free again, and re-remove allowwarnings=true - Make libxml compile warning-free too
sginsberg at svn.reactos.org
sginsberg at svn.reactos.org
Sun Jan 18 21:42:14 CET 2009
Author: sginsberg
Date: Sun Jan 18 14:42:13 2009
New Revision: 38911
URL: http://svn.reactos.org/svn/reactos?rev=38911&view=rev
Log:
- Fix WMC and mkhive warnings
- Fix the unitialized variable warning in freetype (done the same way in freetype trunk)
- Make CRT compile warning-free again, and re-remove allowwarnings=true
- Make libxml compile warning-free too
Modified:
trunk/reactos/dll/3rdparty/freetype/freetype.rbuild
trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c
trunk/reactos/lib/3rdparty/libxml2/catalog.c
trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild
trunk/reactos/lib/3rdparty/libxml2/nanoftp.c
trunk/reactos/lib/3rdparty/libxml2/nanohttp.c
trunk/reactos/lib/3rdparty/libxml2/threads.c
trunk/reactos/lib/3rdparty/libxml2/trionan.c
trunk/reactos/lib/3rdparty/libxml2/uri.c
trunk/reactos/lib/sdk/crt/crt.rbuild
trunk/reactos/lib/sdk/crt/except/cppexcept.c
trunk/reactos/tools/mkhive/cmi.c
trunk/reactos/tools/mkhive/mkhive.rbuild
trunk/reactos/tools/mkhive/rtl.c
trunk/reactos/tools/wmc/wmc.rbuild
trunk/reactos/tools/wmc/wmctypes.h
Modified: trunk/reactos/dll/3rdparty/freetype/freetype.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/freetype.rbuild?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/freetype/freetype.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="freetype" type="kernelmodedll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" allowwarnings="true" crt="libcntpr">
+<module name="freetype" type="kernelmodedll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" crt="libcntpr">
<importlibrary definition="freetype.def" />
<include base="freetype">include</include>
<define name="_DISABLE_TIDENTS" />
Modified: trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/freetype/src/autofit/aflatin.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -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 ));
Modified: trunk/reactos/lib/3rdparty/libxml2/catalog.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/catalog.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/catalog.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/catalog.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -3250,7 +3250,7 @@
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] = '/';
Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/libxml2.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="libxml2" type="staticlibrary" allowwarnings="true" crt="dll">
+<module name="libxml2" type="staticlibrary" crt="dll">
<define name="HAVE_CONFIG_H" />
<define name="WIN32" />
<define name="_WINDOWS" />
Modified: trunk/reactos/lib/3rdparty/libxml2/nanoftp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanoftp.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/nanoftp.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -78,11 +78,13 @@
#if defined(__MINGW32__) || defined(_WIN32_WCE)
+#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_
+#endif
#include <wsockcompat.h>
#include <winsock2.h>
#undef XML_SOCKLEN_T
-#define XML_SOCKLEN_T unsigned int
+#define XML_SOCKLEN_T int
#endif
/**
Modified: trunk/reactos/lib/3rdparty/libxml2/nanohttp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanohttp.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/nanohttp.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -75,11 +75,13 @@
#endif
#if defined(__MINGW32__) || defined(_WIN32_WCE)
+#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_
+#endif
#include <wsockcompat.h>
#include <winsock2.h>
#undef XML_SOCKLEN_T
-#define XML_SOCKLEN_T unsigned int
+#define XML_SOCKLEN_T int
#endif
Modified: trunk/reactos/lib/3rdparty/libxml2/threads.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/threads.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/threads.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -453,7 +453,7 @@
/* 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 @@
#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
Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trionan.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/trionan.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/trionan.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -58,6 +58,7 @@
# endif
#endif
/* Small ReactOS hack */
+#undef fpclassify
#define fpclassify _fpclass
#include <assert.h>
@@ -213,6 +214,7 @@
return is_special_quantity;
}
+#if 0
/*
* trio_is_negative
*/
@@ -230,6 +232,7 @@
}
return is_negative;
}
+#endif
#endif /* USE_IEEE_754 */
Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libxml2/uri.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -2453,7 +2453,6 @@
*/
#if defined(_WIN32) && !defined(__CYGWIN__)
int len = 0;
- int i = 0;
xmlChar *p = NULL;
#endif
xmlURIPtr uri;
@@ -2522,7 +2521,7 @@
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 @@
}
/* 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') {
Modified: trunk/reactos/lib/sdk/crt/crt.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -15,7 +15,7 @@
</directory>
</module>
-<module name="crt" type="staticlibrary" allowwarnings="true">
+<module name="crt" type="staticlibrary">
<library>chkstk</library>
<include base="crt">.</include>
<include base="crt">include</include>
Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexcept.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -105,6 +105,7 @@
static void dump_function_descr( const cxx_function_descr *descr )
{
+#ifndef WINE_NO_TRACE_MSGS
UINT i;
int j;
@@ -122,6 +123,7 @@
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 @@
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 */
Modified: trunk/reactos/tools/mkhive/cmi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -241,8 +241,6 @@
HSTORAGE_TYPE Storage;
ULONG i;
- DPRINT("CmiAddSubKey(%p '%wZ')\n", RegistryHive, SubKeyName);
-
VERIFY_KEY_CELL(ParentKeyCell);
/* Skip leading backslash */
@@ -523,8 +521,6 @@
VERIFY_KEY_CELL(KeyCell);
- DPRINT("CmiScanForSubKey('%wZ')\n", SubKeyName);
-
ASSERT(RegistryHive);
*pSubKeyCell = NULL;
Modified: trunk/reactos/tools/mkhive/mkhive.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
-<module name="mkhive" type="buildtool" allowwarnings="true">
+<module name="mkhive" type="buildtool">
<include base="inflibhost">.</include>
<include base="cmlibhost">.</include>
<include base="zlibhost">.</include>
Modified: trunk/reactos/tools/mkhive/rtl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/rtl.c [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -6,6 +6,12 @@
#include <stdlib.h>
#include <stdarg.h>
+
+/* gcc defaults to cdecl */
+#if defined(__GNUC__)
+#undef __cdecl
+#define __cdecl
+#endif
#include "mkhive.h"
#include <bitmap.c>
Modified: trunk/reactos/tools/wmc/wmc.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.rbuild?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/wmc/wmc.rbuild [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
-<module name="wmc" type="buildtool" allowwarnings="true">
+<module name="wmc" type="buildtool">
<define name="WINE_UNICODE_API">" "</define>
<include base="unicode">.</include>
<library>unicode</library>
Modified: trunk/reactos/tools/wmc/wmctypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmctypes.h?rev=38911&r1=38910&r2=38911&view=diff
==============================================================================
--- trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] (original)
+++ trunk/reactos/tools/wmc/wmctypes.h [iso-8859-1] Sun Jan 18 14:42:13 2009
@@ -22,6 +22,7 @@
#define __WMC_WMCTYPES_H
#include <stdarg.h>
+#include <string.h>
#include <host/typedefs.h>
/* Byteordering defines */
More information about the Ros-diffs
mailing list