Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 52185: [win32k] - Arch, stop breaking msvc build already
by gadamopoulos＠svn.reactos.org 11 Jun '11

11 Jun '11

Author: gadamopoulos Date: Sat Jun 11 12:03:38 2011 New Revision: 52185 URL: http://svn.reactos.org/svn/reactos?rev=52185&view=rev Log: [win32k] - Arch, stop breaking msvc build already Modified: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] Sat Jun 11 12:03:38 2011 @@ -43,10 +43,10 @@ LONG PatternX = 0, PatternY = 0; - ASSERT(IS_VALID_ROP4(ROP)); - BOOL UsesSource = ROP4_USES_SOURCE(ROP); BOOL UsesPattern = ROP4_USES_PATTERN(ROP); + + ASSERT(IS_VALID_ROP4(ROP)); fnDest_GetPixel = DibFunctionsForBitmapFormat[DestSurf->iBitmapFormat].DIB_GetPixel; fnDest_PutPixel = DibFunctionsForBitmapFormat[DestSurf->iBitmapFormat].DIB_PutPixel;

1 0

[ekohl] 52184: [NTOSKRNL] - Do not create/open the CurrentVersion key in a single call to NtCreateKey because its parent key might not exist yet. See issue #6302 for more details.
by ekohl＠svn.reactos.org 11 Jun '11

11 Jun '11

Author: ekohl Date: Sat Jun 11 11:58:46 2011 New Revision: 52184 URL: http://svn.reactos.org/svn/reactos?rev=52184&view=rev Log: [NTOSKRNL] - Do not create/open the CurrentVersion key in a single call to NtCreateKey because its parent key might not exist yet. See issue #6302 for more details. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Jun 11 11:58:46 2011 @@ -1946,13 +1946,16 @@ UNICODE_STRING KeyName; UNICODE_STRING ValueName; UNICODE_STRING ValueData; - HANDLE KeyHandle; + HANDLE SoftwareKeyHandle = NULL; + HANDLE MicrosoftKeyHandle = NULL; + HANDLE WindowsNtKeyHandle = NULL; + HANDLE CurrentVersionKeyHandle = NULL; WCHAR Buffer[128]; NTSTATUS Status; /* Open the 'CurrentVersion' key */ RtlInitUnicodeString(&KeyName, - L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"); + L"\\REGISTRY\\MACHINE\\SOFTWARE"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, @@ -1960,7 +1963,7 @@ NULL, NULL); - Status = NtCreateKey(&KeyHandle, + Status = NtCreateKey(&SoftwareKeyHandle, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, @@ -1973,6 +1976,75 @@ return; } + /* Open the 'CurrentVersion' key */ + RtlInitUnicodeString(&KeyName, + L"Microsoft"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + SoftwareKeyHandle, + NULL); + + Status = NtCreateKey(&MicrosoftKeyHandle, + KEY_CREATE_SUB_KEY, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); + goto done; + } + + /* Open the 'CurrentVersion' key */ + RtlInitUnicodeString(&KeyName, + L"Windows NT"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + MicrosoftKeyHandle, + NULL); + + Status = NtCreateKey(&WindowsNtKeyHandle, + KEY_CREATE_SUB_KEY, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); + goto done; + } + + /* Open the 'CurrentVersion' key */ + RtlInitUnicodeString(&KeyName, + L"CurrentVersion"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + WindowsNtKeyHandle, + NULL); + + Status = NtCreateKey(&CurrentVersionKeyHandle, + KEY_CREATE_SUB_KEY | KEY_SET_VALUE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create key %wZ (Status: %08lx)\n", &KeyName, Status); + goto done; + } + /* Set the 'CurrentType' value */ RtlInitUnicodeString(&ValueName, L"CurrentType"); @@ -1994,15 +2066,26 @@ RtlInitUnicodeString(&ValueData, Buffer); - NtSetValueKey(KeyHandle, + NtSetValueKey(CurrentVersionKeyHandle, &ValueName, 0, REG_SZ, ValueData.Buffer, ValueData.Length + sizeof(WCHAR)); - /* Close the key */ - NtClose(KeyHandle); +done:; + /* Close the keys */ + if (CurrentVersionKeyHandle != NULL) + NtClose(CurrentVersionKeyHandle); + + if (WindowsNtKeyHandle != NULL) + NtClose(WindowsNtKeyHandle); + + if (MicrosoftKeyHandle != NULL) + NtClose(MicrosoftKeyHandle); + + if (SoftwareKeyHandle != NULL) + NtClose(SoftwareKeyHandle); } /* EOF */

1 0

[tkreuzer] 52183: [BOOTSECTOR] Convert dosmbr to new syntax
by tkreuzer＠svn.reactos.org 11 Jun '11

11 Jun '11

Author: tkreuzer Date: Sat Jun 11 10:58:34 2011 New Revision: 52183 URL: http://svn.reactos.org/svn/reactos?rev=52183&view=rev Log: [BOOTSECTOR] Convert dosmbr to new syntax Added: trunk/reactos/boot/freeldr/bootsect/dosmbr.S (with props) Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Sat Jun 11 10:58:34 2011 @@ -1,7 +1,7 @@ if(ARCH MATCHES i386 OR ARCH MATCHES amd64) -#CreateBootSectorTarget2(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 0) +CreateBootSectorTarget2(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) #CreateBootSectorTarget2(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) CreateBootSectorTarget2(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) #CreateBootSectorTarget2(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) @@ -9,7 +9,6 @@ CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) if(NOT MSVC) -CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 0) CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.asm ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.asm ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) endif() Added: trunk/reactos/boot/freeldr/bootsect/dosmbr.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/dosm… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/dosmbr.S (added) +++ trunk/reactos/boot/freeldr/bootsect/dosmbr.S [iso-8859-1] Sat Jun 11 10:58:34 2011 @@ -1,0 +1,187 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Bootsector for ISO file system + * PURPOSE: Normal DOS boot sector + * Ported to nasm from FreeDOS fdisk 1.2.0 by: + * PROGRAMMERS: Casper Hornstrup (chorns(a)users.sourceforge.net) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +//----------------------------------------------------------------------- +// ENTRY (copied from freedos bootsector) +// +// IN: DL = boot drive +// OUT: DL = boot drive +// +//----------------------------------------------------------------------- + +.code16 +real_start: + cli + cld + xor ax, ax + mov ss, ax // initialize stack + mov ds, ax + mov bp, HEX(7c00) + lea sp, [bp-32] + sti + + /* Copy 512 bytes of MBR to 1fe0:7c00 */ + mov ax, HEX(1FE0) + mov es, ax + mov si, bp + mov di, bp + mov cx, 256 + rep movsw + + /* Jump into relocated code */ + ljmp16 HEX(1FE0), cont +cont: + + /* Setup segment registers */ + mov ds, ax + mov ss, ax + xor ax, ax + mov es, ax + + /* Search for active partition */ + lea di, [bp + HEX(1be)] // start of partition table +test_next_for_active: + test byte ptr ds:[di], HEX(80) + jne active_partition_found + add di, 16 // next table + cmp di, HEX(07c00) + HEX(1fe) // scanned beyond end of table ?? + jb test_next_for_active + +/*****************************************************************/ + call print + .asciz "no active partition found" + +WAIT_FOR_REBOOT: + jmp WAIT_FOR_REBOOT + + +/*****************************************************************/ +trouble_reading_drive: + call print + .asciz "read error while reading drive" + jmp WAIT_FOR_REBOOT + +/*****************************************************************/ + +invalid_partition_code: + call print + .asciz "partition signature != 55AA" + + jmp WAIT_FOR_REBOOT + +/*****************************************************************/ + +active_partition_found: +// call print +// .asciz "loading active partition" + + call read_boot_sector + + jc trouble_reading_drive + + cmp word ptr es:[HEX(7c00)+HEX(1fe)], HEX(0aa55) + jne invalid_partition_code + + ljmp16 0, HEX(7c00) // and jump to boot sector code + +/***************************** + * read_boot_sector + * + * IN: DI--> partition info + * OUT:CARRY + *****************************/ +read_boot_sector: + /* check for LBA support */ + mov bx, HEX(55aa) + mov ah, HEX(41) + int HEX(13) + + jc StandardBios // if (regs.b.x != 0xaa55 || (regs.flags & 0x01)) + cmp bx, HEX(0aa55) // goto StandardBios; + jne StandardBios + + /* if DAP cannot be used, don't use LBA + if ((regs.c.x & 1) == 0) + goto StandardBios; */ + test cl, 1 + jz StandardBios + + jmp short LBABios + + +_bios_LBA_address_packet: + .byte 16 + .byte 0 + .byte 4 // read four sectors - why not + .byte 0 + .word HEX(7c00) // fixed boot address for DOS sector + .word HEX(0000) + +_bios_LBA_low: + .word 0 +_bios_LBA_high: + .word 0 + .word 0,0 + + +LBABios: + // copy start address of partition to DAP + mov ax, [di + 8] + mov word ptr ds:[_bios_LBA_low], ax + mov ax,[di + 8 + 2] + mov word ptr ds:[_bios_LBA_high], ax + + mov ax, HEX(4200) // regs.a.x = LBA_READ; + mov si, offset _bios_LBA_address_packet // regs.si = FP_OFF(&dap); + + int HEX(13) + ret + +/***************************************************************** + * read disk, using standard BIOS + */ +StandardBios: + mov ax, HEX(0204) // regs.a.x = 0x0201; + mov bx, HEX(7c00) // regs.b.x = FP_OFF(buffer); + + /* regs.c.x = + ((chs.Cylinder & 0xff) << 8) + ((chs.Cylinder & 0x300) >> 2) + + ; chs.Sector; + that was easy ;-) */ + mov cx, word ptr ds:[di + 2] + mov dh, byte ptr ds:[di + 1] // regs.d.b.h = chs.Head; + // regs.es = FP_SEG(buffer); + int HEX(13) + ret + +/****** PRINT + * prints text after call to this function. + */ +print_1char: + xor bx, bx // video page 0 + mov ah, HEX(0E) // else print it + int HEX(10) // via TTY mode +print: + pop si // this is the first character +print1: + lodsb // get token + push si // stack up potential return address + cmp al, 0 // end of string? + jne print_1char // until done + ret // and jump to it + +.org 510 + .byte HEX(55), HEX(0aa) + +.endcode16 + +END Propchange: trunk/reactos/boot/freeldr/bootsect/dosmbr.S ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 52182: [CMAKE] Fix concatenate_files macro
by tkreuzer＠svn.reactos.org 11 Jun '11

11 Jun '11

Author: tkreuzer Date: Sat Jun 11 08:36:18 2011 New Revision: 52182 URL: http://svn.reactos.org/svn/reactos?rev=52182&view=rev Log: [CMAKE] Fix concatenate_files macro Modified: trunk/reactos/CMakeMacros.cmake Modified: trunk/reactos/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=5218… ============================================================================== --- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Sat Jun 11 08:36:18 2011 @@ -211,7 +211,7 @@ to_win_path("${_output}" _real_output) add_custom_command( OUTPUT ${_output} - COMMAND cmd.exe /C "copy /Y ${_real_file1} + ${_real_file2} ${_real_output}" + COMMAND cmd.exe /C "copy /Y /B ${_real_file1} + ${_real_file2} ${_real_output} > nul" DEPENDS ${_file1} DEPENDS ${_file2}) endmacro()

1 0

[tkreuzer] 52181: [BOOTSECTOR] Try to fix regtest cd
by tkreuzer＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tkreuzer Date: Fri Jun 10 21:38:42 2011 New Revision: 52181 URL: http://svn.reactos.org/svn/reactos?rev=52181&view=rev Log: [BOOTSECTOR] Try to fix regtest cd Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Fri Jun 10 21:38:42 2011 @@ -6,7 +6,7 @@ CreateBootSectorTarget2(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00) #CreateBootSectorTarget2(fat ${CMAKE_CURRENT_SOURCE_DIR}/fat.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 0) CreateBootSectorTarget2(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000) -CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 0) +CreateBootSectorTarget2(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000) if(NOT MSVC) CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.asm ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 0)

1 0

[akhaldi] 52180: [CMAKE] * Add inetcpl to build.
by akhaldi＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: akhaldi Date: Fri Jun 10 20:46:56 2011 New Revision: 52180 URL: http://svn.reactos.org/svn/reactos?rev=52180&view=rev Log: [CMAKE] * Add inetcpl to build. Added: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt (with props) Modified: trunk/reactos/dll/cpl/CMakeLists.txt Modified: trunk/reactos/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] Fri Jun 10 20:46:56 2011 @@ -4,6 +4,7 @@ add_subdirectory(console)#Warning: console\\/lang/cs-CZ.rc:143: unrecognized escape sequence add_subdirectory(desk) add_subdirectory(hdwwiz) +add_subdirectory(inetcpl) add_subdirectory(input) add_subdirectory(intl) add_subdirectory(joy) Added: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt (added) +++ trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt [iso-8859-1] Fri Jun 10 20:46:56 2011 @@ -1,0 +1,41 @@ + +set_unicode() +set_rc_compiler() + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(inetcpl.cpl inetcpl.spec) + +list(APPEND SOURCE + inetcpl.c + content.c + general.c + security.c + inetcpl.rc + ${CMAKE_CURRENT_BINARY_DIR}/inetcpl_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/inetcpl.def) + +add_library(inetcpl SHARED ${SOURCE}) + +set_module_type(inetcpl cpl) + +target_link_libraries(inetcpl wine) + +add_importlibs(inetcpl + advapi32 + comctl32 + user32 + gdi32 + shlwapi + msvcrt + kernel32 + ntdll) + +add_delay_importlibs(inetcpl + cryptui + wininet + ole32 + urlmon) + +add_cd_file(TARGET inetcpl DESTINATION reactos/system32 FOR all) + Propchange: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 52179: [CMAKE] add macro to concatenate 2 files. So far only for windows.
by tkreuzer＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tkreuzer Date: Fri Jun 10 20:45:44 2011 New Revision: 52179 URL: http://svn.reactos.org/svn/reactos?rev=52179&view=rev Log: [CMAKE] add macro to concatenate 2 files. So far only for windows. Modified: trunk/reactos/CMakeMacros.cmake Modified: trunk/reactos/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeMacros.cmake?rev=5217… ============================================================================== --- trunk/reactos/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/CMakeMacros.cmake [iso-8859-1] Fri Jun 10 20:45:44 2011 @@ -199,3 +199,22 @@ _add_executable(${name} ${ARGN}) add_clean_target(${name}) endfunction() + +if(WIN32) + macro(to_win_path _cmake_path _native_path) + string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}") + endmacro() + + macro(concatenate_files _file1 _file2 _output) + to_win_path("${_file1}" _real_file1) + to_win_path("${_file2}" _real_file2) + to_win_path("${_output}" _real_output) + add_custom_command( + OUTPUT ${_output} + COMMAND cmd.exe /C "copy /Y ${_real_file1} + ${_real_file2} ${_real_output}" + DEPENDS ${_file1} + DEPENDS ${_file2}) + endmacro() +else() + +endif()

1 0

[akhaldi] 52178: [CMAKE] * Add delay importlib creation support.
by akhaldi＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: akhaldi Date: Fri Jun 10 20:44:47 2011 New Revision: 52178 URL: http://svn.reactos.org/svn/reactos?rev=52178&view=rev Log: [CMAKE] * Add delay importlib creation support. Modified: trunk/reactos/gcc.cmake trunk/reactos/msc.cmake Modified: trunk/reactos/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/gcc.cmake?rev=52178&r1=521… ============================================================================== --- trunk/reactos/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/gcc.cmake [iso-8859-1] Fri Jun 10 20:44:47 2011 @@ -230,6 +230,14 @@ endforeach() endmacro() +macro(add_delay_importlibs MODULE) + foreach(LIB ${ARGN}) + target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a) + add_dependencies(${MODULE} lib${LIB}_delayed) + endforeach() + target_link_libraries(${MODULE} delayimp) +endmacro() + if(NOT ARCH MATCHES i386) set(DECO_OPTION "-@") endif() @@ -250,10 +258,18 @@ if (${_extension} STREQUAL ".spec") + # Normal importlib creation add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) + + # Delayed importlib creation + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a + COMMAND native-spec2def -n=${_name}${_suffix} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) elseif(${_extension} STREQUAL ".def") @@ -262,13 +278,22 @@ OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) else() message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") endif() + # Normal importlib target add_custom_target( lib${_name} DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a) + # Delayed importlib target + add_custom_target( + lib${_name}_delayed + DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a) endmacro() Modified: trunk/reactos/msc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/msc.cmake?rev=52178&r1=521… ============================================================================== --- trunk/reactos/msc.cmake [iso-8859-1] (original) +++ trunk/reactos/msc.cmake [iso-8859-1] Fri Jun 10 20:44:47 2011 @@ -173,6 +173,10 @@ endforeach() endmacro() +macro(add_delay_importlibs MODULE) +# TODO +endmacro() + macro(spec2def _dllname _spec_file) get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command(

1 0

[tkreuzer] 52177: fix build?
by tkreuzer＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tkreuzer Date: Fri Jun 10 17:44:13 2011 New Revision: 52177 URL: http://svn.reactos.org/svn/reactos?rev=52177&view=rev Log: fix build? Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pxe.S [iso-8859-1] Fri Jun 10 17:44:13 2011 @@ -20,9 +20,8 @@ .text .code16 -#define ASM +#include <arch/pc/x86common.h> -#include <arch.h> /* * U16 PxeCallApi(U16 Segment, U16 Offset, U16 Service, VOID *Parameter);

1 0

[tkreuzer] 52176: fix build
by tkreuzer＠svn.reactos.org 10 Jun '11

10 Jun '11

Author: tkreuzer Date: Fri Jun 10 17:41:02 2011 New Revision: 52176 URL: http://svn.reactos.org/svn/reactos?rev=52176&view=rev Log: fix build Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386cpu.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -2,8 +2,6 @@ #define ASM #include <asm.inc> - -#include <arch.h> .text .code16 Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -22,9 +22,6 @@ .text .code16 - -#define ASM -#include <arch.h> PUBLIC ChainLoadBiosBootSectorCode ChainLoadBiosBootSectorCode: Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/drvmap.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,9 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> - +#include <arch/pc/x86common.h> EXTERN(DriveMapInt13HandlerStart) Int13Handler: Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386cpu.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,9 +20,7 @@ .text .code16 -#define ASM - -#include <arch.h> +#include <arch/pc/x86common.h> /* * U32 CpuidSupported(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386idt.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,10 +20,6 @@ .text .code16 -#define ASM -#include <arch.h> - - .p2align 2 /* force 4-byte alignment */ EXTERN(i386idt) /* Exception 0 - Divide By Zero */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -23,9 +23,7 @@ .text .code16 -#define ASM - -#include <arch.h> +#include <arch/pc/x86common.h> /* @@ -199,7 +197,7 @@ mov al, [rsi] mov _pnp_node_number, al - /* convert pointer to node buffer to segment/offset */ + /* convert pointer to node buffer to segment/offset */ mov eax, [rbp + 0x0C] shr eax, 4 and eax, 0xf000 @@ -215,7 +213,7 @@ mov ax, _pnp_bios_data_segment push ax - /* push control flag */ + /* push control flag */ push 0x0001 /* push pointer to node buffer (segment/offset) */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386trap.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,8 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> #include <ver.h> #define SCREEN_ATTR 0x1f /* Bright white on blue background */ @@ -517,7 +516,7 @@ jmp i386PrintTextLoop i386PrintTextDone: - + ret /************************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -24,8 +24,7 @@ .text .code16 -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> Int386_REGS: Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -23,8 +23,7 @@ .text .code16 -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> #include <multiboot.h> /* @@ -33,7 +32,7 @@ */ .code64 .globl PageDirectoryStart - + .globl pml4_startup .globl pdp_startup .globl pd_startup Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,9 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> - +#include <arch/pc/x86common.h> EXTERN(_ChainLoadBiosBootSectorCode) .code32 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,9 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> - +#include <arch/pc/x86common.h> EXTERN(_DriveMapInt13HandlerStart) Int13Handler: Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386cpu.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386cpu.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386cpu.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,9 +20,7 @@ .text .code16 -#define ASM - -#include <arch.h> +#include <arch/pc/x86common.h> /* * U32 CpuidSupported(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386idt.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,8 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> .p2align 2 /* force 4-byte alignment */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386pnp.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,9 +20,8 @@ .text .code16 -#define ASM - -#include <arch.h> +#include <arch/pc/x86common.h> + /* @@ -144,7 +143,7 @@ movzwl %ax,%ecx movl %ecx,_pnp_result - + call switch_to_prot .code32 @@ -196,14 +195,14 @@ movb (%esi),%al movb %al,_pnp_node_number - /* convert pointer to node buffer to segment/offset */ + /* convert pointer to node buffer to segment/offset */ movl 0x0C(%ebp),%eax shrl $4,%eax andl $0xf000,%eax - movw %ax,_pnp_buffer_segment + movw %ax,_pnp_buffer_segment movl 0x0C(%ebp),%eax andl $0xffff,%eax - movw %ax,_pnp_buffer_offset + movw %ax,_pnp_buffer_offset call switch_to_real .code16 @@ -212,7 +211,7 @@ movw _pnp_bios_data_segment,%ax pushw %ax - /* push control flag */ + /* push control flag */ pushw $0x0001 /* push pointer to node buffer (segment/offset) */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -21,8 +21,7 @@ .text .code16 -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> #include <ver.h> #define SCREEN_ATTR 0x1f /* Bright white on blue background */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,9 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> - +#include <arch/pc/x86common.h> .code32 EXTERN(_BootNewLinuxKernel) Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S [iso-8859-1] Fri Jun 10 17:41:02 2011 @@ -20,8 +20,7 @@ .text .code16 -#define ASM -#include <arch.h> +#include <arch/pc/x86common.h> #include <multiboot.h> /* @@ -30,7 +29,7 @@ */ .code32 .globl _PageDirectoryStart - + .globl _startup_pagedirectory .globl _lowmem_pagetable .globl _kernel_pagetable

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