Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[ion] 20317: Merge 19090:20311

by ion＠svn.reactos.com

Merge 19090:20311 Modified: branches/alex-network-branch/reactos/COPYING Modified: branches/alex-network-branch/reactos/CREDITS Modified: branches/alex-network-branch/reactos/LGPL.txt Modified: branches/alex-network-branch/reactos/Makefile Added: branches/alex-network-branch/reactos/ReactOS-ppc.xml Modified: branches/alex-network-branch/reactos/ReactOS.xml Modified: branches/alex-network-branch/reactos/apistatus.lst Modified: branches/alex-network-branch/reactos/apps/utils/directory.xml Added: branches/alex-network-branch/reactos/apps/utils/getfirefox/ Modified: branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/err.c Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/net.c Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/ftp.c Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/ftp_var.h Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/main.c Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/prototypes.h Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/ruserpass.c Modified: branches/alex-network-branch/reactos/apps/utils/net/ipconfig/ipconfig.c Modified: branches/alex-network-branch/reactos/apps/utils/net/netstat/netstat.c Modified: branches/alex-network-branch/reactos/apps/utils/net/netstat/netstat.h Modified: branches/alex-network-branch/reactos/apps/utils/net/ping/ping.c Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/ansiprsr. cpp Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/ansiprsr. h Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tconsole. cpp Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnconfig. cpp Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnconfig. h Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnetwork. h Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tnmain.cp p Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/src/tscroll.c pp Modified: branches/alex-network-branch/reactos/apps/utils/net/telnet/telnet.xml Modified: branches/alex-network-branch/reactos/apps/utils/net/tracert/tracert.c Modified: branches/alex-network-branch/reactos/apps/utils/net/whois/whois.c Modified: branches/alex-network-branch/reactos/apps/utils/nts2w32err/nts2w32err.c Modified: branches/alex-network-branch/reactos/apps/utils/objdir/objdir.c Modified: branches/alex-network-branch/reactos/apps/utils/partinfo/partinfo.c Modified: branches/alex-network-branch/reactos/apps/utils/pice/loader/stdinc.h Modified: branches/alex-network-branch/reactos/apps/utils/pice/module/patch.c Modified: branches/alex-network-branch/reactos/apps/utils/pice/module/precomp.h Modified: branches/alex-network-branch/reactos/apps/utils/pice/module/privateice.c Modified: branches/alex-network-branch/reactos/apps/utils/pice/module/shell.c Modified: branches/alex-network-branch/reactos/apps/utils/pice/shared/shared.h Modified: branches/alex-network-branch/reactos/apps/utils/pnpdump/pnpdump.c Modified: branches/alex-network-branch/reactos/apps/utils/ps/ps.c Modified: branches/alex-network-branch/reactos/apps/utils/rosperf/alphablend.c Modified: branches/alex-network-branch/reactos/apps/utils/rosperf/rosperf.c Deleted: branches/alex-network-branch/reactos/apps/utils/sc/ Modified: branches/alex-network-branch/reactos/apps/utils/shutdown/shutdown.c Added: branches/alex-network-branch/reactos/apps/utils/shutdown/shutdown.xml Modified: branches/alex-network-branch/reactos/baseaddress.xml Modified: branches/alex-network-branch/reactos/boot/freeldr/bootsect/bootsect.xml Modified: branches/alex-network-branch/reactos/boot/freeldr/bootsect/ofwboot.s Modified: branches/alex-network-branch/reactos/boot/freeldr/fdebug/En.rc Added: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Hu.rc Modified: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Ja.rc Added: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Pl.rc Added: branches/alex-network-branch/reactos/boot/freeldr/fdebug/Tr.rc Modified: branches/alex-network-branch/reactos/boot/freeldr/fdebug/fdebug.rc Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/arch mach.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hard ware.c Deleted: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hard ware.h Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwac pi.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwap m.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwcp u.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/hwpc i.c Deleted: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/i386 .h Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/i386 disk.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/i386 vid.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach pc.c Deleted: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach pc.h Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach xbox.c Deleted: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/mach xbox.h Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcco ns.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcdi sk.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcme m.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcrt c.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/pcvi deo.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/port io.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox cons.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox disk.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox font.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox hw.c Added: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox i2c.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox mem.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox rtc.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/i386/xbox video.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/powerpc/b oot.s Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/powerpc/m ach.c Added: branches/alex-network-branch/reactos/boot/freeldr/freeldr/arch/powerpc/m boot.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/bootmgr.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/cache/blocklis t.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/cache/cache.c Deleted: branches/alex-network-branch/reactos/boot/freeldr/freeldr/cache/cm.h Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/cmdline.c Modified: branches/alex-network-branch/reactos/boot/freeldr/freeldr/comm/rs232.c [truncated at 100 lines; 2280 more skipped] _____ Modified: branches/alex-network-branch/reactos/COPYING --- branches/alex-network-branch/reactos/COPYING 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/COPYING 2005-12-24 02:50:22 UTC (rev 20317) @@ -3,7 +3,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -280,7 +280,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -292,7 +292,7 @@ the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -306,14 +306,15 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. _____ Modified: branches/alex-network-branch/reactos/CREDITS --- branches/alex-network-branch/reactos/CREDITS 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/CREDITS 2005-12-24 02:50:22 UTC (rev 20317) @@ -47,7 +47,8 @@ Jonathan Wilson <jonwil(a)tpgi.com.au> Art Yerkes <ayerkes(a)speakeasy.net> Magnus Olsen (magnus(a)greatlord.com) -Alex Ionescu (alex(a)relsoft.net) +Brandon Turner (turnerb7(a)msu.edu) +Christoph von Wittich (Christoph(a)ApiViewer.de) Graphic Design from _____ Modified: branches/alex-network-branch/reactos/LGPL.txt --- branches/alex-network-branch/reactos/LGPL.txt 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/LGPL.txt 2005-12-24 02:50:22 UTC (rev 20317) @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -485,7 +485,7 @@ 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 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. _____ Modified: branches/alex-network-branch/reactos/Makefile --- branches/alex-network-branch/reactos/Makefile 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/Makefile 2005-12-24 02:50:22 UTC (rev 20317) @@ -105,17 +105,44 @@ # -dm{module} Check only automatic dependencies for this module. # -mi Let make handle creation of install directories. Rbuild will not generate the directories. # -ps Generate proxy makefiles in source tree instead of the output tree. +# -ud Disable compilation units. +# -r Input XML +# +# ROS_AUTOMAKE +# Alternate name of makefile.auto +# +# check for versions of make that don't have features we need... +# the function "eval" is only available in 3.80+, which happens to be the minimum +# version that has the features we use... +# THIS CHECK IS BORROWED FROM THE "GMSL" PROJECT, AND IS COVERED BY THE GPL LICENSE +# YOU CAN FIND OUT MORE ABOUT GMSL - A VERY COOL PROJECT - AT: +# http://gmsl.sourceforge.net/ + +__gmsl_have_eval := +__gmsl_ignore := $(eval __gmsl_have_eval := T) + +ifndef __gmsl_have_eval +$(error ReactOS's makefiles use GNU Make 3.80+ features, you have $(MAKE_VERSION), you MUST UPGRADE in order to build ReactOS - Sorry) +endif +# END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ ) + .PHONY: all .PHONY: clean -all: makefile.auto +ifeq ($(ROS_AUTOMAKE),) +ROS_AUTOMAKE=makefile.auto +endif +all: $(ROS_AUTOMAKE) + + .SUFFIXES: ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) -ifeq ($(OSTYPE),msys) +ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) +export OSTYPE = msys HOST=mingw32-linux else HOST=mingw32-windows @@ -214,7 +241,7 @@ export EXEPREFIX = ./ ifeq ($(OSTYPE),msys) export EXEPOSTFIX = .exe -else +else export EXEPOSTFIX = endif export SEP = / @@ -319,7 +346,7 @@ include lib/lib.mak include tools/tools.mak include boot/freeldr/bootsect/bootsect.mak --include makefile.auto +-include $(ROS_AUTOMAKE) PREAUTO := \ $(BIN2C_TARGET) \ @@ -332,7 +359,7 @@ $(NCI_SERVICE_FILES) \ $(GENDIB_DIB_FILES) -makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) +$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw @@ -347,7 +374,7 @@ $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC) $(ECHO_WMC) - $(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) + $(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC) .PHONY: msvc6 msvc6: $(RBUILD_TARGET) @@ -371,7 +398,7 @@ .PHONY: makefile_auto_clean makefile_auto_clean: - -@$(rm) makefile.auto $(PREAUTO) 2>$(NUL) + -@$(rm) $(ROS_AUTOMAKE) $(PREAUTO) 2>$(NUL) .PHONY: clean clean: makefile_auto_clean _____ Copied: branches/alex-network-branch/reactos/ReactOS-ppc.xml (from rev 20311, trunk/reactos/ReactOS-ppc.xml) _____ Modified: branches/alex-network-branch/reactos/ReactOS.xml --- branches/alex-network-branch/reactos/ReactOS.xml 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/ReactOS.xml 2005-12-24 02:50:22 UTC (rev 20317) @@ -10,6 +10,9 @@ <xi:include href="baseaddress.xml" /> <define name="_M_IX86" /> + <define name="_X86_" /> + <define name="__i386__" /> + <define name="_REACTOS_" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if> @@ -22,7 +25,7 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if> <if property="KDBG" value="1"> <define name="KDBG" value="1" /> @@ -30,12 +33,15 @@ </if> <compilerflag>-Wpointer-arith</compilerflag> + <include>.</include> <include>include</include> <include>include/reactos</include> <include>include/libs</include> <include>include/drivers</include> <include>include/subsys</include> + <include>include/ndk</include> <include>w32api/include</include> + <include>w32api/include/crt</include> <include>w32api/include/ddk</include> <directory name="apps"> _____ Modified: branches/alex-network-branch/reactos/apistatus.lst --- branches/alex-network-branch/reactos/apistatus.lst 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apistatus.lst 2005-12-24 02:50:22 UTC (rev 20317) @@ -11,15 +11,11 @@ kernel32.dll reactos/lib/kernel32 lz32.dll reactos/lib/lzexpand msvcrt.dll reactos/lib/msvcrt -ole32.dll reactos/lib/ole32 -oleaut32.dll reactos/lib/oleaut32 rpcrt4.dll reactos/lib/rpcrt4 secur32.dll reactos/lib/secur32 -shell32.dll reactos/lib/shell32 snmpapi.dll reactos/lib/snmpapi user32.dll reactos/lib/user32 version.dll reactos/lib/version -winmm.dll reactos/lib/winmm winspool.dll reactos/lib/winspool ws2_32.dll reactos/lib/ws2_32 wsock32.dll reactos/lib/wsock32 _____ Modified: branches/alex-network-branch/reactos/apps/utils/directory.xml --- branches/alex-network-branch/reactos/apps/utils/directory.xml 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/directory.xml 2005-12-24 02:50:22 UTC (rev 20317) @@ -2,10 +2,16 @@ <directory name="net"> <xi:include href="net/directory.xml" /> </directory> -<directory name="rosperf"> - <xi:include href="rosperf/rosperf.xml" /> +<directory name="getfirefox"> + <xi:include href="getfirefox/getfirefox.xml" /> </directory> +<directory name="shutdown"> + <xi:include href="shutdown/shutdown.xml" /> +</directory> <directory name="ps"> <xi:include href="ps/ps.xml" /> </directory> +<directory name="rosperf"> + <xi:include href="rosperf/rosperf.xml" /> +</directory> </group> _____ Copied: branches/alex-network-branch/reactos/apps/utils/getfirefox (from rev 20311, trunk/reactos/apps/utils/getfirefox) Property changes on: branches/alex-network-branch/reactos/apps/utils/getfirefox ___________________________________________________________________ Name: svn:ignore + GNUmakefile _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c --- branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/arp/arp.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -28,6 +28,7 @@ * */ +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> #include <stdlib.h> @@ -37,7 +38,6 @@ #include <winsock2.h> #include <iphlpapi.h> -#define WIN32_LEAN_AND_MEAN #define UNICODE #define _UNICODE _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/err.c --- branches/alex-network-branch/reactos/apps/utils/net/finger/err.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/finger/err.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -50,21 +50,10 @@ extern char *__progname; /* Program name, from crt0. */ void -#ifdef __STDC__ err(int eval, const char *fmt, ...) -#else -err(eval, fmt, va_alist) - int eval; - const char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif verr(eval, fmt, ap); va_end(ap); } @@ -85,21 +74,10 @@ } void -#if __STDC__ errx(int eval, const char *fmt, ...) -#else -errx(eval, fmt, va_alist) - int eval; - const char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif verrx(eval, fmt, ap); va_end(ap); } @@ -115,20 +93,10 @@ } void -#if __STDC__ warn(const char *fmt, ...) -#else -warn(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vwarn(fmt, ap); va_end(ap); } @@ -150,20 +118,10 @@ } void -#ifdef __STDC__ warnx(const char *fmt, ...) -#else -warnx(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif vwarnx(fmt, ap); va_end(ap); } _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c --- branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/finger/finger.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -62,7 +62,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include "unistd.h" #include "various.h" #include "getopt.h" _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c --- branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -50,7 +50,7 @@ int opterr = 1, /* if error message should be printed */ optind = 1, /* index into parent argv vector */ optopt; /* character checked for validity */ -char *optarg; /* argument associated with option */ +const char *optarg; /* argument associated with option */ #define BADCH (int)'?' #define EMSG "" @@ -58,7 +58,7 @@ int getopt(int nargc, char * const *nargv, const char *ostr) { - static char *place = EMSG; /* option letter processing */ + static const char *place = EMSG; /* option letter processing */ register char *oli; /* option letter list index */ char *p; _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h --- branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/finger/getopt.h 2005-12-24 02:50:22 UTC (rev 20317) @@ -1,6 +1,6 @@ /* getopt.h */ -extern char *optarg; +extern const char *optarg; extern int optind; int _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/finger/net.c --- branches/alex-network-branch/reactos/apps/utils/net/finger/net.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/finger/net.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -35,13 +35,15 @@ */ #include <sys/types.h> #include <winsock2.h> -#include "unistd.h" + #include <stdio.h> #include <ctype.h> #include <string.h> #include "various.h" +int close(int); + void netfinger(char *name) { _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c --- branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/ftp/cmds.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -25,7 +25,7 @@ //#include <sys/param.h> //#include <sys/wait.h> #include <sys/stat.h> -#if !defined(WIN32) +#ifndef _WIN32 #include <sys/socket.h> #include <arpa/ftp.h> #include <netinet/in.h> @@ -53,9 +53,9 @@ extern off_t restart_point; extern char reply_string[]; -char *mname; +const char *mname; jmp_buf jabort; -char *dotrans(), *domap(); +const char *dotrans(), *domap(); extern short portnum; extern char *hostname; @@ -64,7 +64,7 @@ * Connect to peer server and * auto-login, if possible. */ -void setpeer(int argc, char *argv[]) +void setpeer(int argc, const char *argv[]) { char *host; @@ -154,8 +154,8 @@ } struct types { - char *t_name; - char *t_mode; + const char *t_name; + const char *t_mode; int t_type; char *t_arg; } types[] = { @@ -171,13 +171,13 @@ * Set transfer type. */ void settype(argc, argv) - char *argv[]; + const char *argv[]; { register struct types *p; int comret; if (argc > 2) { - char *sep; + const char *sep; printf("usage: %s [", argv[0]); sep = " "; @@ -216,7 +216,7 @@ } } -char *stype[] = { +const char *stype[] = { "type", "", 0 @@ -308,11 +308,11 @@ */ void put(argc, argv) int argc; - char *argv[]; + const char *argv[]; { - char *cmd; + const char *cmd; int loc = 0; - char *oldargv1, *oldargv2; + const char *oldargv1, *oldargv2; if (argc == 2) { argc++; @@ -374,12 +374,12 @@ * Send multiple files. */ void mput(argc, argv) - char *argv[]; + const char *argv[]; { register int i; int ointer; extern jmp_buf jabort; - char *tp; + const char *tp; if (argc < 2) { (void) strcat(line, " "); @@ -505,13 +505,13 @@ } void reget(argc, argv) - char *argv[]; + const char *argv[]; { (void) getit(argc, argv, 1, "r+w"); } void get(argc, argv) - char *argv[]; + const char *argv[]; { (void) getit(argc, argv, 0, restart_point ? "r+w" : "w" ); } @@ -520,11 +520,11 @@ * Receive one file. */ int getit(argc, argv, restartit, mode) - char *argv[]; - char *mode; + const char *argv[]; + const char *mode; { int loc = 0; - char *oldargv1, *oldargv2; + const char *oldargv1, *oldargv2; if (argc == 2) { argc++; @@ -565,7 +565,8 @@ return (0); } if (loc && mcase) { - char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN]; + const char *tp = argv[1]; + char *tp2, tmpbuf[MAXPATHLEN]; while (*tp && !islower(*tp)) { tp++; @@ -675,9 +676,10 @@ * Get multiple files. */ void mget(argc, argv) - char *argv[]; + const char *argv[]; { - char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN]; + const char *cp, *tp; + char *tp2, tmpbuf[MAXPATHLEN]; int ointer; extern jmp_buf jabort; @@ -756,7 +758,8 @@ static FILE *ftemp = NULL; static char **args; int oldverbose, oldhash; - char *cp, *mode; + char *cp; + const char *mode; if (!mflag) { if (!doglob) { @@ -808,7 +811,7 @@ return (buf); } -static char * +static const char * onoff(bool) int bool; { @@ -1002,7 +1005,7 @@ * on remote machine. */ void cd(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1034,7 +1037,7 @@ * on local machine. */ void lcd(argc, argv) - char *argv[]; + const char *argv[]; { char buf[MAXPATHLEN]; @@ -1064,7 +1067,7 @@ * Delete a single file. */ void delete(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1089,7 +1092,7 @@ * Delete multiple files. */ void mdelete(argc, argv) - char *argv[]; + const char *argv[]; { char *cp; int ointer; @@ -1139,7 +1142,7 @@ * Rename a remote file. */ void renamefile(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1178,9 +1181,9 @@ * of remote files. */ void ls(argc, argv) - char *argv[]; + const char *argv[]; { - char *cmd; + const char *cmd; if (argc < 2) argc++, argv[1] = NULL; @@ -1211,9 +1214,10 @@ * of multiple remote files. */ void mls(argc, argv) - char *argv[]; + const char *argv[]; { - char *cmd, mode[1], *dest; + const char *cmd, *dest; + char mode[1]; int ointer, i; extern jmp_buf jabort; @@ -1395,7 +1399,7 @@ */ void user(argc, argv) int argc; - char **argv; + const char **argv; { char acct[80], *getpass(); int n, aflag = 0; @@ -1466,7 +1470,7 @@ * Make a directory. */ void makedir(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1497,7 +1501,7 @@ * Remove a directory. */ void removedir(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -1528,7 +1532,7 @@ * Send a line, verbatim, to the remote machine. */ void quote(argc, argv) - char *argv[]; + const char *argv[]; { int i; char buf[BUFSIZ]; @@ -1565,7 +1569,7 @@ */ void site(argc, argv) - char *argv[]; + const char *argv[]; { int i; char buf[BUFSIZ]; @@ -1597,7 +1601,7 @@ } void do_chmod(argc, argv) - char *argv[]; + const char *argv[]; { if (argc == 2) { printf("usage: %s mode file-name\n", argv[0]); @@ -1692,7 +1696,7 @@ } int confirm(cmd, file) - char *cmd, *file; + const char *cmd, *file; { char line[BUFSIZ]; @@ -1721,7 +1725,7 @@ * from the expression, we return only the first. */ int globulize(cpp) - char **cpp; + const char **cpp; { char **globbed; @@ -1796,7 +1800,7 @@ void doproxy(argc,argv) int argc; - char *argv[]; + const char *argv[]; { register struct cmd *c; struct cmd *getcmd(); @@ -1901,12 +1905,13 @@ ntout[16] = '\0'; } -char * +const char * dotrans(name) - char *name; + const char *name; { static char new[MAXPATHLEN]; - char *cp1, *cp2 = new; + const char *cp1; + char *cp2 = new; register int i, ostop, found; for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++); @@ -1943,7 +1948,7 @@ void setnmap(argc, argv) int argc; - char *argv[]; + const char *argv[]; { char *cp; @@ -1983,13 +1988,14 @@ (void) strncpy(mapout, cp, MAXPATHLEN - 1); } -char * +const char * domap(name) - char *name; + const char *name; { static char new[MAXPATHLEN]; - register char *cp1 = name, *cp2 = mapin; - char *tp[9], *te[9]; + const char *cp1 = name; + char *cpn, *cp2 = mapin; + const char *tp[9], *te[9]; int i, toks[9], toknum = 0, match = 1; for (i=0; i < 9; ++i) { @@ -2032,33 +2038,34 @@ { toks[toknum] = 0; } - cp1 = new; - *cp1 = '\0'; + + cpn = new; + *cpn = '\0'; cp2 = mapout; while (*cp2) { match = 0; switch (*cp2) { case '\\': if (*(cp2 + 1)) { - *cp1++ = *++cp2; + *cpn++ = *++cp2; } break; case '[': LOOP: if (*++cp2 == '$' && isdigit(*(cp2+1))) { if (*++cp2 == '0') { - char *cp3 = name; + const char *cp3 = name; while (*cp3) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } match = 1; } else if (toks[toknum = *cp2 - '1']) { - char *cp3 = tp[toknum]; + const char *cp3 = tp[toknum]; while (cp3 != te[toknum]) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } match = 1; } @@ -2072,24 +2079,24 @@ else if (*cp2 == '$' && isdigit(*(cp2+1))) { if (*++cp2 == '0') { - char *cp3 = name; + const char *cp3 = name; while (*cp3) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } else if (toks[toknum = *cp2 - '1']) { - char *cp3=tp[toknum]; + const char *cp3=tp[toknum]; while (cp3 != te[toknum]) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } } else if (*cp2) { - *cp1++ = *cp2++; + *cpn++ = *cp2++; } } if (!*cp2) { @@ -2126,29 +2133,29 @@ case '$': if (isdigit(*(cp2 + 1))) { if (*++cp2 == '0') { - char *cp3 = name; + const char *cp3 = name; while (*cp3) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } else if (toks[toknum = *cp2 - '1']) { - char *cp3 = tp[toknum]; + const char *cp3 = tp[toknum]; while (cp3 != te[toknum]) { - *cp1++ = *cp3++; + *cpn++ = *cp3++; } } break; } /* intentional drop through */ default: - *cp1++ = *cp2; + *cpn++ = *cp2; break; } cp2++; } - *cp1 = '\0'; + *cpn = '\0'; if (!*new) { return(name); } @@ -2207,7 +2214,7 @@ void macdef(argc, argv) int argc; - char *argv[]; + const char *argv[]; { char *tmp; int c; @@ -2283,7 +2290,7 @@ * get size of file on remote machine */ void sizecmd(argc, argv) - char *argv[]; + const char *argv[]; { if (argc < 2) { @@ -2308,7 +2315,7 @@ * get last modification time of file on remote machine */ void modtime(argc, argv) - char *argv[]; + const char *argv[]; { int overbose; @@ -2347,7 +2354,7 @@ * show status on reomte machine */ void rmtstatus(argc, argv) - char *argv[]; + const char *argv[]; { (void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]); } @@ -2356,7 +2363,7 @@ * get file if modtime is more recent than current file */ void newer(argc, argv) - char *argv[]; + const char *argv[]; { if (getit(argc, argv, -1, "w")) { printf("Local file \"%s\" is newer than remote file \"%s\"\n", _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c --- branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/ftp/domacro.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -30,10 +30,11 @@ void domacro(argc, argv) int argc; - char *argv[]; + const char *argv[]; { - register int i, j; - register char *cp1, *cp2; + int i, j; + const char *cp1; + char *cp2; int count = 2, loopflg = 0; char line2[200]; struct cmd *getcmd(), *c; _____ Modified: branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c --- branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c 2005-12-23 20:47:54 UTC (rev 20316) +++ branches/alex-network-branch/reactos/apps/utils/net/ftp/fake.c 2005-12-24 02:50:22 UTC (rev 20317) @@ -113,7 +113,7 @@ #endif -char *fprintfSocket(int s, char *format, ...) +const char *fprintfSocket(int s, const char *format, ...) { va_list argptr; char buffer[10009]; [truncated at 1000 lines; 178926 more skipped]

18 years, 9 months

[gvg] 20316: Checking memory allocation return values helps prevent crashes

by gvg＠svn.reactos.com

Checking memory allocation return values helps prevent crashes Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h --- trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h 2005-12-23 20:46:48 UTC (rev 20315) +++ trunk/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h 2005-12-23 20:47:54 UTC (rev 20316) @@ -304,9 +304,12 @@ #ifdef __REACTOS__ #define MCLGET(m, how) { \ OS_DbgPrint(OSK_MID_TRACE,("(MCLGET) m = %x\n", m)); \ - (m)->m_data = (m)->m_ext.ext_buf = malloc(MCLBYTES); \ - (m)->m_flags |= M_EXT; \ - (m)->m_ext.ext_size = MCLBYTES; \ + (m)->m_ext.ext_buf = malloc(MCLBYTES); \ + if ((m)->m_ext.ext_buf != NULL) { \ + (m)->m_data = (m)->m_ext.ext_buf; \ + (m)->m_flags |= M_EXT; \ + (m)->m_ext.ext_size = MCLBYTES; \ + } \ } #define MCLFREE(p) { \ _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c 2005-12-23 20:46:48 UTC (rev 20315) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c 2005-12-23 20:47:54 UTC (rev 20316) @@ -366,8 +366,17 @@ #ifdef __REACTOS__ if( OtcpEvent.PacketSend ) { struct mbuf *new_m; - MGET( new_m, M_DONTWAIT, 0 ); + new_m = m_get( M_DONTWAIT, 0 ); + if ( NULL == new_m ) { + error = ENOBUFS; + goto done; + } MCLGET( new_m, M_DONTWAIT ); + if (0 == (new_m->m_flags & M_EXT)) { + m_free( new_m ); + error = ENOBUFS; + goto done; + } m_copydata( m, 0, htons(ip->ip_len), new_m->m_data ); new_m->m_len = htons(ip->ip_len); error = OtcpEvent.PacketSend( OtcpEvent.ClientData, @@ -498,7 +507,16 @@ if( error == 0 && OtcpEvent.PacketSend ) { struct mbuf *new_m; MGET( new_m, M_DONTWAIT, 0 ); + if ( NULL == new_m ) { + error = ENOBUFS; + goto done; + } MCLGET( new_m, M_DONTWAIT ); + if (0 == (new_m->m_flags & M_EXT)) { + m_free( new_m ); + error = ENOBUFS; + goto done; + } m_copydata( m, 0, htons(ip->ip_len), new_m->m_data ); new_m->m_len = htons(ip->ip_len); error = OtcpEvent.PacketSend( OtcpEvent.ClientData,

18 years, 9 months

[gvg] 20315: Send delayed ACKs after 200ms instead of 2500ms

by gvg＠svn.reactos.com

Send delayed ACKs after 200ms instead of 2500ms Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-23 20:44:39 UTC (rev 20314) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-23 20:46:48 UTC (rev 20315) @@ -307,6 +307,68 @@ TCPWakeup /* Wakeup */ }; +static KEVENT TimerLoopEvent; +static HANDLE TimerThreadHandle; + +/* + * We are running 2 timers here, one with a 200ms interval (fast) and the other + * with a 500ms interval (slow). So we need to time out at 200, 400, 500, 600, + * 800, 1000 and process the "fast" events at 200, 400, 600, 800, 1000 and the + * "slow" events at 500 and 1000. + */ +static VOID DDKAPI +TimerThread(PVOID Context) +{ + LARGE_INTEGER Timeout; + NTSTATUS Status; + unsigned Current, NextFast, NextSlow, Next; + + Current = 0; + Next = 0; + NextFast = 0; + NextSlow = 0; + while ( 1 ) { + if (Next == NextFast) { + NextFast += 2; + } + if (Next == NextSlow) { + NextSlow += 5; + } + Next = min(NextFast, NextSlow); + Timeout.QuadPart = (LONGLONG) (Next - Current) * -1000000; /* 100 ms */ + Status = KeWaitForSingleObject(&TimerLoopEvent, Executive, KernelMode, + FALSE, &Timeout); + if (STATUS_SUCCESS == Status) { + PsTerminateSystemThread(STATUS_SUCCESS); + } + ASSERT(STATUS_TIMEOUT == Status); + + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TimerOskitTCP( Next == NextFast, Next == NextSlow ); + if (Next == NextSlow) { + DrainSignals(); + } + TcpipRecursiveMutexLeave( &TCPLock ); + + Current = Next; + if (10 <= Current) { + Current = 0; + Next = 0; + NextFast = 0; + NextSlow = 0; + } + } +} + +static VOID +StartTimer(VOID) +{ + KeInitializeEvent(&TimerLoopEvent, NotificationEvent, FALSE); + PsCreateSystemThread(&TimerThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, + TimerThread, NULL); +} + + NTSTATUS TCPStartup(VOID) /* * FUNCTION: Initializes the TCP subsystem @@ -336,6 +398,8 @@ TAG('T','C','P','S'), /* Tag */ 0); /* Depth */ + StartTimer(); + TCPInitialized = TRUE; return STATUS_SUCCESS; @@ -349,9 +413,16 @@ * Status of operation */ { + LARGE_INTEGER WaitForThread; + if (!TCPInitialized) return STATUS_SUCCESS; + WaitForThread.QuadPart = -2500000; /* 250 ms */ + KeSetEvent(&TimerLoopEvent, IO_NO_INCREMENT, TRUE); + KeWaitForSingleObject(&TimerThreadHandle, Executive, KernelMode, + FALSE, &WaitForThread); + /* Deregister this protocol with IP layer */ IPRegisterProtocol(IPPROTO_TCP, NULL); @@ -598,13 +669,7 @@ } VOID TCPTimeout(VOID) { - static int Times = 0; - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - if( (Times++ % 5) == 0 ) { - TimerOskitTCP(); - } - DrainSignals(); - TcpipRecursiveMutexLeave( &TCPLock ); + /* Now handled by TimerThread */ } UINT TCPAllocatePort( UINT HintPort ) { _____ Modified: trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h --- trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h 2005-12-23 20:44:39 UTC (rev 20314) +++ trunk/reactos/drivers/lib/oskittcp/include/oskittcp.h 2005-12-23 20:46:48 UTC (rev 20315) @@ -105,7 +105,7 @@ extern void InitOskitTCP(); extern void DeinitOskitTCP(); -extern void TimerOskitTCP(); +extern void TimerOskitTCP( int FastTimer, int SlowTimer ); extern void OskitDumpBuffer( OSK_PCHAR Data, OSK_UINT Len ); extern int OskitTCPShutdown( void *socket, int disconn_type ); extern int OskitTCPSocket( void *Connection, void **ConnectionContext, _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-12-23 20:44:39 UTC (rev 20314) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-12-23 20:46:48 UTC (rev 20315) @@ -66,9 +66,13 @@ void DeinitOskitTCP() { } -void TimerOskitTCP() { - tcp_slowtimo(); - tcp_fasttimo(); +void TimerOskitTCP( int FastTimer, int SlowTimer ) { + if ( SlowTimer ) { + tcp_slowtimo(); + } + if ( FastTimer ) { + tcp_fasttimo(); + } } void RegisterOskitTCPEventHandlers( POSKITTCP_EVENT_HANDLERS EventHandlers ) {

18 years, 9 months

[gvg] 20314: Force Nagle algorithm off for loopback

by gvg＠svn.reactos.com

Force Nagle algorithm off for loopback Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c 2005-12-23 18:03:12 UTC (rev 20313) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c 2005-12-23 20:44:39 UTC (rev 20314) @@ -66,7 +66,10 @@ extern struct mbuf *m_copypack(); #endif +#define IS_LOOPBACK_ADDR(addr) \ + ((ntohl(addr) & IN_CLASSA_NET) == (IN_LOOPBACKNET << IN_CLASSA_NSHIFT)) + /* * Tcp output routine: figure out what should be sent and send it. */ @@ -215,8 +218,8 @@ win = sbspace(&so->so_rcv); /* - * Sender silly window avoidance. If connection is idle - * and can send all data, a maximum segment, + * Sender silly window avoidance. If connection is idle or using + * the loopback interface and can send all data, a maximum segment, * at least a maximum default-size segment do it, * or are forced, do it; otherwise don't bother. * If peer's buffer is tiny, then send @@ -227,7 +230,8 @@ if (len) { if (len == tp->t_maxseg) goto send; - if ((idle || tp->t_flags & TF_NODELAY) && + if ((idle || tp->t_flags & TF_NODELAY || + IS_LOOPBACK_ADDR(tp->t_inpcb->inp_laddr.s_addr)) && (tp->t_flags & TF_NOPUSH) == 0 && len + off >= so->so_snd.sb_cc) goto send;

18 years, 9 months

[mbosma] 20313: Allow to choose between 800x600x16 and 640x480x8 as default resolution in first stage installer.

by mbosma＠svn.reactos.com

Allow to choose between 800x600x16 and 640x480x8 as default resolution in first stage installer. Modified: trunk/reactos/bootdata/txtsetup.sif Modified: trunk/reactos/subsys/system/usetup/settings.c _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2005-12-23 17:46:17 UTC (rev 20312) +++ trunk/reactos/bootdata/txtsetup.sif 2005-12-23 18:03:12 UTC (rev 20313) @@ -66,9 +66,10 @@ halmp.dll = 2,hal.dll [Display] -;<id> = <user friendly name>,<spare>,<service key name> -vga = "VGA Display",,Vga -vbe = "VESA Display",,VBE +;<id> = <user friendly name>,<spare>,<service key name>,<hight>,<width>,<bpp> +vga = "VGA Display (640x680x8)",,Vga,640,480,8 +vbe_lowres = "VESA Display (640x680x8)",,VBE,640,480,8 +vbe = "VESA Display (800x600x16)",,VBE,800,600,16 [Map.Display] ;<id> = <pnp id string> _____ Modified: trunk/reactos/subsys/system/usetup/settings.c --- trunk/reactos/subsys/system/usetup/settings.c 2005-12-23 17:46:17 UTC (rev 20312) +++ trunk/reactos/subsys/system/usetup/settings.c 2005-12-23 18:03:12 UTC (rev 20313) @@ -521,12 +521,14 @@ return FALSE; } + /* Enable the right driver */ if (!InfGetDataField(Context, 3, &ServiceName)) { DPRINT("InfGetDataField() failed\n"); return FALSE; } + ASSERT(wcslen(ServiceName) < 10); DPRINT("Service name: %S\n", ServiceName); StartValue = 1; @@ -536,13 +538,75 @@ REG_DWORD, &StartValue, sizeof(ULONG)); - InfFreeContext(Context); + if (!NT_SUCCESS(Status)) { DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); return FALSE; } + /* Set the resolution */ + WCHAR RegPath [255]; + swprintf(RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\%s\\Device0", ServiceName); + + PWCHAR Buffer; + if (!InfGetDataField(Context, 4, &Buffer)) + { + DPRINT("InfGetDataField() failed\n"); + return FALSE; + } + ULONG Width = wcstoul(Buffer, NULL, 10); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.XResolution", + REG_DWORD, + &Width, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + + if (!InfGetDataField(Context, 5, &Buffer)) + { + DPRINT("InfGetDataField() failed\n"); + return FALSE; + } + ULONG Hight = wcstoul(Buffer, 0, 0); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.YResolution", + REG_DWORD, + &Hight, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + if (!InfGetDataField(Context, 6, &Buffer)) + { + DPRINT("InfGetDataField() failed\n"); + return FALSE; + } + ULONG Bpp = wcstoul(Buffer, 0, 0); + Status = RtlWriteRegistryValue(RTL_REGISTRY_ABSOLUTE, + RegPath, + L"DefaultSettings.BitsPerPel", + REG_DWORD, + &Bpp, + sizeof(ULONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlWriteRegistryValue() failed (Status %lx)\n", Status); + return FALSE; + } + + InfFreeContext(Context); + DPRINT("ProcessDisplayRegistry() done\n"); return TRUE;

18 years, 9 months

[navaraf] 20312: Dead branch

by navaraf＠svn.reactos.com

Dead branch Deleted: branches/umode_net_branch/

18 years, 9 months

[ekohl] 20311: -Add QueryServiceConfig2A stub.

by ekohl＠svn.reactos.com

-Add QueryServiceConfig2A stub. -Implement QueryServiceObjectSecurity and SetServiceObjectSecurity. Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2005-12-23 15:46:03 UTC (rev 20310) +++ trunk/reactos/include/idl/svcctl.idl 2005-12-23 15:56:51 UTC (rev 20311) @@ -10,6 +10,7 @@ #define BOOL unsigned long #define SC_HANDLE unsigned int #define SC_LOCK unsigned int +#define SERVICE_STATUS_HANDLE unsigned long #define LPSTR char* #define LPCSTR char* #define LPWSTR wchar_t* @@ -57,10 +58,19 @@ [out] SC_LOCK *hLock); /* Function 4 */ - DWORD ScmrQueryServiceObjectSecurity([in] handle_t BindingHandle); /* FIXME */ + DWORD ScmrQueryServiceObjectSecurity([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwSecurityInformation, + [out, size_is(dwSecuityDescriptorSize)] unsigned char *lpSecurityDescriptor, + [in] DWORD dwSecuityDescriptorSize, + [out] LPDWORD pcbBytesNeeded); /* Function 5 */ - DWORD ScmrSetServiceObjectSecurity([in] handle_t BindingHandle); /* FIXME */ + DWORD ScmrSetServiceObjectSecurity([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwSecurityInformation, + [in, size_is(dwSecuityDescriptorSize)] unsigned char *lpSecurityDescriptor, + [in] DWORD dwSecuityDescriptorSize); /* Function 6 */ DWORD ScmrQueryServiceStatus([in] handle_t BindingHandle, @@ -68,7 +78,8 @@ [out] LPSERVICE_STATUS lpServiceStatus); /* Function 7 */ - DWORD ScmrSetServiceStatus([in] handle_t BindingHandle); /* FIXME */ + DWORD ScmrSetServiceStatus([in] handle_t BindingHandle, + [in] SERVICE_STATUS_HANDLE hServiceStatus); /* FIXME */ /* Function 8 */ DWORD ScmrUnlockServiceDatabase([in] handle_t BindingHandle, @@ -78,6 +89,13 @@ DWORD ScmrNotifyBootConfigStatus([in] handle_t BindingHandle, [in] BOOL BootAcceptable); + /* Function 10 */ + DWORD ScmrI_ScSetServiceBitsW([in] handle_t BindingHandle, + [in] SERVICE_STATUS_HANDLE hServiceStatus, + [in] DWORD dwServiceBits, + [in] BOOL bSetBitsOn, + [in] BOOL bUpdateImmediately, + [in, string, unique] LPWSTR lpString); /* Function 11 */ DWORD ScmrChangeServiceConfigW([in] handle_t BindingHandle, @@ -132,7 +150,7 @@ [in] DWORD dwBufSize, [out] LPDWORD pcbBytesNeeded, [out] LPDWORD lpServicesReturned, - [in, out] LPDWORD lpResumeHandle); /* FIXME: unique */ + [in, out, unique] LPDWORD lpResumeHandle); /* Function 15 */ DWORD ScmrOpenSCManagerW([in] handle_t BindingHandle, _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-12-23 15:46:03 UTC (rev 20310) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-12-23 15:56:51 UTC (rev 20311) @@ -449,7 +449,7 @@ ;QueryAllTracesA ;QueryAllTracesW QueryRecoveryAgentsOnEncryptedFile@8 -;QueryServiceConfig2A@20 +QueryServiceConfig2A@20 QueryServiceConfig2W@20 QueryServiceConfigA@16 QueryServiceConfigW@16 _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-12-23 15:46:03 UTC (rev 20310) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-12-23 15:56:51 UTC (rev 20311) @@ -1035,8 +1035,7 @@ * * @implemented */ -BOOL -STDCALL +BOOL STDCALL QueryServiceConfigW(SC_HANDLE hService, LPQUERY_SERVICE_CONFIGW lpServiceConfig, DWORD cbBufSize, @@ -1095,21 +1094,39 @@ /********************************************************************** + * QueryServiceConfig2A + * + * @unimplemented + */ +BOOL +STDCALL +QueryServiceConfig2A( + SC_HANDLE hService, + DWORD dwInfo, + LPBYTE lpBuffer, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) +{ + DPRINT1("QueryServiceConfig2A is unimplemented\n"); + return FALSE; +} + + +/********************************************************************** * QueryServiceConfig2W * * @unimplemented */ BOOL STDCALL -QueryServiceConfig2W -( +QueryServiceConfig2W( SC_HANDLE hService, DWORD dwInfo, LPBYTE lpBuffer, DWORD cbBufSize, LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceConfigW2 is unimplemented\n"); + DPRINT1("QueryServiceConfig2W is unimplemented\n"); return FALSE; } @@ -1155,20 +1172,37 @@ /********************************************************************** * QueryServiceObjectSecurity * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceObjectSecurity( - SC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - PSECURITY_DESCRIPTOR lpSecurityDescriptor, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded) +BOOL STDCALL +QueryServiceObjectSecurity(SC_HANDLE hService, + SECURITY_INFORMATION dwSecurityInformation, + PSECURITY_DESCRIPTOR lpSecurityDescriptor, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceObjectSecurity is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD dwError; + + DPRINT("QueryServiceObjectSecurity(%p, %lu, %p)\n", + hService, dwSecurityInformation, lpSecurityDescriptor); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceObjectSecurity(BindingHandle, + (unsigned int)hService, + dwSecurityInformation, + (unsigned char *)lpSecurityDescriptor, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("QueryServiceObjectSecurity() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; } @@ -1225,15 +1259,64 @@ /********************************************************************** * SetServiceObjectSecurity * - * @unimplemented + * @implemented */ BOOL STDCALL SetServiceObjectSecurity(SC_HANDLE hService, - SECURITY_INFORMATION dwSecurityInformation, - PSECURITY_DESCRIPTOR lpSecurityDescriptor) + SECURITY_INFORMATION dwSecurityInformation, + PSECURITY_DESCRIPTOR lpSecurityDescriptor) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + PSECURITY_DESCRIPTOR SelfRelativeSD = NULL; + ULONG Length; + NTSTATUS Status; + DWORD dwError; + + Length = 0; + Status = RtlMakeSelfRelativeSD(lpSecurityDescriptor, + SelfRelativeSD, + &Length); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SelfRelativeSD = HeapAlloc(GetProcessHeap(), 0, Length); + if (SelfRelativeSD == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + Status = RtlMakeSelfRelativeSD(lpSecurityDescriptor, + SelfRelativeSD, + &Length); + if (!NT_SUCCESS(Status)) + { + HeapFree(GetProcessHeap(), 0, SelfRelativeSD); + SetLastError(RtlNtStatusToDosError(Status)); + return FALSE; + } + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrSetServiceObjectSecurity(BindingHandle, + (unsigned int)hService, + dwSecurityInformation, + (unsigned char *)SelfRelativeSD, + Length); + + HeapFree(GetProcessHeap(), 0, SelfRelativeSD); + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrServiceObjectSecurity() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; } _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-12-23 15:46:03 UTC (rev 20310) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-12-23 15:56:51 UTC (rev 20311) @@ -453,16 +453,91 @@ /* Function 4 */ unsigned long -ScmrQueryServiceObjectSecurity(handle_t BindingHandle) +ScmrQueryServiceObjectSecurity(handle_t BindingHandle, + unsigned int hService, + unsigned long dwSecurityInformation, + unsigned char *lpSecurityDescriptor, + unsigned long dwSecuityDescriptorSize, + unsigned long *pcbBytesNeeded) { - DPRINT1("ScmrQueryServiceSecurity() is unimplemented\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + PSERVICE_HANDLE hSvc; + PSERVICE lpService; + ULONG DesiredAccess = 0; + NTSTATUS Status; + DWORD dwBytesNeeded; + DWORD dwError; + + DPRINT("ScmrQueryServiceSecurity() called\n"); + + hSvc = (PSERVICE_HANDLE)hService; + if (hSvc->Handle.Tag != SERVICE_TAG) + { + DPRINT1("Invalid handle tag!\n"); + return ERROR_INVALID_HANDLE; + } + + if (dwSecurityInformation & (DACL_SECURITY_INFORMATION || + GROUP_SECURITY_INFORMATION || + OWNER_SECURITY_INFORMATION)) + DesiredAccess |= READ_CONTROL; + + if (dwSecurityInformation & SACL_SECURITY_INFORMATION) + DesiredAccess |= ACCESS_SYSTEM_SECURITY; + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + DesiredAccess)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", hSvc->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + lpService = hSvc->ServiceEntry; + if (lpService == NULL) + { + DPRINT1("lpService == NULL!\n"); + return ERROR_INVALID_HANDLE; + } + + /* FIXME: Lock the service list */ + + Status = RtlQuerySecurityObject(lpService->lpSecurityDescriptor, + dwSecurityInformation, + (PSECURITY_DESCRIPTOR)lpSecurityDescriptor, + dwSecuityDescriptorSize, + &dwBytesNeeded); + + /* FIXME: Unlock the service list */ + + if (NT_SUCCESS(Status)) + { + *pcbBytesNeeded = dwBytesNeeded; + dwError = STATUS_SUCCESS; + } + else if (Status == STATUS_BUFFER_TOO_SMALL) + { + *pcbBytesNeeded = dwBytesNeeded; + dwError = ERROR_INSUFFICIENT_BUFFER; + } + else if (Status == STATUS_BAD_DESCRIPTOR_FORMAT) + { + dwError = ERROR_GEN_FAILURE; + } + else + { + dwError = RtlNtStatusToDosError(Status); + } + + return dwError; } /* Function 5 */ unsigned long -ScmrSetServiceObjectSecurity(handle_t BindingHandle) +ScmrSetServiceObjectSecurity(handle_t BindingHandle, + unsigned int hService, + unsigned long dwSecurityInformation, + unsigned char *lpSecurityDescriptor, + unsigned long dwSecuityDescriptorSize) { DPRINT1("ScmrSetServiceSecurity() is unimplemented\n"); return ERROR_CALL_NOT_IMPLEMENTED; @@ -515,7 +590,8 @@ /* Function 7 */ unsigned long -ScmrSetServiceStatus(handle_t BindingHandle) +ScmrSetServiceStatus(handle_t BindingHandle, + unsigned long hServiceStatus) /* FIXME */ { DPRINT1("ScmrSetServiceStatus() is unimplemented\n"); /* FIXME */ @@ -545,6 +621,21 @@ } +/* Function 10 */ +unsigned long +ScmrI_ScSetServiceBitsW(handle_t BindingHandle, + unsigned long hServiceStatus, + unsigned long dwServiceBits, + unsigned long bSetBitsOn, + unsigned long bUpdateImmediately, + wchar_t *lpString) +{ + DPRINT1("ScmrI_ScSetServiceBitsW() called\n"); + /* FIXME */ + return ERROR_SUCCESS; +} + + /* Function 11 */ unsigned long ScmrChangeServiceConfigW(handle_t BiningHandle, _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-12-23 15:46:03 UTC (rev 20310) +++ trunk/reactos/subsys/system/services/services.h 2005-12-23 15:56:51 UTC (rev 20311) @@ -25,6 +25,8 @@ ULONG Flags; + PSECURITY_DESCRIPTOR lpSecurityDescriptor; + BOOLEAN ServiceVisited; HANDLE ControlPipeHandle;

18 years, 9 months

[ekohl] 20310: Forgot this file!

by ekohl＠svn.reactos.com

Forgot this file! Exports CMP_InitDetection, CMP_Report_LogOn, CM_Move_DevNode[_Ex], CM_Setup_DevNode[_Ex] and CM_Uninstall_DevNode[_Ex]. Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-12-23 08:40:50 UTC (rev 20309) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-12-23 15:46:03 UTC (rev 20310) @@ -3,9 +3,9 @@ @ stub AddTagToGroupOrderListEntry @ stub AppendStringToMultiSz @ stdcall AssertFail(str long str) -@ stub CMP_Init_Detection +@ stdcall CMP_Init_Detection(long) @ stub CMP_RegisterNotification -@ stub CMP_Report_LogOn +@ stdcall CMP_Report_LogOn(long long) @ stub CMP_UnregisterNotification @ stub CMP_WaitNoPendingInstallEvents @ stub CMP_WaitServicesAvailable @@ -136,8 +136,8 @@ @ stub CM_Merge_Range_List @ stub CM_Modify_Res_Des @ stub CM_Modify_Res_Des_Ex -@ stub CM_Move_DevNode -@ stub CM_Move_DevNode_Ex +@ stdcall CM_Move_DevNode(long long long) +@ stdcall CM_Move_DevNode_Ex(long long long long) @ stub CM_Next_Range @ stdcall CM_Open_Class_KeyA(ptr str long long ptr long) @ stdcall CM_Open_Class_KeyW(ptr wstr long long ptr long) @@ -183,11 +183,11 @@ @ stub CM_Set_HW_Prof_FlagsW @ stub CM_Set_HW_Prof_Flags_ExA @ stub CM_Set_HW_Prof_Flags_ExW -@ stub CM_Setup_DevNode -@ stub CM_Setup_DevNode_Ex +@ stdcall CM_Setup_DevNode(long long) +@ stdcall CM_Setup_DevNode_Ex(long long long) @ stub CM_Test_Range_Available -@ stub CM_Uninstall_DevNode -@ stub CM_Uninstall_DevNode_Ex +@ stdcall CM_Uninstall_DevNode(long long) +@ stdcall CM_Uninstall_DevNode_Ex(long long long) @ stub CM_Unregister_Device_InterfaceA @ stub CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA

18 years, 9 months

[gvg] 20309: Release branch moved to tags

by gvg＠svn.reactos.com

Release branch moved to tags Deleted: branches/ros-branch-0_2_9/

18 years, 9 months

[gvg] 20308: Tag release

by gvg＠svn.reactos.com

Tag release Added: tags/ReactOS-0.2.9/ _____ Copied: tags/ReactOS-0.2.9 (from rev 20307, branches/ros-branch-0_2_9)

18 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005