Ros-diffs

ros-diffs@reactos.org

81390 discussions

[amunger] 32673: Simplify and rename the functions that touch UserPageListHead. They were confusingly coded to accept any flavor of PFN_TYPE, which resulted in at least one bug. Constrained the calls to the MmRequest/ReleasePageMemoryConsumer and MmTrimUserMemory.
by amunger＠svn.reactos.org 13 Mar '08

13 Mar '08

Author: amunger Date: Thu Mar 13 10:26:17 2008 New Revision: 32673 URL: http://svn.reactos.org/svn/reactos?rev=3D32673&view=3Drev Log: Simplify and rename the functions that touch UserPageListHead. They were confusingly coded to accept any flavor of PFN_TYPE, which resulte= d in at least one bug. Constrained the calls to the MmRequest/ReleasePageMemoryConsumer and MmTrim= UserMemory. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/wset.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/mm.h?rev=3D32673&r1=3D32672&r2=3D32673&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Mar 13 10:26:17 2008 @@ -1025,7 +1025,11 @@ = VOID NTAPI -MmSetLRULastPage(PFN_TYPE Page); +MmInsertLRULastUserPage(PFN_TYPE Page); + +VOID +NTAPI +MmRemoveLRUUserPage(PFN_TYPE Page); = VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c= ?rev=3D32673&r1=3D32672&r2=3D32673&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/balance.c (original) +++ trunk/reactos/ntoskrnl/mm/balance.c Thu Mar 13 10:26:17 2008 @@ -114,6 +114,7 @@ Entry =3D RemoveHeadList(&AllocationListHead); Request =3D CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListE= ntry); KeReleaseSpinLock(&AllocationListLock, oldIrql); + if(Consumer =3D=3D MC_USER) MmRemoveLRUUserPage(Page); Request->Page =3D Page; KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); } @@ -121,6 +122,7 @@ else { KeReleaseSpinLock(&AllocationListLock, oldIrql); + if(Consumer =3D=3D MC_USER) MmRemoveLRUUserPage(Page); MmDereferencePage(Page); } = @@ -262,7 +264,9 @@ { KEBUGCHECK(NO_PAGES_AVAILABLE); } - MmSetLRULastPage(Page); + /* Update the Consumer */ + MiGetPfnEntry(Page)->Flags.Consumer =3D Consumer; + if(Consumer =3D=3D MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage =3D Page; (void)InterlockedDecrementUL(&MiPagesRequired); return(STATUS_SUCCESS); @@ -276,6 +280,7 @@ { KEBUGCHECK(NO_PAGES_AVAILABLE); } + if(Consumer =3D=3D MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage =3D Page; = return(STATUS_SUCCESS); Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.= c?rev=3D32673&r1=3D32672&r2=3D32673&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Thu Mar 13 10:26:17 2008 @@ -31,8 +31,12 @@ ULONG MmPageArraySize; = static KSPIN_LOCK PageListLock; +/* List of pages allocated to the MC_USER Consumer */ static LIST_ENTRY UserPageListHead; +/* List of pages zeroed by the ZPW (MmZeroPageThreadMain) */ static LIST_ENTRY FreeZeroedPageListHead; +/* List of free pages, filled by MmGetReferenceCountPage and + * and MmInitializePageList */ static LIST_ENTRY FreeUnzeroedPageListHead; = static KEVENT ZeroPageThreadEvent; @@ -65,19 +69,16 @@ = VOID NTAPI -MmSetLRULastPage(PFN_TYPE Pfn) +MmInsertLRULastUserPage(PFN_TYPE Pfn) { KIRQL oldIrql; PPHYSICAL_PAGE Page; = KeAcquireSpinLock(&PageListLock, &oldIrql); Page =3D MiGetPfnEntry(Pfn); - if (Page->Flags.Type =3D=3D MM_PHYSICAL_PAGE_USED && - Page->Flags.Consumer =3D=3D MC_USER) - { - RemoveEntryList(&Page->ListEntry); - InsertTailList(&UserPageListHead, &Page->ListEntry); - } + ASSERT(Page->Flags.Type =3D=3D MM_PHYSICAL_PAGE_USED); + ASSERT(Page->Flags.Consumer =3D=3D MC_USER); + InsertTailList(&UserPageListHead, &Page->ListEntry); KeReleaseSpinLock(&PageListLock, oldIrql); } = @@ -92,15 +93,9 @@ = KeAcquireSpinLock(&PageListLock, &oldIrql); Page =3D MiGetPfnEntry(PreviousPfn); - if (Page->Flags.Type !=3D MM_PHYSICAL_PAGE_USED || - Page->Flags.Consumer !=3D MC_USER) - { - NextListEntry =3D UserPageListHead.Flink; - } - else - { - NextListEntry =3D Page->ListEntry.Flink; - } + ASSERT(Page->Flags.Type =3D=3D MM_PHYSICAL_PAGE_USED); + ASSERT(Page->Flags.Consumer =3D=3D MC_USER); + NextListEntry =3D Page->ListEntry.Flink; if (NextListEntry =3D=3D &UserPageListHead) { KeReleaseSpinLock(&PageListLock, oldIrql); @@ -109,6 +104,13 @@ PageDescriptor =3D CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, List= Entry); KeReleaseSpinLock(&PageListLock, oldIrql); return PageDescriptor - MmPageArray; +} + +VOID +NTAPI +MmRemoveLRUUserPage(PFN_TYPE Page) +{ + RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry); } = PFN_TYPE @@ -782,7 +784,6 @@ KeReleaseSpinLock(&PageListLock, oldIrql); = PfnOffset =3D PageDescriptor - MmPageArray; - MmSetLRULastPage(PfnOffset); if (NeedClear) { MiZeroPage(PfnOffset); @@ -882,7 +883,7 @@ /* Remember the page */ pfn =3D PageDescriptor - MmPageArray; Pages[NumberOfPagesFound++] =3D pfn; - MmSetLRULastPage(pfn); + if(Consumer =3D=3D MC_USER) MmInsertLRULastUserPage(pfn); } } else @@ -917,7 +918,6 @@ = /* Remember the page */ Pages[NumberOfPagesFound++] =3D pfn; - MmSetLRULastPage(pfn); if (NumberOfPagesFound =3D=3D NumberOfPages) break; } Modified: trunk/reactos/ntoskrnl/mm/wset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/wset.c?re= v=3D32673&r1=3D32672&r2=3D32673&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/wset.c (original) +++ trunk/reactos/ntoskrnl/mm/wset.c Thu Mar 13 10:26:17 2008 @@ -38,7 +38,8 @@ } else if (Status =3D=3D STATUS_PAGEFILE_QUOTA) { - MmSetLRULastPage(CurrentPage); + MmRemoveLRUUserPage(CurrentPage); + MmInsertLRULastUserPage(CurrentPage); } = CurrentPage =3D NextPage;

1 0

[fireball] 32672: - Factor out physical pages allocation and creating a virtual mapping into a standalone function called MmMapMemoryArea (idea proposed by Art Yerkes). - As a result, removed one case of a potentially dangerous _alloca usage in the kernel, increased code readability.
by fireball＠svn.reactos.org 13 Mar '08

13 Mar '08

Author: fireball Date: Thu Mar 13 08:17:57 2008 New Revision: 32672 URL: http://svn.reactos.org/svn/reactos?rev=3D32672&view=3Drev Log: - Factor out physical pages allocation and creating a virtual mapping into = a standalone function called MmMapMemoryArea (idea proposed by Art Yerkes). - As a result, removed one case of a potentially dangerous _alloca usage in= the kernel, increased code readability. Modified: trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/ncache.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?re= v=3D32672&r1=3D32671&r2=3D32672&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/view.c (original) +++ trunk/reactos/ntoskrnl/cc/view.c Thu Mar 13 08:17:57 2008 @@ -561,16 +561,13 @@ ULONG FileOffset, PCACHE_SEGMENT* CacheSeg) { - ULONG i; PCACHE_SEGMENT current; PCACHE_SEGMENT previous; PLIST_ENTRY current_entry; NTSTATUS Status; KIRQL oldIrql; - PPFN_TYPE Pfn; #ifdef CACHE_BITMAP ULONG StartingOffset; -#else #endif PHYSICAL_ADDRESS BoundaryAddressMultiple; = @@ -706,24 +703,10 @@ KEBUGCHECKCC; } #endif - Pfn =3D alloca(sizeof(PFN_TYPE) * ((Bcb->CacheSegmentSize / PAGE_SIZE))); - for (i =3D 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++) - { - Status =3D MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Pfn[i]); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECKCC; - } - } - Status =3D MmCreateVirtualMapping(NULL, - current->BaseAddress, - PAGE_READWRITE, - Pfn, - Bcb->CacheSegmentSize / PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - KEBUGCHECKCC; - } + + /* Create a virtual mapping for this memory area */ + MmMapMemoryArea(current->BaseAddress, Bcb->CacheSegmentSize, + MC_CACHE, PAGE_READWRITE); = return(STATUS_SUCCESS); } Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/mm.h?rev=3D32672&r1=3D32671&r2=3D32672&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h Thu Mar 13 08:17:57 2008 @@ -503,6 +503,13 @@ PVOID BaseAddress ); = +VOID +NTAPI +MmMapMemoryArea(PVOID BaseAddress, + ULONG Length, + ULONG Consumer, + ULONG Protection); + /* npool.c ***************************************************************= ****/ = VOID Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?r= ev=3D32672&r1=3D32671&r2=3D32672&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/marea.c (original) +++ trunk/reactos/ntoskrnl/mm/marea.c Thu Mar 13 08:17:57 2008 @@ -1022,6 +1022,38 @@ return STATUS_SUCCESS; } = +VOID NTAPI +MmMapMemoryArea(PVOID BaseAddress, + ULONG Length, + ULONG Consumer, + ULONG Protection) +{ + ULONG i; + NTSTATUS Status; + + for (i =3D 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) + { + PFN_TYPE Page; + + Status =3D MmRequestPageMemoryConsumer(Consumer, TRUE, &Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to allocate page\n"); + KEBUGCHECK(0); + } + Status =3D MmCreateVirtualMapping (NULL, + (PVOID)((ULONG_PTR)BaseAddress + (i= * PAGE_SIZE)), + Protection, + &Page, + 1); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to create virtual mapping\n"); + KEBUGCHECK(0); + } + } +} + = VOID STDCALL MmReleaseMemoryAreaIfDecommitted(PEPROCESS Process, Modified: trunk/reactos/ntoskrnl/mm/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ncache.c?= rev=3D32672&r1=3D32671&r2=3D32672&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/ncache.c (original) +++ trunk/reactos/ntoskrnl/mm/ncache.c Thu Mar 13 08:17:57 2008 @@ -46,7 +46,6 @@ PVOID Result; MEMORY_AREA* marea; NTSTATUS Status; - ULONG i; ULONG Protect =3D PAGE_READWRITE|PAGE_SYSTEM|PAGE_NOCACHE|PAGE_WRITETHR= OUGH; PHYSICAL_ADDRESS BoundaryAddressMultiple; = @@ -66,20 +65,14 @@ = if (!NT_SUCCESS(Status)) { + DPRINT1("Allocating marea for noncached mem failed with Status " + "0x%08X\n", Status); return (NULL); } = - for (i =3D 0; i < (PAGE_ROUND_UP(NumberOfBytes) / PAGE_SIZE); i++) - { - PFN_TYPE NPage; + /* Create a virtual mapping for this memory area */ + MmMapMemoryArea(Result, NumberOfBytes, MC_NPPOOL, Protect); = - Status =3D MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &NPage); - MmCreateVirtualMapping (NULL, - (char*)Result + (i * PAGE_SIZE), - Protect, - &NPage, - 1); - } return ((PVOID)Result); } = Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c= ?rev=3D32672&r1=3D32671&r2=3D32672&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Thu Mar 13 08:17:57 2008 @@ -4391,7 +4391,6 @@ PVOID Result; MEMORY_AREA* marea; NTSTATUS Status; - ULONG i; PMADDRESS_SPACE AddressSpace; PHYSICAL_ADDRESS BoundaryAddressMultiple; = @@ -4418,27 +4417,10 @@ return (NULL); } DPRINT("Result %p\n",Result); - for (i =3D 0; i < PAGE_ROUND_UP(Length) / PAGE_SIZE; i++) - { - PFN_TYPE Page; - - Status =3D MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to allocate page\n"); - KEBUGCHECK(0); - } - Status =3D MmCreateVirtualMapping (NULL, - (PVOID)((ULONG_PTR)Result + (i * PA= GE_SIZE)), - PAGE_READWRITE, - &Page, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KEBUGCHECK(0); - } - } + + /* Create a virtual mapping for this memory area */ + MmMapMemoryArea(Result, Length, MC_NPPOOL, PAGE_READWRITE); + return ((PVOID)Result); } =

1 0

[ros-arm-bringup] 32671: - Finish implementing very basic system call dispatcher. Our very first system call to NtClose works properly. - The rest of Phase 0 initialization continues smoothly, we now reach the while(TRUE) loop at the end of KiSystemStartup! - Phase 0 bring-up is complete: The phase 1 thread should now start (once thread scheduling works). - Next steps: IRQLs, HAL Initialization (Timers and IRQs) to get the interval clock timer running for quantum end/scheduling/time accounting.
by ros-arm-bringup＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: ros-arm-bringup Date: Wed Mar 12 17:06:42 2008 New Revision: 32671 URL: http://svn.reactos.org/svn/reactos?rev=3D32671&view=3Drev Log: - Finish implementing very basic system call dispatcher. Our very first sys= tem call to NtClose works properly. - The rest of Phase 0 initialization continues smoothly, we now reach the w= hile(TRUE) loop at the end of KiSystemStartup! - Phase 0 bring-up is complete: The phase 1 thread should now start (once t= hread scheduling works). - Next steps: IRQLs, HAL Initialization (Timers and IRQs) to get the interv= al clock timer running for quantum end/scheduling/time accounting. - After that: context switching code to be able to switch to the Phase 1 th= read. - Then: Phase 1 bring-up! Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.= s?rev=3D32671&r1=3D32670&r2=3D32671&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s Wed Mar 12 17:06:42 2008 @@ -72,7 +72,30 @@ // mov r0, sp bl KiSoftwareInterruptHandler - + = + // + // Get the SPSR and restore it + // + ldr r0, [sp], #4 + msr spsr_all, r0 + = + // + // Restore the registers + // + ldmia sp, {r0-r14}^ + mov r0, r0 + = + // + // Advance in the trap frame + // + add sp, sp, #(4*17) + = + // + // Restore program execution state + // + ldr lr, [sp], #4 + movs pc, lr + b . ENTRY_END KiSoftwareInterruptException = NESTED_ENTRY KiPrefetchAbortException @@ -222,3 +245,43 @@ = ENTRY_END KiReservedException = + + NESTED_ENTRY KiSystemCall + PROLOG_END KiSystemCall + = + // + // a1 has the function pointer, a2 has an array of arguments, a3 has t= he count + // Save these to better locations + // + mov r4, a1 + mov r5, a2 + mov r6, a3 + = + // + // Load up A1-A4 from the argument array + // It doesn't matter if we had less than 4 arguments, we'll be loading= some + // of the registers with garbage, but nobody will know/care. + // + ldmia r5, {a1-a4} + add r5, r5, #(4* 4) + //sub r6, r6, #4 + = + // + // Now copy the other arguments into our stack + // +CopyLoop: + cmp r6, #4 + //strne sp, [r5], #4 + //subne r6, r6, #1 + beq . + + // + // Now do the system call + // + mov pc, r4 + = + // + // Should not get here + // + b . + ENTRY_END KiSystemCall Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc= .c?rev=3D32671&r1=3D32670&r2=3D32671&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/trapc.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c Wed Mar 12 17:06:42 2008 @@ -18,6 +18,14 @@ #define KiGetPreviousMode(tf) \ ((tf->Spsr & CPSR_MODES) =3D=3D CPSR_USER_MODE) ? UserMode: KernelMode = +NTSTATUS +KiSystemCall( + IN PVOID Handler, + IN PULONG Arguments, + IN ULONG ArgumentCount +); + = + /* FUNCTIONS *************************************************************= *****/ = NTSTATUS @@ -45,13 +53,18 @@ return STATUS_SUCCESS; } = -NTSTATUS +VOID KiSystemService(IN PKTHREAD Thread, IN PKTRAP_FRAME TrapFrame, IN ULONG Instruction) { - ULONG Id; + ULONG Id, Number, ArgumentCount, i; PKPCR Pcr; + ULONG_PTR ServiceTable, Offset; + PKSERVICE_TABLE_DESCRIPTOR DescriptorTable; + PVOID SystemCall; + PULONG Argument; + ULONG Arguments[16]; // Maximum 20 arguments = // // Increase count of system calls @@ -63,12 +76,104 @@ // Get the system call ID // Id =3D Instruction & 0xFFFFF; - DPRINT1("System call (%X) from thread: %p \n", Id, Thread); = - while (TRUE); - return STATUS_SUCCESS; + DPRINT1("System call (%X) from thread: %p (%d) \n", Id, Thread, Thread= ->PreviousMode); + = + // + // Get the descriptor table + // + ServiceTable =3D (ULONG_PTR)Thread->ServiceTable; + Offset =3D ((Id >> SERVICE_TABLE_SHIFT) & SERVICE_TABLE_MASK); + ServiceTable +=3D Offset; + DescriptorTable =3D (PVOID)ServiceTable; + DPRINT1("Descriptor Table: %p (Count %d)\n", DescriptorTable, Descript= orTable->Limit); + = + // + // Get the service call number and validate it + // + Number =3D Id & SERVICE_NUMBER_MASK; + if (Number > DescriptorTable->Limit) + { + // + // Check if this is a GUI call + // + UNIMPLEMENTED; + while (TRUE); + } + = + // + // Save the function responsible for handling this system call + // + SystemCall =3D (PVOID)DescriptorTable->Base[Number]; + DPRINT1("Handler: %p\n", SystemCall); + DPRINT1("NtClose: %p\n", NtClose); + = + // + // Check if this is a GUI call + // + if (Offset & SERVICE_TABLE_TEST) + { + // + // TODO + // + UNIMPLEMENTED; + while (TRUE); + } + = + // + // Check how many arguments this system call takes + // + DPRINT1("Number: %d\n", Number); + ArgumentCount =3D DescriptorTable->Number[Number] / 4; + ASSERT(ArgumentCount <=3D 20); + DPRINT1("Argument Count: %d\n", ArgumentCount); + = + // + // Copy the register-arguments first + // First four arguments are in a1, a2, a3, a4 + // + Argument =3D &TrapFrame->R0; + for (i =3D 0; (i < ArgumentCount) && (i < 4); i++) + { + // + // Copy them into the kernel stack + // + Arguments[i] =3D *Argument; + Argument++; + DPRINT1("Argument %d: %x\n", i, Arguments[i]); + } + = + // + // If more than four, we'll have some on the user stack + // + if (ArgumentCount > 4) + { + // + // FIXME: Validate the user stack + // + DPRINT1("User stack: %p\n", TrapFrame->UserSp); + = + // + // Copy the rest + // + Argument =3D (PULONG)TrapFrame->UserSp; + for (i =3D 4; i < ArgumentCount; i++) + { + // + // Copy into kernel stack + // + Arguments[i] =3D *Argument; + Argument++; + DPRINT1("Argument %d: %x\n", i, Arguments[i]); + } + } + = + // + // Do the system call and save result in EAX + // + TrapFrame->R0 =3D KiSystemCall(SystemCall, Arguments, ArgumentCount); } = -NTSTATUS +VOID KiSoftwareInterruptHandler(IN PKTRAP_FRAME TrapFrame) { PKTHREAD Thread; @@ -87,6 +192,11 @@ PreviousMode =3D KiGetPreviousMode(TrapFrame); = // + // Save old previous mode + // + //TrapFrame->PreviousMode =3D PreviousMode; + = + // // Save previous mode and trap frame // Thread->TrapFrame =3D TrapFrame; @@ -98,7 +208,11 @@ Instruction =3D *(PULONG)(TrapFrame->Pc - sizeof(ULONG)); = // + // FIXME: Enable interrupts? + // + = + // // Call the service call dispatcher // - return KiSystemService(Thread, TrapFrame, Instruction); + KiSystemService(Thread, TrapFrame, Instruction); } Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?r= ev=3D32671&r1=3D32670&r2=3D32671&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Wed Mar 12 17:06:42 2008 @@ -100,8 +100,9 @@ #define KernelModeStub_mips " j KiSystemService\n" \ " nop\n" = -#define KernelModeStub_arm " swi #0x%x\n" \ - " bx lr\n\n" +#define KernelModeStub_arm " mov ip, lr\n" \ + " swi #0x%x\n" \ + " bx ip\n\n" = #elif defined(_MSC_VER) #define KernelModeStub_x86 " asm { \n" \

1 0

[dreimer] 32670: Polish Translation Update by Olaf Siejka.
by dreimer＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: dreimer Date: Wed Mar 12 16:32:45 2008 New Revision: 32670 URL: http://svn.reactos.org/svn/reactos?rev=3D32670&view=3Drev Log: Polish Translation Update by Olaf Siejka. Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/dll/cpl/input/lang/pl-PL.rc Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan= g/pl-PL.h?rev=3D32670&r1=3D32669&r2=3D32670&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Wed Mar 12 16:32:45 2008 @@ -1607,7 +1607,7 @@ {STRING_TXTSETUPFAILED, "Instalator nie by=C2=88 w stanie odnale=C2=AB=C2=86 sekji '%S'\nw pli= ku TXTSETUP.SIF.\n"}, {STRING_COPYING, - " \xB3 Kopiowanie plik=C2=A2w= : %S"}, + " \xB3 Kopiowanie plik=C2=A2w: %S"}, {STRING_SETUPCOPYINGFILES, "Instalator kopiuje pliki..."}, {STRING_PAGEDMEM, Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl= -PL.rc?rev=3D32670&r1=3D32669&r2=3D32670&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc Wed Mar 12 16:32:45 2008 @@ -1,5 +1,5 @@ /* - * translated by Caemyr - Olaf Siejka (Jan, 2008) + * translated by Caemyr - Olaf Siejka (Jan,March 2008) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -9,17 +9,17 @@ = IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Settings" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Select the services that you want for each input language shown= in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9,= 6, 238, 17 +CAPTION "Ustawienia" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Wybierz us=C2=B3ugi dla ka=C2=BFdego u=C2=BFywanego j=C3=AAzyka= z listy.\nList=C3=AA mo=C2=BFna modyfikowa=C3=A6 przyciskami Dodaj i Usu= =C3=B1.", -1, 9, 6, 238, 17 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VS= CROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 23= 7, 109 - PUSHBUTTON "&Set Default", IDC_SET_DEFAULT, 101, 159, 144, 14 - PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 - PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 175, 142, 70, 14 - GROUPBOX "Preferences", -1, 7, 185, 240, 36 - PUSHBUTTON "&Key Settings...", IDC_KEY_SET_BTN, 14, 198, 110, 14 + PUSHBUTTON "&Ustaw domy=C2=9Clne", IDC_SET_DEFAULT, 101, 159, 144, 14 + PUSHBUTTON "&Dodaj...", IDC_ADD_BUTTON, 27, 142, 70, 14 + PUSHBUTTON "U&su=C3=B1...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&W=C2=B3a=C2=9Cciwo=C2=9Cci...", IDC_PROP_BUTTON, 175, 142= , 70, 14 + GROUPBOX "Preferencje", -1, 7, 185, 240, 36 + PUSHBUTTON "Us&tawienia klawiszy...", IDC_KEY_SET_BTN, 14, 198, 110, 14 END = IDD_KEYSETTINGS DIALOGEX 0, 0, 272, 163 @@ -54,18 +54,18 @@ = IDD_CHANGE_KEY_SEQ DIALOGEX 5, 100, 194, 89 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_PO= PUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Key Sequence" +CAPTION "Zmiana sekwencji klawiszy" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", 1240, 4, 5, 186, 10 GROUPBOX "", -1, 7, 16, 179, 48 - AUTOCHECKBOX "S&witch keyboard layouts", IDC_USE_SK, 12, 17, 135, 8 + AUTOCHECKBOX "&Prze=C2=B3=C2=B9cz uk=C2=B3ad klawiatury", IDC_USE_SK, = 12, 17, 135, 8 CTEXT "SHIFT", -1, 68, 37, 27, 12 CTEXT "+", -1, 57, 37, 8, 9 AUTORADIOBUTTON "&CTRL", -1, 24, 31, 30, 11, WS_GROUP - AUTORADIOBUTTON "Left A&LT", -1, 24, 45, 50, 12, NOT WS_TABSTOP + AUTORADIOBUTTON "Lewy A&LT", -1, 24, 45, 50, 12, NOT WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 83, 70, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 136, 70, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 136, 70, 50, 14 END = IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -90,8 +90,8 @@ IDS_UNKNOWN "(Nieznany)" IDS_RESTART "Czy chcesz zrestartowa=C3=A6 sw=C3=B3j komputer= w tej chwili?" IDS_WHATS_THIS "Co to jest?" - IDS_LANGUAGE "Language" - IDS_LAYOUT "Keyboard Layout" + IDS_LANGUAGE "J=C3=AAzyk" + IDS_LAYOUT "Uk=C2=B3ad klawiatury" END = STRINGTABLE

1 0

[gbrunmar] 32669: Removed false unimplemented output :)
by gbrunmar＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: gbrunmar Date: Wed Mar 12 14:40:31 2008 New Revision: 32669 URL: http://svn.reactos.org/svn/reactos?rev=3D32669&view=3Drev Log: Removed false unimplemented output :) Modified: trunk/reactos/dll/directx/d3d9/d3d9.c Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= .c?rev=3D32669&r1=3D32668&r2=3D32669&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Wed Mar 12 14:40:31 2008 @@ -65,8 +65,6 @@ CHAR DebugMessageBuffer[DEBUG_MESSAGE_BUFFER_SIZE]; UINT NoDebugSDKVersion =3D SDKVersion & ~DX_D3D9_DEBUG; = - UNIMPLEMENTED - LoadDebugDllSize =3D sizeof(LoadDebugDll); if (ReadRegistryValue(REG_DWORD, "LoadDebugRuntime", (LPBYTE)&LoadDebu= gDll, &LoadDebugDllSize)) {

1 0

[gbrunmar] 32668: * Made IDirect3D9 structure more MS compatible. * Removed duplicate initing of internal structure * Started implementing IDirect3D9::CreateDevice() error return values
by gbrunmar＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: gbrunmar Date: Wed Mar 12 14:29:10 2008 New Revision: 32668 URL: http://svn.reactos.org/svn/reactos?rev=3D32668&view=3Drev Log: * Made IDirect3D9 structure more MS compatible. * Removed duplicate initing of internal structure * Started implementing IDirect3D9::CreateDevice() error return values Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _caps.c?rev=3D32668&r1=3D32667&r2=3D32668&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_caps.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.c Wed Mar 12 14:29:10 2008 @@ -502,6 +502,7 @@ = memcpy(&pDriverCaps->DriverCaps9, &DriverCaps8, sizeof(D3D= CAPS8)); pDriverCaps->DriverCaps9.Caps =3D HalInfo.ddCaps.dwCaps; + pDriverCaps->dwDriverCaps |=3D D3D9_INT_D3DCAPS8_VALID; } } = @@ -524,6 +525,7 @@ = pDriverCaps->DriverCaps9 =3D DriverCaps9; pDriverCaps->DriverCaps9.Caps =3D HalInfo.ddCaps.dwCaps; + pDriverCaps->dwDriverCaps |=3D D3D9_INT_D3DCAPS9_VALID; } = = Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _create.c?rev=3D32668&r1=3D32667&r2=3D32668&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_create.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Wed Mar 12 14:29:10 2008 @@ -177,7 +177,7 @@ = AdapterIndex =3D 0; while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) =3D= =3D TRUE && - pDirect3D9->NumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) + pDirect3D9->NumDisplayAdapters < D3D9_INT_MAX_NUM_ADAPTERS) { if ((DisplayDevice.StateFlags & (DISPLAY_DEVICE_DISCONNECT | DISPL= AY_DEVICE_MIRRORING_DRIVER)) =3D=3D 0 && (DisplayDevice.StateFlags & (DISPLAY_DEVICE_PRIMARY_DEVICE | D= ISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) !=3D 0) @@ -196,7 +196,7 @@ = AdapterIndex =3D 0; while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) =3D= =3D TRUE && - pDirect3D9->NumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) + pDirect3D9->NumDisplayAdapters < D3D9_INT_MAX_NUM_ADAPTERS) { if ((DisplayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP= ) !=3D 0 && (DisplayDevice.StateFlags & (DISPLAY_DEVICE_MIRRORING_DRIVER |= DISPLAY_DEVICE_PRIMARY_DEVICE)) =3D=3D 0) @@ -240,13 +240,6 @@ pDirect3D9->dwProcessId =3D GetCurrentThreadId(); pDirect3D9->dwRefCnt =3D 1; = - pDirect3D9->unknown004576 =3D 0; - pDirect3D9->unknown004578 =3D 0; - pDirect3D9->unknown004579 =3D 0; - pDirect3D9->unknown004580 =3D 0; - pDirect3D9->unknown004581 =3D 0; - pDirect3D9->unknown004582 =3D 0; - pDirect3D9->unknown004583 =3D 0; pDirect3D9->SDKVersion =3D SDKVersion; = pDirect3D9->lpInt =3D pDirect3D9; @@ -254,7 +247,6 @@ = InitializeCriticalSection(&pDirect3D9->d3d9_cs); = - memset(pDirect3D9->DisplayAdapters, 0, sizeof(pDirect3D9->DisplayAdapt= ers)); GetDisplayDeviceInfo(pDirect3D9); = *ppDirect3D9 =3D (LPDIRECT3D9)&pDirect3D9->lpVtbl; Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _impl.c?rev=3D32668&r1=3D32667&r2=3D32668&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Wed Mar 12 14:29:10 2008 @@ -881,6 +881,55 @@ D3DPRESENT_PARAMETERS* p= PresentationParameters, struct IDirect3DDevice9*= * ppReturnedDeviceInterface) { + DWORD NumAdaptersToCreate; + + LPDIRECT3D9_INT This =3D impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >=3D This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (DeviceType !=3D D3DDEVTYPE_HAL && + DeviceType !=3D D3DDEVTYPE_REF && + DeviceType !=3D D3DDEVTYPE_SW) + { + DPRINT1("Invalid DeviceType specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (DeviceType !=3D D3DDEVTYPE_HAL) + { + UNIMPLEMENTED + DPRINT1("Sorry, only D3DDEVTYPE_HAL is implemented at this time...= "); + return D3DERR_INVALIDCALL; + } + + if (hFocusWindow !=3D NULL && FALSE =3D=3D IsWindow(hFocusWindow)) + { + DPRINT1("Invalid hFocusWindow parameter specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(ppReturnedDeviceInterface, sizeof(IDirect3DDevice9*)= )) + { + DPRINT1("Invalid ppReturnedDeviceInterface parameter specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if ((BehaviourFlags & D3DCREATE_ADAPTERGROUP_DEVICE) !=3D 0) + NumAdaptersToCreate =3D This->DisplayAdapters[Adapter].NumAdapters= InGroup; + else + NumAdaptersToCreate =3D 1; + + *ppReturnedDeviceInterface =3D 0; + UNIMPLEMENTED = return D3D_OK; Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9= _private.h?rev=3D32668&r1=3D32667&r2=3D32668&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Wed Mar 12 14:29:10 2008 @@ -11,7 +11,10 @@ #include <windows.h> #include <ddraw.h> = -#define DX_D3D9_MAX_NUM_ADAPTERS 12 +#define D3D9_INT_MAX_NUM_ADAPTERS 12 + +#define D3D9_INT_D3DCAPS8_VALID 1 +#define D3D9_INT_D3DCAPS9_VALID 2 = typedef struct _D3D9Unknown6BC_INT_ { @@ -64,7 +67,7 @@ /* 0x0148 */ DWORD dwSVBCaps; /* 0x014c */ DWORD dwVSBCaps; /* 0x0150 */ DWORD dwSVBCaps2; -/* 0x0154 */ DWORD unknown0085; +/* 0x0154 */ DWORD dwDriverCaps; /* 0x0158 */ DWORD NumSupportedFormatOps; /* 0x015c */ LPDDSURFACEDESC pSupportedFormatOps; /* 0x0160 */ DWORD unknown0088; @@ -162,7 +165,7 @@ /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddR= ef() and Release() */ /* 0x002c */ UINT NumDisplayAdapters; -/* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[DX_D3D9_MA= X_NUM_ADAPTERS]; +/* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[D3D9_INT_M= AX_NUM_ADAPTERS]; /* 0x2100 */ DWORD unknown002112; /* 0x2104 */ DWORD unknown002113; /* 0x2108 */ DWORD unknown002114;

1 0

[fireball] 32667: - Fix build.
by fireball＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: fireball Date: Wed Mar 12 14:07:32 2008 New Revision: 32667 URL: http://svn.reactos.org/svn/reactos?rev=3D32667&view=3Drev Log: - Fix build. Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-gen= eric.rbuild?rev=3D32667&r1=3D32666&r2=3D32667&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Wed Mar 12 14:07:32 2008 @@ -166,7 +166,7 @@ <directory name=3D"i386"> <file>interlck_asm.S</file> <file>fastinterlck_asm.S</file> - <file>ioport.s</file> + <file>ioport.S</file> </directory> </if> <file>atom.c</file> @@ -176,7 +176,7 @@ <file>event.c</file> <file>evtpair.c</file> <file>exintrin.c</file> - <file>fastinterlck.c</file> + <file>fastinterlck.c</file> <file>fmutex.c</file> <file>handle.c</file> <file>harderr.c</file>

1 0

[ros-arm-bringup] 32666: - We now define a much simpler system call interface -- instead of using interrupt 2E with the system call ID in the ip register, we use the system call ID as the interrupt number! On ARM, all software interrupts have a generic handler, so ANY software interrupt will be a system call, and the interrupt number is the system call ID! - Removed a bunch more i386-only exports from the ARM kernel. - Implemented all the READ/WRITE_REGISTER* routines for ARM/PPC. - Implement ha
by ros-arm-bringup＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: ros-arm-bringup Date: Wed Mar 12 13:17:55 2008 New Revision: 32666 URL: http://svn.reactos.org/svn/reactos?rev=3D32666&view=3Drev Log: - We now define a much simpler system call interface -- instead of using in= terrupt 2E with the system call ID in the ip register, we use the system ca= ll ID as the interrupt number! On ARM, all software interrupts have a gener= ic handler, so ANY software interrupt will be a system call, and the interr= upt number is the system call ID! - Removed a bunch more i386-only exports from the ARM kernel. - Implemented all the READ/WRITE_REGISTER* routines for ARM/PPC. - Implement half of KiSoftwareInterruptException, which calls KiSoftwareInt= erruptHandler, which calls KiSystemService. We now reach the first kernel-m= ode system call! (ZwClose from PspInitPhase0). - Reformat fastinterlck.c and change the way it's included per-architecture. Modified: trunk/reactos/ntoskrnl/ex/exintrin.c trunk/reactos/ntoskrnl/ex/fastinterlck.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/trap.s trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ntoskrnl_arm.def trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.= c?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/exintrin.c (original) +++ trunk/reactos/ntoskrnl/ex/exintrin.c Wed Mar 12 13:17:55 2008 @@ -17,6 +17,11 @@ #undef InterlockedCompareExchange #undef InterlockedExchangeAdd #undef InterlockedExchange + +// +// HAL Port to Inlined Port +// +#define H2I(Port) PtrToUshort(Port) = /* FUNCTIONS *************************************************************= *****/ = Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinter= lck.c?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/fastinterlck.c (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c Wed Mar 12 13:17:55 2008 @@ -1,37 +1,49 @@ /* * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ex/powerpc/fastinterlck.c - * PURPOSE: Executive Atom Functions - * PROGRAMMERS: Art Yerkes + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ex/fastinterlck.c + * PURPOSE: Portable Ex*Interlocked and REGISTER routines for non-= x86 + * PROGRAMMERS: ReactOS Portable Systems Group */ = -/* INCLUDES **************************************************************= ***/ +/* INCLUDES **************************************************************= *****/ + +#if defined(_ARM_) || defined(_PPC_) || defined(NTOS_USE_GENERICS) = #include <ntoskrnl.h> -#include <internal/debug.h> - -NTKERNELAPI +#define NDEBUG +#include <debug.h> + +#undef ExInterlockedPushEntrySList +#undef ExInterlockedPopEntrySList +#undef ExInterlockedAddULong +#undef ExInterlockedIncrementLong +#undef ExInterlockedDecrementLong + +/* FUNCTIONS *************************************************************= *****/ + PSLIST_ENTRY NTAPI InterlockedPushEntrySList(IN PSLIST_HEADER ListHead, IN PSLIST_ENTRY ListEntry) { = - PSINGLE_LIST_ENTRY FirstEntry, NextEntry, Entry =3D (PVOID)ListEntry, = Head =3D (PVOID)ListHead; + PSINGLE_LIST_ENTRY FirstEntry, NextEntry; + PSINGLE_LIST_ENTRY Entry =3D (PVOID)ListEntry, Head =3D (PVOID)ListHea= d; = FirstEntry =3D Head->Next; do { Entry->Next =3D FirstEntry; NextEntry =3D FirstEntry; - FirstEntry =3D (PVOID)_InterlockedCompareExchange((PLONG)Head, (LO= NG)Entry, (LONG)FirstEntry); + FirstEntry =3D (PVOID)_InterlockedCompareExchange((PLONG)Head, + (LONG)Entry, + (LONG)FirstEntry); } while (FirstEntry !=3D NextEntry); = return FirstEntry; } = -NTKERNELAPI PSLIST_ENTRY NTAPI InterlockedPopEntrySList(IN PSLIST_HEADER ListHead) @@ -44,13 +56,14 @@ if (!FirstEntry) return NULL; = NextEntry =3D FirstEntry; - FirstEntry =3D (PVOID)_InterlockedCompareExchange((PLONG)Head, (LO= NG)FirstEntry->Next, (LONG)FirstEntry); + FirstEntry =3D (PVOID)_InterlockedCompareExchange((PLONG)Head, + (LONG)FirstEntry->= Next, + (LONG)FirstEntry); } while (FirstEntry !=3D NextEntry); = return FirstEntry; = } = -NTKERNELAPI PSINGLE_LIST_ENTRY FASTCALL ExInterlockedFlushSList(IN PSLIST_HEADER ListHead) @@ -58,36 +71,27 @@ return (PVOID)_InterlockedExchange((PLONG)&ListHead->Next.Next, (LONG)= NULL); } = -#undef ExInterlockedPushEntrySList -NTKERNELAPI PSLIST_ENTRY FASTCALL -ExInterlockedPushEntrySList -(IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY ListEntry) +ExInterlockedPushEntrySList(IN PSLIST_HEADER ListHead, + IN PSLIST_ENTRY ListEntry) { return InterlockedPushEntrySList(ListHead, ListEntry); } = -#undef ExInterlockedPopEntrySList -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPopEntrySList( - IN PSLIST_HEADER ListHead, - IN PKSPIN_LOCK Lock) +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPopEntrySList(IN PSLIST_HEADER ListHead, + IN PKSPIN_LOCK Lock) { return InterlockedPopEntrySList(ListHead); } = -#undef ExInterlockedAddULong -NTKERNELAPI ULONG NTAPI -ExfInterlockedAddUlong( - IN PULONG Addend, - IN ULONG Increment, - PKSPIN_LOCK Lock) +ExfInterlockedAddUlong(IN PULONG Addend, + IN ULONG Increment, + PKSPIN_LOCK Lock) { KIRQL OldIrql; KeAcquireSpinLock(Lock, &OldIrql); @@ -96,13 +100,11 @@ return *Addend; } = -NTKERNELAPI LONGLONG FASTCALL -ExfInterlockedCompareExchange64( - IN OUT LONGLONG volatile *Destination, - IN PLONGLONG Exchange, - IN PLONGLONG Comperand) +ExfInterlockedCompareExchange64(IN OUT LONGLONG volatile *Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comperand) { LONGLONG Result; = @@ -111,13 +113,11 @@ return Result; } = -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; PLIST_ENTRY OldHead =3D NULL; @@ -128,13 +128,11 @@ return OldHead; } = -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertTailList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; PLIST_ENTRY OldHead =3D NULL; @@ -145,129 +143,83 @@ return OldHead; } = -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExfInterlockedPopEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + UNIMPLEMENTED; return NULL; } = -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExfInterlockedPushEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + UNIMPLEMENTED; return NULL; } = -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) +PLIST_ENTRY +FASTCALL +ExfInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) { return ExInterlockedRemoveHeadList(ListHead, Lock); } = -NTKERNELAPI -INTERLOCKED_RESULT -FASTCALL -Exfi386InterlockedIncrementLong( - IN PLONG Addend) -{ - return InterlockedIncrement(Addend); -} - -NTKERNELAPI -INTERLOCKED_RESULT -FASTCALL -Exfi386InterlockedDecrementLong( - IN PLONG Addend) -{ - return InterlockedDecrement(Addend); -} - -NTKERNELAPI -ULONG -FASTCALL -Exfi386InterlockedExchangeUlong( - IN PULONG Target, - IN ULONG Value) -{ - return (ULONG)_InterlockedExchange((PLONG)Target, Value); -} - -NTKERNELAPI LARGE_INTEGER NTAPI -ExInterlockedAddLargeInteger( - IN PLARGE_INTEGER Addend, - IN LARGE_INTEGER Increment, - IN PKSPIN_LOCK Lock) +ExInterlockedAddLargeInteger(IN PLARGE_INTEGER Addend, + IN LARGE_INTEGER Increment, + IN PKSPIN_LOCK Lock) { LARGE_INTEGER Integer =3D {{0}}; UNIMPLEMENTED; return Integer; } = -NTKERNELAPI ULONG NTAPI -ExInterlockedAddUlong( - IN PULONG Addend, - IN ULONG Increment, - PKSPIN_LOCK Lock) +ExInterlockedAddUlong(IN PULONG Addend, + IN ULONG Increment, + PKSPIN_LOCK Lock) { return (ULONG)_InterlockedExchangeAdd((PLONG)Addend, Increment); } = -#undef ExInterlockedIncrementLong -NTKERNELAPI INTERLOCKED_RESULT NTAPI -ExInterlockedIncrementLong( - IN PLONG Addend, - IN PKSPIN_LOCK Lock) +ExInterlockedIncrementLong(IN PLONG Addend, + IN PKSPIN_LOCK Lock) { return _InterlockedIncrement(Addend); } = -#undef ExInterlockedDecrementLong -NTKERNELAPI INTERLOCKED_RESULT NTAPI -ExInterlockedDecrementLong( - IN PLONG Addend, - IN PKSPIN_LOCK Lock) +ExInterlockedDecrementLong(IN PLONG Addend, + IN PKSPIN_LOCK Lock) { return _InterlockedDecrement(Addend); } = -NTKERNELAPI ULONG NTAPI -ExInterlockedExchangeUlong( - IN PULONG Target, - IN ULONG Value, - IN PKSPIN_LOCK Lock) +ExInterlockedExchangeUlong(IN PULONG Target, + IN ULONG Value, + IN PKSPIN_LOCK Lock) { return (ULONG)_InterlockedExchange((PLONG)Target, Value); } = -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) +PLIST_ENTRY +NTAPI +ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; PLIST_ENTRY OldHead =3D NULL; @@ -278,13 +230,11 @@ return OldHead; } = -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) +PLIST_ENTRY +NTAPI +ExInterlockedInsertTailList(IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; PLIST_ENTRY OldHead =3D NULL; @@ -295,12 +245,10 @@ return OldHead; } = -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPopEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; PSINGLE_LIST_ENTRY OldHead =3D NULL; @@ -310,13 +258,11 @@ return OldHead; } = -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPushEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; PSINGLE_LIST_ENTRY OldHead =3D NULL; @@ -326,12 +272,10 @@ return OldHead; } = -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) +PLIST_ENTRY +NTAPI +ExInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; PLIST_ENTRY OldHead =3D NULL; @@ -341,23 +285,20 @@ return OldHead; } = -NTKERNELAPI -VOID -FASTCALL -ExInterlockedAddLargeStatistic -(IN PLARGE_INTEGER Addend, - IN ULONG Increment) +VOID +FASTCALL +ExInterlockedAddLargeStatistic(IN PLARGE_INTEGER Addend, + IN ULONG Increment) { UNIMPLEMENTED; } = -NTKERNELAPI LONGLONG FASTCALL -ExInterlockedCompareExchange64(IN OUT PLONGLONG Destination, - IN PLONGLONG Exchange, - IN PLONGLONG Comparand, - IN PKSPIN_LOCK Lock) +ExInterlockedCompareExchange64(IN OUT PLONGLONG Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comparand, + IN PKSPIN_LOCK Lock) { KIRQL OldIrql; LONGLONG Result; @@ -368,3 +309,149 @@ KeReleaseSpinLock(Lock, OldIrql); return Result; } + +VOID +NTAPI +READ_REGISTER_BUFFER_UCHAR(IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + PUCHAR registerBuffer =3D Register; + PUCHAR readBuffer =3D Buffer; + ULONG readCount; + = + for (readCount =3D Count; readCount--; readBuffer++, registerBuffer++) + { + *readBuffer =3D *(volatile UCHAR * const)registerBuffer; + } +} + +VOID +NTAPI +READ_REGISTER_BUFFER_ULONG(IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + PULONG registerBuffer =3D Register; + PULONG readBuffer =3D Buffer; + ULONG readCount; + = + for (readCount =3D Count; readCount--; readBuffer++, registerBuffer++) + { + *readBuffer =3D *(volatile ULONG * const)registerBuffer; + } +} + +VOID +NTAPI +READ_REGISTER_BUFFER_USHORT(IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + PUSHORT registerBuffer =3D Register; + PUSHORT readBuffer =3D Buffer; + ULONG readCount; + = + for (readCount =3D Count; readCount--; readBuffer++, registerBuffer++) + { + *readBuffer =3D *(volatile USHORT * const)registerBuffer; + } +} + +UCHAR +NTAPI +READ_REGISTER_UCHAR(IN PUCHAR Register) +{ + return *(volatile UCHAR * const)Register; +} + +ULONG +NTAPI +READ_REGISTER_ULONG(IN PULONG Register) +{ + return *(volatile ULONG * const)Register; +} + +USHORT +NTAPI +READ_REGISTER_USHORT(IN PUSHORT Register) +{ + return *(volatile USHORT * const)Register; = +} + +VOID +NTAPI +WRITE_REGISTER_BUFFER_UCHAR(IN PUCHAR Register, + IN PUCHAR Buffer, + IN ULONG Count) +{ + PUCHAR registerBuffer =3D Register; + PUCHAR writeBuffer =3D Buffer; + ULONG writeCount; + for (writeCount =3D Count; writeCount--; writeBuffer++, registerBuffer= ++) + { + *(volatile UCHAR * const)registerBuffer =3D *writeBuffer; + } + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_BUFFER_ULONG(IN PULONG Register, + IN PULONG Buffer, + IN ULONG Count) +{ + PULONG registerBuffer =3D Register; + PULONG writeBuffer =3D Buffer; + ULONG writeCount; + for (writeCount =3D Count; writeCount--; writeBuffer++, registerBuffer= ++) + { + *(volatile ULONG * const)registerBuffer =3D *writeBuffer; + } + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_BUFFER_USHORT(IN PUSHORT Register, + IN PUSHORT Buffer, + IN ULONG Count) +{ + PUSHORT registerBuffer =3D Register; + PUSHORT writeBuffer =3D Buffer; + ULONG writeCount; + for (writeCount =3D Count; writeCount--; writeBuffer++, registerBuffer= ++) + { + *(volatile USHORT * const)registerBuffer =3D *writeBuffer; + } + KeFlushWriteBuffer(); +} + +VOID +NTAPI +WRITE_REGISTER_UCHAR(IN PUCHAR Register, + IN UCHAR Value) +{ + *(volatile UCHAR * const)Register =3D Value; + KeFlushWriteBuffer(); = +} + +VOID +NTAPI +WRITE_REGISTER_ULONG(IN PULONG Register, + IN ULONG Value) +{ + *(volatile ULONG * const)Register =3D Value; + KeFlushWriteBuffer(); = +} + +VOID +NTAPI +WRITE_REGISTER_USHORT(IN PUSHORT Register, + IN USHORT Value) +{ + *(volatile USHORT * const)Register =3D Value; + KeFlushWriteBuffer(); = +} + +#endif Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?re= v=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Wed Mar 12 13:17:55 2008 @@ -1841,7 +1841,9 @@ InbvUpdateProgressBar(80); = /* Initialize VDM support */ +#ifdef i386 KeI386VdmInitialize(); +#endif = /* Initialize Power Subsystem in Phase 1*/ if (!PoInitSystem(1, AcpiTableDetected)) KeBugCheck(INTERNAL_POWER_ERR= OR); Modified: trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/inte= rnal/arm/ksarm.h?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ksarm.h Wed Mar 12 13:17:55= 2008 @@ -1,9 +1,20 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/include/internal/arm/ksarm.h + * PURPOSE: Definitions and offsets for ARM Assembly and C code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +#ifdef _ASM_ + /* * CPSR Values */ .equ CPSR_THUMB_ENABLE, 0x20 = .equ CPSR_FIQ_DISABLE, 0x40 .equ CPSR_IRQ_DISABLE, 0x80 +.equ CPSR_USER_MODE, 0x10 .equ CPSR_FIQ_MODE, 0x11 .equ CPSR_IRQ_MODE, 0x12 .equ CPSR_SVC_MODE, 0x13 @@ -38,3 +49,21 @@ * PCR */ .equ KiPcr, 0xFFFFF000 + +#else + +/* + * CPSR Values + */ +#define CPSR_THUMB_ENABLE 0x20 = +#define CPSR_FIQ_DISABLE 0x40 +#define CPSR_IRQ_DISABLE 0x80 +#define CPSR_USER_MODE 0x10 +#define CPSR_FIQ_MODE 0x11 +#define CPSR_IRQ_MODE 0x12 +#define CPSR_SVC_MODE 0x13 +#define CPSR_ABORT_MODE 0x17 +#define CPSR_UND_MODE 0x1B +#define CPSR_MODES 0x1F + +#endif Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs= _asm.s?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Wed Mar 12 13:17:55 2008 @@ -1,20 +1,4 @@ #include <internal/arm/asmmacro.S> - -// -// Port I/O and Register Access -// -GENERATE_ARM_STUB READ_REGISTER_BUFFER_UCHAR = -GENERATE_ARM_STUB READ_REGISTER_BUFFER_ULONG = -GENERATE_ARM_STUB READ_REGISTER_BUFFER_USHORT = -GENERATE_ARM_STUB READ_REGISTER_UCHAR = -GENERATE_ARM_STUB READ_REGISTER_ULONG = -GENERATE_ARM_STUB READ_REGISTER_USHORT = -GENERATE_ARM_STUB WRITE_REGISTER_BUFFER_UCHAR = -GENERATE_ARM_STUB WRITE_REGISTER_BUFFER_ULONG = -GENERATE_ARM_STUB WRITE_REGISTER_BUFFER_USHORT = -GENERATE_ARM_STUB WRITE_REGISTER_UCHAR = -GENERATE_ARM_STUB WRITE_REGISTER_ULONG = -GENERATE_ARM_STUB WRITE_REGISTER_USHORT = = // // Exceptions @@ -30,31 +14,22 @@ // GENERATE_ARM_STUB KiSwapContext GENERATE_ARM_STUB DbgBreakPointWithStatus = -GENERATE_ARM_STUB Ke386CallBios = GENERATE_ARM_STUB KeConnectInterrupt = GENERATE_ARM_STUB KeDcacheFlushCount = GENERATE_ARM_STUB KeDisconnectInterrupt = GENERATE_ARM_STUB KeFlushEntireTb = GENERATE_ARM_STUB KeGetRecommendedSharedDataAlignment = -GENERATE_ARM_STUB KeI386AllocateGdtSelectors = -GENERATE_ARM_STUB KeI386FlatToGdtSelector = -GENERATE_ARM_STUB KeI386ReleaseGdtSelectors = GENERATE_ARM_STUB KeIcacheFlushCount = GENERATE_ARM_STUB KeInitializeInterrupt = GENERATE_ARM_STUB KeNumberProcessors = GENERATE_ARM_STUB KeQueryActiveProcessors = GENERATE_ARM_STUB KeRaiseUserException = -GENERATE_ARM_STUB KeRestoreFloatingPointState = -GENERATE_ARM_STUB KeSaveFloatingPointState = GENERATE_ARM_STUB KeSaveStateForHibernate = GENERATE_ARM_STUB KeSetDmaIoCoherency = GENERATE_ARM_STUB KeSynchronizeExecution = GENERATE_ARM_STUB KeUpdateRunTime = GENERATE_ARM_STUB KeUpdateSystemTime = GENERATE_ARM_STUB KeUserModeCallback = -GENERATE_ARM_STUB Kei386EoiHelper = -GENERATE_ARM_STUB KiCoprocessorError = -GENERATE_ARM_STUB KiDispatchInterrupt = GENERATE_ARM_STUB NtSetLdtEntries GENERATE_ARM_STUB NtRaiseException GENERATE_ARM_STUB NtCallbackReturn @@ -66,12 +41,12 @@ // // Internal Ke Arch-Specific Helpers // +GENERATE_ARM_STUB KiDispatchInterrupt GENERATE_ARM_STUB KiSaveProcessorControlState GENERATE_ARM_STUB KiInitializeUserApc GENERATE_ARM_STUB KeDisableInterrupts GENERATE_ARM_STUB KiDispatchException GENERATE_ARM_STUB KiSwapProcess -GENERATE_ARM_STUB KeI386VdmInitialize GENERATE_ARM_STUB KeSwitchKernelStack GENERATE_ARM_STUB KiInitMachineDependent GENERATE_ARM_STUB KiComputeTimerTableIndex Modified: trunk/reactos/ntoskrnl/ke/arm/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trap.= s?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/trap.s Wed Mar 12 13:17:55 2008 @@ -44,10 +44,35 @@ PROLOG_END KiSoftwareInterruptException = // - // FIXME: TODO - // - b . - = + // Save return address + // + str lr, [sp, #-4]! + = + // + // Make space for trap frame + // + sub sp, sp, #(4*17) + = + // + // Save user-mode registers + // + stmia sp, {r0-r12} + add r0, sp, #(4*13) + stmia r0, {r13-r14}^ + mov r0, r0 + = + // + // Save SPSR + // + mrs r0, spsr_all + str r0, [sp, #-4]! + = + // + // Call the C handler + // + mov r0, sp + bl KiSoftwareInterruptHandler + ENTRY_END KiSoftwareInterruptException = NESTED_ENTRY KiPrefetchAbortException @@ -125,6 +150,7 @@ stmia sp, {r0-r12} add r0, sp, #(4*13) stmia r0, {r13-r14}^ + mov r0, r0 = // // Save SPSR Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc= .c?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/trapc.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c Wed Mar 12 13:17:55 2008 @@ -9,10 +9,14 @@ /* INCLUDES **************************************************************= *****/ = #include <ntoskrnl.h> +#include <internal/arm/ksarm.h> #define NDEBUG #include <debug.h> = /* GLOBALS ***************************************************************= *****/ + +#define KiGetPreviousMode(tf) \ + ((tf->Spsr & CPSR_MODES) =3D=3D CPSR_USER_MODE) ? UserMode: KernelMode = /* FUNCTIONS *************************************************************= *****/ = @@ -41,3 +45,60 @@ return STATUS_SUCCESS; } = +NTSTATUS +KiSystemService(IN PKTHREAD Thread, + IN PKTRAP_FRAME TrapFrame, + IN ULONG Instruction) +{ + ULONG Id; + PKPCR Pcr; + = + // + // Increase count of system calls + // + Pcr =3D (PKPCR)KeGetPcr(); + Pcr->Prcb->KeSystemCalls++; + = + // + // Get the system call ID + // + Id =3D Instruction & 0xFFFFF; + DPRINT1("System call (%X) from thread: %p \n", Id, Thread); = + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +KiSoftwareInterruptHandler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + KPROCESSOR_MODE PreviousMode; + ULONG Instruction; + DPRINT1("SWI @ %p %p \n", TrapFrame->Pc, TrapFrame->UserLr); + = + // + // Get the current thread + // + Thread =3D KeGetCurrentThread(); + = + // + // Isolate previous mode + // + PreviousMode =3D KiGetPreviousMode(TrapFrame); + = + // + // Save previous mode and trap frame + // + Thread->TrapFrame =3D TrapFrame; + Thread->PreviousMode =3D PreviousMode; + = + // + // Read the opcode + // + Instruction =3D *(PULONG)(TrapFrame->Pc - sizeof(ULONG)); + = + // + // Call the service call dispatcher + // + return KiSystemService(Thread, TrapFrame, Instruction); +} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-gen= eric.rbuild?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Wed Mar 12 13:17:55 2008 @@ -166,17 +166,8 @@ <directory name=3D"i386"> <file>interlck_asm.S</file> <file>fastinterlck_asm.S</file> - <file>ioport.S</file> - </directory> - </if> - <if property=3D"ARCH" value=3D"powerpc"> - <directory name=3D"powerpc"> - <file>ioport.s</file> - </directory> - <file>fastinterlck.c</file> - </if> - <if property=3D"ARCH" value=3D"arm"> - <file>fastinterlck.c</file> + <file>ioport.s</file> + </directory> </if> <file>atom.c</file> <file>callback.c</file> @@ -185,6 +176,7 @@ <file>event.c</file> <file>evtpair.c</file> <file>exintrin.c</file> + <file>fastinterlck.c</file> <file>fmutex.c</file> <file>handle.c</file> <file>harderr.c</file> Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm= .def?rev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl_arm.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.def Wed Mar 12 13:17:55 2008 @@ -518,7 +518,6 @@ KdPollBreakIn KdPowerTransition KdSystemDebugControl -Ke386CallBios KeAcquireGuardedMutex KeAcquireGuardedMutexUnsafe KeAcquireSpinLockAtDpcLevel @@ -550,16 +549,6 @@ KeGetCurrentThread KeGetPreviousMode KeGetRecommendedSharedDataAlignment -;KeI386AbiosCall -KeI386AllocateGdtSelectors -;KeI386Call16BitCStyleFunction -;KeI386Call16BitFunction -KeI386FlatToGdtSelector -;KeI386GetLid -;KeI386MachineType DATA -KeI386ReleaseGdtSelectors -;KeI386ReleaseLid -;KeI386SetGdtSelector KeIcacheFlushCount DATA KeInitializeApc KeInitializeDeviceQueue @@ -621,10 +610,8 @@ KeRemoveQueueDpc KeRemoveSystemServiceTable KeResetEvent -KeRestoreFloatingPointState KeRevertToUserAffinityThread KeRundownQueue -KeSaveFloatingPointState KeSaveStateForHibernate KeServiceDescriptorTable DATA KeSetAffinityThread @@ -658,13 +645,10 @@ KeWaitForSingleObject KefAcquireSpinLockAtDpcLevel KefReleaseSpinLockFromDpcLevel -Kei386EoiHelper KiAcquireSpinLock ;KiBugCheckData DATA -KiCoprocessorError KiCheckForKernelApcDelivery KiDeliverApc -KiDispatchInterrupt KiEnableTimerWatchdog KiIpiServiceRoutine KiReleaseSpinLock Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?r= ev=3D32666&r1=3D32665&r2=3D32666&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Wed Mar 12 13:17:55 2008 @@ -68,11 +68,7 @@ " j $8\n" \ " nop\n" = -// -// For now, only supports 0-4 arguments -// -#define UserModeStub_arm " ldr r12, =3D%x\n" \ - " swi #0x2E\n" \ +#define UserModeStub_arm " swi #0x%x\n" \ " bx lr\n\n" = #elif defined(_MSC_VER) @@ -104,8 +100,7 @@ #define KernelModeStub_mips " j KiSystemService\n" \ " nop\n" = -#define KernelModeStub_arm " ldr r12, =3D0x%x\n" \ - " swi #0x2E\n" \ +#define KernelModeStub_arm " swi #0x%x\n" \ " bx lr\n\n" = #elif defined(_MSC_VER)

1 0

[cfinck] 32665: [FORMATTING] Fix indentation
by cfinck＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: cfinck Date: Wed Mar 12 08:50:30 2008 New Revision: 32665 URL: http://svn.reactos.org/svn/reactos?rev=3D32665&view=3Drev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?r= ev=3D32665&r1=3D32664&r2=3D32665&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/add.c (original) +++ trunk/reactos/dll/cpl/input/add.c Wed Mar 12 08:50:30 2008 @@ -18,97 +18,97 @@ SelectLayoutByLang(VOID) { TCHAR Layout[MAX_PATH], Lang[MAX_PATH], LangID[MAX_PATH]; - INT iIndex; - LCID Lcid; + INT iIndex; + LCID Lcid; = iIndex =3D SendMessage(hLangList, CB_GETCURSEL, 0, 0); Lcid =3D SendMessage(hLangList, CB_GETITEMDATA, iIndex, 0); = - GetLocaleInfo(MAKELCID(Lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Lang= , sizeof(Lang)); + GetLocaleInfo(MAKELCID(Lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)L= ang, sizeof(Lang)); = - _stprintf(LangID, _T("0000%s"), Lang); + _stprintf(LangID, _T("0000%s"), Lang); = - if (GetLayoutName(LangID, Layout)) - { - SendMessage(hLayoutList, CB_SELECTSTRING, - (WPARAM) -1, (LPARAM)Layout); - } + if (GetLayoutName(LangID, Layout)) + { + SendMessage(hLayoutList, CB_SELECTSTRING, + (WPARAM) -1, (LPARAM)Layout); + } } = static VOID AddNewLayout(HWND hwndDlg) { - TCHAR Lang[MAX_PATH], LangID[MAX_PATH], LayoutID[MAX_PATH]; - INT iLang, iLayout; - LCID Lcid; + TCHAR Lang[MAX_PATH], LangID[MAX_PATH], LayoutID[MAX_PATH]; + INT iLang, iLayout; + LCID Lcid; = - iLang =3D SendMessage(hLangList, CB_GETCURSEL, 0, 0); - iLayout =3D SendMessage(hLayoutList, CB_GETCURSEL, 0, 0); + iLang =3D SendMessage(hLangList, CB_GETCURSEL, 0, 0); + iLayout =3D SendMessage(hLayoutList, CB_GETCURSEL, 0, 0); = - if ((iLang =3D=3D CB_ERR) || (iLayout =3D=3D CB_ERR)) return; + if ((iLang =3D=3D CB_ERR) || (iLayout =3D=3D CB_ERR)) return; = - Lcid =3D (LCID) SendMessage(hLangList, CB_GETITEMDATA, iLang, 0); - GetLocaleInfo(MAKELCID(Lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)Lang= , sizeof(Lang)); - _stprintf(LangID, _T("0000%s"), Lang); + Lcid =3D (LCID) SendMessage(hLangList, CB_GETITEMDATA, iLang, 0); + GetLocaleInfo(MAKELCID(Lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, (WORD*)L= ang, sizeof(Lang)); + _stprintf(LangID, _T("0000%s"), Lang); = - _tcscpy(LayoutID, (LPTSTR)SendMessage(hLayoutList, CB_GETITEMDATA, iLayou= t, 0)); + _tcscpy(LayoutID, (LPTSTR)SendMessage(hLayoutList, CB_GETITEMDATA, iLa= yout, 0)); = - if (_tcscmp(LangID, LayoutID) =3D=3D 0) - { - MessageBox(0, L"", L"", MB_OK); - HKEY hKey; + if (_tcscmp(LangID, LayoutID) =3D=3D 0) + { + MessageBox(0, L"", L"", MB_OK); + HKEY hKey; = - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, K= EY_WRITE, &hKey)) - { - = - } - } + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload")= , 0, KEY_WRITE, &hKey)) + { + = + } + } } = VOID CreateKeyboardLayoutList(VOID) { - HKEY hKey, hSubKey; - TCHAR szBuf[MAX_PATH], KeyName[MAX_PATH]; - LONG Ret; - DWORD dwIndex =3D 0; + HKEY hKey, hSubKey; + TCHAR szBuf[MAX_PATH], KeyName[MAX_PATH]; + LONG Ret; + DWORD dwIndex =3D 0; = - if (RegOpenKey(HKEY_LOCAL_MACHINE, _T("System\\CurrentControlSet\\Control= \\Keyboard Layouts"), &hKey) =3D=3D ERROR_SUCCESS) - { - Ret =3D RegEnumKey(hKey, dwIndex, szBuf, sizeof(szBuf) / sizeof(TCHAR)); - if (Ret =3D=3D ERROR_SUCCESS) - { - while (Ret =3D=3D ERROR_SUCCESS) - { - _stprintf(KeyName, _T("System\\CurrentControlSet\\Control\\Keyboard La= youts\\%s"), szBuf); - if (RegOpenKey(HKEY_LOCAL_MACHINE, KeyName, &hSubKey) =3D=3D ERROR_SUC= CESS) - { - DWORD Length =3D MAX_PATH; + if (RegOpenKey(HKEY_LOCAL_MACHINE, _T("System\\CurrentControlSet\\Cont= rol\\Keyboard Layouts"), &hKey) =3D=3D ERROR_SUCCESS) + { + Ret =3D RegEnumKey(hKey, dwIndex, szBuf, sizeof(szBuf) / sizeof(TC= HAR)); + if (Ret =3D=3D ERROR_SUCCESS) + { + while (Ret =3D=3D ERROR_SUCCESS) + { + _stprintf(KeyName, _T("System\\CurrentControlSet\\Control\= \Keyboard Layouts\\%s"), szBuf); + if (RegOpenKey(HKEY_LOCAL_MACHINE, KeyName, &hSubKey) =3D= =3D ERROR_SUCCESS) + { + DWORD Length =3D MAX_PATH; = - if (RegQueryValueEx(hSubKey, _T("Layout Text"), NULL, NULL, (LPBYTE)K= eyName, &Length) =3D=3D ERROR_SUCCESS) - { - UINT iIndex; - iIndex =3D (UINT) SendMessage(hLayoutList, CB_ADDSTRING, 0, (LPARAM)= KeyName); + if (RegQueryValueEx(hSubKey, _T("Layout Text"), NULL, = NULL, (LPBYTE)KeyName, &Length) =3D=3D ERROR_SUCCESS) + { + UINT iIndex; + iIndex =3D (UINT) SendMessage(hLayoutList, CB_ADDS= TRING, 0, (LPARAM)KeyName); = - SendMessage(hLayoutList, CB_SETITEMDATA, iIndex, (LPARAM)szBuf); + SendMessage(hLayoutList, CB_SETITEMDATA, iIndex, (= LPARAM)szBuf); = - // FIXME! - if (_tcscmp(szBuf, _T("00000409")) =3D=3D 0) - { - SendMessage(hLayoutList, CB_SELECTSTRING, (WPARAM) -1, (LPARAM)KeyN= ame); - } + // FIXME! + if (_tcscmp(szBuf, _T("00000409")) =3D=3D 0) + { + SendMessage(hLayoutList, CB_SELECTSTRING, (WPA= RAM) -1, (LPARAM)KeyName); + } = - dwIndex++; - Ret =3D RegEnumKey(hKey, dwIndex, szBuf, sizeof(szBuf) / sizeof(TCHA= R)); - } - } + dwIndex++; + Ret =3D RegEnumKey(hKey, dwIndex, szBuf, sizeof(sz= Buf) / sizeof(TCHAR)); + } + } = - RegCloseKey(hSubKey); - } - } - } + RegCloseKey(hSubKey); + } + } + } = - RegCloseKey(hKey); + RegCloseKey(hKey); } = /* Language enumerate procedure */ @@ -128,12 +128,12 @@ SendMessage(hLangList, CB_SETITEMDATA, Index, (LPARAM)Lcid); = - // FIXME! - if (Lcid =3D=3D 0x0409) - { - SendMessage(hLangList, CB_SELECTSTRING, + // FIXME! + if (Lcid =3D=3D 0x0409) + { + SendMessage(hLangList, CB_SELECTSTRING, (WPARAM) -1, (LPARAM)Lang); - } + } = return TRUE; } @@ -149,42 +149,42 @@ switch (message) { case WM_INITDIALOG: - { - hLangList =3D GetDlgItem(hDlg, IDC_INPUT_LANG_COMBO); - hLayoutList =3D GetDlgItem(hDlg, IDC_KEYBOARD_LO_COMBO); + { + hLangList =3D GetDlgItem(hDlg, IDC_INPUT_LANG_COMBO); + hLayoutList =3D GetDlgItem(hDlg, IDC_KEYBOARD_LO_COMBO); EnumSystemLocales(LanguagesEnumProc, LCID_INSTALLED); CreateKeyboardLayoutList(); - } + } break; = case WM_COMMAND: - { + { switch (LOWORD(wParam)) { case IDC_INPUT_LANG_COMBO: - { + { if (HIWORD(wParam) =3D=3D CBN_SELCHANGE) { SelectLayoutByLang(); } - } + } break; = case IDOK: - { - AddNewLayout(hDlg); - EndDialog(hDlg, LOWORD(wParam)); - } + { + AddNewLayout(hDlg); + EndDialog(hDlg, LOWORD(wParam)); + } break; = case IDCANCEL: - { + { EndDialog(hDlg, LOWORD(wParam)); return TRUE; - } + } } - } - break; + } + break; } = return FALSE; Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c= ?rev=3D32665&r1=3D32664&r2=3D32665&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/input.c (original) +++ trunk/reactos/dll/cpl/input/input.c Wed Mar 12 08:50:30 2008 @@ -37,7 +37,7 @@ /* Applets */ APPLET Applets[NUM_APPLETS] =3D { - {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApple= t} + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApp= let} }; = = Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/setting= s.c?rev=3D32665&r1=3D32664&r2=3D32665&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/dll/cpl/input/settings.c (original) +++ trunk/reactos/dll/cpl/input/settings.c Wed Mar 12 08:50:30 2008 @@ -15,12 +15,12 @@ = typedef struct { - LANGID LangId; - TCHAR LangName[MAX_PATH]; - TCHAR LayoutName[MAX_PATH]; - TCHAR ValName[MAX_PATH]; - TCHAR IndName[MAX_PATH]; - TCHAR SubName[MAX_PATH]; + LANGID LangId; + TCHAR LangName[MAX_PATH]; + TCHAR LayoutName[MAX_PATH]; + TCHAR ValName[MAX_PATH]; + TCHAR IndName[MAX_PATH]; + TCHAR SubName[MAX_PATH]; } LAYOUT_ITEM, *LPLAYOUT_ITEM; = BOOL @@ -50,7 +50,7 @@ { LV_COLUMN column; TCHAR szBuf[MAX_PATH]; - HWND hList =3D GetDlgItem(hWnd, IDC_KEYLAYOUT_LIST); + HWND hList =3D GetDlgItem(hWnd, IDC_KEYLAYOUT_LIST); = ZeroMemory(&column, sizeof(LV_COLUMN)); column.mask =3D LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBIT= EM; @@ -67,7 +67,7 @@ column.cx =3D 160; (VOID) ListView_InsertColumn(hList, 1, &column); = - column.fmt =3D LVCFMT_RIGHT; + column.fmt =3D LVCFMT_RIGHT; column.cx =3D 145; column.iSubItem =3D 2; LoadString(hApplet, IDS_LAYOUT, szBuf, sizeof(szBuf) / sizeof(TCHAR)); @@ -78,88 +78,88 @@ static BOOL InitLangList(HWND hWnd) { - HKEY hKey, hSubKey; - TCHAR szBuf[MAX_PATH], szPreload[MAX_PATH], szSub[MAX_PATH]; - LAYOUT_ITEM lItem; - AddListColumn(hWnd); - LONG Ret; - DWORD dwIndex =3D 0, dwType, dwSize; - LV_ITEM item; - HWND hList =3D GetDlgItem(hWnd, IDC_KEYLAYOUT_LIST); - - (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_FULLROWSELECT); - = + HKEY hKey, hSubKey; + TCHAR szBuf[MAX_PATH], szPreload[MAX_PATH], szSub[MAX_PATH]; + LAYOUT_ITEM lItem; + AddListColumn(hWnd); + LONG Ret; + DWORD dwIndex =3D 0, dwType, dwSize; + LV_ITEM item; + HWND hList =3D GetDlgItem(hWnd, IDC_KEYLAYOUT_LIST); + + (VOID) ListView_SetExtendedListViewStyle(hList, LVS_EX_FULLROWSELECT); + = if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), - 0, KEY_QUERY_VALUE, &hKey) =3D=3D ERROR_SUCCESS) + 0, KEY_QUERY_VALUE, &hKey) =3D=3D ERROR_SUCCESS) { - dwSize =3D MAX_PATH; - Ret =3D RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NULL,= NULL); - if (Ret =3D=3D ERROR_SUCCESS) - { - while (Ret =3D=3D ERROR_SUCCESS) - { - _tcscpy(lItem.ValName, szBuf); - - dwSize =3D MAX_PATH; - RegQueryValueEx(hKey, szBuf, NULL, NULL, (LPBYTE)szPreload, &dwSize); - - lItem.LangId =3D _tcstoul(szPreload, NULL, 16); - - GetLocaleInfo(lItem.LangId, LOCALE_SISO639LANGNAME, (LPTSTR) szBuf, si= zeof(szBuf)); - _tcscpy(lItem.IndName, _tcsupr(szBuf)); - - GetLocaleInfo(lItem.LangId, LOCALE_SLANGUAGE, (LPTSTR)szBuf, sizeof(sz= Buf)); - _tcscpy(lItem.LangName, szBuf); - = - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), - 0, KEY_QUERY_VALUE, &hSubKey) =3D=3D ERROR_SUCCESS) - { - dwSize =3D MAX_PATH; - if (RegQueryValueEx(hSubKey, szPreload, NULL, NULL, (LPBYTE)szSub, &d= wSize) =3D=3D ERROR_SUCCESS) - { - _tcscpy(lItem.SubName, szPreload); - if (GetLayoutName(szSub, szBuf)) - { - _tcscpy(lItem.LayoutName, szBuf); - } - } - else - { - _tcscpy(lItem.SubName, _T("")); - } - } - - if (_tcslen(lItem.SubName) < 2) - { - if (GetLayoutName(szPreload, szBuf)) - { - _tcscpy(lItem.LayoutName, szBuf); - } - } - = - ZeroMemory(&item, sizeof(LV_ITEM)); - item.mask =3D LVIF_TEXT | LVIF_PARAM | LVIF_STATE; - item.pszText =3D lItem.IndName; - item.lParam =3D (LPARAM)&lItem; - item.iItem =3D (INT) dwIndex; - INT i =3D ListView_InsertItem(hList, &item); - - ListView_SetItemText(hList, i, 1, lItem.LangName); - ListView_SetItemText(hList, i, 2, lItem.LayoutName); - - dwIndex++; - Ret =3D RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType, NUL= L, NULL); - RegCloseKey(hSubKey); - - if (_tcscmp(lItem.ValName, _T("1")) =3D=3D 0) - { - (VOID) ListView_SetHotItem(hList, i); - } - } - } - } - - RegCloseKey(hKey); + dwSize =3D MAX_PATH; + Ret =3D RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, &dwType,= NULL, NULL); + if (Ret =3D=3D ERROR_SUCCESS) + { + while (Ret =3D=3D ERROR_SUCCESS) + { + _tcscpy(lItem.ValName, szBuf); + + dwSize =3D MAX_PATH; + RegQueryValueEx(hKey, szBuf, NULL, NULL, (LPBYTE)szPreload= , &dwSize); + + lItem.LangId =3D _tcstoul(szPreload, NULL, 16); + + GetLocaleInfo(lItem.LangId, LOCALE_SISO639LANGNAME, (LPTST= R) szBuf, sizeof(szBuf)); + _tcscpy(lItem.IndName, _tcsupr(szBuf)); + + GetLocaleInfo(lItem.LangId, LOCALE_SLANGUAGE, (LPTSTR)szBu= f, sizeof(szBuf)); + _tcscpy(lItem.LangName, szBuf); + = + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\S= ubstitutes"), + 0, KEY_QUERY_VALUE, &hSubKey) =3D=3D ERRO= R_SUCCESS) + { + dwSize =3D MAX_PATH; + if (RegQueryValueEx(hSubKey, szPreload, NULL, NULL, (L= PBYTE)szSub, &dwSize) =3D=3D ERROR_SUCCESS) + { + _tcscpy(lItem.SubName, szPreload); + if (GetLayoutName(szSub, szBuf)) + { + _tcscpy(lItem.LayoutName, szBuf); + } + } + else + { + _tcscpy(lItem.SubName, _T("")); + } + } + + if (_tcslen(lItem.SubName) < 2) + { + if (GetLayoutName(szPreload, szBuf)) + { + _tcscpy(lItem.LayoutName, szBuf); + } + } + = + ZeroMemory(&item, sizeof(LV_ITEM)); + item.mask =3D LVIF_TEXT | LVIF_PARAM | LVIF_STATE; + item.pszText =3D lItem.IndName; + item.lParam =3D (LPARAM)&lItem; + item.iItem =3D (INT) dwIndex; + INT i =3D ListView_InsertItem(hList, &item); + + ListView_SetItemText(hList, i, 1, lItem.LangName); + ListView_SetItemText(hList, i, 2, lItem.LayoutName); + + dwIndex++; + Ret =3D RegEnumValue(hKey, dwIndex, szBuf, &dwSize, NULL, = &dwType, NULL, NULL); + RegCloseKey(hSubKey); + + if (_tcscmp(lItem.ValName, _T("1")) =3D=3D 0) + { + (VOID) ListView_SetHotItem(hList, i); + } + } + } + } + + RegCloseKey(hKey); return TRUE; } =

1 0

[ros-arm-bringup] 32664: - Make another kind of page fault also be handleable by our hacked-up handler: paged pool now fully works. - Current status: we now make it all the way to the first system call at the end of Phase 0! - We now make the IRQL routines modify the IRQL saved in the KPCR, to make some assertions work. - Build mem.c and memgen.c from RTL in order to get non-optimized but portable Rtl*Memory routines and Rtl*Swap routines. - Take the PPC non-optimized but portable Ex*Interlocked
by ros-arm-bringup＠svn.reactos.org 12 Mar '08

12 Mar '08

Author: ros-arm-bringup Date: Tue Mar 11 19:13:09 2008 New Revision: 32664 URL: http://svn.reactos.org/svn/reactos?rev=3D32664&view=3Drev Log: - Make another kind of page fault also be handleable by our hacked-up handl= er: paged pool now fully works. - Current status: we now make it all the way to the first system call at th= e end of Phase 0! - We now make the IRQL routines modify the IRQL saved in the KPCR, to make = some assertions work. - Build mem.c and memgen.c from RTL in order to get non-optimized but porta= ble Rtl*Memory routines and Rtl*Swap routines. - Take the PPC non-optimized but portable Ex*Interlocked* routines and make= them available for ARM as well. Play with the code a bit to get other rout= ines in there too. - Major TODO: Cleanup these routines, re-format them, make them compatible = for all architectures, and later on, provided optimized ARM versions. - Remove _all* _aull* MSVC-i386 helper exports from the kernel, as well as = Exfi386* routines -- they're only for x86 kernels. Added: trunk/reactos/ntoskrnl/ex/fastinterlck.c (contents, props changed) - copied, changed from r32654, trunk/reactos/ntoskrnl/ex/powerpc/fast= interlck.c Removed: trunk/reactos/ntoskrnl/ex/powerpc/fastinterlck.c Modified: trunk/reactos/hal/halarm/generic/hal.c trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ke/arm/trapc.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/ntoskrnl_arm.def Modified: trunk/reactos/hal/halarm/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/generic/ha= l.c?rev=3D32664&r1=3D32663&r2=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/hal/halarm/generic/hal.c (original) +++ trunk/reactos/hal/halarm/generic/hal.c Tue Mar 11 19:13:09 2008 @@ -769,7 +769,8 @@ KfLowerIrql( KIRQL NewIrql) { - UNIMPLEMENTED; + KeGetPcr()->CurrentIrql =3D NewIrql; + UNIMPLEMENTED; } = = @@ -778,9 +779,11 @@ KfRaiseIrql( KIRQL NewIrql) { - UNIMPLEMENTED; - - return (KIRQL)0; + KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; + KeGetPcr()->CurrentIrql =3D NewIrql; + UNIMPLEMENTED; + + return OldIrql; } = VOID @@ -912,22 +915,28 @@ KIRQL KeSwapIrql(IN KIRQL Irql) { + KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; + KeGetPcr()->CurrentIrql =3D Irql; UNIMPLEMENTED; - return 0; + return OldIrql; } = KIRQL KeRaiseIrqlToDpcLevel(VOID) { + KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; + KeGetPcr()->CurrentIrql =3D SYNCH_LEVEL; UNIMPLEMENTED; - return 0; + return OldIrql; } = KIRQL KeRaiseIrqlToSynchLevel(VOID) { + KIRQL OldIrql =3D KeGetPcr()->CurrentIrql; + KeGetPcr()->CurrentIrql =3D SYNCH_LEVEL; UNIMPLEMENTED; - return 0; + return OldIrql; } = BOOLEAN HalpProcessorIdentified; Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?re= v=3D32664&r1=3D32663&r2=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Tue Mar 11 19:13:09 2008 @@ -33,6 +33,8 @@ <directory name=3D"arm"> <file>debug_asm.S</file> </directory> + <file>mem.c</file> + <file>memgen.c</file> </if> <directory name=3D"austin"> <file>avl.c</file> Copied: trunk/reactos/ntoskrnl/ex/fastinterlck.c (from r32654, trunk/reacto= s/ntoskrnl/ex/powerpc/fastinterlck.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinter= lck.c?p2=3Dtrunk/reactos/ntoskrnl/ex/fastinterlck.c&p1=3Dtrunk/reactos/ntos= krnl/ex/powerpc/fastinterlck.c&r1=3D32654&r2=3D32664&rev=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/powerpc/fastinterlck.c (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c Tue Mar 11 19:13:09 2008 @@ -1,293 +1,370 @@ -/* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ex/powerpc/fastinterlck.c - * PURPOSE: Executive Atom Functions - * PROGRAMMERS: Art Yerkes - */ - -/* INCLUDES **************************************************************= ***/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedFlushSList(IN PSLIST_HEADER ListHead) -{ - PSLIST_ENTRY NewHead =3D NULL; - _InterlockedExchangePointer((PVOID *)&ListHead->Next.Next, &NewHead); - return NewHead; -} - -#undef ExInterlockedPushEntrySList -NTKERNELAPI -PSLIST_ENTRY -FASTCALL -ExInterlockedPushEntrySList -(IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY ListEntry) -{ - return InterlockedPushEntrySList(ListHead, ListEntry); -} - -#undef ExInterlockedPopEntrySList -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPopEntrySList( - IN PSLIST_HEADER ListHead, - IN PKSPIN_LOCK Lock) -{ - return InterlockedPopEntrySList(ListHead); -} - -#undef ExInterlockedAddULong -NTKERNELAPI -ULONG -NTAPI -ExfInterlockedAddUlong( - IN PULONG Addend, - IN ULONG Increment, - PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - KeAcquireSpinLock(Lock, &OldIrql); - *Addend +=3D Increment; - KeReleaseSpinLock(Lock, OldIrql); - return *Addend; -} - -NTKERNELAPI -LONGLONG -FASTCALL -ExfInterlockedCompareExchange64( - IN OUT LONGLONG volatile *Destination, - IN PLONGLONG Exchange, - IN PLONGLONG Comperand) -{ - return _InterlockedCompareExchange64(Destination, *Exchange, *Comperan= d); -} - -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock, &OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Flink; - InsertHeadList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock,&OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Blink; - InsertTailList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExfInterlockedPopEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExfInterlockedPushEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return ExInterlockedRemoveHeadList(ListHead, Lock); -} - -NTKERNELAPI -INTERLOCKED_RESULT -FASTCALL -Exfi386InterlockedIncrementLong( - IN PLONG Addend) -{ - return InterlockedIncrement(Addend); -} - -NTKERNELAPI -INTERLOCKED_RESULT -FASTCALL -Exfi386InterlockedDecrementLong( - IN PLONG Addend) -{ - return InterlockedDecrement(Addend); -} - -NTKERNELAPI -ULONG -FASTCALL -Exfi386InterlockedExchangeUlong( - IN PULONG Target, - IN ULONG Value) -{ - return (ULONG)_InterlockedExchange((PLONG)Target, Value); -} - -NTKERNELAPI -LARGE_INTEGER -NTAPI -ExInterlockedAddLargeInteger( - IN PLARGE_INTEGER Addend, - IN LARGE_INTEGER Increment, - IN PKSPIN_LOCK Lock) -{ - LARGE_INTEGER tmp, comp, outnum; - - do { - tmp.QuadPart =3D Addend->QuadPart + Increment.QuadPart; - comp =3D *Addend; - outnum.QuadPart =3D _InterlockedCompareExchange64 - (&Addend->QuadPart, tmp.QuadPart, comp.QuadPart); - } while(outnum.QuadPart !=3D comp.QuadPart); - - return outnum; -} - -NTKERNELAPI -ULONG -NTAPI -ExInterlockedAddUlong( - IN PULONG Addend, - IN ULONG Increment, - PKSPIN_LOCK Lock) -{ - return (ULONG)_InterlockedExchangeAdd((PLONG)Addend, Increment); -} - -#undef ExInterlockedIncrementLong -NTKERNELAPI -INTERLOCKED_RESULT -NTAPI -ExInterlockedIncrementLong( - IN PLONG Addend, - IN PKSPIN_LOCK Lock) -{ - return _InterlockedIncrement(Addend); -} - -#undef ExInterlockedDecrementLong -NTKERNELAPI -INTERLOCKED_RESULT -NTAPI -ExInterlockedDecrementLong( - IN PLONG Addend, - IN PKSPIN_LOCK Lock) -{ - return _InterlockedDecrement(Addend); -} - -NTKERNELAPI -ULONG -NTAPI -ExInterlockedExchangeUlong( - IN PULONG Target, - IN ULONG Value, - IN PKSPIN_LOCK Lock) -{ - return (ULONG)_InterlockedExchange((PLONG)Target, Value); -} - -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock,&OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Flink; - InsertHeadList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock,&OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Blink; - InsertTailList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPopEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPushEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} +/* + * PROJECT: ReactOS Kernel + * COPYRIGHT: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ex/powerpc/fastinterlck.c + * PURPOSE: Executive Atom Functions + * PROGRAMMERS: Art Yerkes + */ + +/* INCLUDES **************************************************************= ***/ + +#include <ntoskrnl.h> +#include <internal/debug.h> + +NTKERNELAPI +PSLIST_ENTRY +NTAPI +InterlockedPushEntrySList(IN PSLIST_HEADER ListHead, + IN PSLIST_ENTRY ListEntry) +{ + = + PSINGLE_LIST_ENTRY FirstEntry, NextEntry, Entry =3D (PVOID)ListEntry, = Head =3D (PVOID)ListHead; + = + FirstEntry =3D Head->Next; + do + { + Entry->Next =3D FirstEntry; + NextEntry =3D FirstEntry; + FirstEntry =3D (PVOID)_InterlockedCompareExchange((PLONG)Head, (LO= NG)Entry, (LONG)FirstEntry); + } while (FirstEntry !=3D NextEntry); + = + return FirstEntry; +} + +NTKERNELAPI +PSLIST_ENTRY +NTAPI +InterlockedPopEntrySList(IN PSLIST_HEADER ListHead) +{ + PSINGLE_LIST_ENTRY FirstEntry, NextEntry, Head =3D (PVOID)ListHead; + = + FirstEntry =3D Head->Next; + do + { + if (!FirstEntry) return NULL; + + NextEntry =3D FirstEntry; + FirstEntry =3D (PVOID)_InterlockedCompareExchange((PLONG)Head, (LO= NG)FirstEntry->Next, (LONG)FirstEntry); + } while (FirstEntry !=3D NextEntry); + + return FirstEntry; = +} + +NTKERNELAPI +PSINGLE_LIST_ENTRY +FASTCALL +ExInterlockedFlushSList(IN PSLIST_HEADER ListHead) +{ + return (PVOID)_InterlockedExchange((PLONG)&ListHead->Next.Next, (LONG)= NULL); +} + +#undef ExInterlockedPushEntrySList +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +ExInterlockedPushEntrySList +(IN PSLIST_HEADER ListHead, + IN PSLIST_ENTRY ListEntry) +{ + return InterlockedPushEntrySList(ListHead, ListEntry); +} + +#undef ExInterlockedPopEntrySList +NTKERNELAPI +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPopEntrySList( + IN PSLIST_HEADER ListHead, + IN PKSPIN_LOCK Lock) +{ + return InterlockedPopEntrySList(ListHead); +} + +#undef ExInterlockedAddULong +NTKERNELAPI +ULONG +NTAPI +ExfInterlockedAddUlong( + IN PULONG Addend, + IN ULONG Increment, + PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + KeAcquireSpinLock(Lock, &OldIrql); + *Addend +=3D Increment; + KeReleaseSpinLock(Lock, OldIrql); + return *Addend; +} + +NTKERNELAPI +LONGLONG +FASTCALL +ExfInterlockedCompareExchange64( + IN OUT LONGLONG volatile *Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comperand) +{ + LONGLONG Result; + = + Result =3D *Destination; + if (*Destination =3D=3D Result) *Destination =3D *Exchange; + return Result; +} + +NTKERNELAPI +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertHeadList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead =3D NULL; + KeAcquireSpinLock(Lock, &OldIrql); + if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Flink; + InsertHeadList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +NTKERNELAPI +PLIST_ENTRY +FASTCALL +ExfInterlockedInsertTailList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead =3D NULL; + KeAcquireSpinLock(Lock,&OldIrql); + if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Blink; + InsertTailList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +NTKERNELAPI +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPopEntryList( + IN PSINGLE_LIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + return NULL; +} + +NTKERNELAPI +PSINGLE_LIST_ENTRY +FASTCALL +ExfInterlockedPushEntryList( + IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + return NULL; +} + +NTKERNELAPI +PLIST_ENTRY +FASTCALL +ExfInterlockedRemoveHeadList( + IN PLIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + return ExInterlockedRemoveHeadList(ListHead, Lock); +} + +NTKERNELAPI +INTERLOCKED_RESULT +FASTCALL +Exfi386InterlockedIncrementLong( + IN PLONG Addend) +{ + return InterlockedIncrement(Addend); +} + +NTKERNELAPI +INTERLOCKED_RESULT +FASTCALL +Exfi386InterlockedDecrementLong( + IN PLONG Addend) +{ + return InterlockedDecrement(Addend); +} + +NTKERNELAPI +ULONG +FASTCALL +Exfi386InterlockedExchangeUlong( + IN PULONG Target, + IN ULONG Value) +{ + return (ULONG)_InterlockedExchange((PLONG)Target, Value); +} + +NTKERNELAPI +LARGE_INTEGER +NTAPI +ExInterlockedAddLargeInteger( + IN PLARGE_INTEGER Addend, + IN LARGE_INTEGER Increment, + IN PKSPIN_LOCK Lock) +{ + LARGE_INTEGER Integer =3D {{0}}; + UNIMPLEMENTED; + return Integer; +} + +NTKERNELAPI +ULONG +NTAPI +ExInterlockedAddUlong( + IN PULONG Addend, + IN ULONG Increment, + PKSPIN_LOCK Lock) +{ + return (ULONG)_InterlockedExchangeAdd((PLONG)Addend, Increment); +} + +#undef ExInterlockedIncrementLong +NTKERNELAPI +INTERLOCKED_RESULT +NTAPI +ExInterlockedIncrementLong( + IN PLONG Addend, + IN PKSPIN_LOCK Lock) +{ + return _InterlockedIncrement(Addend); +} + +#undef ExInterlockedDecrementLong +NTKERNELAPI +INTERLOCKED_RESULT +NTAPI +ExInterlockedDecrementLong( + IN PLONG Addend, + IN PKSPIN_LOCK Lock) +{ + return _InterlockedDecrement(Addend); +} + +NTKERNELAPI +ULONG +NTAPI +ExInterlockedExchangeUlong( + IN PULONG Target, + IN ULONG Value, + IN PKSPIN_LOCK Lock) +{ + return (ULONG)_InterlockedExchange((PLONG)Target, Value); +} + +NTKERNELAPI +PLIST_ENTRY +NTAPI +ExInterlockedInsertHeadList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead =3D NULL; + KeAcquireSpinLock(Lock,&OldIrql); + if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Flink; + InsertHeadList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +NTKERNELAPI +PLIST_ENTRY +NTAPI +ExInterlockedInsertTailList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead =3D NULL; + KeAcquireSpinLock(Lock,&OldIrql); + if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Blink; + InsertTailList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +NTKERNELAPI +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPopEntryList( + IN PSINGLE_LIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PSINGLE_LIST_ENTRY OldHead =3D NULL; + KeAcquireSpinLock(Lock,&OldIrql); + OldHead =3D PopEntryList(ListHead); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +NTKERNELAPI +PSINGLE_LIST_ENTRY +NTAPI +ExInterlockedPushEntryList( + IN PSINGLE_LIST_ENTRY ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PSINGLE_LIST_ENTRY OldHead =3D NULL; + KeAcquireSpinLock(Lock,&OldIrql); + OldHead =3D PushEntryList(ListHead, ListEntry); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +NTKERNELAPI +PLIST_ENTRY +NTAPI +ExInterlockedRemoveHeadList( + IN PLIST_ENTRY ListHead, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + PLIST_ENTRY OldHead =3D NULL; + KeAcquireSpinLock(Lock,&OldIrql); + OldHead =3D RemoveHeadList(ListHead); + KeReleaseSpinLock(Lock, OldIrql); + return OldHead; +} + +NTKERNELAPI +VOID +FASTCALL +ExInterlockedAddLargeStatistic +(IN PLARGE_INTEGER Addend, + IN ULONG Increment) +{ + UNIMPLEMENTED; +} + +NTKERNELAPI +LONGLONG +FASTCALL +ExInterlockedCompareExchange64(IN OUT PLONGLONG Destination, + IN PLONGLONG Exchange, + IN PLONGLONG Comparand, + IN PKSPIN_LOCK Lock) +{ + KIRQL OldIrql; + LONGLONG Result; + = + KeAcquireSpinLock(Lock, &OldIrql); + Result =3D *Destination; + if (*Destination =3D=3D Result) *Destination =3D *Exchange; + KeReleaseSpinLock(Lock, OldIrql); + return Result; +} Propchange: trunk/reactos/ntoskrnl/ex/fastinterlck.c ---------------------------------------------------------------------------= --- svn:eol-style =3D native Propchange: trunk/reactos/ntoskrnl/ex/fastinterlck.c ---------------------------------------------------------------------------= --- svn:mime-type =3D text/plain Removed: trunk/reactos/ntoskrnl/ex/powerpc/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/powerpc/f= astinterlck.c?rev=3D32663&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ex/powerpc/fastinterlck.c (original) +++ trunk/reactos/ntoskrnl/ex/powerpc/fastinterlck.c (removed) @@ -1,293 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * COPYRIGHT: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ex/powerpc/fastinterlck.c - * PURPOSE: Executive Atom Functions - * PROGRAMMERS: Art Yerkes - */ - -/* INCLUDES **************************************************************= ***/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedFlushSList(IN PSLIST_HEADER ListHead) -{ - PSLIST_ENTRY NewHead =3D NULL; - _InterlockedExchangePointer((PVOID *)&ListHead->Next.Next, &NewHead); - return NewHead; -} - -#undef ExInterlockedPushEntrySList -NTKERNELAPI -PSLIST_ENTRY -FASTCALL -ExInterlockedPushEntrySList -(IN PSLIST_HEADER ListHead, - IN PSLIST_ENTRY ListEntry) -{ - return InterlockedPushEntrySList(ListHead, ListEntry); -} - -#undef ExInterlockedPopEntrySList -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPopEntrySList( - IN PSLIST_HEADER ListHead, - IN PKSPIN_LOCK Lock) -{ - return InterlockedPopEntrySList(ListHead); -} - -#undef ExInterlockedAddULong -NTKERNELAPI -ULONG -NTAPI -ExfInterlockedAddUlong( - IN PULONG Addend, - IN ULONG Increment, - PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - KeAcquireSpinLock(Lock, &OldIrql); - *Addend +=3D Increment; - KeReleaseSpinLock(Lock, OldIrql); - return *Addend; -} - -NTKERNELAPI -LONGLONG -FASTCALL -ExfInterlockedCompareExchange64( - IN OUT LONGLONG volatile *Destination, - IN PLONGLONG Exchange, - IN PLONGLONG Comperand) -{ - return _InterlockedCompareExchange64(Destination, *Exchange, *Comperan= d); -} - -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock, &OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Flink; - InsertHeadList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock,&OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Blink; - InsertTailList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExfInterlockedPopEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExfInterlockedPushEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PLIST_ENTRY -FASTCALL -ExfInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return ExInterlockedRemoveHeadList(ListHead, Lock); -} - -NTKERNELAPI -INTERLOCKED_RESULT -FASTCALL -Exfi386InterlockedIncrementLong( - IN PLONG Addend) -{ - return InterlockedIncrement(Addend); -} - -NTKERNELAPI -INTERLOCKED_RESULT -FASTCALL -Exfi386InterlockedDecrementLong( - IN PLONG Addend) -{ - return InterlockedDecrement(Addend); -} - -NTKERNELAPI -ULONG -FASTCALL -Exfi386InterlockedExchangeUlong( - IN PULONG Target, - IN ULONG Value) -{ - return (ULONG)_InterlockedExchange((PLONG)Target, Value); -} - -NTKERNELAPI -LARGE_INTEGER -NTAPI -ExInterlockedAddLargeInteger( - IN PLARGE_INTEGER Addend, - IN LARGE_INTEGER Increment, - IN PKSPIN_LOCK Lock) -{ - LARGE_INTEGER tmp, comp, outnum; - - do { - tmp.QuadPart =3D Addend->QuadPart + Increment.QuadPart; - comp =3D *Addend; - outnum.QuadPart =3D _InterlockedCompareExchange64 - (&Addend->QuadPart, tmp.QuadPart, comp.QuadPart); - } while(outnum.QuadPart !=3D comp.QuadPart); - - return outnum; -} - -NTKERNELAPI -ULONG -NTAPI -ExInterlockedAddUlong( - IN PULONG Addend, - IN ULONG Increment, - PKSPIN_LOCK Lock) -{ - return (ULONG)_InterlockedExchangeAdd((PLONG)Addend, Increment); -} - -#undef ExInterlockedIncrementLong -NTKERNELAPI -INTERLOCKED_RESULT -NTAPI -ExInterlockedIncrementLong( - IN PLONG Addend, - IN PKSPIN_LOCK Lock) -{ - return _InterlockedIncrement(Addend); -} - -#undef ExInterlockedDecrementLong -NTKERNELAPI -INTERLOCKED_RESULT -NTAPI -ExInterlockedDecrementLong( - IN PLONG Addend, - IN PKSPIN_LOCK Lock) -{ - return _InterlockedDecrement(Addend); -} - -NTKERNELAPI -ULONG -NTAPI -ExInterlockedExchangeUlong( - IN PULONG Target, - IN ULONG Value, - IN PKSPIN_LOCK Lock) -{ - return (ULONG)_InterlockedExchange((PLONG)Target, Value); -} - -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock,&OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Flink; - InsertHeadList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - KIRQL OldIrql; - PLIST_ENTRY OldHead =3D NULL; - KeAcquireSpinLock(Lock,&OldIrql); - if (!IsListEmpty(ListHead)) OldHead =3D ListEntry->Blink; - InsertTailList(ListHead, ListEntry); - KeReleaseSpinLock(Lock, OldIrql); - return OldHead; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPopEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PSINGLE_LIST_ENTRY -NTAPI -ExInterlockedPushEntryList( - IN PSINGLE_LIST_ENTRY ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} - -NTKERNELAPI -PLIST_ENTRY -NTAPI -ExInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PKSPIN_LOCK Lock) -{ - return NULL; -} Modified: trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/stubs= _asm.s?rev=3D32664&r1=3D32663&r2=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s (original) +++ trunk/reactos/ntoskrnl/ke/arm/stubs_asm.s Tue Mar 11 19:13:09 2008 @@ -1,38 +1,4 @@ #include <internal/arm/asmmacro.S> - -// -// Interlocked APIs -// -GENERATE_ARM_STUB ExInterlockedAddLargeInteger = -GENERATE_ARM_STUB ExInterlockedAddLargeStatistic = -GENERATE_ARM_STUB ExInterlockedAddUlong = -GENERATE_ARM_STUB ExInterlockedCompareExchange64 -GENERATE_ARM_STUB ExInterlockedDecrementLong = -GENERATE_ARM_STUB ExInterlockedExchangeUlong = -GENERATE_ARM_STUB ExInterlockedFlushSList = -GENERATE_ARM_STUB ExInterlockedIncrementLong = -GENERATE_ARM_STUB ExInterlockedInsertHeadList = -GENERATE_ARM_STUB ExInterlockedInsertTailList = -GENERATE_ARM_STUB ExInterlockedPopEntryList = -GENERATE_ARM_STUB ExInterlockedPopEntrySList = -GENERATE_ARM_STUB ExInterlockedPushEntryList = -GENERATE_ARM_STUB ExInterlockedPushEntrySList = -GENERATE_ARM_STUB ExInterlockedRemoveHeadList = -GENERATE_ARM_STUB ExfInterlockedAddUlong = -GENERATE_ARM_STUB ExfInterlockedCompareExchange64 -GENERATE_ARM_STUB ExfInterlockedInsertHeadList = -GENERATE_ARM_STUB ExfInterlockedInsertTailList = -GENERATE_ARM_STUB ExfInterlockedPopEntryList = -GENERATE_ARM_STUB ExfInterlockedPushEntryList = -GENERATE_ARM_STUB ExfInterlockedRemoveHeadList = -GENERATE_ARM_STUB Exfi386InterlockedDecrementLong = -GENERATE_ARM_STUB Exfi386InterlockedExchangeUlong = -GENERATE_ARM_STUB Exfi386InterlockedIncrementLong = -GENERATE_ARM_STUB Exi386InterlockedDecrementLong = -GENERATE_ARM_STUB Exi386InterlockedExchangeUlong = -GENERATE_ARM_STUB Exi386InterlockedIncrementLong = -GENERATE_ARM_STUB InterlockedPopEntrySList = -GENERATE_ARM_STUB InterlockedPushEntrySList = = // // Port I/O and Register Access @@ -49,35 +15,6 @@ GENERATE_ARM_STUB WRITE_REGISTER_UCHAR = GENERATE_ARM_STUB WRITE_REGISTER_ULONG = GENERATE_ARM_STUB WRITE_REGISTER_USHORT = - -// -// CRT APIs implemented in ASM -// -GENERATE_ARM_STUB _alldiv = -GENERATE_ARM_STUB _alldvrm = -GENERATE_ARM_STUB _allmul = -GENERATE_ARM_STUB _alloca_probe = -GENERATE_ARM_STUB _allrem = -GENERATE_ARM_STUB _allshl = -GENERATE_ARM_STUB _allshr = -GENERATE_ARM_STUB _aulldiv = -GENERATE_ARM_STUB _aulldvrm = -GENERATE_ARM_STUB _aullrem = -GENERATE_ARM_STUB _aullshr = - -// -// RTL CRT-like APIs implemented in ASM -// -GENERATE_ARM_STUB RtlCompareMemory = -GENERATE_ARM_STUB RtlCompareMemoryUlong = -GENERATE_ARM_STUB RtlFillMemory = -GENERATE_ARM_STUB RtlFillMemoryUlong = -GENERATE_ARM_STUB RtlMoveMemory = -GENERATE_ARM_STUB RtlPrefetchMemoryNonTemporal = -GENERATE_ARM_STUB RtlUlongByteSwap = -GENERATE_ARM_STUB RtlUlonglongByteSwap = -GENERATE_ARM_STUB RtlUshortByteSwap = -GENERATE_ARM_STUB RtlZeroMemory = = // // Exceptions Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdi= ni.c?rev=3D32664&r1=3D32663&r2=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c Tue Mar 11 19:13:09 2008 @@ -87,7 +87,7 @@ // // Set the previous mode as user // - TrapFrame->PreviousMode =3D UserMode; + //TrapFrame->PreviousMode =3D UserMode; Thread->PreviousMode =3D UserMode; = // @@ -112,7 +112,7 @@ // // Set the previous mode as kernel // - Thread->PreviousMode =3D KernelMode; + //Thread->PreviousMode =3D KernelMode; = // // Context switch frame to setup below Modified: trunk/reactos/ntoskrnl/ke/arm/trapc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/trapc= .c?rev=3D32664&r1=3D32663&r2=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ke/arm/trapc.c (original) +++ trunk/reactos/ntoskrnl/ke/arm/trapc.c Tue Mar 11 19:13:09 2008 @@ -27,7 +27,7 @@ // // Check if this is a page fault // - if (KeArmFaultStatusRegisterGet() =3D=3D 21) + if (KeArmFaultStatusRegisterGet() =3D=3D 21 || KeArmFaultStatusRegiste= rGet() =3D=3D 23) { Status =3D MmAccessFault(FALSE, Address, Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-gen= eric.rbuild?rev=3D32664&r1=3D32663&r2=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Tue Mar 11 19:13:09 2008 @@ -172,8 +172,11 @@ <if property=3D"ARCH" value=3D"powerpc"> <directory name=3D"powerpc"> <file>ioport.s</file> - <file>fastinterlck.c</file> - </directory> + </directory> + <file>fastinterlck.c</file> + </if> + <if property=3D"ARCH" value=3D"arm"> + <file>fastinterlck.c</file> </if> <file>atom.c</file> <file>callback.c</file> Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm= .def?rev=3D32664&r1=3D32663&r2=3D32664&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/ntoskrnl_arm.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.def Tue Mar 11 19:13:09 2008 @@ -167,12 +167,6 @@ ExfInterlockedPopEntryList ExfInterlockedPushEntryList ExfInterlockedRemoveHeadList -Exfi386InterlockedDecrementLong -Exfi386InterlockedExchangeUlong -Exfi386InterlockedIncrementLong -Exi386InterlockedDecrementLong -Exi386InterlockedExchangeUlong -Exi386InterlockedIncrementLong FsRtlAcquireFileExclusive ;FsRtlAddBaseMcbEntry FsRtlAddLargeMcbEntry @@ -1435,17 +1429,6 @@ ZwWriteFile ZwYieldExecution _abnormal_termination -_alldiv -_allmul -_alloca_probe -_allrem -_allshl -_allshr -_alldvrm -_aulldiv -_aulldvrm -_aullrem -_aullshr _except_handler2 _except_handler3 _global_unwind2

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs