Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 45343: Add exception codes for asm
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 14:21:28 2010 New Revision: 45343 URL: http://svn.reactos.org/svn/reactos?rev=45343&view=rev Log: Add exception codes for asm Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Sat Jan 30 14:21:28 2010 @@ -309,7 +309,27 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 // -// NTSTATUS and Bugcheck Codes +// Exception codes +// +#define EXCEPTION_DIVIDED_BY_ZERO 0x00000 +#define EXCEPTION_DEBUG 0x00001 +#define EXCEPTION_NMI 0x00002 +#define EXCEPTION_INT3 0x00003 +#define EXCEPTION_BOUND_CHECK 0x00005 +#define EXCEPTION_INVALID_OPCODE 0x00006 +#define EXCEPTION_NPX_NOT_AVAILABLE 0x00007 +#define EXCEPTION_DOUBLE_FAULT 0x00008 +#define EXCEPTION_NPX_OVERRUN 0x00009 +#define EXCEPTION_INVALID_TSS 0x0000A +#define EXCEPTION_SEGMENT_NOT_PRESENT 0x0000B +#define EXCEPTION_STACK_FAULT 0x0000C +#define EXCEPTION_GP_FAULT 0x0000D +#define EXCEPTION_RESERVED_TRAP 0x0000F +#define EXCEPTION_NPX_ERROR 0x00010 +#define EXCEPTION_ALIGNMENT_CHECK 0x00011 + +// +// NTSTATUS values // #define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_IN_PAGE_ERROR 0xC0000006 @@ -336,6 +356,11 @@ #define STATUS_FLOAT_UNDERFLOW 0xC0000093 #define STATUS_FLOAT_MULTIPLE_FAULTS 0xC00002B4 #define STATUS_FLOAT_MULTIPLE_TRAPS 0xC00002B5 +#define STATUS_ASSERTION_FAILURE 0xC0000420 + +// +// Bugcheck Codes +// #define APC_INDEX_MISMATCH 0x01 #define IRQL_NOT_GREATER_OR_EQUAL 0x09 #define IRQL_NOT_LESS_OR_EQUAL 0x0A

1 0

[fireball] 45342: - Disable hacked-up SwitchDesktop implementation for now. During shutdown, winlogon tries to switch to the winlogon (the same and only) desktop which results in a RedrawWindow sending a message to a CSR desktop window which is probably already in the process of being destroyed. Fixes a hang during shutdown (issue #27 in the wiki).
by fireball＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: fireball Date: Sat Jan 30 14:10:29 2010 New Revision: 45342 URL: http://svn.reactos.org/svn/reactos?rev=45342&view=rev Log: - Disable hacked-up SwitchDesktop implementation for now. During shutdown, winlogon tries to switch to the winlogon (the same and only) desktop which results in a RedrawWindow sending a message to a CSR desktop window which is probably already in the process of being destroyed. Fixes a hang during shutdown (issue #27 in the wiki). Modified: branches/arwinss/reactos/dll/win32/user32/win.c Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Sat Jan 30 14:10:29 2010 @@ -3315,7 +3315,7 @@ hWnd = GetDesktopWindow(/*hDesktop*/); FIXME("SwitchDesktop(hDesktop %p, desk window %x) stub!\n", hDesktop, hWnd); - +#if 0 /* Set foreground window */ SetForegroundWindow(hWnd); @@ -3328,7 +3328,7 @@ UpdateWindow(hWnd); RedrawWindow(NULL, NULL, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ERASENOW | RDW_ALLCHILDREN); - +#endif return TRUE; }

1 0

[jimtabor] 45341: [User32] - More movement to WND support.
by jimtabor＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: jimtabor Date: Sat Jan 30 07:41:39 2010 New Revision: 45341 URL: http://svn.reactos.org/svn/reactos?rev=45341&view=rev Log: [User32] - More movement to WND support. Modified: trunk/reactos/dll/win32/user32/windows/paint.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Sat Jan 30 07:41:39 2010 @@ -37,9 +37,20 @@ static HBITMAP hHatch; const DWORD HatchBitmap[4] = {0x5555AAAA, 0x5555AAAA, 0x5555AAAA, 0x5555AAAA}; +BOOL WINAPI MirrorRgn(HWND hwnd, HRGN hrgn); BOOL WINAPI PolyPatBlt(HDC,DWORD,PPATRECT,INT,ULONG); /* FUNCTIONS *****************************************************************/ + +INT +WINAPI +MirrorWindowRect( PWND pWnd, LPRECT lprc) +{ + INT Ret = pWnd->rcWindow.right - pWnd->rcWindow.left - lprc->left; + lprc->left = pWnd->rcWindow.right - pWnd->rcWindow.left - lprc->right; + lprc->right = Ret; + return Ret; +} VOID CreateFrameBrushes(VOID) @@ -91,7 +102,24 @@ LPRECT Rect, BOOL Erase) { - return NtUserGetUpdateRect(Wnd, Rect, Erase); + PWND pWnd; + + pWnd = ValidateHwnd(Wnd); + if (!pWnd) + return FALSE; +/* + if ( pWnd->hrgnUpdate || + pWnd->state & (WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT|WNDS_UPDATEDIRTY|WNDS_PAINTNOTPROCESSED)) + {*/ + return NtUserGetUpdateRect(Wnd, Rect, Erase); +/* } + + if (Rect) + { // Did the Rgn update? No! Back set and shutup! + Rect->left = Rect->right = Rect->top = Rect->bottom = 0; + } + return FALSE; // msdn: "If there is no update region, the return value is zero." +*/ } @@ -105,7 +133,25 @@ HRGN hRgn, BOOL bErase) { - return NtUserGetUpdateRgn(hWnd, hRgn, bErase); + PWND pWnd; + + if (!hRgn) + { + SetLastError(ERROR_INVALID_HANDLE); + return ERROR; + } + + pWnd = ValidateHwnd(hWnd); + if (!pWnd) + return ERROR; +/* + if ( pWnd->hrgnUpdate || + pWnd->state & (WNDS_SENDERASEBACKGROUND|WNDS_SENDNCPAINT|WNDS_UPDATEDIRTY|WNDS_PAINTNOTPROCESSED)) + {*/ + return NtUserGetUpdateRgn(hWnd, hRgn, bErase); +/* } + SetRectRgn(hRgn, 0, 0, 0, 0); + return NULLREGION;*/ } @@ -224,7 +270,31 @@ HWND hWnd, HRGN hRgn) { - return (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_GETWINDOWRGN); + PWND pWnd; + int Ret; + + if (!hRgn) + return ERROR; + + pWnd = ValidateHwnd(hWnd); + + if (!pWnd) // || !pwnd->hrgnClip || pwnd->state2 & WNDS2_MAXIMIZEDMONITORREGION) + return ERROR; +/* + Ret = CombineRgn(hRgn, pWnd->hrgnClip, NULL, RGN_COPY); + + if (!Ret) + return ERROR; + + if (pWnd->fnid != FNID_DESKTOP) + Ret = OffsetRgn(hRgn, -pWnd->rcWindow.left, -pWnd->rcWindow.top); + + if (pWnd->ExStyle & WS_EX_LAYOUTRTL) + MirrorRgn(hWnd, hRgn); +*/ + Ret = (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)hRgn, TWOPARAM_ROUTINE_GETWINDOWRGN); + + return Ret; } /* @@ -236,7 +306,31 @@ HWND hWnd, LPRECT lprc) { - return (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)lprc, TWOPARAM_ROUTINE_GETWINDOWRGNBOX); + PWND pWnd; + int Ret; + + if (!lprc) + return ERROR; + + pWnd = ValidateHwnd(hWnd); + + if (!pWnd) // || !pwnd->hrgnClip || pwnd->state2 & WNDS2_MAXIMIZEDMONITORREGION) + return ERROR; +/* + Ret = GetRgnBox(pWnd->hrgnClip, lprc); + + if (!Ret) + return ERROR; + + if (pWnd->fnid != FNID_DESKTOP) + Ret = OffsetRect(lprc, -pWnd->rcWindow.left, -pWnd->rcWindow.top); + + if (pWnd->ExStyle & WS_EX_LAYOUTRTL) + MirrorWindowRect(pWnd, lprc); +*/ + Ret = (int)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)lprc, TWOPARAM_ROUTINE_GETWINDOWRGNBOX); + + return Ret; }

1 0

[tkreuzer] 45340: add else
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 05:27:17 2010 New Revision: 45340 URL: http://svn.reactos.org/svn/reactos?rev=45340&view=rev Log: add else Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Sat Jan 30 05:27:17 2010 @@ -159,5 +159,6 @@ conditionals. We therefore use "if", too. .if shouldn't be used at all */ #define if .if #define endif .endif +#define else .else #endif

1 0

[jimtabor] 45339: [Win32k|User32] - Updated paint functions to use one calls. - Found one leak in engwindow.c and monitor.c, not the big one.
by jimtabor＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: jimtabor Date: Sat Jan 30 05:23:58 2010 New Revision: 45339 URL: http://svn.reactos.org/svn/reactos?rev=45339&view=rev Log: [Win32k|User32] - Updated paint functions to use one calls. - Found one leak in engwindow.c and monitor.c, not the big one. Modified: trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -198,8 +198,7 @@ pWnd->state & WNDS_INTERNALPAINT || pWnd->spwndChild ) {*/ - return RedrawWindow( hWnd, NULL, 0, RDW_UPDATENOW | RDW_ALLCHILDREN ); -// return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_UPDATEWINDOW); + return NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_UPDATEWINDOW); /* } return TRUE;*/ } @@ -213,10 +212,7 @@ HWND hWnd, HRGN hRgn) { - /* FIXME: should RDW_NOCHILDREN be included too? Ros used to, - but Wine dont so i removed it... */ - return RedrawWindow( hWnd, NULL, hRgn, RDW_VALIDATE ); -// return NtUserCallHwndParamLock(hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); + return NtUserCallHwndParamLock(hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN); } /* Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -83,6 +83,8 @@ PROSRGNDATA visRgn; CLIPOBJ *ClipObj = NULL; CLIPOBJ *OldClipObj; + + DPRINT("IntEngWndUpdateClipObj\n"); hVisRgn = VIS_ComputeVisibleRegion(Window, TRUE, TRUE, TRUE); if (hVisRgn != NULL) @@ -115,6 +117,7 @@ { DPRINT1("Warning: Couldn't lock visible region of window DC\n"); } + REGION_FreeRgnByHandle(hVisRgn); } else { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -190,7 +190,7 @@ Monitor->rcWork = Monitor->rcMonitor; Monitor->cWndStack = 0; - Monitor->hrgnMonitor= IntSysCreateRectRgnIndirect( &Monitor->rcMonitor ); + Monitor->hrgnMonitor = IntSysCreateRectRgnIndirect( &Monitor->rcMonitor ); IntGdiSetRegionOwner(Monitor->hrgnMonitor, GDI_OBJ_HMGR_PUBLIC); @@ -263,6 +263,9 @@ if (Monitor->Next != NULL) Monitor->Next->Prev = Monitor->Prev; } + + if (Monitor->hrgnMonitor) + REGION_FreeRgnByHandle(Monitor->hrgnMonitor); IntDestroyMonitorObject(Monitor); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -712,9 +712,39 @@ DWORD Param, DWORD Routine) { - UNIMPLEMENTED; - - return 0; + DWORD Ret = 0; + PWINDOW_OBJECT Window; + PWND Wnd; + USER_REFERENCE_ENTRY Ref; + DECLARE_RETURN(DWORD); + + DPRINT1("Enter NtUserCallHwndParamLock\n"); + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) + { + RETURN( FALSE); + } + UserRefObjectCo(Window, &Ref); + + Wnd = Window->Wnd; + + switch (Routine) + { + case TWOPARAM_ROUTINE_VALIDATERGN: + Ret = (DWORD)co_UserRedrawWindow( Window, NULL, (HRGN)Param, RDW_VALIDATE); + break; + } + + UserDerefObjectCo(Window); + + RETURN( Ret); + +CLEANUP: + DPRINT1("Leave NtUserCallHwndParamLock, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; + } /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sat Jan 30 05:23:58 2010 @@ -4625,6 +4625,7 @@ HRGN hRgn, BOOL bRedraw) { + HRGN hrgnCopy; PWINDOW_OBJECT Window; DECLARE_RETURN(INT); @@ -4636,15 +4637,25 @@ RETURN( 0); } - /* FIXME - Verify if hRgn is a valid handle!!!! - Propably make this operation thread-safe, but maybe it's not necessary */ - - if(Window->hrgnClip) + if (hRgn) // The region will be deleted in user32. + { + if (GDIOBJ_ValidateHandle(hRgn, GDI_OBJECT_TYPE_REGION)) + { + hrgnCopy = IntSysCreateRectRgn(0, 0, 0, 0); + NtGdiCombineRgn(hrgnCopy, hRgn, 0, RGN_COPY); + } + else + RETURN( 0); + } + else + hrgnCopy = (HRGN) 1; + + if (Window->hrgnClip) { /* Delete no longer needed region handle */ GreDeleteObject(Window->hrgnClip); } - Window->hrgnClip = hRgn; + Window->hrgnClip = hrgnCopy; /* FIXME - send WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED messages to the window */

1 0

[tkreuzer] 45338: and the same for trap.S
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 04:18:20 2010 New Revision: 45338 URL: http://svn.reactos.org/svn/reactos?rev=45338&view=rev Log: and the same for trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Jan 30 04:18:20 2010 @@ -51,10 +51,10 @@ label1: .asciz "\func" label2: sub rsp, 32 - lea rcx, RIP(_MsgTrapInfo) + lea rcx, _MsgTrapInfo[rip] lea rdx, 1b[rip] mov r8, [rbp + KTRAP_FRAME_Rip] - call qword ptr RIP(_FrLdrDbgPrint) + call qword ptr _FrLdrDbgPrint[rip] add rsp, 32 #endif ENDM @@ -401,9 +401,9 @@ TRAPINFO KiBreakpointTrap -// lea rcx, RIP(_MsgBreakpointTrap) +// lea rcx, _MsgBreakpointTrap[rip] // mov rdx, rsp -// call qword ptr RIP(_FrLdrDbgPrint) +// call qword ptr _FrLdrDbgPrint[rip] /* Dispatch the exception */ mov eax, STATUS_BREAKPOINT @@ -464,8 +464,8 @@ // DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, RIP(_MsgInvalidOpcodeFault) - call qword ptr RIP(_FrLdrDbgPrint) + lea rcx, _MsgInvalidOpcodeFault[rip] + call qword ptr _FrLdrDbgPrint[rip] jmp $ /* Return */ @@ -496,10 +496,10 @@ ENTER_TRAP_FRAME TRAPFLAG_ALL - lea rcx, RIP(_MsgDoubleFault) + lea rcx, _MsgDoubleFault[rip] mov rdx, [rbp + KTRAP_FRAME_FaultAddress] mov r8, rbp - call qword ptr RIP(_FrLdrDbgPrint) + call qword ptr _FrLdrDbgPrint[rip] /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ mov rcx, HEX(0000007F) @@ -573,8 +573,8 @@ TRAPINFO KiGeneralProtectionFault mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, RIP(_MsgGeneralProtFault) - call qword ptr RIP(_FrLdrDbgPrint) + lea rcx, _MsgGeneralProtFault[rip] + call qword ptr _FrLdrDbgPrint[rip] /* Check if this was from user-mode */ cmp byte ptr [rbp + KTRAP_FRAME_PreviousMode], KernelMode @@ -685,11 +685,11 @@ TRAPINFO KiPageFault #if 0 - lea rcx, RIP(_MsgPageFault) + lea rcx, _MsgPageFault[rip] mov rdx, [rbp + KTRAP_FRAME_ErrorCode] mov r8, [rbp + KTRAP_FRAME_Rip] mov r9, [rbp + KTRAP_FRAME_FaultAddress] - call qword ptr RIP(_FrLdrDbgPrint) + call qword ptr _FrLdrDbgPrint[rip] #endif /* Save page fault address */

1 0

[tkreuzer] 45337: remove the RIP() hack, instead use a constant rip=0 for MASM/ML
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 04:17:11 2010 New Revision: 45337 URL: http://svn.reactos.org/svn/reactos?rev=45337&view=rev Log: remove the RIP() hack, instead use a constant rip=0 for MASM/ML Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Sat Jan 30 04:17:11 2010 @@ -18,7 +18,7 @@ #define VAL(x) x /* MASM/ML doesn't want explicit [rip] addressing */ -#define RIP(address) [address] +rip = 0 /* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ #define MACRO(name, ...) name MACRO __VA_ARGS__ @@ -59,9 +59,6 @@ /* Macro values need to be marked */ #define VAL(x) \x - -/* GAS needs explicit [rip] addressing */ -#define RIP(address) address##[rip] /* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ #define MACRO(...) .macro __VA_ARGS__

1 0

[tkreuzer] 45336: trap.S is now fully MASM/ML compatible
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 04:12:26 2010 New Revision: 45336 URL: http://svn.reactos.org/svn/reactos?rev=45336&view=rev Log: trap.S is now fully MASM/ML compatible Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Jan 30 04:12:26 2010 @@ -11,7 +11,7 @@ #include <ndk/amd64/asm.h> EXTERN _KiDispatchException:PROC -EXTERN _FrLdrDbgPrint:PROC +EXTERN _FrLdrDbgPrint:DWORD EXTERN _KeBugCheckWithTf:PROC EXTERN _MmAccessFault:PROC @@ -45,16 +45,16 @@ .ascii "Trap: %s at %p\n\0" MACRO(TRAPINFO, func) +LOCAL label1, label2 #if 0 - jmp 2f - .equ expr, 12 -1: .asciz "\func" -2: + jmp label2 +label1: .asciz "\func" +label2: sub rsp, 32 lea rcx, RIP(_MsgTrapInfo) lea rdx, 1b[rip] mov r8, [rbp + KTRAP_FRAME_Rip] - call _FrLdrDbgPrint[rip] + call qword ptr RIP(_FrLdrDbgPrint) add rsp, 32 #endif ENDM @@ -86,6 +86,7 @@ * ENTER_TRAP_FRAME - Allocate SIZE_KTRAP_FRAME and save registers to it */ MACRO(ENTER_TRAP_FRAME, Flags) +LOCAL dont_swap SIZE_INITIAL_FRAME = 7 * 8 SIZE_TRAP_FRAME_ALLOC = SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME TRAPFLAGS = VAL(Flags) @@ -145,9 +146,9 @@ mov ax, [rbp + KTRAP_FRAME_SegCs] and al, 1 mov [rbp + KTRAP_FRAME_PreviousMode], al - jz 1f + jz dont_swap swapgs -1: +dont_swap: /* Save previous irql */ mov rax, cr8 @@ -189,7 +190,7 @@ * LEAVE_TRAP_FRAME - Restore registers and free stack space */ MACRO(LEAVE_TRAP_FRAME) - +LOCAL dont_swap_back if (TRAPFLAGS AND TRAPFLAG_SEGMENTS) /* Restore segment selectors */ mov ax, [rbp + KTRAP_FRAME_SegDs] @@ -201,9 +202,9 @@ endif test byte ptr [rbp + KTRAP_FRAME_PreviousMode], 1 - jz 1f + jz dont_swap_back swapgs -1: +dont_swap_back: if (TRAPFLAGS AND TRAPFLAG_NONVOLATILES) /* Restore non-volatile registers */ @@ -330,7 +331,7 @@ PUBLIC _KiDivideErrorFault .PROC _KiDivideErrorFault - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -343,7 +344,7 @@ PUBLIC _KiDebugTrapOrFault .PROC _KiDebugTrapOrFault - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -377,7 +378,7 @@ PUBLIC _KiNmiInterrupt .PROC _KiNmiInterrupt - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -390,7 +391,7 @@ PUBLIC _KiBreakpointTrap .PROC _KiBreakpointTrap - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -402,7 +403,7 @@ // lea rcx, RIP(_MsgBreakpointTrap) // mov rdx, rsp -// call RIP(_FrLdrDbgPrint) +// call qword ptr RIP(_FrLdrDbgPrint) /* Dispatch the exception */ mov eax, STATUS_BREAKPOINT @@ -419,7 +420,7 @@ PUBLIC _KiOverflowTrap .PROC _KiOverflowTrap - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -431,7 +432,7 @@ PUBLIC _KiBoundFault .PROC _KiBoundFault - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -450,7 +451,7 @@ PUBLIC _KiInvalidOpcodeFault .PROC _KiInvalidOpcodeFault - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -464,7 +465,7 @@ mov rdx, [rbp + KTRAP_FRAME_Rip] lea rcx, RIP(_MsgInvalidOpcodeFault) - call RIP(_FrLdrDbgPrint) + call qword ptr RIP(_FrLdrDbgPrint) jmp $ /* Return */ @@ -474,7 +475,7 @@ PUBLIC _KiNpxNotAvailableFault .PROC _KiNpxNotAvailableFault - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -487,7 +488,7 @@ PUBLIC _KiDoubleFaultAbort .PROC _KiDoubleFaultAbort - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -498,7 +499,7 @@ lea rcx, RIP(_MsgDoubleFault) mov rdx, [rbp + KTRAP_FRAME_FaultAddress] mov r8, rbp - call RIP(_FrLdrDbgPrint) + call qword ptr RIP(_FrLdrDbgPrint) /* Bugcheck code UNEXPECTED_KERNEL_MODE_TRAP */ mov rcx, HEX(0000007F) @@ -516,7 +517,7 @@ PUBLIC _KiNpxSegmentOverrunAbort .PROC _KiNpxSegmentOverrunAbort - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -529,7 +530,7 @@ PUBLIC _KiInvalidTssFault .PROC _KiInvalidTssFault - .pushframe 1 + .pushframe code /* We have an error code */ .endprolog @@ -540,7 +541,7 @@ PUBLIC _KiSegmentNotPresentFault .PROC _KiSegmentNotPresentFault - .pushframe 1 + .pushframe /* We have an error code */ .endprolog @@ -551,7 +552,7 @@ PUBLIC _KiStackFault .PROC _KiStackFault - .pushframe 1 + .pushframe code /* We have an error code */ .endprolog @@ -562,7 +563,7 @@ PUBLIC _KiGeneralProtectionFault .PROC _KiGeneralProtectionFault - .pushframe 1 + .pushframe code /* We have an error code */ .endprolog @@ -573,7 +574,7 @@ mov rdx, [rbp + KTRAP_FRAME_Rip] lea rcx, RIP(_MsgGeneralProtFault) - call RIP(_FrLdrDbgPrint) + call qword ptr RIP(_FrLdrDbgPrint) /* Check if this was from user-mode */ cmp byte ptr [rbp + KTRAP_FRAME_PreviousMode], KernelMode @@ -675,7 +676,7 @@ PUBLIC _KiPageFault .PROC _KiPageFault - .pushframe 1 + .pushframe code /* We have an error code */ .endprolog @@ -688,7 +689,7 @@ mov rdx, [rbp + KTRAP_FRAME_ErrorCode] mov r8, [rbp + KTRAP_FRAME_Rip] mov r9, [rbp + KTRAP_FRAME_FaultAddress] - call RIP(_FrLdrDbgPrint) + call qword ptr RIP(_FrLdrDbgPrint) #endif /* Save page fault address */ @@ -745,7 +746,7 @@ PUBLIC _KiFloatingErrorFault .PROC _KiFloatingErrorFault - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -758,7 +759,7 @@ PUBLIC _KiAlignmentFault .PROC _KiAlignmentFault - .pushframe 1 + .pushframe code /* We have an error code */ .endprolog @@ -769,7 +770,7 @@ PUBLIC _KiMcheckAbort .PROC _KiMcheckAbort - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -782,7 +783,7 @@ PUBLIC _KiXmmException .PROC _KiXmmException - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -795,7 +796,7 @@ PUBLIC _KiApcInterrupt .PROC _KiApcInterrupt - .pushframe 1 + .pushframe code .endprolog UNIMPLEMENTED KiApcInterrupt @@ -805,7 +806,7 @@ PUBLIC _KiRaiseAssertion .PROC _KiRaiseAssertion - .pushframe 1 + .pushframe code .endprolog UNIMPLEMENTED KiRaiseAssertion @@ -815,7 +816,7 @@ PUBLIC _KiDebugServiceTrap .PROC _KiDebugServiceTrap - .pushframe 0 + .pushframe /* Push pseudo error code */ push 0 .allocstack 8 @@ -842,7 +843,7 @@ PUBLIC _KiDpcInterrupt .PROC _KiDpcInterrupt - .pushframe 1 + .pushframe code .endprolog UNIMPLEMENTED KiDpcInterrupt @@ -852,7 +853,7 @@ PUBLIC _KiIpiInterrupt .PROC _KiIpiInterrupt - .pushframe 1 + .pushframe code .endprolog UNIMPLEMENTED KiIpiInterrupt @@ -862,7 +863,7 @@ PUBLIC _KiUnexpectedInterrupt .PROC _KiUnexpectedInterrupt - .pushframe 0 + .pushframe .endprolog /* The error code is the vector */

1 0

[tkreuzer] 45335: use .altmacro for gas and hack the UNIMPLEMENTED macro
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 04:11:39 2010 New Revision: 45335 URL: http://svn.reactos.org/svn/reactos?rev=45335&view=rev Log: use .altmacro for gas and hack the UNIMPLEMENTED macro Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Sat Jan 30 04:11:39 2010 @@ -51,6 +51,8 @@ /* Force intel syntax */ .intel_syntax noprefix .code64 + +.altmacro /* Hex numbers need to be in 0x1AB format */ #define HEX(x) 0x##x @@ -138,9 +140,11 @@ .macro .endprolog .endm -.macro UNIMPLEMENTED2 file, line, func +// Note the file1. This is a hack, as "\file" doesn't work with __FILE__, when +// .altmacro is specified. +.macro UNIMPLEMENTED2 file1, line, func + jmp 3f - .equ expr, 12 1: .asciz "\func" 2: .asciz "\file" 3:

1 0

[tkreuzer] 45334: fix macros...
by tkreuzer＠svn.reactos.org 30 Jan '10

30 Jan '10

Author: tkreuzer Date: Sat Jan 30 02:46:16 2010 New Revision: 45334 URL: http://svn.reactos.org/svn/reactos?rev=45334&view=rev Log: fix macros... Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/asm.h [iso-8859-1] Sat Jan 30 02:46:16 2010 @@ -18,7 +18,7 @@ #define VAL(x) x /* MASM/ML doesn't want explicit [rip] addressing */ -#define RIP(address) address +#define RIP(address) [address] /* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ #define MACRO(name, ...) name MACRO __VA_ARGS__ @@ -33,8 +33,13 @@ name ENDP ENDM -/* MASM doesn't have an ASCIIZ macro */ -.ASCIIZ MACRO text +/* MASM doesn't have an ASCII macro */ +.ASCII MACRO text + DB text +ENDM + +/* MASM doesn't have an ASCIZ macro */ +.ASCIZ MACRO text DB text, 0 ENDM @@ -98,13 +103,14 @@ .set cfa_current_offset, cfa_current_offset - \size .endm -.macro .pushframe code - .if (\code == 0) +code = 1 +.macro .pushframe param=0 + .if (\param) + .cfi_adjust_cfa_offset 0x30 + .set cfa_current_offset, cfa_current_offset - 0x30 + .else .cfi_adjust_cfa_offset 0x28 .set cfa_current_offset, cfa_current_offset - 0x28 - .else - .cfi_adjust_cfa_offset 0x30 - .set cfa_current_offset, cfa_current_offset - 0x30 .endif .endm

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