Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49657: [NTOSKRNL] Convert assembly to new sytax

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 20 11:09:32 2010 New Revision: 49657 URL: http://svn.reactos.org/svn/reactos?rev=49657&view=rev Log: [NTOSKRNL] Convert assembly to new sytax Modified: branches/cmake-bringup/ntoskrnl/ex/i386/fastinterlck_asm.S branches/cmake-bringup/ntoskrnl/ex/i386/interlck_asm.S branches/cmake-bringup/ntoskrnl/ex/i386/ioport.S branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S branches/cmake-bringup/ntoskrnl/kdbg/amd64/kdb_help.S branches/cmake-bringup/ntoskrnl/kdbg/i386/kdb_help.S branches/cmake-bringup/ntoskrnl/ke/amd64/boot.S branches/cmake-bringup/ntoskrnl/ke/amd64/ctxswitch.S branches/cmake-bringup/ntoskrnl/ke/amd64/trap.S branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c branches/cmake-bringup/ntoskrnl/ke/i386/ctxswitch.S branches/cmake-bringup/ntoskrnl/ke/i386/trap.s branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S branches/cmake-bringup/ntoskrnl/rtl/i386/stack.S Modified: branches/cmake-bringup/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -8,14 +8,13 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> #include <internal/i386/asmmacro.S> /* FUNCTIONS ****************************************************************/ .code32 -.text /* * NOTE: These functions must obey the following rules: @@ -30,7 +29,7 @@ *ExInterlockedAddLargeStatistic(IN PLARGE_INTEGER Addend, * IN ULONG Increment) */ -.global @ExInterlockedAddLargeStatistic@8 +PUBLIC @ExInterlockedAddLargeStatistic@8 @ExInterlockedAddLargeStatistic@8: #ifdef CONFIG_SMP @@ -38,10 +37,10 @@ lock add [ecx], edx /* Check for carry bit and return */ - jb 1f - ret - -1: + jb .l1 + ret + +.l1: /* Add carry */ lock adc dword ptr [ecx+4], 0 #else @@ -58,7 +57,7 @@ * IN ULONG Increment, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedAddUlong@12 +PUBLIC @ExfInterlockedAddUlong@12 @ExfInterlockedAddUlong@12: /* Save flags */ @@ -103,7 +102,7 @@ * IN PLIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedInsertHeadList@12 +PUBLIC @ExfInterlockedInsertHeadList@12 @ExfInterlockedInsertHeadList@12: #ifdef CONFIG_SMP @@ -139,11 +138,11 @@ /* Check if list was empty */ xor eax, ecx - jz 2f + jz .l2 /* Return list pointer */ xor eax, ecx -2: +.l2: ret 4 #ifdef CONFIG_SMP @@ -159,7 +158,7 @@ * IN PLIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedInsertTailList@12 +PUBLIC @ExfInterlockedInsertTailList@12 @ExfInterlockedInsertTailList@12: #ifdef CONFIG_SMP @@ -195,11 +194,11 @@ /* Check if list was empty */ xor eax, ecx - jz 2f + jz .l3 /* Return list pointer */ xor eax, ecx -2: +.l3: ret 4 #ifdef CONFIG_SMP @@ -214,7 +213,7 @@ *ExfInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedRemoveHeadList@8 +PUBLIC @ExfInterlockedRemoveHeadList@8 @ExfInterlockedRemoveHeadList@8: /* Save flags and disable interrupts */ @@ -228,7 +227,7 @@ /* Check if it's empty */ cmp eax, ecx - je 2f + je .l4 /* Get the next entry and do the deletion */ #ifdef CONFIG_SMP @@ -254,7 +253,7 @@ /* Return */ ret -2: +.l4: /* Release lock */ RELEASE_SPINLOCK(edx) @@ -276,7 +275,7 @@ *ExfInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedPopEntryList@8 +PUBLIC @ExfInterlockedPopEntryList@8 @ExfInterlockedPopEntryList@8: /* Save flags and disable interrupts */ @@ -290,7 +289,7 @@ /* Check if it's empty */ or eax, eax - je 3f + je .l6 /* Get next entry and do deletion */ #ifdef CONFIG_SMP @@ -302,7 +301,7 @@ pop edx #endif -2: +.l5: /* Release lock */ RELEASE_SPINLOCK(edx) @@ -312,10 +311,10 @@ /* Return */ ret -3: +.l6: /* Return empty list */ xor eax, eax - jmp 2b + jmp .l5 #ifdef CONFIG_SMP .spin5: @@ -329,7 +328,7 @@ * IN PSINGLE_LIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedPushEntryList@12 +PUBLIC @ExfInterlockedPushEntryList@12 @ExfInterlockedPushEntryList@12: /* Save flags */ @@ -383,11 +382,11 @@ *ExInterlockedPopEntrySList(IN PSINGLE_LIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ -.global @ExInterlockedPopEntrySList@8 -.global @InterlockedPopEntrySList@4 -.global _ExpInterlockedPopEntrySListResume@0 -.global _ExpInterlockedPopEntrySListFault@0 -.global _ExpInterlockedPopEntrySListEnd@0 +PUBLIC @ExInterlockedPopEntrySList@8 +PUBLIC @InterlockedPopEntrySList@4 +PUBLIC _ExpInterlockedPopEntrySListResume@0 +PUBLIC _ExpInterlockedPopEntrySListFault@0 +PUBLIC _ExpInterlockedPopEntrySListEnd@0 @ExInterlockedPopEntrySList@8: @InterlockedPopEntrySList@4: @@ -405,7 +404,7 @@ /* Check if the list is empty */ or eax, eax - jz 2f + jz .l7 /* Copy sequence number and adjust it */ lea ecx, [edx-1] @@ -418,7 +417,7 @@ jnz _ExpInterlockedPopEntrySListResume@0 /* Restore registers and return */ -2: +.l7: pop ebp pop ebx ret @@ -429,13 +428,13 @@ * IN PSINGLE_LIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global @ExInterlockedPushEntrySList@12 +PUBLIC @ExInterlockedPushEntrySList@12 @ExInterlockedPushEntrySList@12: /* So we can fall through below */ pop [esp] -.global @InterlockedPushEntrySList@8 +PUBLIC @InterlockedPushEntrySList@8 @InterlockedPushEntrySList@8: /* Save registers */ @@ -450,19 +449,18 @@ mov edx, [ebp+4] mov eax, [ebp] -1: +.l8: /* Set link pointer */ mov [ebx], eax /* Copy sequence number and adjust it */ - lea ecx, [edx+0x10001] + lea ecx, [edx + HEX(10001)] /* Do the exchange */ LOCK cmpxchg8b qword ptr [ebp] - jnz 1b + jnz .l8 /* Restore registers and return */ -2: pop ebp pop ebx ret @@ -471,7 +469,7 @@ *FASTCALL *ExInterlockedFlushSList(IN PSINGLE_LIST_ENTRY ListHead) */ -.global @ExInterlockedFlushSList@4 +PUBLIC @ExInterlockedFlushSList@4 @ExInterlockedFlushSList@4: /* Save registers */ @@ -488,10 +486,10 @@ mov edx, [ebp+4] mov eax, [ebp] -1: +.l9: /* Check if the list is empty */ or eax, eax - jz 2f + jz .l10 /* Clear sequence and pointer */ mov ecx, edx @@ -499,10 +497,10 @@ /* Do the exchange */ LOCK cmpxchg8b qword ptr [ebp] - jnz 1b + jnz .l9 /* Restore registers and return */ -2: +.l10: pop ebp pop ebx ret @@ -511,7 +509,7 @@ *FASTCALL *Exfi386InterlockedIncrementLong(IN PLONG Addend) */ -.global @Exfi386InterlockedIncrementLong@4 +PUBLIC @Exfi386InterlockedIncrementLong@4 @Exfi386InterlockedIncrementLong@4: /* Do the op */ @@ -526,7 +524,7 @@ *FASTCALL *Exfi386InterlockedDecrementLong(IN PLONG Addend) */ -.global @Exfi386InterlockedDecrementLong@4 +PUBLIC @Exfi386InterlockedDecrementLong@4 @Exfi386InterlockedDecrementLong@4: /* Do the op */ @@ -542,7 +540,7 @@ *Exfi386InterlockedExchangeUlong(IN PULONG Taget, * IN ULONG Value) */ -.global @Exfi386InterlockedExchangeUlong@8 +PUBLIC @Exfi386InterlockedExchangeUlong@8 @Exfi386InterlockedExchangeUlong@8: #ifdef CONFIG_SMP @@ -552,9 +550,9 @@ #else /* On UP, use cmpxchg */ mov eax, [ecx] -1: +.l11: cmpxchg [ecx], edx - jnz 1b + jnz .l11 #endif /* Return */ @@ -566,7 +564,7 @@ * IN PLONGLONG Exchange, * IN PLONGLONG Comperand) */ -.global @ExfInterlockedCompareExchange64@12 +PUBLIC @ExfInterlockedCompareExchange64@12 @ExfInterlockedCompareExchange64@12: /* Save registers */ @@ -598,7 +596,7 @@ * IN PLONGLONG Comperand, * IN PKSPIN_LOCK Lock) */ -.global @ExInterlockedCompareExchange64@16 +PUBLIC @ExInterlockedCompareExchange64@16 @ExInterlockedCompareExchange64@16: /* Save registers */ @@ -630,7 +628,7 @@ *ExfInterlockedPopEntrySList(IN PSINGLE_LIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedPopEntrySList@8 +PUBLIC @ExfInterlockedPopEntrySList@8 @ExfInterlockedPopEntrySList@8: /* Save flags */ @@ -646,7 +644,7 @@ /* Get the next link and check if it's empty */ mov eax, [ecx] or eax, eax - jz 1f + jz .l12 /* Get address of the next link and store it */ push [eax] @@ -655,7 +653,7 @@ /* Decrement list depth */ dec dword ptr [ecx+4] -1: +.l12: #ifdef CONFIG_SMP /* Release spinlock */ RELEASE_SPINLOCK(edx) @@ -678,7 +676,7 @@ * IN PSINGLE_LIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global @ExfInterlockedPushEntrySList@12 +PUBLIC @ExfInterlockedPushEntrySList@12 @ExfInterlockedPushEntrySList@12: /* Save flags */ @@ -727,7 +725,7 @@ * IN PLONGLONG Comperand, * IN PKSPIN_LOCK Lock) */ -.global @ExpInterlockedCompareExchange64@16 +PUBLIC @ExpInterlockedCompareExchange64@16 @ExpInterlockedCompareExchange64@16: /* Save registers */ @@ -802,4 +800,6 @@ pushfd SPIN_ON_LOCK(esi, .startc) #endif + +END /* EOF */ Modified: branches/cmake-bringup/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -8,14 +8,13 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> #include <internal/i386/asmmacro.S> /* FUNCTIONS ****************************************************************/ .code32 -.text /* * NOTE: These functions must obey the following rules: @@ -31,7 +30,7 @@ * IN PLIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedAddLargeInteger@16 +PUBLIC _ExInterlockedAddLargeInteger@16 _ExInterlockedAddLargeInteger@16: /* Prepare stack frame */ @@ -97,7 +96,7 @@ * IN PLIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedAddUlong@12 +PUBLIC _ExInterlockedAddUlong@12 _ExInterlockedAddUlong@12: /* Save flags and disable interrupts */ @@ -153,7 +152,7 @@ * IN PLIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedInsertHeadList@12 +PUBLIC _ExInterlockedInsertHeadList@12 _ExInterlockedInsertHeadList@12: /* Save lock pointer */ @@ -189,12 +188,12 @@ /* check if the list was empty and return NULL */ xor eax, edx - jz 2f + jz .l2 /* Return pointer */ mov eax, edx -2: +.l2: ret 12 #ifdef CONFIG_SMP @@ -209,7 +208,7 @@ * IN PLIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedInsertTailList@12 +PUBLIC _ExInterlockedInsertTailList@12 _ExInterlockedInsertTailList@12: /* Save lock pointer */ @@ -245,12 +244,12 @@ /* Check if the list was empty and return NULL */ xor eax, edx - jz 2f + jz .l3 /* Return pointer */ mov eax, edx -2: +.l3: ret 12 #ifdef CONFIG_SMP @@ -264,7 +263,7 @@ *ExInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedRemoveHeadList@8 +PUBLIC _ExInterlockedRemoveHeadList@8 _ExInterlockedRemoveHeadList@8: /* Save lock pointer */ @@ -284,7 +283,7 @@ /* Check if it's empty */ cmp eax, edx - je 2f + je .l4 /* Get next entry and do deletion */ mov ecx, [eax] @@ -303,7 +302,7 @@ /* Return */ ret 8 -2: +.l4: /* Release lock */ #ifdef CONFIG_SMP mov edx, [esp+12] @@ -328,7 +327,7 @@ *ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedPopEntryList@8 +PUBLIC _ExInterlockedPopEntryList@8 _ExInterlockedPopEntryList@8: /* Save lock pointer */ @@ -348,13 +347,13 @@ /* Check if it's empty */ or eax, eax - je 3f + je .l6 /* Get next entry and do deletion */ mov edx, [eax] mov [ecx], edx -2: +.l5: /* Release lock */ #ifdef CONFIG_SMP mov ecx, [esp+12] @@ -367,10 +366,10 @@ /* Return */ ret 8 -3: +.l6: /* Return empty list */ xor eax, eax - jmp 2b + jmp .l5 #ifdef CONFIG_SMP .spin6: @@ -384,7 +383,7 @@ * IN PSINGLE_LIST_ENTRY ListEntry, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedPushEntryList@12 +PUBLIC _ExInterlockedPushEntryList@12 _ExInterlockedPushEntryList@12: /* Save lock pointer */ @@ -430,7 +429,7 @@ *ExInterlockedIncrementLong(IN PLONG Addend, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedIncrementLong@8 +PUBLIC _ExInterlockedIncrementLong@8 _ExInterlockedIncrementLong@8: /* Get addend */ @@ -449,7 +448,7 @@ *ExInterlockedDecrementLong(IN PLONG Addend, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedDecrementLong@8 +PUBLIC _ExInterlockedDecrementLong@8 _ExInterlockedDecrementLong@8: /* Get addend */ @@ -469,7 +468,7 @@ * IN ULONG Value, * IN PKSPIN_LOCK Lock) */ -.global _ExInterlockedExchangeUlong@12 +PUBLIC _ExInterlockedExchangeUlong@12 _ExInterlockedExchangeUlong@12: /* Get pointers */ @@ -498,7 +497,7 @@ *Exi386InterlockedIncrementLong(IN PLONG Addend, * IN PKSPIN_LOCK Lock) */ -.global _Exi386InterlockedIncrementLong@4 +PUBLIC _Exi386InterlockedIncrementLong@4 _Exi386InterlockedIncrementLong@4: /* Get addend */ @@ -517,7 +516,7 @@ *Exi386InterlockedDecrementLong(IN PLONG Addend, * IN PKSPIN_LOCK Lock) */ -.global _Exi386InterlockedDecrementLong@4 +PUBLIC _Exi386InterlockedDecrementLong@4 _Exi386InterlockedDecrementLong@4: /* Get addend */ @@ -537,7 +536,7 @@ * IN ULONG Value, * IN PKSPIN_LOCK Lock) */ -.global _Exi386InterlockedExchangeUlong@12 +PUBLIC _Exi386InterlockedExchangeUlong@12 _Exi386InterlockedExchangeUlong@12: /* Get pointers */ @@ -560,5 +559,6 @@ /* Return */ ret 8 - + +END /* EOF */ Modified: branches/cmake-bringup/ntoskrnl/ex/i386/ioport.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ex/i386/ioport.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ex/i386/ioport.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -8,54 +8,52 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> -.intel_syntax noprefix +#include <asm.inc> +#include <ks386.inc> /* GLOBALS *******************************************************************/ -.globl _READ_REGISTER_UCHAR@4 -.globl _READ_REGISTER_USHORT@4 -.globl _READ_REGISTER_ULONG@4 -.globl _READ_REGISTER_BUFFER_UCHAR@12 -.globl _READ_REGISTER_BUFFER_USHORT@12 -.globl _READ_REGISTER_BUFFER_ULONG@12 -.globl _WRITE_REGISTER_UCHAR@8 -.globl _WRITE_REGISTER_USHORT@8 -.globl _WRITE_REGISTER_ULONG@8 -.globl _WRITE_REGISTER_BUFFER_UCHAR@12 -.globl _WRITE_REGISTER_BUFFER_USHORT@12 -.globl _WRITE_REGISTER_BUFFER_ULONG@12 +PUBLIC _READ_REGISTER_UCHAR@4 +PUBLIC _READ_REGISTER_USHORT@4 +PUBLIC _READ_REGISTER_ULONG@4 +PUBLIC _READ_REGISTER_BUFFER_UCHAR@12 +PUBLIC _READ_REGISTER_BUFFER_USHORT@12 +PUBLIC _READ_REGISTER_BUFFER_ULONG@12 +PUBLIC _WRITE_REGISTER_UCHAR@8 +PUBLIC _WRITE_REGISTER_USHORT@8 +PUBLIC _WRITE_REGISTER_ULONG@8 +PUBLIC _WRITE_REGISTER_BUFFER_UCHAR@12 +PUBLIC _WRITE_REGISTER_BUFFER_USHORT@12 +PUBLIC _WRITE_REGISTER_BUFFER_ULONG@12 /* FUNCTIONS *****************************************************************/ -.func READ_REGISTER_UCHAR@4 +.code + _READ_REGISTER_UCHAR@4: /* Return the requested memory location */ mov edx, [esp+4] mov al, [edx] ret 4 -.endfunc - -.func READ_REGISTER_USHORT@4 + + _READ_REGISTER_USHORT@4: /* Return the requested memory location */ mov edx, [esp+4] mov ax, [edx] ret 4 -.endfunc - -.func READ_REGISTER_ULONG@4 + + _READ_REGISTER_ULONG@4: /* Return the requested memory location */ mov edx, [esp+4] mov eax, [edx] ret 4 -.endfunc - -.func READ_REGISTER_BUFFER_UCHAR@12 + + _READ_REGISTER_BUFFER_UCHAR@12: /* Save volatiles */ @@ -72,9 +70,8 @@ mov edi, edx mov esi, eax ret 12 -.endfunc - -.func READ_REGISTER_BUFFER_USHORT@12 + + _READ_REGISTER_BUFFER_USHORT@12: /* Save volatiles */ @@ -91,9 +88,8 @@ mov edi, edx mov esi, eax ret 12 -.endfunc - -.func READ_REGISTER_BUFFER_ULONG@12 + + _READ_REGISTER_BUFFER_ULONG@12: /* Save volatiles */ @@ -110,9 +106,8 @@ mov edi, edx mov esi, eax ret 12 -.endfunc - -.func WRITE_REGISTER_UCHAR@8 + + _WRITE_REGISTER_UCHAR@8: /* Write to memory */ @@ -123,9 +118,8 @@ /* Flush posted write buffers and return */ lock or [esp+4], edx ret 8 -.endfunc - -.func WRITE_REGISTER_USHORT@8 + + _WRITE_REGISTER_USHORT@8: /* Write to memory */ @@ -136,9 +130,8 @@ /* Flush posted write buffers and return */ lock or [esp+4], edx ret 8 -.endfunc - -.func WRITE_REGISTER_ULONG@8 + + _WRITE_REGISTER_ULONG@8: /* Write to memory */ @@ -149,9 +142,8 @@ /* Flush posted write buffers and return */ lock or [esp+4], edx ret 8 -.endfunc - -.func WRITE_REGISTER_BUFFER_UCHAR@12 + + _WRITE_REGISTER_BUFFER_UCHAR@12: /* Save volatiles */ @@ -171,9 +163,8 @@ mov edi, edx mov esi, eax ret 12 -.endfunc - -.func WRITE_REGISTER_BUFFER_USHORT@12 + + _WRITE_REGISTER_BUFFER_USHORT@12: /* Save volatiles */ @@ -193,9 +184,8 @@ mov edi, edx mov esi, eax ret 12 -.endfunc - -.func WRITE_REGISTER_BUFFER_ULONG@12 + + _WRITE_REGISTER_BUFFER_ULONG@12: /* Save volatiles */ @@ -215,6 +205,6 @@ mov edi, edx mov esi, eax ret 12 -.endfunc - + +END /* EOF */ Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -60,8 +60,8 @@ // @remark None. // MACRO(idt, Handler, Bits) - .long \Handler - .short \Bits + .long VAL(Handler) + .short VAL(Bits) .short KGDT_R0_CODE ENDM @@ -128,17 +128,17 @@ mov [esp + KTRAP_FRAME_EAX], eax /* Does the caller want nonvolatiles only? */ - if ((Flags AND KI_NONVOLATILES_ONLY) == 0) + if (NOT (Flags AND KI_NONVOLATILES_ONLY)) /* Otherwise, save the volatiles as well */ mov [esp + KTRAP_FRAME_ECX], ecx mov [esp + KTRAP_FRAME_EDX], edx endif /* Save segment registers? */ - if ((Flags AND KI_DONT_SAVE_SEGS) == 0) + if (NOT (Flags AND KI_DONT_SAVE_SEGS)) /* Check for V86 mode */ - test byte ptr [esp + KTRAP_FRAME_EFLAGS + 2], (EFLAGS_V86_MASK >> 16) + test byte ptr [esp + KTRAP_FRAME_EFLAGS + 2], (EFLAGS_V86_MASK / HEX(10000)) jz not_v86_trap /* Restore V8086 segments into Protected Mode segments */ @@ -173,7 +173,7 @@ mov es, ax /* Fast system calls have fs already fixed */ - if ((Flags AND KI_FAST_SYSTEM_CALL) == 0) + if (NOT (Flags AND KI_FAST_SYSTEM_CALL)) /* Otherwise fix fs now */ mov ax, KGDT_R0_PCR mov fs, ax @@ -296,7 +296,7 @@ mov ecx, [esp - OffsetEsp + KTRAP_FRAME_ESP] /* Keep interrupts disabled until the sti / sysexit */ - and byte ptr [esp - OffsetEsp + KTRAP_FRAME_EFLAGS + 1], ~(EFLAGS_INTERRUPT_MASK >> 8) + and byte ptr [esp - OffsetEsp + KTRAP_FRAME_EFLAGS + 1], NOT (EFLAGS_INTERRUPT_MASK / HEX(100)) endif Modified: branches/cmake-bringup/ntoskrnl/kdbg/amd64/kdb_help.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/amd… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/amd64/kdb_help.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/amd64/kdb_help.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -1,7 +1,9 @@ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> -.globl KdbEnter +#include <asm.inc> + +#include <ksamd64.inc> + +PUBLIC KdbEnter KdbEnter: /* save flags */ @@ -149,4 +151,6 @@ mov rsp, rax /* Return */ - ret + ret + +END Modified: branches/cmake-bringup/ntoskrnl/kdbg/i386/kdb_help.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/i38… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/i386/kdb_help.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/i386/kdb_help.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -1,68 +1,72 @@ -#include <ndk/asm.h> -.text +#include <asm.inc> +#include <ks386.inc> -.globl _KdbEnter +EXTERN _KdbEnterDebuggerException:PROC + +.code + +PUBLIC _KdbEnter _KdbEnter: /* * Set up a trap frame */ - pushfl /* Eflags */ - pushl %cs /* Cs */ - pushl $0 /* ErrorCode */ - pushl %ebp /* Ebp */ - pushl %ebx /* Ebx */ - movl 20(%esp), %ebp /* Eip */ - movl 16(%esp), %ebx /* Eflags */ - movl %ebx, 20(%esp) - movl 12(%esp), %ebx /* Cs */ - movl %ebx, 16(%esp) - movl %ebp, 12(%esp) - pushl %esi /* Esi */ - pushl %edi /* Edi */ - pushl %fs /* Fs */ - pushl $0 /* ExceptionList */ - pushl $0 /* PreviousMode */ - pushl %eax /* Eax */ - pushl %ecx /* Ecx */ - pushl %edx /* Edx */ - pushl %ds /* Ds */ - pushl %es /* Es */ - pushl %gs /* Gs */ - movl %dr7, %eax - pushl %eax /* Dr7 */ + pushf /* Eflags */ + push cs /* Cs */ + push 0 /* ErrorCode */ + push ebp /* Ebp */ + push ebx /* Ebx */ + mov ebp, [esp + 20] /* Eip */ + mov ebx, [esp + 16] /* Eflags */ + mov [esp + 20], ebx + mov ebx, [esp + 12] /* Cs */ + mov [esp + 16], ebx + mov [esp + 12], ebp + push esi /* Esi */ + push edi /* Edi */ + push fs /* Fs */ + push 0 /* ExceptionList */ + push 0 /* PreviousMode */ + push eax /* Eax */ + push ecx /* Ecx */ + push edx /* Edx */ + push ds /* Ds */ + push es /* Es */ + push gs /* Gs */ + mov eax, dr7 + push eax /* Dr7 */ /* Clear all breakpoint enables in dr7. */ - andl $0xFFFF0000, %eax - movl %eax, %dr7 - movl %dr6, %eax - pushl %eax /* Dr6 */ - movl %dr3, %eax - pushl %eax /* Dr3 */ - movl %dr2, %eax - pushl %eax /* Dr2 */ - movl %dr1, %eax - pushl %eax /* Dr1 */ - movl %dr0, %eax - pushl %eax /* Dr0 */ - leal 0x58(%esp), %eax - pushl %eax /* TempEsp */ - pushl %ss /* TempSegSs */ - pushl $0 /* DebugPointer */ - pushl $3 /* DebugArgMark (Exception number) */ - pushl 0x60(%esp) /* DebugEip */ - pushl %ebp /* DebugEbp */ + and eax, HEX(0FFFF0000) + mov dr7, eax + mov eax, dr6 + push eax /* Dr6 */ + mov eax, dr3 + push eax /* Dr3 */ + mov eax, dr2 + push eax /* Dr2 */ + mov eax, dr1 + push eax /* Dr1 */ + mov eax, dr0 + push eax /* Dr0 */ + lea eax, [esp + HEX(58)] + push eax /* TempEsp */ + push ss /* TempSegSs */ + push 0 /* DebugPointer */ + push 3 /* DebugArgMark (Exception number) */ + push [esp + HEX(60)] /* DebugEip */ + push ebp /* DebugEbp */ /* * Call KDB */ - movl %esp, %eax - pushl $1 /* FirstChance */ - pushl %eax /* Push a pointer to the trap frame */ - pushl $0 /* Context */ - pushl $0 /* PreviousMode (KernelMode) */ - pushl $0 /* ExceptionRecord */ - call _KdbEnterDebuggerException + mov eax, esp + push 1 /* FirstChance */ + push eax /* Push a pointer to the trap frame */ + push 0 /* Context */ + push 0 /* PreviousMode (KernelMode) */ + push 0 /* ExceptionRecord */ + call _KdbEnterDebuggerException /* * Pop the arguments and unused portions of the trap frame: @@ -73,41 +77,41 @@ * TempSegSs * TempEsp */ - addl $(11*4), %esp + add esp, 11*4 /* * Restore/update debugging registers. */ - popl %eax /* Dr0 */ - movl %eax, %dr0 - popl %eax /* Dr1 */ - movl %eax, %dr1 - popl %eax /* Dr2 */ - movl %eax, %dr2 - popl %eax /* Dr3 */ - movl %eax, %dr3 - popl %eax /* Dr6 */ - movl %eax, %dr6 - popl %eax /* Dr7 */ - movl %eax, %dr7 + pop eax /* Dr0 */ + mov dr0, eax + pop eax /* Dr1 */ + mov dr1, eax + pop eax /* Dr2 */ + mov dr2, eax + pop eax /* Dr3 */ + mov dr3, eax + pop eax /* Dr6 */ + mov dr6, eax + pop eax /* Dr7 */ + mov dr7, eax /* * Restore registers including any that might have been changed * inside the debugger. */ - popl %gs /* Gs */ - popl %es /* Es */ - popl %ds /* Ds */ - popl %edx /* Edx */ - popl %ecx /* Ecx */ - popl %eax /* Eax */ - addl $8, %esp /* PreviousMode, ExceptionList */ - popl %fs /* Fs */ - popl %edi /* Edi */ - popl %esi /* Esi */ - popl %ebx /* Ebx */ - popl %ebp /* Ebp */ - addl $4, %esp /* ErrorCode */ + pop gs /* Gs */ + pop es /* Es */ + pop ds /* Ds */ + pop edx /* Edx */ + pop ecx /* Ecx */ + pop eax /* Eax */ + add esp, 8 /* PreviousMode, ExceptionList */ + pop fs /* Fs */ + pop edi /* Edi */ + pop esi /* Esi */ + pop ebx /* Ebx */ + pop ebp /* Ebp */ + add esp, 4 /* ErrorCode */ /* * Return to the caller. @@ -115,26 +119,27 @@ iret -.globl _KdbpStackSwitchAndCall@8 +PUBLIC _KdbpStackSwitchAndCall@8 _KdbpStackSwitchAndCall@8: - pushl %ebp - movl %esp, %ebp + push ebp + mov ebp, esp - movl 0x8(%esp), %eax /* New stack */ - movl 0xC(%esp), %ecx /* Function to call */ - movl %esp, %edx /* Old stack */ + mov eax, [esp + 8] /* New stack */ + mov ecx, [esp + 12] /* Function to call */ + mov edx, esp /* Old stack */ /* Switch stack */ - movl %eax, %esp - pushl %edx + mov esp, eax + push edx /* Call function */ - call *%ecx + call ecx /* Switch back to old stack */ - popl %esp + pop esp /* Return */ - popl %ebp - ret $8 + pop ebp + ret 8 +END Modified: branches/cmake-bringup/ntoskrnl/ke/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/amd64… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/amd64/boot.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/amd64/boot.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -2,14 +2,14 @@ * FILE: ntoskrnl/ke/i386/boot.S * COPYRIGHT: See COPYING in the top level directory * PURPOSE: FreeLDR Wrapper Bootstrap Code and Bootstrap Trampoline - * PROGRAMMERs: Alex Ionescu (alex(a)relsoft.net) - * Thomas Weidenmueller <w3seek(a)reactos.org> + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> + +#include <ksamd64.inc> EXTERN KiInitializeKernelAndGotoIdleLoop:PROC Modified: branches/cmake-bringup/ntoskrnl/ke/amd64/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/amd64… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/amd64/ctxswitch.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/amd64/ctxswitch.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -9,8 +9,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> + +#include <ksamd64.inc> /* FUNCTIONS ****************************************************************/ Modified: branches/cmake-bringup/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/amd64… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -7,8 +7,9 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/amd64/asm.h> +#include <asm.inc> + +#include <ksamd64.inc> EXTERN KiDispatchException:PROC EXTERN FrLdrDbgPrint:DWORD Modified: branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -109,7 +109,13 @@ #define CX86_CCR1 0xc1 /* NSC/Cyrix CPU indexed register access macros */ -#define getCx86(reg) ({ WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23); }) +static __inline +ULONG +getCx86(UCHAR reg) +{ + WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22, reg); + return READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23); +} #define setCx86(reg, data) do { \ WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); \ Modified: branches/cmake-bringup/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -10,22 +10,27 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> -.intel_syntax noprefix +#include <asm.inc> +#include <ks386.inc> + +EXTERN @KiSwapContextEntry@8:PROC +EXTERN @KiSwapContextExit@8:PROC +EXTERN @KiRetireDpcList@4:PROC +EXTERN @KiEnterV86Mode@4:PROC +EXTERN @KiExitV86Mode@4:PROC /* FUNCTIONS ****************************************************************/ +.code -.globl @KiSwapContextInternal@0 -.func @KiSwapContextInternal@0, @KiSwapContextInternal@0 +PUBLIC @KiSwapContextInternal@0 @KiSwapContextInternal@0: /* Build switch frame */ sub esp, 2 * 4 mov ecx, esp jmp @KiSwapContextEntry@8 -.endfunc -.globl @KiSwapContext@8 -.func @KiSwapContext@8, @KiSwapContext@8 + +PUBLIC @KiSwapContext@8 @KiSwapContext@8: /* Save 4 registers */ sub esp, 4 * 4 @@ -51,10 +56,9 @@ /* Clean stack */ add esp, 4 * 4 ret -.endfunc -.globl @KiSwitchThreads@8 -.func @KiSwitchThreads@8, @KiSwitchThreads@8 + +PUBLIC @KiSwitchThreads@8 @KiSwitchThreads@8: /* Load the new kernel stack and switch OS to new thread */ mov esp, edx @@ -63,10 +67,9 @@ /* Now we're on the new thread. Return to the caller to restore registers */ add esp, 2 * 4 ret -.endfunc -.globl @KiRetireDpcListInDpcStack@8 -.func @KiRetireDpcListInDpcStack@8, @KiRetireDpcListInDpcStack@8 + +PUBLIC @KiRetireDpcListInDpcStack@8 @KiRetireDpcListInDpcStack@8: /* Switch stacks and retire DPCs */ mov eax, esp @@ -77,11 +80,10 @@ /* Return on original stack */ pop esp ret -.endfunc + /* FIXFIX: Move to C code ****/ -.globl _Ki386SetupAndExitToV86Mode@4 -.func Ki386SetupAndExitToV86Mode@4 +PUBLIC _Ki386SetupAndExitToV86Mode@4 _Ki386SetupAndExitToV86Mode@4: /* Enter V8086 mode */ @@ -90,9 +92,9 @@ mov ecx, esp call @KiEnterV86Mode@4 jmp $ -.endfunc -.globl @Ki386BiosCallReturnAddress@4 + +PUBLIC @Ki386BiosCallReturnAddress@4 @Ki386BiosCallReturnAddress@4: /* Exit V8086 mode */ @@ -102,3 +104,4 @@ popad ret 4 +END Modified: branches/cmake-bringup/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -9,8 +9,8 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/i386/asm.h> +#include <asm.inc> +#include <ks386.inc> #include <internal/i386/asmmacro.S> MACRO(GENERATE_IDT_STUB, Number) @@ -18,16 +18,19 @@ ENDM MACRO(GENERATE_INT_HANDLER, Number) -.func KiUnexpectedInterrupt&Number +//.func KiUnexpectedInterrupt&Number _KiUnexpectedInterrupt&Number: push PRIMARY_VECTOR_BASE + Number jmp _KiEndUnexpectedRange@0 -.endfunc +//.endfunc ENDM + +EXTERN _KiTrap02:PROC /* GLOBALS *******************************************************************/ .data +ASSUME nothing PUBLIC _KiIdt _KiIdt: @@ -52,9 +55,9 @@ idt _KiTrap11, INT_32_DPL0 /* INT 11: Align Check Exception (#AC) */ idt _KiTrap0F, INT_32_DPL0 /* INT 12: Machine Check Exception (#MC)*/ idt _KiTrap0F, INT_32_DPL0 /* INT 13: SIMD FPU Exception (#XF) */ -.rept 22 +REPEAT 22 idt _KiTrap0F, INT_32_DPL0 /* INT 14-29: UNDEFINED INTERRUPTS */ -.endr +ENDR idt _KiGetTickCount, INT_32_DPL3 /* INT 2A: Get Tick Count Handler */ idt _KiCallbackReturn, INT_32_DPL3 /* INT 2B: User-Mode Callback Return */ idt _KiRaiseAssertion, INT_32_DPL3 /* INT 2C: Debug Assertion Handler */ @@ -62,15 +65,15 @@ idt _KiSystemService, INT_32_DPL3 /* INT 2E: System Call Service Handler */ idt _KiTrap0F, INT_32_DPL0 /* INT 2F: RESERVED */ i = 0 -.rept 208 +REPEAT 208 GENERATE_IDT_STUB %i i = i + 1 -.endr +ENDR PUBLIC _KiIdtDescriptor _KiIdtDescriptor: .short 0 - .short 0x7FF + .short HEX(7FF) .long _KiIdt PUBLIC _KiUnexpectedEntrySize @@ -78,8 +81,7 @@ .long _KiUnexpectedInterrupt1 - _KiUnexpectedInterrupt0 /******************************************************************************/ -.code32 -.text +.code TRAP_ENTRY KiTrap00, KI_PUSH_FAKE_ERROR_CODE TRAP_ENTRY KiTrap01, KI_PUSH_FAKE_ERROR_CODE @@ -106,7 +108,7 @@ TRAP_ENTRY KiUnexpectedInterruptTail, 0 ALIGN 4 -EXTERN @KiInterruptTemplateHandler@8 +EXTERN @KiInterruptTemplateHandler@8:PROC PUBLIC _KiInterruptTemplate _KiInterruptTemplate: KiEnterTrap KI_PUSH_FAKE_ERROR_CODE @@ -135,10 +137,10 @@ PUBLIC _KiStartUnexpectedRange@0 _KiStartUnexpectedRange@0: i = 0 -.rept 208 +REPEAT 208 GENERATE_INT_HANDLER %i i = i + 1 -.endr +ENDR PUBLIC _KiEndUnexpectedRange@0 _KiEndUnexpectedRange@0: jmp _KiUnexpectedInterruptTail Modified: branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -8,17 +8,18 @@ /* INCLUDES ******************************************************************/ -#include <reactos/asm.h> -#include <ndk/i386/asm.h> +#include <asm.inc> +#include <ks386.inc> #include <internal/i386/asmmacro.S> +EXTERN _MmGrowKernelStack@4:PROC +EXTERN _KeUserCallbackDispatcher:PROC +EXTERN @KiServiceExit@8:PROC + /* FUNCTIONS ****************************************************************/ - -.code32 -.text - -.globl _KiGetUserModeStackAddress@0 -.func KiGetUserModeStackAddress@0 +.code + +PUBLIC _KiGetUserModeStackAddress@0 _KiGetUserModeStackAddress@0: /* Get the current thread's trapframe and return the esp */ @@ -27,7 +28,6 @@ lea eax, [eax+KTRAP_FRAME_ESP] ret -.endfunc /*++ * @name KiCallUserMode @@ -53,8 +53,7 @@ * This call MUST be paired by interrupt 0x2B or NtCallbackReturn. * *--*/ -.globl _KiCallUserMode@8 -.func KiCallUserMode@8 +PUBLIC _KiCallUserMode@8 _KiCallUserMode@8: /* Save volatile registers */ @@ -102,7 +101,7 @@ #endif /* Get the lowest stack limit and check if we can handle it */ - lea eax, [esp-0x3000] + lea eax, [esp-HEX(3000)] cmp eax, [ebx+KTHREAD_STACK_LIMIT] jnb StackOk @@ -130,7 +129,7 @@ mov [ebx+KTHREAD_CALLBACK_STACK], esp /* Align stack on 16-byte boundary */ - and esp, ~15 + and esp, NOT 15 mov edi, esp /* Set destination and origin NPX Areas */ @@ -181,7 +180,7 @@ /* Copy DR7 */ mov edi, [edx+KTRAP_FRAME_DR7] - test edi, ~DR7_RESERVED_MASK + test edi, NOT DR7_RESERVED_MASK mov [esp+KTRAP_FRAME_DR7], edi /* Check if we need to save debug registers */ @@ -226,7 +225,6 @@ /* Return */ ret 8 -.endfunc /*++ * @name NtCallbackReturn @@ -251,8 +249,7 @@ * @remark This call MUST be paired with KeUserModeCallback. * *--*/ -.globl _NtCallbackReturn@12 -.func NtCallbackReturn@12 +PUBLIC _NtCallbackReturn@12 _NtCallbackReturn@12: /* Get the current thread and make sure we have a callback stack */ @@ -316,7 +313,7 @@ and dword ptr [edi+KTRAP_FRAME_DR7], 0 /* Check if debugging was active */ - test byte ptr [eax+KTHREAD_DEBUG_ACTIVE], 0xFF + test byte ptr [eax+KTHREAD_DEBUG_ACTIVE], HEX(0FF) jnz RestoreDebug RestoreStack: @@ -407,7 +404,6 @@ /* Return failure */ mov eax, STATUS_NO_CALLBACK_ACTIVE ret 12 -.endfunc /*++ * @name KeSwitchKernelStack @@ -429,8 +425,7 @@ * this routine. * *--*/ -.globl _KeSwitchKernelStack@8 -.func KeSwitchKernelStack@8 +PUBLIC _KeSwitchKernelStack@8 _KeSwitchKernelStack@8: /* Save volatiles */ @@ -515,4 +510,5 @@ pop edi pop esi ret 8 -.endfunc + +END Modified: branches/cmake-bringup/ntoskrnl/rtl/i386/stack.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/rtl/i386… ============================================================================== --- branches/cmake-bringup/ntoskrnl/rtl/i386/stack.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/rtl/i386/stack.S [iso-8859-1] Sat Nov 20 11:09:32 2010 @@ -8,13 +8,13 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> -.intel_syntax noprefix +#include <asm.inc> +#include <ks386.inc> /* FUNCTIONS *****************************************************************/ +.code -.func RtlpGetStackLimits@8 -.globl _RtlpGetStackLimits@8 +PUBLIC _RtlpGetStackLimits@8 _RtlpGetStackLimits@8: /* Get the current thread */ @@ -34,4 +34,5 @@ /* return */ ret 8 -.endfunc + +END

14 years, 1 month

[tkreuzer] 49656: [NTOSKRNL] Remove duplicated and incompatible implementations of setjmp / longjmp

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 20 10:57:26 2010 New Revision: 49656 URL: http://svn.reactos.org/svn/reactos?rev=49656&view=rev Log: [NTOSKRNL] Remove duplicated and incompatible implementations of setjmp / longjmp Removed: branches/cmake-bringup/ntoskrnl/kdbg/i386/longjmp.S branches/cmake-bringup/ntoskrnl/kdbg/i386/setjmp.S Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Nov 20 10:57:26 2010 @@ -342,9 +342,7 @@ if(KDBG) list(APPEND SOURCE kdbg/i386/i386-dis.c - kdbg/i386/kdb_help.S - kdbg/i386/longjmp.S - kdbg/i386/setjmp.S) + kdbg/i386/kdb_help.S) endif(KDBG) elseif(ARCH MATCHES amd64) @@ -430,4 +428,4 @@ add_minicd_target(ntoskrnl reactos ntoskrnl.exe) add_livecd_target(ntoskrnl reactos/system32) -add_importlib_target(ntoskrnl.spec) +add_importlib_target(ntoskrnl.spec) Removed: branches/cmake-bringup/ntoskrnl/kdbg/i386/longjmp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/i38… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/i386/longjmp.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/i386/longjmp.S (removed) @@ -1,70 +1,0 @@ - .file "longjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to longjmp looks like: - * - * value - * ptr to jmp_buf - * return PC - */ - -.globl _longjmp -_longjmp: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%ecx /* address of jmp_buf to ecx */ - movl 12(%ebp),%eax /* return value to %eax */ - testl %eax,%eax - jne 1f - incl %eax /* return 1 if handed 0 */ - -1: - movl (%ecx),%ebx /* restore %ebx */ - movl 4(%ecx),%esi /* restore %esi */ - movl 8(%ecx),%edi /* restore %edi */ - - /* - * From this instant on we are not running in a valid frame - */ - - movl 12(%ecx),%ebp /* restore %ebp */ - movl 16(%ecx),%esp /* restore %esp */ - /* movl 20(%ecx),%eax return PC */ - - /* - * Since we are abandoning the stack in any case, - * there isn't much point in doing the usual return - * discipline. - */ - - jmpl *20(%ecx) - Removed: branches/cmake-bringup/ntoskrnl/kdbg/i386/setjmp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/i38… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/i386/setjmp.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/i386/setjmp.S (removed) @@ -1,61 +1,0 @@ - .file "setjmp.S" -/* - * Copyright (C) 1998, 1999, Jonathan S. Shapiro. - * - * This file is part of the EROS Operating System. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* #include <eros/i486/asm.h> */ - - - /* - * typedef struct { - * unsigned long ebx, esi, edi; - * unsigned long ebp; - * unsigned long sp; - * unsigned long pc; - * } jmp_buf[1]; - */ - - /* - * On entry, the stack to setjmp looks like: - * - * ptr to jmp_buf - * return PC - */ -.globl _setjmp -.globl __setjmp -_setjmp: -__setjmp: - pushl %ebp - movl %esp,%ebp - - movl 0x8(%ebp),%eax /* address of jmp_buf to eax */ - movl %ebx,(%eax) /* save %ebx */ - movl %esi,4(%eax) /* save %esi */ - movl %edi,8(%eax) /* save %edi */ - leal 8(%ebp),%edx /* calling proc's esp, not ours! */ - movl %edx,16(%eax) - movl 4(%ebp), %edx /* save return PC */ - movl %edx,20(%eax) - movl 0(%ebp),%edx /* calling proc's ebp, not ours! */ - movl %edx,12(%eax) - - xorl %eax,%eax /* return 0 the first time */ - leave - ret -

14 years, 1 month

[tkreuzer] 49655: [NTOSKRNL] Use constants instead of a gcc extension

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 20 10:43:37 2010 New Revision: 49655 URL: http://svn.reactos.org/svn/reactos?rev=49655&view=rev Log: [NTOSKRNL] Use constants instead of a gcc extension Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/i386/init.c branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Nov 20 10:43:37 2010 @@ -19,16 +19,17 @@ /* GLOBALS ********************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; /* Template PDE for a demand-zero page */ -MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; -MMPTE DemandZeroPte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; +MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; /* Template PTE for prototype page */ -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; - +MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; + /* PRIVATE FUNCTIONS **********************************************************/ VOID Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Nov 20 10:43:37 2010 @@ -138,6 +138,14 @@ #define PTE_EXECUTE_READWRITE 0x0 #define PTE_EXECUTE_WRITECOPY 0x200 #define PTE_PROTOTYPE 0x400 + +// +// State Flags +// +#define PTE_VALID 0x1 +#define PTE_ACCESSED 0x20 +#define PTE_DIRTY 0x40 + // // Cache flags //

14 years, 1 month

[pschweitzer] 49654: [NTOSKRNL/PPC] Fix index out of bounds

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 20 10:22:36 2010 New Revision: 49654 URL: http://svn.reactos.org/svn/reactos?rev=49654&view=rev Log: [NTOSKRNL/PPC] Fix index out of bounds Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm… ============================================================================== --- trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Sat Nov 20 10:22:36 2010 @@ -446,7 +446,7 @@ } /* Null-terminate it */ - CpuString[48] = ANSI_NULL; + CpuString[47] = ANSI_NULL; } }

14 years, 1 month

[jimtabor] 49653: [Wine32k|User32] - Implement client thread information for the beginning of QS flag support and signaling synchronization of messages. - Set and clear idle event when setting clea...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Nov 20 04:24:44 2010 New Revision: 49653 URL: http://svn.reactos.org/svn/reactos?rev=49653&view=rev Log: [Wine32k|User32] - Implement client thread information for the beginning of QS flag support and signaling synchronization of messages. - Set and clear idle event when setting clearing masks. This fixed the idle foreground hook call from user mode. - Fixed wine ListBox and ReactOS ComboBox tests. Critical note: SendMessageA/W, when IsThreadHooked is used and any global hooks are affirmed, all messages are sent to Win32k and the result is, A to W and W to A mismatch via UMToKM. Fixing Global hook support exposed a critical bug in ReactOS message system. Enable the appropriate hooks will temporarily remedy this bug. - All patches are from a checked out revision from 49475. Upping ntuser.h, win32k and user32 to sync. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/misc.h trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -28,7 +28,7 @@ /* One/Two Param Functions */ #define NtUserMsqSetWakeMask(dwWaitMask) \ - (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_MSQSETWAKEMASK) + (HANDLE)NtUserCallOneParam(dwWaitMask, ONEPARAM_ROUTINE_GETINPUTEVENT) #define NtUserMsqClearWakeMask() \ NtUserCallNoParam(NOPARAM_ROUTINE_MSQCLEARWAKEMASK) Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -19,8 +19,8 @@ /* * * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/input.c - * PURPOSE: Input + * FILE: dll/win32/user32/windows/hook.c + * PURPOSE: Hooks * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * UPDATE HISTORY: * 09-05-2001 CSH Created @@ -155,7 +155,8 @@ int nCode) { MSG Msg; - if (NtCurrentTeb()->Win32ThreadInfo && IsThreadHooked(GetWin32ClientInfo())) + if ( NtCurrentTeb()->Win32ThreadInfo && + (ISITHOOKED(WH_MSGFILTER) || ISITHOOKED(WH_SYSMSGFILTER)) ) { if ( lpMsg->message & ~WM_MAXIMUM ) { @@ -179,7 +180,8 @@ int nCode) { MSG Msg; - if (NtCurrentTeb()->Win32ThreadInfo && IsThreadHooked(GetWin32ClientInfo())) + if ( NtCurrentTeb()->Win32ThreadInfo && + (ISITHOOKED(WH_MSGFILTER) || ISITHOOKED(WH_SYSMSGFILTER)) ) { if ( lpMsg->message & ~WM_MAXIMUM ) { Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -2066,14 +2066,16 @@ { if ( Window != NULL && Window->head.pti == ti && - !IsThreadHooked(GetWin32ClientInfo()) && +// !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: * Window belongs to calling thread - * The calling thread is not being hooked + * The calling thread is not being hooked for CallWndProc * Not calling a server side proc: Desktop, Switch, ScrollBar, Menu, IconTitle, or hWndMessage */ @@ -2137,14 +2139,16 @@ { if ( Window != NULL && Window->head.pti == ti && - !IsThreadHooked(GetWin32ClientInfo()) && +// !IsThreadHooked(GetWin32ClientInfo()) && // Enable to test message system bug. + !ISITHOOKED(WH_CALLWNDPROC) && + !ISITHOOKED(WH_CALLWNDPROCRET) && !(Window->state & WNDS_SERVERSIDEWINDOWPROC) ) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: * Window belongs to calling thread - * The calling thread is not being hooked + * The calling thread is not being hooked for CallWndProc * Not calling a server side proc: Desktop, Switch, ScrollBar, Menu, IconTitle, or hWndMessage */ @@ -2694,9 +2698,8 @@ DWORD gfMessagePumpHook = 0; BOOL WINAPI IsInsideMessagePumpHook() -{ // Fixme: Need to fully implement this! FF uses this and polls it when Min/Max +{ // FF uses this and polls it when Min/Max PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; -// FIXME("IIMPH %x\n",pcti); return (gfMessagePumpHook && pcti && (pcti->dwcPumpHook > 0)); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -3161,7 +3161,6 @@ #define ONEPARAM_ROUTINE_SWITCHCARETSHOWING 0xfffe0008 #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0xfffe000d #define ONEPARAM_ROUTINE_GETDESKTOPMAPPING 0xfffe000e -#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -24,7 +24,7 @@ extern SHORT gusLanguageID; SHORT FASTCALL IntGdiGetLanguageID(VOID); -DWORD APIENTRY IntGetQueueStatus(BOOL ClearChanges); +DWORD APIENTRY IntGetQueueStatus(DWORD); VOID FASTCALL IntUserManualGuiCheck(LONG Check); PVOID APIENTRY HackSecureVirtualMemory(IN PVOID,IN SIZE_T,IN ULONG,OUT PVOID *); VOID APIENTRY HackUnsecureVirtualMemory(IN PVOID); Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -275,4 +275,7 @@ return (LONG)(TickCount->QuadPart * (KeQueryTimeIncrement() / 10000)); } +VOID FASTCALL IdlePing(VOID); +VOID FASTCALL IdlePong(VOID); + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -279,7 +279,6 @@ { /* Attempt to startup client support which should have been initialized in IntSetThreadDesktop. */ PCLIENTINFO pci = (PCLIENTINFO)pTeb->Win32ClientInfo; Win32Thread->pClientInfo = pci; - pci->pClientThreadInfo = NULL; pci->ppi = Win32Thread->ppi; pci->fsHooks = Win32Thread->fsHooks; if (Win32Thread->KeyboardLayout) pci->hKL = Win32Thread->KeyboardLayout->hkl; @@ -291,6 +290,10 @@ pci->pDeskInfo = (PVOID)((ULONG_PTR)Win32Thread->pDeskInfo - pci->ulClientDelta); } + if (Win32Thread->pcti && pci->pDeskInfo) + pci->pClientThreadInfo = (PVOID)((ULONG_PTR)Win32Thread->pcti - pci->ulClientDelta); + else + pci->pClientThreadInfo = NULL; } else { @@ -331,6 +334,7 @@ IntSetThreadDesktop(NULL, TRUE); + PsSetThreadWin32Thread(Thread, NULL); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -1835,7 +1835,6 @@ static NTSTATUS IntMapDesktopView(IN PDESKTOP DesktopObject) { - PTHREADINFO ti; PPROCESSINFO CurrentWin32Process; PW32HEAP_USER_MAPPING HeapMapping, *PrevLink; PVOID UserBase = NULL; @@ -1898,19 +1897,6 @@ ObReferenceObject(DesktopObject); - /* create a W32THREADINFO structure if not already done, or update it */ - ti = GetW32ThreadInfo(); - GetWin32ClientInfo()->ulClientDelta = DesktopHeapGetUserDelta(); - if (ti != NULL) - { - if (GetWin32ClientInfo()->pDeskInfo == NULL) - { - GetWin32ClientInfo()->pDeskInfo = - (PVOID)((ULONG_PTR)DesktopObject->pDeskInfo - - GetWin32ClientInfo()->ulClientDelta); - } - } - return STATUS_SUCCESS; } @@ -1922,6 +1908,7 @@ PTHREADINFO W32Thread; NTSTATUS Status; BOOL MapHeap; + CLIENTTHREADINFO ctiSave; DPRINT("IntSetThreadDesktop() DO=%p, FOF=%d\n", DesktopObject, FreeOnFailure); MapHeap = (PsGetCurrentProcess() != PsInitialSystemProcess); @@ -1948,9 +1935,27 @@ SetLastNtError(Status); return FALSE; } + W32Thread->pDeskInfo = DesktopObject->pDeskInfo; } - /* Hack for system threads */ + RtlZeroMemory(&ctiSave, sizeof(CLIENTTHREADINFO)); + + if (W32Thread->pcti && OldDesktop) + { + RtlCopyMemory(&ctiSave, W32Thread->pcti, sizeof(CLIENTTHREADINFO)); + DPRINT("Free ClientThreadInfo\n"); + DesktopHeapFree(OldDesktop, W32Thread->pcti); + W32Thread->pcti = NULL; + } + + if (!W32Thread->pcti && DesktopObject) + { + DPRINT("Allocate ClientThreadInfo\n"); + W32Thread->pcti = DesktopHeapAlloc( DesktopObject, + sizeof(CLIENTTHREADINFO)); + RtlCopyMemory(W32Thread->pcti, &ctiSave, sizeof(CLIENTTHREADINFO)); + } + if (NtCurrentTeb()) { PCLIENTINFO pci = GetWin32ClientInfo(); @@ -1958,6 +1963,7 @@ if (DesktopObject) { pci->pDeskInfo = (PVOID)((ULONG_PTR)DesktopObject->pDeskInfo - pci->ulClientDelta); + if (W32Thread->pcti) pci->pClientThreadInfo = (PVOID)((ULONG_PTR)W32Thread->pcti - pci->ulClientDelta); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -1901,7 +1901,7 @@ DWORD APIENTRY -IntGetQueueStatus(BOOL ClearChanges) +IntGetQueueStatus(DWORD Changes) { PTHREADINFO pti; PUSER_MESSAGE_QUEUE Queue; @@ -1909,12 +1909,18 @@ pti = PsGetCurrentThreadWin32Thread(); Queue = pti->MessageQueue; - - Result = MAKELONG(Queue->QueueBits, Queue->ChangedBits); - if (ClearChanges) - { - Queue->ChangedBits = 0; - } +// wine: + Changes &= (QS_ALLINPUT|QS_ALLPOSTMESSAGE|QS_SMRESULT); + + Result = MAKELONG(Queue->ChangedBits & Changes, Queue->QueueBits & Changes); + + if (pti->pcti) + { + pti->pcti->fsChangeBits = Queue->ChangedBits; + pti->pcti->fsChangeBits &= ~Changes; + } + + Queue->ChangedBits &= ~Changes; return Result; } @@ -2089,7 +2095,6 @@ { NTUSERGETMESSAGEINFO Info; NTSTATUS Status; - /* FIXME: if initialization is removed, gcc complains that this may be used before initialization. Please review */ PMSGMEMORY MsgMemoryEntry; PVOID UserMem; ULONG Size; @@ -2110,7 +2115,7 @@ UserLeave(); - Info.Msg = Msg; //.Msg; + Info.Msg = Msg; /* See if this message type is present in the table */ MsgMemoryEntry = FindMsgMemory(Info.Msg.message); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -125,7 +125,7 @@ break; case THREADSTATE_GETINPUTSTATE: - ret = HIWORD(IntGetQueueStatus(FALSE)) & (QS_KEY | QS_MOUSEBUTTON); + ret = LOWORD(IntGetQueueStatus(QS_POSTMESSAGE|QS_TIMER|QS_PAINT|QS_SENDMESSAGE|QS_INPUT)) & (QS_KEY | QS_MOUSEBUTTON); break; } @@ -471,8 +471,6 @@ } /* initialize it */ pti->ppi = ppi = GetW32ProcessInfo(); - - pti->pcti = &pti->cti; // FIXME Need to set it in desktop.c! if (pti->rpdesk != NULL) { @@ -494,7 +492,6 @@ Teb->Win32ThreadInfo = (PW32THREAD) pti; - pci->pClientThreadInfo = NULL; // FIXME Need to set it in desktop.c! pci->ppi = ppi; pci->fsHooks = pti->fsHooks; if (pti->KeyboardLayout) pci->hKL = pti->KeyboardLayout->hkl; @@ -506,6 +503,11 @@ pci->pDeskInfo = (PVOID)((ULONG_PTR)pti->pDeskInfo - pci->ulClientDelta); } + if (pti->pcti && pci->pDeskInfo) + pci->pClientThreadInfo = (PVOID)((ULONG_PTR)pti->pcti - pci->ulClientDelta); + else + pci->pClientThreadInfo = NULL; + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -77,6 +77,11 @@ MessageQueue->WakeMask = WakeMask; MessageEventHandle = MessageQueue->NewMessagesHandle; + if (Win32Thread->pcti) + Win32Thread->pcti->fsWakeMask = WakeMask; + + IdlePing(); + return MessageEventHandle; } @@ -93,6 +98,11 @@ MessageQueue = Win32Thread->MessageQueue; // HACK!!!!!!! Newbies that wrote this should hold your head down in shame! (jt) MessageQueue->WakeMask = ~0; + + if (Win32Thread->pcti) + Win32Thread->pcti->fsWakeMask = 0; + + IdlePong(); return TRUE; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Nov 20 04:24:44 2010 @@ -252,7 +252,7 @@ RETURN( FALSE); } - case ONEPARAM_ROUTINE_MSQSETWAKEMASK: + case ONEPARAM_ROUTINE_GETINPUTEVENT: RETURN( (DWORD_PTR)IntMsqSetWakeMask(Param)); case ONEPARAM_ROUTINE_GETKEYBOARDTYPE: @@ -269,12 +269,7 @@ case ONEPARAM_ROUTINE_GETQUEUESTATUS: { - DWORD Ret; - WORD changed_bits, wake_bits; - Ret = IntGetQueueStatus(FALSE); - changed_bits = LOWORD(Ret); - wake_bits = HIWORD(Ret); - RETURN( MAKELONG(changed_bits & Param, wake_bits & Param)); + RETURN (IntGetQueueStatus((DWORD)Param)); } case ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS: /* FIXME: Should use UserEnterShared */

14 years, 1 month

[tkreuzer] 49652: [KERNEL32] Get rid of stub entries in spec file, either replacing them with a real export or commenting them out in case of win2k only exports and 1 Win7 export

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 20 00:50:08 2010 New Revision: 49652 URL: http://svn.reactos.org/svn/reactos?rev=49652&view=rev Log: [KERNEL32] Get rid of stub entries in spec file, either replacing them with a real export or commenting them out in case of win2k only exports and 1 Win7 export Modified: branches/cmake-bringup/dll/win32/kernel32/kernel32.spec Modified: branches/cmake-bringup/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/kernel32.spec [iso-8859-1] Sat Nov 20 00:50:08 2010 @@ -15,7 +15,7 @@ @ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler ;@ stdcall AdjustCalendarDate ; Win 7 @ stdcall AllocConsole() -@ stub AllocLSCallback ; missing in XP SP3 and 2003 R2 and Win 7 +;@ stub AllocLSCallback ; missing in XP SP3 and 2003 R2 and Win 7 @ stdcall AllocateUserPhysicalPages(long ptr ptr) ;@ stdcall AllocateUserPhysicalPagesNuma ; Win 7 ;@ stdcall ApplicationRecoveryFinished ; Win 7 @@ -28,7 +28,7 @@ @ stdcall BackupWrite(ptr ptr long ptr long long ptr) @ stdcall BaseCheckAppcompatCache(long long long ptr) ;check ;@ stdcall BaseCheckAppcompatCacheEx ; Win7 -@ stub BaseCheckRunApp +;@ stub BaseCheckRunApp ; Win7 @ stdcall BaseCleanupAppcompatCache() ; missing in Win 7 @ stdcall BaseCleanupAppcompatCacheSupport(ptr) ;@ stdcall BaseDllReadWriteIniFile ; Win 7 @@ -52,8 +52,8 @@ ;@ stdcall BasepAnsiStringToDynamicUnicodeString ; Win 7 ;@ stdcall BasepCheckAppCompat ; Win 7 ;@ stdcall BasepCheckBadapp ; Win 7 -@ stub BasepCheckWinSaferRestrictions -@ stub BasepDebugDump ; missing in XP SP3 and Win 7 +@ stdcall BasepCheckWinSaferRestrictions(long long long long long long) +;@ stub BasepDebugDump ; missing in XP SP3 and Win 7 ;@ stdcall BasepFreeActivationContextActivationBlock ; Win 7 ;@ stdcall BasepFreeAppCompatData ; Win 7 ;@ stdcall BasepMapModuleHandle ; Win 7 @@ -88,7 +88,7 @@ @ stdcall CloseHandle(long) ;@ stdcall ClosePrivateNamespace ; Win 7 @ stdcall CloseProfileUserMapping() -@ stub CloseSystemHandle ; missing in XP SP3 and Win 7 +; @ stub CloseSystemHandle ; missing in XP SP3 and Win 7 ;@ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool ; Win 7 ;@ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup ; Win 7 ;@ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers ; Win 7 @@ -107,7 +107,7 @@ @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall ConnectNamedPipe(long ptr) @ stdcall ConsoleMenuControl(long long long) -@ stub ConsoleSubst ; missing in XP SP3 and Win 7 +; @ stub ConsoleSubst ; missing in XP SP3 and Win 7 @ stdcall ContinueDebugEvent(long long long) ;@ stdcall ConvertCalDateTimeToSystemTime ; Win 7 @ stdcall ConvertDefaultLocale (long) @@ -157,7 +157,7 @@ @ stdcall CreateJobObjectA(ptr str) @ stdcall CreateJobObjectW(ptr wstr) @ stdcall CreateJobSet(long ptr long) -@ stub CreateKernelThread ; missing in XP SP3 and Win 7 +;@ stub CreateKernelThread ; missing in XP SP3 and Win 7 @ stdcall CreateMailslotA(ptr long long ptr) @ stdcall CreateMailslotW(ptr long long ptr) @ stdcall CreateMemoryResourceNotification(long) @@ -475,7 +475,7 @@ @ stdcall GetDateFormatA(long long ptr str ptr long) ;@ stdcall GetDateFormatEx ; Win 7 @ stdcall GetDateFormatW(long long ptr wstr ptr long) -@ stub GetDaylightFlag ; missing in XP SP3 and Win 7 +;@ stub GetDaylightFlag ; missing in XP SP3 and Win 7 @ stdcall GetDefaultCommConfigA(str ptr long) @ stdcall GetDefaultCommConfigW(wstr ptr long) @ stdcall GetDefaultSortkeySize(ptr) ; missing in Win 7 @@ -533,8 +533,8 @@ @ stdcall GetGeoInfoW(long long ptr long long) @ stdcall GetHandleContext(long) ; missing on x64 @ stdcall GetHandleInformation(long ptr) -@ stub GetSCallbackTarget ; missing in XP SP3 and Win 7 -@ stub GetSCallbackTemplate ; missing in XP SP3 and Win 7 +;@ stub GetSCallbackTarget ; missing in XP SP3 and Win 7 +;@ stub GetSCallbackTemplate ; missing in XP SP3 and Win 7 @ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() ntdll.RtlGetLastWin32Error @@ -629,7 +629,7 @@ ;@ stdcall GetProcessWorkingSetSizeEx ; Win 7 ;@ stdcall GetProcessorSystemCycleTime ; Win 7 ;@ stdcall GetProductInfo(long long long long ptr) ; Win 7 -@ stub GetProductName +;@ stub GetProductName @ stdcall GetProfileIntA(str str long) @ stdcall GetProfileIntW(wstr wstr long) @ stdcall GetProfileSectionA(str ptr long) @@ -638,8 +638,8 @@ @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) ;@ stdcall GetQueuedCompletionStatusEx ; Win 7 -@ stub GetLSCallbackTarget ; missing in XP SP3 and Win 7 -@ stub GetLSCallbackTemplate ; missing in XP SP3 and Win 7 +;@ stub GetLSCallbackTarget ; missing in XP SP3 and Win 7 +;@ stub GetLSCallbackTemplate ; missing in XP SP3 and Win 7 @ stdcall GetShortPathNameA(str ptr long) @ stdcall GetShortPathNameW(wstr ptr long) @ stdcall GetStartupInfoA(ptr) @@ -759,7 +759,7 @@ @ stdcall HeapQueryInformation(long long ptr long ptr) @ stdcall HeapQueryTagW(long long long long ptr) ; missing in Win 7 @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap -@ stub HeapSetFlags ; missing in XP SP3 and Win 7 +;@ stub HeapSetFlags ; missing in XP SP3 and Win 7 @ stdcall HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap @ stdcall HeapSummary(long long ptr) @@ -784,7 +784,7 @@ @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall -arch=i386 InterlockedCompareExchange (ptr long long) -@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 +;@ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedDecrement(ptr) @ stdcall -arch=i386 InterlockedExchange(ptr long) @ stdcall -arch=i386 InterlockedExchangeAdd (ptr long ) @@ -794,7 +794,7 @@ @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList ;@ stdcall InterlockedPushListSList ntdll.RtlInterlockedPushListSList ; Win 7 @ stdcall InvalidateConsoleDIBits(long long) -@ stub InvalidateNSCache ; missing in XP SP3 and Win 7 +;@ stub InvalidateNSCache ; missing in XP SP3 and Win 7 @ stdcall IsBadCodePtr(ptr) @ stdcall IsBadHugeReadPtr(ptr long) @ stdcall IsBadHugeWritePtr(ptr long) @@ -920,13 +920,13 @@ @ stdcall NlsConvertIntegerToString(long long long wstr long) ; missing in Win 7 ;@ stdcall NlsEventDataDescCreate ; Win 7 @ stdcall NlsGetCacheUpdateCount() -@ stub NlsResetProcessLocale ; missing in XP SP3 and Win 7 +;@ stub NlsResetProcessLocale ; missing in XP SP3 and Win 7 ;@ stdcall NlsUpdateLocale ; Win 7 ;@ stdcall NlsUpdateSystemLocale ; Win 7 ;@ stdcall NlsWriteEtwEvent ; Win 7 ;@ stdcall NormalizeString ; Win 7 ;@ stdcall NotifyMountMgr ; Win 7 -@ stub NotifyNLSUserCache ; missing in XP SP3 and win 7 +;@ stub NotifyNLSUserCache ; missing in XP SP3 and win 7 ;@ stdcall NotifyUILanguageChange ; Win 7 @ stdcall NumaVirtualQueryNode(long long long long) ; missing in win 7 @ stdcall OpenConsoleW(wstr long long long) @@ -983,8 +983,8 @@ ;@ stdcall QueryIdleProcessorCycleTimeEx ; Win 7 @ stdcall QueryInformationJobObject(long long ptr long ptr) @ stdcall QueryMemoryResourceNotification(ptr ptr) -@ stub QueryNumberOfEventLogRecords ; missing in XP SP3 and Win 7 -@ stub QueryOldestEventLogRecord ; missing in XP SP3 and Win 7 +;@ stub QueryNumberOfEventLogRecords ; missing in XP SP3 and Win 7 +;@ stub QueryOldestEventLogRecord ; missing in XP SP3 and Win 7 @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) ;@ stdcall QueryProcessAffinityUpdateMode ; Win 7 @@ -999,7 +999,7 @@ @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) ;@ stdcall RaiseFailFastException ; Win 7 -@ stub ReOpenFile ;@ stdcall ReOpenFile(ptr long long long) +@ stdcall ReOpenFile(ptr long long long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) @ stdcall ReadConsoleInputExA(long ptr long ptr long) @@ -1065,7 +1065,7 @@ @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) ;@ stub RegisterServiceProcess ; missing in XP SP3 and Win 7 -@ stub RegisterSysMsgHandler ; missing in XP SP3 and win 7 +;@ stub RegisterSysMsgHandler ; missing in XP SP3 and win 7 @ stdcall RegisterWaitForInputIdle(ptr) @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) @ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) @@ -1170,7 +1170,7 @@ ;@ stdcall SetCurrentConsoleFontEx ; Win 7 @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) -@ stub SetDaylightFlag ; missing in XP SP3 and Win 7 +;@ stub SetDaylightFlag ; missing in XP SP3 and Win 7 @ stdcall SetDefaultCommConfigA(str ptr long) @ stdcall SetDefaultCommConfigW(wstr ptr long) @ stdcall SetDllDirectoryA(str) @@ -1207,10 +1207,10 @@ @ stdcall SetHandleCount(long) @ stdcall SetHandleInformation(long long long) @ stdcall SetInformationJobObject(long long ptr long) -@ stub SetLastConsoleEventActive ; missing in XP SP3 +@ stdcall SetLastConsoleEventActive() ; missing in XP SP3 @ stdcall SetLastError(long) ntdll.RtlSetLastWin32Error -@ stub SetLocalPrimaryComputerNameA ; missing in XP SP3 -@ stub SetLocalPrimaryComputerNameW ; missing in XP SP3 +@ stdcall SetLocalPrimaryComputerNameA(long long) ; missing in XP SP3 +@ stdcall SetLocalPrimaryComputerNameW(long long) ; missing in XP SP3 @ stdcall SetLocalTime(ptr) @ stdcall SetLocaleInfoA(long long str) @ stdcall SetLocaleInfoW(long long wstr) @@ -1292,9 +1292,9 @@ @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) @ stdcall TlsAlloc() -@ stub TlsAllocInternal ; missing in XP SP3 and Win 7 +;@ stub TlsAllocInternal ; missing in XP SP3 and Win 7 @ stdcall TlsFree(long) -@ stub TlsFreeInternal ; missing in XP SP3 and Win 7 +;@ stub TlsFreeInternal ; missing in XP SP3 and Win 7 @ stdcall TlsGetValue(long) @ stdcall TlsSetValue(long ptr) @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr) @@ -1325,8 +1325,8 @@ @ stdcall UpdateResourceW(long wstr wstr long ptr long) @ stdcall VDMConsoleOperation(long long) @ stdcall VDMOperationStarted(long) -@ stub ValidateCType ; missing in XP SP3 and Win 7 -@ stub ValidateLocale ; missing in XP SP3 and Win 7 +;@ stub ValidateCType ; missing in XP SP3 and Win 7 +;@ stub ValidateLocale ; missing in XP SP3 and Win 7 @ stdcall VerLanguageNameA(long str long) @ stdcall VerLanguageNameW(long wstr long) @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @@ -1415,8 +1415,8 @@ ;@ stdcall -arch=x86_64 __C_specific_handler ntdll.__C_specific_handler ;@ stdcall -arch=x86_64 __chkstk ntdll.__chkstk ;@ stdcall -arch=x86_64 __misaligned_access ntdll.__misaligned_access -@ stub _DebugOut ; missing in XP SP3 and Win 7 -@ stub _DebugPrintf ; missing in XP SP3 and Win 7 +;@ stub _DebugOut ; missing in XP SP3 and Win 7 +;@ stub _DebugPrintf ; missing in XP SP3 and Win 7 @ stdcall _hread(long ptr long) @ stdcall _hwrite(long ptr long) @ stdcall _lclose(long) @@ -1426,7 +1426,7 @@ @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) _hread @ stdcall _lwrite(long ptr long) _hwrite -@ stub dprintf ; missing in XP SP3 and Win 7 +;@ stub dprintf ; missing in XP SP3 and Win 7 @ stdcall lstrcat(str str) lstrcatA @ stdcall lstrcatA(str str) @ stdcall lstrcatW(wstr wstr)

14 years, 1 month

[tkreuzer] 49651: [NTDLL] - Convert dispatch.S to new asm syntax - Add exports for RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 20 00:46:31 2010 New Revision: 49651 URL: http://svn.reactos.org/svn/reactos?rev=49651&view=rev Log: [NTDLL] - Convert dispatch.S to new asm syntax - Add exports for RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler Modified: branches/cmake-bringup/dll/ntdll/def/ntdll.spec branches/cmake-bringup/dll/ntdll/dispatch/i386/dispatch.S Modified: branches/cmake-bringup/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/def/ntd… ============================================================================== --- branches/cmake-bringup/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Nov 20 00:46:31 2010 @@ -437,7 +437,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) @ stdcall RtlAddRefActivationContext(ptr) ;@ stdcall RtlAddRefMemoryStream -;@ stdcall RtlAddVectoredContinueHandler +@ stdcall RtlAddVectoredContinueHandler(long ptr) @ stdcall RtlAddVectoredExceptionHandler(long ptr) ;@ stdcall RtlAddressInSectionTable @ stdcall RtlAdjustPrivilege(long long long ptr) @@ -723,6 +723,7 @@ @ stdcall RtlInt64ToUnicodeString(double long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) +;@ stdcall RtlInterlockedCompareExchange64 @ stdcall -arch=i386,x86_64 RtlInterlockedFlushSList(ptr) @ stdcall -arch=i386,x86_64 RtlInterlockedPopEntrySList(ptr) @ stdcall -arch=i386,x86_64 RtlInterlockedPushEntrySList(ptr ptr) @@ -849,7 +850,7 @@ @ stdcall RtlReleaseSRWLockExclusive(ptr) @ stdcall RtlReleaseSRWLockShared(ptr) @ stdcall RtlRemoteCall(ptr ptr ptr long ptr long long) -;@ stdcall RtlRemoveVectoredContinueHandler +@ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) @ stdcall RtlResetRtlTranslations(ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error Modified: branches/cmake-bringup/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/dispatc… ============================================================================== --- branches/cmake-bringup/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sat Nov 20 00:46:31 2010 @@ -8,13 +8,22 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> -.intel_syntax noprefix +#include <asm.inc> +#include <ks386.inc> + +EXTERN _LdrpInit@12:PROC +EXTERN _NtTestAlert@0:PROC +EXTERN _RtlDispatchException@8:PROC +EXTERN _RtlRaiseException@4:PROC +EXTERN _RtlRaiseStatus@4:PROC +EXTERN _ZwCallbackReturn@12:PROC +EXTERN _ZwContinue@8:PROC +EXTERN _ZwRaiseException@12:PROC /* FUNCTIONS ****************************************************************/ - -.func LdrInitializeThunk@16 -.globl _LdrInitializeThunk@16 +.code + +PUBLIC _LdrInitializeThunk@16 _LdrInitializeThunk@16: /* Get the APC Context */ @@ -28,9 +37,8 @@ /* Jump into the C initialization routine */ jmp _LdrpInit@12 -.endfunc - -.func KiUserApcExceptionHandler + + _KiUserApcExceptionHandler: /* Put the exception record in ECX and check the Flags */ @@ -45,10 +53,9 @@ /* We'll execute handler */ mov eax, EXCEPTION_EXECUTE_HANDLER ret 16 -.endfunc - -.func KiUserApcDispatcher@16 -.globl _KiUserApcDispatcher@16 + + +PUBLIC _KiUserApcDispatcher@16 _KiUserApcDispatcher@16: /* Setup SEH stack */ @@ -86,9 +93,8 @@ call _RtlRaiseStatus@4 jmp StatusRaiseApc ret 16 -.endfunc - -.func KiUserCallbackExceptionHandler + + _KiUserCallbackExceptionHandler: /* Put the exception record in ECX and check the Flags */ @@ -106,10 +112,9 @@ /* We'll execute the handler */ mov eax, EXCEPTION_EXECUTE_HANDLER ret 16 -.endfunc - -.func KiUserCallbackDispatcher@12 -.globl _KiUserCallbackDispatcher@12 + + +PUBLIC _KiUserCallbackDispatcher@12 _KiUserCallbackDispatcher@12: /* Setup SEH stack */ @@ -131,7 +136,7 @@ mov eax, [eax+PEB_KERNEL_CALLBACK_TABLE] /* Call the routine */ - call [eax+edx*4] + call dword ptr [eax+edx*4] /* Return from callback */ push eax @@ -148,10 +153,9 @@ call _RtlRaiseStatus@4 jmp StatusRaise ret 12 -.endfunc - -.func KiRaiseUserExceptionDispatcher@0 -.globl _KiRaiseUserExceptionDispatcher@0 + + +PUBLIC _KiRaiseUserExceptionDispatcher@0 _KiRaiseUserExceptionDispatcher@0: /* Setup stack for EXCEPTION_RECORD */ @@ -177,10 +181,9 @@ mov esp, ebp pop ebp ret -.endfunc - -.func KiUserExceptionDispatcher@8 -.globl _KiUserExceptionDispatcher@8 + + +PUBLIC _KiUserExceptionDispatcher@8 _KiUserExceptionDispatcher@8: /* Clear direction flag */ @@ -236,39 +239,35 @@ push esp call _RtlRaiseException@4 ret 8 -.endfunc - -.func KiIntSystemCall@0 -.globl _KiIntSystemCall@0 + + +PUBLIC _KiIntSystemCall@0 _KiIntSystemCall@0: /* Set stack in EDX and do the interrupt */ lea edx, [esp+8] - int 0x2E + int HEX(2E) /* Return to caller */ ret -.endfunc - -.func KiFastSystemCall@0 -.globl _KiFastSystemCall@0 + + +PUBLIC _KiFastSystemCall@0 _KiFastSystemCall@0: /* Put ESP in EDX and do the SYSENTER */ mov edx, esp sysenter -.endfunc - -.func KiFastSystemCallRet@0 -.globl _KiFastSystemCallRet@0 + + +PUBLIC _KiFastSystemCallRet@0 _KiFastSystemCallRet@0: /* Just return to caller */ ret -.endfunc - -.func RtlpGetStackLimits@8 -.globl _RtlpGetStackLimits@8 + + +PUBLIC _RtlpGetStackLimits@8 _RtlpGetStackLimits@8: /* Get the stack limits */ @@ -283,4 +282,5 @@ /* return */ ret 8 -.endfunc + +END

14 years, 1 month

[tkreuzer] 49650: [SPEC2DEF] - Fix handling of multiple arches - Remove unused code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 20 00:36:00 2010 New Revision: 49650 URL: http://svn.reactos.org/svn/reactos?rev=49650&view=rev Log: [SPEC2DEF] - Fix handling of multiple arches - Remove unused code Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sat Nov 20 00:36:00 2010 @@ -40,7 +40,7 @@ int IsSeparator(char chr) { - return ((chr <= '*' && chr != '$') || + return ((chr <= ',' && chr != '$') || (chr >= ':' && chr < '?') ); } @@ -174,59 +174,6 @@ { fprintf(fileDest, "@%d", exp->nStackBytes); } - } - - if (exp->nOrdinal != -1) - { - fprintf(fileDest, " @%d", exp->nOrdinal); - } - - if (exp->nCallingConvention == CC_EXTERN) - { - fprintf(fileDest, " DATA"); - } - - fprintf(fileDest, "\n"); - - return 1; -} - -void -OutputHeader_pdef(FILE *file, char *libname) -{ - fprintf(file, - "; File generated automatically, do not edit!\n\n" - "LIBRARY %s\n\n" - "EXPORTS\n" - "#define FOOL(x) x\n" - "#if defined(__GNUC__) && defined(_X86_)\n" - "#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes\n" - "#define _NAME_FASTCALL(name, stackbytes) FOOL(@)FOOL(name)@stackbytes\n" - "#define _NAME_CDECL(name, stackbytes) FOOL(name)\n" - "#else\n" - "#define _NAME_STDCALL(name, stackbytes) name\n" - "#define _NAME_FASTCALL(name, stackbytes) name\n" - "#define _NAME_CDECL(name, stackbytes) name\n" - "#endif\n" - "#define _NAME_EXTERN(name, stackbytes) name\n" - "#define _NAME(name, cc, stackbytes) _NAME_##cc(name, stackbytes)\n", - libname); -} - -int -OutputLine_pdef(FILE *fileDest, EXPORT *exp) -{ - fprintf(fileDest, "_NAME(%.*s,%s,%d)", - exp->nNameLength, exp->pcName, - astrCallingConventions[exp->nCallingConvention], - exp->nStackBytes); - - if (exp->pcRedirection) - { - fprintf(fileDest, "= _NAME(%.*s,%s,%d)", - exp->nRedirectionLength, exp->pcRedirection, - astrCallingConventions[exp->nCallingConvention], - exp->nStackBytes); } if (exp->nOrdinal != -1) @@ -339,7 +286,6 @@ if (CompareToken(pc, pszArchString)) { included = 1; - break; } /* Skip to next arch or end */

14 years, 1 month

[tkreuzer] 49649: [RTL] Add stubs for RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 19 23:51:02 2010 New Revision: 49649 URL: http://svn.reactos.org/svn/reactos?rev=49649&view=rev Log: [RTL] Add stubs for RtlAddVectoredContinueHandler and RtlRemoveVectoredContinueHandler Modified: branches/cmake-bringup/lib/rtl/vectoreh.c Modified: branches/cmake-bringup/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/vectoreh.… ============================================================================== --- branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] Fri Nov 19 23:51:02 2010 @@ -190,4 +190,23 @@ return Ret; } +PVOID +NTAPI +RtlAddVectoredContinueHandler( + IN ULONG FirstHandler, + IN PVECTORED_EXCEPTION_HANDLER VectoredHandler) +{ + UNIMPLEMENTED; + return NULL; +} + +ULONG +NTAPI +RtlRemoveVectoredContinueHandler( + IN PVOID VectoredHandlerHandle) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */

14 years, 1 month

[tkreuzer] 49648: [KERNEL32] Switch to new asm syntax Add dependency to asm

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Nov 19 23:40:01 2010 New Revision: 49648 URL: http://svn.reactos.org/svn/reactos?rev=49648&view=rev Log: [KERNEL32] Switch to new asm syntax Add dependency to asm Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -119,6 +119,6 @@ add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) -add_dependencies(kernel32 errcodes) +add_dependencies(kernel32 errcodes asm) add_cab_target(kernel32 1) add_importlib_target(kernel32.spec) Modified: branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -7,11 +7,13 @@ * KJK::Hyperion <noog(a)libero.it> */ -#include <ndk/asm.h> +#include <asm.inc> -.globl SwitchToFiber -.intel_syntax noprefix + +PUBLIC SwitchToFiber SwitchToFiber: /* FIXME: TODO */ ret 4 + +END Modified: branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -6,9 +6,11 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -.globl BaseThreadStartupThunk -.globl BaseProcessStartThunk -.intel_syntax noprefix +#include <asm.inc> + + +PUBLIC BaseThreadStartupThunk +PUBLIC BaseProcessStartThunk BaseThreadStartupThunk: @@ -29,4 +31,5 @@ push 0 /* Return RIP */ jmp BaseProcessStartup +END /* EOF */ Modified: branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -7,11 +7,12 @@ * KJK::Hyperion <noog(a)libero.it> */ -#include <ndk/asm.h> +#include <asm.inc> +#include <ks386.inc> -.globl _SwitchToFiber@4 -.intel_syntax noprefix +.code +PUBLIC _SwitchToFiber@4 _SwitchToFiber@4: /* Get the TEB */ mov edx, fs:[TEB_SELF] @@ -30,7 +31,7 @@ mov [eax+FIBER_CONTEXT_EIP], ebx /* Check if we're to save FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT + cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL OR CONTEXT_FLOATING_POINT jnz NoFpuStateSave /* Save the FPU State (Status and Control)*/ @@ -80,7 +81,7 @@ mov [edx+TEB_ACTIVATION_CONTEXT_STACK_POINTER], esi /* Restore FPU State */ - cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL | CONTEXT_FLOATING_POINT + cmp dword ptr [eax+FIBER_CONTEXT_FLAGS], CONTEXT_FULL OR CONTEXT_FLOATING_POINT jnz NoFpuStateRestore /* Check if the Status Word Changed */ @@ -96,7 +97,7 @@ StatusWordChanged: /* Load the new one */ - mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], 0xFFFF + mov word ptr [ecx+FIBER_CONTEXT_FLOAT_SAVE_TAG_WORD], HEX(0FFFF) fldenv [ecx+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD] ControlWordEqual: @@ -120,6 +121,7 @@ mov [edx+TEB_FLS_DATA], eax /* Jump to new fiber */ - jmp [ecx+FIBER_CONTEXT_EIP] + jmp dword ptr [ecx+FIBER_CONTEXT_EIP] +END /* EOF */ Modified: branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/thread/i386/thread.S [iso-8859-1] Fri Nov 19 23:40:01 2010 @@ -6,9 +6,15 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -.globl _BaseThreadStartupThunk@0 -.globl _BaseProcessStartThunk@0 -.intel_syntax noprefix +#include <asm.inc> + +.code + +EXTERN _BaseThreadStartup@8:PROC +EXTERN _BaseProcessStartup@4:PROC + +PUBLIC _BaseThreadStartupThunk@0 +PUBLIC _BaseProcessStartThunk@0 _BaseThreadStartupThunk@0: @@ -29,4 +35,5 @@ push 0 /* Return EIP */ jmp _BaseProcessStartup@4 +END /* EOF */

14 years, 1 month

← Newer
1
...
20
21
22
23
24
25
26
...
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 November 2010