Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 45143: [NTOS]: Implement the special NtRaiseException in C as well, just like we did for NtContinue.
by sir_richard＠svn.reactos.org 19 Jan '10

19 Jan '10

Author: sir_richard Date: Tue Jan 19 09:26:25 2010 New Revision: 45143 URL: http://svn.reactos.org/svn/reactos?rev=45143&view=rev Log: [NTOS]: Implement the special NtRaiseException in C as well, just like we did for NtContinue. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Jan 19 09:26:25 2010 @@ -934,6 +934,16 @@ NTSTATUS NTAPI +KiRaiseException( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PKTRAP_FRAME TrapFrame, + IN BOOLEAN SearchFrames +); + +NTSTATUS +NTAPI KiContinue( IN PCONTEXT Context, IN PKEXCEPTION_FRAME ExceptionFrame, Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jan 19 09:26:25 2010 @@ -476,49 +476,11 @@ .func NtRaiseException@12 _NtRaiseException@12: - - /* NOTE: We -must- be called by Zw* to have the right frame! */ - /* Push the stack frame */ - push ebp - - /* Get the current thread and restore its trap frame */ - mov ebx, PCR[KPCR_CURRENT_THREAD] - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ebx+KTHREAD_TRAP_FRAME], edx - - /* Set up stack frame */ - mov ebp, esp - - /* Get the Trap Frame in EBX */ - mov ebx, [ebp+0] - - /* Get the exception list and restore */ - mov eax, [ebx+KTRAP_FRAME_EXCEPTION_LIST] - mov PCR[KPCR_EXCEPTION_LIST], eax - - /* Get the parameters */ - mov edx, [ebp+16] /* Search frames */ - mov ecx, [ebp+12] /* Context */ - mov eax, [ebp+8] /* Exception Record */ - - /* Raise the exception */ - push edx - push ebx - push 0 - push ecx - push eax - call _KiRaiseException@20 - - /* Restore trap frame in EBP */ - pop ebp - mov esp, ebp - - /* Check the result */ - or eax, eax - jz _KiServiceExit2 - - /* Restore debug registers too */ - jmp _KiServiceExit + /* Call C code */ + mov ecx, [esp+4] + mov edx, [esp+8] + or edx, [esp+12] + jmp @NtRaiseExceptionHandler@8 .endfunc .func NtContinue@8 Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Jan 19 09:26:25 2010 @@ -1693,6 +1693,46 @@ VOID FASTCALL +NtRaiseExceptionHandler(IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context) +{ + BOOLEAN FirstChance; + NTSTATUS Status; + PKTHREAD Thread; + PKTRAP_FRAME TrapFrame; + + /* Fixup parameters */ + FirstChance = (ULONG_PTR)Context & 1; + Context = (PVOID)((ULONG_PTR)Context & ~1); + + /* Get trap frame and link previous one*/ + Thread = KeGetCurrentThread(); + TrapFrame = Thread->TrapFrame; + Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + + /* Set exception list */ + KeGetPcr()->Tib.ExceptionList = TrapFrame->ExceptionList; + + /* Raise the exception */ + Status = KiRaiseException(ExceptionRecord, + Context, + NULL, + TrapFrame, + FirstChance); + if (NT_SUCCESS(Status)) + { + /* It was handled, so exit restoring all state */ + KiServiceExit2(TrapFrame); + } + else + { + /* Exit with error */ + KiServiceExit(TrapFrame, Status); + } +} + +VOID +FASTCALL NtContinueHandler(IN PCONTEXT Context, IN BOOLEAN TestAlert) {

1 0

[sir_richard] 45142: [NTOS]: Implement "Edited Trap Frame" exit. This funky trick is actually how NT emulates longjmp/setjmp when doing an NtContinue: it allows arbitrary return with a new CS/ESP. [NTOS]: Implement C version of KiServiceExit, the second system call exit routine. This one sets a new EAX value to be returned to the caller and is used by system calls. [NTOS]: Implement NtContinue in C instead of ASM. Due to the changes above, this can now be done in C and use the new KiServiceExit.
by sir_richard＠svn.reactos.org 19 Jan '10

19 Jan '10

Author: sir_richard Date: Tue Jan 19 09:20:12 2010 New Revision: 45142 URL: http://svn.reactos.org/svn/reactos?rev=45142&view=rev Log: [NTOS]: Implement "Edited Trap Frame" exit. This funky trick is actually how NT emulates longjmp/setjmp when doing an NtContinue: it allows arbitrary return with a new CS/ESP. [NTOS]: Implement C version of KiServiceExit, the second system call exit routine. This one sets a new EAX value to be returned to the caller and is used by system calls. [NTOS]: Implement NtContinue in C instead of ASM. Due to the changes above, this can now be done in C and use the new KiServiceExit. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Jan 19 09:20:12 2010 @@ -932,6 +932,14 @@ VOID ); +NTSTATUS +NTAPI +KiContinue( + IN PCONTEXT Context, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PKTRAP_FRAME TrapFrame +); + VOID FASTCALL KiServiceExit2( Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Tue Jan 19 09:20:12 2010 @@ -322,3 +322,35 @@ : "%esp" ); } + +FORCEINLINE +VOID +KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame) +{ + /* Regular interrupt exit */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "movl %c[a](%%esp), %%eax\n" + "movl %c[b](%%esp), %%ebx\n" + "movl %c[c](%%esp), %%ecx\n" + "movl %c[d](%%esp), %%edx\n" + "movl %c[s](%%esp), %%esi\n" + "movl %c[i](%%esp), %%edi\n" + "movl %c[p](%%esp), %%ebp\n" + "addl $%c[e],%%esp\n" + "movl (%%esp), %%esp\n" + "iret\n" + : + : "r"(TrapFrame), + [a] "i"(KTRAP_FRAME_EAX), + [b] "i"(KTRAP_FRAME_EBX), + [c] "i"(KTRAP_FRAME_ECX), + [d] "i"(KTRAP_FRAME_EDX), + [s] "i"(KTRAP_FRAME_ESI), + [i] "i"(KTRAP_FRAME_EDI), + [p] "i"(KTRAP_FRAME_EBP), + [e] "i"(KTRAP_FRAME_ERROR_CODE) /* We *WANT* the error code since ESP is there! */ + : "%esp" + ); +} Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jan 19 09:20:12 2010 @@ -523,52 +523,10 @@ .func NtContinue@8 _NtContinue@8: - - /* NOTE: We -must- be called by Zw* to have the right frame! */ - /* Push the stack frame */ - push ebp - - /* Get the current thread and restore its trap frame */ - mov ebx, PCR[KPCR_CURRENT_THREAD] - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ebx+KTHREAD_TRAP_FRAME], edx - - /* Set up stack frame */ - mov ebp, esp - - /* Save the parameters */ - mov eax, [ebp+0] - mov ecx, [ebp+8] - - /* Call KiContinue */ - push eax - push 0 - push ecx - call _KiContinue@12 - - /* Check if we failed (bad context record) */ - or eax, eax - jnz Error - - /* Check if test alert was requested */ - cmp dword ptr [ebp+12], 0 - je DontTest - - /* Test alert for the thread */ - mov al, [ebx+KTHREAD_PREVIOUS_MODE] - push eax - call _KeTestAlertThread@4 - -DontTest: - /* Return to previous context */ - pop ebp - mov esp, ebp - jmp _KiServiceExit2 - -Error: - pop ebp - mov esp, ebp - jmp _KiServiceExit + /* Call C code */ + mov ecx, [esp+4] + mov edx, [esp+8] + jmp @NtContinueHandler@8 .endfunc /* HARDWARE TRAP HANDLERS ****************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Jan 19 09:20:12 2010 @@ -54,6 +54,9 @@ IN UCHAR Skip) { KTRAP_EXIT_SKIP_BITS SkipBits = { .Bits = Skip }; + PULONG ReturnStack; + + /* Debugging checks */ KiExitTrapDebugChecks(TrapFrame, SkipBits); /* Restore the SEH handler chain */ @@ -81,12 +84,42 @@ /* Check if the trap frame was edited */ if (__builtin_expect(!(TrapFrame->SegCs & FRAME_EDITED), 0)) - { - /* Not handled yet */ - UNIMPLEMENTED; - KiDumpTrapFrame(TrapFrame); - DbgBreakPoint(); - while (TRUE); + { + /* + * An edited trap frame happens when we need to modify CS and/or ESP but + * don't actually have a ring transition. This happens when a kernelmode + * caller wants to perform an NtContinue to another kernel address, such + * as in the case of SEH (basically, a longjmp), or to a user address. + * + * Therefore, the CPU never saved CS/ESP on the stack because we did not + * get a trap frame due to a ring transition (there was no interrupt). + * Even if we didn't want to restore CS to a new value, a problem occurs + * due to the fact a normal RET would not work if we restored ESP since + * RET would then try to read the result off the stack. + * + * The NT kernel solves this by adding 12 bytes of stack to the exiting + * trap frame, in which EFLAGS, CS, and EIP are stored, and then saving + * the ESP that's being requested into the ErrorCode field. It will then + * exit with an IRET. This fixes both issues, because it gives the stack + * some space where to hold the return address and then end up with the + * wanted stack, and it uses IRET which allows a new CS to be inputted. + * + */ + + /* Set CS that is requested */ + TrapFrame->SegCs = TrapFrame->TempSegCs; + + /* First make space on requested stack */ + ReturnStack = (PULONG)(TrapFrame->TempEsp - 12); + TrapFrame->ErrCode = (ULONG_PTR)ReturnStack; + + /* Now copy IRET frame */ + ReturnStack[0] = TrapFrame->Eip; + ReturnStack[1] = TrapFrame->SegCs; + ReturnStack[2] = TrapFrame->EFlags; + + /* Do special edited return */ + KiEditedTrapReturn(TrapFrame); } /* Check if this is a user trap */ @@ -212,6 +245,24 @@ /* Now exit the trap for real */ KiExitTrap(TrapFrame, KTE_SKIP_PM_BIT); +} + +VOID +FASTCALL +KiServiceExit(IN PKTRAP_FRAME TrapFrame, + IN NTSTATUS Status) +{ + /* Disable interrupts until we return */ + _disable(); + + /* Check for APC delivery */ + KiCheckForApcDelivery(TrapFrame); + + /* Copy the status into EAX */ + TrapFrame->Eax = Status; + + /* Now exit the trap for real */ + KiExitTrap(TrapFrame, KTE_SKIP_SEG_BIT | KTE_SKIP_VOL_BIT); } VOID @@ -1640,6 +1691,37 @@ KiDebugHandler(TrapFrame, TrapFrame->Eax, TrapFrame->Ecx, TrapFrame->Edx); } +VOID +FASTCALL +NtContinueHandler(IN PCONTEXT Context, + IN BOOLEAN TestAlert) +{ + PKTHREAD Thread; + NTSTATUS Status; + PKTRAP_FRAME TrapFrame; + + /* Get trap frame and link previous one*/ + Thread = KeGetCurrentThread(); + TrapFrame = Thread->TrapFrame; + Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + + /* Continue from this point on */ + Status = KiContinue(Context, NULL, TrapFrame); + if (NT_SUCCESS(Status)) + { + /* Check if alert was requested */ + if (TestAlert) KeTestAlertThread(Thread->PreviousMode); + + /* Exit to new trap frame */ + KiServiceExit2(TrapFrame); + } + else + { + /* Exit with an error */ + KiServiceExit(TrapFrame, Status); + } +} + /* HARDWARE INTERRUPTS ********************************************************/ /*

1 0

[sir_richard] 45141: [NTOS]: Implement KiServiceExit2, C Version. This is used for exiting to user-mode with full state restore (as in NtContinue, thread startup, NtRaiseException...). [NTOS]: Implement system service exit (for system calls or KiServiceExit2) in KiExitTrap. Both iret (for user calls), jmp (for kernel calls) and sysexit (for user fast calls) are implemented. [NTOS]: Implement KiThreadStartup in C instead of ASM. It is the first caller of the new KiServiceExit2. Threads now start
by sir_richard＠svn.reactos.org 19 Jan '10

19 Jan '10

Author: sir_richard Date: Tue Jan 19 07:34:15 2010 New Revision: 45141 URL: http://svn.reactos.org/svn/reactos?rev=45141&view=rev Log: [NTOS]: Implement KiServiceExit2, C Version. This is used for exiting to user-mode with full state restore (as in NtContinue, thread startup, NtRaiseException...). [NTOS]: Implement system service exit (for system calls or KiServiceExit2) in KiExitTrap. Both iret (for user calls), jmp (for kernel calls) and sysexit (for user fast calls) are implemented. [NTOS]: Implement KiThreadStartup in C instead of ASM. It is the first caller of the new KiServiceExit2. Threads now start up in C! Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thrdini.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Jan 19 07:34:15 2010 @@ -5,8 +5,6 @@ #include "intrin_i.h" #include "v86m.h" - -extern ULONG Ke386CacheAlignment; // // Thread Dispatcher Header DebugActive Mask @@ -288,15 +286,9 @@ NTAPI KiGetFeatureBits(VOID); -#ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ -VOID -NTAPI -KiThreadStartup(PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - BOOLEAN UserThread, - KTRAP_FRAME TrapFrame); -#endif +VOID +NTAPI +KiThreadStartup(VOID); NTSTATUS NTAPI @@ -438,6 +430,8 @@ extern ULONG KiMXCsrMask; extern ULONG KeI386CpuType; extern ULONG KeI386CpuStep; +extern ULONG Ke386CacheAlignment; +extern ULONG KiFastSystemCallDisable; extern UCHAR KiDebugRegisterTrapOffsets[9]; extern UCHAR KiDebugRegisterContextOffsets[9]; extern VOID __cdecl KiTrap02(VOID); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Jan 19 07:34:15 2010 @@ -932,6 +932,12 @@ VOID ); +VOID +FASTCALL +KiServiceExit2( + IN PKTRAP_FRAME TrapFrame +); + #ifndef HAL_INTERRUPT_SUPPORT_IN_C VOID NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Tue Jan 19 07:34:15 2010 @@ -207,6 +207,93 @@ FORCEINLINE VOID +KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame) +{ + /* Restore nonvolatiles, EAX, and do a "jump" back to the kernel caller */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "movl %c[b](%%esp), %%ebx\n" + "movl %c[s](%%esp), %%esi\n" + "movl %c[i](%%esp), %%edi\n" + "movl %c[p](%%esp), %%ebp\n" + "movl %c[a](%%esp), %%eax\n" + "movl %c[e](%%esp), %%edx\n" + "addl $%c[v],%%esp\n" /* A WHOLE *KERNEL* frame since we're not IRET'ing */ + "jmp *%%edx\n" + : + : "r"(TrapFrame), + [b] "i"(KTRAP_FRAME_EBX), + [s] "i"(KTRAP_FRAME_ESI), + [i] "i"(KTRAP_FRAME_EDI), + [p] "i"(KTRAP_FRAME_EBP), + [a] "i"(KTRAP_FRAME_EAX), + [e] "i"(KTRAP_FRAME_EIP), + [v] "i"(KTRAP_FRAME_ESP) + : "%esp" + ); +} + +FORCEINLINE +VOID +KiSystemCallTrapReturn(IN PKTRAP_FRAME TrapFrame) +{ + /* Regular interrupt exit, but we only restore EAX as a volatile */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "movl %c[b](%%esp), %%ebx\n" + "movl %c[s](%%esp), %%esi\n" + "movl %c[i](%%esp), %%edi\n" + "movl %c[p](%%esp), %%ebp\n" + "movl %c[a](%%esp), %%eax\n" + "addl $%c[e],%%esp\n" + "iret\n" + : + : "r"(TrapFrame), + [b] "i"(KTRAP_FRAME_EBX), + [s] "i"(KTRAP_FRAME_ESI), + [i] "i"(KTRAP_FRAME_EDI), + [p] "i"(KTRAP_FRAME_EBP), + [a] "i"(KTRAP_FRAME_EAX), + [e] "i"(KTRAP_FRAME_EIP) + : "%esp" + ); +} + +FORCEINLINE +VOID +KiSystemCallSysExitReturn(IN PKTRAP_FRAME TrapFrame) +{ + /* Restore nonvolatiles, EAX, and do a SYSEXIT back to the user caller */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "movl %c[s](%%esp), %%esi\n" + "movl %c[b](%%esp), %%ebx\n" + "movl %c[i](%%esp), %%edi\n" + "movl %c[p](%%esp), %%ebp\n" + "movl %c[a](%%esp), %%eax\n" + "movl %c[e](%%esp), %%edx\n" /* SYSEXIT says EIP in EDX */ + "movl %c[x](%%esp), %%ecx\n" /* SYSEXIT says ESP in ECX */ + "addl $%c[v],%%esp\n" /* A WHOLE *USER* frame since we're not IRET'ing */ + "sti\nsysexit\n" + : + : "r"(TrapFrame), + [b] "i"(KTRAP_FRAME_EBX), + [s] "i"(KTRAP_FRAME_ESI), + [i] "i"(KTRAP_FRAME_EDI), + [p] "i"(KTRAP_FRAME_EBP), + [a] "i"(KTRAP_FRAME_EAX), + [e] "i"(KTRAP_FRAME_EIP), + [x] "i"(KTRAP_FRAME_ESP), + [v] "i"(KTRAP_FRAME_V86_ES) + : "%esp" + ); +} + +FORCEINLINE +VOID KiTrapReturn(IN PKTRAP_FRAME TrapFrame) { /* Regular interrupt exit */ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Jan 19 07:34:15 2010 @@ -249,77 +249,6 @@ .endfunc /*++ - * KiThreadStartup - * - * The KiThreadStartup routine is the beginning of any thread. - * - * Params: - * SystemRoutine - Pointer to the System Startup Routine. Either - * PspUserThreadStartup or PspSystemThreadStartup - * - * StartRoutine - For Kernel Threads only, specifies the starting execution - * point of the new thread. - * - * StartContext - For Kernel Threads only, specifies a pointer to variable - * context data to be sent to the StartRoutine above. - * - * UserThread - Indicates whether or not this is a user thread. This tells - * us if the thread has a context or not. - * - * TrapFrame - Pointer to the KTHREAD to which the caller wishes to - * switch from. - * - * Returns: - * Should never return for a system thread. Returns through the System Call - * Exit Dispatcher for a user thread. - * - * Remarks: - * If a return from a system thread is detected, a bug check will occur. - * - *--*/ - .func KiThreadStartup@156 -.globl _KiThreadStartup@156 -_KiThreadStartup@156: - - /* - * Clear all the non-volatile registers, so the thread won't be tempted to - * expect any static data (like some badly coded usermode/win9x apps do) - */ - xor ebx, ebx - xor esi, esi - xor edi, edi - xor ebp, ebp - - /* It's now safe to go to APC */ - mov ecx, APC_LEVEL - call @KfLowerIrql@4 - - /* - * Call the System Routine which is right on our stack now. - * After we pop the pointer, the Start Routine/Context will be on the - * stack, as parameters to the System Routine - */ - pop eax - call eax - - /* The thread returned... was it a user-thread? */ - pop ecx - or ecx, ecx - jz BadThread - - /* Yes it was, set our trapframe for the System Call Exit Dispatcher */ - mov ebp, esp - - /* Exit back to user-mode */ - jmp _KiServiceExit2 - -BadThread: - - /* A system thread returned...this is very bad! */ - int 3 -.endfunc - -/*++ * KiSwapContextInternal * * The KiSwapContextInternal routine switches context to another thread. Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Tue Jan 19 07:34:15 2010 @@ -43,6 +43,32 @@ } KKINIT_FRAME, *PKKINIT_FRAME; /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KiThreadStartup(VOID) +{ + PKTRAP_FRAME TrapFrame; + PKSTART_FRAME StartFrame; + PKUINIT_FRAME InitFrame; + + /* Get the start and trap frames */ + InitFrame = KeGetCurrentThread()->KernelStack; + StartFrame = &InitFrame->StartFrame; + TrapFrame = &InitFrame->TrapFrame; + + /* Lower to APC level */ + KfLowerIrql(APC_LEVEL); + + /* Call the system routine */ + StartFrame->SystemRoutine(StartFrame->StartRoutine, StartFrame->StartContext); + + /* If we returned, we better be a user thread */ + if (!StartFrame->UserThread) DbgBreakPoint(); + + /* Exit to user-mode */ + KiServiceExit2(TrapFrame); +} VOID NTAPI Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Tue Jan 19 07:34:15 2010 @@ -62,27 +62,30 @@ /* Check if the previous mode must be restored */ if (__builtin_expect(!SkipBits.SkipPreviousMode, 0)) /* More INTS than SYSCALLs */ { + /* Restore it */ + KeGetCurrentThread()->PreviousMode = TrapFrame->PreviousPreviousMode; + } + + /* Check if there are active debug registers */ + if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) + { /* Not handled yet */ UNIMPLEMENTED; + DbgBreakPoint(); + KiDumpTrapFrame(TrapFrame); while (TRUE); } - - /* Check if there are active debug registers */ - if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) + + /* Check if this was a V8086 trap */ + if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) KiTrapReturn(TrapFrame); + + /* Check if the trap frame was edited */ + if (__builtin_expect(!(TrapFrame->SegCs & FRAME_EDITED), 0)) { /* Not handled yet */ UNIMPLEMENTED; - while (TRUE); - } - - /* Check if this was a V8086 trap */ - if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) KiTrapReturn(TrapFrame); - - /* Check if the trap frame was edited */ - if (__builtin_expect(!(TrapFrame->SegCs & FRAME_EDITED), 0)) - { - /* Not handled yet */ - UNIMPLEMENTED; + KiDumpTrapFrame(TrapFrame); + DbgBreakPoint(); while (TRUE); } @@ -114,13 +117,37 @@ /* Check for system call -- a system call skips volatiles! */ if (__builtin_expect(SkipBits.SkipVolatiles, 0)) /* More INTs than SYSCALLs */ { - /* Not handled yet */ - /* - * When we do the system call handler through this path, we need - * to have some sort to restore the kernel EAX instead of pushing - * back the user EAX. We'll figure it out... - */ - DPRINT1("Warning: caller doesn't want volatiles restored\n"); + /* Kernel call or user call? */ + if (__builtin_expect(KiUserTrap(TrapFrame), 1)) /* More Ring 3 than 0 */ + { + /* Is SYSENTER supported and/or enabled, or are we stepping code? */ + if (__builtin_expect((KiFastSystemCallDisable) || + (TrapFrame->EFlags & EFLAGS_TF), 0)) + { + /* Exit normally */ + KiSystemCallTrapReturn(TrapFrame); + } + else + { + /* Restore user FS */ + Ke386SetFs(KGDT_R3_TEB | RPL_MASK); + + /* Remove interrupt flag */ + TrapFrame->EFlags &= ~EFLAGS_INTERRUPT_MASK; + __writeeflags(TrapFrame->EFlags); + + /* Exit through SYSEXIT */ + KiSystemCallSysExitReturn(TrapFrame); + } + } + else + { + /* Restore EFLags */ + __writeeflags(TrapFrame->EFlags); + + /* Call is kernel, so do a jump back since this wasn't a real INT */ + KiSystemCallReturn(TrapFrame); + } } else { @@ -185,6 +212,20 @@ /* Now exit the trap for real */ KiExitTrap(TrapFrame, KTE_SKIP_PM_BIT); +} + +VOID +FASTCALL +KiServiceExit2(IN PKTRAP_FRAME TrapFrame) +{ + /* Disable interrupts until we return */ + _disable(); + + /* Check for APC delivery */ + KiCheckForApcDelivery(TrapFrame); + + /* Now exit the trap for real */ + KiExitTrap(TrapFrame, 0); } /* TRAP ENTRY CODE ************************************************************/

1 0

[sir_richard] 45140: [NTOS]: Implement KeUpdateSystemTime and KeUpdateRunTime in C instead of ASM. Based off eVb's ARM implementation, with multiple bugs fixed (incorrect update of system counters, incorrect expiration of timers, remove non-used debug features, use locks when needed). [NTOS]: Implement KiComputeTimerTableIndex in C instead of ASM. Based off eVb's ARM implementation, bugfixed to do correct math instead. As a side effect, this should fix timers on ARM ; -)
by sir_richard＠svn.reactos.org 19 Jan '10

19 Jan '10

Author: sir_richard Date: Tue Jan 19 07:16:47 2010 New Revision: 45140 URL: http://svn.reactos.org/svn/reactos?rev=45140&view=rev Log: [NTOS]: Implement KeUpdateSystemTime and KeUpdateRunTime in C instead of ASM. Based off eVb's ARM implementation, with multiple bugs fixed (incorrect update of system counters, incorrect expiration of timers, remove non-used debug features, use locks when needed). [NTOS]: Implement KiComputeTimerTableIndex in C instead of ASM. Based off eVb's ARM implementation, bugfixed to do correct math instead. As a side effect, this should fix timers on ARM ;-) Added: trunk/reactos/ntoskrnl/ke/time.c - copied, changed from r45139, trunk/reactos/ntoskrnl/ke/arm/time.c Removed: trunk/reactos/ntoskrnl/ke/arm/time.c trunk/reactos/ntoskrnl/ke/i386/systimer.S Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Jan 19 07:16:47 2010 @@ -730,12 +730,6 @@ ULONG NTAPI -KiComputeTimerTableIndex( - IN LONGLONG TimeValue -); - -ULONG -NTAPI KeSetProcess( struct _KPROCESS* Process, KPRIORITY Increment, Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Tue Jan 19 07:16:47 2010 @@ -972,6 +972,13 @@ return STATUS_WAIT_0; } +ULONG +FORCEINLINE +KiComputeTimerTableIndex(IN ULONGLONG DueTime) +{ + return (DueTime / KeMaximumIncrement) & (TIMER_TABLE_SIZE - 1); +} + // // Called from KiCompleteTimer, KiInsertTreeTimer, KeSetSystemTime // to remove timer entries Removed: trunk/reactos/ntoskrnl/ke/arm/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/time.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/time.c (removed) @@ -1,322 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/ke/arm/time.c - * PURPOSE: Implements timebase functionality on ARM processors - * PROGRAMMERS: ReactOS Portable Systems Group - */ - -/* INCLUDES *******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ - -LONG KiTickOffset; -ULONG KeTimeAdjustment; - -/* FUNCTIONS ******************************************************************/ - -ULONG -KiComputeTimerTableIndex(IN LONGLONG DueTime) -{ - ULONG Hand; - - // - // Compute the timer table index - // - Hand = (DueTime / KeMaximumIncrement); - Hand %= TIMER_TABLE_SIZE; - return Hand; -} - -VOID -NTAPI -KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql, - IN ULONG Increment) -{ - PKPRCB Prcb = KeGetPcr()->Prcb; - ULARGE_INTEGER SystemTime, InterruptTime; - ULONG Hand; - - // - // Do nothing if this tick is being skipped - // - if (Prcb->SkipTick) - { - // - // Handle it next time - // - Prcb->SkipTick = FALSE; - return; - } - - // - // Add the increment time to the shared data - // - InterruptTime.HighPart = SharedUserData->InterruptTime.High1Time; - InterruptTime.LowPart = SharedUserData->InterruptTime.LowPart; - InterruptTime.QuadPart += Increment; - SharedUserData->InterruptTime.High1Time = InterruptTime.HighPart; - SharedUserData->InterruptTime.LowPart = InterruptTime.LowPart; - SharedUserData->InterruptTime.High2Time = InterruptTime.HighPart; - - // - // Update tick count - // - KiTickOffset -= Increment; - - // - // Check for incomplete tick - // - if (KiTickOffset <= 0) - { - // - // Update the system time - // - SystemTime.HighPart = SharedUserData->SystemTime.High1Time; - SystemTime.LowPart = SharedUserData->SystemTime.LowPart; - SystemTime.QuadPart += KeTimeAdjustment; - SharedUserData->SystemTime.High1Time = SystemTime.HighPart; - SharedUserData->SystemTime.LowPart = SystemTime.LowPart; - SharedUserData->SystemTime.High2Time = SystemTime.HighPart; - - // - // Update the tick count - // - SystemTime.HighPart = KeTickCount.High1Time; - SystemTime.LowPart = KeTickCount.LowPart; - SystemTime.QuadPart += 1; - KeTickCount.High1Time = SystemTime.HighPart; - KeTickCount.LowPart = SystemTime.LowPart; - KeTickCount.High2Time = SystemTime.HighPart; - - // - // Update it in the shared user data - // - SharedUserData->TickCount.High1Time = SystemTime.HighPart; - SharedUserData->TickCount.LowPart = SystemTime.LowPart; - SharedUserData->TickCount.High2Time = SystemTime.HighPart; - } - - // - // Check for timer expiration - // - Hand = KeTickCount.LowPart % TIMER_TABLE_SIZE; - if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) - { - // - // Check if we are already doing expiration - // - if (!Prcb->TimerRequest) - { - // - // Request a DPC to handle this - // - Prcb->TimerRequest = TrapFrame->SvcSp; - Prcb->TimerHand = Hand; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } - } - - // - // Check if we should request a debugger break - // - if (KdDebuggerEnabled) - { - // - // Check if we should break - // - if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); - } - - // - // Check if this was a full tick - // - if (KiTickOffset <= 0) - { - // - // Updare the tick offset - // - KiTickOffset += KeMaximumIncrement; - - // - // Update system runtime - // - KeUpdateRunTime(TrapFrame, CLOCK2_LEVEL); - } - else - { - // - // Increase interrupt count and exit - // - Prcb->InterruptCount++; - } -} - -VOID -NTAPI -KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql) -{ - PKTHREAD Thread = KeGetCurrentThread(); - PKPROCESS Process = Thread->ApcState.Process; - PKPRCB Prcb = KeGetCurrentPrcb(); - - // - // Do nothing if this tick is being skipped - // - if (Prcb->SkipTick) - { - // - // Handle it next time - // - Prcb->SkipTick = FALSE; - return; - } - - // - // Increase interrupt count - // - Prcb->InterruptCount++; - - // - // Check if we came from user mode - // - if (TrapFrame->PreviousMode != KernelMode) - { - // - // Increase process user time - // - InterlockedIncrement((PLONG)&Process->UserTime); - Prcb->UserTime++; - Thread->UserTime++; - } - else - { - // - // See if we were in an ISR - // - if (TrapFrame->OldIrql > DISPATCH_LEVEL) - { - // - // Handle that - // - Prcb->InterruptTime++; - } - else if ((TrapFrame->OldIrql < DISPATCH_LEVEL) || - !(Prcb->DpcRoutineActive)) - { - // - // Handle being in kernel mode - // - Thread->KernelTime++; - InterlockedIncrement((PLONG)&Process->KernelTime); - } - else - { - // - // Handle being in a DPC - // - Prcb->DpcTime++; - - // - // Update Debug DPC time - // - Prcb->DebugDpcTime++; - - // - // Check if we've timed out - // - if (Prcb->DebugDpcTime >= KiDPCTimeout) - { - // - // Print a message - // - DbgPrint("\n*** DPC routine > 1 sec --- This is not a break in " - "KeUpdateSystemTime\n"); - - // - // Break if a debugger is attached - // - if (KdDebuggerEnabled) DbgBreakPoint(); - - // - // Restore the debug DPC time - // - Prcb->DebugDpcTime = 0; - } - } - } - - // - // Update DPC rates - // - Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + - Prcb->DpcRequestRate) >> 1; - Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; - - // - // Check if the queue is large enough - // - if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) - { - // - // Request a DPC - // - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - - // - // Fix the maximum queue depth - // - if ((Prcb->DpcRequestRate < KiIdealDpcRate) && - (Prcb->MaximumDpcQueueDepth > 1)) - { - // - // Make it smaller - // - Prcb->MaximumDpcQueueDepth--; - } - } - else - { - // - // Check if we've reached the adjustment limit - // - if (!(--Prcb->AdjustDpcThreshold)) - { - // - // Reset it, and check the queue maximum - // - Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; - if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) - { - // - // Increase it - // - Prcb->MaximumDpcQueueDepth++; - } - } - } - - // - // Decrement the thread quantum - // - Thread->Quantum -= CLOCK_QUANTUM_DECREMENT; - - // - // Check if the time expired - // - if ((Thread->Quantum <= 0) && (Thread != Prcb->IdleThread)) - { - // - // Schedule a quantum end - // - Prcb->QuantumEnd = 1; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } -} Removed: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S (removed) @@ -1,383 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/clock.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Clock Management - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -_DpcTimeoutMsg: - .asciz "\n*** DPC routine > 1 sec --- This is not a break in KeUpdateSystemTime\n" - -/* FUNCTIONS ******************************************************************/ - -.globl _KiComputeTimerTableIndex@8 -.func KiComputeTimerTableIndex@8 -_KiComputeTimerTableIndex@8: - - /* Save registers */ - push ebx - - /* Make the first multiplication */ - mov eax, [esp+8] - mul dword ptr [_KiTimeIncrementReciprocal+4] - mov ebx, eax - mov ecx, edx - - /* Make the second multiplication */ - mov eax, [esp+12] - mul dword ptr [_KiTimeIncrementReciprocal] - add ebx, eax - adc ecx, edx - - /* Multiply by the reciprocal */ - mov eax, [esp+8] - mul dword ptr [_KiTimeIncrementReciprocal] - mov eax, [esp+12] - push edx - mul dword ptr [_KiTimeIncrementReciprocal+4] - pop edx - add edx, ebx - adc eax, ecx - - /* Shift the result and generate the index */ - mov cl, [_KiTimeIncrementShiftCount] - shr eax, cl - and eax, TIMER_TABLE_SIZE - 1 - - /* Return */ - pop ebx - ret 8 -.endfunc - -.globl _KeUpdateRunTime@8 -.func KeUpdateRunTime@8 -_KeUpdateRunTime@8: - - /* Get KPCR */ - mov eax, [fs:KPCR_SELF] - - /* Check if this tick is getting skipped */ - cmp byte ptr [eax+KPCR_PRCB_SKIP_TICK], 0 - jnz SkipTick - - /* Save EBX */ - push ebx - - /* Increase interrupt count */ - inc dword ptr [eax+KPCR_PRCB_INTERRUPT_COUNT] - - /* Get the current thread and process */ - mov ebx, [eax+KPCR_CURRENT_THREAD] - mov ecx, [ebx+KTHREAD_APCSTATE_PROCESS] - - /* Check if this was V86 or user mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz NotKern - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jnz NotKern - - /* Increase kernel time */ - inc dword ptr [eax+KPCR_PRCB_KERNEL_TIME] - - /* Check if IRQL was DISPATCH_LEVEL */ - cmp byte ptr [esp+8], DISPATCH_LEVEL - jb BelowDispatch - ja AboveDispatch - - /* Check if the DPC routine is active */ - cmp byte ptr fs:[KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 - jz BelowDispatch - - /* At dispatch, increase DPC time */ - inc dword ptr [eax+KPCR_PRCB_DPC_TIME] -#if DBG - /* Update the DPC time */ - inc dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME] - - /* Check if we've timed out */ - mov edx, _KiDPCTimeout - cmp dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME], edx - jc AfterSet - - /* We did, print out a message */ - push offset _DpcTimeoutMsg - call _DbgPrint - add esp, 4 - - /* Check if the debugger is enabled */ - cmp byte ptr __KdDebuggerEnabled, 0 - jz ResetDpcTime - - /* Breakpoint */ - call _DbgBreakPoint@0 - -ResetDpcTime: - /* Restore state */ - mov eax, PCR[KPCR_SELF] - mov dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME], 0 -#endif - jmp AfterSet - -AboveDispatch: - /* Update interrupt time */ - inc dword ptr [eax+KPCR_PRCB_INTERRUPT_TIME] - jmp AfterSet - -BelowDispatch: - /* Update kernel time */ - inc dword ptr [ebx+KTHREAD_KERNEL_TIME] - jmp AfterSet - -NotKern: - /* Update user time */ - inc dword ptr [eax+KPCR_PRCB_USER_TIME] - inc dword ptr [ebx+KTHREAD_USER_TIME] - -AfterSet: - /* Get the DPC Count and last count, and set the ne wone */ - mov ecx, [eax+KPCR_PRCB_DPC_COUNT] - mov edx, [eax+KPCR_PRCB_DPC_LAST_COUNT] - mov [eax+KPCR_PRCB_DPC_LAST_COUNT], ecx - - /* Substract counts and add request rate, divide by two to get average */ - sub ecx, edx - add ecx, [eax+KPCR_PRCB_DPC_REQUEST_RATE] - shr ecx, 1 - - /* Set this as the new request rate */ - mov [eax+KPCR_PRCB_DPC_REQUEST_RATE], ecx - - /* Check for depth > 0, DPCs to be inactive, and no other pending request */ - cmp dword ptr [eax+KPCR_PRCB_DPC_QUEUE_DEPTH], 0 - je DontRequest - cmp byte ptr [eax+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 - jnz DontRequest - cmp byte ptr [eax+KPCR_PRCB_DPC_INTERRUPT_REQUESTED], 0 - jnz DontRequest - - /* Request a DPC */ - mov ecx, DISPATCH_LEVEL - call @HalRequestSoftwareInterrupt@4 - - /* Restore PCR address */ - mov eax, [fs:KPCR_SELF] - - /* Get the DPC request rate and threshold adjust, and set it */ - mov ecx, [eax+KPCR_PRCB_DPC_REQUEST_RATE] - mov edx, _KiAdjustDpcThreshold - mov [eax+KPCR_PRCB_ADJUST_DPC_THRESHOLD], edx - - /* Check if the rate now is not ideal */ - cmp ecx, _KiIdealDpcRate - jge RateOk - cmp dword ptr [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH], 1 - je RateOk - - /* Fix the depth */ - dec dword ptr [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH] - jmp RateOk - -DontRequest: - /* We didn't request a DPC, decrease the threshold */ - dec dword ptr [eax+KPCR_PRCB_ADJUST_DPC_THRESHOLD] - jnz RateOk - - /* We're at 0 now, reset it */ - mov ecx, _KiAdjustDpcThreshold - mov [eax+KPCR_PRCB_ADJUST_DPC_THRESHOLD], ecx - - /* Get maximum depth and check it */ - mov ecx, _KiMaximumDpcQueueDepth - cmp ecx, [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH] - je RateOk - - /* Increase it, it's below maximum */ - inc dword ptr [eax+KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH] - -RateOk: - /* Decrement quantum and verify it */ - sub byte ptr [ebx+KTHREAD_QUANTUM], CLOCK_QUANTUM_DECREMENT - jg QuantumNotEmpty - - /* Make sure this isn't the idle thread */ - cmp ebx, [eax+KPCR_PRCB_IDLE_THREAD] - jz QuantumNotEmpty - - /* Set quantum end */ - mov byte ptr [eax+KPCR_PRCB_QUANTUM_END], 1 - mov ecx, DISPATCH_LEVEL - call @HalRequestSoftwareInterrupt@4 - -QuantumNotEmpty: - /* Restore ebx and return */ - pop ebx - ret 4 - -SkipTick: - /* Disable skipping the next tick and return */ - mov byte ptr [eax+KPCR_PRCB_SKIP_TICK], 0 - ret 4 -.endfunc - -.globl _KeUpdateSystemTime@0 -.func KeUpdateSystemTime@0 -_KeUpdateSystemTime@0: - - /* Check if this tick is getting skipped */ - cmp byte ptr fs:[KPCR_PRCB_SKIP_TICK], 0 - jnz SkipTickSys - - /* Get shared data in ECX */ - mov ecx, USER_SHARED_DATA - - /* Get interrupt time */ - mov edi, [ecx+USER_SHARED_DATA_INTERRUPT_TIME] - mov esi, [ecx+USER_SHARED_DATA_INTERRUPT_TIME+4] - - /* Add the increment and get the carry */ - add edi, eax - adc esi, 0 - - /* Now store the updated times */ - mov [ecx+USER_SHARED_DATA_INTERRUPT_TIME+8], esi - mov [ecx+USER_SHARED_DATA_INTERRUPT_TIME], edi - mov [ecx+USER_SHARED_DATA_INTERRUPT_TIME+4], esi - - /* Substract tick count and get the low count */ - LOCK sub _KiTickOffset, eax - mov eax, _KeTickCount - mov ebx, eax - jg IncompleteTick - - /* Get shared data in ECX */ - mov ebx, USER_SHARED_DATA - - /* Get system time */ - mov ecx, [ebx+USER_SHARED_DATA_SYSTEM_TIME] - mov edx, [ebx+USER_SHARED_DATA_SYSTEM_TIME+4] - - /* Add the increment and get the carry */ - add ecx, _KeTimeAdjustment - adc edx, 0 - - /* Now store the updated times */ - mov [ebx+USER_SHARED_DATA_SYSTEM_TIME+8], edx - mov [ebx+USER_SHARED_DATA_SYSTEM_TIME], ecx - mov [ebx+USER_SHARED_DATA_SYSTEM_TIME+4], edx - - /* Put tick count back in EBX */ - mov ebx, eax - - /* Copy it in ECX and get high count */ - mov ecx, eax - mov edx, _KeTickCount + 4 - - /* Add the increment and get the carry */ - add ecx, 1 - adc edx, 0 - - /* Now store the updated tick */ - mov [_KeTickCount+8], edx - mov [_KeTickCount], ecx - mov [_KeTickCount+4], edx - - /* Store in in shared data too */ - mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+8], edx - mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT], ecx - mov ds:[USER_SHARED_DATA+USER_SHARED_DATA_TICK_COUNT+4], edx - - /* Get hand index and entry into the table */ - and eax, TIMER_TABLE_SIZE - 1 - shl eax, 4 - - /* Compare the due time */ - cmp esi, [eax+_KiTimerTableListHead+KTIMER_TABLE_TIME+4] - jb NextHand - ja TimerExpired - cmp edi, [eax+_KiTimerTableListHead+KTIMER_TABLE_TIME] - jnb TimerExpired - -NextHand: - /* Move to the next hand */ - inc ebx - mov eax, ebx - -IncompleteTick: - - /* Get hand index and entry into the table */ - and eax, TIMER_TABLE_SIZE - 1 - shl eax, 4 - - /* Compare the due time */ - cmp esi, [eax+_KiTimerTableListHead+KTIMER_TABLE_TIME+4] - jb DebugCheck - ja TimerExpired - cmp edi, [eax+_KiTimerTableListHead+KTIMER_TABLE_TIME] - jb DebugCheck - -TimerExpired: - - /* Check if expiration is active */ - mov ecx, [fs:KPCR_PRCB] - cmp dword ptr [ecx+KPRCB_TIMER_REQUEST], 0 - jne DebugCheck - - /* It's not, register it */ - mov [ecx+KPRCB_TIMER_REQUEST], esp - mov [ecx+KPRCB_TIMER_HAND], ebx - mov ecx, DISPATCH_LEVEL - call @HalRequestSoftwareInterrupt@4 - -DebugCheck: - /* Check if the debugger is enabled */ - cmp byte ptr __KdDebuggerEnabled, 0 - jnz DebuggerEnabled - - /* Check if this was a full tick */ -NoDebug: - cmp dword ptr _KiTickOffset, 0 - jg IncompleteTick2 - - /* Increase tick offset */ - mov eax, _KeMaximumIncrement - add _KiTickOffset, eax - - /* Update system run time */ - push [esp] - call _KeUpdateRunTime@8 - jmp Done - -IncompleteTick2: - /* Increase interrupt count */ - inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] - -Done: - /* Exit the interrupt */ - cli - call _HalEndSystemInterrupt@8 - jmp _Kei386EoiHelper@0 - -DebuggerEnabled: - /* Check for break-in request */ - call _KdPollBreakIn@0 - or al, al - jz NoDebug - - /* Break-in requested! */ - push DBG_STATUS_CONTROL_C - call _DbgBreakPointWithStatus@4 - jmp NoDebug - -SkipTickSys: - /* Disable skipping the next tick and return */ - mov byte ptr fs:[KPCR_PRCB_SKIP_TICK], 0 - jmp IncompleteTick2 -.endfunc Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Tue Jan 19 07:16:47 2010 @@ -656,6 +656,41 @@ /* INTERRUPT HANDLERS ********************************************************/ +.globl _KeUpdateSystemTime@0 +.func KeUpdateSystemTime@0 +_KeUpdateSystemTime@0: + + /* + * When we enter here, the ASM HAL has: + * - Entered here with a JMP, not a CALL + * - Put increment in EAX + * - Pushed OldIRQL on the stack earlier [ESP] + * - Pushed Vector on the stack earlier [ESP + 4] + * - The trap frame at ESP + 8 + * + * When the HAL moves to C, this shit needs to die!!! + * + */ + + /* Call the regparm with Increment, OldIrql, TrapFrame */ + mov edx, [esp] + mov ecx, ebp + call _KeUpdateSystemTimeHandler + + /* + * The code below cannot be done in C because HalEndSystemInterrupt will + * fuck with your stack sideways when it decides to handle a pending APC or + * DPC! + */ + + /* Stack is back where it was, HalEndSystemInterrupt will clean it up */ + cli + call _HalEndSystemInterrupt@8 + + /* Now the stack has become the trap frame */ + jmp _Kei386EoiHelper@0 +.endfunc + .func KiDispatchInterrupt@0 _KiDispatchInterrupt@0: Copied: trunk/reactos/ntoskrnl/ke/time.c (from r45139, trunk/reactos/ntoskrnl/ke/arm/time.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?p2=trun… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Tue Jan 19 07:16:47 2010 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/ke/arm/time.c - * PURPOSE: Implements timebase functionality on ARM processors + * FILE: ntoskrnl/ke/time.c + * PURPOSE: Implements timebase functionality * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -19,44 +19,25 @@ /* FUNCTIONS ******************************************************************/ -ULONG -KiComputeTimerTableIndex(IN LONGLONG DueTime) -{ - ULONG Hand; - - // - // Compute the timer table index - // - Hand = (DueTime / KeMaximumIncrement); - Hand %= TIMER_TABLE_SIZE; - return Hand; -} - +#ifndef _M_ARM +VOID +__attribute__((regparm(3))) +KeUpdateSystemTimeHandler(IN ULONG Increment, + IN KIRQL Irql, + IN PKTRAP_FRAME TrapFrame) +#else VOID NTAPI KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql, - IN ULONG Increment) + IN ULONG Increment, + IN KIRQL Irql) +#endif { - PKPRCB Prcb = KeGetPcr()->Prcb; - ULARGE_INTEGER SystemTime, InterruptTime; - ULONG Hand; - - // - // Do nothing if this tick is being skipped - // - if (Prcb->SkipTick) - { - // - // Handle it next time - // - Prcb->SkipTick = FALSE; - return; - } - - // - // Add the increment time to the shared data - // + PKPRCB Prcb = KeGetCurrentPrcb(); + ULARGE_INTEGER CurrentTime, InterruptTime; + ULONG Hand, OldTickCount; + + /* Add the increment time to the shared data */ InterruptTime.HighPart = SharedUserData->InterruptTime.High1Time; InterruptTime.LowPart = SharedUserData->InterruptTime.LowPart; InterruptTime.QuadPart += Increment; @@ -64,95 +45,78 @@ SharedUserData->InterruptTime.LowPart = InterruptTime.LowPart; SharedUserData->InterruptTime.High2Time = InterruptTime.HighPart; - // - // Update tick count - // - KiTickOffset -= Increment; - - // - // Check for incomplete tick - // + /* Update tick count */ + InterlockedExchangeAdd(&KiTickOffset, -(LONG)Increment); + + /* Check for incomplete tick */ + OldTickCount = KeTickCount.LowPart; if (KiTickOffset <= 0) { - // - // Update the system time - // - SystemTime.HighPart = SharedUserData->SystemTime.High1Time; - SystemTime.LowPart = SharedUserData->SystemTime.LowPart; - SystemTime.QuadPart += KeTimeAdjustment; - SharedUserData->SystemTime.High1Time = SystemTime.HighPart; - SharedUserData->SystemTime.LowPart = SystemTime.LowPart; - SharedUserData->SystemTime.High2Time = SystemTime.HighPart; - - // - // Update the tick count - // - SystemTime.HighPart = KeTickCount.High1Time; - SystemTime.LowPart = KeTickCount.LowPart; - SystemTime.QuadPart += 1; - KeTickCount.High1Time = SystemTime.HighPart; - KeTickCount.LowPart = SystemTime.LowPart; - KeTickCount.High2Time = SystemTime.HighPart; - - // - // Update it in the shared user data - // - SharedUserData->TickCount.High1Time = SystemTime.HighPart; - SharedUserData->TickCount.LowPart = SystemTime.LowPart; - SharedUserData->TickCount.High2Time = SystemTime.HighPart; - } - - // - // Check for timer expiration - // - Hand = KeTickCount.LowPart % TIMER_TABLE_SIZE; + /* Update the system time */ + CurrentTime.HighPart = SharedUserData->SystemTime.High1Time; + CurrentTime.LowPart = SharedUserData->SystemTime.LowPart; + CurrentTime.QuadPart += KeTimeAdjustment; + SharedUserData->SystemTime.High2Time = CurrentTime.HighPart; + SharedUserData->SystemTime.LowPart = CurrentTime.LowPart; + SharedUserData->SystemTime.High1Time = CurrentTime.HighPart; + + /* Update the tick count */ + CurrentTime.HighPart = KeTickCount.High1Time; + CurrentTime.LowPart = OldTickCount; + CurrentTime.QuadPart += 1; + KeTickCount.High2Time = CurrentTime.HighPart; + KeTickCount.LowPart = CurrentTime.LowPart; + KeTickCount.High1Time = CurrentTime.HighPart; + + /* Update it in the shared user data */ + SharedUserData->TickCount.High2Time = CurrentTime.HighPart; + SharedUserData->TickCount.LowPart = CurrentTime.LowPart; + SharedUserData->TickCount.High1Time = CurrentTime.HighPart; + + /* Check for timer expiration */ + Hand = OldTickCount & (TIMER_TABLE_SIZE - 1); + if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) + { + /* Check if we are already doing expiration */ + if (!Prcb->TimerRequest) + { + /* Request a DPC to handle this */ + Prcb->TimerRequest = (ULONG_PTR)TrapFrame; + Prcb->TimerHand = Hand; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } + } + + /* Check for expiration with the new tick count as well */ + OldTickCount++; + } + + /* Check for timer expiration */ + Hand = OldTickCount & (TIMER_TABLE_SIZE - 1); if (KiTimerTableListHead[Hand].Time.QuadPart <= InterruptTime.QuadPart) { - // - // Check if we are already doing expiration - // + /* Check if we are already doing expiration */ if (!Prcb->TimerRequest) { - // - // Request a DPC to handle this - // - Prcb->TimerRequest = TrapFrame->SvcSp; + /* Request a DPC to handle this */ + Prcb->TimerRequest = (ULONG_PTR)TrapFrame; Prcb->TimerHand = Hand; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } } - // - // Check if we should request a debugger break - // - if (KdDebuggerEnabled) - { - // - // Check if we should break - // - if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); - } - - // - // Check if this was a full tick - // + /* Check if this was a full tick */ if (KiTickOffset <= 0) { - // - // Updare the tick offset - // + /* Update the tick offset */ KiTickOffset += KeMaximumIncrement; - // - // Update system runtime - // - KeUpdateRunTime(TrapFrame, CLOCK2_LEVEL); + /* Update system runtime */ + KeUpdateRunTime(TrapFrame, Irql); } else { - // - // Increase interrupt count and exit - // + /* Increase interrupt count and exit */ Prcb->InterruptCount++; } } @@ -163,159 +127,85 @@ IN KIRQL Irql) { PKTHREAD Thread = KeGetCurrentThread(); - PKPROCESS Process = Thread->ApcState.Process; PKPRCB Prcb = KeGetCurrentPrcb(); - // - // Do nothing if this tick is being skipped - // - if (Prcb->SkipTick) - { - // - // Handle it next time - // - Prcb->SkipTick = FALSE; - return; - } - - // - // Increase interrupt count - // + /* Increase interrupt count */ Prcb->InterruptCount++; - // - // Check if we came from user mode - // - if (TrapFrame->PreviousMode != KernelMode) - { - // - // Increase process user time - // - InterlockedIncrement((PLONG)&Process->UserTime); + /* Check if we came from user mode */ +#ifndef _M_ARM + if ((TrapFrame->SegCs & MODE_MASK) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) +#else + if (TrapFrame->PreviousMode == UserMode) +#endif + { + /* Increase thread user time */ Prcb->UserTime++; Thread->UserTime++; } else { - // - // See if we were in an ISR - // - if (TrapFrame->OldIrql > DISPATCH_LEVEL) - { - // - // Handle that - // + /* See if we were in an ISR */ + Prcb->KernelTime++; + if (Irql > DISPATCH_LEVEL) + { + /* Handle that */ Prcb->InterruptTime++; } - else if ((TrapFrame->OldIrql < DISPATCH_LEVEL) || - !(Prcb->DpcRoutineActive)) - { - // - // Handle being in kernel mode - // + else if ((Irql < DISPATCH_LEVEL) || !(Prcb->DpcRoutineActive)) + { + /* Handle being in kernel mode */ Thread->KernelTime++; - InterlockedIncrement((PLONG)&Process->KernelTime); } else { - // - // Handle being in a DPC - // + /* Handle being in a DPC */ Prcb->DpcTime++; - - // - // Update Debug DPC time - // - Prcb->DebugDpcTime++; - - // - // Check if we've timed out - // - if (Prcb->DebugDpcTime >= KiDPCTimeout) - { - // - // Print a message - // - DbgPrint("\n*** DPC routine > 1 sec --- This is not a break in " - "KeUpdateSystemTime\n"); - - // - // Break if a debugger is attached - // - if (KdDebuggerEnabled) DbgBreakPoint(); - - // - // Restore the debug DPC time - // - Prcb->DebugDpcTime = 0; - } - } - } - - // - // Update DPC rates - // + } + } + + /* Update DPC rates */ Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + Prcb->DpcRequestRate) >> 1; Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; - // - // Check if the queue is large enough - // + /* Check if the queue is large enough */ if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) { - // - // Request a DPC - // + /* Request a DPC */ Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - // - // Fix the maximum queue depth - // + /* Fix the maximum queue depth */ if ((Prcb->DpcRequestRate < KiIdealDpcRate) && (Prcb->MaximumDpcQueueDepth > 1)) { - // - // Make it smaller - // + /* Make it smaller */ Prcb->MaximumDpcQueueDepth--; } } else { - // - // Check if we've reached the adjustment limit - // + /* Check if we've reached the adjustment limit */ if (!(--Prcb->AdjustDpcThreshold)) { - // - // Reset it, and check the queue maximum - // + /* Reset it, and check the queue maximum */ Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) { - // - // Increase it - // + /* Increase it */ Prcb->MaximumDpcQueueDepth++; } } } - // - // Decrement the thread quantum - // + /* Decrement the thread quantum */ Thread->Quantum -= CLOCK_QUANTUM_DECREMENT; - - // - // Check if the time expired - // + + /* Check if the time expired */ if ((Thread->Quantum <= 0) && (Thread != Prcb->IdleThread)) { - // - // Schedule a quantum end - // + /* Schedule a quantum end */ Prcb->QuantumEnd = 1; HalRequestSoftwareInterrupt(DISPATCH_LEVEL); } Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Jan 19 07:16:47 2010 @@ -48,7 +48,6 @@ <file>ldt.c</file> <file>mtrr.c</file> <file>patpge.c</file> - <file>systimer.S</file> <file>thrdini.c</file> <file>trap.s</file> <file>traphdlr.c</file> @@ -66,7 +65,6 @@ <file>kiinit.c</file> <file>stubs_asm.s</file> <file>thrdini.c</file> - <file>time.c</file> <file>trap.s</file> <file>trapc.c</file> <file>usercall.c</file> @@ -107,6 +105,7 @@ <file>queue.c</file> <file>semphobj.c</file> <file>spinlock.c</file> + <file>time.c</file> <file>thrdschd.c</file> <file>thrdobj.c</file> <file>timerobj.c</file>

1 0

[cwittich] 45139: [WINDOWSCODECS] update wincodec.idl to wine 1.1.36
by cwittich＠svn.reactos.org 18 Jan '10

18 Jan '10

Author: cwittich Date: Mon Jan 18 21:39:30 2010 New Revision: 45139 URL: http://svn.reactos.org/svn/reactos?rev=45139&view=rev Log: [WINDOWSCODECS] update wincodec.idl to wine 1.1.36 Modified: trunk/reactos/include/psdk/wincodec.idl Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… ============================================================================== --- trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincodec.idl [iso-8859-1] Mon Jan 18 21:39:30 2010 @@ -164,6 +164,7 @@ cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44") cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45") cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50") +cpp_quote("#define WINCODEC_ERR_FRAMEMISSING 0x88982f62") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT 0x88982f80") cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c")

1 0

[cwittich] 45138: [WINDOWSCODECS] update windowscodecs to wine 1.1.36
by cwittich＠svn.reactos.org 18 Jan '10

18 Jan '10

Author: cwittich Date: Mon Jan 18 21:36:58 2010 New Revision: 45138 URL: http://svn.reactos.org/svn/reactos?rev=45138&view=rev Log: [WINDOWSCODECS] update windowscodecs to wine 1.1.36 Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/ungif.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bm… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] Mon Jan 18 21:36:58 2010 @@ -47,6 +47,13 @@ static const struct bmp_pixelformat formats[] = { {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, +#if 0 + /* Windows doesn't seem to support this one. */ + {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, +#endif {NULL} }; @@ -338,11 +345,24 @@ bih.bV5ClrUsed = 0; bih.bV5ClrImportant = 0; + if (This->format->compression == BI_BITFIELDS) + { + if (This->format->alphamask) + bih.bV5Size = info_size = sizeof(BITMAPV4HEADER); + else + info_size = sizeof(BITMAPINFOHEADER)+12; + bih.bV5RedMask = This->format->redmask; + bih.bV5GreenMask = This->format->greenmask; + bih.bV5BlueMask = This->format->bluemask; + bih.bV5AlphaMask = This->format->alphamask; + bih.bV5AlphaMask = LCS_DEVICE_RGB; + } + bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; pos.QuadPart = 0; - hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL);\ + hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) return hr; hr = IStream_Write(This->stream, &bfh, sizeof(BITMAPFILEHEADER), &byteswritten); Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cl… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] Mon Jan 18 21:36:58 2010 @@ -45,6 +45,7 @@ {&CLSID_WICImagingFactory, ImagingFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, + {&CLSID_WICPngEncoder, PngEncoder_CreateInstance}, {&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance}, {&CLSID_WICGifDecoder, GifDecoder_CreateInstance}, {&CLSID_WICIcoDecoder, IcoDecoder_CreateInstance}, Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pn… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Mon Jan 18 21:36:58 2010 @@ -45,24 +45,34 @@ #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(png_create_read_struct); MAKE_FUNCPTR(png_create_info_struct); +MAKE_FUNCPTR(png_create_write_struct); MAKE_FUNCPTR(png_destroy_read_struct); +MAKE_FUNCPTR(png_destroy_write_struct); MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); +MAKE_FUNCPTR(png_get_pHYs); MAKE_FUNCPTR(png_get_PLTE); MAKE_FUNCPTR(png_get_tRNS); MAKE_FUNCPTR(png_set_bgr); +MAKE_FUNCPTR(png_set_filler); MAKE_FUNCPTR(png_set_gray_1_2_4_to_8); MAKE_FUNCPTR(png_set_gray_to_rgb); +MAKE_FUNCPTR(png_set_IHDR); +MAKE_FUNCPTR(png_set_pHYs); MAKE_FUNCPTR(png_set_read_fn); MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS_to_alpha); +MAKE_FUNCPTR(png_set_write_fn); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); +MAKE_FUNCPTR(png_write_end); +MAKE_FUNCPTR(png_write_info); +MAKE_FUNCPTR(png_write_rows); #undef MAKE_FUNCPTR static void *load_libpng(void) @@ -76,24 +86,34 @@ } LOAD_FUNCPTR(png_create_read_struct); LOAD_FUNCPTR(png_create_info_struct); + LOAD_FUNCPTR(png_create_write_struct); LOAD_FUNCPTR(png_destroy_read_struct); + LOAD_FUNCPTR(png_destroy_write_struct); LOAD_FUNCPTR(png_error); LOAD_FUNCPTR(png_get_bit_depth); LOAD_FUNCPTR(png_get_color_type); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); + LOAD_FUNCPTR(png_get_pHYs); LOAD_FUNCPTR(png_get_PLTE); LOAD_FUNCPTR(png_get_tRNS); LOAD_FUNCPTR(png_set_bgr); + LOAD_FUNCPTR(png_set_filler); LOAD_FUNCPTR(png_set_gray_1_2_4_to_8); LOAD_FUNCPTR(png_set_gray_to_rgb); + LOAD_FUNCPTR(png_set_IHDR); + LOAD_FUNCPTR(png_set_pHYs); LOAD_FUNCPTR(png_set_read_fn); LOAD_FUNCPTR(png_set_strip_16); LOAD_FUNCPTR(png_set_tRNS_to_alpha); + LOAD_FUNCPTR(png_set_write_fn); LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); + LOAD_FUNCPTR(png_write_end); + LOAD_FUNCPTR(png_write_info); + LOAD_FUNCPTR(png_write_rows); #undef LOAD_FUNCPTR } @@ -215,7 +235,7 @@ This->info_ptr = ppng_create_info_struct(This->png_ptr); if (!This->info_ptr) { - ppng_destroy_read_struct(&This->png_ptr, (png_infopp)NULL, (png_infopp)NULL); + ppng_destroy_read_struct(&This->png_ptr, NULL, NULL); This->png_ptr = NULL; return E_FAIL; } @@ -223,7 +243,7 @@ This->end_info = ppng_create_info_struct(This->png_ptr); if (!This->info_ptr) { - ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, (png_infopp)NULL); + ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, NULL); This->png_ptr = NULL; return E_FAIL; } @@ -510,8 +530,26 @@ static HRESULT WINAPI PngDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + PngDecoder *This = impl_from_frame(iface); + png_uint_32 ret, xres, yres; + int unit_type; + + ret = ppng_get_pHYs(This->png_ptr, This->info_ptr, &xres, &yres, &unit_type); + + if (ret && unit_type == PNG_RESOLUTION_METER) + { + *pDpiX = xres * 0.0254; + *pDpiY = yres * 0.0254; + } + else + { + WARN("no pHYs block present\n"); + *pDpiX = *pDpiY = 96.0; + } + + TRACE("(%p)->(%0.2f,%0.2f)\n", iface, *pDpiX, *pDpiY); + + return S_OK; } static HRESULT WINAPI PngDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, @@ -639,6 +677,603 @@ return ret; } +struct png_pixelformat { + const WICPixelFormatGUID *guid; + UINT bpp; + int bit_depth; + int color_type; + BOOL remove_filler; + BOOL swap_rgb; +}; + +static const struct png_pixelformat formats[] = { + {&GUID_WICPixelFormat24bppBGR, 24, 8, PNG_COLOR_TYPE_RGB, 0, 1}, + {&GUID_WICPixelFormatBlackWhite, 1, 1, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat2bppGray, 2, 2, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat4bppGray, 4, 4, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat8bppGray, 8, 8, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat16bppGray, 16, 16, PNG_COLOR_TYPE_GRAY, 0, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1}, + {&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1}, + {&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0}, + {&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0}, + {NULL}, +}; + +typedef struct PngEncoder { + const IWICBitmapEncoderVtbl *lpVtbl; + const IWICBitmapFrameEncodeVtbl *lpFrameVtbl; + LONG ref; + IStream *stream; + png_structp png_ptr; + png_infop info_ptr; + UINT frame_count; + BOOL frame_initialized; + const struct png_pixelformat *format; + BOOL info_written; + UINT width, height; + double xres, yres; + UINT lines_written; + BOOL frame_committed; + BOOL committed; +} PngEncoder; + +static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, PngEncoder, lpFrameVtbl); +} + +static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, + void **ppv) +{ + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) + { + *ppv = &This->lpFrameVtbl; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngFrameEncode_AddRef(IWICBitmapFrameEncode *iface) +{ + PngEncoder *This = encoder_from_frame(iface); + return IUnknown_AddRef((IUnknown*)This); +} + +static ULONG WINAPI PngFrameEncode_Release(IWICBitmapFrameEncode *iface) +{ + PngEncoder *This = encoder_from_frame(iface); + return IUnknown_Release((IUnknown*)This); +} + +static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, + IPropertyBag2 *pIEncoderOptions) +{ + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%p)\n", iface, pIEncoderOptions); + + if (This->frame_initialized) return WINCODEC_ERR_WRONGSTATE; + + This->frame_initialized = TRUE; + + return S_OK; +} + +static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, + UINT uiWidth, UINT uiHeight) +{ + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); + + if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + + This->width = uiWidth; + This->height = uiHeight; + + return S_OK; +} + +static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + + This->xres = dpiX; + This->yres = dpiY; + + return S_OK; +} + +static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + PngEncoder *This = encoder_from_frame(iface); + int i; + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + if (!This->frame_initialized || This->info_written) return WINCODEC_ERR_WRONGSTATE; + + for (i=0; formats[i].guid; i++) + { + if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!formats[i].guid) i = 0; + + This->format = &formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + return S_OK; +} + +static HRESULT WINAPI PngFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, + UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) +{ + PngEncoder *This = encoder_from_frame(iface); + png_byte **row_pointers=NULL; + UINT i; + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + + if (!This->frame_initialized || !This->width || !This->height || !This->format) + return WINCODEC_ERR_WRONGSTATE; + + if (lineCount == 0 || lineCount + This->lines_written > This->height) + return E_INVALIDARG; + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + HeapFree(GetProcessHeap(), 0, row_pointers); + return E_FAIL; + } + + if (!This->info_written) + { + ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, + This->format->bit_depth, This->format->color_type, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + if (This->xres != 0.0 && This->yres != 0.0) + { + ppng_set_pHYs(This->png_ptr, This->info_ptr, (This->xres+0.0127) / 0.0254, + (This->yres+0.0127) / 0.0254, PNG_RESOLUTION_METER); + } + + ppng_write_info(This->png_ptr, This->info_ptr); + + if (This->format->remove_filler) + ppng_set_filler(This->png_ptr, 0, PNG_FILLER_AFTER); + + if (This->format->swap_rgb) + ppng_set_bgr(This->png_ptr); + + This->info_written = TRUE; + } + + row_pointers = HeapAlloc(GetProcessHeap(), 0, lineCount * sizeof(png_byte*)); + if (!row_pointers) + return E_OUTOFMEMORY; + + for (i=0; i<lineCount; i++) + row_pointers[i] = pbPixels + cbStride * i; + + ppng_write_rows(This->png_ptr, row_pointers, lineCount); + This->lines_written += lineCount; + + HeapFree(GetProcessHeap(), 0, row_pointers); + + return S_OK; +} + +static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIBitmapSource, WICRect *prc) +{ + PngEncoder *This = encoder_from_frame(iface); + HRESULT hr; + WICRect rc; + WICPixelFormatGUID guid; + UINT stride; + BYTE *pixeldata; + TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); + + if (!This->frame_initialized || !This->width || !This->height) + return WINCODEC_ERR_WRONGSTATE; + + if (!This->format) + { + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); + if (FAILED(hr)) return hr; + } + + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) + { + /* FIXME: should use WICConvertBitmapSource to convert */ + ERR("format %s unsupported\n", debugstr_guid(&guid)); + return E_FAIL; + } + + if (This->xres == 0.0 || This->yres == 0.0) + { + double xres, yres; + hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = width; + rc.Height = height; + prc = &rc; + } + + if (prc->Width != This->width) return E_INVALIDARG; + + stride = (This->format->bpp * This->width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + + return hr; +} + +static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) +{ + PngEncoder *This = encoder_from_frame(iface); + TRACE("(%p)\n", iface); + + if (!This->info_written || This->lines_written != This->height || This->frame_committed) + return WINCODEC_ERR_WRONGSTATE; + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + return E_FAIL; + } + + ppng_write_end(This->png_ptr, This->info_ptr); + + This->frame_committed = TRUE; + + return S_OK; +} + +static HRESULT WINAPI PngFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapFrameEncodeVtbl PngEncoder_FrameVtbl = { + PngFrameEncode_QueryInterface, + PngFrameEncode_AddRef, + PngFrameEncode_Release, + PngFrameEncode_Initialize, + PngFrameEncode_SetSize, + PngFrameEncode_SetResolution, + PngFrameEncode_SetPixelFormat, + PngFrameEncode_SetColorContexts, + PngFrameEncode_SetPalette, + PngFrameEncode_SetThumbnail, + PngFrameEncode_WritePixels, + PngFrameEncode_WriteSource, + PngFrameEncode_Commit, + PngFrameEncode_GetMetadataQueryWriter +}; + +static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, + void **ppv) +{ + PngEncoder *This = (PngEncoder*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapEncoder, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PngEncoder_AddRef(IWICBitmapEncoder *iface) +{ + PngEncoder *This = (PngEncoder*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PngEncoder_Release(IWICBitmapEncoder *iface) +{ + PngEncoder *This = (PngEncoder*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + if (This->png_ptr) + ppng_destroy_write_struct(&This->png_ptr, &This->info_ptr); + if (This->stream) + IStream_Release(This->stream); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static void user_write_data(png_structp png_ptr, png_bytep data, png_size_t length) +{ + PngEncoder *This = ppng_get_io_ptr(png_ptr); + HRESULT hr; + ULONG byteswritten; + + hr = IStream_Write(This->stream, data, length, &byteswritten); + if (FAILED(hr) || byteswritten != length) + { + ppng_error(png_ptr, "failed writing data"); + } +} + +static void user_flush(png_structp png_ptr) +{ +} + +static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, + IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) +{ + PngEncoder *This = (PngEncoder*)iface; + + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); + + if (This->png_ptr) + return WINCODEC_ERR_WRONGSTATE; + + /* initialize libpng */ + This->png_ptr = ppng_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!This->png_ptr) + return E_FAIL; + + This->info_ptr = ppng_create_info_struct(This->png_ptr); + if (!This->info_ptr) + { + ppng_destroy_write_struct(&This->png_ptr, NULL); + This->png_ptr = NULL; + return E_FAIL; + } + + IStream_AddRef(pIStream); + This->stream = pIStream; + + /* set up setjmp/longjmp error handling */ + if (setjmp(png_jmpbuf(This->png_ptr))) + { + ppng_destroy_write_struct(&This->png_ptr, &This->info_ptr); + This->png_ptr = NULL; + IStream_Release(This->stream); + This->stream = NULL; + return E_FAIL; + } + + /* set up custom i/o handling */ + ppng_set_write_fn(This->png_ptr, This, user_write_data, user_flush); + + return S_OK; +} + +static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, + GUID *pguidContainerFormat) +{ + FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, + IWICBitmapEncoderInfo **ppIEncoderInfo) +{ + FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI PngEncoder_SetPalette(IWICBitmapEncoder *iface, IWICPalette *pIPalette) +{ + TRACE("(%p,%p)\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngEncoder_SetThumbnail(IWICBitmapEncoder *iface, IWICBitmapSource *pIThumbnail) +{ + TRACE("(%p,%p)\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmapSource *pIPreview) +{ + TRACE("(%p,%p)\n", iface, pIPreview); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, + IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) +{ + PngEncoder *This = (PngEncoder*)iface; + HRESULT hr; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); + + if (This->frame_count != 0) + return WINCODEC_ERR_UNSUPPORTEDOPERATION; + + if (!This->stream) + return WINCODEC_ERR_NOTINITIALIZED; + + hr = CreatePropertyBag2(ppIEncoderOptions); + if (FAILED(hr)) return hr; + + This->frame_count = 1; + + IWICBitmapEncoder_AddRef(iface); + *ppIFrameEncode = (IWICBitmapFrameEncode*)&This->lpFrameVtbl; + + return S_OK; +} + +static HRESULT WINAPI PngEncoder_Commit(IWICBitmapEncoder *iface) +{ + PngEncoder *This = (PngEncoder*)iface; + TRACE("(%p)\n", iface); + + if (!This->frame_committed || This->committed) + return WINCODEC_ERR_WRONGSTATE; + + This->committed = TRUE; + + return S_OK; +} + +static HRESULT WINAPI PngEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapEncoderVtbl PngEncoder_Vtbl = { + PngEncoder_QueryInterface, + PngEncoder_AddRef, + PngEncoder_Release, + PngEncoder_Initialize, + PngEncoder_GetContainerFormat, + PngEncoder_GetEncoderInfo, + PngEncoder_SetColorContexts, + PngEncoder_SetPalette, + PngEncoder_SetThumbnail, + PngEncoder_SetPreview, + PngEncoder_CreateNewFrame, + PngEncoder_Commit, + PngEncoder_GetMetadataQueryWriter +}; + +HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + PngEncoder *This; + HRESULT ret; + + TRACE("(%p,%s,%p)\n", pUnkOuter, debugstr_guid(iid), ppv); + + *ppv = NULL; + + if (pUnkOuter) return CLASS_E_NOAGGREGATION; + + if (!libpng_handle && !load_libpng()) + { + ERR("Failed writing PNG because unable to find %s\n",SONAME_LIBPNG); + return E_FAIL; + } + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngEncoder)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &PngEncoder_Vtbl; + This->lpFrameVtbl = &PngEncoder_FrameVtbl; + This->ref = 1; + This->png_ptr = NULL; + This->info_ptr = NULL; + This->stream = NULL; + This->frame_count = 0; + This->frame_initialized = FALSE; + This->format = NULL; + This->info_written = FALSE; + This->width = 0; + This->height = 0; + This->xres = 0.0; + This->yres = 0.0; + This->lines_written = 0; + This->frame_committed = FALSE; + This->committed = FALSE; + + ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); + IUnknown_Release((IUnknown*)This); + + return ret; +} + #else /* !HAVE_PNG_H */ HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) @@ -647,4 +1282,10 @@ return E_FAIL; } +HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) +{ + ERR("Trying to save PNG picture, but PNG supported not compiled in.\n"); + return E_FAIL; +} + #endif Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/re… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Mon Jan 18 21:36:58 2010 @@ -741,6 +741,12 @@ "windowscodecs.dll", "Apartment" }, + { &CLSID_WICPngEncoder, + "WIC PNG Encoder", + NULL, + "windowscodecs.dll", + "Apartment" + }, { &CLSID_WICBmpEncoder, "WIC BMP Encoder", NULL, Modified: trunk/reactos/dll/win32/windowscodecs/ungif.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/un… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/ungif.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/ungif.c [iso-8859-1] Mon Jan 18 21:36:58 2010 @@ -320,7 +320,10 @@ GifByteType Buf; if (READ(GifFile, &Buf, 1) != 1) { - return GIF_ERROR; + /* Wine-specific behavior: Native accepts broken GIF files that have no + * terminator, so we match this by treating EOF as a terminator. */ + *Type = TERMINATE_RECORD_TYPE; + return GIF_OK; } switch (Buf) { Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/wi… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Mon Jan 18 21:36:58 2010 @@ -23,6 +23,7 @@ extern HRESULT ImagingFactory_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT BmpDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT PngDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT BmpEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT GifDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID riid, void** ppv); extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv);

1 0

[tkreuzer] 45137: [NTOS] Fix possible NULL pointer dereference. Spotted by Amine Khaldi.
by tkreuzer＠svn.reactos.org 18 Jan '10

18 Jan '10

Author: tkreuzer Date: Mon Jan 18 18:24:28 2010 New Revision: 45137 URL: http://svn.reactos.org/svn/reactos?rev=45137&view=rev Log: [NTOS] Fix possible NULL pointer dereference. Spotted by Amine Khaldi. Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/contmem.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Mon Jan 18 18:24:28 2010 @@ -276,7 +276,7 @@ // Now get the PFN entry for this, and make sure it's the correct one // Pfn1 = MiGetPfnEntry(PageFrameIndex); - if (Pfn1->u3.e1.StartOfAllocation == 0) + if ((!Pfn1) || (Pfn1->u3.e1.StartOfAllocation == 0)) { // // This probably means you did a free on an address that was in between

1 0

[cwittich] 45136: [MSHTML_WINETEST] update mshtml winetest to wine 1.1.36
by cwittich＠svn.reactos.org 18 Jan '10

18 Jan '10

Author: cwittich Date: Mon Jan 18 17:59:11 2010 New Revision: 45136 URL: http://svn.reactos.org/svn/reactos?rev=45136&view=rev Log: [MSHTML_WINETEST] update mshtml winetest to wine 1.1.36 Added: trunk/rostests/winetests/mshtml/htmllocation.c (with props) trunk/rostests/winetests/mshtml/jstest.html (with props) trunk/rostests/winetests/mshtml/rsrc.rc (with props) Modified: trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/mshtml.rbuild trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/mshtml/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… Added: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… Added: trunk/rostests/winetests/mshtml/jstest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/jstest.h… Modified: trunk/rostests/winetests/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/mshtml.r… Added: trunk/rostests/winetests/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/rsrc.rc?… Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… Modified: trunk/rostests/winetests/mshtml/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/testlist…

1 0

[cwittich] 45135: [MSXML3] update msxml3 to wine 1.1.36
by cwittich＠svn.reactos.org 18 Jan '10

18 Jan '10

Author: cwittich Date: Mon Jan 18 17:53:59 2010 New Revision: 45135 URL: http://svn.reactos.org/svn/reactos?rev=45135&view=rev Log: [MSXML3] update msxml3 to wine 1.1.36 Modified: trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/node.c Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] Mon Jan 18 17:53:59 2010 @@ -104,7 +104,6 @@ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_FALSE; } Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Mon Jan 18 17:53:59 2010 @@ -1118,7 +1118,8 @@ if(!V_BSTR(&src)) return E_OUTOFMEMORY; - hres = VariantChangeType(v, &src, 0, V_VT(v)); + hres = VariantChangeTypeEx(v, &src, MAKELCID(MAKELANGID( + LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT),0, V_VT(v)); VariantClear(&src); return hres; }

1 0

[tkreuzer] 45134: [NTOS] Fix buffer overrun in ExFreePoolWithTag when dealing with a PoolType other than NonPagedPool and PagedPool. Spotted by Amine Khaldi.
by tkreuzer＠svn.reactos.org 18 Jan '10

18 Jan '10

Author: tkreuzer Date: Mon Jan 18 17:43:58 2010 New Revision: 45134 URL: http://svn.reactos.org/svn/reactos?rev=45134&view=rev Log: [NTOS] Fix buffer overrun in ExFreePoolWithTag when dealing with a PoolType other than NonPagedPool and PagedPool. Spotted by Amine Khaldi. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Mon Jan 18 17:43:58 2010 @@ -520,7 +520,7 @@ // for this pool type // BlockSize = Entry->BlockSize; - PoolType = (Entry->PoolType & 3) - 1; + PoolType = (Entry->PoolType - 1) & BASE_POOL_TYPE_MASK; PoolDesc = PoolVector[PoolType]; //

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs