Ros-diffs

ros-diffs@reactos.org

81390 discussions

[nyadav] 52328: [AUDSRV] fix mixer routine, working now
by nyadav＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: nyadav Date: Sat Jun 18 10:37:54 2011 New Revision: 52328 URL: http://svn.reactos.org/svn/reactos?rev=52328&view=rev Log: [AUDSRV] fix mixer routine, working now Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c branches/nyadav-audio-branch/base/services/audsrv/stream.c Modified: branches/nyadav-audio-branch/base/services/audsrv/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/mixer.c [iso-8859-1] Sat Jun 18 10:37:54 2011 @@ -43,11 +43,14 @@ stream = mixer->serverstreamlist; minsamplevalue = *(short *) stream->minsamplevalue; maxsamplevalue = *(short *) stream->maxsamplevalue; - while(stream->next != NULL) + + while( stream != NULL) { localsrcbuf = stream->filteredbuf; if(stream->ready == TRUE ) { + coefficient = 1.0; + if( *(short *)stream->maxsamplevalue != maxsamplevalue || *(short *)stream->minsamplevalue != minsamplevalue ) { @@ -56,18 +59,16 @@ coefficient = (float) maxsamplevalue / (float)*(short *)stream->maxsamplevalue; else coefficient = (float) minsamplevalue / (float)*(short *)stream->minsamplevalue; - - for(i=0;i<stream->length_filtered;i++) - { - localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); - } } + for(i=0;i<stream->length_filtered/sizeof(short);i++) + { + localsinkbuf[i] = (short) (( (localsinkbuf[i] * streamcount) + ((short)((float) localsrcbuf[i] ) * coefficient) ) / (streamcount +1)); + } } - stream->ready = 0; + //stream->ready = 0; /*TODO Enable it when actual filter thread starts working*/ streamcount++; stream = stream->next; } - CopyMemory(mixer->masterbuf[buffer],mixer->serverstreamlist->filteredbuf,mixer->serverstreamlist->length_filtered); return NULL; } Modified: branches/nyadav-audio-branch/base/services/audsrv/stream.c URL: http://svn.reactos.org/svn/reactos/branches/nyadav-audio-branch/base/servic… ============================================================================== --- branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] (original) +++ branches/nyadav-audio-branch/base/services/audsrv/stream.c [iso-8859-1] Sat Jun 18 10:37:54 2011 @@ -36,7 +36,11 @@ while (i < localstream->length_filtered / 2) { tempbuf[i] = 0x7FFF * sin(0.5 * (i - 1) * 500 * 6.28 / 48000); - if(initmin) + + if((localstream->streamid %2) == 0) + tempbuf[i] = 0; + + if(initmin) { if(tempbuf[i]<minimum) minimum = tempbuf[i]; @@ -57,6 +61,11 @@ i++; tempbuf[i] = 0x7FFF * sin(0.5 * (i - 2) * 500 * 6.28 / 48000); + + if((localstream->streamid %2) != 0) + tempbuf[i] = 0; + + if(initmin) { if(tempbuf[i]<minimum)

1 0

[tkreuzer] 52327: [ASM] - Use .586P for 16 bit code to allow privileged instructions, like lidt/lgdt. Found by ThFabba - Add a 0 byte at the end to make ML fill the file up to the required length
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 09:40:44 2011 New Revision: 52327 URL: http://svn.reactos.org/svn/reactos?rev=52327&view=rev Log: [ASM] - Use .586P for 16 bit code to allow privileged instructions, like lidt/lgdt. Found by ThFabba - Add a 0 byte at the end to make ML fill the file up to the required length Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/include/asm/asm.inc 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 09:40:44 2011 @@ -88,8 +88,7 @@ /* Load IDTR with real mode value */ #ifdef _USE_ML - DB 0Fh, 01h, 1Eh - DW rmode_idtptr + lidt fword ptr rmode_idtptr #else lidt rmode_idtptr #endif @@ -114,8 +113,7 @@ /* Load the GDT */ #ifdef _USE_ML - DB 0Fh, 01h, 16h - DW gdtptr + lgdt fword ptr gdtptr #else lgdt gdtptr #endif @@ -195,7 +193,7 @@ #include "pnp.inc" #include "helpers.inc" -.org (FREELDR_PE_BASE - FREELDR_BASE) +.org (FREELDR_PE_BASE - FREELDR_BASE - 1) +.byte 0 .endcode16 - END 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 09:40:44 2011 @@ -73,7 +73,7 @@ .code16 MACRO ASSUME nothing .text SEGMENT use16 - .586 + .586P ENDM .endcode16 MACRO

1 0

[tkreuzer] 52326: [FEELDR] - Fix offset in manually encoded lgdt instruction - improve syntax for ML
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 08:05:35 2011 New Revision: 52326 URL: http://svn.reactos.org/svn/reactos?rev=52326&view=rev Log: [FEELDR] - Fix offset in manually encoded lgdt instruction - improve syntax for ML Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S 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 08:05:35 2011 @@ -25,7 +25,7 @@ mov ss, ax /* Setup the stack */ - mov sp, word ptr ds:stack16 + mov sp, word ptr ds:[stack16] /* Enable A20 address line */ call EnableA20 @@ -42,7 +42,7 @@ add eax, FREELDR_PE_BASE /* Save entry point */ - mov dword ptr [pm_entrypoint], eax + mov dword ptr ds:[pm_entrypoint], eax jmp exit_to_protected @@ -98,7 +98,7 @@ /* Do the callback, specified by bx */ shl bx, 1 - call word ptr ds:[callback_table + bx] + call word ptr ds:callback_table[bx] /* @@ -115,7 +115,7 @@ /* Load the GDT */ #ifdef _USE_ML DB 0Fh, 01h, 16h - DW rmode_idtptr + DW gdtptr #else lgdt gdtptr #endif

1 0

[tkreuzer] 52325: [FREELDR] - Instead of using the far jmp when switching to protected mode to go to the entry point, use a relative absolute jmp instruction, manually encoded - Remove the END from...
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 23:44:07 2011 New Revision: 52325 URL: http://svn.reactos.org/svn/reactos?rev=52325&view=rev Log: [FREELDR] - Instead of using the far jmp when switching to protected mode to go to the entry point, use a relative absolute jmp instruction, manually encoded - Remove the END from fathelp.inc, that was terminating the code - fix code for ML Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.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] Fri Jun 17 23:44:07 2011 @@ -217,9 +217,8 @@ ret -msgLoading: .asciz "Loading FreeLoader...\r\n" +msgLoading: .asciz "Loading FreeLoader...", CR, LF .org 510 // Pad to 510 bytes .word HEX(0aa55) // BootSector signature -END Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/helpers.inc [iso-8859-1] Fri Jun 17 23:44:07 2011 @@ -1,10 +1,10 @@ Empty8042: - .word 0x00eb,0x00eb // jmp $+2, jmp $+2 - in al, 0x64 - cmp al, 0xff // legacy-free machine without keyboard + .word HEX(00eb), HEX(00eb) // jmp $+2, jmp $+2 + in al, HEX(64) + cmp al, HEX(0ff) // legacy-free machine without keyboard jz Empty8042_ret // controllers on Intel Macs read back 0xFF - test al, 0x02 + test al, 2 jnz Empty8042 Empty8042_ret: ret @@ -12,11 +12,11 @@ EnableA20: pusha call Empty8042 - mov al, 0xD1 // command write - out 0x64, al + mov al, HEX(0D1) // command write + out HEX(064), al call Empty8042 - mov al, 0xDF // A20 on - out 0x60, al + mov al, HEX(0DF) // A20 on + out HEX(060), al call Empty8042 popa ret @@ -46,9 +46,9 @@ writechr: pushf pusha - mov ah, 0x0E + mov ah, HEX(0E) xor bx, bx - int 0x10 + int HEX(10) popa popf ret 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] Fri Jun 17 23:44:07 2011 @@ -31,7 +31,7 @@ call EnableA20 /* Safe real mode entry point in shared memory */ - mov dword ptr [BSS_RealModeEntry], offset switch_to_real16 + mov dword ptr ds:[BSS_RealModeEntry], offset switch_to_real16 /* Get address of optional header */ mov eax, dword ptr ds:[FREELDR_PE_BASE + IMAGE_DOS_HEADER_e_lfanew] @@ -41,8 +41,8 @@ mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] add eax, FREELDR_PE_BASE - /* Patch the long jump instruction */ - mov word ptr [pm_offset], ax + /* Save entry point */ + mov dword ptr [pm_entrypoint], eax jmp exit_to_protected @@ -87,7 +87,12 @@ mov sp, word ptr ds:[stack16] /* Load IDTR with real mode value */ +#ifdef _USE_ML + DB 0Fh, 01h, 1Eh + DW rmode_idtptr +#else lidt rmode_idtptr +#endif sti /* These are ok now */ @@ -108,7 +113,12 @@ mov word ptr ds:[stack16], sp /* Load the GDT */ +#ifdef _USE_ML + DB 0Fh, 01h, 16h + DW rmode_idtptr +#else lgdt gdtptr +#endif /* Enable Protected Mode */ mov eax, cr0 @@ -116,14 +126,13 @@ mov cr0, eax /* Clear prefetch queue & correct CS */ - .byte HEX(0ea) // jmp far PMODE_CS:entry_point -pm_offset: - .word 0 // receives address of PE entry point - .word PMODE_CS + ljmp16 PMODE_CS, inpmode +inpmode: + .byte HEX(0ff), HEX(25) // opcode of indirect jump + .word pm_entrypoint, 0 +pm_entrypoint: + .long 0 // receives address of PE entry point nop -// FIXME: use ljmp16 PMODE_CS:inpmode + hexed 32bit jump - - callback_table: .word Int386 @@ -174,15 +183,13 @@ /* GDT table pointer */ gdtptr: .word HEX(27) /* Limit */ - .long gdt /* Base Address */ + .word gdt, 0 /* Base Address */ /* Real-mode IDT pointer */ rmode_idtptr: .word HEX(3ff) /* Limit */ .long 0 /* Base Address */ -//.org 1024 - #include "int386.inc" #include "pxe.inc" #include "pnp.inc" Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/int386.inc [iso-8859-1] Fri Jun 17 23:44:07 2011 @@ -34,9 +34,9 @@ /* Call the interrupt vector */ /*int Int386_vector*/ - .byte 0xcd + .byte HEX(0cd) Int386_vector_opcode: - .byte 0x00 + .byte 00 /* Save the registers */ mov dword ptr cs:[BSS_RegisterSet + REGS_EAX], eax 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] Fri Jun 17 23:44:07 2011 @@ -15,11 +15,11 @@ push 0 - call dword ptr [BSS_PnpBiosEntryPoint] + call dword ptr ds:[BSS_PnpBiosEntryPoint] add sp, 12 movzx ecx, ax - mov dword ptr [BSS_PnpResult], ecx + mov dword ptr ds:[BSS_PnpResult], ecx ret @@ -48,11 +48,11 @@ push 1 /* call entry point */ - call dword ptr [BSS_PnpBiosEntryPoint] + call dword ptr ds:[BSS_PnpBiosEntryPoint] add sp, 14 movzx ecx, ax - mov [BSS_PnpResult], ecx + mov dword ptr ds:[BSS_PnpResult], ecx ret 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] Fri Jun 17 23:44:07 2011 @@ -26,8 +26,8 @@ push ax mov ax, [BSS_PxeFunction] push ax - call dword ptr [BSS_PxeEntryPoint] + call dword ptr ds:[BSS_PxeEntryPoint] add esp, 6 - mov [BSS_PxeResult], ax + mov word ptr ds:[BSS_PxeResult], ax ret

1 0

[tkreuzer] 52324: [FREELDR] - convert mb.S to portable syntax - remove obsolete reactos_memory_map - Make use of CR / LF in isoboot.S
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 22:26:11 2011 New Revision: 52324 URL: http://svn.reactos.org/svn/reactos?rev=52324&view=rev Log: [FREELDR] - convert mb.S to portable syntax - remove obsolete reactos_memory_map - Make use of CR / LF in isoboot.S Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/mb.S trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S 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] Fri Jun 17 22:26:11 2011 @@ -923,9 +923,9 @@ isolinux_banner: - .asciz "\r\nLoading IsoBoot...\r\n" + .asciz CR, LF, "Loading IsoBoot...", CR, LF copyright_str: - .asciz " (C) 1994-2002 H. Peter Anvin\r\n" + .asciz " (C) 1994-2002 H. Peter Anvin", CR, LF presskey_msg: .asciz "Press any key to boot from CD" dot_msg: @@ -957,33 +957,33 @@ #endif spec_err_msg: - .asciz "Load spec failed, trying wing ...\r\n" + .asciz "Load spec failed, trying wing ...", CR, LF maybe_msg: .asciz "Found smth at drive = " alright_msg: - .asciz "might be ok, continuing...\r\n" + .asciz "might be ok, continuing...", CR, LF nothing_msg: - .asciz "Failed locate CD-ROM; boot failed.\r\n" + .asciz "Failed locate CD-ROM; boot failed.", CR, LF isolinux_str: .asciz "IsoBoot: " crlf_msg: - .asciz "\r\n" + .asciz CR, LF diskerr_msg: .asciz "Disk error " ondrive_str: .asciz ", drive " err_bootfailed: - .asciz "\r\nfailed.." + .asciz CR, LF, "failed.." isolinux_dir: .asciz "\\LOADER" no_dir_msg: - .asciz "LOADER dir not found.\r\n" + .asciz "LOADER dir not found.", CR, LF isolinux_bin: .asciz "SETUPLDR.SYS" no_isolinux_msg: - .asciz "SETUPLDR not found.\r\n" + .asciz "SETUPLDR not found.", CR, LF // 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] Fri Jun 17 22:26:11 2011 @@ -14,13 +14,13 @@ arch/i386/i386idt.c arch/i386/i386trap.S arch/i386/i386pnp.cmake.S - arch/i386/i386bug.c) + arch/i386/i386bug.c + arch/i386/mb.S) if(NOT MSVC) list(APPEND FREELDR_BASE64K_SOURCE arch/i386/drvmap.S arch/i386/linux.S - arch/i386/multiboot.S - arch/i386/mb.S) + arch/i386/multiboot.S) else() list(APPEND FREELDR_BASE64K_SOURCE arch/i386/realmode.S) 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 17 22:26:11 2011 @@ -17,39 +17,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .text - .code16 - +#include <asm.inc> #include <arch/pc/x86common.h> #include <multiboot.h> - /* - * Here we assume the kernel is loaded at 1mb - * This boots the kernel - */ - .code32 - .globl _PageDirectoryStart +.code32 +PUBLIC _PageDirectoryStart - .globl _startup_pagedirectory - .globl _lowmem_pagetable - .globl _kernel_pagetable - .globl _apic_pagetable +PUBLIC _startup_pagedirectory +PUBLIC _lowmem_pagetable +PUBLIC _kernel_pagetable +PUBLIC _apic_pagetable +PUBLIC _PageDirectoryEnd - .globl _PageDirectoryEnd - - // - // Boot information structure - // - -EXTERN(_reactos_memory_map_descriptor_size) - .long 0 - -EXTERN(_reactos_memory_map) - .rept (32 * /*sizeof(memory_map_t)*/24) - .byte 0 - .endr - +#ifndef _USE_ML .bss +#endif _PageDirectoryStart: _startup_pagedirectory: .fill 4096, 1, 0 @@ -64,3 +47,5 @@ .fill 4096, 1, 0 _PageDirectoryEnd: + +END 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] Fri Jun 17 22:26:11 2011 @@ -6,19 +6,6 @@ // globals -PUBLIC _PageDirectoryStart -_PageDirectoryStart: -PUBLIC _PageDirectoryEnd -_PageDirectoryEnd: - -PUBLIC _startup_pagedirectory -_startup_pagedirectory: -PUBLIC _apic_pagetable -_apic_pagetable: -PUBLIC _kernel_pagetable -_kernel_pagetable: -PUBLIC _lowmem_pagetable -_lowmem_pagetable: PUBLIC _BootOldLinuxKernel _BootOldLinuxKernel:

1 0

[tkreuzer] 52323: [ASM] - Make .asciz macro accept a varaiable number of arguments - add CR and LF definitions, since MASM doesn't like "\r\n" codes
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 21:57:34 2011 New Revision: 52323 URL: http://svn.reactos.org/svn/reactos?rev=52323&view=rev Log: [ASM] - Make .asciz macro accept a varaiable number of arguments - add CR and LF definitions, since MASM doesn't like "\r\n" codes Modified: trunk/reactos/include/asm/asm.inc 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] Fri Jun 17 21:57:34 2011 @@ -52,11 +52,13 @@ ENDM /* MASM doesn't have an ASCIZ macro */ -.ASCIZ MACRO text - DB text, 0 -ENDM -.asciz MACRO text - DB text, 0 +.ASCIZ MACRO text:VARARG + DB text + DB 0 +ENDM +.asciz MACRO text:VARARG + DB text + DB 0 ENDM .code64 MACRO @@ -157,6 +159,9 @@ /* We need this to distinguish repeat from macros */ #define ENDR ENDM + +#define CR 13 +#define LF 10 #else /***********************************************************************/ @@ -305,4 +310,7 @@ #define else .else #define elseif .elseif +#define CR "\r" +#define LF "\n" + #endif

1 0

[tkreuzer] 52322: [FREELDR] Disable DriveMapMapDrivesInSection on MSVC builds, freeldr works basically without it
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 20:02:37 2011 New Revision: 52322 URL: http://svn.reactos.org/svn/reactos?rev=52322&view=rev Log: [FREELDR] Disable DriveMapMapDrivesInSection on MSVC builds, freeldr works basically without it Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c trunk/reactos/boot/freeldr/freeldr/arch/i386/drvmap.S trunk/reactos/boot/freeldr/freeldr/arch/i386/realmode.S trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] Fri Jun 17 20:02:37 2011 @@ -25,6 +25,7 @@ ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler +#ifndef _MSC_VER VOID DriveMapMapDrivesInSection(PCSTR SectionName) { CHAR SettingName[80]; @@ -141,6 +142,7 @@ return TRUE; } +#endif ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName) { @@ -167,6 +169,7 @@ return BiosDriveNumber; } +#ifndef _MSC_VER VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) { ULONG* RealModeIVT = (ULONG*)0x00000000; @@ -220,3 +223,4 @@ DriveMapInstalled = FALSE; } } +#endif 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 17 20:02:37 2011 @@ -139,4 +139,3 @@ PUBLIC _DriveMapInt13HandlerEnd _DriveMapInt13HandlerEnd: - .byte 0 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] Fri Jun 17 20:02:37 2011 @@ -26,16 +26,4 @@ PUBLIC _BootNewLinuxKernel _BootNewLinuxKernel: -PUBLIC _DriveMapOldInt13HandlerAddress -_DriveMapOldInt13HandlerAddress: - -PUBLIC _DriveMapInt13HandlerStart -_DriveMapInt13HandlerStart: - -PUBLIC _DriveMapInt13HandlerEnd -_DriveMapInt13HandlerEnd: - -PUBLIC _DriveMapInt13HandlerMapList -_DriveMapInt13HandlerMapList: - END Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Fri Jun 17 20:02:37 2011 @@ -228,7 +228,7 @@ #ifndef _M_ARM // Install the drive mapper according to this sections drive mappings -#ifdef __i386__ +#if defined(__i386__) && !defined(_MSC_VER) DriveMapMapDrivesInSection(SectionName); #endif if (_stricmp(BootType, "ReactOS") == 0)

1 0

[tkreuzer] 52321: [CRYPT32] remove version.rc from the CMakeLists.txt, since its included in crypt32.rc already
by tkreuzer＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: tkreuzer Date: Fri Jun 17 18:37:44 2011 New Revision: 52321 URL: http://svn.reactos.org/svn/reactos?rev=52321&view=rev Log: [CRYPT32] remove version.rc from the CMakeLists.txt, since its included in crypt32.rc already Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Fri Jun 17 18:37:44 2011 @@ -38,7 +38,6 @@ store.c str.c crypt32.rc - version.rc ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def)

1 0

[sir_richard] 52320: Patch by Anton Yarotsky: [SACDRV]: Implement DriverEntry point which connects to NTOS HeadLess Module (HDL). If HDL enabled through FreeLDR (/EMSPORT), connection should work. ...
by sir_richard＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: sir_richard Date: Fri Jun 17 17:21:20 2011 New Revision: 52320 URL: http://svn.reactos.org/svn/reactos?rev=52320&view=rev Log: Patch by Anton Yarotsky: [SACDRV]: Implement DriverEntry point which connects to NTOS HeadLess Module (HDL). If HDL enabled through FreeLDR (/EMSPORT), connection should work. [SACDRV]: Fix typo's. Modified: trunk/reactos/drivers/sac/driver/data.c trunk/reactos/drivers/sac/driver/dispatch.c trunk/reactos/drivers/sac/driver/init.c trunk/reactos/drivers/sac/driver/sacdrv.h Modified: trunk/reactos/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/data.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] Fri Jun 17 17:21:20 2011 @@ -49,7 +49,7 @@ } BOOLEAN -InitalizeGlobalData( +InitializeGlobalData( IN PUNICODE_STRING RegistryPath, IN PDRIVER_OBJECT DriverObject ) Modified: trunk/reactos/drivers/sac/driver/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/dispatc… ============================================================================== --- trunk/reactos/drivers/sac/driver/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/dispatch.c [iso-8859-1] Fri Jun 17 17:21:20 2011 @@ -80,7 +80,6 @@ } VOID -NTAPI UnloadHandler( IN PDRIVER_OBJECT DriverObject ) Modified: trunk/reactos/drivers/sac/driver/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/init.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/init.c [iso-8859-1] Fri Jun 17 17:21:20 2011 @@ -20,5 +20,74 @@ IN PUNICODE_STRING RegistryPath ) { - return STATUS_NOT_IMPLEMENTED; + HEADLESS_RSP_QUERY_INFO HeadlessInformation; + ULONG InfoSize; + NTSTATUS Status; + UNICODE_STRING DriverName; + PDEVICE_OBJECT DeviceObject; + PSAC_DEVICE_EXTENSION DeviceExtension; + PAGED_CODE(); + + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Entering.\n"); + + HeadlessDispatch( + HeadlessCmdQueryInformation, + NULL, + 0, + &HeadlessInformation, + &InfoSize + ); + if ((HeadlessInformation.Serial.TerminalType != HeadlessUndefinedPortType) && + ((HeadlessInformation.Serial.TerminalType != HeadlessSerialPort) || + (HeadlessInformation.Serial.TerminalAttached))) + { + RtlInitUnicodeString(&DriverName, L"\\Device\\SAC"); + + Status = IoCreateDevice( + DriverObject, + sizeof(SAC_DEVICE_EXTENSION), + &DriverName, + FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &DeviceObject + ); + if (NT_SUCCESS(Status)) + { + DeviceExtension = DeviceObject->DeviceExtension; + DeviceExtension->Initialized = FALSE; + + RtlFillMemoryUlong( + DriverObject->MajorFunction, + sizeof(DriverObject->MajorFunction) / sizeof(PVOID), + (ULONG_PTR)Dispatch); + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = + DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = + DispatchShutdownControl; + DriverObject->FastIoDispatch = NULL; + DriverObject->DriverUnload = UnloadHandler; + + if (InitializeGlobalData(RegistryPath, DriverObject)) + { + if (InitializeDeviceData(DeviceObject)) + { + IoRegisterShutdownNotification(DeviceObject); + return Status; + } + } + + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + SAC_DBG(SAC_DBG_INIT, "unable to create device object: %X\n", Status); + } + + FreeGlobalData(); + SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting with status 0x%x\n", Status); + return Status; + } + + return STATUS_PORT_DISCONNECTED; } Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Fri Jun 17 17:21:20 2011 @@ -7,9 +7,11 @@ */ /* INCLUDES *******************************************************************/ -#include <ntddk.h> +#include <ntifs.h> +#include <ntoskrnl/include/internal/hdl.h> #define SAC_DBG_ENTRY_EXIT 0x01 +#define SAC_DBG_INIT 0x04 #define SAC_DBG_MM 0x1000 #define SAC_DBG(x, ...) \ @@ -154,8 +156,48 @@ PKEVENT HasNewDataEvent; PKEVENT LockEvent; PKEVENT RedrawEvent; - GUID ChannelId; + GUID ChannelId; } SAC_CHANNEL_ATTRIBUTES, *PSAC_CHANNEL_ATTRIBUTES; +NTSTATUS +Dispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +NTAPI +DispatchDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +NTSTATUS +DispatchShutdownControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp +); + +VOID +UnloadHandler( + IN PDRIVER_OBJECT DriverObject +); + +VOID +FreeGlobalData( + VOID +); + +BOOLEAN +InitializeDeviceData( + IN PDEVICE_OBJECT DeviceObject +); + +BOOLEAN +InitializeGlobalData( + IN PUNICODE_STRING RegistryPath, + IN PDRIVER_OBJECT DriverObject +); + extern ULONG SACDebug;

1 0

[sir_richard] 52319: Patch by Anton Yarotsky: [NTOSKRNL]: Export HeadlessDispatch. [NTOSKRNL]: Add more missing definitions to internal Headless header. Alex: Move to NDK? [NTOSKRNL]: Headless head...
by sir_richard＠svn.reactos.org 17 Jun '11

17 Jun '11

Author: sir_richard Date: Fri Jun 17 17:19:56 2011 New Revision: 52319 URL: http://svn.reactos.org/svn/reactos?rev=52319&view=rev Log: Patch by Anton Yarotsky: [NTOSKRNL]: Export HeadlessDispatch. [NTOSKRNL]: Add more missing definitions to internal Headless header. Alex: Move to NDK? [NTOSKRNL]: Headless header uses SYSTEM_TIMEOFDAY_INFORMATION, which is only in NDK. So hdl.h needs NDK. Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h trunk/reactos/ntoskrnl/ntoskrnl.pspec trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Fri Jun 17 17:19:56 2011 @@ -7,6 +7,7 @@ */ #define _HDL_ #include <cportlib/cportlib.h> +#include <ndk/extypes.h> // // Define this if you want debugging support @@ -150,6 +151,38 @@ HeadlessCmdPutData } HEADLESS_CMD, *PHEADLESS_CMD; +typedef enum _HEADLESS_TERM_PORT_TYPE +{ + HeadlessUndefinedPortType = 0, + HeadlessSerialPort +} HEADLESS_TERM_PORT_TYPE, *PHEADLESS_TERM_PORT_TYPE; + +typedef enum _HEADLESS_TERM_SERIAL_PORT +{ + SerialPortUndefined = 0, + ComPort1, + ComPort2, + ComPort3, + ComPort4 +} HEADLESS_TERM_SERIAL_PORT, *PHEADLESS_TERM_SERIAL_PORT; + +typedef struct _HEADLESS_RSP_QUERY_INFO +{ + HEADLESS_TERM_PORT_TYPE PortType; + union + { + struct + { + BOOLEAN TerminalAttached; + BOOLEAN UsedBiosSettings; + HEADLESS_TERM_SERIAL_PORT TerminalPort; + PUCHAR TerminalPortBaseAddress; + ULONG TerminalBaudRate; + UCHAR TerminalType; + } Serial; + }; +} HEADLESS_RSP_QUERY_INFO, *PHEADLESS_RSP_QUERY_INFO; + typedef struct _HEADLESS_CMD_PUT_STRING { UCHAR String[1]; Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Fri Jun 17 17:19:56 2011 @@ -325,7 +325,7 @@ @ extern HalDispatchTable _HalDispatchTable @ FASTCALL HalExamineMBR(ptr long long ptr) @ extern HalPrivateDispatchTable -;HeadlessDispatch +@ stdcall HeadlessDispatch(long ptr long ptr ptr) @ stdcall InbvAcquireDisplayOwnership() @ stdcall InbvCheckDisplayOwnership() @ stdcall InbvDisplayString(str) Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Fri Jun 17 17:19:56 2011 @@ -305,7 +305,7 @@ @ extern HalDispatchTable _HalDispatchTable @ fastcall HalExamineMBR(ptr long long ptr) @ extern HalPrivateDispatchTable -;HeadlessDispatch +@ stdcall HeadlessDispatch(long ptr long ptr ptr) @ stdcall InbvAcquireDisplayOwnership() @ stdcall InbvCheckDisplayOwnership() @ stdcall InbvDisplayString(str)

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