From fb03ace091bfd6ae3aae2272939fb410e14ee954 Mon Sep 17 00:00:00 2001 From: Casper Hornstrup Date: Sun, 10 Apr 2005 19:44:11 +0000 Subject: [PATCH] Support -Werror svn path=/branches/xmlbuildsystem/; revision=14582 --- reactos/apps/utils/net/arp/arp.c | 2 +- reactos/apps/utils/net/finger/finger.c | 10 ---- reactos/apps/utils/net/finger/net.c | 6 +-- reactos/apps/utils/net/ftp/ftp.xml | 2 +- reactos/apps/utils/net/ipconfig/ipconfig.xml | 2 +- reactos/apps/utils/net/netstat/netstat.xml | 2 +- reactos/apps/utils/net/ping/ping.c | 3 +- reactos/apps/utils/net/route/route.c | 5 +- reactos/apps/utils/net/whois/whois.c | 12 +---- reactos/baseaddress.xml | 2 + reactos/boot/freeldr/freeldr/freeldr_base.xml | 2 +- reactos/drivers/bus/acpi/acpi.xml | 2 +- reactos/drivers/bus/directory.xml | 3 ++ reactos/drivers/bus/serenum/serenum.xml | 12 +++++ reactos/drivers/dd/sndblst/card.c | 2 - reactos/drivers/dd/sndblst/dma.c | 1 - reactos/drivers/dd/sndblst/irq.c | 12 ----- reactos/drivers/dd/sndblst/portio.c | 2 +- reactos/drivers/dd/sndblst/settings.c | 2 - reactos/drivers/dd/sndblst/sndblst.c | 2 - reactos/drivers/dd/sound/dsp.c | 1 + reactos/drivers/dd/sound/dsp.h | 2 +- reactos/drivers/dd/sound/mixer.c | 1 + reactos/drivers/dd/sound/sound.c | 3 +- reactos/drivers/dd/sound/wave.c | 4 +- reactos/drivers/lib/oskittcp/oskittcp.xml | 4 +- reactos/lib/cabinet/cabinet.xml | 2 +- reactos/lib/comctl32/comctl32.xml | 2 +- reactos/lib/comdlg32/comdlg32.xml | 2 +- reactos/lib/dbghelp/dbghelp.xml | 2 +- reactos/lib/devenum/devenum.xml | 2 +- reactos/lib/dinput/dinput.xml | 2 +- reactos/lib/directory.xml | 6 +++ reactos/lib/iphlpapi/iphlpapi.xml | 2 +- reactos/lib/kbdda/kbdda.xml | 2 +- reactos/lib/kbddv/kbddv.xml | 2 +- reactos/lib/kbdes/kbdes.xml | 2 +- reactos/lib/kbdfr/kbdfr.xml | 2 +- reactos/lib/kbdgr/kbdgr.xml | 2 +- reactos/lib/kbdse/kbdse.xml | 2 +- reactos/lib/kbduk/kbduk.xml | 2 +- reactos/lib/kbdus/kbdus.xml | 2 +- reactos/lib/msi/msi.xml | 52 +++++++++++++++++++ reactos/lib/ntdll/rtl/intrlck.c | 2 +- reactos/lib/ole32/ole32.xml | 2 +- reactos/lib/oleaut32/oleaut32.xml | 2 +- reactos/lib/riched20/riched20.xml | 2 +- reactos/lib/rpcrt4/rpcrt4.xml | 2 +- reactos/lib/serialui/serialui.xml | 12 +++++ reactos/lib/setupapi/setupapi.xml | 2 +- reactos/lib/shdocvw/shdocvw.xml | 2 +- reactos/lib/shell32/shell32.xml | 2 +- reactos/lib/shlwapi/shlwapi.xml | 2 +- reactos/lib/urlmon/urlmon.xml | 2 +- reactos/lib/userenv/desktop.c | 6 +-- reactos/lib/userenv/registry.c | 2 +- reactos/lib/userenv/setup.c | 6 +-- reactos/lib/winmm/winmm.xml | 2 +- reactos/subsys/system/calc/calc.xml | 2 +- reactos/subsys/system/directory.xml | 3 ++ reactos/subsys/system/msiexec/msiexec.xml | 19 +++++++ reactos/subsys/system/regedit/childwnd.c | 2 +- reactos/subsys/system/regedit/edit.c | 2 - reactos/subsys/system/regedit/framewnd.c | 2 +- reactos/subsys/system/regedit/hexedit.c | 6 ++- reactos/subsys/system/regedit/listview.c | 14 +---- reactos/subsys/system/regedit/main.c | 5 +- reactos/subsys/system/regedit/main.h | 4 +- reactos/subsys/system/regedit/regproc.c | 1 + reactos/subsys/system/regedit/security.c | 18 ++++++- reactos/subsys/system/regedit/security.h | 23 +++----- .../subsys/system/reporterror/reporterror.c | 16 +++--- reactos/subsys/system/usetup/usetup.xml | 2 +- reactos/subsys/system/winefile/winefile.xml | 2 +- reactos/subsys/win32k/objects/font.c | 2 +- reactos/tools/rbuild/backend/mingw/mingw.cpp | 7 +-- .../rbuild/backend/mingw/modulehandler.cpp | 2 + reactos/tools/rbuild/module.cpp | 6 +++ reactos/tools/rbuild/rbuild.h | 1 + reactos/tools/rbuild/rbuild.txt | 3 +- 80 files changed, 225 insertions(+), 154 deletions(-) create mode 100644 reactos/drivers/bus/serenum/serenum.xml create mode 100644 reactos/lib/msi/msi.xml create mode 100644 reactos/lib/serialui/serialui.xml create mode 100644 reactos/subsys/system/msiexec/msiexec.xml diff --git a/reactos/apps/utils/net/arp/arp.c b/reactos/apps/utils/net/arp/arp.c index 4468cac7ce7..19bbf0f31b3 100644 --- a/reactos/apps/utils/net/arp/arp.c +++ b/reactos/apps/utils/net/arp/arp.c @@ -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 { diff --git a/reactos/apps/utils/net/finger/finger.c b/reactos/apps/utils/net/finger/finger.c index 125f8786391..7d3c9997b22 100644 --- a/reactos/apps/utils/net/finger/finger.c +++ b/reactos/apps/utils/net/finger/finger.c @@ -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 diff --git a/reactos/apps/utils/net/finger/net.c b/reactos/apps/utils/net/finger/net.c index 3cf4bdb3168..f007a79ccf2 100644 --- a/reactos/apps/utils/net/finger/net.c +++ b/reactos/apps/utils/net/finger/net.c @@ -34,10 +34,6 @@ * SUCH DAMAGE. */ -#ifndef lint -static char sccsid[] = "@(#)net.c 8.4 (Berkeley) 4/28/95"; -#endif /* not lint */ - #include #include #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; diff --git a/reactos/apps/utils/net/ftp/ftp.xml b/reactos/apps/utils/net/ftp/ftp.xml index 0871c49fed4..abc7f2d65b2 100644 --- a/reactos/apps/utils/net/ftp/ftp.xml +++ b/reactos/apps/utils/net/ftp/ftp.xml @@ -1,4 +1,4 @@ - + . kernel32 diff --git a/reactos/apps/utils/net/ipconfig/ipconfig.xml b/reactos/apps/utils/net/ipconfig/ipconfig.xml index 7a980e64589..f8758033522 100644 --- a/reactos/apps/utils/net/ipconfig/ipconfig.xml +++ b/reactos/apps/utils/net/ipconfig/ipconfig.xml @@ -1,4 +1,4 @@ - + . kernel32 diff --git a/reactos/apps/utils/net/netstat/netstat.xml b/reactos/apps/utils/net/netstat/netstat.xml index 580e3d8f7f6..68a2e26614a 100644 --- a/reactos/apps/utils/net/netstat/netstat.xml +++ b/reactos/apps/utils/net/netstat/netstat.xml @@ -1,4 +1,4 @@ - + . 0x600 diff --git a/reactos/apps/utils/net/ping/ping.c b/reactos/apps/utils/net/ping/ping.c index 5cab24632b7..f91a8981cd2 100644 --- a/reactos/apps/utils/net/ping/ping.c +++ b/reactos/apps/utils/net/ping/ping.c @@ -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; diff --git a/reactos/apps/utils/net/route/route.c b/reactos/apps/utils/net/route/route.c index ded88019259..60f2b2260c3 100644 --- a/reactos/apps/utils/net/route/route.c +++ b/reactos/apps/utils/net/route/route.c @@ -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, diff --git a/reactos/apps/utils/net/whois/whois.c b/reactos/apps/utils/net/whois/whois.c index 989d0a2e754..171547679ba 100644 --- a/reactos/apps/utils/net/whois/whois.c +++ b/reactos/apps/utils/net/whois/whois.c @@ -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 #include /* #include */ /* #include */ /* #include */ #include +#include /* #include */ #include @@ -160,6 +151,7 @@ int main(int argc, char **argv) putchar(ch); leave(0); + return 0; } void usage() diff --git a/reactos/baseaddress.xml b/reactos/baseaddress.xml index 2af46181772..69f52b97893 100644 --- a/reactos/baseaddress.xml +++ b/reactos/baseaddress.xml @@ -25,6 +25,7 @@ + @@ -58,6 +59,7 @@ + diff --git a/reactos/boot/freeldr/freeldr/freeldr_base.xml b/reactos/boot/freeldr/freeldr/freeldr_base.xml index f08569ed98c..6bf12a64b79 100644 --- a/reactos/boot/freeldr/freeldr/freeldr_base.xml +++ b/reactos/boot/freeldr/freeldr/freeldr_base.xml @@ -1,4 +1,4 @@ - + include cache include diff --git a/reactos/drivers/bus/acpi/acpi.xml b/reactos/drivers/bus/acpi/acpi.xml index 43c25f20948..009ffc22f11 100644 --- a/reactos/drivers/bus/acpi/acpi.xml +++ b/reactos/drivers/bus/acpi/acpi.xml @@ -1,4 +1,4 @@ - + include ospm/include ntoskrnl diff --git a/reactos/drivers/bus/directory.xml b/reactos/drivers/bus/directory.xml index fe5626f4033..c0b239bc0a4 100644 --- a/reactos/drivers/bus/directory.xml +++ b/reactos/drivers/bus/directory.xml @@ -7,3 +7,6 @@ + + + diff --git a/reactos/drivers/bus/serenum/serenum.xml b/reactos/drivers/bus/serenum/serenum.xml new file mode 100644 index 00000000000..9db96ab67e1 --- /dev/null +++ b/reactos/drivers/bus/serenum/serenum.xml @@ -0,0 +1,12 @@ + + . + + ntoskrnl + hal + detect.c + fdo.c + misc.c + pdo.c + serenum.c + serenum.rc + diff --git a/reactos/drivers/dd/sndblst/card.c b/reactos/drivers/dd/sndblst/card.c index 434406b2688..e1b38b018ab 100644 --- a/reactos/drivers/dd/sndblst/card.c +++ b/reactos/drivers/dd/sndblst/card.c @@ -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) diff --git a/reactos/drivers/dd/sndblst/dma.c b/reactos/drivers/dd/sndblst/dma.c index bbeddbbce19..876b17063d4 100644 --- a/reactos/drivers/dd/sndblst/dma.c +++ b/reactos/drivers/dd/sndblst/dma.c @@ -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; diff --git a/reactos/drivers/dd/sndblst/irq.c b/reactos/drivers/dd/sndblst/irq.c index 1448f772ee8..b9ffbff695f 100644 --- a/reactos/drivers/dd/sndblst/irq.c +++ b/reactos/drivers/dd/sndblst/irq.c @@ -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? diff --git a/reactos/drivers/dd/sndblst/portio.c b/reactos/drivers/dd/sndblst/portio.c index 6c918084fcd..0cd268c65b2 100644 --- a/reactos/drivers/dd/sndblst/portio.c +++ b/reactos/drivers/dd/sndblst/portio.c @@ -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 --); } diff --git a/reactos/drivers/dd/sndblst/settings.c b/reactos/drivers/dd/sndblst/settings.c index 983918d7159..71d6ec49969 100644 --- a/reactos/drivers/dd/sndblst/settings.c +++ b/reactos/drivers/dd/sndblst/settings.c @@ -292,8 +292,6 @@ NTSTATUS SaveSettings( NT status STATUS_SUCCESS if successful */ { - NTSTATUS s; - DPRINT("SaveSettings() unimplemented\n"); // UNIMPLEMENTED; diff --git a/reactos/drivers/dd/sndblst/sndblst.c b/reactos/drivers/dd/sndblst/sndblst.c index 7cb3990155a..d7457025db1 100644 --- a/reactos/drivers/dd/sndblst/sndblst.c +++ b/reactos/drivers/dd/sndblst/sndblst.c @@ -294,8 +294,6 @@ BlasterDeviceControl(PDEVICE_OBJECT DeviceObject, { PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExtension; - UINT ByteCount; - PBYTE Data; DPRINT("BlasterDeviceControl() called!\n"); diff --git a/reactos/drivers/dd/sound/dsp.c b/reactos/drivers/dd/sound/dsp.c index 3e0cbbf6201..fd36af3b434 100644 --- a/reactos/drivers/dd/sound/dsp.c +++ b/reactos/drivers/dd/sound/dsp.c @@ -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; } /************************************' diff --git a/reactos/drivers/dd/sound/dsp.h b/reactos/drivers/dd/sound/dsp.h index 8f79320280e..543cf4491c7 100644 --- a/reactos/drivers/dd/sound/dsp.h +++ b/reactos/drivers/dd/sound/dsp.h @@ -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); diff --git a/reactos/drivers/dd/sound/mixer.c b/reactos/drivers/dd/sound/mixer.c index 8a579ebcc91..6aa9ab24db2 100644 --- a/reactos/drivers/dd/sound/mixer.c +++ b/reactos/drivers/dd/sound/mixer.c @@ -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) diff --git a/reactos/drivers/dd/sound/sound.c b/reactos/drivers/dd/sound/sound.c index 051e14a3791..d084a5516af 100644 --- a/reactos/drivers/dd/sound/sound.c +++ b/reactos/drivers/dd/sound/sound.c @@ -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); } diff --git a/reactos/drivers/dd/sound/wave.c b/reactos/drivers/dd/sound/wave.c index 79927c063b6..2f86adb41dd 100644 --- a/reactos/drivers/dd/sound/wave.c +++ b/reactos/drivers/dd/sound/wave.c @@ -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]; diff --git a/reactos/drivers/lib/oskittcp/oskittcp.xml b/reactos/drivers/lib/oskittcp/oskittcp.xml index d5e6ff07fd8..48069b0ef27 100644 --- a/reactos/drivers/lib/oskittcp/oskittcp.xml +++ b/reactos/drivers/lib/oskittcp/oskittcp.xml @@ -1,5 +1,5 @@ - - 1 + + 1 diff --git a/reactos/lib/cabinet/cabinet.xml b/reactos/lib/cabinet/cabinet.xml index d44098f8542..d117463b22a 100644 --- a/reactos/lib/cabinet/cabinet.xml +++ b/reactos/lib/cabinet/cabinet.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/comctl32/comctl32.xml b/reactos/lib/comctl32/comctl32.xml index 58d1d2367f9..8fc1741f552 100644 --- a/reactos/lib/comctl32/comctl32.xml +++ b/reactos/lib/comctl32/comctl32.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/comdlg32/comdlg32.xml b/reactos/lib/comdlg32/comdlg32.xml index 745bec762a2..f361b8859ca 100644 --- a/reactos/lib/comdlg32/comdlg32.xml +++ b/reactos/lib/comdlg32/comdlg32.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/dbghelp/dbghelp.xml b/reactos/lib/dbghelp/dbghelp.xml index 082efac6014..ccc8bc9d3a6 100644 --- a/reactos/lib/dbghelp/dbghelp.xml +++ b/reactos/lib/dbghelp/dbghelp.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/devenum/devenum.xml b/reactos/lib/devenum/devenum.xml index dc3ae29303f..9f10fed66e8 100644 --- a/reactos/lib/devenum/devenum.xml +++ b/reactos/lib/devenum/devenum.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/dinput/dinput.xml b/reactos/lib/dinput/dinput.xml index 5ee3f650469..97597398a67 100644 --- a/reactos/lib/dinput/dinput.xml +++ b/reactos/lib/dinput/dinput.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/directory.xml b/reactos/lib/directory.xml index 7fe706b68b4..05fd22aa828 100644 --- a/reactos/lib/directory.xml +++ b/reactos/lib/directory.xml @@ -148,6 +148,9 @@ + + + @@ -205,6 +208,9 @@ + + + diff --git a/reactos/lib/iphlpapi/iphlpapi.xml b/reactos/lib/iphlpapi/iphlpapi.xml index 45d0e118cd3..7b1d3d6111d 100644 --- a/reactos/lib/iphlpapi/iphlpapi.xml +++ b/reactos/lib/iphlpapi/iphlpapi.xml @@ -1,4 +1,4 @@ - + include include/wine diff --git a/reactos/lib/kbdda/kbdda.xml b/reactos/lib/kbdda/kbdda.xml index c6a687c3646..399e87506d5 100644 --- a/reactos/lib/kbdda/kbdda.xml +++ b/reactos/lib/kbdda/kbdda.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/kbddv/kbddv.xml b/reactos/lib/kbddv/kbddv.xml index ddf8d9aee1f..7d03f1b55b6 100644 --- a/reactos/lib/kbddv/kbddv.xml +++ b/reactos/lib/kbddv/kbddv.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/kbdes/kbdes.xml b/reactos/lib/kbdes/kbdes.xml index 2ec4a6c208a..92e1219f514 100644 --- a/reactos/lib/kbdes/kbdes.xml +++ b/reactos/lib/kbdes/kbdes.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/kbdfr/kbdfr.xml b/reactos/lib/kbdfr/kbdfr.xml index 00749bb5726..cf1e6f3abcd 100644 --- a/reactos/lib/kbdfr/kbdfr.xml +++ b/reactos/lib/kbdfr/kbdfr.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/kbdgr/kbdgr.xml b/reactos/lib/kbdgr/kbdgr.xml index fd896c44db0..e24f249a2da 100644 --- a/reactos/lib/kbdgr/kbdgr.xml +++ b/reactos/lib/kbdgr/kbdgr.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/kbdse/kbdse.xml b/reactos/lib/kbdse/kbdse.xml index 5388a84883a..39cd0239230 100644 --- a/reactos/lib/kbdse/kbdse.xml +++ b/reactos/lib/kbdse/kbdse.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/kbduk/kbduk.xml b/reactos/lib/kbduk/kbduk.xml index e45d6486a62..46d4029c069 100644 --- a/reactos/lib/kbduk/kbduk.xml +++ b/reactos/lib/kbduk/kbduk.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/kbdus/kbdus.xml b/reactos/lib/kbdus/kbdus.xml index 39761799522..89f2c6fb353 100644 --- a/reactos/lib/kbdus/kbdus.xml +++ b/reactos/lib/kbdus/kbdus.xml @@ -1,4 +1,4 @@ - + include diff --git a/reactos/lib/msi/msi.xml b/reactos/lib/msi/msi.xml new file mode 100644 index 00000000000..1514fca835d --- /dev/null +++ b/reactos/lib/msi/msi.xml @@ -0,0 +1,52 @@ + + + . + include/wine + + + 0x600 + 0x501 + 0x501 + wine + uuid + ntdll + kernel32 + user32 + gdi32 + advapi32 + shell32 + winmm + cabinet + ole32 + oleaut32 + version + action.c + appsearch.c + cond.tab.c + create.c + custom.c + delete.c + dialog.c + distinct.c + format.c + handle.c + insert.c + msi.c + msiquery.c + order.c + package.c + preview.c + record.c + registry.c + regsvr.c + select.c + sql.tab.c + string.c + suminfo.c + table.c + tokenize.c + update.c + where.c + msi.spec + msi.rc + diff --git a/reactos/lib/ntdll/rtl/intrlck.c b/reactos/lib/ntdll/rtl/intrlck.c index 49f8b76ed93..597e8a09bac 100644 --- a/reactos/lib/ntdll/rtl/intrlck.c +++ b/reactos/lib/ntdll/rtl/intrlck.c @@ -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)" diff --git a/reactos/lib/ole32/ole32.xml b/reactos/lib/ole32/ole32.xml index 9cc776b3e51..6cddd5cf4e2 100644 --- a/reactos/lib/ole32/ole32.xml +++ b/reactos/lib/ole32/ole32.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/oleaut32/oleaut32.xml b/reactos/lib/oleaut32/oleaut32.xml index e885c4e04f6..c9b3c047575 100644 --- a/reactos/lib/oleaut32/oleaut32.xml +++ b/reactos/lib/oleaut32/oleaut32.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/riched20/riched20.xml b/reactos/lib/riched20/riched20.xml index cfc513558fa..e3e97fc2578 100644 --- a/reactos/lib/riched20/riched20.xml +++ b/reactos/lib/riched20/riched20.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/rpcrt4/rpcrt4.xml b/reactos/lib/rpcrt4/rpcrt4.xml index f0be6ddc320..7577e74e1ca 100644 --- a/reactos/lib/rpcrt4/rpcrt4.xml +++ b/reactos/lib/rpcrt4/rpcrt4.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/serialui/serialui.xml b/reactos/lib/serialui/serialui.xml new file mode 100644 index 00000000000..56637e58765 --- /dev/null +++ b/reactos/lib/serialui/serialui.xml @@ -0,0 +1,12 @@ + + + . + + + + kernel32 + user32 + shlwapi + serialui.c + serialui.rc + diff --git a/reactos/lib/setupapi/setupapi.xml b/reactos/lib/setupapi/setupapi.xml index 739d6c520a0..25242005655 100644 --- a/reactos/lib/setupapi/setupapi.xml +++ b/reactos/lib/setupapi/setupapi.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/shdocvw/shdocvw.xml b/reactos/lib/shdocvw/shdocvw.xml index 85064ccac57..fa7ac28294f 100644 --- a/reactos/lib/shdocvw/shdocvw.xml +++ b/reactos/lib/shdocvw/shdocvw.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/shell32/shell32.xml b/reactos/lib/shell32/shell32.xml index 8eb3b625a34..796703e0e1e 100644 --- a/reactos/lib/shell32/shell32.xml +++ b/reactos/lib/shell32/shell32.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/shlwapi/shlwapi.xml b/reactos/lib/shlwapi/shlwapi.xml index a0188511364..b6db72e57ee 100644 --- a/reactos/lib/shlwapi/shlwapi.xml +++ b/reactos/lib/shlwapi/shlwapi.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/urlmon/urlmon.xml b/reactos/lib/urlmon/urlmon.xml index 6e9156f8928..5253d0c7ed7 100644 --- a/reactos/lib/urlmon/urlmon.xml +++ b/reactos/lib/urlmon/urlmon.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/lib/userenv/desktop.c b/reactos/lib/userenv/desktop.c index 1d9260a8dcf..bf735351aa3 100644 --- a/reactos/lib/userenv/desktop.c +++ b/reactos/lib/userenv/desktop.c @@ -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; diff --git a/reactos/lib/userenv/registry.c b/reactos/lib/userenv/registry.c index 07a873dd096..482827daa31 100644 --- a/reactos/lib/userenv/registry.c +++ b/reactos/lib/userenv/registry.c @@ -206,7 +206,7 @@ CopyKey (HKEY hDstKey, return FALSE; } - if (RegSetValueEx (hDstKey, + if (RegSetValueExW (hDstKey, lpNameBuffer, 0, dwType, diff --git a/reactos/lib/userenv/setup.c b/reactos/lib/userenv/setup.c index f5b533526de..e809ff98410 100644 --- a/reactos/lib/userenv/setup.c +++ b/reactos/lib/userenv/setup.c @@ -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)) diff --git a/reactos/lib/winmm/winmm.xml b/reactos/lib/winmm/winmm.xml index 616014e53a3..cbff235edb3 100644 --- a/reactos/lib/winmm/winmm.xml +++ b/reactos/lib/winmm/winmm.xml @@ -1,4 +1,4 @@ - + . include/wine diff --git a/reactos/subsys/system/calc/calc.xml b/reactos/subsys/system/calc/calc.xml index bdbc8de1fbd..bc2bad7eefe 100644 --- a/reactos/subsys/system/calc/calc.xml +++ b/reactos/subsys/system/calc/calc.xml @@ -1,4 +1,4 @@ - + . 0x0501 diff --git a/reactos/subsys/system/directory.xml b/reactos/subsys/system/directory.xml index 3c5ff42262d..c85058cc4f5 100644 --- a/reactos/subsys/system/directory.xml +++ b/reactos/subsys/system/directory.xml @@ -16,6 +16,9 @@ + + + diff --git a/reactos/subsys/system/msiexec/msiexec.xml b/reactos/subsys/system/msiexec/msiexec.xml new file mode 100644 index 00000000000..ad522e9a024 --- /dev/null +++ b/reactos/subsys/system/msiexec/msiexec.xml @@ -0,0 +1,19 @@ + + . + include/wine + + + 0x501 + 0x501 + 0x501 + uuid + wine + ntdll + kernel32 + user32 + advapi32 + ole32 + msi + msiexec.c + version.rc + diff --git a/reactos/subsys/system/regedit/childwnd.c b/reactos/subsys/system/regedit/childwnd.c index 04040f3a5dd..a4528e07563 100644 --- a/reactos/subsys/system/regedit/childwnd.c +++ b/reactos/subsys/system/regedit/childwnd.c @@ -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; diff --git a/reactos/subsys/system/regedit/edit.c b/reactos/subsys/system/regedit/edit.c index 3d0ee6812c6..84f186fc7ba 100644 --- a/reactos/subsys/system/regedit/edit.c +++ b/reactos/subsys/system/regedit/edit.c @@ -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; diff --git a/reactos/subsys/system/regedit/framewnd.c b/reactos/subsys/system/regedit/framewnd.c index 71a7b5d1b81..8cb0a28366b 100644 --- a/reactos/subsys/system/regedit/framewnd.c +++ b/reactos/subsys/system/regedit/framewnd.c @@ -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) { diff --git a/reactos/subsys/system/regedit/hexedit.c b/reactos/subsys/system/regedit/hexedit.c index a363752992a..c305922322d 100644 --- a/reactos/subsys/system/regedit/hexedit.c +++ b/reactos/subsys/system/regedit/hexedit.c @@ -21,6 +21,8 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include +#include +#include #include #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 *************************************************************/ diff --git a/reactos/subsys/system/regedit/listview.c b/reactos/subsys/system/regedit/listview.c index 2aea225b548..43831177bca 100644 --- a/reactos/subsys/system/regedit/listview.c +++ b/reactos/subsys/system/regedit/listview.c @@ -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]; diff --git a/reactos/subsys/system/regedit/main.c b/reactos/subsys/system/regedit/main.c index 40c9f2047f6..30bc08fe45c 100644 --- a/reactos/subsys/system/regedit/main.c +++ b/reactos/subsys/system/regedit/main.c @@ -21,6 +21,8 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include #include +#include +#include #include #include #include @@ -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) diff --git a/reactos/subsys/system/regedit/main.h b/reactos/subsys/system/regedit/main.h index 5bce146dcea..96c6d424686 100644 --- a/reactos/subsys/system/regedit/main.h +++ b/reactos/subsys/system/regedit/main.h @@ -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); diff --git a/reactos/subsys/system/regedit/regproc.c b/reactos/subsys/system/regedit/regproc.c index 974e3c0091a..acf2045a73a 100644 --- a/reactos/subsys/system/regedit/regproc.c +++ b/reactos/subsys/system/regedit/regproc.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include diff --git a/reactos/subsys/system/regedit/security.c b/reactos/subsys/system/regedit/security.c index 216f389f744..74669b91d2d 100644 --- a/reactos/subsys/system/regedit/security.c +++ b/reactos/subsys/system/regedit/security.c @@ -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; diff --git a/reactos/subsys/system/regedit/security.h b/reactos/subsys/system/regedit/security.h index a0e9f832001..ada97c7af69 100644 --- a/reactos/subsys/system/regedit/security.h +++ b/reactos/subsys/system/regedit/security.h @@ -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 */ diff --git a/reactos/subsys/system/reporterror/reporterror.c b/reactos/subsys/system/reporterror/reporterror.c index 3d1240c04c2..11ff644fcad 100644 --- a/reactos/subsys/system/reporterror/reporterror.c +++ b/reactos/subsys/system/reporterror/reporterror.c @@ -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; } diff --git a/reactos/subsys/system/usetup/usetup.xml b/reactos/subsys/system/usetup/usetup.xml index 55213791b3b..68b920bd0e3 100644 --- a/reactos/subsys/system/usetup/usetup.xml +++ b/reactos/subsys/system/usetup/usetup.xml @@ -1,4 +1,4 @@ - + . . diff --git a/reactos/subsys/system/winefile/winefile.xml b/reactos/subsys/system/winefile/winefile.xml index 8dac35e506c..e2809e68bde 100644 --- a/reactos/subsys/system/winefile/winefile.xml +++ b/reactos/subsys/system/winefile/winefile.xml @@ -1,4 +1,4 @@ - + . diff --git a/reactos/subsys/win32k/objects/font.c b/reactos/subsys/win32k/objects/font.c index ee683355a7c..dd31a49f10a 100644 --- a/reactos/subsys/win32k/objects/font.c +++ b/reactos/subsys/win32k/objects/font.c @@ -1,2 +1,2 @@ /* EMPTY FOR NOW */ -/* Hope I didn't delete existing defs!! Check CVS version of this file.. */ \ No newline at end of file +/* Hope I didn't delete existing defs!! Check CVS version of this file.. */ diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp index 4e349851d9d..935d6965eb7 100644 --- a/reactos/tools/rbuild/backend/mingw/mingw.cpp +++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp @@ -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" ); } diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp index 03e25149740..9290027ed69 100644 --- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp +++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp @@ -1445,6 +1445,8 @@ MingwModuleHandler::GenerateOtherMacros () string globalCflags = "-g"; if ( backend->usePipe ) globalCflags += " -pipe"; + if ( !module.enableWarnings ) + globalCflags += " -Werror"; fprintf ( fMakefile, diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp index 8bfd0353437..d51ebda5f86 100644 --- a/reactos/tools/rbuild/module.cpp +++ b/reactos/tools/rbuild/module.cpp @@ -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 () diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h index b52ff471c6e..b50b587027f 100644 --- a/reactos/tools/rbuild/rbuild.h +++ b/reactos/tools/rbuild/rbuild.h @@ -176,6 +176,7 @@ public: std::string installBase; std::string installName; bool useWRC; + bool enableWarnings; Module ( const Project& project, const XMLElement& moduleNode, diff --git a/reactos/tools/rbuild/rbuild.txt b/reactos/tools/rbuild/rbuild.txt index e707ac08f26..af5b9fba6cc 100644 --- a/reactos/tools/rbuild/rbuild.txt +++ b/reactos/tools/rbuild/rbuild.txt @@ -107,7 +107,7 @@ Module element There can be zero or more modules per xml build file. Syntax: - + ... @@ -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.