Support -Werror

svn path=/branches/xmlbuildsystem/; revision=14582
2026-09-02 19:26:32 +00:00 · 2005-04-10 19:44:11 +00:00
parent 6d5cdde45c
commit fb03ace091
80 changed files with 225 additions and 154 deletions
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])

        DWORD dwUptime = SnmpSvcGetUptime();

-        _tprintf(_T("SNMP uptime: %d\n"), dwUptime);
+        _tprintf(_T("SNMP uptime: %ld\n"), dwUptime);

        SnmpUtilMemFree(pCache);
    } else {
@@ -41,16 +41,6 @@
 *          Had to remove local handling.	 Otherwise, same as whois.
 */

-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
-#endif /* not lint */
-
 /*
 * Finger prints out information about users.  It is not portable since
 * certain fields (e.g. the full user name, office, and phone numbers) are
@@ -34,10 +34,6 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <winsock2.h>
 #include "unistd.h"
@@ -63,7 +59,7 @@ netfinger(char *name)
 	if (!(host = rindex(name, '@')))
 		return;

-	*host++ = NULL;
+	*host++ = 0;
 	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) {
 		def.h_name = host;
 		def.h_addr_list = alist;
@@ -1,4 +1,4 @@
-<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe">
+<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true">
 	<include base="ftp">.</include>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
@@ -1,4 +1,4 @@
-<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe">
+<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" warnings="true">
 	<include base="ipconfig">.</include>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
@@ -1,4 +1,4 @@
-<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe">
+<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" warnings="true">
 	<include base="netstat">.</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
@@ -113,7 +113,7 @@ VOID DisplayBuffer(
    UINT i;
    PCHAR p;

-    printf("Buffer (0x%X)  Size (0x%X).\n", Buffer, Size);
+    printf("Buffer (0x%p)  Size (0x%lX).\n", Buffer, Size);

    p = (PCHAR)Buffer;
    for (i = 0; i < Size; i++) {
@@ -386,7 +386,6 @@ VOID QueryTime(PLARGE_INTEGER Time)

 VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time)
 {
-    UINT          i, Length;
    CHAR          Convstr[40];
    LARGE_INTEGER LargeTime;

@@ -35,8 +35,7 @@ int print_routes() {
    PMIB_IPFORWARDTABLE IpForwardTable;
    DWORD Error;
    ULONG Size = 0;
-    char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], 
-	Index[IPBUF], Metric[IPBUF];
+    char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF];
    int i;

    if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) ==
@@ -63,7 +62,7 @@ int print_routes() {
 		    inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].
 		    		dwForwardNextHop) ) );

-	    printf( "%-16s%-16s%-16s%-10d%-10d\n", 
+	    printf( "%-16s%-16s%-16s%-10ld%-10ld\n", 
 		    Destination,
 		    Netmask,
 		    Gateway,
@@ -36,22 +36,13 @@
 *          more convenient fdopen()/fprintf() to send()/recv().
 */

-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <winsock2.h>
 /* #include <sys/socket.h> */
 /* #include <netinet/in.h> */
 /* #include <netdb.h> */
 #include <stdio.h>
+#include <stdlib.h>

 /* #include <various.h> */
 #include <getopt.h>
@@ -160,6 +151,7 @@ int main(int argc, char **argv)
 		putchar(ch);

 	leave(0);
+	return 0;
 }

 void usage()
@@ -25,6 +25,7 @@
 <property name="BASEADDRESS_SECUR32" value="0x6b3A0000" />
 <property name="BASEADDRESS_SMDLL" value="0x6b3B0000" />
 <property name="BASEADDRESS_URLMON" value="0x6b3C0000" />
+<property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" />
 <property name="BASEADDRESS_CARDS" value="0x701a0000" />
 <property name="BASEADDRESS_WININET" value="0x70200000" />
 <property name="BASEADDRESS_ACLUI" value="0x71550000" />
@@ -58,6 +59,7 @@
 <property name="BASEADDRESS_MMDRV" value="0x77500000" />
 <property name="BASEADDRESS_CRTDLL" value="0x77630000" />
 <property name="BASEADDRESS_MSAFD" value="0x777a0000" />
+<property name="BASEADDRESS_MSI" value="0x777b0000" />
 <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" />
 <property name="BASEADDRESS_WINMM" value="0x777d0000" />
 <property name="BASEADDRESS_WS2HELP" value="0x777e0000" />
@@ -1,4 +1,4 @@
-<module name="freeldr_base" type="objectlibrary">
+<module name="freeldr_base" type="objectlibrary" warnings="true">
 	<include base="freeldr_base">include</include>
 	<include base="freeldr_base">cache</include>
 	<include base="ntoskrnl">include</include>
@@ -1,4 +1,4 @@
-<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys">
+<module name="acpi" type="kernelmodedriver" installbase="system32/drivers" installname="acpi.sys" warnings="true">
 	<include base="acpi">include</include>
 	<include base="acpi">ospm/include</include>
 	<library>ntoskrnl</library>
@@ -7,3 +7,6 @@
 <directory name="pci">
 	<xi:include href="pci/pci.xml" />
 </directory>
+<directory name="serenum">
+	<xi:include href="serenum/serenum.xml" />
+</directory>
@@ -0,0 +1,12 @@
+<module name="serenum" type="kernelmodedriver" installbase="system32/drivers" installname="serenum.sys">
+	<include base="serenum">.</include>
+	<define name="__USE_W32API" />
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<file>detect.c</file>
+	<file>fdo.c</file>
+	<file>misc.c</file>
+	<file>pdo.c</file>
+	<file>serenum.c</file>
+	<file>serenum.rc</file>
+</module>
@@ -50,8 +50,6 @@ BOOLEAN IsSpeakerEnabled(UINT BasePort)

 VOID BeginPlayback(UINT BasePort, UINT BitDepth, UINT Channels, UINT BlockSize)
 {
-    CHAR Command;
-
    DPRINT("BeginPlayback(%d, %d, %d, %d)\n", BasePort, BitDepth, Channels, BlockSize);

 //    switch(BitDepth)
@@ -70,7 +70,6 @@ BOOLEAN CreateDMA(PDEVICE_OBJECT DeviceObject)
 {
    DEVICE_DESCRIPTION Desc;
    ULONG MappedRegs = 0;
-    NTSTATUS Status;
    PDEVICE_EXTENSION Device = DeviceObject->DeviceExtension;
    KEVENT DMAEvent;
    KIRQL OldIrql;
@@ -14,14 +14,6 @@ BOOLEAN CheckIRQ(PDEVICE_EXTENSION Parameters)

    for (i = 0; ValidIRQs[i] != 0xffff; i ++)
    {
-        UCHAR ThisIRQ = ValidIRQs[i];
-        UCHAR bConfig = (UCHAR)(0x40 |
-                            (ThisIRQ == 7 ? 0x08 :
-                             ThisIRQ == 9 ? 0x10 :
-                             ThisIRQ == 10 ? 0x18 :
-                             ThisIRQ == 11 ? 0x20 :
-                             0));
-
        // Consult the card

 //        OUTPORT(pHw, BOARD_CONFIG, bConfig);
@@ -37,7 +29,6 @@ BOOLEAN CheckIRQ(PDEVICE_EXTENSION Parameters)
    // else
    // Compaq stuff?
    {
-        UCHAR CompaqPIDR;
        UCHAR Expected;

        switch (Parameters->IRQ)
@@ -59,9 +50,6 @@ BOOLEAN ISR(
    IN PKINTERRUPT pInterrupt,
    IN PVOID Context)
 {
-    PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context;
-    PDEVICE_EXTENSION Parameters = DeviceObject->DeviceExtension;
-
    DPRINT("*** Processing ISR ***\n");

    // What do we do here then?
@@ -83,7 +83,7 @@ WORD InitSoundCard(UINT BasePort)
    {
        // Check to make sure the reset was acknowledged:
        for (TimeOut = SB_TIMEOUT;
-             Status = (SB_READ_DATA(BasePort) != SB_DSP_READY) && TimeOut > 0;
+             (Status = (SB_READ_DATA(BasePort) != SB_DSP_READY) && (TimeOut > 0));
             TimeOut --);
    }

@@ -292,8 +292,6 @@ NTSTATUS SaveSettings(
        NT status STATUS_SUCCESS if successful
 */
 {
-    NTSTATUS s;
-
    DPRINT("SaveSettings() unimplemented\n");

 //    UNIMPLEMENTED;
@@ -294,8 +294,6 @@ BlasterDeviceControl(PDEVICE_OBJECT DeviceObject,
 {
    PIO_STACK_LOCATION Stack;
    PDEVICE_EXTENSION DeviceExtension;
-    UINT ByteCount;
-    PBYTE Data;

    DPRINT("BlasterDeviceControl() called!\n");

@@ -25,6 +25,7 @@ unsigned char read_dsp(unsigned short base)
 {
 //	while((inb(base+0x0e)&0x80)==0);	//Wait until there is something to read
 //	return	inb(base+0x0a);
+	return 0;
 }

 /************************************'
@@ -13,5 +13,5 @@ unsigned short base;
 unsigned char irq,dma8,dma16;
 unsigned char read_dsp(unsigned short base);
 void write_dsp(unsigned short base,unsigned char data);
-//sb_status detect_dsp(SB16* sb16);
+sb_status detect_dsp(SB16* sb16);
 sb_status reset_dsp(unsigned short base_address);
@@ -20,6 +20,7 @@ unsigned char read_mixer(unsigned short base,unsigned char reg)

 //	outb(base+0x04,reg);
 //	return inb(base+0x05);
+	return 0;
 }

 unsigned char get_irq(SB16* sb16)
@@ -77,6 +77,7 @@ NTSTATUS ModuleEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
 * RETURNS: Success or failure
 */
 {
+#if 0
 	PDEVICE_OBJECT DeviceObject;
 	NTSTATUS ret;
   
@@ -96,7 +97,7 @@ NTSTATUS ModuleEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath)
 	DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch;
 	DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch;
 	DriverObject->DriverUnload = NULL;
-   
+#endif
 	return(STATUS_SUCCESS);
 }

@@ -29,7 +29,7 @@ SB16 sb16;

 ULONG OldIRQ;
 PKINTERRUPT IrqObject;
-BOOLEAN DMAOutputISR(PKINTERRUPT Interrupt, PVOID ServiceContext)
+BOOLEAN STDCALL DMAOutputISR(PKINTERRUPT Interrupt, PVOID ServiceContext)
 {
 	DPRINT1("interrupt\n");
 	return FALSE;
@@ -42,7 +42,7 @@ void sb16_play(WAVE_HDR* wave)
 	KIRQL Dirql;
 	KAFFINITY Affinity;
 	PKINTERRUPT IrqObject;
-	unsigned int mask,newmask;
+	unsigned int newmask;
 	
 	unsigned int i;
 	unsigned int tmp[255];
@@ -1,5 +1,5 @@
-<module name="oskittcp" type="staticlibrary">
-        <define name="__REACTOS__">1</define>
+<module name="oskittcp" type="staticlibrary" warnings="true">
+	<define name="__REACTOS__">1</define>
 	<define name="__NTDRIVER__"/>
 	<define name="KERNEL"/>
 	<define name="_DISABLE_TIDENTS"/>
@@ -1,4 +1,4 @@
-<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll">
+<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" warnings="true">
 	<importlibrary definition="cabinet.spec.def" />
 	<include base="cabinet">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll">
+<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true">
 	<importlibrary definition="comctl32.spec.def" />
 	<include base="comctl32">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll">
+<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true">
 	<importlibrary definition="comdlg32.spec.def" />
 	<include base="comdlg32">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll">
+<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true">
 	<importlibrary definition="dbghelp.spec.def" />
 	<include base="dbghelp">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll">
+<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" warnings="true">
 	<importlibrary definition="devenum.spec.def" />
 	<include base="devenum">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll">
+<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" warnings="true">
 	<importlibrary definition="dinput.spec.def" />
 	<include base="dinput">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -148,6 +148,9 @@
 <directory name="msgina">
 	<xi:include href="msgina/msgina.xml" />
 </directory>
+<directory name="msi">
+	<xi:include href="msi/msi.xml" />
+</directory>
 <directory name="msimg32">
 	<xi:include href="msimg32/msimg32.xml" />
 </directory>
@@ -205,6 +208,9 @@
 <directory name="secur32">
 	<xi:include href="secur32/secur32.xml" />
 </directory>
+<directory name="serialui">
+	<xi:include href="serialui/serialui.xml" />
+</directory>
 <directory name="setupapi">
 	<xi:include href="setupapi/setupapi.xml" />
 </directory>
@@ -1,4 +1,4 @@
-<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll">
+<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" warnings="true">
 	<importlibrary definition="iphlpapi.spec.def" />
 	<include base="iphlpapi">include</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll">
+<module name="kbdda" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdda.dll" warnings="true">
 	<importlibrary definition="kbdda.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -1,4 +1,4 @@
-<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll">
+<module name="kbddv" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbddv.dll" warnings="true">
 	<importlibrary definition="kbddv.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -1,4 +1,4 @@
-<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll">
+<module name="kbdes" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdes.dll" warnings="true">
 	<importlibrary definition="kbdes.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -1,4 +1,4 @@
-<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll">
+<module name="kbdfr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdfr.dll" warnings="true">
 	<importlibrary definition="kbdfr.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -1,4 +1,4 @@
-<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll">
+<module name="kbdgr" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdgr.dll" warnings="true">
 	<importlibrary definition="kbdgr.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -1,4 +1,4 @@
-<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll">
+<module name="kbdse" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdse.dll" warnings="true">
 	<importlibrary definition="kbdse.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -1,4 +1,4 @@
-<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll">
+<module name="kbduk" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbduk.dll" warnings="true">
 	<importlibrary definition="kbduk.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -1,4 +1,4 @@
-<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll">
+<module name="kbdus" type="kernelmodedll" entrypoint="0" installbase="system32" installname="kbdus.dll" warnings="true">
 	<importlibrary definition="kbdus.def" />
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -0,0 +1,52 @@
+<module name="msi" type="win32dll" baseaddress="${BASEADDRESS_MSI}" installbase="system32" installname="msi.dll" warnings="true">
+	<importlibrary definition="msi.spec.def" />
+	<include base="msi">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>wine</library>
+	<library>uuid</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>advapi32</library>
+	<library>shell32</library>
+	<library>winmm</library>
+	<library>cabinet</library>
+	<library>ole32</library>
+	<library>oleaut32</library>
+	<library>version</library>
+	<file>action.c</file>
+	<file>appsearch.c</file>
+	<file>cond.tab.c</file>
+	<file>create.c</file>
+	<file>custom.c</file>
+	<file>delete.c</file>
+	<file>dialog.c</file>
+	<file>distinct.c</file>
+	<file>format.c</file>
+	<file>handle.c</file>
+	<file>insert.c</file>
+	<file>msi.c</file>
+	<file>msiquery.c</file>
+	<file>order.c</file>
+	<file>package.c</file>
+	<file>preview.c</file>
+	<file>record.c</file>
+	<file>registry.c</file>
+	<file>regsvr.c</file>
+	<file>select.c</file>
+	<file>sql.tab.c</file>
+	<file>string.c</file>
+	<file>suminfo.c</file>
+	<file>table.c</file>
+	<file>tokenize.c</file>
+	<file>update.c</file>
+	<file>where.c</file>
+	<file>msi.spec</file>
+	<file>msi.rc</file>
+</module>
@@ -122,7 +122,7 @@ InterlockedCompareExchange(PLONG Destination,
 	LONG Exchange,
 	LONG Comperand)
 {	
-	PVOID ret;
+	LONG ret;
 	__asm__ ( /* lock for SMP systems */
                  "lock\n\t"
                  "cmpxchgl %2,(%1)"
@@ -1,4 +1,4 @@
-<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll">
+<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true">
 	<importlibrary definition="ole32.spec.def" />
 	<include base="ole32">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll">
+<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true">
 	<importlibrary definition="oleaut32.spec.def" />
 	<include base="oleaut32">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}">
+<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" warnings="true">
 	<importlibrary definition="riched20.spec.def" />
 	<include base="riched20">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}">
+<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" warnings="true">
 	<importlibrary definition="rpcrt4.spec.def" />
 	<include base="rpcrt4">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -0,0 +1,12 @@
+<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}">
+	<importlibrary definition="serialui.def" />
+	<include base="serialui">.</include>
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>shlwapi</library>
+	<file>serialui.c</file>
+	<file>serialui.rc</file>
+</module>
@@ -1,4 +1,4 @@
-<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll">
+<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" warnings="true">
 	<importlibrary definition="setupapi.spec.def" />
 	<include base="setupapi">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll">
+<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" warnings="true">
 	<importlibrary definition="shdocvw.spec.def" />
 	<include base="shdocvw">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll">
+<module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" warnings="true">
 	<importlibrary definition="shell32.spec.def" />
 	<include base="shell32">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll">
+<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true">
 	<importlibrary definition="shlwapi.spec.def" />
 	<include base="shlwapi">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll">
+<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true">
 	<importlibrary definition="urlmon.spec.def" />
 	<include base="urlmon">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -232,7 +232,7 @@ AddDesktopItemW (BOOL bCommonDesktop,
  WCHAR szLinkPath[MAX_PATH];
  WCHAR szArguments[MAX_PATH];
  WCHAR szCommand[MAX_PATH];
-  WIN32_FIND_DATA FindData;
+  WIN32_FIND_DATAW FindData;
  HANDLE hFind;
  LPWSTR Ptr;
  DWORD dwLength;
@@ -416,7 +416,7 @@ DeleteDesktopItemW (BOOL bCommonItem,
  wcscat (szLinkPath, L".lnk");
  DPRINT ("Link path: '%S'\n", szLinkPath);

-  return DeleteFile (szLinkPath);
+  return DeleteFileW (szLinkPath);
 }


@@ -657,7 +657,7 @@ AddItemW (LPCWSTR lpGroupName,  /* Optional */
  WCHAR szLinkPath[MAX_PATH];
  WCHAR szArguments[MAX_PATH];
  WCHAR szCommand[MAX_PATH];
-  WIN32_FIND_DATA FindData;
+  WIN32_FIND_DATAW FindData;
  HANDLE hFind;
  LPWSTR Ptr;
  DWORD dwLength;
@@ -206,7 +206,7 @@ CopyKey (HKEY hDstKey,
 	      return FALSE;
 	    }

-	  if (RegSetValueEx (hDstKey,
+	  if (RegSetValueExW (hDstKey,
 			     lpNameBuffer,
 			     0,
 			     dwType,
@@ -110,7 +110,7 @@ InitializeProfiles (VOID)
  HKEY hKey;

  /* Load profiles directory path */
-  if (!LoadString(hInstance,
+  if (!LoadStringW(hInstance,
 		  IDS_PROFILEPATH,
 		  szBuffer,
 		  MAX_PATH))
@@ -289,7 +289,7 @@ InitializeProfiles (VOID)
    }

  /* Set 'Fonts' folder path */
-  GetWindowsDirectory(szBuffer, MAX_PATH);
+  GetWindowsDirectoryW(szBuffer, MAX_PATH);
  wcscat(szBuffer, L"\\media\\fonts");

  dwLength = (wcslen(szBuffer) + 1) * sizeof(WCHAR);
@@ -541,7 +541,7 @@ InitializeProfiles (VOID)
  RegCloseKey(hKey);

  /* Load 'Program Files' location */
-  if (!LoadString(hInstance,
+  if (!LoadStringW(hInstance,
 		  IDS_PROGRAMFILES,
 		  szBuffer,
 		  MAX_PATH))
@@ -1,4 +1,4 @@
-<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll">
+<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true">
 	<importlibrary definition="winmm.spec.def" />
 	<include base="winmm">.</include>
 	<include base="ReactOS">include/wine</include>
@@ -1,4 +1,4 @@
-<module name="calc" type="win32gui" installbase="system32" installname="calc.exe">
+<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" warnings="true">
 	<include base="calc">.</include>
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
@@ -16,6 +16,9 @@
 <directory name="format">
 	<xi:include href="format/format.xml" />
 </directory>
+<directory name="msiexec">
+	<xi:include href="msiexec/msiexec.xml" />
+</directory>
 <directory name="notepad">
 	<xi:include href="notepad/notepad.xml" />
 </directory>
@@ -0,0 +1,19 @@
+<module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe" warnings="true">
+	<include base="msiexec">.</include>
+	<include base="ReactOS">include/wine</include>
+	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x501</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>uuid</library>
+	<library>wine</library>
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>advapi32</library>
+	<library>ole32</library>
+	<library>msi</library>
+	<file>msiexec.c</file>
+	<file>version.rc</file>
+</module>
@@ -131,7 +131,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 *  WM_DESTROY  - post a quit message and return
 *
 */
-INT_PTR CALLBACK
+LRESULT CALLBACK
 ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
    static short last_split;
@@ -271,7 +271,6 @@ LRESULT CALLBACK DwordEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
 INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
    WNDPROC oldproc;
-    TCHAR* valueData;
    HWND hwndValue;
    int len;
    TCHAR ValueString[32];
@@ -398,7 +397,6 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP

 INT_PTR CALLBACK modify_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    PVOID valueData;
    HWND hwndValue;
    int len;

@@ -642,7 +642,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 *
 */

-INT_PTR CALLBACK
+LRESULT CALLBACK
 FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
    switch (message) {
@@ -21,6 +21,8 @@
 #define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */
 #include <windows.h>
 #include <commctrl.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <tchar.h>

 #include "hexedit.h"
@@ -226,7 +228,7 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
      dx = hed->LeftMargin;
      
      /* draw address */
-      _stprintf(addr, _T("%04X"), linestart);
+      _stprintf(addr, _T("%04lX"), linestart);
      TextOut(hDC, dx, dy, addr, 4);
      
      dx += ((4 + hed->AddressSpacing) * hed->CharWidth);
@@ -273,7 +275,6 @@ HEXEDIT_PaintLines(PHEXEDIT_DATA hed, HDC hDC, DWORD ScrollPos, DWORD First, DWO
 static DWORD
 HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt)
 {
-  WINDOWINFO wi;
  int d;
  
  if(pt.x <= hed->LeftMargin)
@@ -478,6 +479,7 @@ HEXEDIT_HEM_SETMAXBUFFERSIZE(PHEXEDIT_DATA hed, DWORD nMaxSize)
    hed->hBuffer = LocalReAlloc(hed->hBuffer, hed->MaxBuffer, LMEM_MOVEABLE);
    HEXEDIT_Update(hed);
  }
+  return 0;
 }

 /*** Message Proc *************************************************************/
@@ -176,7 +176,7 @@ static void AddEntryToList(HWND hwndLV, LPTSTR Name, DWORD dwValType, void* ValB
            break;
        case REG_MULTI_SZ:
            {
-              LPTSTR src, str, cursrc;
+              LPTSTR src, str;
              if(dwCount >= 2)
              {
 	          src = (LPTSTR)ValBuf;
@@ -374,17 +374,6 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor
    return g_invertSort ? _tcscmp(r->name, l->name) : _tcscmp(l->name, r->name);
 }

-static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    switch (LOWORD(wParam)) {
-        /*    case ID_FILE_OPEN: */
-        /*        break; */
-    default:
-        return FALSE;
-    }
-    return TRUE;
-}
-
 BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
 {
    NMLVDISPINFO* Info;
@@ -445,7 +434,6 @@ BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
                }
                else
                {
-                  LONG ret;
 		  //if((ret = RenameValue(lineinfo->name, Info->item.pszText)) != ERROR_SUCCESS)
                  {
 		    TCHAR msg[128], caption[128];
@@ -21,6 +21,8 @@
 #define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */
 #include <windows.h>
 #include <commctrl.h>
+#include <accctrl.h>
+#include <unknwn.h>
 #include <stdlib.h>
 #include <tchar.h>
 #include <process.h>
@@ -29,7 +31,7 @@

 #include "main.h"
 #include "hexedit.h"
-
+#include "security.h"

 BOOL ProcessCmdLine(LPSTR lpCmdLine);

@@ -118,7 +120,6 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
    if(!AclUiAvailable)
    {
      HMENU hEditMenu;
-      int mePos;
      /* hide the Edit/Permissions... menu entry */
      hEditMenu = GetSubMenu(hMenuFrame, 1);
      if(hEditMenu != NULL)
@@ -80,10 +80,10 @@ extern TCHAR szChildClass[];
 extern void ShowAboutBox(HWND hWnd);

 /* childwnd.c */
-extern INT_PTR CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);
+extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM);

 /* framewnd.c */
-extern INT_PTR CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
+extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM);
 extern void SetupStatusBar(HWND hWnd, BOOL bResize);
 extern void UpdateStatusBar(void);

@@ -22,6 +22,7 @@

 #include <limits.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <windows.h>
 #include <winnt.h>
 #include <winreg.h>
@@ -36,6 +36,23 @@
   Implementation of the CRegKeySecurity interface
 ******************************************************************************/
 
+ static ifaceCRegKeySecurityVbtl efvt =
+{
+  /* IUnknown methods */
+  CRegKeySecurity_fnQueryInterface,
+  CRegKeySecurity_fnAddRef,
+  CRegKeySecurity_fnRelease,
+  
+  /* CRegKeySecurity methods */
+  CRegKeySecurity_fnGetObjectInformation,
+  CRegKeySecurity_fnGetSecurity,
+  CRegKeySecurity_fnSetSecurity,
+  CRegKeySecurity_fnGetAccessRights,
+  CRegKeySecurity_fnMapGeneric,
+  CRegKeySecurity_fnGetInheritTypes,
+  CRegKeySecurity_fnPropertySheetPageCallback
+};
+
 SI_ACCESS RegAccess[] = {
  {&GUID_NULL, KEY_ALL_ACCESS,         (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_FULLCONTROL),      SI_ACCESS_GENERAL | SI_ACCESS_SPECIFIC},
  {&GUID_NULL, KEY_READ,               (LPWSTR)MAKEINTRESOURCE(IDS_ACCESS_READ),             SI_ACCESS_GENERAL},
@@ -257,7 +274,6 @@ RegKeyEditPermissions(HWND hWndOwner,
                      LPCTSTR lpKeyName)
 {
  BOOL Result;
-  HMODULE hAclEditDll;
  LPWSTR Machine, KeyName;
  HKEY hInfoKey;
  LPREGKEYSECURITY RegKeySecurity;
@@ -12,6 +12,12 @@ GetSecurityInfo(HANDLE handle,
                PACL* ppSacl,
                PSECURITY_DESCRIPTOR* ppSecurityDescriptor);

+extern BOOL
+InitializeAclUiDll(VOID);
+
+extern VOID
+UnloadAclUiDll(VOID);
+
 DEFINE_GUID(IID_CRegKeySecurity, 0x965fc360, 0x16ff, 0x11d0, 0x0091, 0xcb,0x00,0xaa,0x00,0xbb,0xb7,0x23);

 /******************************************************************************
@@ -103,23 +109,6 @@ HRESULT STDMETHODCALLTYPE CRegKeySecurity_fnPropertySheetPageCallback(LPREGKEYSE
                                                                      UINT uMsg,
                                                                      SI_PAGE_TYPE uPage);

-static ifaceCRegKeySecurityVbtl efvt =
-{
-  /* IUnknown methods */
-  CRegKeySecurity_fnQueryInterface,
-  CRegKeySecurity_fnAddRef,
-  CRegKeySecurity_fnRelease,
-  
-  /* CRegKeySecurity methods */
-  CRegKeySecurity_fnGetObjectInformation,
-  CRegKeySecurity_fnGetSecurity,
-  CRegKeySecurity_fnSetSecurity,
-  CRegKeySecurity_fnGetAccessRights,
-  CRegKeySecurity_fnMapGeneric,
-  CRegKeySecurity_fnGetInheritTypes,
-  CRegKeySecurity_fnPropertySheetPageCallback
-};
-
 #endif /* _REGEXP_SECURITY_H */

 /* EOF */
@@ -86,6 +86,7 @@ FillErrorReport(HWND hwndDlg)
  return errorReport;
 }

+VOID
 ReleaseErrorReport(LPERROR_REPORT errorReport)
 {
  if (errorReport->YourEmail)
@@ -320,10 +321,8 @@ ReceiveResponse(SOCKET socket, LPSTR responseBuffer, PULONG responseBufferSize)
 {
  PCHAR pch = (PCHAR)responseBuffer;
  ULONG length = 0;
-  INT contentLength = 0;
  fd_set fdset[1];
  struct timeval timeout;
-  CHAR buf[4000];

  FD_ZERO(&fdset);
  FD_SET(socket, &fdset);
@@ -380,7 +379,6 @@ SubmissionThread(LPVOID lpParameter)
  SOCKET socket;
  HANDLE hThread;
  INT error;
-  INT i;

  if (AbortSubmission != 0)
    goto done;
@@ -585,11 +583,9 @@ WinMain(HINSTANCE hInstance,
 	LPSTR lpszCmdLine,
 	int nCmdShow)
 {
-	WORD wVersionRequested;
-	WSADATA wsaData;
-	INT error;
-  INT version;
-  WCHAR *lc;
+  WORD wVersionRequested;
+  WSADATA wsaData;
+  INT error;

  hAppInstance = hInstance;

@@ -602,12 +598,12 @@ WinMain(HINSTANCE hInstance,
    LoadString(hAppInstance, IDS_FAILED_TO_INITIALIZE_WINSOCK, format, sizeof(format) / sizeof(WCHAR));
    wsprintf(message, format, error);
    MessageBox(NULL, message, NULL, MB_ICONWARNING);
-    return;
+    return 0;
  }
  
  CreateWizard();

- 	WSACleanup();
+  WSACleanup();
  
  return 0;
 }
@@ -1,4 +1,4 @@
-<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe">
+<module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" warnings="true">
 	<bootstrap base="reactos/system32" nameoncd="smss.exe" />
 	<include base="usetup">.</include>
 	<include base="zlib">.</include>
@@ -1,4 +1,4 @@
-<module name="winefile" type="win32gui"  installbase="system32" installname="winefile.exe">
+<module name="winefile" type="win32gui"  installbase="system32" installname="winefile.exe" warnings="true">
 	<include base="winefile">.</include>
 	<define name="UNICODE" />
 	<define name="__USE_W32API" />
@@ -1,2 +1,2 @@
 /* EMPTY FOR NOW */
-/* Hope I didn't delete existing defs!! Check CVS version of this file.. */
+/* Hope I didn't delete existing defs!! Check CVS version of this file.. */
@@ -417,10 +417,11 @@ MingwBackend::GenerateGlobalVariables () const
 	GenerateGlobalCFlagsAndProperties (
 		"=",
 		ProjectNode.non_if_data );
-	fprintf ( fMakefile, "PROJECT_RCFLAGS = $(PROJECT_CFLAGS)\n" );
-	fprintf ( fMakefile, "PROJECT_WIDLFLAGS = $(PROJECT_CFLAGS)\n" );
-	fprintf ( fMakefile, "PROJECT_LFLAGS = %s\n",
+	fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" );
+	fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" );
+	fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n",
 	          GenerateProjectLFLAGS ().c_str () );
+	fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
 	fprintf ( fMakefile, "\n" );
 }

@@ -1445,6 +1445,8 @@ MingwModuleHandler::GenerateOtherMacros ()
 	string globalCflags = "-g";
 	if ( backend->usePipe )
 		globalCflags += " -pipe";
+	if ( !module.enableWarnings )
+		globalCflags += " -Werror";
 	
 	fprintf (
 		fMakefile,
@@ -222,6 +222,12 @@ Module::Module ( const Project& project,
 		useWRC = att->value == "true";
 	else
 		useWRC = true;
+
+	att = moduleNode.GetAttribute ( "warnings", false );
+	if ( att != NULL )
+		enableWarnings = att->value == "true";
+	else
+		enableWarnings = false;
 }

 Module::~Module ()
@@ -176,6 +176,7 @@ public:
 	std::string installBase;
 	std::string installName;
 	bool useWRC;
+	bool enableWarnings;

 	Module ( const Project& project,
 	         const XMLElement& moduleNode,
@@ -107,7 +107,7 @@ Module element
 There can be zero or more modules per xml build file.

 Syntax:
-	<module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false">
+	<module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true">
 		...
 	</module>

@@ -121,6 +121,7 @@ Attributes:
 	installbase - Base directory of the generated file in the installation directory. This attribute is optional.
 	installname - Name of generated file in the installation directory. This attribute is optional, but if not specified, the generated file is not copied to the installation directory.
 	usewrc - Use WRC to compile resources if true. If false, windres is used. This attribute is optional. If not specified, WRC will be used.
+	warnings - Error out if false and at least one warning is emitted during building of this module. This attribute is optional. If not specified, it is assumed to be false.

 Value:
 	None.