Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 49520: [NTOS]: Context switch in C instead of ASM. Can be made more portable, but it's a good start. Unless Timo rewrites it.
by sir_richard＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: sir_richard Date: Mon Nov 8 02:15:53 2010 New Revision: 49520 URL: http://svn.reactos.org/svn/reactos?rev=49520&view=rev Log: [NTOS]: Context switch in C instead of ASM. Can be made more portable, but it's a good start. Unless Timo rewrites it. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thrdini.c 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] Mon Nov 8 02:15:53 2010 @@ -40,284 +40,16 @@ .globl @KiSwapContextInternal@0 .func @KiSwapContextInternal@0, @KiSwapContextInternal@0 @KiSwapContextInternal@0: - - /* Save the IRQL */ - push ecx - -#ifdef CONFIG_SMP -GetSwapLock: - /* Acquire the swap lock */ - cmp byte ptr [esi+KTHREAD_SWAP_BUSY], 0 - jz NotBusy - pause - jmp GetSwapLock -NotBusy: -#endif - /* Increase context switches (use ES for lazy load) */ - inc dword ptr es:[ebx+KPCR_CONTEXT_SWITCHES] - - /* Save the Exception list */ - push [ebx+KPCR_EXCEPTION_LIST] - - /* Check for WMI */ - cmp dword ptr [ebx+KPCR_PERF_GLOBAL_GROUP_MASK], 0 - jnz WmiTrace - -AfterTrace: -#ifdef CONFIG_SMP -#if DBG - /* Assert that we're on the right CPU */ - mov cl, [esi+KTHREAD_NEXT_PROCESSOR] - cmp cl, [ebx+KPCR_PROCESSOR_NUMBER] - jnz WrongCpu -#endif -#endif - - /* Get CR0 and save it */ - mov ebp, cr0 - mov edx, ebp - -#ifdef CONFIG_SMP - /* Check NPX State */ - cmp byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_LOADED - jz NpxLoaded -SetStack: -#endif - - /* Set new stack */ - mov [edi+KTHREAD_KERNEL_STACK], esp - - /* Checking NPX, disable interrupts now */ - mov eax, [esi+KTHREAD_INITIAL_STACK] - cli - - /* Get the NPX State */ - movzx ecx, byte ptr [esi+KTHREAD_NPX_STATE] - - /* Clear the other bits, merge in CR0, merge in FPU CR0 bits and compare */ - and edx, ~(CR0_MP + CR0_EM + CR0_TS) - or ecx, edx - or ecx, [eax - (NPX_FRAME_LENGTH - FN_CR0_NPX_STATE)] - cmp ebp, ecx - jnz NewCr0 - -StackOk: - /* Enable interrupts and set the current stack */ - sti - mov esp, [esi+KTHREAD_KERNEL_STACK] - - /* Check if address space switch is needed */ - mov ebp, [esi+KTHREAD_APCSTATE_PROCESS] - mov eax, [edi+KTHREAD_APCSTATE_PROCESS] - cmp ebp, eax - jz SameProcess - -#ifdef CONFIG_SMP - /* Get the active processors and XOR with the process' */ - mov ecx, [ebx+KPCR_SET_MEMBER_COPY] - lock xor [ebp+KPROCESS_ACTIVE_PROCESSORS], ecx - lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx - - /* Assert change went ok */ -#if DBG - test [ebp+KPROCESS_ACTIVE_PROCESSORS], ecx - jz WrongActiveCpu - test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx - jnz WrongActiveCpu -#endif -#endif - - /* Check if we need an LDT */ - mov ecx, [ebp+KPROCESS_LDT_DESCRIPTOR0] - or ecx, [eax+KPROCESS_LDT_DESCRIPTOR0] - jnz LdtReload - -UpdateCr3: - /* Switch address space */ - mov eax, [ebp+KPROCESS_DIRECTORY_TABLE_BASE] - mov cr3, eax - -SameProcess: - -#ifdef CONFIG_SMP - /* Release swap lock */ - and byte ptr [edi+KTHREAD_SWAP_BUSY], 0 -#endif - - /* Clear gs */ - xor eax, eax - mov gs, ax - - /* Set the TEB */ - mov eax, [esi+KTHREAD_TEB] - mov [ebx+KPCR_TEB], eax - mov ecx, [ebx+KPCR_GDT] - mov [ecx+0x3A], ax - shr eax, 16 - mov [ecx+0x3C], al - mov [ecx+0x3F], ah - - /* Get stack pointer */ - mov eax, [esi+KTHREAD_INITIAL_STACK] - - /* Make space for the NPX Frame */ - sub eax, NPX_FRAME_LENGTH - - /* Check if this isn't V86 Mode, so we can bias the Esp0 */ - test dword ptr [eax - KTRAP_FRAME_SIZE + KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz NoAdjust - - /* Bias esp */ - sub eax, KTRAP_FRAME_V86_GS - KTRAP_FRAME_SS - -NoAdjust: - - /* Set new ESP0 */ - mov ecx, [ebx+KPCR_TSS] - mov [ecx+KTSS_ESP0], eax - - /* Set current IOPM offset in the TSS */ - mov ax, [ebp+KPROCESS_IOPM_OFFSET] - mov [ecx+KTSS_IOMAPBASE], ax - - /* Increase context switches */ - inc dword ptr [esi+KTHREAD_CONTEXT_SWITCHES] - - /* Restore exception list */ - pop [ebx+KPCR_EXCEPTION_LIST] - - /* Restore IRQL */ - pop ecx - - /* DPC shouldn't be active */ - cmp byte ptr [ebx+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 - jnz BugCheckDpc - - /* Check if kernel APCs are pending */ - cmp byte ptr [esi+KTHREAD_PENDING_KERNEL_APC], 0 - jnz CheckApc - - /* No APCs, return */ - xor eax, eax - ret - -CheckApc: - - /* Check if they're disabled */ - cmp word ptr [esi+KTHREAD_SPECIAL_APC_DISABLE], 0 - jnz ApcReturn - test cl, cl - jz ApcReturn - - /* Request APC Delivery */ - mov cl, APC_LEVEL - call @HalRequestSoftwareInterrupt@4 - or eax, esp - -ApcReturn: - - /* Return with APC pending */ - setz al - ret - -LdtReload: - /* Check if it's empty */ - mov eax, [ebp+KPROCESS_LDT_DESCRIPTOR0] - test eax, eax - jz LoadLdt - - /* Write the LDT Selector */ - mov ecx, [ebx+KPCR_GDT] - mov [ecx+KGDT_LDT], eax - mov eax, [ebp+KPROCESS_LDT_DESCRIPTOR1] - mov [ecx+KGDT_LDT+4], eax - - /* Write the INT21 handler */ - mov ecx, [ebx+KPCR_IDT] - mov eax, [ebp+KPROCESS_INT21_DESCRIPTOR0] - mov [ecx+0x108], eax - mov eax, [ebp+KPROCESS_INT21_DESCRIPTOR1] - mov [ecx+0x10C], eax - - /* Save LDT Selector */ - mov eax, KGDT_LDT - -LoadLdt: - lldt ax - jmp UpdateCr3 - -NewCr0: - -#if DBG - /* Assert NPX State */ - test byte ptr [esi+KTHREAD_NPX_STATE], ~(NPX_STATE_NOT_LOADED) - jnz InvalidNpx - test dword ptr [eax - (NPX_FRAME_LENGTH - FN_CR0_NPX_STATE)], ~(CR0_PE + CR0_MP + CR0_EM + CR0_TS) - jnz InvalidNpx -#endif - - /* Update CR0 */ - mov cr0, ecx - jmp StackOk - -#ifdef CONFIG_SMP -NpxLoaded: - - /* Mask out FPU flags */ - and edx, ~(CR0_MP + CR0_EM + CR0_TS) - - /* Get the NPX Frame */ - mov ecx, [edi+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - - /* Check if we have a new CR0 */ - cmp ebp, edx - jz Cr0Equal - - /* We do, update it */ - mov cr0, edx - mov ebp, edx - -Cr0Equal: - - /* Save the NPX State */ - fxsave [ecx] - mov byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - - /* Clear the NPX Thread */ - mov dword ptr [ebx+KPCR_NPX_THREAD], 0 - - /* Jump back */ - jmp SetStack -#endif - -WmiTrace: - - /* No WMI support yet */ - int 3 - - /* Jump back */ - jmp AfterTrace - -BugCheckDpc: - - /* Bugcheck the machine, printing out the threads being switched */ - mov eax, [edi+KTHREAD_INITIAL_STACK] - push 0 - push eax - push esi - push edi - push ATTEMPTED_SWITCH_FROM_DPC - call _KeBugCheckEx@20 - -#if DBG -InvalidNpx: - int 3 -WrongActiveCpu: - int 3 -WrongCpu: - int 3 -#endif + /* Set APC Bypass Disable and old thread pointer */ + mov edx, edi + or dl, cl + + /* Build switch frame */ + sub esp, 2 * 4 + mov ecx, esp + call @KiSwapContextEntry@8 + mov ecx, 0xB00BFACA + jmp $ .endfunc /*++ @@ -511,6 +243,20 @@ jmp $ .endfunc +.globl @KiSwitchThreads@8 +.func @KiSwitchThreads@8, @KiSwitchThreads@8 +@KiSwitchThreads@8: + + /* Load the new kernel stack and switch OS to new thread */ + mov esp, [edx+KTHREAD_KERNEL_STACK] + mov edx, esp + call @KiSwapContextExit@8 + + /* Now we're on the new thread. Return to the caller to restore registers */ + add esp, 2 * 4 + ret +.endfunc + .globl @Ki386BiosCallReturnAddress@4 @Ki386BiosCallReturnAddress@4: Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Mon Nov 8 02:15:53 2010 @@ -41,6 +41,13 @@ KSTART_FRAME StartFrame; FX_SAVE_AREA FxSaveArea; } KKINIT_FRAME, *PKKINIT_FRAME; + +VOID +FASTCALL +KiSwitchThreads( + IN PKTHREAD OldThread, + IN PKTHREAD NewThread +); /* FUNCTIONS *****************************************************************/ @@ -311,4 +318,133 @@ } } +BOOLEAN +FASTCALL +KiSwapContextExit(IN PKTHREAD OldThread, + IN PKSWITCHFRAME SwitchFrame) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPROCESS OldProcess, NewProcess; + PKGDTENTRY GdtEntry; + PKTHREAD NewThread; + PKUINIT_FRAME InitFrame; + + /* We are on the new thread stack now */ + NewThread = Pcr->PrcbData.CurrentThread; + + /* Now we are the new thread. Check if it's in a new process */ + OldProcess = OldThread->ApcState.Process; + NewProcess = NewThread->ApcState.Process; + if (OldProcess != NewProcess) + { + /* Check if there is a different LDT */ + if (*(PULONGLONG)&OldProcess->LdtDescriptor != *(PULONGLONG)&NewProcess->LdtDescriptor) + { + DPRINT1("LDT switch not implemented\n"); + ASSERT(FALSE); + } + + /* Switch address space and flush TLB */ + __writecr3(NewProcess->DirectoryTableBase[0]); + } + + /* Clear GS */ + Ke386SetGs(0); + + /* Set the TEB */ + Pcr->NtTib.Self = (PVOID)NewThread->Teb; + GdtEntry = &Pcr->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)]; + GdtEntry->BaseLow = (USHORT)((ULONG_PTR)NewThread->Teb & 0xFFFF); + GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)NewThread->Teb >> 16); + GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)NewThread->Teb >> 24); + + /* Set new TSS fields */ + InitFrame = (PKUINIT_FRAME)NewThread->InitialStack - 1; + Pcr->TSS->Esp0 = (ULONG_PTR)&InitFrame->TrapFrame; + if (!(InitFrame->TrapFrame.EFlags & EFLAGS_V86_MASK)) + { + Pcr->TSS->Esp0 -= (FIELD_OFFSET(KTRAP_FRAME, V86Gs) - FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs)); + } + Pcr->TSS->IoMapBase = NewProcess->IopmOffset; + + /* Increase thread context switches */ + NewThread->ContextSwitches++; + + /* Load data from switch frame */ + Pcr->NtTib.ExceptionList = SwitchFrame->ExceptionList; + + /* DPCs shouldn't be active */ + if (Pcr->PrcbData.DpcRoutineActive) + { + /* Crash the machine */ + KeBugCheckEx(ATTEMPTED_SWITCH_FROM_DPC, + (ULONG_PTR)OldThread, + (ULONG_PTR)NewThread, + (ULONG_PTR)OldThread->InitialStack, + 0); + } + + /* Kernel APCs may be pending */ + if (NewThread->ApcState.KernelApcPending) + { + /* Are APCs enabled? */ + if (!NewThread->SpecialApcDisable) + { + /* Request APC delivery */ + if (!SwitchFrame->ApcBypassDisable) HalRequestSoftwareInterrupt(APC_LEVEL); + return TRUE; + } + } + + /* Return */ + return FALSE; +} + +VOID +FASTCALL +KiSwapContextEntry(IN PKSWITCHFRAME SwitchFrame, + IN ULONG_PTR OldThreadAndApcFlag) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKTHREAD OldThread, NewThread; + ULONG Cr0, NewCr0; + + /* Switch threads, check for APC disable */ + ASSERT(OldThreadAndApcFlag &~ 1); + + /* Save APC bypass disable */ + SwitchFrame->ApcBypassDisable = OldThreadAndApcFlag & 3; + SwitchFrame->ExceptionList = Pcr->NtTib.ExceptionList; + + /* Increase context switch count and check if tracing is enabled */ + Pcr->ContextSwitches++; + if (Pcr->PerfGlobalGroupMask) + { + /* We don't support this yet on x86 either */ + DPRINT1("WMI Tracing not supported\n"); + ASSERT(FALSE); + } + + /* Get thread pointers */ + OldThread = (PKTHREAD)(OldThreadAndApcFlag & ~3); + NewThread = Pcr->PrcbData.CurrentThread; + + /* Get the old thread and set its kernel stack */ + OldThread->KernelStack = SwitchFrame; + + /* ISRs can change FPU state, so disable interrupts while checking */ + _disable(); + + /* Get current and new CR0 and check if they've changed */ + Cr0 = __readcr0(); + NewCr0 = NewThread->NpxState | + (Cr0 & ~(CR0_MP | CR0_EM | CR0_TS)) | + ((PKUINIT_FRAME)NewThread->InitialStack - 1)->FxSaveArea.Cr0NpxState; + if (Cr0 != NewCr0) __writecr0(NewCr0); + + /* Now enable interrupts and do the switch */ + _enable(); + KiSwitchThreads(OldThread, NewThread); +} + /* EOF */

1 0

[pschweitzer] 49519: [NTOSKRNL] Minor stuff. Here is your commit Timo ; )
by pschweitzer＠svn.reactos.org 08 Nov '10

08 Nov '10

Author: pschweitzer Date: Mon Nov 8 00:31:00 2010 New Revision: 49519 URL: http://svn.reactos.org/svn/reactos?rev=49519&view=rev Log: [NTOSKRNL] Minor stuff. Here is your commit Timo ;) Modified: trunk/reactos/ntoskrnl/fsrtl/faulttol.c Modified: trunk/reactos/ntoskrnl/fsrtl/faulttol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/faulttol.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/faulttol.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/faulttol.c [iso-8859-1] Mon Nov 8 00:31:00 2010 @@ -17,7 +17,7 @@ /*++ * @name FsRtlBalanceReads - * @implemented NT 4.0 + * @implemented NT 5.2 * * The FsRtlBalanceReads routine sends an IRP to an FTDISK Driver * requesting the driver to balance read requests across a mirror set. @@ -65,6 +65,8 @@ KernelMode, FALSE, NULL); + ASSERT(Status == STATUS_SUCCESS); + /* Return Status */ Status = IoStatusBlock.Status; } @@ -75,7 +77,7 @@ /*++ * @name FsRtlSyncVolumes - * @implemented NT 4.0 + * @implemented NT 5.2 * * The FsRtlSyncVolumes routine is deprecated. *

1 0

[spetreolle] 49518: [CMAKE] Add missing files to bootcd.
by spetreolle＠svn.reactos.org 07 Nov '10

07 Nov '10

Author: spetreolle Date: Sun Nov 7 21:24:35 2010 New Revision: 49518 URL: http://svn.reactos.org/svn/reactos?rev=49518&view=rev Log: [CMAKE] Add missing files to bootcd. Added: branches/cmake-bringup/importlibs/libd3d9.a (with props) Modified: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt branches/cmake-bringup/base/setup/welcome/CMakeLists.txt branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt Modified: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:24:35 2010 @@ -14,3 +14,5 @@ msvcrt kernel32 ntdll) + +add_minicd_target(reactos reactos) Modified: branches/cmake-bringup/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom… ============================================================================== --- branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/welcome/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:24:35 2010 @@ -5,3 +5,5 @@ set_module_type(welcome win32gui) add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll) + +add_minicd_target(welcome reactos) Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:24:35 2010 @@ -215,7 +215,9 @@ add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivedef_${ARCH}.inf reactos hivedef.inf) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesft_${ARCH}.inf reactos hivesft.inf) add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesys_${ARCH}.inf reactos hivesys.inf) - +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/autorun.inf "" autorun.inf) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/icon.ico "" icon.ico) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/readme.txt "" readme.txt) # Livecd files list(APPEND LIVECD_HIVES ${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf Modified: branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:24:35 2010 @@ -38,3 +38,5 @@ add_importlibs(ks ntoskrnl hal msvcrt) add_dependencies(ks psdk bugcodes) + +add_cab_target(ks 2) Added: branches/cmake-bringup/importlibs/libd3d9.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libd3d9.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[spetreolle] 49517: [CMAKE] Add remaining Wine directx dlls to bootcd.
by spetreolle＠svn.reactos.org 07 Nov '10

07 Nov '10

Author: spetreolle Date: Sun Nov 7 21:22:31 2010 New Revision: 49517 URL: http://svn.reactos.org/svn/reactos?rev=49517&view=rev Log: [CMAKE] Add remaining Wine directx dlls to bootcd. Added: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMake… ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -12,7 +12,7 @@ add_subdirectory(dplay) add_subdirectory(dplayx) add_subdirectory(dsound) -#add_subdirectory(dsound_new) +#add_subdirectory(dsound_new) #disabled in trunk add_subdirectory(dxdiagn) #add_subdirectory(ksproxy)# undefined reference to `operator new(unsigned int)' add_subdirectory(ksuser) Modified: branches/cmake-bringup/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,24 +1,24 @@ -#add_subdirectory(d3d8) -#add_subdirectory(d3d9) -#add_subdirectory(d3dx9_24) -#add_subdirectory(d3dx9_25) -#add_subdirectory(d3dx9_26) -#add_subdirectory(d3dx9_27) -#add_subdirectory(d3dx9_28) -#add_subdirectory(d3dx9_29) -#add_subdirectory(d3dx9_30) -#add_subdirectory(d3dx9_31) -#add_subdirectory(d3dx9_32) -#add_subdirectory(d3dx9_33) -#add_subdirectory(d3dx9_34) -#add_subdirectory(d3dx9_35) -#add_subdirectory(d3dx9_36) -#add_subdirectory(d3dx9_37) -#add_subdirectory(d3dx9_38) -#add_subdirectory(d3dx9_39) -#add_subdirectory(d3dx9_40) -#add_subdirectory(d3dx9_41) -#add_subdirectory(d3dx9_42) +add_subdirectory(d3d8) +add_subdirectory(d3d9) +add_subdirectory(d3dx9_24) +add_subdirectory(d3dx9_25) +add_subdirectory(d3dx9_26) +add_subdirectory(d3dx9_27) +add_subdirectory(d3dx9_28) +add_subdirectory(d3dx9_29) +add_subdirectory(d3dx9_30) +add_subdirectory(d3dx9_31) +add_subdirectory(d3dx9_32) +add_subdirectory(d3dx9_33) +add_subdirectory(d3dx9_34) +add_subdirectory(d3dx9_35) +add_subdirectory(d3dx9_36) +add_subdirectory(d3dx9_37) +add_subdirectory(d3dx9_38) +add_subdirectory(d3dx9_39) +add_subdirectory(d3dx9_40) +add_subdirectory(d3dx9_41) +add_subdirectory(d3dx9_42) add_subdirectory(ddraw) add_subdirectory(wined3d) Modified: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,4 +1,4 @@ - +set_rc_compiler() set_unicode() add_definitions(-D__WINESRC__) @@ -7,23 +7,23 @@ spec2def(d3d8.dll d3d8.spec) -add_library(d3d8 SHARED +list(APPEND SOURCE + buffer.c cubetexture.c d3d8_main.c device.c directx.c - #indexbuffer.c - #pixelshader.c + shader.c surface.c swapchain.c texture.c - #vertexbuffer.c vertexdeclaration.c - vertexshader.c volume.c volumetexture.c version.rc - ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def) + d3d8.def) + +add_library(d3d8 SHARED ${SOURCE}) set_module_type(d3d8 win32dll) @@ -35,7 +35,10 @@ user32 gdi32 advapi32 - wined3d) + wined3d + msvcrt + kernel32 + ntdll) add_dependencies(d3d8 wineheaders) add_cab_target(d3d8 1) Modified: branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,4 +1,4 @@ - +set_rc_compiler() set_unicode() add_definitions(-D__WINESRC__) @@ -7,25 +7,25 @@ spec2def(d3d9.dll d3d9.spec) -add_library(d3d9 SHARED +list(APPEND SOURCE + buffer.c cubetexture.c d3d9_main.c device.c directx.c - indexbuffer.c - pixelshader.c query.c + shader.c stateblock.c surface.c swapchain.c texture.c - vertexbuffer.c vertexdeclaration.c - vertexshader.c volume.c volumetexture.c version.rc - ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def) + d3d9.def) + +add_library(d3d9 SHARED ${SOURCE}) set_module_type(d3d9 win32dll) @@ -37,7 +37,10 @@ user32 gdi32 advapi32 - wined3d) + wined3d + msvcrt + kernel32 + ntdll) add_dependencies(d3d9 wineheaders) add_cab_target(d3d9 1) Added: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_24.dll d3dx9_24.spec) + +list(APPEND SOURCE + d3dx9_24_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_24.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_24 SHARED ${SOURCE}) +set_module_type(d3dx9_24 win32dll) + +target_link_libraries(d3dx9_24 + wine) + +add_importlibs(d3dx9_24 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_24 wineheaders) +add_cab_target(d3dx9_24 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_25.dll d3dx9_25.spec) + +list(APPEND SOURCE + d3dx9_25_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_25 SHARED ${SOURCE}) +set_module_type(d3dx9_25 win32dll) + +target_link_libraries(d3dx9_25 + wine) + +add_importlibs(d3dx9_25 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_25 wineheaders) +add_cab_target(d3dx9_25 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_26.dll d3dx9_26.spec) + +list(APPEND SOURCE + d3dx9_26_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_26 SHARED ${SOURCE}) +set_module_type(d3dx9_26 win32dll) + +target_link_libraries(d3dx9_26 + wine) + +add_importlibs(d3dx9_26 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_26 wineheaders) +add_cab_target(d3dx9_26 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_27.dll d3dx9_27.spec) + +list(APPEND SOURCE + d3dx9_27_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_27 SHARED ${SOURCE}) +set_module_type(d3dx9_27 win32dll) + +target_link_libraries(d3dx9_27 + wine) + +add_importlibs(d3dx9_27 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_27 wineheaders) +add_cab_target(d3dx9_27 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_28.dll d3dx9_28.spec) + +list(APPEND SOURCE + d3dx9_28_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_28 SHARED ${SOURCE}) +set_module_type(d3dx9_28 win32dll) + +target_link_libraries(d3dx9_28 + wine) + +add_importlibs(d3dx9_28 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_28 wineheaders) +add_cab_target(d3dx9_28 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_29.dll d3dx9_29.spec) + +list(APPEND SOURCE + d3dx9_29_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_29 SHARED ${SOURCE}) +set_module_type(d3dx9_29 win32dll) + +target_link_libraries(d3dx9_29 + wine) + +add_importlibs(d3dx9_29 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_29 wineheaders) +add_cab_target(d3dx9_29 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_30.dll d3dx9_30.spec) + +list(APPEND SOURCE + d3dx9_30_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_30 SHARED ${SOURCE}) +set_module_type(d3dx9_30 win32dll) + +target_link_libraries(d3dx9_30 + wine) + +add_importlibs(d3dx9_30 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_30 wineheaders) +add_cab_target(d3dx9_30 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_31.dll d3dx9_31.spec) + +list(APPEND SOURCE + d3dx9_31_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_31 SHARED ${SOURCE}) +set_module_type(d3dx9_31 win32dll) + +target_link_libraries(d3dx9_31 + wine) + +add_importlibs(d3dx9_31 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_31 wineheaders) +add_cab_target(d3dx9_31 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_32.dll d3dx9_32.spec) + +list(APPEND SOURCE + d3dx9_32_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_32 SHARED ${SOURCE}) +set_module_type(d3dx9_32 win32dll) + +target_link_libraries(d3dx9_32 + wine) + +add_importlibs(d3dx9_32 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_32 wineheaders) +add_cab_target(d3dx9_32 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_33.dll d3dx9_33.spec) + +list(APPEND SOURCE + d3dx9_33_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_33 SHARED ${SOURCE}) +set_module_type(d3dx9_33 win32dll) + +target_link_libraries(d3dx9_33 + wine) + +add_importlibs(d3dx9_33 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_33 wineheaders) +add_cab_target(d3dx9_33 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_34.dll d3dx9_34.spec) + +list(APPEND SOURCE + d3dx9_34_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_34 SHARED ${SOURCE}) +set_module_type(d3dx9_34 win32dll) + +target_link_libraries(d3dx9_34 + wine) + +add_importlibs(d3dx9_34 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_34 wineheaders) +add_cab_target(d3dx9_34 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_35.dll d3dx9_35.spec) + +list(APPEND SOURCE + d3dx9_35_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_35.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_35 SHARED ${SOURCE}) +set_module_type(d3dx9_35 win32dll) + +target_link_libraries(d3dx9_35 + wine) + +add_importlibs(d3dx9_35 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_35 wineheaders) +add_cab_target(d3dx9_35 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,40 @@ +set_rc_compiler() + +spec2def(d3dx9_36.dll d3dx9_36.spec) + +list(APPEND SOURCE + core.c + d3dx9_36_main.c + font.c + math.c + mesh.c + shader.c + sprite.c + surface.c + texture.c + util.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_36.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_36 SHARED ${SOURCE}) +set_module_type(d3dx9_36 win32dll) + +target_link_libraries(d3dx9_36 + wine) + +add_importlibs(d3dx9_36 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_36 wineheaders) +add_cab_target(d3dx9_36 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_36/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_37.dll d3dx9_37.spec) + +list(APPEND SOURCE + d3dx9_37_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_37.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_37 SHARED ${SOURCE}) +set_module_type(d3dx9_37 win32dll) + +target_link_libraries(d3dx9_37 + wine) + +add_importlibs(d3dx9_37 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_37 wineheaders) +add_cab_target(d3dx9_37 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_38.dll d3dx9_38.spec) + +list(APPEND SOURCE + d3dx9_38_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_38.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_38 SHARED ${SOURCE}) +set_module_type(d3dx9_38 win32dll) + +target_link_libraries(d3dx9_38 + wine) + +add_importlibs(d3dx9_38 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_38 wineheaders) +add_cab_target(d3dx9_38 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_39.dll d3dx9_39.spec) + +list(APPEND SOURCE + d3dx9_39_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_39.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_39 SHARED ${SOURCE}) +set_module_type(d3dx9_39 win32dll) + +target_link_libraries(d3dx9_39 + wine) + +add_importlibs(d3dx9_39 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_39 wineheaders) +add_cab_target(d3dx9_39 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_40.dll d3dx9_40.spec) + +list(APPEND SOURCE + d3dx9_40_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_40.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_40 SHARED ${SOURCE}) +set_module_type(d3dx9_40 win32dll) + +target_link_libraries(d3dx9_40 + wine) + +add_importlibs(d3dx9_40 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_40 wineheaders) +add_cab_target(d3dx9_40 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_41.dll d3dx9_41.spec) + +list(APPEND SOURCE + d3dx9_41_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_41.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_41 SHARED ${SOURCE}) +set_module_type(d3dx9_41 win32dll) + +target_link_libraries(d3dx9_41 + wine) + +add_importlibs(d3dx9_41 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_41 wineheaders) +add_cab_target(d3dx9_41 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -1,0 +1,31 @@ +set_rc_compiler() + +spec2def(d3dx9_42.dll d3dx9_42.spec) + +list(APPEND SOURCE + d3dx9_42_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_42.def) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_library(d3dx9_42 SHARED ${SOURCE}) +set_module_type(d3dx9_42 win32dll) + +target_link_libraries(d3dx9_42 + wine) + +add_importlibs(d3dx9_42 + d3d9 + user32 + gdi32 + advapi32 + wined3d + msvcrt + kernel32 + ntdll) + +add_dependencies(d3dx9_42 wineheaders) +add_cab_target(d3dx9_42 1) Propchange: branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -34,7 +34,6 @@ set_module_type(ddraw win32dll) target_link_libraries(ddraw - ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def wine uuid dxguid @@ -49,4 +48,6 @@ msvcrt kernel32 ntdll) - + +add_dependencies(ddraw wineheaders) +add_cab_target(ddraw 1) Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… ============================================================================== --- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Sun Nov 7 21:22:31 2010 @@ -70,4 +70,5 @@ ntdll) add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) +add_dependencies(wined3d wineheaders) add_cab_target(wined3d 1)

1 0

[tkreuzer] 49516: [CRT] In streamout(): fix a number of formatting bugs, round floats, fix issue with large unsigned values that were treated as signed, simplify some code.
by tkreuzer＠svn.reactos.org 07 Nov '10

07 Nov '10

Author: tkreuzer Date: Sun Nov 7 10:06:00 2010 New Revision: 49516 URL: http://svn.reactos.org/svn/reactos?rev=49516&view=rev Log: [CRT] In streamout(): fix a number of formatting bugs, round floats, fix issue with large unsigned values that were treated as signed, simplify some code. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sun Nov 7 10:06:00 2010 @@ -145,7 +145,7 @@ } /* CHECKME: Windows seems to handle a max of 17 digits(?) */ - num_digits = precision <= 17 ? precision : 17; + num_digits = precision <= 17 ? precision: 17; /* Handle sign */ if (fpval < 0) @@ -173,20 +173,19 @@ } else { - val64 = (__int64)fpval; - fpval -= val64; fpval *= pow(10., precision); + val64 = (__int64)(fpval + 0.5); - while (num_digits--) - { - *--(*string) = digits[(__int64)fpval % 10]; - fpval /= 10; + while (num_digits-- > 0) + { + *--(*string) = digits[val64 % 10]; + val64 /= 10; } } *--(*string) = _T('.'); - /* Gather digits in reverse order */ + /* Digits before the decimal point */ do { *--(*string) = digits[val64 % base]; @@ -286,7 +285,7 @@ int base, len, prefixlen, fieldwidth, precision, padding; int written = 1, written_all = 0; unsigned int flags; - __int64 val64; + unsigned __int64 val64; buffer[BUFFER_SIZE] = '\0'; @@ -297,8 +296,9 @@ /* Check for end of format string */ if (chr == _T('\0')) break; - /* Check for 'normal' character */ - if (chr != _T('%')) + /* Check for 'normal' character or double % */ + if ((chr != _T('%')) || + (chr = *format++) == _T('%')) { /* Write the character to the stream */ if ((written = streamout_char(stream, chr)) == -1) return -1; @@ -306,26 +306,17 @@ continue; } - /* Check for escaped % character */ - if (*format == _T('%')) - { - /* Write % to the stream */ - if ((written = streamout_char(stream, _T('%'))) == -1) return -1; - written_all += written; - continue; - } - /* Handle flags */ flags = 0; while (1) { - chr = *format++; if (chr == _T('-')) flags |= FLAG_ALIGN_LEFT; else if (chr == _T('+')) flags |= FLAG_FORCE_SIGN; else if (chr == _T(' ')) flags |= FLAG_FORCE_SIGNSP; else if (chr == _T('0')) flags |= FLAG_PAD_ZERO; else if (chr == _T('#')) flags |= FLAG_SPECIAL; else break; + chr = *format++; } /* Handle field width modifier */ @@ -505,13 +496,14 @@ /* Use external function, one for kernel one for user mode */ format_float(chr, flags, precision, &string, &prefix, &argptr); len = _tcslen(string); + precision = 0; break; case _T('d'): case _T('i'): - val64 = va_arg_f(argptr, flags); - - if (val64 < 0) + val64 = (__int64)va_arg_f(argptr, flags); + + if ((__int64)val64 < 0) { val64 = -val64; prefix = _T("-"); @@ -526,11 +518,8 @@ case _T('o'): base = 8; if (flags & FLAG_SPECIAL) prefix = _T("0"); + goto case_unsigned; /* Fall through */ - - case _T('u'): - val64 = (unsigned __int64)va_arg_fu(argptr, flags); - goto case_number; case _T('p'): precision = 2 * sizeof(void*); @@ -543,12 +532,15 @@ /* Fall through */ case _T('x'): - val64 = (unsigned __int64)va_arg_fu(argptr, flags); base = 16; if (flags & FLAG_SPECIAL) { prefix = &digits[16]; } + + case _T('u'): + case_unsigned: + val64 = va_arg_fu(argptr, flags); case_number: #ifdef _UNICODE @@ -556,14 +548,15 @@ #else flags &= ~FLAG_WIDECHAR; #endif + if (precision < 0) precision = 1; + /* Gather digits in reverse order */ - do + while (val64) { *--string = digits[val64 % base]; val64 /= base; precision--; } - while (val64); len = _tcslen(string); break; @@ -578,11 +571,12 @@ prefixlen = prefix ? _tcslen(prefix) : 0; if (precision < 0) precision = 0; padding = fieldwidth - len - prefixlen - precision; + if (padding < 0) padding = 0; /* Optional left space padding */ if ((flags & (FLAG_ALIGN_LEFT | FLAG_PAD_ZERO)) == 0) { - while (padding-- > 0) + for (; padding > 0; padding--) { if ((written = streamout_char(stream, _T(' '))) == -1) return -2; written_all += written;

1 0

[janderwald] 49515: [PORTCLS] - Enable property handler
by janderwald＠svn.reactos.org 07 Nov '10

07 Nov '10

Author: janderwald Date: Sun Nov 7 09:16:31 2010 New Revision: 49515 URL: http://svn.reactos.org/svn/reactos?rev=49515&view=rev Log: [PORTCLS] - Enable property handler Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/wdm/audio… ============================================================================== --- branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ branches/audio-bringup/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sun Nov 7 09:16:31 2010 @@ -275,10 +275,10 @@ // now call the handler UNICODE_STRING GuidBuffer; RtlStringFromGUID(Property->Set, &GuidBuffer); - DPRINT1("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p\n", + DPRINT1("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p PropertyItemFlags %lx PropertyItemId %lu\n", PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize, - PropertyRequest->PropertyItem->Handler, PropertyRequest); -#if 0 + PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id); +#if 1 Status = PropertyRequest->PropertyItem->Handler(PropertyRequest); #else Status = STATUS_NOT_FOUND;

1 0

[tkreuzer] 49514: [CRT] In streamout() handle %%, negative fieldwidth and negative precision.
by tkreuzer＠svn.reactos.org 07 Nov '10

07 Nov '10

Author: tkreuzer Date: Sun Nov 7 00:59:41 2010 New Revision: 49514 URL: http://svn.reactos.org/svn/reactos?rev=49514&view=rev Log: [CRT] In streamout() handle %%, negative fieldwidth and negative precision. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sun Nov 7 00:59:41 2010 @@ -97,7 +97,8 @@ int num_digits, val32, base = 10; __int64 val64; - if (precision == -1) precision = 6; + if (precision < 0) precision = 6; + else if (precision > 512) precision = 512; fpval = va_arg_ffp(*argptr, flags); exponent = get_exp(fpval); @@ -302,7 +303,15 @@ /* Write the character to the stream */ if ((written = streamout_char(stream, chr)) == -1) return -1; written_all += written; - /* Continue with next char */ + continue; + } + + /* Check for escaped % character */ + if (*format == _T('%')) + { + /* Write % to the stream */ + if ((written = streamout_char(stream, _T('%'))) == -1) return -1; + written_all += written; continue; } @@ -323,6 +332,11 @@ if (chr == _T('*')) { fieldwidth = va_arg(argptr, int); + if (fieldwidth < 0) + { + flags |= FLAG_ALIGN_LEFT; + fieldwidth = -fieldwidth; + } chr = *format++; } else

1 0

[tkreuzer] 49513: [CRT] Fix a bug in streamout(), that could cause a buffer overrun and made msvcrt_winetest crash.
by tkreuzer＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: tkreuzer Date: Sat Nov 6 23:03:22 2010 New Revision: 49513 URL: http://svn.reactos.org/svn/reactos?rev=49513&view=rev Log: [CRT] Fix a bug in streamout(), that could cause a buffer overrun and made msvcrt_winetest crash. Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sat Nov 6 23:03:22 2010 @@ -551,7 +551,6 @@ } while (val64); - while (precision-- > 0) *--string = '0'; len = _tcslen(string); break; @@ -563,7 +562,8 @@ /* Calculate padding */ prefixlen = prefix ? _tcslen(prefix) : 0; - padding = fieldwidth - len - prefixlen; + if (precision < 0) precision = 0; + padding = fieldwidth - len - prefixlen - precision; /* Optional left space padding */ if ((flags & (FLAG_ALIGN_LEFT | FLAG_PAD_ZERO)) == 0) @@ -584,13 +584,11 @@ } /* Optional left '0' padding */ - if ((flags & (FLAG_ALIGN_LEFT | FLAG_PAD_ZERO)) == FLAG_PAD_ZERO) - { - while (padding-- > 0) - { - if ((written = streamout_char(stream, _T('0'))) == -1) return -4; - written_all += written; - } + if ((flags & FLAG_ALIGN_LEFT) == 0) precision += padding; + while (precision-- > 0) + { + if ((written = streamout_char(stream, _T('0'))) == -1) return -4; + written_all += written; } /* Output the string */

1 0

[akhaldi] 49512: [SPRINTF] - Don't compile the new sprintf by default. Requested by Timo.
by akhaldi＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: akhaldi Date: Sat Nov 6 15:38:43 2010 New Revision: 49512 URL: http://svn.reactos.org/svn/reactos?rev=49512&view=rev Log: [SPRINTF] - Don't compile the new sprintf by default. Requested by Timo. Modified: trunk/reactos/config.template.rbuild Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Sat Nov 6 15:38:43 2010 @@ -107,6 +107,6 @@  -<property name="NEWSPRINTF" value="1" /> +<property name="NEWSPRINTF" value="0" /> </group>

1 0

[janderwald] 49511: - merge audio headers
by janderwald＠svn.reactos.org 06 Nov '10

06 Nov '10

Author: janderwald Date: Sat Nov 6 12:10:50 2010 New Revision: 49511 URL: http://svn.reactos.org/svn/reactos?rev=49511&view=rev Log: - merge audio headers Added: branches/audio-bringup/include/ddk/dmusprop.h - copied unchanged from r49509, trunk/reactos/include/ddk/dmusprop.h Modified: branches/audio-bringup/include/ (props changed) branches/audio-bringup/include/ddk/dmusicks.h branches/audio-bringup/include/ddk/portcls.h branches/audio-bringup/include/psdk/ks.h branches/audio-bringup/include/psdk/ksmedia.h branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h Propchange: branches/audio-bringup/include/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Nov 6 12:10:50 2010 @@ -1,0 +1,5 @@ +/branches/header-work/include:45691-47721 +/branches/reactos-yarotows/include:46372,46848,46966,47800,48026,48064 +/branches/ros-amd64-bringup/include:36852 +/branches/ros-amd64-bringup/reactos/include:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos/include:49194-49509 Modified: branches/audio-bringup/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/ddk/dmusi… ============================================================================== --- branches/audio-bringup/include/ddk/dmusicks.h [iso-8859-1] (original) +++ branches/audio-bringup/include/ddk/dmusicks.h [iso-8859-1] Sat Nov 6 12:10:50 2010 @@ -1,5 +1,7 @@ #ifndef _DMUSICKS_ #define _DMUSICKS_ + +#include <dmusprop.h> #define DONT_HOLD_FOR_SEQUENCING 0x8000000000000000 @@ -230,4 +232,35 @@ IN PMASTERCLOCK MasterClock, \ OUT PULONGLONG SchedulePreFetch) + +#define STATIC_KSAUDFNAME_DMUSIC_MPU_OUT\ + 0xA4DF0EB5, 0xBAC9, 0x11d2, {0xB7, 0xA8, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1} +DEFINE_GUIDSTRUCT("A4DF0EB5-BAC9-11d2-B7A8-0060083316C1", KSAUDFNAME_DMUSIC_MPU_OUT); +#define KSAUDFNAME_DMUSIC_MPU_OUT DEFINE_GUIDNAMED(KSAUDFNAME_DMUSIC_MPU_OUT) + +#define STATIC_KSAUDFNAME_DMUSIC_MPU_IN\ + 0xB2EC0A7D, 0xBAC9, 0x11d2, {0xB7, 0xA8, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1} +DEFINE_GUIDSTRUCT("B2EC0A7D-BAC9-11d2-B7A8-0060083316C1", KSAUDFNAME_DMUSIC_MPU_IN); +#define KSAUDFNAME_DMUSIC_MPU_IN DEFINE_GUIDNAMED(KSAUDFNAME_DMUSIC_MPU_IN) + +#define STATIC_IID_IMXF\ + 0xc096df9e, 0xfb09, 0x11d1, {0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1} +DEFINE_GUIDSTRUCT("c096df9e-fb09-11d1-81b0-0060083316c1", IID_IMXF); +#define IID_IMXF DEFINE_GUIDNAMED(IID_IMXF) + +#define DMUS_KEF_EVENT_COMPLETE 0x0000 +#define DMUS_KEF_EVENT_INCOMPLETE 0x0001 +#define DMUS_KEF_PACKAGE_EVENT 0x0002 +#define kBytePositionNone (~(ULONGLONG)0) + +#define SHORT_EVT(evt) ((evt)->cbEvent <= sizeof(PBYTE)) +#define PACKAGE_EVT(evt) ((evt)->usFlags & DMUS_KEF_PACKAGE_EVENT) +#define INCOMPLETE_EVT(evt) ((evt)->usFlags & DMUS_KEF_EVENT_INCOMPLETE) +#define COMPLETE_EVT(evt) (((evt)->usFlags & DMUS_KEF_EVENT_INCOMPLETE) == 0) + +#define SET_INCOMPLETE_EVT(evt) ((evt)->usFlags |= DMUS_KEF_EVENT_INCOMPLETE) +#define SET_COMPLETE_EVT(evt) ((evt)->usFlags &= (~DMUS_KEF_EVENT_INCOMPLETE)) +#define SET_PACKAGE_EVT(evt) ((evt)->usFlags |= DMUS_KEF_PACKAGE_EVENT) +#define CLEAR_PACKAGE_EVT(evt) ((evt)->usFlags &= (~DMUS_KEF_PACKAGE_EVENT)) + #endif /* _DMUSICKS_ */ Modified: branches/audio-bringup/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/ddk/portc… ============================================================================== --- branches/audio-bringup/include/ddk/portcls.h [iso-8859-1] (original) +++ branches/audio-bringup/include/ddk/portcls.h [iso-8859-1] Sat Nov 6 12:10:50 2010 @@ -1958,6 +1958,12 @@ typedef IPowerNotify *PPOWERNOTIFY; +#define IMP_IPowerNotify\ + STDMETHODIMP_(void) PowerChangeNotify\ + ( IN POWER_STATE PowerState\ + ) + + #undef INTERFACE /* =============================================================== @@ -2158,6 +2164,11 @@ #undef INTERFACE +#if (NTDDI_VERSION >= NTDDI_WINXP) +DEFINE_GUID(IID_IMusicTechnology, +0x80396C3CL, 0xCBCB, 0x409B, 0x9F, 0x65, 0x4F, 0x1E, 0x74, 0x67, 0xCD, 0xAF); +#endif + /* =============================================================== IDmaOperations Interface */ @@ -2364,6 +2375,10 @@ PcGetTimeInterval( IN ULONGLONG Since); +#define GTI_SECONDS(t) (ULONGLONG(t)*10000000) +#define GTI_MILLISECONDS(t) (ULONGLONG(t)*10000) +#define GTI_MICROSECONDS(t) (ULONGLONG(t)*10) + PORTCLASSAPI NTSTATUS NTAPI PcRegisterSubdevice( IN PDEVICE_OBJECT DeviceObject, Modified: branches/audio-bringup/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/psdk/ks.h… ============================================================================== --- branches/audio-bringup/include/psdk/ks.h [iso-8859-1] (original) +++ branches/audio-bringup/include/psdk/ks.h [iso-8859-1] Sat Nov 6 12:10:50 2010 @@ -1005,11 +1005,6 @@ KSPROPERTY_DIRECTSOUND3DLISTENER_VELOCITY */ -#define KSPROPSETID_DrmAudioStream -/* - KSPROPERTY_DRMAUDIOSTREAM_CONTENTID -*/ - #define KSPROPSETID_Hrtf3d /* KSPROPERTY_HRTF3D_FILTER_FORMAT @@ -1020,28 +1015,6 @@ #define KSPROPSETID_Itd3d /* KSPROPERTY_ITD3D_PARAMS -*/ - -#define KSPROPSETID_Synth -/* - KSPROPERTY_SYNTH_CAPS - KSPROPERTY_SYNTH_CHANNELGROUPS - KSPROPERTY_SYNTH_LATENCYCLOCK - KSPROPERTY_SYNTH_MASTERCLOCK - KSPROPERTY_SYNTH_PORTPARAMETERS - KSPROPERTY_SYNTH_RUNNINGSTATS - KSPROPERTY_SYNTH_VOICEPRIORITY - KSPROPERTY_SYNTH_VOLUME - KSPROPERTY_SYNTH_VOLUMEBOOST -*/ - -#define KSPROPSETID_Synth_Dls -/* - KSPROPERTY_SYNTH_DLS_APPEND - KSPROPERTY_SYNTH_DLS_COMPACT - KSPROPERTY_SYNTH_DLS_DOWNLOAD - KSPROPERTY_SYNTH_DLS_UNLOAD - KSPROPERTY_SYNTH_DLS_WAVEFORMAT */ #define KSPROPSETID_TopologyNode Modified: branches/audio-bringup/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/psdk/ksme… ============================================================================== --- branches/audio-bringup/include/psdk/ksmedia.h [iso-8859-1] (original) +++ branches/audio-bringup/include/psdk/ksmedia.h [iso-8859-1] Sat Nov 6 12:10:50 2010 @@ -565,6 +565,15 @@ #endif // !_NTDDK_ } LOOPEDSTREAMING_POSITION_EVENT_DATA, *PLOOPEDSTREAMING_POSITION_EVENT_DATA ; +#define STATIC_KSPROPSETID_DrmAudioStream\ + 0x2f2c8ddd, 0x4198, 0x4fac, 0xba, 0x29, 0x61, 0xbb, 0x5, 0xb7, 0xde, 0x6 +DEFINE_GUIDSTRUCT("2F2C8DDD-4198-4fac-BA29-61BB05B7DE06", KSPROPSETID_DrmAudioStream); +#define KSPROPSETID_DrmAudioStream DEFINE_GUIDNAMED(KSPROPSETID_DrmAudioStream) + +typedef enum { + KSPROPERTY_DRMAUDIOSTREAM_CONTENTID +} KSPROPERTY_DRMAUDIOSTREAM; + /* SysAudio Properties @@ -677,4 +686,52 @@ ULONG Accuracy; } KSRTAUDIO_HWREGISTER, *PKSRTAUDIO_HWREGISTER; +#define KSNODEPIN_STANDARD_IN 1 +#define KSNODEPIN_STANDARD_OUT 0 + +#define KSNODEPIN_SUM_MUX_IN 1 +#define KSNODEPIN_SUM_MUX_OUT 0 + +#define KSNODEPIN_DEMUX_IN 0 +#define KSNODEPIN_DEMUX_OUT 1 + +#if (NTDDI_VERSION < NTDDI_VISTA) + +#define KSNODEPIN_AEC_RENDER_IN 1 +#define KSNODEPIN_AEC_RENDER_OUT 0 +#define KSNODEPIN_AEC_CAPTURE_IN 2 +#define KSNODEPIN_AEC_CAPTURE_OUT 3 + #endif + + +#define STATIC_KSMUSIC_TECHNOLOGY_PORT\ + 0x86C92E60L, 0x62E8, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} +DEFINE_GUIDSTRUCT("86C92E60-62E8-11CF-A5D6-28DB04C10000", KSMUSIC_TECHNOLOGY_PORT); +#define KSMUSIC_TECHNOLOGY_PORT DEFINE_GUIDNAMED(KSMUSIC_TECHNOLOGY_PORT) + +#define STATIC_KSDATAFORMAT_SUBTYPE_MIDI_BUS\ + 0x2CA15FA0L, 0x6CFE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} +DEFINE_GUIDSTRUCT("2CA15FA0-6CFE-11CF-A5D6-28DB04C10000", KSDATAFORMAT_SUBTYPE_MIDI_BUS); +#define KSDATAFORMAT_SUBTYPE_MIDI_BUS DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI_BUS) + +#define STATIC_KSAUDFNAME_MIDI\ + 0x185FEDF8L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDF8-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIDI); +#define KSAUDFNAME_MIDI DEFINE_GUIDNAMED(KSAUDFNAME_MIDI) + +#define STATIC_KSNODETYPE_SYNTHESIZER\ + DEFINE_USB_TERMINAL_GUID(0x0713) +DEFINE_GUIDSTRUCT("DFF220F3-F70F-11D0-B917-00A0C9223196", KSNODETYPE_SYNTHESIZER); +#define KSNODETYPE_SYNTHESIZER DEFINE_GUIDNAMED(KSNODETYPE_SYNTHESIZER) + +typedef struct +{ + KSDATARANGE DataRange; + GUID Technology; + ULONG Channels; + ULONG Notes; + ULONG ChannelMask; +} KSDATARANGE_MUSIC, *PKSDATARANGE_MUSIC; + +#endif Modified: branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/include/reactos/l… ============================================================================== --- branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original) +++ branches/audio-bringup/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sat Nov 6 12:10:50 2010 @@ -68,7 +68,7 @@ SND_TRACE(L"-- Current wave header list --\n"); \ while ( CurrDumpHdr ) \ { \ - SND_TRACE(L"%x | %d bytes | flags: %x\n", CurrDumpHdr->lpData, \ + SND_TRACE(L"%x | %d bytes | flags: %x\n", CurrDumpHdr, \ CurrDumpHdr->dwBufferLength, \ CurrDumpHdr->dwFlags); \ CurrDumpHdr = CurrDumpHdr->lpNext; \ @@ -364,6 +364,8 @@ WAVEFORMATEX WaveFormatEx; HANDLE hNotifyEvent; HANDLE hStopEvent; + HANDLE hResetEvent; + BOOL ResetInProgress; } SOUND_DEVICE_INSTANCE, *PSOUND_DEVICE_INSTANCE; /* This lives in WAVEHDR.reserved */ @@ -411,7 +413,7 @@ IN DWORD CapabilitiesSize); MMRESULT -MmeOpenWaveDevice( +MmeOpenDevice( IN MMDEVICE_TYPE DeviceType, IN UINT DeviceId, IN LPWAVEOPENDESC OpenParameters,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs