Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[jgardou] 52335: wrong change, sorry
by jgardou＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: jgardou Date: Sat Jun 18 14:21:55 2011 New Revision: 52335 URL: http://svn.reactos.org/svn/reactos?rev=52335&view=rev Log: wrong change, sorry Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat Jun 18 14:21:55 2011 @@ -18,9 +18,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#define MAX_PROPERTY_SHEET_PAGE 32 + +#define WIN32_NO_STATUS +#define NTOS_MODE_USER +#define UNICODE +#define _UNICODE +#define COBJMACROS +#include <windows.h> +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> +#include <largeint.h> + #include <precomp.h> - -#define MAX_PROPERTY_SHEET_PAGE 32 WINE_DEFAULT_DEBUG_CHANNEL(shell);

1 0

[jgardou] 52334: [SHELL32] - do not include headers that are already in precomp.h
by jgardou＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: jgardou Date: Sat Jun 18 14:20:48 2011 New Revision: 52334 URL: http://svn.reactos.org/svn/reactos?rev=52334&view=rev Log: [SHELL32] - do not include headers that are already in precomp.h Modified: trunk/reactos/dll/win32/shell32/drive.c Modified: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/drive.c [iso-8859-1] Sat Jun 18 14:20:48 2011 @@ -18,19 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <precomp.h> + #define MAX_PROPERTY_SHEET_PAGE 32 - -#define WIN32_NO_STATUS -#define NTOS_MODE_USER -#define UNICODE -#define _UNICODE -#define COBJMACROS -#include <windows.h> -#include <ndk/ntndk.h> -#include <fmifs/fmifs.h> -#include <largeint.h> - -#include <precomp.h> WINE_DEFAULT_DEBUG_CHANNEL(shell);

1 0

[rharabien] 52333: [SHELL32] - Update years in ReactOS about box
by rharabien＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: rharabien Date: Sat Jun 18 12:45:20 2011 New Revision: 52333 URL: http://svn.reactos.org/svn/reactos?rev=52333&view=rev Log: [SHELL32] - Update years in ReactOS about box Modified: trunk/reactos/dll/win32/shell32/authors.c 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 12:45:20 2011 @@ -1,1 +1,1 @@ -const char * const SHELL_Authors[] = { "Copyright 1993-2009 WINE team", "Copyright 1998-2009 ReactOS Team", 0 }; +const char * const SHELL_Authors[] = { "Copyright 1993-2011 WINE team", "Copyright 1998-2011 ReactOS Team", 0 };

1 0

[rharabien] 52332: [WIN32K] - Don't clip siblings in co_WinPosSetWindowPos when window has no WS_CLIPSIBLINGS style. Fixes ReactOS about box. - Commented out line with WS_CLIPCHILDREN support needs...
by rharabien＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: rharabien Date: Sat Jun 18 12:41:29 2011 New Revision: 52332 URL: http://svn.reactos.org/svn/reactos?rev=52332&view=rev Log: [WIN32K] - Don't clip siblings in co_WinPosSetWindowPos when window has no WS_CLIPSIBLINGS style. Fixes ReactOS about box. - Commented out line with WS_CLIPCHILDREN support needs more work - Simplify co_WinPosSetWindowPos a bit Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Sat Jun 18 12:41:29 2011 @@ -156,12 +156,12 @@ ASSERT_REFS_CO(Wnd); - Temp = IntSysCreateRectRgn(0, 0, 0, 0); - NtGdiCombineRgn(Temp, NewlyExposed, NULL, RGN_COPY); - Parent = Wnd->spwndParent; if(Parent) { + Temp = IntSysCreateRectRgn(0, 0, 0, 0); + + NtGdiCombineRgn(Temp, NewlyExposed, NULL, RGN_COPY); NtGdiOffsetRgn(Temp, Wnd->rcWindow.left - Parent->rcClient.left, Wnd->rcWindow.top - Parent->rcClient.top); @@ -171,8 +171,9 @@ RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); UserDerefObjectCo(Parent); + + GreDeleteObject(Temp); } - GreDeleteObject(Temp); } /* EOF */ 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 12:41:29 2011 @@ -982,7 +982,6 @@ int RgnType; HDC Dc; RECTL CopyRect; - RECTL TempRect; PWND Ancestor; ASSERT_REFS_CO(Window); @@ -1033,17 +1032,19 @@ if (!(WinPos.flags & SWP_NOREDRAW)) { /* Compute the visible region before the window position is changed */ - if (!(WinPos.flags & (SWP_NOREDRAW | SWP_SHOWWINDOW)) && + if (!(WinPos.flags & SWP_SHOWWINDOW) && (WinPos.flags & (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_HIDEWINDOW | SWP_FRAMECHANGED)) != (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER)) { - VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, TRUE); + VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, + FALSE, //(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE, + (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); VisRgn = NULL; if ( VisBefore != NULL && (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisBefore, NULL)) && - REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION ) + REGION_Complexity(VisRgn) == NULLREGION ) { RGNOBJAPI_Unlock(VisRgn); GreDeleteObject(VisBefore); @@ -1084,8 +1085,8 @@ /* FIXME: Actually do something with WVR_VALIDRECTS */ - if ( NewClientRect.left != OldClientRect.left || - NewClientRect.top != OldClientRect.top) + if (NewClientRect.left != OldClientRect.left || + NewClientRect.top != OldClientRect.top) { WinPosInternalMoveWindow(Window, NewClientRect.left - OldClientRect.left, @@ -1095,7 +1096,7 @@ Window->rcWindow = NewWindowRect; Window->rcClient = NewClientRect; - if (!(WinPos.flags & SWP_SHOWWINDOW) && (WinPos.flags & SWP_HIDEWINDOW)) + if (WinPos.flags & SWP_HIDEWINDOW) { /* Clear the update region */ co_UserRedrawWindow( Window, @@ -1103,11 +1104,9 @@ 0, RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_ALLCHILDREN); - if ((Window->style & WS_VISIBLE) && - Window->spwndParent == UserGetDesktopWindow()) - { + if (Window->spwndParent == UserGetDesktopWindow()) co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (LPARAM)Window->head.h); - } + Window->style &= ~WS_VISIBLE; } else if (WinPos.flags & SWP_SHOWWINDOW) @@ -1130,12 +1129,14 @@ if (!(WinPos.flags & SWP_NOREDRAW)) { /* Determine the new visible region */ - VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, TRUE); + VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, + FALSE,//(Window->style & WS_CLIPCHILDREN) ? TRUE : FALSE, + (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); VisRgn = NULL; if ( VisAfter != NULL && (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisAfter, NULL)) && - REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION ) + REGION_Complexity(VisRgn) == NULLREGION ) { RGNOBJAPI_Unlock(VisRgn); GreDeleteObject(VisAfter); @@ -1309,15 +1310,13 @@ if (VisBefore != NULL) { ExposedRgn = IntSysCreateRectRgn(0, 0, 0, 0); - NtGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY); + RgnType = NtGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY); NtGdiOffsetRgn( ExposedRgn, OldWindowRect.left - NewWindowRect.left, OldWindowRect.top - NewWindowRect.top); if (VisAfter != NULL) RgnType = NtGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF); - else - RgnType = SIMPLEREGION; if (RgnType != ERROR && RgnType != NULLREGION) {

1 0

[tkreuzer] 52331: [CRT] - Fix a typo [DDK/XDK] Fix declaration of KDEFERRED_ROUTINE Patch by Thomas Faber
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 12:24:13 2011 New Revision: 52331 URL: http://svn.reactos.org/svn/reactos?rev=52331&view=rev Log: [CRT] - Fix a typo [DDK/XDK] Fix declaration of KDEFERRED_ROUTINE Patch by Thomas Faber Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5233… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat Jun 18 12:24:13 2011 @@ -1204,11 +1204,12 @@ #endif /* defined(_AMD64_) */ typedef VOID -(NTAPI *PKDEFERRED_ROUTINE)( +(NTAPI KDEFERRED_ROUTINE)( IN struct _KDPC *Dpc, IN PVOID DeferredContext OPTIONAL, IN PVOID SystemArgument1 OPTIONAL, IN PVOID SystemArgument2 OPTIONAL); +typedef KDEFERRED_ROUTINE *PKDEFERRED_ROUTINE; typedef enum _KDPC_IMPORTANCE { LowImportance, Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Sat Jun 18 12:24:13 2011 @@ -640,11 +640,12 @@ #endif /* defined(_AMD64_) */ typedef VOID -(NTAPI *PKDEFERRED_ROUTINE)( +(NTAPI KDEFERRED_ROUTINE)( IN struct _KDPC *Dpc, IN PVOID DeferredContext OPTIONAL, IN PVOID SystemArgument1 OPTIONAL, IN PVOID SystemArgument2 OPTIONAL); +typedef KDEFERRED_ROUTINE *PKDEFERRED_ROUTINE; typedef enum _KDPC_IMPORTANCE { LowImportance, @@ -1017,7 +1018,7 @@ typedef enum _TIMER_SET_INFORMATION_CLASS { TimerSetCoalescableTimer, - MaxTimerInfoClass + MaxTimerInfoClass } TIMER_SET_INFORMATION_CLASS; #if (NTDDI_VERSION >= NTDDI_WIN7) Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sat Jun 18 12:24:13 2011 @@ -73,7 +73,7 @@ #ifndef _USER32_WSPRINTF void -#ifdef _LIBCNT +#ifdef _LIBCNT_ /* Due to restrictions in kernel mode regarding the use of floating point, we prevent it from being inlined */ __declspec(noinline)

1 0

[tfaber] 52330: [KMTESTS] - reference streamout.c and provide a wctomb stub to have an any-IRQL vsnprintf implementation for the test framework
by tfaber＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tfaber Date: Sat Jun 18 11:03:28 2011 New Revision: 52330 URL: http://svn.reactos.org/svn/reactos?rev=52330&view=rev Log: [KMTESTS] - reference streamout.c and provide a wctomb stub to have an any-IRQL vsnprintf implementation for the test framework Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/printf_stubs.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Sat Jun 18 11:03:28 2011 @@ -21,11 +21,17 @@ add_library(kmtest_drv SHARED ${KMTEST_DRV_SOURCE}) set_module_type(kmtest_drv kernelmodedriver) -target_link_libraries(kmtest_drv ${PSEH_LIB}) +target_link_libraries(kmtest_drv kmtest_printf ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) set_property(TARGET kmtest_drv PROPERTY COMPILE_DEFINITIONS KMT_KERNEL_MODE) add_cd_file(TARGET kmtest_drv DESTINATION reactos/system32/drivers FOR all) + +add_library(kmtest_printf + kmtest_drv/printf_stubs.c + ${REACTOS_SOURCE_DIR}/lib/sdk/crt/printf/streamout.c) +set_property(TARGET kmtest_printf PROPERTY COMPILE_DEFINITIONS _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb) +set_property(TARGET kmtest_printf PROPERTY INCLUDE_DIRECTORIES ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) # # kmtest.exe loader application Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Sat Jun 18 11:03:28 2011 @@ -8,7 +8,9 @@ #ifndef _KMTEST_TEST_H_ #define _KMTEST_TEST_H_ -typedef void KMT_TESTFUNC(void); +#include <stdarg.h> + +typedef VOID KMT_TESTFUNC(VOID); typedef struct { @@ -74,6 +76,12 @@ KmtMemCpy(&Buffer->LogBuffer[OldLength], String, Length); } +#ifdef KMT_KERNEL_MODE +INT __cdecl KmtVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Format, va_list Arguments); +#elif defined KMT_USER_MODE +#define KmtVSNPrintF vsnprintf +#endif /* defined KMT_USER_MODE */ + #endif /* defined KMT_DEFINE_TEST_FUNCTIONS */ #endif /* !defined _KMTEST_TEST_H_ */ Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/printf_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/printf_stubs.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/printf_stubs.c [iso-8859-1] Sat Jun 18 11:03:28 2011 @@ -1,0 +1,40 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite stub functions for any-IRQL vsnprintf + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#undef wctomb +#include <stdarg.h> +#include <stdio.h> +#include <wchar.h> + +int __cdecl KmtWcToMb(char *mbchar, wchar_t wchar) +{ + *mbchar = wchar; + return 1; +} + +int __cdecl streamout(FILE *stream, const char *format, va_list argptr); + +int __cdecl KmtVSNPrintF(char *buffer, size_t count, const char *format, va_list argptr) +{ + int result; + FILE stream; + + stream._base = (char *)buffer; + stream._ptr = stream._base; + stream._charbuf = 0; + stream._cnt = count; + stream._bufsiz = 0; + stream._flag = _IOSTRG | _IOWRT; + stream._tmpfname = 0; + + result = streamout(&stream, format, argptr); + + /* Only zero terminate if there is enough space left */ + if (stream._cnt) *(char *)stream._ptr = '\0'; + + return result; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/printf_stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 52329: [FREELDR] - Convert Boot*LinuxKernel to new realmode call mechanism - Remove switch to realmode when multiboot fails - remove switch_to_prot and switch_to_real completely
by tkreuzer＠svn.reactos.org 18 Jun '11

18 Jun '11

Author: tkreuzer Date: Sat Jun 18 10:46:06 2011 New Revision: 52329 URL: http://svn.reactos.org/svn/reactos?rev=52329&view=rev Log: [FREELDR] - Convert Boot*LinuxKernel to new realmode call mechanism - Remove switch to realmode when multiboot fails - remove switch_to_prot and switch_to_real completely Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.cmake.S (with props) trunk/reactos/boot/freeldr/freeldr/arch/realmode/linux.inc Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/i386.S trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h 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 10:46:06 2011 @@ -15,11 +15,11 @@ arch/i386/i386trap.S arch/i386/i386pnp.cmake.S arch/i386/i386bug.c + arch/i386/linux.cmake.S arch/i386/mb.S) if(NOT MSVC) list(APPEND FREELDR_BASE64K_SOURCE arch/i386/drvmap.S - arch/i386/linux.S arch/i386/multiboot.S) else() list(APPEND FREELDR_BASE64K_SOURCE 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 10:46:06 2011 @@ -82,151 +82,6 @@ nop nop -#ifndef _USE_ML -/* - * Switches the processor to protected mode - * it destroys eax - */ -EXTERN(switch_to_prot) - -.code16 - - cli /* None of these */ - - /* We don't know what values are currently */ - /* in the segment registers. So we are */ - /* going to reload them with sane values. */ - /* Of course CS has to already be valid. */ - /* We are currently in real-mode so we */ - /* need real-mode segment values. */ - xor ax, ax - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Get the return address off the stack */ - pop word ptr ds:[code32ret] - - /* Save 16-bit stack pointer */ - mov word ptr ds:[stack16], sp - - /* Load the GDT */ - lgdt gdtptr - - /* Load the IDT */ - lidt i386idtptr - - /* Enable Protected Mode */ - mov eax, cr0 - or eax, CR0_PE_SET - mov cr0, eax - - /* Clear prefetch queue & correct CS */ - //ljmp PMODE_CS, inpmode - jmp far ptr PMODE_CS:inpmode - -.code32 - -inpmode: - /* Setup segment selectors */ - mov ax, PMODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - mov esp, dword ptr [stack32] - - /* Put the return address back onto the stack */ - push dword ptr [code32ret] - - /* Now return in p-mode! */ - ret - -/* - * Switches the processor back to real mode - * it destroys eax - */ -EXTERN(switch_to_real) - -.code32 - - /* We don't know what values are currently */ - /* in the segment registers. So we are */ - /* going to reload them with sane values. */ - /* Of course CS has to already be valid. */ - /* We are currently in protected-mode so we */ - /* need protected-mode segment values. */ - mov ax, PMODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Get the return address off the stack */ - pop dword ptr [code16ret] - - /* Save 32-bit stack pointer */ - mov dword ptr [stack32], esp - - /* jmp to 16-bit segment to set the limit correctly */ - ljmp RMODE_CS, switch_to_real16 - -switch_to_real16: -.code16 - - /* Restore segment registers to correct limit */ - mov ax, RMODE_DS - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Disable Protected Mode */ - mov eax, cr0 - and eax, CR0_PE_CLR - mov cr0, eax - - /* Clear prefetch queue & correct CS */ - //ljmp $0, $inrmode - jmp far ptr 0:inrmode - -inrmode: - mov ax, cs - mov ds, ax - mov es, ax - mov fs, ax - mov gs, ax - mov ss, ax - - /* Clear out the high 16-bits of ESP */ - /* This is needed because I have one */ - /* machine that hangs when booted to dos if */ - /* anything other than 0x0000 is in the high */ - /* 16-bits of ESP. Even though real-mode */ - /* code should only use SP and not ESP. */ - xor esp, esp - - mov sp, word ptr ds:[stack16] - - /* Put the return address back onto the stack */ - push word ptr ds:[code16ret] - - /* Load IDTR with real mode value */ - lidt rmode_idtptr - - sti /* These are ok now */ - - /* Now return in r-mode! */ - ret -#endif - -.code32 - Int386_regsin: .long 0 Int386_regsout: @@ -390,15 +245,6 @@ stack32: .long STACK32ADDR - /* 16-bit return address */ -code16ret: - .long 0 - - /* 32-bit return address */ -code32ret: - .long 0 - - .align 4 /* force 4-byte alignment */ gdt: /* NULL Descriptor */ Added: 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 (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.cmake.S [iso-8859-1] Sat Jun 18 10:46:06 2011 @@ -1,0 +1,53 @@ +/* + * FreeLoader + * Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <asm.inc> +#include <arch/pc/x86common.h> + +.code32 + +/* + * VOID BootOldLinuxKernel(ULONG KernelSize); + */ +PUBLIC _BootOldLinuxKernel +_BootOldLinuxKernel: + + /* First we have to copy the kernel down from 0x100000 to 0x10000 */ + /* The reason we can overwrite low memory is because this code */ + /* executes between 0000:8000 and 0000:FFFF. That leaves space for */ + /* 32k of code before we start interfering with Linux kernel address space. */ + + /* Get KernelSize in ECX and move the kernel down */ + mov ecx, [esp + 4] + mov esi, HEX(100000) + mov edi, HEX(10000) + rep movsb + + /* Fall through */ + +PUBLIC _BootNewLinuxKernel +_BootNewLinuxKernel: + + mov bx, FNID_BootLinuxKernel + call i386CallRealMode + + /* We should never get here */ + int 3 + +END Propchange: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.cmake.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/multiboot.S [iso-8859-1] Sat Jun 18 10:46:06 2011 @@ -163,9 +163,7 @@ call _BootMain mbfail: - call switch_to_real - .code16 - int 0x19 + int 3 mbstop: jmp mbstop /* We should never get here */ mb_info: 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 10:46:06 2011 @@ -139,6 +139,7 @@ .word PxeCallApi .word PnpBiosGetDeviceNodeCount .word PnpBiosGetDeviceNode + .word BootLinuxKernel /* 16-bit stack pointer */ @@ -191,6 +192,7 @@ #include "int386.inc" #include "pxe.inc" #include "pnp.inc" +#include "linux.inc" #include "helpers.inc" .org (FREELDR_PE_BASE - FREELDR_BASE - 1) Added: trunk/reactos/boot/freeldr/freeldr/arch/realmode/linux.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/linux.inc (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/linux.inc [iso-8859-1] Sat Jun 18 10:46:06 2011 @@ -1,0 +1,16 @@ + + +BootLinuxKernel: + // dl must be set to the boot drive + + /* Load segment registers */ + cli + mov bx, HEX(9000) + mov ds, bx + mov es, bx + mov fs, bx + mov gs, bx + mov ss, bx + mov sp, HEX(9000) + + ljmp16 HEX(9020), HEX(0000) 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 10:46:06 2011 @@ -49,6 +49,7 @@ #define FNID_PxeCallApi 3 #define FNID_PnpBiosGetDeviceNodeCount 4 #define FNID_PnpBiosGetDeviceNode 5 +#define FNID_BootLinuxKernel 6 /* Layout of the REGS structure */ #define REGS_EAX 0

1 0

[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

← Newer
1
...
14
15
16
17
18
19
20
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011