Ros-diffs September 2006

ros-diffs@reactos.org

16 participants
146 discussions

[ion] 24276: - In some far, far away galaxy, a long, long time ago, Greatlord will learn to fix 1-line bugs and/or talk to the developers responsible instead of reverting their code...until then....
by ion＠svn.reactos.org 26 Sep '06

26 Sep '06

Author: ion Date: Tue Sep 26 09:29:46 2006 New Revision: 24276 URL: http://svn.reactos.org/svn/reactos?rev=24276&view=rev Log: - In some far, far away galaxy, a long, long time ago, Greatlord will learn to fix 1-line bugs and/or talk to the developers responsible instead of reverting their code...until then.... Removed: trunk/reactos/lib/rtl/RtlMoveMemory.c Modified: trunk/reactos/lib/rtl/i386/rtlmem.s trunk/reactos/lib/rtl/rtl.rbuild Removed: trunk/reactos/lib/rtl/RtlMoveMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/RtlMoveMemory.c?re… ============================================================================== --- trunk/reactos/lib/rtl/RtlMoveMemory.c (original) +++ trunk/reactos/lib/rtl/RtlMoveMemory.c (removed) @@ -1,23 +1,0 @@ -#include <rtl.h> - -#define NDEBUG -#include <debug.h> - -#undef RtlMoveMemory -/* - * @implemented - */ -VOID -NTAPI -RtlMoveMemory ( - PVOID Destination, - CONST VOID * Source, - ULONG Length -) -{ - memmove ( - Destination, - Source, - Length - ); -} Modified: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlmem.s (original) +++ trunk/reactos/lib/rtl/i386/rtlmem.s Tue Sep 26 09:29:46 2006 @@ -214,6 +214,73 @@ ret 8 .endfunc +.func RtlMoveMemory@12 +_RtlMoveMemory@12: + + /* Save volatiles */ + push esi + push edi + + /* Get pointers and size */ + mov esi, [esp+16] + mov edi, [esp+12] + mov ecx, [esp+20] + cld + + /* Check if the destination is higher (or equal) */ + cmp esi, edi + jbe Overlap + + /* Set ULONG size and UCHAR remainder */ +DoMove: + mov edx, ecx + and edx, 3 + shr ecx, 2 + + /* Do the move */ + rep movsd + or ecx, edx + jnz ByteMove + + /* Return */ + pop edi + pop esi + ret 12 + +ByteMove: + /* Move what's left */ + rep movsb + +DoneMove: + /* Restore volatiles */ + pop edi + pop esi + ret 12 + +Overlap: + /* Don't copy if they're equal */ + jz DoneMove + + /* Compare pointer distance with given length and check for overlap */ + mov eax, edi + sub eax, esi + cmp ecx, eax + jbe DoMove + + /* Set direction flag for backward move */ + std + + /* Copy byte-by-byte the non-overlapping distance */ + add esi, ecx + add edi, ecx + dec esi + dec edi + + /* Do the move, reset flag and return */ + rep movsb + cld + jmp DoneMove +.endfunc .func @RtlPrefetchMemoryNonTemporal@8, @RtlPrefetchMemoryNonTemporal@8 @RtlPrefetchMemoryNonTemporal@8: Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=242… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Tue Sep 26 09:29:46 2006 @@ -39,7 +39,6 @@ <file>sqrt_asm.s</file> <file>tan_asm.s</file> </directory> - <file>RtlMoveMemory.c</file> </if> <ifnot property="ARCH" value="i386">

1 0

[arty] 24275: Checkpoint in here. More work needed.
by arty＠svn.reactos.org 26 Sep '06

26 Sep '06

Author: arty Date: Tue Sep 26 07:33:05 2006 New Revision: 24275 URL: http://svn.reactos.org/svn/reactos?rev=24275&view=rev Log: Checkpoint in here. More work needed. Added: branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/mm.h Modified: branches/powerpc/reactos/ntoskrnl/include/internal/ke.h branches/powerpc/reactos/ntoskrnl/ke/krnlinit.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/main_asm.S branches/powerpc/reactos/ntoskrnl/ntoskrnl.lnk branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/powerpc/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/ke.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/ke.h Tue Sep 26 07:33:05 2006 @@ -73,11 +73,13 @@ extern PVOID KeRaiseUserExceptionDispatcher; extern LARGE_INTEGER SystemBootTime; extern ULONG_PTR KERNEL_BASE; +#ifdef _M_IX86 extern ULONG KeI386NpxPresent; extern ULONG KeI386XMMIPresent; extern ULONG KeI386FxsrPresent; extern ULONG KeI386CpuType; extern ULONG KeI386CpuStep; +#endif extern ULONG KeProcessorArchitecture; extern ULONG KeProcessorLevel; extern ULONG KeProcessorRevision; @@ -94,6 +96,7 @@ extern PULONG KiInterruptTemplateDispatch; extern PULONG KiInterruptTemplate2ndDispatch; extern ULONG KiUnexpectedEntrySize; +#ifdef _M_IX86 extern PVOID Ki386IopmSaveArea; extern ULONG KeI386EFlagsAndMaskV86; extern ULONG KeI386EFlagsOrMaskV86; @@ -103,6 +106,7 @@ extern KDESCRIPTOR KiGdtDescriptor; extern KDESCRIPTOR KiIdtDescriptor; extern KTSS KiBootTss; +#endif extern UCHAR P0BootStack[]; extern UCHAR KiDoubleFaultStack[]; extern FAST_MUTEX KernelAddressSpaceLock; Added: branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/mm.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/mm.h (added) +++ branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/mm.h Tue Sep 26 07:33:05 2006 @@ -1,0 +1,37 @@ +/* + * Lowlevel memory managment definitions + */ + +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H +#define __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H + +#if 0 +/* + * Page access attributes (or these together) + */ +#define PA_READ (1<<0) +#define PA_WRITE ((1<<0)+(1<<1)) +#define PA_EXECUTE PA_READ +#define PA_PCD (1<<4) +#define PA_PWT (1<<3) + +/* + * Page attributes + */ +#define PA_USER (1<<2) +#define PA_SYSTEM (0) +#endif + +#define FLUSH_TLB { \ + } + +#define FLUSH_TLB_ONE(addr) { \ +} + +struct _EPROCESS; +PULONG MmGetPageDirectory(VOID); + +#define PAGE_MASK(x) ((x)&(~0xfff)) +#define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) + +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_MM_H */ Modified: branches/powerpc/reactos/ntoskrnl/ke/krnlinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/krn… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/krnlinit.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/krnlinit.c Tue Sep 26 07:33:05 2006 @@ -327,6 +327,8 @@ } /* Set IDT to writable */ +#ifdef _M_IX86 Protect = MmGetPageProtect(NULL, (PVOID)KiIdt); MmSetPageProtect(NULL, (PVOID)KiIdt, Protect | PAGE_IS_WRITABLE); +#endif } Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/main_asm.S URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/main_asm.S (original) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/main_asm.S Tue Sep 26 07:33:05 2006 @@ -28,6 +28,8 @@ .text .globl NtProcessStartup + .globl KiSystemStartup + .globl KiRosPrepareForSystemStartup NtProcessStartup: lis 0,AP_MAGIC@ha ori 0,0,AP_MAGIC@l @@ -42,7 +44,7 @@ /* * Call the application processor initialization code */ - bl _KiSystemStartup + bl KiSystemStartup .m1: /* Load the initial kernel stack */ @@ -53,5 +55,5 @@ /* Call the main kernel initialization */ mr 3,5 mr 4,6 - bl __main + bl KiRosPrepareForSystemStartup Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.lnk URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ntoskr… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ntoskrnl.lnk (original) +++ branches/powerpc/reactos/ntoskrnl/ntoskrnl.lnk Tue Sep 26 07:33:05 2006 @@ -1,105 +1,217 @@ -OUTPUT_FORMAT(pei-i386) -ENTRY(_mainCRTStartup) +/* Default linker script, for normal executables */ +OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", + "elf32-powerpc") +OUTPUT_ARCH(powerpc:common) +ENTRY(_start) +SEARCH_DIR("/usr/powerpc-unknown-linux-gnu/lib"); +/* Do we need any of these for elf? + __DYNAMIC = 0; */ +PROVIDE (__stack = 0); PROVIDE (___stack = 0); SECTIONS { - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - } - - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .bss BLOCK(__section_alignment__) : - { - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - /* These zeroes mark the end of the reloc section. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } + /* Read-only sections, merged into text segment: */ + PROVIDE (__executable_start = 0x10000000); . = 0x10000000 + SIZEOF_HEADERS; + .interp : { *(.interp) } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } + .gnu.version : { *(.gnu.version) } + .gnu.version_d : { *(.gnu.version_d) } + .gnu.version_r : { *(.gnu.version_r) } + .rel.init : { *(.rel.init) } + .rela.init : { *(.rela.init) } + .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } + .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } + .rel.fini : { *(.rel.fini) } + .rela.fini : { *(.rela.fini) } + .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } + .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } + .rel.data.rel.ro : { *(.rel.data.rel.ro*) } + .rela.data.rel.ro : { *(.rel.data.rel.ro*) } + .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } + .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } + .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } + .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } + .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } + .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } + .rel.ctors : { *(.rel.ctors) } + .rela.ctors : { *(.rela.ctors) } + .rel.dtors : { *(.rel.dtors) } + .rela.dtors : { *(.rela.dtors) } + .rel.got : { *(.rel.got) } + .rela.got : { *(.rela.got) } + .rela.got1 : { *(.rela.got1) } + .rela.got2 : { *(.rela.got2) } + .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } + .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } + .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } + .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) } + .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } + .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } + .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } + .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } + .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } + .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } + .rel.plt : { *(.rel.plt) } + .rela.plt : { *(.rela.plt) } + .init : + { + KEEP (*(.init)) + } =0 + .text : + { + *(.text .stub .text.* .gnu.linkonce.t.*) + KEEP (*(.text.*personality*)) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + } =0 + .fini : + { + KEEP (*(.fini)) + } =0 + PROVIDE (__etext = .); + PROVIDE (_etext = .); + PROVIDE (etext = .); + .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } + .rodata1 : { *(.rodata1) } + .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } + .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } + .eh_frame_hdr : { *(.eh_frame_hdr) } + .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) } + .gcc_except_table : ONLY_IF_RO { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } + /* Adjust the address for the data segment. We want to adjust up to + the same address within the page on the next page up. */ + . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN (0x10000, 0x1000); + /* Exception handling */ + .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) } + .gcc_except_table : ONLY_IF_RW { KEEP (*(.gcc_except_table)) *(.gcc_except_table.*) } + /* Thread Local Storage sections */ + .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } + .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } + /* Ensure the __preinit_array_start label is properly aligned. We + could instead move the label definition inside the section, but + the linker would then create the section even if it turns out to + be empty, which isn't pretty. */ + . = ALIGN(32 / 8); + PROVIDE (__preinit_array_start = .); + .preinit_array : { KEEP (*(.preinit_array)) } + PROVIDE (__preinit_array_end = .); + PROVIDE (__init_array_start = .); + .init_array : { KEEP (*(.init_array)) } + PROVIDE (__init_array_end = .); + PROVIDE (__fini_array_start = .); + .fini_array : { KEEP (*(.fini_array)) } + PROVIDE (__fini_array_end = .); + .ctors : + { + /* gcc uses crtbegin.o to find the start of + the constructors, so we make sure it is + first. Because this is a wildcard, it + doesn't matter if the user does not + actually link against crtbegin.o; the + linker won't look for a file to match a + wildcard. The wildcard also means that it + doesn't matter which directory crtbegin.o + is in. */ + KEEP (*crtbegin*.o(.ctors)) + /* We don't want to include the .ctor section from + from the crtend.o file until after the sorted ctors. + The .ctor section from the crtend file contains the + end of ctors marker and it must be last */ + KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors)) + KEEP (*(SORT(.ctors.*))) + KEEP (*(.ctors)) + } + .dtors : + { + KEEP (*crtbegin*.o(.dtors)) + KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors)) + KEEP (*(SORT(.dtors.*))) + KEEP (*(.dtors)) + } + .jcr : { KEEP (*(.jcr)) } + .data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) } + .fixup : { *(.fixup) } + .got1 : { *(.got1) } + .got2 : { *(.got2) } + .dynamic : { *(.dynamic) } + . = DATA_SEGMENT_RELRO_END (0, .); + .data : + { + *(.data .data.* .gnu.linkonce.d.*) + KEEP (*(.gnu.linkonce.d.*personality*)) + SORT(CONSTRUCTORS) + } + .data1 : { *(.data1) } + .got : { *(.got.plt) *(.got) } + /* We want the small data sections together, so single-instruction offsets + can access them all, and initialized data all before uninitialized, so + we can shorten the on-disk segment size. */ + .sdata : + { + *(.sdata .sdata.* .gnu.linkonce.s.*) + } + _edata = .; + PROVIDE (edata = .); + __bss_start = .; + .sbss : + { + PROVIDE (__sbss_start = .); + PROVIDE (___sbss_start = .); + *(.dynsbss) + *(.sbss .sbss.* .gnu.linkonce.sb.*) + *(.scommon) + PROVIDE (__sbss_end = .); + PROVIDE (___sbss_end = .); + } + .plt : { *(.plt) } + .bss : + { + *(.dynbss) + *(.bss .bss.* .gnu.linkonce.b.*) + *(COMMON) + /* Align here to ensure that the .bss section occupies space up to + _end. Align after .bss to ensure correct alignment even if the + .bss section disappears because there are no input sections. */ + . = ALIGN(32 / 8); + } + . = ALIGN(32 / 8); + _end = .; + __end = .; + PROVIDE (end = .); + . = DATA_SEGMENT_END (.); + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section so we begin them at 0. */ + /* DWARF 1 */ + .debug 0 : { *(.debug) } + .line 0 : { *(.line) } + /* GNU DWARF 1 extensions */ + .debug_srcinfo 0 : { *(.debug_srcinfo) } + .debug_sfnames 0 : { *(.debug_sfnames) } + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + /* DWARF 2 */ + .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } + .debug_abbrev 0 : { *(.debug_abbrev) } + .debug_line 0 : { *(.debug_line) } + .debug_frame 0 : { *(.debug_frame) } + .debug_str 0 : { *(.debug_str) } + .debug_loc 0 : { *(.debug_loc) } + .debug_macinfo 0 : { *(.debug_macinfo) } + /* SGI/MIPS DWARF 2 extensions */ + .debug_weaknames 0 : { *(.debug_weaknames) } + .debug_funcnames 0 : { *(.debug_funcnames) } + .debug_typenames 0 : { *(.debug_typenames) } + .debug_varnames 0 : { *(.debug_varnames) } + /DISCARD/ : { *(.note.GNU-stack) } } - Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ntoskr… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Tue Sep 26 07:33:05 2006 @@ -45,6 +45,7 @@ <if property="ARCH" value="powerpc"> <directory name="powerpc"> <file first="true">main_asm.S</file> + <file>kiinit.c</file> <file>ppc_irq.c</file> </directory> </if>

1 0

[arty] 24274: Added some needed OFW calls.
by arty＠svn.reactos.org 26 Sep '06

26 Sep '06

Author: arty Date: Tue Sep 26 07:29:53 2006 New Revision: 24274 URL: http://svn.reactos.org/svn/reactos?rev=24274&view=rev Log: Added some needed OFW calls. Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw 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 Sep 26 07:29:53 2006 @@ -8,12 +8,14 @@ exit 0 0 child 1 1 int int peer 1 1 int int +parent 1 1 int int seek 3 1 int int int int # MMU methods # claim (virt size align -- base) claim 3 1 int int int int # release (virt size --) release 2 0 int int +package-to-path 3 1 int char*:arg2 int int # Declare the call-method BE function +call-method 0 0 # Convenience functions that interact closely with OFW (written in BE asm)

1 0

[greatlrd] 24273: fixed overlaping memory problem with RtlMoveMemory. The rewrite of RtlMoveMemory did not handling overlaping memory. it shows with ntdll_winetest rtl, use the old asm version from the string.a instead
by greatlrd＠svn.reactos.org 25 Sep '06

25 Sep '06

Author: greatlrd Date: Tue Sep 26 03:46:32 2006 New Revision: 24273 URL: http://svn.reactos.org/svn/reactos?rev=24273&view=rev Log: fixed overlaping memory problem with RtlMoveMemory. The rewrite of RtlMoveMemory did not handling overlaping memory. it shows with ntdll_winetest rtl, use the old asm version from the string.a instead Added: trunk/reactos/lib/rtl/RtlMoveMemory.c (with props) Modified: trunk/reactos/lib/rtl/i386/rtlmem.s trunk/reactos/lib/rtl/rtl.rbuild Added: trunk/reactos/lib/rtl/RtlMoveMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/RtlMoveMemory.c?re… ============================================================================== --- trunk/reactos/lib/rtl/RtlMoveMemory.c (added) +++ trunk/reactos/lib/rtl/RtlMoveMemory.c Tue Sep 26 03:46:32 2006 @@ -1,0 +1,23 @@ +#include <rtl.h> + +#define NDEBUG +#include <debug.h> + +#undef RtlMoveMemory +/* + * @implemented + */ +VOID +NTAPI +RtlMoveMemory ( + PVOID Destination, + CONST VOID * Source, + ULONG Length +) +{ + memmove ( + Destination, + Source, + Length + ); +} Propchange: trunk/reactos/lib/rtl/RtlMoveMemory.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlmem.s (original) +++ trunk/reactos/lib/rtl/i386/rtlmem.s Tue Sep 26 03:46:32 2006 @@ -214,73 +214,6 @@ ret 8 .endfunc -.func RtlMoveMemory@12 -_RtlMoveMemory@12: - - /* Save volatiles */ - push esi - push edi - - /* Get pointers and size */ - mov esi, [esp+16] - mov edi, [esp+12] - mov ecx, [esp+20] - cld - - /* Check if the destination is higher (or equal) */ - cmp esi, edi - jbe Overlap - - /* Set ULONG size and UCHAR remainder */ -DoMove: - mov edx, ecx - and edx, 3 - shr ecx, 2 - - /* Do the move */ - rep movsd - or ecx, edx - jnz ByteMove - - /* Return */ - pop edi - pop esi - ret 12 - -ByteMove: - /* Move what's left */ - rep stosb - -DoneMove: - /* Restore volatiles */ - pop edi - pop esi - ret 12 - -Overlap: - /* Don't copy if they're equal */ - jz DoneMove - - /* Compare pointer distance with given length and check for overlap */ - mov eax, edi - sub eax, esi - cmp ecx, eax - jbe DoMove - - /* Set direction flag for backward move */ - std - - /* Copy byte-by-byte the non-overlapping distance */ - add esi, ecx - add edi, ecx - dec esi - dec edi - - /* Do the move, reset flag and return */ - rep movsb - cld - jmp DoneMove -.endfunc .func @RtlPrefetchMemoryNonTemporal@8, @RtlPrefetchMemoryNonTemporal@8 @RtlPrefetchMemoryNonTemporal@8: Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=242… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Tue Sep 26 03:46:32 2006 @@ -39,6 +39,7 @@ <file>sqrt_asm.s</file> <file>tan_asm.s</file> </directory> + <file>RtlMoveMemory.c</file> </if> <ifnot property="ARCH" value="i386">

1 0

[greatlrd] 24272: restore files mem.c and memgen.c restore no i386 arch define in rbuild do not remove it, it is for build on no i386 platform the was accident delete in r23830
by greatlrd＠svn.reactos.org 25 Sep '06

25 Sep '06

Author: greatlrd Date: Tue Sep 26 03:26:08 2006 New Revision: 24272 URL: http://svn.reactos.org/svn/reactos?rev=24272&view=rev Log: restore files mem.c and memgen.c restore no i386 arch define in rbuild do not remove it, it is for build on no i386 platform the was accident delete in r23830 Added: trunk/reactos/lib/rtl/mem.c - copied unchanged from r23829, trunk/reactos/lib/rtl/mem.c trunk/reactos/lib/rtl/memgen.c - copied unchanged from r23829, trunk/reactos/lib/rtl/memgen.c Modified: trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=242… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Tue Sep 26 03:26:08 2006 @@ -40,6 +40,12 @@ <file>tan_asm.s</file> </directory> </if> + + <ifnot property="ARCH" value="i386"> + <file>memgen.c</file> + <file>mem.c</file> + </ifnot> + <file>access.c</file> <file>acl.c</file> <file>atom.c</file>

1 0

[greatlrd] 24271: NtGdiSetViewportExtEx fix a bsd by moving in some value to seh last we can run gdi32_winetest mapping without bsd
by greatlrd＠svn.reactos.org 25 Sep '06

25 Sep '06

Author: greatlrd Date: Tue Sep 26 01:28:09 2006 New Revision: 24271 URL: http://svn.reactos.org/svn/reactos?rev=24271&view=rev Log: NtGdiSetViewportExtEx fix a bsd by moving in some value to seh last we can run gdi32_winetest mapping without bsd Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Tue Sep 26 01:28:09 2006 @@ -795,6 +795,12 @@ 1); Size->cx = dc->vportExtX; Size->cy = dc->vportExtY; + + dc->vportExtX = XExtent; + dc->vportExtY = YExtent; + + if (dc->w.MapMode == MM_ISOTROPIC) + IntFixIsotropicMapping(dc); } _SEH_HANDLE { @@ -810,11 +816,7 @@ } } - dc->vportExtX = XExtent; - dc->vportExtY = YExtent; - - if (dc->w.MapMode == MM_ISOTROPIC) - IntFixIsotropicMapping(dc); + DC_UpdateXforms(dc); DC_UnlockDc(dc);

1 0

[greatlrd] 24270: implement PEN_GetObject, we can now get pen from GetopjectType. and manger pass some new wine test
by greatlrd＠svn.reactos.org 25 Sep '06

25 Sep '06

Author: greatlrd Date: Tue Sep 26 00:12:43 2006 New Revision: 24270 URL: http://svn.reactos.org/svn/reactos?rev=24270&view=rev Log: implement PEN_GetObject, we can now get pen from GetopjectType. and manger pass some new wine test Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/pen.c Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pen.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/pen.h Tue Sep 26 00:12:43 2006 @@ -11,4 +11,6 @@ #define PENOBJ_LockPen(hBMObj) ((PGDIBRUSHOBJ)GDIOBJ_LockObj(GdiHandleTable, (HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_PEN)) #define PENOBJ_UnlockPen(pPenObj) GDIOBJ_UnlockObjByPtr(GdiHandleTable, pPenObj) +INT STDCALL PEN_GetObject(PGDIBRUSHOBJ hPen, INT Count, PLOGPEN Buffer); + #endif Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Sep 26 00:12:43 2006 @@ -1734,11 +1734,11 @@ ObjectType = GDIOBJ_GetObjectType(Handle); switch (ObjectType) { -#if 0 + case GDI_OBJECT_TYPE_PEN: - Result = PEN_GetObject((PENOBJ *) GdiObject, Count, Buffer); + Result = PEN_GetObject((PGDIBRUSHOBJ) GdiObject, Count, (PLOGPEN) Buffer); // IntGdiCreatePenIndirect break; -#endif + case GDI_OBJECT_TYPE_BRUSH: Result = BRUSH_GetObject((PGDIBRUSHOBJ ) GdiObject, Count, (LPLOGBRUSH)Buffer); break; Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/pen.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/pen.c Tue Sep 26 00:12:43 2006 @@ -84,12 +84,29 @@ break; default: - DPRINT1("FIXME: IntGdiCreatePenIndirect is UNIMPLEMENTED\n"); + DPRINT1("FIXME: IntGdiCreatePenIndirect is UNIMPLEMENTED pen %x\n",LogPen->lopnStyle); } PENOBJ_UnlockPen(PenObject); return hPen; +} + +INT STDCALL +PEN_GetObject(PGDIBRUSHOBJ PenObject, INT Count, PLOGPEN Buffer) +{ + + LOGPEN LogPen; + + if( Buffer == NULL ) return sizeof(LOGPEN); + + LogPen.lopnWidth = PenObject->ptPenWidth; + LogPen.lopnStyle = PenObject->ulPenStyle; + LogPen.lopnColor = PenObject->BrushAttr.lbColor; + memcpy(Buffer, &LogPen, Count); + + return Count; + } /* PUBLIC FUNCTIONS ***********************************************************/

1 0

[janderwald] 24269: * fix typo in german resource file spotted by pilic * fix bug 1797 * set svn-eolstyle:native property See issue #1797 for more details.
by janderwald＠svn.reactos.org 25 Sep '06

25 Sep '06

Author: janderwald Date: Mon Sep 25 23:28:40 2006 New Revision: 24269 URL: http://svn.reactos.org/svn/reactos?rev=24269&view=rev Log: * fix typo in german resource file spotted by pilic * fix bug 1797 * set svn-eolstyle:native property See issue #1797 for more details. Modified: trunk/reactos/base/applications/notepad/lang/Cs.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Da.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/De.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/En.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Es.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Fi.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Fr.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Gr.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Hu.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/It.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Ja.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Nl.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Pl.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Pt.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Ru.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Si.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Sk.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Sv.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Th.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Uk.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Wa.rc (contents, props changed) trunk/reactos/base/applications/notepad/lang/Zh.rc (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/notepad/lang/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…

1 0

[greatlrd] 24268: NtGdiRestoreDC 1. fix do not delete all hdc and the restore hdc. 2. fix calc of SaveLevel the calc are not perfect we only have 6 fails when we try restore dc now with wine gdi32 test dc
by greatlrd＠svn.reactos.org 25 Sep '06

25 Sep '06

Author: greatlrd Date: Mon Sep 25 22:50:40 2006 New Revision: 24268 URL: http://svn.reactos.org/svn/reactos?rev=24268&view=rev Log: NtGdiRestoreDC 1. fix do not delete all hdc and the restore hdc. 2. fix calc of SaveLevel the calc are not perfect we only have 6 fails when we try restore dc now with wine gdi32 test dc Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Sep 25 22:50:40 2006 @@ -1940,55 +1940,57 @@ return FALSE; } - if (SaveLevel == -1) - SaveLevel = dc->saveLevel; - - if ((SaveLevel < 1) || (SaveLevel > dc->saveLevel)) + if(abs(SaveLevel) > dc->saveLevel || SaveLevel == 0) { DC_UnlockDc(dc); return FALSE; } - success = TRUE; + /* FIXME this calc are not 100% correct I think ??*/ + if (SaveLevel < 0) SaveLevel = dc->saveLevel + SaveLevel + 1; + + success=TRUE; while (dc->saveLevel >= SaveLevel) { - HDC hdcs = DC_GetNextDC (dc); - - dcs = DC_LockDc (hdcs); - if (dcs == NULL) - { - DC_UnlockDc(dc); - return FALSE; - } - DC_SetNextDC (dcs, DC_GetNextDC (dcs)); - if (--dc->saveLevel < SaveLevel) - { - DC_UnlockDc( dc ); - DC_UnlockDc( dcs ); - NtGdiSetDCState(hDC, hdcs); -#if 0 - if (!PATH_AssignGdiPath( &dc->w.path, &dcs->w.path )) - { - /* FIXME: This might not be quite right, since we're - * returning FALSE but still destroying the saved DC state */ - success = FALSE; - } -#endif - dc = DC_LockDc(hDC); - if(!dc) - { - return FALSE; - } - } - else - { - DC_UnlockDc( dcs ); - } - NtGdiDeleteObjectApp (hdcs); + HDC hdcs = DC_GetNextDC (dc); + + dcs = DC_LockDc (hdcs); + if (dcs == NULL) + { + DC_UnlockDc(dc); + return FALSE; + } + + DC_SetNextDC (dc, DC_GetNextDC (dcs)); + dcs->hNext = 0; + + if (--dc->saveLevel < SaveLevel) + { + DC_UnlockDc( dc ); + DC_UnlockDc( dcs ); + + NtGdiSetDCState(hDC, hdcs); + //if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) + /* FIXME: This might not be quite right, since we're + * returning FALSE but still destroying the saved DC state + */ + success=FALSE; + dc = DC_LockDc(hDC); + if(!dc) + { + return FALSE; + } + } + else + { + DC_UnlockDc( dcs ); + } + NtGdiDeleteObjectApp (hdcs); } DC_UnlockDc( dc ); return success; } + INT STDCALL NtGdiSaveDC(HDC hDC)

1 0

[tretiakov] 24267: - PATH_RoundRect from wine - RtlCopyMemory -> memcpy
by tretiakov＠svn.reactos.org 25 Sep '06

25 Sep '06

Author: tretiakov Date: Mon Sep 25 12:06:20 2006 New Revision: 24267 URL: http://svn.reactos.org/svn/reactos?rev=24267&view=rev Log: - PATH_RoundRect from wine - RtlCopyMemory -> memcpy Modified: trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/path.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/path.h Mon Sep 25 12:06:20 2006 @@ -19,7 +19,7 @@ BOOL FASTCALL PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons); BOOL FASTCALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines); BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2); -BOOL FASTCALL PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius); +BOOL FASTCALL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height); BOOL FASTCALL PATH_PathToRegion (GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn); #endif /* _WIN32K_PATH_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c Mon Sep 25 12:06:20 2006 @@ -38,6 +38,7 @@ BOOL FASTCALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries); VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint); BOOL FASTCALL PATH_StrokePath(DC *dc, GdiPath *pPath); +BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, INT y2); INT FASTCALL IntGdiGetArcDirection(DC *dc); @@ -242,8 +243,8 @@ { _SEH_TRY { - RtlCopyMemory(Points, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed); - RtlCopyMemory(Types, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed); + memcpy(Points, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed); + memcpy(Types, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed); /* Convert the points to logical coordinates */ IntDPtoLP(dc, Points, pPath->numEntriesUsed); @@ -511,9 +512,9 @@ return FALSE; /* Perform the copy operation */ - RtlCopyMemory(pPathDest->pPoints, pPathSrc->pPoints, + memcpy(pPathDest->pPoints, pPathSrc->pPoints, sizeof(POINT)*pPathSrc->numEntriesUsed); - RtlCopyMemory(pPathDest->pFlags, pPathSrc->pFlags, + memcpy(pPathDest->pFlags, pPathSrc->pFlags, sizeof(BYTE)*pPathSrc->numEntriesUsed); pPathDest->state=pPathSrc->state; @@ -648,12 +649,63 @@ return TRUE; } -BOOL -FASTCALL -PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius) -{ - UNIMPLEMENTED; - return FALSE; +/* PATH_RoundRect + * + * Should be called when a call to RoundRect is performed on a DC that has + * an open path. Returns TRUE if successful, else FALSE. + * + * FIXME: it adds the same entries to the path as windows does, but there + * is an error in the bezier drawing code so that there are small pixel-size + * gaps when the resulting path is drawn by StrokePath() + */ +FASTCALL BOOL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height) +{ + GdiPath *pPath = &dc->w.path; + POINT corners[2], pointTemp; + FLOAT_POINT ellCorners[2]; + + /* Check that path is open */ + if(pPath->state!=PATH_Open) + return FALSE; + + if(!PATH_CheckCorners(dc,corners,x1,y1,x2,y2)) + return FALSE; + + /* Add points to the roundrect path */ + ellCorners[0].x = corners[1].x-ell_width; + ellCorners[0].y = corners[0].y; + ellCorners[1].x = corners[1].x; + ellCorners[1].y = corners[0].y+ell_height; + if(!PATH_DoArcPart(pPath, ellCorners, 0, -M_PI_2, TRUE)) + return FALSE; + pointTemp.x = corners[0].x+ell_width/2; + pointTemp.y = corners[0].y; + if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + return FALSE; + ellCorners[0].x = corners[0].x; + ellCorners[1].x = corners[0].x+ell_width; + if(!PATH_DoArcPart(pPath, ellCorners, -M_PI_2, -M_PI, FALSE)) + return FALSE; + pointTemp.x = corners[0].x; + pointTemp.y = corners[1].y-ell_height/2; + if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + return FALSE; + ellCorners[0].y = corners[1].y-ell_height; + ellCorners[1].y = corners[1].y; + if(!PATH_DoArcPart(pPath, ellCorners, M_PI, M_PI_2, FALSE)) + return FALSE; + pointTemp.x = corners[1].x-ell_width/2; + pointTemp.y = corners[1].y; + if(!PATH_AddEntry(pPath, &pointTemp, PT_LINETO)) + return FALSE; + ellCorners[0].x = corners[1].x-ell_width; + ellCorners[1].x = corners[1].x; + if(!PATH_DoArcPart(pPath, ellCorners, M_PI_2, 0, FALSE)) + return FALSE; + + IntGdiCloseFigure(dc); + + return TRUE; } /* PATH_Ellipse @@ -1016,6 +1068,46 @@ * Internal functions */ +/* PATH_CheckCorners + * + * Helper function for PATH_RoundRect() and PATH_Rectangle() + */ +BOOL PATH_CheckCorners(DC *dc, POINT corners[], INT x1, INT y1, INT x2, INT y2) +{ + INT temp; + + /* Convert points to device coordinates */ + corners[0].x=x1; + corners[0].y=y1; + corners[1].x=x2; + corners[1].y=y2; + CoordLPtoDP(dc, &corners[0]); + CoordLPtoDP(dc, &corners[1]); + + /* Make sure first corner is top left and second corner is bottom right */ + if(corners[0].x>corners[1].x) + { + temp=corners[0].x; + corners[0].x=corners[1].x; + corners[1].x=temp; + } + if(corners[0].y>corners[1].y) + { + temp=corners[0].y; + corners[0].y=corners[1].y; + corners[1].y=temp; + } + + /* In GM_COMPATIBLE, don't include bottom and right edges */ + if(dc->w.GraphicsMode==GM_COMPATIBLE) + { + corners[1].x--; + corners[1].y--; + } + + return TRUE; +} + /* PATH_AddFlatBezier * @@ -1239,8 +1331,8 @@ { ASSERT(pPath->pFlags); - RtlCopyMemory(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed); - RtlCopyMemory(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed); + memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed); + memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed); ExFreePool(pPath->pPoints); ExFreePool(pPath->pFlags); @@ -1461,11 +1553,11 @@ goto end; } - RtlCopyMemory(Realloc, pLinePts, nLinePts*sizeof(POINT)); + memcpy(Realloc, pLinePts, nLinePts*sizeof(POINT)); ExFreePool(pLinePts); pLinePts = Realloc; } - RtlCopyMemory(&pLinePts[nLinePts], &pBzrPts[1], (nBzrPts - 1) * sizeof(POINT)); + memcpy(&pLinePts[nLinePts], &pBzrPts[1], (nBzrPts - 1) * sizeof(POINT)); nLinePts += nBzrPts - 1; ExFreePool(pBzrPts); i += 2;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2006