Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 48689: [CMAKE] - Add ftfd driver to build.
by akhaldi＠svn.reactos.org 02 Sep '10

02 Sep '10

Author: akhaldi Date: Thu Sep 2 22:38:36 2010 New Revision: 48689 URL: http://svn.reactos.org/svn/reactos?rev=48689&view=rev Log: [CMAKE] - Add ftfd driver to build. Added: branches/cmake-bringup/drivers/video/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/font/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Thu Sep 2 22:38:36 2010 @@ -2,3 +2,4 @@ add_subdirectory(base) add_subdirectory(input) add_subdirectory(storage) +add_subdirectory(video) Added: branches/cmake-bringup/drivers/video/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/CMa… ============================================================================== --- branches/cmake-bringup/drivers/video/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] Thu Sep 2 22:38:36 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(font) Propchange: branches/cmake-bringup/drivers/video/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/font/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/font/CMakeLists.txt [iso-8859-1] Thu Sep 2 22:38:36 2010 @@ -1,0 +1,2 @@ + +add_subdirectory(ftfd) Propchange: branches/cmake-bringup/drivers/video/font/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Thu Sep 2 22:38:36 2010 @@ -1,0 +1,21 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) + +add_library(ftfd SHARED + enable.c + font.c + glyph.c + rosglue.c + sprintf.c) + +set_target_properties(ftfd PROPERTIES LINK_FLAGS "-Wl,-entry,_FtfdEnableDriver@12 -Wl,--subsystem,native") + +target_link_libraries(ftfd + ${CMAKE_CURRENT_SOURCE_DIR}/freetype.def + -lwin32k + freetype + libcntpr) + +add_dependencies(ftfd psdk) Propchange: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48688: [FREELDR] - Use fathelp.S from r43775 (amd64 branch by timo) [CMAKE] - Improve hal, ntoskrnl and freeldr/setupldr build.
by akhaldi＠svn.reactos.org 02 Sep '10

02 Sep '10

Author: akhaldi Date: Thu Sep 2 21:00:02 2010 New Revision: 48688 URL: http://svn.reactos.org/svn/reactos?rev=48688&view=rev Log: [FREELDR] - Use fathelp.S from r43775 (amd64 branch by timo) [CMAKE] - Improve hal, ntoskrnl and freeldr/setupldr build. Modified: branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Thu Sep 2 21:00:02 2010 @@ -154,7 +154,7 @@ list(APPEND SETUPLDR_MAIN_SOURCE freeldr/freeldr/windows/setupldr2.c) endif(ARCH MATCHES i386) -set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;FREELDR_REACTOS_SETUP" COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") +set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") @@ -169,7 +169,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch ${FREELDR_SOURCE}) -set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000" SUFFIX ".sys") if(ARCH MATCHES i386) target_link_libraries(freeldr mini_hal) @@ -189,11 +189,9 @@ ${FREELDR_ARCH_SOURCE} ${SETUPLDR_MAIN_SOURCE}) -add_library(setupldr SHARED - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch - ${SETUPLDR_SOURCE}) - -set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +add_library(setupldr SHARED ${SETUPLDR_SOURCE}) + +set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") if(ARCH MATCHES i386) target_link_libraries(setupldr mini_hal) @@ -204,4 +202,3 @@ cmlib rtl libcntpr) -add_pch(setupldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${SETUPLDR_SOURCE}) Modified: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] Thu Sep 2 21:00:02 2010 @@ -1,10 +1,12 @@ -// FATHELP.ASM +// fathelp.S // FAT12/16 Boot Sector Helper Code // Copyright (c) 1998, 2001, 2002, 2003 Brian Palmer - .text - .code16 - .intel_syntax +.intel_syntax noprefix + +.text + +.code16 #define BootSectorStackTop 0x7bf2 #define DataAreaStartHigh 0x2 @@ -16,28 +18,26 @@ #define ReadClusterOffset 0xc #define PutCharsOffset 0xe -#define OEMName 3 -#define BytesPerSector 11 -#define SectsPerCluster 13 -#define ReservedSectors 14 -#define NumberOfFats 16 -#define MaxRootEntries 17 -#define TotalSectors 19 -#define MediaDescriptor 21 -#define SectorsPerFat 22 -#define SectorsPerTrack 24 -#define NumberOfHeads 26 -#define HiddenSectors 28 -#define TotalSectorsBig 32 -#define BootDrive 36 -#define Reserved 37 -#define ExtendSig 38 -#define SerialNumber 39 -#define VolumeLabel 43 -#define FileSystem 54 - -#define BootPartition 0x7dfd - +#define OEMName 3 +#define BytesPerSector 11 +#define SectsPerCluster 13 +#define ReservedSectors 14 +#define NumberOfFats 16 +#define MaxRootEntries 17 +#define TotalSectors 19 +#define MediaDescriptor 21 +#define SectorsPerFat 22 +#define SectorsPerTrack 24 +#define NumberOfHeads 26 +#define HiddenSectors 28 +#define TotalSectorsBig 32 +#define BootDrive 36 +#define Reserved 37 +#define ExtendSig 38 +#define SerialNumber 39 +#define VolumeLabel 43 +#define FileSystem 54 + // This code will be stored in the first 512 bytes // of freeldr.sys. The first 3 bytes will be a jmp @@ -46,12 +46,13 @@ // // This code is loaded at 0000:8000 so we have to // encode a jmp instruction to jump to 0000:8200 - -.globl _mainCRTStartup /* For Mingw32 builds where the linker looks for this symbol */ +//.org 0x8000 + +.global _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol _mainCRTStartup: -.globl start +.global start start: - .byte 0xe9 + .byte 0xe9 .byte 0xfd .byte 0x01 @@ -64,80 +65,80 @@ FatHelperEntryPoint: - push %ax /* First save AX - the start cluster of freeldr.sys */ + push ax // First save AX - the start cluster of freeldr.sys // Display "Loading FreeLoader..." message - mov %esi,msgLoading /* Loading message */ - call [%bp-PutCharsOffset] /* Display it */ + mov esi, offset msgLoading // Loading message + call [bp-PutCharsOffset] // Display it call ReadFatIntoMemory - pop %ax /* Restore AX (start cluster) */ + pop ax // Restore AX (start cluster) // AX has start cluster of freeldr.sys - mov %bx,0x800 - mov %es,%bx + mov bx,0x800 + mov es,bx LoadFile: - push %ax + push ax call IsFat12 - pop %ax + pop ax jnc LoadFile2 - cmp %ax,0xff8 /* Check to see if this is the last cluster in the chain */ + cmp ax,0x0ff8 // Check to see if this is the last cluster in the chain jmp LoadFile3 LoadFile2: - cmp %ax,0xfff8 + cmp ax,0x0fff8 LoadFile3: - jae LoadFile_Done /* If so continue, if not then read then next one */ - push %ax - xor %bx,%bx /* Load ROSLDR starting at 0000:8000h */ - push %es - call [%bp-ReadClusterOffset] - pop %es - - xor %bx,%bx - mov %bl,BYTE [%bp+SectsPerCluster] - shl %bx,5 /* BX = BX * 512 / 16 */ - mov %ax,%es /* Increment the load address by */ - add %ax,%bx /* The size of a cluster */ - mov %es,%ax + jae LoadFile_Done // If so continue, if not then read then next one + push ax + xor bx,bx // Load ROSLDR starting at 0000:8000h + push es + call [bp-ReadClusterOffset] + pop es + + xor bx,bx + mov bl, [bp+SectsPerCluster] + shl bx,5 // BX = BX * 512 / 16 + mov ax,es // Increment the load address by + add ax,bx // The size of a cluster + mov es,ax call IsFat12 - pop %ax - push %es + pop ax + push es jnc LoadFile4 - call GetFatEntry12 /* Get the next entry */ + call GetFatEntry12 // Get the next entry jmp LoadFile5 LoadFile4: call GetFatEntry16 LoadFile5: - pop %es - - jmp LoadFile /* Load the next cluster (if any) */ + pop es + + jmp LoadFile // Load the next cluster (if any) LoadFile_Done: - mov %dl,BYTE [%bp+BootDrive] /* Load the boot drive into DL */ - mov %dh,[BootPartition] /* Load the boot partition into DH */ - - push 0 /* push segment (0x0000) */ - mov %bx, [0x80A8] /* load the RVA of the EntryPoint into eax */ - add %bx, 0x8000 /* RVA -> VA and skip 3 bytes (jump to fathelper code) */ - push %bx /* push offset */ - retf /* Transfer control to FreeLoader */ + mov dl, [bp+BootDrive] // Load the boot drive into DL + mov dh, BootPartition // Load the boot partition into DH + push word ptr 0x0000 + push word ptr 0x8000 // We will do a far return to 0000:8000h + +// retf // Transfer control to ROSLDR + .byte 0xcb // == retf + // Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory: - mov %ax,WORD [%bp+HiddenSectors] - mov %dx,WORD [%bp+HiddenSectors+2] - add %ax,WORD [%bp+ReservedSectors] - adc %dx,0 - mov %cx,WORD [%bp+SectorsPerFat] - mov %bx,0x7000 - mov %es,%bx - xor %bx,%bx - call [%bp-ReadSectorsOffset] + mov ax, [bp+HiddenSectors] + mov dx, [bp+HiddenSectors+2] + add ax, [bp+ReservedSectors] + adc dx, 0 + mov cx, [bp+SectorsPerFat] + mov bx,0x7000 + mov es,bx + xor bx,bx + call [bp-ReadSectorsOffset] ret @@ -146,15 +147,15 @@ // On return AX has FAT entry for that cluster GetFatEntry16: - mov %cx,2 /* AX = AX * 2 (since FAT16 entries are 2 bytes) */ - mul %cx - shl %dx,12 - - mov %bx,0x7000 - add %bx,%dx - mov %es,%bx - mov %bx,%ax /* Restore FAT entry offset */ - es mov %ax,WORD [%bx] /* Get FAT entry */ + mov cx,2 // AX = AX * 2 (since FAT16 entries are 2 bytes) + mul cx + shl dx,12 + + mov bx,0x7000 + add bx,dx + mov es,bx + mov bx,ax // Restore FAT entry offset + mov ax, es:[bx] // Get FAT entry ret @@ -164,24 +165,24 @@ // On return AX has FAT entry for that cluster GetFatEntry12: - push %ax - mov %cx,%ax - shr %ax,1 - add %ax,%cx /* AX = AX * 1.5 (AX = AX + (AX / 2)) (since FAT12 entries are 12 bits) */ - - mov %bx,0x7000 - mov %es,%bx - mov %bx,%ax /* Put FAT entry offset into BX */ - es mov %ax,WORD [%bx] /* Get FAT entry */ - pop %cx /* Get cluster number from stack */ - and %cx,1 + push ax + mov cx,ax + shr ax,1 + add ax,cx // AX = AX * 1.5 (AX = AX + (AX / 2)) (since FAT12 entries are 12 bits) + + mov bx,0x7000 + mov es,bx + mov bx,ax // Put FAT entry offset into BX + mov ax, es:[bx] // Get FAT entry + pop cx // Get cluster number from stack + and cx,1 jz UseLow12Bits - and %ax,0xfff0 - shr %ax,4 + and ax,0x0fff0 + shr ax,4 jmp GetFatEntry12_Done UseLow12Bits: - and %ax,0x0fff + and ax,0x0fff GetFatEntry12_Done: @@ -192,31 +193,30 @@ // Otherwise CF = 0 for FAT16 IsFat12: - mov %ebx,DWORD [%bp-DataAreaStartLow] + mov ebx, [bp-DataAreaStartLow] // EBX now has the number of the starting sector of the data area // starting from the beginning of the disk, so subtrace hidden sectors - sub %ebx,DWORD [%bp+HiddenSectors] - - - xor %eax,%eax - mov %ax,WORD [%bp+TotalSectors] - cmp %ax,0 + sub ebx, [bp+HiddenSectors] + + + xor eax,eax + mov ax, [bp+TotalSectors] + cmp ax, 0 jnz IsFat12_2 - mov %eax,DWORD [%bp+TotalSectorsBig] + mov eax, [bp+TotalSectorsBig] // EAX now contains the number of sectors on the volume IsFat12_2: - sub %eax,%ebx /* Subtract data area start sector */ - xor %edx,%edx /* from total sectors of volume */ + sub eax,ebx // Subtract data area start sector + xor edx,edx // from total sectors of volume // EDX:EAX now contains the number of data sectors on the volume - xor %ebx,%ebx - mov %bl,BYTE [%bp+SectsPerCluster] - div %ebx + movzx ebx, byte ptr [bp+SectsPerCluster] + div ebx // EAX now has the number of clusters on the volume stc - cmp %eax,4085 + cmp eax,4085 jb IsFat12_Done clc @@ -226,8 +226,14 @@ msgLoading: - .asciz "Loading FreeLoader...\r\n" - - .org 0x1fe -blockend: - .word 0x0aa55 /* BootSector signature */ + .ascii "Loading FreeLoader..." + .byte 0x0d,0x0a,0 + +// times 510-($-$$) db 0 // Pad to 510 bytes +.org 0x1fe + .word 0x0aa55 // BootSector signature + + +// pseudo adresses +//.org 0x7dfd +BootPartition: Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Thu Sep 2 21:00:02 2010 @@ -28,10 +28,6 @@ halx86/generic/i386/systimer.S halx86/generic/i386/trap.S) -add_library(hal_generic ${HAL_GENERIC_SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/hal_generic_hal.h.gch) -add_pch(hal_generic ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_GENERIC_SOURCE}) -add_dependencies(hal_generic psdk bugcodes) - list(APPEND HAL_GENERIC_PCAT_SOURCE halx86/generic/legacy/bus/bushndlr.c halx86/generic/legacy/bus/cmosbus.c @@ -42,28 +38,29 @@ halx86/generic/legacy/bussupp.c halx86/generic/legacy/halpcat.c) -add_library(hal_generic_pcat ${HAL_GENERIC_PCAT_SOURCE}) -add_dependencies(hal_generic_pcat psdk) - list(APPEND HAL_GENERIC_UP_SOURCE halx86/generic/spinlock.c halx86/up/pic.c halx86/up/processor.c) -add_library(hal_generic_up ${HAL_GENERIC_UP_SOURCE}) -add_dependencies(hal_generic_up psdk) - set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") -add_library(hal SHARED halx86/up/halinit_up.c halx86/up/halup.rc) +list(APPEND HAL_SOURCE + ${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch + ${HAL_GENERIC_SOURCE} + ${HAL_GENERIC_PCAT_SOURCE} + ${HAL_GENERIC_UP_SOURCE} + halx86/up/halinit_up.c + halx86/up/halup.rc) -set_target_properties(hal PROPERTIES LINK_FLAGS "-Wl,-entry,_HalInitSystem@8") +add_library(hal SHARED ${HAL_SOURCE}) +add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE}) +add_dependencies(hal psdk bugcodes) + +set_target_properties(hal PROPERTIES LINK_FLAGS "-Wl,-entry,_HalInitSystem@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") target_link_libraries(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def - -Wl,--whole-archive hal_generic -Wl,--no-whole-archive - hal_generic_pcat - hal_generic_up ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a libcntpr) @@ -99,7 +96,7 @@ endif(ARCH MATCHES i386) add_library(mini_hal ${MINI_HAL_SOURCE}) -set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS _BLDR_ _MINIHAL_) +set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") add_dependencies(mini_hal psdk bugcodes) else() Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Thu Sep 2 21:00:02 2010 @@ -1,8 +1,8 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -I${REACTOS_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include -O coff -o <OBJECT> ") -set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") +set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds -Wl,--subsystem,native") add_definitions(-D__NTOSKRNL__) add_definitions(-D_NTOSKRNL_)

1 0

[akhaldi] 48687: [FREELDR] - Convert fat12/16 boot sector helper code to gas syntax. Brought to you by the Arty. [CMAKE] - Add freeldr and setupldr to build.
by akhaldi＠svn.reactos.org 02 Sep '10

02 Sep '10

Author: akhaldi Date: Thu Sep 2 17:39:45 2010 New Revision: 48687 URL: http://svn.reactos.org/svn/reactos?rev=48687&view=rev Log: [FREELDR] - Convert fat12/16 boot sector helper code to gas syntax. Brought to you by the Arty. [CMAKE] - Add freeldr and setupldr to build. Added: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S - copied, changed from r48568, branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.asm Removed: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.asm Modified: branches/cmake-bringup/boot/CMakeLists.txt Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Thu Sep 2 17:39:45 2010 @@ -5,3 +5,203 @@ CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin) CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isoboot.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin) CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/bootsect/isobtrt.asm ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isobtrt.bin) + +include_directories(BEFORE freeldr/freeldr/include) +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_STARTUP_SOURCE + freeldr/freeldr/arch/i386/fathelp.S + freeldr/freeldr/arch/i386/arch.S) +elseif(ARCH MATCHES amd64) +list(APPEND FREELDR_STARTUP_SOURCE + freeldr/freeldr/arch/amd64/fathelp.S + freeldr/freeldr/arch/amd64/arch.S) +endif(ARCH MATCHES i386) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_BASE64K_SOURCE + freeldr/freeldr/arch/i386/boot.S + freeldr/freeldr/arch/i386/drvmap.S + freeldr/freeldr/arch/i386/i386cpu.S + freeldr/freeldr/arch/i386/i386idt.S + freeldr/freeldr/arch/i386/i386pnp.S + freeldr/freeldr/arch/i386/i386trap.S + freeldr/freeldr/arch/i386/int386.S + freeldr/freeldr/arch/i386/linux.S + freeldr/freeldr/arch/i386/mb.S) +elseif(ARCH MATCHES amd64) +list(APPEND FREELDR_BASE64K_SOURCE + freeldr/freeldr/arch/amd64/drvmap.S + freeldr/freeldr/arch/amd64/i386cpu.S + freeldr/freeldr/arch/amd64/i386idt.S + freeldr/freeldr/arch/amd64/i386trap.S + freeldr/freeldr/arch/amd64/mb.S) +endif(ARCH MATCHES i386) + +set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_") + +include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib) + +list(APPEND FREELDR_BASE_SOURCE + freeldr/freeldr/arcemul/mm.c + freeldr/freeldr/arcemul/time.c + freeldr/freeldr/cache/blocklist.c + freeldr/freeldr/cache/cache.c + freeldr/freeldr/comm/rs232.c + freeldr/freeldr/disk/disk.c + freeldr/freeldr/disk/partition.c + freeldr/freeldr/disk/ramdisk.c + freeldr/freeldr/fs/ext2.c + freeldr/freeldr/fs/fat.c + freeldr/freeldr/fs/fs.c + freeldr/freeldr/fs/iso.c + freeldr/freeldr/fs/ntfs.c + freeldr/freeldr/inifile/ini_init.c + freeldr/freeldr/inifile/inifile.c + freeldr/freeldr/inifile/parse.c + freeldr/freeldr/mm/meminit.c + freeldr/freeldr/mm/mm.c + freeldr/freeldr/reactos/registry.c + freeldr/freeldr/reactos/arcname.c + freeldr/freeldr/reactos/archwsup.c + freeldr/freeldr/reactos/binhive.c + freeldr/freeldr/reactos/reactos.c + freeldr/freeldr/reactos/imageldr.c + freeldr/freeldr/rtl/bget.c + freeldr/freeldr/rtl/libsupp.c + freeldr/freeldr/ui/directui.c + freeldr/freeldr/ui/gui.c + freeldr/freeldr/ui/minitui.c + freeldr/freeldr/ui/noui.c + freeldr/freeldr/ui/tui.c + freeldr/freeldr/ui/tuimenu.c + freeldr/freeldr/ui/ui.c + freeldr/freeldr/video/fade.c + freeldr/freeldr/video/palette.c + freeldr/freeldr/video/video.c + freeldr/freeldr/windows/conversion.c + freeldr/freeldr/windows/peloader.c + freeldr/freeldr/windows/winldr.c + freeldr/freeldr/windows/wlmemory.c + freeldr/freeldr/windows/wlregistry.c + freeldr/freeldr/freeldr.c + freeldr/freeldr/debug.c + freeldr/freeldr/version.c + freeldr/freeldr/cmdline.c + freeldr/freeldr/machine.c + freeldr/freeldr/options.c + freeldr/freeldr/linuxboot.c + freeldr/freeldr/oslist.c) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_BASE_SOURCE freeldr/freeldr/disk/scsiport.c) +endif(ARCH MATCHES i386) + +set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf) + +if(ARCH MATCHES i386) +list(APPEND FREELDR_ARCH_SOURCE + freeldr/freeldr/arch/i386/_alloca.S + freeldr/freeldr/arch/i386/archmach.c + freeldr/freeldr/arch/i386/custom.c + freeldr/freeldr/arch/i386/drivemap.c + freeldr/freeldr/arch/i386/halstub.c + freeldr/freeldr/arch/i386/hardware.c + freeldr/freeldr/arch/i386/hwacpi.c + freeldr/freeldr/arch/i386/hwapm.c + freeldr/freeldr/arch/i386/hwpci.c + freeldr/freeldr/arch/i386/i386disk.c + freeldr/freeldr/arch/i386/i386rtl.c + freeldr/freeldr/arch/i386/i386vid.c + freeldr/freeldr/arch/i386/loader.c + freeldr/freeldr/arch/i386/machpc.c + freeldr/freeldr/arch/i386/miscboot.c + freeldr/freeldr/arch/i386/ntoskrnl.c + freeldr/freeldr/arch/i386/pccons.c + freeldr/freeldr/arch/i386/pcdisk.c + freeldr/freeldr/arch/i386/pcmem.c + freeldr/freeldr/arch/i386/pcrtc.c + freeldr/freeldr/arch/i386/pcvideo.c + freeldr/freeldr/arch/i386/machxbox.c + freeldr/freeldr/arch/i386/xboxcons.c + freeldr/freeldr/arch/i386/xboxdisk.c + freeldr/freeldr/arch/i386/xboxfont.c + freeldr/freeldr/arch/i386/xboxhw.c + freeldr/freeldr/arch/i386/xboxi2c.c + freeldr/freeldr/arch/i386/xboxmem.c + freeldr/freeldr/arch/i386/xboxrtc.c + freeldr/freeldr/arch/i386/xboxvideo.c + freeldr/freeldr/windows/i386/ntsetup.c + freeldr/freeldr/windows/i386/wlmemory.c) +else() +#TBD +endif(ARCH MATCHES i386) + +set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") + +list(APPEND SETUPLDR_MAIN_SOURCE + freeldr/freeldr/bootmgr.c + freeldr/freeldr/inffile/inffile.c + freeldr/freeldr/reactos/setupldr.c) + +if(ARCH MATCHES i386) +list(APPEND SETUPLDR_MAIN_SOURCE freeldr/freeldr/windows/setupldr2.c) +elseif(ARCH MATCHES amd64) +list(APPEND SETUPLDR_MAIN_SOURCE freeldr/freeldr/windows/setupldr2.c) +endif(ARCH MATCHES i386) + +set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;FREELDR_REACTOS_SETUP" COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +list(APPEND FREELDR_SOURCE + freeldr/freeldr/bootmgr.c + ${FREELDR_STARTUP_SOURCE} + ${FREELDR_BASE64K_SOURCE} + ${FREELDR_BASE_SOURCE} + ${FREELDR_ARCH_SOURCE}) + +add_library(freeldr SHARED + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch + ${FREELDR_SOURCE}) + +set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +if(ARCH MATCHES i386) +target_link_libraries(freeldr mini_hal) +endif(ARCH MATCHES i386) + +target_link_libraries(freeldr + rossym + cmlib + rtl + libcntpr) +add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${FREELDR_SOURCE}) + +list(APPEND SETUPLDR_SOURCE + ${FREELDR_STARTUP_SOURCE} + ${FREELDR_BASE64K_SOURCE} + ${FREELDR_BASE_SOURCE} + ${FREELDR_ARCH_SOURCE} + ${SETUPLDR_MAIN_SOURCE}) + +add_library(setupldr SHARED + ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch + ${SETUPLDR_SOURCE}) + +set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") + +if(ARCH MATCHES i386) +target_link_libraries(setupldr mini_hal) +endif(ARCH MATCHES i386) + +target_link_libraries(setupldr + rossym + cmlib + rtl + libcntpr) +add_pch(setupldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${SETUPLDR_SOURCE}) Copied: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S (from r48568, branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.asm) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.asm [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.S [iso-8859-1] Thu Sep 2 17:39:45 2010 @@ -1,226 +1,222 @@ -; FATHELP.ASM -; FAT12/16 Boot Sector Helper Code -; Copyright (c) 1998, 2001, 2002, 2003 Brian Palmer - - - -;org 8000h - -segment .text - -bits 16 - - -BootSectorStackTop equ 0x7bf2 -DataAreaStartHigh equ 0x2 -DataAreaStartLow equ 0x4 -BiosCHSDriveSizeHigh equ 0x6 -BiosCHSDriveSizeLow equ 0x8 -BiosCHSDriveSize equ 0x8 -ReadSectorsOffset equ 0xa -ReadClusterOffset equ 0xc -PutCharsOffset equ 0xe - -OEMName equ 3 -BytesPerSector equ 11 -SectsPerCluster equ 13 -ReservedSectors equ 14 -NumberOfFats equ 16 -MaxRootEntries equ 17 -TotalSectors equ 19 -MediaDescriptor equ 21 -SectorsPerFat equ 22 -SectorsPerTrack equ 24 -NumberOfHeads equ 26 -HiddenSectors equ 28 -TotalSectorsBig equ 32 -BootDrive equ 36 -Reserved equ 37 -ExtendSig equ 38 -SerialNumber equ 39 -VolumeLabel equ 43 -FileSystem equ 54 - -BootPartition equ 0x7dfd +// FATHELP.ASM +// FAT12/16 Boot Sector Helper Code +// Copyright (c) 1998, 2001, 2002, 2003 Brian Palmer + + .text + .code16 + .intel_syntax + +#define BootSectorStackTop 0x7bf2 +#define DataAreaStartHigh 0x2 +#define DataAreaStartLow 0x4 +#define BiosCHSDriveSizeHigh 0x6 +#define BiosCHSDriveSizeLow 0x8 +#define BiosCHSDriveSize 0x8 +#define ReadSectorsOffset 0xa +#define ReadClusterOffset 0xc +#define PutCharsOffset 0xe + +#define OEMName 3 +#define BytesPerSector 11 +#define SectsPerCluster 13 +#define ReservedSectors 14 +#define NumberOfFats 16 +#define MaxRootEntries 17 +#define TotalSectors 19 +#define MediaDescriptor 21 +#define SectorsPerFat 22 +#define SectorsPerTrack 24 +#define NumberOfHeads 26 +#define HiddenSectors 28 +#define TotalSectorsBig 32 +#define BootDrive 36 +#define Reserved 37 +#define ExtendSig 38 +#define SerialNumber 39 +#define VolumeLabel 43 +#define FileSystem 54 + +#define BootPartition 0x7dfd -; This code will be stored in the first 512 bytes -; of freeldr.sys. The first 3 bytes will be a jmp -; instruction to skip past the FAT helper code -; that is stored in the rest of the 512 bytes. -; -; This code is loaded at 0000:8000 so we have to -; encode a jmp instruction to jump to 0000:8200 - -global _mainCRTStartup ; For Mingw32 builds where the linker looks for this symbol +// This code will be stored in the first 512 bytes +// of freeldr.sys. The first 3 bytes will be a jmp +// instruction to skip past the FAT helper code +// that is stored in the rest of the 512 bytes. +// +// This code is loaded at 0000:8000 so we have to +// encode a jmp instruction to jump to 0000:8200 + +.globl _mainCRTStartup /* For Mingw32 builds where the linker looks for this symbol */ _mainCRTStartup: -global start +.globl start start: - db 0xe9 - db 0xfd - db 0x01 - -; Now starts the extra boot code that we will store -; in the first 512 bytes of freeldr.sys. This code -; allows the FAT12/16 bootsector to navigate the -; FAT table so that we can still load freeldr.sys -; even if it is fragmented. + .byte 0xe9 + .byte 0xfd + .byte 0x01 + +// Now starts the extra boot code that we will store +// in the first 512 bytes of freeldr.sys. This code +// allows the FAT12/16 bootsector to navigate the +// FAT table so that we can still load freeldr.sys +// even if it is fragmented. FatHelperEntryPoint: - push ax ; First save AX - the start cluster of freeldr.sys - - - ; Display "Loading FreeLoader..." message - mov esi,msgLoading ; Loading message - call [bp-PutCharsOffset] ; Display it + push %ax /* First save AX - the start cluster of freeldr.sys */ + + + // Display "Loading FreeLoader..." message + mov %esi,msgLoading /* Loading message */ + call [%bp-PutCharsOffset] /* Display it */ call ReadFatIntoMemory - pop ax ; Restore AX (start cluster) - ; AX has start cluster of freeldr.sys - - mov bx,800h - mov es,bx + pop %ax /* Restore AX (start cluster) */ + // AX has start cluster of freeldr.sys + + mov %bx,0x800 + mov %es,%bx LoadFile: - push ax + push %ax call IsFat12 - pop ax + pop %ax jnc LoadFile2 - cmp ax,0ff8h ; Check to see if this is the last cluster in the chain + cmp %ax,0xff8 /* Check to see if this is the last cluster in the chain */ jmp LoadFile3 LoadFile2: - cmp ax,0fff8h + cmp %ax,0xfff8 LoadFile3: - jae LoadFile_Done ; If so continue, if not then read then next one - push ax - xor bx,bx ; Load ROSLDR starting at 0000:8000h - push es - call [bp-ReadClusterOffset] - pop es - - xor bx,bx - mov bl,BYTE [BYTE bp+SectsPerCluster] - shl bx,5 ; BX = BX * 512 / 16 - mov ax,es ; Increment the load address by - add ax,bx ; The size of a cluster - mov es,ax + jae LoadFile_Done /* If so continue, if not then read then next one */ + push %ax + xor %bx,%bx /* Load ROSLDR starting at 0000:8000h */ + push %es + call [%bp-ReadClusterOffset] + pop %es + + xor %bx,%bx + mov %bl,BYTE [%bp+SectsPerCluster] + shl %bx,5 /* BX = BX * 512 / 16 */ + mov %ax,%es /* Increment the load address by */ + add %ax,%bx /* The size of a cluster */ + mov %es,%ax call IsFat12 - pop ax - push es + pop %ax + push %es jnc LoadFile4 - call GetFatEntry12 ; Get the next entry + call GetFatEntry12 /* Get the next entry */ jmp LoadFile5 LoadFile4: call GetFatEntry16 LoadFile5: - pop es - - jmp LoadFile ; Load the next cluster (if any) + pop %es + + jmp LoadFile /* Load the next cluster (if any) */ LoadFile_Done: - mov dl,BYTE [BYTE bp+BootDrive] ; Load the boot drive into DL - mov dh,[BootPartition] ; Load the boot partition into DH - - push 0 ; push segment (0x0000) - mov bx, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add bx, 0x8000 ; RVA -> VA and skip 3 bytes (jump to fathelper code) - push bx ; push offset - retf ; Transfer control to FreeLoader - -; Reads the entire FAT into memory at 7000:0000 + mov %dl,BYTE [%bp+BootDrive] /* Load the boot drive into DL */ + mov %dh,[BootPartition] /* Load the boot partition into DH */ + + push 0 /* push segment (0x0000) */ + mov %bx, [0x80A8] /* load the RVA of the EntryPoint into eax */ + add %bx, 0x8000 /* RVA -> VA and skip 3 bytes (jump to fathelper code) */ + push %bx /* push offset */ + retf /* Transfer control to FreeLoader */ + +// Reads the entire FAT into memory at 7000:0000 ReadFatIntoMemory: - mov ax,WORD [BYTE bp+HiddenSectors] - mov dx,WORD [BYTE bp+HiddenSectors+2] - add ax,WORD [BYTE bp+ReservedSectors] - adc dx,byte 0 - mov cx,WORD [BYTE bp+SectorsPerFat] - mov bx,7000h - mov es,bx - xor bx,bx - call [bp-ReadSectorsOffset] - ret - - -; Returns the FAT entry for a given cluster number for 16-bit FAT -; On entry AX has cluster number -; On return AX has FAT entry for that cluster + mov %ax,WORD [%bp+HiddenSectors] + mov %dx,WORD [%bp+HiddenSectors+2] + add %ax,WORD [%bp+ReservedSectors] + adc %dx,0 + mov %cx,WORD [%bp+SectorsPerFat] + mov %bx,0x7000 + mov %es,%bx + xor %bx,%bx + call [%bp-ReadSectorsOffset] + ret + + +// Returns the FAT entry for a given cluster number for 16-bit FAT +// On entry AX has cluster number +// On return AX has FAT entry for that cluster GetFatEntry16: - mov cx,2 ; AX = AX * 2 (since FAT16 entries are 2 bytes) - mul cx - shl dx,12 - - mov bx,7000h - add bx,dx - mov es,bx - mov bx,ax ; Restore FAT entry offset - mov ax,WORD [es:bx] ; Get FAT entry - - ret - - -; Returns the FAT entry for a given cluster number for 12-bit FAT -; On entry AX has cluster number -; On return AX has FAT entry for that cluster + mov %cx,2 /* AX = AX * 2 (since FAT16 entries are 2 bytes) */ + mul %cx + shl %dx,12 + + mov %bx,0x7000 + add %bx,%dx + mov %es,%bx + mov %bx,%ax /* Restore FAT entry offset */ + es mov %ax,WORD [%bx] /* Get FAT entry */ + + ret + + +// Returns the FAT entry for a given cluster number for 12-bit FAT +// On entry AX has cluster number +// On return AX has FAT entry for that cluster GetFatEntry12: - push ax - mov cx,ax - shr ax,1 - add ax,cx ; AX = AX * 1.5 (AX = AX + (AX / 2)) (since FAT12 entries are 12 bits) - - mov bx,7000h - mov es,bx - mov bx,ax ; Put FAT entry offset into BX - mov ax,WORD [es:bx] ; Get FAT entry - pop cx ; Get cluster number from stack - and cx,1 + push %ax + mov %cx,%ax + shr %ax,1 + add %ax,%cx /* AX = AX * 1.5 (AX = AX + (AX / 2)) (since FAT12 entries are 12 bits) */ + + mov %bx,0x7000 + mov %es,%bx + mov %bx,%ax /* Put FAT entry offset into BX */ + es mov %ax,WORD [%bx] /* Get FAT entry */ + pop %cx /* Get cluster number from stack */ + and %cx,1 jz UseLow12Bits - and ax,0fff0h - shr ax,4 + and %ax,0xfff0 + shr %ax,4 jmp GetFatEntry12_Done UseLow12Bits: - and ax,0fffh + and %ax,0x0fff GetFatEntry12_Done: ret -; Returns CF = 1 if this is a FAT12 file system -; Otherwise CF = 0 for FAT16 +// Returns CF = 1 if this is a FAT12 file system +// Otherwise CF = 0 for FAT16 IsFat12: - mov ebx,DWORD [BYTE bp-DataAreaStartLow] - ; EBX now has the number of the starting sector of the data area - ; starting from the beginning of the disk, so subtrace hidden sectors - sub ebx,DWORD [BYTE bp+HiddenSectors] - - - xor eax,eax - mov ax,WORD [BYTE bp+TotalSectors] - cmp ax,byte 0 + mov %ebx,DWORD [%bp-DataAreaStartLow] + // EBX now has the number of the starting sector of the data area + // starting from the beginning of the disk, so subtrace hidden sectors + sub %ebx,DWORD [%bp+HiddenSectors] + + + xor %eax,%eax + mov %ax,WORD [%bp+TotalSectors] + cmp %ax,0 jnz IsFat12_2 - mov eax,DWORD [BYTE bp+TotalSectorsBig] - - ; EAX now contains the number of sectors on the volume + mov %eax,DWORD [%bp+TotalSectorsBig] + + // EAX now contains the number of sectors on the volume IsFat12_2: - sub eax,ebx ; Subtract data area start sector - xor edx,edx ; from total sectors of volume - - ; EDX:EAX now contains the number of data sectors on the volume - movzx ebx,BYTE [BYTE bp+SectsPerCluster] - div ebx - ; EAX now has the number of clusters on the volume + sub %eax,%ebx /* Subtract data area start sector */ + xor %edx,%edx /* from total sectors of volume */ + + // EDX:EAX now contains the number of data sectors on the volume + xor %ebx,%ebx + mov %bl,BYTE [%bp+SectsPerCluster] + div %ebx + // EAX now has the number of clusters on the volume stc - cmp eax,4085 + cmp %eax,4085 jb IsFat12_Done clc @@ -229,7 +225,9 @@ -msgLoading db 'Loading FreeLoader...',0dh,0ah,0 - - times 510-($-$$) db 0 ; Pad to 510 bytes - dw 0aa55h ; BootSector signature +msgLoading: + .asciz "Loading FreeLoader...\r\n" + + .org 0x1fe +blockend: + .word 0x0aa55 /* BootSector signature */ Removed: branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.asm URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free… ============================================================================== --- branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.asm [iso-8859-1] (original) +++ branches/cmake-bringup/boot/freeldr/freeldr/arch/i386/fathelp.asm (removed) @@ -1,235 +1,0 @@ -; FATHELP.ASM -; FAT12/16 Boot Sector Helper Code -; Copyright (c) 1998, 2001, 2002, 2003 Brian Palmer - - - -;org 8000h - -segment .text - -bits 16 - - -BootSectorStackTop equ 0x7bf2 -DataAreaStartHigh equ 0x2 -DataAreaStartLow equ 0x4 -BiosCHSDriveSizeHigh equ 0x6 -BiosCHSDriveSizeLow equ 0x8 -BiosCHSDriveSize equ 0x8 -ReadSectorsOffset equ 0xa -ReadClusterOffset equ 0xc -PutCharsOffset equ 0xe - -OEMName equ 3 -BytesPerSector equ 11 -SectsPerCluster equ 13 -ReservedSectors equ 14 -NumberOfFats equ 16 -MaxRootEntries equ 17 -TotalSectors equ 19 -MediaDescriptor equ 21 -SectorsPerFat equ 22 -SectorsPerTrack equ 24 -NumberOfHeads equ 26 -HiddenSectors equ 28 -TotalSectorsBig equ 32 -BootDrive equ 36 -Reserved equ 37 -ExtendSig equ 38 -SerialNumber equ 39 -VolumeLabel equ 43 -FileSystem equ 54 - -BootPartition equ 0x7dfd - - -; This code will be stored in the first 512 bytes -; of freeldr.sys. The first 3 bytes will be a jmp -; instruction to skip past the FAT helper code -; that is stored in the rest of the 512 bytes. -; -; This code is loaded at 0000:8000 so we have to -; encode a jmp instruction to jump to 0000:8200 - -global _mainCRTStartup ; For Mingw32 builds where the linker looks for this symbol -_mainCRTStartup: -global start -start: - db 0xe9 - db 0xfd - db 0x01 - -; Now starts the extra boot code that we will store -; in the first 512 bytes of freeldr.sys. This code -; allows the FAT12/16 bootsector to navigate the -; FAT table so that we can still load freeldr.sys -; even if it is fragmented. - - -FatHelperEntryPoint: - - push ax ; First save AX - the start cluster of freeldr.sys - - - ; Display "Loading FreeLoader..." message - mov esi,msgLoading ; Loading message - call [bp-PutCharsOffset] ; Display it - - - call ReadFatIntoMemory - - pop ax ; Restore AX (start cluster) - ; AX has start cluster of freeldr.sys - - mov bx,800h - mov es,bx - -LoadFile: - push ax - call IsFat12 - pop ax - jnc LoadFile2 - cmp ax,0ff8h ; Check to see if this is the last cluster in the chain - jmp LoadFile3 -LoadFile2: - cmp ax,0fff8h -LoadFile3: - jae LoadFile_Done ; If so continue, if not then read then next one - push ax - xor bx,bx ; Load ROSLDR starting at 0000:8000h - push es - call [bp-ReadClusterOffset] - pop es - - xor bx,bx - mov bl,BYTE [BYTE bp+SectsPerCluster] - shl bx,5 ; BX = BX * 512 / 16 - mov ax,es ; Increment the load address by - add ax,bx ; The size of a cluster - mov es,ax - - call IsFat12 - pop ax - push es - jnc LoadFile4 - call GetFatEntry12 ; Get the next entry - jmp LoadFile5 -LoadFile4: - call GetFatEntry16 -LoadFile5: - pop es - - jmp LoadFile ; Load the next cluster (if any) - -LoadFile_Done: - mov dl,BYTE [BYTE bp+BootDrive] ; Load the boot drive into DL - mov dh,[BootPartition] ; Load the boot partition into DH - - push 0 ; push segment (0x0000) - mov bx, [0x8000 + 0xA8] ; load the RVA of the EntryPoint into eax - add bx, 0x8000 ; RVA -> VA and skip 3 bytes (jump to fathelper code) - push bx ; push offset - retf ; Transfer control to FreeLoader - -; Reads the entire FAT into memory at 7000:0000 -ReadFatIntoMemory: - mov ax,WORD [BYTE bp+HiddenSectors] - mov dx,WORD [BYTE bp+HiddenSectors+2] - add ax,WORD [BYTE bp+ReservedSectors] - adc dx,byte 0 - mov cx,WORD [BYTE bp+SectorsPerFat] - mov bx,7000h - mov es,bx - xor bx,bx - call [bp-ReadSectorsOffset] - ret - - -; Returns the FAT entry for a given cluster number for 16-bit FAT -; On entry AX has cluster number -; On return AX has FAT entry for that cluster -GetFatEntry16: - - mov cx,2 ; AX = AX * 2 (since FAT16 entries are 2 bytes) - mul cx - shl dx,12 - - mov bx,7000h - add bx,dx - mov es,bx - mov bx,ax ; Restore FAT entry offset - mov ax,WORD [es:bx] ; Get FAT entry - - ret - - -; Returns the FAT entry for a given cluster number for 12-bit FAT -; On entry AX has cluster number -; On return AX has FAT entry for that cluster -GetFatEntry12: - - push ax - mov cx,ax - shr ax,1 - add ax,cx ; AX = AX * 1.5 (AX = AX + (AX / 2)) (since FAT12 entries are 12 bits) - - mov bx,7000h - mov es,bx - mov bx,ax ; Put FAT entry offset into BX - mov ax,WORD [es:bx] ; Get FAT entry - pop cx ; Get cluster number from stack - and cx,1 - jz UseLow12Bits - and ax,0fff0h - shr ax,4 - jmp GetFatEntry12_Done - -UseLow12Bits: - and ax,0fffh - -GetFatEntry12_Done: - - ret - - -; Returns CF = 1 if this is a FAT12 file system -; Otherwise CF = 0 for FAT16 -IsFat12: - - mov ebx,DWORD [BYTE bp-DataAreaStartLow] - ; EBX now has the number of the starting sector of the data area - ; starting from the beginning of the disk, so subtrace hidden sectors - sub ebx,DWORD [BYTE bp+HiddenSectors] - - - xor eax,eax - mov ax,WORD [BYTE bp+TotalSectors] - cmp ax,byte 0 - jnz IsFat12_2 - mov eax,DWORD [BYTE bp+TotalSectorsBig] - - ; EAX now contains the number of sectors on the volume - -IsFat12_2: - sub eax,ebx ; Subtract data area start sector - xor edx,edx ; from total sectors of volume - - ; EDX:EAX now contains the number of data sectors on the volume - movzx ebx,BYTE [BYTE bp+SectsPerCluster] - div ebx - ; EAX now has the number of clusters on the volume - stc - cmp eax,4085 - jb IsFat12_Done - clc - -IsFat12_Done: - ret - - - -msgLoading db 'Loading FreeLoader...',0dh,0ah,0 - - times 510-($-$$) db 0 ; Pad to 510 bytes - dw 0aa55h ; BootSector signature

1 0

[cgutman] 48686: [OSKITTCP] - Check for a shutdown connection that we missed a few times - Remove some junk and stop playing with flags behind oskit's back - Fix an invalid parameter check - Enable...
by cgutman＠svn.reactos.org 02 Sep '10

02 Sep '10

Author: cgutman Date: Thu Sep 2 04:18:17 2010 New Revision: 48686 URL: http://svn.reactos.org/svn/reactos?rev=48686&view=rev Log: [OSKITTCP] - Check for a shutdown connection that we missed a few times - Remove some junk and stop playing with flags behind oskit's back - Fix an invalid parameter check - Enable a check to ensure that accept doesn't get called for a socket that isn't listening - Use the queue manipulation function instead of manually changing the queue - Signal that we accepted/connected a socket [IP] - Set the network mask and destination address in TCPGetInterfaceData Modified: trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Thu Sep 2 04:18:17 2010 @@ -163,7 +163,7 @@ TcpipInitializeSpinLock(&IF->Lock); IF->TCPContext = ExAllocatePoolWithTag - ( NonPagedPool, sizeof(OSK_IFADDR) + 2 * sizeof( struct sockaddr_in ), + ( NonPagedPool, sizeof(OSK_IFADDR) + 3 * sizeof( struct sockaddr_in ), OSKITTCP_CONTEXT_TAG ); if (!IF->TCPContext) { ExFreePoolWithTag(IF, IP_INTERFACE_TAG); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Thu Sep 2 04:18:17 2010 @@ -35,19 +35,16 @@ POSK_IFADDR ifaddr = IF->TCPContext; struct sockaddr_in *addr_in; struct sockaddr_in *dstaddr_in; + struct sockaddr_in *netmask_in; ASSERT(ifaddr); - RtlZeroMemory(ifaddr, sizeof(OSK_IFADDR) + 2 * sizeof( struct sockaddr_in )); + RtlZeroMemory(ifaddr, sizeof(OSK_IFADDR) + 3 * sizeof( struct sockaddr_in )); addr_in = (struct sockaddr_in *)&ifaddr[1]; dstaddr_in = (struct sockaddr_in *)&addr_in[1]; + netmask_in = (struct sockaddr_in *)&dstaddr_in[1]; TI_DbgPrint(DEBUG_TCPIF,("Called\n")); - - ifaddr->ifa_dstaddr = (struct sockaddr *)dstaddr_in; - - /* XXX - Point-to-point interfaces not supported yet */ - memset( &ifaddr->ifa_dstaddr, 0, sizeof( struct sockaddr ) ); ifaddr->ifa_addr = (struct sockaddr *)addr_in; Status = GetInterfaceIPv4Address( IF, @@ -56,10 +53,24 @@ ASSERT(NT_SUCCESS(Status)); + ifaddr->ifa_dstaddr = (struct sockaddr *)dstaddr_in; + Status = GetInterfaceIPv4Address(IF, + ADE_POINTOPOINT, + (PULONG)&dstaddr_in->sin_addr.s_addr ); + + ASSERT(NT_SUCCESS(Status)); + + ifaddr->ifa_netmask = (struct sockaddr *)netmask_in; + Status = GetInterfaceIPv4Address(IF, + ADE_ADDRMASK, + (PULONG)&netmask_in->sin_addr.s_addr ); + + ASSERT(NT_SUCCESS(Status)); + TI_DbgPrint(DEBUG_TCPIF,("interface %x : addr %x\n", IF, addr_in->sin_addr.s_addr)); - ifaddr->ifa_flags = 0; /* XXX what goes here? */ + ifaddr->ifa_flags = 0; ifaddr->ifa_refcnt = 0; /* Anachronistic */ ifaddr->ifa_metric = 1; /* We can get it like in ninfo.c, if we want */ ifaddr->ifa_mtu = IF->MTU; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Thu Sep 2 04:18:17 2010 @@ -151,6 +151,9 @@ struct iovec iov = { 0 }; int error = 0; int tcp_flags = 0; + + if (!connection) + return OSK_ESHUTDOWN; OS_DbgPrint(OSK_MID_TRACE, ("so->so_state %x\n", ((struct socket *)connection)->so_state)); @@ -218,14 +221,12 @@ struct sockaddr addr; OS_DbgPrint(OSK_MID_TRACE,("Called, socket = %08x\n", socket)); - - OSKLock(); - if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) { - error = EALREADY; - goto done; - } + + if (!socket) + return OSK_ESHUTDOWN; OS_DbgPrint(OSK_MIN_TRACE,("Nam: %x\n", nam)); + if( nam ) addr = *((struct sockaddr *)nam); @@ -236,26 +237,12 @@ addr.sa_family = addr.sa_len; addr.sa_len = sizeof(struct sockaddr); + OSKLock(); error = soconnect(so, &sabuf); - - if (error == EINPROGRESS) - goto done; - else if (error) - goto bad; - - if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) { - error = EINPROGRESS; - goto done; - } - -bad: - so->so_state &= ~SS_ISCONNECTING; - - if (error == ERESTART) - error = EINTR; - -done: - OSKUnlock(); + OSKUnlock(); + + if (error == 0) error = OSK_EINPROGRESS; + OS_DbgPrint(OSK_MID_TRACE,("Ending: %08x\n", error)); return (error); } @@ -347,13 +334,11 @@ if (!socket) return OSK_ESHUTDOWN; - if (!new_socket || !AddrOut) + if (!new_socket) return OSK_EINVAL; OS_DbgPrint(OSK_MID_TRACE,("OSKITTCP: Doing accept (Finish %d)\n", FinishAccepting)); - - *OutAddrLen = AddrLen; if (name) /* that's a copyin actually */ @@ -363,19 +348,17 @@ s = splnet(); -#if 0 if ((head->so_options & SO_ACCEPTCONN) == 0) { OS_DbgPrint(OSK_MID_TRACE,("OSKITTCP: head->so_options = %x, wanted bit %x\n", head->so_options, SO_ACCEPTCONN)); error = EINVAL; goto out; } -#endif OS_DbgPrint(OSK_MID_TRACE,("head->so_q = %x, head->so_state = %x\n", head->so_q, head->so_state)); - if ((head->so_state & SS_NBIO) && head->so_q == NULL) { + if (head->so_q == NULL) { error = EWOULDBLOCK; goto out; } @@ -395,8 +378,6 @@ OS_DbgPrint(OSK_MID_TRACE,("error = %d\n", error)); if( FinishAccepting && so ) { - head->so_q = so->so_q; - head->so_qlen--; mnam.m_data = (char *)&sa; mnam.m_len = sizeof(sa); @@ -405,12 +386,9 @@ if (error) goto out; - InitializeSocketFlags(so); - so->so_state |= SS_ISCONNECTED; - so->so_q = so->so_q0 = NULL; - so->so_qlen = so->so_q0len = 0; - so->so_head = 0; + soqremque(so, 1); so->so_connection = context; + soisconnected(so); *newso = so;

1 0

[jgardou] 48685: [WIN32K] - Do not acccess unsafe bits outside of PSEH
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 22:36:00 2010 New Revision: 48685 URL: http://svn.reactos.org/svn/reactos?rev=48685&view=rev Log: [WIN32K] - Do not acccess unsafe bits outside of PSEH Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Sep 1 22:36:00 2010 @@ -1219,11 +1219,27 @@ IN HANDLE hcmXform) { NTSTATUS Status = STATUS_SUCCESS; + PBYTE safeBits = NULL; + HBITMAP hbmResult = NULL; + + if(pjInit && (fInit == CBM_INIT)) + { + safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); + if(!safeBits) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + } _SEH2_TRY { if(pbmi) ProbeForRead(pbmi, cjMaxInitInfo, 1); - if(pjInit && (fInit == CBM_INIT)) ProbeForRead(pjInit, cjMaxBits, 1); + if(pjInit && (fInit == CBM_INIT)) + { + ProbeForRead(pjInit, cjMaxBits, 1); + RtlCopyMemory(safeBits, pjInit, cjMaxBits); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1234,18 +1250,22 @@ if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - return NULL; - } - - return GreCreateDIBitmapInternal(hDc, - cx, - cy, - fInit, - pjInit, - pbmi, - iUsage, - fl, - hcmXform); + goto cleanup; + } + + hbmResult = GreCreateDIBitmapInternal(hDc, + cx, + cy, + fInit, + safeBits, + pbmi, + iUsage, + fl, + hcmXform); + +cleanup: + ExFreePoolWithTag(safeBits, TAG_DIB); + return hbmResult; } HBITMAP

1 0

[jgardou] 48684: [WIN32K] - always make icon mask bitmap a global object
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 20:06:46 2010 New Revision: 48684 URL: http://svn.reactos.org/svn/reactos?rev=48684&view=rev Log: [WIN32K] - always make icon mask bitmap a global object Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Wed Sep 1 20:06:46 2010 @@ -1006,8 +1006,8 @@ CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy / 2; SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); - } + } + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); Ret = TRUE;

1 0

[jgardou] 48683: [WIN32K] - Do not access unsafe buffer out of PSEH.
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 19:54:45 2010 New Revision: 48683 URL: http://svn.reactos.org/svn/reactos?rev=48683&view=rev Log: [WIN32K] - Do not access unsafe buffer out of PSEH. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Sep 1 19:54:45 2010 @@ -1030,13 +1030,24 @@ HBITMAP hBitmap; BOOL fastpath = FALSE; NTSTATUS Status = STATUS_SUCCESS; - + PBYTE safeBits ; if (!Bits || !BitsInfo) return 0; - if (!(pdc = DC_LockDc(hDC))) return 0; - + safeBits = ExAllocatePoolWithTag(PagedPool, cjMaxBits, TAG_DIB); + if(!safeBits) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + + if (!(pdc = DC_LockDc(hDC))) + { + ExFreePoolWithTag(safeBits, TAG_DIB); + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } _SEH2_TRY { @@ -1047,6 +1058,7 @@ DPRINT1("Invalid bitmap\n"); Status = STATUS_INVALID_PARAMETER; } + RtlCopyMemory(safeBits, Bits, cjMaxBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1088,19 +1100,24 @@ { /* fast path */ DPRINT1("using fast path\n"); - ret = IntSetDIBits( pdc, hBitmap, 0, height, Bits, BitsInfo, Usage); + ret = IntSetDIBits( pdc, hBitmap, 0, height, safeBits, BitsInfo, Usage); } else { /* slow path - need to use StretchBlt */ HBITMAP hOldBitmap; - HPALETTE hpal = NULL; HDC hdcMem; PVOID pvBits; hdcMem = NtGdiCreateCompatibleDC( hDC ); hBitmap = DIB_CreateDIBSection(pdc, BitsInfo, Usage, &pvBits, NULL, 0, 0); - RtlCopyMemory(pvBits, Bits, cjMaxBits); + if(!hBitmap) + { + DPRINT1("Error, failed to create a DIB section\n"); + NtGdiDeleteObjectApp(hdcMem); + goto cleanup; + } + RtlCopyMemory(pvBits, safeBits, cjMaxBits); hOldBitmap = NtGdiSelectBitmap( hdcMem, hBitmap ); /* Origin for DIBitmap may be bottom left (positive biHeight) or top @@ -1108,15 +1125,15 @@ ret = NtGdiStretchBlt( hDC, XDest, YDest, DestWidth, DestHeight, hdcMem, XSrc, abs(height) - SrcHeight - YSrc, SrcWidth, SrcHeight, ROP, 0 ); - if(hpal) - GdiSelectPalette(hdcMem, hpal, FALSE); - if(ret) + + if(ret) ret = SrcHeight; NtGdiSelectBitmap( hdcMem, hOldBitmap ); NtGdiDeleteObjectApp( hdcMem ); GreDeleteObject( hBitmap ); } cleanup: + ExFreePoolWithTag(safeBits, TAG_DIB); DC_UnlockDc(pdc); return ret; }

1 0

[jgardou] 48682: [WIN32K] - same as 48681 for win32k
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 18:39:37 2010 New Revision: 48682 URL: http://svn.reactos.org/svn/reactos?rev=48682&view=rev Log: [WIN32K] - same as 48681 for win32k Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Wed Sep 1 18:39:37 2010 @@ -158,7 +158,7 @@ // These functions are assigned if we're working with a DIB // The assigned functions depend on the bitsPerPixel of the DIB - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, pbo ? (pbo->iSolidColor &0x00ffffff): 0); + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, pbo ? pbo->iSolidColor : 0); return TRUE; }

1 0

[jgardou] 48681: [GENDIB] - Revert the "ignore alpha channel value of pattern" changes
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 18:37:48 2010 New Revision: 48681 URL: http://svn.reactos.org/svn/reactos?rev=48681&view=rev Log: [GENDIB] - Revert the "ignore alpha channel value of pattern" changes Modified: branches/reactos-yarotows/tools/gendib/gendib.c Modified: branches/reactos-yarotows/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/tools/gendib/g… ============================================================================== --- branches/reactos-yarotows/tools/gendib/gendib.c [iso-8859-1] (original) +++ branches/reactos-yarotows/tools/gendib/gendib.c [iso-8859-1] Wed Sep 1 18:37:48 2010 @@ -143,16 +143,16 @@ { ROPCODE_NOTSRCCOPY, "NOTSRCCOPY", "~S", 0, 1, 0 }, { ROPCODE_SRCERASE, "SRCERASE", "(~D) & S", 1, 1, 0 }, { ROPCODE_DSTINVERT, "DSTINVERT", "~D", 1, 0, 0 }, - { ROPCODE_PATINVERT, "PATINVERT", "D ^ (P & 0x00ffffff)", 1, 0, 1 }, + { ROPCODE_PATINVERT, "PATINVERT", "D ^ P", 1, 0, 1 }, { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, { ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 }, - { ROPCODE_MERGECOPY, "MERGECOPY", "S & P & 0x00ffffff", 0, 1, 1 }, + { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 }, - { ROPCODE_PATCOPY, "PATCOPY", "P & 0x00ffffff", 0, 0, 1 }, - { ROPCODE_PATPAINT, "PATPAINT", "D | (~S) | (P & 0x00ffffff)", 1, 1, 1 }, + { ROPCODE_PATCOPY, "PATCOPY", "P", 0, 0, 1 }, + { ROPCODE_PATPAINT, "PATPAINT", "D | (~S) | P", 1, 1, 1 }, { ROPCODE_WHITENESS, "WHITENESS", "0xffffffff", 0, 0, 0 }, { ROPCODE_GENERIC, NULL, NULL, 1, 1, 1 } };

1 0

[jgardou] 48680: [WIN32K] - Use newly introduced macros and get rid of related functions - Ignore alpha channels of solid brush color
by jgardou＠svn.reactos.org 01 Sep '10

01 Sep '10

Author: jgardou Date: Wed Sep 1 16:52:23 2010 New Revision: 48680 URL: http://svn.reactos.org/svn/reactos?rev=48680&view=rev Log: [WIN32K] - Use newly introduced macros and get rid of related functions - Ignore alpha channels of solid brush color Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -158,7 +158,7 @@ // These functions are assigned if we're working with a DIB // The assigned functions depend on the bitsPerPixel of the DIB - DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, pbo ? pbo->iSolidColor : 0); + DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_ColorFill(Dest, DestRect, pbo ? (pbo->iSolidColor &0x00ffffff): 0); return TRUE; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -144,7 +144,7 @@ ULONG lWidth; /* Calculate width in bytes of the realized brush */ - lWidth = DIB_GetDIBWidthBytes(psoPattern->sizlBitmap.cx, + lWidth = WIDTH_BYTES_ALIGN32(psoPattern->sizlBitmap.cx, BitsPerFormat(psoDst->iBitmapFormat)); /* Allocate a bitmap */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -64,7 +64,7 @@ /* Allocate a temporary bitmap */ BitmapSize.cx = DestRect->right - DestRect->left; BitmapSize.cy = DestRect->bottom - DestRect->top; - Width = DIB_GetDIBWidthBytes(BitmapSize.cx, BitsPerFormat(psoDest->iBitmapFormat)); + Width = WIDTH_BYTES_ALIGN32(BitmapSize.cx, BitsPerFormat(psoDest->iBitmapFormat)); EnterLeave->OutputBitmap = EngCreateBitmap(BitmapSize, Width, psoDest->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -334,7 +334,7 @@ rectl.bottom = sizel.cy; /* Calculate lDelta for our surfaces. */ - lDelta = DIB_GetDIBWidthBytes(sizel.cx, + lDelta = WIDTH_BYTES_ALIGN32(sizel.cx, BitsPerFormat(pso->iBitmapFormat)); /* Create a bitmap for saving the pixels under the cursor. */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -12,7 +12,6 @@ HBITMAP FASTCALL IntCreateBitmap(IN SIZEL Size, IN LONG Width, IN ULONG Format, IN ULONG Flags, IN PVOID Bits); HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); -INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); HBITMAP APIENTRY Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -11,8 +11,6 @@ LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ); INT APIENTRY DIB_GetDIBImageBytes (INT width, INT height, INT depth); -INT FASTCALL -DIB_GetDIBWidthBytes (INT width, INT depth); HPALETTE FASTCALL DIB_MapPaletteColors(PPALETTE ppal, CONST BITMAPINFO* lpbmi); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -55,7 +55,7 @@ pjDst = psurf->SurfObj.pvScan0; pjSrc = pvBits; lDeltaDst = psurf->SurfObj.lDelta; - lDeltaSrc = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); while (nHeight--) { @@ -186,7 +186,7 @@ } /* Make sure that cjBits will not overflow */ - cjWidthBytes = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + cjWidthBytes = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); if ((ULONGLONG)cjWidthBytes * nHeight >= 0x100000000ULL) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", @@ -581,7 +581,7 @@ pjSrc = psurf->SurfObj.pvScan0; pjDst = pvBits; lDeltaSrc = psurf->SurfObj.lDelta; - lDeltaDst = BITMAP_GetWidthBytes(nWidth, cBitsPixel); + lDeltaDst = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); while (nHeight--) { @@ -613,7 +613,7 @@ return 0; } - bmSize = BITMAP_GetWidthBytes(psurf->SurfObj.sizlBitmap.cx, + bmSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx, BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * abs(psurf->SurfObj.sizlBitmap.cy); @@ -858,40 +858,6 @@ return 0; } -INT FASTCALL -BITMAP_GetWidthBytes(INT bmWidth, INT bpp) -{ -#if 0 - switch (bpp) - { - case 1: - return 2 * ((bmWidth+15) >> 4); - - case 24: - bmWidth *= 3; /* fall through */ - case 8: - return bmWidth + (bmWidth & 1); - - case 32: - return bmWidth * 4; - - case 16: - case 15: - return bmWidth * 2; - - case 4: - return 2 * ((bmWidth+3) >> 2); - - default: - DPRINT ("stub"); - } - - return -1; -#endif - - return ((bmWidth * bpp + 15) & ~15) >> 3; -} - HBITMAP FASTCALL BITMAP_CopyBitmap(HBITMAP hBitmap) { @@ -963,7 +929,7 @@ pBitmap->bmHeight = psurf->SurfObj.sizlBitmap.cy; pBitmap->bmPlanes = 1; pBitmap->bmBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - pBitmap->bmWidthBytes = BITMAP_GetWidthBytes(pBitmap->bmWidth, pBitmap->bmBitsPixel); + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN16(pBitmap->bmWidth, pBitmap->bmBitsPixel); /* Check for DIB section */ if (psurf->hSecure) @@ -971,7 +937,7 @@ /* Set bmBits in this case */ pBitmap->bmBits = psurf->SurfObj.pvBits; /* DIBs data are 32 bits aligned */ - pBitmap->bmWidthBytes = DIB_GetDIBWidthBytes(pBitmap->bmWidth, pBitmap->bmBitsPixel); + pBitmap->bmWidthBytes = WIDTH_BYTES_ALIGN32(pBitmap->bmWidth, pBitmap->bmBitsPixel); if (Count >= sizeof(DIBSECTION)) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Sep 1 16:52:23 2010 @@ -480,7 +480,7 @@ SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; - DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); + DIBWidth = WIDTH_BYTES_ALIGN32(SourceSize.cx, bmi->bmiHeader.biBitCount); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, @@ -1390,7 +1390,7 @@ bm.bmType = 0; bm.bmWidth = bi->biWidth; bm.bmHeight = effHeight; - bm.bmWidthBytes = ovr_pitch ? ovr_pitch : (ULONG) DIB_GetDIBWidthBytes(bm.bmWidth, bi->biBitCount); + bm.bmWidthBytes = ovr_pitch ? ovr_pitch : WIDTH_BYTES_ALIGN32(bm.bmWidth, bi->biBitCount); bm.bmPlanes = bi->biPlanes; bm.bmBitsPixel = bi->biBitCount; @@ -1603,18 +1603,6 @@ } /*********************************************************************** - * DIB_GetDIBWidthBytes - * - * Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. - * http://www.microsoft.com/msdn/sdk/platforms/doc/sdk/win32/struc/src/str01.h… - * 11/16/1999 (RJJ) lifted from wine - */ -INT FASTCALL DIB_GetDIBWidthBytes(INT width, INT depth) -{ - return ((width * depth + 31) & ~31) >> 3; -} - -/*********************************************************************** * DIB_GetDIBImageBytes * * Return the number of bytes used to hold the image in a DIB bitmap. @@ -1623,7 +1611,7 @@ INT APIENTRY DIB_GetDIBImageBytes(INT width, INT height, INT depth) { - return DIB_GetDIBWidthBytes(width, depth) * (height < 0 ? -height : height); + return WIDTH_BYTES_ALIGN32(width, depth) * (height < 0 ? -height : height); } /***********************************************************************

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