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