Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[sir_richard] 45156: [NTOS]: Implement KiSwapProcess in C. [NTOS]: Implement KiIsNpxPresent and KiIsNpxErrataPresent in C. It's much clearer what these are doing now. [NTOS]: Implement KiFlushNPXState and fix some bugs that were present in the ASM version, such as a wrong NPX state check. [NTOS]: Implement working intrinsics for fxrstor, fxsave, fnsave and enable them for flushing. We'll update the FPU trap code to use these later.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed Jan 20 05:05:08 2010 New Revision: 45156 URL: http://svn.reactos.org/svn/reactos?rev=45156&view=rev Log: [NTOS]: Implement KiSwapProcess in C. [NTOS]: Implement KiIsNpxPresent and KiIsNpxErrataPresent in C. It's much clearer what these are doing now. [NTOS]: Implement KiFlushNPXState and fix some bugs that were present in the ASM version, such as a wrong NPX state check. [NTOS]: Implement working intrinsics for fxrstor, fxsave, fnsave and enable them for flushing. We'll update the FPU trap code to use these later. Added: trunk/reactos/ntoskrnl/ke/i386/context.c (with props) Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Wed Jan 20 05:05:08 2010 @@ -13,6 +13,28 @@ : "=m" (*X) \ : /* no input */ \ : "memory"); + +FORCEINLINE +VOID +Ke386FxStore(IN PFX_SAVE_AREA SaveArea) +{ + asm volatile ("fxrstor (%0)" : : "r"(SaveArea)); +} + +FORCEINLINE +VOID +Ke386FxSave(IN PFX_SAVE_AREA SaveArea) +{ + asm volatile ("fxsave (%0)" : : "r"(SaveArea)); +} + + +FORCEINLINE +VOID +Ke386FnSave(IN PFLOATING_SAVE_AREA SaveArea) +{ + asm volatile ("fnsave (%0); wait" : : "r"(SaveArea)); +} FORCEINLINE VOID Added: trunk/reactos/ntoskrnl/ke/i386/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/context.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/context.c (added) +++ trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] Wed Jan 20 05:05:08 2010 @@ -1,0 +1,51 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/ke/i386/context.c + * PURPOSE: Context Switching Related Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS ********************************************************************/ + +/* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +KiSwapProcess(IN PKPROCESS NewProcess, + IN PKPROCESS OldProcess) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); +#ifdef CONFIG_SMP + ULONG SetMember; + + /* Update active processor mask */ + SetMember = Pcr->SetMember; + InterlockedXor(NewProcess->ActiveProcessors, SetMember); + InterlockedXor(OldProcess->ActiveProcessors, SetMember); +#endif + + /* Check for new LDT */ + if (NewProcess->LdtDescriptor.LimitLow != OldProcess->LdtDescriptor.LimitLow) + { + /* Not handled yet */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Update CR3 */ + __writecr3(NewProcess->DirectoryTableBase[0]); + + /* Clear GS */ + Ke386SetGs(0); + + /* Update IOPM offset */ + Pcr->TSS->IoMapBase = NewProcess->IopmOffset; +} + Propchange: trunk/reactos/ntoskrnl/ke/i386/context.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Wed Jan 20 05:05:08 2010 @@ -944,6 +944,155 @@ KiSaveProcessorControlState(&Prcb->ProcessorState); } +BOOLEAN +NTAPI +KiIsNpxPresent(VOID) +{ + ULONG Cr0; + USHORT Magic; + + /* Set magic */ + Magic = 0xFFFF; + + /* Read CR0 and mask out FPU flags */ + Cr0 = __readcr0() & ~(CR0_MP | CR0_TS | CR0_EM | CR0_ET); + + /* Store on FPU stack */ + asm volatile ("fninit;" "fnstsw %0" : "+m"(Magic)); + + /* Magic should now be cleared */ + if (Magic & 0xFF) + { + /* You don't have an FPU -- enable emulation for now */ + __writecr0(Cr0 | CR0_EM | CR0_TS); + return FALSE; + } + + /* You have an FPU, enable it */ + Cr0 |= CR0_ET; + + /* Enable INT 16 on 486 and higher */ + if (KeGetCurrentPrcb()->CpuType >= 3) Cr0 |= CR0_NE; + + /* Set FPU state */ + __writecr0(Cr0 | CR0_EM | CR0_TS); + return TRUE; +} + +BOOLEAN +NTAPI +KiIsNpxErrataPresent(VOID) +{ + BOOLEAN ErrataPresent; + ULONG Cr0; + volatile double Value1, Value2; + + /* Disable interrupts */ + _disable(); + + /* Read CR0 and remove FPU flags */ + Cr0 = __readcr0(); + __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM)); + + /* Initialize FPU state */ + asm volatile ("fninit"); + + /* Multiply the magic values and divide, we should get the result back */ + Value1 = 4195835.0; + Value2 = 3145727.0; + ErrataPresent = (Value1 * Value2 / 3145727.0) != 4195835.0; + + /* Restore CR0 */ + __writecr0(Cr0); + + /* Enable interrupts */ + _enable(); + + /* Return if there's an errata */ + return ErrataPresent; +} + +NTAPI +VOID +KiFlushNPXState(IN PFLOATING_SAVE_AREA SaveArea) +{ + ULONG EFlags, Cr0; + PKTHREAD Thread, NpxThread; + PFX_SAVE_AREA FxSaveArea; + + /* Save volatiles and disable interrupts */ + EFlags = __readeflags(); + _disable(); + + /* Save the PCR and get the current thread */ + Thread = KeGetCurrentThread(); + + /* Check if we're already loaded */ + if (Thread->NpxState != NPX_STATE_LOADED) + { + /* If there's nothing to load, quit */ + if (!SaveArea) return; + + /* Need FXSR support for this */ + ASSERT(KeI386FxsrPresent == TRUE); + + /* Check for sane CR0 */ + Cr0 = __readcr0(); + if (Cr0 & (CR0_MP | CR0_TS | CR0_EM)) + { + /* Mask out FPU flags */ + __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM)); + } + + /* Get the NPX thread and check its FPU state */ + NpxThread = KeGetCurrentPrcb()->NpxThread; + if ((NpxThread) && (NpxThread->NpxState == NPX_STATE_LOADED)) + { + /* Get the FX frame and store the state there */ + FxSaveArea = KiGetThreadNpxArea(NpxThread); + Ke386FxSave(FxSaveArea); + + /* NPX thread has lost its state */ + NpxThread->NpxState = NPX_STATE_NOT_LOADED; + } + + /* Now load NPX state from the NPX area */ + FxSaveArea = KiGetThreadNpxArea(Thread); + Ke386FxStore(FxSaveArea); + } + else + { + /* Check for sane CR0 */ + Cr0 = __readcr0(); + if (Cr0 & (CR0_MP | CR0_TS | CR0_EM)) + { + /* Mask out FPU flags */ + __writecr0(Cr0 & ~(CR0_MP | CR0_TS | CR0_EM)); + } + + /* Get FX frame */ + FxSaveArea = KiGetThreadNpxArea(Thread); + Thread->NpxState = NPX_STATE_NOT_LOADED; + + /* Save state if supported by CPU */ + if (KeI386FxsrPresent) Ke386FxSave(FxSaveArea); + } + + /* Now save the FN state wherever it was requested */ + if (SaveArea) Ke386FnSave(SaveArea); + + /* Clear NPX thread */ + KeGetCurrentPrcb()->NpxThread = NULL; + + /* Add the CR0 from the NPX frame */ + Cr0 |= NPX_STATE_NOT_LOADED; + Cr0 |= FxSaveArea->Cr0NpxState; + __writecr0(Cr0); + + /* Restore interrupt state */ + __writeeflags(EFlags); +} + /* PUBLIC FUNCTIONS **********************************************************/ /* 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] Wed Jan 20 05:05:08 2010 @@ -17,236 +17,7 @@ #define Running 2 #define WrDispatchInt 0x1F -Dividend: .float 4195835.0 -Divisor: .float 3145727.0 -Result1: .float 0 -Result2: .float 0 - /* FUNCTIONS ****************************************************************/ - -.globl _KiIsNpxErrataPresent@0 -.func KiIsNpxErrataPresent@0 -_KiIsNpxErrataPresent@0: - - /* Disable interrupts */ - cli - - /* Get CR0 and mask out FPU flags */ - mov eax, cr0 - mov ecx, eax - and eax, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, eax - - /* Initialize the FPU */ - fninit - - /* Do the divison and inverse multiplication */ - fld qword ptr Dividend - fstp qword ptr Result1 - fld qword ptr Divisor - fstp qword ptr Result2 - fld qword ptr Result1 - fdiv qword ptr Result2 - fmul qword ptr Result2 - - /* Do the compare and check flags */ - fcomp qword ptr Result1 - fstsw ax - sahf - - /* Restore CR0 and interrupts */ - mov cr0, ecx - sti - - /* Return errata status */ - xor eax, eax - jz NoErrata - inc eax - -NoErrata: - ret -.endfunc - -.globl _KiIsNpxPresent@0 -.func KiIsNpxPresent@0 -_KiIsNpxPresent@0: - - /* Save stack */ - push ebp - - /* Get CR0 and mask out FPU flags */ - mov eax, cr0 - and eax, ~(CR0_MP + CR0_TS + CR0_EM + CR0_ET) - - /* Initialize the FPU and assume FALSE for return */ - xor edx, edx - fninit - - /* Save magic value on stack */ - mov ecx, 0x42424242 - push ecx - - /* Setup stack for FPU store */ - mov ebp ,esp - fnstsw [ebp] - - /* Now check if our magic got cleared */ - cmp byte ptr [ebp], 0 - jnz NoFpu - - /* Enable FPU, set return to TRUE */ - or eax, CR0_ET - mov edx, 1 - - /* If this is a 486 or higher, enable INT 16 as well */ - cmp dword ptr fs:KPCR_PRCB_CPU_TYPE, 3 - jbe NoFpu - or eax, CR0_NE - -NoFpu: - /* Set emulation enabled during the first boot phase and set the CR0 */ - or eax, (CR0_EM + CR0_TS) - mov cr0, eax - - /* Restore stack */ - pop eax - pop ebp - - /* Return true or false */ - mov eax, edx - ret -.endfunc - -.globl _KiFlushNPXState@4 -.func KiFlushNPXState@4 -_KiFlushNPXState@4: - - /* Save volatiles and disable interrupts */ - push esi - push edi - push ebx - pushfd - cli - - /* Save the PCR and get the current thread */ - mov edi, fs:[KPCR_SELF] - mov esi, [edi+KPCR_CURRENT_THREAD] - - /* Check if we're already loaded */ - cmp byte ptr [esi+KTHREAD_NPX_STATE], NPX_STATE_LOADED - je IsValid - - /* Check if we're supposed to get it */ - cmp dword ptr [esp+20], 0 - je Return - -#if DBG - /* Assert Fxsr support */ - test byte ptr _KeI386FxsrPresent, 1 - jnz AssertOk - int 3 -AssertOk: -#endif - - /* Get CR0 and test if it's valid */ - mov ebx, cr0 - test bl, CR0_MP + CR0_TS + CR0_EM - jz Cr0OK - - /* Enable fnsave to work */ - and ebx, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, ebx - -Cr0OK: - /* Check if we are the NPX Thread */ - mov eax, [edi+KPCR_NPX_THREAD] - or eax, eax - jz DontSave - - /* Check if it's not loaded */ - cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - jnz DontSave - -#if DBG - /* We are the NPX Thread with an unloaded NPX State... this isn't normal! */ - int 3 -#endif - - /* Save the NPX State */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - fxsave [ecx] - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - -DontSave: - /* Load the NPX State */ - mov ecx, [esi+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - fxrstor [ecx] - - /* Get the CR0 state and destination */ - mov edx, [ecx+FN_CR0_NPX_STATE] - mov ecx, [esp+20] - jmp DoneLoad - -IsValid: - /* We already have a valid state, flush it */ - mov ebx, cr0 - test bl, CR0_MP + CR0_TS + CR0_EM - jz Cr0OK2 - - /* Enable fnsave to work */ - and ebx, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, ebx - -Cr0OK2: - /* Get the kernel stack */ - mov ecx, [esi+KTHREAD_INITIAL_STACK] - test byte ptr _KeI386FxsrPresent, 1 - lea ecx, [ecx-NPX_FRAME_LENGTH] - - /* Set the NPX State */ - mov byte ptr [esi+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - - /* Get Cr0 */ - mov edx, [ecx+FN_CR0_NPX_STATE] - jz DoneLoad - - /* Save the FX State */ - fxsave [ecx] - - /* Check if we also have to save it in the parameter */ - mov ecx, [esp+20] - jecxz NoSave - -DoneLoad: - /* Save the Fn state in the parameter we got */ - fnsave [ecx] - fwait - -NoSave: - /* Clear eax */ - xor eax, eax - - /* Add NPX State */ - or ebx, NPX_STATE_NOT_LOADED - - /* Clear the NPX thread */ - mov [edi+KPCR_NPX_THREAD], eax - - /* Add saved CR0 into NPX State, and set it */ - or ebx, edx - mov cr0, ebx - - /* Re-enable interrupts and return */ -Return: - popf - pop ebx - pop edi - pop esi - ret 4 - -.endfunc /*++ * KiSwapContextInternal @@ -736,64 +507,6 @@ #endif .endfunc -.globl _KiSwapProcess@8 -.func KiSwapProcess@8 -_KiSwapProcess@8: - - /* Get process pointers */ - mov edx, [esp+4] - mov eax, [esp+8] - -#ifdef CONFIG_SMP - /* Update active processors */ - mov ecx, fs:[KPCR_SET_MEMBER] - lock xor [edx+KPROCESS_ACTIVE_PROCESSORS], ecx - lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx - - /* Sanity check */ -#if DBG - test [edx+KPROCESS_ACTIVE_PROCESSORS], ecx - jz WrongCpu1 - test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx - jnz WrongCpu2 -#endif -#endif - - /* Check if their LDTs changed */ - mov ecx, [edx+KPROCESS_LDT_DESCRIPTOR0] - or ecx, [eax+KPROCESS_LDT_DESCRIPTOR0] - jnz NewLdt - - /* Update CR3 */ - mov eax, [edx+KPROCESS_DIRECTORY_TABLE_BASE] - mov cr3, eax - - /* Get the KTSS */ - mov ecx, fs:[KPCR_TSS] - - /* Clear GS on process swap */ - xor eax, eax - mov gs, ax - - /* Update IOPM offset */ - mov ax, [edx+KPROCESS_IOPM_OFFSET] - mov [ecx+KTSS_IOMAPBASE], ax - - /* Return */ - ret 8 - -NewLdt: - /* FIXME: TODO */ - int 3 - -#if DBG -WrongCpu1: - int 3 -WrongCpu2: - int 3 -#endif -.endfunc - .globl _Ki386SetupAndExitToV86Mode@4 .func Ki386SetupAndExitToV86Mode@4 _Ki386SetupAndExitToV86Mode@4: 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] Wed Jan 20 05:05:08 2010 @@ -40,6 +40,7 @@ <directory name="i386"> <file>abios.c</file> <file>cpu.c</file> + <file>context.c</file> <file>ctxswitch.S</file> <file>exp.c</file> <file>irqobj.c</file>

14 years, 8 months

[jimtabor] 45155: - Add dclevel flags.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jan 20 02:40:27 2010 New Revision: 45155 URL: http://svn.reactos.org/svn/reactos?rev=45155&view=rev Log: - Add dclevel flags. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Jan 20 02:40:27 2010 @@ -12,6 +12,14 @@ /* Get/SetBounds/Rect support. */ #define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ + +/* flFontState */ +#define DC_DIRTYFONT_XFORM 1 +#define DC_DIRTYFONT_LFONT 2 +#define DC_UFI_MAPPING 4 + +/* fl */ +#define DC_FL_PAL_BACK 1 /* Type definitions ***********************************************************/

14 years, 8 months

[sir_richard] 45154: [NTOS]: Workaround for GCC 4.4.x bug reported by Dmitry.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 19 23:21:12 2010 New Revision: 45154 URL: http://svn.reactos.org/svn/reactos?rev=45154&view=rev Log: [NTOS]: Workaround for GCC 4.4.x bug reported by Dmitry. Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Jan 19 23:21:12 2010 @@ -16,8 +16,8 @@ /* GLOBALS *******************************************************************/ /* Boot and double-fault/NMI/DPC stack */ -UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))); -UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))); +UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; +UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0}; ULONG_PTR P0BootStack = (ULONG_PTR)&P0BootStackData[KERNEL_STACK_SIZE]; ULONG_PTR KiDoubleFaultStack = (ULONG_PTR)&KiDoubleFaultStackData[KERNEL_STACK_SIZE];

14 years, 8 months

[khornicek] 45153: - fix build, thanks Black_Fox

by khornicek＠svn.reactos.org

Author: khornicek Date: Tue Jan 19 22:19:56 2010 New Revision: 45153 URL: http://svn.reactos.org/svn/reactos?rev=45153&view=rev Log: - fix build, thanks Black_Fox Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Jan 19 22:19:56 2010 @@ -799,4 +799,4 @@ /* Switch to new kernel stack and start kernel bootstrapping */ KiSwitchToBootStack(InitialStack & ~3); -} +}

14 years, 8 months

[sir_richard] 45152: [FREELDR]: Jump to a standard 1-parameter STDCALL kernel entrypoint instead of a FASTCALL double-parameter entrypoint. [NTOS]: Make KiSystemStartup the real C entrypoint of the kernel, and move the "Am I being booted by FreeLDR" logic inside it -- it will then call KiRosPrepareForSystemStartup as earlier. [NTOS]: Move the Double Fault and Boot Stack declaration in C code, with the proper alignment attribute. [NTOS]: Although the concern that KiSystemStartup cannot be 100% C

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 19 19:27:24 2010 New Revision: 45152 URL: http://svn.reactos.org/svn/reactos?rev=45152&view=rev Log: [FREELDR]: Jump to a standard 1-parameter STDCALL kernel entrypoint instead of a FASTCALL double-parameter entrypoint. [NTOS]: Make KiSystemStartup the real C entrypoint of the kernel, and move the "Am I being booted by FreeLDR" logic inside it -- it will then call KiRosPrepareForSystemStartup as earlier. [NTOS]: Move the Double Fault and Boot Stack declaration in C code, with the proper alignment attribute. [NTOS]: Although the concern that KiSystemStartup cannot be 100% C since it modifies ESP is real (Thomas' original fix of Alex's code), we don't need that much of it in assembly. Instead, write a simple trampoline (KiSwitchToBootStack) inline which switches stacks and jumps to a second-stage C function. [NTOS]: Completely remove boot.S as it isn't needed anymore, ReactOS startup is back to being (nearly) 100% C. Removed: trunk/reactos/ntoskrnl/ke/i386/boot.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/include/reactos/rosldr.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c [iso-8859-1] Tue Jan 19 19:27:24 2010 @@ -32,6 +32,7 @@ extern PAGE_DIRECTORY_X86 kuser_pagetable; extern ULONG_PTR KernelBase; extern ROS_KERNEL_ENTRY_POINT KernelEntryPoint; + /* FUNCTIONS *****************************************************************/ /*++ @@ -97,7 +98,7 @@ __writecr0(__readcr0() | CR0_PG | CR0_WP); /* Jump to Kernel */ - (*KernelEntryPoint)(Magic, &LoaderBlock); + (*KernelEntryPoint)(&LoaderBlock); } /*++ Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Tue Jan 19 19:27:24 2010 @@ -103,7 +103,7 @@ ULONG_PTR NTAPI FrLdrLoadModule(PFILE ModuleImage, LPCSTR ModuleName, PULONG ModuleSize); BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize); VOID NTAPI FrLdrStartup(ULONG Magic); -typedef VOID (FASTCALL *ROS_KERNEL_ENTRY_POINT)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock); +typedef VOID (NTAPI *ROS_KERNEL_ENTRY_POINT)(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock); PVOID NTAPI Modified: trunk/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rosldr.h?r… ============================================================================== --- trunk/reactos/include/reactos/rosldr.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/rosldr.h [iso-8859-1] Tue Jan 19 19:27:24 2010 @@ -48,4 +48,10 @@ ULONG (*FrLdrDbgPrint)(const char *Format, ...); } ROS_LOADER_PARAMETER_BLOCK, *PROS_LOADER_PARAMETER_BLOCK; +VOID +NTAPI +KiRosPrepareForSystemStartup( + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock +); + #endif 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 19:27:24 2010 @@ -103,8 +103,7 @@ extern PULONG KiInterruptTemplateDispatch; extern PULONG KiInterruptTemplate2ndDispatch; extern ULONG KiUnexpectedEntrySize; -extern UCHAR P0BootStack[]; -extern UCHAR KiDoubleFaultStack[]; +extern ULONG_PTR KiDoubleFaultStack; extern EX_PUSH_LOCK KernelAddressSpaceLock; extern ULONG KiMaximumDpcQueueDepth; extern ULONG KiMinimumDpcRate; @@ -812,7 +811,7 @@ VOID NTAPI -KiSystemStartupReal( +KiSystemStartup( IN PLOADER_PARAMETER_BLOCK LoaderBlock ); @@ -1119,6 +1118,7 @@ ); VOID +FASTCALL KiIdleLoop( VOID ); 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 19:27:24 2010 @@ -10,7 +10,7 @@ // Debug Macros // VOID -NTAPI +FORCEINLINE KiDumpTrapFrame(IN PKTRAP_FRAME TrapFrame) { /* Dump the whole thing */ @@ -475,3 +475,22 @@ return Result; } + +VOID +FORCEINLINE +KiSwitchToBootStack(IN ULONG_PTR InitialStack) +{ + /* We have to switch to a new stack before continuing kernel initialization */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "subl %1, %%esp\n" + "pushl %2\n" + "jmp _KiSystemStartupBootStack@0\n" + : + : "c"(InitialStack), + "i"(NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH), + "i"(CR0_EM | CR0_TS | CR0_MP) + : "%esp" + ); +} Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Tue Jan 19 19:27:24 2010 @@ -1319,9 +1319,8 @@ KiSetupSyscallHandler(); VOID -FASTCALL -KiRosPrepareForSystemStartup(IN ULONG Dummy, - IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +NTAPI +KiRosPrepareForSystemStartup(IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { PLOADER_PARAMETER_BLOCK NtLoaderBlock; ULONG size, i = 0, *ent; @@ -1411,5 +1410,5 @@ #endif /* Do general System Startup */ - KiSystemStartupReal(NtLoaderBlock); + KiSystemStartup(NtLoaderBlock); } Removed: trunk/reactos/ntoskrnl/ke/i386/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/boot.S?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/boot.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/boot.S (removed) @@ -1,80 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/boot.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: FreeLDR Wrapper Bootstrap Code and Bootstrap Trampoline - * PROGRAMMERs: Alex Ionescu (alex(a)relsoft.net) - * Thomas Weidenmueller <w3seek(a)reactos.org> - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -.intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -.bss -.align 16 - -/* Kernel Boot Stack */ -.globl _P0BootStack -.space KERNEL_STACK_SIZE -_P0BootStack: - -/* Kernel Double-Fault and Temporary DPC Stack */ -.globl _KiDoubleFaultStack -.space KERNEL_STACK_SIZE -_KiDoubleFaultStack: - -/* FUNCTIONS *****************************************************************/ - -.text -.globl _KiSystemStartup -.func KiSystemStartup -_KiSystemStartup: - - /* NTLDR Boot: Call the main kernel initialization */ - test dword ptr [esp+4], 0x80000000 - jnz _KiSystemStartupReal@4 - - /* FREELDR Boot: Call the FreeLDR wrapper */ - jmp @KiRosPrepareForSystemStartup@8 -.endfunc - -.globl _KiSetupStackAndInitializeKernel@24 -.func KiSetupStackAndInitializeKernel@24 -_KiSetupStackAndInitializeKernel@24: - - /* Save current stack */ - mov esi, esp - - /* Setup the new stack */ - mov esp, [esp+12] - sub esp, NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH - push CR0_EM + CR0_TS + CR0_MP - - /* Copy all parameters to the new stack */ - push [esi+24] - push [esi+20] - push [esi+16] - push [esi+12] - push [esi+8] - push [esi+4] - xor ebp, ebp - call _KiInitializeKernel@24 - - /* Set the priority of this thread to 0 */ - mov ebx, PCR[KPCR_CURRENT_THREAD] - mov byte ptr [ebx+KTHREAD_PRIORITY], 0 - - /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ - sti - mov ecx, DISPATCH_LEVEL - call @KfLowerIrql@4 - - /* Set the right wait IRQL */ - mov byte ptr [ebx+KTHREAD_WAIT_IRQL], DISPATCH_LEVEL; - - /* Jump into the idle loop */ - jmp @KiIdleLoop@0 -.endfunc Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Tue Jan 19 19:27:24 2010 @@ -649,8 +649,8 @@ Tss = (PKTSS)KiDoubleFaultTSS; KiInitializeTSS(Tss); Tss->CR3 = __readcr3(); - Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); - Tss->Esp = PtrToUlong(KiDoubleFaultStack); + Tss->Esp0 = KiDoubleFaultStack; + Tss->Esp = KiDoubleFaultStack; Tss->Eip = PtrToUlong(KiTrap08); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; @@ -679,8 +679,8 @@ Tss = (PKTSS)KiNMITSS; KiInitializeTSS(Tss); Tss->CR3 = __readcr3(); - Tss->Esp0 = PtrToUlong(KiDoubleFaultStack); - Tss->Esp = PtrToUlong(KiDoubleFaultStack); + Tss->Esp0 = KiDoubleFaultStack; + Tss->Esp = KiDoubleFaultStack; Tss->Eip = PtrToUlong(KiTrap02); Tss->Cs = KGDT_R0_CODE; Tss->Fs = KGDT_R0_PCR; Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Jan 19 19:27:24 2010 @@ -11,8 +11,15 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> +#include "internal/trap_x.h" /* GLOBALS *******************************************************************/ + +/* Boot and double-fault/NMI/DPC stack */ +UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))); +UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))); +ULONG_PTR P0BootStack = (ULONG_PTR)&P0BootStackData[KERNEL_STACK_SIZE]; +ULONG_PTR KiDoubleFaultStack = (ULONG_PTR)&KiDoubleFaultStackData[KERNEL_STACK_SIZE]; /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; @@ -642,7 +649,36 @@ VOID NTAPI -KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +KiSystemStartupBootStack(VOID) +{ + PKTHREAD Thread; + + /* Initialize the kernel for the current CPU */ + KiInitializeKernel(&KiInitialProcess.Pcb, + (PKTHREAD)KeLoaderBlock->Thread, + (PVOID)(KeLoaderBlock->KernelStack & ~3), + (PKPRCB)__readfsdword(KPCR_PRCB), + KeNumberProcessors - 1, + KeLoaderBlock); + + /* Set the priority of this thread to 0 */ + Thread = KeGetCurrentThread(); + Thread->Priority = 0; + + /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ + _enable(); + KfLowerIrql(DISPATCH_LEVEL); + + /* Set the right wait IRQL */ + Thread->WaitIrql = DISPATCH_LEVEL; + + /* Jump into the idle loop */ + KiIdleLoop(); +} + +VOID +NTAPI +KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG Cpu; PKTHREAD InitialThread; @@ -652,6 +688,9 @@ KIDTENTRY NmiEntry, DoubleFaultEntry; PKTSS Tss; PKIPCR Pcr; + + /* Check if we are being booted from FreeLDR */ + if (!((ULONG_PTR)LoaderBlock & 0x80000000)) KiRosPrepareForSystemStartup((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); /* Save the loader block and get the current CPU */ KeLoaderBlock = LoaderBlock; @@ -694,7 +733,7 @@ Gdt, Tss, InitialThread, - KiDoubleFaultStack); + (PVOID)KiDoubleFaultStack); /* Set us as the current process */ InitialThread->ApcState.Process = &KiInitialProcess.Pcb; @@ -758,14 +797,6 @@ /* Raise to HIGH_LEVEL */ KfRaiseIrql(HIGH_LEVEL); - /* Align stack and make space for the trap frame and NPX frame */ - InitialStack &= ~(KTRAP_FRAME_ALIGN - 1); - /* Switch to new kernel stack and start kernel bootstrapping */ - KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb, - InitialThread, - (PVOID)InitialStack, - (PKPRCB)__readfsdword(KPCR_PRCB), - (CCHAR)Cpu, - KeLoaderBlock); -} + KiSwitchToBootStack(InitialStack & ~3); +} 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 19:27:24 2010 @@ -38,7 +38,6 @@ <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> - <file first="true">boot.S</file> <file>abios.c</file> <file>cpu.c</file> <file>ctxswitch.S</file>

14 years, 8 months

[dreimer] 45151: First Version of the KDBG Command. It uses log2lines to output the stuff coming from the pipe \\.\pipe\kdbg. If you add the command "writelog", you will get a log in the format DBG-%date%-%time%.txt in the folder you are in right now. if %2 is declared, it will use this path for the log. Plz test. If you have suggetions or bugs, plz tell me. PS1 Port will follow later.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 19 16:51:20 2010 New Revision: 45151 URL: http://svn.reactos.org/svn/reactos?rev=45151&view=rev Log: First Version of the KDBG Command. It uses log2lines to output the stuff coming from the pipe \\.\pipe\kdbg. If you add the command "writelog", you will get a log in the format DBG-%date%-%time%.txt in the folder you are in right now. if %2 is declared, it will use this path for the log. Plz test. If you have suggetions or bugs, plz tell me. PS1 Port will follow later. Added: trunk/tools/RosBE/RosBE-Windows/Root/kdbg.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Tue Jan 19 16:51:20 2010 @@ -52,6 +52,11 @@ echo help [COMMAND] - Display the available commands or give help on a echo specific command. + if exist "%_ROSBE_BASEDIR%\kdbg.cmd" ( + echo kdbg [OPTIONS] - Outputs KDBG Debug Output and lets you give + echo debug commands to it. + ) + if exist "%_ROSBE_BASEDIR%\raddr2line.cmd" ( echo raddr2line [OPTIONS] - Translates program addresses into file names and echo line numbers to assist developers with finding @@ -177,6 +182,14 @@ ) else if /i "%1" == "help" ( echo Usage: help [COMMAND] echo Shows help for the specified command or lists all available commands. +) else if /i "%1" == "kdbg" ( + if exist "%_ROSBE_BASEDIR%\kdbg.cmd" ( + echo Usage: kdbg [LOGFILE] [PIPE] + echo Outputs KDBG Debug Output and lets you give debug commands to it. + echo. + echo WRITELOG - Outputs the Log File to ".\DBG-%DATE%-%TIME%.txt". + echo. + ) ) else if /i "%1" == "raddr2line" ( if exist "%_ROSBE_BASEDIR%\raddr2line.cmd" ( echo Usage: raddr2line [FILE] [ADDRESS] Added: trunk/tools/RosBE/RosBE-Windows/Root/kdbg.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/kdb… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/kdbg.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/kdbg.cmd [iso-8859-1] Tue Jan 19 16:51:20 2010 @@ -1,0 +1,34 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/kdbg.cmd +:: PURPOSE: Displays a KDBG Session Interactively. +:: COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel(a)freenet.de> +:: + +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + +call "%_ROSBE_BASEDIR%\TimeDate.cmd" + +title kdbg Session... + +if "%1" == "writelog" ( + if "%2" == "" ( + set LOGFILE=-l DBG-%datename%-%timename%.txt + ) else ( + set LOGFILE=-l %2 + ) +) else ( + set LOGFILE= +) + +echo Now Start your VM with COM1 set to \\.\pipe\kdbg +pause + +log2lines -c %LOGFILE% < \\.\pipe\kdbg + +title ReactOS Build Environment %_ROSBE_VERSION% Propchange: trunk/tools/RosBE/RosBE-Windows/Root/kdbg.cmd ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 8 months

[sir_richard] 45150: [NTOS]: Try backing out a change to see if thix fixes BuildBot.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 19 16:26:16 2010 New Revision: 45150 URL: http://svn.reactos.org/svn/reactos?rev=45150&view=rev Log: [NTOS]: Try backing out a change to see if thix fixes BuildBot. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s 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 16:26:16 2010 @@ -156,10 +156,41 @@ .func Kei386EoiHelper@0 _Kei386EoiHelper@0: - /* Call the C EOI Helper */ - mov ecx, esp - jmp @KiEoiHelper@4 -.endfunc + + /* Disable interrupts */ + cli + + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 0 + + /* Exit and cleanup */ +_Kei386EoiHelper2ndEntry: + TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything +.endfunc + +V86_Exit: + /* Move to EDX position */ + add esp, KTRAP_FRAME_EDX + + /* Restore volatiles */ + pop edx + pop ecx + pop eax + + /* Move to non-volatiles */ + lea esp, [ebp+KTRAP_FRAME_EDI] + pop edi + pop esi + pop ebx + pop ebp + + /* Skip error code and return */ + add esp, 4 + iret + +AbiosExit: + /* FIXME: TODO */ + UNHANDLED_PATH GENERATE_TRAP_HANDLER KiGetTickCount, 1 GENERATE_TRAP_HANDLER KiCallbackReturn, 1

14 years, 8 months

[dreimer] 45149: Update the d3dx9_XX.dll files to the recent wine release version. Mostly stubs, but many games appreciate their existance.

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 19 11:09:33 2010 New Revision: 45149 URL: http://svn.reactos.org/svn/reactos?rev=45149&view=rev Log: Update the d3dx9_XX.dll files to the recent wine release version. Mostly stubs, but many games appreciate their existance. Added: trunk/reactos/dll/directx/wine/d3dx9_42/ (with props) trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild (with props) trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec (with props) trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c (with props) trunk/reactos/dll/directx/wine/d3dx9_42/version.rc (with props) Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c trunk/reactos/dll/directx/wine/d3dx9_36/shader.c trunk/reactos/dll/directx/wine/d3dx9_36/surface.c trunk/reactos/dll/directx/wine/d3dx9_36/util.c trunk/reactos/dll/directx/wine/wine.rbuild trunk/reactos/include/dxsdk/d3dx9shader.h Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.spec [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -1,8 +1,8 @@ -@ stub D3DXAssembleShader -@ stub D3DXAssembleShaderFromFileA -@ stub D3DXAssembleShaderFromFileW -@ stub D3DXAssembleShaderFromResourceA -@ stub D3DXAssembleShaderFromResourceW +@ stdcall D3DXAssembleShader(ptr long ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromFileA(str ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromFileW(wstr ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromResourceA(long str ptr ptr long ptr ptr) +@ stdcall D3DXAssembleShaderFromResourceW(long wstr ptr ptr long ptr ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) @ stub D3DXCheckCubeTextureRequirements @ stub D3DXCheckTextureRequirements Modified: trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/d3dx9_36_private.h [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -31,8 +31,24 @@ #include "d3dx9.h" /* for internal use */ +typedef enum _FormatType { + FORMAT_ARGB, /* unsigned */ + FORMAT_UNKNOWN +} FormatType; + +typedef struct _PixelFormatDesc { + D3DFORMAT format; + BYTE bits[4]; + BYTE shift[4]; + UINT bytes_per_pixel; + FormatType type; +} PixelFormatDesc; + HRESULT map_view_of_file(LPCWSTR filename, LPVOID *buffer, DWORD *length); HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, DWORD *length); + +const PixelFormatDesc *get_format_info(D3DFORMAT format); + extern const ID3DXBufferVtbl D3DXBuffer_Vtbl; Modified: trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/mesh.c [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -20,10 +20,12 @@ #include "config.h" #include "wine/port.h" -#include "wine/debug.h" + +#define NONAMELESSUNION #include "windef.h" #include "wingdi.h" #include "d3dx9.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -260,22 +262,22 @@ D3DXMATRIX m; D3DXVECTOR4 vec; - m.m[0][0] = p1->x - p0->x; - m.m[1][0] = p2->x - p0->x; - m.m[2][0] = -praydir->x; - m.m[3][0] = 0.0f; - m.m[0][1] = p1->y - p0->z; - m.m[1][1] = p2->y - p0->z; - m.m[2][1] = -praydir->y; - m.m[3][1] = 0.0f; - m.m[0][2] = p1->z - p0->z; - m.m[1][2] = p2->z - p0->z; - m.m[2][2] = -praydir->z; - m.m[3][2] = 0.0f; - m.m[0][3] = 0.0f; - m.m[1][3] = 0.0f; - m.m[2][3] = 0.0f; - m.m[3][3] = 1.0f; + m.u.m[0][0] = p1->x - p0->x; + m.u.m[1][0] = p2->x - p0->x; + m.u.m[2][0] = -praydir->x; + m.u.m[3][0] = 0.0f; + m.u.m[0][1] = p1->y - p0->z; + m.u.m[1][1] = p2->y - p0->z; + m.u.m[2][1] = -praydir->y; + m.u.m[3][1] = 0.0f; + m.u.m[0][2] = p1->z - p0->z; + m.u.m[1][2] = p2->z - p0->z; + m.u.m[2][2] = -praydir->z; + m.u.m[3][2] = 0.0f; + m.u.m[0][3] = 0.0f; + m.u.m[1][3] = 0.0f; + m.u.m[2][3] = 0.0f; + m.u.m[3][3] = 1.0f; vec.x = praypos->x - p0->x; vec.y = praypos->y - p0->y; Modified: trunk/reactos/dll/directx/wine/d3dx9_36/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/shader.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/shader.c [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -19,9 +19,11 @@ #include "config.h" #include "wine/port.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "windef.h" #include "wingdi.h" #include "d3dx9.h" +#include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -131,3 +133,90 @@ return NULL; } + +HRESULT WINAPI D3DXAssembleShader(LPCSTR data, + UINT data_len, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + FIXME("stub\n"); + return D3DERR_INVALIDCALL; +} + +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + LPWSTR filename_w = NULL; + DWORD len; + HRESULT ret; + + if (!filename) return D3DXERR_INVALIDDATA; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filename_w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filename_w) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filename_w, len); + + ret = D3DXAssembleShaderFromFileW(filename_w, defines, include, flags, shader, error_messages); + + HeapFree(GetProcessHeap(), 0, filename_w); + return ret; +} + +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + FIXME("stub\n"); + return D3DERR_INVALIDCALL; +} + +HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceA(module, resource, (LPCSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXAssembleShader(buffer, len, defines, include, flags, + shader, error_messages); +} + +HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages) +{ + HRSRC res; + LPCSTR buffer; + DWORD len; + + if (!(res = FindResourceW(module, resource, (LPCWSTR)RT_RCDATA))) + return D3DXERR_INVALIDDATA; + if (FAILED(load_resource_into_memory(module, res, (LPVOID *)&buffer, &len))) + return D3DXERR_INVALIDDATA; + return D3DXAssembleShader(buffer, len, defines, include, flags, + shader, error_messages); +} Modified: trunk/reactos/dll/directx/wine/d3dx9_36/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/surface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/surface.c [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -321,6 +321,84 @@ return E_NOTIMPL; } return D3DXERR_INVALIDDATA; +} + + +/************************************************************ + * copy_simple_data + * + * Copies the source buffer to the destination buffer, performing + * any necessary format conversion and color keying. + * Works only for ARGB formats with 1 - 4 bytes per pixel. + */ +static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, + CONST BYTE *dest, UINT destpitch, POINT destsize, CONST PixelFormatDesc *destformat, + DWORD dwFilter) +{ + DWORD srcshift[4], destshift[4]; + DWORD srcmask[4], destmask[4]; + BOOL process_channel[4]; + DWORD channels[4]; + DWORD channelmask = 0; + + UINT minwidth, minheight; + BYTE *srcptr, *destptr; + UINT i, x, y; + + ZeroMemory(channels, sizeof(channels)); + ZeroMemory(process_channel, sizeof(process_channel)); + + for(i = 0;i < 4;i++) { + /* srcshift is used to extract the _relevant_ components */ + srcshift[i] = srcformat->shift[i] + max( srcformat->bits[i] - destformat->bits[i], 0); + + /* destshift is used to move the components to the correct position */ + destshift[i] = destformat->shift[i] + max(destformat->bits[i] - srcformat->bits[i], 0); + + srcmask[i] = ((1 << srcformat->bits[i]) - 1) << srcformat->shift[i]; + destmask[i] = ((1 << destformat->bits[i]) - 1) << destformat->shift[i]; + + /* channelmask specifies bits which aren't used in the source format but in the destination one */ + if(destformat->bits[i]) { + if(srcformat->bits[i]) process_channel[i] = TRUE; + else channelmask |= destmask[i]; + } + } + + minwidth = (srcsize.x < destsize.x) ? srcsize.x : destsize.x; + minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; + + for(y = 0;y < minheight;y++) { + srcptr = (BYTE*)( src + y * srcpitch); + destptr = (BYTE*)(dest + y * destpitch); + for(x = 0;x < minwidth;x++) { + /* extract source color components */ + if(srcformat->type == FORMAT_ARGB) { + const DWORD col = *(DWORD*)srcptr; + for(i = 0;i < 4;i++) + if(process_channel[i]) + channels[i] = (col & srcmask[i]) >> srcshift[i]; + } + + /* recombine the components */ + if(destformat->type == FORMAT_ARGB) { + DWORD* const pixel = (DWORD*)destptr; + *pixel = 0; + + for(i = 0;i < 4;i++) { + if(process_channel[i]) { + /* necessary to make sure that e.g. an X4R4G4B4 white maps to an R8G8B8 white instead of 0xf0f0f0 */ + signed int shift; + for(shift = destshift[i]; shift > destformat->shift[i]; shift -= srcformat->bits[i]) *pixel |= channels[i] << shift; + *pixel |= (channels[i] >> (destformat->shift[i] - shift)) << destformat->shift[i]; + } + } + *pixel |= channelmask; /* new channels are set to their maximal value */ + } + srcptr += srcformat->bytes_per_pixel; + destptr += destformat->bytes_per_pixel; + } + } } /************************************************************ @@ -350,7 +428,8 @@ * E_FAIL, if SrcFormat is D3DFMT_UNKNOWN or the dimensions of pSrcRect are invalid * * NOTES - * pSrcRect specifies the dimensions of the source data + * pSrcRect specifies the dimensions of the source data; + * negative values for pSrcRect are allowed as we're only looking at the width and height anyway. * */ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, @@ -364,11 +443,44 @@ DWORD dwFilter, D3DCOLOR Colorkey) { - TRACE("stub\n"); + CONST PixelFormatDesc *srcformatdesc, *destformatdesc; + D3DSURFACE_DESC surfdesc; + D3DLOCKED_RECT lockrect; + POINT srcsize, destsize; + HRESULT hr; + TRACE("(void)\n"); if( !pDestSurface || !pSrcMemory || !pSrcRect ) return D3DERR_INVALIDCALL; if(SrcFormat == D3DFMT_UNKNOWN || pSrcRect->left >= pSrcRect->right || pSrcRect->top >= pSrcRect->bottom) return E_FAIL; - return E_NOTIMPL; + + if(dwFilter != D3DX_FILTER_NONE) return E_NOTIMPL; + + IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); + + srcformatdesc = get_format_info(SrcFormat); + destformatdesc = get_format_info(surfdesc.Format); + if( srcformatdesc->type == FORMAT_UNKNOWN || srcformatdesc->bytes_per_pixel > 4) return E_NOTIMPL; + if(destformatdesc->type == FORMAT_UNKNOWN || destformatdesc->bytes_per_pixel > 4) return E_NOTIMPL; + + srcsize.x = pSrcRect->right - pSrcRect->left; + srcsize.y = pSrcRect->bottom - pSrcRect->top; + if( !pDestRect ) { + destsize.x = surfdesc.Width; + destsize.y = surfdesc.Height; + } else { + destsize.x = pDestRect->right - pDestRect->left; + destsize.y = pDestRect->bottom - pDestRect->top; + } + + hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + + copy_simple_data((CONST BYTE*)pSrcMemory, SrcPitch, srcsize, srcformatdesc, + (CONST BYTE*)lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, + dwFilter); + + IDirect3DSurface9_UnlockRect(pDestSurface); + return D3D_OK; } /************************************************************ Modified: trunk/reactos/dll/directx/wine/d3dx9_36/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/util.c [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -19,6 +19,37 @@ #include "wine/debug.h" #include "d3dx9_36_private.h" + + +/************************************************************ + * pixel format table providing info about number of bytes per pixel, + * number of bits per channel and format type. + * + * Call get_format_info to request information about a specific format. + */ +static const PixelFormatDesc formats[] = +{ + /* format bits per channel shifts per channel bpp type */ + { D3DFMT_R8G8B8, { 0, 8, 8, 8 }, { 0, 16, 8, 0 }, 3, FORMAT_ARGB }, + { D3DFMT_A8R8G8B8, { 8, 8, 8, 8 }, { 24, 16, 8, 0 }, 4, FORMAT_ARGB }, + { D3DFMT_X8R8G8B8, { 0, 8, 8, 8 }, { 0, 16, 8, 0 }, 4, FORMAT_ARGB }, + { D3DFMT_A8B8G8R8, { 8, 8, 8, 8 }, { 24, 0, 8, 16 }, 4, FORMAT_ARGB }, + { D3DFMT_X8B8G8R8, { 0, 8, 8, 8 }, { 0, 0, 8, 16 }, 4, FORMAT_ARGB }, + { D3DFMT_R5G6B5, { 0, 5, 6, 5 }, { 0, 11, 5, 0 }, 2, FORMAT_ARGB }, + { D3DFMT_X1R5G5B5, { 0, 5, 5, 5 }, { 0, 10, 5, 0 }, 2, FORMAT_ARGB }, + { D3DFMT_A1R5G5B5, { 1, 5, 5, 5 }, { 15, 10, 5, 0 }, 2, FORMAT_ARGB }, + { D3DFMT_R3G3B2, { 0, 3, 3, 2 }, { 0, 5, 2, 0 }, 1, FORMAT_ARGB }, + { D3DFMT_A8R3G3B2, { 8, 3, 3, 2 }, { 8, 5, 2, 0 }, 2, FORMAT_ARGB }, + { D3DFMT_A4R4G4B4, { 4, 4, 4, 4 }, { 12, 8, 4, 0 }, 2, FORMAT_ARGB }, + { D3DFMT_X4R4G4B4, { 0, 4, 4, 4 }, { 0, 8, 4, 0 }, 2, FORMAT_ARGB }, + { D3DFMT_A2R10G10B10, { 2, 10, 10, 10 }, { 30, 20, 10, 0 }, 4, FORMAT_ARGB }, + { D3DFMT_A2B10G10R10, { 2, 10, 10, 10 }, { 30, 0, 10, 20 }, 4, FORMAT_ARGB }, + { D3DFMT_G16R16, { 0, 16, 16, 0 }, { 0, 0, 16, 0 }, 4, FORMAT_ARGB }, + { D3DFMT_A8, { 8, 0, 0, 0 }, { 0, 0, 0, 0 }, 1, FORMAT_ARGB }, + + { D3DFMT_UNKNOWN, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, FORMAT_UNKNOWN }, /* marks last element */ +}; + /************************************************************ * map_view_of_file @@ -102,3 +133,22 @@ return S_OK; } + + +/************************************************************ + * get_format_info + * + * Returns information about the specified format. + * If the format is unsupported, it's filled with the D3DFMT_UNKNOWN desc. + * + * PARAMS + * format [I] format whose description is queried + * desc [O] pointer to a StaticPixelFormatDesc structure + * + */ +const PixelFormatDesc *get_format_info(D3DFORMAT format) +{ + unsigned int i = 0; + while(formats[i].format != format && formats[i].format != D3DFMT_UNKNOWN) i++; + return &formats[i]; +} Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Jan 19 11:09:33 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild (added) +++ trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="d3dx9_42" type="win32dll" installbase="system32" installname="d3dx9_42.dll" unicode="yes"> + <importlibrary definition="d3dx9_42.spec" /> + <include base="d3dx9_42">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + + <library>d3d9</library> + <library>wine</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>wined3d</library> + + <file>d3dx9_42_main.c</file> + <file>version.rc</file> + + <dependency>wineheaders</dependency> +</module> Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec (added) +++ trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -1,0 +1,336 @@ +@ stdcall D3DXAssembleShader(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShader +@ stdcall D3DXAssembleShaderFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShaderFromFileA +@ stdcall D3DXAssembleShaderFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShaderFromFileW +@ stdcall D3DXAssembleShaderFromResourceA(long ptr ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShaderFromResourceA +@ stdcall D3DXAssembleShaderFromResourceW(long ptr ptr ptr long ptr ptr) d3dx9_36.D3DXAssembleShaderFromResourceW +@ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe +@ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckCubeTextureRequirements +@ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckTextureRequirements +@ stdcall D3DXCheckVersion(long long) +@ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr long) d3dx9_36.D3DXCheckVolumeTextureRequirements +@ stdcall D3DXCleanMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCleanMesh +@ stdcall D3DXColorAdjustContrast(ptr ptr long) d3dx9_36.D3DXColorAdjustContrast +@ stdcall D3DXColorAdjustSaturation(ptr ptr long) d3dx9_36.D3DXColorAdjustSaturation +@ stdcall D3DXCompileShader(ptr long ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCompileShader +@ stdcall D3DXCompileShaderFromFileA(ptr ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCompileShaderFromFileA +@ stdcall D3DXCompileShaderFromFileW(ptr ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCompileShaderFromFileW +@ stdcall D3DXCompileShaderFromResourceA(long ptr ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCompileShaderFromResourceA +@ stdcall D3DXCompileShaderFromResourceW(long ptr ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCompileShaderFromResourceW +@ stdcall D3DXComputeBoundingBox(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingBox +@ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) d3dx9_36.D3DXComputeBoundingSphere +@ stdcall D3DXComputeIMTFromPerVertexSignal(ptr ptr long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerVertexSignal +@ stdcall D3DXComputeIMTFromPerTexelSignal(ptr long ptr long long long long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromPerTexelSignal +@ stdcall D3DXComputeIMTFromSignal(ptr long long long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromSignal +@ stdcall D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) d3dx9_36.D3DXComputeIMTFromTexture +@ stdcall D3DXComputeNormalMap(ptr ptr ptr long long long) d3dx9_36.D3DXComputeNormalMap +@ stdcall D3DXComputeNormals(ptr ptr) d3dx9_36.D3DXComputeNormals +@ stdcall D3DXComputeTangent(ptr long long long long ptr) d3dx9_36.D3DXComputeTangent +@ stdcall D3DXComputeTangentFrame(ptr long) d3dx9_36.D3DXComputeTangentFrame +@ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr long long long ptr ptr) d3dx9_36.D3DXComputeTangentFrameEx +@ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes +@ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip +@ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips +@ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController +@ stdcall D3DXCreateBox(ptr long long long ptr ptr) d3dx9_36.D3DXCreateBox +@ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer +@ stdcall D3DXCreateCompressedAnimationSet(ptr long long ptr long ptr ptr) d3dx9_36.D3DXCreateCompressedAnimationSet +@ stdcall D3DXCreateCubeTexture(ptr long long long long long ptr) d3dx9_36.D3DXCreateCubeTexture +@ stdcall D3DXCreateCubeTextureFromFileA(ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromFileA +@ stdcall D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromFileExA +@ stdcall D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromFileExW +@ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) d3dx9_36.D3DXCreateCubeTextureFromFileInMemory +@ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromFileInMemoryEx +@ stdcall D3DXCreateCubeTextureFromFileW(ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromFileW +@ stdcall D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceA +@ stdcall D3DXCreateCubeTextureFromResourceExA(ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceExA +@ stdcall D3DXCreateCubeTextureFromResourceExW(ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceExW +@ stdcall D3DXCreateCubeTextureFromResourceW(ptr long ptr ptr) d3dx9_36.D3DXCreateCubeTextureFromResourceW +@ stdcall D3DXCreateCylinder(ptr long long long long long ptr ptr) d3dx9_36.D3DXCreateCylinder +@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffect +@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompiler +@ stdcall D3DXCreateEffectCompilerFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromFileA +@ stdcall D3DXCreateEffectCompilerFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromFileW +@ stdcall D3DXCreateEffectCompilerFromResourceA(long ptr ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromResourceA +@ stdcall D3DXCreateEffectCompilerFromResourceW(long ptr ptr ptr long ptr ptr) d3dx9_36.D3DXCreateEffectCompilerFromResourceW +@ stdcall D3DXCreateEffectEx(ptr ptr long ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectEx +@ stdcall D3DXCreateEffectFromFileA(ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileA +@ stdcall D3DXCreateEffectFromFileExA(ptr ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileExA +@ stdcall D3DXCreateEffectFromFileExW(ptr ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileExW +@ stdcall D3DXCreateEffectFromFileW(ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromFileW +@ stdcall D3DXCreateEffectFromResourceA(ptr long ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceA +@ stdcall D3DXCreateEffectFromResourceExA(ptr long ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceExA +@ stdcall D3DXCreateEffectFromResourceExW(ptr long ptr ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceExW +@ stdcall D3DXCreateEffectFromResourceW(ptr long ptr ptr ptr long ptr ptr ptr) d3dx9_36.D3DXCreateEffectFromResourceW +@ stdcall D3DXCreateEffectPool(ptr) d3dx9_36.D3DXCreateEffectPool +@ stdcall D3DXCreateFontA(ptr long long long long long long long long long ptr ptr) d3dx9_36.D3DXCreateFontA +@ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) d3dx9_36.D3DXCreateFontIndirectA +@ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) d3dx9_36.D3DXCreateFontIndirectW +@ stdcall D3DXCreateFontW(ptr long long long long long long long long long ptr ptr) d3dx9_36.D3DXCreateFontW +@ stdcall D3DXCreateFragmentLinker(ptr long ptr) d3dx9_36.D3DXCreateFragmentLinker +@ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) d3dx9_36.D3DXCreateFragmentLinkerEx +@ stdcall D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) d3dx9_36.D3DXCreateKeyframedAnimationSet +@ stdcall D3DXCreateLine(ptr ptr) d3dx9_36.D3DXCreateLine +@ stdcall D3DXCreateMatrixStack(long ptr) d3dx9_36.D3DXCreateMatrixStack +@ stdcall D3DXCreateMesh(long long long ptr ptr ptr) d3dx9_36.D3DXCreateMesh +@ stdcall D3DXCreateMeshFVF(long long long long ptr ptr) d3dx9_36.D3DXCreateMeshFVF +@ stdcall D3DXCreateNPatchMesh(ptr ptr) d3dx9_36.D3DXCreateNPatchMesh +@ stdcall D3DXCreatePMeshFromStream(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreatePMeshFromStream +@ stdcall D3DXCreatePatchMesh(ptr long long long ptr ptr ptr) d3dx9_36.D3DXCreatePatchMesh +@ stdcall D3DXCreatePolygon(ptr long long ptr ptr) d3dx9_36.D3DXCreatePolygon +@ stdcall D3DXCreatePRTBuffer(long long long ptr) d3dx9_36.D3DXCreatePRTBuffer +@ stdcall D3DXCreatePRTBufferTex(long long long long ptr) d3dx9_36.D3DXCreatePRTBufferTex +@ stdcall D3DXCreatePRTCompBuffer(long long long ptr ptr ptr ptr) d3dx9_36.D3DXCreatePRTCompBuffer +@ stdcall D3DXCreatePRTEngine(ptr ptr long ptr ptr) d3dx9_36.D3DXCreatePRTEngine +@ stdcall D3DXCreateRenderToEnvMap(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToEnvMap +@ stdcall D3DXCreateRenderToSurface(ptr long long long long long ptr) d3dx9_36.D3DXCreateRenderToSurface +@ stdcall D3DXCreateSPMesh(ptr ptr ptr ptr ptr) d3dx9_36.D3DXCreateSPMesh +@ stdcall D3DXCreateSkinInfo(long ptr long ptr) d3dx9_36.D3DXCreateSkinInfo +@ stdcall D3DXCreateSkinInfoFromBlendedMesh(ptr long ptr ptr) d3dx9_36.D3DXCreateSkinInfoFromBlendedMesh +@ stdcall D3DXCreateSkinInfoFVF(long long long ptr) d3dx9_36.D3DXCreateSkinInfoFVF +@ stdcall D3DXCreateSphere(ptr long long long ptr ptr) d3dx9_36.D3DXCreateSphere +@ stdcall D3DXCreateSprite(ptr ptr) d3dx9_36.D3DXCreateSprite +@ stdcall D3DXCreateTeapot(ptr ptr ptr) d3dx9_36.D3DXCreateTeapot +@ stdcall D3DXCreateTextA(ptr long ptr long long ptr ptr ptr) d3dx9_36.D3DXCreateTextA +@ stdcall D3DXCreateTextW(ptr long ptr long long ptr ptr ptr) d3dx9_36.D3DXCreateTextW +@ stdcall D3DXCreateTexture(ptr long long long long long long ptr) d3dx9_36.D3DXCreateTexture +@ stdcall D3DXCreateTextureFromFileA(ptr ptr ptr) d3dx9_36.D3DXCreateTextureFromFileA +@ stdcall D3DXCreateTextureFromFileExA(ptr ptr long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateTextureFromFileExA +@ stdcall D3DXCreateTextureFromFileExW(ptr ptr long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateTextureFromFileExW +@ stdcall D3DXCreateTextureFromFileInMemory(ptr ptr long ptr) d3dx9_36.D3DXCreateTextureFromFileInMemory +@ stdcall D3DXCreateTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateTextureFromFileInMemoryEx +@ stdcall D3DXCreateTextureFromFileW(ptr ptr ptr) d3dx9_36.D3DXCreateTextureFromFileW +@ stdcall D3DXCreateTextureFromResourceA(ptr long ptr ptr) d3dx9_36.D3DXCreateTextureFromResourceA +@ stdcall D3DXCreateTextureFromResourceExA(ptr long ptr long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateTextureFromResourceExA +@ stdcall D3DXCreateTextureFromResourceExW(ptr long ptr long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateTextureFromResourceExW +@ stdcall D3DXCreateTextureFromResourceW(ptr long ptr ptr) d3dx9_36.D3DXCreateTextureFromResourceW +@ stdcall D3DXCreateTextureGutterHelper(long long ptr long ptr) d3dx9_36.D3DXCreateTextureGutterHelper +@ stdcall D3DXCreateTextureShader(ptr ptr) d3dx9_36.D3DXCreateTextureShader +@ stdcall D3DXCreateTorus(ptr long long long long ptr ptr) d3dx9_36.D3DXCreateTorus +@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) d3dx9_36.D3DXCreateVolumeTexture +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromFileA +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromFileExA +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromFileExW +@ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) d3dx9_36.D3DXCreateVolumeTextureFromFileInMemory +@ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromFileInMemoryEx +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromFileW +@ stdcall D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromResourceA +@ stdcall D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromResourceExA +@ stdcall D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromResourceExW +@ stdcall D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) d3dx9_36.D3DXCreateVolumeTextureFromResourceW +@ stdcall D3DXDebugMute(long) d3dx9_36.D3DXDebugMute +@ stdcall D3DXDeclaratorFromFVF(long ptr) d3dx9_36.D3DXDeclaratorFromFVF +@ stdcall D3DXDisassembleEffect(ptr long ptr) d3dx9_36.D3DXDisassembleEffect +@ stdcall D3DXDisassembleShader(ptr long ptr ptr) d3dx9_36.D3DXDisassembleShader +@ stdcall D3DXFileCreate(ptr) d3dx9_36.D3DXFileCreate +@ stdcall D3DXFillCubeTexture(ptr ptr ptr) d3dx9_36.D3DXFillCubeTexture +@ stdcall D3DXFillCubeTextureTX(ptr ptr) d3dx9_36.D3DXFillCubeTextureTX +@ stdcall D3DXFillTexture(ptr ptr ptr) d3dx9_36.D3DXFillTexture +@ stdcall D3DXFillTextureTX(ptr ptr) d3dx9_36.D3DXFillTextureTX +@ stdcall D3DXFillVolumeTexture(ptr ptr ptr) d3dx9_36.D3DXFillVolumeTexture +@ stdcall D3DXFillVolumeTextureTX(ptr ptr) d3dx9_36.D3DXFillVolumeTextureTX +@ stdcall D3DXFilterTexture(ptr ptr long long) d3dx9_36.D3DXFilterTexture +@ stdcall D3DXFindShaderComment(ptr long ptr ptr) d3dx9_36.D3DXFindShaderComment +@ stdcall D3DXFloat16To32Array(ptr ptr long) d3dx9_36.D3DXFloat16To32Array +@ stdcall D3DXFloat32To16Array(ptr ptr long) d3dx9_36.D3DXFloat32To16Array +@ stdcall D3DXFrameAppendChild(ptr ptr) d3dx9_36.D3DXFrameAppendChild +@ stdcall D3DXFrameCalculateBoundingSphere(ptr ptr ptr) d3dx9_36.D3DXFrameCalculateBoundingSphere +@ stdcall D3DXFrameDestroy(ptr ptr) d3dx9_36.D3DXFrameDestroy +@ stdcall D3DXFrameFind(ptr ptr) d3dx9_36.D3DXFrameFind +@ stdcall D3DXFrameNumNamedMatrices(ptr) d3dx9_36.D3DXFrameNumNamedMatrices +@ stdcall D3DXFrameRegisterNamedMatrices(ptr ptr) d3dx9_36.D3DXFrameRegisterNamedMatrices +@ stdcall D3DXFresnelTerm(long long) d3dx9_36.D3DXFresnelTerm +@ stdcall D3DXFVFFromDeclarator(ptr ptr) d3dx9_36.D3DXFVFFromDeclarator +@ stdcall D3DXGatherFragments(ptr long ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragments +@ stdcall D3DXGatherFragmentsFromFileA(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileA +@ stdcall D3DXGatherFragmentsFromFileW(ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromFileW +@ stdcall D3DXGatherFragmentsFromResourceA(long ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromResourceA +@ stdcall D3DXGatherFragmentsFromResourceW(long ptr ptr ptr long ptr ptr) d3dx9_36.D3DXGatherFragmentsFromResourceW +@ stdcall D3DXGenerateOutputDecl(ptr ptr) d3dx9_36.D3DXGenerateOutputDecl +@ stdcall D3DXGeneratePMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXGeneratePMesh +@ stdcall D3DXGetDeclLength(ptr) d3dx9_36.D3DXGetDeclLength +@ stdcall D3DXGetDeclVertexSize(ptr long) d3dx9_36.D3DXGetDeclVertexSize +@ stdcall D3DXGetDriverLevel(ptr) d3dx9_36.D3DXGetDriverLevel +@ stdcall D3DXGetFVFVertexSize(long) d3dx9_36.D3DXGetFVFVertexSize +@ stdcall D3DXGetImageInfoFromFileA(ptr ptr) d3dx9_36.D3DXGetImageInfoFromFileA +@ stdcall D3DXGetImageInfoFromFileInMemory(ptr long ptr) d3dx9_36.D3DXGetImageInfoFromFileInMemory +@ stdcall D3DXGetImageInfoFromFileW(ptr ptr) d3dx9_36.D3DXGetImageInfoFromFileW +@ stdcall D3DXGetImageInfoFromResourceA(long ptr ptr) d3dx9_36.D3DXGetImageInfoFromResourceA +@ stdcall D3DXGetImageInfoFromResourceW(long ptr ptr) d3dx9_36.D3DXGetImageInfoFromResourceW +@ stdcall D3DXGetPixelShaderProfile(ptr) d3dx9_36.D3DXGetPixelShaderProfile +@ stdcall D3DXGetShaderConstantTable(ptr ptr) d3dx9_36.D3DXGetShaderConstantTable +@ stdcall D3DXGetShaderConstantTableEx(ptr long ptr) d3dx9_36.D3DXGetShaderConstantTableEx +@ stdcall D3DXGetShaderInputSemantics(ptr ptr ptr) d3dx9_36.D3DXGetShaderInputSemantics +@ stdcall D3DXGetShaderOutputSemantics(ptr ptr ptr) d3dx9_36.D3DXGetShaderOutputSemantics +@ stdcall D3DXGetShaderSamplers(ptr ptr ptr) d3dx9_36.D3DXGetShaderSamplers +@ stdcall D3DXGetShaderSize(ptr) d3dx9_36.D3DXGetShaderSize +@ stdcall D3DXGetShaderVersion(ptr) d3dx9_36.D3DXGetShaderVersion +@ stdcall D3DXGetVertexShaderProfile(ptr) d3dx9_36.D3DXGetVertexShaderProfile +@ stdcall D3DXIntersect(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXIntersect +@ stdcall D3DXIntersectSubset(ptr long ptr ptr ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXIntersectSubset +@ stdcall D3DXIntersectTri(ptr ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXIntersectTri +@ stdcall D3DXLoadMeshFromXA(ptr long ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshFromXA +@ stdcall D3DXLoadMeshFromXInMemory(ptr long long ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshFromXInMemory +@ stdcall D3DXLoadMeshFromXResource(long ptr ptr long ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshFromXResource +@ stdcall D3DXLoadMeshFromXW(ptr long ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshFromXW +@ stdcall D3DXLoadMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshFromXof +@ stdcall D3DXLoadMeshHierarchyFromXA(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXA +@ stdcall D3DXLoadMeshHierarchyFromXInMemory(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXInMemory +@ stdcall D3DXLoadMeshHierarchyFromXW(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadMeshHierarchyFromXW +@ stdcall D3DXLoadPatchMeshFromXof(ptr long ptr ptr ptr long ptr) d3dx9_36.D3DXLoadPatchMeshFromXof +@ stdcall D3DXLoadPRTBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileA +@ stdcall D3DXLoadPRTBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTBufferFromFileW +@ stdcall D3DXLoadPRTCompBufferFromFileA(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileA +@ stdcall D3DXLoadPRTCompBufferFromFileW(ptr ptr) d3dx9_36.D3DXLoadPRTCompBufferFromFileW +@ stdcall D3DXLoadSkinMeshFromXof(ptr long ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXLoadSkinMeshFromXof +@ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileA +@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileInMemory +@ stdcall D3DXLoadSurfaceFromFileW(ptr ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromFileW +@ stdcall D3DXLoadSurfaceFromMemory(ptr ptr ptr ptr long long ptr ptr long long) d3dx9_36.D3DXLoadSurfaceFromMemory +@ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr long ptr ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromResourceA +@ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr long ptr ptr long long ptr) d3dx9_36.D3DXLoadSurfaceFromResourceW +@ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long) d3dx9_36.D3DXLoadSurfaceFromSurface +@ stdcall D3DXLoadVolumeFromFileA(ptr ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromFileA +@ stdcall D3DXLoadVolumeFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromFileInMemory +@ stdcall D3DXLoadVolumeFromFileW(ptr ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromFileW +@ stdcall D3DXLoadVolumeFromMemory(ptr ptr ptr ptr long long long ptr ptr long long) d3dx9_36.D3DXLoadVolumeFromMemory +@ stdcall D3DXLoadVolumeFromResourceA(ptr ptr ptr long ptr ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromResourceA +@ stdcall D3DXLoadVolumeFromResourceW(ptr ptr ptr long ptr ptr long long ptr) d3dx9_36.D3DXLoadVolumeFromResourceW +@ stdcall D3DXLoadVolumeFromVolume(ptr ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXLoadVolumeFromVolume +@ stdcall D3DXMatrixAffineTransformation(ptr long ptr ptr ptr) d3dx9_36.D3DXMatrixAffineTransformation +@ stdcall D3DXMatrixAffineTransformation2D(ptr long ptr long ptr) d3dx9_36.D3DXMatrixAffineTransformation2D +@ stdcall D3DXMatrixDecompose(ptr ptr ptr ptr) d3dx9_36.D3DXMatrixDecompose +@ stdcall D3DXMatrixDeterminant(ptr) d3dx9_36.D3DXMatrixDeterminant +@ stdcall D3DXMatrixInverse(ptr ptr ptr) d3dx9_36.D3DXMatrixInverse +@ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr) d3dx9_36.D3DXMatrixLookAtLH +@ stdcall D3DXMatrixLookAtRH(ptr ptr ptr ptr) d3dx9_36.D3DXMatrixLookAtRH +@ stdcall D3DXMatrixMultiply(ptr ptr ptr) d3dx9_36.D3DXMatrixMultiply +@ stdcall D3DXMatrixMultiplyTranspose(ptr ptr ptr) d3dx9_36.D3DXMatrixMultiplyTranspose +@ stdcall D3DXMatrixOrthoLH(ptr long long long long) d3dx9_36.D3DXMatrixOrthoLH +@ stdcall D3DXMatrixOrthoOffCenterLH(ptr long long long long long long) d3dx9_36.D3DXMatrixOrthoOffCenterLH +@ stdcall D3DXMatrixOrthoOffCenterRH(ptr long long long long long long) d3dx9_36.D3DXMatrixOrthoOffCenterRH +@ stdcall D3DXMatrixOrthoRH(ptr long long long long) d3dx9_36.D3DXMatrixOrthoRH +@ stdcall D3DXMatrixPerspectiveFovLH(ptr long long long long) d3dx9_36.D3DXMatrixPerspectiveFovLH +@ stdcall D3DXMatrixPerspectiveFovRH(ptr long long long long) d3dx9_36.D3DXMatrixPerspectiveFovRH +@ stdcall D3DXMatrixPerspectiveLH(ptr long long long long) d3dx9_36.D3DXMatrixPerspectiveLH +@ stdcall D3DXMatrixPerspectiveOffCenterLH(ptr long long long long long long) d3dx9_36.D3DXMatrixPerspectiveOffCenterLH +@ stdcall D3DXMatrixPerspectiveOffCenterRH(ptr long long long long long long) d3dx9_36.D3DXMatrixPerspectiveOffCenterRH +@ stdcall D3DXMatrixPerspectiveRH(ptr long long long long) d3dx9_36.D3DXMatrixPerspectiveRH +@ stdcall D3DXMatrixReflect(ptr ptr) d3dx9_36.D3DXMatrixReflect +@ stdcall D3DXMatrixRotationAxis(ptr ptr long) d3dx9_36.D3DXMatrixRotationAxis +@ stdcall D3DXMatrixRotationQuaternion(ptr ptr) d3dx9_36.D3DXMatrixRotationQuaternion +@ stdcall D3DXMatrixRotationX(ptr long) d3dx9_36.D3DXMatrixRotationX +@ stdcall D3DXMatrixRotationY(ptr long) d3dx9_36.D3DXMatrixRotationY +@ stdcall D3DXMatrixRotationYawPitchRoll(ptr long long long) d3dx9_36.D3DXMatrixRotationYawPitchRoll +@ stdcall D3DXMatrixRotationZ(ptr long) d3dx9_36.D3DXMatrixRotationZ +@ stdcall D3DXMatrixScaling(ptr long long long) d3dx9_36.D3DXMatrixScaling +@ stdcall D3DXMatrixShadow(ptr ptr ptr) d3dx9_36.D3DXMatrixShadow +@ stdcall D3DXMatrixTransformation(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXMatrixTransformation +@ stdcall D3DXMatrixTransformation2D(ptr ptr long ptr ptr long ptr) d3dx9_36.D3DXMatrixTransformation2D +@ stdcall D3DXMatrixTranslation(ptr long long long) d3dx9_36.D3DXMatrixTranslation +@ stdcall D3DXMatrixTranspose(ptr ptr) d3dx9_36.D3DXMatrixTranspose +@ stdcall D3DXOptimizeFaces(ptr long long long ptr) d3dx9_36.D3DXOptimizeFaces +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) d3dx9_36.D3DXOptimizeVertices +@ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) d3dx9_36.D3DXPlaneFromPointNormal +@ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) d3dx9_36.D3DXPlaneFromPoints +@ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) d3dx9_36.D3DXPlaneIntersectLine +@ stdcall D3DXPlaneNormalize(ptr ptr) d3dx9_36.D3DXPlaneNormalize +@ stdcall D3DXPlaneTransform(ptr ptr ptr) d3dx9_36.D3DXPlaneTransform +@ stdcall D3DXPlaneTransformArray(ptr long ptr long ptr long) d3dx9_36.D3DXPlaneTransformArray +@ stdcall D3DXPreprocessShader(ptr long ptr ptr ptr ptr) d3dx9_36.D3DXPreprocessShader +@ stdcall D3DXPreprocessShaderFromFileA(ptr ptr ptr ptr ptr) d3dx9_36.D3DXPreprocessShaderFromFileA +@ stdcall D3DXPreprocessShaderFromFileW(ptr ptr ptr ptr ptr) d3dx9_36.D3DXPreprocessShaderFromFileW +@ stdcall D3DXPreprocessShaderFromResourceA(long long ptr ptr ptr ptr) d3dx9_36.D3DXPreprocessShaderFromResourceA +@ stdcall D3DXPreprocessShaderFromResourceW(long long ptr ptr ptr ptr) d3dx9_36.D3DXPreprocessShaderFromResourceW +@ stdcall D3DXQuaternionBaryCentric(ptr ptr ptr ptr long long) d3dx9_36.D3DXQuaternionBaryCentric +@ stdcall D3DXQuaternionExp(ptr ptr) d3dx9_36.D3DXQuaternionExp +@ stdcall D3DXQuaternionInverse(ptr ptr) d3dx9_36.D3DXQuaternionInverse +@ stdcall D3DXQuaternionLn(ptr ptr) d3dx9_36.D3DXQuaternionLn +@ stdcall D3DXQuaternionMultiply(ptr ptr ptr) d3dx9_36.D3DXQuaternionMultiply +@ stdcall D3DXQuaternionNormalize(ptr ptr) d3dx9_36.D3DXQuaternionNormalize +@ stdcall D3DXQuaternionRotationAxis(ptr ptr long) d3dx9_36.D3DXQuaternionRotationAxis +@ stdcall D3DXQuaternionRotationMatrix(ptr ptr) d3dx9_36.D3DXQuaternionRotationMatrix +@ stdcall D3DXQuaternionRotationYawPitchRoll(ptr long long long) d3dx9_36.D3DXQuaternionRotationYawPitchRoll +@ stdcall D3DXQuaternionSlerp(ptr ptr ptr long) d3dx9_36.D3DXQuaternionSlerp +@ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr long) d3dx9_36.D3DXQuaternionSquad +@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXQuaternionSquadSetup +@ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) d3dx9_36.D3DXQuaternionToAxisAngle +@ stdcall D3DXRectPatchSize(ptr ptr ptr) d3dx9_36.D3DXRectPatchSize +@ stdcall D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileA +@ stdcall D3DXSaveMeshHierarchyToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveMeshHierarchyToFileW +@ stdcall D3DXSaveMeshToXA(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXA +@ stdcall D3DXSaveMeshToXW(ptr ptr ptr ptr ptr long long) d3dx9_36.D3DXSaveMeshToXW +@ stdcall D3DXSavePRTBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileA +@ stdcall D3DXSavePRTBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTBufferToFileW +@ stdcall D3DXSavePRTCompBufferToFileA(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileA +@ stdcall D3DXSavePRTCompBufferToFileW(ptr ptr) d3dx9_36.D3DXSavePRTCompBufferToFileW +@ stdcall D3DXSaveSurfaceToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileA +@ stdcall D3DXSaveSurfaceToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileInMemory +@ stdcall D3DXSaveSurfaceToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveSurfaceToFileW +@ stdcall D3DXSaveTextureToFileA(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileA +@ stdcall D3DXSaveTextureToFileInMemory(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileInMemory +@ stdcall D3DXSaveTextureToFileW(ptr long ptr ptr) d3dx9_36.D3DXSaveTextureToFileW +@ stdcall D3DXSaveVolumeToFileA(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileA +@ stdcall D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileInMemory +@ stdcall D3DXSaveVolumeToFileW(ptr long ptr ptr ptr) d3dx9_36.D3DXSaveVolumeToFileW +@ stdcall D3DXSHAdd(ptr long ptr ptr) d3dx9_36.D3DXSHAdd +@ stdcall D3DXSHDot(long ptr ptr) d3dx9_36.D3DXSHDot +@ stdcall D3DXSHEvalConeLight(long ptr long long long long ptr ptr ptr) d3dx9_36.D3DXSHEvalConeLight +@ stdcall D3DXSHEvalDirection(ptr long ptr) d3dx9_36.D3DXSHEvalDirection +@ stdcall D3DXSHEvalDirectionalLight(long ptr long long long long ptr ptr ptr) d3dx9_36.D3DXSHEvalDirectionalLight +@ stdcall D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) d3dx9_36.D3DXSHEvalHemisphereLight +@ stdcall D3DXSHEvalSphericalLight(long ptr long long long long ptr ptr ptr) d3dx9_36.D3DXSHEvalSphericalLight +@ stdcall D3DXSHMultiply2(ptr ptr ptr) d3dx9_36.D3DXSHMultiply2 +@ stdcall D3DXSHMultiply3(ptr ptr ptr) d3dx9_36.D3DXSHMultiply3 +@ stdcall D3DXSHMultiply4(ptr ptr ptr) d3dx9_36.D3DXSHMultiply4 +@ stdcall D3DXSHMultiply5(ptr ptr ptr) d3dx9_36.D3DXSHMultiply5 +@ stdcall D3DXSHMultiply6(ptr ptr ptr) d3dx9_36.D3DXSHMultiply6 +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) d3dx9_36.D3DXSHProjectCubeMap +@ stdcall D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSHPRTCompSplitMeshSC +@ stdcall D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) d3dx9_36.D3DXSHPRTCompSuperCluster +@ stdcall D3DXSHRotate(ptr long ptr ptr) d3dx9_36.D3DXSHRotate +@ stdcall D3DXSHRotateZ(ptr long long ptr) d3dx9_36.D3DXSHRotateZ +@ stdcall D3DXSHScale(ptr long ptr ptr) d3dx9_36.D3DXSHScale +@ stdcall D3DXSimplifyMesh(ptr ptr ptr ptr long long ptr) d3dx9_36.D3DXSimplifyMesh +@ stdcall D3DXSphereBoundProbe(ptr long ptr ptr) d3dx9_36.D3DXSphereBoundProbe +@ stdcall D3DXSplitMesh(ptr ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXSplitMesh +@ stdcall D3DXTessellateNPatches(ptr ptr long long ptr ptr) d3dx9_36.D3DXTessellateNPatches +@ stdcall D3DXTessellateRectPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateRectPatch +@ stdcall D3DXTessellateTriPatch(ptr ptr ptr ptr ptr) d3dx9_36.D3DXTessellateTriPatch +@ stdcall D3DXTriPatchSize(ptr ptr ptr) d3dx9_36.D3DXTriPatchSize +@ stdcall D3DXUVAtlasCreate(ptr long long long long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXUVAtlasCreate +@ stdcall D3DXUVAtlasPack(ptr long long long long ptr ptr long ptr long ptr) d3dx9_36.D3DXUVAtlasPack +@ stdcall D3DXUVAtlasPartition(ptr long long long ptr ptr ptr ptr long ptr long ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXUVAtlasPartition +@ stdcall D3DXValidMesh(ptr ptr ptr) d3dx9_36.D3DXValidMesh +@ stdcall D3DXValidPatchMesh(ptr ptr ptr ptr) d3dx9_36.D3DXValidPatchMesh +@ stdcall D3DXVec2BaryCentric(ptr ptr ptr ptr long long) d3dx9_36.D3DXVec2BaryCentric +@ stdcall D3DXVec2CatmullRom(ptr ptr ptr ptr ptr long) d3dx9_36.D3DXVec2CatmullRom +@ stdcall D3DXVec2Hermite(ptr ptr ptr ptr ptr long) d3dx9_36.D3DXVec2Hermite +@ stdcall D3DXVec2Normalize(ptr ptr) d3dx9_36.D3DXVec2Normalize +@ stdcall D3DXVec2Transform(ptr ptr ptr) d3dx9_36.D3DXVec2Transform +@ stdcall D3DXVec2TransformArray(ptr long ptr long ptr long) d3dx9_36.D3DXVec2TransformArray +@ stdcall D3DXVec2TransformCoord(ptr ptr ptr) d3dx9_36.D3DXVec2TransformCoord +@ stdcall D3DXVec2TransformCoordArray(ptr long ptr long ptr long) d3dx9_36.D3DXVec2TransformCoordArray +@ stdcall D3DXVec2TransformNormal(ptr ptr ptr) d3dx9_36.D3DXVec2TransformNormal +@ stdcall D3DXVec2TransformNormalArray(ptr long ptr long ptr long) d3dx9_36.D3DXVec2TransformNormalArray +@ stdcall D3DXVec3BaryCentric(ptr ptr ptr ptr long long) d3dx9_36.D3DXVec3BaryCentric +@ stdcall D3DXVec3CatmullRom(ptr ptr ptr ptr ptr long) d3dx9_36.D3DXVec3CatmullRom +@ stdcall D3DXVec3Hermite(ptr ptr ptr ptr ptr long) d3dx9_36.D3DXVec3Hermite +@ stdcall D3DXVec3Normalize(ptr ptr) d3dx9_36.D3DXVec3Normalize +@ stdcall D3DXVec3Project(ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXVec3Project +@ stdcall D3DXVec3ProjectArray(ptr long ptr long ptr ptr ptr ptr long) d3dx9_36.D3DXVec3ProjectArray +@ stdcall D3DXVec3Transform(ptr ptr ptr) d3dx9_36.D3DXVec3Transform +@ stdcall D3DXVec3TransformArray(ptr long ptr long ptr long) d3dx9_36.D3DXVec3TransformArray +@ stdcall D3DXVec3TransformCoord(ptr ptr ptr) d3dx9_36.D3DXVec3TransformCoord +@ stdcall D3DXVec3TransformCoordArray(ptr long ptr long ptr long) d3dx9_36.D3DXVec3TransformCoordArray +@ stdcall D3DXVec3TransformNormal(ptr ptr ptr) d3dx9_36.D3DXVec3TransformNormal +@ stdcall D3DXVec3TransformNormalArray(ptr long ptr long ptr long) d3dx9_36.D3DXVec3TransformNormalArray +@ stdcall D3DXVec3Unproject(ptr ptr ptr ptr ptr ptr) d3dx9_36.D3DXVec3Unproject +@ stdcall D3DXVec3UnprojectArray(ptr long ptr long ptr ptr ptr ptr long) d3dx9_36.D3DXVec3UnprojectArray +@ stdcall D3DXVec4BaryCentric(ptr ptr ptr ptr long long) d3dx9_36.D3DXVec4BaryCentric +@ stdcall D3DXVec4CatmullRom(ptr ptr ptr ptr ptr long) d3dx9_36.D3DXVec4CatmullRom +@ stdcall D3DXVec4Cross(ptr ptr ptr ptr) d3dx9_36.D3DXVec4Cross +@ stdcall D3DXVec4Hermite(ptr ptr ptr ptr ptr long) d3dx9_36.D3DXVec4Hermite +@ stdcall D3DXVec4Normalize(ptr ptr) d3dx9_36.D3DXVec4Normalize +@ stdcall D3DXVec4Transform(ptr ptr ptr) d3dx9_36.D3DXVec4Transform +@ stdcall D3DXVec4TransformArray(ptr long ptr long ptr long) d3dx9_36.D3DXVec4TransformArray +@ stdcall D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr) d3dx9_36.D3DXWeldVertices Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c (added) +++ trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -1,0 +1,64 @@ +/* + * Direct3D X 9 main file + * + * Copyright (C) 2007 David Adam + * Copyright (C) 2009 Rico SchÃ¼ller + * Copyright (C) 2009 RiÄardas Barkauskas + * + * 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 "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" + +#include "d3dx9.h" + +/*********************************************************************** + * DllMain. + */ +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +/*********************************************************************** + * D3DXCheckVersion + * Checks whether we are compiling against the correct d3d and d3dx library. + */ +BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +{ + if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==42) + return TRUE; + else + return FALSE; +} Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/d3dx9_42_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/wine/d3dx9_42/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_42/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_42/version.rc (added) +++ trunk/reactos/dll/directx/wine/d3dx9_42/version.rc [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -1,0 +1,28 @@ +/* + * Copyright 2008 Louis Lenders + * Copyright 2009 Rico SchÃ¼ller + * Copyright 2009 RiÄardas Barkauskas + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine D3DX9" +#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILEVERSION 9,27,952,3001 +#define WINE_FILEVERSION_STR "9.27.952.3001" +#define WINE_PRODUCTVERSION 9,27,952,3001 +#define WINE_PRODUCTVERSION_STR "9.27.952.3001" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/directx/wine/d3dx9_42/version.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/wine.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wine.rbui… ============================================================================== --- trunk/reactos/dll/directx/wine/wine.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wine.rbuild [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -64,6 +64,9 @@ <directory name="d3dx9_41"> <xi:include href="d3dx9_41/d3dx9_41.rbuild" /> </directory> + <directory name="d3dx9_42"> + <xi:include href="d3dx9_42/d3dx9_42.rbuild" /> + </directory> <directory name="ddraw"> <xi:include href="ddraw/ddraw.rbuild" /> </directory> Modified: trunk/reactos/include/dxsdk/d3dx9shader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9shader.… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9shader.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/d3dx9shader.h [iso-8859-1] Tue Jan 19 11:09:33 2010 @@ -20,6 +20,27 @@ #ifndef __D3DX9SHADER_H__ #define __D3DX9SHADER_H__ + +#define D3DXSHADER_DEBUG 0x1 +#define D3DXSHADER_SKIPVALIDATION 0x2 +#define D3DXSHADER_SKIPOPTIMIZATION 0x4 +#define D3DXSHADER_PACKMATRIX_ROWMAJOR 0x8 +#define D3DXSHADER_PACKMATRIX_COLUMNMAJOR 0x10 +#define D3DXSHADER_PARTIALPRECISION 0x20 +#define D3DXSHADER_FORCE_VS_SOFTWARE_NOOPT 0x40 +#define D3DXSHADER_FORCE_PS_SOFTWARE_NOOPT 0x80 +#define D3DXSHADER_NO_PRESHADER 0x100 +#define D3DXSHADER_AVOID_FLOW_CONTROL 0x200 +#define D3DXSHADER_PREFER_FLOW_CONTROL 0x400 +#define D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3DXSHADER_IEEE_STRICTNESS 0x2000 + +#define D3DXSHADER_OPTIMIZATION_LEVEL0 0x4000 +#define D3DXSHADER_OPTIMIZATION_LEVEL1 0x0 +#define D3DXSHADER_OPTIMIZATION_LEVEL2 0xC000 +#define D3DXSHADER_OPTIMIZATION_LEVEL3 0x8000 + +#define D3DXSHADER_USE_LEGACY_D3DX9_31_DLL 0x10000 typedef LPCSTR D3DXHANDLE; @@ -64,6 +85,26 @@ LPCSTR Definition; } D3DXMACRO, *LPD3DXMACRO; +typedef enum _D3DXINCLUDE_TYPE +{ + D3DXINC_LOCAL, + D3DXINC_SYSTEM, + D3DXINC_FORCE_DWORD = 0x7fffffff, +} D3DXINCLUDE_TYPE, *LPD3DXINCLUDE_TYPE; + +#undef INTERFACE +#define INTERFACE ID3DXInclude + +DECLARE_INTERFACE(ID3DXInclude) +{ + STDMETHOD(Open)(THIS_ D3DXINCLUDE_TYPE include_type, LPCSTR filename, LPCVOID parent_data, LPCVOID *data, UINT *bytes) PURE; + STDMETHOD(Close)(THIS_ LPCVOID data) PURE; +}; + +#define ID3DXInclude_Open(p,a,b,c,d,e) (p)->lpVtbl->Open(p,a,b,c,d,e) +#define ID3DXInclude_Close(p,a) (p)->lpVtbl->Close(p,a) + +typedef struct ID3DXInclude *LPD3DXINCLUDE; #ifdef __cplusplus extern "C" { @@ -74,6 +115,44 @@ DWORD WINAPI D3DXGetShaderVersion(const DWORD *byte_code); LPCSTR WINAPI D3DXGetVertexShaderProfile(LPDIRECT3DDEVICE9 device); +HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, + LPCSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, + LPCWSTR resource, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + +HRESULT WINAPI D3DXAssembleShader(LPCSTR data, + UINT data_len, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_messages); + #ifdef __cplusplus } #endif

14 years, 8 months

[sir_richard] 45148: [NTOS]: Implement GUI thread promotion during the first GUI system call in C. This is tricky due to EBP, and actually requires some tiny inline ASM magic to make it work right. [NTOS]: Implement SYSENTER system calls in C as well. All system calls are now handled in C. This code will be further optimized/refined soon.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 19 10:45:30 2010 New Revision: 45148 URL: http://svn.reactos.org/svn/reactos?rev=45148&view=rev Log: [NTOS]: Implement GUI thread promotion during the first GUI system call in C. This is tricky due to EBP, and actually requires some tiny inline ASM magic to make it work right. [NTOS]: Implement SYSENTER system calls in C as well. All system calls are now handled in C. This code will be further optimized/refined soon. 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 10:45:30 2010 @@ -138,6 +138,7 @@ extern ULONG_PTR KiBugCheckData[5]; extern ULONG KiFreezeFlag; extern ULONG KiDPCTimeout; +extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch; /* MACROS *************************************************************************/ 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 10:45:30 2010 @@ -436,3 +436,42 @@ return Result; } + +NTSTATUS +FORCEINLINE +KiConvertToGuiThread(VOID) +{ + NTSTATUS Result; + PVOID StackFrame; + + /* + * Converting to a GUI thread safely updates ESP in-place as well as the + * current Thread->TrapFrame and EBP when KeSwitchKernelStack is called. + * + * However, PsConvertToGuiThread "helpfully" restores EBP to the original + * caller's value, since it is considered a nonvolatile register. As such, + * as soon as we're back after the conversion and we try to store the result + * which will probably be in some stack variable (EBP-based), we'll crash as + * we are touching the de-allocated non-expanded stack. + * + * Thus we need a way to update our EBP before EBP is touched, and the only + * way to guarantee this is to do the call itself in assembly, use the EAX + * register to store the result, fixup EBP, and then let the C code continue + * on its merry way. + * + */ + __asm__ __volatile__ + ( + "movl %%ebp, %1\n" + "subl %%esp, %1\n" + "call _PsConvertToGuiThread@0\n" + "addl %%esp, %1\n" + "movl %1, %%ebp\n" + "movl %%eax, %0\n" + : "=r"(Result), "=r"(StackFrame) + : + : "%esp", "%ecx", "%edx" + ); + + return Result; +} 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 10:45:30 2010 @@ -129,260 +129,30 @@ .endfunc .func KiFastCallEntry -TRAP_FIXUPS FastCallDrSave, FastCallDrReturn, DoNotFixupV86, DoNotFixupAbios _KiFastCallEntry: - /* Enter the fast system call prolog */ - FASTCALL_PROLOG FastCallDrSave, FastCallDrReturn - -SharedCode: - - /* - * Find out which table offset to use. Converts 0x1124 into 0x10. - * The offset is related to the Table Index as such: Offset = TableIndex x 10 - */ - mov edi, eax - shr edi, SERVICE_TABLE_SHIFT - and edi, SERVICE_TABLE_MASK - mov ecx, edi - - /* Now add the thread's base system table to the offset */ - add edi, [esi+KTHREAD_SERVICE_TABLE] - - /* Get the true syscall ID and check it */ - mov ebx, eax - and eax, SERVICE_NUMBER_MASK - cmp eax, [edi+SERVICE_DESCRIPTOR_LIMIT] - - /* Invalid ID, try to load Win32K Table */ - jnb KiBBTUnexpectedRange - - /* Check if this was Win32K */ - cmp ecx, SERVICE_TABLE_TEST - jnz NotWin32K - - /* Get the TEB */ - mov ecx, PCR[KPCR_TEB] - - /* Check if we should flush the User Batch */ - xor ebx, ebx -_ReadBatch: - or ebx, [ecx+TEB_GDI_BATCH_COUNT] - jz NotWin32K - - /* Flush it */ - push edx - push eax - call [_KeGdiFlushUserBatch] - pop eax - pop edx - -NotWin32K: - /* Increase total syscall count */ - inc dword ptr PCR[KPCR_SYSTEM_CALLS] - -#if DBG - /* Increase per-syscall count */ - mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] - jecxz NoCountTable - inc dword ptr [ecx+eax*4] -#endif - - /* Users's current stack frame pointer is source */ -NoCountTable: - mov esi, edx - - /* Allocate room for argument list from kernel stack */ - mov ebx, [edi+SERVICE_DESCRIPTOR_NUMBER] - xor ecx, ecx - mov cl, [eax+ebx] - - /* Get pointer to function */ - mov edi, [edi+SERVICE_DESCRIPTOR_BASE] - mov ebx, [edi+eax*4] - - /* Allocate space on our stack */ - sub esp, ecx - - /* Set the size of the arguments and the destination */ - shr ecx, 2 - mov edi, esp - - /* Make sure we're within the User Probe Address */ - cmp esi, _MmUserProbeAddress - jnb AccessViolation - -_CopyParams: - /* Copy the parameters */ - rep movsd - - /* Do the System Call */ - call ebx - -AfterSysCall: -#if DBG - /* Make sure the user-mode call didn't return at elevated IRQL */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz SkipCheck - mov esi, eax /* We need to save the syscall's return val */ - call _KeGetCurrentIrql@0 - or al, al - jnz InvalidIrql - mov eax, esi /* Restore it */ - - /* Get our temporary current thread pointer for sanity check */ - mov ecx, PCR[KPCR_CURRENT_THREAD] - - /* Make sure that we are not attached and that APCs are not disabled */ - mov dl, [ecx+KTHREAD_APC_STATE_INDEX] - or dl, dl - jnz InvalidIndex - mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] - or edx, edx - jnz InvalidIndex -#endif - -SkipCheck: - - /* Deallocate the kernel stack frame */ - mov esp, ebp - -KeReturnFromSystemCall: - - /* Get the Current Thread */ - mov ecx, PCR[KPCR_CURRENT_THREAD] - - /* Restore the old trap frame pointer */ - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ecx+KTHREAD_TRAP_FRAME], edx + /* Sane FS segment */ + mov ecx, KGDT_R0_PCR + mov fs, cx - /* Exit the system call */ - mov ecx, ebp - mov edx, eax - jmp @KiServiceExit@8 -.endfunc - -KiBBTUnexpectedRange: - - /* If this isn't a Win32K call, fail */ - cmp ecx, SERVICE_TABLE_TEST - jne InvalidCall - - /* Set up Win32K Table */ - push edx - push ebx - call _PsConvertToGuiThread@0 - - /* Check return code */ - or eax, eax - - /* Restore registers */ - pop eax - pop edx - - /* Reset trap frame address */ - mov ebp, esp - mov [esi+KTHREAD_TRAP_FRAME], ebp - - /* Try the Call again, if we suceeded */ - jz SharedCode - - /* - * The Shadow Table should have a special byte table which tells us - * whether we should return FALSE, -1 or STATUS_INVALID_SYSTEM_SERVICE. - */ - - /* Get the table limit and base */ - lea edx, _KeServiceDescriptorTableShadow + SERVICE_TABLE_TEST - mov ecx, [edx+SERVICE_DESCRIPTOR_LIMIT] - mov edx, [edx+SERVICE_DESCRIPTOR_BASE] - - /* Get the table address and add our index into the array */ - lea edx, [edx+ecx*4] - and eax, SERVICE_NUMBER_MASK - add edx, eax - - /* Find out what we should return */ - movsx eax, byte ptr [edx] - or eax, eax - - /* Return either 0 or -1, we've set it in EAX */ - jle KeReturnFromSystemCall - - /* Set STATUS_INVALID_SYSTEM_SERVICE */ - mov eax, STATUS_INVALID_SYSTEM_SERVICE - jmp KeReturnFromSystemCall - -InvalidCall: - - /* Invalid System Call */ - mov eax, STATUS_INVALID_SYSTEM_SERVICE - jmp KeReturnFromSystemCall - -AccessViolation: - - /* Check if this came from kernel-mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - - /* It's fine, go ahead with it */ - jz _CopyParams - - /* Caller sent invalid parameters, fail here */ - mov eax, STATUS_ACCESS_VIOLATION - jmp AfterSysCall - -BadStack: - - /* Restore ESP0 stack */ - mov ecx, PCR[KPCR_TSS] - mov esp, ss:[ecx+KTSS_ESP0] - - /* Generate V86M Stack for Trap 6 */ - push 0 - push 0 - push 0 - push 0 - - /* Generate interrupt stack for Trap 6 */ - push KGDT_R3_DATA + RPL_MASK - push 0 - push 0x20202 - push KGDT_R3_CODE + RPL_MASK - push 0 - jmp _KiTrap06 - -#if DBG -InvalidIrql: - /* Save current IRQL */ - push PCR[KPCR_IRQL] - - /* Set us at passive */ - mov dword ptr PCR[KPCR_IRQL], 0 - cli - - /* Bugcheck */ - push 0 - push 0 - push eax - push ebx - push IRQL_GT_ZERO_AT_SYSTEM_SERVICE - call _KeBugCheckEx@20 - -InvalidIndex: - - /* Get the index and APC state */ - movzx eax, byte ptr [ecx+KTHREAD_APC_STATE_INDEX] - mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] - - /* Bugcheck */ - push 0 - push edx - push eax - push ebx - push APC_INDEX_MISMATCH - call _KeBugCheckEx@20 - ret -#endif + /* Sane stack and frame */ + mov esp, PCR[KPCR_TSS] + mov esp, [esp+KTSS_ESP0] + + /* Make space for trap frame on the stack */ + sub esp, KTRAP_FRAME_V86_ES + + /* Save EBP, EBX, ESI, EDI only! */ + mov [esp+KTRAP_FRAME_EBX], ebx + mov [esp+KTRAP_FRAME_ESI], esi + mov [esp+KTRAP_FRAME_EDI], edi + mov [esp+KTRAP_FRAME_EBP], ebp + + /* Call C handler -- note that EDX is the user stack, and EAX the syscall */ + mov ecx, esp + add edx, 8 + jmp _KiFastCallEntryHandler +.endfunc .func Kei386EoiHelper@0 _Kei386EoiHelper@0: 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 10:45:30 2010 @@ -1465,6 +1465,7 @@ } /* Check for syscall fault */ +#if 0 if ((TrapFrame->Eip == (ULONG_PTR)CopyParams) || (TrapFrame->Eip == (ULONG_PTR)ReadBatch)) { @@ -1472,7 +1473,7 @@ UNIMPLEMENTED; while (TRUE); } - +#endif /* Check for VDM trap */ ASSERT((KiVdmTrap(TrapFrame)) == FALSE); @@ -1725,9 +1726,14 @@ goto ExitCall; } - /* GUI calls are not yet supported */ - UNIMPLEMENTED; - while (TRUE); + /* Convert us to a GUI thread -- must wrap in ASM to get new EBP */ + Result = KiConvertToGuiThread(); + if (__builtin_expect(!NT_SUCCESS(Result), 0)) + { + /* Figure out how we should fail to the user */ + UNIMPLEMENTED; + while (TRUE); + } /* Try the call again */ continue; @@ -1741,8 +1747,7 @@ if (__builtin_expect(Offset & SERVICE_TABLE_TEST, 0)) { /* Get the batch count and flush if necessary */ - UNIMPLEMENTED; - while (TRUE); + if (NtCurrentTeb()->GdiBatchCount) KeGdiFlushUserBatch(); } /* Increase system call count */ @@ -1816,6 +1821,39 @@ /* Enable interrupts and make the call */ _enable(); KiSystemCall(ServiceNumber, Arguments); +} + +VOID +__attribute__((regparm(3))) +KiFastCallEntryHandler(IN ULONG ServiceNumber, + IN PVOID Arguments, + IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + + /* Fixup segments */ + Ke386SetDs(KGDT_R3_DATA | RPL_MASK); + Ke386SetEs(KGDT_R3_DATA | RPL_MASK); + + /* Set up a fake INT Stack and enable interrupts */ + TrapFrame->HardwareSegSs = KGDT_R3_DATA | RPL_MASK; + TrapFrame->HardwareEsp = (ULONG_PTR)Arguments - 8; // Stack is 2 frames down + TrapFrame->EFlags = __readeflags() | EFLAGS_INTERRUPT_MASK; + TrapFrame->SegCs = KGDT_R3_CODE | RPL_MASK; + TrapFrame->Eip = SharedUserData->SystemCallReturn; + __writeeflags(0x2); + + /* Get the current thread */ + Thread = KeGetCurrentThread(); + + /* Call the shared handler (inline) */ + KiSystemCallHandler(TrapFrame, + ServiceNumber, + Arguments, + Thread, + UserMode, + Thread->PreviousMode, + KGDT_R3_TEB | RPL_MASK); } VOID

14 years, 8 months

[sir_richard] 45147: [NTOS]: Convert system call handling to C. Only kernel system calls are done this way for now, not SYSENTER calls from user-mode. A small ASM trampoline is used inline for the call itself.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jan 19 10:20:40 2010 New Revision: 45147 URL: http://svn.reactos.org/svn/reactos?rev=45147&view=rev Log: [NTOS]: Convert system call handling to C. Only kernel system calls are done this way for now, not SYSENTER calls from user-mode. A small ASM trampoline is used inline for the call itself. Modified: 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/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 10:20:40 2010 @@ -111,15 +111,55 @@ while (TRUE); } } + +FORCEINLINE +VOID +KiExitSystemCallDebugChecks(IN ULONG SystemCall, + IN PKTRAP_FRAME TrapFrame) +{ + KIRQL OldIrql; + + /* Check if this was a user call */ + if (KiUserMode(TrapFrame)) + { + /* Make sure we are not returning with elevated IRQL */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql != PASSIVE_LEVEL) + { + /* Forcibly put us in a sane state */ + KeGetPcr()->CurrentIrql = PASSIVE_LEVEL; + _disable(); + + /* Fail */ + KeBugCheckEx(IRQL_GT_ZERO_AT_SYSTEM_SERVICE, + SystemCall, + OldIrql, + 0, + 0); + } + + /* Make sure we're not attached and that APCs are not disabled */ + if ((KeGetCurrentThread()->ApcStateIndex != CurrentApcEnvironment) || + (KeGetCurrentThread()->CombinedApcDisable != 0)) + { + /* Fail */ + KeBugCheckEx(APC_INDEX_MISMATCH, + SystemCall, + KeGetCurrentThread()->ApcStateIndex, + KeGetCurrentThread()->CombinedApcDisable, + 0); + } + } +} #else #define KiExitTrapDebugChecks(x, y) #define KiFillTrapFrameDebug(x) +#define KiExitSystemCallDebugChecks(x, y) #endif // // Helper Code // - BOOLEAN FORCEINLINE KiUserTrap(IN PKTRAP_FRAME TrapFrame) @@ -354,3 +394,45 @@ : "%esp" ); } + +NTSTATUS +FORCEINLINE +KiSystemCallTrampoline(IN PVOID Handler, + IN PVOID Arguments, + IN ULONG StackBytes) +{ + NTSTATUS Result; + + /* + * This sequence does a RtlCopyMemory(Stack - StackBytes, Arguments, StackBytes) + * and then calls the function associated with the system call. + * + * It's done in assembly for two reasons: we need to muck with the stack, + * and the call itself restores the stack back for us. The only way to do + * this in C is to do manual C handlers for every possible number of args on + * the stack, and then have the handler issue a call by pointer. This is + * wasteful since it'll basically push the values twice and require another + * level of call indirection. + * + * The ARM kernel currently does this, but it should probably be changed + * later to function like this as well. + * + */ + __asm__ __volatile__ + ( + "subl %1, %%esp\n" + "movl %%esp, %%edi\n" + "movl %2, %%esi\n" + "shrl $2, %1\n" + "rep movsd\n" + "call *%3\n" + "movl %%eax, %0\n" + : "=r"(Result) + : "c"(StackBytes), + "d"(Arguments), + "r"(Handler) + : "%esp", "%esi", "%edi" + ); + + return Result; +} 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 10:20:40 2010 @@ -66,8 +66,6 @@ .globl _KiSystemService /* And special system-defined software traps: */ -.globl _NtRaiseException@12 -.globl _NtContinue@8 .globl _KiDispatchInterrupt@0 /* Interrupt template entrypoints */ @@ -84,7 +82,6 @@ /* We implement the following trap exit points: */ .globl _Kei386EoiHelper@0 /* Exit from interrupt or H/W trap */ -.globl _Kei386EoiHelper2ndEntry /* Exit from unexpected interrupt */ .globl _KiIdtDescriptor _KiIdtDescriptor: @@ -115,14 +112,20 @@ .text .func KiSystemService -TRAP_FIXUPS kss_a, kss_t, DoNotFixupV86, DoNotFixupAbios _KiSystemService: - /* Enter the shared system call prolog */ - SYSCALL_PROLOG kss_a, kss_t - - /* Jump to the actual handler */ - jmp SharedCode + /* Make space for trap frame on the stack */ + sub esp, KTRAP_FRAME_EIP + + /* Save EBP, EBX, ESI, EDI only! */ + mov [esp+KTRAP_FRAME_EBX], ebx + mov [esp+KTRAP_FRAME_ESI], esi + mov [esp+KTRAP_FRAME_EDI], edi + mov [esp+KTRAP_FRAME_EBP], ebp + + /* Call C handler -- note that EDX is the caller stack, EAX is the ID */ + mov ecx, esp + jmp _KiSystemServiceHandler .endfunc .func KiFastCallEntry 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 10:20:40 2010 @@ -1691,6 +1691,165 @@ KiDebugHandler(TrapFrame, TrapFrame->Eax, TrapFrame->Ecx, TrapFrame->Edx); } +VOID +FASTCALL +KiSystemCall(IN ULONG SystemCallNumber, + IN PVOID Arguments) +{ + PKTHREAD Thread; + PKTRAP_FRAME TrapFrame; + PKSERVICE_TABLE_DESCRIPTOR DescriptorTable; + ULONG Id, Offset, StackBytes, Result; + PVOID Handler; + + /* Loop because we might need to try this twice in case of a GUI call */ + while (TRUE) + { + /* Decode the system call number */ + Offset = (SystemCallNumber >> SERVICE_TABLE_SHIFT) & SERVICE_TABLE_MASK; + Id = SystemCallNumber & SERVICE_NUMBER_MASK; + + /* Get current thread, trap frame, and descriptor table */ + Thread = KeGetCurrentThread(); + TrapFrame = Thread->TrapFrame; + DescriptorTable = (PVOID)((ULONG_PTR)Thread->ServiceTable + Offset); + + /* Validate the system call number */ + if (__builtin_expect(Id > DescriptorTable->Limit, 0)) + { + /* Check if this is a GUI call */ + if (__builtin_expect(!(Offset & SERVICE_TABLE_TEST), 0)) + { + /* Fail the call */ + Result = STATUS_INVALID_SYSTEM_SERVICE; + goto ExitCall; + } + + /* GUI calls are not yet supported */ + UNIMPLEMENTED; + while (TRUE); + + /* Try the call again */ + continue; + } + + /* If we made it here, the call is good */ + break; + } + + /* Check if this is a GUI call */ + if (__builtin_expect(Offset & SERVICE_TABLE_TEST, 0)) + { + /* Get the batch count and flush if necessary */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Increase system call count */ + KeGetCurrentPrcb()->KeSystemCalls++; + + /* FIXME: Increase individual counts on debug systems */ + //KiIncreaseSystemCallCount(DescriptorTable, Id); + + /* Get stack bytes */ + StackBytes = DescriptorTable->Number[Id]; + + /* Probe caller stack */ + if (__builtin_expect((Arguments < (PVOID)MmUserProbeAddress) && !(KiUserTrap(TrapFrame)), 0)) + { + /* Access violation */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Get the handler and make the system call */ + Handler = (PVOID)DescriptorTable->Base[Id]; + Result = KiSystemCallTrampoline(Handler, Arguments, StackBytes); + + /* Make sure we're exiting correctly */ + KiExitSystemCallDebugChecks(Id, TrapFrame); + + /* Restore the old trap frame */ +ExitCall: + Thread->TrapFrame = (PKTRAP_FRAME)TrapFrame->Edx; + + /* Exit from system call */ + KiServiceExit(TrapFrame, Result); +} + +VOID +FORCEINLINE +KiSystemCallHandler(IN PKTRAP_FRAME TrapFrame, + IN ULONG ServiceNumber, + IN PVOID Arguments, + IN PKTHREAD Thread, + IN KPROCESSOR_MODE PreviousMode, + IN KPROCESSOR_MODE PreviousPreviousMode, + IN USHORT SegFs) +{ + /* No error code */ + TrapFrame->ErrCode = 0; + + /* Save previous mode and FS segment */ + TrapFrame->PreviousPreviousMode = PreviousPreviousMode; + TrapFrame->SegFs = SegFs; + + /* Save the SEH chain and terminate it for now */ + TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; + KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END; + + /* Clear DR7 and check for debugging */ + TrapFrame->Dr7 = 0; + if (__builtin_expect(Thread->DispatcherHeader.DebugActive & 0xFF, 0)) + { + UNIMPLEMENTED; + while (TRUE); + } + + /* Set thread fields */ + Thread->TrapFrame = TrapFrame; + Thread->PreviousMode = PreviousMode; + + /* Set debug header */ + KiFillTrapFrameDebug(TrapFrame); + + /* Enable interrupts and make the call */ + _enable(); + KiSystemCall(ServiceNumber, Arguments); +} + +VOID +__attribute__((regparm(3))) +KiSystemServiceHandler(IN ULONG ServiceNumber, + IN PVOID Arguments, + IN PKTRAP_FRAME TrapFrame) +{ + USHORT SegFs; + PKTHREAD Thread; + + /* Save and fixup FS */ + SegFs = Ke386GetFs(); + Ke386SetFs(KGDT_R0_PCR); + + /* Get the current thread */ + Thread = KeGetCurrentThread(); + + /* Chain trap frames */ + TrapFrame->Edx = (ULONG_PTR)Thread->TrapFrame; + + /* Clear direction flag */ + Ke386ClearDirectionFlag(); + + /* Call the shared handler (inline) */ + KiSystemCallHandler(TrapFrame, + ServiceNumber, + Arguments, + Thread, + KiUserTrap(TrapFrame), + Thread->PreviousMode, + SegFs); +} + /* HARDWARE INTERRUPTS ********************************************************/ /*

14 years, 8 months

← Newer
1
...
19
20
21
22
23
24
25
...
53
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 January 2010