Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 52348: [FREELDR] More syntax fixes for ML
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 19:51:26 2011 New Revision: 52348 URL: http://svn.reactos.org/svn/reactos?rev=52348&view=rev Log: [FREELDR] More syntax fixes for ML Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S [iso-8859-1] Sat Jun 18 19:51:26 2011 @@ -39,17 +39,17 @@ mov ss, ax /* Setup protected mode stack */ - mov esp, dword ptr [stack32] + mov esp, dword ptr ds:[stack32] /* Load the IDT */ #ifdef _USE_ML - lidt fword ptr [i386idtptr] + lidt fword ptr ds:[i386idtptr] #else lidt i386idtptr #endif /* Continue execution */ - jmp dword ptr [ContinueAddress] + jmp dword ptr ds:[ContinueAddress] ContinueAddress: .long _FrldrStartup @@ -60,9 +60,9 @@ /* Store BootDrive and BootPartition */ xor eax, eax mov al, dl - mov dword ptr [_FrldrBootDrive], eax + mov dword ptr ds:[_FrldrBootDrive], eax mov al, dh - mov dword ptr [_FrldrBootPartition], eax + mov dword ptr ds:[_FrldrBootPartition], eax /* Patch long jump with real mode entry point */ mov eax, dword ptr ds:[BSS_RealModeEntry]

1 0

[tkreuzer] 52347: [FREELDR] Fix syntax for ML
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 19:41:01 2011 New Revision: 52347 URL: http://svn.reactos.org/svn/reactos?rev=52347&view=rev Log: [FREELDR] Fix syntax for ML Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] Sat Jun 18 19:41:01 2011 @@ -49,8 +49,8 @@ PUBLIC start start: - // This code is loaded at 0000:8000 so we have to - // encode a jmp instruction to jump to 0000:8200 + // This code is loaded at 0000:F800 so we have to + // encode a jmp instruction to jump to 0000:FA00 .byte HEX(e9), HEX(fd), HEX(01) // Now starts the extra boot code that we will store @@ -217,7 +217,8 @@ ret -msgLoading: .asciz "Loading FreeLoader...", CR, LF +msgLoading: + .ascii "Loading FreeLoader...", CR, LF, NUL .org 510 // Pad to 510 bytes .word HEX(0aa55) // BootSector signature Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc [iso-8859-1] Sat Jun 18 19:41:01 2011 @@ -2,7 +2,7 @@ PnpBiosGetDeviceNodeCount: - mov ax, word ptr [BSS_PnpBiosDataSegment] + mov ax, word ptr ds:[BSS_PnpBiosDataSegment] push ax push cs @@ -27,16 +27,16 @@ PnpBiosGetDeviceNode: /* push bios segment */ - mov ax, word ptr [BSS_PnpBiosDataSegment] + mov ax, word ptr ds:[BSS_PnpBiosDataSegment] push ax /* push control flag */ push 1 /* push pointer to node buffer (segment/offset) */ - mov ax, word ptr [BSS_PnpBiosBufferSegment] + mov ax, word ptr ds:[BSS_PnpBiosBufferSegment] push ax - mov ax, word ptr [BSS_PnpBiosBufferOffset] + mov ax, word ptr ds:[BSS_PnpBiosBufferOffset] push ax /* push pointer to node number (segment/offset) */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc [iso-8859-1] Sat Jun 18 19:41:01 2011 @@ -20,11 +20,11 @@ PxeCallApi: - mov ax, [BSS_PxeBufferSegment] + mov ax, word ptr ds:[BSS_PxeBufferSegment] push ax - mov ax, [BSS_PxeBufferOffset] + mov ax, word ptr ds:[BSS_PxeBufferOffset] push ax - mov ax, [BSS_PxeFunction] + mov ax, word ptr ds:[BSS_PxeFunction] push ax call dword ptr ds:[BSS_PxeEntryPoint] add esp, 6

1 0

[tkreuzer] 52346: [FREELDR] - Change base addresses to 0xF800 (realmode code) and 0x10000 (PE file) - use FREELDR_BASE constant in bootsectors - Use es segment to address PE file from realmode
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 17:19:28 2011 New Revision: 52346 URL: http://svn.reactos.org/svn/reactos?rev=52346&view=rev Log: [FREELDR] - Change base addresses to 0xF800 (realmode code) and 0x10000 (PE file) - use FREELDR_BASE constant in bootsectors - Use es segment to address PE file from realmode Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -39,6 +39,7 @@ // boots dramatically. #include <asm.inc> +#include "../freeldr/include/arch/pc/x86common.h" #define BP_REL(x) [bp+x-offset start] @@ -210,7 +211,7 @@ // ES:DI has dir entry (ES:DI == 07E0:XXXX) mov ax, word ptr es:[di + HEX(1a)] // Get start cluster push ax // Save start cluster - push HEX(800) // Put 800h on the stack and load it + push FREELDR_BASE / 16 // Put load segment on the stack and load it pop es // Into ES so that we load the cluster at 0000:8000 call ReadCluster // Read the cluster pop ax // Restore start cluster of FreeLoader @@ -227,7 +228,7 @@ // to the helper code. Skip the first three bytes // because they contain a jump instruction to skip // over the helper code in the FreeLoader image. - ljmp16 0, HEX(8003) + ljmp16 0, FREELDR_BASE + 3 Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <asm.inc> +#include "../freeldr/include/arch/pc/x86common.h" #define BP_REL(x) [bp+x-offset start] @@ -390,7 +391,7 @@ jmp PrintFileSystemError // If so exit with error InitializeLoadSegment: - mov bx, HEX(800) + mov bx, FREELDR_BASE / 16 mov es, bx LoadFile: @@ -421,7 +422,7 @@ mov dh, byte ptr ds:[BootPartition] // Load boot partition into DH /* Transfer execution to the bootloader */ - ljmp16 0, HEX(8000) + ljmp16 0, FREELDR_BASE // Returns the FAT entry for a given cluster number // On entry EAX has cluster number Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <asm.inc> +#include "../freeldr/include/arch/pc/x86common.h" .code16 @@ -359,11 +360,7 @@ call crlf #endif -#ifdef _USE_ML - mov bx, HEX(F000) // bx = load address -#else - mov bx, HEX(8000) // bx = load address -#endif + mov bx, FREELDR_BASE // bx = load address mov si, di // restore file pointer mov cx, HEX(0FFFF) // load the whole file call getfssec // get the whole file @@ -378,11 +375,7 @@ mov dh, 0 // dh = boot partition /* Transfer execution to the bootloader */ -#ifdef _USE_ML - ljmp16 0, HEX(F000) -#else - ljmp16 0, HEX(8000) -#endif + ljmp16 0, FREELDR_BASE // // searchdir: Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -1,16 +1,9 @@ if(ARCH MATCHES i386) - if (NOT MSVC) CreateBootSectorTarget2(frldr16 ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - 8000) - else() - CreateBootSectorTarget2(frldr16 - ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S - ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - F000) - endif() + F800) endif() include_directories(BEFORE include) @@ -175,12 +168,11 @@ if(NOT MSVC) set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") - set_image_base(freeldr_pe 0x9000) else() set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") - set_image_base(freeldr_pe 0x10000) -endif() - +endif() + +set_image_base(freeldr_pe 0x10000) set_subsystem(freeldr_pe native) set_entrypoint(freeldr_pe RealEntryPoint) @@ -224,12 +216,11 @@ if(NOT MSVC) set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") - set_image_base(setupldr_pe 0x9000) else() set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") - set_image_base(setupldr_pe 0x10000) -endif() - +endif() + +set_image_base(setupldr_pe 0x10000) set_subsystem(setupldr_pe native) set_entrypoint(setupldr_pe RealEntryPoint) Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -74,7 +74,7 @@ pop ax // AX has start cluster of freeldr.sys - mov bx, HEX(800) + mov bx, FREELDR_BASE / 16 mov es,bx LoadFile: Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -33,16 +33,24 @@ /* Safe real mode entry point in shared memory */ mov dword ptr ds:[BSS_RealModeEntry], offset switch_to_real16 + /* Address the image with es segment */ + mov ax, FREELDR_PE_BASE / 16 + mov es, ax + /* Get address of optional header */ - mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] - add eax, FREELDR_PE_BASE + 4 + IMAGE_FILE_HEADER_SIZE + mov eax, dword ptr es:[IMAGE_DOS_HEADER_e_lfanew] + add eax, 4 + IMAGE_FILE_HEADER_SIZE /* Get address of entry point */ - mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] + mov eax, dword ptr es:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] add eax, FREELDR_PE_BASE /* Save entry point */ mov dword ptr ds:[pm_entrypoint], eax + + /* Restore es */ + xor ax, ax + mov es, ax jmp exit_to_protected Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Sat Jun 18 17:19:28 2011 @@ -6,13 +6,8 @@ /* Memory layout */ #define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ #define BSS_START HEX(6F00) -#if defined(_USE_ML) || defined(_MSC_VER) -#define FREELDR_BASE HEX(f000) +#define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#else -#define FREELDR_BASE HEX(8000) -#define FREELDR_PE_BASE HEX(9000) -#endif #define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ #define BIOSCALLBUFFER HEX(78000) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFSEGMENT HEX(7800) /* Buffer to store temporary data for any Int386() call */

1 0

[tkreuzer] 52345: [FREELDR] Fix build with MSVC
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 15:27:41 2011 New Revision: 52345 URL: http://svn.reactos.org/svn/reactos?rev=52345&view=rev Log: [FREELDR] Fix build with MSVC Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.cmake.S trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.cmake.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.cmake.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.cmake.S [iso-8859-1] Sat Jun 18 15:27:41 2011 @@ -19,6 +19,8 @@ #include <asm.inc> #include <arch/pc/x86common.h> + +EXTERN i386CallRealMode:PROC .code32 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S [iso-8859-1] Sat Jun 18 15:27:41 2011 @@ -5,12 +5,4 @@ .code32 -// globals - -PUBLIC _BootOldLinuxKernel -_BootOldLinuxKernel: - -PUBLIC _BootNewLinuxKernel -_BootNewLinuxKernel: - END

1 0

[mkupfer] 52344: add missing file for revision 52336
by mkupfer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: mkupfer Date: Sat Jun 18 15:04:15 2011 New Revision: 52344 URL: http://svn.reactos.org/svn/reactos?rev=52344&view=rev Log: add missing file for revision 52336 Added: trunk/reactos/base/system/subst/lang/uk-UA.rc (with props) Added: trunk/reactos/base/system/subst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/uk-… ============================================================================== --- trunk/reactos/base/system/subst/lang/uk-UA.rc (added) +++ trunk/reactos/base/system/subst/lang/uk-UA.rc [iso-8859-1] Sat Jun 18 15:04:15 2011 @@ -1,0 +1,27 @@ +/* + * PROJECT: ReactOS subst + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/subst/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for subst + * TRANSLATOR: Igor Paliychuk + */ + +#include "resource.h" + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - %s\n" + IDS_INVALID_PARAMETER "ÐÐµÐ²ÑÑÐ½Ð° ÐºÑÐ»ÑÐºÑÑÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² - %s\n" + IDS_INVALID_PARAMETER2 "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ - %s\n" + IDS_DRIVE_ALREAD_SUBSTED "ÐÐ¾ Ð´Ð¸ÑÐºÑ Ð²Ð¶Ðµ Ð·Ð°ÑÑÐ¾ÑÐ¾Ð²Ð°Ð½Ð¾ SUBST\n" + IDS_FAILED_WITH_ERROCODE "ÐÐµÐ²Ð´Ð°ÑÐ° Ð· ÐºÐ¾Ð´Ð¾Ð¼ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ 0x%x: %s\n" + IDS_USAGE "ÐÑÐ¾ÑÑÑÑ ÑÐ»ÑÑ Ð· Ð±ÑÐºÐ²Ð¾Ñ Ð´Ð¸ÑÐºÑ.\n\n\ +SUBST [Ð´Ð¸ÑÐº1: [Ð´Ð¸ÑÐº2:]ÑÐ»ÑÑ]\n\ +SUBST Ð´Ð¸ÑÐº1: /D\n\n\ + Ð´Ð¸ÑÐº1: ÐÐ¸Ð·Ð½Ð°ÑÐ°Ñ Ð²ÑÑÑÑÐ°Ð»ÑÐ½Ð¸Ð¹ Ð´Ð¸ÑÐº, Ð½Ð° ÑÐºÐ¸Ð¹ Ð²Ð¸ ÑÐ¾ÑÐµÑÐµ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐ¸ÑÐ¸ ÑÐ»ÑÑ.\n\ + [Ð´Ð¸ÑÐº2:]ÑÐ»ÑÑ ÐÐ¸Ð·Ð½Ð°ÑÐ°Ñ ÑÑÐ·Ð¸ÑÐ½Ð¸Ð¹ Ð´Ð¸ÑÐº ÑÐ° ÑÐ»ÑÑ, ÑÐºÐ¸Ð¹ Ð²Ð¸ ÑÐ¾ÑÐµÑÐµ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐ¸ÑÐ¸\n Ð´Ð»Ñ Ð²ÑÑÑÑÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ Ð´Ð¸ÑÐºÑ.\n\ + /D ÐÐ¸Ð´Ð°Ð»ÑÑ Ð¿ÑÐ´ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ð¹ (Ð²ÑÑÑÑÐ°Ð»ÑÐ½Ð¸Ð¹) Ð´Ð¸ÑÐº.\n\n\ +ÐÐ²ÐµÐ´ÑÑÑ SUBST Ð±ÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² Ð´Ð»Ñ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÐ¿Ð¸ÑÐºÑ Ð¿Ð¾ÑÐ¾ÑÐ½Ð¸Ñ Ð²ÑÑÑÑÐ°Ð»ÑÐ½Ð¸Ñ Ð´Ð¸ÑÐºÑÐ².\n" +END Propchange: trunk/reactos/base/system/subst/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[rharabien] 52343: [WIN32K] - Remove commented out lines added in r52332 - clip children should not be taken into account here [SHELL32] - Use COPYRIGHT_YEAR definition instead of current year
by rharabien＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: rharabien Date: Sat Jun 18 14:55:03 2011 New Revision: 52343 URL: http://svn.reactos.org/svn/reactos?rev=52343&view=rev Log: [WIN32K] - Remove commented out lines added in r52332 - clip children should not be taken into account here [SHELL32] - Use COPYRIGHT_YEAR definition instead of current year Modified: trunk/reactos/CREDITS trunk/reactos/dll/win32/shell32/authors.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=52343&r1=52342… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Sat Jun 18 14:55:03 2011 @@ -58,6 +58,7 @@ Peter Ward <dralnix(a)gmail.com> Pierre Schweitzer <pschweitzer(a)reactos.org> Phillip Susi <phreak(a)iag.net> +Rafal Harabien <rafalh(a)reactos.org> Rex Jolliff <rex(a)lvcablemodem.com> Richard Campbell <betam4x(a)gmail.com> Robert Bergkvist <fragdance(a)hotmail.com> Modified: trunk/reactos/dll/win32/shell32/authors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/authors.… ============================================================================== --- trunk/reactos/dll/win32/shell32/authors.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/authors.c [iso-8859-1] Sat Jun 18 14:55:03 2011 @@ -1,1 +1,3 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2011 WINE team", "Copyright 1998-2011 ReactOS Team", 0 }; +#include <reactos/version.h> + +const char * const SHELL_Authors[] = { "Copyright 1993-" COPYRIGHT_YEAR " WINE team", "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team", 0 }; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat Jun 18 14:55:03 2011 @@ -1037,8 +1037,7 @@ SWP_HIDEWINDOW | SWP_FRAMECHANGED)) != (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER)) { - VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, - FALSE, //(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE, + VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); VisRgn = NULL; @@ -1129,8 +1128,7 @@ if (!(WinPos.flags & SWP_NOREDRAW)) { /* Determine the new visible region */ - VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, - FALSE,//(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE, + VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); VisRgn = NULL;

1 0

[jgardou] 52342: [NTOSKRNL] KeGetPreviousMode returns KPROCESSORMODE, which is CCHAR and not UCHAR
by jgardou＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: jgardou Date: Sat Jun 18 14:50:59 2011 New Revision: 52342 URL: http://svn.reactos.org/svn/reactos?rev=52342&view=rev Log: [NTOSKRNL] KeGetPreviousMode returns KPROCESSORMODE, which is CCHAR and not UCHAR Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Jun 18 14:50:59 2011 @@ -8,7 +8,7 @@ #ifndef _M_ARM FORCEINLINE -UCHAR +KPROCESSOR_MODE KeGetPreviousMode(VOID) { /* Return the current mode */

1 0

[tkreuzer] 52341: [ASM] Use CR, LF and NUL in .ascii macro instead of using .asciz or "\r" "\n", since the latter is not portable
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 14:50:24 2011 New Revision: 52341 URL: http://svn.reactos.org/svn/reactos?rev=52341&view=rev Log: [ASM] Use CR, LF and NUL in .ascii macro instead of using .asciz or "\r" "\n", since the latter is not portable Modified: trunk/reactos/boot/freeldr/bootsect/fat.S trunk/reactos/boot/freeldr/bootsect/fat32.S trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/include/asm/asm.inc Modified: trunk/reactos/boot/freeldr/bootsect/fat.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat.… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat.S [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -406,9 +406,9 @@ msgDiskError: - .asciz "Disk error\r\n" + .ascii "Disk error", CR, LF, NUL msgFreeLdr: - .asciz "ldr not found\r\n" + .ascii "ldr not found", CR, LF, NUL // Sorry, need the space... //msgAnyKey: // .asciz "Press any key to restart\r\n" Modified: trunk/reactos/boot/freeldr/bootsect/fat32.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/fat3… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/fat32.S [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -522,11 +522,11 @@ jmp Reboot msgFreeLdr: - .asciz "freeldr.sys not found\r\n" + .ascii "freeldr.sys not found", CR, LF, NUL filename: .ascii "FREELDR SYS" msgLoading: - .asciz "Loading FreeLoader...\r\n" + .ascii "Loading FreeLoader...\r\n", CR, LF, NUL .org 1022 // Pad to 1022 bytes Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -923,67 +923,67 @@ isolinux_banner: - .asciz CR, LF, "Loading IsoBoot...", CR, LF + .ascii CR, LF, "Loading IsoBoot...", CR, LF, NUL copyright_str: - .asciz " (C) 1994-2002 H. Peter Anvin", CR, LF + .ascii " (C) 1994-2002 H. Peter Anvin", CR, LF, NUL presskey_msg: - .asciz "Press any key to boot from CD" + .ascii "Press any key to boot from CD", NUL dot_msg: - .asciz "." + .ascii ".", NUL #ifdef DEBUG_MESSAGES startup_msg: - .asciz "Startup, DL = '" + .ascii "Startup, DL = '", NUL spec_ok_msg: - .asciz "packet OK, drive = " + .ascii "packet OK, drive = ", NUL secsize_msg: - .asciz "size appears to be " + .ascii "size appears to be ", NUL rootloc_msg: - .asciz "Root dir loc: " + .ascii "Root dir loc: ", NUL rootlen_msg: - .asciz "Root dir len: " + .ascii "Root dir len: ", NUL rootsect_msg: - .asciz "Root dir len(sect): " + .ascii "Root dir len(sect): ", NUL fileloc_msg: - .asciz "SETUPLDR loc: " + .ascii "SETUPLDR loc: ", NUL filelen_msg: - .asciz "SETUPLDR len: " + .ascii "SETUPLDR len: ", NUL filesect_msg: - .asciz "SETUPLDR len(sect): " + .ascii "SETUPLDR len(sect): ", NUL findfail_msg: - .asciz "Failed to find file!" + .ascii "Failed to find file!", NUL startldr_msg: - .asciz "Starting SETUPLDR.SYS" + .ascii "Starting SETUPLDR.SYS", NUL #endif spec_err_msg: - .asciz "Load spec failed, trying wing ...", CR, LF + .ascii "Load spec failed, trying wing ...", CR, LF, NUL maybe_msg: - .asciz "Found smth at drive = " + .ascii "Found smth at drive = ", NUL alright_msg: - .asciz "might be ok, continuing...", CR, LF + .ascii "might be ok, continuing...", CR, LF, NUL nothing_msg: - .asciz "Failed locate CD-ROM; boot failed.", CR, LF + .ascii "Failed locate CD-ROM; boot failed.", CR, LF, NUL isolinux_str: - .asciz "IsoBoot: " + .ascii "IsoBoot: ", NUL crlf_msg: - .asciz CR, LF + .ascii CR, LF, NUL diskerr_msg: - .asciz "Disk error " + .ascii "Disk error ", NUL ondrive_str: - .asciz ", drive " + .ascii ", drive ", NUL err_bootfailed: - .asciz CR, LF, "failed.." + .ascii CR, LF, "failed..", NUL isolinux_dir: - .asciz "\\LOADER" + .ascii "\\LOADER", NUL no_dir_msg: - .asciz "LOADER dir not found.", CR, LF + .ascii "LOADER dir not found.", CR, LF, NUL isolinux_bin: - .asciz "SETUPLDR.SYS" + .ascii "SETUPLDR.SYS", NUL no_isolinux_msg: - .asciz "SETUPLDR not found.", CR, LF + .ascii "SETUPLDR not found.", CR, LF, NUL // Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=52… ============================================================================== --- trunk/reactos/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/asm.inc [iso-8859-1] Sat Jun 18 14:50:24 2011 @@ -44,10 +44,10 @@ #define ENDFUNC .ENDP /* MASM doesn't have an ASCII macro */ -.ASCII MACRO text +.ASCII MACRO text:VARARG DB text ENDM -.ascii MACRO text +.ascii MACRO text:VARARG DB text ENDM @@ -162,6 +162,7 @@ #define CR 13 #define LF 10 +#define NUL 0 #else /***********************************************************************/ @@ -312,5 +313,6 @@ #define CR "\r" #define LF "\n" +#define NUL "\0" #endif

1 0

[jgardou] 52340: [RTL] - do not use RtlpCoalesceFreeBlocks to reinsert a block resulting from a split. This bad idea was mine, introduced in r51757
by jgardou＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: jgardou Date: Sat Jun 18 14:47:51 2011 New Revision: 52340 URL: http://svn.reactos.org/svn/reactos?rev=52340&view=rev Log: [RTL] - do not use RtlpCoalesceFreeBlocks to reinsert a block resulting from a split. This bad idea was mine, introduced in r51757 Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=52340&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sat Jun 18 14:47:51 2011 @@ -1749,7 +1749,7 @@ SIZE_T Index, SIZE_T Size) { - PHEAP_FREE_ENTRY SplitBlock; + PHEAP_FREE_ENTRY SplitBlock, SplitBlock2; UCHAR FreeFlags; PHEAP_ENTRY InUseEntry; SIZE_T FreeSize; @@ -1791,12 +1791,63 @@ SplitBlock->SegmentOffset = InUseEntry->SegmentOffset; SplitBlock->Size = FreeSize; SplitBlock->PreviousSize = Index; - - /* Coalesce it with the next entry */ - SplitBlock = RtlpCoalesceFreeBlocks(Heap, SplitBlock, &FreeSize, FALSE); - RtlpInsertFreeBlock(Heap, SplitBlock, FreeSize); - - /* Reset the flag */ + + /* Check if it's the last entry */ + if (FreeFlags & HEAP_ENTRY_LAST_ENTRY) + { + /* Insert it to the free list if it's the last entry */ + RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* Not so easy - need to update next's previous size too */ + SplitBlock2 = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize); + + if (SplitBlock2->Flags & HEAP_ENTRY_BUSY) + { + SplitBlock2->PreviousSize = (USHORT)FreeSize; + RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); + Heap->TotalFreeSize += FreeSize; + } + else + { + /* Even more complex - the next entry is free, so we can merge them into one! */ + SplitBlock->Flags = SplitBlock2->Flags; + + /* Remove that next entry */ + RtlpRemoveFreeBlock(Heap, SplitBlock2, FALSE, FALSE); + + /* Update sizes */ + FreeSize += SplitBlock2->Size; + Heap->TotalFreeSize -= SplitBlock2->Size; + + if (FreeSize <= HEAP_MAX_BLOCK_SIZE) + { + /* Insert it back */ + SplitBlock->Size = FreeSize; + + /* Don't forget to update previous size of the next entry! */ + if (!(SplitBlock->Flags & HEAP_ENTRY_LAST_ENTRY)) + { + ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = FreeSize; + } + + /* Actually insert it */ + RtlpInsertFreeBlockHelper(Heap, SplitBlock, (USHORT)FreeSize, FALSE); + + /* Update total size */ + Heap->TotalFreeSize += FreeSize; + } + else + { + /* Resulting block is quite big */ + RtlpInsertFreeBlock(Heap, SplitBlock, FreeSize); + } + } + } + + /* Reset flags of the free entry */ FreeFlags = 0; } } @@ -2645,7 +2696,7 @@ { RtlEnterHeapLock(Heap->LockVariable); HeapLocked = TRUE; - Flags ^= HEAP_NO_SERIALIZE; + Flags &= ~HEAP_NO_SERIALIZE; } /* Get the pointer to the in-use entry */

1 0

[jgardou] 52339: [NTOSKRNL] - don't rely on a boolean being 1 or 0, it's a bad idea (tm)
by jgardou＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: jgardou Date: Sat Jun 18 14:45:08 2011 New Revision: 52339 URL: http://svn.reactos.org/svn/reactos?rev=52339&view=rev Log: [NTOSKRNL] - don't rely on a boolean being 1 or 0, it's a bad idea (tm) Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Jun 18 14:45:08 2011 @@ -1510,7 +1510,7 @@ /* Set thread fields */ Thread->TrapFrame = TrapFrame; - Thread->PreviousMode = KiUserTrap(TrapFrame); + Thread->PreviousMode = KiUserTrap(TrapFrame) ? UserMode : KernelMode; /* Enable interrupts */ _enable();

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