Ros-diffs February 2006

ros-diffs@reactos.org

5 participants
47 discussions

by gedmurphy＠svn.reactos.org

add network tools Added: trunk/reactos/base/applications/network/finger/ Added: trunk/reactos/base/applications/network/finger/LICENSE.txt Added: trunk/reactos/base/applications/network/finger/err.c Added: trunk/reactos/base/applications/network/finger/err.h Added: trunk/reactos/base/applications/network/finger/finger.c Added: trunk/reactos/base/applications/network/finger/finger.rbuild Added: trunk/reactos/base/applications/network/finger/finger.rc Added: trunk/reactos/base/applications/network/finger/getopt.c Added: trunk/reactos/base/applications/network/finger/getopt.h Added: trunk/reactos/base/applications/network/finger/net.c Added: trunk/reactos/base/applications/network/finger/various.h Added: trunk/reactos/base/applications/network/ftp/ Added: trunk/reactos/base/applications/network/ftp/cmds.c Added: trunk/reactos/base/applications/network/ftp/cmdtab.c Added: trunk/reactos/base/applications/network/ftp/domacro.c Added: trunk/reactos/base/applications/network/ftp/fake.c Added: trunk/reactos/base/applications/network/ftp/fake.h Added: trunk/reactos/base/applications/network/ftp/ftp.c Added: trunk/reactos/base/applications/network/ftp/ftp.mak Added: trunk/reactos/base/applications/network/ftp/ftp.mak.orig Added: trunk/reactos/base/applications/network/ftp/ftp.rbuild Added: trunk/reactos/base/applications/network/ftp/ftp.rc Added: trunk/reactos/base/applications/network/ftp/ftp_var.h Added: trunk/reactos/base/applications/network/ftp/main.c Added: trunk/reactos/base/applications/network/ftp/pathnames.h Added: trunk/reactos/base/applications/network/ftp/prototypes.h Added: trunk/reactos/base/applications/network/ftp/ruserpass.c Added: trunk/reactos/base/applications/network/ping/ Added: trunk/reactos/base/applications/network/ping/ping.c Added: trunk/reactos/base/applications/network/ping/ping.rbuild Added: trunk/reactos/base/applications/network/ping/ping.rc Added: trunk/reactos/base/applications/network/route/ Added: trunk/reactos/base/applications/network/route/route.c Added: trunk/reactos/base/applications/network/route/route.rbuild Added: trunk/reactos/base/applications/network/route/route.rc Added: trunk/reactos/base/applications/network/telnet/ Added: trunk/reactos/base/applications/network/telnet/Makefile.mingw Added: trunk/reactos/base/applications/network/telnet/doc/ Added: trunk/reactos/base/applications/network/telnet/doc/00readme.avs Added: trunk/reactos/base/applications/network/telnet/doc/bugs.txt Added: trunk/reactos/base/applications/network/telnet/doc/changes.txt Added: trunk/reactos/base/applications/network/telnet/doc/license.txt Added: trunk/reactos/base/applications/network/telnet/doc/options.txt Added: trunk/reactos/base/applications/network/telnet/doc/readme.txt Added: trunk/reactos/base/applications/network/telnet/doc/ssh.txt Added: trunk/reactos/base/applications/network/telnet/resource/ Added: trunk/reactos/base/applications/network/telnet/resource/tnmsg.h Added: trunk/reactos/base/applications/network/telnet/resource/tnmsg.rc Added: trunk/reactos/base/applications/network/telnet/src/ Added: trunk/reactos/base/applications/network/telnet/src/ansiprsr.cpp Added: trunk/reactos/base/applications/network/telnet/src/ansiprsr.h Added: trunk/reactos/base/applications/network/telnet/src/keytrans.cpp Added: trunk/reactos/base/applications/network/telnet/src/keytrans.h Added: trunk/reactos/base/applications/network/telnet/src/stl_bids.h Added: trunk/reactos/base/applications/network/telnet/src/tcharmap.cpp Added: trunk/reactos/base/applications/network/telnet/src/tcharmap.h Added: trunk/reactos/base/applications/network/telnet/src/tconsole.cpp Added: trunk/reactos/base/applications/network/telnet/src/tconsole.h Added: trunk/reactos/base/applications/network/telnet/src/telnet.h Added: trunk/reactos/base/applications/network/telnet/src/tkeydef.cpp Added: trunk/reactos/base/applications/network/telnet/src/tkeydef.h Added: trunk/reactos/base/applications/network/telnet/src/tkeymap.cpp Added: trunk/reactos/base/applications/network/telnet/src/tkeymap.h Added: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp Added: trunk/reactos/base/applications/network/telnet/src/tmapldr.h Added: trunk/reactos/base/applications/network/telnet/src/tmouse.cpp Added: trunk/reactos/base/applications/network/telnet/src/tmouse.h Added: trunk/reactos/base/applications/network/telnet/src/tnclass.cpp Added: trunk/reactos/base/applications/network/telnet/src/tnclass.h Added: trunk/reactos/base/applications/network/telnet/src/tnclip.cpp Added: trunk/reactos/base/applications/network/telnet/src/tnclip.h Added: trunk/reactos/base/applications/network/telnet/src/tncon.cpp Added: trunk/reactos/base/applications/network/telnet/src/tncon.h Added: trunk/reactos/base/applications/network/telnet/src/tnconfig.cpp Added: trunk/reactos/base/applications/network/telnet/src/tnconfig.h Added: trunk/reactos/base/applications/network/telnet/src/tnerror.cpp Added: trunk/reactos/base/applications/network/telnet/src/tnerror.h Added: trunk/reactos/base/applications/network/telnet/src/tnetwork.cpp Added: trunk/reactos/base/applications/network/telnet/src/tnetwork.h Added: trunk/reactos/base/applications/network/telnet/src/tnmain.cpp Added: trunk/reactos/base/applications/network/telnet/src/tnmain.h Added: trunk/reactos/base/applications/network/telnet/src/tnmisc.cpp Added: trunk/reactos/base/applications/network/telnet/src/tnmisc.h Added: trunk/reactos/base/applications/network/telnet/src/tnmsg.h Added: trunk/reactos/base/applications/network/telnet/src/tparams.h Added: trunk/reactos/base/applications/network/telnet/src/tparser.h Added: trunk/reactos/base/applications/network/telnet/src/tscript.cpp Added: trunk/reactos/base/applications/network/telnet/src/tscript.h Added: trunk/reactos/base/applications/network/telnet/src/tscroll.cpp Added: trunk/reactos/base/applications/network/telnet/src/tscroll.h Added: trunk/reactos/base/applications/network/telnet/src/ttelhndl.cpp Added: trunk/reactos/base/applications/network/telnet/src/ttelhndl.h Added: trunk/reactos/base/applications/network/telnet/telnet.cfg Added: trunk/reactos/base/applications/network/telnet/telnet.ico Added: trunk/reactos/base/applications/network/telnet/telnet.ini Added: trunk/reactos/base/applications/network/telnet/telnet.rbuild Added: trunk/reactos/base/applications/network/telnet/telnet.rc Added: trunk/reactos/base/applications/network/whois/ Added: trunk/reactos/base/applications/network/whois/LICENSE.txt Added: trunk/reactos/base/applications/network/whois/whois.c [truncated at 100 lines; 2 more skipped] _____ Added: trunk/reactos/base/applications/network/finger/LICENSE.txt --- trunk/reactos/base/applications/network/finger/LICENSE.txt 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/LICENSE.txt 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,23 @@ +July 22, 1999 + +To All Licensees, Distributors of Any Version of BSD: + +As you know, certain of the Berkeley Software Distribution ("BSD") source code files +require that further distributions of products containing all or portions of the +software, acknowledge within their advertising materials that such products contain +software developed by UC Berkeley and its contributors. + +Specifically, the provision reads: + + * 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. + +Effective immediately, licensees and distributors are no longer required to include +the acknowledgement within advertising materials. Accordingly, the foregoing paragraph +of those BSD Unix files containing it is hereby deleted in its entirety. + +William Hoskins +Director, Office of Technology Licensing +University of California, Berkeley " _____ Added: trunk/reactos/base/applications/network/finger/err.c --- trunk/reactos/base/applications/network/finger/err.c 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/err.c 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,138 @@ +/*- + * Copyright (c) 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. 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. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ + +#include "err.h" +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#ifdef __STDC__ +#include <stdarg.h> +#else +#include <varargs.h> +#endif + +extern char *__progname; /* Program name, from crt0. */ + +void +err(int eval, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verr(eval, fmt, ap); + va_end(ap); +} + +void +verr(int eval, const char *fmt, va_list ap) +{ + int sverrno; + + sverrno = errno; + (void)fprintf(stderr, "%s: ", __progname); + if (fmt != NULL) { + (void)vfprintf(stderr, fmt, ap); + (void)fprintf(stderr, ": "); + } + (void)fprintf(stderr, "%s\n", strerror(sverrno)); + exit(eval); +} + +void +errx(int eval, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verrx(eval, fmt, ap); + va_end(ap); +} + +void +verrx(int eval, const char *fmt, va_list ap) +{ + (void)fprintf(stderr, "%s: ", __progname); + if (fmt != NULL) + (void)vfprintf(stderr, fmt, ap); + (void)fprintf(stderr, "\n"); + exit(eval); +} + +void +warn(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vwarn(fmt, ap); + va_end(ap); +} + +void +vwarn(fmt, ap) + const char *fmt; + va_list ap; +{ + int sverrno; + + sverrno = errno; + (void)fprintf(stderr, "%s: ", __progname); + if (fmt != NULL) { + (void)vfprintf(stderr, fmt, ap); + (void)fprintf(stderr, ": "); + } + (void)fprintf(stderr, "%s\n", strerror(sverrno)); +} + +void +warnx(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vwarnx(fmt, ap); + va_end(ap); +} + +void +vwarnx(fmt, ap) + const char *fmt; + va_list ap; +{ + (void)fprintf(stderr, "%s: ", __progname); + if (fmt != NULL) + (void)vfprintf(stderr, fmt, ap); + (void)fprintf(stderr, "\n"); +} _____ Added: trunk/reactos/base/applications/network/finger/err.h --- trunk/reactos/base/applications/network/finger/err.h 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/err.h 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,60 @@ +/*- + * Copyright (c) 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. 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. + * + * @(#)err.h 8.1 (Berkeley) 6/2/93 + */ + +#ifndef _ERR_H_ +#define _ERR_H_ + +/* + * Don't use va_list in the err/warn prototypes. Va_list is typedef'd in two + * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one + * of them here we may collide with the utility's includes. It's unreasonable + * for utilities to have to include one of them to include err.h, so we get + * _BSD_VA_LIST_ from <machine/ansi.h> and use it. + */ +/*#include <machine/ansi.h>*/ +/*#include <sys/cdefs.h>*/ +#include "various.h" +#include <stdarg.h> + +void err __P((int, const char *, ...)); +void verr __P((int, const char *, va_list)); +void errx __P((int, const char *, ...)); +void verrx __P((int, const char *, va_list)); +void warn __P((const char *, ...)); +void vwarn __P((const char *, va_list)); +void warnx __P((const char *, ...)); +void vwarnx __P((const char *, va_list)); + +#endif /* !_ERR_H_ */ _____ Added: trunk/reactos/base/applications/network/finger/finger.c --- trunk/reactos/base/applications/network/finger/finger.c 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/finger.c 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,178 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Tony Nardo of the Johns Hopkins University/Applied Physics Lab. + * + * 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. + * + * 8/2/97 - Ted Felix <tfelix(a)fred.net> + * Ported to Win32 from 4.4BSD-LITE2 at wcarchive. + * NT Workstation already has finger, and it runs fine under + * Win95. Thought I'd do this anyways since not everyone has + * access to NT. + * Had to remove local handling. Otherwise, same as whois. + */ + +/* + * Finger prints out information about users. It is not portable since + * certain fields (e.g. the full user name, office, and phone numbers) are + * extracted from the gecos field of the passwd file which other UNIXes + * may not have or may use for other things. + * + * There are currently two output formats; the short format is one line + * per user and displays login name, tty, login time, real name, idle time, + * and office location/phone number. The long format gives the same + * information (in a more legible format) as well as home directory, shell, + * mail info, and .plan/.project files. + */ + +#include <winsock2.h> +#include "err.h" +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +#include "various.h" +#include "getopt.h" + +char *__progname; + +time_t now; +int lflag, mflag, pplan, sflag; + +static void userlist(int, char **); +void usage(); + +int +main(int argc, char **argv) +{ + int ch; + + while ((ch = getopt(argc, argv, "lmps")) != EOF) + switch(ch) { + case 'l': + lflag = 1; /* long format */ + break; + case 'm': + mflag = 1; /* force exact match of names */ + break; + case 'p': + pplan = 1; /* don't show .plan/.project */ + break; + case 's': + sflag = 1; /* short format */ + break; + case '?': + default: + (void)fprintf(stderr, + "usage: finger [-lmps] login [...]\n"); + exit(1); + } + argc -= optind; + argv += optind; + + (void)time(&now); + if (!*argv) { + usage(); + } else { + userlist(argc, argv); + /* + * Assign explicit "large" format if names given and -s not + * explicitly stated. Force the -l AFTER we get names so any + * remote finger attempts specified won't be mishandled. + */ + if (!sflag) + lflag = 1; /* if -s not explicit, force -l */ + } + return 0; +} + + +static void +userlist(int argc, char **argv) +{ + int *used; + char **ap, **nargv, **np, **p; + WORD wVersionRequested; + WSADATA wsaData; + int iErr; + + + if ((nargv = malloc((argc+1) * sizeof(char *))) == NULL || + (used = calloc(argc, sizeof(int))) == NULL) + err(1, NULL); + + /* Pull out all network requests into nargv. */ + for (ap = p = argv, np = nargv; *p; ++p) + if (index(*p, '@')) + *np++ = *p; + else + *ap++ = *p; + + *np++ = NULL; + *ap++ = NULL; + + /* If there are local requests */ + if (*argv) + { + fprintf(stderr, "Warning: Can't do local finger\n"); + } + + /* Start winsock */ + wVersionRequested = MAKEWORD( 1, 1 ); + iErr = WSAStartup( wVersionRequested, &wsaData ); + if ( iErr != 0 ) + { + /* Tell the user that we couldn't find a usable */ + /* WinSock DLL. */ + fprintf(stderr, "WSAStartup failed\n"); + return; + } + + /* Handle network requests. */ + for (p = nargv; *p;) + netfinger(*p++); + + /* Bring down winsock */ + WSACleanup(); + exit(0); +} + +void usage() +{ + (void)fprintf(stderr, + "usage: finger [-lmps] login [...]\n"); + exit(1); +} + _____ Added: trunk/reactos/base/applications/network/finger/finger.rbuild --- trunk/reactos/base/applications/network/finger/finger.rbuild 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/finger.rbuild 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <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> + <file>finger.c</file> + <file>err.c</file> + <file>getopt.c</file> + <file>net.c</file> + <file>finger.rc</file> + </module> + </module> +</rbuild> _____ Added: trunk/reactos/base/applications/network/finger/finger.rc --- trunk/reactos/base/applications/network/finger/finger.rc 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/finger.rc 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,6 @@ +/* $Id: finger.rc 12852 2005-01-06 13:58:04Z mf $ */ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 finger\0" +#define REACTOS_STR_INTERNAL_NAME "finger\0" +#define REACTOS_STR_ORIGINAL_FILENAME "finger.exe\0" +#include <reactos/version.rc> _____ Added: trunk/reactos/base/applications/network/finger/getopt.c --- trunk/reactos/base/applications/network/finger/getopt.c 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/getopt.c 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 1987 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. 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. + * + * Fri Jun 13 10:39:00 1997, tfelix(a)fred.net: + * Ported to Win32, changed index/rindex to strchr/strrchr + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)getopt.c 4.13 (Berkeley) 2/23/91"; +#endif /* LIBC_SCCS and not lint */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "getopt.h" + +/* + * get option letter from argument vector + */ +int opterr = 1, /* if error message should be printed */ + optind = 1, /* index into parent argv vector */ + optopt; /* character checked for validity */ +const char *optarg; /* argument associated with option */ + +#define BADCH (int)'?' +#define EMSG "" + +int +getopt(int nargc, char * const *nargv, const char *ostr) +{ + static const char *place = EMSG; /* option letter processing */ + register char *oli; /* option letter list index */ + char *p; + + if (!*place) { /* update scanning pointer */ + if (optind >= nargc || *(place = nargv[optind]) != '-') { + place = EMSG; + return(EOF); + } + if (place[1] && *++place == '-') { /* found "--" */ + ++optind; + place = EMSG; + return(EOF); + } + } /* option letter okay? */ + if ((optopt = (int)*place++) == (int)':' || + !(oli = strchr(ostr, optopt))) { + /* + * if the user didn't specify '-' as an option, + * assume it means EOF. + */ + if (optopt == (int)'-') + return(EOF); + if (!*place) + ++optind; + if (opterr) { + if (!(p = strrchr(*nargv, '/'))) + p = *nargv; + else + ++p; + (void)fprintf(stderr, "%s: illegal option -- %c\n", + p, optopt); + } + return(BADCH); + } + if (*++oli != ':') { /* don't need argument */ + optarg = NULL; + if (!*place) + ++optind; + } + else { /* need an argument */ + if (*place) /* no white space */ + optarg = place; + else if (nargc <= ++optind) { /* no arg */ + place = EMSG; + if (!(p = strrchr(*nargv, '/'))) + p = *nargv; + else + ++p; + if (opterr) + (void)fprintf(stderr, + "%s: option requires an argument -- %c\n", + p, optopt); + return(BADCH); + } + else /* white space */ + optarg = nargv[optind]; + place = EMSG; + ++optind; + } + return(optopt); /* dump back option letter */ +} _____ Added: trunk/reactos/base/applications/network/finger/getopt.h --- trunk/reactos/base/applications/network/finger/getopt.h 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/getopt.h 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,7 @@ +/* getopt.h */ + +extern const char *optarg; +extern int optind; + +int +getopt(int nargc, char * const *nargv, const char *ostr); _____ Added: trunk/reactos/base/applications/network/finger/net.c --- trunk/reactos/base/applications/network/finger/net.c 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/net.c 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,139 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Tony Nardo of the Johns Hopkins University/Applied Physics Lab. + * + * 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. + */ +#include <sys/types.h> +#include <winsock2.h> + +#include <stdio.h> +#include <ctype.h> +#include <string.h> + +#include "various.h" + +int close(int); + +void +netfinger(char *name) +{ + extern int lflag; + char c, lastc; + struct in_addr defaddr; + struct hostent *hp, def; + struct servent *sp; + struct sockaddr_in sin; + SOCKET s; + char *alist[1], *host; + + /* If this is a local request */ + if (!(host = rindex(name, '@'))) + return; + + *host++ = '\0'; + if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != (unsigned long)-1) { + def.h_name = host; + def.h_addr_list = alist; + def.h_addr = (char *)&defaddr; + def.h_length = sizeof(struct in_addr); + def.h_addrtype = AF_INET; + def.h_aliases = 0; + hp = &def; + } else if (!(hp = gethostbyname(host))) { + (void)fprintf(stderr, + "finger: unknown host: %s\n", host); + return; + } + if (!(sp = getservbyname("finger", "tcp"))) { + (void)fprintf(stderr, "finger: tcp/finger: unknown service\n"); + return; + } + sin.sin_family = hp->h_addrtype; + bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length); + sin.sin_port = sp->s_port; + if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) == INVALID_SOCKET) { + perror("finger: socket"); + return; + } + + /* have network connection; identify the host connected with */ + (void)printf("[%s]\n", hp->h_name); + if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) { + fprintf(stderr, "finger: connect rc = %d", WSAGetLastError()); + (void)close(s); + return; + } + + /* -l flag for remote fingerd */ + if (lflag) + send(s, "/W ", 3, 0); + /* send the name followed by <CR><LF> */ + send(s, name, strlen(name), 0); + send(s, "\r\n", 2, 0); + + /* + * Read from the remote system; once we're connected, we assume some + * data. If none arrives, we hang until the user interrupts. + * + * If we see a <CR> or a <CR> with the high bit set, treat it as + * a newline; if followed by a newline character, only output one + * newline. + * + * Otherwise, all high bits are stripped; if it isn't printable and + * it isn't a space, we can simply set the 7th bit. Every ASCII + * character with bit 7 set is printable. + */ + lastc = 0; + while (recv(s, &c, 1, 0) == 1) { + c &= 0x7f; + if (c == 0x0d) { + if (lastc == '\r') /* ^M^M - skip dupes */ + continue; + c = '\n'; + lastc = '\r'; + } else { + if (!isprint(c) && !isspace(c)) + c |= 0x40; + if (lastc != '\r' || c != '\n') + lastc = c; + else { + lastc = '\n'; + continue; + } + } + putchar(c); + } + if (lastc != '\n') + putchar('\n'); + putchar('\n'); +} _____ Added: trunk/reactos/base/applications/network/finger/various.h --- trunk/reactos/base/applications/network/finger/various.h 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/finger/various.h 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,36 @@ +// Various things you need when porting BSD and GNU utilities to +// Win32. + +#ifndef VARIOUS_H +#define VARIOUS_H + + +typedef float f4byte_t; +typedef double f8byte_t; +typedef long uid_t; // SunOS 5.5 + +#define __P(x) x + +/* utmp.h */ +#define UT_LINESIZE 8 +#define UT_HOSTSIZE 16 + +/* stat.h */ +#define S_ISREG(mode) (((mode)&0xF000) == 0x8000) +#define S_ISDIR(mode) (((mode)&0xF000) == 0x4000) + +#undef MIN //take care of windows default +#undef MAX //take care of windows default +#define MIN(a, b) ((a) <= (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + +#define bcopy(s1, s2, n) memmove(s2, s1, n) +#define bcmp(s1, s2, n) (memcmp(s1, s2, n) != 0) +#define bzero(s, n) memset(s, 0, n) + +#define index(s, c) strchr(s, c) +#define rindex(s, c) strrchr(s, c) + +void netfinger(char *); + +#endif _____ Added: trunk/reactos/base/applications/network/ftp/cmds.c --- trunk/reactos/base/applications/network/ftp/cmds.c 2006-02-04 12:21:58 UTC (rev 85) +++ trunk/reactos/base/applications/network/ftp/cmds.c 2006-02-04 12:39:36 UTC (rev 86) @@ -0,0 +1,2373 @@ +/* + * Copyright (c) 1985, 1989 Regents of the University of California. + * All rights reserved. + * + * Redistribution and use in source and binary forms are permitted + * provided that the above copyright notice and this paragraph are + * duplicated in all such forms and that any documentation, + * advertising materials, and other materials related to such + * distribution and use acknowledge that the software was developed + * by the University of California, Berkeley. The name of the + * University may not be used to endorse or promote products derived + * from this software without specific prior written permission. + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + +#ifndef lint +static char sccsid[] = "@(#)cmds.c 5.18 (Berkeley) 4/20/89"; +#endif /* not lint */ + +/* + * FTP User Program -- Command Routines. + */ +//#include <sys/param.h> +//#include <sys/wait.h> +#include <sys/stat.h> +#ifndef _WIN32 +#include <sys/socket.h> +#include <arpa/ftp.h> +#include <netinet/in.h> +#include <netdb.h> +#else +#include <winsock.h> +#endif + +#include <signal.h> +#include <direct.h> +#include <stdio.h> +#include <errno.h> +#include <ctype.h> +#include <time.h> + +#include "ftp_var.h" +#include "pathnames.h" +#include "prototypes.h" + +extern char *globerr; +extern char home[]; +extern char *remglob(); +extern char *getenv(); +extern int allbinary; +extern off_t restart_point; +extern char reply_string[]; + +const char *mname; +jmp_buf jabort; +const char *dotrans(), *domap(); + +extern short portnum; +extern char *hostname; +extern int autologin; +/* + * Connect to peer server and + * auto-login, if possible. + */ +void setpeer(int argc, const char *argv[]) +{ + char *host; + + if (connected) { + printf("Already connected to %s, use close first.\n", + hostname); + (void) fflush(stdout); + code = -1; + return; + } + if (argc < 2) { + (void) strcat(line, " "); + printf("(to) "); + (void) fflush(stdout); + (void) gets(&line[strlen(line)]); + makeargv(); + argc = margc; + argv = margv; + } + if (argc > 3) { + printf("usage: %s host-name [port]\n", argv[0]); + (void) fflush(stdout); + code = -1; + return; + } + if (argc > 2) { + portnum = atoi(argv[2]); + if (portnum <= 0) { + printf("%s: bad port number-- %s\n", argv[1], argv[2]); + printf ("usage: %s host-name [port]\n", argv[0]); + (void) fflush(stdout); + code = -1; + return; + } + portnum = htons(portnum); + } + host = hookup(argv[1], portnum); + if (host) { +#if defined(unix) && NBBY == 8 + int overbose; +#endif + connected = 1; + if (autologin) + (void) login(argv[1]); + +#if defined(unix) && NBBY == 8 +/* + * this ifdef is to keep someone form "porting" this to an incompatible + * system and not checking this out. This way they have to think about it. + */ + overbose = verbose; + if (debug == 0) + verbose = -1; + allbinary = 0; + if (command("SYST") == COMPLETE && overbose) { + register char *cp, c; + cp = index(reply_string+4, ' '); + if (cp == NULL) + cp = index(reply_string+4, '\r'); + if (cp) { + if (cp[-1] == '.') + cp--; + c = *cp; + *cp = '\0'; + } + + printf("Remote system type is %s.\n", + reply_string+4); + if (cp) + *cp = c; + } + if (!strncmp(reply_string, "215 UNIX Type: L8", 17)) { + setbinary(); + /* allbinary = 1; this violates the RFC */ + if (overbose) + printf("Using %s mode to transfer files.\n", + typename); + } else if (overbose && + !strncmp(reply_string, "215 TOPS20", 10)) { + printf( +"Remember to set tenex mode when transfering binary files from this machine.\n"); + } + verbose = overbose; +#endif /* unix */ + } + (void) fflush(stdout); +} + +struct types { + const char *t_name; + const char *t_mode; + int t_type; + char *t_arg; +} types[] = { + { "ascii", "A", TYPE_A, 0 }, + { "binary", "I", TYPE_I, 0 }, + { "image", "I", TYPE_I, 0 }, + { "ebcdic", "E", TYPE_E, 0 }, + { "tenex", "L", TYPE_L, bytename }, + {0 } +}; + +/* + * Set transfer type. + */ +void settype(argc, argv) + const char *argv[]; +{ + register struct types *p; + int comret; + + if (argc > 2) { + const char *sep; + + printf("usage: %s [", argv[0]); + sep = " "; + for (p = types; p->t_name; p++) { + printf("%s%s", sep, p->t_name); + if (*sep == ' ') + sep = " | "; + } + printf(" ]\n"); + (void) fflush(stdout); + code = -1; + return; + } + if (argc < 2) { + printf("Using %s mode to transfer files.\n", typename); + (void) fflush(stdout); + code = 0; + return; + } + for (p = types; p->t_name; p++) + if (strcmp(argv[1], p->t_name) == 0) + break; + if (p->t_name == 0) { + printf("%s: unknown mode\n", argv[1]); + (void) fflush(stdout); + code = -1; + return; + } + if ((p->t_arg != NULL) && (*(p->t_arg) != '\0')) + comret = command ("TYPE %s %s", p->t_mode, p->t_arg); + else + comret = command("TYPE %s", p->t_mode); + if (comret == COMPLETE) { + (void) strcpy(typename, p->t_name); + type = p->t_type; + } +} + +const char *stype[] = { + "type", [truncated at 1000 lines; 22260 more skipped]

18 years, 7 months

[gedmurphy] 85: what would we do without solitaire and winemine !!!

by gedmurphy＠svn.reactos.org

what would we do without solitaire and winemine !!! Added: trunk/reactos/base/applications/games/directory.rbuild Added: trunk/reactos/base/applications/games/solitaire/ Added: trunk/reactos/base/applications/games/solitaire/ReadMe.txt Added: trunk/reactos/base/applications/games/solitaire/cardlib/ Added: trunk/reactos/base/applications/games/solitaire/cardlib/card.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardcolor.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardcolor.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardcount.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardcount.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardlib.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardregion.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardstack.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardstack.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/dropzone.cpp Added: trunk/reactos/base/applications/games/solitaire/cardlib/dropzone.h Added: trunk/reactos/base/applications/games/solitaire/cardlib/globals.h Added: trunk/reactos/base/applications/games/solitaire/icon1.ico Added: trunk/reactos/base/applications/games/solitaire/resource.h Added: trunk/reactos/base/applications/games/solitaire/sol.rc Added: trunk/reactos/base/applications/games/solitaire/solcreate.cpp Added: trunk/reactos/base/applications/games/solitaire/solgame.cpp Added: trunk/reactos/base/applications/games/solitaire/solitaire.cpp Added: trunk/reactos/base/applications/games/solitaire/solitaire.h Added: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Added: trunk/reactos/base/applications/games/winemine/ Added: trunk/reactos/base/applications/games/winemine/De.rc Added: trunk/reactos/base/applications/games/winemine/En.rc Added: trunk/reactos/base/applications/games/winemine/README Added: trunk/reactos/base/applications/games/winemine/dialog.c Added: trunk/reactos/base/applications/games/winemine/dialog.h Added: trunk/reactos/base/applications/games/winemine/main.c Added: trunk/reactos/base/applications/games/winemine/main.h Added: trunk/reactos/base/applications/games/winemine/rc/ Added: trunk/reactos/base/applications/games/winemine/rc/Thumbs.db Added: trunk/reactos/base/applications/games/winemine/rc/faces.bmp Added: trunk/reactos/base/applications/games/winemine/rc/leds.bmp Added: trunk/reactos/base/applications/games/winemine/rc/mines.bmp Added: trunk/reactos/base/applications/games/winemine/rc/winemine.ico Added: trunk/reactos/base/applications/games/winemine/resource.h Added: trunk/reactos/base/applications/games/winemine/winemine.rbuild Added: trunk/reactos/base/applications/games/winemine/winemine.rc _____ Added: trunk/reactos/base/applications/games/directory.rbuild --- trunk/reactos/base/applications/games/directory.rbuild 2006-02-04 10:04:41 UTC (rev 84) +++ trunk/reactos/base/applications/games/directory.rbuild 2006-02-04 12:21:58 UTC (rev 85) @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <group> + + </group> +</rbuild> _____ Added: trunk/reactos/base/applications/games/solitaire/ReadMe.txt --- trunk/reactos/base/applications/games/solitaire/ReadMe.txt 2006-02-04 10:04:41 UTC (rev 84) +++ trunk/reactos/base/applications/games/solitaire/ReadMe.txt 2006-02-04 12:21:58 UTC (rev 85) @@ -0,0 +1,22 @@ +Solitaire for ReactOS + +/***************************************** +A complete working example of the CardLib +card-game library. + +Freeware +Copyright J Brown 2001 + +Updates at http://www.catch22.net + +******************************************/ + +The author has given permission to use these sources +under Public Domain. Do what thou will but please give +credit where credit is due. + +If you wish to use cardlib to write another card game +for ReactOS please make cardlib a static lib. + +-sedwards + _____ Added: trunk/reactos/base/applications/games/solitaire/cardlib/card.h --- trunk/reactos/base/applications/games/solitaire/cardlib/card.h 2006-02-04 10:04:41 UTC (rev 84) +++ trunk/reactos/base/applications/games/solitaire/cardlib/card.h 2006-02-04 12:21:58 UTC (rev 85) @@ -0,0 +1,105 @@ +// +// CardLib - Card class +// +// Freeware +// Copyright J Brown 2001 +// + +#ifndef _CARD_INCLUDED +#define _CARD_INCLUDED + +enum eSuit { Clubs = 0, Diamonds = 1, Hearts = 2, Spades = 3 }; +enum eValue { Ace = 1, Two = 2, Three = 3, Four = 4, Five = 5, Six = 6, Seven = 7, + Eight = 8, Nine = 9, Ten = 10, Jack = 11, Queen = 12, King = 13 }; + +inline int MAKE_CARD(int Value, int Suit) +{ + if(Value < 1) Value = 1; + if(Value == 14) Value = 1; + if(Value > 13) Value = 13; + + if(Suit < 0) Suit = 0; + if(Suit > 3) Suit = 3; + + return ((Value - 1) * 4 + Suit); +} + +class Card +{ + friend class CardStack; + +public: + + Card() + { + nValue = 0; //ace of spades by default + fFaceUp = true; + } + + Card(int value, int suit) //specify a face value [1-13] and suit [0-3] + { + nValue = MAKE_CARD(value, suit); + fFaceUp = true; + } + + Card(int index) //specify a 0-51 index + { + if(index < 0) index = 0; + if(index > 51) index = 51; + + nValue = index; + fFaceUp = true; + } + + int Suit() const + { + return (nValue % 4); + } + + int LoVal() const + { + return (nValue / 4) + 1; + } + + int HiVal() const + { + return ((nValue < 4) ? 14 : (nValue / 4) + 1); + } + + int Idx() const //unique value (0-51 etc) + { + return nValue; + } + + bool FaceUp() const + { + return fFaceUp; + } + + bool FaceDown() const + { + return !fFaceUp; + } + + void SetFaceUp(bool fTrue) + { + fFaceUp = fTrue; + } + + bool IsBlack() const + { + return Suit() == 0 || Suit() == 3; + } + + bool IsRed() const + { + return !IsBlack(); + } + +private: + + int nValue; + bool fFaceUp; +}; + +#endif _____ Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp 2006-02-04 10:04:41 UTC (rev 84) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp 2006-02-04 12:21:58 UTC (rev 85) @@ -0,0 +1,281 @@ +// +// CardLib - Card bitmap support +// +// Freeware +// Copyright J Brown 2001 +// +#include <windows.h> +#include "globals.h" +#include "cardcolor.h" + +#ifndef __REACTOS__ +#pragma comment( lib, "..\\CardLib\\cards16.lib" ) + +extern "C" HINSTANCE WINAPI LoadLibrary16( PSTR ); +extern "C" void WINAPI FreeLibrary16( HINSTANCE ); +#endif + +#define NUMCARDBITMAPS (52+16) + +void PaintRect(HDC hdc, RECT *rect, COLORREF col); + +void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight) +{ + HBITMAP hBitmap; + HDC hdcCard = NULL; + HANDLE hOld; + int i, xpos; + int width, height; + BITMAP bmp; + + for(i = 0; i < NUMCARDBITMAPS; i++) + { + //convert into the range used by the cdt_xxx functions + int val; + + if(i < 52) val = (i % 4) * 13 + (i/4); + else val = i; + + hBitmap = LoadBitmap(hCardDll, MAKEINTRESOURCE(val + 1)); + GetObject(hBitmap, sizeof(bmp), &bmp); + + width = bmp.bmWidth; + height = bmp.bmHeight; + + if(i == 0) //if first time through, create BIG bitmap.. + { + HDC hdc = GetDC(0); + __hdcCardBitmaps = CreateCompatibleDC(hdc); + __hbmCardBitmaps = CreateCompatibleBitmap(hdc, width * NUMCARDBITMAPS, height); + SelectObject(__hdcCardBitmaps, __hbmCardBitmaps); + + hdcCard = CreateCompatibleDC(0); + + ReleaseDC(0, hdc); + } + + hOld = SelectObject(hdcCard, hBitmap); + BitBlt(__hdcCardBitmaps, i*width, 0, width, height, hdcCard, 0, 0, SRCCOPY); + SelectObject(hdcCard, hOld); + + //Now draw a black border around each card... + xpos = i*width; + MoveToEx(__hdcCardBitmaps, xpos+2, 0, 0); + LineTo(__hdcCardBitmaps, xpos+width - 3, 0); + LineTo(__hdcCardBitmaps, xpos+width - 1, 2); + LineTo(__hdcCardBitmaps, xpos+width - 1, height - 3); //vertical + LineTo(__hdcCardBitmaps, xpos+width - 3, height - 1); + LineTo(__hdcCardBitmaps, xpos+2, height - 1); + LineTo(__hdcCardBitmaps, xpos+0, height - 3); + LineTo(__hdcCardBitmaps, xpos+0, 2); + LineTo(__hdcCardBitmaps, xpos+2, 0); + + DeleteObject(hBitmap); + } + + DeleteDC(hdcCard); + + *pwidth = width; + *pheight = height; + +} + +void LoadCardBitmaps(void) +{ + HINSTANCE hCardDll; + + + //If Windows NT/2000/XP + if(GetVersion() < 0x80000000) + { + hCardDll = LoadLibrary("cards.dll"); + + if(hCardDll == 0) + { + MessageBox(0, "Error loading cards.dll (32bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); + PostQuitMessage(0); + return; + } + + LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); + + FreeLibrary(hCardDll); + } +#ifndef __REACTOS__ + //Else, Win9X + else + { + hCardDll = LoadLibrary16("cards.dll"); + + if(hCardDll == 0) + { + MessageBox(0, "Error loading cards.dll (16bit)", "Shed", MB_OK | MB_ICONEXCLAMATION); + PostQuitMessage(0); + return; + } + + LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); + + FreeLibrary16(hCardDll); + } +#endif +} + +void FreeCardBitmaps() +{ + DeleteObject (__hbmCardBitmaps); + DeleteDC (__hdcCardBitmaps); +} +// +// Paint a checkered rectangle, with each alternate +// pixel being assigned a different colour +// +static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg) +{ + static WORD wCheckPat[8] = + { + 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 + }; + + HBITMAP hbmp; + HBRUSH hbr, hbrold; + COLORREF fgold, bgold; + + hbmp = CreateBitmap(8, 8, 1, 1, wCheckPat); + hbr = CreatePatternBrush(hbmp); + + //UnrealizeObject(hbr); + + SetBrushOrgEx(hdc, rect->left, rect->top, 0); + + hbrold = (HBRUSH)SelectObject(hdc, hbr); + + fgold = SetTextColor(hdc, fg); + bgold = SetBkColor(hdc, bg); + + PatBlt(hdc, rect->left, rect->top, + rect->right - rect->left, + rect->bottom - rect->top, + PATCOPY); + + SetBkColor(hdc, bgold); + SetTextColor(hdc, fgold); + + SelectObject(hdc, hbrold); + DeleteObject(hbr); + DeleteObject(hbmp); +} + +void GetSinkCols(COLORREF crBase, COLORREF *fg, COLORREF *bg, COLORREF *sh1, COLORREF *sh2) +{ + if(bg) *bg = crBase; + if(fg) *fg = ColorScaleRGB(crBase, RGB(255,255,255), 0.2);//RGB(49, 99, 140); + if(sh1) *sh1 = ColorScaleRGB(crBase, RGB(0,0,0), 0.4); + if(sh2) *sh2 = ColorScaleRGB(crBase, RGB(0,0,0), 0.2); +} + +HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, COLORREF col, int width, int height) +{ + HANDLE hold, hpold; + HBITMAP hbm = CreateCompatibleBitmap(hdcCompat, width, height); + + HPEN hpfg, hpbg, hpsh, hpsh2; + + RECT rect; + COLORREF fg, bg, shadow, shadow2; + + GetSinkCols(col, &fg, &bg, &shadow, &shadow2); + + hold = SelectObject(hdc, hbm); + + //fill with a solid base colour + SetRect(&rect, 0,0,width,height); + PaintRect(hdc, &rect, MAKE_PALETTERGB(bg)); + + //draw the outline + hpfg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(fg)); + hpbg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(bg)); + hpsh = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow)); + hpsh2= CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow2)); + + hpold = SelectObject(hdc, hpsh); + MoveToEx(hdc, 2, 0, NULL); + LineTo (hdc, width-3,0); + LineTo (hdc, width-1, 2); + + SelectObject(hdc, hpold); + hpold = SelectObject(hdc, hpsh2); + LineTo (hdc, width-1, height-3); //vertical + LineTo (hdc, width-3, height-1); + LineTo (hdc, 2, height-1); + LineTo (hdc, 0, height-3); + SelectObject(hdc, hpold); + hpold = SelectObject(hdc, hpsh); + + //MoveToEx( hdc, 0, height-3,0); + LineTo (hdc, 0, 2); + LineTo (hdc, 2, 0); + + SelectObject(hdc, hpold); + + //draw the highlight (vertical) + hpold = SelectObject(hdc, hpfg); + MoveToEx(hdc, width - 2, 3, NULL); + LineTo (hdc, width - 2, height - 2); + + //(horz) + MoveToEx(hdc, width - 3, height-2, NULL); + LineTo (hdc, 3, height-2); + SelectObject(hdc, hpold); + + //draw the background + InflateRect(&rect, -2, -2); + DrawCheckedRect(hdc, &rect, MAKE_PALETTERGB(bg), MAKE_PALETTERGB(fg)); + + //overwrite the top-left background pixel + SetPixel(hdc, 2, 2, MAKE_PALETTERGB(bg)); + + DeleteObject(hpsh); + DeleteObject(hpsh2); + DeleteObject(hpfg); + DeleteObject(hpbg); + + + return hbm; +} + + + +void CopyColor(PALETTEENTRY *pe, COLORREF col) +{ + pe->peBlue = GetBValue(col); + pe->peGreen = GetGValue(col); + pe->peRed = GetRValue(col); + pe->peFlags = 0; +} + +HPALETTE MakePaletteFromCols(COLORREF cols[], int nNumColours) +{ + LOGPALETTE *lp; + HPALETTE hPalette; + + // Allocate memory for the logical palette + lp = (LOGPALETTE *)HeapAlloc( + GetProcessHeap(), 0, sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * nNumColours); + + lp->palNumEntries = nNumColours; + lp->palVersion = 0x300; + + //copy the colours into the logical palette format + for(int i = 0; i < nNumColours; i++) + { + CopyColor(&lp->palPalEntry[i], cols[i]); + } + + // create palette! + hPalette = CreatePalette(lp); + + HeapFree(GetProcessHeap(), 0, lp); + + return hPalette; +} _____ Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp 2006-02-04 10:04:41 UTC (rev 84) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp 2006-02-04 12:21:58 UTC (rev 85) @@ -0,0 +1,489 @@ +// +// CardLib - CardButton class +// +// Freeware +// Copyright J Brown 2001 +// +#include <windows.h> +#include <tchar.h> + +#include "cardlib.h" +#include "cardwindow.h" +#include "cardbutton.h" +#include "cardcolor.h" + +HPALETTE UseNicePalette(HDC, HPALETTE); +void RestorePalette(HDC, HPALETTE); + +void PaintRect(HDC hdc, RECT *rect, COLORREF colour); + +CardButton::CardButton(CardWindow &parent, int Id, TCHAR *szText, UINT Style, bool visible, + int x, int y, int width, int height) + + : parentWnd(parent), id(Id), uStyle(Style), fVisible(visible), ButtonCallback(0) +{ + crText = RGB(255,255,255); + crBack = RGB(0, 128, 0); + + xadjust = 0; + yadjust = 0; + xjustify = 0; + yjustify = 0; + + fMouseDown = false; + fButtonDown = false; + + hIcon = 0; + + SetText(szText); + Move(x, y, width, height); + + mxlock = CreateMutex(0, FALSE, 0); + + hFont = 0; +} + +CardButton::~CardButton() +{ + CloseHandle(mxlock); +} + +void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal) +{ + RECT fill; + + HANDLE hOld; + + HPEN hhi = CreatePen(0, 0, MAKE_PALETTERGB(crHighlight)); + HPEN hsh = CreatePen(0, 0, MAKE_PALETTERGB(crShadow)); + HPEN hbl = (HPEN)GetStockObject(BLACK_PEN); + + int x = rect->left; + int y = rect->top; + int width = rect->right-rect->left - 1; + int height = rect->bottom-rect->top - 1; + + SetRect(&fill, x+1, y+1, x+width-1, y+height-1); + + int one = 1; + + if(!fNormal) + { + x += width; + y += height; + width = -width; + height = -height; + one = -1; + OffsetRect(&fill, 1, 1); + } + + if(fNormal) + hOld = SelectObject(hdc, hhi); + else + hOld = SelectObject(hdc, hhi); + + MoveToEx(hdc, x, y+height, 0); + LineTo(hdc, x, y); + LineTo(hdc, x+width, y); + SelectObject(hdc, hOld); + + hOld = SelectObject(hdc, hbl); + LineTo(hdc, x+width, y+height); + LineTo(hdc, x-one, y+height); + SelectObject(hdc, hOld); + + hOld = SelectObject(hdc, hsh); + MoveToEx(hdc, x+one, y+height-one, 0); + LineTo(hdc, x+width-one, y+height-one); + LineTo(hdc, x+width-one, y); + SelectObject(hdc, hOld); + + PaintRect(hdc, &fill, MAKE_PALETTERGB(crBack)); + + DeleteObject(hhi); + DeleteObject(hsh); +} + +void CardButton::Clip(HDC hdc) +{ + if(fVisible == false) return; + + ExcludeClipRect(hdc, rect.left, rect.top, rect.right, rect.bottom); +} + +void CardButton::Draw(HDC hdc, bool fNormal) +{ + SIZE textsize; + int x, y; //text x, y + int ix, iy; //icon x, y + int iconwidth = 0; + + RECT cliprect; + + if(fVisible == 0) return; + + if(hFont == 0) + SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); + else + SelectObject(hdc, hFont); + + GetTextExtentPoint32(hdc, szText, lstrlen(szText), &textsize); + + if(hIcon) + { + x = rect.left + 32 + 8; + } + else + { + if(uStyle & CB_ALIGN_LEFT) + { + x = rect.left + iconwidth; + } + else if(uStyle & CB_ALIGN_RIGHT) + { + x = rect.left + (rect.right-rect.left-iconwidth-textsize.cx); + } + else //centered + { + x = rect.right - rect.left - iconwidth; + x = (x - textsize.cx) / 2; + x += rect.left + iconwidth; + } + } + + y = rect.bottom - rect.top; + y = (y - textsize.cy) / 2; + y += rect.top; + + //calc icon position.. + ix = rect.left + 4; + iy = rect.top + (rect.bottom-rect.top-32) / 2; + + //if button is pressed, then shift text + if(fNormal == false && (uStyle & CB_PUSHBUTTON)) + { + x += 1; + y += 1; + ix += 1; + iy += 1; + } + + SetRect(&cliprect, x, y, x+textsize.cx, y+textsize.cy); + ExcludeClipRect(hdc, x, y, x+textsize.cx, y+textsize.cy); + + // + // Calc icon pos + // + + if(hIcon) + { + ExcludeClipRect(hdc, ix, iy, ix + 32, iy + 32); + } + + if(uStyle & CB_PUSHBUTTON) + { + DrawRect(hdc, &rect, fNormal); + + SetBkColor(hdc, MAKE_PALETTERGB(crBack)); + SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); + + SelectClipRgn(hdc, 0); + + ExtTextOut(hdc, x, y, ETO_OPAQUE, &cliprect, szText, lstrlen(szText), 0); + } + else + { + SetBkColor(hdc, MAKE_PALETTERGB(crBack)); + SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); + + SelectClipRgn(hdc, 0); + + ExtTextOut(hdc, x, y, ETO_OPAQUE, &rect, szText, lstrlen(szText), 0); + } + + if(hIcon) + { + HBRUSH hbr = CreateSolidBrush(MAKE_PALETTERGB(crBack)); + DrawIconEx(hdc, ix, iy, hIcon, 32, 32, 0, hbr, 0); + DeleteObject(hbr); + } + +} + +void CardButton::AdjustPosition(int winwidth, int winheight) +{ + int width = rect.right-rect.left; + int height = rect.bottom-rect.top; + + width = width & ~0x1; + + switch(xjustify) + { + case CS_XJUST_NONE: + break; + + case CS_XJUST_CENTER: //centered + rect.left = (winwidth - (width)) / 2; + rect.left += xadjust; + rect.right = rect.left+width; + break; + + case CS_XJUST_RIGHT: //right-aligned + rect.left = winwidth - width; + rect.left += xadjust; + rect.right = rect.left+width; + break; + } + + switch(yjustify) + { + case CS_YJUST_NONE: + break; + + case CS_YJUST_CENTER: //centered + rect.top = (winheight - (height)) / 2; + rect.top += yadjust; + rect.bottom = rect.top+height; + break; + + case CS_YJUST_BOTTOM: //right-aligned + rect.top = winheight - height; + rect.top += yadjust; + rect.bottom = rect.top+height; + break; + } + +} + +int CardButton::OnLButtonDown(HWND hwnd, int x, int y) +{ + if((uStyle & CB_PUSHBUTTON) == 0) + return 0; + + //make sure that the user is allowed to do something + if(WaitForSingleObject(mxlock, 0) != WAIT_OBJECT_0) + { + return 0; + } + else + { + ReleaseMutex(mxlock); + } + + fMouseDown = true; + fButtonDown = true; + + Redraw(); + + SetCapture(hwnd); + + return 1; +} + +int CardButton::OnMouseMove(HWND hwnd, int x, int y) +{ + if(fMouseDown) + { + bool fOldButtonDown = fButtonDown; + + POINT pt; + + pt.x = x; + pt.y = y; + + if(PtInRect(&rect, pt)) + fButtonDown = true; + else + fButtonDown = false; + + if(fButtonDown != fOldButtonDown) + Redraw(); + } + + return 0; +} + +int CardButton::OnLButtonUp(HWND hwnd, int x, int y) +{ + if(fMouseDown) + { + fMouseDown = false; + fButtonDown = false; + + if(uStyle & CB_PUSHBUTTON) + { + Redraw(); + ReleaseCapture(); + } + + //if have clicked the button + if(parentWnd.CardButtonFromPoint(x, y) == this) + { + if(ButtonCallback) + { + ButtonCallback(*this); + } + else + { + HWND hwnd = (HWND)parentWnd; + SendMessage(GetParent(hwnd), WM_COMMAND, MAKEWPARAM(id, BN_CLICKED), (LONG)hwnd); + } + } + } + + return 0; +} + +#define _countof(array) (sizeof(array)/sizeof(array[0])) + +CardButton *CardWindow::CreateButton(int id, TCHAR *szText, UINT uStyle, bool fVisible, int x, int y, int width, int height) +{ + CardButton *cb; + + if(nNumButtons == MAXBUTTONS) + return 0; + + cb = new CardButton(*this, id, szText, uStyle, fVisible, x, y, width, height); + Buttons[nNumButtons++] = cb; + + if(uStyle & CB_PUSHBUTTON) + { + cb->SetBackColor(CardButton::GetFace(crBackgnd)); + //cb->SetBackColor(ScaleLumRGB(crBackgnd, 0.1)); + cb->SetForeColor(RGB(255,255,255)); + } + else + { + cb->SetBackColor(crBackgnd); + cb->SetForeColor(RGB(255,255,255)); + } + + return cb; +} + +void CardButton::SetText(TCHAR *lpszFormat, ...) +{ + int count; + + va_list args; + va_start(args, lpszFormat); + + count = wvsprintf(szText, lpszFormat, args); + va_end(args); +} + +int CardButton::Id() +{ + return id; +} + +void CardButton::Show(bool fShow) +{ + fVisible = fShow; +} + +void CardButton::Move(int x, int y, int width, int height) +{ + SetRect(&rect, x, y, x+width, y+height); +} + +void CardButton::Redraw() +{ + HDC hdc = GetDC((HWND)parentWnd); + + HPALETTE hOldPal = UseNicePalette(hdc, __hPalette); + + Draw(hdc, !fButtonDown); + + RestorePalette(hdc, hOldPal); + + ReleaseDC((HWND)parentWnd, hdc); +} + +void CardButton::SetForeColor(COLORREF cr) +{ + crText = cr; +} + +void CardButton::SetBackColor(COLORREF cr) +{ + crBack = cr; + + crHighlight = GetHighlight(cr); + crShadow = GetShadow(cr); + + //crHighlight = ScaleLumRGB(cr, +0.25); + //crShadow = ScaleLumRGB(cr, -0.25); +} + +// Static member +COLORREF CardButton::GetHighlight(COLORREF crBase) +{ + return ColorScaleRGB(crBase, RGB(255,255,255), 0.25); +} + +// Static member +COLORREF CardButton::GetShadow(COLORREF crBase) +{ + return ColorScaleRGB(crBase, RGB(0, 0, 0), 0.25); +} + +COLORREF CardButton::GetFace(COLORREF crBase) +{ + return ColorScaleRGB(crBase, RGB(255,255,255), 0.1); +} + +void CardButton::SetPlacement(UINT xJustify, UINT yJustify, int xAdjust, int yAdjust) +{ + xadjust = xAdjust; + yadjust = yAdjust; + xjustify = xJustify; + yjustify = yJustify; +} + +void CardButton::SetIcon(HICON hicon, bool fRedraw) +{ + hIcon = hicon; + + if(fRedraw) + Redraw(); +} + +void CardButton::SetFont(HFONT font) +{ + //don't delete the existing font.. + hFont = font; +} + +void CardButton::SetButtonProc(pButtonProc proc) +{ + ButtonCallback = proc; +} + +bool CardButton::Lock() +{ + DWORD dw = WaitForSingleObject(mxlock, 0); + + if(dw == WAIT_OBJECT_0) + return true; + else + return false; +} + +bool CardButton::UnLock() +{ + if(ReleaseMutex(mxlock)) + return true; + else + return false; +} + +void CardButton::SetStyle(UINT style) +{ + uStyle = style; +} + +UINT CardButton::GetStyle() +{ + return uStyle; +} _____ Added: trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.h --- trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.h 2006-02-04 10:04:41 UTC (rev 84) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardbutton.h 2006-02-04 12:21:58 UTC (rev 85) @@ -0,0 +1,101 @@ +#ifndef CARDBUTTON_INCLUDED +#define CARDBUTTON_INCLUDED + +#define MAXBUTTONTEXT 64 + +#include "cardlib.h" + +class CardButton +{ + friend class CardWindow; + + // + // Constructor is PRIVATE - only a + // CardWindow can create buttons! + // + CardButton(CardWindow &parent, int id, TCHAR *szText, UINT style, bool visible, + int x, int y, int width, int height); + + ~CardButton(); + +public: + + void SetStyle(UINT uStyle); + UINT GetStyle(); + + void SetText(TCHAR *fmt, ...); + void SetFont(HFONT font); + + void SetPlacement(UINT xJustify, UINT yJustify, int xAdjust, int yAdjust); + + void SetForeColor(COLORREF cr); + void SetBackColor(COLORREF cr); + + void Move(int x, int y, int width, int height); + void Show(bool fShow); + void Redraw(); + int Id(); + + void SetIcon(HICON hicon, bool fRedraw); + + void SetButtonProc(pButtonProc proc); + + CardWindow &GetCardWindow() { return parentWnd; } + + bool Lock(); + bool UnLock(); + + static COLORREF GetHighlight(COLORREF crBase); + static COLORREF GetShadow(COLORREF crBase); + static COLORREF GetFace(COLORREF crBase); + +private: + + // + // Private member functions + // + void AdjustPosition(int winwidth, int winheight); + + void DrawRect(HDC hdc, RECT *rect, bool fNormal); [truncated at 1000 lines; 7027 more skipped]

18 years, 7 months

[martinf] 84: winefile-Sync to Wine:

by martinf＠svn.reactos.org

winefile-Sync to Wine: Aric Stewart <aric(a)codeweavers.com> winefile: Highlight the file specified on the command line instead of filtering based on it. To be integrated with explorer to allow for that functionality. Mike McCormack <mike(a)codeweavers.com> winefile: Move the license and warranty text into the resources. Modified: trunk/reactos/base/applications/winefile/en.rc Deleted: trunk/reactos/base/applications/winefile/license.c Modified: trunk/reactos/base/applications/winefile/resource.h Modified: trunk/reactos/base/applications/winefile/winefile.c Modified: trunk/reactos/base/applications/winefile/winefile.dsp Modified: trunk/reactos/base/applications/winefile/winefile.h Modified: trunk/reactos/base/applications/winefile/winefile.sln Modified: trunk/reactos/base/applications/winefile/winefile.vcproj _____ Modified: trunk/reactos/base/applications/winefile/en.rc --- trunk/reactos/base/applications/winefile/en.rc 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/en.rc 2006-02-04 10:04:41 UTC (rev 84) @@ -264,3 +264,27 @@ IDS_FREE_SPACE_FMT "%s of %s free" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENSE" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library 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 \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + +IDS_WARRANTY_CAPTION, "NO WARRANTY" +IDS_WARRANTY, +"This library 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 \ +Lesser General Public License for more details." +} _____ Deleted: trunk/reactos/base/applications/winefile/license.c --- trunk/reactos/base/applications/winefile/license.c 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/license.c 2006-02-04 10:04:41 UTC (rev 84) @@ -1,56 +0,0 @@ -/* - * Copyright 2000 Martin Fuchs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "winefile.h" - -#ifdef __WINE__ - -static const CHAR LicenseCaption[] = "LICENSE"; -static const CHAR License[] = -"This library is free software; you can redistribute it and/or " -"modify it under the terms of the GNU Lesser General Public " -"License as published by the Free Software Foundation; either " -"version 2.1 of the License, or (at your option) any later version.\n" - -"This library 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 " -"Lesser General Public License for more details.\n" - -"You should have received a copy of the GNU Lesser General Public " -"License along with this library; if not, write to the Free Software " -"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"; - -static const CHAR NoWarrantyCaption[] = "NO WARRANTY"; -static const CHAR NoWarranty[] = -"This library 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 " -"Lesser General Public License for more details."; - -VOID WineLicense(HWND hwnd) -{ - MessageBoxA(hwnd, License, LicenseCaption, MB_ICONINFORMATION|MB_OK); -} - -VOID WineWarranty(HWND hwnd) -{ - MessageBoxA(hwnd, NoWarranty, NoWarrantyCaption, MB_ICONEXCLAMATION|MB_OK); -} - -#endif _____ Modified: trunk/reactos/base/applications/winefile/resource.h --- trunk/reactos/base/applications/winefile/resource.h 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/resource.h 2006-02-04 10:04:41 UTC (rev 84) @@ -135,7 +135,12 @@ #define IDS_COL_SEC 1218 #define IDS_FREE_SPACE_FMT 1219 +#define IDS_LICENSE_CAPTION 1300 +#define IDS_LICENSE 1301 +#define IDS_WARRANTY_CAPTION 1302 +#define IDS_WARRANTY 1303 + /* range for drive bar command ids: 0x9000..0x90FF */ #ifdef __WINE__ _____ Modified: trunk/reactos/base/applications/winefile/winefile.c --- trunk/reactos/base/applications/winefile/winefile.c 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/winefile.c 2006-02-04 10:04:41 UTC (rev 84) @@ -239,6 +239,23 @@ } +static VOID WineLicense(HWND Wnd) +{ + TCHAR cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_LICENSE, text, 1024); + LoadString(Globals.hInstance, IDS_LICENSE_CAPTION, cap, 20); + MessageBox(Wnd, text, cap, MB_ICONINFORMATION | MB_OK); +} + +static VOID WineWarranty(HWND Wnd) +{ + TCHAR cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_WARRANTY, text, 1024); + LoadString(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, 20); + MessageBox(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); +} + + #ifdef __WINE__ #ifdef UNICODE @@ -1403,6 +1420,7 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) { TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; + TCHAR dir_path[MAX_PATH]; TCHAR b1[BUFFER_LEN]; const static TCHAR sAsterics[] = {'*', '\0'}; @@ -1447,7 +1465,9 @@ root->entry.level = 0; - entry = read_tree(root, path, pidl, drv, child->sortOrder, hwnd); + lstrcpy(dir_path, drv); + lstrcat(dir_path, dir); + entry = read_tree(root, dir_path, pidl, drv, child->sortOrder, hwnd); #ifdef _SHELL_FOLDERS if (root->entry.etype == ET_SHELL) @@ -4779,6 +4799,36 @@ Globals.prescan_node = FALSE; UpdateWindow(Globals.hMainWnd); + + if (path && path[0]) + { + int index,count; + TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; + TCHAR fullname[_MAX_FNAME+_MAX_EXT+1]; + + memset(name,0,sizeof(name)); + memset(name,0,sizeof(ext)); + _tsplitpath(path, drv, dir, name, ext); + if (name[0]) + { + count = ListBox_GetCount(child->right.hwnd); + lstrcpy(fullname,name); + lstrcat(fullname,ext); + + for (index = 0; index < count; index ++) + { + Entry* entry = (Entry*) ListBox_GetItemData(child->right.hwnd, + index); + if (lstrcmp(entry->data.cFileName,fullname)==0 || + lstrcmp(entry->data.cAlternateFileName,fullname)==0) + { + ListBox_SetCurSel(child->right.hwnd, index); + SetFocus(child->right.hwnd); + break; + } + } + } + } } static void ExitInstance(void) _____ Modified: trunk/reactos/base/applications/winefile/winefile.dsp --- trunk/reactos/base/applications/winefile/winefile.dsp 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/winefile.dsp 2006-02-04 10:04:41 UTC (rev 84) @@ -250,11 +250,6 @@ # End Group # Begin Source File -SOURCE=.\license.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - SOURCE=.\resource.h # End Source File # Begin Source File _____ Modified: trunk/reactos/base/applications/winefile/winefile.h --- trunk/reactos/base/applications/winefile/winefile.h 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/winefile.h 2006-02-04 10:04:41 UTC (rev 84) @@ -149,10 +149,6 @@ #ifdef __WINE__ -extern void WineLicense(HWND hwnd); -extern void WineWarranty(HWND hwnd); - - #ifdef UNICODE extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext); #define _tsplitpath _wsplitpath _____ Modified: trunk/reactos/base/applications/winefile/winefile.sln --- trunk/reactos/base/applications/winefile/winefile.sln 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/winefile.sln 2006-02-04 10:04:41 UTC (rev 84) @@ -14,7 +14,6 @@ EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D5D64C37-5820-4EE1-9982-98A2CFFAC645}.Debug|Win32.ActiveCfg = Debug|Win32 - {D5D64C37-5820-4EE1-9982-98A2CFFAC645}.Debug|Win32.Build.0 = Debug|Win32 {D5D64C37-5820-4EE1-9982-98A2CFFAC645}.Release|Win32.ActiveCfg = Release|Win32 {D5D64C37-5820-4EE1-9982-98A2CFFAC645}.Release|Win32.Build.0 = Release|Win32 {D5D64C37-5820-4EE1-9982-98A2CFFAC645}.Unicode Debug|Win32.ActiveCfg = Debug|Win32 _____ Modified: trunk/reactos/base/applications/winefile/winefile.vcproj --- trunk/reactos/base/applications/winefile/winefile.vcproj 2006-02-04 09:02:51 UTC (rev 83) +++ trunk/reactos/base/applications/winefile/winefile.vcproj 2006-02-04 10:04:41 UTC (rev 84) @@ -1119,52 +1119,6 @@ </File> </Filter> <File - RelativePath="license.c" - > - <FileConfiguration - Name="Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_DEBUG;_WIN32_WINNT=0x0501;$(NoInherit)" - UsePrecompiledHeader="0" - BrowseInformation="1" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="NDEBUG;_WIN32_WINNT=0x0501;$(NoInherit)" - UsePrecompiledHeader="0" - /> - </FileConfiguration> - <FileConfiguration - Name="UNICODE Release|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="NDEBUG;UNICODE;_WIN32_WINNT=0x0501;$(NoInherit) " - UsePrecompiledHeader="0" - /> - </FileConfiguration> - <FileConfiguration - Name="Unicode Debug|Win32" - ExcludedFromBuild="true" - > - <Tool - Name="VCCLCompilerTool" - PreprocessorDefinitions="_DEBUG;UNICODE;_WIN32_WINNT=0x0501;$(NoInherit) " - UsePrecompiledHeader="0" - BrowseInformation="1" - /> - </FileConfiguration> - </File> - <File RelativePath="resource.h" > </File>

18 years, 7 months

[martinf] 83: set svn:eol-style

by martinf＠svn.reactos.org

set svn:eol-style Property changes on: trunk/documentation/README ___________________________________________________________________ Name: svn:eol-style + native

18 years, 7 months

[martinf] 82: winefile: set output directory

by martinf＠svn.reactos.org

winefile: set output directory Modified: trunk/reactos/base/applications/winefile/winefile.dsp _____ Modified: trunk/reactos/base/applications/winefile/winefile.dsp --- trunk/reactos/base/applications/winefile/winefile.dsp 2006-02-04 09:00:03 UTC (rev 81) +++ trunk/reactos/base/applications/winefile/winefile.dsp 2006-02-04 09:02:15 UTC (rev 82) @@ -123,7 +123,7 @@ # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "winefileRelease" +# PROP Output_Dir "." # PROP Intermediate_Dir "winefileRelease" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" @@ -139,7 +139,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib version.lib mpr.lib /nologo /subsystem:windows /machine:I386 /out:"winefileRelease/winefile-ansi.exe" +# ADD LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib comdlg32.lib ole32.lib version.lib mpr.lib /nologo /subsystem:windows /machine:I386 /out:"winefile-ansi.exe" !ENDIF

18 years, 7 months

[arty] 81: Added fonts rbuild.

by arty＠svn.reactos.org

Added fonts rbuild. Added: trunk/reactos/media/fonts/fonts.rbuild _____ Added: trunk/reactos/media/fonts/fonts.rbuild --- trunk/reactos/media/fonts/fonts.rbuild 2006-02-04 06:41:56 UTC (rev 80) +++ trunk/reactos/media/fonts/fonts.rbuild 2006-02-04 09:00:03 UTC (rev 81) @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <installfile base="media/fonts">c0419bt_.ttf</installfile> + <installfile base="media/fonts">c0582bt_.ttf</installfile> + <installfile base="media/fonts">c0583bt_.ttf</installfile> + <installfile base="media/fonts">c0611bt_.ttf</installfile> + <installfile base="media/fonts">c0632bt_.ttf</installfile> + <installfile base="media/fonts">c0633bt_.ttf</installfile> + <installfile base="media/fonts">c0648bt_.ttf</installfile> + <installfile base="media/fonts">c0649bt_.ttf</installfile> + <installfile base="media/fonts">cour.ttf</installfile> + <installfile base="media/fonts">courb.ttf</installfile> + <installfile base="media/fonts">courbi.ttf</installfile> + <installfile base="media/fonts">helb____.ttf</installfile> + <installfile base="media/fonts">TGMarlett.ttf</installfile> + <installfile base="media/fonts">timr____.ttf</installfile> + <installfile base="media/fonts">UTB_____.ttf</installfile> + <installfile base="media/fonts">UTBI____.ttf</installfile> + <installfile base="media/fonts">UTI_____.ttf</installfile> + <installfile base="media/fonts">UTRG____.ttf</installfile> + <installfile base="media/fonts">Vera.ttf</installfile> + <installfile base="media/fonts">VeraBd.ttf</installfile> + <installfile base="media/fonts">VeraBI.ttf</installfile> + <installfile base="media/fonts">VeraIt.ttf</installfile> + <installfile base="media/fonts">VeraMoBd.ttf</installfile> + <installfile base="media/fonts">VeraMoBI.ttf</installfile> + <installfile base="media/fonts">VeraMoIt.ttf</installfile> + <installfile base="media/fonts">VeraMono.ttf</installfile> + <installfile base="media/fonts">VeraSe.ttf</installfile> + <installfile base="media/fonts">VeraSeBd.ttf</installfile> +</rbuild> \ No newline at end of file

18 years, 7 months

[arty] 80: Added fonts (proper attributions are in media/doc)

by arty＠svn.reactos.org

Added fonts (proper attributions are in media/doc) Modified: trunk/reactos/ReactOS.rbuild Added: trunk/reactos/media/fonts/ Added: trunk/reactos/media/fonts/TGMarlett.ttf Added: trunk/reactos/media/fonts/UTBI____.ttf Added: trunk/reactos/media/fonts/UTB_____.ttf Added: trunk/reactos/media/fonts/UTI_____.ttf Added: trunk/reactos/media/fonts/UTRG____.ttf Added: trunk/reactos/media/fonts/Vera.ttf Added: trunk/reactos/media/fonts/VeraBI.ttf Added: trunk/reactos/media/fonts/VeraBd.ttf Added: trunk/reactos/media/fonts/VeraIt.ttf Added: trunk/reactos/media/fonts/VeraMoBI.ttf Added: trunk/reactos/media/fonts/VeraMoBd.ttf Added: trunk/reactos/media/fonts/VeraMoIt.ttf Added: trunk/reactos/media/fonts/VeraMono.ttf Added: trunk/reactos/media/fonts/VeraSe.ttf Added: trunk/reactos/media/fonts/VeraSeBd.ttf Added: trunk/reactos/media/fonts/c0419bt_.ttf Added: trunk/reactos/media/fonts/c0582bt_.ttf Added: trunk/reactos/media/fonts/c0583bt_.ttf Added: trunk/reactos/media/fonts/c0611bt_.ttf Added: trunk/reactos/media/fonts/c0632bt_.ttf Added: trunk/reactos/media/fonts/c0633bt_.ttf Added: trunk/reactos/media/fonts/c0648bt_.ttf Added: trunk/reactos/media/fonts/c0649bt_.ttf Added: trunk/reactos/media/fonts/cour.ttf Added: trunk/reactos/media/fonts/courb.ttf Added: trunk/reactos/media/fonts/courbi.ttf Added: trunk/reactos/media/fonts/helb____.ttf Added: trunk/reactos/media/fonts/timr____.ttf Added: trunk/reactos/media/media.rbuild _____ Modified: trunk/reactos/ReactOS.rbuild --- trunk/reactos/ReactOS.rbuild 2006-02-04 06:23:24 UTC (rev 79) +++ trunk/reactos/ReactOS.rbuild 2006-02-04 06:41:56 UTC (rev 80) @@ -73,10 +73,10 @@ <directory name="lib"> <xi:include href="lib/directory.rbuild" /> </directory> -<!-- TODO <directory name="media"> - <xi:include href="media/directory.rbuild" /> + <xi:include href="media/media.rbuild" /> </directory> +<!-- TODO <directory name="modules"> <xi:include href="modules/directory.rbuild" /> </directory> _____ Added: trunk/reactos/media/fonts/TGMarlett.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/TGMarlett.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/UTBI____.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/UTBI____.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/UTB_____.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/UTB_____.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/UTI_____.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/UTI_____.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/UTRG____.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/UTRG____.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/Vera.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/Vera.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraBI.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraBI.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraBd.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraBd.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraIt.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraIt.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraMoBI.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraMoBI.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraMoBd.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraMoBd.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraMoIt.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraMoIt.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraMono.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraMono.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraSe.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraSe.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/VeraSeBd.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/VeraSeBd.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0419bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0419bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0582bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0582bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0583bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0583bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0611bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0611bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0632bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0632bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0633bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0633bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0648bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0648bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/c0649bt_.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/c0649bt_.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/cour.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/cour.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/courb.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/courb.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/courbi.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/courbi.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/helb____.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/helb____.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/fonts/timr____.ttf (Binary files differ) Property changes on: trunk/reactos/media/fonts/timr____.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/media/media.rbuild --- trunk/reactos/media/media.rbuild 2006-02-04 06:23:24 UTC (rev 79) +++ trunk/reactos/media/media.rbuild 2006-02-04 06:41:56 UTC (rev 80) @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <group> + <directory name="fonts"> + <xi:include href="fonts/fonts.rbuild" /> + </directory> + </group> +</rbuild>

18 years, 7 months

[arty] 79: Add source documentation for fonts shipped with reactos.

by arty＠svn.reactos.org

Add source documentation for fonts shipped with reactos. Added: trunk/reactos/media/doc/ Added: trunk/reactos/media/doc/COPYRIGHT.IBM Added: trunk/reactos/media/doc/Copyright.Bitstream Added: trunk/reactos/media/doc/README.TXT Added: trunk/reactos/media/doc/TGMarlett.txt Added: trunk/reactos/media/doc/VERA-COPYRIGHT.TXT Added: trunk/reactos/media/doc/VERA-README.TXT Added: trunk/reactos/media/doc/VERA-RELEASENOTES.TXT _____ Added: trunk/reactos/media/doc/COPYRIGHT.IBM --- trunk/reactos/media/doc/COPYRIGHT.IBM 2006-02-03 23:57:39 UTC (rev 78) +++ trunk/reactos/media/doc/COPYRIGHT.IBM 2006-02-04 06:23:24 UTC (rev 79) @@ -0,0 +1,9 @@ +IBM Courier - Copyright (c) IBM Corporation 1990, 1991 + +You are hereby granted permission under the terms of the IBM/MIT X Consortium +Courier Typefont agreement to execute, reproduce, distribute, display, market, +sell and otherwise transfer copies of the IBM Courier font to third parties. + +The font is provided "AS IS" without charge. NO WARRANTIES OR INDEMNIFICATION +ARE GIVEN, WHETHER EXPRESS OR IMPLIED INCLUDING, BUT LIMITED TO THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. _____ Added: trunk/reactos/media/doc/Copyright.Bitstream --- trunk/reactos/media/doc/Copyright.Bitstream 2006-02-03 23:57:39 UTC (rev 78) +++ trunk/reactos/media/doc/Copyright.Bitstream 2006-02-04 06:23:24 UTC (rev 79) @@ -0,0 +1,11 @@ +(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA. + +You are hereby granted permission under all Bitstream propriety rights +to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream +Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts +for any purpose and without restriction; provided, that this notice is +left intact on all copies of such fonts and that Bitstream's trademark +is acknowledged as shown below on all unmodified copies of the 4 Charter +Type 1 fonts. + +BITSTREAM CHARTER is a registered trademark of Bitstream Inc. _____ Added: trunk/reactos/media/doc/README.TXT --- trunk/reactos/media/doc/README.TXT 2006-02-03 23:57:39 UTC (rev 78) +++ trunk/reactos/media/doc/README.TXT 2006-02-04 06:23:24 UTC (rev 79) @@ -0,0 +1,3 @@ +The Vera*.ttf contain the Bitstream Vera fonts. They were downloaded +from http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/. +The original documentation files are available as VERA-*.TXT. \ No newline at end of file _____ Added: trunk/reactos/media/doc/TGMarlett.txt --- trunk/reactos/media/doc/TGMarlett.txt 2006-02-03 23:57:39 UTC (rev 78) +++ trunk/reactos/media/doc/TGMarlett.txt 2006-02-04 06:23:24 UTC (rev 79) @@ -0,0 +1,8 @@ +6.2 Can I redistribute TGMarlett.ttf + +Yes. TGMarlett is licensed under an X11 license, so you can do whatever you +wish with it. However, if you make any improvements to this font (see FAQ 6.3) +we would appreciate it if you made the improvements available to everyone by +contributing the changes back to TransGaming. + +from ( http://www.transgaming.com/gamefaq.php?specialid=3 ) \ No newline at end of file _____ Added: trunk/reactos/media/doc/VERA-COPYRIGHT.TXT --- trunk/reactos/media/doc/VERA-COPYRIGHT.TXT 2006-02-03 23:57:39 UTC (rev 78) +++ trunk/reactos/media/doc/VERA-COPYRIGHT.TXT 2006-02-04 06:23:24 UTC (rev 79) @@ -0,0 +1,124 @@ +Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as +long as "Bitstream" or "Vera" are not in the names), and full +redistribution (so long as they are not *sold* by themselves). They +can be be bundled, redistributed and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright +========= + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream +Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute +the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished +to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, +OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT +SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font +Software without prior written authorization from the Gnome Foundation +or Bitstream Inc., respectively. For further information, contact: +fonts at gnome dot org. + +Copyright FAQ +============= + + 1. I don't understand the resale restriction... What gives? + + Bitstream is giving away these fonts, but wishes to ensure its + competitors can't just drop the fonts as is into a font sale system + and sell them as is. It seems fair that if Bitstream can't make money + from the Bitstream Vera fonts, their competitors should not be able to + do so either. You can sell the fonts as part of any software package, + however. + + 2. I want to package these fonts separately for distribution and + sale as part of a larger software package or system. Can I do so? + + Yes. A RPM or Debian package is a "larger software package" to begin + with, and you aren't selling them independently by themselves. + See 1. above. + + 3. Are derivative works allowed? + Yes! + + 4. Can I change or add to the font(s)? + Yes, but you must change the name(s) of the font(s). + + 5. Under what terms are derivative works allowed? + + You must change the name(s) of the fonts. This is to ensure the + quality of the fonts, both to protect Bitstream and Gnome. We want to + ensure that if an application has opened a font specifically of these + names, it gets what it expects (though of course, using fontconfig, + substitutions could still could have occurred during font + opening). You must include the Bitstream copyright. Additional + copyrights can be added, as per copyright law. Happy Font Hacking! + + 6. If I have improvements for Bitstream Vera, is it possible they might get + adopted in future versions? + + Yes. The contract between the Gnome Foundation and Bitstream has + provisions for working with Bitstream to ensure quality additions to + the Bitstream Vera font family. Please contact us if you have such + additions. Note, that in general, we will want such additions for the + entire family, not just a single font, and that you'll have to keep + both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add + glyphs to the font, they must be stylistically in keeping with Vera's + design. Vera cannot become a "ransom note" font. Jim Lyles will be + providing a document describing the design elements used in Vera, as a + guide and aid for people interested in contributing to Vera. + + 7. I want to sell a software package that uses these fonts: Can I do so? + + Sure. Bundle the fonts with your software and sell your software + with the fonts. That is the intent of the copyright. + + 8. If applications have built the names "Bitstream Vera" into them, + can I override this somehow to use fonts of my choosing? + + This depends on exact details of the software. Most open source + systems and software (e.g., Gnome, KDE, etc.) are now converting to + use fontconfig (see www.fontconfig.org) to handle font configuration, + selection and substitution; it has provisions for overriding font + names and subsituting alternatives. An example is provided by the + supplied local.conf file, which chooses the family Bitstream Vera for + "sans", "serif" and "monospace". Other software (e.g., the XFree86 + core server) has other mechanisms for font substitution. + _____ Added: trunk/reactos/media/doc/VERA-README.TXT --- trunk/reactos/media/doc/VERA-README.TXT 2006-02-03 23:57:39 UTC (rev 78) +++ trunk/reactos/media/doc/VERA-README.TXT 2006-02-04 06:23:24 UTC (rev 79) @@ -0,0 +1,11 @@ +Contained herin is the Bitstream Vera font family. + +The Copyright information is found in the COPYRIGHT.TXT file (along +with being incoporated into the fonts themselves). + +The releases notes are found in the file "RELEASENOTES.TXT". + +We hope you enjoy Vera! + + Bitstream, Inc. + The Gnome Project _____ Added: trunk/reactos/media/doc/VERA-RELEASENOTES.TXT --- trunk/reactos/media/doc/VERA-RELEASENOTES.TXT 2006-02-03 23:57:39 UTC (rev 78) +++ trunk/reactos/media/doc/VERA-RELEASENOTES.TXT 2006-02-04 06:23:24 UTC (rev 79) @@ -0,0 +1,162 @@ +Bitstream Vera Fonts - April 16, 2003 +===================================== + +The version number of these fonts is 1.10 to distinguish them from the +beta test fonts. + +Note that the Vera copyright is incorporated in the fonts themselves. +The License field in the fonts contains the copyright license as it +appears below. The TrueType copyright field is not large enough to +contain the full license, so the license is incorporated (as you might +think if you thought about it) into the license field, which +unfortunately can be obscure to find. (In pfaedit, see: Element->Font +Info->TTFNames->License). + +Our apologies for it taking longer to complete the fonts than planned. +Beta testers requested a tighter line spacing (less leading) and Jim +Lyles redesigned Vera's accents to bring its line spacing to more +typical of other fonts. This took additional time and effort. Our +thanks to Jim for this effort above and beyond the call of duty. + +There are four monospace and sans faces (normal, oblique, bold, bold +oblique) and two serif faces (normal and bold). Fontconfig/Xft2 (see +www.fontconfig.org) can artificially oblique the serif faces for you: +this loses hinting and distorts the faces slightly, but is visibly +different than normal and bold, and reasonably pleasing. + +On systems with fontconfig 2.0 or 2.1 installed, making your sans, +serif and monospace fonts default to these fonts is very easy. Just +drop the file local.conf into your /etc/fonts directory. This will +make the Bitstream fonts your default fonts for all applications using +fontconfig (if sans, serif, or monospace names are used, as they often +are as default values in many desktops). The XML in local.conf may +need modification to enable subpixel decimation, if appropriate, +however, the commented out phrase does so for XFree86 4.3, in the case +that the server does not have sufficient information to identify the +use of a flat panel. Fontconfig 2.2 adds Vera to the list of font +families and will, by default use it as the default sans, serif and +monospace fonts. + +During the testing of the final Vera fonts, we learned that screen +fonts in general are only typically hinted to work correctly at +integer pixel sizes. Vera is coded internally for integer sizes only. +We need to investigate further to see if there are commonly used fonts +that are hinted to be rounded but are not rounded to integer sizes due +to oversights in their coding. + +Most fonts work best at 8 pixels and below if anti-aliased only, as +the amount of work required to hint well at smaller and smaller sizes +becomes astronomical. GASP tables are typically used to control +whether hinting is used or not, but Freetype/Xft does not currently +support GASP tables (which are present in Vera). + +To mitigate this problem, both for Vera and other fonts, there will be +(very shortly) a new fontconfig 2.2 release that will, by default not +apply hints if the size is below 8 pixels. if you should have a font +that in fact has been hinted more agressively, you can use fontconfig +to note this exception. We believe this should improve many hinted +fonts in addition to Vera, though implemeting GASP support is likely +the right long term solution. + +Font rendering in Gnome or KDE is the combination of algorithms in +Xft2 and Freetype, along with hinting in the fonts themselves. It is +vital to have sufficient information to disentangle problems that you +may observe. + +Note that having your font rendering system set up correctly is vital +to proper judgement of problems of the fonts: + + * Freetype may or may not be configured to in ways that may + implement execution of possibly patented (in some parts of the world) + TrueType hinting algorithms, particularly at small sizes. Best + results are obtained while using these algorithms. + + * The freetype autohinter (used when the possibly patented + algorithms are not used) continues to improve with each release. If + you are using the autohinter, please ensure you are using an up to + date version of freetype before reporting problems. + + * Please identify what version of freetype you are using in any + bug reports, and how your freetype is configured. + + * Make sure you are not using the freetype version included in + XFree86 4.3, as it has bugs that significantly degrade most fonts, + including Vera. if you build XFree86 4.3 from source yourself, you may + have installed this broken version without intending it (as I + did). Vera was verified with the recently released Freetype 2.1.4. On + many systems, 'ldd" can be used to see which freetype shared library + is actually being used. + + * Xft/X Render does not (yet) implement gamma correction. This + causes significant problems rendering white text on a black background + (causing partial pixels to be insufficiently shaded) if the gamma of + your monitor has not been compensated for, and minor problems with + black text on a while background. The program "xgamma" can be used to + set a gamma correction value in the X server's color pallette. Most + monitors have a gamma near 2. + + * Note that the Vera family uses minimal delta hinting. Your + results on other systems when not used anti-aliased may not be + entirely satisfying. We are primarily interested in reports of + problems on open source systems implementing Xft2/fontconfig/freetype + (which implements antialiasing and hinting adjustements, and + sophisticated subpixel decimation on flatpanels). Also, the + algorithms used by Xft2 adjust the hints to integer widths and the + results are crisper on open source systems than on Windows or + MacIntosh. + + * Your fontconfig may (probably does) predate the release of + fontconfig 2.2, and you may see artifacts not present when the font is + used at very small sizes with hinting enabled. "vc-list -V" can be + used to see what version you have installed. + +We believe and hope that these fonts will resolve the problems +reported during beta test. The largest change is the reduction of +leading (interline spacing), which had annoyed a number of people, and +reduced Vera's utility for some applcations. The Vera monospace font +should also now make '0' and 'O' and '1' and 'l' more clearly +distinguishable. + +The version of these fonts is version 1.10. Fontconfig should be +choosing the new version of the fonts if both the released fonts and +beta test fonts are installed (though please discard them: they have +names of form tt20[1-12]gn.ttf). Note that older versions of +fontconfig sometimes did not rebuild their cache correctly when new +fonts are installed: please upgrade to fontconfig 2.2. "fc-cache -f" +can be used to force rebuilding fontconfig's cache files. + +If you note problems, please send them to fonts at gnome dot org, with +exactly which face and size and unicode point you observe the problem +at. The xfd utility from XFree86 CVS may be useful for this (e.g. "xfd +-fa sans"). A possibly more useful program to examine fonts at a +variety of sizes is the "waterfall" program found in Keith Packard's +CVS. + + $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS login + Logging in to :pserver:anoncvs@keithp.com:2401/local/src/CVS + CVS password: <hit return> + $ cvs -d :pserver:anoncvs@keithp.com:/local/src/CVS co waterfall + $ cd waterfall + $ xmkmf -a + $ make + # make install + # make install.man + +Again, please make sure you are running an up-to-date freetype, and +that you are only examining integer sizes. + +Reporting Problems +================== + +Please send problem reports to fonts at gnome org, with the following +information: + + 1. Version of Freetype, Xft2 and fontconfig + 2. Whether TT hinting is being used, or the autohinter + 3. Application being used + 4. Character/Unicode code point that has problems (if applicable) + 5. Version of which operating system + 6. Please include a screenshot, when possible. + +Please check the fonts list archives before reporting problems to cut +down on duplication.

18 years, 7 months

[gedmurphy] 78: Get rbuild to build ISOs with the bootsector again

by gedmurphy＠svn.reactos.org

Get rbuild to build ISOs with the bootsector again Patch by Samuel Bronson, naesten at gmail dot com Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2006-02-03 20:38:07 UTC (rev 77) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2006-02-03 23:57:39 UTC (rev 78) @@ -2970,9 +2970,9 @@ OutputCdfileCopyCommands ( bootcdDirectory ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, - //"\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS ReactOS.iso\n", - //isoboot.c_str (), - "\t$(Q)$(CDMAKE_TARGET) -v -m %s REACTOS ReactOS.iso\n", + "\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS ReactOS.iso\n", + isoboot.c_str (), + //"\t$(Q)$(CDMAKE_TARGET) -v -m %s REACTOS ReactOS.iso\n", bootcd.c_str () ); fprintf ( fMakefile, "\n" );

18 years, 7 months

[gedmurphy] 77: fix setting of the description when creating services

by gedmurphy＠svn.reactos.org

fix setting of the description when creating services Modified: trunk/reactos/base/system/servman/create.c Modified: trunk/reactos/base/system/servman/query.c Modified: trunk/reactos/base/system/servman/servman.h _____ Modified: trunk/reactos/base/system/servman/create.c --- trunk/reactos/base/system/servman/create.c 2006-02-03 20:03:48 UTC (rev 76) +++ trunk/reactos/base/system/servman/create.c 2006-02-03 20:38:07 UTC (rev 77) @@ -20,9 +20,6 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; - HKEY hKey; - LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); - TCHAR buf[300]; /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); @@ -52,19 +49,8 @@ return FALSE; } + SetDescription(ServiceName, Description); - - /* open the registry key for the service */ - /* TODO: move all this into query */ - _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey); - - SetDescription(hKey, &Description); - DisplayString(_T("Service Succesfully Created")); CloseServiceHandle(hSCManager); CloseServiceHandle(hSc); @@ -144,7 +130,6 @@ if (ServiceName != NULL) { GetWindowText(hwnd, ServiceName, iLen+1); - DisplayString(ServiceName); } } @@ -175,7 +160,7 @@ /* get description */ iLen = 0; - hwnd = GetDlgItem(hDlg, IDC_CREATE_PATH); + hwnd = GetDlgItem(hDlg, IDC_CREATE_DESC); iLen = GetWindowTextLength(hwnd); if (iLen != 0) { _____ Modified: trunk/reactos/base/system/servman/query.c --- trunk/reactos/base/system/servman/query.c 2006-02-03 20:03:48 UTC (rev 76) +++ trunk/reactos/base/system/servman/query.c 2006-02-03 20:38:07 UTC (rev 77) @@ -43,23 +43,42 @@ /* Sets the service description in the registry */ -BOOL SetDescription(HKEY hKey, LPTSTR *Description) +BOOL SetDescription(LPTSTR ServiceName, LPTSTR Description) { - TCHAR szBuf[MAX_PATH]; + HKEY hKey; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + TCHAR buf[300]; + TCHAR szBuf[MAX_PATH]; + LONG val; - if (RegSetValueEx(hKey, - L"Description", + + /* open the registry key for the service */ + _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName); + RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_WRITE, + &hKey); + + + if ((val = RegSetValueEx(hKey, + _T("Description"), 0, REG_SZ, (LPBYTE)Description, - (DWORD)lstrlen(szBuf)+1)) - GetError(0); + (DWORD)lstrlen(szBuf)+1)) != ERROR_SUCCESS) + { + GetError(val); + return FALSE; + } RegCloseKey(hKey); return TRUE; } + + /* Retrives the service description from the registry */ BOOL GetDescription(LPTSTR lpServiceName, LPTSTR *retDescription) { _____ Modified: trunk/reactos/base/system/servman/servman.h --- trunk/reactos/base/system/servman/servman.h 2006-02-03 20:03:48 UTC (rev 76) +++ trunk/reactos/base/system/servman/servman.h 2006-02-03 20:38:07 UTC (rev 77) @@ -31,7 +31,7 @@ VOID FreeMemory(VOID); VOID DisplayString(PTCHAR); -BOOL SetDescription(HKEY, LPTSTR *); +BOOL SetDescription(LPTSTR, LPTSTR); BOOL GetDescription(LPTSTR, LPTSTR *); BOOL GetExecutablePath(LPTSTR *);

18 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2006