Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

by chorns＠svn.reactos.com

Support -Werror Modified: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c Modified: branches/xmlbuildsystem/reactos/baseaddress.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml Modified: branches/xmlbuildsystem/reactos/drivers/bus/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml Modified: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml Modified: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml Modified: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml Added: branches/xmlbuildsystem/reactos/lib/msi/msi.xml Modified: branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml Modified: branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml Added: branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml Modified: branches/xmlbuildsystem/reactos/lib/userenv/desktop.c Modified: branches/xmlbuildsystem/reactos/lib/userenv/registry.c Modified: branches/xmlbuildsystem/reactos/lib/userenv/setup.c Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml Added: branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/listview.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/main.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/main.h Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/regproc.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/security.c Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/security.h Modified: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.c Modified: branches/xmlbuildsystem/reactos/subsys/system/usetup/usetup.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/winefile/winefile.xml Modified: branches/xmlbuildsystem/reactos/subsys/win32k/objects/font.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c --- branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/arp/arp.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -87,7 +87,7 @@ DWORD dwUptime = SnmpSvcGetUptime(); - _tprintf(_T("SNMP uptime: %d\n"), dwUptime); + _tprintf(_T("SNMP uptime: %ld\n"), dwUptime); SnmpUtilMemFree(pCache); } else { _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/finger.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -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 _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/net.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -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 @@ 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; _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/ftp.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/ipconfig.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/netstat/netstat.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -113,7 +113,7 @@ 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 TimeToMsString(LPSTR String, LARGE_INTEGER Time) { - UINT i, Length; CHAR Convstr[40]; LARGE_INTEGER LargeTime; _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c --- branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/route/route.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -35,8 +35,7 @@ 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 @@ 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, _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c --- branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/apps/utils/net/whois/whois.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -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 @@ putchar(ch); leave(0); + return 0; } void usage() _____ Modified: branches/xmlbuildsystem/reactos/baseaddress.xml --- branches/xmlbuildsystem/reactos/baseaddress.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/baseaddress.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml --- branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/bus/acpi/acpi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/drivers/bus/directory.xml --- branches/xmlbuildsystem/reactos/drivers/bus/directory.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/bus/directory.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -7,3 +7,6 @@ <directory name="pci"> <xi:include href="pci/pci.xml" /> </directory> +<directory name="serenum"> + <xi:include href="serenum/serenum.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml --- branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> Property changes on: branches/xmlbuildsystem/reactos/drivers/bus/serenum/serenum.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/card.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -50,8 +50,6 @@ 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) _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/dma.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -70,7 +70,6 @@ { DEVICE_DESCRIPTION Desc; ULONG MappedRegs = 0; - NTSTATUS Status; PDEVICE_EXTENSION Device = DeviceObject->DeviceExtension; KEVENT DMAEvent; KIRQL OldIrql; _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/irq.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -14,14 +14,6 @@ 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 @@ // else // Compaq stuff? { - UCHAR CompaqPIDR; UCHAR Expected; switch (Parameters->IRQ) @@ -59,9 +50,6 @@ 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? _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/portio.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -83,7 +83,7 @@ { // 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 --); } _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/settings.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -292,8 +292,6 @@ NT status STATUS_SUCCESS if successful */ { - NTSTATUS s; - DPRINT("SaveSettings() unimplemented\n"); // UNIMPLEMENTED; _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c --- branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sndblst/sndblst.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -294,8 +294,6 @@ { PIO_STACK_LOCATION Stack; PDEVICE_EXTENSION DeviceExtension; - UINT ByteCount; - PBYTE Data; DPRINT("BlasterDeviceControl() called!\n"); _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -25,6 +25,7 @@ { // while((inb(base+0x0e)&0x80)==0); //Wait until there is something to read // return inb(base+0x0a); + return 0; } /************************************' _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h --- branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/dsp.h 2005-04-10 19:44:11 UTC (rev 14582) @@ -13,5 +13,5 @@ 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); _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/mixer.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -20,6 +20,7 @@ // outb(base+0x04,reg); // return inb(base+0x05); + return 0; } unsigned char get_irq(SB16* sb16) _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/sound.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -77,6 +77,7 @@ * RETURNS: Success or failure */ { +#if 0 PDEVICE_OBJECT DeviceObject; NTSTATUS ret; @@ -96,7 +97,7 @@ DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch; DriverObject->MajorFunction[IRP_MJ_WRITE] = Dispatch; DriverObject->DriverUnload = NULL; - +#endif return(STATUS_SUCCESS); } _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c --- branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/dd/sound/wave.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -29,7 +29,7 @@ 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 @@ KIRQL Dirql; KAFFINITY Affinity; PKINTERRUPT IrqObject; - unsigned int mask,newmask; + unsigned int newmask; unsigned int i; unsigned int tmp[255]; _____ Modified: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml --- branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/oskittcp.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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"/> _____ Modified: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml --- branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml --- branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml --- branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml --- branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/dbghelp/dbghelp.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml --- branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/devenum/devenum.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml --- branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/dinput/dinput.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml --- branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/iphlpapi/iphlpapi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml --- branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdda/kbdda.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml --- branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbddv/kbddv.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml --- branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdes/kbdes.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml --- branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdfr/kbdfr.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml --- branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdgr/kbdgr.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml --- branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdse/kbdse.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml --- branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbduk/kbduk.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Modified: branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml --- branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/kbdus/kbdus.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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" /> _____ Added: branches/xmlbuildsystem/reactos/lib/msi/msi.xml --- branches/xmlbuildsystem/reactos/lib/msi/msi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/msi/msi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> Property changes on: branches/xmlbuildsystem/reactos/lib/msi/msi.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c --- branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/ntdll/rtl/intrlck.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -122,7 +122,7 @@ LONG Exchange, LONG Comperand) { - PVOID ret; + LONG ret; __asm__ ( /* lock for SMP systems */ "lock\n\t" "cmpxchgl %2,(%1)" _____ Modified: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml --- branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml --- branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml --- branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/riched20/riched20.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml --- branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Added: branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml --- branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> Property changes on: branches/xmlbuildsystem/reactos/lib/serialui/serialui.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml --- branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/setupapi/setupapi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml --- branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/shdocvw/shdocvw.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml --- branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml --- branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml --- branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/urlmon/urlmon.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/lib/userenv/desktop.c --- branches/xmlbuildsystem/reactos/lib/userenv/desktop.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/userenv/desktop.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -232,7 +232,7 @@ 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 @@ wcscat (szLinkPath, L".lnk"); DPRINT ("Link path: '%S'\n", szLinkPath); - return DeleteFile (szLinkPath); + return DeleteFileW (szLinkPath); } @@ -657,7 +657,7 @@ 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; _____ Modified: branches/xmlbuildsystem/reactos/lib/userenv/registry.c --- branches/xmlbuildsystem/reactos/lib/userenv/registry.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/userenv/registry.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -206,7 +206,7 @@ return FALSE; } - if (RegSetValueEx (hDstKey, + if (RegSetValueExW (hDstKey, lpNameBuffer, 0, dwType, _____ Modified: branches/xmlbuildsystem/reactos/lib/userenv/setup.c --- branches/xmlbuildsystem/reactos/lib/userenv/setup.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/userenv/setup.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -110,7 +110,7 @@ HKEY hKey; /* Load profiles directory path */ - if (!LoadString(hInstance, + if (!LoadStringW(hInstance, IDS_PROFILEPATH, szBuffer, MAX_PATH)) @@ -289,7 +289,7 @@ } /* 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 @@ RegCloseKey(hKey); /* Load 'Program Files' location */ - if (!LoadString(hInstance, + if (!LoadStringW(hInstance, IDS_PROGRAMFILES, szBuffer, MAX_PATH)) _____ Modified: branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml --- branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/lib/winmm/winmm.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml --- branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/calc/calc.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/directory.xml --- branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/directory.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> _____ Added: branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml --- branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml 2005-04-10 19:44:11 UTC (rev 14582) @@ -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> Property changes on: branches/xmlbuildsystem/reactos/subsys/system/msiexec/msiexec.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/childwnd.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -131,7 +131,7 @@ * 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; _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/edit.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -271,7 +271,6 @@ 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_binary_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - PVOID valueData; HWND hwndValue; int len; _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/framewnd.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -642,7 +642,7 @@ * */ -INT_PTR CALLBACK +LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c --- branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c 2005-04-10 19:08:23 UTC (rev 14581) +++ branches/xmlbuildsystem/reactos/subsys/system/regedit/hexedit.c 2005-04-10 19:44:11 UTC (rev 14582) @@ -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 @@ 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 @@ static DWORD HEXEDIT_HitRegionTest(PHEXEDIT_DATA hed, POINTS pt) { - WINDOWINFO wi; [truncated at 1000 lines; 359 more skipped]

19 years, 7 months

[ea] 14581: SM: initial work on SM_API_QUERY_INFORMATION (client side; ROS specific).

by ea＠svn.reactos.com

SM: initial work on SM_API_QUERY_INFORMATION (client side; ROS specific). SM: fixed connection data in callback SM->subsystem_server during ss registration Modified: trunk/reactos/include/sm/api.h Modified: trunk/reactos/include/sm/helper.h Modified: trunk/reactos/lib/smdll/query.c Modified: trunk/reactos/lib/smdll/smdll.def Deleted: trunk/reactos/lib/smdll/testapi.c Modified: trunk/reactos/lib/smlib/compses.c Modified: trunk/reactos/lib/smlib/connect.c Modified: trunk/reactos/lib/smlib/execpgm.c Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smapicomp.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smapiquery.c _____ Modified: trunk/reactos/include/sm/api.h --- trunk/reactos/include/sm/api.h 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/include/sm/api.h 2005-04-10 19:08:23 UTC (rev 14581) @@ -12,15 +12,16 @@ #pragma pack(push,4) -/* SmConnectApiPort */ +/* SmConnectApiPort (SS->SM) */ typedef struct _SM_CONNECT_DATA { - ULONG Subsystem; + USHORT SubSystemId; + WORD Unused; WCHAR SbName [SM_SB_NAME_MAX_LENGTH]; } SM_CONNECT_DATA, *PSM_CONNECT_DATA; -/* SmpConnectSbApiPort */ +/* SmpConnectSbApiPort (SM->SS) */ typedef struct _SB_CONNECT_DATA { ULONG SmApiMax; @@ -65,6 +66,47 @@ } SM_PORT_MESSAGE_EXECPGM, *PSM_PORT_MESSAGE_EXECPGM; +/*** 5 ****************************************************************/ + +#define SM_API_QUERY_INFORMATION 5 /* ask SM to send back some data */ + /* Note: this is not in NT */ +#define SM_QRYINFO_MAX_SS_COUNT 8 +#define SM_QRYINFO_MAX_ROOT_NODE 30 + +typedef enum { + SmBasicInformation = 0, + SmSubSystemInformation = 1, +} SM_INFORMATION_CLASS; + +typedef struct _SM_BASIC_INFORMATION +{ + USHORT SubSystemCount; + WORD Unused; + struct { + WORD Id; + WORD Flags; + DWORD ProcessId; + } SubSystem [SM_QRYINFO_MAX_SS_COUNT]; +} SM_BASIC_INFORMATION, *PSM_BASIC_INFORMATION; + +typedef struct _SM_SUBSYSTEM_INFORMATION +{ + WORD SubSystemId; + WORD Flags; + DWORD ProcessId; + WCHAR NameSpaceRootNode [SM_QRYINFO_MAX_ROOT_NODE]; +} SM_SUBSYSTEM_INFORMATION, *PSM_SUBSYSTEM_INFORMATION; + +typedef struct _SM_PORT_MESSAGE_QRYINFO +{ + SM_INFORMATION_CLASS SmInformationClass; + ULONG DataLength; + union { + SM_BASIC_INFORMATION BasicInformation; + SM_SUBSYSTEM_INFORMATION SubSystemInformation; + }; +} SM_PORT_MESSAGE_QRYINFO, * PSM_PORT_MESSAGE_QRYINFO; + /*** | ****************************************************************/ typedef struct _SM_PORT_MESSAGE @@ -72,12 +114,22 @@ /*** LPC common header ***/ LPC_MESSAGE Header; /*** SM common header ***/ - DWORD ApiIndex; - NTSTATUS Status; + struct { + DWORD ApiIndex; + NTSTATUS Status; + } SmHeader; /*** SM per API arguments ***/ union { - SM_PORT_MESSAGE_COMPSES CompSes; - SM_PORT_MESSAGE_EXECPGM ExecPgm; + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Request; + union { + SM_PORT_MESSAGE_COMPSES CompSes; + SM_PORT_MESSAGE_EXECPGM ExecPgm; + SM_PORT_MESSAGE_QRYINFO QryInfo; + } Reply; }; } SM_PORT_MESSAGE, * PSM_PORT_MESSAGE; @@ -86,7 +138,7 @@ /*** MACRO ***********************************************************/ -#define SM_CONNECT_DATA_SIZE(m) ((m).Header.DataSize-sizeof(ULONG)) +#define SM_CONNECT_DATA_SIZE(m) ((m).Header.DataSize-sizeof(USHORT)-sizeof(WORD)) #define SM_PORT_DATA_SIZE(c) (sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c)) #define SM_PORT_MESSAGE_SIZE (sizeof(SM_PORT_MESSAGE)) _____ Modified: trunk/reactos/include/sm/helper.h --- trunk/reactos/include/sm/helper.h 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/include/sm/helper.h 2005-04-10 19:08:23 UTC (rev 14581) @@ -1,13 +1,17 @@ #if !defined(INCLUDE_SM_HELPER_H) #define INCLUDE_SM_HELPER_H +#if !defined(__SM_API_H) +#include <sm/api.h> +#endif + /* $Id$ */ /* smlib/connect.c */ NTSTATUS STDCALL SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, IN HANDLE hSbApiPort OPTIONAL, - IN DWORD dwSubsystem OPTIONAL, /* pe.h */ + IN WORD wSubsystem OPTIONAL, /* pe.h */ IN OUT PHANDLE phSmApiPort); /* smlib/compses.c */ NTSTATUS STDCALL @@ -20,14 +24,11 @@ IN PUNICODE_STRING Pgm ); /* smdll/query.c */ -typedef enum { - SM_BASE_INFORMATION -} SM_INFORMATION_CLASS, *PSM_INFORMATION_CLASS; - NTSTATUS STDCALL -SmQuery (IN HANDLE SmApiPort, - IN SM_INFORMATION_CLASS SmInformationClass, - IN OUT PVOID Data, - IN OUT PULONG DataLength); +SmQueryInformation (IN HANDLE SmApiPort, + IN SM_INFORMATION_CLASS SmInformationClass, + IN OUT PVOID Data, + IN ULONG DataLength, + IN OUT PULONG ReturnedDataLength OPTIONAL); #endif /* ndef INCLUDE_SM_HELPER_H */ _____ Modified: trunk/reactos/lib/smdll/query.c --- trunk/reactos/lib/smdll/query.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smdll/query.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -1,39 +1,105 @@ -/* $Id: compses.c 13731 2005-02-23 23:37:06Z ea $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/smdll/query.c - * PURPOSE: Call SM API SM_API_QUERY (not in NT) + * PURPOSE: Call SM API SM_API_QUERY_INFORMATION (not in NT) */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #define NDEBUG #include <debug.h> + /********************************************************************** * NAME EXPORTED - * SmQuery/4 + * SmQueryInformation/5 * * DESCRIPTION + * Ask the SM to collect some data from its internal data + * structures and send it back. * * ARGUMENTS - * + * hSmApiPort: handle returned by SmConnectApiPort; + * SmInformationClass: an SM information class ID: + * SM_BASIC_INFORMATION: the number of registered subsystems + * Data: pointer to storage for the information to request; + * DataLength: length in bytes of the Data buffer; it must be + * set and must match the SmInformationClass info size; + * ReturnedDataLength: optional pointer to storage to receive + * the size of the returnede data. + * * RETURN VALUE + * STATUS_SUCCESS: OK you get what you asked for; + * STATUS_INFO_LENGTH_MISMATCH: you set DataLength to 0 or to a + * value that does not match whet the SmInformationClass + * requires; + * STATUS_INVALID_PARAMETER_2: bad information class; + * A port error. + * */ NTSTATUS STDCALL -SmQuery (IN HANDLE SmApiPort, - IN SM_INFORMATION_CLASS SmInformationClass, - IN OUT PVOID Data, - IN OUT PULONG DataLength) +SmQueryInformation (IN HANDLE hSmApiPort, + IN SM_INFORMATION_CLASS SmInformationClass, + IN OUT PVOID Data, + IN ULONG DataLength, + IN OUT PULONG ReturnedDataLength OPTIONAL) { - /* TODO */ - if(NULL != DataLength) + NTSTATUS Status = STATUS_SUCCESS; + SM_PORT_MESSAGE SmReqMsg; + + + if(0 == DataLength) { - *DataLength = 0; + return STATUS_INFO_LENGTH_MISMATCH; } - return STATUS_SUCCESS; + /* Marshal data in the port message */ + switch (SmInformationClass) + { + case SmBasicInformation: + if(DataLength != sizeof (SM_BASIC_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + SmReqMsg.Request.QryInfo.SmInformationClass = SmBasicInformation; + SmReqMsg.Request.QryInfo.DataLength = DataLength; + SmReqMsg.Request.QryInfo.BasicInformation.SubSystemCount = 0; + break; + case SmSubSystemInformation: + if(DataLength != sizeof (SM_SUBSYSTEM_INFORMATION)) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + SmReqMsg.Request.QryInfo.SmInformationClass = SmSubSystemInformation; + SmReqMsg.Request.QryInfo.DataLength = DataLength; + SmReqMsg.Request.QryInfo.SubSystemInformation.SubSystemId = + ((PSM_SUBSYSTEM_INFORMATION)Data)->SubSystemId; + break; + default: + return STATUS_INVALID_PARAMETER_2; + } + /* SM API to invoke */ + SmReqMsg.SmHeader.ApiIndex = SM_API_QUERY_INFORMATION; + + /* Prepare the port request message */ + SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.Request); + SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); + if (NT_SUCCESS(Status)) + { + /* Unmarshal data */ + RtlCopyMemory (Data, & SmReqMsg.Reply.QryInfo.BasicInformation, SmReqMsg.Reply.QryInfo.DataLength); + /* Use caller provided storage to store data size */ + if(NULL != ReturnedDataLength) + { + *ReturnedDataLength = SmReqMsg.Reply.QryInfo.DataLength; + } + return SmReqMsg.SmHeader.Status; + } + DPRINT("SMLIB: %s failed (Status=0x%08lx)\n", __FUNCTION__, Status); + return Status; } /* EOF */ _____ Modified: trunk/reactos/lib/smdll/smdll.def --- trunk/reactos/lib/smdll/smdll.def 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smdll/smdll.def 2005-04-10 19:08:23 UTC (rev 14581) @@ -3,4 +3,4 @@ SmCompleteSession@12 SmConnectApiPort@16 SmExecuteProgram@8 -SmQuery@16 +SmQueryInformation@20 _____ Deleted: trunk/reactos/lib/smdll/testapi.c --- trunk/reactos/lib/smdll/testapi.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smdll/testapi.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -1,20 +0,0 @@ -/* $Id$ */ -#define NTOS_MODE_USER -#include <ntos.h> -#include <sm/api.h> - -VOID STDCALL SmPrintPortMessage (PSM_PORT_MESSAGE SmMessage) -{ - DbgPrint ("SM_PORT_MESSAGE %08lx:\n", (ULONG) SmMessage); - DbgPrint (" Header:\n"); - DbgPrint (" MessageType = %u\n", SmMessage->Header.MessageType); - DbgPrint (" DataSize = %d\n", SmMessage->Header.DataSize); - DbgPrint (" MessageSize = %d\n", SmMessage->Header.MessageSize); - DbgPrint (" ApiIndex = %ld\n", SmMessage->ApiIndex); - DbgPrint (" Status = %08lx\n", SmMessage->Status); - DbgPrint (" ExecPgm:\n"); - DbgPrint (" NameLength = %ld\n", SmMessage->ExecPgm.NameLength); - DbgPrint (" Name = %ls\n", (LPWSTR) & SmMessage->ExecPgm.Name); -} -/* EOF */ - _____ Modified: trunk/reactos/lib/smlib/compses.c --- trunk/reactos/lib/smlib/compses.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smlib/compses.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -7,7 +7,6 @@ */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #define NDEBUG @@ -42,20 +41,20 @@ DPRINT("SMLIB: %s called\n", __FUNCTION__); /* Marshal Ses in the LPC message */ - SmReqMsg.CompSes.hApiPort = hApiPort; - SmReqMsg.CompSes.hSbApiPort = hSbApiPort; + SmReqMsg.Request.CompSes.hApiPort = hApiPort; + SmReqMsg.Request.CompSes.hSbApiPort = hSbApiPort; /* SM API to invoke */ - SmReqMsg.ApiIndex = SM_API_COMPLETE_SESSION; + SmReqMsg.SmHeader.ApiIndex = SM_API_COMPLETE_SESSION; /* Port message */ SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; - SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.CompSes); + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.Request); SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); if (NT_SUCCESS(Status)) { - return SmReqMsg.Status; + return SmReqMsg.SmHeader.Status; } DPRINT("SMLIB: %s failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; _____ Modified: trunk/reactos/lib/smlib/connect.c --- trunk/reactos/lib/smlib/connect.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smlib/connect.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -7,7 +7,6 @@ */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #include <pe.h> @@ -25,26 +24,34 @@ * ARGUMENTS * pSbApiPortName: name of the Sb port the calling subsystem * server already created in the system name space; - * hSbApiPort: LPC port handle (checked, but not used); - * dwSubsystem: a valid IMAGE_SUBSYSTEM_xxx value; + * hSbApiPort: LPC port handle (checked, but not used: the + * subsystem is required to have already created + * the callback port before it connects to the SM); + * wSubsystem: a valid IMAGE_SUBSYSTEM_xxx value; * phSmApiPort: a pointer to a HANDLE, which will be * filled with a valid client-side LPC comm port. + * + * There should be only two ways to call this API: + * a) subsystems willing to register with SM will use it + * with full parameters (the function checks them); + * b) regular SM clients, will set to 0 the 1st, the 2nd, + * and the 3rd parameter. * * RETURN VALUE * If all three optional values are omitted, an LPC status. * STATUS_INVALID_PARAMETER_MIX if PortName is defined and - * both hSbApiPort and dwSubsystem are 0. + * both hSbApiPort and wSubsystem are 0. */ NTSTATUS STDCALL SmConnectApiPort (IN PUNICODE_STRING pSbApiPortName OPTIONAL, IN HANDLE hSbApiPort OPTIONAL, - IN DWORD dwSubsystem OPTIONAL, + IN WORD wSubSystemId OPTIONAL, IN OUT PHANDLE phSmApiPort) { UNICODE_STRING SmApiPortName; SECURITY_QUALITY_OF_SERVICE SecurityQos; NTSTATUS Status = STATUS_SUCCESS; - SM_CONNECT_DATA ConnectData = {0,{0}}; + SM_CONNECT_DATA ConnectData = {0,0,{0}}; ULONG ConnectDataLength = 0; DPRINT("SMLIB: %s called\n", __FUNCTION__); @@ -55,12 +62,13 @@ { return STATUS_INVALID_PARAMETER_1; } - if (NULL == hSbApiPort || IMAGE_SUBSYSTEM_UNKNOWN == dwSubsystem) + if (NULL == hSbApiPort || IMAGE_SUBSYSTEM_UNKNOWN == wSubSystemId) { return STATUS_INVALID_PARAMETER_MIX; } RtlZeroMemory (& ConnectData, sizeof ConnectData); - ConnectData.Subsystem = dwSubsystem; + ConnectData.Unused = 0; + ConnectData.SubSystemId = wSubSystemId; if (pSbApiPortName->Length > 0) { RtlCopyMemory (& ConnectData.SbName, _____ Modified: trunk/reactos/lib/smlib/execpgm.c --- trunk/reactos/lib/smlib/execpgm.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/lib/smlib/execpgm.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -7,7 +7,6 @@ */ #define NTOS_MODE_USER #include <ntos.h> -#include <sm/api.h> #include <sm/helper.h> #include <string.h> @@ -41,7 +40,8 @@ SM_PORT_MESSAGE SmReqMsg; - DPRINT("SMLIB: %s called\n", __FUNCTION__); + DPRINT("SMLIB: %s(%08lx,'%S') called\n", + __FUNCTION__, hSmApiPort, Pgm->Buffer); /* Check Pgm's length */ if (Pgm->Length > (sizeof (Pgm->Buffer[0]) * SM_EXEXPGM_MAX_LENGTH)) @@ -50,24 +50,35 @@ } /* Marshal Pgm in the LPC message */ RtlZeroMemory (& SmReqMsg, sizeof SmReqMsg); - SmReqMsg.ExecPgm.NameLength = Pgm->Length; - RtlCopyMemory (SmReqMsg.ExecPgm.Name, + SmReqMsg.Request.ExecPgm.NameLength = Pgm->Length; + RtlCopyMemory (SmReqMsg.Request.ExecPgm.Name, Pgm->Buffer, Pgm->Length); /* SM API to invoke */ - SmReqMsg.ApiIndex = SM_API_EXECUTE_PROGRAMME; + SmReqMsg.SmHeader.ApiIndex = SM_API_EXECUTE_PROGRAMME; /* LPC message */ SmReqMsg.Header.MessageType = LPC_NEW_MESSAGE; - SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.ExecPgm); + SmReqMsg.Header.DataSize = SM_PORT_DATA_SIZE(SmReqMsg.Request); SmReqMsg.Header.MessageSize = SM_PORT_MESSAGE_SIZE; + DPRINT("SMLIB: %s:\n" + " MessageType = %d\n" + " DataSize = %d\n" + " MessageSize = %d\n" + " sizeof(LPC_MESSAGE)==%d\n", + __FUNCTION__, + SmReqMsg.Header.MessageType, + SmReqMsg.Header.DataSize, + SmReqMsg.Header.MessageSize, + sizeof(LPC_MESSAGE)); + /* Call SM and wait for a reply */ Status = NtRequestWaitReplyPort (hSmApiPort, (PLPC_MESSAGE) & SmReqMsg, (PLPC_MESSAGE) & SmReqMsg); if (NT_SUCCESS(Status)) { - return SmReqMsg.Status; + return SmReqMsg.SmHeader.Status; } DPRINT("SMLIB: %s failed (Status=0x%08lx)\n", __FUNCTION__, Status); return Status; _____ Modified: trunk/reactos/subsys/smss/client.c --- trunk/reactos/subsys/smss/client.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/client.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -166,14 +166,14 @@ /* * Check if a client for the ID already exist. */ - if (SmpLookupClient(ConnectData->Subsystem)) + if (SmpLookupClient(ConnectData->SubSystemId)) { DPRINT("SM: %s: attempt to register again subsystem %d.\n", __FUNCTION__, - ConnectData->Subsystem); + ConnectData->SubSystemId); return STATUS_UNSUCCESSFUL; } - DPRINT("SM: %s: registering subsystem %d \n", __FUNCTION__, ConnectData->Subsystem); + DPRINT("SM: %s: registering subsystem ID=%d \n", __FUNCTION__, ConnectData->SubSystemId); /* * Allocate the storage for client data */ @@ -188,7 +188,7 @@ /* * Initialize the client data */ - pClient->SubsystemId = ConnectData->Subsystem; + pClient->SubsystemId = ConnectData->SubSystemId; /* SM auto-initializes; other subsystems are required to call * SM_API_COMPLETE_SESSION via SMDLL. */ pClient->Initialized = (IMAGE_SUBSYSTEM_NATIVE == pClient->SubsystemId); _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapi.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -21,7 +21,7 @@ SMAPI(SmInvalid) { DPRINT("SM: %s called\n",__FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; + Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; return STATUS_SUCCESS; } @@ -67,10 +67,12 @@ PSM_CONNECT_DATA ConnectData = SmpGetConnectData (Request); UNICODE_STRING CallbackPortName; ULONG CallbackPortNameLength = SM_SB_NAME_MAX_LENGTH; /* TODO: compute length */ + SB_CONNECT_DATA SbConnectData; + ULONG SbConnectDataLength = sizeof SbConnectData; DPRINT("SM: %s called\n", __FUNCTION__); - if(IMAGE_SUBSYSTEM_NATIVE == ConnectData->Subsystem) + if(IMAGE_SUBSYSTEM_NATIVE == ConnectData->SubSystemId) { DPRINT("SM: %s: we do not need calling back SM!\n", __FUNCTION__); @@ -81,14 +83,16 @@ CallbackPortNameLength); RtlInitUnicodeString (& CallbackPortName, ClientData->SbApiPortName); + + SbConnectData.SmApiMax = (sizeof SmApi / sizeof SmApi[0]); Status = NtConnectPort (& ClientData->SbApiPort, & CallbackPortName, NULL, NULL, NULL, NULL, - NULL, - NULL); + & SbConnectData, + & SbConnectDataLength); return Status; } @@ -138,13 +142,13 @@ Reply = NULL; break; default: - if ((Request.ApiIndex) && - (Request.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) + if ((Request.SmHeader.ApiIndex) && + (Request.SmHeader.ApiIndex < (sizeof SmApi / sizeof SmApi[0]))) { - Status = SmApi[Request.ApiIndex](&Request); + Status = SmApi[Request.SmHeader.ApiIndex](&Request); Reply = (PLPC_MESSAGE) & Request; } else { - Request.Status = STATUS_NOT_IMPLEMENTED; + Request.SmHeader.Status = STATUS_NOT_IMPLEMENTED; Reply = (PLPC_MESSAGE) & Request; } } @@ -181,11 +185,11 @@ PVOID Context = NULL; DPRINT("SM: %s called:\n SubSystemID=%d\n SbName=\"%S\"\n", - __FUNCTION__, ConnectData->Subsystem, ConnectData->SbName); + __FUNCTION__, ConnectData->SubSystemId, ConnectData->SbName); if(sizeof (SM_CONNECT_DATA) == Request->Header.DataSize) { - if(IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->Subsystem) + if(IMAGE_SUBSYSTEM_UNKNOWN == ConnectData->SubSystemId) { /* * This is not a call to register an image set, @@ -202,9 +206,9 @@ * Reject GUIs classes: only odd subsystem IDs are * allowed to register here (tty mode images). */ - if(1 == (ConnectData->Subsystem % 2)) + if(1 == (ConnectData->SubSystemId % 2)) { - DPRINT("SM: %s: id = %d\n", __FUNCTION__, ConnectData->Subsystem); + DPRINT("SM: %s: id = %d\n", __FUNCTION__, ConnectData->SubSystemId); /* * SmCreateClient/2 is called here explicitly to *fail*. * If it succeeds, there is something wrong in the @@ -236,7 +240,7 @@ } else { DPRINT("SM: %s: SmpCallbackServer failed (Status=%08lx)\n", __FUNCTION__, Status); - Status = SmDestroyClient (ConnectData->Subsystem); + Status = SmDestroyClient (ConnectData->SubSystemId); } } } _____ Modified: trunk/reactos/subsys/smss/smapicomp.c --- trunk/reactos/subsys/smss/smapicomp.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapicomp.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -36,15 +36,12 @@ { NTSTATUS Status = STATUS_SUCCESS; - DPRINT("SM: %s called from [%lx|%lx]\n", - __FUNCTION__, - Request->ClientId.UniqueProcessId, - Request->ClientId.UniqueThreadId); + DPRINT("SM: %s called\n", __FUNCTION__); Status = SmCompleteClientInitialization (Request->Header.ClientId.UniqueProcess); if(!NT_SUCCESS(Status)) { - Request->Status = STATUS_UNSUCCESSFUL; + Request->SmHeader.Status = STATUS_UNSUCCESSFUL; } return Status; } _____ Modified: trunk/reactos/subsys/smss/smapiexec.c --- trunk/reactos/subsys/smss/smapiexec.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapiexec.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -253,7 +253,7 @@ DPRINT("SM: %s called from CID(%lx|%lx)\n", __FUNCTION__, Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); - ExecPgm = & Request->ExecPgm; + ExecPgm = & Request->Request.ExecPgm; /* Check if the name lenght is valid */ if((ExecPgm->NameLength > 0) && (ExecPgm->NameLength <= SM_EXEXPGM_MAX_LENGTH) && @@ -277,7 +277,7 @@ * independent process; now it is embedded in the * SM for performance or security. */ - Request->Status = SmInitializeDbgSs(); + Request->SmHeader.Status = SmInitializeDbgSs(); } else { @@ -299,20 +299,20 @@ wcscat (ImagePath, Data); /* Create native process */ - Request->Status = SmCreateUserProcess(ImagePath, + Request->SmHeader.Status = SmCreateUserProcess(ImagePath, L"", /* FIXME */ FALSE, /* wait */ NULL, FALSE, /* terminate */ NULL); }else{ - Request->Status = Status; + Request->SmHeader.Status = Status; } } } else { - Request->Status = Status = STATUS_INVALID_PARAMETER; + Request->SmHeader.Status = Status = STATUS_INVALID_PARAMETER; } return Status; } _____ Modified: trunk/reactos/subsys/smss/smapiquery.c --- trunk/reactos/subsys/smss/smapiquery.c 2005-04-10 17:03:40 UTC (rev 14580) +++ trunk/reactos/subsys/smss/smapiquery.c 2005-04-10 19:08:23 UTC (rev 14581) @@ -38,7 +38,7 @@ DPRINT("SM: %s called\n", __FUNCTION__); - Request->Status = STATUS_NOT_IMPLEMENTED; + Request->SmHeader.Status = STATUS_NOT_IMPLEMENTED; return Status; }

19 years, 7 months

[mbosma] 14580: PackageManager: Cmdline fix

by mbosma＠svn.reactos.com

PackageManager: Cmdline fix Modified: trunk/rosapps/packmgr/cmd-line/main.cpp Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/tree.cpp Modified: trunk/rosapps/packmgr/tree/mozcontrol.xml _____ Modified: trunk/rosapps/packmgr/cmd-line/main.cpp --- trunk/rosapps/packmgr/cmd-line/main.cpp 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/cmd-line/main.cpp 2005-04-10 17:03:40 UTC (rev 14580) @@ -90,6 +90,25 @@ return 0; } + +int Ask (const WCHAR* question) +{ + char answer[255]; + + wprintf(question); + + cout << " [y/n] "; + cin >> answer; + cout << endl; + + if (answer[0]=='y') + return 1; + + else if (answer[0]=='n') + return 0; + + return Ask(question); +} int SetStatus (int status1, int status2, WCHAR* text) { @@ -125,14 +144,14 @@ int id = PML_FindItem(tree, cmdline[i].c_str()); if(id) - PML_SetAction(tree, id, 1, NULL); + PML_SetAction(tree, id, 1, NULL, Ask); else cout << "Could not find the Package \"" << cmdline[i] << "\"\n"; } // do it - error = PML_DoIt (tree, SetStatus); + error = PML_DoIt (tree, SetStatus, Ask); if(error) { wprintf(L"%s\n", PML_TransError(error)); @@ -168,15 +187,12 @@ { int id = PML_FindItem(tree, cmdline[i].c_str()); - cout << i << "<" << cmdline.size() << endl; - if(id) cout << PML_GetDescription (tree, id) << "\n"; else cout << "Could not find the Package \"" << cmdline[i] << "\"\n"; } - cout << i << "<" << cmdline.size() << endl; // clean up PML_CloseTree (tree); _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 17:03:40 UTC (rev 14580) @@ -16,7 +16,7 @@ #include <wine/urlmon.h> // Server there all the files lie -const char* tree_server = "http://maarten-online.de/xml/"; +const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller, _____ Modified: trunk/rosapps/packmgr/lib/tree.cpp --- trunk/rosapps/packmgr/lib/tree.cpp 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/lib/tree.cpp 2005-04-10 17:03:40 UTC (rev 14580) @@ -99,7 +99,8 @@ // do some manipulation at the parent else { - tree->addItem(id, tree->packages[id].name, parents.back(), icon); + if(tree->addItem) + tree->addItem(id, tree->packages[id].name, parents.back(), icon); // list as child in the parent node tree->packages[parents.back()].children.push_back(id); _____ Modified: trunk/rosapps/packmgr/tree/mozcontrol.xml --- trunk/rosapps/packmgr/tree/mozcontrol.xml 2005-04-10 16:45:30 UTC (rev 14579) +++ trunk/rosapps/packmgr/tree/mozcontrol.xml 2005-04-10 17:03:40 UTC (rev 14580) @@ -1,7 +1,7 @@ <package> -<name>MozillaControl</name> -<description>Provide the Gekko Engine for ReactOS.</description> -<scripts inst="mozillacontrol.inst.rps" srcinst="mozillacontrol.inst.rps"/> - + <name>MozillaControl</name> + <description>Provide the Gekko Engine for ReactOS.</description> + <scripts inst="mozillacontrol.inst.rps" srcinst="mozillacontrol.inst.rps"/> + <depent>abiword</depent> </package>

19 years, 7 months

[hbirr] 14579: Added dependency tracking.

by hbirr＠svn.reactos.com

Added dependency tracking. Modified: trunk/reactos/drivers/storage/floppy/GNUmakefile _____ Modified: trunk/reactos/drivers/storage/floppy/GNUmakefile --- trunk/reactos/drivers/storage/floppy/GNUmakefile 2005-04-10 16:44:00 UTC (rev 14578) +++ trunk/reactos/drivers/storage/floppy/GNUmakefile 2005-04-10 16:45:30 UTC (rev 14579) @@ -30,6 +30,8 @@ TARGET_OBJECTS = floppy.o csqrtns.o hardware.o readwrite.o ioctl.o TARGET_DDKLIBS = csq.a +DEP_OBJECTS = $(TARGET_OBJECTS) + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk - +include $(TOOLS_PATH)/depend.mk

19 years, 7 months

[hbirr] 14578: Set a better value for gap3 on read/write requests.

by hbirr＠svn.reactos.com

Set a better value for gap3 on read/write requests. Modified: trunk/reactos/drivers/storage/floppy/readwrite.c _____ Modified: trunk/reactos/drivers/storage/floppy/readwrite.c --- trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-10 16:41:32 UTC (rev 14577) +++ trunk/reactos/drivers/storage/floppy/readwrite.c 2005-04-10 16:44:00 UTC (rev 14578) @@ -430,6 +430,7 @@ NTSTATUS Status; BOOLEAN DiskChanged; ULONG_PTR TransferByteOffset; + UCHAR Gap; PAGED_CODE(); @@ -523,6 +524,15 @@ } /* + * FIXME: + * FloppyDeviceData.ReadWriteGapLength specify the value for the physical drive. + * We should set this value depend on the format of the inserted disk and possible + * depend on the request (read or write). A value of 0 results in one rotation + * between the sectors (7.2sec for reading a track). + */ + Gap = DriveInfo->FloppyDeviceData.ReadWriteGapLength; + + /* * Set up DMA transfer * * This is as good of a place as any to document something that used to confuse me @@ -703,7 +713,7 @@ /* Issue the read/write command to the controller. Note that it expects the opposite of WriteToDevice. */ if(HwReadWriteData(DriveInfo->ControllerInfo, !WriteToDevice, DriveInfo->UnitNumber, Cylinder, Head, StartSector, - DriveInfo->BytesPerSectorCode, DriveInfo->DiskGeometry.SectorsPerTrack, 0, 0xff) != STATUS_SUCCESS) + DriveInfo->BytesPerSectorCode, DriveInfo->DiskGeometry.SectorsPerTrack, Gap, 0xff) != STATUS_SUCCESS) { KdPrint(("floppy: ReadWritePassive(): HwReadWriteData returned failure; unable to read; completing with STATUS_UNSUCCESSFUL\n")); RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject);

19 years, 7 months

[hbirr] 14577: Made the hard coded value for the HUT a little bit longer.

by hbirr＠svn.reactos.com

Made the hard coded value for the HUT a little bit longer. Modified: trunk/reactos/drivers/storage/floppy/hardware.c _____ Modified: trunk/reactos/drivers/storage/floppy/hardware.c --- trunk/reactos/drivers/storage/floppy/hardware.c 2005-04-10 15:34:15 UTC (rev 14576) +++ trunk/reactos/drivers/storage/floppy/hardware.c 2005-04-10 16:41:32 UTC (rev 14577) @@ -991,7 +991,7 @@ Buffer[1] = (StepRateTime << 4) + HeadUnloadTime; Buffer[2] = (HeadLoadTime << 1) + (NonDma ? 1 : 0); */ - Buffer[1] = 0xd1; + Buffer[1] = 0xdf; Buffer[2] = 0x2; //KdPrint(("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2]));

19 years, 7 months

[mbosma] 14576: PackageManager: Depencies

by mbosma＠svn.reactos.com

PackageManager: Depencies Modified: trunk/rosapps/packmgr/gui/main.cpp Modified: trunk/rosapps/packmgr/gui/main.h Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/en.rc Modified: trunk/rosapps/packmgr/lib/error.h Modified: trunk/rosapps/packmgr/lib/main.cpp Modified: trunk/rosapps/packmgr/lib/package.cpp Modified: trunk/rosapps/packmgr/lib/package.hpp _____ Modified: trunk/rosapps/packmgr/gui/main.cpp --- trunk/rosapps/packmgr/gui/main.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/gui/main.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -174,6 +174,17 @@ return 1; } +// Set the Icons +int Ask (const WCHAR* message) +{ + int ans = MessageBox (0,message,0,MB_YESNO); + + if(ans == IDYES) + return 1; + + return 0; +} + // En- or Disable a Button inside of the toolbar and the Context Menu int SetButton (DWORD id, BOOL state) { @@ -182,7 +193,12 @@ ti.cbSize = sizeof (ti); ti.dwMask = TBIF_STATE; - +/* + if(state&&id==1) + MessageBox(0,L"on",0,0); + else if(!state&&id==1) + MessageBox(0,L"off",0,0); +*/ if(state) ti.fsState = TBSTATE_ENABLED; else @@ -294,7 +310,7 @@ if(LOWORD(wParam) <= 5 && LOWORD(wParam) >= 1) { if(selected) - if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon) == ERR_OK) + if(PML_SetAction(tree, selected, LOWORD(wParam)-1, SetIcon, Ask) == ERR_OK) break; MessageBeep(MB_ICONHAND); @@ -303,7 +319,7 @@ // DoIt else if(LOWORD(wParam)==6) { - if(PML_DoIt(tree, SetStatus) == ERR_OK) + if(PML_DoIt(tree, SetStatus, Ask) == ERR_OK) DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_DOIT), hwnd, StatusProc); else MessageBeep(MB_ICONHAND); @@ -325,7 +341,7 @@ // prozess hotkeys case WM_HOTKEY: { - if(PML_SetAction(tree, selected, wParam, SetIcon) != ERR_OK) + if(PML_SetAction(tree, selected, wParam, SetIcon, Ask) != ERR_OK) MessageBeep(MB_ICONHAND); } break; _____ Modified: trunk/rosapps/packmgr/gui/main.h --- trunk/rosapps/packmgr/gui/main.h 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/gui/main.h 2005-04-10 15:34:15 UTC (rev 14576) @@ -35,6 +35,7 @@ int AddItem (int id, const char* name, int parent, int icon); int SetText (const char* text); int SetStatus (int status1, int status2, WCHAR* text); +int Ask (const WCHAR* message); /* Toolbar Releated */ _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -16,7 +16,7 @@ #include <wine/urlmon.h> // Server there all the files lie -const char* tree_server = "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/"; +const char* tree_server = "http://maarten-online.de/xml/"; HRESULT WINAPI URLDownloadToFileA( LPUNKNOWN pCaller, _____ Modified: trunk/rosapps/packmgr/lib/en.rc --- trunk/rosapps/packmgr/lib/en.rc 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/en.rc 2005-04-10 15:34:15 UTC (rev 14576) @@ -14,6 +14,10 @@ ERR_SYNATX "Error while Script Execution.\nWrong Synatx." ERR_CALL "Error while Script Execution.\nCould not find function." ERR_PARAMETER "Error while Script Execution.\nWrong Parameter(s)." + + ERR_DEP1 "To install this package you have to install the following package(s) as well:\n\n" + ERR_DEP2 "\nDo you want this ?" + ERR_READY "You choosen to install %d package(s). To install them you have to read and agree with each of thier licences.\n\n Do you want still want to ?" END /* EOF */ _____ Modified: trunk/rosapps/packmgr/lib/error.h --- trunk/rosapps/packmgr/lib/error.h 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/error.h 2005-04-10 15:34:15 UTC (rev 14576) @@ -6,6 +6,10 @@ #define ERR_NOTODO 0x003 // without text yet #define ERR_PACK 0x004 +#define ERR_DEP1 0x005 +#define ERR_DEP2 0x006 +#define ERR_READY 0x007 + // Script #define ERR_SYNATX 0x011 #define ERR_CALL 0x012 _____ Modified: trunk/rosapps/packmgr/lib/main.cpp --- trunk/rosapps/packmgr/lib/main.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/main.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -102,7 +102,7 @@ // set all actions to none for(i=0; i<tree->packages.size(); i++) - PML_SetAction (tree, i, 0, tree->setIcon); + PML_SetAction (tree, i, 0, tree->setIcon, NULL); tree->setStatus(1000, ret, NULL); @@ -110,7 +110,7 @@ } // Do the actions the user wants us to do -extern "C" int PML_DoIt (TREE* tree, PML_SetStatus SetStatus) +extern "C" int PML_DoIt (TREE* tree, PML_SetStatus SetStatus, PML_Ask Ask) { DWORD dummy; tree->setStatus = SetStatus; @@ -118,6 +118,14 @@ if(!tree->todo.size()) return ERR_NOTODO; + //ask + WCHAR buffer [2000]; + wsprintf(buffer, PML_TransError(ERR_READY), tree->todo.size()); + + if(!Ask(buffer)) + return ERR_GENERIC; + + hThread = CreateThread(NULL, 0, DoitThread, tree, 0, &dummy); if(!hThread) _____ Modified: trunk/rosapps/packmgr/lib/package.cpp --- trunk/rosapps/packmgr/lib/package.cpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/package.cpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -58,6 +58,12 @@ else if(!strcmp(tag, "description")) pack->field = &pack->description; + + else if (!strcmp(tag, "depent")) + { + pack->depencies.push_back((char*)NULL); + pack->field = &pack->depencies.back(); + } } } @@ -82,7 +88,6 @@ (*pack->field)[len] = '\0'; } - // The user clicks on a package extern "C" int PML_LoadPackage (TREE* tree, int id, PML_SetButton SetButton) { @@ -138,7 +143,7 @@ } // The user chooses a actions like Install -extern "C" int PML_SetAction (TREE* tree, int id, int action, PML_SetIcon SetIcon) +extern "C" int PML_SetAction (TREE* tree, int id, int action, PML_SetIcon SetIcon, PML_Ask Ask) { UINT i; int ret = ERR_OK; @@ -148,7 +153,7 @@ // if we have children, same action for them for (i=0; i<pack->children.size(); i++) - ret = ret || PML_SetAction(tree, pack->children[i], action, SetIcon); + ret = ret || PML_SetAction(tree, pack->children[i], action, SetIcon, Ask); // is the action possible ? if(!pack->actions[action]) @@ -158,11 +163,66 @@ if(pack->action == action) return ERR_OK; + // + if(pack->depencies.size() && action) + { + UINT count = pack->depencies.size(); + WCHAR buffer[2000], buffer2[200]; + wcscpy(buffer, PML_TransError(ERR_DEP1)); + + for (i=0; i<pack->depencies.size(); i++) + { + int item = PML_FindItem(tree, pack->depencies[i]); + + if(!item) + return ERR_GENERIC; + + if(action == tree->packages[item].action)// || tree->packages[item].installed + { + count--; + continue; + } + + MultiByteToWideChar (CP_ACP, 0, pack->depencies[i], strlen(pack->depencies[i])+1, buffer2, 200); + wsprintf(buffer, L"%s - %s\n", buffer, buffer2);// + } + + wcscat(buffer, PML_TransError(ERR_DEP2)); + + if(count) + if(!Ask(buffer)) + return ERR_GENERIC; + + for (i=0; i<pack->depencies.size(); i++) + { + int item = PML_FindItem(tree, pack->depencies[i]); + + tree->packages[item].neededBy.push_back(id); + + PML_SetAction(tree, item, action, SetIcon, Ask); + } + } + + // load it if it's not loaded yet + else if (!pack->loaded && pack->path) + { + PML_XmlDownload (pack->path, (void*)pack, pack_start, pack_end, pack_text); + pack->loaded = TRUE; + + return PML_SetAction(tree, id, action, SetIcon, Ask); + } + // set the icon - if(!pack->icon) - if(SetIcon) + if(SetIcon && !pack->icon) SetIcon(id, action); + // set the button(s) + if(tree->setButton && action != 2) + { + tree->setButton(1, action); + //tree->setButton(pack->action+1, action); + } + // can't do src install yet if(action == 2) { @@ -177,19 +237,13 @@ if(tree->setButton) tree->setButton(1, 1); //tree->setButton(action+1, 0); + pack->action = action; // root notes (like network) return here if(!pack->path) return ret; - // load it if it's not loaded yet - if(!pack->loaded) - { - PML_XmlDownload (pack->path, (void*)pack, pack_start, pack_end, pack_text); - pack->loaded = TRUE; - } - // save the name of the corresponding script in a vector tree->todo.push_back(pack->files[action-1]); } @@ -197,10 +251,16 @@ // undoing else { - // set other things back - if(tree->setButton) - tree->setButton(1, 0); - //tree->setButton(pack->action+1, 1); + for(i=0; i<pack->neededBy.size(); i++) + { + if(tree->packages[pack->neededBy[i]].action) + { + SetIcon(id, pack->action); + return ERR_GENERIC; + } + } + + // set action back pack->action = 0; // root notes (like network) return here @@ -211,8 +271,6 @@ for(i=0; i<tree->todo.size(); i++) if(!strcmp(tree->todo[i], pack->files[pack->action-1])) // look for right entry tree->todo.erase(tree->todo.begin()+i); // delete it - - return ERR_OK; } return ret; _____ Modified: trunk/rosapps/packmgr/lib/package.hpp --- trunk/rosapps/packmgr/lib/package.hpp 2005-04-10 14:32:30 UTC (rev 14575) +++ trunk/rosapps/packmgr/lib/package.hpp 2005-04-10 15:34:15 UTC (rev 14576) @@ -18,6 +18,7 @@ typedef int (*PML_SetButton) (DWORD dwID, BOOL state); typedef int (*PML_SetIcon) (int id, int icon); typedef int (*PML_SetText) (const char* text); +typedef int (*PML_Ask) (const WCHAR* text); /* Structs */ @@ -32,6 +33,8 @@ char** field; char* name; char* description; + vector<char*> depencies; + vector<int> neededBy; int action; char* files [4]; @@ -74,8 +77,8 @@ int PML_FindItem (TREE* tree, const char* what); int PML_LoadPackage (pTree, int id, PML_SetButton); char* PML_GetDescription (TREE* tree, int id); - int PML_SetAction (pTree, int package, int action, PML_SetIcon); - int PML_DoIt (pTree, PML_SetStatus); + int PML_SetAction (pTree, int package, int action, PML_SetIcon, PML_Ask); + int PML_DoIt (pTree, PML_SetStatus, PML_Ask); void PML_CloseTree (pTree); }

19 years, 7 months

[chorns] 14575: Merge 13831:14550 from trunk

by chorns＠svn.reactos.com

Merge 13831:14550 from trunk Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Modified: branches/xmlbuildsystem/reactos/apps/testsets/loadlib/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/Makefile Added: branches/xmlbuildsystem/reactos/apps/utils/binpatch/ Deleted: branches/xmlbuildsystem/reactos/apps/utils/consw/ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml Modified: branches/xmlbuildsystem/reactos/apps/utils/partinfo/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/partinfo/partinfo.c Modified: branches/xmlbuildsystem/reactos/apps/utils/pnpdump/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/pnpdump/pnpdump.c Modified: branches/xmlbuildsystem/reactos/apps/utils/ps/makefile Modified: branches/xmlbuildsystem/reactos/apps/utils/sc/makefile Added: branches/xmlbuildsystem/reactos/apps/utils/winetest/ Modified: branches/xmlbuildsystem/reactos/baseaddress.xml Modified: branches/xmlbuildsystem/reactos/boot/freeldr/Makefile Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile Added: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.i386 Added: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.powerpc Added: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/ofwboot.s Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Added: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/powerpc/ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/multiboot.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/math/libgcc2.c Added: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/math/powerpc.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/mm/mem.h Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/print.c Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/stdlib.c Modified: branches/xmlbuildsystem/reactos/bootdata/hivecls.inf Modified: branches/xmlbuildsystem/reactos/bootdata/hivesys.inf Modified: branches/xmlbuildsystem/reactos/bootdata/icon.ico Modified: branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff Modified: branches/xmlbuildsystem/reactos/doc/README.WINE Added: branches/xmlbuildsystem/reactos/doc/irp cancel boilerplate.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/Makefile Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/ospm/fdo.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/ospm/include/acpisys.h Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/ospm/osl.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/ospm/pdo.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/tables/tbget.c Modified: branches/xmlbuildsystem/reactos/drivers/bus/acpi/utils/cmglobal.c Added: branches/xmlbuildsystem/reactos/drivers/bus/serenum/ Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/circularbuffer.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/cleanup.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/close.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/create.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/devctrl.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/info.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/legacy.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/makefile Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/misc.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/pnp.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/power.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/rw.c Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.c Added: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.h Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/create.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/fsctrl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/npfs.h Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/rw.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/np/volume.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/cleanup.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/close.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/fcb.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/finfo.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/fsctl.c Modified: branches/xmlbuildsystem/reactos/drivers/fs/vfat/vfat.h Modified: branches/xmlbuildsystem/reactos/drivers/input/keyboard/keyboard.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/ip/network/interface.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/ip/network/ip.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/ip/network/ports.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/ip/transport/tcp/accept.c Modified: branches/xmlbuildsystem/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd/listen.c Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd/lock.c Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd/main.c Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/afd/read.c Modified: branches/xmlbuildsystem/reactos/drivers/net/afd/include/afd.h Modified: branches/xmlbuildsystem/reactos/drivers/net/ndis/ndis/protocol.c Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/datalink/lan.c Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/include/dispatch.h Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/include/interface.h Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/include/ip.h Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/include/lan.h Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/include/precomp.h Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/include/tcpip.h Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/include/ticonsts.h Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip/iinfo.c Modified: branches/xmlbuildsystem/reactos/drivers/net/tcpip/tcpip/main.c Modified: branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.c [truncated at 100 lines; 909 more skipped] _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -79,6 +79,7 @@ ECHO_AR =@echo [AR] $@ ECHO_WINEBLD =@echo [WINEBLD] $@ ECHO_WRC =@echo [WRC] $@ + ECHO_WIDL =@echo [WIDL] $@ ECHO_BIN2RES =@echo [BIN2RES] $< ECHO_DLLTOOL =@echo [DLLTOOL] $@ ECHO_LD =@echo [LD] $@ @@ -105,6 +106,7 @@ ECHO_AR = ECHO_WINEBLD = ECHO_WRC = + ECHO_WIDL = ECHO_BIN2RES = ECHO_DLLTOOL = ECHO_LD = _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-04-10 14:32:30 UTC (rev 14575) @@ -38,6 +38,9 @@ <directory name="hal"> <xi:include href="hal/directory.xml" /> </directory> + <directory name="include"> + <xi:include href="include/directory.xml" /> + </directory> <directory name="lib"> <xi:include href="lib/directory.xml" /> </directory> _____ Modified: branches/xmlbuildsystem/reactos/apps/testsets/loadlib/makefile --- branches/xmlbuildsystem/reactos/apps/testsets/loadlib/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/testsets/loadlib/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -11,7 +11,7 @@ TARGET_NAME = loadlib -TARGET_CFLAGS = -Wall -Werror -D_USE_W32API -DUNICODE -D_UNICODE +TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE TARGET_SDKLIBS = kernel32.a ntdll.a _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/Makefile --- branches/xmlbuildsystem/reactos/apps/utils/Makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/Makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -9,7 +9,7 @@ # Console system utilities # cabman cat net objdir partinfo pice ps sc stats -UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount consw ps +UTIL_APPS = cat objdir pnpdump sc shutdown stats tickcount ps UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois _____ Copied: branches/xmlbuildsystem/reactos/apps/utils/binpatch (from rev 14550, trunk/reactos/apps/utils/binpatch) _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -8,6 +8,8 @@ TARGET_INSTALLDIR = system32 +TARGET_CFLAGS = -D__USE_W32API + TARGET_SDKLIBS = ws2_32.a iphlpapi.a # ntdll.a _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -8,7 +8,7 @@ TARGET_INSTALLDIR = system32 -TARGET_CFLAGS = -D__USE_W32_SOCKETS +TARGET_CFLAGS = -D__USE_W32API -D__USE_W32_SOCKETS TARGET_SDKLIBS = ws2_32.a _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/ping.xml 2005-04-10 14:32:30 UTC (rev 14575) @@ -1,5 +1,6 @@ <module name="ping" type="win32cui" installbase="system32" installname="ping.exe"> <include base="ping">.</include> + <define name="__USE_W32API" /> <define name="__USE_W32_SOCKETS" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -12,7 +12,7 @@ TARGET_OBJECTS = $(TARGET_NAME).o -TARGET_GCCLIBS = +TARGET_CFLAGS = -D__USE_W32API include $(PATH_TO_TOP)/rules.mak _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml --- branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/net/route/route.xml 2005-04-10 14:32:30 UTC (rev 14575) @@ -1,5 +1,6 @@ <module name="route" type="win32cui"> <include base="route">.</include> + <define name="__USE_W32API" /> <library>kernel32</library> <library>ws2_32</library> <library>iphlpapi</library> _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/partinfo/makefile --- branches/xmlbuildsystem/reactos/apps/utils/partinfo/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/partinfo/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -10,7 +10,7 @@ TARGET_NAME = partinfo -TARGET_CFLAGS = -Wall -Werror -Wno-format +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -Wno-format TARGET_SDKLIBS = ntdll.a kernel32.a _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/partinfo/partinfo.c --- branches/xmlbuildsystem/reactos/apps/utils/partinfo/partinfo.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/partinfo/partinfo.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -8,10 +8,12 @@ #include <stdio.h> #include <stdlib.h> +#include <ddk/ntddk.h> + //#define DUMP_DATA #define DUMP_SIZE_INFO +#define UNICODE - #ifdef DUMP_DATA void HexDump(char *buffer, ULONG size) { _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/pnpdump/makefile --- branches/xmlbuildsystem/reactos/apps/utils/pnpdump/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/pnpdump/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -10,7 +10,7 @@ TARGET_NAME = pnpdump -TARGET_CFLAGS = -Wall -Werror +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror TARGET_SDKLIBS = ntdll.a kernel32.a _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/pnpdump/pnpdump.c --- branches/xmlbuildsystem/reactos/apps/utils/pnpdump/pnpdump.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/pnpdump/pnpdump.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -8,6 +8,8 @@ #include <stdlib.h> #include <conio.h> +#include <ddk/ntddk.h> + #include <pshpack1.h> typedef struct _CM_PNP_BIOS_DEVICE_NODE _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/ps/makefile --- branches/xmlbuildsystem/reactos/apps/utils/ps/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/ps/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -10,7 +10,7 @@ TARGET_NAME = ps -TARGET_CFLAGS = -DANONYMOUSUNIONS -Werror -Wall +TARGET_CFLAGS = -D__USE_W32API -DANONYMOUSUNIONS -Werror -Wall TARGET_SDKLIBS = ntdll.a kernel32.a user32.a _____ Modified: branches/xmlbuildsystem/reactos/apps/utils/sc/makefile --- branches/xmlbuildsystem/reactos/apps/utils/sc/makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/apps/utils/sc/makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -13,7 +13,7 @@ TARGET_NAME = sc -TARGET_CFLAGS = -DDBG -Werror -Wall +TARGET_CFLAGS = -D__USE_W32API -DDBG -Werror -Wall TARGET_SDKLIBS = kernel32.a ntdll.a advapi32.a _____ Copied: branches/xmlbuildsystem/reactos/apps/utils/winetest (from rev 14550, trunk/reactos/apps/utils/winetest) _____ Modified: branches/xmlbuildsystem/reactos/baseaddress.xml --- branches/xmlbuildsystem/reactos/baseaddress.xml 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/baseaddress.xml 2005-04-10 14:32:30 UTC (rev 14575) @@ -45,6 +45,7 @@ <property name="BASEADDRESS_COMDLG32" value="0x76200000" /> <property name="BASEADDRESS_OLEAUT32" value="0x76260000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" /> +<property name="BASEADDRESS_RICHED20" value="0x76360000" /> <property name="BASEADDRESS_TWAIN_32" value="0x76380000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/Makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/Makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -29,7 +29,7 @@ $(MAKE) -C fdebug test: - + clean: $(MAKE) -C bootsect clean $(MAKE) -C freeldr clean @@ -38,6 +38,7 @@ $(MAKE) -C tools clean bootcd: +ifeq ($(ARCH),i386) $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin $(CP) bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin $(CP) bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin @@ -46,5 +47,7 @@ $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin $(CP) freeldr/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys $(CP) freeldr/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys +endif .PHONY : clean + _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile 2005-04-10 14:32:30 UTC (rev 14575) @@ -25,56 +25,8 @@ .PHONY : clean bootcd -all: $(BIN2C) dosmbr.bin fat.bin fat32.bin isoboot.bin ext2.bin - - -$(BIN2C) : - @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) - -dosmbr.bin : dosmbr.asm - @echo freeldr: Assembling dosmbr - @$(NASM_CMD) $(NFLAGS) -o dosmbr.bin -f bin dosmbr.asm - -fat.bin : fat.asm $(BIN2C) - @echo freeldr: Assembling fat - @$(NASM_CMD) $(NFLAGS) -o fat.bin -f bin fat.asm - @$(BIN2C) fat.bin fat.h fat_data - - -fat32.bin : fat32.asm $(BIN2C) - @echo freeldr: Assembling fat32 - @$(NASM_CMD) $(NFLAGS) -o fat32.bin -f bin fat32.asm - @$(BIN2C) fat32.bin fat32.h fat32_data - -isoboot.bin : isoboot.asm - @echo freeldr: Assembling isoboot - @$(NASM_CMD) $(NFLAGS) -o isoboot.bin -f bin isoboot.asm - -ext2.bin : ext2.asm - @echo freeldr: Assembling ext2 - @$(NASM_CMD) $(NFLAGS) -o ext2.bin -f bin ext2.asm - @$(BIN2C) ext2.bin ext2.h ext2_data - - -.PHONY : bootcd -bootcd: bootcd_dirs isoboot.bin - $(CP) isoboot.bin $(BOOTCD_DIR) - $(CP) dosmbr.bin $(BOOTCD_DIR)/disk/loader - $(CP) ext2.bin $(BOOTCD_DIR)/disk/loader - $(CP) fat.bin $(BOOTCD_DIR)/disk/loader - $(CP) fat32.bin $(BOOTCD_DIR)/disk/loader - $(CP) isoboot.bin $(BOOTCD_DIR)/disk/loader - -.PHONY : bootcd_dirs -bootcd_dirs: - $(MKDIR) $(BOOTCD_DIR) - $(MKDIR) $(BOOTCD_DIR)/disk - $(MKDIR) $(BOOTCD_DIR)/disk/reactos - $(MKDIR) $(BOOTCD_DIR)/disk/install - $(MKDIR) $(BOOTCD_DIR)/disk/bootdisk - $(MKDIR) $(BOOTCD_DIR)/disk/loader - -clean: - @-$(RM) *.bin - @-$(RM) *.h - @echo freeldr: Clean ALL done. +ifeq ($(ARCH),powerpc) +include Makefile.powerpc +else +include Makefile.i386 +endif _____ Copied: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.i386 (from rev 14550, trunk/reactos/boot/freeldr/bootsect/Makefile.i386) _____ Copied: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile.powerpc (from rev 14550, trunk/reactos/boot/freeldr/bootsect/Makefile.powerpc) _____ Copied: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/ofwboot.s (from rev 14550, trunk/reactos/boot/freeldr/bootsect/ofwboot.s) _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -28,6 +28,7 @@ #include "../../reactos/registry.h" #include "hardware.h" +BOOLEAN AcpiPresent = FALSE; static BOOL FindAcpiBios(VOID) @@ -63,6 +64,7 @@ if (FindAcpiBios()) { + AcpiPresent = TRUE; /* Create new bus key */ sprintf(Buffer, "MultifunctionAdapter\\%u", *BusNumber); _____ Copied: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/arch/powerpc (from rev 14550, trunk/reactos/boot/freeldr/freeldr/arch/powerpc) _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -21,7 +21,7 @@ * Limitations: * - No support for compressed files. * - No attribute list support. - * - May crash on currupted filesystem. + * - May crash on corrupted filesystem. */ #include <freeldr.h> _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/multiboot.h --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/include/multiboot.h 2005-04-10 14:32:30 UTC (rev 14575) @@ -52,6 +52,7 @@ #define MB_INFO_FLAG_BOOT_LOADER_NAME 0x00000200 #define MB_INFO_FLAG_APM_TABLE 0x00000400 #define MB_INFO_FLAG_GRAPHICS_TABLE 0x00000800 +#define MB_INFO_FLAG_ACPI_TABLE 0x00001000 #ifndef ASM /* Do not include here in boot.S. */ _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/math/libgcc2.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/math/libgcc2.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/math/libgcc2.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -38,6 +38,8 @@ */ #ifdef __i386__ #include "i386.h" +#elif defined(_M_PPC) +#include "powerpc.h" #endif #define L_clz #define L_udivdi3 _____ Copied: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/math/powerpc.h (from rev 14550, trunk/reactos/boot/freeldr/freeldr/math/powerpc.h) _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/mm/mem.h --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/mm/mem.h 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/mm/mem.h 2005-04-10 14:32:30 UTC (rev 14575) @@ -22,11 +22,11 @@ #define __MEM_H -#ifdef __i386__ +#if defined(__i386__) || defined(_PPC_) #define MM_PAGE_SIZE 4096 -#endif // defined __i386__ +#endif // defined __i386__ or _PPC_ typedef struct { _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/multiboot.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -164,9 +164,7 @@ /* Re-initalize EFLAGS */ Ke386EraseFlags(); - /* Get Kernel Base and Set MmSystemRangeStart */ - FrLdrGetKernelBase(); - + /* Get the PAE Mode */ FrLdrGetPaeMode(); /* Initialize the page directory */ @@ -531,6 +529,14 @@ ULONG_PTR TargetSection; ULONG SectionSize; LONG i; + PIMAGE_DATA_DIRECTORY RelocationDDir; + PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd; + ULONG Count; + ULONG_PTR Address, MaxAddress; + PUSHORT TypeOffset; + ULONG_PTR Delta; + PUSHORT ShortPtr; + PULONG LongPtr; /* Allocate 1024 bytes for PE Header */ ImageHeader = (PIMAGE_DOS_HEADER)MmAllocateMemory(1024); @@ -552,8 +558,9 @@ /* Now read the MZ header to get the offset to the PE Header */ NtHeader = (PIMAGE_NT_HEADERS)((PCHAR)ImageHeader + ImageHeader->e_lfanew); - /* Save the Image Base */ - KernelBase = NtHeader->OptionalHeader.ImageBase; + /* Get Kernel Base */ + KernelBase = NtHeader->OptionalHeader.ImageBase; + FrLdrGetKernelBase(); /* Save Entrypoint */ KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); @@ -603,10 +610,65 @@ Section->Misc.VirtualSize - Section->SizeOfRawData); } } + + /* Get the Relocation Data Directory */ + RelocationDDir = &NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC] ; - /* Now relocate the file */ - /* FIXME: ADD RELOC CODE */ + /* Get the Relocation Section Start and End*/ + RelocationDir = (PIMAGE_BASE_RELOCATION)(KERNEL_BASE_PHYS + RelocationDDir->VirtualAddress); + RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); + + /* Calculate Difference between Real Base and Compiled Base*/ + Delta = KernelBase - NtHeader->OptionalHeader.ImageBase;; + /* Determine how far we shoudl relocate */ + MaxAddress = KERNEL_BASE_PHYS + ImageSize; + + /* Relocate until we've processed all the blocks */ + while (RelocationDir < RelocationEnd && RelocationDir->SizeOfBlock > 0) { + + /* See how many Relocation Blocks we have */ + Count = (RelocationDir->SizeOfBlock - sizeof(IMAGE_BASE_RELOCATION)) / sizeof(USHORT); + + /* Calculate the Address of this Directory */ + Address = KERNEL_BASE_PHYS + RelocationDir->VirtualAddress; + + /* Calculate the Offset of the Type */ + TypeOffset = (PUSHORT)(RelocationDir + 1); + + for (i = 0; i < Count; i++) { + + ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF)); + + /* Don't relocate after the end of the loaded driver */ + if ((ULONG_PTR)ShortPtr >= MaxAddress) break; + + switch (*TypeOffset >> 12) { + + case IMAGE_REL_BASED_ABSOLUTE: + break; + + case IMAGE_REL_BASED_HIGH: + *ShortPtr += HIWORD(Delta); + break; + + case IMAGE_REL_BASED_LOW: + *ShortPtr += LOWORD(Delta); + break; + + case IMAGE_REL_BASED_HIGHLOW: + LongPtr = (PULONG)ShortPtr; + *LongPtr += Delta; + break; + } + + TypeOffset++; + } + + /* Move to the next Relocation Table */ + RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDir->SizeOfBlock); + } + /* Increase the next Load Base */ NextModuleBase = ROUND_UP(KERNEL_BASE_PHYS + ImageSize, PAGE_SIZE); _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/reactos.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -578,8 +578,9 @@ PARTITION_TABLE_ENTRY PartitionTableEntry; ULONG rosPartition; - extern ULONG PageDirectoryStart; - extern ULONG PageDirectoryEnd; + extern ULONG PageDirectoryStart; + extern ULONG PageDirectoryEnd; + extern BOOLEAN AcpiPresent; // // Open the operating system section @@ -596,8 +597,8 @@ * Setup multiboot information structure */ LoaderBlock.Flags = MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES; - LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; - LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; + LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; + LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; LoaderBlock.BootDevice = 0xffffffff; LoaderBlock.CommandLine = (unsigned long)multiboot_kernel_cmdline; LoaderBlock.ModsCount = 0; @@ -734,6 +735,7 @@ */ MachHwDetect(); + if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE; UiDrawStatusText("Loading..."); UiDrawProgressBarCenter(0, 100, "Loading ReactOS..."); _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/print.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/print.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/print.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -20,6 +20,7 @@ #include <freeldr.h> #include <machine.h> #include <rtl.h> +#include <stdarg.h> /* * print() - prints unformatted text to stdout @@ -38,12 +39,11 @@ */ void printf(char *format, ... ) { - int *dataptr = (int *)(void *)&format; + va_list ap; + va_start(ap,format); char c, *ptr, str[16]; int ll; - dataptr++; - while ((c = *(format++))) { if (c != '%') @@ -66,11 +66,11 @@ case 'd': case 'u': case 'x': if (ll) { - *convert_i64_to_ascii(str, c, *((unsigned long long *) dataptr++)) = 0; + *convert_i64_to_ascii(str, c, va_arg(ap, unsigned long long)) = 0; } else { - *convert_to_ascii(str, c, *((unsigned long *) dataptr++)) = 0; + *convert_to_ascii(str, c, va_arg(ap, unsigned long)) = 0; } ptr = str; @@ -81,10 +81,10 @@ } break; - case 'c': MachConsPutChar((*(dataptr++))&0xff); break; + case 'c': MachConsPutChar((va_arg(ap,int))&0xff); break; case 's': - ptr = (char *)(*(dataptr++)); + ptr = va_arg(ap,char *); while ((c = *(ptr++))) { @@ -100,16 +100,18 @@ } } } + + va_end(ap); } void sprintf(char *buffer, char *format, ... ) { - int *dataptr = (int *)(void *)&format; + va_list ap; char c, *ptr, str[16]; char *p = buffer; int ll; - dataptr++; + va_start(ap,format); while ((c = *(format++))) { @@ -134,11 +136,11 @@ case 'd': case 'u': case 'x': if (ll) { - *convert_i64_to_ascii(str, c, *((unsigned long long*) dataptr++)) = 0; + *convert_i64_to_ascii(str, c, va_arg(ap, unsigned long long)) = 0; } else { - *convert_to_ascii(str, c, *((unsigned long *) dataptr++)) = 0; + *convert_to_ascii(str, c, va_arg(ap, unsigned long)) = 0; } ptr = str; @@ -151,12 +153,12 @@ break; case 'c': - *p = (*(dataptr++))&0xff; + *p = va_arg(ap,int)&0xff; p++; break; case 's': - ptr = (char *)(*(dataptr++)); + ptr = va_arg(ap,char *); while ((c = *(ptr++))) { @@ -174,5 +176,6 @@ } } } + va_end(ap); *p=0; } _____ Modified: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/stdlib.c --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/stdlib.c 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/rtl/stdlib.c 2005-04-10 14:32:30 UTC (rev 14575) @@ -17,16 +17,15 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - /* * convert_to_ascii() - converts a number to it's ascii equivalent * from: * GRUB -- GRand Unified Bootloader * Copyright (C) 1996 Erich Boleyn <erich(a)uruk.org> */ -char *convert_to_ascii(char *buf, int c, ...) +char *convert_to_ascii(char *buf, int c, int num) { - unsigned long num = *((&c) + 1), mult = 10; + unsigned long mult = 10; char *ptr = buf; if (c == 'x') @@ -63,9 +62,8 @@ return ptr; } -char *convert_i64_to_ascii(char *buf, int c, ...) +char *convert_i64_to_ascii(char *buf, int c, unsigned long long num) { - unsigned long long num = *(long long*)((&c) + 1); int mult = 10; char *ptr = buf; _____ Modified: branches/xmlbuildsystem/reactos/bootdata/hivecls.inf --- branches/xmlbuildsystem/reactos/bootdata/hivecls.inf 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/bootdata/hivecls.inf 2005-04-10 14:32:30 UTC (rev 14575) @@ -344,4 +344,133 @@ HKCR,"WinNT\Clsid","",0x00000002,"{8b20cd60-0f29-11cf-abc4-02608c9e7553} " + +; For language support: + +HKCR,"MIME",,0x00000012 +HKCR,"MIME\Database",,0x00000012 +HKCR,"MIME\Database\Rfc1766",,0x00000012 +HKCR,"MIME\Database\Rfc1766","0436",0x00000000,"af;Afrikaans" +HKCR,"MIME\Database\Rfc1766","041C",0x00000000,"sq;Albanian" +HKCR,"MIME\Database\Rfc1766","0001",0x00000000,"ar;Arabic" +HKCR,"MIME\Database\Rfc1766","0401",0x00000000,"ar-sa;Arabic (Saudi Arabia)" +HKCR,"MIME\Database\Rfc1766","0801",0x00000000,"ar-iq;Arabic (Iraq)" +HKCR,"MIME\Database\Rfc1766","0C01",0x00000000,"ar-eg;Arabic (Egypt)" +HKCR,"MIME\Database\Rfc1766","1001",0x00000000,"ar-ly;Arabic (Libya)" +HKCR,"MIME\Database\Rfc1766","1401",0x00000000,"ar-dz;Arabic (Algeria)" +HKCR,"MIME\Database\Rfc1766","1801",0x00000000,"ar-ma;Arabic (Morocco)" +HKCR,"MIME\Database\Rfc1766","1C01",0x00000000,"ar-tn;Arabic (Tunisia)" +HKCR,"MIME\Database\Rfc1766","2001",0x00000000,"ar-om;Arabic (Oman)" +HKCR,"MIME\Database\Rfc1766","2401",0x00000000,"ar-ye;Arabic (Yemen)" +HKCR,"MIME\Database\Rfc1766","2801",0x00000000,"ar-sy;Arabic (Syria)" +HKCR,"MIME\Database\Rfc1766","2C01",0x00000000,"ar-jo;Arabic (Jordan)" +HKCR,"MIME\Database\Rfc1766","3001",0x00000000,"ar-lb;Arabic (Lebanon)" +HKCR,"MIME\Database\Rfc1766","3401",0x00000000,"ar-kw;Arabic (Kuwait)" +HKCR,"MIME\Database\Rfc1766","3801",0x00000000,"ar-ae;Arabic (U.A.E.)" +HKCR,"MIME\Database\Rfc1766","3C01",0x00000000,"ar-bh;Arabic (Bahrain)" +HKCR,"MIME\Database\Rfc1766","4001",0x00000000,"ar-qa;Arabic (Qatar)" +HKCR,"MIME\Database\Rfc1766","042D",0x00000000,"eu;Basque" +HKCR,"MIME\Database\Rfc1766","0402",0x00000000,"bg;Bulgarian" +HKCR,"MIME\Database\Rfc1766","0423",0x00000000,"be;Belarusian" +HKCR,"MIME\Database\Rfc1766","0403",0x00000000,"ca;Catalan" +HKCR,"MIME\Database\Rfc1766","0004",0x00000000,"zh;Chinese" +HKCR,"MIME\Database\Rfc1766","0404",0x00000000,"zh-tw;Chinese (Taiwan)" +HKCR,"MIME\Database\Rfc1766","0804",0x00000000,"zh-cn;Chinese (China)" +HKCR,"MIME\Database\Rfc1766","0C04",0x00000000,"zh-hk;Chinese (Hong Kong SAR)" +HKCR,"MIME\Database\Rfc1766","1004",0x00000000,"zh-sg;Chinese (Singapore)" +HKCR,"MIME\Database\Rfc1766","041A",0x00000000,"hr;Croatian" +HKCR,"MIME\Database\Rfc1766","0405",0x00000000,"cs;Czech" +HKCR,"MIME\Database\Rfc1766","0406",0x00000000,"da;Danish" +HKCR,"MIME\Database\Rfc1766","0413",0x00000000,"nl;Dutch (Netherlands)" +HKCR,"MIME\Database\Rfc1766","0813",0x00000000,"nl-be;Dutch (Belgium)" +HKCR,"MIME\Database\Rfc1766","0009",0x00000000,"en;English" +HKCR,"MIME\Database\Rfc1766","0409",0x00000000,"en-us;English (United States)" +HKCR,"MIME\Database\Rfc1766","0809",0x00000000,"en-gb;English (United Kingdom)" +HKCR,"MIME\Database\Rfc1766","0C09",0x00000000,"en-au;English (Australia)" +HKCR,"MIME\Database\Rfc1766","1009",0x00000000,"en-ca;English (Canada)" +HKCR,"MIME\Database\Rfc1766","1409",0x00000000,"en-nz;English (New Zealand)" +HKCR,"MIME\Database\Rfc1766","1809",0x00000000,"en-ie;English (Ireland)" +HKCR,"MIME\Database\Rfc1766","1C09",0x00000000,"en-za;English (South Africa)" +HKCR,"MIME\Database\Rfc1766","2009",0x00000000,"en-jm;English (Jamaica)" +HKCR,"MIME\Database\Rfc1766","2809",0x00000000,"en-bz;English (Belize)" +HKCR,"MIME\Database\Rfc1766","2C09",0x00000000,"en-tt;English (Trinidad)" +HKCR,"MIME\Database\Rfc1766","0425",0x00000000,"et;Estonian" +HKCR,"MIME\Database\Rfc1766","0438",0x00000000,"fo;Faeroese" +HKCR,"MIME\Database\Rfc1766","0429",0x00000000,"fa;Farsi" +HKCR,"MIME\Database\Rfc1766","040B",0x00000000,"fi;Finnish" +HKCR,"MIME\Database\Rfc1766","040C",0x00000000,"fr;French (France)" +HKCR,"MIME\Database\Rfc1766","080C",0x00000000,"fr-be;French (Belgium)" +HKCR,"MIME\Database\Rfc1766","0C0C",0x00000000,"fr-ca;French (Canada)" +HKCR,"MIME\Database\Rfc1766","100C",0x00000000,"fr-ch;French (Switzerland)" +HKCR,"MIME\Database\Rfc1766","140C",0x00000000,"fr-lu;French (Luxembourg)" +HKCR,"MIME\Database\Rfc1766","043C",0x00000000,"gd;Gaelic" +HKCR,"MIME\Database\Rfc1766","0407",0x00000000,"de;German (Germany)" +HKCR,"MIME\Database\Rfc1766","0807",0x00000000,"de-ch;German (Switzerland)" +HKCR,"MIME\Database\Rfc1766","0C07",0x00000000,"de-at;German (Austria)" +HKCR,"MIME\Database\Rfc1766","1007",0x00000000,"de-lu;German (Luxembourg)" +HKCR,"MIME\Database\Rfc1766","1407",0x00000000,"de-li;German (Liechtenstein)" +HKCR,"MIME\Database\Rfc1766","0408",0x00000000,"el;Greek" +HKCR,"MIME\Database\Rfc1766","040D",0x00000000,"he;Hebrew" +HKCR,"MIME\Database\Rfc1766","0439",0x00000000,"hi;Hindi" +HKCR,"MIME\Database\Rfc1766","040E",0x00000000,"hu;Hungarian" +HKCR,"MIME\Database\Rfc1766","040F",0x00000000,"is;Icelandic" +HKCR,"MIME\Database\Rfc1766","0421",0x00000000,"in;Indonesian" +HKCR,"MIME\Database\Rfc1766","0410",0x00000000,"it;Italian (Italy)" +HKCR,"MIME\Database\Rfc1766","0810",0x00000000,"it-ch;Italian (Switzerland)" +HKCR,"MIME\Database\Rfc1766","0411",0x00000000,"ja;Japanese" +HKCR,"MIME\Database\Rfc1766","0412",0x00000000,"ko;Korean" +HKCR,"MIME\Database\Rfc1766","0426",0x00000000,"lv;Latvian" +HKCR,"MIME\Database\Rfc1766","0427",0x00000000,"lt;Lithuanian" +HKCR,"MIME\Database\Rfc1766","042F",0x00000000,"mk;FYRO Macedonian" +HKCR,"MIME\Database\Rfc1766","043E",0x00000000,"ms;Malay (Malaysia)" +HKCR,"MIME\Database\Rfc1766","043A",0x00000000,"mt;Maltese" +HKCR,"MIME\Database\Rfc1766","0414",0x00000000,"no;Norwegian (Bokmal)" +HKCR,"MIME\Database\Rfc1766","0814",0x00000000,"no;Norwegian (Nynorsk)" +HKCR,"MIME\Database\Rfc1766","0415",0x00000000,"pl;Polish" +HKCR,"MIME\Database\Rfc1766","0416",0x00000000,"pt-br;Portuguese (Brazil)" +HKCR,"MIME\Database\Rfc1766","0816",0x00000000,"pt;Portuguese (Portugal)" +HKCR,"MIME\Database\Rfc1766","0417",0x00000000,"rm;Rhaeto-Romanic" +HKCR,"MIME\Database\Rfc1766","0418",0x00000000,"ro;Romanian" +HKCR,"MIME\Database\Rfc1766","0818",0x00000000,"ro-mo;Romanian (Moldova)" +HKCR,"MIME\Database\Rfc1766","0419",0x00000000,"ru;Russian" +HKCR,"MIME\Database\Rfc1766","0819",0x00000000,"ru-mo;Russian (Moldova)" +HKCR,"MIME\Database\Rfc1766","0C1A",0x00000000,"sr;Serbian (Cyrillic)" +HKCR,"MIME\Database\Rfc1766","081A",0x00000000,"sr;Serbian (Latin)" +HKCR,"MIME\Database\Rfc1766","041B",0x00000000,"sk;Slovak" +HKCR,"MIME\Database\Rfc1766","0424",0x00000000,"sl;Slovenian" +HKCR,"MIME\Database\Rfc1766","042E",0x00000000,"sb;Sorbian" +HKCR,"MIME\Database\Rfc1766","040A",0x00000000,"es;Spanish (Traditional Sort)" +HKCR,"MIME\Database\Rfc1766","080A",0x00000000,"es-mx;Spanish (Mexico)" +HKCR,"MIME\Database\Rfc1766","0C0A",0x00000000,"es;Spanish (International Sort)" +HKCR,"MIME\Database\Rfc1766","100A",0x00000000,"es-gt;Spanish (Guatemala)" +HKCR,"MIME\Database\Rfc1766","140A",0x00000000,"es-cr;Spanish (Costa Rica)" +HKCR,"MIME\Database\Rfc1766","180A",0x00000000,"es-pa;Spanish (Panama)" +HKCR,"MIME\Database\Rfc1766","1C0A",0x00000000,"es-do;Spanish (Dominican Republic)" +HKCR,"MIME\Database\Rfc1766","200A",0x00000000,"es-ve;Spanish (Venezuela)" +HKCR,"MIME\Database\Rfc1766","240A",0x00000000,"es-co;Spanish (Colombia)" +HKCR,"MIME\Database\Rfc1766","280A",0x00000000,"es-pe;Spanish (Peru)" +HKCR,"MIME\Database\Rfc1766","2C0A",0x00000000,"es-ar;Spanish (Argentina)" +HKCR,"MIME\Database\Rfc1766","300A",0x00000000,"es-ec;Spanish (Ecuador)" +HKCR,"MIME\Database\Rfc1766","340A",0x00000000,"es-cl;Spanish (Chile)" +HKCR,"MIME\Database\Rfc1766","380A",0x00000000,"es-uy;Spanish (Uruguay)" +HKCR,"MIME\Database\Rfc1766","3C0A",0x00000000,"es-py;Spanish (Paraguay)" +HKCR,"MIME\Database\Rfc1766","400A",0x00000000,"es-bo;Spanish (Bolivia)" +HKCR,"MIME\Database\Rfc1766","440A",0x00000000,"es-sv;Spanish (El Salvador)" +HKCR,"MIME\Database\Rfc1766","480A",0x00000000,"es-hn;Spanish (Honduras)" +HKCR,"MIME\Database\Rfc1766","4C0A",0x00000000,"es-ni;Spanish (Nicaragua)" +HKCR,"MIME\Database\Rfc1766","500A",0x00000000,"es-pr;Spanish (Puerto Rico)" +HKCR,"MIME\Database\Rfc1766","0430",0x00000000,"sx;Sutu" +HKCR,"MIME\Database\Rfc1766","041D",0x00000000,"sv;Swedish" +HKCR,"MIME\Database\Rfc1766","081D",0x00000000,"sv-fi;Swedish (Finland)" +HKCR,"MIME\Database\Rfc1766","041E",0x00000000,"th;Thai" +HKCR,"MIME\Database\Rfc1766","0431",0x00000000,"ts;Tsonga" +HKCR,"MIME\Database\Rfc1766","0432",0x00000000,"tn;Tswana" +HKCR,"MIME\Database\Rfc1766","041F",0x00000000,"tr;Turkish" +HKCR,"MIME\Database\Rfc1766","0422",0x00000000,"uk;Ukrainian" +HKCR,"MIME\Database\Rfc1766","0420",0x00000000,"ur;Urdu" +HKCR,"MIME\Database\Rfc1766","042A",0x00000000,"vi;Vietnamese" +HKCR,"MIME\Database\Rfc1766","0434",0x00000000,"xh;Xhosa" +HKCR,"MIME\Database\Rfc1766","043D",0x00000000,"ji;Yiddish" +HKCR,"MIME\Database\Rfc1766","0435",0x00000000,"zu;Zulu" + ; EOF _____ Modified: branches/xmlbuildsystem/reactos/bootdata/hivesys.inf --- branches/xmlbuildsystem/reactos/bootdata/hivesys.inf 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/bootdata/hivesys.inf 2005-04-10 14:32:30 UTC (rev 14575) @@ -257,10 +257,10 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys " -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00070001,50,00,6f,00,73,00,69,00,78,00, 00,00,4f,00,73,00,32,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\os2ss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00070001,44,00,65,00,62,00,75,00,67,00, 00,00,57,00,69,00,6e,00,64,00,6f,00,77,00,73,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.ex e" ; 3Com 3c905 Driver @@ -469,6 +469,19 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Type",0x00010001,0x00 000001 +; Serial port enumerator +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ErrorControl",0x00010 001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Group",0x00000000,"PN P Filter" +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","ImagePath",0x00020000 ,"system32\drivers\serenum.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Start",0x00010001,0x0 0000003 +HKLM,"SYSTEM\CurrentControlSet\Services\serenum","Type",0x00010001,0x00 000001 +;hard coded values +HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","0",0x00000000,"A CPI\PNP0501" +HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","Count",0x0001000 1,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\serenum\Enum","NextInstance",0x 00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","UpperFilters",0x00 010000,"serenum" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","UpperFilters",0x00 010000,"serenum" + ; SB16 driver HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Bas e" HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x0001000 1,0x00000001 @@ -676,6 +689,12 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Serial","ImagePath",0x00020000," system32\drivers\serial.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Start",0x00010001,0x000 00001 HKLM,"SYSTEM\CurrentControlSet\Services\Serial","Type",0x00010001,0x0000 0001 +;hard coded values +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","0",0x00000000,"AC PI\PNP0501" +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","Count",0x00010001 ,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Serial\Enum","NextInstance",0x0 0010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\1","Service",0x0000000 0,"serial" +HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0501\2","Service",0x0000000 0,"serial" ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x0001000 1,0x00000001 _____ Modified: branches/xmlbuildsystem/reactos/bootdata/icon.ico (Binary files differ) _____ Modified: branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff --- branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/bootdata/packages/reactos.dff 2005-04-10 14:32:30 UTC (rev 14575) @@ -29,6 +29,7 @@ drivers\bus\acpi\acpi.sys 2 drivers\bus\isapnp\isapnp.sys 2 drivers\bus\pci\pci.sys 2 +drivers\bus\serenum\serenum.sys 2 drivers\dd\beep\beep.sys 2 drivers\dd\bootvid\bootvid.sys 2 drivers\dd\null\null.sys 2 @@ -99,6 +100,7 @@ lib\msacm\msacm32.dll 1 lib\msafd\msafd.dll 1 lib\msgina\msgina.dll 1 +lib\msi\msi.dll 1 lib\msimg32\msimg32.dll 1 lib\msvcrt\msvcrt.dll 1 lib\msvcrt20\msvcrt20.dll 1 @@ -108,10 +110,12 @@ lib\oleaut32\oleaut32.dll 1 lib\olepro32\olepro32.dll 1 lib\psapi\psapi.dll 1 +lib\riched20\riched20.dll 1 lib\richedit\riched32.dll 1 lib\rpcrt4\rpcrt4.dll 1 lib\samlib\samlib.dll 1 lib\secur32\secur32.dll 1 +lib\serialui\serialui.dll 1 lib\setupapi\setupapi.dll 1 lib\shdocvw\shdocvw.dll 1 lib\shell32\shell32.dll 1 @@ -146,8 +150,9 @@ subsys\system\explorer\explorer.exe 4 subsys\system\explorer\explorer-cfg-template.xml 4 subsys\system\explorer\notifyhook\notifyhook.dll 1 +subsys\system\format\format.exe 1 subsys\system\ibrowser\ibrowser.exe 1 -subsys\system\format\format.exe 1 +subsys\system\msiexec\msiexec.exe 1 subsys\system\notepad\notepad.exe 1 subsys\system\regedit\regedit.exe 4 subsys\system\regsvr32\regsvr32.exe 1 _____ Modified: branches/xmlbuildsystem/reactos/doc/README.WINE --- branches/xmlbuildsystem/reactos/doc/README.WINE 2005-04-10 14:16:38 UTC (rev 14574) +++ branches/xmlbuildsystem/reactos/doc/README.WINE 2005-04-10 14:32:30 UTC (rev 14575) @@ -26,52 +26,55 @@ work to import a new dll. The following build tools are derived from Wine. +reactos/tools/unicode # Synced to Wine-20050310 +reactos/tools/wpp # Synced to Wine-20050310 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050211 +reactos/tools/winebuild # Synced to Wine-20050310 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050211 +reactos/tools/wrc # Synced to Wine-20050310 +reactos/tools/widl # Synced to Wine-20050310 The following shared libraries are a 100% port from Winehq sources. -reactos/lib/cabinet # Synced to Wine-20050211 -reactos/lib/comctl32 # Synced to Wine-20050211 -reactos/lib/comdlg32 # Synced to Wine-20050211 -reactos/lib/dinput # Synced to Wine-20050211 -reactos/lib/dinput8 # Synced to Wine-20050211 -reactos/lib/icmp # Synced to Wine-20050211 +reactos/lib/cabinet # Synced to Wine-20050310 +reactos/lib/comctl32 # Synced to Wine-20050310 +reactos/lib/comdlg32 # Synced to Wine-20050310 +reactos/lib/dinput # Synced to Wine-20050310 +reactos/lib/dinput8 # Synced to Wine-20050310 +reactos/lib/icmp # Synced to Wine-20050310 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050211 +reactos/lib/mpr # Synced to Wine-20050310 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050211 -reactos/lib/msi # Synced to Wine-20050211 +reactos/lib/msimg32 # Synced to Wine-20050310 +reactos/lib/msi # Synced to Wine-20050310 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050211 -reactos/lib/oleaut32 # Synced to Wine-20050211 -reactos/lib/oledlg # Synced to Wine-20050211 -reactos/lib/olepro32 # Synced to Wine-20050211 -reactos/lib/richedit # Synced to Wine-20050211 -reactos/lib/rpcrt4 # Synced to Wine-20050211 -reactos/lib/setupapi # Synced to Wine-20050125 # CVS -reactos/lib/shell32 # Synced to Wine-20050211 -reactos/lib/shdocvw # Synced to Wine-20050211 -reactos/lib/shlwapi # Synced to Wine-20050211 +reactos/lib/ole32 # Synced to Wine-20050310 +reactos/lib/oleaut32 # Synced to Wine-20050310 +reactos/lib/oledlg # Synced to Wine-20050310 +reactos/lib/olepro32 # Synced to Wine-20050310 +reactos/lib/riched20 # Synced to Wine-20050310 +reactos/lib/richedit # Synced to Wine-20050310 +reactos/lib/rpcrt4 # Synced to Wine-20050310 +reactos/lib/setupapi # Synced to Wine-20050310 +reactos/lib/shell32 # Synced to Wine-20050310 +reactos/lib/shdocvw # Synced to Wine-20050310 +reactos/lib/shlwapi # Synced to Wine-20050310 reactos/lib/twain # Out of sync -reactos/lib/unicode # Dependancy on this lib needs to be removed. Synced to Wine-20050211 -reactos/lib/urlmon # Synced to Wine-20050211 +reactos/lib/urlmon # Synced to Wine-20050310 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050211 -reactos/lib/winmm/midimap # Synced to Wine-20050211 -reactos/lib/winmm/wavemap # Synced to Wine-20050211 +reactos/lib/winmm # Synced to Wine-20050310 +reactos/lib/winmm/midimap # Synced to Wine-20050310 +reactos/lib/winmm/wavemap # Synced to Wine-20050310 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync [truncated at 1000 lines; 191135 more skipped]

19 years, 7 months

[fireball] 14574: Change OsLoadOptions back to the default value

by fireball＠svn.reactos.com

Change OsLoadOptions back to the default value Modified: trunk/reactos/bootdata/txtsetup.sif _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-04-10 14:02:31 UTC (rev 14573) +++ trunk/reactos/bootdata/txtsetup.sif 2005-04-10 14:16:38 UTC (rev 14574) @@ -34,8 +34,8 @@ [SetupData] DefaultPath = \ReactOS -;OsLoadOptions = "/NOGUIBOOT /NODEBUG" -OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /BAUDRATE=19200 /IRQ=4" +OsLoadOptions = "/NOGUIBOOT /NODEBUG" +;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /BAUDRATE=19200 /IRQ=4" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"

19 years, 7 months

[fireball] 14573: Add russian keyboard layout to HKLM\...\KeyboardLayours, and also add kbdru.dll into reactos.dff (as pointed again by unC0Rr :-))

by fireball＠svn.reactos.com

Add russian keyboard layout to HKLM\...\KeyboardLayours, and also add kbdru.dll into reactos.dff (as pointed again by unC0Rr :-)) Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-04-10 11:37:57 UTC (rev 14572) +++ trunk/reactos/bootdata/hivesys.inf 2005-04-10 14:02:31 UTC (rev 14573) @@ -64,6 +64,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00010409","Layout Text",0x00000000,"US-Dvorak" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout File",0x00000000,"kbdfr.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000040c","Layout Text",0x00000000,"FR" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layou t File",0x00000000,"kbdru.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layou t Text",0x00000000,"Russian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout File",0x00000000,"kbdse.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout Text",0x00000000,"SE" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout File",0x00000000,"kbduk.dll" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-04-10 11:37:57 UTC (rev 14572) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-04-10 14:02:31 UTC (rev 14573) @@ -88,6 +88,7 @@ lib\kbdes\kbdes.dll 1 lib\kbdfr\kbdfr.dll 1 lib\kbdgr\kbdgr.dll 1 +lib\kbdru\kbdru.dll 1 lib\kbdse\kbdse.dll 1 lib\kbduk\kbduk.dll 1 lib\kbdus\kbdus.dll 1

19 years, 7 months

← Newer
1
...
27
28
29
30
31
32
33
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005