Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbirr] 15929: Add an optimized version of strpbrk to the string library.
by hbirr＠svn.reactos.com 15 Jun '05

15 Jun '05

Add an optimized version of strpbrk to the string library. Modified: trunk/reactos/lib/string/string.xml Added: trunk/reactos/lib/string/strpbrk.c _____ Modified: trunk/reactos/lib/string/string.xml --- trunk/reactos/lib/string/string.xml 2005-06-15 22:39:03 UTC (rev 15928) +++ trunk/reactos/lib/string/string.xml 2005-06-15 22:47:12 UTC (rev 15929) @@ -63,5 +63,6 @@ <file>memccpy.c</file> <file>memcmp.c</file> <file>strcspn.c</file> + <file>strpbrk.c</file> <file>strspn.c</file> </module> _____ Added: trunk/reactos/lib/string/strpbrk.c --- trunk/reactos/lib/string/strpbrk.c 2005-06-15 22:39:03 UTC (rev 15928) +++ trunk/reactos/lib/string/strpbrk.c 2005-06-15 22:47:12 UTC (rev 15929) @@ -0,0 +1,54 @@ +/* + * $Id$ + */ +#include <limits.h> +#include <string.h> + +#define BIT_SIZE (CHAR_BIT * sizeof(unsigned long) / sizeof(char)) + +char* strpbrk(const char *s1, const char *s2) +{ + if (*s2 == 0) + { + return 0; + } + if (*(s2+1) == 0) + { + return strchr(s1, *s2); + } + else if (*(s2+2) == 0) + { + char *s3, *s4; + s3 = strchr(s1, *s2); + s4 = strchr(s1, *(s2+1)); + if (s3 == 0) + { + return s4; + } + else if (s4 == 0) + { + return s3; + } + return s3 < s4 ? s3 : s4; + } + else + { + unsigned long char_map[(1 << CHAR_BIT) / BIT_SIZE] = {0, }; + register unsigned char* str = (unsigned char*)s1; + while (*s2) + { + char_map[*(unsigned char*)s2 / BIT_SIZE] |= (1 << (*(unsigned char*)s2 % BIT_SIZE)); + s2++; + } + while (*str) + { + if (char_map[*str / BIT_SIZE] & (1 << (*str % BIT_SIZE))) + { + return str; + } + str++; + } + } + return 0; +} +

1 0

[hbirr] 15928: Used the assembler source for the i386 architecture.
by hbirr＠svn.reactos.com 15 Jun '05

15 Jun '05

Used the assembler source for the i386 architecture. Modified: trunk/reactos/lib/string/string.xml _____ Modified: trunk/reactos/lib/string/string.xml --- trunk/reactos/lib/string/string.xml 2005-06-15 21:55:36 UTC (rev 15927) +++ trunk/reactos/lib/string/string.xml 2005-06-15 22:39:03 UTC (rev 15928) @@ -1,30 +1,67 @@ <module name="string" type="staticlibrary"> - <file>memccpy.c</file> - <file>memchr.c</file> - <file>memcmp.c</file> - <file>memcpy.c</file> - <file>memmove.c</file> - <file>memset.c</file> - <file>strcat.c</file> - <file>strchr.c</file> - <file>strcmp.c</file> - <file>strcpy.c</file> - <file>strcspn.c</file> - <file>strlen.c</file> - <file>strncat.c</file> - <file>strncmp.c</file> - <file>strncpy.c</file> - <file>strnlen.c</file> - <file>strrchr.c</file> - <file>strspn.c</file> - <file>wcscat.c</file> - <file>wcschr.c</file> - <file>wcscmp.c</file> - <file>wcscpy.c</file> - <file>wcslen.c</file> - <file>wcsncat.c</file> - <file>wcsncmp.c</file> - <file>wcsncpy.c</file> - <file>wcsnlen.c</file> - <file>wcsrchr.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>memchr.s</file> + <file>memcpy.s</file> + <file>memmove.s</file> + <file>memset.s</file> + <file>strcat.s</file> + <file>strchr.s</file> + <file>strcmp.s</file> + <file>strcpy.s</file> + <file>strlen.s</file> + <file>strncat.s</file> + <file>strncmp.s</file> + <file>strncpy.s</file> + <file>strnlen.s</file> + <file>strrchr.s</file> + <file>wcscat.s</file> + <file>wcschr.s</file> + <file>wcscmp.s</file> + <file>wcscpy.s</file> + <file>wcslen.s</file> + <file>wcsncat.s</file> + <file>wcsncmp.s</file> + <file>wcsncpy.s</file> + <file>wcsnlen.s</file> + <file>wcsrchr.s</file> + </directory> + + </if> + <if property="ARCH" value="unknown"> + <file>memchr.c</file> + <file>memcpy.c</file> + <file>memmove.c</file> + <file>memset.c</file> + <file>strcat.c</file> + <file>strchr.c</file> + <file>strcmp.c</file> + <file>strcpy.c</file> + <file>strlen.c</file> + <file>strncat.c</file> + <file>strncmp.c</file> + <file>strncpy.c</file> + <file>strnlen.c</file> + <file>strrchr.c</file> + <file>wcscat.c</file> + <file>wcschr.c</file> + <file>wcscmp.c</file> + <file>wcscpy.c</file> + <file>wcslen.c</file> + <file>wcsncat.c</file> + <file>wcsncmp.c</file> + <file>wcsncpy.c</file> + <file>wcsnlen.c</file> + <file>wcsrchr.c</file> + </if> + + <file>memccpy.c</file> + <file>memcmp.c</file> + <file>strcspn.c</file> + <file>strspn.c</file> </module>

1 0

[hyperion] 15927: No reason KiDoubleFaultHandler should return a value - in fact it doesn't return at all
by hyperion＠svn.reactos.com 15 Jun '05

15 Jun '05

No reason KiDoubleFaultHandler should return a value - in fact it doesn't return at all Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-06-15 20:24:31 UTC (rev 15926) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-06-15 21:55:36 UTC (rev 15927) @@ -178,7 +178,7 @@ return(0); } -ULONG +VOID KiDoubleFaultHandler(VOID) { unsigned int cr2; @@ -384,7 +384,6 @@ DbgPrint("\n"); for(;;); - return 0; } VOID

1 0

[sedwards] 15926: Added new better tracert replacement by Ged Murphy
by sedwards＠svn.reactos.com 15 Jun '05

15 Jun '05

Added new better tracert replacement by Ged Murphy Modified: trunk/reactos/apps/utils/net/directory.xml Deleted: trunk/reactos/apps/utils/net/tracert/ip.h Deleted: trunk/reactos/apps/utils/net/tracert/ip_icmp.h Modified: trunk/reactos/apps/utils/net/tracert/tracert.c Added: trunk/reactos/apps/utils/net/tracert/tracert.h Modified: trunk/reactos/apps/utils/net/tracert/tracert.rc Added: trunk/reactos/apps/utils/net/tracert/tracert.xml _____ Modified: trunk/reactos/apps/utils/net/directory.xml --- trunk/reactos/apps/utils/net/directory.xml 2005-06-15 20:05:54 UTC (rev 15925) +++ trunk/reactos/apps/utils/net/directory.xml 2005-06-15 20:24:31 UTC (rev 15926) @@ -22,6 +22,9 @@ <directory name="telnet"> <xi:include href="telnet/telnet.xml" /> </directory> +<directory name="tracert"> + <xi:include href="tracert/tracert.xml" /> +</directory> <directory name="whois"> <xi:include href="whois/whois.xml" /> </directory> _____ Deleted: trunk/reactos/apps/utils/net/tracert/ip.h --- trunk/reactos/apps/utils/net/tracert/ip.h 2005-06-15 20:05:54 UTC (rev 15925) +++ trunk/reactos/apps/utils/net/tracert/ip.h 2005-06-15 20:24:31 UTC (rev 15926) @@ -1,195 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip.h 8.2 (Berkeley) 6/1/94 - * $FreeBSD: src/sys/netinet/ip.h,v 1.16 1999/08/28 00:49:19 peter Exp $ - */ - -#ifndef _NETINET_IP_H_ -#define _NETINET_IP_H_ - -/* - * Definitions for internet protocol version 4. - * Per RFC 791, September 1981. - */ -#define IPVERSION 4 - -/* A little magic to make the Windows build happy. */ -#if defined(_MSC_VER) || defined(__MINGW32__) -#include <winsock2.h> -#include <ws2tcpip.h> -#include <time.h> - -typedef u_short n_short; -typedef u_int n_long; -typedef u_int n_time; - -#define EMSGSIZE WSAEMSGSIZE -#define ENETUNREACH WSAENETUNREACH -#define EHOSTUNREACH WSAEHOSTUNREACH -#endif - -/* - * Structure of an internet header, naked of options. - */ -struct ip { -#ifdef _IP_VHL - u_char ip_vhl; /* version << 4 | header length >> 2 */ -#else -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ip_hl:4, /* header length */ - ip_v:4; /* version */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ip_v:4, /* version */ - ip_hl:4; /* header length */ -#endif -#endif /* not _IP_VHL */ - u_char ip_tos; /* type of service */ - u_short ip_len; /* total length */ - u_short ip_id; /* identification */ - u_short ip_off; /* fragment offset field */ -#define IP_RF 0x8000 /* reserved fragment flag */ -#define IP_DF 0x4000 /* don't fragment flag */ -#define IP_MF 0x2000 /* more fragments flag */ -#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ - u_char ip_ttl; /* time to live */ - u_char ip_p; /* protocol */ - u_short ip_sum; /* checksum */ - struct in_addr ip_src,ip_dst; /* source and dest address */ -}; - -#ifdef _IP_VHL -#define IP_MAKE_VHL(v, hl) ((v) << 4 | (hl)) -#define IP_VHL_HL(vhl) ((vhl) & 0x0f) -#define IP_VHL_V(vhl) ((vhl) >> 4) -#define IP_VHL_BORING 0x45 -#endif - -#define IP_MAXPACKET 65535 /* maximum packet size */ - -/* - * Definitions for IP type of service (ip_tos) - */ -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -#define IPTOS_MINCOST 0x02 - -/* - * Definitions for IP precedence (also in ip_tos) (hopefully unused) - */ -#define IPTOS_PREC_NETCONTROL 0xe0 -#define IPTOS_PREC_INTERNETCONTROL 0xc0 -#define IPTOS_PREC_CRITIC_ECP 0xa0 -#define IPTOS_PREC_FLASHOVERRIDE 0x80 -#define IPTOS_PREC_FLASH 0x60 -#define IPTOS_PREC_IMMEDIATE 0x40 -#define IPTOS_PREC_PRIORITY 0x20 -#define IPTOS_PREC_ROUTINE 0x00 - -/* - * Definitions for options. - */ -#define IPOPT_COPIED(o) ((o)&0x80) -#define IPOPT_CLASS(o) ((o)&0x60) -#define IPOPT_NUMBER(o) ((o)&0x1f) - -#define IPOPT_CONTROL 0x00 -#define IPOPT_RESERVED1 0x20 -#define IPOPT_DEBMEAS 0x40 -#define IPOPT_RESERVED2 0x60 - -#define IPOPT_EOL 0 /* end of option list */ -#define IPOPT_NOP 1 /* no operation */ - -#define IPOPT_RR 7 /* record packet route */ -#define IPOPT_TS 68 /* timestamp */ -#define IPOPT_SECURITY 130 /* provide s,c,h,tcc */ -#define IPOPT_LSRR 131 /* loose source route */ -#define IPOPT_SATID 136 /* satnet id */ -#define IPOPT_SSRR 137 /* strict source route */ -#define IPOPT_RA 148 /* router alert */ - -/* - * Offsets to fields in options other than EOL and NOP. - */ -#define IPOPT_OPTVAL 0 /* option ID */ -#define IPOPT_OLEN 1 /* option length */ -#define IPOPT_OFFSET 2 /* offset within option */ -#define IPOPT_MINOFF 4 /* min value of above */ - -/* - * Time stamp option structure. - */ -struct ip_timestamp { - u_char ipt_code; /* IPOPT_TS */ - u_char ipt_len; /* size of structure (variable) */ - u_char ipt_ptr; /* index of current entry */ -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ipt_flg:4, /* flags, see below */ - ipt_oflw:4; /* overflow counter */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ipt_oflw:4, /* overflow counter */ - ipt_flg:4; /* flags, see below */ -#endif - union ipt_timestamp { - n_long ipt_time[1]; - struct ipt_ta { - struct in_addr ipt_addr; - n_long ipt_time; - } ipt_ta[1]; - } ipt_timestamp; -}; - -/* flag bits for ipt_flg */ -#define IPOPT_TS_TSONLY 0 /* timestamps only */ -#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ -#define IPOPT_TS_PRESPEC 3 /* specified modules only */ - -/* bits for security (not byte swapped) */ -#define IPOPT_SECUR_UNCLASS 0x0000 -#define IPOPT_SECUR_CONFID 0xf135 -#define IPOPT_SECUR_EFTO 0x789a -#define IPOPT_SECUR_MMMM 0xbc4d -#define IPOPT_SECUR_RESTR 0xaf13 -#define IPOPT_SECUR_SECRET 0xd788 -#define IPOPT_SECUR_TOPSECRET 0x6bc5 - -/* - * Internet implementation parameters. - */ -#define MAXTTL 255 /* maximum time to live (seconds) */ -#define IPDEFTTL 64 /* default ttl, from RFC 1340 */ -#define IPFRAGTTL 60 /* time to live for frags, slowhz */ -#define IPTTLDEC 1 /* subtracted when forwarding */ - -#define IP_MSS 576 /* default maximum segment size */ - -#endif _____ Deleted: trunk/reactos/apps/utils/net/tracert/ip_icmp.h --- trunk/reactos/apps/utils/net/tracert/ip_icmp.h 2005-06-15 20:05:54 UTC (rev 15925) +++ trunk/reactos/apps/utils/net/tracert/ip_icmp.h 2005-06-15 20:24:31 UTC (rev 15926) @@ -1,186 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.13 1999/08/28 00:49:24 peter Exp $ - */ - -#ifndef _NETINET_IP_ICMP_H_ -#define _NETINET_IP_ICMP_H_ - -/* - * Interface Control Message Protocol Definitions. - * Per RFC 792, September 1981. - */ - -/* - * Internal of an ICMP Router Advertisement - */ -struct icmp_ra_addr { - u_int32_t ira_addr; - u_int32_t ira_preference; -}; - -/* - * Structure of an icmp header. - */ -struct icmp { - u_char icmp_type; /* type of message, see below */ - u_char icmp_code; /* type sub code */ - u_short icmp_cksum; /* ones complement cksum of struct */ - union { - u_char ih_pptr; /* ICMP_PARAMPROB */ - struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ - struct ih_idseq { - n_short icd_id; - n_short icd_seq; - } ih_idseq; - int ih_void; - - /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */ - struct ih_pmtu { - n_short ipm_void; - n_short ipm_nextmtu; - } ih_pmtu; - - struct ih_rtradv { - u_char irt_num_addrs; - u_char irt_wpa; - u_int16_t irt_lifetime; - } ih_rtradv; - } icmp_hun; -#define icmp_pptr icmp_hun.ih_pptr -#define icmp_gwaddr icmp_hun.ih_gwaddr -#define icmp_id icmp_hun.ih_idseq.icd_id -#define icmp_seq icmp_hun.ih_idseq.icd_seq -#define icmp_void icmp_hun.ih_void -#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void -#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu -#define icmp_num_addrs icmp_hun.ih_rtradv.irt_num_addrs -#define icmp_wpa icmp_hun.ih_rtradv.irt_wpa -#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime - union { - struct id_ts { - n_time its_otime; - n_time its_rtime; - n_time its_ttime; - } id_ts; - struct id_ip { - struct ip idi_ip; - /* options and then 64 bits of data */ - } id_ip; - struct icmp_ra_addr id_radv; - u_int32_t id_mask; - char id_data[1]; - } icmp_dun; -#define icmp_otime icmp_dun.id_ts.its_otime -#define icmp_rtime icmp_dun.id_ts.its_rtime -#define icmp_ttime icmp_dun.id_ts.its_ttime -#define icmp_ip icmp_dun.id_ip.idi_ip -#define icmp_radv icmp_dun.id_radv -#define icmp_mask icmp_dun.id_mask -#define icmp_data icmp_dun.id_data -}; - -/* - * Lower bounds on packet lengths for various types. - * For the error advice packets must first insure that the - * packet is large enough to contain the returned ip header. - * Only then can we do the check to see if 64 bits of packet - * data have been returned, since we need to check the returned - * ip header length. - */ -#define ICMP_MINLEN 8 /* abs minimum */ -#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */ -#define ICMP_MASKLEN 12 /* address mask */ -#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */ -#ifndef _IP_VHL -#define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8) - /* N.B.: must separately check that ip_hl >= 5 */ -#else -#define ICMP_ADVLEN(p) (8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8) - /* N.B.: must separately check that header length >= 5 */ -#endif - -/* - * Definition of type and code field values. - */ -#define ICMP_ECHOREPLY 0 /* echo reply */ -#define ICMP_UNREACH 3 /* dest unreachable, codes: */ -#define ICMP_UNREACH_NET 0 /* bad net */ -#define ICMP_UNREACH_HOST 1 /* bad host */ -#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */ -#define ICMP_UNREACH_PORT 3 /* bad port */ -#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */ -#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */ -#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */ -#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */ -#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */ -#define ICMP_UNREACH_NET_PROHIB 9 /* prohibited access */ -#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */ -#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */ -#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */ -#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib */ -#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec vio. */ -#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff */ -#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */ -#define ICMP_REDIRECT 5 /* shorter route, codes: */ -#define ICMP_REDIRECT_NET 0 /* for network */ -#define ICMP_REDIRECT_HOST 1 /* for host */ -#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */ -#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */ -#define ICMP_ECHO 8 /* echo service */ -#define ICMP_ROUTERADVERT 9 /* router advertisement */ -#define ICMP_ROUTERSOLICIT 10 /* router solicitation */ -#define ICMP_TIMXCEED 11 /* time exceeded, code: */ -#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */ -#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */ -#define ICMP_PARAMPROB 12 /* ip header bad */ -#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */ -#define ICMP_TSTAMP 13 /* timestamp request */ -#define ICMP_TSTAMPREPLY 14 /* timestamp reply */ -#define ICMP_IREQ 15 /* information request */ -#define ICMP_IREQREPLY 16 /* information reply */ -#define ICMP_MASKREQ 17 /* address mask request */ -#define ICMP_MASKREPLY 18 /* address mask reply */ - -#define ICMP_MAXTYPE 18 - -#define ICMP_INFOTYPE(type) \ - ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \ - (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \ - (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \ - (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \ - (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY) - -#ifdef KERNEL -void icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *)); -void icmp_input __P((struct mbuf *, int)); -#endif - -#endif _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-06-15 20:05:54 UTC (rev 15925) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-06-15 20:24:31 UTC (rev 15926) @@ -1,957 +1,656 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Van Jacobson. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1990, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ - -/* - * traceroute host - trace the route ip packets follow going to "host". - * - * Attempt to trace the route an ip packet would follow to some - * internet host. We find out intermediate hops by launching probe - * packets with a small ttl (time to live) then listening for an - * icmp "time exceeded" reply from a gateway. We start our probes - * with a ttl of one and increase by one until we get an icmp "port - * unreachable" (which means we got to "host") or hit a max (which - * defaults to 30 hops & can be changed with the -m flag). Three - * probes (change with -q flag) are sent at each ttl setting and a - * line is printed showing the ttl, address of the gateway and - * round trip time of each probe. If the probe answers come from - * different gateways, the address of each responding system will - * be printed. If there is no response within a 5 sec. timeout - * interval (changed with the -w flag), a "*" is printed for that - * probe. - * - * Probe packets are UDP format. We don't want the destination - * host to process them so the destination port is set to an - * unlikely value (if some clod on the destination is using that - * value, it can be changed with the -p flag). - * - * A sample use might be: - * - * [yak 71]% traceroute nis.nsf.net. - * traceroute to nis.nsf.net (35.1.1.48), 30 hops max, 56 byte packet - * 1 helios.ee.lbl.gov (128.3.112.1) 19 ms 19 ms 0 ms - * 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms - * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms - * 4 ccngw-ner-cc.Berkeley.EDU (128.32.136.23) 39 ms 40 ms 39 ms - * 5 ccn-nerif22.Berkeley.EDU (128.32.168.22) 39 ms 39 ms 39 ms - * 6 128.32.197.4 (128.32.197.4) 40 ms 59 ms 59 ms - * 7 131.119.2.5 (131.119.2.5) 59 ms 59 ms 59 ms - * 8 129.140.70.13 (129.140.70.13) 99 ms 99 ms 80 ms - * 9 129.140.71.6 (129.140.71.6) 139 ms 239 ms 319 ms - * 10 129.140.81.7 (129.140.81.7) 220 ms 199 ms 199 ms - * 11 nic.merit.edu (35.1.1.48) 239 ms 239 ms 239 ms - * - * Note that lines 2 & 3 are the same. This is due to a buggy - * kernel on the 2nd hop system -- lbl-csam.arpa -- that forwards - * packets with a zero ttl. - * - * A more interesting example is: - * - * [yak 72]% traceroute allspice.lcs.mit.edu. - * traceroute to allspice.lcs.mit.edu (18.26.0.115), 30 hops max - * 1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms - * 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 19 ms 19 ms 19 ms - * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 19 ms - * 4 ccngw-ner-cc.Berkeley.EDU (128.32.136.23) 19 ms 39 ms 39 ms - * 5 ccn-nerif22.Berkeley.EDU (128.32.168.22) 20 ms 39 ms 39 ms - * 6 128.32.197.4 (128.32.197.4) 59 ms 119 ms 39 ms - * 7 131.119.2.5 (131.119.2.5) 59 ms 59 ms 39 ms - * 8 129.140.70.13 (129.140.70.13) 80 ms 79 ms 99 ms - * 9 129.140.71.6 (129.140.71.6) 139 ms 139 ms 159 ms - * 10 129.140.81.7 (129.140.81.7) 199 ms 180 ms 300 ms - * 11 129.140.72.17 (129.140.72.17) 300 ms 239 ms 239 ms - * 12 * * * - * 13 128.121.54.72 (128.121.54.72) 259 ms 499 ms 279 ms - * 14 * * * - * 15 * * * - * 16 * * * - * 17 * * * - * 18 ALLSPICE.LCS.MIT.EDU (18.26.0.115) 339 ms 279 ms 279 ms - * - * (I start to see why I'm having so much trouble with mail to - * MIT.) Note that the gateways 12, 14, 15, 16 & 17 hops away - * either don't send ICMP "time exceeded" messages or send them - * with a ttl too small to reach us. 14 - 17 are running the - * MIT C Gateway code that doesn't send "time exceeded"s. God - * only knows what's going on with 12. - * - * The silent gateway 12 in the above may be the result of a bug in - * the 4.[23]BSD network code (and its derivatives): 4.x (x <= 3) - * sends an unreachable message using whatever ttl remains in the - * original datagram. Since, for gateways, the remaining ttl is - * zero, the icmp "time exceeded" is guaranteed to not make it back - * to us. The behavior of this bug is slightly more interesting - * when it appears on the destination system: - * - * 1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms - * 2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 39 ms - * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 19 ms 39 ms 19 ms - * 4 ccngw-ner-cc.Berkeley.EDU (128.32.136.23) 39 ms 40 ms 19 ms - * 5 ccn-nerif35.Berkeley.EDU (128.32.168.35) 39 ms 39 ms 39 ms - * 6 csgw.Berkeley.EDU (128.32.133.254) 39 ms 59 ms 39 ms - * 7 * * * - * 8 * * * - * 9 * * * - * 10 * * * - * 11 * * * - * 12 * * * - * 13 rip.Berkeley.EDU (128.32.131.22) 59 ms ! 39 ms ! 39 ms ! - * - * Notice that there are 12 "gateways" (13 is the final - * destination) and exactly the last half of them are "missing". - * What's really happening is that rip (a Sun-3 running Sun OS3.5) - * is using the ttl from our arriving datagram as the ttl in its - * icmp reply. So, the reply will time out on the return path - * (with no notice sent to anyone since icmp's aren't sent for - * icmp's) until we probe with a ttl that's at least twice the path - * length. I.e., rip is really only 7 hops away. A reply that - * returns with a ttl of 1 is a clue this problem exists. - * Traceroute prints a "!" after the time if the ttl is <= 1. - * Since vendors ship a lot of obsolete (DEC's Ultrix, Sun 3.x) or - * non-standard (HPUX) software, expect to see this problem - * frequently and/or take care picking the target host of your - * probes. - * - * Other possible annotations after the time are !H, !N, !P (got a host, - * network or protocol unreachable, respectively), !S or !F (source - * route failed or fragmentation needed -- neither of these should - * ever occur and the associated gateway is busted if you see one). If - * almost all the probes result in some kind of unreachable, traceroute - * will give up and exit. - * - * Notes - * ----- - * This program must be run by root or be setuid. (I suggest that - * you *don't* make it setuid -- casual use could result in a lot - * of unnecessary traffic on our poor, congested nets.) - * - * This program requires a kernel mod that does not appear in any - * system available from Berkeley: A raw ip socket using proto - * IPPROTO_RAW must interpret the data sent as an ip datagram (as - * opposed to data to be wrapped in a ip datagram). See the README - * file that came with the source to this program for a description - * of the mods I made to /sys/netinet/raw_ip.c. Your mileage may - * vary. But, again, ANY 4.x (x < 4) BSD KERNEL WILL HAVE TO BE - * MODIFIED TO RUN THIS PROGRAM. - * - * The udp port usage may appear bizarre (well, ok, it is bizarre). - * The problem is that an icmp message only contains 8 bytes of - * data from the original datagram. 8 bytes is the size of a udp - * header so, if we want to associate replies with the original - * datagram, the necessary information must be encoded into the - * udp header (the ip id could be used but there's no way to - * interlock with the kernel's assignment of ip id's and, anyway, - * it would have taken a lot more kernel hacking to allow this - * code to set the ip id). So, to allow two or more users to - * use traceroute simultaneously, we use this task's pid as the - * source port (the high bit is set to move the port number out - * of the "likely" range). To keep track of which probe is being - * replied to (so times and/or hop counts don't get confused by a - * reply that was delayed in transit), we increment the destination - * port number before each probe. - * - * Don't use this as a coding example. I was trying to find a - * routing problem and this code sort-of popped out after 48 hours - * without sleep. I was amazed it ever compiled, much less ran. - * - * I stole the idea for this program from Steve Deering. Since - * the first release, I've learned that had I attended the right - * IETF working group meetings, I also could have stolen it from Guy - * Almes or Matt Mathis. I don't know (or care) who came up with - * the idea first. I envy the originators' perspicacity and I'm - * glad they didn't keep the idea a secret. - * - * Tim Seaver, Ken Adelman and C. Philip Wood provided bug fixes and/or - * enhancements to the original distribution. - * - * I've hacked up a round-trip-route version of this that works by - * sending a loose-source-routed udp datagram through the destination - * back to yourself. Unfortunately, SO many gateways botch source - * routing, the thing is almost worthless. Maybe one day... - * - * -- Van Jacobson (van(a)helios.ee.lbl.gov) - * Tue Dec 20 03:50:13 PST 1988 - */ - -#define caddr_t void * - -#include <stdio.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -#include <winsock2.h> - - -#include <stdio.h> -#include <time.h> -#include <winsock.h> - -//void print(buf, cc, from); -char * inetname(struct in_addr); -double deltaT(struct timeval *, struct timeval *); -void usage(); -void send_probe(int, int); - -#define bzero( ptr, count ) memset( ptr, 0, count ) -#define bcopy(src,dest,len) memcpy(dest,src,len) - -// setlinebuf is equivalent to the setvbuf call below. -inline int setlinebuf(FILE *stream) -{ - return setvbuf( stream, (char*)0, _IONBF, 0 ); -} - -#ifndef __GNUC__ -#define EPOCHFILETIME (116444736000000000i64) -#else -#define EPOCHFILETIME (116444736000000000LL) -#endif - -struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - FILETIME ft; - LARGE_INTEGER li; - __int64 t; - static int tzflag; - - if (tv) - { - GetSystemTimeAsFileTime(&ft); - //li.LowPart = ft.dwLowDateTime; - //li.HighPart = ft.dwHighDateTime; - t = li.QuadPart; /* In 100-nanosecond intervals */ - t -= EPOCHFILETIME; /* Offset to the Epoch time */ - t /= 10; /* In microseconds */ - tv->tv_sec = (long)(t / 1000000); - tv->tv_usec = (long)(t % 1000000); - } - - if (tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; -} - - - -/* Set up endiannes macros for the ip and ip_icmp BSD headers */ -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 -#endif -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1234 -#endif -#ifndef BYTE_ORDER -#ifdef WORDS_BIGENDIAN -#define BYTE_ORDER BIG_ENDIAN -#else -#define BYTE_ORDER LITTLE_ENDIAN -#endif -#endif /* BYTE_ORDER */ - -#define u_int16_t WORD -#define u_int32_t DWORD - -/* These are BSD headers. We use these here because they are needed on - * libc5 Linux systems. On other platforms they are usually simply more - * complete than the native stuff, and cause less portability problems - * so we use them anyway. - */ -#include "ip.h" -#include "ip_icmp.h" - - -#define MAXPACKET 65535 /* max ip packet size */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 64 -#endif - -#ifndef FD_SET -#define NFDBITS (8*sizeof(fd_set)) -#define FD_SETSIZE NFDBITS -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) -#endif - -#define Fprintf (void)fprintf -#define Sprintf (void)sprintf -#define Printf (void)printf - -/* - * Define the UDP header - */ -typedef struct udphdr { - u_short uh_dport; - u_short uh_sport; - u_short uh_sum; - u_short uh_ulen; -} udphdr; - -/* - * format of a (udp) probe packet. - */ -struct opacket { - struct ip ip; - udphdr udp; - u_char seq; /* sequence number of this packet */ - u_char ttl; /* ttl packet left with */ - struct timeval tv; /* time packet left */ -}; - -u_char packet[512]; /* last inbound (icmp) packet */ -struct opacket *outpacket; /* last output (udp) packet */ - -#if 0 -int wait_for_reply __P((int, struct sockaddr_in *)); -void send_probe __P((int, int)); -double deltaT __P((struct timeval *, struct timeval *)); -int packet_ok __P((u_char *, int, struct sockaddr_in *, int)); -//void print __P((u_char *, int, struct sockaddr_in *)); -void tvsub __P((struct timeval *, struct timeval *)); -char *inetname __P((struct in_addr)); -void usage __P(()); -#endif - -int s; /* receive (icmp) socket file descriptor */ -int sndsock; /* send (udp) socket file descriptor */ -struct timezone tz; /* leftover */ - -struct sockaddr whereto; /* Who to try to reach */ -int datalen; /* How much data */ - -char *source = 0; -char *hostname; - -int nprobes = 3; -int max_ttl = 30; -u_short ident; -u_short port = 32768+666; /* start udp dest port # for probe packets */ -int options; /* socket options */ -int verbose; -int waittime = 5; /* time to wait for response (in seconds) */ -int nflag; /* print addresses numerically */ - -void -print(buf, cc, from) - u_char *buf; - int cc; - struct sockaddr_in *from; -{ - struct ip *ip; - int hlen; - - ip = (struct ip *) buf; - hlen = ip->ip_hl << 2; - cc -= hlen; - - if (nflag) - Printf(" %s", inet_ntoa(from->sin_addr)); - else - Printf(" %s (%s)", inetname(from->sin_addr), - inet_ntoa(from->sin_addr)); - - if (verbose) - Printf (" %d bytes to %s", cc, inet_ntoa (ip->ip_dst)); -} - - -int -main(argc, argv) - int argc; - char *argv[]; -{ - extern char *optarg; - extern int optind; - struct hostent *hp; - struct protoent *pe; - struct sockaddr_in from, *to; - int ch, i, on, probe, seq, tos, ttl; - WSADATA wsadata; - INT status; - - on = 1; - seq = tos = 0; - to = (struct sockaddr_in *)&whereto; - while ((ch = getopt(argc, argv, "dm:np:q:rs:t:w:v")) != EOF) - switch(ch) { - case 'd': - options |= SO_DEBUG; - break; - case 'm': - max_ttl = atoi(optarg); - if (max_ttl <= 1) { - Fprintf(stderr, - "traceroute: max ttl must be >1.\n"); - WSACleanup(); - exit(1); - } - break; - case 'n': - nflag++; - break; - case 'p': - port = atoi(optarg); - if (port < 1) { - Fprintf(stderr, - "traceroute: port must be >0.\n"); - WSACleanup(); - exit(1); - } - break; - case 'q': - nprobes = atoi(optarg); - if (nprobes < 1) { - Fprintf(stderr, - "traceroute: nprobes must be >0.\n"); - WSACleanup(); - exit(1); - } - break; - case 'r': - options |= SO_DONTROUTE; - break; - case 's': - /* - * set the ip source address of the outbound - * probe (e.g., on a multi-homed host). - */ - source = optarg; - break; - case 't': - tos = atoi(optarg); - if (tos < 0 || tos > 255) { - Fprintf(stderr, - "traceroute: tos must be 0 to 255.\n"); - WSACleanup(); - exit(1); - } - break; - case 'v': - verbose++; - break; - case 'w': - waittime = atoi(optarg); - if (waittime <= 1) { - Fprintf(stderr, - "traceroute: wait must be >1 sec.\n"); - WSACleanup(); - exit(1); - } - break; - default: - usage(); - } - argc -= optind; - argv += optind; - - if (argc < 1) - usage(); - - status = WSAStartup(MAKEWORD(2, 2), &wsadata); - if (status != 0) { - printf("Could not initialize winsock dll.\n"); - return FALSE; - } - - setlinebuf (stdout); - - (void) bzero((char *)&whereto, sizeof(struct sockaddr)); - to->sin_family = AF_INET; - to->sin_addr.s_addr = inet_addr(*argv); - if (to->sin_addr.s_addr != -1) - hostname = *argv; - else { - hp = gethostbyname(*argv); - if (hp) { - to->sin_family = hp->h_addrtype; - bcopy(hp->h_addr, (caddr_t)&to->sin_addr, hp->h_length); - hostname = hp->h_name; - } else { - (void)fprintf(stderr, - "traceroute: unknown host %s\n", *argv); - WSACleanup(); - exit(1); - } - } - if (*++argv) - datalen = atoi(*argv); - if (datalen < 0 || datalen >= MAXPACKET - sizeof(struct opacket)) { - Fprintf(stderr, - "traceroute: packet size must be 0 <= s < %ld.\n", - MAXPACKET - sizeof(struct opacket)); - WSACleanup(); - exit(1); - } - datalen += sizeof(struct opacket); - outpacket = (struct opacket *)malloc((unsigned)datalen); - if (! outpacket) { - perror("traceroute: malloc"); - WSACleanup(); - exit(1); - } - (void) bzero((char *)outpacket, datalen); - outpacket->ip.ip_dst = to->sin_addr; - outpacket->ip.ip_tos = tos; - outpacket->ip.ip_v = IPVERSION; - outpacket->ip.ip_id = 0; - - ident = (getpid() & 0xffff) | 0x8000; - - if ((pe = getprotobyname("icmp")) == NULL) { - Fprintf(stderr, "icmp: unknown protocol\n"); - WSACleanup(); - exit(10); - } - if ((s = socket(AF_INET, SOCK_RAW, pe->p_proto)) < 0) { - perror("traceroute: icmp socket"); - WSACleanup(); - exit(5); - } - if (options & SO_DEBUG) - (void) setsockopt(s, SOL_SOCKET, SO_DEBUG, - (char *)&on, sizeof(on)); - if (options & SO_DONTROUTE) - (void) setsockopt(s, SOL_SOCKET, SO_DONTROUTE, - (char *)&on, sizeof(on)); - - if ((sndsock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0) { - perror("traceroute: raw socket"); - WSACleanup(); - exit(5); - } -#ifdef SO_SNDBUF - if (setsockopt(sndsock, SOL_SOCKET, SO_SNDBUF, (char *)&datalen, - sizeof(datalen)) < 0) { - perror("traceroute: SO_SNDBUF"); - WSACleanup(); - exit(6); - } -#endif /* SO_SNDBUF */ -#ifdef IP_HDRINCL - if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, (char *)&on, [truncated at 1000 lines; 1138 more skipped]

1 0

[sedwards] 15925: Use w32api
by sedwards＠svn.reactos.com 15 Jun '05

15 Jun '05

Use w32api Modified: trunk/reactos/apps/utils/net/finger/finger.xml Modified: trunk/reactos/apps/utils/net/whois/whois.xml _____ Modified: trunk/reactos/apps/utils/net/finger/finger.xml --- trunk/reactos/apps/utils/net/finger/finger.xml 2005-06-15 19:45:28 UTC (rev 15924) +++ trunk/reactos/apps/utils/net/finger/finger.xml 2005-06-15 20:05:54 UTC (rev 15925) @@ -1,5 +1,6 @@ <module name="finger" type="win32cui" installbase="system32" installname="finger.exe"> <include base="finger">.</include> + <define name="__USE_W32API" /> <define name="__USE_W32_SOCKETS" /> <library>kernel32</library> <library>ws2_32</library> _____ Modified: trunk/reactos/apps/utils/net/whois/whois.xml --- trunk/reactos/apps/utils/net/whois/whois.xml 2005-06-15 19:45:28 UTC (rev 15924) +++ trunk/reactos/apps/utils/net/whois/whois.xml 2005-06-15 20:05:54 UTC (rev 15925) @@ -1,4 +1,5 @@ <module name="whois" type="win32cui" installbase="system32" installname="whois.exe"> + <define name="__USE_W32API" /> <include base="whois">.</include> <library>kernel32</library> <library>ws2_32</library>

1 0

[sedwards] 15924: some magic to make w32api happy when using a [arch]-linux compiler rather than mingw32
by sedwards＠svn.reactos.com 15 Jun '05

15 Jun '05

some magic to make w32api happy when using a [arch]-linux compiler rather than mingw32 Modified: trunk/reactos/w32api/include/winnt.h Modified: trunk/reactos/w32api/include/winsock2.h _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-06-15 17:51:54 UTC (rev 15923) +++ trunk/reactos/w32api/include/winnt.h 2005-06-15 19:45:28 UTC (rev 15924) @@ -19,6 +19,9 @@ #define _X86_ #elif defined(_M_ALPHA) && !defined(_ALPHA_) #define _ALPHA_ + +#elif defined(_M_ARM) && !defined(ARM) +#define ARM #elif defined(_M_PPC) && !defined(_PPC_) #define _PPC_ #elif defined(_M_MRX000) && !defined(_MIPS_) _____ Modified: trunk/reactos/w32api/include/winsock2.h --- trunk/reactos/w32api/include/winsock2.h 2005-06-15 17:51:54 UTC (rev 15923) +++ trunk/reactos/w32api/include/winsock2.h 2005-06-15 19:45:28 UTC (rev 15924) @@ -96,8 +96,10 @@ This may cause runtime problems with W32 sockets" #endif /* ndef _SYS_TYPES_FD_SET */ #if !(defined (__INSIDE_CYGWIN__) || (__INSIDE_MSYS__)) -#ifndef _TIMEVAL_DEFINED /* also in sys/time.h */ +#ifndef _TIMEVAL_DEFINED +/* also in sys/time.h */ #define _TIMEVAL_DEFINED +#define _STRUCT_TIMEVAL struct timeval { long tv_sec; long tv_usec; @@ -562,7 +564,10 @@ u_long PASCAL ntohl(u_long); u_short PASCAL htons(u_short); u_short PASCAL ntohs(u_short); +#ifndef _SYS_SELECT_H /* Work around for Linux Compilers */ +#define _SYS_SELECT_H int PASCAL select(int nfds,fd_set*,fd_set*,fd_set*,const struct timeval*); +#endif #endif /* ! (__INSIDE_CYGWIN__ || __INSIDE_MSYS__) */ int PASCAL gethostname(char*,int);

1 0

[mbosma] 15923: delete .cvsignore
by mbosma＠svn.reactos.com 15 Jun '05

15 Jun '05

delete .cvsignore Deleted: trunk/rosapps/.cvsignore Deleted: trunk/rosapps/cmdutils/.cvsignore Deleted: trunk/rosapps/cmdutils/mode/.cvsignore Deleted: trunk/rosapps/cmdutils/touch/.cvsignore Deleted: trunk/rosapps/demos/maze/.cvsignore Deleted: trunk/rosapps/devutils/genguid/.cvsignore Deleted: trunk/rosapps/devutils/zoomin/.cvsignore Deleted: trunk/rosapps/dflat32/.cvsignore Deleted: trunk/rosapps/games/winemine/.cvsignore Deleted: trunk/rosapps/lib/dflat32/.cvsignore Deleted: trunk/rosapps/mc/.cvsignore Deleted: trunk/rosapps/mc/edit/.cvsignore Deleted: trunk/rosapps/mc/pc/.cvsignore Deleted: trunk/rosapps/mc/release/.cvsignore Deleted: trunk/rosapps/mc/slang/.cvsignore Deleted: trunk/rosapps/mc/src/.cvsignore Deleted: trunk/rosapps/net/ncftp/.cvsignore Deleted: trunk/rosapps/net/ncftp/Strn/.cvsignore Deleted: trunk/rosapps/net/ncftp/libncftp/.cvsignore Deleted: trunk/rosapps/net/ncftp/ncftp/.cvsignore Deleted: trunk/rosapps/net/ncftp/sio/.cvsignore Deleted: trunk/rosapps/net/niclist/.cvsignore Deleted: trunk/rosapps/notevil/.cvsignore Deleted: trunk/rosapps/sysutils/.cvsignore Deleted: trunk/rosapps/sysutils/ctm/.cvsignore Deleted: trunk/rosapps/sysutils/man/.cvsignore Deleted: trunk/rosapps/sysutils/regexpl/.cvsignore Deleted: trunk/rosapps/sysutils/tcat/.cvsignore Deleted: trunk/rosapps/sysutils/tlist/.cvsignore Deleted: trunk/rosapps/templates/dialog/.cvsignore Deleted: trunk/rosapps/templates/mdi/.cvsignore Deleted: trunk/rosapps/tests/accelerator/.cvsignore Deleted: trunk/rosapps/tests/alive/.cvsignore Deleted: trunk/rosapps/tests/alphablend/.cvsignore Deleted: trunk/rosapps/tests/apc/.cvsignore Deleted: trunk/rosapps/tests/apc2/.cvsignore Deleted: trunk/rosapps/tests/args/.cvsignore Deleted: trunk/rosapps/tests/atomtest/.cvsignore Deleted: trunk/rosapps/tests/bench/.cvsignore Deleted: trunk/rosapps/tests/bitblt/.cvsignore Deleted: trunk/rosapps/tests/button/.cvsignore Deleted: trunk/rosapps/tests/button2/.cvsignore Deleted: trunk/rosapps/tests/capclock/.cvsignore Deleted: trunk/rosapps/tests/carets/.cvsignore Deleted: trunk/rosapps/tests/combo/.cvsignore Deleted: trunk/rosapps/tests/consume/.cvsignore Deleted: trunk/rosapps/tests/copymove/.cvsignore Deleted: trunk/rosapps/tests/count/.cvsignore Deleted: trunk/rosapps/tests/create-links/.cvsignore Deleted: trunk/rosapps/tests/dibtest/.cvsignore Deleted: trunk/rosapps/tests/dirdlg/.cvsignore Deleted: trunk/rosapps/tests/diskspeed/.cvsignore Deleted: trunk/rosapps/tests/dnsapi/.cvsignore Deleted: trunk/rosapps/tests/dnsquery/.cvsignore Deleted: trunk/rosapps/tests/dump_shared_data/.cvsignore Deleted: trunk/rosapps/tests/edit/.cvsignore Deleted: trunk/rosapps/tests/enhmetafile/.cvsignore Deleted: trunk/rosapps/tests/enumfonts/.cvsignore Deleted: trunk/rosapps/tests/enumwnd/.cvsignore Deleted: trunk/rosapps/tests/enumws/.cvsignore Deleted: trunk/rosapps/tests/event/.cvsignore Deleted: trunk/rosapps/tests/eventpair/.cvsignore Deleted: trunk/rosapps/tests/fiber/.cvsignore Deleted: trunk/rosapps/tests/global_mem/.cvsignore Deleted: trunk/rosapps/tests/gradient/.cvsignore Deleted: trunk/rosapps/tests/guithreadinfo/.cvsignore Deleted: trunk/rosapps/tests/hello/.cvsignore Deleted: trunk/rosapps/tests/hivetest/.cvsignore Deleted: trunk/rosapps/tests/icontest/.cvsignore Deleted: trunk/rosapps/tests/iptest/.cvsignore Deleted: trunk/rosapps/tests/isotest/.cvsignore Deleted: trunk/rosapps/tests/lineclip/.cvsignore Deleted: trunk/rosapps/tests/linetest/.cvsignore Deleted: trunk/rosapps/tests/lpc/.cvsignore Deleted: trunk/rosapps/tests/map_dup_inherit/.cvsignore Deleted: trunk/rosapps/tests/mdi/.cvsignore Deleted: trunk/rosapps/tests/miditest/.cvsignore Deleted: trunk/rosapps/tests/mktime/.cvsignore Deleted: trunk/rosapps/tests/moztest/.cvsignore Deleted: trunk/rosapps/tests/mstest/.cvsignore Deleted: trunk/rosapps/tests/multithrdwin/.cvsignore Deleted: trunk/rosapps/tests/multiwin/.cvsignore Deleted: trunk/rosapps/tests/mutex/.cvsignore Deleted: trunk/rosapps/tests/nameserverlist/.cvsignore Deleted: trunk/rosapps/tests/noexecute/.cvsignore Deleted: trunk/rosapps/tests/nptest/.cvsignore Deleted: trunk/rosapps/tests/oskittcp/.cvsignore Deleted: trunk/rosapps/tests/p_dup_handle/.cvsignore Deleted: trunk/rosapps/tests/palbitblt/.cvsignore Deleted: trunk/rosapps/tests/patblt/.cvsignore Deleted: trunk/rosapps/tests/polytest/.cvsignore Deleted: trunk/rosapps/tests/popupmenu/.cvsignore Deleted: trunk/rosapps/tests/primitives/.cvsignore Deleted: trunk/rosapps/tests/pteb/.cvsignore Deleted: trunk/rosapps/tests/regdump/.cvsignore Deleted: trunk/rosapps/tests/regqueryvalue/.cvsignore Deleted: trunk/rosapps/tests/regtest/.cvsignore Deleted: trunk/rosapps/tests/sectest/.cvsignore Deleted: trunk/rosapps/tests/sertest/.cvsignore Deleted: trunk/rosapps/tests/shaptest/.cvsignore [truncated at 100 lines; 22 more skipped] _____ Deleted: trunk/rosapps/.cvsignore --- trunk/rosapps/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,3 +0,0 @@ -*.zip -*.map -doxy-doc _____ Deleted: trunk/rosapps/cmdutils/.cvsignore --- trunk/rosapps/cmdutils/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/cmdutils/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/cmdutils/mode/.cvsignore --- trunk/rosapps/cmdutils/mode/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/cmdutils/mode/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/cmdutils/touch/.cvsignore --- trunk/rosapps/cmdutils/touch/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/cmdutils/touch/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/demos/maze/.cvsignore --- trunk/rosapps/demos/maze/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/demos/maze/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -maze.exe -maze.nostrip.exe -maze.sym -maze.coff -.*.d -*.o -*.map _____ Deleted: trunk/rosapps/devutils/genguid/.cvsignore --- trunk/rosapps/devutils/genguid/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/devutils/genguid/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,12 +0,0 @@ -*.exe -*.o -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/devutils/zoomin/.cvsignore --- trunk/rosapps/devutils/zoomin/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/devutils/zoomin/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,12 +0,0 @@ -*.exe -*.o -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/dflat32/.cvsignore --- trunk/rosapps/dflat32/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/dflat32/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/games/winemine/.cvsignore --- trunk/rosapps/games/winemine/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/games/winemine/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,6 +0,0 @@ -*.o -*.d -*.exe -*.coff -*.sym -*.map _____ Deleted: trunk/rosapps/lib/dflat32/.cvsignore --- trunk/rosapps/lib/dflat32/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/lib/dflat32/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/mc/.cvsignore --- trunk/rosapps/mc/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/mc/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/mc/edit/.cvsignore --- trunk/rosapps/mc/edit/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/mc/edit/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,2 +0,0 @@ -*.o -*.map _____ Deleted: trunk/rosapps/mc/pc/.cvsignore --- trunk/rosapps/mc/pc/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/mc/pc/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,2 +0,0 @@ -*.o -*.map _____ Deleted: trunk/rosapps/mc/release/.cvsignore --- trunk/rosapps/mc/release/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/mc/release/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/mc/slang/.cvsignore --- trunk/rosapps/mc/slang/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/mc/slang/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,2 +0,0 @@ -*.o -*.map _____ Deleted: trunk/rosapps/mc/src/.cvsignore --- trunk/rosapps/mc/src/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/mc/src/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,2 +0,0 @@ -*.o -*.map _____ Deleted: trunk/rosapps/net/ncftp/.cvsignore --- trunk/rosapps/net/ncftp/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/net/ncftp/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,18 +0,0 @@ -Users -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/net/ncftp/Strn/.cvsignore --- trunk/rosapps/net/ncftp/Strn/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/net/ncftp/Strn/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/net/ncftp/libncftp/.cvsignore --- trunk/rosapps/net/ncftp/libncftp/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/net/ncftp/libncftp/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/net/ncftp/ncftp/.cvsignore --- trunk/rosapps/net/ncftp/ncftp/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/net/ncftp/ncftp/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/net/ncftp/sio/.cvsignore --- trunk/rosapps/net/ncftp/sio/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/net/ncftp/sio/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/net/niclist/.cvsignore --- trunk/rosapps/net/niclist/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/net/niclist/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/notevil/.cvsignore --- trunk/rosapps/notevil/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/notevil/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/sysutils/.cvsignore --- trunk/rosapps/sysutils/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/sysutils/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/sysutils/ctm/.cvsignore --- trunk/rosapps/sysutils/ctm/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/sysutils/ctm/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/sysutils/man/.cvsignore --- trunk/rosapps/sysutils/man/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/sysutils/man/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/sysutils/regexpl/.cvsignore --- trunk/rosapps/sysutils/regexpl/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/sysutils/regexpl/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,18 +0,0 @@ -*.mak -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/sysutils/tcat/.cvsignore --- trunk/rosapps/sysutils/tcat/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/sysutils/tcat/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/sysutils/tlist/.cvsignore --- trunk/rosapps/sysutils/tlist/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/sysutils/tlist/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/templates/dialog/.cvsignore --- trunk/rosapps/templates/dialog/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/templates/dialog/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/templates/mdi/.cvsignore --- trunk/rosapps/templates/mdi/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/templates/mdi/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,17 +0,0 @@ -*.sys -*.exe -*.dll -*.cpl -*.a -*.o -*.d -*.coff -*.dsp -*.dsw -*.aps -*.ncb -*.opt -*.sym -*.plg -*.bak -*.map _____ Deleted: trunk/rosapps/tests/accelerator/.cvsignore --- trunk/rosapps/tests/accelerator/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/accelerator/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/alive/.cvsignore --- trunk/rosapps/tests/alive/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/alive/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/alphablend/.cvsignore --- trunk/rosapps/tests/alphablend/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/alphablend/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/apc/.cvsignore --- trunk/rosapps/tests/apc/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/apc/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/apc2/.cvsignore --- trunk/rosapps/tests/apc2/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/apc2/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/args/.cvsignore --- trunk/rosapps/tests/args/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/args/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/atomtest/.cvsignore --- trunk/rosapps/tests/atomtest/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/atomtest/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/bench/.cvsignore --- trunk/rosapps/tests/bench/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/bench/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/bitblt/.cvsignore --- trunk/rosapps/tests/bitblt/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/bitblt/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/button/.cvsignore --- trunk/rosapps/tests/button/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/button/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/button2/.cvsignore --- trunk/rosapps/tests/button2/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/button2/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/capclock/.cvsignore --- trunk/rosapps/tests/capclock/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/capclock/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/carets/.cvsignore --- trunk/rosapps/tests/carets/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/carets/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/combo/.cvsignore --- trunk/rosapps/tests/combo/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/combo/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/consume/.cvsignore --- trunk/rosapps/tests/consume/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/consume/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/copymove/.cvsignore --- trunk/rosapps/tests/copymove/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/copymove/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/count/.cvsignore --- trunk/rosapps/tests/count/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/count/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/create-links/.cvsignore --- trunk/rosapps/tests/create-links/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/create-links/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/dibtest/.cvsignore --- trunk/rosapps/tests/dibtest/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/dibtest/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/dirdlg/.cvsignore --- trunk/rosapps/tests/dirdlg/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/dirdlg/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/diskspeed/.cvsignore --- trunk/rosapps/tests/diskspeed/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/diskspeed/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/dnsapi/.cvsignore --- trunk/rosapps/tests/dnsapi/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/dnsapi/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/dnsquery/.cvsignore --- trunk/rosapps/tests/dnsquery/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/dnsquery/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/dump_shared_data/.cvsignore --- trunk/rosapps/tests/dump_shared_data/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/dump_shared_data/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/edit/.cvsignore --- trunk/rosapps/tests/edit/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/edit/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/enhmetafile/.cvsignore --- trunk/rosapps/tests/enhmetafile/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/enhmetafile/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/enumfonts/.cvsignore --- trunk/rosapps/tests/enumfonts/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/enumfonts/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/enumwnd/.cvsignore --- trunk/rosapps/tests/enumwnd/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/enumwnd/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/enumws/.cvsignore --- trunk/rosapps/tests/enumws/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/enumws/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/event/.cvsignore --- trunk/rosapps/tests/event/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/event/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/eventpair/.cvsignore --- trunk/rosapps/tests/eventpair/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/eventpair/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/fiber/.cvsignore --- trunk/rosapps/tests/fiber/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/fiber/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ -*.o -*.d -*.a -*.exe -*.coff -*.sym -*.map \ No newline at end of file _____ Deleted: trunk/rosapps/tests/global_mem/.cvsignore --- trunk/rosapps/tests/global_mem/.cvsignore 2005-06-15 17:42:12 UTC (rev 15922) +++ trunk/rosapps/tests/global_mem/.cvsignore 2005-06-15 17:51:54 UTC (rev 15923) @@ -1,7 +0,0 @@ [truncated at 1000 lines; 767 more skipped]

1 0

[mbosma] 15922: removed rules.mak and outdated entries from readme.txt
by mbosma＠svn.reactos.com 15 Jun '05

15 Jun '05

removed rules.mak and outdated entries from readme.txt Modified: trunk/rosapps/readme.txt Deleted: trunk/rosapps/rules.mak _____ Modified: trunk/rosapps/readme.txt --- trunk/rosapps/readme.txt 2005-06-15 17:37:14 UTC (rev 15921) +++ trunk/rosapps/readme.txt 2005-06-15 17:42:12 UTC (rev 15922) @@ -1,4 +1,4 @@ -$Id: readme.txt,v 1.5 2004/04/06 21:04:42 sedwards Exp $ +$Id$ This directory contains extra applicatons for ReactOS. Make sure you also have a copy of the rest of the ReactOS @@ -7,13 +7,11 @@ The following is a short decription of each. Check for a readme.txt under each application for more details. -CALC : A clone of calc CMDUTILS: External commands for CMD. DEVUTILS: Extra developer tools. DFLAT32 : Console text editor GAMES : The start of the ReactOS games collection MC : Midnight Commander -NET : Network tools: Arp, finger, Ping, Ncftp, Telnet, etc... -NOTEPAD : Notepad clone. +NET : Network tools: Ncftp, etc... NOTEVIL : ReactOS Coders Console Parade. SYSUTILS: System Utilities. _____ Deleted: trunk/rosapps/rules.mak --- trunk/rosapps/rules.mak 2005-06-15 17:37:14 UTC (rev 15921) +++ trunk/rosapps/rules.mak 2005-06-15 17:42:12 UTC (rev 15922) @@ -1,120 +0,0 @@ -# -# Important -# -.EXPORT_ALL_VARIABLES: - -# -# Select your host -#HOST = mingw32-windows -#HOST = mingw32-linux -# - -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif - - -ifeq ($(HOST),mingw32-linux) -TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) -endif - -W32API_PATH = $(PATH_TO_TOP)/../reactos/w32api - -# -# Choose various options -# -ifeq ($(HOST),mingw32-linux) -PREFIX = mingw32- -EXE_POSTFIX = -CP = cp -DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as -RM = rm -DOSCLI = no -FLOPPY_DIR = /mnt/floppy -# DIST_DIR should be relative from the top of the tree -DIST_DIR = dist -SEP = / -endif - - -ifeq ($(HOST),mingw32-windows) -PREFIX = -EXE_POSTFIX = .exe -CP = copy -DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as -RM = del -DOSCLI = yes -FLOPPY_DIR = A: -# DIST_DIR should be relative from the top of the tree -DIST_DIR = dist -SEP = \$($EMPTY_VAR) -endif - -# Set INSTALL_DIR to default value if not already set -# ifeq ($(INSTALL_DIR),) -INSTALL_DIR = $(PATH_TO_TOP)/reactos -# endif - -# -# Create variables for all the compiler tools -# -ifeq ($(WITH_DEBUGGING),yes) -DEBUGGING_CFLAGS = -g -else -DEBUGGING_CFLAGS = -endif - -ifeq ($(WARNINGS_ARE_ERRORS),yes) -EXTRA_CFLAGS = -Werror -endif - -DEFINES = -DDBG - -ifeq ($(WIN32_LEAN_AND_MEAN),yes) -LEAN_AND_MEAN_DEFINE = -DWIN32_LEAN_AND_MEAN -else -LEAN_AND_MEAN_DEFINE = -endif - -CXX = $(PREFIX)g++ -CC = $(PREFIX)gcc -NATIVE_CC = gcc -CFLAGS = \ - $(BASE_CFLAGS) \ - -pipe \ - -O2 \ - -Wall \ - -Wstrict-prototypes \ - -fno-builtin \ - -I$(W32API_PATH)/include \ - $(LEAN_AND_MEAN_DEFINE) \ - $(DEFINES) \ - $(DEBUGGING_CFLAGS) \ - $(EXTRA_CFLAGS) -CXXFLAGS = $(CFLAGS) -LD = $(PREFIX)ld -NM = $(PREFIX)nm -OBJCOPY = $(PREFIX)objcopy -STRIP = $(PREFIX)strip -AS = $(PREFIX)gcc -c -x assembler-with-cpp -AR = $(PREFIX)ar -RC = $(PREFIX)windres -RCINC = --include-dir $(PATH_TO_TOP)/../reactos/include -TOOLS_PATH = $(PATH_TO_TOP)/../reactos/tools -RSYM = $(TOOLS_PATH)/rsym - -%.o: %.cpp - $(CXX) $(CFLAGS) -c $< -o $@ -%.o: %.cc - $(CXX) $(CFLAGS) -c $< -o $@ -%.o: %.c - $(CC) $(CFLAGS) -c $< -o $@ -%.o: %.asm - $(NASM_CMD) $(NFLAGS) $< -o $@ -%.coff: %.rc - $(RC) $(RCFLAGS) $(RCINC) $< $@ - - - -RULES_MAK_INCLUDED = 1

1 0

[mbosma] 15921: remove old makefile
by mbosma＠svn.reactos.com 15 Jun '05

15 Jun '05

remove old makefile Deleted: trunk/rosapps/Makefile Deleted: trunk/rosapps/cmdutils/makefile Deleted: trunk/rosapps/cmdutils/mode/makefile Deleted: trunk/rosapps/cmdutils/touch/makefile Deleted: trunk/rosapps/devutils/gdb2/Makefile Deleted: trunk/rosapps/devutils/genguid/Makefile Deleted: trunk/rosapps/devutils/zoomin/makefile Deleted: trunk/rosapps/dflat32/makefile Deleted: trunk/rosapps/games/solitaire/makefile Deleted: trunk/rosapps/games/winemine/Makefile Deleted: trunk/rosapps/mc/Makefile Deleted: trunk/rosapps/mc/doc/Makefile Deleted: trunk/rosapps/mc/edit/Makefile Deleted: trunk/rosapps/mc/pc/Makefile Deleted: trunk/rosapps/mc/slang/Makefile Deleted: trunk/rosapps/mc/src/Makefile Deleted: trunk/rosapps/mc/vfs/Makefile Deleted: trunk/rosapps/net/ncftp/makefile Deleted: trunk/rosapps/net/netreg/makefile Deleted: trunk/rosapps/net/niclist/makefile Deleted: trunk/rosapps/notevil/makefile Deleted: trunk/rosapps/packmgr/cmd-line/makefile Deleted: trunk/rosapps/packmgr/gui/makefile Deleted: trunk/rosapps/packmgr/lib/makefile Deleted: trunk/rosapps/packmgr/makefile Deleted: trunk/rosapps/sysutils/ctm/Makefile Deleted: trunk/rosapps/sysutils/kill/makefile Deleted: trunk/rosapps/sysutils/makefile Deleted: trunk/rosapps/sysutils/man/makefile Deleted: trunk/rosapps/sysutils/regexpl/Makefile Deleted: trunk/rosapps/sysutils/tcat/makefile Deleted: trunk/rosapps/sysutils/tlist/Makefile Deleted: trunk/rosapps/templates/dialog/makefile Deleted: trunk/rosapps/templates/mdi/makefile Deleted: trunk/rosapps/welcome/makefile Deleted: trunk/rosapps/winfile/Makefile _____ Deleted: trunk/rosapps/Makefile --- trunk/rosapps/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,118 +0,0 @@ -# -# Global makefile for the ROSAPPS package -# - -include rules.mak - -# -# Available applications -# - -APPS = cmdutils \ - cmdutils$(SEP)mode \ - cmdutils$(SEP)touch \ - demos$(SEP)maze \ - devutils$(SEP)genguid \ - devutils$(SEP)zoomin \ - dflat32 \ - games$(SEP)winemine \ - games$(SEP)solitaire \ - mc \ - notevil \ - packmgr$(SEP)lib \ - packmgr$(SEP)cmd-line \ - packmgr$(SEP)gui \ - sysutils \ - sysutils$(SEP)ctm \ - sysutils$(SEP)kill \ - sysutils$(SEP)tcat \ - sysutils$(SEP)tlist \ - net$(SEP)niclist \ - net$(SEP)ncftp \ - sysutils$(SEP)regexpl \ - welcome \ - winfile - -all: $(APPS) -.PHONY: all - -implib: -.PHONY: implib - -clean: $(APPS:%=%_clean) -.PHONY: clean - -install: $(APPS:%=%_install) -.PHONY: install - -floppy: make_floppy_dirs $(APPS:%=%_floppy) - -dist: clean_dist_dir make_dist_dirs $(APPS:%=%_dist) -.PHONY: dist - - -# -# Applications -# -$(APPS): %: - $(MAKE) -C $* - -$(APPS:%=%_clean): %_clean: - $(MAKE) -C $* clean - -$(APPS:%=%_floppy): %_floppy: - $(MAKE) -C $* floppy - -$(APPS:%=%_dist): %_dist: - $(MAKE) -C $* dist - -$(APPS:%=%_install): %_install: - $(MAKE) -C $* install - -.PHONY: $(APPS) $(APPS:%=%_clean) $(APPS:%=%_floppy) $(APPS:%=%_dist) $(APPS:%=%_install) - - -# -# Make an install floppy -# - -#install: all -# ./install.sh /mnt/hda1 - -make_floppy_dirs: -ifeq ($(DOSCLI),yes) - mkdir $(FLOPPY_DIR)\apps -else - mkdir $(FLOPPY_DIR)/apps -endif - -.PHONY: make_floppy_dirs - -# -# Make a distribution saveset -# - -clean_dist_dir: -ifeq ($(DOSCLI),yes) -# $(RM) $(DIST_DIR)\apps\*.* -# $(RMDIR) $(DIST_DIR)\apps -# $(RMDIR) $(DIST_DIR) -else - $(RM) -r $(DIST_DIR) -endif - -make_dist_dirs: -ifeq ($(DOSCLI),yes) - mkdir $(DIST_DIR) - mkdir $(DIST_DIR)\apps -else - mkdir $(DIST_DIR) - mkdir $(DIST_DIR)/apps -endif - -#dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \ -# $(WINE_MODULES:%=%_dist) - -.PHONY: clean_dist_dir make_dist_dirs - -# EOF _____ Deleted: trunk/rosapps/cmdutils/makefile --- trunk/rosapps/cmdutils/makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/cmdutils/makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,67 +0,0 @@ -# -# ReactOS cmdutils makefile -# - -PATH_TO_TOP=.. - -TARGET=find.exe more.exe sort.exe tee.exe y.exe - -all: $(TARGET) - - -CLEAN_FILES = *.o *.exe *.sym *.coff - -find.exe: find.o find.coff - $(CC) find.o -lkernel32 -lmsvcrt -o find.exe find.coff - $(NM) --numeric-sort find.exe > find.sym - -more.exe: more.o more.coff - $(CC) more.o -lkernel32 -lmsvcrt -o more.exe more.coff - $(NM) --numeric-sort more.exe > more.sym - -sort.exe: sort.o sort.coff - $(CC) sort.o -lkernel32 -lmsvcrt -o sort.exe sort.coff - $(NM) --numeric-sort sort.exe > sort.sym - -tee.exe: tee.o tee.coff - $(CC) tee.o -lkernel32 -lmsvcrt -o tee.exe tee.coff - $(NM) --numeric-sort tee.exe > tee.sym - -y.exe: y.o y.coff - $(CC) y.o -lkernel32 -lmsvcrt -o y.exe y.coff - $(NM) --numeric-sort y.exe > y.sym - -install: - -.phony: install - - -clean: $(CLEAN_FILES:%=%_clean) - -$(CLEAN_FILES:%=%_clean): %_clean: - - $(RM) $* - -.phony: clean $(CLEAN_FILES:%=%_clean) - - -floppy: $(TARGET:%=$(FLOPPY_DIR)/apps/%) - -$(TARGET:%=$(FLOPPY_DIR)/apps/%): $(FLOPPY_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(FLOPPY_DIR)\apps\$* -else - $(CP) $* $(FLOPPY_DIR)/apps/$* -endif - - -dist: $(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%) - -$(TARGET:%=$(PATH_TO_TOP)/$(DIST_DIR)/apps/%): $(PATH_TO_TOP)/$(DIST_DIR)/apps/%: % -ifeq ($(DOSCLI),yes) - $(CP) $* $(PATH_TO_TOP)\$(DIST_DIR)\apps\$* -else - $(CP) $* $(PATH_TO_TOP)/$(DIST_DIR)/apps/$* -endif - -include $(PATH_TO_TOP)/rules.mak - _____ Deleted: trunk/rosapps/cmdutils/mode/makefile --- trunk/rosapps/cmdutils/mode/makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/cmdutils/mode/makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,20 +0,0 @@ - -PATH_TO_TOP=../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = mode - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/cmdutils/touch/makefile --- trunk/rosapps/cmdutils/touch/makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/cmdutils/touch/makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,21 +0,0 @@ - -PATH_TO_TOP=../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = touch - -TARGET_SDKLIBS = ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o \ -err.o - -TARGET_GCCLIBS = iberty - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/devutils/gdb2/Makefile --- trunk/rosapps/devutils/gdb2/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/devutils/gdb2/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,13 +0,0 @@ -# $Id: Makefile,v 1.1 2001/04/15 23:43:12 narnaoud Exp $ -# -# ReactOS makefile for gdb2 -# - -include ../../rules.mak - -TARGET_NAME=gdb2 - -all: $(TARGET_NAME)$(EXE_POSTFIX) - -gdb2.exe : gdb2.cpp ph.h - gcc gdb2.cpp -o gdb2.exe _____ Deleted: trunk/rosapps/devutils/genguid/Makefile --- trunk/rosapps/devutils/genguid/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/devutils/genguid/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,23 +0,0 @@ -# $Id: Makefile,v 1.1 2003/08/22 07:26:41 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = genguid - -TARGET_CFLAGS = -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API - -TARGET_SDKLIBS = kernel32.a - -TARGET_GCCLIBS = ole32 uuid - -TARGET_OBJECTS = genguid.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/devutils/zoomin/makefile --- trunk/rosapps/devutils/zoomin/makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/devutils/zoomin/makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,42 +0,0 @@ -# $Id: makefile,v 1.2 2004/06/02 02:27:04 royce Exp $ -# -# ReactOS zoomin -# -# Makefile -# -# Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = ../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = zoomin - -TARGET_CFLAGS = -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__USE_W32API - -TARGET_SDKLIBS = kernel32.a gdi32.a user32.a - -TARGET_OBJECTS = framewnd.o main.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/dflat32/makefile --- trunk/rosapps/dflat32/makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/dflat32/makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,41 +0,0 @@ -# -# ReactOS D-Flat/32 -# -# Makefile -# - -PATH_TO_TOP = ../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = edit - -WINE_MODE = yes - -WINE_RC = $(TARGET_NAME) - -WINE_INCLUDE = ./ - -TARGET_CFLAGS = -D__USE_W32API - -#WITH_DEBUGGING=yes - -TARGET_SDKLIBS = \ - kernel32.a \ - user32.a - -TARGET_OBJECTS = \ - applicat.o barchart.o box.o button.o calendar.o checkbox.o clipbord.o \ - combobox.o config.o console.o decomp.o dfalloc.o dialbox.o dialogs.o \ - direct.o edit.o editbox.o fileopen.o helpbox.o htree.o keys.o \ - listbox.o lists.o log.o menu.o menubar.o menus.o message.o msgbox.o \ - normal.o pictbox.o popdown.o radio.o rect.o search.o slidebox.o spinbutt.o \ - statbar.o sysmenu.o text.o textbox.o video.o watch.o window.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/games/solitaire/makefile --- trunk/rosapps/games/solitaire/makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/games/solitaire/makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,44 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = windows -# change to console for debugging purposes... -#TARGET_APPTYPE = console - -TARGET_INSTALLDIR = system32 - -TARGET_NAME = sol - -TARGET_SDKLIBS = kernel32.a user32.a gdi32.a cards.a comctl32.a - -TARGET_GCCLIBS = stdc++ - -TARGET_OBJECTS = $(SOL_OBJECTS) $(CARDLIB_OBJECTS) - -SOL_OBJECTS = \ - solcreate.o \ - solgame.o \ - solitaire.o - -CARDLIB_OBJECTS = \ - cardlib/cardbitmaps.o \ - cardlib/cardbutton.o \ - cardlib/cardcolor.o \ - cardlib/cardcount.o \ - cardlib/cardlib.o \ - cardlib/cardregion.o \ - cardlib/cardrgndraw.o \ - cardlib/cardrgnmouse.o \ - cardlib/cardstack.o \ - cardlib/cardwindow.o \ - cardlib/dropzone.o - -TARGET_CPPFLAGS = -Icardlib -Wall -D__USE_W32API -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -D__REACTOS__ - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/games/winemine/Makefile --- trunk/rosapps/games/winemine/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/games/winemine/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,21 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = winemine - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = main.o dialog.o - -TARGET_CFLAGS = -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/mc/Makefile --- trunk/rosapps/mc/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/mc/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,106 +0,0 @@ -# -# ReactOS mc -# -# Makefile -# - -PATH_TO_TOP = ../../reactos - -TARGET_TYPE = program - -TARGET_OS = NT - -TARGET_APPTYPE = console - -TARGET_NAME = mc - -TARGET_CFLAGS = -I./pc -I./slang -DMC_$(TARGET_OS) -DHAVE_CONFIG_H -D__USE_W32API - -TARGET_SDKLIBS = \ - kernel32.a \ - user32.a - -MC_OBJS = \ - ./src/terms.o \ - ./src/user.o \ - ./src/file.o \ - ./src/listmode.o \ - ./src/cmd.o \ - ./src/command.o \ - ./src/help.o \ - ./src/menu.o \ - ./src/view.o \ - ./src/dir.o \ - ./src/info.o \ - ./src/widget.o \ - ./src/option.o \ - ./src/dlg.o \ - ./src/panelize.o \ - ./src/profile.o \ - ./src/util.o \ - ./src/dialog.o \ - ./src/ext.o \ - ./src/color.o \ - ./src/layout.o \ - ./src/setup.o \ - ./src/regex.o \ - ./src/hotlist.o \ - ./src/tree.o \ - ./src/win.o \ - ./src/complete.o \ - ./src/find.o \ - ./src/wtools.o \ - ./src/boxes.o \ - ./src/background.o \ - ./src/main.o \ - ./src/popt.o \ - ./src/text.o \ - ./src/screen.o - -PC_OBJS= \ - ./pc/slint_pc.o \ - ./pc/chmod.o \ - ./pc/drive.o - -NT_OBJS = \ - ./pc/cons_nt.o \ - ./pc/dirent_nt.o \ - ./pc/key_nt.o \ - ./pc/util_win32.o \ - ./pc/util_winnt.o \ - ./pc/util_nt.o - -SLANG_NT = slw32tty.o - -SLANG_OS2 = slos2tty.o - -SLANG_OBJS = \ - ./slang/slerr.o \ - ./slang/slgetkey.o \ - ./slang/slsmg.o \ - ./slang/slvideo.o \ - ./slang/$(SLANG_$(TARGET_OS)) - -MCEDIT_OBJS = \ - ./edit/edit.o \ - ./edit/editcmd.o \ - ./edit/editdraw.o \ - ./edit/editmenu.o \ - ./edit/editoptions.o \ - ./edit/editwidget.o \ - ./edit/syntax.o \ - ./edit/wordproc.o - -TARGET_OBJECTS = \ - $(MC_OBJS) \ - $(PC_OBJS) \ - $(NT_OBJS) \ - $(SLANG_OBJS) \ - $(MCEDIT_OBJS) \ - - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Deleted: trunk/rosapps/mc/doc/Makefile Deleted: trunk/rosapps/mc/edit/Makefile --- trunk/rosapps/mc/edit/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/mc/edit/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,86 +0,0 @@ -# Generated automatically from Makefile.in by configure. -srcdir = . - -rootdir = $(srcdir)/.. -include ../Make.common - -CFLAGS = $(XCFLAGS) -CPPFLAGS = $(XCPPFLAGS) -LDFLAGS = $(XLDFLAGS) -DEFS = $(XDEFS) -LIBS = $(XLIBS) $(XLIB) -INSTALL = /usr/bin/install -c -INSTALL_PROGRAM = ${INSTALL} -INSTALL_DATA = ${INSTALL} -m 644 -AR = /usr/bin/ar - -# -# Distribution variables -# - -EDITSRC = edit.c editcmd.c editwidget.c edit_key_translator.c editdraw.c \ - edit.h editmenu.c editcmddef.h wordproc.c syntax.c editoptions.c - -EDITOBJS = edit.o editcmd.o editwidget.o editdraw.o editmenu.o wordproc.o \ - syntax.o editoptions.o - -DIST = Makefile.in README.edit $(EDITSRC) - -all: libedit.a - -.c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DMIDNIGHT $< - -check: - @echo no tests are supplied. - -libedit.a: $(EDITOBJS) - $(RMF) $@ - $(AR) cr $@ $(EDITOBJS) - -$(RANLIB) $@ - -mcedit: - -$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit - $(LN_S) mc $(DESTDIR)$(bindir)/$(binprefix)mcedit - -showlibdep: - @echo 'OBJS="$(EDITOBJS)"' - -cross: - $(MAKE) CC=gcc-linux CPP="gcc-linux -E" \ - CPPFLAGS="$(CPPFLAGS) -I/usr/local/lib/gcc-lib/i386-linux-linux/include/ncurses " - -TAGS: $(EDITSRC) - etags $(EDITSRC) - -clean: - $(RMF) *.o core a.out libedit.a - -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ - -distclean: - -$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out - -$(RMF) $(srcdir)/core $(srcdir)/libedit.a - -if test $(srcdir) = .; then $(MAKE) realclean; fi - -$(RMF) $(srcdir)/Makefile - -install: mcedit - -uninstall: - -$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit - -distcopy: - $(CP) $(DIST) ../../mc-$(VERSION)/edit - -depend dep: mcdep - -fastdeploc: - -# ***Dependencies***Do not edit*** -ifeq (.depend,$(wildcard .depend)) -include .depend -endif -# ***End of dependencies*** _____ Deleted: trunk/rosapps/mc/pc/Makefile --- trunk/rosapps/mc/pc/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/mc/pc/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,28 +0,0 @@ -TARGET_OS=NT - -CC=gcc -LINK=gcc -s -OBJ_SUFFIX=o -OBJ_PLACE=-o -EXE_PLACE=-o - -# ---- Compiler-specific optional stuff -MC_MISC_CFLAGS= -OBJS_DIR=release -EXTRA_MC_SRCS= -SPECIFIC_DEFINES= -SPECIFIC_MC_CFLAGS=-O2 $(MC_MISC_CFLAGS) -SPECIFIC_MC_LFLAGS_EXTRA= -SPECIFIC_SLANG_CFLAGS=$(SPECIFIC_MC_CFLAGS) -SPECIFIC_MCEDIT_CFLAGS=$(SPECIFIC_MC_CFLAGS) - -# ---- Compiler independent defines -include Makefile.PC - -# ---- Linkers are very compiler-specific - -SPECIFIC_MC_LFLAGS=$(SPECIFIC_MC_LFLAGS_EXTRA) -MC_LIBS= # -lintl - -$(MC_EXE): $(OBJS) $(MCEDIT_OBJS) $(SLANG_OBJS) - $(LINK) $(EXE_PLACE) $(MC_EXE) $(SPECIFIC_MC_LFLAGS) $+ $(MC_LIBS) _____ Deleted: trunk/rosapps/mc/slang/Makefile --- trunk/rosapps/mc/slang/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/mc/slang/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,80 +0,0 @@ -# Generated automatically from Makefile.in by configure. -srcdir = . - -rootdir = $(srcdir)/.. -include ../Make.common - -CFLAGS = $(XCFLAGS) -CPPFLAGS = $(XCPPFLAGS) -LDFLAGS = $(XLDFLAGS) -DEFS = $(XDEFS) -LIBS = $(XLIBS) $(XLIB) -AR = /usr/bin/ar - -SLANGSRCS = sldisply.c slerr.c slsmg.c slutty.c slgetkey.c slmemcpy.c \ - slmemset.c sltermin.c sltoken.c slsignal.c \ - slvideo.c slw32tty.c slos2tty.c - -SLANGHDRS = slang.h _slang.h sl-feat.h jdmacros.h - -SLANGOBJS = sldisply.o slerr.o slsmg.o slutty.o \ - slgetkey.o slmemcpy.o slmemset.o sltermin.o \ - sltoken.o slsignal.o - -# -# Distribution variables -# - -DISTSLANG = Makefile.in README $(SLANGSRCS) $(SLANGHDRS) - -all: libmcslang.a - -.c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< - -check: - @echo no tests are supplied. - -libmcslang.a: $(SLANGOBJS) - $(RMF) $@ - $(AR) cr $@ $(SLANGOBJS) - -$(RANLIB) $@ - -showlibdep: - @echo 'OBJS="$(SLANGOBJS)"' - -cross: - $(MAKE) CC=gcc-linux CPP="gcc-linux -E" \ - CPPFLAGS="$(CPPFLAGS) -I/usr/local/lib/gcc-lib/i386-linux-linux/include/ncurses " - -TAGS: $(SLANGSRCS) - etags $(SLANGSRCS) - -clean: - $(RMF) *.o core a.out libmcslang.a - -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ - -distclean: - -$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/core $(srcdir)/a.out - -$(RMF) $(srcdir)/libmcslang.a - -if test $(srcdir) = .; then $(MAKE) realclean; fi - -$(RMF) $(srcdir)/Makefile - -distcopy: - $(CP) $(DISTSLANG) ../../mc-$(VERSION)/slang - -install uninstall: - -depend dep: mcdep - -fastdeploc: - -# ***Dependencies***Do not edit*** -ifeq (.depend,$(wildcard .depend)) -include .depend -endif -# ***End of dependencies*** _____ Deleted: trunk/rosapps/mc/src/Makefile --- trunk/rosapps/mc/src/Makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/mc/src/Makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,153 +0,0 @@ -# Generated automatically from Makefile.in by configure. -srcdir = . - -rootdir = $(srcdir)/.. -include ../Make.common - -CFLAGS = $(XCFLAGS) -CPPFLAGS = $(XCPPFLAGS) -DREGEX_MALLOC -LDFLAGS = $(XLDFLAGS) -DEFS = $(XDEFS) -LIBS = $(XLIBS) $(XLIB) -OURLIBS = -lvfs -lmcslang -ledit -INSTALL = /usr/bin/install -c -INSTALL_PROGRAM = ${INSTALL} -INSTALL_DATA = ${INSTALL} -m 644 - -SRCS = dir.c util.c main.c screen.c dialog.c key.c keyxdef.c menu.c\ - file.c win.c color.c help.c find.c profile.c user.c view.c \ - ext.c mouse.c setup.c dlg.c option.c info.c \ - tree.c widget.c chmod.c mad.c xcurses.c xslint.c \ - wtools.c cons.handler.c chown.c subshell.c terms.c boxes.c \ - hotlist.c achown.c layout.c fsusage.c mountlist.c regex.c \ - complete.c slint.c command.c cmd.c panelize.c learn.c \ - listmode.c utilunix.c background.c rxvt.c popt.c \ - text.c - -HDRS = color.h file.h mouse.h user.h dialog.h find.h main.h \ - util.h dir.h global.h menu.h panel.h win.h mem.h \ - help.h profile.h dlg.h option.h tree.h info.h \ - widget.h chmod.h cons.saver.h mad.h wtools.h chown.h \ - subshell.h view.h setup.h key.h ext.h boxes.h \ - hotlist.h layout.h fsusage.h mountlist.h regex.h complete.h \ - myslang.h command.h cmd.h tty.h fs.h panelize.h achown.h \ - learn.h listmode.h features.inc background.h \ - x.h popt.h textconf.h i18n.h - -OBJS = dir.o util.o screen.o dialog.o key.o keyxdef.o menu.o\ - file.o win.o color.o help.o find.o profile.o user.o view.o \ - ext.o mouse.o setup.o dlg.o option.o \ - tree.o widget.o chmod.o mad.o wtools.o info.o \ - cons.handler.o chown.o subshell.o terms.o boxes.o \ - hotlist.o achown.o layout.o fsusage.o mountlist.o \ - regex.o complete.o slint.o command.o \ - cmd.o main.o panelize.o learn.o listmode.o utilunix.o \ - background.o rxvt.o popt.o text.o - -# -# Distribution variables -# - -DISTFILES = \ - $(HDRS) $(SRCS) Makefile.in TODO ChangeLog OChangeLog man2hlp.c \ - gindex.pl xmkdir cons.saver.c ncurses.patch mc.hlp depend.awk \ - fixhlp.c mfmt.c - -# Should be: mc $(srcdir)/mc.hlp but it's remaking it always - -all: mc mcmfmt - -.c.o: - $(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $< - -cons.saver: cons.saver.o - $(CC) -s cons.saver.o -o cons.saver - -check: - @echo no tests are supplied. - -mc: $(OBJS) libvfs.a libmcslang.a libedit.a - $(CC) $(LDFLAGS) -o $@ $(OBJS) -L../vfs -L../slang -L../edit $(OURLIBS) $(LIBS) - -mfmt: mfmt.o - $(CC) $(LDFLAGS) mfmt.o -o mfmt - -mcmfmt: mfmt - cp mfmt mcmfmt - -libvfs.a: - cd ../vfs; $(MAKE) libvfs.a - -$(RMF) libvfs.a - $(LN_S) ../vfs/libvfs.a . - -libmcslang.a: - cd ../slang; $(MAKE) libmcslang.a - -$(RMF) libmcslang.a - $(LN_S) ../slang/libmcslang.a . - -libedit.a: - cd ../edit; $(MAKE) libedit.a - -$(RMF) libedit.a - $(LN_S) ../edit/libedit.a . - -cross: - $(MAKE) CC=gcc-linux CPP="gcc-linux -E" \ - CPPFLAGS="$(CPPFLAGS) -I/usr/local/lib/gcc-lib/i386-linux-linux/include/ncurses " - -$(srcdir)/mc.hlp: $(docdir)/mc.1.in $(mclibdir)/xnc.hlp $(srcdir)/gindex.pl - $(MAKE) man2hlp - ./man2hlp 58 $(docdir)/mc.1.in | cat - $(mclibdir)/xnc.hlp | \ - perl $(srcdir)/gindex.pl > $(srcdir)/mc.hlp - -mc.html: $(docdir)/mc.1.in man2hlp - ./man2hlp 0 $(docdir)/mc.1.in > body.html - cat index.html body.html > mc.html - $(RM) index.html body.html - -TAGS: $(SRCS) - etags $(SRCS) - -clean: - $(RMF) mc cons.saver man2hlp fixhlp *.o core a.out mc.html mcmfmt - $(RMF) libvfs.a libedit.a libmcslang.a mfmt - -realclean: clean - $(RMF) .depend - $(RMF) TAGS - $(RMF) *~ - -distclean: - -$(RMF) $(srcdir)/*~ $(srcdir)/mc $(srcdir)/cons.saver - -$(RMF) $(srcdir)/mfmt - -$(RMF) $(srcdir)/man2hlp $(srcdir)/fixhlp $(srcdir)/*.o $(srcdir)/core - -$(RMF) $(srcdir)/a.out $(srcdir)/mc.html - -$(RMF) $(srcdir)/libvfs.a $(srcdir)/libmcslang.a $(srcdir)/libedit.a - -if test $(srcdir) = .; then $(MAKE) realclean; fi - -$(RMF) $(srcdir)/Makefile - -install: mc mfmt - $(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc - $(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt - $(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(libdir)/$(libprefix)mc.hlp - -install.saver: cons.saver - $(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver - -uninstall: - cd $(bindir); $(RMF) $(binprefix)mc - cd $(bindir); $(RMF) $(binprefix)mcmfmt - cd $(bindir); $(RMF) $(binprefix)cons.saver - cd $(libdir); $(RMF) $(libprefix)mc.hlp - -distcopy: $(srcdir)/mc.hlp - $(CP) $(DISTFILES) ../../mc-$(VERSION)/src - -depend dep: mcdep - -fastdeploc: fastdepslang fastdepvfs - -# ***Dependencies***Do not edit*** -ifeq (.depend,$(wildcard .depend)) -include .depend -endif -# ***End of dependencies*** _____ Deleted: trunk/rosapps/mc/vfs/Makefile Deleted: trunk/rosapps/net/ncftp/makefile --- trunk/rosapps/net/ncftp/makefile 2005-06-15 17:19:52 UTC (rev 15920) +++ trunk/rosapps/net/ncftp/makefile 2005-06-15 17:37:14 UTC (rev 15921) @@ -1,105 +0,0 @@ -# -# ncftp 3.0.3 for reactos ported from MS-Vc -# sedwards 12-20-01 - -PATH_TO_TOP=../../../reactos - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = ncftp - -TARGET_SDKLIBS = kernel32.a ws2_32.a - -TARGET_CFLAGS = -Dncftp -D__USE_W32API - -TARGET_CLEAN = \ -sio/*.o Strn/*.o libncftp/*.o ncftp/*.o - -OBJECTS_SIO = \ -sio/PRead.o \ -sio/PWrite.o \ -sio/SAcceptA.o \ -sio/SAcceptS.o \ -sio/SBind.o \ -sio/SClose.o \ -sio/SConnect.o \ -sio/SConnectByName.o \ -sio/SNew.o \ -sio/SRead.o \ -sio/SReadline.o \ -sio/SRecv.o \ -sio/SRecvfrom.o \ -sio/SRecvmsg.o \ -sio/SSelect.o \ -sio/SSend.o \ -sio/SSendto.o \ -sio/SSendtoByName.o \ -sio/SWrite.o \ -sio/SocketUtil.o \ -sio/StrAddr.o \ -sio/UAcceptA.o \ -sio/UAcceptS.o \ -sio/UBind.o \ -sio/UConnect.o \ -sio/UConnectByName.o \ -sio/UNew.o \ -sio/URecvfrom.o \ -sio/USendto.o \ -sio/USendtoByName.o \ -sio/SError.o \ -sio/SWait.o \ -sio/main.o [truncated at 1000 lines; 854 more skipped]

1 0

[mbosma] 15920: Created XML makefiles for rosapps. You need to checkout /rosapps in your /reactos folder to use it. This projects do not build: /lib/dflat32 and /welcome (I don't know if they did before). Winemine does not work. (but it builds) /test makefiles are not done yet.
by mbosma＠svn.reactos.com 15 Jun '05

15 Jun '05

Created XML makefiles for rosapps. You need to checkout /rosapps in your /reactos folder to use it. This projects do not build: /lib/dflat32 and /welcome (I don't know if they did before). Winemine does not work. (but it builds) /test makefiles are not done yet. Added: trunk/rosapps/cmdutils/cmdutils.xml Added: trunk/rosapps/cmdutils/mode/mode.xml Added: trunk/rosapps/cmdutils/touch/touch.xml Added: trunk/rosapps/demos/directory.xml Added: trunk/rosapps/demos/maze/maze.xml Added: trunk/rosapps/devutils/directory.xml Added: trunk/rosapps/devutils/gdb2/gdb2.xml Added: trunk/rosapps/devutils/genguid/genguid.xml Added: trunk/rosapps/devutils/zoomin/zoomin.xml Added: trunk/rosapps/dflat32/dflat32.xml Added: trunk/rosapps/directory.xml Added: trunk/rosapps/games/directory.xml Added: trunk/rosapps/games/solitaire/solitaire.xml Added: trunk/rosapps/games/winemine/winemine.xml Added: trunk/rosapps/lib/dflat32/dflat32.xml Added: trunk/rosapps/lib/directory.xml Added: trunk/rosapps/mc/mc.xml Added: trunk/rosapps/net/directory.xml Added: trunk/rosapps/net/ncftp/ncftp.xml Added: trunk/rosapps/net/netreg/netreg.xml Added: trunk/rosapps/net/niclist/niclist.xml Added: trunk/rosapps/notevil/notevil.xml Modified: trunk/rosapps/packmgr/gui/packmgr.xml Modified: trunk/rosapps/packmgr/lib/packlib.xml Added: trunk/rosapps/sysutils/ctm/ctm.xml Added: trunk/rosapps/sysutils/kill/kill.xml Added: trunk/rosapps/sysutils/man/man.xml Added: trunk/rosapps/sysutils/regexpl/regexpl.xml Added: trunk/rosapps/sysutils/sysutils.xml Added: trunk/rosapps/sysutils/tcat/cat.xml Added: trunk/rosapps/sysutils/tlist/tlist.xml Added: trunk/rosapps/templates/dialog/dialog.xml Added: trunk/rosapps/templates/directory.xml Added: trunk/rosapps/templates/mdi/mdi.xml Modified: trunk/rosapps/tests/dibtest/makefile Modified: trunk/rosapps/tests/tmrqueue/makefile Added: trunk/rosapps/welcome/welcome.xml Added: trunk/rosapps/winfile/winfile.xml _____ Added: trunk/rosapps/cmdutils/cmdutils.xml --- trunk/rosapps/cmdutils/cmdutils.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/cmdutils/cmdutils.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,52 @@ +<directory name="mode"> + <xi:include href="mode/mode.xml" /> +</directory> + +<directory name="touch"> + <xi:include href="touch/touch.xml" /> +</directory> + +<module name="find" type="win32cui" installbase="system32" installname="find.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>find.c</file> + <file>find.rc</file> +</module> + +<module name="more" type="win32cui" installbase="system32" installname="more.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>more.c</file> + <file>more.rc</file> +</module> + +<module name="sort" type="win32cui" installbase="system32" installname="sort.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>sort.c</file> + <file>sort.rc</file> +</module> + +<module name="tee" type="win32cui" installbase="system32" installname="tee.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>tee.c</file> + <file>tee.rc</file> +</module> + +<module name="y" type="win32cui" installbase="system32" installname="y.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>y.c</file> + <file>y.rc</file> +</module> _____ Added: trunk/rosapps/cmdutils/mode/mode.xml --- trunk/rosapps/cmdutils/mode/mode.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/cmdutils/mode/mode.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,10 @@ +<module name="mode" type="win32cui" installbase="system32" installname="mode.exe" warnings="true"> + <include base="mode">.</include> + <include base="mode">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>mode.c</file> + <file>mode.rc</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/cmdutils/touch/touch.xml --- trunk/rosapps/cmdutils/touch/touch.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/cmdutils/touch/touch.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,10 @@ +<module name="touch" type="win32cui" installbase="system32" installname="touch.exe" warnings="true"> + <include base="touch">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>ntdll</library> + <file>err.c</file> + <file>touch.c</file> + <file>touch.rc</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/demos/directory.xml --- trunk/rosapps/demos/directory.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/demos/directory.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,3 @@ +<directory name="maze"> + <xi:include href="maze/maze.xml" /> +</directory> \ No newline at end of file _____ Added: trunk/rosapps/demos/maze/maze.xml --- trunk/rosapps/demos/maze/maze.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/demos/maze/maze.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,9 @@ +<module name="maze" type="win32gui" installbase="system32" installname="maze.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>maze.c</file> + <file>maze.rc</file> +</module> _____ Added: trunk/rosapps/devutils/directory.xml --- trunk/rosapps/devutils/directory.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/devutils/directory.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,11 @@ +<directory name="gdb2"> + <xi:include href="gdb2/gdb2.xml" /> +</directory> + +<directory name="genguid"> + <xi:include href="genguid/genguid.xml" /> +</directory> + +<directory name="zoomin"> + <xi:include href="zoomin/zoomin.xml" /> +</directory> _____ Added: trunk/rosapps/devutils/gdb2/gdb2.xml --- trunk/rosapps/devutils/gdb2/gdb2.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/devutils/gdb2/gdb2.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,7 @@ +<module name="gdb2" type="win32cui" installbase="system32" installname="gdb2.exe"> + <include base="gdb2">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <file>gdb2.cpp</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/devutils/genguid/genguid.xml --- trunk/rosapps/devutils/genguid/genguid.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/devutils/genguid/genguid.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,9 @@ +<module name="genguid" type="win32cui" installbase="system32" installname="genguid.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>ole32</library> + <library>uuid</library> + <file>genguid.c</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/devutils/zoomin/zoomin.xml --- trunk/rosapps/devutils/zoomin/zoomin.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/devutils/zoomin/zoomin.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,12 @@ +<module name="zoomin" type="win32gui" installbase="system32" installname="zoomin.exe"> + <include base="zoomin">.</include> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <file>framewnd.c</file> + <file>main.c</file> + <file>zoomin.rc</file> +</module> _____ Added: trunk/rosapps/dflat32/dflat32.xml --- trunk/rosapps/dflat32/dflat32.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/dflat32/dflat32.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,53 @@ +<module name="dflat32" type="win32cui" installbase="system32" installname="dflat32.exe" warnings="true"> + <include base="ReactOS">include/wine</include> + <include base="dflat32">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>gdi32</library> + <file>applicat.c</file> + <file>barchart.c</file> + <file>box.c</file> + <file>button.c</file> + <file>calendar.c</file> + <file>checkbox.c</file> + <file>clipbord.c</file> + <file>combobox.c</file> + <file>config.c</file> + <file>console.c</file> + <file>decomp.c</file> + <file>dfalloc.c</file> + <file>dialbox.c</file> + <file>dialogs.c</file> + <file>direct.c</file> + <file>edit.c</file> + <file>editbox.c</file> + <file>fileopen.c</file> + <file>helpbox.c</file> + <file>htree.c</file> + <file>keys.c</file> + <file>listbox.c</file> + <file>lists.c</file> + <file>log.c</file> + <file>menu.c</file> + <file>menubar.c</file> + <file>menus.c</file> + <file>message.c</file> + <file>msgbox.c</file> + <file>normal.c</file> + <file>pictbox.c</file> + <file>popdown.c</file> + <file>radio.c</file> + <file>rect.c</file> + <file>search.c</file> + <file>slidebox.c</file> + <file>spinbutt.c</file> + <file>statbar.c</file> + <file>sysmenu.c</file> + <file>text.c</file> + <file>textbox.c</file> + <file>video.c</file> + <file>watch.c</file> + <file>window.c</file> +</module> _____ Added: trunk/rosapps/directory.xml --- trunk/rosapps/directory.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/directory.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,55 @@ +<directory name="cmdutils"> + <xi:include href="cmdutils/cmdutils.xml" /> +</directory> + +<directory name="demos"> + <xi:include href="demos/directory.xml" /> +</directory> + +<directory name="devutils"> + <xi:include href="devutils/directory.xml" /> +</directory> + +<directory name="dflat32"> + <xi:include href="dflat32/dflat32.xml" /> +</directory> + +<directory name="games"> + <xi:include href="games/directory.xml" /> +</directory> + +<directory name="mc"> + <xi:include href="mc/mc.xml" /> +</directory> + +<directory name="net"> + <xi:include href="net/directory.xml" /> +</directory> + +<directory name="notevil"> + <xi:include href="notevil/notevil.xml" /> +</directory> + +<directory name="packmgr"> + <xi:include href="packmgr/directory.xml" /> +</directory> + +<directory name="sysutils"> + <xi:include href="sysutils/sysutils.xml" /> +</directory> + +<directory name="templates"> + <xi:include href="templates/directory.xml" /> +</directory> + +<directory name="winfile"> + <xi:include href="winfile/winfile.xml" /> +</directory> _____ Added: trunk/rosapps/games/directory.xml --- trunk/rosapps/games/directory.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/games/directory.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,7 @@ +<directory name="solitaire"> + <xi:include href="solitaire/solitaire.xml" /> +</directory> + +<directory name="winemine"> + <xi:include href="winemine/winemine.xml" /> +</directory> _____ Added: trunk/rosapps/games/solitaire/solitaire.xml --- trunk/rosapps/games/solitaire/solitaire.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/games/solitaire/solitaire.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,33 @@ +<module name="sol" type="win32gui" installbase="system32" installname="solitaire.exe" warnings="true"> + <include base="sol">.</include> + <include base="sol">cardlib</include> + <linkerflag>-lstdc++</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__REACTOS__" /> + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>cards</library> + <library>comctl32</library> + + <file>solcreate.cpp</file> + <file>solgame.cpp</file> + <file>solitaire.cpp</file> + <directory name="cardlib"> + <file>cardbitmaps.cpp</file> + <file>cardbutton.cpp</file> + <file>cardcolor.cpp</file> + <file>cardcount.cpp</file> + <file>cardlib.cpp</file> + <file>cardregion.cpp</file> + <file>cardrgndraw.cpp</file> + <file>cardrgnmouse.cpp</file> + <file>cardstack.cpp</file> + <file>cardwindow.cpp</file> + <file>dropzone.cpp</file> + </directory> + <file>sol.rc</file> +</module> _____ Added: trunk/rosapps/games/winemine/winemine.xml --- trunk/rosapps/games/winemine/winemine.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/games/winemine/winemine.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,10 @@ +<module name="winemine" type="win32gui" installbase="system32" installname="winemine.exe"> + <include base="winemine">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>gdi32</library> + <file>main.c</file> + <file>dialog.c</file> +</module> _____ Added: trunk/rosapps/lib/dflat32/dflat32.xml --- trunk/rosapps/lib/dflat32/dflat32.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/lib/dflat32/dflat32.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,43 @@ +<module name="dflat32lib" type="win32dll" baseadress="0x98000000" installbase="system32" installname="dflat32.dll"> + <importlibrary definition="dflat32.def" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + + <file>applicat.c</file> + <file>box.c</file> + <file>checkbox.c</file> + <file>clipbord.c</file> + <file>config.c</file> + <file>console.c</file> + <file>decomp.c</file> + <file>dfalloc.c</file> + <file>dialbox.c</file> + <file>dialogs.c</file> + <file>dllmain.c</file> + <file>editbox.c</file> + <file>lists.c</file> + <file>helpbox.c</file> + <file>listbox.c</file> + <file>log.c</file> + <file>message.c</file> + <file>menu.c</file> + <file>menubar.c</file> + <file>menus.c</file> + <file>msgbox.c</file> + <file>normal.c</file> + <file>pictbox.c</file> + <file>popdown.c</file> + <file>keys.c</file> + <file>radio.c</file> + <file>rect.c</file> + <file>spinbutt.c</file> + <file>statbar.c</file> + <file>stubs.c</file> + <file>sysmenu.c</file> + <file>text.c</file> + <file>textbox.c</file> + <file>video.c</file> + <file>watch.c</file> + <file>window.c</file> +</module> _____ Added: trunk/rosapps/lib/directory.xml --- trunk/rosapps/lib/directory.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/lib/directory.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,3 @@ +<directory name="dflat32"> + <xi:include href="dflat32/dflat32.xml" /> +</directory> \ No newline at end of file _____ Added: trunk/rosapps/mc/mc.xml --- trunk/rosapps/mc/mc.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/mc/mc.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,83 @@ +<module name="mc" type="win32cui" installbase="system32" installname="mc.exe" warnings="true"> + <include base="mc">src</include> + <include base="mc">pc</include> + <include base="mc">slang</include> + <include base="mc">edit</include> + <define name="__USE_W32API" /> + <define name="DMC_NT" /> + <define name="_OS_NT" /> + <define name="HAVE_CONFIG_H" /> + <library>kernel32</library> + <library>user32</library> + + <directory name="src"> + <file>terms.c</file> + <file>user.c</file> + <file>file.c</file> + <file>listmode.c</file> + <file>cmd.c</file> + <file>command.c</file> + <file>help.c</file> + <file>menu.c</file> + <file>view.c</file> + <file>dir.c</file> + <file>info.c</file> + <file>widget.c</file> + <file>option.c</file> + <file>dlg.c</file> + <file>panelize.c</file> + <file>profile.c</file> + <file>util.c</file> + <file>dialog.c</file> + <file>ext.c</file> + <file>color.c</file> + <file>layout.c</file> + <file>setup.c</file> + <file>regex.c</file> + <file>hotlist.c</file> + <file>tree.c</file> + <file>win.c</file> + <file>complete.c</file> + <file>find.c</file> + <file>wtools.c</file> + <file>boxes.c</file> + <file>background.c</file> + <file>main.c</file> + <file>popt.c</file> + <file>text.c</file> + <file>screen.c</file> + </directory> + + <directory name="pc"> + <file>slint_pc.c</file> + <file>chmod.c</file> + <file>drive.c</file> + <file>cons_nt.c</file> + <file>dirent_nt.c</file> + <file>key_nt.c</file> + <file>util_win32.c</file> + <file>util_winnt.c</file> + <file>util_nt.c</file> + </directory> + + <directory name="slang"> + <file>slerr.c</file> + <file>slgetkey.c</file> + <file>slsmg.c</file> + <file>slvideo.c</file> + <file>slw32tty.c</file> + </directory> + + <directory name="edit"> + <file>edit.c</file> + <file>editcmd.c</file> + <file>editdraw.c</file> + <file>editmenu.c</file> + <file>editoptions.c</file> + <file>editwidget.c</file> + <file>syntax.c</file> + <file>wordproc.c</file> + </directory> + + <file>mc.rc</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/net/directory.xml --- trunk/rosapps/net/directory.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/net/directory.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,12 @@ +<directory name="ncftp"> + <xi:include href="ncftp/ncftp.xml" /> +</directory> + +<directory name="netreg"> + <xi:include href="netreg/netreg.xml" /> +</directory> + +<directory name="niclist"> + <xi:include href="niclist/niclist.xml" /> +</directory> + _____ Added: trunk/rosapps/net/ncftp/ncftp.xml --- trunk/rosapps/net/ncftp/ncftp.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/net/ncftp/ncftp.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,93 @@ +<module name="ncftp" type="win32cui" installbase="system32" installname="ncftp.exe" warnings="true"> + <include base="ncftp">.</include> + <include base="ncftp">sio</include> + <include base="ncftp">Strn</include> + <include base="ncftp">libncftp</include> + <include base="ncftp">ncftp</include> + + <define name="ncftp" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>ws2_32</library> + + <directory name="sio"> + <file>PRead.c</file> + <file>PWrite.c</file> + <file>SAcceptA.c</file> + <file>SAcceptS.c</file> + <file>SBind.c</file> + <file>SClose.c</file> + <file>SConnect.c</file> + <file>SConnectByName.c</file> + <file>SNew.c</file> + <file>SRead.c</file> + <file>SReadline.c</file> + <file>SRecv.c</file> + <file>SRecvfrom.c</file> + <file>SRecvmsg.c</file> + <file>SSelect.c</file> + <file>SSend.c</file> + <file>SSendto.c</file> + <file>SSendtoByName.c</file> + <file>SWrite.c</file> + <file>SocketUtil.c</file> + <file>StrAddr.c</file> + <file>UAcceptA.c</file> + <file>UAcceptS.c</file> + <file>UBind.c</file> + <file>UConnect.c</file> + <file>UConnectByName.c</file> + <file>UNew.c</file> + <file>URecvfrom.c</file> + <file>USendto.c</file> + <file>USendtoByName.c</file> + <file>SError.c</file> + <file>SWait.c</file> + <file>main.c</file> + </directory> + + <directory name="Strn"> + <file>Dynscat.c</file> + <file>Strncpy.c</file> + <file>Strncat.c</file> + <file>Strntok.c</file> + <file>Strnpcpy.c</file> + <file>Strnpcat.c</file> + <file>strtokc.c</file> + <file>version.c</file> + </directory> + + <directory name="libncftp"> + <file>open.c</file> + <file>cmds.c</file> + <file>util.c</file> + <file>rcmd.c</file> + <file>ftp.c</file> + <file>io.c</file> + <file>errno.c</file> + <file>linelist.c</file> + <file>glob.c</file> + </directory> + + <directory name="ncftp"> + <file>cmds.c</file> + <file>cmdlist.c</file> + <file>getopt.c</file> + <file>ls.c</file> + <file>main.c</file> + <file>version.c</file> + <file>shell.c</file> + <file>util.c</file> + <file>readln.c</file> + <file>progress.c</file> + <file>bookmark.c</file> + <file>pref.c</file> + <file>preffw.c</file> + <file>trace.c</file> + <file>spool.c</file> + <file>log.c</file> + <file>getline.c</file> + </directory> +</module> _____ Added: trunk/rosapps/net/netreg/netreg.xml --- trunk/rosapps/net/netreg/netreg.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/net/netreg/netreg.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,11 @@ +<module name="netreg" type="win32cui" installbase="system32" installname="netreg.exe" warnings="true"> + <include base="netreg">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>ws2_32</library> + + <file>netreg.cpp</file> + <file>netreg.rc</file> +</module> _____ Added: trunk/rosapps/net/niclist/niclist.xml --- trunk/rosapps/net/niclist/niclist.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/net/niclist/niclist.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,9 @@ +<module name="niclist" type="win32cui" installbase="system32" installname="niclist.exe" warnings="true"> + <include base="niclist">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + + <file>niclist.c</file> + <file>niclist.rc</file> +</module> _____ Added: trunk/rosapps/notevil/notevil.xml --- trunk/rosapps/notevil/notevil.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/notevil/notevil.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,10 @@ +<module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe" warnings="true"> + <include base="notevil">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <file>notevil.c</file> + <file>notevil.rc</file> +</module> \ No newline at end of file _____ Modified: trunk/rosapps/packmgr/gui/packmgr.xml --- trunk/rosapps/packmgr/gui/packmgr.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/packmgr/gui/packmgr.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -1,5 +1,6 @@ <module name="packmgr" type="win32gui" installbase="system32" installname="packmgr.exe"> <include base="packlib">.</include> + <include base="packmgr">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_WIN32_IE">0x0501</define> _____ Modified: trunk/rosapps/packmgr/lib/packlib.xml --- trunk/rosapps/packmgr/lib/packlib.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/packmgr/lib/packlib.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -1,5 +1,6 @@ <module name="packlib" type="win32dll" installbase="system32" installname="package.dll"> <importlibrary definition="package.def" /> + <include base="packlib">.</include> <define name="UNICODE" /> <define name="__USE_W32API" /> _____ Added: trunk/rosapps/sysutils/ctm/ctm.xml --- trunk/rosapps/sysutils/ctm/ctm.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/sysutils/ctm/ctm.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,9 @@ +<module name="cmt" type="win32cui" installbase="system32" installname="cmt.exe" warnings="true"> + <define name="__USE_W32API" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <library>epsapi</library> + <library>ntdll</library> + <file>ctm.c</file> + <file>ctm.rc</file> +</module> _____ Added: trunk/rosapps/sysutils/kill/kill.xml --- trunk/rosapps/sysutils/kill/kill.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/sysutils/kill/kill.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,6 @@ +<module name="kill" type="win32cui" installbase="system32" installname="kill.exe"> + <define name="__USE_W32API" /> + <library>ntdll</library> + <file>kill.c</file> + <file>kill.rc</file> +</module> _____ Added: trunk/rosapps/sysutils/man/man.xml --- trunk/rosapps/sysutils/man/man.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/sysutils/man/man.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,5 @@ +<module name="man" type="win32cui" installbase="system32" installname="man.exe"> + <define name="__USE_W32API" /> + <library>ntdll</library> + <file>man.c</file> +</module> _____ Added: trunk/rosapps/sysutils/regexpl/regexpl.xml --- trunk/rosapps/sysutils/regexpl/regexpl.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/sysutils/regexpl/regexpl.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,33 @@ +<module name="regexpl" type="win32cui" installbase="system32" installname="regexpl.exe"> + <include base="regexpl">.</include> + <define name="__USE_W32API" /> + + <file>ArgumentParser.cpp</file> + <file>Console.cpp</file> + <file>RegistryExplorer.cpp</file> + <file>RegistryKey.cpp</file> + <file>RegistryTree.cpp</file> + <file>SecurityDescriptor.cpp</file> + <file>ShellCommand.cpp</file> + <file>ShellCommandChangeKey.cpp</file> + <file>ShellCommandConnect.cpp</file> + <file>ShellCommandDACL.cpp</file> + <file>ShellCommandDeleteKey.cpp</file> + <file>ShellCommandDeleteValue.cpp</file> + <file>ShellCommandDir.cpp</file> + <file>ShellCommandExit.cpp</file> + <file>ShellCommandHelp.cpp</file> + <file>ShellCommandNewKey.cpp</file> + <file>ShellCommandOwner.cpp</file> + <file>ShellCommandSACL.cpp</file> + <file>ShellCommandSetValue.cpp</file> + <file>ShellCommandValue.cpp</file> + <file>ShellCommandVersion.cpp</file> + <file>ShellCommandsLinkedList.cpp</file> + <file>CrtSupplement.c</file> + <file>TextHistory.cpp</file> + <file>Completion.cpp</file> + <file>Pattern.cpp</file> + <file>Settings.cpp</file> + <file>Prompt.cpp</file> +</module> \ No newline at end of file _____ Added: trunk/rosapps/sysutils/sysutils.xml --- trunk/rosapps/sysutils/sysutils.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/sysutils/sysutils.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,68 @@ +<directory name="ctm"> + <xi:include href="ctm/ctm.xml" /> +</directory> + +<directory name="kill"> + <xi:include href="kill/kill.xml" /> +</directory> + +<directory name="man"> + <xi:include href="man/man.xml" /> +</directory> + +<directory name="regexpl"> + <xi:include href="regexpl/regexpl.xml" /> +</directory> + +<directory name="tcat"> + <xi:include href="tcat/cat.xml" /> +</directory> + +<directory name="tlist"> + <xi:include href="tlist/tlist.xml" /> +</directory> + + +<module name="chklib" type="win32cui" installbase="system32" installname="chklib.exe" warnings="true"> + <linkerflag>--numeric-sort</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>chklib.c</file> + <file>win32err.c</file> + <file>chklib.rc</file> +</module> + +<module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe"> + <linkerflag>--numeric-sort</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <file>shutdown.c</file> + <file>win32err.c</file> + <file>shutdown.rc</file> +</module> + +<module name="pedump" type="win32cui" installbase="system32" installname="pedump.exe" warnings="true"> + <linkerflag>--numeric-sort</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>ntdll</library> + <library>kernel32</library> + <file>pedump.c</file> + <file>pedump.rc</file> +</module> + +<module name="ldd" type="win32cui" installbase="system32" installname="ldd.exe"> + <linkerflag>--numeric-sort</linkerflag> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <file>ldd.c</file> + <file>win32err.c</file> + <file>ldd.rc</file> +</module> _____ Added: trunk/rosapps/sysutils/tcat/cat.xml --- trunk/rosapps/sysutils/tcat/cat.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/sysutils/tcat/cat.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,5 @@ +<module name="cat" type="win32cui" installbase="system32" installname="cat.exe"> + <define name="__USE_W32API" /> + <library>ntdll</library> + <file>cat.c</file> +</module> _____ Added: trunk/rosapps/sysutils/tlist/tlist.xml --- trunk/rosapps/sysutils/tlist/tlist.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/sysutils/tlist/tlist.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,9 @@ +<module name="tlist" type="win32cui" installbase="system32" installname="tlist.exe" warnings="true"> + <define name="__USE_W32API" /> + <library>epsapi</library> +  + <library>kernel32</library> + <library>user32</library> + <library>ntdll</library> + <file>tlist.c</file> +</module> _____ Added: trunk/rosapps/templates/dialog/dialog.xml --- trunk/rosapps/templates/dialog/dialog.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/templates/dialog/dialog.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,17 @@ +<module name="template_dialog" type="win32cui" installname="dialog.exe" warnings="true"> + <include base="template_dialog">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>comctl32</library> + <file>dialog.c</file> + <file>memdlg.c</file> + <file>page1.c</file> + <file>page2.c</file> + <file>page3.c</file> + <file>trace.c</file> +</module> _____ Added: trunk/rosapps/templates/directory.xml --- trunk/rosapps/templates/directory.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/templates/directory.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,8 @@ +<directory name="dialog"> + <xi:include href="dialog/dialog.xml" /> +</directory> + \ No newline at end of file _____ Added: trunk/rosapps/templates/mdi/mdi.xml --- trunk/rosapps/templates/mdi/mdi.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/templates/mdi/mdi.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,14 @@ +<module name="template_mdi" type="win32cui" installname="mdi.exe" warnings="true"> + <include base="template_mdi">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>about.c</file> + <file>framewnd.c</file> + <file>childwnd.c</file> + <file>main.c</file> +</module> _____ Modified: trunk/rosapps/tests/dibtest/makefile --- trunk/rosapps/tests/dibtest/makefile 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/tests/dibtest/makefile 2005-06-15 17:19:52 UTC (rev 15920) @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2004/10/21 05:12:00 sedwards Exp $ +# $Id$ PATH_TO_TOP = ../../../reactos _____ Modified: trunk/rosapps/tests/tmrqueue/makefile --- trunk/rosapps/tests/tmrqueue/makefile 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/tests/tmrqueue/makefile 2005-06-15 17:19:52 UTC (rev 15920) @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.1 2004/10/21 04:48:45 sedwards Exp $ +# $Id$ PATH_TO_TOP = ../../../reactos _____ Added: trunk/rosapps/welcome/welcome.xml --- trunk/rosapps/welcome/welcome.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/welcome/welcome.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,23 @@ +<module name="rosapps_welcome" type="win32cui" installname="welcome.exe"> + <include base="welcome">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>welcome.c</file> + <file>welcome.rc</file> +</module> + +<module name="autorun" type="win32cui" installname="autorun.exe"> + <include base="autorun">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>welcome.c</file> + <file>autorun.rc</file> +</module> _____ Added: trunk/rosapps/winfile/winfile.xml --- trunk/rosapps/winfile/winfile.xml 2005-06-15 17:11:36 UTC (rev 15919) +++ trunk/rosapps/winfile/winfile.xml 2005-06-15 17:19:52 UTC (rev 15920) @@ -0,0 +1,32 @@ +<module name="winfile" type="win32cui" installname="winfile.exe" warnings="true"> + <include base="winfile">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>version</library> + <library>comdlg32</library> + <library>comctl32</library> + <file>about.c</file> + <file>childwnd.c</file> + <file>debug.c</file> + <file>dialogs.c</file> + <file>drivebar.c</file> + <file>entries.c</file> + <file>framewnd.c</file> + <file>listview.c</file> + <file>main.c</file> + <file>network.c</file> + <file>settings.c</file> + <file>shell.c</file> + <file>sort.c</file> + <file>splitpath.c</file> + <file>run.c</file> + <file>trace.c</file> + <file>treeview.c</file> + <file>utils.c</file> + <file>worker.c</file> +</module>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs