Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[jgardou] 64200: [WIN32K] - revert r64197 and r64198

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Sep 19 21:10:56 2014 New Revision: 64200 URL: http://svn.reactos.org/svn/reactos?rev=64200&view=rev Log: [WIN32K] - revert r64197 and r64198 Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Fri Sep 19 21:10:56 2014 @@ -266,7 +266,6 @@ NTSTATUS Status = STATUS_SUCCESS; PTEB pTeb; LARGE_INTEGER LargeTickCount; - OBJECT_ATTRIBUTES EventQueueObjAttr; Process = Thread->ThreadsProcess; @@ -314,9 +313,8 @@ ptiCurrent->ppi->cThreads++; ptiCurrent->hEventQueueClient = NULL; - InitializeObjectAttributes(&EventQueueObjAttr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateEvent(&ptiCurrent->hEventQueueClient, EVENT_ALL_ACCESS, - &EventQueueObjAttr, SynchronizationEvent, FALSE); + NULL, SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) { goto error;

10 years

[ekohl] 64199: [RPCRT4] Addendum to r64053. Fix EmbeddedPointerFree too. Patch by Alexandre Julliard.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Sep 19 20:30:17 2014 New Revision: 64199 URL: http://svn.reactos.org/svn/reactos?rev=64199&view=rev Log: [RPCRT4] Addendum to r64053. Fix EmbeddedPointerFree too. Patch by Alexandre Julliard. Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Fri Sep 19 20:30:17 2014 @@ -1479,7 +1479,7 @@ unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; - pStubMsg->Memory = pMemory; + pStubMsg->Memory = membase; PointerFree(pStubMsg, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; }

10 years

[jgardou] 64198: [WIN32K] - Embarassing addendum to r64197

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Sep 19 18:55:22 2014 New Revision: 64198 URL: http://svn.reactos.org/svn/reactos?rev=64198&view=rev Log: [WIN32K] - Embarassing addendum to r64197 Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Fri Sep 19 18:55:22 2014 @@ -316,7 +316,7 @@ ptiCurrent->hEventQueueClient = NULL; InitializeObjectAttributes(&EventQueueObjAttr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateEvent(&ptiCurrent->hEventQueueClient, EVENT_ALL_ACCESS, - NULL, SynchronizationEvent, FALSE); + &EventQueueObjAttr, SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) { goto error;

10 years

[jgardou] 64197: [WIN32K] - Allocate the the queue client event as a KERNEL_HANDLE CORE-8539

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Sep 19 18:21:06 2014 New Revision: 64197 URL: http://svn.reactos.org/svn/reactos?rev=64197&view=rev Log: [WIN32K] - Allocate the the queue client event as a KERNEL_HANDLE CORE-8539 Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Fri Sep 19 18:21:06 2014 @@ -266,6 +266,7 @@ NTSTATUS Status = STATUS_SUCCESS; PTEB pTeb; LARGE_INTEGER LargeTickCount; + OBJECT_ATTRIBUTES EventQueueObjAttr; Process = Thread->ThreadsProcess; @@ -313,6 +314,7 @@ ptiCurrent->ppi->cThreads++; ptiCurrent->hEventQueueClient = NULL; + InitializeObjectAttributes(&EventQueueObjAttr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateEvent(&ptiCurrent->hEventQueueClient, EVENT_ALL_ACCESS, NULL, SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status))

10 years

[tfaber] 64196: [GDI32] - Fix MSVC build

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 19 17:51:04 2014 New Revision: 64196 URL: http://svn.reactos.org/svn/reactos?rev=64196&view=rev Log: [GDI32] - Fix MSVC build Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Fri Sep 19 17:51:04 2014 @@ -58,6 +58,7 @@ target_link_libraries(gdi32 win32ksys dxguid + msvcrtex ${PSEH_LIB}) add_importlibs(gdi32 user32 advapi32 kernel32 ntdll)

10 years

[tfaber] 64195: [OLEAUT32] - Sync MSVC version of call_method with GCC version. Patch by Timo Kreuzer.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 19 14:35:56 2014 New Revision: 64195 URL: http://svn.reactos.org/svn/reactos?rev=64195&view=rev Log: [OLEAUT32] - Sync MSVC version of call_method with GCC version. Patch by Timo Kreuzer. Modified: trunk/reactos/dll/win32/oleaut32/msvc.S Modified: trunk/reactos/dll/win32/oleaut32/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/msvc.S?… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/msvc.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/msvc.S [iso-8859-1] Fri Sep 19 14:35:56 2014 @@ -19,17 +19,21 @@ push esi push edi mov edx, dword ptr ds:[ebp + 12] + mov edi, esp shl edx, 2 jz cm1 - sub esp, edx - and esp, HEX(0FFFFFFF0) + sub edi, edx + and edi, HEX(0FFFFFFF0) + mov esp, edi mov ecx, dword ptr ds:[ebp + 12] mov esi, dword ptr ds:[ebp + 16] - mov edi, esp cld rep movsd cm1: call dword ptr ds:[ebp + 8] + sub edi, esp + mov ecx,[ebp + 20] + mov [ecx], edi lea esp, [ebp - 8] pop edi pop esi

10 years

[tfaber] 64194: [PSEH3] - Don't clobber ebx in __SEH3$_RegisterTryLevelWithNonVolatiles (addendum to r64132)

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 19 13:59:13 2014 New Revision: 64194 URL: http://svn.reactos.org/svn/reactos?rev=64194&view=rev Log: [PSEH3] - Don't clobber ebx in __SEH3$_RegisterTryLevelWithNonVolatiles (addendum to r64132) Modified: trunk/reactos/lib/pseh/i386/pseh3.c trunk/reactos/lib/pseh/i386/pseh3_i386.S Modified: trunk/reactos/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3.c?rev=… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3.c [iso-8859-1] Fri Sep 19 13:59:13 2014 @@ -153,7 +153,7 @@ /* Check for __finally frames */ if (Frame->ScopeTable->Target == NULL) { - _SEH3$_InvokeFilter(Frame, Frame->ScopeTable->Filter); + _SEH3$_InvokeFilter(Frame, Frame->ScopeTable->Filter); } } Modified: trunk/reactos/lib/pseh/i386/pseh3_i386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/pseh3_i386.S… ============================================================================== --- trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/pseh3_i386.S [iso-8859-1] Fri Sep 19 13:59:13 2014 @@ -87,6 +87,7 @@ /* Safe the return address */ mov ebx, [esp] mov [eax + SEH3_REGISTRATION_FRAME_ReturnAddress], ebx + mov ebx, [eax + SEH3_REGISTRATION_FRAME_Ebx] .global __SEH3$_RegisterTryLevelWithStackLayout __SEH3$_RegisterTryLevelWithStackLayout:

10 years

[jgardou] 64193: [WIN32K] - Check the right variable for error condition

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Sep 18 14:26:59 2014 New Revision: 64193 URL: http://svn.reactos.org/svn/reactos?rev=64193&view=rev Log: [WIN32K] - Check the right variable for error condition Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Thu Sep 18 14:26:59 2014 @@ -1930,7 +1930,7 @@ RETURN(Result); CLEANUP: - if (hrgnUpdate && (Result != ERROR)) + if (hrgnUpdate && (_ret_ != ERROR)) { /* Give everything back to the caller */ RgnTemp = RGNOBJAPI_Lock(hrgnUpdate, NULL);

10 years

[tkreuzer] 64192: [NTOSKRNL/AMD64] Actually revert the change to KiRaiseAssertion, it was correct before

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 18 14:10:41 2014 New Revision: 64192 URL: http://svn.reactos.org/svn/reactos?rev=64192&view=rev Log: [NTOSKRNL/AMD64] Actually revert the change to KiRaiseAssertion, it was correct before Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Sep 18 14:10:41 2014 @@ -612,7 +612,7 @@ PUBLIC KiRaiseAssertion FUNC KiRaiseAssertion /* We have an error code */ - EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) + EnterTrap (TF_SAVE_ALL) /* Decrement RIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ sub qword ptr [rbp + KTRAP_FRAME_Rip], 2

10 years

[tkreuzer] 64191: [NTOSKRNL/AMD64] - Fix trap flags in KiRaiseAssertion - Add some asm debugcode

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Sep 18 14:06:31 2014 New Revision: 64191 URL: http://svn.reactos.org/svn/reactos?rev=64191&view=rev Log: [NTOSKRNL/AMD64] - Fix trap flags in KiRaiseAssertion - Add some asm debugcode Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Sep 18 14:06:31 2014 @@ -30,6 +30,55 @@ MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" +MsgPageFault: +.asciz "Page fault! Code = 0x%x, RIP = %p, FaultingAddress = %p\n" + +MsgGeneralProtFault: +.asciz "General protection fault at %p!\n" + +MsgBreakpointTrap: +.asciz "BreakpointTrap at %p\n" + +MsgUnexpectedInterrupt: +.asciz "UnexpectedInterrupt Vector=0x%02lx\n" + +MsgInvalidOpcodeFault: +.asciz "Invalid opcode fault at %p!\n" + +MsgDoubleFault: +.asciz "Double fault at %p, rbp=%p!\n" + +MsgTrapInfo: +.asciz "Trap: %s at %p\n" + +MACRO(TRAPINFO, func) +LOCAL label1, label2 +#if 0 + jmp label2 +label1: .asciz "\func" +label2: + push rax + push rcx + push rdx + push r8 + push r9 + push r10 + push r11 + sub rsp, 32 + lea rcx, MsgTrapInfo[rip] + lea rdx, 1b[rip] + mov r8, [rbp + KTRAP_FRAME_Rip] + call qword ptr FrLdrDbgPrint[rip] + pop r11 + pop r10 + pop r9 + pop r8 + pop rdx + pop rcx + pop rax + add rsp, 32 +#endif +ENDM /* Helper Macros *************************************************************/ @@ -87,7 +136,7 @@ // rbp = TrapFrame, eax = ExceptionCode, edx = NumParams, r9,r10,r11 = params -.PROC InternalDispatchException +FUNC InternalDispatchException /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ sub rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH @@ -155,7 +204,7 @@ add rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH ret -.ENDP +ENDFUNC InternalDispatchException /* CPU EXCEPTION HANDLERS ****************************************************/ @@ -173,7 +222,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiDivideErrorFault PUBLIC KiDebugTrapOrFault @@ -181,6 +230,8 @@ /* Push pseudo error code */ EnterTrap TF_SAVE_ALL + TRAPINFO KiDebugTrapOrFault + /* Check if the frame was from kernelmode */ test word ptr [rbp + KTRAP_FRAME_SegCs], 3 jz KiDebugTrapOrFaultKMode @@ -194,7 +245,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiDebugTrapOrFault PUBLIC KiNmiInterrupt @@ -207,7 +258,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiNmiInterrupt PUBLIC KiBreakpointTrap @@ -228,7 +279,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiBreakpointTrap PUBLIC KiOverflowTrap @@ -244,7 +295,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiOverflowTrap PUBLIC KiBoundFault @@ -268,13 +319,19 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiBoundFault PUBLIC KiInvalidOpcodeFault FUNC KiInvalidOpcodeFault /* No error code */ EnterTrap TF_SAVE_ALL + + TRAPINFO KiInvalidOpcodeFault + + mov rdx, [rbp + KTRAP_FRAME_Rip] + lea rcx, MsgInvalidOpcodeFault[rip] + call qword ptr FrLdrDbgPrint[rip] /* Enable interrupts */ sti @@ -293,7 +350,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiInvalidOpcodeFault PUBLIC KiNpxNotAvailableFault @@ -315,18 +372,23 @@ KiNpxNotAvailableFaultExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiNpxNotAvailableFault PUBLIC KiDoubleFaultAbort FUNC KiDoubleFaultAbort /* No error code */ EnterTrap TF_SAVE_ALL + + lea rcx, MsgDoubleFault[rip] + mov rdx, [rbp + KTRAP_FRAME_FaultAddress] + mov r8, rbp + call qword ptr FrLdrDbgPrint[rip] /* Bugcheck */ Fatal 8 // EXCEPTION_DOUBLE_FAULT jmp $ -ENDFUNC +ENDFUNC KiDoubleFaultAbort PUBLIC KiNpxSegmentOverrunAbort @@ -336,8 +398,9 @@ /* Bugcheck */ Fatal EXCEPTION_NPX_OVERRUN + jmp $ -ENDFUNC +ENDFUNC KiNpxSegmentOverrunAbort PUBLIC KiInvalidTssFault @@ -348,7 +411,7 @@ /* Bugcheck */ Fatal EXCEPTION_INVALID_TSS jmp $ -ENDFUNC +ENDFUNC KiInvalidTssFault PUBLIC KiSegmentNotPresentFault @@ -359,7 +422,7 @@ /* Bugcheck */ Fatal EXCEPTION_SEGMENT_NOT_PRESENT jmp $ -ENDFUNC +ENDFUNC KiSegmentNotPresentFault PUBLIC KiStackFault @@ -370,13 +433,18 @@ /* Bugcheck */ Fatal EXCEPTION_STACK_FAULT jmp $ -ENDFUNC +ENDFUNC KiStackFault PUBLIC KiGeneralProtectionFault FUNC KiGeneralProtectionFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) + + //TRAPINFO KiGeneralProtectionFault + //mov rdx, [rbp + KTRAP_FRAME_Rip] + //lea rcx, MsgGeneralProtFault[rip] + //call qword ptr FrLdrDbgPrint[rip] /* Call the C handler */ mov rcx, rbp @@ -404,13 +472,23 @@ /* Return */ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiGeneralProtectionFault PUBLIC KiPageFault FUNC KiPageFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) + + TRAPINFO KiPageFault + +#if 0 + 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 FrLdrDbgPrint[rip] +#endif /* Save page fault address */ mov rdx, cr2 @@ -482,7 +560,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiFloatingErrorFault PUBLIC KiAlignmentFault @@ -493,7 +571,7 @@ /* Bugcheck */ Fatal EXCEPTION_ALIGNMENT_CHECK jmp $ -ENDFUNC +ENDFUNC KiAlignmentFault PUBLIC KiMcheckAbort @@ -504,7 +582,7 @@ /* Bugcheck */ Fatal HEX(12) jmp $ -ENDFUNC +ENDFUNC KiMcheckAbort PUBLIC KiXmmException @@ -526,7 +604,7 @@ KiXmmExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiXmmException /* SOFTWARE INTERRUPT SERVICES ***********************************************/ @@ -534,7 +612,7 @@ PUBLIC KiRaiseAssertion FUNC KiRaiseAssertion /* We have an error code */ - EnterTrap (TF_SAVE_ALL) + EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) /* Decrement RIP to point to the INT2C instruction (2 bytes, not 1 like INT3) */ sub qword ptr [rbp + KTRAP_FRAME_Rip], 2 @@ -544,13 +622,15 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiRaiseAssertion PUBLIC KiDebugServiceTrap -.PROC KiDebugServiceTrap - /* No error code */ - EnterTrap TF_SAVE_ALL +FUNC KiDebugServiceTrap + /* No error code */ + EnterTrap TF_SAVE_ALL + + TRAPINFO KiDebugServiceTrap /* Increase Rip to skip the int3 */ inc qword ptr [rbp + KTRAP_FRAME_Rip] @@ -560,7 +640,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -.ENDP +ENDFUNC KiDebugServiceTrap PUBLIC KiApcInterrupt @@ -666,7 +746,7 @@ #endif /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC +ENDFUNC KiUnexpectedInterrupt PUBLIC KiInterruptDispatch FUNC KiInterruptDispatch

10 years

← Newer
1
...
21
22
23
24
25
26
27
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2014