Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[pschweitzer] 67644: [NTFS] Don't call MmGetSystemAddressForMdl()

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 10 21:24:51 2015 New Revision: 67644 URL: http://svn.reactos.org/svn/reactos?rev=67644&view=rev Log: [NTFS] Don't call MmGetSystemAddressForMdl() Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 10 21:24:51 2015 @@ -89,8 +89,6 @@ ((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || (!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && (IrpContext->Flags & IRPCONTEXT_QUEUE))); - - if (IrpContext->Flags & IRPCONTEXT_COMPLETE) { Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Sun May 10 21:24:51 2015 @@ -184,7 +184,7 @@ DeviceExt = DeviceObject->DeviceExtension; ReadLength = Stack->Parameters.Read.Length; ReadOffset = Stack->Parameters.Read.ByteOffset; - Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); + Buffer = NtfsGetUserBuffer(Irp); Status = NtfsReadFile(DeviceExt, FileObject,

9 years, 7 months

[tkreuzer] 67643: [RTL] Implement DbgUserBreakPoint and DbgBreakPointWithStatus on ARM

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 10 21:05:01 2015 New Revision: 67643 URL: http://svn.reactos.org/svn/reactos?rev=67643&view=rev Log: [RTL] Implement DbgUserBreakPoint and DbgBreakPointWithStatus on ARM Modified: trunk/reactos/lib/rtl/arm/debug_asm.S Modified: trunk/reactos/lib/rtl/arm/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/arm/debug_asm.S?re… ============================================================================== --- trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] Sun May 10 21:05:01 2015 @@ -10,72 +10,73 @@ TEXTAREA - NESTED_ENTRY DbgBreakPoint - PROLOG_END DbgBreakPoint + LEAF_ENTRY DbgBreakPoint + __debugbreak + bx lr + LEAF_END DbgBreakPoint - // - // Do a breakpoint and return - // - bkpt BREAKPOINT_BREAK + LEAF_ENTRY DbgUserBreakPoint + __debugbreak bx lr - ENTRY_END DbgBreakPoint + LEAF_END DbgUserBreakPoint - NESTED_ENTRY DebugService - PROLOG_END DebugService + LEAF_ENTRY DbgBreakPointWithStatus + __debugbreak + bx lr + LEAF_END - // - // Do a breakpoint and return - // - bkpt BREAKPOINT_PRINT // Could be prompt too, we check this later + LEAF_ENTRY RtlpBreakWithStatusInstruction + __debugbreak bx lr - ENTRY_END DebugService + LEAF_END - NESTED_ENTRY DebugService2 - PROLOG_END DebugService2 + LEAF_ENTRY DebugService + __debugservice + //bkpt BREAKPOINT_PRINT // Could be prompt too, we check this later + bx lr + LEAF_END DebugService - // - // FIXME-TODO: Do a breakpoint and return - // + LEAF_ENTRY DebugService2 //bkpt BREAKPOINT_LOAD_SYMBOLS // Could be unload too, we check this later bx lr - ENTRY_END DebugService2 + LEAF_END DebugService2 - NESTED_ENTRY RtlCaptureContext - PROLOG_END RtlCaptureContext + LEAF_ENTRY RtlCaptureContext - // // FIXME-PERF: Change to stmdb later - // - str r0, [a1, #CsR0] - str r1, [a1, #CsR1] - str r2, [a1, #CsR2] - str r3, [a1, #CsR3] - str r4, [a1, #CsR4] - str r5, [a1, #CsR5] - str r6, [a1, #CsR6] - str r7, [a1, #CsR7] - str r8, [a1, #CsR8] - str r9, [a1, #CsR9] - str r10, [a1, #CsR10] - str r11, [a1, #CsR11] - str r12, [a1, #CsR12] - str sp, [a1, #CsSp] - str lr, [a1, #CsLr] -// str pc, [a1, #CsPc] // FIXME: error A2193: this instruction generates unpredictable behavior + str r0, [a1, #CxR0] + str r1, [a1, #CxR1] + str r2, [a1, #CxR2] + str r3, [a1, #CxR3] + str r4, [a1, #CxR4] + str r5, [a1, #CxR5] + str r6, [a1, #CxR6] + str r7, [a1, #CxR7] + str r8, [a1, #CxR8] + str r9, [a1, #CxR9] + str r10, [a1, #CxR10] + str r11, [a1, #CxR11] + str r12, [a1, #CxR12] + + str sp, [a1, #CxSp] + str lr, [a1, #CxLr] + + /* Need to do this indirectly, since "str pc, [a1, #CxPc]" generates + unpredictable behavior (error A2193) */ + mov ip, pc + str ip, [a1, #CxPc] mrs ip, spsr - str ip, [a1, #CsCpsr] + str ip, [a1, #CxCpsr] - // - // Set flags - // - mov ip, #CONTEXT_FULL - str ip, [a1, #CsContextFlags] + // FIXME: Fpscr and remaining stuff - // - // Return - // + /* Set flags */ + mov32 r0, #CONTEXT_FULL + str ip, [a1, #CxContextFlags] + + /* Return */ bx lr - ENTRY_END RtlCaptureContext + LEAF_END RtlCaptureContext END /* EOF */

9 years, 7 months

[tkreuzer] 67642: [CRT] Implement __rt_srsh

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 10 21:04:48 2015 New Revision: 67642 URL: http://svn.reactos.org/svn/reactos?rev=67642&view=rev Log: [CRT] Implement __rt_srsh Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_srsh.s [iso-8859-1] Sun May 10 21:04:48 2015 @@ -13,10 +13,66 @@ TEXTAREA +/* + __int64 + __rt_srsh( + __int64 value, + uint32_t shift); + + R0 = loword of value + R1 = hiword of value + R2 = shift + +*/ + LEAF_ENTRY __rt_srsh - __assertfail - bx lr + /* r3 = 32 - r2 */ + rsbs r3, r2, #32 + + /* Branch if minus (r2 > 32) */ + bmi __rt_srsh2 + + /* r0 = r0 >> r2 (logical shift!) */ + lsr r0, r0, r2 + + /* r3 = r1 << r3 */ + lsl r3, r1, r3 + + /* r0 |= r1 << (32 - r2) */ + orr r0, r0, r3 + + /* r1 = r1 >> r2 (arithmetic shift!) */ + asr r1, r1, r2 + + bx lr + +__rt_srsh2 + + /* Check if shift is > 64 */ + cmp r2, 64 + bhs __rt_srsh3 + + /* r3 = r2 - 32 */ + sub r3, r2, #32 + + /* r0 = r1 >> r3 (arithmetic shift!) */ + asr r0, r1, r3 + + /* r1 = r1 >> 32 (arithmetic shift!) */ + asr r1, r1, #32 + + bx lr + +__rt_srsh3 + + /* r1 = r1 >> 32 (arithmetic shift!) */ + asr r1, r1, #32 + + /* r0 = r1 */ + mov r0, r1 + + bx lr LEAF_END __rt_srsh

9 years, 7 months

[tkreuzer] 67641: [CRT/RTL/NTOSKRNL] Add new ARM files to build and improve the stubs a bit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 10 21:04:27 2015 New Revision: 67641 URL: http://svn.reactos.org/svn/reactos?rev=67641&view=rev Log: [CRT/RTL/NTOSKRNL] Add new ARM files to build and improve the stubs a bit Modified: trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s trunk/reactos/lib/sdk/crt/except/arm/_abnormal_termination.s trunk/reactos/lib/sdk/crt/except/arm/_except_handler2.s trunk/reactos/lib/sdk/crt/except/arm/_except_handler3.s trunk/reactos/lib/sdk/crt/except/arm/_global_unwind2.s trunk/reactos/lib/sdk/crt/except/arm/_local_unwind2.s trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/math/arm/floor.s trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/ntoskrnl/ntos.cmake Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Sun May 10 21:04:27 2015 @@ -93,6 +93,7 @@ elseif(ARCH STREQUAL "arm") list(APPEND ASM_SOURCE arm/debug_asm.S) list(APPEND SOURCE + arm/except.c byteswap.c mem.c) elseif(ARCH STREQUAL "powerpc") Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Sun May 10 21:04:27 2015 @@ -475,21 +475,54 @@ except/amd64/cpp.s) endif() elseif(ARCH STREQUAL "arm") - list(APPEND LIBCNTPR_SOURCE + list(APPEND CRT_SOURCE + except/arm/ehandler.c + math/fabsf.c math/arm/__rt_sdiv.c math/arm/__rt_sdiv64_worker.c math/arm/__rt_udiv.c math/arm/__rt_udiv64_worker.c ) list(APPEND CRT_ASM_SOURCE + except/arm/_abnormal_termination.s + except/arm/_except_handler2.s + except/arm/_except_handler3.s + except/arm/_global_unwind2.s + except/arm/_local_unwind2.s + except/arm/chkstk_asm.s + float/arm/_clearfp.s + float/arm/_controlfp.s + float/arm/_fpreset.s + float/arm/_statusfp.s + math/arm/atan.s + math/arm/atan2.s + math/arm/ceil.s + math/arm/exp.s + math/arm/fabs.s + math/arm/fmod.s math/arm/floor.s + math/arm/ldexp.s + math/arm/log.s math/arm/log10.s math/arm/pow.s + math/arm/sqrt.s + math/arm/tan.s + math/arm/_logb.s + math/arm/__dtoi64.s math/arm/__dtou64.s + math/arm/__i64tod.s + math/arm/__i64tos.s math/arm/__u64tod.s + math/arm/__u64tos.s math/arm/__rt_sdiv64.s + math/arm/__rt_srsh.s math/arm/__rt_udiv64.s + setjmp/arm/setjmp.s ) + if(MSVC) + list(APPEND CRT_ASM_SOURCE + except/arm/cpp.s) + endif() endif() if(NOT ARCH STREQUAL "i386") Modified: trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/__j… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/__jump_unwind.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,7 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory * PROJECT: ReactOS CRT library - * PURPOSE: Implementation of __jmp_unwind + * PURPOSE: Implementation of __jump_unwind * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -12,10 +12,10 @@ /* CODE **********************************************************************/ TEXTAREA - LEAF_ENTRY __jmp_unwind + LEAF_ENTRY __jump_unwind __assertfail bx lr - LEAF_END __jmp_unwind + LEAF_END __jump_unwind END /* EOF */ Modified: trunk/reactos/lib/sdk/crt/except/arm/_abnormal_termination.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/_ab… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/_abnormal_termination.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/_abnormal_termination.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,8 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT librariy * PURPOSE: Implementation of _abnormal_termination - * FILE: lib/sdk/crt/except/arm/_abnormal_termination.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -14,7 +13,7 @@ TEXTAREA LEAF_ENTRY _abnormal_termination - DCD 0xdefc // __assertfail + __assertfail bx lr LEAF_END _abnormal_termination Modified: trunk/reactos/lib/sdk/crt/except/arm/_except_handler2.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/_ex… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/_except_handler2.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/_except_handler2.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,8 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT librariy * PURPOSE: Implementation of _except_handler2 - * FILE: lib/sdk/crt/except/arm/_except_handler2.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -14,7 +13,7 @@ TEXTAREA LEAF_ENTRY _except_handler2 - DCD 0xdefc // __assertfail + __assertfail bx lr LEAF_END _except_handler2 Modified: trunk/reactos/lib/sdk/crt/except/arm/_except_handler3.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/_ex… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/_except_handler3.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/_except_handler3.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,8 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT librariy * PURPOSE: Implementation of _except_handler3 - * FILE: lib/sdk/crt/except/arm/_except_handler3.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -14,7 +13,7 @@ TEXTAREA LEAF_ENTRY _except_handler3 - DCD 0xdefc // __assertfail + __assertfail bx lr LEAF_END _except_handler3 Modified: trunk/reactos/lib/sdk/crt/except/arm/_global_unwind2.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/_gl… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/_global_unwind2.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/_global_unwind2.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,8 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT librariy * PURPOSE: Implementation of _global_unwind2 - * FILE: lib/sdk/crt/except/arm/_global_unwind2.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -14,7 +13,7 @@ TEXTAREA LEAF_ENTRY _global_unwind2 - DCD 0xdefc // __assertfail + __assertfail bx lr LEAF_END _global_unwind2 Modified: trunk/reactos/lib/sdk/crt/except/arm/_local_unwind2.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/_lo… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/_local_unwind2.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/_local_unwind2.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,8 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT librariy * PURPOSE: Implementation of _local_unwind2 - * FILE: lib/sdk/crt/except/arm/_local_unwind2.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -14,7 +13,7 @@ TEXTAREA LEAF_ENTRY _local_unwind2 - DCD 0xdefc // __assertfail + __assertfail bx lr LEAF_END _local_unwind2 Modified: trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/chk… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,8 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT librariy * PURPOSE: Implementation of _chkstk and _alloca_probe - * FILE: lib/sdk/crt/except/arm/chkstk_asm.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) * Yuntian Zhang (yuntian.zh(a)gmail.com) */ @@ -14,15 +13,13 @@ /* CODE **********************************************************************/ TEXTAREA -MsgUnimplemented ASCII "Unimplemented", CR, LF, NUL - LEAF_ENTRY __chkstk - UNIMPLEMENTED chkstk + __assertfail bx lr LEAF_END __chkstk LEAF_ENTRY __alloca_probe - UNIMPLEMENTED alloca_probe + __assertfail bx lr LEAF_END __alloca_probe Modified: trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/chk… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/arm/chkstk_ms.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -1,8 +1,7 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries + * COPYRIGHT: BSD - See COPYING.ARM in the top level directory + * PROJECT: ReactOS CRT librariy * PURPOSE: Implementation of _chkstk and _alloca_probe - * FILE: lib/sdk/crt/except/arm/chkstk_ms.s * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) * Yuntian Zhang (yuntian.zh(a)gmail.com) */ @@ -14,15 +13,13 @@ /* CODE **********************************************************************/ TEXTAREA -MsgUnimplemented ASCII "Unimplemented", CR, LF, NUL - LEAF_ENTRY ___chkstk_ms - UNIMPLEMENTED chkstk_ms + __assertfail bx lr LEAF_END __chkstk_ms LEAF_ENTRY __alloca_probe - UNIMPLEMENTED alloca_probe + __assertfail bx lr LEAF_END __alloca_probe Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Sun May 10 21:04:27 2015 @@ -135,19 +135,48 @@ math/sin.c) elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_SOURCE + except/arm/chkstk_asm.s + except/arm/__jump_unwind.s math/arm/__rt_sdiv.c math/arm/__rt_sdiv64_worker.c math/arm/__rt_udiv.c math/arm/__rt_udiv64_worker.c ) list(APPEND LIBCNTPR_ASM_SOURCE + except/arm/_abnormal_termination.s + except/arm/_except_handler2.s + except/arm/_except_handler3.s + except/arm/_global_unwind2.s + except/arm/_local_unwind2.s + except/arm/chkstk_asm.s + except/arm/ehandler.c + float/arm/_clearfp.s + float/arm/_controlfp.s + float/arm/_fpreset.s + float/arm/_statusfp.s + math/arm/atan.s + math/arm/atan2.s + math/arm/ceil.s + math/arm/exp.s + math/arm/fabs.s + math/arm/fmod.s math/arm/floor.s + math/arm/ldexp.s + math/arm/log.s math/arm/log10.s math/arm/pow.s + math/arm/sqrt.s + math/arm/tan.s + math/arm/__dtoi64.s math/arm/__dtou64.s + math/arm/__i64tod.s + math/arm/__i64tos.s math/arm/__u64tod.s + math/arm/__u64tos.s math/arm/__rt_sdiv64.s + math/arm/__rt_srsh.s math/arm/__rt_udiv64.s + setjmp/arm/setjmp.s ) endif() @@ -178,6 +207,8 @@ string/i386/wcsrchr_asm.s) else() list(APPEND LIBCNTPR_SOURCE + math/cos.c + math/sin.c mem/memchr.c mem/memcpy.c mem/memmove.c Modified: trunk/reactos/lib/sdk/crt/math/arm/floor.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/floor… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/floor.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/floor.s [iso-8859-1] Sun May 10 21:04:27 2015 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ -#include <ksarm.h> +#include <kxarm.h> /* CODE **********************************************************************/ Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun May 10 21:04:27 2015 @@ -64,6 +64,25 @@ list(APPEND MSVCRTEX_ASM_SOURCE except/amd64/chkstk_asm.s except/amd64/chkstk_ms.s) +elseif(ARCH STREQUAL "arm") + list(APPEND MSVCRTEX_SOURCE + math/arm/__rt_sdiv.c + math/arm/__rt_sdiv64_worker.c + math/arm/__rt_udiv.c + math/arm/__rt_udiv64_worker.c + ) + list(APPEND MSVCRTEX_ASM_SOURCE + except/arm/chkstk_asm.s + math/arm/__dtoi64.s + math/arm/__dtou64.s + math/arm/__i64tod.s + math/arm/__i64tos.s + math/arm/__u64tod.s + math/arm/__u64tos.s + math/arm/__rt_sdiv64.s + math/arm/__rt_srsh.s + math/arm/__rt_udiv64.s + ) endif() if(MSVC) Modified: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Sun May 10 21:04:27 2015 @@ -327,14 +327,17 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/amd64/psctx.c) elseif(ARCH STREQUAL "arm") list(APPEND ASM_SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/ex/arm/ioport.s ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/boot.s ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/ctxswtch.s ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/stubs_asm.s ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trap.s) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/config/arm/cmhardwr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/cpu.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/exp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/interrupt.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/kiinit.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/thrdini.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trapc.c

9 years, 7 months

[tkreuzer] 67640: [ASM] - Make syscalls ARM compatible

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 10 21:03:53 2015 New Revision: 67640 URL: http://svn.reactos.org/svn/reactos?rev=67640&view=rev Log: [ASM] - Make syscalls ARM compatible Modified: trunk/reactos/include/asm/syscalls.inc trunk/reactos/ntoskrnl/ex/zw.S trunk/reactos/ntoskrnl/include/sysfuncs.h trunk/reactos/ntoskrnl/ntdll.S trunk/reactos/win32ss/sys-stubs.S trunk/reactos/win32ss/w32ksvc.h Modified: trunk/reactos/include/asm/syscalls.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/syscalls.inc?r… ============================================================================== --- trunk/reactos/include/asm/syscalls.inc [iso-8859-1] (original) +++ trunk/reactos/include/asm/syscalls.inc [iso-8859-1] Sun May 10 21:03:53 2015 @@ -1,3 +1,56 @@ + +#ifdef _M_ARM + +#include <ksarm.h> + + GBLA SyscallId + +SyscallId SETA 0 + + MACRO + STUB_K $Name + LCLS ZwFuncName + LCLS ZwFuncEndName +ZwFuncName SETS "Zw$Name" +ZwFuncEndName SETS "$ZwFuncName":CC:"_end" + ALIGN 2 + EXPORT $ZwFuncName [FUNC] +$ZwFuncName + ROUT + mov r12, #SyscallId + svc #1 + bx lr +$ZwFuncEndName + MEND + + MACRO + STUB_U $Name + LCLS NtFuncName + LCLS NtFuncEndName + LCLS ZwFuncName + LCLS ZwFuncEndName +NtFuncName SETS "Nt$Name" +NtFuncEndName SETS "$NtFuncName":CC:"_end" +ZwFuncName SETS "Zw$Name" +ZwFuncEndName SETS "$ZwFuncName":CC:"_end" + ALIGN 2 + EXPORT $NtFuncName [FUNC] +$NtFuncName + EXPORT $ZwFuncName [FUNC] +$ZwFuncName + ROUT + mov r12, #SyscallId + svc #1 + bx lr +$NtFuncEndName +$ZwFuncEndName + MEND + +#else + +#include <asm.inc> + +SyscallId = 0 #ifdef _M_IX86 #define KUSER_SHARED_SYSCALL HEX(7ffe0300) @@ -34,16 +87,6 @@ lea rax, Nt&Name[rip] mov r10, ArgCount * 8 jmp KiZwSystemService -ENDM -#elif defined(_M_ARM) -MACRO(STUBCODE_U, Name, SyscallId, ArgCount) - swi #SyscallId - bx lr -ENDM -MACRO(STUBCODE_K, Name, SyscallId, ArgCount) - mov ip, lr - swi #SyscallId - bx ip ENDM #elif defined(_M_PPC) MACRO(STUBCODE_U, Name, SyscallId, ArgCount) @@ -107,3 +150,5 @@ .ENDP SyscallId = SyscallId + 1 ENDM + +#endif Modified: trunk/reactos/ntoskrnl/ex/zw.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/zw.S?rev=67640… ============================================================================== --- trunk/reactos/ntoskrnl/ex/zw.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/zw.S [iso-8859-1] Sun May 10 21:03:53 2015 @@ -1,6 +1,15 @@ -#include <asm.inc> #include <syscalls.inc> + +#ifdef _M_ARM + + TEXTAREA + +#define SVC_(name, argcount) STUB_K name + +#include <sysfuncs.h> + +#else #ifdef _M_IX86 EXTERN _KiSystemService:PROC @@ -12,9 +21,10 @@ .code -SyscallId = 0 #define SVC_(name, argcount) STUB_K name, argcount #include <sysfuncs.h> -END +#endif + + END Modified: trunk/reactos/ntoskrnl/include/sysfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/sysfuncs.… ============================================================================== --- trunk/reactos/ntoskrnl/include/sysfuncs.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/sysfuncs.h [iso-8859-1] Sun May 10 21:03:53 2015 @@ -1,296 +1,296 @@ -SVC_(AcceptConnectPort, 6) -SVC_(AccessCheck, 8) -SVC_(AccessCheckAndAuditAlarm, 11) -SVC_(AccessCheckByType, 11) -SVC_(AccessCheckByTypeAndAuditAlarm, 16) -SVC_(AccessCheckByTypeResultList, 11) -SVC_(AccessCheckByTypeResultListAndAuditAlarm, 16) -SVC_(AccessCheckByTypeResultListAndAuditAlarmByHandle, 17) -SVC_(AddAtom, 3) -SVC_(AddBootEntry, 2) -SVC_(AddDriverEntry, 2) -SVC_(AdjustGroupsToken, 6) -SVC_(AdjustPrivilegesToken, 6) -SVC_(AlertResumeThread, 2) -SVC_(AlertThread, 1) -SVC_(AllocateLocallyUniqueId, 1) -SVC_(AllocateUserPhysicalPages, 3) -SVC_(AllocateUuids, 4) -SVC_(AllocateVirtualMemory, 6) -SVC_(ApphelpCacheControl, 2) -SVC_(AreMappedFilesTheSame, 2) -SVC_(AssignProcessToJobObject, 2) -SVC_(CallbackReturn, 3) -SVC_(CancelDeviceWakeupRequest, 1) -SVC_(CancelIoFile, 2) -SVC_(CancelTimer, 2) -SVC_(ClearEvent, 1) -SVC_(Close, 1) -SVC_(CloseObjectAuditAlarm, 3) -SVC_(CompactKeys, 2) -SVC_(CompareTokens, 3) -SVC_(CompleteConnectPort, 1) -SVC_(CompressKey, 1) -SVC_(ConnectPort, 8) -SVC_(Continue, 2) -SVC_(CreateDebugObject, 4) -SVC_(CreateDirectoryObject, 3) -SVC_(CreateEvent, 5) -SVC_(CreateEventPair, 3) -SVC_(CreateFile, 11) -SVC_(CreateIoCompletion, 4) -SVC_(CreateJobObject, 3) -SVC_(CreateJobSet, 3) -SVC_(CreateKey, 7) -SVC_(CreateMailslotFile, 8) -SVC_(CreateMutant, 4) -SVC_(CreateNamedPipeFile, 14) -SVC_(CreatePagingFile, 4) -SVC_(CreatePort, 5) -SVC_(CreateProcess, 8) -SVC_(CreateProcessEx, 9) -SVC_(CreateProfile, 9) -SVC_(CreateSection, 7) -SVC_(CreateSemaphore, 5) -SVC_(CreateSymbolicLinkObject, 4) -SVC_(CreateThread, 8) -SVC_(CreateTimer, 4) -SVC_(CreateToken, 13) -SVC_(CreateWaitablePort, 5) -SVC_(DebugActiveProcess, 2) -SVC_(DebugContinue, 3) -SVC_(DelayExecution, 2) -SVC_(DeleteAtom, 1) -SVC_(DeleteBootEntry, 1) -SVC_(DeleteDriverEntry, 1) -SVC_(DeleteFile, 1) -SVC_(DeleteKey, 1) -SVC_(DeleteObjectAuditAlarm, 3) -SVC_(DeleteValueKey, 2) -SVC_(DeviceIoControlFile, 10) -SVC_(DisplayString, 1) -SVC_(DuplicateObject, 7) -SVC_(DuplicateToken, 6) -SVC_(EnumerateBootEntries, 2) -SVC_(EnumerateDriverEntries, 2) -SVC_(EnumerateKey, 6) -SVC_(EnumerateSystemEnvironmentValuesEx, 3) -SVC_(EnumerateValueKey, 6) -SVC_(ExtendSection, 2) -SVC_(FilterToken, 6) -SVC_(FindAtom, 3) -SVC_(FlushBuffersFile, 2) -SVC_(FlushInstructionCache, 3) -SVC_(FlushKey, 1) -SVC_(FlushVirtualMemory, 4) -SVC_(FlushWriteBuffer, 0) -SVC_(FreeUserPhysicalPages, 3) -SVC_(FreeVirtualMemory, 4) -SVC_(FsControlFile, 10) -SVC_(GetContextThread, 2) -SVC_(GetDevicePowerState, 2) -SVC_(GetPlugPlayEvent, 4) -SVC_(GetWriteWatch, 7) -SVC_(ImpersonateAnonymousToken, 1) -SVC_(ImpersonateClientOfPort, 2) -SVC_(ImpersonateThread, 3) -SVC_(InitializeRegistry, 1) -SVC_(InitiatePowerAction, 4) -SVC_(IsProcessInJob, 2) -SVC_(IsSystemResumeAutomatic, 0) -SVC_(ListenPort, 2) -SVC_(LoadDriver, 1) -SVC_(LoadKey, 2) -SVC_(LoadKey2, 3) -SVC_(LoadKeyEx, 4) -SVC_(LockFile, 10) -SVC_(LockProductActivationKeys, 2) -SVC_(LockRegistryKey, 1) -SVC_(LockVirtualMemory, 4) -SVC_(MakePermanentObject, 1) -SVC_(MakeTemporaryObject, 1) -SVC_(MapUserPhysicalPages, 3) -SVC_(MapUserPhysicalPagesScatter, 3) -SVC_(MapViewOfSection, 10) -SVC_(ModifyBootEntry, 1) -SVC_(ModifyDriverEntry, 1) -SVC_(NotifyChangeDirectoryFile, 9) -SVC_(NotifyChangeKey, 10) -SVC_(NotifyChangeMultipleKeys, 12) -SVC_(OpenDirectoryObject, 3) -SVC_(OpenEvent, 3) -SVC_(OpenEventPair, 3) -SVC_(OpenFile, 6) -SVC_(OpenIoCompletion, 3) -SVC_(OpenJobObject, 3) -SVC_(OpenKey, 3) -SVC_(OpenMutant, 3) -SVC_(OpenObjectAuditAlarm, 12) -SVC_(OpenProcess, 4) -SVC_(OpenProcessToken, 3) -SVC_(OpenProcessTokenEx, 4) -SVC_(OpenSection, 3) -SVC_(OpenSemaphore, 3) -SVC_(OpenSymbolicLinkObject, 3) -SVC_(OpenThread, 4) -SVC_(OpenThreadToken, 4) -SVC_(OpenThreadTokenEx, 5) -SVC_(OpenTimer, 3) -SVC_(PlugPlayControl, 3) -SVC_(PowerInformation, 5) -SVC_(PrivilegeCheck, 3) -SVC_(PrivilegeObjectAuditAlarm, 6) -SVC_(PrivilegedServiceAuditAlarm, 5) -SVC_(ProtectVirtualMemory, 5) -SVC_(PulseEvent, 2) -SVC_(QueryAttributesFile, 2) -SVC_(QueryBootEntryOrder, 2) -SVC_(QueryBootOptions, 2) -SVC_(QueryDebugFilterState, 2) -SVC_(QueryDefaultLocale, 2) -SVC_(QueryDefaultUILanguage, 1) -SVC_(QueryDirectoryFile, 11) -SVC_(QueryDirectoryObject, 7) -SVC_(QueryDriverEntryOrder, 2) -SVC_(QueryEaFile, 9) -SVC_(QueryEvent, 5) -SVC_(QueryFullAttributesFile, 2) -SVC_(QueryInformationAtom, 5) -SVC_(QueryInformationFile, 5) -SVC_(QueryInformationJobObject, 5) -SVC_(QueryInformationPort, 5) -SVC_(QueryInformationProcess, 5) -SVC_(QueryInformationThread, 5) -SVC_(QueryInformationToken, 5) -SVC_(QueryInstallUILanguage, 1) -SVC_(QueryIntervalProfile, 2) -SVC_(QueryIoCompletion, 5) -SVC_(QueryKey, 5) -SVC_(QueryMultipleValueKey, 6) -SVC_(QueryMutant, 5) -SVC_(QueryObject, 5) -SVC_(QueryOpenSubKeys, 2) -SVC_(QueryOpenSubKeysEx, 4) -SVC_(QueryPerformanceCounter, 2) -SVC_(QueryQuotaInformationFile, 9) -SVC_(QuerySection, 5) -SVC_(QuerySecurityObject, 5) -SVC_(QuerySemaphore, 5) -SVC_(QuerySymbolicLinkObject, 3) -SVC_(QuerySystemEnvironmentValue, 4) -SVC_(QuerySystemEnvironmentValueEx, 5) -SVC_(QuerySystemInformation, 4) -SVC_(QuerySystemTime, 1) -SVC_(QueryTimer, 5) -SVC_(QueryTimerResolution, 3) -SVC_(QueryValueKey, 6) -SVC_(QueryVirtualMemory, 6) -SVC_(QueryVolumeInformationFile, 5) -SVC_(QueueApcThread, 5) -SVC_(RaiseException, 3) -SVC_(RaiseHardError, 6) -SVC_(ReadFile, 9) -SVC_(ReadFileScatter, 9) -SVC_(ReadRequestData, 6) -SVC_(ReadVirtualMemory, 5) -SVC_(RegisterThreadTerminatePort, 1) -SVC_(ReleaseMutant, 2) -SVC_(ReleaseSemaphore, 3) -SVC_(RemoveIoCompletion, 5) -SVC_(RemoveProcessDebug, 2) -SVC_(RenameKey, 2) -SVC_(ReplaceKey, 3) -SVC_(ReplyPort, 2) -SVC_(ReplyWaitReceivePort, 4) -SVC_(ReplyWaitReceivePortEx, 5) -SVC_(ReplyWaitReplyPort, 2) -SVC_(RequestDeviceWakeup, 1) -SVC_(RequestPort, 2) -SVC_(RequestWaitReplyPort, 3) -SVC_(RequestWakeupLatency, 1) -SVC_(ResetEvent, 2) -SVC_(ResetWriteWatch, 3) -SVC_(RestoreKey, 3) -SVC_(ResumeProcess, 1) -SVC_(ResumeThread, 2) -SVC_(SaveKey, 2) -SVC_(SaveKeyEx, 3) -SVC_(SaveMergedKeys, 3) -SVC_(SecureConnectPort, 9) -SVC_(SetBootEntryOrder, 2) -SVC_(SetBootOptions, 2) -SVC_(SetContextThread, 2) -SVC_(SetDebugFilterState, 3) -SVC_(SetDefaultHardErrorPort, 1) -SVC_(SetDefaultLocale, 2) -SVC_(SetDefaultUILanguage, 1) -SVC_(SetDriverEntryOrder, 2) -SVC_(SetEaFile, 4) -SVC_(SetEvent, 2) -SVC_(SetEventBoostPriority, 1) -SVC_(SetHighEventPair, 1) -SVC_(SetHighWaitLowEventPair, 1) -SVC_(SetInformationDebugObject, 5) -SVC_(SetInformationFile, 5) -SVC_(SetInformationJobObject, 4) -SVC_(SetInformationKey, 4) -SVC_(SetInformationObject, 4) -SVC_(SetInformationProcess, 4) -SVC_(SetInformationThread, 4) -SVC_(SetInformationToken, 4) -SVC_(SetIntervalProfile, 2) -SVC_(SetIoCompletion, 5) -SVC_(SetLdtEntries, 6) -SVC_(SetLowEventPair, 1) -SVC_(SetLowWaitHighEventPair, 1) -SVC_(SetQuotaInformationFile, 4) -SVC_(SetSecurityObject, 3) -SVC_(SetSystemEnvironmentValue, 2) -SVC_(SetSystemEnvironmentValueEx, 2) -SVC_(SetSystemInformation, 3) -SVC_(SetSystemPowerState, 3) -SVC_(SetSystemTime, 2) -SVC_(SetThreadExecutionState, 2) -SVC_(SetTimer, 7) -SVC_(SetTimerResolution, 3) -SVC_(SetUuidSeed, 1) -SVC_(SetValueKey, 6) -SVC_(SetVolumeInformationFile, 5) -SVC_(ShutdownSystem, 1) -SVC_(SignalAndWaitForSingleObject, 4) -SVC_(StartProfile, 1) -SVC_(StopProfile, 1) -SVC_(SuspendProcess, 1) -SVC_(SuspendThread, 2) -SVC_(SystemDebugControl, 6) -SVC_(TerminateJobObject, 2) -SVC_(TerminateProcess, 2) -SVC_(TerminateThread, 2) -SVC_(TestAlert, 0) -SVC_(TraceEvent, 4) -SVC_(TranslateFilePath, 4) -SVC_(UnloadDriver, 1) -SVC_(UnloadKey, 1) -SVC_(UnloadKey2, 2) -SVC_(UnloadKeyEx, 2) -SVC_(UnlockFile, 5) -SVC_(UnlockVirtualMemory, 4) -SVC_(UnmapViewOfSection, 2) -SVC_(VdmControl, 2) -SVC_(WaitForDebugEvent, 4) -SVC_(WaitForMultipleObjects, 5) -SVC_(WaitForSingleObject, 3) -SVC_(WaitHighEventPair, 1) -SVC_(WaitLowEventPair, 1) -SVC_(WriteFile, 9) -SVC_(WriteFileGather, 9) -SVC_(WriteRequestData, 6) -SVC_(WriteVirtualMemory, 5) -SVC_(YieldExecution, 0) -SVC_(CreateKeyedEvent, 4) -SVC_(OpenKeyedEvent, 3) -SVC_(ReleaseKeyedEvent, 4) -SVC_(WaitForKeyedEvent, 4) -SVC_(QueryPortInformationProcess, 0) -SVC_(GetCurrentProcessorNumber, 0) -SVC_(WaitForMultipleObjects32, 5) + SVC_(AcceptConnectPort, 6) + SVC_(AccessCheck, 8) + SVC_(AccessCheckAndAuditAlarm, 11) + SVC_(AccessCheckByType, 11) + SVC_(AccessCheckByTypeAndAuditAlarm, 16) + SVC_(AccessCheckByTypeResultList, 11) + SVC_(AccessCheckByTypeResultListAndAuditAlarm, 16) + SVC_(AccessCheckByTypeResultListAndAuditAlarmByHandle, 17) + SVC_(AddAtom, 3) + SVC_(AddBootEntry, 2) + SVC_(AddDriverEntry, 2) + SVC_(AdjustGroupsToken, 6) + SVC_(AdjustPrivilegesToken, 6) + SVC_(AlertResumeThread, 2) + SVC_(AlertThread, 1) + SVC_(AllocateLocallyUniqueId, 1) + SVC_(AllocateUserPhysicalPages, 3) + SVC_(AllocateUuids, 4) + SVC_(AllocateVirtualMemory, 6) + SVC_(ApphelpCacheControl, 2) + SVC_(AreMappedFilesTheSame, 2) + SVC_(AssignProcessToJobObject, 2) + SVC_(CallbackReturn, 3) + SVC_(CancelDeviceWakeupRequest, 1) + SVC_(CancelIoFile, 2) + SVC_(CancelTimer, 2) + SVC_(ClearEvent, 1) + SVC_(Close, 1) + SVC_(CloseObjectAuditAlarm, 3) + SVC_(CompactKeys, 2) + SVC_(CompareTokens, 3) + SVC_(CompleteConnectPort, 1) + SVC_(CompressKey, 1) + SVC_(ConnectPort, 8) + SVC_(Continue, 2) + SVC_(CreateDebugObject, 4) + SVC_(CreateDirectoryObject, 3) + SVC_(CreateEvent, 5) + SVC_(CreateEventPair, 3) + SVC_(CreateFile, 11) + SVC_(CreateIoCompletion, 4) + SVC_(CreateJobObject, 3) + SVC_(CreateJobSet, 3) + SVC_(CreateKey, 7) + SVC_(CreateMailslotFile, 8) + SVC_(CreateMutant, 4) + SVC_(CreateNamedPipeFile, 14) + SVC_(CreatePagingFile, 4) + SVC_(CreatePort, 5) + SVC_(CreateProcess, 8) + SVC_(CreateProcessEx, 9) + SVC_(CreateProfile, 9) + SVC_(CreateSection, 7) + SVC_(CreateSemaphore, 5) + SVC_(CreateSymbolicLinkObject, 4) + SVC_(CreateThread, 8) + SVC_(CreateTimer, 4) + SVC_(CreateToken, 13) + SVC_(CreateWaitablePort, 5) + SVC_(DebugActiveProcess, 2) + SVC_(DebugContinue, 3) + SVC_(DelayExecution, 2) + SVC_(DeleteAtom, 1) + SVC_(DeleteBootEntry, 1) + SVC_(DeleteDriverEntry, 1) + SVC_(DeleteFile, 1) + SVC_(DeleteKey, 1) + SVC_(DeleteObjectAuditAlarm, 3) + SVC_(DeleteValueKey, 2) + SVC_(DeviceIoControlFile, 10) + SVC_(DisplayString, 1) + SVC_(DuplicateObject, 7) + SVC_(DuplicateToken, 6) + SVC_(EnumerateBootEntries, 2) + SVC_(EnumerateDriverEntries, 2) + SVC_(EnumerateKey, 6) + SVC_(EnumerateSystemEnvironmentValuesEx, 3) + SVC_(EnumerateValueKey, 6) + SVC_(ExtendSection, 2) + SVC_(FilterToken, 6) + SVC_(FindAtom, 3) + SVC_(FlushBuffersFile, 2) + SVC_(FlushInstructionCache, 3) + SVC_(FlushKey, 1) + SVC_(FlushVirtualMemory, 4) + SVC_(FlushWriteBuffer, 0) + SVC_(FreeUserPhysicalPages, 3) + SVC_(FreeVirtualMemory, 4) + SVC_(FsControlFile, 10) + SVC_(GetContextThread, 2) + SVC_(GetDevicePowerState, 2) + SVC_(GetPlugPlayEvent, 4) + SVC_(GetWriteWatch, 7) + SVC_(ImpersonateAnonymousToken, 1) + SVC_(ImpersonateClientOfPort, 2) + SVC_(ImpersonateThread, 3) + SVC_(InitializeRegistry, 1) + SVC_(InitiatePowerAction, 4) + SVC_(IsProcessInJob, 2) + SVC_(IsSystemResumeAutomatic, 0) + SVC_(ListenPort, 2) + SVC_(LoadDriver, 1) + SVC_(LoadKey, 2) + SVC_(LoadKey2, 3) + SVC_(LoadKeyEx, 4) + SVC_(LockFile, 10) + SVC_(LockProductActivationKeys, 2) + SVC_(LockRegistryKey, 1) + SVC_(LockVirtualMemory, 4) + SVC_(MakePermanentObject, 1) + SVC_(MakeTemporaryObject, 1) + SVC_(MapUserPhysicalPages, 3) + SVC_(MapUserPhysicalPagesScatter, 3) + SVC_(MapViewOfSection, 10) + SVC_(ModifyBootEntry, 1) + SVC_(ModifyDriverEntry, 1) + SVC_(NotifyChangeDirectoryFile, 9) + SVC_(NotifyChangeKey, 10) + SVC_(NotifyChangeMultipleKeys, 12) + SVC_(OpenDirectoryObject, 3) + SVC_(OpenEvent, 3) + SVC_(OpenEventPair, 3) + SVC_(OpenFile, 6) + SVC_(OpenIoCompletion, 3) + SVC_(OpenJobObject, 3) + SVC_(OpenKey, 3) + SVC_(OpenMutant, 3) + SVC_(OpenObjectAuditAlarm, 12) + SVC_(OpenProcess, 4) + SVC_(OpenProcessToken, 3) + SVC_(OpenProcessTokenEx, 4) + SVC_(OpenSection, 3) + SVC_(OpenSemaphore, 3) + SVC_(OpenSymbolicLinkObject, 3) + SVC_(OpenThread, 4) + SVC_(OpenThreadToken, 4) + SVC_(OpenThreadTokenEx, 5) + SVC_(OpenTimer, 3) + SVC_(PlugPlayControl, 3) + SVC_(PowerInformation, 5) + SVC_(PrivilegeCheck, 3) + SVC_(PrivilegeObjectAuditAlarm, 6) + SVC_(PrivilegedServiceAuditAlarm, 5) + SVC_(ProtectVirtualMemory, 5) + SVC_(PulseEvent, 2) + SVC_(QueryAttributesFile, 2) + SVC_(QueryBootEntryOrder, 2) + SVC_(QueryBootOptions, 2) + SVC_(QueryDebugFilterState, 2) + SVC_(QueryDefaultLocale, 2) + SVC_(QueryDefaultUILanguage, 1) + SVC_(QueryDirectoryFile, 11) + SVC_(QueryDirectoryObject, 7) + SVC_(QueryDriverEntryOrder, 2) + SVC_(QueryEaFile, 9) + SVC_(QueryEvent, 5) + SVC_(QueryFullAttributesFile, 2) + SVC_(QueryInformationAtom, 5) + SVC_(QueryInformationFile, 5) + SVC_(QueryInformationJobObject, 5) + SVC_(QueryInformationPort, 5) + SVC_(QueryInformationProcess, 5) + SVC_(QueryInformationThread, 5) + SVC_(QueryInformationToken, 5) + SVC_(QueryInstallUILanguage, 1) + SVC_(QueryIntervalProfile, 2) + SVC_(QueryIoCompletion, 5) + SVC_(QueryKey, 5) + SVC_(QueryMultipleValueKey, 6) + SVC_(QueryMutant, 5) + SVC_(QueryObject, 5) + SVC_(QueryOpenSubKeys, 2) + SVC_(QueryOpenSubKeysEx, 4) + SVC_(QueryPerformanceCounter, 2) + SVC_(QueryQuotaInformationFile, 9) + SVC_(QuerySection, 5) + SVC_(QuerySecurityObject, 5) + SVC_(QuerySemaphore, 5) + SVC_(QuerySymbolicLinkObject, 3) + SVC_(QuerySystemEnvironmentValue, 4) + SVC_(QuerySystemEnvironmentValueEx, 5) + SVC_(QuerySystemInformation, 4) + SVC_(QuerySystemTime, 1) + SVC_(QueryTimer, 5) + SVC_(QueryTimerResolution, 3) + SVC_(QueryValueKey, 6) + SVC_(QueryVirtualMemory, 6) + SVC_(QueryVolumeInformationFile, 5) + SVC_(QueueApcThread, 5) + SVC_(RaiseException, 3) + SVC_(RaiseHardError, 6) + SVC_(ReadFile, 9) + SVC_(ReadFileScatter, 9) + SVC_(ReadRequestData, 6) + SVC_(ReadVirtualMemory, 5) + SVC_(RegisterThreadTerminatePort, 1) + SVC_(ReleaseMutant, 2) + SVC_(ReleaseSemaphore, 3) + SVC_(RemoveIoCompletion, 5) + SVC_(RemoveProcessDebug, 2) + SVC_(RenameKey, 2) + SVC_(ReplaceKey, 3) + SVC_(ReplyPort, 2) + SVC_(ReplyWaitReceivePort, 4) + SVC_(ReplyWaitReceivePortEx, 5) + SVC_(ReplyWaitReplyPort, 2) + SVC_(RequestDeviceWakeup, 1) + SVC_(RequestPort, 2) + SVC_(RequestWaitReplyPort, 3) + SVC_(RequestWakeupLatency, 1) + SVC_(ResetEvent, 2) + SVC_(ResetWriteWatch, 3) + SVC_(RestoreKey, 3) + SVC_(ResumeProcess, 1) + SVC_(ResumeThread, 2) + SVC_(SaveKey, 2) + SVC_(SaveKeyEx, 3) + SVC_(SaveMergedKeys, 3) + SVC_(SecureConnectPort, 9) + SVC_(SetBootEntryOrder, 2) + SVC_(SetBootOptions, 2) + SVC_(SetContextThread, 2) + SVC_(SetDebugFilterState, 3) + SVC_(SetDefaultHardErrorPort, 1) + SVC_(SetDefaultLocale, 2) + SVC_(SetDefaultUILanguage, 1) + SVC_(SetDriverEntryOrder, 2) + SVC_(SetEaFile, 4) + SVC_(SetEvent, 2) + SVC_(SetEventBoostPriority, 1) + SVC_(SetHighEventPair, 1) + SVC_(SetHighWaitLowEventPair, 1) + SVC_(SetInformationDebugObject, 5) + SVC_(SetInformationFile, 5) + SVC_(SetInformationJobObject, 4) + SVC_(SetInformationKey, 4) + SVC_(SetInformationObject, 4) + SVC_(SetInformationProcess, 4) + SVC_(SetInformationThread, 4) + SVC_(SetInformationToken, 4) + SVC_(SetIntervalProfile, 2) + SVC_(SetIoCompletion, 5) + SVC_(SetLdtEntries, 6) + SVC_(SetLowEventPair, 1) + SVC_(SetLowWaitHighEventPair, 1) + SVC_(SetQuotaInformationFile, 4) + SVC_(SetSecurityObject, 3) + SVC_(SetSystemEnvironmentValue, 2) + SVC_(SetSystemEnvironmentValueEx, 2) + SVC_(SetSystemInformation, 3) + SVC_(SetSystemPowerState, 3) + SVC_(SetSystemTime, 2) + SVC_(SetThreadExecutionState, 2) + SVC_(SetTimer, 7) + SVC_(SetTimerResolution, 3) + SVC_(SetUuidSeed, 1) + SVC_(SetValueKey, 6) + SVC_(SetVolumeInformationFile, 5) + SVC_(ShutdownSystem, 1) + SVC_(SignalAndWaitForSingleObject, 4) + SVC_(StartProfile, 1) + SVC_(StopProfile, 1) + SVC_(SuspendProcess, 1) + SVC_(SuspendThread, 2) + SVC_(SystemDebugControl, 6) + SVC_(TerminateJobObject, 2) + SVC_(TerminateProcess, 2) + SVC_(TerminateThread, 2) + SVC_(TestAlert, 0) + SVC_(TraceEvent, 4) + SVC_(TranslateFilePath, 4) + SVC_(UnloadDriver, 1) + SVC_(UnloadKey, 1) + SVC_(UnloadKey2, 2) + SVC_(UnloadKeyEx, 2) + SVC_(UnlockFile, 5) + SVC_(UnlockVirtualMemory, 4) + SVC_(UnmapViewOfSection, 2) + SVC_(VdmControl, 2) + SVC_(WaitForDebugEvent, 4) + SVC_(WaitForMultipleObjects, 5) + SVC_(WaitForSingleObject, 3) + SVC_(WaitHighEventPair, 1) + SVC_(WaitLowEventPair, 1) + SVC_(WriteFile, 9) + SVC_(WriteFileGather, 9) + SVC_(WriteRequestData, 6) + SVC_(WriteVirtualMemory, 5) + SVC_(YieldExecution, 0) + SVC_(CreateKeyedEvent, 4) + SVC_(OpenKeyedEvent, 3) + SVC_(ReleaseKeyedEvent, 4) + SVC_(WaitForKeyedEvent, 4) + SVC_(QueryPortInformationProcess, 0) + SVC_(GetCurrentProcessorNumber, 0) + SVC_(WaitForMultipleObjects32, 5) Modified: trunk/reactos/ntoskrnl/ntdll.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntdll.S?rev=67640… ============================================================================== --- trunk/reactos/ntoskrnl/ntdll.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntdll.S [iso-8859-1] Sun May 10 21:03:53 2015 @@ -1,12 +1,23 @@ -#include <asm.inc> #include <syscalls.inc> + +#ifdef _M_ARM + + TEXTAREA + +#define SVC_(name, argcount) STUB_U name + +#include <sysfuncs.h> + + END + +#else .code -SyscallId = 0 #define SVC_(name, argcount) STUB_U name, argcount #include <sysfuncs.h> END +#endif Modified: trunk/reactos/win32ss/sys-stubs.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/sys-stubs.S?rev=67… ============================================================================== --- trunk/reactos/win32ss/sys-stubs.S [iso-8859-1] (original) +++ trunk/reactos/win32ss/sys-stubs.S [iso-8859-1] Sun May 10 21:03:53 2015 @@ -1,6 +1,17 @@ -#include <asm.inc> #include <syscalls.inc> + +#ifdef _M_ARM + + TEXTAREA + +#define SVC_(name, argcount) STUB_U name + +#include "w32ksvc.h" + + END + +#else .code @@ -9,4 +20,6 @@ #include "w32ksvc.h" -END + END +#endif + Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6764… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Sun May 10 21:03:53 2015 @@ -1,685 +1,686 @@ -// SVC_(<NAME>, <ARG_COUNT>) -// -// Funcs order should match Windows XP 5.1.2600 SP2 -// -SVC_(GdiAbortDoc, 1) -SVC_(GdiAbortPath, 1) -SVC_(GdiAddFontResourceW, 6) -SVC_(GdiAddRemoteFontToDC, 4) -SVC_(GdiAddFontMemResourceEx, 5) -SVC_(GdiRemoveMergeFont, 2) -SVC_(GdiAddRemoteMMInstanceToDC, 3) -SVC_(GdiAlphaBlend, 12) -SVC_(GdiAngleArc, 6) -SVC_(GdiAnyLinkedFonts, 0) -SVC_(GdiFontIsLinked, 1) -SVC_(GdiArcInternal, 10) -SVC_(GdiBeginPath, 1) -SVC_(GdiBitBlt, 11) -SVC_(GdiCancelDC, 1) -SVC_(GdiCheckBitmapBits, 8) -SVC_(GdiCloseFigure, 1) -SVC_(GdiClearBitmapAttributes, 2) -SVC_(GdiClearBrushAttributes, 2) -SVC_(GdiColorCorrectPalette, 6) -SVC_(GdiCombineRgn, 4) -SVC_(GdiCombineTransform, 3) -SVC_(GdiComputeXformCoefficients, 1) -SVC_(GdiConsoleTextOut, 4) -SVC_(GdiConvertMetafileRect, 2) -SVC_(GdiCreateBitmap, 5) -SVC_(GdiCreateClientObj, 1) -SVC_(GdiCreateColorSpace, 1) -SVC_(GdiCreateColorTransform, 8) -SVC_(GdiCreateCompatibleBitmap, 3) -SVC_(GdiCreateCompatibleDC, 1) -SVC_(GdiCreateDIBBrush, 6) -SVC_(GdiCreateDIBitmapInternal, 11) -SVC_(GdiCreateDIBSection, 9) -SVC_(GdiCreateEllipticRgn, 4) -SVC_(GdiCreateHalftonePalette, 1) -SVC_(GdiCreateHatchBrushInternal, 3) -SVC_(GdiCreateMetafileDC, 1) -SVC_(GdiCreatePaletteInternal, 2) -SVC_(GdiCreatePatternBrushInternal, 3) -SVC_(GdiCreatePen, 4) -SVC_(GdiCreateRectRgn, 4) -SVC_(GdiCreateRoundRectRgn, 6) -SVC_(GdiCreateServerMetaFile, 6) -SVC_(GdiCreateSolidBrush, 2) -SVC_(GdiD3dContextCreate, 4) -SVC_(GdiD3dContextDestroy, 1) -SVC_(GdiD3dContextDestroyAll, 1) -SVC_(GdiD3dValidateTextureStageState, 1) -SVC_(GdiD3dDrawPrimitives2, 7) -SVC_(GdiDdGetDriverState, 1) -SVC_(GdiDdAddAttachedSurface, 3) -SVC_(GdiDdAlphaBlt, 3) -SVC_(GdiDdAttachSurface, 2) -SVC_(GdiDdBeginMoCompFrame, 2) -SVC_(GdiDdBlt, 3) -SVC_(GdiDdCanCreateSurface, 2) -SVC_(GdiDdCanCreateD3DBuffer, 2) -SVC_(GdiDdColorControl, 2) -SVC_(GdiDdCreateDirectDrawObject, 1) -SVC_(GdiDdCreateSurface, 8) -SVC_(GdiDdCreateD3DBuffer, 8) -SVC_(GdiDdCreateMoComp, 2) -SVC_(GdiDdCreateSurfaceObject, 6) -SVC_(GdiDdDeleteDirectDrawObject, 1) -SVC_(GdiDdDeleteSurfaceObject, 1) -SVC_(GdiDdDestroyMoComp, 2) -SVC_(GdiDdDestroySurface, 2) -SVC_(GdiDdDestroyD3DBuffer, 1) -SVC_(GdiDdEndMoCompFrame, 2) -SVC_(GdiDdFlip, 5) -SVC_(GdiDdFlipToGDISurface, 2) -SVC_(GdiDdGetAvailDriverMemory, 2) -SVC_(GdiDdGetBltStatus, 2) -SVC_(GdiDdGetDC, 2) -SVC_(GdiDdGetDriverInfo, 2) -SVC_(GdiDdGetDxHandle, 3) -SVC_(GdiDdGetFlipStatus, 2) -SVC_(GdiDdGetInternalMoCompInfo, 2) -SVC_(GdiDdGetMoCompBuffInfo, 2) -SVC_(GdiDdGetMoCompGuids, 2) -SVC_(GdiDdGetMoCompFormats, 2) -SVC_(GdiDdGetScanLine, 2) -SVC_(GdiDdLock, 3) -SVC_(GdiDdLockD3D, 2) -SVC_(GdiDdQueryDirectDrawObject, 11) -SVC_(GdiDdQueryMoCompStatus, 2) -SVC_(GdiDdReenableDirectDrawObject, 2) -SVC_(GdiDdReleaseDC, 1) -SVC_(GdiDdRenderMoComp, 2) -SVC_(GdiDdResetVisrgn, 2) -SVC_(GdiDdSetColorKey, 2) -SVC_(GdiDdSetExclusiveMode, 2) -SVC_(GdiDdSetGammaRamp, 3) -SVC_(GdiDdCreateSurfaceEx, 3) -SVC_(GdiDdSetOverlayPosition, 3) -SVC_(GdiDdUnattachSurface, 2) -SVC_(GdiDdUnlock, 2) -SVC_(GdiDdUnlockD3D, 2) -SVC_(GdiDdUpdateOverlay, 3) -SVC_(GdiDdWaitForVerticalBlank, 2) -SVC_(GdiDvpCanCreateVideoPort, 2) -SVC_(GdiDvpColorControl, 2) -SVC_(GdiDvpCreateVideoPort, 2) -SVC_(GdiDvpDestroyVideoPort, 2) -SVC_(GdiDvpFlipVideoPort, 4) -SVC_(GdiDvpGetVideoPortBandwidth, 2) -SVC_(GdiDvpGetVideoPortField, 2) -SVC_(GdiDvpGetVideoPortFlipStatus, 2) -SVC_(GdiDvpGetVideoPortInputFormats, 2) -SVC_(GdiDvpGetVideoPortLine, 2) -SVC_(GdiDvpGetVideoPortOutputFormats, 2) -SVC_(GdiDvpGetVideoPortConnectInfo, 2) -SVC_(GdiDvpGetVideoSignalStatus, 2) -SVC_(GdiDvpUpdateVideoPort, 4) -SVC_(GdiDvpWaitForVideoPortSync, 2) -SVC_(GdiDvpAcquireNotification, 3) -SVC_(GdiDvpReleaseNotification, 2) -SVC_(GdiDxgGenericThunk, 6) -SVC_(GdiDeleteClientObj, 1) -SVC_(GdiDeleteColorSpace, 1) -SVC_(GdiDeleteColorTransform, 2) -SVC_(GdiDeleteObjectApp, 1) -SVC_(GdiDescribePixelFormat, 4) -SVC_(GdiGetPerBandInfo, 2) -SVC_(GdiDoBanding, 4) -SVC_(GdiDoPalette, 6) -SVC_(GdiDrawEscape, 4) -SVC_(GdiEllipse, 5) -SVC_(GdiEnableEudc, 1) -SVC_(GdiEndDoc, 1) -SVC_(GdiEndPage, 1) -SVC_(GdiEndPath, 1) -SVC_(GdiEnumFontChunk, 5) -SVC_(GdiEnumFontClose, 1) -SVC_(GdiEnumFontOpen, 7) -SVC_(GdiEnumObjects, 4) -SVC_(GdiEqualRgn, 2) -SVC_(GdiEudcLoadUnloadLink, 7) -SVC_(GdiExcludeClipRect, 5) -SVC_(GdiExtCreatePen, 11) -SVC_(GdiExtCreateRegion, 3) -SVC_(GdiExtEscape, 8) -SVC_(GdiExtFloodFill, 5) -SVC_(GdiExtGetObjectW, 3) -SVC_(GdiExtSelectClipRgn, 3) -SVC_(GdiExtTextOutW, 9) -SVC_(GdiFillPath, 1) -SVC_(GdiFillRgn, 3) -SVC_(GdiFlattenPath, 1) -SVC_(GdiFlushUserBatch, 0) -SVC_(GdiFlush, 0) -SVC_(GdiForceUFIMapping, 2) -SVC_(GdiFrameRgn, 5) -SVC_(GdiFullscreenControl, 5) -SVC_(GdiGetAndSetDCDword, 4) -SVC_(GdiGetAppClipBox, 2) -SVC_(GdiGetBitmapBits, 3) -SVC_(GdiGetBitmapDimension, 2) -SVC_(GdiGetBoundsRect, 3) -SVC_(GdiGetCharABCWidthsW, 6) -SVC_(GdiGetCharacterPlacementW, 6) -SVC_(GdiGetCharSet, 1) -SVC_(GdiGetCharWidthW, 6) -SVC_(GdiGetCharWidthInfo, 2) -SVC_(GdiGetColorAdjustment, 2) -SVC_(GdiGetColorSpaceforBitmap, 1) -SVC_(GdiGetDCDword, 3) -SVC_(GdiGetDCforBitmap, 1) -SVC_(GdiGetDCObject, 2) -SVC_(GdiGetDCPoint, 3) -SVC_(GdiGetDeviceCaps, 2) -SVC_(GdiGetDeviceGammaRamp, 2) -SVC_(GdiGetDeviceCapsAll, 2) -SVC_(GdiGetDIBitsInternal, 9) -SVC_(GdiGetETM, 2) -SVC_(GdiGetEudcTimeStampEx, 3) -SVC_(GdiGetFontData, 5) -SVC_(GdiGetFontResourceInfoInternalW, 7) -SVC_(GdiGetGlyphIndicesW, 5) -SVC_(GdiGetGlyphIndicesWInternal, 6) -SVC_(GdiGetGlyphOutline, 8) -SVC_(GdiGetKerningPairs, 3) -SVC_(GdiGetLinkedUFIs, 3) -SVC_(GdiGetMiterLimit, 2) -SVC_(GdiGetMonitorID, 3) -SVC_(GdiGetNearestColor, 2) -SVC_(GdiGetNearestPaletteIndex, 2) -SVC_(GdiGetObjectBitmapHandle, 2) -SVC_(GdiGetOutlineTextMetricsInternalW, 4) -SVC_(GdiGetPath, 4) -SVC_(GdiGetPixel, 3) -SVC_(GdiGetRandomRgn, 3) -SVC_(GdiGetRasterizerCaps, 2) -SVC_(GdiGetRealizationInfo, 3) -SVC_(GdiGetRegionData, 3) -SVC_(GdiGetRgnBox, 2) -SVC_(GdiGetServerMetaFileBits, 7) -SVC_(GdiGetSpoolMessage, 4) -SVC_(GdiGetStats, 5) -SVC_(GdiGetStockObject, 1) -SVC_(GdiGetStringBitmapW, 5) -SVC_(GdiGetSystemPaletteUse, 1) -SVC_(GdiGetTextCharsetInfo, 3) -SVC_(GdiGetTextExtent, 5) -SVC_(GdiGetTextExtentExW, 8) -SVC_(GdiGetTextFaceW, 4) -SVC_(GdiGetTextMetricsW, 3) -SVC_(GdiGetTransform, 3) -SVC_(GdiGetUFI, 6) -SVC_(GdiGetEmbUFI, 7) -SVC_(GdiGetUFIPathname, 10) -SVC_(GdiGetEmbedFonts, 0) -SVC_(GdiChangeGhostFont, 2) -SVC_(GdiAddEmbFontToDC, 2) -SVC_(GdiGetFontUnicodeRanges, 2) -SVC_(GdiGetWidthTable, 7) -SVC_(GdiGradientFill, 6) -SVC_(GdiHfontCreate, 5) -SVC_(GdiIcmBrushInfo, 8) -SVC_(GdiInit, 0) -SVC_(GdiInitSpool, 0) -SVC_(GdiIntersectClipRect, 5) -SVC_(GdiInvertRgn, 2) -SVC_(GdiLineTo, 3) -SVC_(GdiMakeFontDir, 5) -SVC_(GdiMakeInfoDC, 2) -SVC_(GdiMaskBlt, 13) -SVC_(GdiModifyWorldTransform, 3) -SVC_(GdiMonoBitmap, 1) -SVC_(GdiMoveTo, 4) -SVC_(GdiOffsetClipRgn, 3) -SVC_(GdiOffsetRgn, 3) -SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP/2k3 */ -SVC_(GdiPatBlt, 6) -SVC_(GdiPolyPatBlt, 5) -SVC_(GdiPathToRegion, 1) -SVC_(GdiPlgBlt, 11) -SVC_(GdiPolyDraw, 4) -SVC_(GdiPolyPolyDraw, 5) -SVC_(GdiPolyTextOutW, 4) -SVC_(GdiPtInRegion, 3) -SVC_(GdiPtVisible, 3) -SVC_(GdiQueryFonts, 3) -SVC_(GdiQueryFontAssocInfo, 1) -SVC_(GdiRectangle, 5) -SVC_(GdiRectInRegion, 2) -SVC_(GdiRectVisible, 2) -SVC_(GdiRemoveFontResourceW, 6) -SVC_(GdiRemoveFontMemResourceEx, 1) -SVC_(GdiResetDC, 5) -SVC_(GdiResizePalette, 2) -SVC_(GdiRestoreDC, 2) -SVC_(GdiRoundRect, 7) -SVC_(GdiSaveDC, 1) -SVC_(GdiScaleViewportExtEx, 6) -SVC_(GdiScaleWindowExtEx, 6) -SVC_(GdiSelectBitmap, 2) -SVC_(GdiSelectBrush, 2) -SVC_(GdiSelectClipPath, 2) -SVC_(GdiSelectFont, 2) -SVC_(GdiSelectPen, 2) -SVC_(GdiSetBitmapAttributes, 2) -SVC_(GdiSetBitmapBits, 3) -SVC_(GdiSetBitmapDimension, 4) -SVC_(GdiSetBoundsRect, 3) -SVC_(GdiSetBrushAttributes, 2) -SVC_(GdiSetBrushOrg, 4) -SVC_(GdiSetColorAdjustment, 2) -SVC_(GdiSetColorSpace, 2) -SVC_(GdiSetDeviceGammaRamp, 2) -SVC_(GdiSetDIBitsToDeviceInternal, 16) -SVC_(GdiSetFontEnumeration, 1) -SVC_(GdiSetFontXform, 3) -SVC_(GdiSetIcmMode, 3) -SVC_(GdiSetLinkedUFIs, 3) -SVC_(GdiSetMagicColors, 3) -SVC_(GdiSetMetaRgn, 1) -SVC_(GdiSetMiterLimit, 3) -SVC_(GdiGetDeviceWidth, 1) -SVC_(GdiMirrorWindowOrg, 1) -SVC_(GdiSetLayout, 3) -SVC_(GdiSetPixel, 4) -SVC_(GdiSetPixelFormat, 2) -SVC_(GdiSetRectRgn, 5) -SVC_(GdiSetSystemPaletteUse, 2) -SVC_(GdiSetTextJustification, 3) -SVC_(GdiSetupPublicCFONT, 3) -SVC_(GdiSetVirtualResolution, 5) -SVC_(GdiSetSizeDevice, 3) -SVC_(GdiStartDoc, 4) -SVC_(GdiStartPage, 1) -SVC_(GdiStretchBlt, 12) -SVC_(GdiStretchDIBitsInternal, 16) -SVC_(GdiStrokeAndFillPath, 1) -SVC_(GdiStrokePath, 1) -SVC_(GdiSwapBuffers, 1) -SVC_(GdiTransformPoints, 5) -SVC_(GdiTransparentBlt, 11) -SVC_(GdiUnloadPrinterDriver, 2) -SVC_(GdiUnmapMemFont, 1) -SVC_(GdiUnrealizeObject, 1) -SVC_(GdiUpdateColors, 1) -SVC_(GdiWidenPath, 1) -SVC_(UserActivateKeyboardLayout, 2) -SVC_(UserAlterWindowStyle, 3) -SVC_(UserAssociateInputContext, 3) -SVC_(UserAttachThreadInput, 3) -SVC_(UserBeginPaint, 2) -SVC_(UserBitBltSysBmp, 8) -SVC_(UserBlockInput, 1) -SVC_(UserBuildHimcList, 4) -SVC_(UserBuildHwndList, 7) -SVC_(UserBuildNameList, 4) -SVC_(UserBuildPropList, 4) -SVC_(UserCallHwnd, 2) -SVC_(UserCallHwndLock, 2) -SVC_(UserCallHwndOpt, 2) -SVC_(UserCallHwndParam, 3) -SVC_(UserCallHwndParamLock, 3) -SVC_(UserCallMsgFilter, 2) -SVC_(UserCallNextHookEx, 4) -SVC_(UserCallNoParam, 1) -SVC_(UserCallOneParam, 2) -SVC_(UserCallTwoParam, 3) -SVC_(UserChangeClipboardChain, 2) -SVC_(UserChangeDisplaySettings, 5) -SVC_(UserCheckImeHotKey, 2) -SVC_(UserCheckMenuItem, 3) -SVC_(UserChildWindowFromPointEx, 4) -SVC_(UserClipCursor, 1) -SVC_(UserCloseClipboard, 0) -SVC_(UserCloseDesktop, 1) -SVC_(UserCloseWindowStation, 1) -SVC_(UserConsoleControl, 3) -SVC_(UserConvertMemHandle, 2) -SVC_(UserCopyAcceleratorTable, 3) -SVC_(UserCountClipboardFormats, 0) -SVC_(UserCreateAcceleratorTable, 2) -SVC_(UserCreateCaret, 4) -SVC_(UserCreateDesktop, 5) -SVC_(UserCreateInputContext, 1) -SVC_(UserCreateLocalMemHandle, 4) -SVC_(UserCreateWindowEx, 15) -SVC_(UserCreateWindowStation, 7) -SVC_(UserDdeGetQualityOfService, 3) -SVC_(UserDdeInitialize, 5) -SVC_(UserDdeSetQualityOfService, 3) -SVC_(UserDeferWindowPos, 8) -SVC_(UserDefSetText, 2) -SVC_(UserDeleteMenu, 3) -SVC_(UserDestroyAcceleratorTable, 1) -SVC_(UserDestroyCursor, 2) -SVC_(UserDestroyInputContext, 1) -SVC_(UserDestroyMenu, 1) -SVC_(UserDestroyWindow, 1) -SVC_(UserDisableThreadIme, 1) -SVC_(UserDispatchMessage, 1) -SVC_(UserDragDetect, 3) -SVC_(UserDragObject, 5) -SVC_(UserDrawAnimatedRects, 4) -SVC_(UserDrawCaption, 4) -SVC_(UserDrawCaptionTemp, 7) -SVC_(UserDrawIconEx, 11) -SVC_(UserDrawMenuBarTemp, 5) -SVC_(UserEmptyClipboard, 0) -SVC_(UserEnableMenuItem, 3) -SVC_(UserEnableScrollBar, 3) -SVC_(UserEndDeferWindowPosEx, 2) -SVC_(UserEndMenu, 0) -SVC_(UserEndPaint, 2) -SVC_(UserEnumDisplayDevices, 4) -SVC_(UserEnumDisplayMonitors, 5) /* FIXME: 4 on XP/2k3 */ -SVC_(UserEnumDisplaySettings, 4) -SVC_(UserEvent, 1) -SVC_(UserExcludeUpdateRgn, 2) -SVC_(UserFillWindow, 4) -SVC_(UserFindExistingCursorIcon, 3) -SVC_(UserFindWindowEx, 5) -SVC_(UserFlashWindowEx, 1) -SVC_(UserGetAltTabInfo, 6) -SVC_(UserGetAncestor, 2) -SVC_(UserGetAppImeLevel, 1) -SVC_(UserGetAsyncKeyState, 1) -SVC_(UserGetAtomName, 2) -SVC_(UserGetCaretBlinkTime, 0) -SVC_(UserGetCaretPos, 1) -SVC_(UserGetClassInfo, 5) -SVC_(UserGetClassName, 3) -SVC_(UserGetClipboardData, 2) -SVC_(UserGetClipboardFormatName, 3) -SVC_(UserGetClipboardOwner, 0) -SVC_(UserGetClipboardSequenceNumber, 0) -SVC_(UserGetClipboardViewer, 0) -SVC_(UserGetClipCursor, 1) -SVC_(UserGetComboBoxInfo, 2) -SVC_(UserGetControlBrush, 3) -SVC_(UserGetControlColor, 4) -SVC_(UserGetCPD, 3) -SVC_(UserGetCursorFrameInfo, 4) -SVC_(UserGetCursorInfo, 1) -SVC_(UserGetDC, 1) -SVC_(UserGetDCEx, 3) -SVC_(UserGetDoubleClickTime, 0) -SVC_(UserGetForegroundWindow, 0) -SVC_(UserGetGuiResources, 2) -SVC_(UserGetGUIThreadInfo, 2) -SVC_(UserGetIconInfo, 6) -SVC_(UserGetIconSize, 4) -SVC_(UserGetImeHotKey, 4) -SVC_(UserGetImeInfoEx, 2) -SVC_(UserGetInternalWindowPos, 3) -SVC_(UserGetKeyboardLayoutList, 2) -SVC_(UserGetKeyboardLayoutName, 1) -SVC_(UserGetKeyboardState, 1) -SVC_(UserGetKeyNameText, 3) -SVC_(UserGetKeyState, 1) -SVC_(UserGetListBoxInfo, 1) -SVC_(UserGetMenuBarInfo, 4) -SVC_(UserGetMenuIndex, 2) -SVC_(UserGetMenuItemRect, 4) -SVC_(UserGetMessage, 4) -SVC_(UserGetMouseMovePointsEx, 5) -SVC_(UserGetObjectInformation, 5) -SVC_(UserGetOpenClipboardWindow, 0) -SVC_(UserGetPriorityClipboardFormat, 2) -SVC_(UserGetProcessWindowStation, 0) -SVC_(UserGetRawInputBuffer, 3) -SVC_(UserGetRawInputData, 5) -SVC_(UserGetRawInputDeviceInfo, 4) -SVC_(UserGetRawInputDeviceList, 3) -SVC_(UserGetRegisteredRawInputDevices, 3) -SVC_(UserGetScrollBarInfo, 3) -SVC_(UserGetSystemMenu, 2) -SVC_(UserGetThreadDesktop, 2) -SVC_(UserGetThreadState, 1) -SVC_(UserGetTitleBarInfo, 2) -SVC_(UserGetUpdateRect, 3) -SVC_(UserGetUpdateRgn, 3) -SVC_(UserGetWindowDC, 1) -SVC_(UserGetWindowPlacement, 2) -SVC_(UserGetWOWClass, 2) -SVC_(UserHardErrorControl, 3) -SVC_(UserHideCaret, 1) -SVC_(UserHiliteMenuItem, 4) -SVC_(UserImpersonateDdeClientWindow, 2) -SVC_(UserInitialize, 3) -SVC_(UserInitializeClientPfnArrays, 4) -SVC_(UserInitTask, 12) -SVC_(UserInternalGetWindowText, 3) -SVC_(UserInvalidateRect, 3) -SVC_(UserInvalidateRgn, 3) -SVC_(UserIsClipboardFormatAvailable, 1) -SVC_(UserKillTimer, 2) -SVC_(UserLoadKeyboardLayoutEx, 7) -SVC_(UserLockWindowStation, 1) -SVC_(UserLockWindowUpdate, 1) -SVC_(UserLockWorkStation, 0) -SVC_(UserMapVirtualKeyEx, 4) -SVC_(UserMenuItemFromPoint, 4) -SVC_(UserMessageCall, 7) -SVC_(UserMinMaximize, 3) -SVC_(UserMNDragLeave, 0) -SVC_(UserMNDragOver, 2) -SVC_(UserModifyUserStartupInfoFlags, 2) -SVC_(UserMoveWindow, 6) -SVC_(UserNotifyIMEStatus, 3) -SVC_(UserNotifyProcessCreate, 4) -SVC_(UserNotifyWinEvent, 4) -SVC_(UserOpenClipboard, 2) -SVC_(UserOpenDesktop, 3) -SVC_(UserOpenInputDesktop, 3) -SVC_(UserOpenWindowStation, 2) -SVC_(UserPaintDesktop, 1) -SVC_(UserPeekMessage, 5) -SVC_(UserPostMessage, 4) -SVC_(UserPostThreadMessage, 4) -SVC_(UserPrintWindow, 3) -SVC_(UserProcessConnect, 3) -SVC_(UserQueryInformationThread, 4) -SVC_(UserQueryInputContext, 2) -SVC_(UserQuerySendMessage, 1) -SVC_(UserQueryUserCounters, 5) -SVC_(UserQueryWindow, 2) -SVC_(UserRealChildWindowFromPoint, 3) -SVC_(UserRealInternalGetMessage, 6) -SVC_(UserRealWaitMessageEx, 2) -SVC_(UserRedrawWindow, 4) -SVC_(UserRegisterClassExWOW, 7) -SVC_(UserRegisterUserApiHook, 4) /* Note: 2 params on XP, 4 on 2k3 */ -SVC_(UserRegisterHotKey, 4) -SVC_(UserRegisterRawInputDevices, 3) -SVC_(UserRegisterTasklist, 1) -SVC_(UserRegisterWindowMessage, 1) -SVC_(UserRemoveMenu, 3) -SVC_(UserRemoveProp, 2) -SVC_(UserResolveDesktop, 4) -SVC_(UserResolveDesktopForWOW, 1) -SVC_(UserSBGetParms, 4) -SVC_(UserScrollDC, 7) -SVC_(UserScrollWindowEx, 8) -SVC_(UserSelectPalette, 3) -SVC_(UserSendInput, 3) -SVC_(UserSetActiveWindow, 1) -SVC_(UserSetAppImeLevel, 2) -SVC_(UserSetCapture, 1) -SVC_(UserSetClassLong, 4) -SVC_(UserSetClassWord, 3) -SVC_(UserSetClipboardData, 3) -SVC_(UserSetClipboardViewer, 1) -SVC_(UserSetConsoleReserveKeys, 2) -SVC_(UserSetCursor, 1) -SVC_(UserSetCursorContents, 2) -SVC_(UserSetCursorIconData, 4) -SVC_(UserSetDbgTag, 2) -SVC_(UserSetFocus, 1) -SVC_(UserSetImeHotKey, 5) -SVC_(UserSetImeInfoEx, 1) -SVC_(UserSetImeOwnerWindow, 2) -SVC_(UserSetInformationProcess, 4) -SVC_(UserSetInformationThread, 4) -SVC_(UserSetInternalWindowPos, 4) -SVC_(UserSetKeyboardState, 1) -SVC_(UserSetLogonNotifyWindow, 1) -SVC_(UserSetMenu, 3) -SVC_(UserSetMenuContextHelpId, 2) -SVC_(UserSetMenuDefaultItem, 3) -SVC_(UserSetMenuFlagRtoL, 1) -SVC_(UserSetObjectInformation, 4) -SVC_(UserSetParent, 2) -SVC_(UserSetProcessWindowStation, 1) -SVC_(UserSetProp, 3) -SVC_(UserSetRipFlags, 2) -SVC_(UserSetScrollInfo, 4) -SVC_(UserSetShellWindowEx, 2) -SVC_(UserSetSysColors, 4) -SVC_(UserSetSystemCursor, 2) -SVC_(UserSetSystemMenu, 2) -SVC_(UserSetSystemTimer, 4) -SVC_(UserSetThreadDesktop, 1) -SVC_(UserSetThreadLayoutHandles, 2) -SVC_(UserSetThreadState, 2) -SVC_(UserSetTimer, 4) -SVC_(UserSetWindowFNID, 2) -SVC_(UserSetWindowLong, 4) -SVC_(UserSetWindowPlacement, 2) -SVC_(UserSetWindowPos, 7) -SVC_(UserSetWindowRgn, 3) -SVC_(UserSetWindowsHookAW, 3) -SVC_(UserSetWindowsHookEx, 6) -SVC_(UserSetWindowStationUser, 4) -SVC_(UserSetWindowWord, 3) -SVC_(UserSetWinEventHook, 8) -SVC_(UserShowCaret, 1) -SVC_(UserShowScrollBar, 3) -SVC_(UserShowWindow, 2) -SVC_(UserShowWindowAsync, 2) -SVC_(UserSoundSentry, 0) -SVC_(UserSwitchDesktop, 1) -SVC_(UserSystemParametersInfo, 4) -SVC_(UserTestForInteractiveUser, 1) -SVC_(UserThunkedMenuInfo, 2) -SVC_(UserThunkedMenuItemInfo, 6) -SVC_(UserToUnicodeEx, 7) -SVC_(UserTrackMouseEvent, 1) -SVC_(UserTrackPopupMenuEx, 6) -SVC_(UserCalcMenuBar, 5) -SVC_(UserPaintMenuBar, 6) -SVC_(UserTranslateAccelerator, 3) -SVC_(UserTranslateMessage, 2) -SVC_(UserUnhookWindowsHookEx, 1) -SVC_(UserUnhookWinEvent, 1) -SVC_(UserUnloadKeyboardLayout, 1) -SVC_(UserUnlockWindowStation, 1) -SVC_(UserUnregisterClass, 3) -SVC_(UserUnregisterUserApiHook, 0) -SVC_(UserUnregisterHotKey, 2) -SVC_(UserUpdateInputContext, 3) -SVC_(UserUpdateInstance, 3) -SVC_(UserUpdateLayeredWindow, 10) /* Note: 9 params on XP, 10 on 2k3 */ -SVC_(UserGetLayeredWindowAttributes, 4) -SVC_(UserSetLayeredWindowAttributes, 4) -SVC_(UserUpdatePerUserSystemParameters, 2) -SVC_(UserUserHandleGrantAccess, 3) -SVC_(UserValidateHandleSecure, 2) -SVC_(UserValidateRect, 2) -SVC_(UserValidateTimerCallback, 3) -SVC_(UserVkKeyScanEx, 3) -SVC_(UserWaitForInputIdle, 3) -SVC_(UserWaitForMsgAndEvent, 1) -SVC_(UserWaitMessage, 0) -SVC_(UserWin32PoolAllocationStats, 6) -SVC_(UserWindowFromPoint, 2) -SVC_(UserYieldTask, 0) -SVC_(UserRemoteConnect, 3) -SVC_(UserRemoteRedrawRectangle, 4) -SVC_(UserRemoteRedrawScreen, 0) -SVC_(UserRemoteStopScreenUpdates, 0) -SVC_(UserCtxDisplayIOCtl, 3) -SVC_(GdiEngAssociateSurface, 3) -SVC_(GdiEngCreateBitmap, 6) -SVC_(GdiEngCreateDeviceSurface, 4) -SVC_(GdiEngCreateDeviceBitmap, 4) -SVC_(GdiEngCreatePalette, 6) -SVC_(GdiEngComputeGlyphSet, 3) -SVC_(GdiEngCopyBits, 6) -SVC_(GdiEngDeletePalette, 1) -SVC_(GdiEngDeleteSurface, 1) -SVC_(GdiEngEraseSurface, 3) -SVC_(GdiEngUnlockSurface, 1) -SVC_(GdiEngLockSurface, 1) -SVC_(GdiEngBitBlt, 11) -SVC_(GdiEngStretchBlt, 11) -SVC_(GdiEngPlgBlt, 11) -SVC_(GdiEngMarkBandingSurface, 1) -SVC_(GdiEngStrokePath, 8) -SVC_(GdiEngFillPath, 7) -SVC_(GdiEngStrokeAndFillPath, 10) -SVC_(GdiEngPaint, 5) -SVC_(GdiEngLineTo, 9) -SVC_(GdiEngAlphaBlend, 7) -SVC_(GdiEngGradientFill, 10) -SVC_(GdiEngTransparentBlt, 8) -SVC_(GdiEngTextOut, 10) -SVC_(GdiEngStretchBltROP, 13) -SVC_(GdiXLATEOBJ_cGetPalette, 4) -SVC_(GdiXLATEOBJ_iXlate, 2) -SVC_(GdiXLATEOBJ_hGetColorTransform, 1) -SVC_(GdiCLIPOBJ_bEnum, 3) -SVC_(GdiCLIPOBJ_cEnumStart, 5) -SVC_(GdiCLIPOBJ_ppoGetPath, 1) -SVC_(GdiEngDeletePath, 1) -SVC_(GdiEngCreateClip, 0) -SVC_(GdiEngDeleteClip, 1) -SVC_(GdiBRUSHOBJ_ulGetBrushColor, 1) -SVC_(GdiBRUSHOBJ_pvAllocRbrush, 2) -SVC_(GdiBRUSHOBJ_pvGetRbrush, 1) -SVC_(GdiBRUSHOBJ_hGetColorTransform, 1) -SVC_(GdiXFORMOBJ_bApplyXform, 5) -SVC_(GdiXFORMOBJ_iGetXform, 2) -SVC_(GdiFONTOBJ_vGetInfo, 3) -SVC_(GdiFONTOBJ_pxoGetXform, 1) -SVC_(GdiFONTOBJ_cGetGlyphs, 5) -SVC_(GdiFONTOBJ_pifi, 1) -SVC_(GdiFONTOBJ_pfdg, 1) -SVC_(GdiFONTOBJ_pQueryGlyphAttrs, 2) -SVC_(GdiFONTOBJ_pvTrueTypeFontFile, 2) -SVC_(GdiFONTOBJ_cGetAllGlyphHandles, 2) -SVC_(GdiSTROBJ_bEnum, 3) -SVC_(GdiSTROBJ_bEnumPositionsOnly, 3) -SVC_(GdiSTROBJ_bGetAdvanceWidths, 4) -SVC_(GdiSTROBJ_vEnumStart, 1) -SVC_(GdiSTROBJ_dwGetCodePage, 1) -SVC_(GdiPATHOBJ_vGetBounds, 2) -SVC_(GdiPATHOBJ_bEnum, 2) -SVC_(GdiPATHOBJ_vEnumStart, 1) -SVC_(GdiPATHOBJ_vEnumStartClipLines, 4) -SVC_(GdiPATHOBJ_bEnumClipLines, 3) -SVC_(GdiGetDhpdev, 1) -SVC_(GdiEngCheckAbort, 1) -SVC_(GdiHT_Get8BPPFormatPalette, 4) -SVC_(GdiHT_Get8BPPMaskPalette, 6) -SVC_(GdiUpdateTransform, 1) -SVC_(GdiSetPUMPDOBJ, 4) -SVC_(GdiBRUSHOBJ_DeleteRbrush, 2) -SVC_(GdiUMPDEngFreeUserMem, 1) -SVC_(GdiDrawStream, 3) + // SVC_(<NAME>, <ARG_COUNT>) + // + // Funcs order should match Windows XP 5.1.2600 SP2 + // Note: these MUST be indented for the ARM assembler! + // + SVC_(GdiAbortDoc, 1) + SVC_(GdiAbortPath, 1) + SVC_(GdiAddFontResourceW, 6) + SVC_(GdiAddRemoteFontToDC, 4) + SVC_(GdiAddFontMemResourceEx, 5) + SVC_(GdiRemoveMergeFont, 2) + SVC_(GdiAddRemoteMMInstanceToDC, 3) + SVC_(GdiAlphaBlend, 12) + SVC_(GdiAngleArc, 6) + SVC_(GdiAnyLinkedFonts, 0) + SVC_(GdiFontIsLinked, 1) + SVC_(GdiArcInternal, 10) + SVC_(GdiBeginPath, 1) + SVC_(GdiBitBlt, 11) + SVC_(GdiCancelDC, 1) + SVC_(GdiCheckBitmapBits, 8) + SVC_(GdiCloseFigure, 1) + SVC_(GdiClearBitmapAttributes, 2) + SVC_(GdiClearBrushAttributes, 2) + SVC_(GdiColorCorrectPalette, 6) + SVC_(GdiCombineRgn, 4) + SVC_(GdiCombineTransform, 3) + SVC_(GdiComputeXformCoefficients, 1) + SVC_(GdiConsoleTextOut, 4) + SVC_(GdiConvertMetafileRect, 2) + SVC_(GdiCreateBitmap, 5) + SVC_(GdiCreateClientObj, 1) + SVC_(GdiCreateColorSpace, 1) + SVC_(GdiCreateColorTransform, 8) + SVC_(GdiCreateCompatibleBitmap, 3) + SVC_(GdiCreateCompatibleDC, 1) + SVC_(GdiCreateDIBBrush, 6) + SVC_(GdiCreateDIBitmapInternal, 11) + SVC_(GdiCreateDIBSection, 9) + SVC_(GdiCreateEllipticRgn, 4) + SVC_(GdiCreateHalftonePalette, 1) + SVC_(GdiCreateHatchBrushInternal, 3) + SVC_(GdiCreateMetafileDC, 1) + SVC_(GdiCreatePaletteInternal, 2) + SVC_(GdiCreatePatternBrushInternal, 3) + SVC_(GdiCreatePen, 4) + SVC_(GdiCreateRectRgn, 4) + SVC_(GdiCreateRoundRectRgn, 6) + SVC_(GdiCreateServerMetaFile, 6) + SVC_(GdiCreateSolidBrush, 2) + SVC_(GdiD3dContextCreate, 4) + SVC_(GdiD3dContextDestroy, 1) + SVC_(GdiD3dContextDestroyAll, 1) + SVC_(GdiD3dValidateTextureStageState, 1) + SVC_(GdiD3dDrawPrimitives2, 7) + SVC_(GdiDdGetDriverState, 1) + SVC_(GdiDdAddAttachedSurface, 3) + SVC_(GdiDdAlphaBlt, 3) + SVC_(GdiDdAttachSurface, 2) + SVC_(GdiDdBeginMoCompFrame, 2) + SVC_(GdiDdBlt, 3) + SVC_(GdiDdCanCreateSurface, 2) + SVC_(GdiDdCanCreateD3DBuffer, 2) + SVC_(GdiDdColorControl, 2) + SVC_(GdiDdCreateDirectDrawObject, 1) + SVC_(GdiDdCreateSurface, 8) + SVC_(GdiDdCreateD3DBuffer, 8) + SVC_(GdiDdCreateMoComp, 2) + SVC_(GdiDdCreateSurfaceObject, 6) + SVC_(GdiDdDeleteDirectDrawObject, 1) + SVC_(GdiDdDeleteSurfaceObject, 1) + SVC_(GdiDdDestroyMoComp, 2) + SVC_(GdiDdDestroySurface, 2) + SVC_(GdiDdDestroyD3DBuffer, 1) + SVC_(GdiDdEndMoCompFrame, 2) + SVC_(GdiDdFlip, 5) + SVC_(GdiDdFlipToGDISurface, 2) + SVC_(GdiDdGetAvailDriverMemory, 2) + SVC_(GdiDdGetBltStatus, 2) + SVC_(GdiDdGetDC, 2) + SVC_(GdiDdGetDriverInfo, 2) + SVC_(GdiDdGetDxHandle, 3) + SVC_(GdiDdGetFlipStatus, 2) + SVC_(GdiDdGetInternalMoCompInfo, 2) + SVC_(GdiDdGetMoCompBuffInfo, 2) + SVC_(GdiDdGetMoCompGuids, 2) + SVC_(GdiDdGetMoCompFormats, 2) + SVC_(GdiDdGetScanLine, 2) + SVC_(GdiDdLock, 3) + SVC_(GdiDdLockD3D, 2) + SVC_(GdiDdQueryDirectDrawObject, 11) + SVC_(GdiDdQueryMoCompStatus, 2) + SVC_(GdiDdReenableDirectDrawObject, 2) + SVC_(GdiDdReleaseDC, 1) + SVC_(GdiDdRenderMoComp, 2) + SVC_(GdiDdResetVisrgn, 2) + SVC_(GdiDdSetColorKey, 2) + SVC_(GdiDdSetExclusiveMode, 2) + SVC_(GdiDdSetGammaRamp, 3) + SVC_(GdiDdCreateSurfaceEx, 3) + SVC_(GdiDdSetOverlayPosition, 3) + SVC_(GdiDdUnattachSurface, 2) + SVC_(GdiDdUnlock, 2) + SVC_(GdiDdUnlockD3D, 2) + SVC_(GdiDdUpdateOverlay, 3) + SVC_(GdiDdWaitForVerticalBlank, 2) + SVC_(GdiDvpCanCreateVideoPort, 2) + SVC_(GdiDvpColorControl, 2) + SVC_(GdiDvpCreateVideoPort, 2) + SVC_(GdiDvpDestroyVideoPort, 2) + SVC_(GdiDvpFlipVideoPort, 4) + SVC_(GdiDvpGetVideoPortBandwidth, 2) + SVC_(GdiDvpGetVideoPortField, 2) + SVC_(GdiDvpGetVideoPortFlipStatus, 2) + SVC_(GdiDvpGetVideoPortInputFormats, 2) + SVC_(GdiDvpGetVideoPortLine, 2) + SVC_(GdiDvpGetVideoPortOutputFormats, 2) + SVC_(GdiDvpGetVideoPortConnectInfo, 2) + SVC_(GdiDvpGetVideoSignalStatus, 2) + SVC_(GdiDvpUpdateVideoPort, 4) + SVC_(GdiDvpWaitForVideoPortSync, 2) + SVC_(GdiDvpAcquireNotification, 3) + SVC_(GdiDvpReleaseNotification, 2) + SVC_(GdiDxgGenericThunk, 6) + SVC_(GdiDeleteClientObj, 1) + SVC_(GdiDeleteColorSpace, 1) + SVC_(GdiDeleteColorTransform, 2) + SVC_(GdiDeleteObjectApp, 1) + SVC_(GdiDescribePixelFormat, 4) + SVC_(GdiGetPerBandInfo, 2) + SVC_(GdiDoBanding, 4) + SVC_(GdiDoPalette, 6) + SVC_(GdiDrawEscape, 4) + SVC_(GdiEllipse, 5) + SVC_(GdiEnableEudc, 1) + SVC_(GdiEndDoc, 1) + SVC_(GdiEndPage, 1) + SVC_(GdiEndPath, 1) + SVC_(GdiEnumFontChunk, 5) + SVC_(GdiEnumFontClose, 1) + SVC_(GdiEnumFontOpen, 7) + SVC_(GdiEnumObjects, 4) + SVC_(GdiEqualRgn, 2) + SVC_(GdiEudcLoadUnloadLink, 7) + SVC_(GdiExcludeClipRect, 5) + SVC_(GdiExtCreatePen, 11) + SVC_(GdiExtCreateRegion, 3) + SVC_(GdiExtEscape, 8) + SVC_(GdiExtFloodFill, 5) + SVC_(GdiExtGetObjectW, 3) + SVC_(GdiExtSelectClipRgn, 3) + SVC_(GdiExtTextOutW, 9) + SVC_(GdiFillPath, 1) + SVC_(GdiFillRgn, 3) + SVC_(GdiFlattenPath, 1) + SVC_(GdiFlushUserBatch, 0) + SVC_(GdiFlush, 0) + SVC_(GdiForceUFIMapping, 2) + SVC_(GdiFrameRgn, 5) + SVC_(GdiFullscreenControl, 5) + SVC_(GdiGetAndSetDCDword, 4) + SVC_(GdiGetAppClipBox, 2) + SVC_(GdiGetBitmapBits, 3) + SVC_(GdiGetBitmapDimension, 2) + SVC_(GdiGetBoundsRect, 3) + SVC_(GdiGetCharABCWidthsW, 6) + SVC_(GdiGetCharacterPlacementW, 6) + SVC_(GdiGetCharSet, 1) + SVC_(GdiGetCharWidthW, 6) + SVC_(GdiGetCharWidthInfo, 2) + SVC_(GdiGetColorAdjustment, 2) + SVC_(GdiGetColorSpaceforBitmap, 1) + SVC_(GdiGetDCDword, 3) + SVC_(GdiGetDCforBitmap, 1) + SVC_(GdiGetDCObject, 2) + SVC_(GdiGetDCPoint, 3) + SVC_(GdiGetDeviceCaps, 2) + SVC_(GdiGetDeviceGammaRamp, 2) + SVC_(GdiGetDeviceCapsAll, 2) + SVC_(GdiGetDIBitsInternal, 9) + SVC_(GdiGetETM, 2) + SVC_(GdiGetEudcTimeStampEx, 3) + SVC_(GdiGetFontData, 5) + SVC_(GdiGetFontResourceInfoInternalW, 7) + SVC_(GdiGetGlyphIndicesW, 5) + SVC_(GdiGetGlyphIndicesWInternal, 6) + SVC_(GdiGetGlyphOutline, 8) + SVC_(GdiGetKerningPairs, 3) + SVC_(GdiGetLinkedUFIs, 3) + SVC_(GdiGetMiterLimit, 2) + SVC_(GdiGetMonitorID, 3) + SVC_(GdiGetNearestColor, 2) + SVC_(GdiGetNearestPaletteIndex, 2) + SVC_(GdiGetObjectBitmapHandle, 2) + SVC_(GdiGetOutlineTextMetricsInternalW, 4) + SVC_(GdiGetPath, 4) + SVC_(GdiGetPixel, 3) + SVC_(GdiGetRandomRgn, 3) + SVC_(GdiGetRasterizerCaps, 2) + SVC_(GdiGetRealizationInfo, 3) + SVC_(GdiGetRegionData, 3) + SVC_(GdiGetRgnBox, 2) + SVC_(GdiGetServerMetaFileBits, 7) + SVC_(GdiGetSpoolMessage, 4) + SVC_(GdiGetStats, 5) + SVC_(GdiGetStockObject, 1) + SVC_(GdiGetStringBitmapW, 5) + SVC_(GdiGetSystemPaletteUse, 1) + SVC_(GdiGetTextCharsetInfo, 3) + SVC_(GdiGetTextExtent, 5) + SVC_(GdiGetTextExtentExW, 8) + SVC_(GdiGetTextFaceW, 4) + SVC_(GdiGetTextMetricsW, 3) + SVC_(GdiGetTransform, 3) + SVC_(GdiGetUFI, 6) + SVC_(GdiGetEmbUFI, 7) + SVC_(GdiGetUFIPathname, 10) + SVC_(GdiGetEmbedFonts, 0) + SVC_(GdiChangeGhostFont, 2) + SVC_(GdiAddEmbFontToDC, 2) + SVC_(GdiGetFontUnicodeRanges, 2) + SVC_(GdiGetWidthTable, 7) + SVC_(GdiGradientFill, 6) + SVC_(GdiHfontCreate, 5) + SVC_(GdiIcmBrushInfo, 8) + SVC_(GdiInit, 0) + SVC_(GdiInitSpool, 0) + SVC_(GdiIntersectClipRect, 5) + SVC_(GdiInvertRgn, 2) + SVC_(GdiLineTo, 3) + SVC_(GdiMakeFontDir, 5) + SVC_(GdiMakeInfoDC, 2) + SVC_(GdiMaskBlt, 13) + SVC_(GdiModifyWorldTransform, 3) + SVC_(GdiMonoBitmap, 1) + SVC_(GdiMoveTo, 4) + SVC_(GdiOffsetClipRgn, 3) + SVC_(GdiOffsetRgn, 3) + SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP/2k3 */ + SVC_(GdiPatBlt, 6) + SVC_(GdiPolyPatBlt, 5) + SVC_(GdiPathToRegion, 1) + SVC_(GdiPlgBlt, 11) + SVC_(GdiPolyDraw, 4) + SVC_(GdiPolyPolyDraw, 5) + SVC_(GdiPolyTextOutW, 4) + SVC_(GdiPtInRegion, 3) + SVC_(GdiPtVisible, 3) + SVC_(GdiQueryFonts, 3) + SVC_(GdiQueryFontAssocInfo, 1) + SVC_(GdiRectangle, 5) + SVC_(GdiRectInRegion, 2) + SVC_(GdiRectVisible, 2) + SVC_(GdiRemoveFontResourceW, 6) + SVC_(GdiRemoveFontMemResourceEx, 1) + SVC_(GdiResetDC, 5) + SVC_(GdiResizePalette, 2) + SVC_(GdiRestoreDC, 2) + SVC_(GdiRoundRect, 7) + SVC_(GdiSaveDC, 1) + SVC_(GdiScaleViewportExtEx, 6) + SVC_(GdiScaleWindowExtEx, 6) + SVC_(GdiSelectBitmap, 2) + SVC_(GdiSelectBrush, 2) + SVC_(GdiSelectClipPath, 2) + SVC_(GdiSelectFont, 2) + SVC_(GdiSelectPen, 2) + SVC_(GdiSetBitmapAttributes, 2) + SVC_(GdiSetBitmapBits, 3) + SVC_(GdiSetBitmapDimension, 4) + SVC_(GdiSetBoundsRect, 3) + SVC_(GdiSetBrushAttributes, 2) + SVC_(GdiSetBrushOrg, 4) + SVC_(GdiSetColorAdjustment, 2) + SVC_(GdiSetColorSpace, 2) + SVC_(GdiSetDeviceGammaRamp, 2) + SVC_(GdiSetDIBitsToDeviceInternal, 16) + SVC_(GdiSetFontEnumeration, 1) + SVC_(GdiSetFontXform, 3) + SVC_(GdiSetIcmMode, 3) + SVC_(GdiSetLinkedUFIs, 3) + SVC_(GdiSetMagicColors, 3) + SVC_(GdiSetMetaRgn, 1) + SVC_(GdiSetMiterLimit, 3) + SVC_(GdiGetDeviceWidth, 1) + SVC_(GdiMirrorWindowOrg, 1) + SVC_(GdiSetLayout, 3) + SVC_(GdiSetPixel, 4) + SVC_(GdiSetPixelFormat, 2) + SVC_(GdiSetRectRgn, 5) + SVC_(GdiSetSystemPaletteUse, 2) + SVC_(GdiSetTextJustification, 3) + SVC_(GdiSetupPublicCFONT, 3) + SVC_(GdiSetVirtualResolution, 5) + SVC_(GdiSetSizeDevice, 3) + SVC_(GdiStartDoc, 4) + SVC_(GdiStartPage, 1) + SVC_(GdiStretchBlt, 12) + SVC_(GdiStretchDIBitsInternal, 16) + SVC_(GdiStrokeAndFillPath, 1) + SVC_(GdiStrokePath, 1) + SVC_(GdiSwapBuffers, 1) + SVC_(GdiTransformPoints, 5) + SVC_(GdiTransparentBlt, 11) + SVC_(GdiUnloadPrinterDriver, 2) + SVC_(GdiUnmapMemFont, 1) + SVC_(GdiUnrealizeObject, 1) + SVC_(GdiUpdateColors, 1) + SVC_(GdiWidenPath, 1) + SVC_(UserActivateKeyboardLayout, 2) + SVC_(UserAlterWindowStyle, 3) + SVC_(UserAssociateInputContext, 3) + SVC_(UserAttachThreadInput, 3) + SVC_(UserBeginPaint, 2) + SVC_(UserBitBltSysBmp, 8) + SVC_(UserBlockInput, 1) + SVC_(UserBuildHimcList, 4) + SVC_(UserBuildHwndList, 7) + SVC_(UserBuildNameList, 4) + SVC_(UserBuildPropList, 4) + SVC_(UserCallHwnd, 2) + SVC_(UserCallHwndLock, 2) + SVC_(UserCallHwndOpt, 2) + SVC_(UserCallHwndParam, 3) + SVC_(UserCallHwndParamLock, 3) + SVC_(UserCallMsgFilter, 2) + SVC_(UserCallNextHookEx, 4) + SVC_(UserCallNoParam, 1) + SVC_(UserCallOneParam, 2) + SVC_(UserCallTwoParam, 3) + SVC_(UserChangeClipboardChain, 2) + SVC_(UserChangeDisplaySettings, 5) + SVC_(UserCheckImeHotKey, 2) + SVC_(UserCheckMenuItem, 3) + SVC_(UserChildWindowFromPointEx, 4) + SVC_(UserClipCursor, 1) + SVC_(UserCloseClipboard, 0) + SVC_(UserCloseDesktop, 1) + SVC_(UserCloseWindowStation, 1) + SVC_(UserConsoleControl, 3) + SVC_(UserConvertMemHandle, 2) + SVC_(UserCopyAcceleratorTable, 3) + SVC_(UserCountClipboardFormats, 0) + SVC_(UserCreateAcceleratorTable, 2) + SVC_(UserCreateCaret, 4) + SVC_(UserCreateDesktop, 5) + SVC_(UserCreateInputContext, 1) + SVC_(UserCreateLocalMemHandle, 4) + SVC_(UserCreateWindowEx, 15) + SVC_(UserCreateWindowStation, 7) + SVC_(UserDdeGetQualityOfService, 3) + SVC_(UserDdeInitialize, 5) + SVC_(UserDdeSetQualityOfService, 3) + SVC_(UserDeferWindowPos, 8) + SVC_(UserDefSetText, 2) + SVC_(UserDeleteMenu, 3) + SVC_(UserDestroyAcceleratorTable, 1) + SVC_(UserDestroyCursor, 2) + SVC_(UserDestroyInputContext, 1) + SVC_(UserDestroyMenu, 1) + SVC_(UserDestroyWindow, 1) + SVC_(UserDisableThreadIme, 1) + SVC_(UserDispatchMessage, 1) + SVC_(UserDragDetect, 3) + SVC_(UserDragObject, 5) + SVC_(UserDrawAnimatedRects, 4) + SVC_(UserDrawCaption, 4) + SVC_(UserDrawCaptionTemp, 7) + SVC_(UserDrawIconEx, 11) + SVC_(UserDrawMenuBarTemp, 5) + SVC_(UserEmptyClipboard, 0) + SVC_(UserEnableMenuItem, 3) + SVC_(UserEnableScrollBar, 3) + SVC_(UserEndDeferWindowPosEx, 2) + SVC_(UserEndMenu, 0) + SVC_(UserEndPaint, 2) + SVC_(UserEnumDisplayDevices, 4) + SVC_(UserEnumDisplayMonitors, 5) /* FIXME: 4 on XP/2k3 */ + SVC_(UserEnumDisplaySettings, 4) + SVC_(UserEvent, 1) + SVC_(UserExcludeUpdateRgn, 2) + SVC_(UserFillWindow, 4) + SVC_(UserFindExistingCursorIcon, 3) + SVC_(UserFindWindowEx, 5) + SVC_(UserFlashWindowEx, 1) + SVC_(UserGetAltTabInfo, 6) + SVC_(UserGetAncestor, 2) + SVC_(UserGetAppImeLevel, 1) + SVC_(UserGetAsyncKeyState, 1) + SVC_(UserGetAtomName, 2) + SVC_(UserGetCaretBlinkTime, 0) + SVC_(UserGetCaretPos, 1) + SVC_(UserGetClassInfo, 5) + SVC_(UserGetClassName, 3) + SVC_(UserGetClipboardData, 2) + SVC_(UserGetClipboardFormatName, 3) + SVC_(UserGetClipboardOwner, 0) + SVC_(UserGetClipboardSequenceNumber, 0) + SVC_(UserGetClipboardViewer, 0) + SVC_(UserGetClipCursor, 1) + SVC_(UserGetComboBoxInfo, 2) + SVC_(UserGetControlBrush, 3) + SVC_(UserGetControlColor, 4) + SVC_(UserGetCPD, 3) + SVC_(UserGetCursorFrameInfo, 4) + SVC_(UserGetCursorInfo, 1) + SVC_(UserGetDC, 1) + SVC_(UserGetDCEx, 3) + SVC_(UserGetDoubleClickTime, 0) + SVC_(UserGetForegroundWindow, 0) + SVC_(UserGetGuiResources, 2) + SVC_(UserGetGUIThreadInfo, 2) + SVC_(UserGetIconInfo, 6) + SVC_(UserGetIconSize, 4) + SVC_(UserGetImeHotKey, 4) + SVC_(UserGetImeInfoEx, 2) + SVC_(UserGetInternalWindowPos, 3) + SVC_(UserGetKeyboardLayoutList, 2) + SVC_(UserGetKeyboardLayoutName, 1) + SVC_(UserGetKeyboardState, 1) + SVC_(UserGetKeyNameText, 3) + SVC_(UserGetKeyState, 1) + SVC_(UserGetListBoxInfo, 1) + SVC_(UserGetMenuBarInfo, 4) + SVC_(UserGetMenuIndex, 2) + SVC_(UserGetMenuItemRect, 4) + SVC_(UserGetMessage, 4) + SVC_(UserGetMouseMovePointsEx, 5) + SVC_(UserGetObjectInformation, 5) + SVC_(UserGetOpenClipboardWindow, 0) + SVC_(UserGetPriorityClipboardFormat, 2) + SVC_(UserGetProcessWindowStation, 0) + SVC_(UserGetRawInputBuffer, 3) + SVC_(UserGetRawInputData, 5) + SVC_(UserGetRawInputDeviceInfo, 4) + SVC_(UserGetRawInputDeviceList, 3) + SVC_(UserGetRegisteredRawInputDevices, 3) + SVC_(UserGetScrollBarInfo, 3) + SVC_(UserGetSystemMenu, 2) + SVC_(UserGetThreadDesktop, 2) + SVC_(UserGetThreadState, 1) + SVC_(UserGetTitleBarInfo, 2) + SVC_(UserGetUpdateRect, 3) + SVC_(UserGetUpdateRgn, 3) + SVC_(UserGetWindowDC, 1) + SVC_(UserGetWindowPlacement, 2) + SVC_(UserGetWOWClass, 2) + SVC_(UserHardErrorControl, 3) + SVC_(UserHideCaret, 1) + SVC_(UserHiliteMenuItem, 4) + SVC_(UserImpersonateDdeClientWindow, 2) + SVC_(UserInitialize, 3) + SVC_(UserInitializeClientPfnArrays, 4) + SVC_(UserInitTask, 12) + SVC_(UserInternalGetWindowText, 3) + SVC_(UserInvalidateRect, 3) + SVC_(UserInvalidateRgn, 3) + SVC_(UserIsClipboardFormatAvailable, 1) + SVC_(UserKillTimer, 2) + SVC_(UserLoadKeyboardLayoutEx, 7) + SVC_(UserLockWindowStation, 1) + SVC_(UserLockWindowUpdate, 1) + SVC_(UserLockWorkStation, 0) + SVC_(UserMapVirtualKeyEx, 4) + SVC_(UserMenuItemFromPoint, 4) + SVC_(UserMessageCall, 7) + SVC_(UserMinMaximize, 3) + SVC_(UserMNDragLeave, 0) + SVC_(UserMNDragOver, 2) + SVC_(UserModifyUserStartupInfoFlags, 2) + SVC_(UserMoveWindow, 6) + SVC_(UserNotifyIMEStatus, 3) + SVC_(UserNotifyProcessCreate, 4) + SVC_(UserNotifyWinEvent, 4) + SVC_(UserOpenClipboard, 2) + SVC_(UserOpenDesktop, 3) + SVC_(UserOpenInputDesktop, 3) + SVC_(UserOpenWindowStation, 2) + SVC_(UserPaintDesktop, 1) + SVC_(UserPeekMessage, 5) + SVC_(UserPostMessage, 4) + SVC_(UserPostThreadMessage, 4) + SVC_(UserPrintWindow, 3) + SVC_(UserProcessConnect, 3) + SVC_(UserQueryInformationThread, 4) + SVC_(UserQueryInputContext, 2) + SVC_(UserQuerySendMessage, 1) + SVC_(UserQueryUserCounters, 5) + SVC_(UserQueryWindow, 2) + SVC_(UserRealChildWindowFromPoint, 3) + SVC_(UserRealInternalGetMessage, 6) + SVC_(UserRealWaitMessageEx, 2) + SVC_(UserRedrawWindow, 4) + SVC_(UserRegisterClassExWOW, 7) + SVC_(UserRegisterUserApiHook, 4) /* Note: 2 params on XP, 4 on 2k3 */ + SVC_(UserRegisterHotKey, 4) + SVC_(UserRegisterRawInputDevices, 3) + SVC_(UserRegisterTasklist, 1) + SVC_(UserRegisterWindowMessage, 1) + SVC_(UserRemoveMenu, 3) + SVC_(UserRemoveProp, 2) + SVC_(UserResolveDesktop, 4) + SVC_(UserResolveDesktopForWOW, 1) + SVC_(UserSBGetParms, 4) + SVC_(UserScrollDC, 7) + SVC_(UserScrollWindowEx, 8) + SVC_(UserSelectPalette, 3) + SVC_(UserSendInput, 3) + SVC_(UserSetActiveWindow, 1) + SVC_(UserSetAppImeLevel, 2) + SVC_(UserSetCapture, 1) + SVC_(UserSetClassLong, 4) + SVC_(UserSetClassWord, 3) + SVC_(UserSetClipboardData, 3) + SVC_(UserSetClipboardViewer, 1) + SVC_(UserSetConsoleReserveKeys, 2) + SVC_(UserSetCursor, 1) + SVC_(UserSetCursorContents, 2) + SVC_(UserSetCursorIconData, 4) + SVC_(UserSetDbgTag, 2) + SVC_(UserSetFocus, 1) + SVC_(UserSetImeHotKey, 5) + SVC_(UserSetImeInfoEx, 1) + SVC_(UserSetImeOwnerWindow, 2) + SVC_(UserSetInformationProcess, 4) + SVC_(UserSetInformationThread, 4) + SVC_(UserSetInternalWindowPos, 4) + SVC_(UserSetKeyboardState, 1) + SVC_(UserSetLogonNotifyWindow, 1) + SVC_(UserSetMenu, 3) + SVC_(UserSetMenuContextHelpId, 2) + SVC_(UserSetMenuDefaultItem, 3) + SVC_(UserSetMenuFlagRtoL, 1) + SVC_(UserSetObjectInformation, 4) + SVC_(UserSetParent, 2) + SVC_(UserSetProcessWindowStation, 1) + SVC_(UserSetProp, 3) + SVC_(UserSetRipFlags, 2) + SVC_(UserSetScrollInfo, 4) + SVC_(UserSetShellWindowEx, 2) + SVC_(UserSetSysColors, 4) + SVC_(UserSetSystemCursor, 2) + SVC_(UserSetSystemMenu, 2) + SVC_(UserSetSystemTimer, 4) + SVC_(UserSetThreadDesktop, 1) + SVC_(UserSetThreadLayoutHandles, 2) + SVC_(UserSetThreadState, 2) + SVC_(UserSetTimer, 4) + SVC_(UserSetWindowFNID, 2) + SVC_(UserSetWindowLong, 4) + SVC_(UserSetWindowPlacement, 2) + SVC_(UserSetWindowPos, 7) + SVC_(UserSetWindowRgn, 3) + SVC_(UserSetWindowsHookAW, 3) + SVC_(UserSetWindowsHookEx, 6) + SVC_(UserSetWindowStationUser, 4) + SVC_(UserSetWindowWord, 3) + SVC_(UserSetWinEventHook, 8) + SVC_(UserShowCaret, 1) + SVC_(UserShowScrollBar, 3) + SVC_(UserShowWindow, 2) + SVC_(UserShowWindowAsync, 2) + SVC_(UserSoundSentry, 0) + SVC_(UserSwitchDesktop, 1) + SVC_(UserSystemParametersInfo, 4) + SVC_(UserTestForInteractiveUser, 1) + SVC_(UserThunkedMenuInfo, 2) + SVC_(UserThunkedMenuItemInfo, 6) + SVC_(UserToUnicodeEx, 7) + SVC_(UserTrackMouseEvent, 1) + SVC_(UserTrackPopupMenuEx, 6) + SVC_(UserCalcMenuBar, 5) + SVC_(UserPaintMenuBar, 6) + SVC_(UserTranslateAccelerator, 3) + SVC_(UserTranslateMessage, 2) + SVC_(UserUnhookWindowsHookEx, 1) + SVC_(UserUnhookWinEvent, 1) + SVC_(UserUnloadKeyboardLayout, 1) + SVC_(UserUnlockWindowStation, 1) + SVC_(UserUnregisterClass, 3) + SVC_(UserUnregisterUserApiHook, 0) + SVC_(UserUnregisterHotKey, 2) + SVC_(UserUpdateInputContext, 3) + SVC_(UserUpdateInstance, 3) + SVC_(UserUpdateLayeredWindow, 10) /* Note: 9 params on XP, 10 on 2k3 */ + SVC_(UserGetLayeredWindowAttributes, 4) + SVC_(UserSetLayeredWindowAttributes, 4) + SVC_(UserUpdatePerUserSystemParameters, 2) + SVC_(UserUserHandleGrantAccess, 3) + SVC_(UserValidateHandleSecure, 2) + SVC_(UserValidateRect, 2) + SVC_(UserValidateTimerCallback, 3) + SVC_(UserVkKeyScanEx, 3) + SVC_(UserWaitForInputIdle, 3) + SVC_(UserWaitForMsgAndEvent, 1) + SVC_(UserWaitMessage, 0) + SVC_(UserWin32PoolAllocationStats, 6) + SVC_(UserWindowFromPoint, 2) + SVC_(UserYieldTask, 0) + SVC_(UserRemoteConnect, 3) + SVC_(UserRemoteRedrawRectangle, 4) + SVC_(UserRemoteRedrawScreen, 0) + SVC_(UserRemoteStopScreenUpdates, 0) + SVC_(UserCtxDisplayIOCtl, 3) + SVC_(GdiEngAssociateSurface, 3) + SVC_(GdiEngCreateBitmap, 6) + SVC_(GdiEngCreateDeviceSurface, 4) + SVC_(GdiEngCreateDeviceBitmap, 4) + SVC_(GdiEngCreatePalette, 6) + SVC_(GdiEngComputeGlyphSet, 3) + SVC_(GdiEngCopyBits, 6) + SVC_(GdiEngDeletePalette, 1) + SVC_(GdiEngDeleteSurface, 1) + SVC_(GdiEngEraseSurface, 3) + SVC_(GdiEngUnlockSurface, 1) + SVC_(GdiEngLockSurface, 1) + SVC_(GdiEngBitBlt, 11) + SVC_(GdiEngStretchBlt, 11) + SVC_(GdiEngPlgBlt, 11) + SVC_(GdiEngMarkBandingSurface, 1) + SVC_(GdiEngStrokePath, 8) + SVC_(GdiEngFillPath, 7) + SVC_(GdiEngStrokeAndFillPath, 10) + SVC_(GdiEngPaint, 5) + SVC_(GdiEngLineTo, 9) + SVC_(GdiEngAlphaBlend, 7) + SVC_(GdiEngGradientFill, 10) + SVC_(GdiEngTransparentBlt, 8) + SVC_(GdiEngTextOut, 10) + SVC_(GdiEngStretchBltROP, 13) + SVC_(GdiXLATEOBJ_cGetPalette, 4) + SVC_(GdiXLATEOBJ_iXlate, 2) + SVC_(GdiXLATEOBJ_hGetColorTransform, 1) + SVC_(GdiCLIPOBJ_bEnum, 3) + SVC_(GdiCLIPOBJ_cEnumStart, 5) + SVC_(GdiCLIPOBJ_ppoGetPath, 1) + SVC_(GdiEngDeletePath, 1) + SVC_(GdiEngCreateClip, 0) + SVC_(GdiEngDeleteClip, 1) + SVC_(GdiBRUSHOBJ_ulGetBrushColor, 1) + SVC_(GdiBRUSHOBJ_pvAllocRbrush, 2) + SVC_(GdiBRUSHOBJ_pvGetRbrush, 1) + SVC_(GdiBRUSHOBJ_hGetColorTransform, 1) + SVC_(GdiXFORMOBJ_bApplyXform, 5) + SVC_(GdiXFORMOBJ_iGetXform, 2) + SVC_(GdiFONTOBJ_vGetInfo, 3) + SVC_(GdiFONTOBJ_pxoGetXform, 1) + SVC_(GdiFONTOBJ_cGetGlyphs, 5) + SVC_(GdiFONTOBJ_pifi, 1) + SVC_(GdiFONTOBJ_pfdg, 1) + SVC_(GdiFONTOBJ_pQueryGlyphAttrs, 2) + SVC_(GdiFONTOBJ_pvTrueTypeFontFile, 2) + SVC_(GdiFONTOBJ_cGetAllGlyphHandles, 2) + SVC_(GdiSTROBJ_bEnum, 3) + SVC_(GdiSTROBJ_bEnumPositionsOnly, 3) + SVC_(GdiSTROBJ_bGetAdvanceWidths, 4) + SVC_(GdiSTROBJ_vEnumStart, 1) + SVC_(GdiSTROBJ_dwGetCodePage, 1) + SVC_(GdiPATHOBJ_vGetBounds, 2) + SVC_(GdiPATHOBJ_bEnum, 2) + SVC_(GdiPATHOBJ_vEnumStart, 1) + SVC_(GdiPATHOBJ_vEnumStartClipLines, 4) + SVC_(GdiPATHOBJ_bEnumClipLines, 3) + SVC_(GdiGetDhpdev, 1) + SVC_(GdiEngCheckAbort, 1) + SVC_(GdiHT_Get8BPPFormatPalette, 4) + SVC_(GdiHT_Get8BPPMaskPalette, 6) + SVC_(GdiUpdateTransform, 1) + SVC_(GdiSetPUMPDOBJ, 4) + SVC_(GdiBRUSHOBJ_DeleteRbrush, 2) + SVC_(GdiUMPDEngFreeUserMem, 1) + SVC_(GdiDrawStream, 3) -// ReactOS, specific, syscalls) -SVC_(GdiSetViewportOrgEx, 4) -SVC_(GdiSetWindowOrgEx, 4) -SVC_(GdiGetFontFamilyInfo, 4) -SVC_(GdiOffsetViewportOrgEx, 4) -SVC_(GdiOffsetWindowOrgEx, 4) + // ReactOS, specific, syscalls) + SVC_(GdiSetViewportOrgEx, 4) + SVC_(GdiSetWindowOrgEx, 4) + SVC_(GdiGetFontFamilyInfo, 4) + SVC_(GdiOffsetViewportOrgEx, 4) + SVC_(GdiOffsetWindowOrgEx, 4) -SVC_(UserGetMonitorInfo, 2) -SVC_(UserMonitorFromPoint, 3) -SVC_(UserMonitorFromRect, 2) -SVC_(UserMonitorFromWindow, 2) -SVC_(UserSetScrollBarInfo, 3) + SVC_(UserGetMonitorInfo, 2) + SVC_(UserMonitorFromPoint, 3) + SVC_(UserMonitorFromRect, 2) + SVC_(UserMonitorFromWindow, 2) + SVC_(UserSetScrollBarInfo, 3)

9 years, 7 months

[tkreuzer] 67639: [KSARM.H] - Fix/add a number of macros based on native definitions - Add "intrinsics" for GNU ARM assembler - Move trap macros to asmmacro.S

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 10 21:03:33 2015 New Revision: 67639 URL: http://svn.reactos.org/svn/reactos?rev=67639&view=rev Log: [KSARM.H] - Fix/add a number of macros based on native definitions - Add "intrinsics" for GNU ARM assembler - Move trap macros to asmmacro.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.S trunk/reactos/include/asm/kxarm.h trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.S [iso-8859-1] Sun May 10 21:03:33 2015 @@ -8,17 +8,12 @@ #include <ksarm.h> - //.title "ARM FreeLDR Entry Point" - //.include "ntoskrnl/include/internal/arm/kxarm.h" - //.include "ntoskrnl/include/internal/arm/ksarm.h" - //.section .init - NESTED_ENTRY _start PROLOG_END _start - //b ArmInit + __assertfail - ENTRY_END _start + NESTED_END _start //L_ArmInit: // .long ArmInit Modified: trunk/reactos/include/asm/kxarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/kxarm.h?rev=67… ============================================================================== --- trunk/reactos/include/asm/kxarm.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/kxarm.h [iso-8859-1] Sun May 10 21:03:33 2015 @@ -1,72 +1,162 @@ +#define ENABLE_FRAME_POINTER 1 + +#undef TRUE +//#define TRUE 1 +#undef FALSE +//#define FALSE 0 + +//#include "kxarmunw.h" #ifdef _MSC_VER /* Globals */ - GBLS AreaName - GBLS FuncName - GBLS PrologName - GBLS FuncEndName -AreaName SETS "|.text|" + GBLS __FuncStartLabel + GBLS __FuncEpilog1StartLabel + GBLS __FuncEpilog2StartLabel + GBLS __FuncEpilog3StartLabel + GBLS __FuncEpilog4StartLabel + GBLS __FuncXDataLabel + GBLS __FuncXDataPrologLabel + GBLS __FuncXDataEpilog1Label + GBLS __FuncXDataEpilog2Label + GBLS __FuncXDataEpilog3Label + GBLS __FuncXDataEpilog4Label + GBLS __FuncXDataEndLabel + GBLS __FuncEndLabel + GBLS __FuncArea + GBLS __FuncExceptionHandler + + MACRO + __DeriveFunctionLabels $FuncName +__FuncStartLabel SETS "|$FuncName|" +__FuncEndLabel SETS "|$FuncName._end|" +__FuncEpilog1StartLabel SETS "|$FuncName._epilog1_start|" +__FuncEpilog2StartLabel SETS "|$FuncName._epilog2_start|" +__FuncEpilog3StartLabel SETS "|$FuncName._epilog3_start|" +__FuncEpilog4StartLabel SETS "|$FuncName._epilog4_start|" +__FuncXDataLabel SETS "|$FuncName._xdata|" +__FuncXDataPrologLabel SETS "|$FuncName._xdata_prolog|" +__FuncXDataEpilog1Label SETS "|$FuncName._xdata_epilog1|" +__FuncXDataEpilog2Label SETS "|$FuncName._xdata_epilog2|" +__FuncXDataEpilog3Label SETS "|$FuncName._xdata_epilog3|" +__FuncXDataEpilog4Label SETS "|$FuncName._xdata_epilog4|" +__FuncXDataEndLabel SETS "|$FuncName._xdata_end|" + MEND + + MACRO + __ExportName $FuncName + LCLS Name +Name SETS "|$FuncName|" + ALIGN 4 + EXPORT $Name +$Name + MEND + + MACRO + __ExportProc $FuncName + LCLS Name +Name SETS "|$FuncName|" + ALIGN 4 + EXPORT $Name +$Name PROC + MEND MACRO TEXTAREA - AREA |.text|,ALIGN=2,CODE,READONLY -AreaName SETS "|.text|" - MEND - - MACRO - NESTED_ENTRY $Name -FuncName SETS "$Name" -PrologName SETS "$Name":CC:"_Prolog" -FuncEndName SETS "$Name":CC:"_end" - //AREA |.pdata|,ALIGN=2,PDATA - ALIGN 2 - EXPORT $FuncName [FUNC] -$FuncName - ROUT - MEND - +#if defined(_CONTROL_FLOW_GUARD) + AREA |.text|,ALIGN=4,CODE,READONLY +#else + AREA |.text|,ALIGN=2,CODE,READONLY +#endif + MEND + + MACRO + DATAAREA + AREA |.data|,DATA + MEND + + MACRO + RODATAAREA + AREA |.rdata|,DATA,READONLY + MEND + + MACRO + NESTED_ENTRY $FuncName, $AreaName, $ExceptHandler + __DeriveFunctionLabels $FuncName +__FuncArea SETS "|.text|" + IF "$AreaName" != "" +__FuncArea SETS "$AreaName" + ENDIF +__FuncExceptionHandler SETS "" + IF "$ExceptHandler" != "" +__FuncExceptionHandler SETS "|$ExceptHandler|" + ENDIF + AREA $__FuncArea,CODE,READONLY + __ExportProc $FuncName + ROUT + // __ResetUnwindState + MEND + + // FIXME: this does not exist in native MACRO PROLOG_END -$PrologName - MEND - - MACRO - ENTRY_END $Name -$FuncEndName - MEND - - MACRO - LEAF_ENTRY $Name -FuncName SETS "$Name" -PrologName SETS "Invalid Prolog" -FuncEndName SETS "$Name":CC:"_end" - ALIGN 2 - EXPORT $FuncName [FUNC] -$FuncName - ROUT - MEND - - MACRO - LEAF_END $Name -$FuncEndName - MEND - - MACRO - TRAP_PROLOG $Abort - fixme - MEND - - MACRO - SYSCALL_PROLOG $Abort - fixme - MEND - - MACRO - TRAP_EPILOG $SystemCall - fixme - MEND + /* Ignore for now */ + MEND + + MACRO + NESTED_END $FuncName +$__FuncEndLabel + LTORG + ENDP + //AREA |.pdata|,ALIGN=2,READONLY + //DCD $__FuncStartLabel + //RELOC 2 + //DCD $__FuncXDataLabel + //RELOC 2 + //__EmitUnwindXData + //AREA $__FuncArea,CODE,READONLY +__FuncStartLabel SETS "" +__FuncEndLabel SETS "" + MEND + + MACRO + LEAF_ENTRY $FuncName, $AreaName + NESTED_ENTRY $FuncName, $AreaName + MEND + + MACRO + LEAF_END $FuncName + NESTED_END $FuncName + MEND + + MACRO + LEAF_ENTRY_NO_PDATA $FuncName, $AreaName + __DeriveFunctionLabels $FuncName +__FuncArea SETS "|.text|" + IF "$AreaName" != "" +__FuncArea SETS "$AreaName" + ENDIF + AREA $__FuncArea,CODE,READONLY + __ExportProc $FuncName + ROUT + MEND + + MACRO + LEAF_END_NO_PDATA $FuncName +$__FuncEndLabel + LTORG + ENDP +__FuncStartLabel SETS "" +__FuncEndLabel SETS "" + MEND + + MACRO + ALTERNATE_ENTRY $FuncName + __ExportName $FuncName + ROUT + MEND + #define CR 13 #define LF 10 @@ -87,9 +177,25 @@ /* Ignore */ .endm +.macro EXPORT Name + .global &Name +.endm + .macro TEXTAREA .section .text, "rx" +#if defined(_CONTROL_FLOW_GUARD) + .align 4 +#else .align 2 +#endif +.endm + +.macro DATAAREA + .section .data, "rw" +.endm + +.macro RODATAAREA + .section .rdata, "rw" .endm .macro NESTED_ENTRY Name @@ -102,152 +208,51 @@ &FuncName: .endm +// FIXME: should go to kxarmunw.h .macro PROLOG_END \PrologName: .endm -.macro ENTRY_END Name +.macro NESTED_END Name &FuncEndName: .endfunc .endm -.macro TRAP_PROLOG Abort - // - // Fixup lr - // -.if \Abort - sub lr, lr, #8 -.else - sub lr, lr, #4 -.endif - - // Save the bottom 4 registers - stmdb sp, {r0-r3} - - // Save the abort lr, sp, spsr, cpsr - mov r0, lr - mov r1, sp - mrs r2, cpsr - mrs r3, spsr - - // Switch to SVC mode - bic r2, r2, #CPSR_MODES - orr r2, r2, #CPSR_SVC_MODE - msr cpsr_c, r2 - - // Save the SVC sp before we modify it - mov r2, sp - - // Make space for the trap frame - sub sp, sp, #TrapFrameLength - - // Save abt32 state - str r0, [sp, #TrPc] - str lr, [sp, #TrSvcLr] - str r2, [sp, #TrSvcSp] - - // Restore the saved SPSR - msr spsr_all, r3 - - // Restore our 4 registers - ldmdb r1, {r0-r3} - - // Build trap frame - // FIXME: Change to stmdb later - str r0, [sp, #TrR0] - str r1, [sp, #TrR1] - str r2, [sp, #TrR2] - str r3, [sp, #TrR3] - str r4, [sp, #TrR4] - str r5, [sp, #TrR5] - str r6, [sp, #TrR6] - str r7, [sp, #TrR7] - str r8, [sp, #TrR8] - str r9, [sp, #TrR9] - str r10, [sp, #TrR10] - str r11, [sp, #TrR11] - str r12, [sp, #TrR12] - mov r12, sp - add r12, r12, #TrUserSp - stm r12, {sp, lr}^ - mrs r0, spsr_all - str r0, [sp, #TrSpsr] - ldr r0, =0xBADB0D00 - str r0, [sp, #TrDbgArgMark] -.endm - -.macro SYSCALL_PROLOG - // Make space for the trap frame - sub sp, sp, #TrapFrameLength - - // Build trap frame - // FIXME: Change to stmdb later - str r0, [sp, #TrR0] - str r1, [sp, #TrR1] - str r2, [sp, #TrR2] - str r3, [sp, #TrR3] - str r4, [sp, #TrR4] - str r5, [sp, #TrR5] - str r6, [sp, #TrR6] - str r7, [sp, #TrR7] - str r8, [sp, #TrR8] - str r9, [sp, #TrR9] - str r10, [sp, #TrR10] - str r11, [sp, #TrR11] - str r12, [sp, #TrR12] - mov r12, sp - add r12, r12, #TrUserSp - stm r12, {sp, lr}^ - str sp, [sp, #TrSvcSp] - str lr, [sp, #TrPc] - mrs r0, spsr_all - str r0, [sp, #TrSpsr] - ldr r0, =0xBADB0D00 - str r0, [sp, #TrDbgArgMark] -.endm - -.macro TRAP_EPILOG SystemCall - // ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00) - ldr r0, [sp, #TrDbgArgMark] - ldr r1, =0xBADB0D00 - cmp r0, r1 - bne 1f - - // Get the SPSR and restore it - ldr r0, [sp, #TrSpsr] - msr spsr_all, r0 - - // Restore the registers - // FIXME: Use LDMIA later - mov r0, sp - add r0, r0, #TrUserSp - ldm r0, {sp, lr}^ - ldr r0, [sp, #TrR0] - ldr r1, [sp, #TrR1] - ldr r2, [sp, #TrR2] - ldr r3, [sp, #TrR3] - ldr r4, [sp, #TrR4] - ldr r5, [sp, #TrR5] - ldr r6, [sp, #TrR6] - ldr r7, [sp, #TrR7] - ldr r8, [sp, #TrR8] - ldr r9, [sp, #TrR9] - ldr r10, [sp, #TrR10] - ldr r11, [sp, #TrR11] - ldr r12, [sp, #TrR12] - - // Restore program execution state -.if \SystemCall - ldr lr, [sp, #TrPc] - add sp, sp, #TrapFrameLength - movs pc, lr -.else - add sp, sp, #TrSvcSp - ldmia sp, {sp, lr, pc}^ -.endif -1: - b . -.endm +.macro LEAF_ENTRY $FuncName, $AreaName + NESTED_ENTRY $FuncName, $AreaName +.endm + +.macro LEAF_END $FuncName + NESTED_END $FuncName +.endm + + +/* Some "intrinsics", see http://codemachine.com/article_armasm.html */ + +.macro __debugbreak + DCD 0xDEFE +.endm + +.macro __assertfail + DCD 0xDEFC +.endm + +.macro __fastfail + DCD 0xDEFB +.endm + +.macro __rdpmccntr64 + DCD 0xDEFA +.endm + +.macro __debugservice + DCD 0xDEFD +.endm + +.macro __brkdiv0 + DCD 0xDEF9 +.endm + #endif Modified: trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/asmmacro.S [iso-8859-1] Sun May 10 21:03:33 2015 @@ -1,17 +1,142 @@ -// -// @name GENERATE_INT_HANDLER -// -// This macro creates an unexpected interrupt handler. -// -// @param None. -// -// @remark None. -// -.macro GENERATE_ARM_STUB Name -.global &Name -.func &Name -&Name: +#ifdef _MSC_VER + +#else + +.macro TRAP_PROLOG Abort + // Fixup lr +.if \Abort + sub lr, lr, #8 +.else + sub lr, lr, #4 +.endif + + // Save the bottom 4 registers + stmdb sp, {r0-r3} + + // Save the abort lr, sp, spsr, cpsr + mov r0, lr + mov r1, sp + mrs r2, cpsr + mrs r3, spsr + + // Switch to SVC mode + bic r2, r2, #CPSR_MODES + orr r2, r2, #CPSR_SVC_MODE + msr cpsr_c, r2 + + // Save the SVC sp before we modify it + mov r2, sp + + // Make space for the trap frame + sub sp, sp, #TrapFrameLength + + // Save abt32 state + str r0, [sp, #TrPc] + str lr, [sp, #TrSvcLr] + str r2, [sp, #TrSvcSp] + + // Restore the saved SPSR + msr spsr_all, r3 + + // Restore our 4 registers + ldmdb r1, {r0-r3} + + // Build trap frame + // FIXME: Change to stmdb later + str r0, [sp, #TrR0] + str r1, [sp, #TrR1] + str r2, [sp, #TrR2] + str r3, [sp, #TrR3] + str r4, [sp, #TrR4] + str r5, [sp, #TrR5] + str r6, [sp, #TrR6] + str r7, [sp, #TrR7] + str r8, [sp, #TrR8] + str r9, [sp, #TrR9] + str r10, [sp, #TrR10] + str r11, [sp, #TrR11] + str r12, [sp, #TrR12] + mov r12, sp + add r12, r12, #TrUserSp + stm r12, {sp, lr}^ + mrs r0, spsr_all + str r0, [sp, #TrSpsr] + ldr r0, =0xBADB0D00 + str r0, [sp, #TrDbgArgMark] +.endm + +.macro SYSCALL_PROLOG + // Make space for the trap frame + sub sp, sp, #TrapFrameLength + + // Build trap frame + // FIXME: Change to stmdb later + str r0, [sp, #TrR0] + str r1, [sp, #TrR1] + str r2, [sp, #TrR2] + str r3, [sp, #TrR3] + str r4, [sp, #TrR4] + str r5, [sp, #TrR5] + str r6, [sp, #TrR6] + str r7, [sp, #TrR7] + str r8, [sp, #TrR8] + str r9, [sp, #TrR9] + str r10, [sp, #TrR10] + str r11, [sp, #TrR11] + str r12, [sp, #TrR12] + mov r12, sp + add r12, r12, #TrUserSp + stm r12, {sp, lr}^ + str sp, [sp, #TrSvcSp] + str lr, [sp, #TrPc] + mrs r0, spsr_all + str r0, [sp, #TrSpsr] + ldr r0, =0xBADB0D00 + str r0, [sp, #TrDbgArgMark] +.endm + +.macro TRAP_EPILOG SystemCall + // ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00) + ldr r0, [sp, #TrDbgArgMark] + ldr r1, =0xBADB0D00 + cmp r0, r1 + bne 1f + + // Get the SPSR and restore it + ldr r0, [sp, #TrSpsr] + msr spsr_all, r0 + + // Restore the registers + // FIXME: Use LDMIA later + mov r0, sp + add r0, r0, #TrUserSp + ldm r0, {sp, lr}^ + ldr r0, [sp, #TrR0] + ldr r1, [sp, #TrR1] + ldr r2, [sp, #TrR2] + ldr r3, [sp, #TrR3] + ldr r4, [sp, #TrR4] + ldr r5, [sp, #TrR5] + ldr r6, [sp, #TrR6] + ldr r7, [sp, #TrR7] + ldr r8, [sp, #TrR8] + ldr r9, [sp, #TrR9] + ldr r10, [sp, #TrR10] + ldr r11, [sp, #TrR11] + ldr r12, [sp, #TrR12] + + // Restore program execution state +.if \SystemCall + ldr lr, [sp, #TrPc] + add sp, sp, #TrapFrameLength + movs pc, lr +.else + add sp, sp, #TrSvcSp + ldmia sp, {sp, lr, pc}^ +.endif +1: b . -.endfunc .endm + +#endif

9 years, 7 months

[tkreuzer] 67638: [ASM] Update templates for asm include generation

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 10 21:03:09 2015 New Revision: 67638 URL: http://svn.reactos.org/svn/reactos?rev=67638&view=rev Log: [ASM] Update templates for asm include generation Modified: trunk/reactos/include/asm/asm.inc trunk/reactos/include/asm/genincdata.c trunk/reactos/include/asm/ks386.template.h trunk/reactos/include/asm/ksamd64.template.h trunk/reactos/include/asm/ksarm.template.h trunk/reactos/include/asm/ksx.template.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/asm.inc?rev=67… Modified: trunk/reactos/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/genincdata.c?r… Modified: trunk/reactos/include/asm/ks386.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ks386.template… Modified: trunk/reactos/include/asm/ksamd64.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksamd64.templa… Modified: trunk/reactos/include/asm/ksarm.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksarm.template… Modified: trunk/reactos/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksx.template.h…

9 years, 7 months

[tkreuzer] 67637: [CRT] - Add _JUMP_BUFFER for ARM - On ARM there are no underscore prefixes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 10 21:02:53 2015 New Revision: 67637 URL: http://svn.reactos.org/svn/reactos?rev=67637&view=rev Log: [CRT] - Add _JUMP_BUFFER for ARM - On ARM there are no underscore prefixes Modified: trunk/reactos/include/crt/_mingw_mac.h trunk/reactos/include/crt/setjmp.h Modified: trunk/reactos/include/crt/_mingw_mac.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw_mac.h?r… ============================================================================== --- trunk/reactos/include/crt/_mingw_mac.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/_mingw_mac.h [iso-8859-1] Sun May 10 21:02:53 2015 @@ -22,8 +22,8 @@ #define __MINGW32_MAJOR_VERSION 3 #define __MINGW32_MINOR_VERSION 11 -#ifdef _WIN64 -/* MS does not prefix symbols by underscores for 64-bit. */ +#ifndef _M_IX86 +/* MS does not prefix symbols by underscores for anything other than x86. */ #ifndef __MINGW_USE_UNDERSCORE_PREFIX /* As we have to support older gcc version, which are using underscores as symbol prefix for x64, we have to check here for the user label Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=6… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Sun May 10 21:02:53 2015 @@ -131,8 +131,24 @@ #elif defined(_M_ARM) -#define _JBLEN 11 +#define _JBLEN 28 #define _JBTYPE int + + typedef struct _JUMP_BUFFER { + unsigned long Frame; + unsigned long R4; + unsigned long R5; + unsigned long R6; + unsigned long R7; + unsigned long R8; + unsigned long R9; + unsigned long R10; + unsigned long R11; + unsigned long Sp; + unsigned long Pc; + unsigned long Fpscr; + unsigned long long D[8]; // D8-D15 VFP/NEON regs + } _JUMP_BUFFER; #else

9 years, 7 months

[pschweitzer] 67636: [NTFS] - Only set the IOSB status if we complete the IRP - Fix the assert: the caller might want not to complete the IRP nor to queue it (passed down IRPs)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 10 20:56:48 2015 New Revision: 67636 URL: http://svn.reactos.org/svn/reactos?rev=67636&view=rev Log: [NTFS] - Only set the IOSB status if we complete the IRP - Fix the assert: the caller might want not to complete the IRP nor to queue it (passed down IRPs) Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 10 20:56:48 2015 @@ -85,13 +85,17 @@ else Status = STATUS_INSUFFICIENT_RESOURCES; - ASSERT(((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || + ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || + ((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || (!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && (IrpContext->Flags & IRPCONTEXT_QUEUE))); - Irp->IoStatus.Status = Status; + if (IrpContext->Flags & IRPCONTEXT_COMPLETE) + { + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IrpContext->PriorityBoost); + } if (IrpContext) ExFreePoolWithTag(IrpContext, 'PRIN');

9 years, 7 months

[pschweitzer] 67635: [NTFS] Add two more flags (mutually exclusive) for IRP context: - _COMPLETE will cause the IRP to be completed at the end of the dispatch, with the run-time priority boost set ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun May 10 20:47:44 2015 New Revision: 67635 URL: http://svn.reactos.org/svn/reactos?rev=67635&view=rev Log: [NTFS] Add two more flags (mutually exclusive) for IRP context: - _COMPLETE will cause the IRP to be completed at the end of the dispatch, with the run-time priority boost set by caller - _QUEUE will cause the IRP to be queued for delayed execution (not yet implemented) This allows more flexibility for callers that can set the behavior thanks to the flags. Default behavior is the previous one: by default the IRP is completed at the end of the dispatch That one should really come to FastFAT... Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Sun May 10 20:47:44 2015 @@ -85,8 +85,13 @@ else Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || + (!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && (IrpContext->Flags & IRPCONTEXT_QUEUE))); + Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IrpContext->PriorityBoost); + + if (IrpContext->Flags & IRPCONTEXT_COMPLETE) + IoCompleteRequest(Irp, IrpContext->PriorityBoost); if (IrpContext) ExFreePoolWithTag(IrpContext, 'PRIN'); Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Sun May 10 20:47:44 2015 @@ -88,6 +88,7 @@ IrpContext->FileObject = IrpContext->Stack->FileObject; IrpContext->IsTopLevel = (IoGetTopLevelIrp() == Irp); IrpContext->PriorityBoost = IO_NO_INCREMENT; + IrpContext->Flags = IRPCONTEXT_COMPLETE; if (IrpContext->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL || IrpContext->MajorFunction == IRP_MJ_DEVICE_CONTROL || Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 10 20:47:44 2015 @@ -392,6 +392,8 @@ } REPARSE_POINT_ATTRIBUTE, *PREPARSE_POINT_ATTRIBUTE; #define IRPCONTEXT_CANWAIT 0x1 +#define IRPCONTEXT_COMPLETE 0x2 +#define IRPCONTEXT_QUEUE 0x4 typedef struct {

9 years, 7 months

← Newer
1
...
32
33
34
35
36
37
38
...
50
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 May 2015