Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[dgorbachev] 45226: Forgot ntdef.h
by dgorbachev＠svn.reactos.org 24 Jan '10

24 Jan '10

Author: dgorbachev Date: Sun Jan 24 02:37:13 2010 New Revision: 45226 URL: http://svn.reactos.org/svn/reactos?rev=45226&view=rev Log: Forgot ntdef.h Modified: trunk/reactos/include/ddk/ntdef.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=45… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sun Jan 24 02:37:13 2010 @@ -193,16 +193,8 @@ // Done the same way as in windef.h for now #define DECLSPEC_IMPORT __declspec(dllimport) - -#ifndef DECLSPEC_NORETURN -#if (_MSC_VER >= 1200) && !defined(MIDL_PASS) -#define DECLSPEC_NORETURN __declspec(noreturn) -#else -/* On 4.5 we can use __builtin_unreachable instead of this hack */ -__attribute__ ((noreturn)) void exit(int s) {exit(s);} -#define DECLSPEC_NORETURN __attribute__((noreturn)) -#endif -#endif +#define DECLSPEC_NORETURN __declspec(noreturn) + #ifndef DECLSPEC_ADDRSAFE #if (_MSC_VER >= 1200) && (defined(_M_ALPHA) || defined(_M_AXP64))

1 0

[dgorbachev] 45225: Trying to fix build...
by dgorbachev＠svn.reactos.org 24 Jan '10

24 Jan '10

Author: dgorbachev Date: Sun Jan 24 02:35:25 2010 New Revision: 45225 URL: http://svn.reactos.org/svn/reactos?rev=45225&view=rev Log: Trying to fix build... Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sun Jan 24 02:35:25 2010 @@ -5,6 +5,16 @@ * PURPOSE: Internal Inlined Functions for the Trap Handling Code * PROGRAMMERS: ReactOS Portable Systems Group */ + +#ifdef __GNUC__ +#if __GNUC__ * 100 + __GNUC_MINOR__ >= 405 +#define UNREACHABLE __builtin_unreachable() +#else +#define UNREACHABLE __builtin_trap() +#else /* not __GNUC__ */ +#define UNREACHABLE +#endif +#endif // // Debug Macros @@ -276,7 +286,7 @@ [v] "i"(KTRAP_FRAME_ESP) : "%esp" ); - exit(0); + UNREACHABLE; } FORCEINLINE @@ -305,7 +315,7 @@ [e] "i"(KTRAP_FRAME_EIP) : "%esp" ); - exit(0); + UNREACHABLE; } FORCEINLINE @@ -338,7 +348,7 @@ [v] "i"(KTRAP_FRAME_V86_ES) : "%esp" ); - exit(0); + UNREACHABLE; } FORCEINLINE @@ -371,7 +381,7 @@ [e] "i"(KTRAP_FRAME_EIP) : "%esp" ); - exit(0); + UNREACHABLE; } FORCEINLINE @@ -405,7 +415,7 @@ [e] "i"(KTRAP_FRAME_ERROR_CODE) /* We *WANT* the error code since ESP is there! */ : "%esp" ); - exit(0); + UNREACHABLE; } NTSTATUS

1 0

[dgorbachev] 45224: Fix vmwinst.exe crash (bug #5134).
by dgorbachev＠svn.reactos.org 24 Jan '10

24 Jan '10

Author: dgorbachev Date: Sun Jan 24 01:50:54 2010 New Revision: 45224 URL: http://svn.reactos.org/svn/reactos?rev=45224&view=rev Log: Fix vmwinst.exe crash (bug #5134). Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sun Jan 24 01:50:54 2010 @@ -1258,7 +1258,7 @@ { /* Get the IOPL and compare with the RPL mask */ Iopl = (TrapFrame->EFlags & EFLAGS_IOPL) >> 12; - if ((TrapFrame->SegCs & RPL_MASK) == Iopl) + if ((TrapFrame->SegCs & RPL_MASK) > Iopl) { /* I/O privilege error -- check for known instructions */ if ((Instruction == 0xFA) || (Instruction == 0xFB)) // CLI or STI

1 0

[sir_richard] 45223: [PERF]: Make all trap handlers, trap exit code, fatal exit code, and exception dispatch code "no return" since it always leads to an iret or other kind of non-directly-returning mechanism. This allows the compiler to optimize better and also remove useless code at the bottom of the functions. Since __builtin_unreachable is only for GCC 4.5, we use exit(0) for now (it will never be reached) to trick GCC.
by sir_richard＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sir_richard Date: Sun Jan 24 00:59:59 2010 New Revision: 45223 URL: http://svn.reactos.org/svn/reactos?rev=45223&view=rev Log: [PERF]: Make all trap handlers, trap exit code, fatal exit code, and exception dispatch code "no return" since it always leads to an iret or other kind of non-directly-returning mechanism. This allows the compiler to optimize better and also remove useless code at the bottom of the functions. Since __builtin_unreachable is only for GCC 4.5, we use exit(0) for now (it will never be reached) to trick GCC. Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sun Jan 24 00:59:59 2010 @@ -214,6 +214,7 @@ VOID FORCEINLINE +DECLSPEC_NORETURN KiDispatchException0Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN PKTRAP_FRAME TrapFrame) @@ -224,6 +225,7 @@ VOID FORCEINLINE +DECLSPEC_NORETURN KiDispatchException1Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG P1, @@ -235,6 +237,7 @@ VOID FORCEINLINE +DECLSPEC_NORETURN KiDispatchException2Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG P1, @@ -247,6 +250,7 @@ FORCEINLINE VOID +DECLSPEC_NORETURN KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame) { /* Restore nonvolatiles, EAX, and do a "jump" back to the kernel caller */ @@ -272,10 +276,12 @@ [v] "i"(KTRAP_FRAME_ESP) : "%esp" ); -} - -FORCEINLINE -VOID + exit(0); +} + +FORCEINLINE +VOID +DECLSPEC_NORETURN KiSystemCallTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit, but we only restore EAX as a volatile */ @@ -299,10 +305,12 @@ [e] "i"(KTRAP_FRAME_EIP) : "%esp" ); -} - -FORCEINLINE -VOID + exit(0); +} + +FORCEINLINE +VOID +DECLSPEC_NORETURN KiSystemCallSysExitReturn(IN PKTRAP_FRAME TrapFrame) { /* Restore nonvolatiles, EAX, and do a SYSEXIT back to the user caller */ @@ -330,10 +338,12 @@ [v] "i"(KTRAP_FRAME_V86_ES) : "%esp" ); -} - -FORCEINLINE -VOID + exit(0); +} + +FORCEINLINE +VOID +DECLSPEC_NORETURN KiTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit */ @@ -361,10 +371,12 @@ [e] "i"(KTRAP_FRAME_EIP) : "%esp" ); -} - -FORCEINLINE -VOID + exit(0); +} + +FORCEINLINE +VOID +DECLSPEC_NORETURN KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit */ @@ -393,6 +405,7 @@ [e] "i"(KTRAP_FRAME_ERROR_CODE) /* We *WANT* the error code since ESP is there! */ : "%esp" ); + exit(0); } NTSTATUS Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sun Jan 24 00:59:59 2010 @@ -50,6 +50,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiExitTrap(IN PKTRAP_FRAME TrapFrame, IN UCHAR Skip) { @@ -235,6 +236,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiEoiHelper(IN PKTRAP_FRAME TrapFrame) { /* Disable interrupts until we return */ @@ -249,6 +251,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiServiceExit(IN PKTRAP_FRAME TrapFrame, IN NTSTATUS Status) { @@ -267,6 +270,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiServiceExit2(IN PKTRAP_FRAME TrapFrame) { /* Disable interrupts until we return */ @@ -423,6 +427,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiSystemFatalException(IN ULONG ExceptionCode, IN PKTRAP_FRAME TrapFrame) { @@ -437,6 +442,7 @@ VOID NTAPI +DECLSPEC_NORETURN KiDispatchExceptionFromTrapFrame(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG ParameterCount, @@ -477,6 +483,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiDebugHandler(IN PKTRAP_FRAME TrapFrame, IN ULONG Parameter1, IN ULONG Parameter2, @@ -500,6 +507,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiNpxHandler(IN PKTRAP_FRAME TrapFrame, IN PKTHREAD Thread, IN PFX_SAVE_AREA SaveArea) @@ -656,6 +664,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap00Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -675,6 +684,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap01Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -694,6 +704,7 @@ } VOID +DECLSPEC_NORETURN KiTrap02(VOID) { PKTSS Tss, NmiTss; @@ -840,6 +851,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap03Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -851,6 +863,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap04Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -870,6 +883,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap05Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -892,6 +906,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap06Handler(IN PKTRAP_FRAME TrapFrame) { PUCHAR Instruction; @@ -937,6 +952,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap07Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread, NpxThread; @@ -1046,6 +1062,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap08Handler(IN PKTRAP_FRAME TrapFrame) { /* FIXME: Not handled */ @@ -1054,6 +1071,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap09Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1066,6 +1084,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap0AHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1080,6 +1099,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap0BHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1092,6 +1112,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap0CHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1104,6 +1125,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame, IN ULONG EFlags) { @@ -1388,6 +1410,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1510,6 +1533,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap0FHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1520,9 +1544,9 @@ KiSystemFatalException(EXCEPTION_RESERVED_TRAP, TrapFrame); } - -VOID -FASTCALL +VOID +FASTCALL +DECLSPEC_NORETURN KiTrap10Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1550,6 +1574,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap11Handler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1562,6 +1587,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiTrap13Handler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -1664,6 +1690,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiRaiseAssertionHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1680,6 +1707,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiDebugServiceHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ @@ -1694,6 +1722,7 @@ VOID FASTCALL +DECLSPEC_NORETURN KiSystemCall(IN ULONG SystemCallNumber, IN PVOID Arguments) { @@ -1784,6 +1813,7 @@ VOID FORCEINLINE +DECLSPEC_NORETURN KiSystemCallHandler(IN PKTRAP_FRAME TrapFrame, IN ULONG ServiceNumber, IN PVOID Arguments, @@ -1825,6 +1855,7 @@ VOID __attribute__((regparm(3))) +DECLSPEC_NORETURN KiFastCallEntryHandler(IN ULONG ServiceNumber, IN PVOID Arguments, IN PKTRAP_FRAME TrapFrame) @@ -1858,6 +1889,7 @@ VOID __attribute__((regparm(3))) +DECLSPEC_NORETURN KiSystemServiceHandler(IN ULONG ServiceNumber, IN PVOID Arguments, IN PKTRAP_FRAME TrapFrame)

1 0

[sir_richard] 45222: [PSDK]: Define DECLSPEC_NORETURN for MSVC and GCC.
by sir_richard＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sir_richard Date: Sun Jan 24 00:58:29 2010 New Revision: 45222 URL: http://svn.reactos.org/svn/reactos?rev=45222&view=rev Log: [PSDK]: Define DECLSPEC_NORETURN for MSVC and GCC. Modified: trunk/reactos/include/ddk/ntdef.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=45… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sun Jan 24 00:58:29 2010 @@ -193,8 +193,16 @@ // Done the same way as in windef.h for now #define DECLSPEC_IMPORT __declspec(dllimport) -#define DECLSPEC_NORETURN __declspec(noreturn) - + +#ifndef DECLSPEC_NORETURN +#if (_MSC_VER >= 1200) && !defined(MIDL_PASS) +#define DECLSPEC_NORETURN __declspec(noreturn) +#else +/* On 4.5 we can use __builtin_unreachable instead of this hack */ +__attribute__ ((noreturn)) void exit(int s) {exit(s);} +#define DECLSPEC_NORETURN __attribute__((noreturn)) +#endif +#endif #ifndef DECLSPEC_ADDRSAFE #if (_MSC_VER >= 1200) && (defined(_M_ALPHA) || defined(_M_AXP64))

1 0

[jimtabor] 45221: [Win32k] - Fixed DCE masks, clipping and added support for mirror and process owned dce. - Reference: http://www.reactos.org/archives/public/ros-dev/2008-July/010498.html http://www.reactos.org/archives/public/ros-dev/2008-July/010499.html
by jimtabor＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: jimtabor Date: Sun Jan 24 00:55:32 2010 New Revision: 45221 URL: http://svn.reactos.org/svn/reactos?rev=45221&view=rev Log: [Win32k] - Fixed DCE masks, clipping and added support for mirror and process owned dce. - Reference: http://www.reactos.org/archives/public/ros-dev/2008-July/010498.html http://www.reactos.org/archives/public/ros-dev/2008-July/010499.html Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jan 24 00:55:32 2010 @@ -775,6 +775,8 @@ // #define DCX_USESTYLE 0x00010000 #define DCX_KEEPCLIPRGN 0x00040000 +#define DCX_KEEPLAYOUT 0x40000000 +#define DCX_PROCESSOWNED 0x80000000 // // Non SDK Queue message types. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sun Jan 24 00:55:32 2010 @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> +int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); + /* GLOBALS *******************************************************************/ /* NOTE - I think we should store this per window station (including gdi objects) */ @@ -22,7 +24,9 @@ //static INT DCECount = 0; // Count of DCE in system. #define DCX_CACHECOMPAREMASK (DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | \ - DCX_CACHE | DCX_WINDOW | DCX_PARENTCLIP) + DCX_NORESETATTRS | DCX_LOCKWINDOWUPDATE | \ + DCX_LAYEREDWIN | DCX_CACHE | DCX_WINDOW | \ + DCX_PARENTCLIP) /* FUNCTIONS *****************************************************************/ @@ -58,16 +62,15 @@ HRGN VisRgn; VisRgn = VIS_ComputeVisibleRegion( Window, - 0 == (Flags & DCX_WINDOW), - 0 != (Flags & DCX_CLIPCHILDREN), - 0 != (Flags & DCX_CLIPSIBLINGS)); + 0 == (Flags & DCX_WINDOW), + 0 != (Flags & DCX_CLIPCHILDREN), + 0 != (Flags & DCX_CLIPSIBLINGS)); if (VisRgn == NULL) VisRgn = IntSysCreateRectRgn(0, 0, 0, 0); return VisRgn; } - PDCE FASTCALL DceAllocDCE(PWINDOW_OBJECT Window OPTIONAL, DCE_TYPE Type) @@ -94,7 +97,6 @@ pDce->hrgnClip = NULL; pDce->hrgnClipPublic = NULL; pDce->hrgnSavedVis = NULL; - pDce->ptiOwner = NULL; pDce->ppiOwner = NULL; KeEnterCriticalRegion(); @@ -111,13 +113,13 @@ if (Type == DCE_WINDOW_DC || Type == DCE_CLASS_DC) //Window DCE have ownership. { - pDce->ptiOwner = GetW32ThreadInfo(); - pDce->ppiOwner = pDce->ptiOwner->ppi; + pDce->ptiOwner = GetW32ThreadInfo(); } else { DPRINT("FREE DCATTR!!!! NOT DCE_WINDOW_DC!!!!! hDC-> %x\n", pDce->hDC); IntGdiSetDCOwnerEx( pDce->hDC, GDI_OBJ_HMGR_NONE, FALSE); + pDce->ptiOwner = NULL; } if (Type == DCE_CACHE_DC) @@ -140,8 +142,10 @@ } static VOID APIENTRY -DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags, - BOOL SetClipOrigin) +DceSetDrawable( PWINDOW_OBJECT Window OPTIONAL, + HDC hDC, + ULONG Flags, + BOOL SetClipOrigin) { PWND Wnd; DC *dc = DC_LockDc(hDC); @@ -302,8 +306,7 @@ hRgnVisible = IntSysCreateRectRgn(0, 0, 0, 0); } } - - if (Flags & DCX_EXCLUDERGN && Dce->hrgnClip != NULL) + else if (Flags & DCX_EXCLUDERGN && Dce->hrgnClip != NULL) { NtGdiCombineRgn(hRgnVisible, hRgnVisible, Dce->hrgnClip, RGN_DIFF); } @@ -328,10 +331,10 @@ PWINDOW_OBJECT Parent; ULONG DcxFlags; DCE* Dce = NULL; - BOOL UpdateVisRgn = TRUE; BOOL UpdateClipOrigin = FALSE; PWND Wnd = NULL; - HDC hDC = NULL; + HDC hDC = NULL; + PPROCESSINFO ppi; if (NULL == Window) { @@ -381,6 +384,12 @@ !(Wnd->style & WS_MINIMIZE)) { Flags |= DCX_CLIPCHILDREN; + } + /* If minized with icon in the set, we are forced to be cheap! */ + if (Wnd->style & WS_MINIMIZE && + Wnd->pcls->hIcon) + { + Flags |= DCX_CACHE; } } else @@ -458,9 +467,6 @@ else if (Dce->hwndCurrent == (Window ? Window->hSelf : NULL) && ((Dce->DCXFlags & DCX_CACHECOMPAREMASK) == DcxFlags)) { -#if 0 /* FIXME */ - UpdateVisRgn = FALSE; -#endif UpdateClipOrigin = TRUE; break; } @@ -485,31 +491,19 @@ Dce = FirstDce; do { // Check for Window handle than HDC match for CLASS. - if ((Dce->hwndCurrent == Window->hSelf) || (Dce->hDC == hDC)) break; + if ((Dce->hwndCurrent == Window->hSelf) || + (Dce->hDC == hDC)) + break; Dce = (PDCE)Dce->List.Flink; } while (Dce != FirstDce); KeLeaveCriticalRegion(); - DPRINT("DCX:Flags -> %x:%x\n",Dce->DCXFlags & DCX_CACHE, Flags & DCX_CACHE); - - if (Dce->hwndCurrent == Window->hSelf) - { - DPRINT("Owned DCE!\n"); - UpdateVisRgn = FALSE; /* updated automatically, via DCHook() */ - } - else - { - DPRINT("Owned/Class DCE\n"); - /* we should free dce->clip_rgn here, but Windows apparently doesn't */ - Dce->DCXFlags &= ~(DCX_EXCLUDERGN | DCX_INTERSECTRGN); - Dce->hrgnClip = NULL; - } - -#if 1 /* FIXME */ - UpdateVisRgn = TRUE; -#endif - } - + if ( (Flags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) && + (Dce->DCXFlags & (DCX_INTERSECTRGN|DCX_EXCLUDERGN)) ) + { + DceDeleteClipRgn(Dce); + } + } // First time use hax, need to use DceAllocDCE during window display init. if (NULL == Dce) { @@ -523,23 +517,24 @@ /* FIXME: Handle error */ } - if (!(Flags & (DCX_EXCLUDERGN | DCX_INTERSECTRGN)) && ClipRegion) - { - if (!(Flags & DCX_KEEPCLIPRGN)) - REGION_FreeRgnByHandle(ClipRegion); - ClipRegion = NULL; - } - -#if 0 - if (NULL != Dce->hrgnClip) - { - DceDeleteClipRgn(Dce); - } -#endif - Dce->DCXFlags = Flags | DCX_DCEBUSY; - if (0 != (Flags & DCX_INTERSECTUPDATE) && NULL == ClipRegion) + /* + Bump it up! This prevents the random errors in wine dce tests and with + proper bits set in DCX_CACHECOMPAREMASK. + Reference: + http://www.reactos.org/archives/public/ros-dev/2008-July/010498.html + http://www.reactos.org/archives/public/ros-dev/2008-July/010499.html + */ + if ((Dce != FirstDce)) + { + RemoveEntryList(&Dce->List); + InsertHeadList(&FirstDce->List, &Dce->List); + FirstDce = Dce; + } + + /* Introduced in rev 6691 and modified later. */ + if ( (Flags & DCX_INTERSECTUPDATE) && !ClipRegion ) { Flags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; Dce->DCXFlags |= DCX_INTERSECTRGN | DCX_KEEPCLIPRGN; @@ -565,10 +560,7 @@ DceSetDrawable(Window, Dce->hDC, Flags, UpdateClipOrigin); - // if (UpdateVisRgn) - { - DceUpdateVisRgn(Dce, Window, Flags); - } + DceUpdateVisRgn(Dce, Window, Flags); if (Dce->DCXFlags & DCX_CACHE) { @@ -576,8 +568,23 @@ // Need to set ownership so Sync dcattr will work. IntGdiSetDCOwnerEx( Dce->hDC, GDI_OBJ_HMGR_POWNED, FALSE); Dce->ptiOwner = GetW32ThreadInfo(); // Set the temp owning - Dce->ppiOwner = Dce->ptiOwner->ppi; - } + } + + if ( Wnd && + Wnd->ExStyle & WS_EX_LAYOUTRTL && + !(Flags & DCX_KEEPLAYOUT) ) + { + NtGdiSetLayout(Dce->hDC, -1, LAYOUT_RTL); + } + + if (Dce->DCXFlags & DCX_PROCESSOWNED) + { + ppi = PsGetCurrentProcessWin32Process(); + ppi->W32PF_flags |= W32PF_OWNDCCLEANUP; + Dce->ptiOwner = NULL; + Dce->ppiOwner = ppi; + } + return(Dce->hDC); } @@ -726,7 +733,6 @@ } if (NULL != dc->rosdc.hClipRgn) { - int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); NtGdiOffsetRgn(dc->rosdc.hClipRgn, DeltaX, DeltaY); CLIPPING_UpdateGCRegion(dc); }

1 0

[dgorbachev] 45220: Fix initialization of PICs.
by dgorbachev＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: dgorbachev Date: Sun Jan 24 00:39:43 2010 New Revision: 45220 URL: http://svn.reactos.org/svn/reactos?rev=45220&view=rev Log: Fix initialization of PICs. Modified: trunk/reactos/hal/halx86/generic/pic.c Modified: trunk/reactos/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pic.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] Sun Jan 24 00:39:43 2010 @@ -36,6 +36,7 @@ /* Initialize ICW1 for master, interval 8, edge-triggered mode with ICW4 */ Icw1.NeedIcw4 = TRUE; + Icw1.InterruptMode = EdgeTriggered; Icw1.OperatingMode = Cascade; Icw1.Interval = Interval8; Icw1.Init = TRUE; @@ -64,6 +65,7 @@ /* Initialize ICW1 for master, interval 8, edge-triggered mode with ICW4 */ Icw1.NeedIcw4 = TRUE; + Icw1.InterruptMode = EdgeTriggered; Icw1.OperatingMode = Cascade; Icw1.Interval = Interval8; Icw1.Init = TRUE;

1 0

[tkreuzer] 45219: Hopefully create a branch and not destroy the svn repository.
by tkreuzer＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: tkreuzer Date: Sun Jan 24 00:25:04 2010 New Revision: 45219 URL: http://svn.reactos.org/svn/reactos?rev=45219&view=rev Log: Hopefully create a branch and not destroy the svn repository. Added: branches/reactos-yarotows/ (props changed) - copied from r45218, trunk/reactos/ Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jan 24 00:25:04 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Jan 24 00:25:04 2010 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Jan 24 00:25:04 2010 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 Propchange: branches/reactos-yarotows/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[dgorbachev] 45218: Fix build.
by dgorbachev＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: dgorbachev Date: Sat Jan 23 22:57:15 2010 New Revision: 45218 URL: http://svn.reactos.org/svn/reactos?rev=45218&view=rev Log: Fix build. Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpsirql.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/mpsirql.c [iso-8859-1] Sat Jan 23 22:57:15 2010 @@ -292,7 +292,7 @@ BOOLEAN NTAPI HalBeginSystemInterrupt (KIRQL Irql, - ULONG Vector, + UCHAR Vector, PKIRQL OldIrql) { ULONG Flags; @@ -319,7 +319,7 @@ VOID NTAPI HalEndSystemInterrupt (KIRQL Irql, - ULONG Unknown2) + UCHAR Vector) /* * FUNCTION: Finish a system interrupt and restore the specified irq level. */ @@ -338,8 +338,8 @@ VOID NTAPI -HalDisableSystemInterrupt(ULONG Vector, - KIRQL Irql) +HalDisableSystemInterrupt(UCHAR Vector, + KIRQL Irql) { ULONG irq; @@ -361,7 +361,7 @@ BOOLEAN NTAPI -HalEnableSystemInterrupt (ULONG Vector, +HalEnableSystemInterrupt (UCHAR Vector, KIRQL Irql, KINTERRUPT_MODE InterruptMode) {

1 0

[sir_richard] 45217: [PERF]: Replace early ZwClose system calls with ObCloseHandle(KernelMode). This avoids taking a system call for those cases and gives a slight perf boost to booting up the system. It also pushes the first system call somewhat later in the boot process, allowing for easier debugging should the interface have issues/need tracing. [NTOS]: Do not attempt querying the Registry Primary Handle for the Backing Hive File Size in the case where there is no actual Primary! There was no
by sir_richard＠svn.reactos.org 23 Jan '10

23 Jan '10

Author: sir_richard Date: Sat Jan 23 22:27:26 2010 New Revision: 45217 URL: http://svn.reactos.org/svn/reactos?rev=45217&view=rev Log: [PERF]: Replace early ZwClose system calls with ObCloseHandle(KernelMode). This avoids taking a system call for those cases and gives a slight perf boost to booting up the system. It also pushes the first system call somewhat later in the boot process, allowing for easier debugging should the interface have issues/need tracing. [NTOS]: Do not attempt querying the Registry Primary Handle for the Backing Hive File Size in the case where there is no actual Primary! There was no error checking so nobody noticed this happens -- it also probably resets Cluster to 0 (instead of 1), which can cause corruption in some cases. [NTOS]: Make KiUserTrap use the MODE_MASK instead of hard-coding a check for Ring 0 CS (which is slower and not as correct). Modified: trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/work.c trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sat Jan 23 22:27:26 2010 @@ -163,13 +163,17 @@ /* Set flags */ Hive->Flags = HiveFlags; - /* Check how large the file is */ - ZwQueryInformationFile(Primary, - &IoStatusBlock, - &FileInformation, - sizeof(FileInformation), - FileStandardInformation); - Cluster = FileInformation.EndOfFile.LowPart; + /* Check if this is a primary */ + if (Primary) + { + /* Check how large the file is */ + ZwQueryInformationFile(Primary, + &IoStatusBlock, + &FileInformation, + sizeof(FileInformation), + FileStandardInformation); + Cluster = FileInformation.EndOfFile.LowPart; + } /* Initialize it */ Status = HvInitialize(&Hive->Hive, Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=452… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Jan 23 22:27:26 2010 @@ -303,7 +303,7 @@ KernelMode, &ExpNlsSectionPointer, NULL); - ZwClose(NlsSection); + ObCloseHandle(NlsSection, KernelMode); if (!NT_SUCCESS(Status)) { /* Failed */ Modified: trunk/reactos/ntoskrnl/ex/work.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/work.c?rev=452… ============================================================================== --- trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/work.c [iso-8859-1] Sat Jan 23 22:27:26 2010 @@ -310,7 +310,7 @@ /* Dereference and close handle */ ObDereferenceObject(Thread); - ZwClose(hThread); + ObCloseHandle(hThread, KernelMode); } /*++ @@ -586,7 +586,7 @@ ExpWorkerThreadBalanceManagerPtr = Thread; /* Close the handle and return */ - ZwClose(ThreadHandle); + ObCloseHandle(ThreadHandle, KernelMode); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sat Jan 23 22:27:26 2010 @@ -165,7 +165,7 @@ KiUserTrap(IN PKTRAP_FRAME TrapFrame) { /* Anything else but Ring 0 is Ring 3 */ - return (TrapFrame->SegCs != KGDT_R0_CODE); + return (TrapFrame->SegCs & MODE_MASK); } BOOLEAN Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Jan 23 22:27:26 2010 @@ -466,7 +466,7 @@ NULL, TrapFrame, TrapFrame->EFlags & EFLAGS_V86_MASK ? - -1 : TrapFrame->SegCs & MODE_MASK, + -1 : KiUserTrap(TrapFrame), TRUE); /* Return from this trap */ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Jan 23 22:27:26 2010 @@ -586,7 +586,7 @@ KernelMode, (PVOID*)&SysThread, NULL); - ZwClose(SysThreadHandle); + ObCloseHandle(SysThreadHandle, KernelMode); SysThreadCreated = TRUE; /* Return success */

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
53
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 January 2010