Merge 19090:20311

svn path=/branches/alex-network-branch/; revision=20317

Author: ionescu007

reactos/COPYING

@@ -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 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     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 @@ convey the exclusion of warranty; and each file should have at least
 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 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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.

reactos/CREDITS

@@ -47,7 +47,8 @@ David Welch <[email protected]>
 Jonathan Wilson <[email protected]>
 Art Yerkes <[email protected]>
 Magnus Olsen ([email protected])
-Alex Ionescu ([email protected])
+Brandon Turner ([email protected])
+Christoph von Wittich ([email protected])
 
 Graphic Design from
 

reactos/LGPL.txt

@@ -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 @@ convey the exclusion of warranty; and each file should have at least the
 
     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.
 

reactos/Makefile

@@ -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 @@ ifeq ($(HOST),mingw32-linux)
 	export EXEPREFIX = ./
 ifeq ($(OSTYPE),msys)
 	export EXEPOSTFIX = .exe
-else	
+else
 	export EXEPOSTFIX =
 endif
 	export SEP = /
@@ -319,7 +346,7 @@ ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc
 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 @@ PREAUTO := \
 	$(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 @@ $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC)
 
 $(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 @@ msvc8: $(RBUILD_TARGET)
 
 .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

reactos/ReactOS-ppc.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="config-ppc.xml">
+		<xi:fallback>
+			<xi:include href="config.template.xml" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="baseaddress.xml" />
+
+	<property name="BOOTPROG_PREPARE" value="ppc-le2be" />
+	<property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" />
+	<property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" />
+	<property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" />
+
+	<define name="_M_PPC" />
+	<define name="_PPC_" />
+	<define name="__PowerPC__" />
+	<define name="_REACTOS_" />
+	<define name="__MINGW_IMPORT" empty="true" />
+	<define name="__restrict__" empty="true" />
+	<compilerflag>-v</compilerflag>
+	<if property="MP" value="1">
+		<define name="CONFIG_SMP" value="1" />
+	</if>
+	<if property="DBG" value="1">
+		<define name="DBG" value="1" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<if property="DBG" value="0">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-Wno-strict-aliasing</compilerflag>
+	</if>
+	<if property="KDBG" value="1">
+		<define name="KDBG" value="1" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</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">
+		<xi:include href="apps/directory.xml" />
+	</directory>
+	<directory name="boot">
+		<xi:include href="boot/boot.xml" />
+	</directory>
+	<directory name="bootdata">
+		<xi:include href="bootdata/bootdata.xml" />
+	</directory>
+	<directory name="drivers">
+		<xi:include href="drivers/directory.xml" />
+	</directory>
+	<directory name="hal">
+		<xi:include href="hal/directory.xml" />
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.xml" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/directory.xml" />
+	</directory>
+	<directory name="media">
+		<xi:include href="media/directory.xml" />
+	</directory>
+	<directory name="modules">
+		<xi:include href="modules/directory.xml" />
+	</directory>
+	<directory name="ntoskrnl">
+		<xi:include href="ntoskrnl/ntoskrnl.xml" />
+	</directory>
+	<directory name="regtests">
+		<xi:include href="regtests/directory.xml" />
+	</directory>
+	<directory name="services">
+		<xi:include href="services/directory.xml" />
+	</directory>
+	<directory name="subsys">
+		<xi:include href="subsys/directory.xml" />
+	</directory>
+</project>

reactos/ReactOS.xml

@@ -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,20 +25,23 @@
 		<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" />
 		<property name="DBG_OR_KDBG" value="true" />
 	</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">

reactos/apistatus.lst

@@ -11,15 +11,11 @@ iphlpapi.dll reactos/lib/iphlpapi
 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

reactos/apps/utils/directory.xml

@@ -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>

reactos/apps/utils/getfirefox/De.rc

@@ -0,0 +1,44 @@
+/*
+ * PROJECT:     ReactOS utilities
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        apps/utils/getfirefox/En.rc
+ * PURPOSE:     English resources
+ * COPYRIGHT:   Copyright 2004 Mike McCormack for CodeWeavers
+ *              Copyright 2005 Ge van Geldorp ([email protected])
+ */
+/*
+ * Based on Wine dlls/shdocvw/En.rc
+ *
+ * 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
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Lade Firefox herunter"
+FONT 8, "MS Shell Dlg"
+{
+ CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12
+ LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER
+ CHECKBOX "Entferne ""Get Firefox"" nach Fertigstellung aus dem Startmen�", IDC_REMOVE,
+           10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
+}
+
+STRINGTABLE
+BEGIN
+ IDS_START_MENU_NAME "Get Firefox"
+END