Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[tkreuzer] 53451: [FREELDR] - Implement switching back to real mode - use a symbolic name for the size of the REGGS structure
by tkreuzer＠svn.reactos.org 26 Aug '11

26 Aug '11

Author: tkreuzer Date: Fri Aug 26 09:15:38 2011 New Revision: 53451 URL: http://svn.reactos.org/svn/reactos?rev=53451&view=rev Log: [FREELDR] - Implement switching back to real mode - use a symbolic name for the size of the REGGS structure Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S trunk/reactos/boot/freeldr/freeldr/arch/i386/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Fri Aug 26 09:15:38 2011 @@ -9,20 +9,118 @@ PUBLIC RealEntryPoint RealEntryPoint: - //mov ax, LMODE_DS - //mov ds, ax + /* Setup segment selectors */ + mov ax, LMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax +// mov ss, ax + //mov word ptr [HEX(b8000)], HEX(0e00) + '1' + + /* Setup long mode stack */ + mov rsp, qword ptr [stack64] + + /* Continue execution */ + jmp qword ptr [ContinueAddress] + +ContinueAddress: + .double offset FrldrStartup + + +FrldrStartup: + + /* Store BootDrive and BootPartition */ + mov byte ptr [FrldrBootDrive], dl + xor eax, eax + mov al, dh + mov dword ptr [FrldrBootPartition], eax + + /* Patch long jump with real mode entry point */ + mov eax, dword ptr [BSS_RealModeEntry] + mov dword ptr [AddressOfRealModeEntryPoint], eax /* GO! */ xor rcx, rcx call BootMain + /* We should never get here */ +stop: + jmp stop + nop + nop + + +/* Internal function for realmode calls + * bx must be set to the ID of the realmode function to call. */ +PUBLIC CallRealMode +CallRealMode: + /* Save current stack pointer */ + mov qword ptr [stack64], rsp + + /* Set continue address and switch to real mode */ + lea rax, [CallRealMode_return] + mov qword ptr [ContinueAddress], rax + +SwitchToReal: + /* Set sane segments */ + mov ax, LMODE_DS + mov ds, ax + mov es, ax + mov fs, ax + mov gs, ax + //mov ss, ax + + mov word ptr [HEX(0b8008)], HEX(0e00) + '4' + + /* Save 64-bit stack pointer */ + mov qword ptr [stack64], rsp + + /* Step 1 - jump to compatibility segment */ + jmp fword ptr [jumpvector] + +jumpvector: + .long offset SwitchToRealCompSegment + .word CMODE_CS + +SwitchToRealCompSegment: + /* Note: In fact the CPU is in 32 bit mode here. But it will interprete + the generated instructions accordingly. rax will become eax */ + + /* Step 2 - deactivate long mode, by disabling paging */ + mov rax, cr0 + and eax, HEX(7fffffff) //~0x80000000, upper bits cleared + mov cr0, rax + +// mov word ptr [HEX(0b800a)], HEX(0e00) + '5' + + /* Step 3 - jump to 16-bit segment to set the limit correctly */ + .byte HEX(0EA) // 32bit long jmp +AddressOfRealModeEntryPoint: + .long 0 // receives address of RealModeEntryPoint + .word HEX(20)//RMODE_CS + nop + +CallRealMode_return: + /* restore stack pointer */ + mov rsp, qword ptr [stack64] + ret + +///////////////////////////////////////// + + + /* 64-bit stack pointer */ +stack64: + .double STACK64ADDR PUBLIC FrldrBootDrive FrldrBootDrive: + .byte 0 PUBLIC FrldrBootPartition FrldrBootPartition: + .long 0 PUBLIC PageDirectoryEnd PageDirectoryEnd: @@ -34,8 +132,57 @@ PnpBiosGetDeviceNodeCount: PUBLIC PnpBiosSupported PnpBiosSupported: + +/* int Int386(int ivec<ecx>, REGS* in<rdx>, REGS* out<r8>); */ PUBLIC Int386 Int386: + + /* Save home registers */ + mov r11, rsp + mov qword ptr [r11 + 8], rcx + mov qword ptr [r11 + 16], rdx + mov qword ptr [r11 + 24], r8 + + /* Save non-volatile registers */ + push rbx + push rbp + push rsi + push rdi + + /* Alloc stack space for home registers */ + sub rsp, 40 + //.ENDPROLOG + + mov word ptr [HEX(0b8006)], HEX(0e00) + '3' + + /* Copy the int vector to shared memory */ + mov dword ptr [BSS_IntVector], ecx + + /* Copy input registers */ + mov rsi, rdx + mov rdi, BSS_RegisterSet + mov rcx, REGS_SIZE / 4 + rep movsd + + /* Set the function ID and call real mode */ + mov bx, FNID_Int386 + call CallRealMode + + /* Copy output registers */ + mov rsi, BSS_RegisterSet + mov rdi, [r11 + 16] + mov rcx, REGS_SIZE / 4 + rep movsd + + /* cleanup and return */ + add rsp, 40 + pop rdi + pop rsi + pop rbp + pop rbx + ret + + PUBLIC PxeCallApi PxeCallApi: PUBLIC __lgdt 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] Fri Aug 26 09:15:38 2011 @@ -110,7 +110,7 @@ /* Copy input registers */ mov esi, dword ptr [Int386_regsin] mov edi, BSS_RegisterSet - mov ecx, 9 + mov ecx, REGS_SIZE / 4 rep movsd /* Set the function ID */ @@ -125,7 +125,7 @@ /* Copy output registers */ mov esi, BSS_RegisterSet mov edi, dword ptr [Int386_regsout] - mov ecx, 9 + mov ecx, REGS_SIZE / 4 rep movsd popa Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] Fri Aug 26 09:15:38 2011 @@ -100,14 +100,14 @@ Msg_SwitchToLongMode: .ascii "Switching to long mode....", CR, LF, NUL -.align 4 +.align 8 gdt: .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 00: NULL descriptor */ .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 08: */ .word HEX(0000), HEX(0000), HEX(9800), HEX(0020) /* 10: long mode cs */ .word HEX(ffff), HEX(0000), HEX(f300), HEX(00cf) /* 18: long mode ds */ - .word HEX(FFFF), HEX(0000), HEX(9E00), HEX(0000) /* 16-bit real mode CS */ - .word HEX(FFFF), HEX(0000), HEX(9200), HEX(0000) /* 16-bit real mode DS */ + .word HEX(FFFF), HEX(0000), HEX(9E00), HEX(0000) /* 20: 16-bit real mode CS */ + .word HEX(FFFF), HEX(0000), HEX(9200), HEX(0000) /* 28: 16-bit real mode DS */ .word HEX(FFFF), HEX(0000), HEX(9B00), HEX(00CF) /* 30: compat mode cs */ /* GDT table pointer */ @@ -232,7 +232,20 @@ /* This is the entry point from long mode */ RealModeEntryPoint: - + /* Disable Protected Mode */ + mov eax, cr0 + and eax, HEX(0fffffffe) // ~0x00000001 + mov cr0, eax + + /* Clear prefetch queue & correct CS */ + ljmp16 0, offset InRealMode + +InRealMode: + + mov ax, HEX(0b800) + mov es, ax + mov word ptr es:[12], HEX(0e00) + '6' + jmp $ ExitToLongMode: Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Fri Aug 26 09:15:38 2011 @@ -26,12 +26,6 @@ #undef KIP0PCRADDRESS #define KIP0PCRADDRESS 0xFFFFF78000001000ULL /* FIXME!!! */ -#define STACK64ADDR 0x74000 /* The 64-bit stack top will be at 0x74000 */ - -/* Long mode selectors */ -#define LMODE_CS 0x10 -#define LMODE_DS 0x18 - #define VA_MASK 0x0000FFFFFFFFFFFFUL #define PtrToPfn(p) \ 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] Fri Aug 26 09:15:38 2011 @@ -14,6 +14,7 @@ #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) #define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ +#define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */ #define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ #define FILESYSBUFFER HEX(80000) /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER HEX(90000) /* Buffer to store data read in from the disk via the BIOS */ @@ -21,6 +22,20 @@ #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ + +/* Layout of the REGS structure */ +#define REGS_EAX 0 +#define REGS_EBX 4 +#define REGS_ECX 8 +#define REGS_EDX 12 +#define REGS_ESI 16 +#define REGS_EDI 20 +#define REGS_DS 24 +#define REGS_ES 26 +#define REGS_FS 28 +#define REGS_GS 30 +#define REGS_EFLAGS 32 +#define REGS_SIZE 36 /* These addresses specify the realmode "BSS section" layout */ #define BSS_RealModeEntry (BSS_START + 0) @@ -52,19 +67,6 @@ #define FNID_PnpBiosGetDeviceNode 5 #define FNID_BootLinuxKernel 6 -/* Layout of the REGS structure */ -#define REGS_EAX 0 -#define REGS_EBX 4 -#define REGS_ECX 8 -#define REGS_EDX 12 -#define REGS_ESI 16 -#define REGS_EDI 20 -#define REGS_DS 24 -#define REGS_ES 26 -#define REGS_FS 28 -#define REGS_GS 30 -#define REGS_EFLAGS 32 - /* Flag Masks */ #define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */ #define CR0_PE_CLR HEX(FFFFFFFE) /* AND this value with CR0 to disable pmode */ @@ -80,6 +82,7 @@ /* Long mode selectors */ #define LMODE_CS HEX(10) #define LMODE_DS HEX(18) +#define CMODE_CS HEX(30) //#endif /* Makes "x" a global variable or label */

1 0

[jimtabor] 53450: [Win32k] - Move function out of the stub file.
by jimtabor＠svn.reactos.org 26 Aug '11

26 Aug '11

Author: jimtabor Date: Fri Aug 26 03:02:00 2011 New Revision: 53450 URL: http://svn.reactos.org/svn/reactos?rev=53450&view=rev Log: [Win32k] - Move function out of the stub file. Modified: trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Fri Aug 26 03:02:00 2011 @@ -14,6 +14,8 @@ extern ATOM AtomMessage; extern ATOM AtomWndObj; /* WNDOBJ list */ +extern ATOM AtomLayer; +extern ATOM AtomFlashWndState; BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri Aug 26 03:02:00 2011 @@ -742,54 +742,6 @@ { STUB; return 0; -} - -DWORD -APIENTRY -NtUserMinMaximize( - HWND hWnd, - UINT cmd, // Wine SW_ commands - BOOL Hide) -{ - RECTL NewPos; - UINT SwFlags; - PWND pWnd; - - TRACE("Enter NtUserMinMaximize\n"); - UserEnterExclusive(); - - pWnd = UserGetWindowObject(hWnd); - if ( !pWnd || // FIXME: - pWnd == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP - pWnd == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND - { - goto Exit; - } - - if ( cmd > SW_MAX || pWnd->state2 & WNDS2_INDESTROY) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - goto Exit; - } - - co_WinPosMinMaximize(pWnd, cmd, &NewPos); - - SwFlags = Hide ? SWP_NOACTIVATE|SWP_NOZORDER|SWP_FRAMECHANGED : SWP_NOZORDER|SWP_FRAMECHANGED; - - co_WinPosSetWindowPos( pWnd, - NULL, - NewPos.left, - NewPos.top, - NewPos.right, - NewPos.bottom, - SwFlags); - - co_WinPosShowWindow(pWnd, cmd); - -Exit: - TRACE("Leave NtUserMinMaximize\n"); - UserLeave(); - return 0; // Always NULL? } DWORD @@ -1055,23 +1007,6 @@ return 0; } -BOOL -APIENTRY -NtUserValidateTimerCallback( - HWND hWnd, - WPARAM wParam, - LPARAM lParam) -{ - BOOL Ret = FALSE; - - UserEnterShared(); - - Ret = ValidateTimerCallback(PsGetCurrentThreadWin32Thread(), lParam); - - UserLeave(); - return Ret; -} - DWORD APIENTRY NtUserRemoteConnect( @@ -1154,48 +1089,6 @@ STUB return 0; -} - -/* - * @implemented - */ -BOOL APIENTRY -NtUserFlashWindowEx(IN PFLASHWINFO pfwi) -{ - PWND pWnd; - FLASHWINFO finfo = {0}; - BOOL Ret = TRUE; - - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead(pfwi, sizeof(FLASHWINFO), sizeof(ULONG)); - RtlCopyMemory(&finfo, pfwi, sizeof(FLASHWINFO)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; - } - _SEH2_END - - if (!Ret) goto Exit; - - if (!(pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || - finfo.cbSize != sizeof(FLASHWINFO) || - finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) ) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - Ret = FALSE; - goto Exit; - } - - //Ret = IntFlashWindowEx(pWnd, &finfo); - -Exit: - UserLeave(); - return Ret; } /* Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Fri Aug 26 03:02:00 2011 @@ -951,6 +951,47 @@ END_CLEANUP; } +/* + * @implemented + */ +BOOL APIENTRY +NtUserFlashWindowEx(IN PFLASHWINFO pfwi) +{ + PWND pWnd; + FLASHWINFO finfo = {0}; + BOOL Ret = TRUE; + + UserEnterExclusive(); + + _SEH2_TRY + { + ProbeForRead(pfwi, sizeof(FLASHWINFO), sizeof(ULONG)); + RtlCopyMemory(&finfo, pfwi, sizeof(FLASHWINFO)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = FALSE; + } + _SEH2_END + + if (!Ret) goto Exit; + + if (!(pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || + finfo.cbSize != sizeof(FLASHWINFO) || + finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) ) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + Ret = FALSE; + goto Exit; + } + + //Ret = IntFlashWindowEx(pWnd, &finfo); + +Exit: + UserLeave(); + return Ret; +} INT FASTCALL co_UserGetUpdateRgn(PWND Window, HRGN hRgn, BOOL bErase) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Fri Aug 26 03:02:00 2011 @@ -684,5 +684,22 @@ END_CLEANUP; } +BOOL +APIENTRY +NtUserValidateTimerCallback( + HWND hWnd, + WPARAM wParam, + LPARAM lParam) +{ + BOOL Ret = FALSE; + + UserEnterShared(); + + Ret = ValidateTimerCallback(PsGetCurrentThreadWin32Thread(), lParam); + + UserLeave(); + return Ret; +} + /* 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] Fri Aug 26 03:02:00 2011 @@ -1944,6 +1944,54 @@ return Ret; } +DWORD +APIENTRY +NtUserMinMaximize( + HWND hWnd, + UINT cmd, // Wine SW_ commands + BOOL Hide) +{ + RECTL NewPos; + UINT SwFlags; + PWND pWnd; + + TRACE("Enter NtUserMinMaximize\n"); + UserEnterExclusive(); + + pWnd = UserGetWindowObject(hWnd); + if ( !pWnd || // FIXME: + pWnd == IntGetDesktopWindow() || // pWnd->fnid == FNID_DESKTOP + pWnd == IntGetMessageWindow() ) // pWnd->fnid == FNID_MESSAGEWND + { + goto Exit; + } + + if ( cmd > SW_MAX || pWnd->state2 & WNDS2_INDESTROY) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + goto Exit; + } + + co_WinPosMinMaximize(pWnd, cmd, &NewPos); + + SwFlags = Hide ? SWP_NOACTIVATE|SWP_NOZORDER|SWP_FRAMECHANGED : SWP_NOZORDER|SWP_FRAMECHANGED; + + co_WinPosSetWindowPos( pWnd, + NULL, + NewPos.left, + NewPos.top, + NewPos.right, + NewPos.bottom, + SwFlags); + + co_WinPosShowWindow(pWnd, cmd); + +Exit: + TRACE("Leave NtUserMinMaximize\n"); + UserLeave(); + return 0; // Always NULL? +} + /* * @implemented */

1 0

[jimtabor] 53449: - This seems to happen alot...
by jimtabor＠svn.reactos.org 26 Aug '11

26 Aug '11

Author: jimtabor Date: Fri Aug 26 01:54:21 2011 New Revision: 53449 URL: http://svn.reactos.org/svn/reactos?rev=53449&view=rev Log: - This seems to happen alot... Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Fri Aug 26 01:54:21 2011 @@ -654,7 +654,7 @@ EXTINLINE BOOL NtUserxValidateRgn(HWND hWnd, HRGN hRgn) { - return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); + return (BOOL)NtUserCallHwndParamLock(hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); } EXTINLINE BOOL NtUserxSetCursorPos(INT x, INT y)

1 0

[jimtabor] 53448: - Hax Fix rBuild.
by jimtabor＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: jimtabor Date: Thu Aug 25 23:57:24 2011 New Revision: 53448 URL: http://svn.reactos.org/svn/reactos?rev=53448&view=rev Log: - Hax Fix rBuild. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/int386.S [iso-8859-1] Thu Aug 25 23:57:24 2011 @@ -22,6 +22,9 @@ #include <arch/pc/x86common.h> +#define I386FLAG_CF HEX(0001) // Carry Flag +#define I386FLAG_ZF HEX(0040) // Zero Flag +#define I386FLAG_SF HEX(0080) // Sign Flag /* Only these flags are propagated into Int386() */ #define FLAGS_PROP (I386FLAG_CF | \ I386FLAG_ZF | \

1 0

[tfaber] 53447: [CMAKE] - Remove /nologo option from RC again - WDK's version doesn't support it - Add /nologo to MIDL's flags - Remove redundant IDL compiler declaration for GCC build
by tfaber＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tfaber Date: Thu Aug 25 22:32:57 2011 New Revision: 53447 URL: http://svn.reactos.org/svn/reactos?rev=53447&view=rev Log: [CMAKE] - Remove /nologo option from RC again - WDK's version doesn't support it - Add /nologo to MIDL's flags - Remove redundant IDL compiler declaration for GCC build Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/idl-support.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53447&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Aug 25 22:32:57 2011 @@ -191,15 +191,6 @@ "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>" PARENT_SCOPE) endfunction() -#idl files support -set(IDL_COMPILER native-widl) - -if(ARCH MATCHES i386) - set(IDL_FLAGS -m32 --win32) -elseif(ARCH MATCHES amd64) - set(IDL_FLAGS -m64 --win64) -endif() - function(add_delay_importlibs MODULE) foreach(LIB ${ARGN}) target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a) Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Thu Aug 25 22:32:57 2011 @@ -10,11 +10,11 @@ set(IDL_PROXY_ARG /proxy) set(IDL_INTERFACE_ARG /iid) if(ARCH MATCHES i386) - set(IDL_FLAGS /win32) + set(IDL_FLAGS /nologo /win32) elseif(ARCH MATCHES amd64) - set(IDL_FLAGS /amd64) + set(IDL_FLAGS /nologo /amd64) else() - set(IDL_FLAGS "") + set(IDL_FLAGS /nologo) endif() set(IDL_DEPENDS "") else() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53447… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Aug 25 22:32:57 2011 @@ -36,7 +36,7 @@ link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt) -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") if(MSVC_IDE) # Asm source files are not supported in VS generators yet. As a result, <DEFINES> isn't recognized. @@ -143,7 +143,7 @@ set(rc_result_incs "/I${arg} ${rc_result_incs}") endforeach() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) endfunction() # Thanks MS for creating a stupid linker

1 0

[fireball] 53446: [NTDLL/LDR] - Fix wrong loop condition which would often lead to heap underread. - Fix wrong subkey string length calculation, which would result in an incorrect string being used...
by fireball＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: fireball Date: Thu Aug 25 22:25:25 2011 New Revision: 53446 URL: http://svn.reactos.org/svn/reactos?rev=53446&view=rev Log: [NTDLL/LDR] - Fix wrong loop condition which would often lead to heap underread. - Fix wrong subkey string length calculation, which would result in an incorrect string being used to open an image specific key. - Don't close the key handle in LdrQueryImageFileKeyOption() because it's used more than once and closed after it's not needed anymore. - Use Zw* functions instead of Nt* where necessary in LdrQueryImageFileKeyOption(). - Per-image execution options work now (e.g. enabling DPH). Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Thu Aug 25 22:25:25 2011 @@ -144,14 +144,14 @@ /* Extract the name */ SubKeyString = *SubKey; p1 = (PWCHAR)((ULONG_PTR)SubKeyString.Buffer + SubKeyString.Length); - while (SubKey->Length) + while (SubKeyString.Length) { if (p1[-1] == L'\\') break; p1--; SubKeyString.Length -= sizeof(*p1); } SubKeyString.Buffer = p1; - SubKeyString.Length = SubKeyString.MaximumLength - SubKeyString.Length - sizeof(WCHAR); + SubKeyString.Length = SubKey->Length - SubKeyString.Length; /* Setup the object attributes */ InitializeObjectAttributes(&ObjectAttributes, @@ -192,7 +192,7 @@ if (!NT_SUCCESS(Status)) return Status; /* Query the value */ - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueNameString, KeyValuePartialInformation, KeyValueInformation, @@ -213,7 +213,7 @@ } /* Try again */ - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueNameString, KeyValuePartialInformation, KeyValueInformation, @@ -326,8 +326,7 @@ /* Check if buffer was in heap */ if (FreeHeap) RtlFreeHeap(RtlGetProcessHeap(), 0, KeyValueInformation); - /* Close key and return */ - NtClose(KeyHandle); + /* Return status */ return Status; }

1 0

[akhaldi] 53445: [NEWCC] * Fix rbuild build with NEWCC=0
by akhaldi＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: akhaldi Date: Thu Aug 25 17:23:31 2011 New Revision: 53445 URL: http://svn.reactos.org/svn/reactos?rev=53445&view=rev Log: [NEWCC] * Fix rbuild build with NEWCC=0 Modified: branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Thu Aug 25 17:23:31 2011 @@ -4750,7 +4750,9 @@ IN MMFLUSH_TYPE FlushType) { BOOLEAN Result = TRUE; +#ifdef NEWCC PMM_SECTION_SEGMENT Segment; +#endif switch(FlushType) { @@ -5000,7 +5002,7 @@ IO_STATUS_BLOCK Iosb; NTSTATUS Status; CHAR Buffer; - LARGE_INTEGER ByteOffset = {0}; + LARGE_INTEGER ByteOffset; Status = ZwReadFile (FileHandle, NULL,

1 0

[akhaldi] 53444: [NEWCC] * Fix rbuild build.
by akhaldi＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: akhaldi Date: Thu Aug 25 17:07:31 2011 New Revision: 53444 URL: http://svn.reactos.org/svn/reactos?rev=53444&view=rev Log: [NEWCC] * Fix rbuild build. Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/section/fault.c branches/arty-newcc/ntoskrnl/cache/section/sptab.c Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Thu Aug 25 17:07:31 2011 @@ -143,7 +143,7 @@ PNOCC_BCB Bcb = NULL; LARGE_INTEGER LowerBound, UpperBound; PLIST_ENTRY ListEntry; - IO_STATUS_BLOCK IOSB = {0}; + IO_STATUS_BLOCK IOSB = {{0}}; DPRINT("CcFlushCache (while file) (%s:%d)\n", File, Line); Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Thu Aug 25 17:07:31 2011 @@ -337,7 +337,14 @@ { ToWrite = MIN(UpperBound.QuadPart - LowerBound.QuadPart, (PAGE_SIZE - LowerBound.QuadPart) & (PAGE_SIZE - 1)); DPRINT("Zero last half %08x%08x %x\n", Target.u.HighPart, Target.u.LowPart, ToWrite); - Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, TRUE, &IOSB); + Status = MiSimpleRead(FileObject, + &Target, + ZeroBuf, + PAGE_SIZE, +#ifdef __ROS_CMAKE__ + TRUE, +#endif + &IOSB); if (!NT_SUCCESS(Status)) { ExFreePool(ZeroBuf); @@ -373,7 +380,14 @@ { ToWrite = UpperBound.QuadPart - Target.QuadPart; DPRINT("Zero first half %08x%08x %x\n", Target.u.HighPart, Target.u.LowPart, ToWrite); - Status = MiSimpleRead(FileObject, &Target, ZeroBuf, PAGE_SIZE, TRUE, &IOSB); + Status = MiSimpleRead(FileObject, + &Target, + ZeroBuf, + PAGE_SIZE, +#ifdef __ROS_CMAKE__ + TRUE, +#endif + &IOSB); if (!NT_SUCCESS(Status)) { ExFreePool(ZeroBuf); Modified: branches/arty-newcc/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] Thu Aug 25 17:07:31 2011 @@ -394,7 +394,7 @@ NTSTATUS Status; BOOLEAN Locked = FromMdl; MM_REQUIRED_RESOURCES Resources = { 0 }; - WORK_QUEUE_WITH_CONTEXT Context = { 0 }; + WORK_QUEUE_WITH_CONTEXT Context; DPRINT("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); @@ -587,7 +587,7 @@ BOOLEAN Locked = FromMdl; PMEMORY_AREA MemoryArea; MM_REQUIRED_RESOURCES Resources = { 0 }; - WORK_QUEUE_WITH_CONTEXT Context = { 0 }; + WORK_QUEUE_WITH_CONTEXT Context; NTSTATUS Status = STATUS_SUCCESS; if (!FromMdl) Modified: branches/arty-newcc/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] Thu Aug 25 17:07:31 2011 @@ -105,7 +105,7 @@ PLARGE_INTEGER FileOffset) { LARGE_INTEGER SearchFileOffset; - CACHE_SECTION_PAGE_TABLE SectionZeroPageTable = {0}; + CACHE_SECTION_PAGE_TABLE SectionZeroPageTable; PCACHE_SECTION_PAGE_TABLE PageTableSlice = MiSectionPageTableGet(Table, FileOffset); if (!PageTableSlice)

1 0

[tkreuzer] 53443: [FREELDR] - Implement real mode entry point for amd64 (amd64 freeldr starts but dies later, it cannot yet switch back to real mode, which is a bit more complicated) - delete empty...
by tkreuzer＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: tkreuzer Date: Thu Aug 25 14:43:15 2011 New Revision: 53443 URL: http://svn.reactos.org/svn/reactos?rev=53443&view=rev Log: [FREELDR] - Implement real mode entry point for amd64 (amd64 freeldr starts but dies later, it cannot yet switch back to real mode, which is a bit more complicated) - delete empty folders Removed: trunk/reactos/boot/freeldr/freeldr/windows/amd64/ trunk/reactos/boot/freeldr/freeldr/windows/arm/ trunk/reactos/boot/freeldr/freeldr/windows/i386/ Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.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] Thu Aug 25 14:43:15 2011 @@ -1,7 +1,12 @@ -if(ARCH MATCHES i386 OR ARCH MATCHES amd64) +if(ARCH MATCHES i386) CreateBootSectorTarget2(frldr16 ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S + ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin + F800) +elseif(ARCH MATCHES amd64) + CreateBootSectorTarget2(frldr16 + ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/amd64.S ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin F800) endif() Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Thu Aug 25 14:43:15 2011 @@ -3,10 +3,20 @@ #include <asm.inc> #include <arch/pc/x86common.h> +EXTERN BootMain:PROC + .code64 PUBLIC RealEntryPoint RealEntryPoint: + //mov ax, LMODE_DS + //mov ds, ax + //mov word ptr [HEX(b8000)], HEX(0e00) + '1' + + /* GO! */ + xor rcx, rcx + call BootMain + PUBLIC FrldrBootDrive FrldrBootDrive: Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/amd64.S [iso-8859-1] Thu Aug 25 14:43:15 2011 @@ -1,8 +1,8 @@ #include <asm.inc> -#include <arch/pc/x86common.h> - -#define IMAGE_DOS_HEADER_e_lfanew 36 +#include "../../include/arch/pc/x86common.h" + +#define IMAGE_DOS_HEADER_e_lfanew 60 #define IMAGE_FILE_HEADER_SIZE 20 #define IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint 16 @@ -13,7 +13,7 @@ #include "fathelp.inc" .org 512 -RealEntryPoint: +Startup: cli @@ -25,41 +25,98 @@ mov gs, ax mov ss, ax - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint0 - call writestr - /* Setup a real mode stack */ - mov sp, stack16 - - /* Zero BootDrive and BootPartition */ - xor eax, eax - mov BootDrive, eax - mov BootPartition, eax - - /* Store the boot drive */ - mov BootDrive, dl - - /* Store the boot partition */ - mov BootPartition, dh + mov sp, word ptr ds:[stack16] + + /* Output first status */ + mov si, offset Msg_Starting + call writestr + + /* Enable A20 address line */ + call EnableA20 + + /* Check the CPU */ + call CheckFor64BitSupport + test al, al + jnz .LongModeSupported + + /* Output failure message */ + mov si, offset Msg_Unsupported + call writestr + + /* Wait for a keypress */ + int HEX(16) + jmp SoftReboot + +Msg_Unsupported: + .ascii "This CPU is not supported.", CR, LF + .ascii "Press any key to reboot...", NUL + +Msg_Starting: + .ascii "Starting FreeLoader...", CR, LF, NUL + +Msg_LongModeSupported: + .ascii "Long mode support detected.", CR, LF, NUL + +.LongModeSupported: + /* Output status */ + mov si, offset Msg_LongModeSupported + call writestr /* Load the GDT */ - lgdt gdtptr - /* Load the IDT */ -// lidt idtptr - - call x86_16_EnableA20 - - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint1 - call writestr - - call x86_16_BuildPageTables - - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint2 - call writestr - + lgdt fword ptr [gdtptr] + + /* Build the startup page tables */ + call BuildPageTables + + /* Safe real mode entry point in shared memory */ + mov dword ptr ds:[BSS_RealModeEntry], offset RealModeEntryPoint + + /* Address the image with es segment */ + mov ax, FREELDR_PE_BASE / 16 + mov es, ax + + /* Get address of optional header */ + 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 es:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] + add eax, FREELDR_PE_BASE + + /* Save entry point */ + mov dword ptr ds:[LongModeEntryPoint], eax + + /* Restore es */ + xor ax, ax + mov es, ax + + /* Output status */ + mov si, offset Msg_SwitchToLongMode + call writestr + + jmp ExitToLongMode + +Msg_SwitchToLongMode: + .ascii "Switching to long mode....", CR, LF, NUL + +.align 4 +gdt: + .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 00: NULL descriptor */ + .word HEX(0000), HEX(0000), HEX(0000), HEX(0000) /* 08: */ + .word HEX(0000), HEX(0000), HEX(9800), HEX(0020) /* 10: long mode cs */ + .word HEX(ffff), HEX(0000), HEX(f300), HEX(00cf) /* 18: long mode ds */ + .word HEX(FFFF), HEX(0000), HEX(9E00), HEX(0000) /* 16-bit real mode CS */ + .word HEX(FFFF), HEX(0000), HEX(9200), HEX(0000) /* 16-bit real mode DS */ + .word HEX(FFFF), HEX(0000), HEX(9B00), HEX(00CF) /* 30: compat mode cs */ + +/* GDT table pointer */ +gdtptr: + .word HEX(37) /* Limit */ + .long offset gdt /* Base Address */ + + +CheckFor64BitSupport: /* Check if CPU supports CPUID */ pushfd pop eax @@ -70,107 +127,97 @@ pushfd pop eax cmp eax,ebx - jz no_cpuid_support_detected - + jnz .CheckForPAE + + mov si, offset .Msg_NoCpuidSupport + call writestr + xor al, al + ret + +.Msg_NoCpuidSupport: + .ascii "The system doesn't support CPUID.", CR, LF, NUL + +.CheckForPAE: /* CPUID support detected - getting the PAE/PGE */ - mov eax,1 // Fn0000_0001 - PAE in EDX[6] cpuid - xor eax,eax and edx, HEX(00a0) - test edx,edx // are PAE and PGE bits set? - jz no_x64_support_detected - - /* PAE and PGE are here */ - + cmp edx, HEX(00a0) + je .CheckForLongMode + + mov si, offset .Msg_NoPAE + call writestr + xor al, al + ret + +.Msg_NoPAE: + .ascii "PAE or PGE not set.", CR, LF, NUL + +.CheckForLongMode: xor edx, edx mov eax, HEX(80000001) cpuid and edx, HEX(20000000) test edx,edx - jz no_x64_support_detected - - /* X64 Processor */ - - /* checkPoint Charlie - where it all began... */ - mov si, offset CheckPoint3 - call writestr - - /* 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 - - /* Get address of entry point */ - mov eax, dword ptr ds:[eax + IMAGE_OPTIONAL_HEADER_AddressOfEntryPoint] - - /* Store the address in the callback return variable */ - mov dword ptr ds:[CallbackReturnAddress], eax - -switch64: - mov - jmp x86_16_ReturnToLong - - -no_x64_support_detected: - mov si, offset NotAnX64Processor // Loading message - call writestr - jmp fail - -no_cpuid_support_detected: - mov si, offset NoCPUIDSupport // Loading message - call writestr - -fail: - jmp fail - nop - nop - -/* - * We define 512 2MB pages at the start of memory, so we can access the first - * 1 GB as if paging was disabled - */ -x86_16_BuildPageTables: + jnz .Success + + mov si, offset .Msg_NoLongMode + call writestr + xor al, al + ret + +.Msg_NoLongMode: + .ascii "Long mode is not supported.", CR, LF, NUL + +.Success: + xor al, al + inc al + ret + + +BuildPageTables: pusha push es - /* Get segment of pml4 */ - mov eax, offset pml4_startup - shr eax, 4 + /* Get segment of the PML4 */ + mov eax, PML4_ADDRESS / 16 mov es, ax cld xor di, di /* One entry in the PML4 pointing to PDP */ - mov eax, offset pdp_startup - or eax, HEX(00f) + mov eax, PDP_ADDRESS + or eax, HEX(0f) stosd + /* clear rest */ xor eax, eax - mov cx, HEX(03ff) + mov cx, 1023 rep stosd /* One entry in the PDP pointing to PD */ - mov eax, offset pd_startup - or eax, HEX(00f) + mov eax, PD_ADDRESS + or eax, HEX(0f) stosd + /* clear rest */ xor eax, eax - mov ecx, HEX(03ff) + mov ecx, 1023 rep stosd - /* 512 entries in the PD defining a 2MB page each */ + /* 512 entries in the PD, each defining a 2MB page each */ mov ecx, 512 mov eax, HEX(008f) -Bpt2: +.Bpt2: mov es: [di], eax mov dword ptr es: [di + 4], 0 - add eax, 512 << 12 // add 512 4k pages + add eax, 512 * 4096 // add 512 4k pages add di, 8 - /* Loop it */ + /* Loop all PDEs */ dec cx - jnz Bpt2 + jnz .Bpt2 /* Return */ pop es @@ -178,13 +225,21 @@ ret - - - -x86_16_ReturnToLong: - - cli - +/******************************************************************************/ + +#define MSR_EFER HEX(C0000080) +#define LMODE_CS HEX(10) + +/* This is the entry point from long mode */ +RealModeEntryPoint: + + + +ExitToLongMode: + /* Disable interrupts */ + cli + + /* Set correct segment registers */ xor ax,ax mov ds,ax mov es,ax @@ -192,34 +247,57 @@ mov gs,ax mov ss,ax - /* Get the return address off the stack */ - pop word ptr code64ret - - /* Save 16-bit stack pointer */ - mov stack16, sp - - mov eax, 0x00a0 // Set PAE and PGE: 10100000b + /* Safe current stack pointer */ + mov word ptr ds:[stack16], sp + + /* Set PAE and PGE: 10100000b */ + mov eax, HEX(00a0) mov cr4, eax - mov edx, offset pml4_startup // Point cr3 at PML4 + /* Point cr3 at the PML4 */ + mov edx, PML4_ADDRESS mov cr3, edx - mov ecx, HEX(0C0000080) // Specify EFER MSR - - rdmsr // Enable long mode + + /* Enable long mode */ + mov ecx, MSR_EFER + rdmsr or eax, HEX(00000100) wrmsr - mov ebx, cr0 // Activate long mode - or ebx, HEX(080000001) // by enabling paging and protection simultaneously - mov cr0, ebx // skipping protected mode entirely - - //jmp LMODE_CS:offset LongCat //Load CS with 64 bit segment and flush the instruction cache - // Do a long jmp to the CallbackReturn address + /* Activate long mode by enabling paging and protection simultaneously, + skipping protected mode entirely */ + mov ebx, cr0 + or ebx, HEX(80000001) + mov cr0, ebx + + /* Clear prefetch queue & correct CS */ + ljmp16 LMODE_CS, InLongMode +InLongMode: + DB 66h, 0B8h, 18h, 00h // mov ax, LMODE_DS + DB 66h, 8Eh, 0D8h // mov ds, ax + DB 66h, 66h, 0C7h, 04h, 25h, 00h, 80h, 0Bh, 00h, 31h, 0Eh + //mov word ptr [HEX(b8000)], HEX(0e00) + '1' + + .byte HEX(0ff), HEX(25) // opcode of indirect jump + .long 1 // relative address of LongModeEntryPoint + nop +LongModeEntryPoint: + .long 0, 0 + + int HEX(16) + jmp SoftReboot + + + /* 16-bit stack pointer */ +stack16: + .word STACK16ADDR #include "helpers.inc" +.org (FREELDR_PE_BASE - FREELDR_BASE - 1) +.byte 0 .endcode16 END 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] Thu Aug 25 14:43:15 2011 @@ -4,6 +4,11 @@ #endif /* Memory layout */ +//#ifdef _M_AMD64 +#define PML4_ADDRESS HEX(1000) /* One page PML4 page table */ +#define PDP_ADDRESS HEX(2000) /* One page PDP page table */ +#define PD_ADDRESS HEX(3000) /* One page PD page table */ +//#endif #define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ #define BSS_START HEX(6F00) #define FREELDR_BASE HEX(F800) @@ -60,21 +65,7 @@ #define REGS_GS 30 #define REGS_EFLAGS 32 - -// Flag Masks -#define I386FLAG_CF HEX(0001) // Carry Flag -#define I386FLAG_RESV1 HEX(0002) // Reserved - Must be 1 -#define I386FLAG_PF HEX(0004) // Parity Flag -#define I386FLAG_RESV2 HEX(0008) // Reserved - Must be 0 -#define I386FLAG_AF HEX(0010) // Auxiliary Flag -#define I386FLAG_RESV3 HEX(0020) // Reserved - Must be 0 -#define I386FLAG_ZF HEX(0040) // Zero Flag -#define I386FLAG_SF HEX(0080) // Sign Flag -#define I386FLAG_TF HEX(0100) // Trap Flag (Single Step) -#define I386FLAG_IF HEX(0200) // Interrupt Flag -#define I386FLAG_DF HEX(0400) // Direction Flag -#define I386FLAG_OF HEX(0800) // Overflow Flag - +/* Flag Masks */ #define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */ #define CR0_PE_CLR HEX(FFFFFFFE) /* AND this value with CR0 to disable pmode */ @@ -85,6 +76,10 @@ #define PMODE_DS HEX(10) /* PMode data selector, base 0 limit 4g */ #define RMODE_CS HEX(18) /* RMode code selector, base 0 limit 64k */ #define RMODE_DS HEX(20) /* RMode data selector, base 0 limit 64k */ +//#else +/* Long mode selectors */ +#define LMODE_CS HEX(10) +#define LMODE_DS HEX(18) //#endif /* Makes "x" a global variable or label */

1 0

[akhaldi] 53442: [NEWCC] * MSVC fixes.
by akhaldi＠svn.reactos.org 25 Aug '11

25 Aug '11

Author: akhaldi Date: Thu Aug 25 12:38:41 2011 New Revision: 53442 URL: http://svn.reactos.org/svn/reactos?rev=53442&view=rev Log: [NEWCC] * MSVC fixes. Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c branches/arty-newcc/ntoskrnl/cache/fssup.c branches/arty-newcc/ntoskrnl/cache/pinsup.c branches/arty-newcc/ntoskrnl/cache/section/fault.c branches/arty-newcc/ntoskrnl/cache/section/sptab.c branches/arty-newcc/ntoskrnl/cache/section/swapout.c branches/arty-newcc/ntoskrnl/mm/section.c Modified: branches/arty-newcc/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/cache… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/cachesub.c [iso-8859-1] Thu Aug 25 12:38:41 2011 @@ -143,7 +143,7 @@ PNOCC_BCB Bcb = NULL; LARGE_INTEGER LowerBound, UpperBound; PLIST_ENTRY ListEntry; - IO_STATUS_BLOCK IOSB = { }; + IO_STATUS_BLOCK IOSB = {0}; DPRINT("CcFlushCache (while file) (%s:%d)\n", File, Line); @@ -287,7 +287,8 @@ NTAPI CcShutdownSystem() { - ULONG i; + ULONG i, Result; + NTSTATUS Status; DPRINT1("CC: Shutdown\n"); @@ -308,8 +309,7 @@ } // Evict all section pages - ULONG Result; - NTSTATUS Status = MiRosTrimCache(~0, 0, &Result); + Status = MiRosTrimCache(~0, 0, &Result); DPRINT1("Done (Evicted %d, Status %x)\n", Result, Status); } Modified: branches/arty-newcc/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/fssup… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/fssup.c [iso-8859-1] Thu Aug 25 12:38:41 2011 @@ -250,10 +250,12 @@ CcSetFileSizes(IN PFILE_OBJECT FileObject, IN PCC_FILE_SIZES FileSizes) { - PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + PNOCC_BCB Bcb; + PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)FileObject->SectionObjectPointer->SharedCacheMap; + if (!Map) return; Map->FileSizes = *FileSizes; - PNOCC_BCB Bcb = Map->AssociatedBcb.Flink == &Map->AssociatedBcb ? + Bcb = Map->AssociatedBcb.Flink == &Map->AssociatedBcb ? NULL : CONTAINING_RECORD(Map->AssociatedBcb.Flink, NOCC_BCB, ThisFileList); if (!Bcb) return; MmExtendCacheSection(Bcb->SectionObject, &FileSizes->FileSize, FALSE); Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Thu Aug 25 12:38:41 2011 @@ -310,7 +310,7 @@ /* Note: windows 2000 drivers treat this as a bool */ //BOOLEAN Wait = (Flags & MAP_WAIT) || (Flags == TRUE); LARGE_INTEGER Target, EndInterval; - ULONG BcbHead; + ULONG BcbHead, SectionSize, ViewSize; PNOCC_BCB Bcb = NULL; PROS_SECTION_OBJECT SectionObject = NULL; NTSTATUS Status; @@ -355,8 +355,6 @@ goto cleanup; } - ULONG SectionSize; - DPRINT("File size %08x%08x\n", Map->FileSizes.ValidDataLength.HighPart, Map->FileSizes.ValidDataLength.LowPart); if (Map->FileSizes.ValidDataLength.QuadPart) @@ -421,7 +419,7 @@ } DPRINT("Selected BCB #%x\n", BcbHead); - ULONG ViewSize = CACHE_STRIPE; + ViewSize = CACHE_STRIPE; Bcb = &CcCacheSections[BcbHead]; Status = MmMapCacheViewInSystemSpaceAtOffset Modified: branches/arty-newcc/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/fault.c [iso-8859-1] Thu Aug 25 12:38:41 2011 @@ -238,6 +238,7 @@ PVOID PAddress; LARGE_INTEGER Offset; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + ULONG Entry; DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked); @@ -269,7 +270,7 @@ { DPRINTC("file %wZ\n", &Segment->FileObject->FileName); } - ULONG Entry = MmGetPageEntrySectionSegment(Segment, &Offset); + Entry = MmGetPageEntrySectionSegment(Segment, &Offset); DPRINT("Entry %x\n", Entry); if (Entry && !IS_SWAP_FROM_SSE(Entry) && @@ -393,6 +394,7 @@ NTSTATUS Status; BOOLEAN Locked = FromMdl; MM_REQUIRED_RESOURCES Resources = { 0 }; + WORK_QUEUE_WITH_CONTEXT Context = { 0 }; DPRINT("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); @@ -476,7 +478,6 @@ { if (Thread->ActiveFaultCount > 0) { - WORK_QUEUE_WITH_CONTEXT Context = { }; DPRINT("Already fault handling ... going to work item (%x)\n", Address); Context.AddressSpace = AddressSpace; Context.MemoryArea = MemoryArea; @@ -586,6 +587,7 @@ BOOLEAN Locked = FromMdl; PMEMORY_AREA MemoryArea; MM_REQUIRED_RESOURCES Resources = { 0 }; + WORK_QUEUE_WITH_CONTEXT Context = { 0 }; NTSTATUS Status = STATUS_SUCCESS; if (!FromMdl) @@ -657,7 +659,6 @@ { if (Thread->ActiveFaultCount > 2) { - WORK_QUEUE_WITH_CONTEXT Context = { }; DPRINTC("Already fault handling ... going to work item (%x)\n", Address); Context.AddressSpace = AddressSpace; Context.MemoryArea = MemoryArea; Modified: branches/arty-newcc/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/sptab.c [iso-8859-1] Thu Aug 25 12:38:41 2011 @@ -105,11 +105,11 @@ PLARGE_INTEGER FileOffset) { LARGE_INTEGER SearchFileOffset; + CACHE_SECTION_PAGE_TABLE SectionZeroPageTable = {0}; PCACHE_SECTION_PAGE_TABLE PageTableSlice = MiSectionPageTableGet(Table, FileOffset); if (!PageTableSlice) { - CACHE_SECTION_PAGE_TABLE SectionZeroPageTable = { }; SearchFileOffset.QuadPart = ROUND_DOWN(FileOffset->QuadPart, ENTRIES_PER_ELEMENT * PAGE_SIZE); SectionZeroPageTable.FileOffset = SearchFileOffset; SectionZeroPageTable.Refcount = 1; Modified: branches/arty-newcc/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/secti… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/section/swapout.c [iso-8859-1] Thu Aug 25 12:38:41 2011 @@ -247,6 +247,7 @@ PEPROCESS Process = NULL; NTSTATUS Status = STATUS_SUCCESS; MM_REQUIRED_RESOURCES Resources = { 0 }; + ULONG RefCount; DPRINTC("Page out %x (ref ct %x)\n", Page, MmGetReferenceCountPage(Page)); @@ -438,7 +439,6 @@ } // Alas, we had the last reference - ULONG RefCount; if ((RefCount = InterlockedDecrementUL(&Segment->ReferenceCount)) == 0) MmFinalizeSegment(Segment); } Modified: branches/arty-newcc/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section.c [iso-8859-1] Thu Aug 25 12:38:41 2011 @@ -1197,7 +1197,8 @@ * Page - Variable that receives a page contains the read data. */ { - MM_REQUIRED_RESOURCES Resources = { }; + MM_REQUIRED_RESOURCES Resources = {0}; + NTSTATUS Status; Resources.Context = MemoryArea->Data.SectionData.Section->FileObject; Resources.FileOffset.QuadPart = SegOffset + @@ -1205,7 +1206,7 @@ Resources.Consumer = MC_USER; Resources.Amount = PAGE_SIZE; DPRINT("%S, offset %x, len %d, page %x\n", ((PFILE_OBJECT)Resources.Context)->FileName.Buffer, Resources.FileOffset.LowPart, Resources.Amount, Resources.Page[0]); - NTSTATUS Status = MiReadFilePage(NULL, NULL, &Resources); + Status = MiReadFilePage(NULL, NULL, &Resources); *Page = Resources.Page[0]; return Status; } @@ -4748,6 +4749,9 @@ MmFlushImageSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, IN MMFLUSH_TYPE FlushType) { + BOOLEAN Result = TRUE; + PMM_SECTION_SEGMENT Segment; + switch(FlushType) { case MmFlushForDelete: @@ -4763,10 +4767,8 @@ case MmFlushForWrite: { DPRINT("MmFlushImageSection(%d)\n", FlushType); - BOOLEAN Result = TRUE; #ifdef NEWCC - PMM_SECTION_SEGMENT Segment = - (PMM_SECTION_SEGMENT)SectionObjectPointer->DataSectionObject; + Segment = (PMM_SECTION_SEGMENT)SectionObjectPointer->DataSectionObject; #endif if (SectionObjectPointer->ImageSectionObject) { @@ -4998,7 +5000,7 @@ IO_STATUS_BLOCK Iosb; NTSTATUS Status; CHAR Buffer; - LARGE_INTEGER ByteOffset = { }; + LARGE_INTEGER ByteOffset = {0}; Status = ZwReadFile (FileHandle, NULL,

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
50
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 August 2011