Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 22658: Forward functions verified working.
by arty＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: arty Date: Tue Jun 27 12:51:04 2006 New Revision: 22658 URL: http://svn.reactos.org/svn/reactos?rev=22658&view=rev Log: Forward functions verified working. Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp branches/powerpc/reactos/tools/tools.mak Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Tue Jun 27 12:51:04 2006 @@ -1,14 +1,14 @@ # Function Args Returns Types # Real OFW functions to proxy finddevice 1 1 char* int -open 1 1 int int +open 1 1 char* int getprop 4 1 int char* char*:arg3 int int write 3 1 int char*:arg2 int int read 3 1 int char*:arg2 int int exit 0 0 child 1 1 int int peer 1 1 int int -seek 3 1 int int int int +seek 2 1 int int int # Convenience functions that interact closely with OFW (written in BE asm) -dumpregs 0 0 -print_string 1 0 char* Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Tue Jun 27 12:51:04 2006 @@ -34,7 +34,7 @@ } int round_up( int x, int factor ) { - return (x + (factor - 1)) & (factor - 1); + return (x + (factor - 1)) & ~(factor - 1); } std::string c_type( const std::string &intype ) { Modified: branches/powerpc/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/tools.mak… ============================================================================== --- branches/powerpc/reactos/tools/tools.mak (original) +++ branches/powerpc/reactos/tools/tools.mak Tue Jun 27 12:51:04 2006 @@ -52,6 +52,7 @@ include tools/mkhive/mkhive.mak include tools/nci/nci.mak include tools/rbuild/rbuild.mak +include tools/ofw_interface/ofw_interface.mak include tools/unicode/unicode.mak include tools/widl/widl.mak include tools/winebuild/winebuild.mak

1 0

[arty] 22657: Add ofw generated object file.
by arty＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: arty Date: Tue Jun 27 12:15:06 2006 New Revision: 22657 URL: http://svn.reactos.org/svn/reactos?rev=22657&view=rev Log: Add ofw generated object file. Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Tue Jun 27 12:15:06 2006 @@ -1,8 +1,8 @@ #!/bin/sh export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin -ld -EL -g -nostartfiles -nostdlib -N -Ttext=0x8000 -o freeldr.elf obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o obj-ppc/boot/freeldr/freeldr/cache/blocklist.o obj-ppc/boot/freeldr/freeldr/cache/cache.o obj-ppc/boot/freeldr/freeldr/comm/rs232.o obj-ppc/boot/freeldr/freeldr/disk/disk.o obj-ppc/boot/freeldr/freeldr/disk/partition.o obj-ppc/boot/freeldr/freeldr/fs/ext2.o obj-ppc/boot/freeldr/freeldr/fs/fat.o obj-ppc/boot/freeldr/freeldr/fs/fs.o obj-ppc/boot/freeldr/freeldr/fs/fsrec.o obj-ppc/boot/freeldr/freeldr/fs/iso.o obj-ppc/boot/freeldr/freeldr/fs/ntfs.o obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o obj-ppc/boot/freeldr/freeldr/inifile/inifile.o obj-ppc/boot/freeldr/freeldr/inifile/parse.o obj-ppc/boot/freeldr/freeldr/math/libgcc2.o obj-ppc/boot/freeldr/freeldr/mm/meminit.o obj-ppc/boot/freeldr/freeldr/mm/mm.o obj-ppc/boot/freeldr/freeldr/reactos/registry.o obj-ppc/boot/freeldr/freeldr/reactos/arcname.o obj-ppc/boot/freeldr/freeldr/reactos/binhive.o obj-ppc/boot/freeldr/freeldr/reactos/reactos.o obj-ppc/boot/freeldr/freeldr/rtl/list.o obj-ppc/boot/freeldr/freeldr/ui/gui.o obj-ppc/boot/freeldr/freeldr/ui/tui.o obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o obj-ppc/boot/freeldr/freeldr/ui/ui.o obj-ppc/boot/freeldr/freeldr/video/bank.o obj-ppc/boot/freeldr/freeldr/video/fade.o obj-ppc/boot/freeldr/freeldr/video/palette.o obj-ppc/boot/freeldr/freeldr/video/pixel.o obj-ppc/boot/freeldr/freeldr/video/video.o obj-ppc/boot/freeldr/freeldr/freeldr.o obj-ppc/boot/freeldr/freeldr/debug.o obj-ppc/boot/freeldr/freeldr/version.o obj-ppc/boot/freeldr/freeldr/cmdline.o obj-ppc/boot/freeldr/freeldr/machine.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o obj-ppc/boot/freeldr/freeldr/bootmgr.o obj-ppc/boot/freeldr/freeldr/drivemap.o obj-ppc/boot/freeldr/freeldr/miscboot.o obj-ppc/boot/freeldr/freeldr/options.o obj-ppc/boot/freeldr/freeldr/linuxboot.o obj-ppc/boot/freeldr/freeldr/oslist.o obj-ppc/boot/freeldr/freeldr/custom.o obj-ppc/lib/rossym/rossym.a obj-ppc/lib/string/string.a obj-ppc/lib/rtl/rtl.a /usr/local/pkg/reactos-powerpc/lib/libgcc.a -objcopy -O binary freeldr.elf freeldr.tmp +ld -EL -g -nostartfiles -nostdlib -N -Ttext=0x8000 -o freeldr.elf obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o obj-ppc/boot/freeldr/freeldr/cache/blocklist.o obj-ppc/boot/freeldr/freeldr/cache/cache.o obj-ppc/boot/freeldr/freeldr/comm/rs232.o obj-ppc/boot/freeldr/freeldr/disk/disk.o obj-ppc/boot/freeldr/freeldr/disk/partition.o obj-ppc/boot/freeldr/freeldr/fs/ext2.o obj-ppc/boot/freeldr/freeldr/fs/fat.o obj-ppc/boot/freeldr/freeldr/fs/fs.o obj-ppc/boot/freeldr/freeldr/fs/fsrec.o obj-ppc/boot/freeldr/freeldr/fs/iso.o obj-ppc/boot/freeldr/freeldr/fs/ntfs.o obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o obj-ppc/boot/freeldr/freeldr/inifile/inifile.o obj-ppc/boot/freeldr/freeldr/inifile/parse.o obj-ppc/boot/freeldr/freeldr/math/libgcc2.o obj-ppc/boot/freeldr/freeldr/mm/meminit.o obj-ppc/boot/freeldr/freeldr/mm/mm.o obj-ppc/boot/freeldr/freeldr/reactos/registry.o obj-ppc/boot/freeldr/freeldr/reactos/arcname.o obj-ppc/boot/freeldr/freeldr/reactos/binhive.o obj-ppc/boot/freeldr/freeldr/reactos/reactos.o obj-ppc/boot/freeldr/freeldr/rtl/list.o obj-ppc/boot/freeldr/freeldr/ui/gui.o obj-ppc/boot/freeldr/freeldr/ui/tui.o obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o obj-ppc/boot/freeldr/freeldr/ui/ui.o obj-ppc/boot/freeldr/freeldr/video/bank.o obj-ppc/boot/freeldr/freeldr/video/fade.o obj-ppc/boot/freeldr/freeldr/video/palette.o obj-ppc/boot/freeldr/freeldr/video/pixel.o obj-ppc/boot/freeldr/freeldr/video/video.o obj-ppc/boot/freeldr/freeldr/freeldr.o obj-ppc/boot/freeldr/freeldr/debug.o obj-ppc/boot/freeldr/freeldr/version.o obj-ppc/boot/freeldr/freeldr/cmdline.o obj-ppc/boot/freeldr/freeldr/machine.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o obj-ppc/boot/freeldr/freeldr/bootmgr.o obj-ppc/boot/freeldr/freeldr/drivemap.o obj-ppc/boot/freeldr/freeldr/miscboot.o obj-ppc/boot/freeldr/freeldr/options.o obj-ppc/boot/freeldr/freeldr/linuxboot.o obj-ppc/boot/freeldr/freeldr/oslist.o obj-ppc/boot/freeldr/freeldr/custom.o obj-ppc/lib/rossym/rossym.a obj-ppc/lib/string/string.a obj-ppc/lib/rtl/rtl.a /usr/local/pkg/reactos-powerpc/lib/libgcc.a +objcopy -O binary --only-section=.text --only-section=.data --only-section=.bss freeldr.elf freeldr.tmp objcopy -I binary -B powerpc:common -O elf32-powerpc freeldr.tmp ofwldr.payload reactos-powerpc-as -mbig -o ofwboot.o boot/freeldr/bootsect/ofwboot.s ld -EB -Ttext 0xe00000 -e _begin -o ofwldr ofwboot.o ofwldr.payload

1 0

[arty] 22656: Regularize with generated interfaces.
by arty＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: arty Date: Tue Jun 27 12:01:08 2006 New Revision: 22656 URL: http://svn.reactos.org/svn/reactos?rev=22656&view=rev Log: Regularize with generated interfaces. Modified: branches/powerpc/reactos/Makefile branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Modified: branches/powerpc/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/Makefile?rev=22… ============================================================================== --- branches/powerpc/reactos/Makefile (original) +++ branches/powerpc/reactos/Makefile Tue Jun 27 12:01:08 2006 @@ -372,9 +372,7 @@ $(ERRCODES_RC) \ $(NCI_SERVICE_FILES) \ $(GENDIB_DIB_FILES) \ - $(OFW_INTERFACE_OUTPUT) \ - $(OFW_INTERFACE_SOURCE) \ - $(OFW_INTERFACE_HEADER) + $(OFW_INTERFACE_SERVICE_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Tue Jun 27 12:01:08 2006 @@ -29,9 +29,9 @@ char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; jmp_buf jmp; -void le_swap( const void *start_addr_v, - const void *end_addr_v, - const void *target_addr_v ) { +void le_swap( void *start_addr_v, + void *end_addr_v, + void *target_addr_v ) { long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), *end_addr = (long *)ROUND_UP((long)end_addr_v,8), *target_addr = (long *)ROUND_DOWN((long)target_addr_v,8); @@ -43,90 +43,6 @@ start_addr += 2; target_addr += 2; } -} - -int ofw_finddevice( const char *name ) { - int ret, len; - - len = strlen(name); - le_swap( name, name + len, name ); - ret = ofproxy( 0, (char *)name, NULL, NULL, NULL ); - le_swap( name, name + len, name ); - return ret; -} - -int ofw_getprop( int package, const char *name, void *buffer, int buflen ) { - int ret, len = strlen(name); - le_swap( name, name + len, name ); - le_swap( buffer, (char *)buffer + buflen, buffer ); - ret = ofproxy - ( 4, (void *)package, (char *)name, buffer, (void *)buflen ); - le_swap( buffer, (char *)buffer + buflen, buffer ); - le_swap( name, name + len, name ); - return ret; -} - -/* Since this is from external storage, it doesn't need swapping */ -int ofw_write( int handle, const char *data, int len ) { - int ret; - le_swap( data, data + len, data ); - ret = ofproxy - ( 8, (void *)handle, (char *)data, (void *)len, NULL ); - le_swap( data, data + len, data ); - return ret; -} - -/* Since this is from external storage, it doesn't need swapping */ -int ofw_read( int handle, const char *data, int len ) { - int ret; - - le_swap( data, data + len, data ); - ret = ofproxy - ( 12, (void *)handle, (char *)data, (void *)len, NULL ); - le_swap( data, data + len, data ); - - return ret; -} - -void ofw_exit() { - ofproxy( 16, NULL, NULL, NULL, NULL ); -} - -void ofw_dumpregs() { - ofproxy( 20, NULL, NULL, NULL, NULL ); -} - -void ofw_print_string( const char *str ) { - int len = strlen(str); - le_swap( (char *)str, str + len, (char *)str ); - ofproxy( 24, (void *)str, NULL, NULL, NULL ); - le_swap( (char *)str, str + len, (char *)str ); -} - -void ofw_print_number( int num ) { - ofproxy( 28, (void *)num, NULL, NULL, NULL ); -} - -int ofw_open( const char *name ) { - int ret, len; - - len = strlen(name); - le_swap( name, name + len, name ); - ret = ofproxy( 32, (char *)name, NULL, NULL, NULL ); - le_swap( name, name + len, name ); - return ret; -} - -int ofw_child( int package ) { - return ofproxy( 36, (void *)package, NULL, NULL, NULL ); -} - -int ofw_peer( int package ) { - return ofproxy( 40, (void *)package, NULL, NULL, NULL ); -} - -int ofw_seek( int handle, long long location ) { - return ofproxy( 44, (void *)handle, (void *)(int)(location >> 32), (void *)(int)location, NULL ); } void PpcPutChar( int ch ) { Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Tue Jun 27 12:01:08 2006 @@ -62,6 +62,7 @@ <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-Os</compilerflag> <file>boot.s</file> + <file>ofw.c</file> <file>mach.c</file> <file>mboot.c</file> </module> Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h Tue Jun 27 12:01:08 2006 @@ -6,20 +6,14 @@ #define REV(x) (((x)>>24)&0xff)|(((x)>>8)&0xff00)|(((x)<<24)&0xff000000)|(((x)<<8)&0xff0000) +#include "of_call.h" +#include <string.h> + typedef int (*of_proxy) ( int table_off, void *arg1, void *arg2, void *arg3, void *arg4 ); typedef long jmp_buf[100]; - extern of_proxy ofproxy; - -int ofw_finddevice( const char *name ); -int ofw_getprop( int package, const char *name, void *buffer, int size ); -int ofw_open( const char *name ); -int ofw_write( int handle, const char *buffer, int size ); -int ofw_read( int handle, const char *buffer, int size ); -void ofw_print_string(const char *); -void ofw_print_number(int); -void ofw_exit(); +extern void le_swap( void *begin, void *end, void *dest ); int setjmp( jmp_buf buf ); int longjmp( jmp_buf buf, int retval ); Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Tue Jun 27 12:01:08 2006 @@ -2,7 +2,7 @@ # Real OFW functions to proxy finddevice 1 1 char* int open 1 1 int int -getprop 4 1 int char* int*:arg3 int int +getprop 4 1 int char* char*:arg3 int int write 3 1 int char*:arg2 int int read 3 1 int char*:arg2 int int exit 0 0 Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Tue Jun 27 12:01:08 2006 @@ -46,7 +46,7 @@ $(ECHO_CC) ${host_gpp} $(OFW_INTERFACE_HOST_CFLAGS) -c $< -o $@ -$(OFW_SERVICE_FILES): $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) +$(OFW_INTERFACE_SERVICE_FILES): $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) $(ECHO_OFW) $(Q)$(OFW_INTERFACE_TARGET) \ $(OFW_INTERFACE_INPUT) \

1 0

[arty] 22655: Small tweaks.
by arty＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: arty Date: Tue Jun 27 11:46:47 2006 New Revision: 22655 URL: http://svn.reactos.org/svn/reactos?rev=22655&view=rev Log: Small tweaks. Modified: branches/powerpc/reactos/Makefile branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Modified: branches/powerpc/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/Makefile?rev=22… ============================================================================== --- branches/powerpc/reactos/Makefile (original) +++ branches/powerpc/reactos/Makefile Tue Jun 27 11:46:47 2006 @@ -203,6 +203,7 @@ ECHO_RSYM =@echo $(QUOTE)[RSYM] $@$(QUOTE) ECHO_WMC =@echo $(QUOTE)[WMC] $@$(QUOTE) ECHO_NCI =@echo $(QUOTE)[NCI] $@$(QUOTE) + ECHO_OFW =@echo $(QUOTE)[OFW] $@$(QUOTE) ECHO_CABMAN =@echo $(QUOTE)[CABMAN] $<$(QUOTE) ECHO_CDMAKE =@echo $(QUOTE)[CDMAKE] $@$(QUOTE) ECHO_MKHIVE =@echo $(QUOTE)[MKHIVE] $@$(QUOTE) Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Tue Jun 27 11:46:47 2006 @@ -9,6 +9,10 @@ OFW_INTERFACE_SOURCE = boot/freeldr/freeldr/arch/powerpc/ofw.c OFW_INTERFACE_HEADER = boot/freeldr/freeldr/include/of_call.h OFW_INTERFACE_INPUT = $(OFW_INTERFACE_BASE_)calls.ofw +OFW_INTERFACE_SERVICE_FILES = \ + $(OFW_INTERFACE_OUTPUT) \ + $(OFW_INTERFACE_SOURCE) \ + $(OFW_INTERFACE_HEADER) $(OFW_INTERFACE_INT): | $(TOOLS_INT) $(ECHO_MKDIR) @@ -42,15 +46,16 @@ $(ECHO_CC) ${host_gpp} $(OFW_INTERFACE_HOST_CFLAGS) -c $< -o $@ -$(OFW_INTERFACE_OUTPUT): ofw_interface - $(OFW_INTERFACE_TARGET) \ +$(OFW_SERVICE_FILES): $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) + $(ECHO_OFW) + $(Q)$(OFW_INTERFACE_TARGET) \ $(OFW_INTERFACE_INPUT) \ $(OFW_INTERFACE_OUTPUT) \ $(OFW_INTERFACE_SOURCE) \ $(OFW_INTERFACE_HEADER) .PHONY: ofw_interface -ofw_interface: $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) +ofw_interface: $(OFW_INTERFACE_TARGET) .PHONY: ofw_interface_clean ofw_interface_clean:

1 0

[arty] 22654: Add ofw interface generator. It's a bit like mig is for mach. Just does some convenience stuff, since we're an unusual OS, and we have special needs wrt OF.
by arty＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: arty Date: Tue Jun 27 11:32:56 2006 New Revision: 22654 URL: http://svn.reactos.org/svn/reactos?rev=22654&view=rev Log: Add ofw interface generator. It's a bit like mig is for mach. Just does some convenience stuff, since we're an unusual OS, and we have special needs wrt OF. Added: branches/powerpc/reactos/tools/ofw_interface/ branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Modified: branches/powerpc/reactos/Makefile Modified: branches/powerpc/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/Makefile?rev=22… ============================================================================== --- branches/powerpc/reactos/Makefile (original) +++ branches/powerpc/reactos/Makefile Tue Jun 27 11:32:56 2006 @@ -370,7 +370,10 @@ $(ERRCODES_H) \ $(ERRCODES_RC) \ $(NCI_SERVICE_FILES) \ - $(GENDIB_DIB_FILES) + $(GENDIB_DIB_FILES) \ + $(OFW_INTERFACE_OUTPUT) \ + $(OFW_INTERFACE_SOURCE) \ + $(OFW_INTERFACE_HEADER) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) $(ECHO_RBUILD) Added: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (added) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Tue Jun 27 11:32:56 2006 @@ -1,0 +1,15 @@ +# Function Args Returns Types +# Real OFW functions to proxy +finddevice 1 1 char* int +open 1 1 int int +getprop 4 1 int char* int*:arg3 int int +write 3 1 int char*:arg2 int int +read 3 1 int char*:arg2 int int +exit 0 0 +child 1 1 int int +peer 1 1 int int +seek 3 1 int int int int +# Convenience functions that interact closely with OFW (written in BE asm) +-dumpregs 0 0 +-print_string 1 0 char* +-print_number 1 0 int Added: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp (added) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Tue Jun 27 11:32:56 2006 @@ -1,0 +1,270 @@ +#include <stdio.h> +#include <iostream> +#include <fstream> +#include <sstream> +#include <string> +#include <vector> + +class ofw_wrappers { +public: + int base, ctindex; + std::string functions; + std::string names; + std::string calltable; + std::string le_stubs; + std::string of_call; +}; + +std::string uppercase( const std::string &toucase ) { + std::vector<char> ucase_work(toucase.size()); + for( size_t i = 0; i < toucase.size(); i++ ) { + ucase_work[i] = toupper(toucase[i]); + } + return std::string(&ucase_work[0], toucase.size()); +} + +std::string clip_eol( std::string in, const std::string &eol_marks ) { + size_t found; + for( size_t i = 0; i < eol_marks.size(); i++ ) { + found = in.find( eol_marks[i] ); + if( found != std::string::npos ) + in = in.substr( 0, found ); + } + return in; +} + +int round_up( int x, int factor ) { + return (x + (factor - 1)) & (factor - 1); +} + +std::string c_type( const std::string &intype ) { + size_t colon = intype.find(':'); + if( colon != std::string::npos ) return intype.substr(0,colon); + else if( intype.size() ) return intype; + else return "void"; +} + +std::string have_len( const std::string &intype ) { + size_t colon = intype.find(':'); + if( colon != std::string::npos ) return intype.substr(colon+1); + else return ""; +} + +bool need_swap( const std::string &intype ) { + return intype.find('*') != std::string::npos; +} + +void populate_definition( ofw_wrappers &wrapper, const std::string &line ) { + std::istringstream iss(line); + bool make_function = true; + std::string name, argtype, rettype, c_rettype; + std::vector<std::string> argtypes; + int args, rets, i, local_offset, total_stack; + std::ostringstream function, ct_csource, le_stub, of_call; + + iss >> name >> args >> rets; + + if( !name.size() ) return; + if( name[0] == '-' ) { + name = name.substr(1); + make_function = false; + } + + for( i = 0; i < args; i++ ) { + iss >> argtype; + argtypes.push_back(argtype); + } + + iss >> rettype; + + local_offset = (3 + rets + args) * 4; + total_stack = round_up(12 + local_offset, 16); + + function << "ofw_" << name << ":\n" + << "\t/* Reserve stack space */\n" + << "\tsubi %r1,%r1," << total_stack << "\n" + << "\t/* Store r8, r9, lr */\n" + << "\tstw %r8," << (local_offset + 0) << "(%r1)\n" + << "\tstw %r9," << (local_offset + 4) << "(%r1)\n" + << "\tmflr %r8\n" + << "\tstw %r8," << (local_offset + 8) << "(%r1)\n" + << "\t/* Get read name */\n" + << "\tlis %r8," << wrapper.base << "@ha\n" + << "\taddi %r9,%r8," << name << "_ofw_name - _start\n" + << "\tstw %r9,0(%r1)\n" + << "\t/* " << args << " arguments and " << rets << " return */\n" + << "\tli %r9," << args << "\n" + << "\tstw %r9,4(%r1)\n" + << "\tli %r9," << rets << "\n" + << "\tstw %r9,8(%r1)\n"; + + for( int i = 0; i < args; i++ ) + function << "\tstw %r" << (i+3) << "," << (4 * (i + 3)) << "(%r1)\n"; + + function << "\t/* Load up the call address */\n" + << "\tlwz %r9,ofw_call_addr - _start(%r8)\n" + << "\tmtlr %r9\n" + << "\t/* Set argument */\n" + << "\tmr %r3,%r1\n" + << "\t/* Fire */\n" + << "\tblrl\n" + << "\tlwz %r3," << (local_offset - 4) << "(%r1)\n" + << "\t/* Restore registers */\n" + << "\tlwz %r8," << (local_offset + 8) << "(%r1)\n" + << "\tmtlr %r8\n" + << "\tlwz %r9," << (local_offset + 4) << "(%r1)\n" + << "\tlwz %r8," << (local_offset + 0) << "(%r1)\n" + << "\t/* Return */\n" + << "\taddi %r1,%r1," << total_stack << "\n" + << "\tblr\n"; + + c_rettype = c_type(rettype); + + le_stub << c_rettype << " ofw_" << name << "("; + for( i = 0; i < args; i++ ) { + if( i ) le_stub << ","; + le_stub << c_type(argtypes[i]) << " arg" << i; + } + le_stub << ")"; + of_call << le_stub.str() << ";\n"; + + le_stub << " {\n"; + if( c_rettype != "void" ) + le_stub << "\t" << c_rettype << " ret;\n"; + + for( i = 0; i < args; i++ ) { + if( need_swap(argtypes[i]) ) { + std::string len; + if( have_len(argtypes[i]).size() ) + len = have_len(argtypes[i]); + else { + std::ostringstream oss; + oss << "strlen(arg" << i << ")"; + len = oss.str(); + } + le_stub << "\tle_swap(" + << "arg" << i << "," + << "arg" << i << "+" << len << "," + << "arg" << i << ");\n"; + } + } + + le_stub << "\t"; + if( c_rettype != "void" ) le_stub << "ret = (" << c_rettype << ")"; + + le_stub << "ofproxy(" << (wrapper.ctindex * 4); + + for( i = 0; i < 4; i++ ) { + if( i < args ) le_stub << ",(void *)arg" << i; + else le_stub << ",NULL"; + } + + le_stub << ");\n"; + + for( i = args-1; i >= 0; i-- ) { + if( need_swap(argtypes[i]) ) { + std::string len; + if( have_len(argtypes[i]).size() ) + len = have_len(argtypes[i]); + else { + std::ostringstream oss; + oss << "strlen(arg" << i << ")"; + len = oss.str(); + } + le_stub << "\tle_swap(" + << "arg" << i << "," + << "arg" << i << "+" << len << "," + << "arg" << i << ");\n"; + } + } + + if( c_rettype != "void" ) + le_stub << "\treturn ret;\n"; + + le_stub << "}\n"; + + if( make_function ) wrapper.functions += function.str(); + wrapper.le_stubs += le_stub.str(); + wrapper.of_call += of_call.str(); + wrapper.names += name + "_ofw_name:\n\t.asciz \"" + name + "\"\n"; + wrapper.calltable += std::string("\t.long ofw_") + name + "\n"; + wrapper.ctindex++; +} + +int main( int argc, char **argv ) { + int status = 0; + std::ifstream in; + std::ofstream out, outcsource, outcheader; + std::string line; + const char *eol_marks = "#\r\n"; + ofw_wrappers wrappers; + + wrappers.base = 0xe00000; + wrappers.ctindex = 0; + + if( argc < 5 ) { + fprintf( stderr, "%s [interface.ofw] [ofw.s] [le_stub.c] [le_stub.h]\n", argv[0] ); + return 1; + } + + in.open( argv[1] ); + if( !in ) { + fprintf( stderr, "can't open %s\n", argv[1] ); + status = 1; + goto error; + } + + out.open( argv[2] ); + if( !out ) { + fprintf( stderr, "can't open %s\n", argv[2] ); + status = 1; + goto error; + } + + outcsource.open( argv[3] ); + if( !outcsource ) { + fprintf( stderr, "can't open %s\n", argv[3] ); + status = 1; + goto error; + } + + outcheader.open( argv[4] ); + if( !outcheader ) { + fprintf( stderr, "can't open %s\n", argv[4] ); + status = 1; + goto error; + } + + while( std::getline( in, line ) ) { + line = clip_eol( line, eol_marks ); + if( line.size() ) populate_definition( wrappers, line ); + } + + out << "/* AUTOMATICALLY GENERATED BY ofw_interface */\n" + << "\t.section .text\n" + << "\t.globl _start\n" + << "\t.globl ofw_call_addr\n" + << "ofw_call_addr:\n" + << "\t.long 0\n" + << "\n/* Function Wrappers */\n\n" + << wrappers.functions + << "\t/* Function Names */\n\n" + << wrappers.names + << "\n/* Function Call Table for Freeldr */\n\n" + << "ofw_functions:\n" + << wrappers.calltable + << "\n/* End */\n"; + + outcsource << "/* AUTOMATICALLY GENERATED BY ofw_interface */\n" + << "#include \"of.h\"\n" + << wrappers.le_stubs; + + outcheader << "/* AUTOMATICALLY GENERATE BY ofw_interface */\n" + << "#ifndef _OFW_CALLS_H\n" + << "#define _OFW_CALLS_H\n" + << wrappers.of_call + << "#endif/*_OFW_CALLS_H*/\n"; + +error: + return status; +} Added: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak (added) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Tue Jun 27 11:32:56 2006 @@ -1,0 +1,58 @@ +OFW_INTERFACE_BASE = $(TOOLS_BASE_)ofw_interface +OFW_INTERFACE_BASE_ = $(OFW_INTERFACE_BASE)$(SEP) +OFW_INTERFACE_INT = $(INTERMEDIATE_)$(OFW_INTERFACE_BASE) +OFW_INTERFACE_INT_ = $(OFW_INTERFACE_INT)$(SEP) +OFW_INTERFACE_OUT = $(OUTPUT_)$(OFW_INTERFACE_BASE) +OFW_INTERFACE_OUT_ = $(OFW_INTERFACE_OUT)$(SEP) + +OFW_INTERFACE_OUTPUT = boot/freeldr/bootsect/ofw.s +OFW_INTERFACE_SOURCE = boot/freeldr/freeldr/arch/powerpc/ofw.c +OFW_INTERFACE_HEADER = boot/freeldr/freeldr/include/of_call.h +OFW_INTERFACE_INPUT = $(OFW_INTERFACE_BASE_)calls.ofw + +$(OFW_INTERFACE_INT): | $(TOOLS_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(OFW_INTERFACE_OUT): | $(TOOLS_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + +OFW_INTERFACE_TARGET = \ + $(EXEPREFIX)$(OFW_INTERFACE_OUT_)ofw_interface$(EXEPOSTFIX) + +OFW_INTERFACE_SOURCES = $(addprefix $(OFW_INTERFACE_BASE_), \ + ofw_interface.cpp \ + ) + +OFW_INTERFACE_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(OFW_INTERFACE_SOURCES:.cpp=.o)) + +OFW_INTERFACE_HOST_CFLAGS = $(TOOLS_CFLAGS) + +OFW_INTERFACE_HOST_LFLAGS = $(TOOLS_LFLAGS) + +$(OFW_INTERFACE_TARGET): $(OFW_INTERFACE_OBJECTS) | $(OFW_INTERFACE_OUT) + $(ECHO_LD) + ${host_gpp} $(OFW_INTERFACE_OBJECTS) $(OFW_INTERFACE_HOST_LFLAGS) -o $@ + +$(OFW_INTERFACE_INT_)ofw_interface.o: $(OFW_INTERFACE_BASE_)ofw_interface.cpp | $(OFW_INTERFACE_INT) + $(ECHO_CC) + ${host_gpp} $(OFW_INTERFACE_HOST_CFLAGS) -c $< -o $@ + +$(OFW_INTERFACE_OUTPUT): ofw_interface + $(OFW_INTERFACE_TARGET) \ + $(OFW_INTERFACE_INPUT) \ + $(OFW_INTERFACE_OUTPUT) \ + $(OFW_INTERFACE_SOURCE) \ + $(OFW_INTERFACE_HEADER) + +.PHONY: ofw_interface +ofw_interface: $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_INPUT) + +.PHONY: ofw_interface_clean +ofw_interface_clean: + -@$(rm) $(OFW_INTERFACE_TARGET) $(OFW_INTERFACE_OBJECTS) 2>$(NUL) +clean: ofw_interface_clean

1 0

[ion] 22653: - Fix all the failures in the RTLSTR Wine test by merging our old rtl string routines with Wine's. We now pass all 2300 something tests.
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 08:09:03 2006 New Revision: 22653 URL: http://svn.reactos.org/svn/reactos?rev=22653&view=rev Log: - Fix all the failures in the RTLSTR Wine test by merging our old rtl string routines with Wine's. We now pass all 2300 something tests. Modified: trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=22653&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c (original) +++ trunk/reactos/lib/rtl/nls.c Tue Jun 27 08:09:03 2006 @@ -564,19 +564,19 @@ { USHORT Offset; - if (Source < L'a') + if (Source < 'a') return Source; - if (Source <= L'z') - return (Source - (L'a' - L'A')); - - Offset = ((USHORT)Source >> 8); + if (Source <= 'z') + return (Source - ('a' - 'A')); + + Offset = ((USHORT)Source >> 8) & 0xFF; Offset = NlsUnicodeUpcaseTable[Offset]; - Offset += (((USHORT)Source & 0x00F0) >> 4); + Offset += ((USHORT)Source >> 4) & 0xF; Offset = NlsUnicodeUpcaseTable[Offset]; - Offset += ((USHORT)Source & 0x000F); + Offset += ((USHORT)Source & 0xF); Offset = NlsUnicodeUpcaseTable[Offset]; return Source + (SHORT)Offset; @@ -727,24 +727,42 @@ WCHAR Unicode; CHAR Destination; - if (NlsMbCodePageTag == FALSE) - { - /* single-byte code page */ - - /* ansi->unicode */ - Unicode = NlsAnsiToUnicodeTable[(UCHAR)Source]; - - /* upcase conversion */ - Unicode = RtlUpcaseUnicodeChar (Unicode); - - /* unicode -> ansi */ - Destination = NlsUnicodeToAnsiTable[(USHORT)Unicode]; - } - else - { - /* multi-byte code page */ - /* FIXME */ - Destination = Source; + /* Check for simple ANSI case */ + if (Source <= 'z') + { + /* Check for simple downcase a-z case */ + if (Source >= 'a') + { + /* Just XOR with the difference */ + return Source ^ ('a' - 'A'); + } + else + { + /* Otherwise return the same char, it's already upcase */ + return Source; + } + } + else + { + if (NlsMbCodePageTag == FALSE) + { + /* single-byte code page */ + + /* ansi->unicode */ + Unicode = NlsAnsiToUnicodeTable[(UCHAR)Source]; + + /* upcase conversion */ + Unicode = RtlUpcaseUnicodeChar (Unicode); + + /* unicode -> ansi */ + Destination = NlsUnicodeToAnsiTable[(USHORT)Unicode]; + } + else + { + /* multi-byte code page */ + /* FIXME */ + Destination = Source; + } } return Destination; Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=2265… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c (original) +++ trunk/reactos/lib/rtl/unicode.c Tue Jun 27 08:09:03 2006 @@ -510,54 +510,48 @@ * Str is nullterminated when length allowes it. * When str fits exactly in length characters the nullterm is ommitted. */ -NTSTATUS -NTAPI -RtlIntegerToChar( - IN ULONG Value, - IN ULONG Base, - IN ULONG Length, - IN OUT PCHAR String) -{ - ULONG Radix; - CHAR temp[33]; - ULONG v = Value; - ULONG i; - PCHAR tp; - PCHAR sp; - - Radix = Base; - if (Radix == 0) - Radix = 10; - - if ((Radix != 2) && (Radix != 8) && - (Radix != 10) && (Radix != 16)) - { - return STATUS_INVALID_PARAMETER; - } - - tp = temp; - while (v || tp == temp) - { - i = v % Radix; - v = v / Radix; - if (i < 10) - *tp = i + '0'; - else - *tp = i + 'a' - 10; - tp++; - } - - if ((ULONG)((ULONG_PTR)tp - (ULONG_PTR)temp) >= Length) - { - return STATUS_BUFFER_TOO_SMALL; - } - - sp = String; - while (tp > temp) - *sp++ = *--tp; - *sp = 0; - - return STATUS_SUCCESS; +NTSTATUS NTAPI RtlIntegerToChar( + ULONG value, /* [I] Value to be converted */ + ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ + ULONG length, /* [I] Length of the str buffer in bytes */ + PCHAR str) /* [O] Destination for the converted value */ +{ + CHAR buffer[33]; + PCHAR pos; + CHAR digit; + ULONG len; + + if (base == 0) { + base = 10; + } else if (base != 2 && base != 8 && base != 10 && base != 16) { + return STATUS_INVALID_PARAMETER; + } /* if */ + + pos = &buffer[32]; + *pos = '\0'; + + do { + pos--; + digit = value % base; + value = value / base; + if (digit < 10) { + *pos = '0' + digit; + } else { + *pos = 'A' + digit - 10; + } /* if */ + } while (value != 0L); + + len = &buffer[32] - pos; + if (len > length) { + return STATUS_BUFFER_OVERFLOW; + } else if (str == NULL) { + return STATUS_ACCESS_VIOLATION; + } else if (len == length) { + memcpy(str, pos, len); + } else { + memcpy(str, pos, len + 1); + } /* if */ + return STATUS_SUCCESS; } /* @@ -765,87 +759,57 @@ } return FALSE; } - -/************************************************************************** - * RtlUnicodeStringToInteger (NTDLL.@) - * @implemented - * Converts an unicode string into its integer equivalent. - * - * RETURNS - * Success: STATUS_SUCCESS. value contains the converted number - * Failure: STATUS_INVALID_PARAMETER, if base is not 0, 2, 8, 10 or 16. - * STATUS_ACCESS_VIOLATION, if value is NULL. - * - * NOTES - * For base 0 it uses 10 as base and the string should be in the format - * "{whitespace} [+|-] [0[x|o|b]] {digits}". - * For other bases the string should be in the format - * "{whitespace} [+|-] {digits}". - * No check is made for value overflow, only the lower 32 bits are assigned. - * If str is NULL it crashes, as the native function does. - * - * Note that regardless of success or failure status, we should leave the - * partial value in Value. An error is never returned based on the chars - * in the string. - * - * DIFFERENCES - * This function does not read garbage on string length 0 as the native - * version does. - */ -NTSTATUS -NTAPI -RtlUnicodeStringToInteger( - PCUNICODE_STRING str, /* [I] Unicode string to be converted */ +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlUnicodeStringToInteger(const UNICODE_STRING *str, /* [I] Unicode string to be converted */ ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ - PULONG value) /* [O] Destination for the converted value */ + ULONG *value) /* [O] Destination for the converted value */ { LPWSTR lpwstr = str->Buffer; USHORT CharsRemaining = str->Length / sizeof(WCHAR); WCHAR wchCurrent; int digit; - ULONG newbase = 0; ULONG RunningTotal = 0; char bMinus = 0; - while (CharsRemaining >= 1 && *lpwstr <= L' ') { + while (CharsRemaining >= 1 && *lpwstr <= ' ') { lpwstr++; CharsRemaining--; } /* while */ if (CharsRemaining >= 1) { - if (*lpwstr == L'+') { + if (*lpwstr == '+') { lpwstr++; CharsRemaining--; - } else if (*lpwstr == L'-') { + } else if (*lpwstr == '-') { bMinus = 1; lpwstr++; CharsRemaining--; } /* if */ } /* if */ - if (CharsRemaining >= 2 && lpwstr[0] == L'0') { - if (lpwstr[1] == L'b' || lpwstr[1] == L'B') { - lpwstr += 2; - CharsRemaining -= 2; - newbase = 2; - } else if (lpwstr[1] == L'o' || lpwstr[1] == L'O') { - lpwstr += 2; - CharsRemaining -= 2; - newbase = 8; - } else if (lpwstr[1] == L'x' || lpwstr[1] == L'X') { - lpwstr += 2; - CharsRemaining -= 2; - newbase = 16; + if (base == 0) { + base = 10; + if (CharsRemaining >= 2 && lpwstr[0] == '0') { + if (lpwstr[1] == 'b') { + lpwstr += 2; + CharsRemaining -= 2; + base = 2; + } else if (lpwstr[1] == 'o') { + lpwstr += 2; + CharsRemaining -= 2; + base = 8; + } else if (lpwstr[1] == 'x') { + lpwstr += 2; + CharsRemaining -= 2; + base = 16; + } /* if */ } /* if */ - } - if (base == 0 && newbase == 0) { - base = 10; - } else if (base == 0 && newbase != 0) { - base = newbase; - } else if ((newbase != 0 && base != newbase) || - (base != 2 && base != 8 && base != 10 && base != 16)) { + } else if (base != 2 && base != 8 && base != 10 && base != 16) { return STATUS_INVALID_PARAMETER; - } /* if */ if (value == NULL) { @@ -854,16 +818,16 @@ while (CharsRemaining >= 1) { wchCurrent = *lpwstr; - if (wchCurrent >= L'0' && wchCurrent <= L'9') { - digit = wchCurrent - L'0'; - } else if (wchCurrent >= L'A' && wchCurrent <= L'Z') { - digit = wchCurrent - L'A' + 10; - } else if (wchCurrent >= L'a' && wchCurrent <= L'z') { - digit = wchCurrent - L'a' + 10; + if (wchCurrent >= '0' && wchCurrent <= '9') { + digit = wchCurrent - '0'; + } else if (wchCurrent >= 'A' && wchCurrent <= 'Z') { + digit = wchCurrent - 'A' + 10; + } else if (wchCurrent >= 'a' && wchCurrent <= 'z') { + digit = wchCurrent - 'a' + 10; } else { digit = -1; } /* if */ - if (digit < 0 || digit >= (int)base) { + if (digit < 0 || digit >= base) { *value = bMinus ? -RunningTotal : RunningTotal; return STATUS_SUCCESS; } /* if */ @@ -1267,7 +1231,7 @@ /* Convert string: {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} * to memory: DWORD... WORD WORD BYTES............ */ - while (i < 37) + while (i <= 37) { switch (i) { @@ -1774,36 +1738,28 @@ RtlStringFromGUID (IN REFGUID Guid, OUT PUNICODE_STRING GuidString) { - static CONST PWCHAR Hex = L"0123456789ABCDEF"; - WCHAR Buffer[40]; - PWCHAR BufferPtr; - ULONG i; - - if (Guid == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - swprintf (Buffer, - L"{%08lX-%04X-%04X-%02X%02X-", + /* Setup the string */ + GuidString->Length = 38 * sizeof(WCHAR); + GuidString->MaximumLength = GuidString->Length + sizeof(UNICODE_NULL); + GuidString->Buffer = RtlpAllocateStringMemory(GuidString->MaximumLength, + TAG_USTR); + if (!GuidString->Buffer) return STATUS_NO_MEMORY; + + /* Now format the GUID */ + swprintf(GuidString->Buffer, + L"{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", Guid->Data1, Guid->Data2, Guid->Data3, Guid->Data4[0], - Guid->Data4[1]); - BufferPtr = Buffer + 25; - - /* 6 hex bytes */ - for (i = 2; i < 8; i++) - { - *BufferPtr++ = Hex[Guid->Data4[i] >> 4]; - *BufferPtr++ = Hex[Guid->Data4[i] & 0xf]; - } - - *BufferPtr++ = L'}'; - *BufferPtr++ = L'\0'; - - return RtlCreateUnicodeString (GuidString, Buffer); + Guid->Data4[1], + Guid->Data4[2], + Guid->Data4[3], + Guid->Data4[4], + Guid->Data4[5], + Guid->Data4[6], + Guid->Data4[7]); + return STATUS_SUCCESS; } /* @@ -2119,7 +2075,7 @@ PCHAR Src, Dest; Length = min(SourceString->Length, - DestinationString->MaximumLength - 1); + DestinationString->MaximumLength); Src = SourceString->Buffer; Dest = DestinationString->Buffer; @@ -2146,8 +2102,12 @@ { PAGED_CODE_RTL(); - if (SourceString == NULL || DestinationString == NULL) - return STATUS_INVALID_PARAMETER; + if (SourceString == NULL || DestinationString == NULL || + SourceString->Length > SourceString->MaximumLength || + (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || + Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4 || Flags < 0) { + return STATUS_INVALID_PARAMETER; + } if ((SourceString->Length == 0) &&

1 0

[ion] 22652: - Catch illegal call to Ob functions when ObjectAttributes == NULL and return distinguished status code for this situation (STATUS_INVALID_PARAMETER), instead of failing due to access violation. - Create the BNO Global and Local symbolic links in kernel32. - We pass all the Ob+Native tests in ntdll_winetest om now (we fail some named pipe ones, but I have no idea why WINE calls them "Object Manager" related...)
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 07:06:26 2006 New Revision: 22652 URL: http://svn.reactos.org/svn/reactos?rev=22652&view=rev Log: - Catch illegal call to Ob functions when ObjectAttributes == NULL and return distinguished status code for this situation (STATUS_INVALID_PARAMETER), instead of failing due to access violation. - Create the BNO Global and Local symbolic links in kernel32. - We pass all the Ob+Native tests in ntdll_winetest om now (we fail some named pipe ones, but I have no idea why WINE calls them "Object Manager" related...) Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c Tue Jun 27 07:06:26 2006 @@ -66,7 +66,10 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\BaseNamedObjects"); + UNICODE_STRING SymName = RTL_CONSTANT_STRING(L"Local"); + UNICODE_STRING SymName2 = RTL_CONSTANT_STRING(L"Global"); NTSTATUS Status; + HANDLE SymHandle; InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -87,6 +90,36 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateDirectoryObject() failed\n"); + } + + /* Create the "local" Symbolic Link. FIXME: CSR should do this */ + InitializeObjectAttributes(&ObjectAttributes, + &SymName, + OBJ_CASE_INSENSITIVE, + *DirHandle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateSymbolicLinkObject() failed\n"); + } + + /* Create the "global" Symbolic Link. FIXME: CSR should do this */ + InitializeObjectAttributes(&ObjectAttributes, + &SymName2, + OBJ_CASE_INSENSITIVE, + *DirHandle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateSymbolicLinkObject() failed\n"); } } Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jun 27 07:06:26 2006 @@ -1455,6 +1455,14 @@ OB_OPEN_REASON OpenReason; PAGED_CODE(); + /* Check if we didn't get any Object Attributes */ + if (!ObjectAttributes) + { + /* Fail with special status code */ + *Handle = NULL; + return STATUS_INVALID_PARAMETER; + } + /* Capture all the info */ Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode,

1 0

[ion] 22651: - Fix another critical bug in ObInsertObject: don't overwrite the lookup status with the handle creation status. If the lookup returned something like OBJECT_NAME_EXISTS (which is a success + warning), we don't want to overwrite it with ObpCreateHandle's STATUS_SUCCESS. This should fix a large number of regressions (and also fixes many WINE ntdll "om" tests). - We also now correctly dereference the object in ObInsertObject, which should reduce one source of leaks (But there is still
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 05:52:16 2006 New Revision: 22651 URL: http://svn.reactos.org/svn/reactos?rev=22651&view=rev Log: - Fix another critical bug in ObInsertObject: don't overwrite the lookup status with the handle creation status. If the lookup returned something like OBJECT_NAME_EXISTS (which is a success + warning), we don't want to overwrite it with ObpCreateHandle's STATUS_SUCCESS. This should fix a large number of regressions (and also fixes many WINE ntdll "om" tests). - We also now correctly dereference the object in ObInsertObject, which should reduce one source of leaks (But there is still one). OTOH, this makes the Cm code crash at shutdown (I'll fix this ASAP, this fix is worth having atm.) Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jun 27 05:52:16 2006 @@ -1705,7 +1705,7 @@ POBJECT_TYPE ObjectType; PVOID FoundObject = NULL; POBJECT_HEADER FoundHeader = NULL; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS, RealStatus; PSECURITY_DESCRIPTOR DirectorySd = NULL; BOOLEAN SdAllocated; OBP_LOOKUP_CONTEXT Context; @@ -1749,9 +1749,14 @@ Header->ObjectCreateInfo = NULL; /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); // FIXME: Needs sync changes + if (Handle) ObDereferenceObject(Object); // FIXME: Needs sync changes /* Return */ + OBTRACE(OB_HANDLE_DEBUG, + "%s - returning Object with PC S: %lx %lx\n", + __FUNCTION__, + OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + Status); return Status; } @@ -1893,12 +1898,15 @@ } } + /* Save the actual status until here */ + RealStatus = Status; + /* HACKHACK: Because of ROS's incorrect startup, this can be called - * without a valid Process until I finalize the startup patch, - * so don't create a handle if this is the case. We also don't create - * a handle if Handle is NULL when the Registry Code calls it, because - * the registry code totally bastardizes the Ob and needs to be fixed - */ + * without a valid Process until I finalize the startup patch, + * so don't create a handle if this is the case. We also don't create + * a handle if Handle is NULL when the Registry Code calls it, because + * the registry code totally bastardizes the Ob and needs to be fixed + */ if (Handle) { /* Create the handle */ @@ -1925,7 +1933,15 @@ } /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); + if (Handle) ObDereferenceObject(Object); + + /* Check our final status */ + if (!NT_SUCCESS(Status)) + { + /* Return the status of the failure */ + *Handle = NULL; + RealStatus = Status; + } /* Check if we created our own access state */ if (PassedAccessState == &AccessState) @@ -1934,8 +1950,13 @@ SeDeleteAccessState(PassedAccessState); } - /* Return failure code */ - return Status; + /* Return status code */ + OBTRACE(OB_HANDLE_DEBUG, + "%s - returning Object with PC S/RS: %lx %lx %lx\n", + __FUNCTION__, + OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + RealStatus, Status); + return RealStatus; } /*++

1 0

[ion] 22650: - ObpCreateUnnamedHandle/ObpCreateHandle => Reference the object before calling ExCreateHandle. - Fix two critical bugs in ObInsertObject: We were creating a handle for the wrong object (in ObInsertObject) and we were not passing the ReferencedObject parameter to ObpCreateHandle, so that object was never being returned properly to the caller. - ObfDereferenceObject shouldn't check for the OB_FLAG_PERMANENT flag, or else it would never be possible to kill permanent objects while in k
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 05:16:17 2006 New Revision: 22650 URL: http://svn.reactos.org/svn/reactos?rev=22650&view=rev Log: - ObpCreateUnnamedHandle/ObpCreateHandle => Reference the object before calling ExCreateHandle. - Fix two critical bugs in ObInsertObject: We were creating a handle for the wrong object (in ObInsertObject) and we were not passing the ReferencedObject parameter to ObpCreateHandle, so that object was never being returned properly to the caller. - ObfDereferenceObject shouldn't check for the OB_FLAG_PERMANENT flag, or else it would never be possible to kill permanent objects while in kernel mode (permanent objects only apply to user-mode handles). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jun 27 05:16:17 2006 @@ -520,6 +520,7 @@ BOOLEAN AttachedToProcess = FALSE; PVOID HandleTable; NTSTATUS Status; + ULONG i; PAGED_CODE(); /* Get the object header and type */ @@ -579,6 +580,18 @@ /* Save the access mask */ NewEntry.GrantedAccess = DesiredAccess; + + /* Handle extra references */ + if (AdditionalReferences) + { + /* Make a copy in case we fail later below */ + i = AdditionalReferences; + while (i--) + { + /* Increment the count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } + } /* * Create the actual handle. We'll need to do this *after* calling @@ -597,13 +610,6 @@ /* Make sure we got a handle */ if (Handle) { - /* Handle extra references */ - while (AdditionalReferences--) - { - /* Increment the count */ - InterlockedIncrement(&ObjectHeader->PointerCount); - } - /* Check if this was a kernel handle */ if (HandleAttributes & OBJ_KERNEL_HANDLE) { @@ -615,12 +621,19 @@ *ReturnedHandle = Handle; if (ReturnedObject) *ReturnedObject = Object; OBTRACE(OB_HANDLE_DEBUG, - "%s %s - Returning Handle: %lx HC LC %lx %lx\n", + "%s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, Handle, ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; + } + + /* Handle extra references */ + while (AdditionalReferences--) + { + /* Decrement the count */ + InterlockedDecrement(&ObjectHeader->PointerCount); } /* Decrement the handle count and detach */ @@ -692,6 +705,7 @@ POBJECT_TYPE ObjectType; PVOID HandleTable; NTSTATUS Status; + ULONG i; PAGED_CODE(); /* Get the object header and type */ @@ -764,6 +778,18 @@ NewEntry.GrantedAccess = AccessState->RemainingDesiredAccess | AccessState->PreviouslyGrantedAccess; + /* Handle extra references */ + if (AdditionalReferences) + { + /* Make a copy in case we fail later below */ + i = AdditionalReferences; + while (i--) + { + /* Increment the count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } + } + /* * Create the actual handle. We'll need to do this *after* calling * ObpIncrementHandleCount to make sure that Object Security is valid @@ -781,13 +807,6 @@ /* Make sure we got a handle */ if (Handle) { - /* Handle extra references */ - while (AdditionalReferences--) - { - /* Increment the count */ - InterlockedIncrement(&ObjectHeader->PointerCount); - } - /* Check if this was a kernel handle */ if (HandleAttributes & OBJ_KERNEL_HANDLE) { @@ -805,6 +824,13 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; + } + + /* Handle extra references */ + while (AdditionalReferences--) + { + /* Increment the count */ + InterlockedDecrement(&ObjectHeader->PointerCount); } /* Decrement the handle count and detach */ @@ -1052,7 +1078,7 @@ /* Make sure that the handle is inheritable */ Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - if(Ret) + if (Ret) { /* Get the object header */ ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); @@ -1519,9 +1545,10 @@ ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); OBTRACE(OB_HANDLE_DEBUG, - "%s returning Object with PC S: %lx %lx\n", + "%s - returning Object %p with PC S: %lx %lx\n", __FUNCTION__, - OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + Object, + Object ? OBJECT_TO_OBJECT_HEADER(Object)->PointerCount : -1, Status); return Status; } @@ -1722,7 +1749,7 @@ Header->ObjectCreateInfo = NULL; /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); FIXME: Will require massive changes + //ObDereferenceObject(Object); // FIXME: Needs sync changes /* Return */ return Status; @@ -1853,6 +1880,7 @@ if (!NT_SUCCESS(Status)) { /* We failed, dereference the object and delete the access state */ + KEBUGCHECK(0); ObDereferenceObject(Object); if (PassedAccessState == &AccessState) { @@ -1875,13 +1903,13 @@ { /* Create the handle */ Status = ObpCreateHandle(OpenReason, - &Header->Body, + FoundObject, NULL, PassedAccessState, AdditionalReferences + 1, ObjectCreateInfo->Attributes, ExGetPreviousMode(), - NULL, + ReferencedObject, Handle); } @@ -1897,7 +1925,7 @@ } /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); FIXME: Will require massive changes + //ObDereferenceObject(Object); /* Check if we created our own access state */ if (PassedAccessState == &AccessState) Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Tue Jun 27 05:16:17 2006 @@ -38,7 +38,7 @@ }; PDEVICE_MAP ObSystemDeviceMap = NULL; -ULONG ObpTraceLevel = OB_NAMESPACE_DEBUG; +ULONG ObpTraceLevel = OB_HANDLE_DEBUG | OB_REFERENCE_DEBUG; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Tue Jun 27 05:16:17 2006 @@ -89,8 +89,7 @@ Header = OBJECT_TO_OBJECT_HEADER(Object); /* Check whether the object can now be deleted. */ - if (!(InterlockedDecrement(&Header->PointerCount)) && - !(Header->Flags & OB_FLAG_PERMANENT)) + if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ ASSERT(!Header->HandleCount);

1 0

[ion] 22649: - Lesson One: Don't revert commits because your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copyright". - Lesson Two: What do you know! En and De.rc actually *are* our files, not James Brown's (his is sol.rc, which hasn't been altered with a ROS Header). - Lesson Three: It is official (voted) ROS Policy that all ROS files have a header. Reverting this header violated it.
by ion＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: ion Date: Tue Jun 27 03:50:03 2006 New Revision: 22649 URL: http://svn.reactos.org/svn/reactos?rev=22649&view=rev Log: - Lesson One: Don't revert commits because your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copyright". - Lesson Two: What do you know! En and De.rc actually *are* our files, not James Brown's (his is sol.rc, which hasn't been altered with a ROS Header). - Lesson Three: It is official (voted) ROS Policy that all ROS files have a header. Reverting this header violated it. Modified: trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/de.rc (original) +++ trunk/reactos/base/applications/games/solitaire/de.rc Tue Jun 27 03:50:03 2006 @@ -1,3 +1,10 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/de.rc + * PURPOSE: German Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS Modified: trunk/reactos/base/applications/games/solitaire/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/en.rc (original) +++ trunk/reactos/base/applications/games/solitaire/en.rc Tue Jun 27 03:50:03 2006 @@ -1,3 +1,10 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/en.rc + * PURPOSE: English Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs