Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

by jcatena＠svn.reactos.org

Author: jcatena Date: Sun Feb 7 06:17:13 2010 New Revision: 45481 URL: http://svn.reactos.org/svn/reactos?rev=45481&view=rev Log: [ntos] msvc wip Modified: branches/jcatena-branch/ntoskrnl/ex/init.c branches/jcatena-branch/ntoskrnl/include/internal/ke.h branches/jcatena-branch/ntoskrnl/include/internal/ob.h branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h branches/jcatena-branch/ntoskrnl/include/ntoskrnl_bld.h branches/jcatena-branch/ntoskrnl/ke/dpc.c branches/jcatena-branch/ntoskrnl/ke/i386/irqobj.c branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c branches/jcatena-branch/ntoskrnl/ke/thrdobj.c branches/jcatena-branch/ntoskrnl/ke/thrdschd.c branches/jcatena-branch/ntoskrnl/mm/mminit.c branches/jcatena-branch/ntoskrnl/ps/process.c branches/jcatena-branch/ntoskrnl/ps/thread.c branches/jcatena-branch/ntoskrnl/trap/i386/TrapStub.h branches/jcatena-branch/ntoskrnl/trap/trap.c branches/jcatena-branch/ntoskrnl/trap/trap.h branches/jcatena-branch/ntoskrnl/trap/trap.vcproj Modified: branches/jcatena-branch/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ex/init… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ex/init.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -1226,6 +1226,10 @@ DPRINTT("DbgkInitialize\n"); DbgkInitialize(); + DPRINTT("DbgkInitialize r\n"); + _asm int 3 + + /* Calculate the tick count multiplier */ ExpTickCountMultiplier = ExComputeTickCountMultiplier(KeMaximumIncrement); SharedUserData->TickCountMultiplier = ExpTickCountMultiplier; @@ -1265,6 +1269,19 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; DPRINTT("\n"); + + // _enable(); + // DPRINTT("_enable\n"); + // _ASM int 3 + __test(0x110, 0); + + + // DPRINTT("DbgWait\n"); + // DbgWait(5000 * 10000); + // DPRINTT("DbgWait r\n"); + // _ASM int 3 + + /* Allocate the initialization buffer */ InitBuffer = ExAllocatePoolWithTag(NonPagedPool, sizeof(INIT_BUFFER), @@ -1282,7 +1299,11 @@ KeSetPriorityThread(KeGetCurrentThread(), HIGH_PRIORITY); /* Do Phase 1 HAL Initialization */ - if (!HalInitSystem(1, LoaderBlock)) KeBugCheck(HAL1_INITIALIZATION_FAILED); + DPRINTT("HalInitSystem\n"); + if (!HalInitSystem(1, LoaderBlock)) + KeBugCheck(HAL1_INITIALIZATION_FAILED); + DPRINTT("HalInitSystem r\n"); + /* Get the command line and upcase it */ CommandLine = _strupr(LoaderBlock->LoadOptions); Modified: branches/jcatena-branch/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… ============================================================================== --- branches/jcatena-branch/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/include/internal/ke.h [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -98,9 +98,13 @@ extern UCHAR KeProcessNodeSeed; extern ETHREAD KiInitialThread; extern EPROCESS KiInitialProcess; + +#if 0 // moved to interrupt.h extern PULONG KiInterruptTemplateObject; extern PULONG KiInterruptTemplateDispatch; extern PULONG KiInterruptTemplate2ndDispatch; +#endif + extern ULONG KiUnexpectedEntrySize; extern ULONG_PTR KiDoubleFaultStack; extern EX_PUSH_LOCK KernelAddressSpaceLock; Modified: branches/jcatena-branch/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… ============================================================================== --- branches/jcatena-branch/ntoskrnl/include/internal/ob.h [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/include/internal/ob.h [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -9,7 +9,7 @@ // // Define this if you want debugging support // -#define _OB_DEBUG_ 0x00 +#define _OB_DEBUG_ 0xFF // // These define the Debug Masks Supported Modified: branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… ============================================================================== --- branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -305,7 +305,7 @@ mov eax, KTRAP_FRAME.Eax[esp] mov ecx, KTRAP_FRAME.Ecx[esp] mov edx, KTRAP_FRAME.Edx[esp] - jmp edx + iretd #else mov ebx, [esp+KTRAP_FRAME_EBX] mov esi, [esp+KTRAP_FRAME_ESI] @@ -624,15 +624,14 @@ #endif } -// // Returns whether or not this is a V86 trap by checking the EFLAGS field. -// -// FIXME: GCC 4.5 Can Improve this with "goto labels" -// BOOLEAN FORCEINLINE KiIsV8086TrapSafe(IN PKTRAP_FRAME TrapFrame) { +#if defined(_MSC_VER) + return TrapFrame->EFlags & EFLAGS_V86_MASK ? TRUE : FALSE; +#elif defined(__GNUC__) BOOLEAN Result; /* @@ -642,12 +641,9 @@ * Instead, we use the SS segment which is guaranteed to be correct. Because * operate in 32-bit flat mode, this works just fine. */ -#if defined(_MSC_VER) - _ASM_BEGIN - test ss:[TrapFrame+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - setnz Result - _ASM_END -#elif defined(__GNUC__) +// +// FIXME: GCC 4.5 Can Improve this with "goto labels" +// asm volatile ( "testl $%c[f], %%ss:%1\n" @@ -656,13 +652,13 @@ : "m"(TrapFrame->EFlags), [f] "i"(EFLAGS_V86_MASK) ); -#elif -#error unsupported compiler -#endif - /* If V86 flag was set */ return Result; -} +#elif +#error unsupported compiler +#endif +} + // // Returns whether or not this is a user-mode trap by checking the SegCs field. @@ -673,8 +669,9 @@ FORCEINLINE KiIsUserTrapSafe(IN PKTRAP_FRAME TrapFrame) { - BOOLEAN Result; - +#if defined(_MSC_VER) + return TrapFrame->SegCs != KGDT_R0_CODE ? TRUE : FALSE; +#elif defined(__GNUC__) /* * The check MUST be done this way, as we guarantee that no DS/ES/FS segment * is used (since it might be garbage). @@ -682,13 +679,9 @@ * Instead, we use the SS segment which is guaranteed to be correct. Because * operate in 32-bit flat mode, this works just fine. */ -#if defined(_MSC_VER) - _ASM_BEGIN - cmp ss:[TrapFrame+KTRAP_FRAME_CS], KGDT_R0_CODE - setnz Result - _ASM_END -#elif defined(__GNUC__) - asm volatile + BOOLEAN Result; + + asm volatile ( "cmp $%c[f], %%ss:%1\n" "setnz %0\n" @@ -696,12 +689,12 @@ : "m"(TrapFrame->SegCs), [f] "i"(KGDT_R0_CODE) ); -#elif -#error unsupported compiler -#endif - /* If V86 flag was set */ return Result; +#elif +#error unsupported compiler +#endif + } VOID @@ -940,6 +933,7 @@ } } +#if 0 // // Interrupt Trap Entry // @@ -947,15 +941,16 @@ FORCEINLINE KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { - ULONG Ds, Es; + + // ULONG Ds, Es; /* Check for V86 mode, otherwise check for ring 3 code */ if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 0)) { /* Set correct segments */ - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - Ke386SetFs(KGDT_R0_PCR); + // Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + // Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + // Ke386SetFs(KGDT_R0_PCR); /* Restore V8086 segments into Protected Mode segments */ TrapFrame->SegFs = TrapFrame->V86Fs; @@ -965,20 +960,12 @@ } else if (__builtin_expect(KiIsUserTrapSafe(TrapFrame), 1)) /* Ring 3 is more common */ { - /* Save DS/ES and load correct values */ - Es = Ke386GetEs(); - Ds = Ke386GetDs(); - TrapFrame->SegDs = Ds; - TrapFrame->SegEs = Es; - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - - /* Save FS/GS */ - TrapFrame->SegFs = Ke386GetFs(); + /* Save GS */ + // TrapFrame->SegFs = Ke386GetFs(); TrapFrame->SegGs = Ke386GetGs(); /* Set correct FS */ - Ke386SetFs(KGDT_R0_PCR); + // Ke386SetFs(KGDT_R0_PCR); } /* Save exception list and terminate it */ @@ -997,8 +984,10 @@ } /* Set debug header */ - KiFillTrapFrameDebug(TrapFrame); -} + // KiFillTrapFrameDebug(TrapFrame); +} +#endif + #if 0 // @@ -1178,7 +1167,7 @@ _ASM_BEGIN mov KTRAP_FRAME.Eax[esp], eax mov KTRAP_FRAME.Ecx[esp], ecx - mov KTRAP_FRAME.Edx[esp], eax + mov KTRAP_FRAME.Edx[esp], edx _ASM_END #elif defined(__GNUC) __asm__ __volatile__ Modified: branches/jcatena-branch/ntoskrnl/include/ntoskrnl_bld.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/include… ============================================================================== --- branches/jcatena-branch/ntoskrnl/include/ntoskrnl_bld.h [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/include/ntoskrnl_bld.h [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -140,4 +140,4 @@ #define HALDISPATCH (&HalDispatchTable) #define ExRaiseStatus RtlRaiseStatus -void __test(void); +void __test(int fn, void *arg); Modified: branches/jcatena-branch/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/dpc.… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ke/dpc.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -454,6 +454,8 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD NextThread, Thread = Prcb->CurrentThread; + DPRINTT("\n"); + /* Check if a DPC Event was requested to be signaled */ if (InterlockedExchange(&Prcb->DpcSetEventRequest, 0)) { Modified: branches/jcatena-branch/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -43,23 +43,20 @@ Entry = HalVectorToIDTEntry(Vector); /* Setup the handlers */ - Dispatch->NoDispatch = (PVOID)KiInterruptNoDispatch; + Dispatch->NoDispatch = (PVOID)KiInterruptNoDispatch; Dispatch->InterruptDispatch = (PVOID)KiInterruptDispatch; - Dispatch->FloatingDispatch = (PVOID)KiInterruptNoDispatch; // Floating Interrupts are not supported + Dispatch->FloatingDispatch = (PVOID)KiInterruptNoDispatch; // Floating Interrupts are not supported Dispatch->ChainedDispatch = (PVOID)KiChainedDispatch; - // Dispatch->FlatDispatch = NULL; - Dispatch->FlatDispatch = (PVOID)KiInterruptNoDispatch; + Dispatch->FlatDispatch = (PVOID)NULL; /* Get the current handler */ Current = KeQueryInterruptHandler(Vector); /* Set the interrupt */ - Dispatch->Interrupt = CONTAINING_RECORD(Current, - KINTERRUPT, - DispatchCode); + Dispatch->Interrupt = KiInterruptGetObject(Current); /* Check what this interrupt is connected to */ - if ((PKINTERRUPT_ROUTINE)Current == Dispatch->NoDispatch) + if (Current == (PVOID)Dispatch->NoDispatch) { /* Not connected */ Dispatch->Type = NoConnect; @@ -95,7 +92,9 @@ DISPATCH_INFO Dispatch; PKINTERRUPT_ROUTINE Handler; - /* Get vector data */ + DPRINTT("\n"); + + /* Get vector data */ KiGetVectorDispatch(Interrupt->Vector, &Dispatch); /* Check if we're only disconnecting */ @@ -121,9 +120,13 @@ ASSERT(Dispatch.FlatDispatch == NULL); Handler = (PVOID)&Interrupt->DispatchCode; } - + /* Register the interrupt */ - KeRegisterInterruptHandler(Interrupt->Vector, Handler); + _ASM int 3 + Interrupt->DispatchAddress = Handler; + KeRegisterInterruptHandler(Interrupt->Vector, (PVOID)&Interrupt->DispatchCode); + + // KeRegisterInterruptHandler(Interrupt->Vector, Handler); } VOID @@ -145,27 +148,22 @@ KiEoiHelper(TrapFrame); } -#if 0 VOID KiUnexpectedInterrupt(VOID) { /* Crash the machine */ KeBugCheck(TRAP_CAUSE_UNKNOWN); } -#endif - -typedef void (FASTCALL PKI_INTERRUPT_DISPATCH)(IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt); - + VOID FASTCALL -// KiUnexpectedInterruptTailHandler(IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt ) -KiInterruptNoDispatch(IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt) +KiUnexpectedInterruptTailHandler(IN PKTRAP_FRAME TrapFrame, PKINTERRUPT Interrupt) { KIRQL OldIrql; - DPRINTT("\n"); - - /* Enter trap */ + DPRINTT("\n"); + + /* Enter trap */ KiEnterInterruptTrap(TrapFrame); /* Increase interrupt count */ @@ -187,12 +185,52 @@ } } -VOID FASTCALL KiInterruptDispatch(IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt) +typedef +VOID +(FASTCALL PKI_INTERRUPT_DISPATCH)( + IN PKTRAP_FRAME TrapFrame, + IN PKINTERRUPT Interrupt +); + +VOID +FASTCALL +KiInterruptNoDispatch(IN PKTRAP_FRAME TrapFrame, PKINTERRUPT Interrupt) +{ + KIRQL OldIrql; + + DPRINTT("\n"); + + /* Enter trap */ + KiEnterInterruptTrap(TrapFrame); + + /* Increase interrupt count */ + KeGetCurrentPrcb()->InterruptCount++; + + /* Start the interrupt */ + if (HalBeginSystemInterrupt(HIGH_LEVEL, Interrupt->Vector, &OldIrql)) + { + /* Warn user */ + DPRINT1("\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n"); + + /* Now call the epilogue code */ + KiExitInterrupt(TrapFrame, OldIrql, FALSE); + } + else + { + /* Now call the epilogue code */ + KiExitInterrupt(TrapFrame, OldIrql, TRUE); + } +} + +VOID +FASTCALL +KiInterruptDispatch(IN PKTRAP_FRAME TrapFrame, + IN PKINTERRUPT Interrupt) { KIRQL OldIrql; - DPRINTT("\n"); - /* Increase interrupt count */ + DPRINTT("\n"); + /* Increase interrupt count */ KeGetCurrentPrcb()->InterruptCount++; /* Begin the interrupt, making sure it's not spurious */ @@ -228,8 +266,9 @@ BOOLEAN Handled; PLIST_ENTRY NextEntry, ListHead; - DPRINTT("\n"); - /* Increase interrupt count */ + DPRINTT("\n"); + + /* Increase interrupt count */ KeGetCurrentPrcb()->InterruptCount++; /* Begin the interrupt, making sure it's not spurious */ @@ -296,25 +335,21 @@ } } - -#if 0 VOID FASTCALL KiInterruptTemplateHandler(IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt) { - /* Enter interrupt frame */ + DPRINTT("\n"); + /* Enter interrupt frame */ KiEnterInterruptTrap(TrapFrame); /* Call the correct dispatcher */ ((PKI_INTERRUPT_DISPATCH*)Interrupt->DispatchAddress)(TrapFrame, Interrupt); } -#endif - -#if 0 -KiTrap(KiInterruptTemplate, KI_PUSH_FAKE_ERROR_CODE | KI_HARDWARE_INT); -KiTrap(KiUnexpectedInterruptTail, KI_PUSH_FAKE_ERROR_CODE); -#endif + +// KiTrap(KiInterruptTemplate, KI_PUSH_FAKE_ERROR_CODE | KI_HARDWARE_INT); +// KiTrap(KiUnexpectedInterruptTail, KI_PUSH_FAKE_ERROR_CODE); /* PUBLIC FUNCTIONS **********************************************************/ @@ -335,10 +370,7 @@ IN CHAR ProcessorNumber, IN BOOLEAN FloatingSave) { - // ULONG i; - iptru PatchAddr; - PULONG DispatchCode = &Interrupt->DispatchCode[0]; - PULONG Patch = DispatchCode; + PULONG DispatchCode = &Interrupt->DispatchCode[0]; /* Set the Interrupt Header */ Interrupt->Type = InterruptObject; @@ -368,29 +400,12 @@ Interrupt->FloatingSave = FloatingSave; Interrupt->TickCount = MAXULONG; Interrupt->DispatchCount = MAXULONG; - Interrupt->DispatchAddress = (PKINTERRUPT_ROUTINE)KiInterruptNoDispatch; - -#if 0 // !!! - /* Loop the template in memory */ - for (i = 0; i < KINTERRUPT_DISPATCH_CODES; i++) - { - /* Copy the dispatch code */ - *DispatchCode++ = ((PULONG)KiInterruptTemplate)[i]; - } -#endif - -#if 0 - /* Jump to the last 4 bytes */ - Patch = (PULONG)((ULONG_PTR)Patch + - ((ULONG_PTR)&KiInterruptTemplateObject - - (ULONG_PTR)KiInterruptTemplate) - 4); - - /* Apply the patch */ - *Patch = PtrToUlong(Interrupt); -#endif - - PatchAddr = (iptru)KiInterrupt0 + Interrupt->Vector * ((iptru)KiInterrupt1 - (iptru)KiInterrupt0); - *((iptru *)(PatchAddr+1)) = (iptru)Interrupt; + + /* copy the handler template code to the actual handler instance */ + memcpy(DispatchCode, KiInterruptTemplate, KiInterruptTemplateSize); + + // patch handler to associate PKINTERRUPT to it + KiInterruptSetObject(DispatchCode, Interrupt); /* Disconnect it at first */ Interrupt->Connected = FALSE; @@ -409,7 +424,9 @@ ULONG Vector; DISPATCH_INFO Dispatch; - /* Get data from interrupt */ + DPRINTT("\n"); + + /* Get data from interrupt */ Number = Interrupt->Number; Vector = Interrupt->Vector; Irql = Interrupt->Irql; @@ -507,7 +524,8 @@ PKINTERRUPT NextInterrupt; BOOLEAN State; - /* Set the affinity */ + DPRINTT("\n"); + /* Set the affinity */ KeSetSystemAffinityThread(1 << Interrupt->Number); /* Lock the dispatcher */ @@ -588,6 +606,8 @@ NTSTATUS Status; KIRQL OldIrql; + DPRINTT("\n"); + /* Raise IRQL */ OldIrql = KfRaiseIrql(Interrupt->SynchronizeIrql); Modified: branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/i386… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -1159,7 +1159,6 @@ return; // !!! KiEoiHelper(TrapFrame); } - DPRINTT("KiEoiHelper r\n"); /* Check for S-LIST fault */ if (TrapFrame->Eip == (ULONG_PTR)ExpInterlockedPopEntrySListFault) Modified: branches/jcatena-branch/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/thrd… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -1317,7 +1317,7 @@ /* Return Old Priority */ DPRINTT("ret=%x\n", OldPriority); - + return OldPriority; } /* Modified: branches/jcatena-branch/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ke/thrd… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ke/thrdschd.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -345,7 +345,9 @@ PKTHREAD NextThread; ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); - /* Acquire the PRCB lock */ + DPRINTT("\n"); + + /* Acquire the PRCB lock */ KiAcquirePrcbLock(Prcb); /* Get the next thread */ @@ -711,7 +713,9 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD Thread = KeGetCurrentThread(), NextThread; - /* Fail if there's no ready summary */ + DPRINTT("\n"); + + /* Fail if there's no ready summary */ if (!Prcb->ReadySummary) return Status; /* Raise IRQL to synch */ Modified: branches/jcatena-branch/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/mm/mmin… ============================================================================== --- branches/jcatena-branch/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -361,6 +361,7 @@ if (Phase == 0) { + DPRINTT("phase 0\n"); /* Initialize the kernel address space */ KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); MmKernelAddressSpace = MmGetCurrentAddressSpace(); @@ -412,9 +413,6 @@ /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE); - - DPRINT1("__test\n"); - __test(); /* Reload boot drivers */ MiReloadBootLoadedDrivers(LoaderBlock); @@ -432,7 +430,8 @@ } else if (Phase == 1) { - MmInitializeRmapList(); + DPRINTT("phase 1\n"); + MmInitializeRmapList(); MmInitializePageOp(); MmInitSectionImplementation(); MmInitPagingFile(); @@ -479,7 +478,7 @@ { } - + DPRINTT("r\n"); return TRUE; } Modified: branches/jcatena-branch/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ps/proc… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ps/process.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -371,7 +371,6 @@ DPRINTT("PSTRACE\n"); PSTRACE(PS_PROCESS_DEBUG, "ProcessHandle: %p Parent: %p\n", ProcessHandle, ParentProcess); - DPRINTT("PSTRACE r\n"); /* Validate flags */ if (Flags & ~PS_ALL_FLAGS) return STATUS_INVALID_PARAMETER; @@ -380,12 +379,14 @@ if (ParentProcess) { /* Reference it */ - Status = ObReferenceObjectByHandle(ParentProcess, + DPRINTT("ObReferenceObjectByHandle\n"); + Status = ObReferenceObjectByHandle(ParentProcess, PROCESS_CREATE_PROCESS, PsProcessType, PreviousMode, (PVOID*)&Parent, NULL); + DPRINTT("ObReferenceObjectByHandle r=%x\n", Status); if (!NT_SUCCESS(Status)) return Status; /* If this process should be in a job but the parent isn't */ Modified: branches/jcatena-branch/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/ps/thre… ============================================================================== --- branches/jcatena-branch/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/ps/thread.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -143,7 +143,10 @@ PSTRACE(PS_THREAD_DEBUG, "StartRoutine: %p StartContext: %p\n", StartRoutine, StartContext); - /* Unlock the dispatcher Database */ + // CpuDumpCpu(7); + // _ASM int 3 + + /* Unlock the dispatcher Database */ KeLowerIrql(PASSIVE_LEVEL); Thread = PsGetCurrentThread(); Modified: branches/jcatena-branch/ntoskrnl/trap/i386/TrapStub.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/trap/i3… ============================================================================== --- branches/jcatena-branch/ntoskrnl/trap/i386/TrapStub.h [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/trap/i386/TrapStub.h [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -14,10 +14,10 @@ #define TRAP_STUB_FS KGDT_R0_PCR #endif -#define TRAP_STUB_NAMEH tokenpaste(TRAP_STUB_NAME, Handler) +// #define TRAP_STUB_NAMEH tokenpaste(TRAP_STUB_NAME, Handler) #if (TRAP_STUB_FLAGS & TRAPF_INTERRUPT) -VOID _FASTCALL tokenpaste(TRAP_STUB_NAME, Handler)(KTRAP_FRAME *TrapFrame); +VOID _FASTCALL tokenpaste(TRAP_STUB_NAME, Handler)(KTRAP_FRAME *TrapFrame, PKINTERRUPT Interrupt); #else VOID _FASTCALL tokenpaste(TRAP_STUB_NAME, Handler)(KTRAP_FRAME *TrapFrame); #endif @@ -33,7 +33,8 @@ mov esp, KTSS.Esp0[esp] sub esp, dword ptr offset KTRAP_FRAME.V86Es #elif (TRAP_STUB_FLAGS & TRAPF_INTERRUPT) - // the primary stub (trap_m.h) pushes the vector number + // the primary stub (trap_m.h) pushes a pointer to KINTERRUPT + int 3 sub esp, offset KTRAP_FRAME.ErrCode #elif (TRAP_STUB_FLAGS & TRAPF_ERRORCODE) sub esp, offset KTRAP_FRAME.ErrCode @@ -61,24 +62,26 @@ #if !(TRAP_STUB_FLAGS & TRAPF_NOSAVESEG) mov KTRAP_FRAME.SegDs[esp], ds mov KTRAP_FRAME.SegEs[esp], es -#if !(TRAP_STUB_FLAGS & TRAPF_NOSAVEFS) - mov KTRAP_FRAME.SegFs[esp], fs -#endif #if !(TRAP_STUB_FLAGS & TRAPF_NOLOADDS) -#ifndef TRAP_STUB_DS -#define TRAP_STUB_DS (KGDT_R3_DATA | RPL_MASK) -#endif mov ax, TRAP_STUB_DS mov ds, ax mov es, ax #endif +#if !(TRAP_STUB_FLAGS & TRAPF_NOSAVEFS) + mov KTRAP_FRAME.SegFs[esp], fs +#if (TRAP_STUB_FLAGS & TRAPF_LOADFS) + mov ax, TRAP_STUB_FS + mov fs, ax #endif +#endif // #if !(TRAP_STUB_FLAGS & TRAPF_NOSAVEFS) +#endif // #if !(TRAP_STUB_FLAGS & TRAPF_NOSAVESEG) // call handler #if (TRAP_STUB_FLAGS & TRAPF_INTERRUPT) mov edx, KTRAP_FRAME.ErrCode[esp] mov ecx, esp - call KINTERRUPT.DispatchAddress[edx] + call tokenpaste(TRAP_STUB_NAME, Handler) + // call KINTERRUPT.DispatchAddress[edx] #else mov ecx, esp call tokenpaste(TRAP_STUB_NAME, Handler) Modified: branches/jcatena-branch/ntoskrnl/trap/trap.c URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/trap/tr… ============================================================================== --- branches/jcatena-branch/ntoskrnl/trap/trap.c [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/trap/trap.c [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -140,8 +140,19 @@ void *kk = KiTrap00; +VOID _FASTCALL KiInterruptHandler(KTRAP_FRAME *TrapFrame, PKINTERRUPT Interrupt) +{ + DPRINTT("\n"); + _ASM int 3 + KiInterruptTemplateHandler(TrapFrame, Interrupt); + // KiTrapReturn(TrapFrame); +} + VOID _CDECL KiTrapInit(VOID) { - KiInterruptInitialData.DispatchAddress = (PKINTERRUPT_ROUTINE)KiInterruptNoDispatch; + PKINTERRUPT Interrupt = &KiInterruptInitialData; + + Interrupt->DispatchAddress = (PKINTERRUPT_ROUTINE)KiInterruptNoDispatch; + Interrupt->Vector = 0x30; } Modified: branches/jcatena-branch/ntoskrnl/trap/trap.h URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/trap/tr… ============================================================================== --- branches/jcatena-branch/ntoskrnl/trap/trap.h [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/trap/trap.h [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -2,7 +2,8 @@ #define DBGTRAP DPRINT1 // #define DBGTRAPENTRY DPRINT1("\n"); DbgDumpCpu(7|DBG_DUMPCPU_TSS); DPRINT1("TrapFrame=%p:\n", TrapFrame); DbgDumpMem(TrapFrame, 0x80) -#define DBGTRAPENTRY DbgDumpCpu(7); DPRINT1("TrapFrame=%p:\n", TrapFrame); DbgDumpMem(TrapFrame, sizeof(KTRAP_FRAME)); +// #define DBGTRAPENTRY DbgDumpCpu(7); DPRINT1("TrapFrame=%p:\n", TrapFrame); DbgDumpMem(TrapFrame, sizeof(KTRAP_FRAME)); +#define DBGTRAPENTRY // TRAP_STUB_FLAGS TrapStub x-macro flags // trap type @@ -14,10 +15,24 @@ #define TRAPF_NOSAVEFS 0x200 #define TRAPF_SAVENOVOL 0x400 #define TRAPF_NOLOADDS 0x800 +#define TRAPF_LOADFS 0x1000 #include <trap_asm.h> +// interrupt handler template +VOID _CDECL KiInterruptTemplate(VOID); +extern PULONG KiInterruptTemplateEnd; +extern PULONG KiInterruptTemplateObject; +extern PULONG KiInterruptTemplateDispatch; +extern PULONG KiInterruptTemplate2ndDispatch; +#define KiInterruptTemplateSize ((iptru)&KiInterruptTemplateEnd - (iptru)KiInterruptTemplate) +#define KiInterruptTemplateObjectOffset ((iptru)&KiInterruptTemplateObject - (iptru)KiInterruptTemplate - sizeof(iptru)) + extern KINTERRUPT KiInterruptInitialData; + +VOID _FASTCALL KiInterruptTemplateHandler(PKTRAP_FRAME TrapFrame, PKINTERRUPT Interrupt); +VOID _CDECL KiUnexpectedInterruptTail(VOID); +VOID _FASTCALL KiUnexpectedInterruptTailHandler(PKTRAP_FRAME TrapFrame, PKINTERRUPT Interrupt); VOID _CDECL KiTrapInit(VOID); VOID _CDECL KiInterrupt0(VOID); @@ -32,3 +47,18 @@ VOID KiExitTrapDebugChecks(IN PKTRAP_FRAME TrapFrame, IN KTRAP_EXIT_SKIP_BITS SkipBits); VOID KiEnterTrap(IN PKTRAP_FRAME TrapFrame); VOID KiExitTrap(IN PKTRAP_FRAME TrapFrame, IN UCHAR Skip); +VOID FASTCALL KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame); + + +// get the PKINTERRUPT assigned to the int handler +// it is an immediate patched in the handler code +// see KeInterruptTemplate code +PKINTERRUPT _INLINE KiInterruptGetObject(PVOID Handler) +{ + return *((PKINTERRUPT *)(((iptru)Handler)+KiInterruptTemplateObjectOffset)); +} + +VOID _INLINE KiInterruptSetObject(PVOID Handler, PKINTERRUPT Interrupt) +{ + *((PKINTERRUPT *)(((iptru)Handler)+KiInterruptTemplateObjectOffset)) = Interrupt; +} Modified: branches/jcatena-branch/ntoskrnl/trap/trap.vcproj URL: http://svn.reactos.org/svn/reactos/branches/jcatena-branch/ntoskrnl/trap/tr… ============================================================================== --- branches/jcatena-branch/ntoskrnl/trap/trap.vcproj [iso-8859-1] (original) +++ branches/jcatena-branch/ntoskrnl/trap/trap.vcproj [iso-8859-1] Sun Feb 7 06:17:13 2010 @@ -185,6 +185,10 @@ > </File> <File + RelativePath=".\i386\trap_m.s" + > + </File> + <File RelativePath=".\i386\TrapStub.h" > </File>

14 years, 7 months

[sir_richard] 45480: [NTOS]: Add a branch-to-self to start testing kernel code. [ARMLLB]: Fix incorrect frame buffer size calculation. [FREELDR]: Finish paging setup. Now we're able to boot to the kernel entrypoint at 0x808D3000, but I'm not happy with the memory descriptors.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Feb 7 04:01:19 2010 New Revision: 45480 URL: http://svn.reactos.org/svn/reactos?rev=45480&view=rev Log: [NTOS]: Add a branch-to-self to start testing kernel code. [ARMLLB]: Fix incorrect frame buffer size calculation. [FREELDR]: Finish paging setup. Now we're able to boot to the kernel entrypoint at 0x808D3000, but I'm not happy with the memory descriptors. Modified: trunk/reactos/boot/armllb/hw/versatile/hwinfo.c trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/ke/arm/boot.s Modified: trunk/reactos/boot/armllb/hw/versatile/hwinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/armllb/hw/versatile/h… ============================================================================== --- trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] (original) +++ trunk/reactos/boot/armllb/hw/versatile/hwinfo.c [iso-8859-1] Sun Feb 7 04:01:19 2010 @@ -47,8 +47,8 @@ // 0x00000200 - 0x0000FFFF ARM STACK [ 62 KB] // 0x00010000 - 0x0001FFFF ARM LLB [ 64 KB] // 0x00020000 - 0x0009FFFF ARM OS LOADER [512 KB] -// 0x000A0000 - 0x000FFFFF ARM FRAMEBUFFER [384 KB] -// 0x00100000 - 0x007FFFFF OS LOADER FREE/UNUSED [ 7 MB] +// 0x000A0000 - 0x0013FFFF ARM FRAMEBUFFER [640 KB] +// 0x00140000 - 0x007FFFFF OS LOADER FREE/UNUSED [ 6 MB] // 0x00800000 - 0x017FFFFF KERNEL, HAL, INITIAL DRIVER LOAD ADDR [ 16 MB] // 0x01800000 - 0x037FFFFF RAM DISK [ 32 MB] // 0x03800000 - 0x07FFFFFF FREE RAM [ 72 MB] @@ -61,8 +61,8 @@ {0x00000200, 0x0000FE00, BiosMemoryBootStrap, 0}, {0x00010000, 0x00010000, BiosMemoryBootStrap, 0}, {0x00020000, 0x00080000, BiosMemoryBootLoader, 0}, - {0x000A0000, 0x00060000, BiosMemoryBootLoader, 0}, - {0x00100000, 0x01700000, BiosMemoryUsable, 0}, + {0x000A0000, 0x000A0000, BiosMemoryBootLoader, 0}, + {0x00140000, 0x016C0000, BiosMemoryUsable, 0}, {0x01800000, 0x02000000, BiosMemoryReserved, 0}, {0x10000000, 0x10000000, BiosMemoryReserved, 0}, {0, 0, 0, 0} Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Sun Feb 7 04:01:19 2010 @@ -719,12 +719,9 @@ /* Get the Kernel Table Index */ KernelPageTableIndex = KernelBase >> PDE_SHIFT; - printf("Kernel Base: 0x%p (PDE Index: %lx)\n", KernelBase, KernelPageTableIndex); - - /* Allocate 1MB PDE_BASE and HYPER_SPACE. This will be improved later. Must be 1MB aligned */ + + /* Allocate 1MB PDE_BASE and HYPER_SPACE. This will be improved later. Must be 1MB aligned */ PageDir = MmAllocateMemoryAtAddress(1 * 1024 * 1024, (PVOID)0x700000, LoaderMemoryData); - if (!PageDir) { printf("FATAL: No memory!\n"); while (TRUE); } - printf("Initial Page Directory: 0x%p\n", PageDir); /* Setup the Low Memory PDE as an identity-mapped Large Page (1MB) */ LargePte = &PageDir->Pte[LowMemPageTableIndex]; @@ -741,31 +738,35 @@ /* Allocate 8 page tables (8KB) to describe the 8MB initial kernel region */ KernelPageTable = MmAllocateMemoryWithType(8192, LoaderMemoryData); - if (!KernelPageTable) { printf("FATAL: No memory!\n"); while (TRUE); } - printf("Kernel Page Tables: 0x%p\n", KernelPageTable); /* Setup the Kernel PDEs */ PointerPde = &PageDir->Pde[KernelPageTableIndex]; Pfn = PaPtrToPdePfn(KernelPageTable); for (i = 0; i < 8; i++) { - TempPde.PageFrameNumber = Pfn++; + TempPde.PageFrameNumber = Pfn; *PointerPde++ = TempPde; - } - + Pfn++; + } + + /* Setup the Kernel PTEs */ + PointerPte = KernelPageTable->Pte; + Pfn = PaPtrToPfn(KERNEL_BASE_PHYS); + for (i = 0; i < 1536; i++) + { + TempPte.PageFrameNumber = Pfn++; + *PointerPte++ = TempPte; + } + /* Setup the Startup PDE */ - printf("PAGEDIR: %p IDX: %lx PPDE: %p PFN: %lx \n", PageDir, StartupPdePageTableIndex, &PageDir->Pte[StartupPdePageTableIndex], PaToLargePfn((ULONG_PTR)PageDir)); LargePte = &PageDir->Pte[StartupPdePageTableIndex]; TempLargePte.PageFrameNumber = PaToLargePfn((ULONG_PTR)PageDir); - printf("PAGEDIR: %p IDX: %lx PPDE: %p PFN: %lx \n", PageDir, StartupPdePageTableIndex, LargePte, TempLargePte.PageFrameNumber); *LargePte = TempLargePte; /* After this point, any MiAddressToPde is guaranteed not to fault */ /* Allocate 4 page tables (4KB) to describe the 4MB PTE_BASE region */ PageTable = MmAllocateMemoryWithType(4096, LoaderMemoryData); - if (!PageTable) { printf("FATAL: No memory!\n"); while (TRUE); } - printf("Initial Page Tables: 0x%p\n", PageTable); /* * Link them in the Startup PDE. @@ -794,7 +795,6 @@ * and mapped in the PTE_BASE first, then the page table itself will be * editable through its flat PTE address. */ - printf("Paging init done\n"); return PageDir; } @@ -825,8 +825,6 @@ KeArmControlRegisterSet(ControlRegister); /* Jump to Kernel */ - TuiPrintf("Hello from MMU Enabled!\n"); - while (TRUE); (*KernelEntryPoint)((PVOID)((ULONG_PTR)ArmLoaderBlock | KSEG0_BASE)); } Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Sun Feb 7 04:01:19 2010 @@ -65,8 +65,8 @@ ULONG Valid:1; ULONG Buffered:1; ULONG Cached:1; + ULONG Accessed:1; ULONG Owner:1; - ULONG Accessed:1; ULONG CacheAttributes:3; ULONG ReadOnly:1; ULONG Shared:1; @@ -103,173 +103,6 @@ InvalidDomain, ManagerDomain } ARM_DOMAIN; - -// -// FIXFIX: This is all wrong now!!! -// -typedef union _ARM_PTE -{ - union - { - struct - { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Ignored:2; - ULONG Reserved:1; - ULONG Domain:4; - ULONG Ignored1:1; - ULONG BaseAddress:22; - } Coarse; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Reserved:1; - ULONG Domain:4; - ULONG Ignored:1; - ULONG Access:2; - ULONG Ignored1:8; - ULONG BaseAddress:12; - } Section; - struct - { - ULONG Type:2; - ULONG Reserved:3; - ULONG Domain:4; - ULONG Ignored:3; - ULONG BaseAddress:20; - } Fine; - } L1; - union - { - struct - { - ULONG Type:2; - ULONG Unused:30; - } Fault; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG Ignored:4; - ULONG BaseAddress:16; - } Large; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Access1:2; - ULONG Access2:2; - ULONG Access3:2; - ULONG BaseAddress:20; - } Small; - struct - { - ULONG Type:2; - ULONG Buffered:1; - ULONG Cached:1; - ULONG Access0:2; - ULONG Ignored:4; - ULONG BaseAddress:22; - } Tiny; - } L2; - ULONG AsUlong; -} ARM_PTE, *PARM_PTE; - -typedef struct _ARM_TRANSLATION_TABLE -{ - ARM_PTE Pte[4096]; -} ARM_TRANSLATION_TABLE, *PARM_TRANSLATION_TABLE; - -typedef struct _ARM_COARSE_PAGE_TABLE -{ - ARM_PTE Pte[256]; - ULONG Padding[768]; -} ARM_COARSE_PAGE_TABLE, *PARM_COARSE_PAGE_TABLE; - -typedef enum _ARM_L1_PTE_TYPE -{ - FaultPte, - CoarsePte, - SectionPte, - FinePte -} ARM_L1_PTE_TYPE; - -typedef enum _ARM_L2_PTE_TYPE -{ - LargePte = 1, - SmallPte, - TinyPte -} ARM_L2_PTE_TYPE; - -typedef enum _ARM_PTE_ACCESS -{ - FaultAccess, - SupervisorAccess, - SharedAccess, - UserAccess -} ARM_PTE_ACCESS; - -#if 0 - -// -// FIXFIX: This is all wrong now!!! -// - -// -// Take 0x80812345 and extract: -// PTE_BASE[0x808][0x12] -// -#define MiGetPteAddress(x) \ - (PMMPTE)(PTE_BASE + \ - (((ULONG)(x) >> 20) << 12) + \ - ((((ULONG)(x) >> 12) & 0xFF) << 2)) - -#define MiGetPdeAddress(x) \ - (PMMPDE_HARDWARE)(PDE_BASE + \ - (((ULONG)(x) >> 20) << 2)) - -#define MiGetPdeOffset(x) (((ULONG)(x)) >> 22) - -#define PTE_BASE 0xC0000000 -#define PTE_TOP 0xC03FFFFF -#define PDE_BASE 0xC1000000 -#define HYPER_SPACE 0xC1100000 - -// -// FIXME: THESE ARE WRONG ATM. -// -#define MiAddressToPde(x) \ -((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PDE_BASE)) -#define MiAddressToPte(x) \ -((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) -#define MiAddressToPteOffset(x) \ -((((ULONG)(x)) << 10) >> 22) - - -// -// Convert a PTE into a corresponding address -// -#define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) - -#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) -#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) -#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) - -#endif struct _EPROCESS; PULONG MmGetPageDirectory(VOID); @@ -288,4 +121,167 @@ /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) + +#if 1 + +// +// FIXFIX: This is all wrong now!!! +// + +// +// Take 0x80812345 and extract: +// PTE_BASE[0x808][0x12] +// +#define MiGetPteAddress(x) \ + (PMMPTE)(PTE_BASE + \ + (((ULONG)(x) >> 20) << 12) + \ + ((((ULONG)(x) >> 12) & 0xFF) << 2)) + +#define MiGetPdeAddress(x) \ + (PMMPDE_HARDWARE)(PDE_BASE + \ + (((ULONG)(x) >> 20) << 2)) + +#define MiGetPdeOffset(x) (((ULONG)(x)) >> 22) + +// +// FIXME: THESE ARE WRONG ATM. +// +#define MiAddressToPde(x) \ +((PMMPTE)(((((ULONG)(x)) >> 22) << 2) + PDE_BASE)) +#define MiAddressToPte(x) \ +((PMMPTE)(((((ULONG)(x)) >> 12) << 2) + PTE_BASE)) +#define MiAddressToPteOffset(x) \ +((((ULONG)(x)) << 10) >> 22) + + +// +// Convert a PTE into a corresponding address +// +#define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) + +#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) +#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) +#define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +// +// FIXFIX: This is all wrong now!!! +// +typedef union _ARM_PTE +{ + union + { + struct + { + ULONG Type:2; + ULONG Unused:30; + } Fault; + struct + { + ULONG Type:2; + ULONG Ignored:2; + ULONG Reserved:1; + ULONG Domain:4; + ULONG Ignored1:1; + ULONG BaseAddress:22; + } Coarse; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Reserved:1; + ULONG Domain:4; + ULONG Ignored:1; + ULONG Access:2; + ULONG Ignored1:8; + ULONG BaseAddress:12; + } Section; + struct + { + ULONG Type:2; + ULONG Reserved:3; + ULONG Domain:4; + ULONG Ignored:3; + ULONG BaseAddress:20; + } Fine; + } L1; + union + { + struct + { + ULONG Type:2; + ULONG Unused:30; + } Fault; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Access1:2; + ULONG Access2:2; + ULONG Access3:2; + ULONG Ignored:4; + ULONG BaseAddress:16; + } Large; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Access1:2; + ULONG Access2:2; + ULONG Access3:2; + ULONG BaseAddress:20; + } Small; + struct + { + ULONG Type:2; + ULONG Buffered:1; + ULONG Cached:1; + ULONG Access0:2; + ULONG Ignored:4; + ULONG BaseAddress:22; + } Tiny; + } L2; + ULONG AsUlong; +} ARM_PTE, *PARM_PTE; + +typedef struct _ARM_TRANSLATION_TABLE +{ + ARM_PTE Pte[4096]; +} ARM_TRANSLATION_TABLE, *PARM_TRANSLATION_TABLE; + +typedef struct _ARM_COARSE_PAGE_TABLE +{ + ARM_PTE Pte[256]; + ULONG Padding[768]; +} ARM_COARSE_PAGE_TABLE, *PARM_COARSE_PAGE_TABLE; + +typedef enum _ARM_L1_PTE_TYPE +{ + FaultPte, + CoarsePte, + SectionPte, + FinePte +} ARM_L1_PTE_TYPE; + +typedef enum _ARM_L2_PTE_TYPE +{ + LargePte = 1, + SmallPte, + TinyPte +} ARM_L2_PTE_TYPE; + +typedef enum _ARM_PTE_ACCESS +{ + FaultAccess, + SupervisorAccess, + SharedAccess, + UserAccess +} ARM_PTE_ACCESS; + #endif + +#endif Modified: trunk/reactos/ntoskrnl/ke/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/boot.s?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/boot.s [iso-8859-1] Sun Feb 7 04:01:19 2010 @@ -17,6 +17,7 @@ // // Put us in FIQ mode // + b . mrs r3, cpsr orr r3, r1, #CPSR_FIQ_MODE msr cpsr, r3

14 years, 7 months

[cwittich] 45479: [AVIFIL32] sync avifil32 to wine 1.1.38

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Feb 7 01:28:22 2010 New Revision: 45479 URL: http://svn.reactos.org/svn/reactos?rev=45479&view=rev Log: [AVIFIL32] sync avifil32 to wine 1.1.38 Modified: trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_Cs.rc trunk/reactos/dll/win32/avifil32/avifile_Da.rc trunk/reactos/dll/win32/avifil32/avifile_De.rc trunk/reactos/dll/win32/avifil32/avifile_En.rc trunk/reactos/dll/win32/avifil32/avifile_Es.rc trunk/reactos/dll/win32/avifil32/avifile_Fr.rc trunk/reactos/dll/win32/avifil32/avifile_Hu.rc trunk/reactos/dll/win32/avifil32/avifile_It.rc trunk/reactos/dll/win32/avifil32/avifile_Ja.rc trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/avifile_Nl.rc trunk/reactos/dll/win32/avifil32/avifile_No.rc trunk/reactos/dll/win32/avifil32/avifile_Pl.rc trunk/reactos/dll/win32/avifil32/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/avifile_Ru.rc trunk/reactos/dll/win32/avifil32/avifile_Si.rc trunk/reactos/dll/win32/avifil32/avifile_Sv.rc Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -244,7 +244,7 @@ /* if no handler then try guessing it by extension */ if (lpHandler == NULL) { if (! AVIFILE_GetFileHandlerByExtension(szFile, &clsidHandler)) - return AVIERR_UNSUPPORTED; + clsidHandler = CLSID_AVIFile; } else clsidHandler = *lpHandler; @@ -1225,13 +1225,14 @@ acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &size); if ((pOptions->cbFormat == 0 || pOptions->lpFormat == NULL) && size != 0) { pOptions->lpFormat = HeapAlloc(GetProcessHeap(), 0, size); + if (!pOptions->lpFormat) return FALSE; pOptions->cbFormat = size; } else if (pOptions->cbFormat < (DWORD)size) { - pOptions->lpFormat = HeapReAlloc(GetProcessHeap(), 0, pOptions->lpFormat, size); + void *new_buffer = HeapReAlloc(GetProcessHeap(), 0, pOptions->lpFormat, size); + if (!new_buffer) return FALSE; + pOptions->lpFormat = new_buffer; pOptions->cbFormat = size; } - if (pOptions->lpFormat == NULL) - return FALSE; afmtc.pwfx = pOptions->lpFormat; afmtc.cbwfx = pOptions->cbFormat; Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -1087,6 +1087,15 @@ LONG block = start; LONG offset = 0; + if (!buffer) + { + if (bytesread) + *bytesread = samples*This->sInfo.dwSampleSize; + if (samplesread) + *samplesread = samples; + return AVIERR_OK; + } + /* convert start sample to block,offset pair */ AVIFILE_SamplesToBlock(This, &block, &offset); @@ -1094,6 +1103,7 @@ samples *= This->sInfo.dwSampleSize; while (samples > 0 && buffersize > 0) { + LONG blocksize; if (block != This->dwCurrentFrame) { hr = AVIFILE_ReadBlock(This, block, NULL, 0); if (FAILED(hr)) @@ -1101,7 +1111,9 @@ } size = min((DWORD)samples, (DWORD)buffersize); - size = min(size, This->cbBuffer - offset); + blocksize = This->lpBuffer[1]; + TRACE("blocksize = %u\n",blocksize); + size = min(size, blocksize - offset); memcpy(buffer, ((BYTE*)&This->lpBuffer[2]) + offset, size); block++; @@ -1362,6 +1374,8 @@ static HRESULT AVIFILE_AddFrame(IAVIStreamImpl *This, DWORD ckid, DWORD size, DWORD offset, DWORD flags) { + UINT n; + /* pre-conditions */ assert(This != NULL); @@ -1379,31 +1393,32 @@ ERR(": found palette change in non-video stream!\n"); return AVIERR_BADFORMAT; } + + if (This->idxFmtChanges == NULL || This->nIdxFmtChanges <= This->sInfo.dwFormatChangeCount) { + DWORD new_count = This->nIdxFmtChanges + 16; + void *new_buffer; + + if (This->idxFmtChanges == NULL) { + This->idxFmtChanges = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, new_count * sizeof(AVIINDEXENTRY)); + if (!This->idxFmtChanges) return AVIERR_MEMORY; + } else { + new_buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFmtChanges, + new_count * sizeof(AVIINDEXENTRY)); + if (!new_buffer) return AVIERR_MEMORY; + This->idxFmtChanges = new_buffer; + } + This->nIdxFmtChanges = new_count; + } + This->sInfo.dwFlags |= AVISTREAMINFO_FORMATCHANGES; - This->sInfo.dwFormatChangeCount++; - - if (This->idxFmtChanges == NULL || This->sInfo.dwFormatChangeCount < This->nIdxFmtChanges) { - UINT n = This->sInfo.dwFormatChangeCount; - - This->nIdxFmtChanges += 16; - if (This->idxFmtChanges == NULL) - This->idxFmtChanges = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->nIdxFmtChanges * sizeof(AVIINDEXENTRY)); - else - This->idxFmtChanges = - HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->idxFmtChanges, - This->nIdxFmtChanges * sizeof(AVIINDEXENTRY)); - if (This->idxFmtChanges == NULL) - return AVIERR_MEMORY; - - This->idxFmtChanges[n].ckid = This->lLastFrame; - This->idxFmtChanges[n].dwFlags = 0; - This->idxFmtChanges[n].dwChunkOffset = offset; - This->idxFmtChanges[n].dwChunkLength = size; - - return AVIERR_OK; - } - break; + n = ++This->sInfo.dwFormatChangeCount; + This->idxFmtChanges[n].ckid = This->lLastFrame; + This->idxFmtChanges[n].dwFlags = 0; + This->idxFmtChanges[n].dwChunkOffset = offset; + This->idxFmtChanges[n].dwChunkLength = size; + + return AVIERR_OK; case cktypeWAVEbytes: if (This->paf->fInfo.dwFlags & AVIFILEINFO_TRUSTCKTYPE) flags |= AVIIF_KEYFRAME; @@ -1652,7 +1667,7 @@ This->fInfo.dwCaps = AVIFILECAPS_CANREAD|AVIFILECAPS_CANWRITE; This->fInfo.dwLength = MainAVIHdr.dwTotalFrames; This->fInfo.dwStreams = MainAVIHdr.dwStreams; - This->fInfo.dwSuggestedBufferSize = MainAVIHdr.dwSuggestedBufferSize; + This->fInfo.dwSuggestedBufferSize = 0; This->fInfo.dwWidth = MainAVIHdr.dwWidth; This->fInfo.dwHeight = MainAVIHdr.dwHeight; LoadStringW(AVIFILE_hModule, IDS_AVIFILETYPE, This->fInfo.szFileType, @@ -1754,8 +1769,7 @@ pStream->sInfo.dwRate = streamHdr.dwRate; pStream->sInfo.dwStart = streamHdr.dwStart; pStream->sInfo.dwLength = streamHdr.dwLength; - pStream->sInfo.dwSuggestedBufferSize = - streamHdr.dwSuggestedBufferSize; + pStream->sInfo.dwSuggestedBufferSize = 0; pStream->sInfo.dwQuality = streamHdr.dwQuality; pStream->sInfo.dwSampleSize = streamHdr.dwSampleSize; pStream->sInfo.rcFrame.left = streamHdr.rcFrame.left; @@ -1816,7 +1830,14 @@ if (FAILED(hr)) return hr; }; - + if (pStream->lpFormat != NULL && pStream->sInfo.fccType == streamtypeAUDIO) + { + WAVEFORMATEX *wfx = pStream->lpFormat; /* wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample / 8; could be added */ + pStream->sInfo.dwSampleSize = wfx->nBlockAlign; /* to deal with corrupt wfx->nBlockAlign but Windows doesn't do this */ + TRACE("Block size reset to %u, chan=%u bpp=%u\n", wfx->nBlockAlign, wfx->nChannels, wfx->wBitsPerSample); + pStream->sInfo.dwScale = 1; + pStream->sInfo.dwRate = wfx->nSamplesPerSec; + } if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEREAD; } @@ -1897,6 +1918,13 @@ } } + for (nStream = 0; nStream < This->fInfo.dwStreams; nStream++) + { + DWORD sugbuf = This->ppStreams[nStream]->sInfo.dwSuggestedBufferSize; + if (This->fInfo.dwSuggestedBufferSize < sugbuf) + This->fInfo.dwSuggestedBufferSize = sugbuf; + } + /* find other chunks */ FindChunkAndKeepExtras(&This->fileextra, This->hmmio, &ck, &ckRIFF, 0); @@ -2027,16 +2055,18 @@ size += 2 * sizeof(DWORD); /* check that buffer is big enough -- don't trust dwSuggestedBufferSize */ - if (This->lpBuffer == NULL || size < This->cbBuffer) { + if (This->lpBuffer == NULL || This->cbBuffer < size) { DWORD maxSize = max(size, This->sInfo.dwSuggestedBufferSize); - if (This->lpBuffer == NULL) + if (This->lpBuffer == NULL) { This->lpBuffer = HeapAlloc(GetProcessHeap(), 0, maxSize); - else - This->lpBuffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize); - if (This->lpBuffer == NULL) - return AVIERR_MEMORY; - This->cbBuffer = max(size, This->sInfo.dwSuggestedBufferSize); + if (!This->lpBuffer) return AVIERR_MEMORY; + } else { + void *new_buffer = HeapReAlloc(GetProcessHeap(), 0, This->lpBuffer, maxSize); + if (!new_buffer) return AVIERR_MEMORY; + This->lpBuffer = new_buffer; + } + This->cbBuffer = maxSize; } /* now read the complete chunk into our buffer */ Modified: trunk/reactos/dll/win32/avifil32/avifile_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Cs.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -19,6 +19,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_CZECH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/avifile_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Da.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/avifile_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_De.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 @@ -23,7 +27,7 @@ CAPTION "Komprimierungsoptionen" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Wählen Sie die Eingangsdaten aus:",-1,2,5,154,10 + LTEXT "&WÃ¤hlen Sie die Eingangsdaten aus:",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Optionen...",IDC_OPTIONS,170,17,50,14 @@ -31,7 +35,7 @@ EDITTEXT IDC_INTERLEAVEEVERY,81,41,32,12,ES_AUTOHSCROLL LTEXT "Einzelbilder",-1,119,43,36,9 LTEXT "Aktuelles Format:",-1,3,56,73,9 - LTEXT "This space for rent",IDC_FORMATTEXT,75,56,90,26 + LTEXT "Platzhalter",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,170,61,50,14 END @@ -48,3 +52,4 @@ IDS_AVIFILETYPE "Wine AVI-Standard-Dateibehandlungsroutine" IDS_UNCOMPRESSED "Unkomprimiert" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/avifil32/avifile_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_En.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -1,5 +1,5 @@ /* - * Copyright 2002 Michael Günnewig + * Copyright 2002 Michael GÃ¼nnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/avifile_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Es.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/avifil32/avifile_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Fr.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -2,8 +2,8 @@ * Avifil32 * French language support * - * Copyright 2002 Michael Günnewig - * Copyright 2003 Vincent Béron + * Copyright 2002 Michael GÃ¼nnewig + * Copyright 2003 Vincent BÃ©ron * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 @@ -27,28 +32,29 @@ CAPTION "Options de compression" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Sélectionnez un flux :",-1,2,5,154,10 + LTEXT "&SÃ©lectionnez un flux :",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Options...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Imbriquer à chaque",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + AUTOCHECKBOX "&Imbriquer toutes les",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL LTEXT "images",-1,129,43,36,9 - LTEXT "Format actuel:",-1,3,56,73,9 - LTEXT "Cet espace est à louer",IDC_FORMATTEXT,75,56,90,26 + LTEXT "Format actuel :",-1,3,56,73,9 + LTEXT "Cet espace est Ã louer",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 PUSHBUTTON "Annuler",IDCANCEL,170,61,50,14 END STRINGTABLE DISCARDABLE { - IDS_WAVESTREAMFORMAT "Waveform : %s" + IDS_WAVESTREAMFORMAT "WaveformÂ : %s" IDS_WAVEFILETYPE "Waveform" - IDS_ALLMULTIMEDIA "Tous les fichiers multimédias" - IDS_ALLFILES "Tous les fichier (*.*)(a)*.*" - IDS_VIDEO "vidéo" + IDS_ALLMULTIMEDIA "Tous les fichiers multimÃ©dia" + IDS_ALLFILES "Tous les fichiers (*.*)(a)*.*" + IDS_VIDEO "vidÃ©o" IDS_AUDIO "audio" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-default-filehandler" - IDS_UNCOMPRESSED "non compressé" + IDS_AVIFILETYPE "Gestionnaire de fichiers AVI par dÃ©faut de Wine" + IDS_UNCOMPRESSED "non compressÃ©" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/avifil32/avifile_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Hu.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/avifile_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_It.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/avifil32/avifile_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ja.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/avifile_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Nl.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/avifil32/avifile_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_No.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/avifil32/avifile_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Pl.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/avifil32/avifile_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Pt.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -16,6 +16,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN Modified: trunk/reactos/dll/win32/avifil32/avifile_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ru.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -18,35 +18,41 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "avifile_private.h" + +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 226, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Íàñòðîéêè ñæàòèÿ" +CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¶Ð°ÑÐ¸Ñ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Âûáåðèòå ïîòîê:",-1,2,5,154,10 + LTEXT "&ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿Ð¾ÑÐ¾Ðº:",-1,2,5,154,10 COMBOBOX IDC_STREAM,2,18,154,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Îïöèè...",IDC_OPTIONS,170,17,50,14 - AUTOCHECKBOX "&Ïðîñëàèâàòü êàæäûå",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP + PUSHBUTTON "&ÐÐ¿ÑÐ¸Ð¸...",IDC_OPTIONS,170,17,50,14 + AUTOCHECKBOX "&ÐÑÐ¾ÑÐ»Ð°Ð¸Ð²Ð°ÑÑ ÐºÐ°Ð¶Ð´ÑÐµ",IDC_INTERLEAVE,3,42,85,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,91,41,32,12,ES_AUTOHSCROLL - LTEXT "ôðåéìà",-1,129,43,36,9 - LTEXT "Òåêóùèé ôîðìàò:",-1,3,56,73,9 - LTEXT "Ýòî ìåñòî ñäà¸òñÿ â àðåíäó",IDC_FORMATTEXT,75,56,90,26 + LTEXT "ÑÑÐµÐ¹Ð¼Ð°",-1,129,43,36,9 + LTEXT "Ð¢ÐµÐºÑÑÐ¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ:",-1,3,56,73,9 + LTEXT "ÐÑÐ¾ Ð¼ÐµÑÑÐ¾ ÑÐ´Ð°ÑÑÑÑ Ð² Ð°ÑÐµÐ½Ð´Ñ",IDC_FORMATTEXT,75,56,90,26 DEFPUSHBUTTON "OK",IDOK,170,42,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,170,61,50,14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,170,61,50,14 END STRINGTABLE DISCARDABLE { - IDS_WAVESTREAMFORMAT "Çâóêîâîé ïîòîê: %s" - IDS_WAVEFILETYPE "Çâóêîâîé ïîòîê" - IDS_ALLMULTIMEDIA "Âñå ôàéëû ìóëüòèìåäèà" - IDS_ALLFILES "Âñå ôàéëû (*.*)(a)*.*" - IDS_VIDEO "âèäåî" - IDS_AUDIO "àóäèî" + IDS_WAVESTREAMFORMAT "ÐÐ²ÑÐºÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÐ¾Ðº: %s" + IDS_WAVEFILETYPE "ÐÐ²ÑÐºÐ¾Ð²Ð¾Ð¹ Ð¿Ð¾ÑÐ¾Ðº" + IDS_ALLMULTIMEDIA "ÐÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´Ð¸Ð°" + IDS_ALLFILES "ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)(a)*.*" + IDS_VIDEO "Ð²Ð¸Ð´ÐµÐ¾" + IDS_AUDIO "Ð°ÑÐ´Ð¸Ð¾" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Îáðàáîò÷èê ïî óìîë÷àíèþ avi-ôàéëîâ â Wine" - IDS_UNCOMPRESSED "áåç ñæàòèÿ" + IDS_AVIFILETYPE "ÐÐ±ÑÐ°Ð±Ð¾ÑÑÐ¸Ðº Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ avi-ÑÐ°Ð¹Ð»Ð¾Ð² Ð² Wine" + IDS_UNCOMPRESSED "Ð±ÐµÐ· ÑÐ¶Ð°ÑÐ¸Ñ" } +#pragma code_page(default) Modified: trunk/reactos/dll/win32/avifil32/avifile_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Si.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/avifil32/avifile_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Sv.rc [iso-8859-1] Sun Feb 7 01:28:22 2010 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "avifile_private.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL

14 years, 7 months

[cwittich] 45478: [MSVCRT_WINETEST] sync msvcrt_winetest to wine 1.1.38

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Feb 7 01:13:49 2010 New Revision: 45478 URL: http://svn.reactos.org/svn/reactos?rev=45478&view=rev Log: [MSVCRT_WINETEST] sync msvcrt_winetest to wine 1.1.38 Added: trunk/rostests/winetests/msvcrt/misc.c (with props) Modified: trunk/rostests/winetests/msvcrt/cpp.c trunk/rostests/winetests/msvcrt/file.c trunk/rostests/winetests/msvcrt/msvcrt.rbuild trunk/rostests/winetests/msvcrt/testlist.c Modified: trunk/rostests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/cpp.c?re… ============================================================================== --- trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/cpp.c [iso-8859-1] Sun Feb 7 01:13:49 2010 @@ -1034,6 +1034,10 @@ /* 113 */ {"?f@T@@QAEHQAY1BE@BO@$$CBD@Z", "public: int __thiscall T::f(char const (* const)[20][30])"}, /* 114 */ {"??0?$Foo@U?$vector_c@H$00$01$0?1$0A@$0A@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@$0HPPPPPPP@@mpl@boost@@@@QAE@XZ", "public: __thiscall Foo<struct boost::mpl::vector_c<int,1,2,-2,0,0,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647> >::Foo<struct boost::mpl::vector_c<int,1,2,-2,0,0,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647,2147483647> >(void)"}, +/* 115 */ {"?swprintf@@YAHPAGIPBGZZ", "int __cdecl swprintf(unsigned short *,unsigned int,unsigned short const *,...)"}, +/* 116 */ {"?vswprintf@@YAHPAGIPBGPAD@Z", "int __cdecl vswprintf(unsigned short *,unsigned int,unsigned short const *,char *)"}, +/* 117 */ {"?vswprintf@@YAHPA_WIPB_WPAD@Z", "int __cdecl vswprintf(wchar_t *,unsigned int,wchar_t const *,char *)"}, +/* 118 */ {"?swprintf@@YAHPA_WIPB_WZZ", "int __cdecl swprintf(wchar_t *,unsigned int,wchar_t const *,...)"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); Modified: trunk/rostests/winetests/msvcrt/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/file.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/file.c [iso-8859-1] Sun Feb 7 01:13:49 2010 @@ -422,6 +422,35 @@ return buffer; } +/* Test reading in text mode when the 512'th character read is \r*/ +static void test_readboundary(void) +{ + FILE *fp; + char buf[513], rbuf[513]; + int i, j; + for (i = 0; i < 511; i++) + { + j = (i%('~' - ' ')+ ' '); + buf[i] = j; + } + buf[511] = '\n'; + buf[512] =0; + fp = fopen("boundary.tst", "wt"); + fwrite(buf, 512,1,fp); + fclose(fp); + fp = fopen("boundary.tst", "rt"); + for(i=0; i<512; i++) + { + fseek(fp,0 , SEEK_CUR); + rbuf[i] = fgetc(fp); + } + rbuf[512] =0; + fclose(fp); + unlink("boundary.tst"); + + ok(strcmp(buf, rbuf) == 0,"CRLF on buffer boundary failure\n"); + } + static void test_fgetc( void ) { char* tempf; @@ -437,6 +466,14 @@ ok(ich == ret, "First fgetc expected %x got %x\n", ich, ret); ret = fgetc(tempfh); ok(ich == ret, "Second fgetc expected %x got %x\n", ich, ret); + fclose(tempfh); + tempfh = fopen(tempf,"wt"); + fputc('\n', tempfh); + fclose(tempfh); + tempfh = fopen(tempf,"wt"); + setbuf(tempfh, NULL); + ret = fgetc(tempfh); + ok(ret == -1, "Unbuffered fgetc in text mode must failed on \\r\\n\n"); fclose(tempfh); unlink(tempf); free(tempf); @@ -800,15 +837,23 @@ tempfd = _open(tempf,_O_RDONLY|_O_TEXT); /* open in TEXT mode */ _lseek(tempfd, -1, FILE_END); ret = _read(tempfd,btext,LLEN); - ok(ret == 1, "_read expected 1 got bad length: %d\n", ret); + ok(ret == 1 && *btext == '\n', "_read expected 1 got bad length: %d\n", ret); _lseek(tempfd, -2, FILE_END); ret = _read(tempfd,btext,LLEN); ok(ret == 1 && *btext == '\n', "_read expected '\\n' got bad length: %d\n", ret); _lseek(tempfd, -3, FILE_END); + ret = _read(tempfd,btext,1); + ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); + ok(tell(tempfd) == 41, "bad position %u expecting 41\n", tell(tempfd)); + _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,2); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); ok(tell(tempfd) == 42, "bad position %u expecting 42\n", tell(tempfd)); - _close(tempfd); + _lseek(tempfd, -3, FILE_END); + ret = _read(tempfd,btext,3); + ok(ret == 2 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); + ok(tell(tempfd) == 43, "bad position %u expecting 43\n", tell(tempfd)); + _close(tempfd); ret = unlink(tempf); ok( ret == 0 ,"Can't unlink '%s': %d\n", tempf, errno); @@ -835,7 +880,23 @@ "problems with _O_BINARY _write / _O_TEXT _read\n"); _close(tempfd); - ret =_chmod (tempf, _S_IREAD | _S_IWRITE); + /* test _read with single bytes. CR should be skipped and LF pulled in */ + tempfd = _open(tempf,_O_RDONLY|_O_TEXT); /* open in TEXT mode */ + for (i=0; i<strlen(mytext); i++) /* */ + { + _read(tempfd,btext, 1); + ok(btext[0] == mytext[i],"_read failed at pos %d 0x%02x vs 0x%02x\n", i, btext[0], mytext[i]); + } + while (_read(tempfd,btext, 1)); + _close(tempfd); + + /* test _read in buffered mode. Last CR should be skipped but LF not pulled in */ + tempfd = _open(tempf,_O_RDONLY|_O_TEXT); /* open in TEXT mode */ + i = _read(tempfd,btext, strlen(mytext)); + ok(i == strlen(mytext)-1, "_read_i %d vs %d\n", i, strlen(mytext)); + _close(tempfd); + + ret =_chmod (tempf, _S_IREAD | _S_IWRITE); ok( ret == 0, "Can't chmod '%s' to read-write: %d\n", tempf, errno); ret = unlink(tempf); @@ -1353,6 +1414,11 @@ rmdir("test_unlink"); } +void test_dup2(void) +{ + ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); +} + START_TEST(file) { int arg_c; @@ -1373,6 +1439,7 @@ ok(0, "invalid argument '%s'\n", arg_v[2]); return; } + test_dup2(); test_file_inherit(arg_v[0]); test_file_write_read(); test_chsize(); @@ -1388,6 +1455,7 @@ test_asciimode2(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ + test_readboundary(); test_fgetc(); test_fputc(); test_flsbuf(); Added: trunk/rostests/winetests/msvcrt/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/misc.c?r… ============================================================================== --- trunk/rostests/winetests/msvcrt/misc.c (added) +++ trunk/rostests/winetests/msvcrt/misc.c [iso-8859-1] Sun Feb 7 01:13:49 2010 @@ -1,0 +1,58 @@ +/* + * Unit tests for miscellaneous msvcrt functions + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include <errno.h> + +static int (__cdecl *prand_s)(unsigned int *); + +static void init(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + prand_s = (void *)GetProcAddress(hmod, "rand_s"); +} + +static void test_rand_s(void) +{ + int ret; + unsigned int rand; + + if (!prand_s) + { + win_skip("rand_s is not available\n"); + return; + } + + errno = EBADF; + ret = prand_s(NULL); + ok(ret == EINVAL, "Expected rand_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to return EINVAL, got %d\n", errno); + + ret = prand_s(&rand); + ok(ret == 0, "Expected rand_s to return 0, got %d\n", ret); +} + +START_TEST(misc) +{ + init(); + + test_rand_s(); +} Propchange: trunk/rostests/winetests/msvcrt/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/msvcrt.r… ============================================================================== --- trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/msvcrt.rbuild [iso-8859-1] Sun Feb 7 01:13:49 2010 @@ -27,6 +27,7 @@ <file>file.c</file> <file>headers.c</file> <file>heap.c</file> + <file>misc.c</file> <file>printf.c</file> <file>scanf.c</file> <file>signal.c</file> Modified: trunk/rostests/winetests/msvcrt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msvcrt/testlist… ============================================================================== --- trunk/rostests/winetests/msvcrt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msvcrt/testlist.c [iso-8859-1] Sun Feb 7 01:13:49 2010 @@ -13,6 +13,7 @@ extern void func_file(void); extern void func_headers(void); extern void func_heap(void); +extern void func_misc(void); extern void func_printf(void); extern void func_scanf(void); extern void func_signal(void); @@ -28,6 +29,7 @@ { "file", func_file }, { "headers", func_headers }, { "heap", func_heap }, + { "misc", func_misc }, { "printf", func_printf }, { "scanf", func_scanf }, { "signal", func_signal },

14 years, 7 months

[sir_richard] 45477: [FREELDR]: Start rewrite of eVb's messed up FreeLDR paging code. The new code is all dynamic and makes much better decisions as to the layout of the address space and how things will be implemented. Already, we are saving 16MB of VA. For now we still consume a large (1 MB) page for simplicity for the page directory, but that can go away later. I will post a diagram later if time permits. We get to MMU enabled and the PDE_BASE mapping works. [NTOS]: Start redefining ARMv6 pag

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Feb 7 01:09:10 2010 New Revision: 45477 URL: http://svn.reactos.org/svn/reactos?rev=45477&view=rev Log: [FREELDR]: Start rewrite of eVb's messed up FreeLDR paging code. The new code is all dynamic and makes much better decisions as to the layout of the address space and how things will be implemented. Already, we are saving 16MB of VA. For now we still consume a large (1 MB) page for simplicity for the page directory, but that can go away later. I will post a diagram later if time permits. We get to MMU enabled and the PDE_BASE mapping works. [NTOS]: Start redefining ARMv6 paging structures. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c trunk/reactos/ntoskrnl/include/internal/arm/mm.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/boot.s [iso-8859-1] Sun Feb 7 01:09:10 2010 @@ -19,19 +19,3 @@ L_ArmInit: .long ArmInit - -.global PageDirectoryStart, PageDirectoryEnd -.global startup_pagedirectory -.global kernel_pagetable - -.bss -PageDirectoryStart: -kernel_pagetable: - .fill 2*4096, 1, 0 - .space 4096 -startup_pagedirectory: - .fill 4*4096, 1, 0 - - -.global PageDirectoryEnd -PageDirectoryEnd: Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/loader.c [iso-8859-1] Sun Feb 7 01:09:10 2010 @@ -40,6 +40,7 @@ PCHAR ArmSharedHeap; extern PAGE_DIRECTORY_ARM startup_pagedirectory; +extern PAGE_TABLE_ARM kernel_pagetable; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; extern ULONG_PTR KernelBase; @@ -678,371 +679,134 @@ #define PFN_SHIFT 12 #define LARGE_PFN_SHIFT 20 -#define STARTUP_BASE 0xC0000000 +#define PTE_BASE 0xC0000000 +#define PDE_BASE 0xC0400000 #define HAL_BASE 0xFFC00000 #define MMIO_BASE 0x10000000 #define LowMemPageTableIndex 0 -#define StartupPageTableIndex (STARTUP_BASE >> PDE_SHIFT) +#define StartupPtePageTableIndex (PTE_BASE >> PDE_SHIFT) +#define StartupPdePageTableIndex (PDE_BASE >> PDE_SHIFT) #define MmioPageTableIndex (MMIO_BASE >> PDE_SHIFT) #define HalPageTableIndex (HAL_BASE >> PDE_SHIFT) /* Converts a Physical Address into a Page Frame Number */ #define PaToPfn(p) ((p) >> PFN_SHIFT) #define PaToLargePfn(p) ((p) >> LARGE_PFN_SHIFT) - -VOID +#define PaPtrToPfn(p) (((ULONG_PTR)(p)) >> PFN_SHIFT) + +/* Converts a Physical Address into a Coarse Page Table PFN */ +#define PaPtrToPdePfn(p) (((ULONG_PTR)(p)) >> CPT_SHIFT) + +HARDWARE_PTE_ARMV6 TempPte; +HARDWARE_LARGE_PTE_ARMV6 TempLargePte; +HARDWARE_PDE_ARMV6 TempPde; + +PVOID ArmSetupPageDirectory(VOID) { PPAGE_DIRECTORY_ARM PageDir; + PPAGE_TABLE_ARM PageTable, KernelPageTable; ULONG KernelPageTableIndex; - //ULONG i; - + ULONG i; + PHARDWARE_PTE_ARMV6 PointerPte; + PHARDWARE_PDE_ARMV6 PointerPde; + PHARDWARE_LARGE_PTE_ARMV6 LargePte; + PFN_NUMBER Pfn; + + /* Setup templates */ + TempPte.Accessed = TempPte.Valid = TempLargePte.LargePage = TempLargePte.Accessed = TempPde.Valid = 1; + /* Get the Kernel Table Index */ KernelPageTableIndex = KernelBase >> PDE_SHIFT; printf("Kernel Base: 0x%p (PDE Index: %lx)\n", KernelBase, KernelPageTableIndex); - /* Get the Startup Page Directory */ - PageDir = (PPAGE_DIRECTORY_ARM)&startup_pagedirectory; + /* Allocate 1MB PDE_BASE and HYPER_SPACE. This will be improved later. Must be 1MB aligned */ + PageDir = MmAllocateMemoryAtAddress(1 * 1024 * 1024, (PVOID)0x700000, LoaderMemoryData); + if (!PageDir) { printf("FATAL: No memory!\n"); while (TRUE); } printf("Initial Page Directory: 0x%p\n", PageDir); /* Setup the Low Memory PDE as an identity-mapped Large Page (1MB) */ - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[LowMemPageTableIndex].LargePage = 1; - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[LowMemPageTableIndex].Accessed = 1; - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[LowMemPageTableIndex].PageFrameNumber = 0; + LargePte = &PageDir->Pte[LowMemPageTableIndex]; + *LargePte = TempLargePte; /* Setup the MMIO PDE as two identity mapped large pages -- the kernel will blow these away later */ - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[MmioPageTableIndex].LargePage = 1; - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[MmioPageTableIndex].Accessed = 1; - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[MmioPageTableIndex].PageFrameNumber = PaToLargePfn(0x10000000); - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[MmioPageTableIndex+1].LargePage = 1; - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[MmioPageTableIndex+1].Accessed = 1; - ((PHARDWARE_LARGE_PTE_ARMV6)PageDir->Pde)[MmioPageTableIndex+1].PageFrameNumber = PaToLargePfn(0x10100000); + LargePte = &PageDir->Pte[MmioPageTableIndex]; + Pfn = PaToLargePfn(0x10000000); + for (i = 0; i < 2; i++) + { + TempLargePte.PageFrameNumber = Pfn++; + *LargePte++ = TempLargePte; + } + + /* Allocate 8 page tables (8KB) to describe the 8MB initial kernel region */ + KernelPageTable = MmAllocateMemoryWithType(8192, LoaderMemoryData); + if (!KernelPageTable) { printf("FATAL: No memory!\n"); while (TRUE); } + printf("Kernel Page Tables: 0x%p\n", KernelPageTable); + + /* Setup the Kernel PDEs */ + PointerPde = &PageDir->Pde[KernelPageTableIndex]; + Pfn = PaPtrToPdePfn(KernelPageTable); + for (i = 0; i < 8; i++) + { + TempPde.PageFrameNumber = Pfn++; + *PointerPde++ = TempPde; + } + + /* Setup the Startup PDE */ + printf("PAGEDIR: %p IDX: %lx PPDE: %p PFN: %lx \n", PageDir, StartupPdePageTableIndex, &PageDir->Pte[StartupPdePageTableIndex], PaToLargePfn((ULONG_PTR)PageDir)); + LargePte = &PageDir->Pte[StartupPdePageTableIndex]; + TempLargePte.PageFrameNumber = PaToLargePfn((ULONG_PTR)PageDir); + printf("PAGEDIR: %p IDX: %lx PPDE: %p PFN: %lx \n", PageDir, StartupPdePageTableIndex, LargePte, TempLargePte.PageFrameNumber); + *LargePte = TempLargePte; + + /* After this point, any MiAddressToPde is guaranteed not to fault */ + + /* Allocate 4 page tables (4KB) to describe the 4MB PTE_BASE region */ + PageTable = MmAllocateMemoryWithType(4096, LoaderMemoryData); + if (!PageTable) { printf("FATAL: No memory!\n"); while (TRUE); } + printf("Initial Page Tables: 0x%p\n", PageTable); + + /* + * Link them in the Startup PDE. + * Note these are the entries in the PD at (MiAddressToPde(PTE_BASE)). + */ + PointerPde = &PageDir->Pde[StartupPtePageTableIndex]; + Pfn = PaPtrToPdePfn(PageTable); + for (i = 0; i < 4; i++) + { + TempPde.PageFrameNumber = Pfn++; + *PointerPde++ = TempPde; + } + + /* + * Now map these page tables in PTE space (MiAddressToPte(PTE_BASE)). + * Note that they all live on a single page, since each is 1KB. + */ + PointerPte = &PageTable->Pte[0x300]; + TempPte.PageFrameNumber = PaPtrToPfn(PageTable); + *PointerPte = TempPte; + + /* + * After this point, MiAddressToPte((PDE_BASE) to MiAddressToPte(PDE_TOP)) + * is guaranteed not to fault. + * Any subsequent page allocation will first need its page table created + * and mapped in the PTE_BASE first, then the page table itself will be + * editable through its flat PTE address. + */ printf("Paging init done\n"); - - #if 0 - ARM_PTE Pte; - ULONG i, j; - PARM_TRANSLATION_TABLE ArmTable; - PARM_COARSE_PAGE_TABLE BootTable, KernelTable, FlatMapTable, MasterTable; - - // - // Get the PDEs that we will use - // - ArmTable = &ArmTranslationTable; - BootTable = &BootTranslationTable; - KernelTable = &KernelTranslationTable; - FlatMapTable = &FlatMapTranslationTable; - MasterTable = &MasterTranslationTable; - - // - // Set the master L1 PDE as the TTB - // - TtbRegister.AsUlong = (ULONG)ArmTable; - ASSERT(TtbRegister.Reserved == 0); - KeArmTranslationTableRegisterSet(TtbRegister); - - // - // Use Domain 0, enforce AP bits (client) - // - DomainRegister.AsUlong = 0; - DomainRegister.Domain0 = ClientDomain; - KeArmDomainRegisterSet(DomainRegister); - - // - // Set Fault PTEs everywhere - // - RtlZeroMemory(ArmTable, sizeof(ARM_TRANSLATION_TABLE)); - - // - // Identity map the first MB of memory - // - Pte.L1.Section.Type = SectionPte; - Pte.L1.Section.Buffered = FALSE; - Pte.L1.Section.Cached = FALSE; - Pte.L1.Section.Reserved = 1; // ARM926EJ-S manual recommends setting to 1 - Pte.L1.Section.Domain = Domain0; - Pte.L1.Section.Access = SupervisorAccess; - Pte.L1.Section.BaseAddress = 0; - Pte.L1.Section.Ignored = Pte.L1.Section.Ignored1 = 0; - ArmTable->Pte[0] = Pte; - - // - // Map the page in MMIO space that contains the serial port and timers - // - Pte.L1.Section.BaseAddress = ArmBoardBlock->UartRegisterBase >> PDE_SHIFT; - ArmTable->Pte[UART_VIRTUAL >> PDE_SHIFT] = Pte; - - // - // Create template PTE for the coarse page table which maps the PTE_BASE - // - Pte.L1.Coarse.Type = CoarsePte; - Pte.L1.Coarse.Domain = Domain0; - Pte.L1.Coarse.Reserved = 1; // ARM926EJ-S manual recommends setting to 1 - Pte.L1.Coarse.Ignored = Pte.L1.Coarse.Ignored1 = 0; - Pte.L1.Coarse.BaseAddress = (ULONG)FlatMapTable >> CPT_SHIFT; - - // - // On x86, there is 4MB of space, starting at 0xC0000000 to 0xC0400000 - // which contains the mappings for each PTE on the system. 4MB is needed - // since for 4GB, there will be 1 million PTEs, each of 4KB. - // - // To describe a 4MB region, on x86, only requires a page table, which can - // be linked from the page table directory. - // - // On the other hand, on ARM, we can only describe 1MB regions, so we need - // four times less PTE entries to represent a single mapping (an L2 coarse - // page table). This is problematic, because this would only take up 1KB of - // space, and we can't have a page that small. - // - // This means we must: - // - // - Allocate page tables (in physical memory) with 4KB granularity, instead - // of 1KB (the other 3KB is unused and invalid). - // - // - "Skip" the other 3KB in the region, because we can't point to another - // coarse page table after just 1KB. - // - // So 0xC0000000 will be mapped to the page table that maps the range of - // 0x00000000 to 0x01000000, while 0xC0001000 till be mapped to the page - // table that maps the area from 0x01000000 to 0x02000000, and so on. In - // total, this will require 4 million entries, and additionally, because of - // the padding, since each 256 entries will be 4KB (instead of 1KB), this - // means we'll need 16MB (0xC0000000 to 0xC1000000). - // - // We call this region the flat-map area - // - for (i = (PTE_BASE >> PDE_SHIFT); i < ((PTE_BASE + 0x1000000) >> PDE_SHIFT); i++) - { - // - // Write PTE and update the base address (next MB) for the next one - // - ArmTable->Pte[i] = Pte; - Pte.L1.Coarse.BaseAddress += 4; - } - - // - // On x86, there is also the region of 0xC0300000 to 0xC03080000 which maps - // to the various PDEs on the system. Yes, this overlaps with the above, and - // works because of an insidious dark magic (self-mapping the PDE as a PTE). - // Unfortunately, this doesn't work on ARM, firstly because the size of a L1 - // page table is different than from an L2 page table, and secondly, which - // is even worse, the format for an L1 page table is different than the one - // for an L2 page table -- basically meaning we cannot self-map. - // - // However, we somewhat emulate this behavior on ARM. This will be expensive - // since we manually need to keep track of every page directory added and - // add an entry in our flat-map region. We also need to keep track of every - // change in the TTB, so that we can update the mappings in our PDE region. - // - // Note that for us, this region starts at 0xC1000000, after the flat-map - // area. - // - // Finally, to deal with different sizes (1KB page tables, 4KB page size!), - // we pad the ARM L2 page tables to make them 4KB, so that each page will - // therefore point to an L2 page table. - // - // This region is a lot easier than the first -- an L1 page table is only - // 16KB, so to access any index inside it, we just need 4 pages, since each - // page is 4KB... Clearly, there's also no need to pad in this case. - // - // We'll call this region the master translation area. - // - Pte.L1.Coarse.BaseAddress = (ULONG)MasterTable >> CPT_SHIFT; - ArmTable->Pte[PDE_BASE >> PDE_SHIFT] = Pte; - - // - // Now create the template for the coarse page tables which map the first 8MB - // - Pte.L1.Coarse.BaseAddress = (ULONG)BootTable >> CPT_SHIFT; - - // - // Map 0x00000000 - 0x007FFFFF to 0x80000000 - 0x807FFFFF. - // This is where the freeldr boot structures are located, and we need them. - // - for (i = (KSEG0_BASE >> PDE_SHIFT); i < ((KSEG0_BASE + 0x800000) >> PDE_SHIFT); i++) - { - // - // Write PTE and update the base address (next MB) for the next one - // - ArmTable->Pte[i] = Pte; - Pte.L1.Coarse.BaseAddress += 4; - } - - // - // Now create the template PTE for the coarse page tables for the next 6MB - // - Pte.L1.Coarse.BaseAddress = (ULONG)KernelTable >> CPT_SHIFT; - - // - // Map 0x00800000 - 0x00DFFFFF to 0x80800000 - 0x80DFFFFF - // In this way, the KERNEL_PHYS_ADDR (0x800000) becomes 0x80800000 - // which is the kernel virtual base address, just like on x86. - // - ASSERT(KernelBase == 0x80800000); - for (i = (KernelBase >> PDE_SHIFT); i < ((KernelBase + 0x600000) >> PDE_SHIFT); i++) - { - // - // Write PTE and update the base address (next MB) for the next one - // - ArmTable->Pte[i] = Pte; - Pte.L1.Coarse.BaseAddress += 4; - } - - // - // Now build the template PTE for the pages mapping the first 8MB - // - Pte.L2.Small.Type = SmallPte; - Pte.L2.Small.Buffered = Pte.L2.Small.Cached = 0; - Pte.L2.Small.Access0 = - Pte.L2.Small.Access1 = - Pte.L2.Small.Access2 = - Pte.L2.Small.Access3 = SupervisorAccess; - Pte.L2.Small.BaseAddress = 0; - - // - // Loop each boot coarse page table (i). - // Each PDE describes 1MB. We're mapping an area of 8MB, so 8 times. - // - for (i = 0; i < 8; i++) - { - // - // Loop and set each the PTE (j). - // Each PTE describes 4KB. We're mapping an area of 1MB, so 256 times. - // - for (j = 0; j < (PDE_SIZE / PAGE_SIZE); j++) - { - // - // Write PTE and update the base address (next MB) for the next one - // - BootTable->Pte[j] = Pte; - Pte.L2.Small.BaseAddress++; - } - - // - // Next iteration - // - BootTable++; - } - - // - // Now create the template PTE for the pages mapping the next 6MB - // - Pte.L2.Small.BaseAddress = (ULONG)KERNEL_BASE_PHYS >> PTE_SHIFT; - - // - // Loop each kernel coarse page table (i). - // Each PDE describes 1MB. We're mapping an area of 6MB, so 6 times. - // - for (i = 0; i < 6; i++) - { - // - // Loop and set each the PTE (j). - // Each PTE describes 4KB. We're mapping an area of 1MB, so 256 times. - // - for (j = 0; j < (PDE_SIZE / PAGE_SIZE); j++) - { - // - // Write PTE and update the base address (next MB) for the next one - // - KernelTable->Pte[j] = Pte; - Pte.L2.Small.BaseAddress++; - } - - // - // Next iteration - // - KernelTable++; - } - - // - // Now we need to create the PTEs for the addresses which have been mapped - // already. - // - // We have allocated 4 page table directories: - // - // - One for the kernel, 6MB - // - One for low-memory FreeLDR, 8MB - // - One for identity-mapping below 1MB, 1MB - // - And finally, one for the flat-map itself, 16MB - // - // - Each MB mapped is a 1KB table, which we'll use a page to reference, so - // we will require 31 pages. - // - - // - // For the 0x80000000 region (8MB) - // - Pte.L2.Small.BaseAddress = (ULONG)&BootTranslationTable >> PTE_SHIFT; - FlatMapTable = &(&FlatMapTranslationTable)[0x80000000 >> 28]; - for (i = 0; i < 8; i++) - { - // - // Point to the page table mapping the next MB - // - FlatMapTable->Pte[i] = Pte; - Pte.L2.Small.BaseAddress++; - } - - // - // For the 0x80800000 region (6MB) - // - Pte.L2.Small.BaseAddress = (ULONG)&KernelTranslationTable >> PTE_SHIFT; - for (i = 8; i < 14; i++) - { - // - // Point to the page table mapping the next MB - // - FlatMapTable->Pte[i] = Pte; - Pte.L2.Small.BaseAddress++; - } - - // - // For the 0xC0000000 region (16MB) - // - Pte.L2.Small.BaseAddress = (ULONG)&FlatMapTranslationTable >> PTE_SHIFT; - FlatMapTable = &(&FlatMapTranslationTable)[0xC0000000 >> 28]; - for (i = 0; i < 16; i++) - { - // - // Point to the page table mapping the next MB - // - FlatMapTable->Pte[i] = Pte; - Pte.L2.Small.BaseAddress++; - } - - // - // For the 0xC1000000 region (1MB) - // - Pte.L2.Small.BaseAddress = (ULONG)&MasterTranslationTable >> PTE_SHIFT; - FlatMapTable->Pte[16] = Pte; - - // - // Now we handle the master translation area for our PDEs. We'll just make - // the 4 page tables point to the ARM TTB. - // - Pte.L2.Small.BaseAddress = (ULONG)&ArmTranslationTable >> PTE_SHIFT; - for (i = 0; i < 4; i++) - { - // - // Point to the page table mapping the next MB - // - MasterTable->Pte[i] = Pte; - Pte.L2.Small.BaseAddress++; - } -#endif + return PageDir; } VOID -ArmSetupPagingAndJump(IN ULONG Magic) -{ - ULONG_PTR PageDirectoryBaseAddress = (ULONG_PTR)&startup_pagedirectory; +ArmSetupPagingAndJump(IN PVOID PageDirectoryBaseAddress) +{ ARM_CONTROL_REGISTER ControlRegister; ARM_TTB_REGISTER TtbRegister; ARM_DOMAIN_REGISTER DomainRegister; /* Set the TTBR */ - TtbRegister.AsUlong = PageDirectoryBaseAddress; + TtbRegister.AsUlong = (ULONG_PTR)PageDirectoryBaseAddress; ASSERT(TtbRegister.Reserved == 0); KeArmTranslationTableRegisterSet(TtbRegister); @@ -1648,6 +1412,7 @@ VOID FrLdrStartup(IN ULONG Magic) { + PVOID PageDir; // // Disable interrupts (already done) // @@ -1659,10 +1424,10 @@ // // Initialize the page directory // - ArmSetupPageDirectory(); + PageDir = ArmSetupPageDirectory(); // // Initialize paging and load NTOSKRNL // - ArmSetupPagingAndJump(Magic); + ArmSetupPagingAndJump(PageDir); } Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Sun Feb 7 01:09:10 2010 @@ -1,5 +1,31 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H #define __NTOSKRNL_INCLUDE_INTERNAL_ARM_MM_H + +// +// Number of bits corresponding to the area that a PDE entry represents (1MB) +// +#define PDE_SHIFT 20 +#define PDE_SIZE (1 << PDE_SHIFT) + +// +// Number of bits corresponding to the area that a coarse page table entry represents (4KB) +// +#define PTE_SHIFT 12 +#define PTE_SIZE (1 << PTE_SHIFT) + +// +// Number of bits corresponding to the area that a coarse page table occupies (1KB) +// +#define CPT_SHIFT 10 +#define CPT_SIZE (1 << CPT_SHIFT) + +// +// Base Addresses +// +#define PTE_BASE 0xC0000000 +#define PTE_TOP 0xC03FFFFF +#define PDE_BASE 0xC0400000 +#define HYPER_SPACE 0xC0404000 typedef struct _HARDWARE_PDE_ARMV6 { @@ -33,10 +59,6 @@ ULONG PageFrameNumber:12; } HARDWARE_LARGE_PTE_ARMV6, *PHARDWARE_LARGE_PTE_ARMV6; -C_ASSERT(sizeof(HARDWARE_PDE_ARMV6) == sizeof(ULONG)); -C_ASSERT(sizeof(HARDWARE_LARGE_PTE_ARMV6) == sizeof(ULONG)); - - typedef struct _HARDWARE_PTE_ARMV6 { ULONG NoExecute:1; @@ -52,36 +74,35 @@ ULONG PageFrameNumber:20; } HARDWARE_PTE_ARMV6, *PHARDWARE_PTE_ARMV6; +C_ASSERT(sizeof(HARDWARE_PDE_ARMV6) == sizeof(ULONG)); +C_ASSERT(sizeof(HARDWARE_LARGE_PTE_ARMV6) == sizeof(ULONG)); +C_ASSERT(sizeof(HARDWARE_PTE_ARMV6) == sizeof(ULONG)); + /* For FreeLDR */ +typedef struct _PAGE_TABLE_ARM +{ + HARDWARE_PTE_ARMV6 Pte[1024]; +} PAGE_TABLE_ARM, *PPAGE_TABLE_ARM; + typedef struct _PAGE_DIRECTORY_ARM { - HARDWARE_PDE_ARMV6 Pde[4096]; + union + { + HARDWARE_PDE_ARMV6 Pde[4096]; + HARDWARE_LARGE_PTE_ARMV6 Pte[4096]; + }; } PAGE_DIRECTORY_ARM, *PPAGE_DIRECTORY_ARM; -// -// Number of bits corresponding to the area that a PDE entry represents (1MB) -// -#define PDE_SHIFT 20 -#define PDE_SIZE (1 << PDE_SHIFT) - -// -// FIXFIX: This is all wrong now!!! -// - - -// -// Number of bits corresponding to the area that a coarse page table entry represents (4KB) -// -#define PTE_SHIFT 12 -//#define PAGE_SIZE (1 << PTE_SHIFT) // FIXME: This conflicts with ndk/arm/mmtypes.h which does #define PAGE_SIZE 0x1000 -- use PTE_SIZE here instead? - -// -// Number of bits corresponding to the area that a coarse page table occupies (1KB) -// -#define CPT_SHIFT 10 -#define CPT_SIZE (1 << CPT_SHIFT) - - +C_ASSERT(sizeof(PAGE_TABLE_ARM) == PAGE_SIZE); +C_ASSERT(sizeof(PAGE_DIRECTORY_ARM) == (4 * PAGE_SIZE)); + +typedef enum _ARM_DOMAIN +{ + FaultDomain, + ClientDomain, + InvalidDomain, + ManagerDomain +} ARM_DOMAIN; // // FIXFIX: This is all wrong now!!! @@ -202,14 +223,7 @@ UserAccess } ARM_PTE_ACCESS; -typedef enum _ARM_DOMAIN -{ - FaultDomain, - ClientDomain, - InvalidDomain, - ManagerDomain -} ARM_DOMAIN; - +#if 0 // // FIXFIX: This is all wrong now!!! @@ -234,10 +248,6 @@ #define PTE_TOP 0xC03FFFFF #define PDE_BASE 0xC1000000 #define HYPER_SPACE 0xC1100000 - -struct _EPROCESS; -PULONG MmGetPageDirectory(VOID); - // // FIXME: THESE ARE WRONG ATM. @@ -249,6 +259,7 @@ #define MiAddressToPteOffset(x) \ ((((ULONG)(x)) << 10) >> 22) + // // Convert a PTE into a corresponding address // @@ -257,6 +268,11 @@ #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) #define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) + +#endif + +struct _EPROCESS; +PULONG MmGetPageDirectory(VOID); #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) #define MI_MAKE_DIRTY_PAGE(x)

14 years, 7 months

[cwittich] 45476: [SHELL32] fix debug channel (merge from wine)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Feb 7 01:07:07 2010 New Revision: 45476 URL: http://svn.reactos.org/svn/reactos?rev=45476&view=rev Log: [SHELL32] fix debug channel (merge from wine) Modified: trunk/reactos/dll/win32/shell32/regsvr.c Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Sun Feb 7 01:07:07 2010 @@ -30,7 +30,7 @@ const GUID SHELL32_AdvtShortcutComponent = {0x9db1186e, 0x40df, 0x11d1, {0xaa, 0x8c, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63}}; -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(shell); /* * Near the bottom of this file are the exported DllRegisterServer and

14 years, 7 months

[cwittich] 45475: [SHELL32] don't print the function name twice in ERR (merge from wine)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Feb 7 01:06:04 2010 New Revision: 45475 URL: http://svn.reactos.org/svn/reactos?rev=45475&view=rev Log: [SHELL32] don't print the function name twice in ERR (merge from wine) Modified: trunk/reactos/dll/win32/shell32/classes.c Modified: trunk/reactos/dll/win32/shell32/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/classes.… ============================================================================== --- trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/classes.c [iso-8859-1] Sun Feb 7 01:06:04 2010 @@ -460,7 +460,7 @@ TRACE("(pidlFolder=%p, pdwAttributes=%p)\n", pidlFolder, pdwAttributes); if (!_ILIsPidlSimple(pidlFolder)) { - ERR("HCR_GetFolderAttributes should be called for simple PIDL's only!\n"); + ERR("should be called for simple PIDL's only!\n"); return FALSE; }

14 years, 7 months

[cfinck] 45474: As you want it... here is 1.5!

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Feb 7 00:28:47 2010 New Revision: 45474 URL: http://svn.reactos.org/svn/reactos?rev=45474&view=rev Log: As you want it... here is 1.5! Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/README [iso-8859-1] Sun Feb 7 00:28:47 2010 @@ -1,5 +1,5 @@ ReactOS Build Environment - Version 1.5-RC2 for Unix-based operating systems + Version 1.5 for Unix-based operating systems Base package and i386 build tools by Colin Finck (colin(a)reactos.org) Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/R… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Sun Feb 7 00:28:47 2010 @@ -21,8 +21,8 @@ # RosBE-Unix Constants DEFAULT_INSTALL_DIR="/usr/local/RosBE" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5-RC2" -ROSBE_VERSION="1.5-RC2" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1 1.4 1.4.2 1.5" +ROSBE_VERSION="1.5" TARGET_ARCH="i386" source "$rs_scriptdir/scripts/rosbelibrary.sh"

14 years, 7 months

[ekohl] 45473: Simplify the policy handle creation and destruction. This fixes two winetest failures.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 7 00:06:57 2010 New Revision: 45473 URL: http://svn.reactos.org/svn/reactos?rev=45473&view=rev Log: Simplify the policy handle creation and destruction. This fixes two winetest failures. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Feb 7 00:06:57 2010 @@ -10,78 +10,69 @@ #include <wine/debug.h> -#define POLICY_DELETE (RTL_HANDLE_VALID << 1) -typedef struct _LSAR_POLICY_HANDLE -{ - ULONG Flags; +typedef struct _LSA_DB_HANDLE +{ + ULONG Signature; + ULONG Type; LONG RefCount; ACCESS_MASK AccessGranted; -} LSAR_POLICY_HANDLE, *PLSAR_POLICY_HANDLE; +} LSA_DB_HANDLE, *PLSA_DB_HANDLE; + +#define LSAP_DB_SIGNATURE 0x12345678 static RTL_CRITICAL_SECTION PolicyHandleTableLock; -static RTL_HANDLE_TABLE PolicyHandleTable; WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + /* FUNCTIONS ***************************************************************/ -static NTSTATUS -ReferencePolicyHandle( - IN LSA_HANDLE ObjectHandle, - IN ACCESS_MASK DesiredAccess, - OUT PLSAR_POLICY_HANDLE *Policy) -{ - PLSAR_POLICY_HANDLE ReferencedPolicy; - NTSTATUS Status = STATUS_SUCCESS; - - RtlEnterCriticalSection(&PolicyHandleTableLock); - - if (RtlIsValidIndexHandle(&PolicyHandleTable, - HandleToUlong(ObjectHandle), - (PRTL_HANDLE_TABLE_ENTRY*)&ReferencedPolicy) && - !(ReferencedPolicy->Flags & POLICY_DELETE)) +static LSAPR_HANDLE +LsapCreateDbHandle(ULONG Type) +{ + PLSA_DB_HANDLE DbHandle; + +// RtlEnterCriticalSection(&PolicyHandleTableLock); + + DbHandle = (PLSA_DB_HANDLE)RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(LSA_DB_HANDLE)); + if (DbHandle != NULL) { - if (RtlAreAllAccessesGranted(ReferencedPolicy->AccessGranted, - DesiredAccess)) - { - ReferencedPolicy->RefCount++; - *Policy = ReferencedPolicy; - } - else - Status = STATUS_ACCESS_DENIED; + DbHandle->Signature = LSAP_DB_SIGNATURE; + DbHandle->RefCount = 1; + DbHandle->Type = Type; } - else - Status = STATUS_INVALID_HANDLE; - - RtlLeaveCriticalSection(&PolicyHandleTableLock); - - return Status; -} - -static VOID -DereferencePolicyHandle( - IN OUT PLSAR_POLICY_HANDLE Policy, - IN BOOLEAN Delete) -{ - RtlEnterCriticalSection(&PolicyHandleTableLock); - - if (Delete) + +// RtlLeaveCriticalSection(&PolicyHandleTableLock); + + return (LSAPR_HANDLE)DbHandle; +} + + +static BOOL +LsapValidateDbHandle(LSAPR_HANDLE Handle) +{ + PLSA_DB_HANDLE DbHandle = (PLSA_DB_HANDLE)Handle; + BOOL bValid = FALSE; + + _SEH2_TRY { - Policy->Flags |= POLICY_DELETE; - Policy->RefCount--; - - ASSERT(Policy->RefCount != 0); + if (DbHandle->Signature == LSAP_DB_SIGNATURE) + bValid = TRUE; } - - if (--Policy->RefCount == 0) + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - ASSERT(Policy->Flags & POLICY_DELETE); - RtlFreeHandle(&PolicyHandleTable, - (PRTL_HANDLE_TABLE_ENTRY)Policy); + bValid = FALSE; } - - RtlLeaveCriticalSection(&PolicyHandleTableLock); -} + _SEH2_END; + + + return bValid; +} + + + VOID LsarStartRpcServer(VOID) @@ -89,9 +80,6 @@ RPC_STATUS Status; RtlInitializeCriticalSection(&PolicyHandleTableLock); - RtlInitializeHandleTable(0x1000, - sizeof(LSAR_POLICY_HANDLE), - &PolicyHandleTable); TRACE("LsarStartRpcServer() called"); @@ -135,29 +123,21 @@ NTSTATUS LsarClose( LSAPR_HANDLE *ObjectHandle) { - PLSAR_POLICY_HANDLE Policy = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; TRACE("0x%p\n", ObjectHandle); -#if 1 - /* This is our fake handle, don't go too much long way */ - if (*ObjectHandle == (LSA_HANDLE)0xcafe) +// RtlEnterCriticalSection(&PolicyHandleTableLock); + + if (LsapValidateDbHandle(*ObjectHandle)) { + RtlFreeHeap(RtlGetProcessHeap(), 0, *ObjectHandle); *ObjectHandle = NULL; - Status = STATUS_SUCCESS; } -#endif - - Status = ReferencePolicyHandle((LSA_HANDLE)*ObjectHandle, - 0, - &Policy); - if (NT_SUCCESS(Status)) - { - /* delete the handle */ - DereferencePolicyHandle(Policy, - TRUE); - } + else + Status = STATUS_INVALID_HANDLE; + +// RtlLeaveCriticalSection(&PolicyHandleTableLock); return Status; } @@ -227,18 +207,21 @@ ACCESS_MASK DesiredAccess, LSAPR_HANDLE *PolicyHandle) { -#if 1 + NTSTATUS Status = STATUS_SUCCESS; + TRACE("LsarOpenPolicy called!\n"); - *PolicyHandle = (LSAPR_HANDLE)0xcafe; + RtlEnterCriticalSection(&PolicyHandleTableLock); + + *PolicyHandle = LsapCreateDbHandle(0); + if (*PolicyHandle == NULL) + Status = STATUS_INSUFFICIENT_RESOURCES; + + RtlLeaveCriticalSection(&PolicyHandleTableLock); TRACE("LsarOpenPolicy done!\n"); - return STATUS_SUCCESS; -#else - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -#endif + return Status; }

14 years, 7 months

[cwittich] 45472: [QEDIT] sync qedit to wine 1.1.38

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Feb 6 22:46:26 2010 New Revision: 45472 URL: http://svn.reactos.org/svn/reactos?rev=45472&view=rev Log: [QEDIT] sync qedit to wine 1.1.38 Added: trunk/reactos/dll/directx/qedit/samplegrabber.c (with props) Modified: trunk/reactos/dll/directx/qedit/main.c trunk/reactos/dll/directx/qedit/mediadet.c trunk/reactos/dll/directx/qedit/qedit.rbuild trunk/reactos/dll/directx/qedit/qedit_private.h trunk/reactos/dll/directx/qedit/regsvr.c trunk/reactos/include/dxsdk/qedit.idl trunk/reactos/include/dxsdk/uuids.h Modified: trunk/reactos/dll/directx/qedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/qedit/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/main.c [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -53,6 +53,7 @@ static const struct object_creation_info object_creation[] = { { &CLSID_MediaDet, MediaDet_create }, + { &CLSID_SampleGrabber, SampleGrabber_create }, }; static HRESULT WINAPI Modified: trunk/reactos/dll/directx/qedit/mediadet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/mediadet… ============================================================================== --- trunk/reactos/dll/directx/qedit/mediadet.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/mediadet.c [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -112,7 +112,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, long *pVal) +static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, LONG *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; IEnumPins *pins; @@ -156,7 +156,7 @@ return S_OK; } -static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, long *pVal) +static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; TRACE("(%p)\n", This); @@ -209,16 +209,16 @@ return S_OK; } -static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, long newVal) -{ - MediaDetImpl *This = (MediaDetImpl *)iface; - HRESULT hr; - - TRACE("(%p)->(%ld)\n", This, newVal); +static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + HRESULT hr; + + TRACE("(%p)->(%d)\n", This, newVal); if (This->num_streams == -1) { - long n; + LONG n; hr = MediaDet_get_OutputStreams(iface, &n); if (FAILED(hr)) return hr; @@ -310,7 +310,11 @@ hr = IPropertyBag_Read(pPropBagCat, wszClsidName, pvar, NULL); if (SUCCEEDED(hr)) + { hr = CLSIDFromString(V_UNION(pvar, bstrVal), pclsid); + VariantClear(pvar); + V_VT(pvar) = VT_BSTR; + } if (SUCCEEDED(hr)) hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); @@ -387,10 +391,14 @@ hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **) &splitter); if (FAILED(hr)) - return hr; + { + VariantClear(&var); + return hr; + } hr = IGraphBuilder_AddFilter(This->graph, splitter, V_UNION(&var, bstrVal)); + VariantClear(&var); if (FAILED(hr)) { IBaseFilter_Release(splitter); @@ -461,21 +469,21 @@ static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, double StreamTime, - long *pBufferSize, char *pBuffer, - long Width, long Height) -{ - MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %p %p %ld %ld): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, + LONG *pBufferSize, char *pBuffer, + LONG Width, LONG Height) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f %p %p %d %d): not implemented!\n", This, StreamTime, pBufferSize, pBuffer, Width, Height); return E_NOTIMPL; } static HRESULT WINAPI MediaDet_WriteBitmapBits(IMediaDet* iface, - double StreamTime, long Width, - long Height, BSTR Filename) -{ - MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%f %ld %ld %p): not implemented!\n", This, StreamTime, Width, Height, Filename); + double StreamTime, LONG Width, + LONG Height, BSTR Filename) +{ + MediaDetImpl *This = (MediaDetImpl *)iface; + FIXME("(%p)->(%f %d %d %p): not implemented!\n", This, StreamTime, Width, Height, Filename); return E_NOTIMPL; } Modified: trunk/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rb… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -8,6 +8,7 @@ <file>main.c</file> <file>mediadet.c</file> <file>regsvr.c</file> + <file>samplegrabber.c</file> <library>wine</library> <library>strmiids</library> <library>uuid</library> Modified: trunk/reactos/dll/directx/qedit/qedit_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit_pr… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit_private.h [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -37,5 +37,6 @@ #include "qedit.h" HRESULT MediaDet_create(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppObj); #endif /* __QEDIT_PRIVATE_INCLUDED__ */ Modified: trunk/reactos/dll/directx/qedit/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/regsvr.c… ============================================================================== --- trunk/reactos/dll/directx/qedit/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/regsvr.c [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -294,6 +294,12 @@ "qedit.dll", "Both" }, + { &CLSID_SampleGrabber, + "Sample Grabber", + NULL, + "qedit.dll", + "Both" + }, { NULL } /* list terminator */ }; Added: trunk/reactos/dll/directx/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/samplegr… ============================================================================== --- trunk/reactos/dll/directx/qedit/samplegrabber.c (added) +++ trunk/reactos/dll/directx/qedit/samplegrabber.c [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -1,0 +1,453 @@ +/* DirectShow Sample Grabber object (QEDIT.DLL) + * + * Copyright 2009 Paul Chitescu + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "qedit_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(qedit); + +static WCHAR const vendor_name[] = { 'W', 'i', 'n', 'e', 0 }; + +/* Sample Grabber filter implementation */ +typedef struct _SG_Impl { + const IBaseFilterVtbl* IBaseFilter_Vtbl; + const ISampleGrabberVtbl* ISampleGrabber_Vtbl; + /* TODO: IMediaPosition, IMediaSeeking, IQualityControl */ + LONG refCount; + FILTER_INFO info; + FILTER_STATE state; + IMemAllocator *allocator; + IReferenceClock *refClock; +} SG_Impl; + +/* Get the SampleGrabber implementation This pointer from various interface pointers */ +static inline SG_Impl *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, IBaseFilter_Vtbl)); +} + +static inline SG_Impl *impl_from_ISampleGrabber(ISampleGrabber *iface) +{ + return (SG_Impl *)((char*)iface - FIELD_OFFSET(SG_Impl, ISampleGrabber_Vtbl)); +} + + +/* Cleanup at end of life */ +static void SampleGrabber_cleanup(SG_Impl *This) +{ + TRACE("(%p)\n", This); + if (This->info.pGraph) + WARN("(%p) still joined to filter graph %p\n", This, This->info.pGraph); + if (This->allocator) + IMemAllocator_Release(This->allocator); + if (This->refClock) + IReferenceClock_Release(This->refClock); +} + +/* Common helper AddRef called from all interfaces */ +static ULONG SampleGrabber_addref(SG_Impl *This) +{ + ULONG refCount = InterlockedIncrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); + return refCount; +} + +/* Common helper Release called from all interfaces */ +static ULONG SampleGrabber_release(SG_Impl *This) +{ + ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); + if (refCount == 0) + { + SampleGrabber_cleanup(This); + CoTaskMemFree(This); + return 0; + } + return refCount; +} + +/* Common helper QueryInterface called from all interfaces */ +static HRESULT SampleGrabber_query(SG_Impl *This, REFIID riid, void **ppvObject) +{ + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IPersist) || + IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter)) { + SampleGrabber_addref(This); + *ppvObject = &(This->IBaseFilter_Vtbl); + return S_OK; + } + else if (IsEqualIID(riid, &IID_ISampleGrabber)) { + SampleGrabber_addref(This); + *ppvObject = &(This->ISampleGrabber_Vtbl); + return S_OK; + } + else if (IsEqualIID(riid, &IID_IMemInputPin)) + FIXME("IMemInputPin not implemented\n"); + else if (IsEqualIID(riid, &IID_IMediaPosition)) + FIXME("IMediaPosition not implemented\n"); + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + FIXME("IMediaSeeking not implemented\n"); + else if (IsEqualIID(riid, &IID_IQualityControl)) + FIXME("IQualityControl not implemented\n"); + *ppvObject = NULL; + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); + return E_NOINTERFACE; +} + + +/* SampleGrabber implementation of IBaseFilter interface */ + +/* IUnknown */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppvObject) +{ + return SampleGrabber_query(impl_from_IBaseFilter(iface), riid, ppvObject); +} + +/* IUnknown */ +static ULONG WINAPI +SampleGrabber_IBaseFilter_AddRef(IBaseFilter *iface) +{ + return SampleGrabber_addref(impl_from_IBaseFilter(iface)); +} + +/* IUnknown */ +static ULONG WINAPI +SampleGrabber_IBaseFilter_Release(IBaseFilter *iface) +{ + return SampleGrabber_release(impl_from_IBaseFilter(iface)); +} + +/* IPersist */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_GetClassID(IBaseFilter *iface, CLSID *pClassID) +{ + TRACE("(%p)\n", pClassID); + if (!pClassID) + return E_POINTER; + *pClassID = CLSID_SampleGrabber; + return S_OK; +} + +/* IMediaFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_Stop(IBaseFilter *iface) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)\n", This); + This->state = State_Stopped; + return S_OK; +} + +/* IMediaFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_Pause(IBaseFilter *iface) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)\n", This); + This->state = State_Paused; + return S_OK; +} + +/* IMediaFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_Run(IBaseFilter *iface, REFERENCE_TIME tStart) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)\n", This); + This->state = State_Running; + return S_OK; +} + +/* IMediaFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_GetState(IBaseFilter *iface, DWORD msTout, FILTER_STATE *state) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)->(%u, %p)\n", This, msTout, state); + if (!state) + return E_POINTER; + *state = This->state; + return S_OK; +} + +/* IMediaFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)->(%p)\n", This, clock); + if (clock != This->refClock) + { + if (clock) + IReferenceClock_AddRef(clock); + if (This->refClock) + IReferenceClock_Release(This->refClock); + This->refClock = clock; + } + return S_OK; +} + +/* IMediaFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_GetSyncSource(IBaseFilter *iface, IReferenceClock **clock) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)->(%p)\n", This, clock); + if (!clock) + return E_POINTER; + if (This->refClock) + IReferenceClock_AddRef(This->refClock); + *clock = This->refClock; + return S_OK; +} + +/* IBaseFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_EnumPins(IBaseFilter *iface, IEnumPins **pins) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%p): stub\n", This, pins); + if (!pins) + return E_POINTER; + return E_OUTOFMEMORY; +} + +/* IBaseFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_FindPin(IBaseFilter *iface, LPCWSTR id, IPin **pin) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + FIXME("(%p)->(%s, %p): stub\n", This, debugstr_w(id), pin); + if (!id || !pin) + return E_POINTER; + *pin = NULL; + return VFW_E_NOT_FOUND; +} + +/* IBaseFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *info) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)->(%p)\n", This, info); + if (!info) + return E_POINTER; + if (This->info.pGraph) + IFilterGraph_AddRef(This->info.pGraph); + *info = This->info; + return S_OK; +} + +/* IBaseFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *graph, LPCWSTR name) +{ + SG_Impl *This = impl_from_IBaseFilter(iface); + TRACE("(%p)->(%p, %s)\n", This, graph, debugstr_w(name)); + This->info.pGraph = graph; + if (name) + lstrcpynW(This->info.achName,name,MAX_FILTER_NAME); + return S_OK; +} + +/* IBaseFilter */ +static HRESULT WINAPI +SampleGrabber_IBaseFilter_QueryVendorInfo(IBaseFilter *iface, LPWSTR *vendor) +{ + TRACE("(%p)\n", vendor); + if (!vendor) + return E_POINTER; + *vendor = CoTaskMemAlloc(sizeof(vendor_name)); + CopyMemory(*vendor, vendor_name, sizeof(vendor_name)); + return S_OK; +} + + +/* SampleGrabber implementation of ISampleGrabber interface */ + +/* IUnknown */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_QueryInterface(ISampleGrabber *iface, REFIID riid, void **ppvObject) +{ + return SampleGrabber_query(impl_from_ISampleGrabber(iface), riid, ppvObject); +} + +/* IUnknown */ +static ULONG WINAPI +SampleGrabber_ISampleGrabber_AddRef(ISampleGrabber *iface) +{ + return SampleGrabber_addref(impl_from_ISampleGrabber(iface)); +} + +/* IUnknown */ +static ULONG WINAPI +SampleGrabber_ISampleGrabber_Release(ISampleGrabber *iface) +{ + return SampleGrabber_release(impl_from_ISampleGrabber(iface)); +} + +/* ISampleGrabber */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_SetOneShot(ISampleGrabber *iface, BOOL oneShot) +{ + SG_Impl *This = impl_from_ISampleGrabber(iface); + FIXME("(%p)->(%u): stub\n", This, oneShot); + return E_NOTIMPL; +} + +/* ISampleGrabber */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_SetMediaType(ISampleGrabber *iface, const AM_MEDIA_TYPE *type) +{ + SG_Impl *This = impl_from_ISampleGrabber(iface); + FIXME("(%p)->(%p): stub\n", This, type); + if (!type) + return E_POINTER; + return E_NOTIMPL; +} + +/* ISampleGrabber */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_GetConnectedMediaType(ISampleGrabber *iface, AM_MEDIA_TYPE *type) +{ + SG_Impl *This = impl_from_ISampleGrabber(iface); + FIXME("(%p)->(%p): stub\n", This, type); + if (!type) + return E_POINTER; + return E_NOTIMPL; +} + +/* ISampleGrabber */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_SetBufferSamples(ISampleGrabber *iface, BOOL bufferEm) +{ + TRACE("(%u)\n", bufferEm); + if (bufferEm) { + FIXME("buffering not implemented\n"); + return E_NOTIMPL; + } + return S_OK; +} + +/* ISampleGrabber */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_GetCurrentBuffer(ISampleGrabber *iface, LONG *bufSize, LONG *buffer) +{ + FIXME("(%p, %p): stub\n", bufSize, buffer); + if (!bufSize) + return E_POINTER; + return E_INVALIDARG; +} + +/* ISampleGrabber */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_GetCurrentSample(ISampleGrabber *iface, IMediaSample **sample) +{ + /* MS doesn't implement it either, noone should call it */ + WARN("(%p): not implemented\n", sample); + return E_NOTIMPL; +} + +/* ISampleGrabber */ +static HRESULT WINAPI +SampleGrabber_ISampleGrabber_SetCallback(ISampleGrabber *iface, ISampleGrabberCB *cb, LONG whichMethod) +{ + SG_Impl *This = impl_from_ISampleGrabber(iface); + FIXME("(%p)->(%p, %u): stub\n", This, cb, whichMethod); + return E_NOTIMPL; +} + + +/* SampleGrabber vtables and constructor */ + +static const IBaseFilterVtbl IBaseFilter_VTable = +{ + SampleGrabber_IBaseFilter_QueryInterface, + SampleGrabber_IBaseFilter_AddRef, + SampleGrabber_IBaseFilter_Release, + SampleGrabber_IBaseFilter_GetClassID, + SampleGrabber_IBaseFilter_Stop, + SampleGrabber_IBaseFilter_Pause, + SampleGrabber_IBaseFilter_Run, + SampleGrabber_IBaseFilter_GetState, + SampleGrabber_IBaseFilter_SetSyncSource, + SampleGrabber_IBaseFilter_GetSyncSource, + SampleGrabber_IBaseFilter_EnumPins, + SampleGrabber_IBaseFilter_FindPin, + SampleGrabber_IBaseFilter_QueryFilterInfo, + SampleGrabber_IBaseFilter_JoinFilterGraph, + SampleGrabber_IBaseFilter_QueryVendorInfo, +}; + +static const ISampleGrabberVtbl ISampleGrabber_VTable = +{ + SampleGrabber_ISampleGrabber_QueryInterface, + SampleGrabber_ISampleGrabber_AddRef, + SampleGrabber_ISampleGrabber_Release, + SampleGrabber_ISampleGrabber_SetOneShot, + SampleGrabber_ISampleGrabber_SetMediaType, + SampleGrabber_ISampleGrabber_GetConnectedMediaType, + SampleGrabber_ISampleGrabber_SetBufferSamples, + SampleGrabber_ISampleGrabber_GetCurrentBuffer, + SampleGrabber_ISampleGrabber_GetCurrentSample, + SampleGrabber_ISampleGrabber_SetCallback, +}; + +HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) +{ + SG_Impl* obj = NULL; + + TRACE("(%p,%p)\n", ppv, pUnkOuter); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + obj = CoTaskMemAlloc(sizeof(SG_Impl)); + if (NULL == obj) { + *ppv = NULL; + return E_OUTOFMEMORY; + } + ZeroMemory(obj, sizeof(SG_Impl)); + + obj->refCount = 1; + obj->IBaseFilter_Vtbl = &IBaseFilter_VTable; + obj->ISampleGrabber_Vtbl = &ISampleGrabber_VTable; + obj->info.achName[0] = 0; + obj->info.pGraph = NULL; + obj->state = State_Stopped; + obj->allocator = NULL; + obj->refClock = NULL; + *ppv = obj; + + return S_OK; +} Propchange: trunk/reactos/dll/directx/qedit/samplegrabber.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/dxsdk/qedit.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/qedit.idl?re… ============================================================================== --- trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/qedit.idl [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -37,7 +37,7 @@ HRESULT BufferCB( double SampleTime, BYTE * pBuffer, - long BufferLen + LONG BufferLen ); } @@ -66,8 +66,8 @@ ); HRESULT GetCurrentBuffer( - [in,out] long * pBufferSize, - [out] long * pBuffer + [in,out] LONG * pBufferSize, + [out] LONG * pBuffer ); HRESULT GetCurrentSample( @@ -76,7 +76,7 @@ HRESULT SetCallback( ISampleGrabberCB * pCallback, - long WhichMethodToCallback + LONG WhichMethodToCallback ); }; @@ -96,15 +96,15 @@ ); HRESULT get_OutputStreams( - [out] long *pVal + [out] LONG *pVal ); HRESULT get_CurrentStream( - [out] long *pVal + [out] LONG *pVal ); HRESULT put_CurrentStream( - long newVal + LONG newVal ); HRESULT get_StreamType( @@ -129,16 +129,16 @@ HRESULT GetBitmapBits( double StreamTime, - long * pBufferSize, + LONG * pBufferSize, char * pBuffer, - long Width, - long Height + LONG Width, + LONG Height ); HRESULT WriteBitmapBits( double StreamTime, - long Width, - long Height, + LONG Width, + LONG Height, BSTR Filename ); Modified: trunk/reactos/include/dxsdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/uuids.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/uuids.h [iso-8859-1] Sat Feb 6 22:46:26 2010 @@ -135,6 +135,7 @@ OUR_GUID_ENTRY(CLSID_QTDec, 0xfdfe9681, 0x74a3, 0x11d0, 0xaf, 0xa7, 0x00, 0xaa, 0x00, 0xb6, 0x7a, 0x42) OUR_GUID_ENTRY(CLSID_AVIDoc, 0xd3588ab0, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) OUR_GUID_ENTRY(CLSID_AVIDocWriter, 0xd3588ab1, 0x0781, 0x11ce, 0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70) +OUR_GUID_ENTRY(CLSID_SampleGrabber, 0xc1f400a0, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) OUR_GUID_ENTRY(CLSID_NullRenderer, 0xc1f400a4, 0x3f08, 0x11d3, 0x9f, 0x0b, 0x00, 0x60, 0x08, 0x03, 0x9e, 0x37) OUR_GUID_ENTRY(CLSID_VideoRenderer, 0x70e102b0, 0x5556, 0x11ce, 0x97, 0xc0, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a) OUR_GUID_ENTRY(CLSID_VideoRendererDefault, 0x6bc1cffa, 0x8fc1, 0x4261, 0xac, 0x22, 0xcf, 0xb4, 0xcc, 0x38, 0xdb, 0x50)

14 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2010