Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 26371: add cryptui.dll (stubbed) needed by SmartFTP
by cwittich＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: cwittich Date: Tue Apr 17 17:02:53 2007 New Revision: 26371 URL: http://svn.reactos.org/svn/reactos?rev=26371&view=rev Log: add cryptui.dll (stubbed) needed by SmartFTP Added: trunk/reactos/dll/win32/cryptui/ trunk/reactos/dll/win32/cryptui/cryptui.c trunk/reactos/dll/win32/cryptui/cryptui.def trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/include/psdk/cryptuiapi.h Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=263… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Tue Apr 17 17:02:53 2007 @@ -61,6 +61,7 @@ <property name="BASEADDRESS_NETAPI32" value="0x71c00000" /> <property name="BASEADDRESS_DPLAY" value="0x71e80000" /> <property name="BASEADDRESS_SECURITY" value="0x71f10000" /> + <property name="BASEADDRESS_CRYPTUI" value="0x720D0000" /> <property name="BASEADDRESS_WINFAX" value="0x722C0000" /> <property name="BASEADDRESS_WINSCARD" value="0x723d0000" /> <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> Added: trunk/reactos/dll/win32/cryptui/cryptui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.c (added) +++ trunk/reactos/dll/win32/cryptui/cryptui.c Tue Apr 17 17:02:53 2007 @@ -1,0 +1,43 @@ +/* $Id: dllmain.c 21873 2006-05-10 08:41:27Z cwittich $ +* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS system libraries +* FILE: dll/win32/crypui/cryptui.c +* PURPOSE: Library main function +* PROGRAMMER: Christoph von Wittich +* UPDATE HISTORY: +* +*/ + +#include <windows.h> +#include <cryptuiapi.h> + +#define NDEBUG +#include <debug.h> + +INT STDCALL +DllMain(PVOID hinstDll, + ULONG dwReason, + PVOID reserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +BOOL +WINAPI +CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr) +{ + UNIMPLEMENTED + return FALSE; +} + + +/* EOF */ Added: trunk/reactos/dll/win32/cryptui/cryptui.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.def (added) +++ trunk/reactos/dll/win32/cryptui/cryptui.def Tue Apr 17 17:02:53 2007 @@ -1,0 +1,10 @@ +; $Id: advapi32.def 24529 2006-10-15 19:58:57Z weiden $ +; +; cryptui.def +; +; ReactOS Operating System +; +LIBRARY cryptui.dll +EXPORTS +CryptUIDlgCertMgr@4 +; EOF Added: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild (added) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild Tue Apr 17 17:02:53 2007 @@ -1,0 +1,13 @@ +<module name="cryptui" type="win32dll" baseaddress="${BASEADDRESS_CRYPTUI}" installbase="system32" installname="cryptui.dll" allowwarnings="true"> + <importlibrary definition="cryptui.def" /> + <include base="cryptui">.</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>cryptui.c</file> +</module> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Apr 17 17:02:53 2007 @@ -49,6 +49,9 @@ <directory name="cryptdll"> <xi:include href="cryptdll/cryptdll.rbuild" /> </directory> +<directory name="cryptui"> + <xi:include href="cryptui/cryptui.rbuild" /> +</directory> <directory name="dbghelp"> <xi:include href="dbghelp/dbghelp.rbuild" /> </directory> Added: trunk/reactos/include/psdk/cryptuiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptuiapi.h?… ============================================================================== --- trunk/reactos/include/psdk/cryptuiapi.h (added) +++ trunk/reactos/include/psdk/cryptuiapi.h Tue Apr 17 17:02:53 2007 @@ -1,0 +1,13 @@ + +typedef struct _CRYPTUI_CERT_MGR_STRUCT { + DWORD dwSize; + HWND hwndParent; + DWORD dwFlags; + LPCWSTR pwszTitle; + LPCSTR pszInitUsageOID; +} CRYPTUI_CERT_MGR_STRUCT, + *PCRYPTUI_CERT_MGR_STRUCT; + +typedef const CRYPTUI_CERT_MGR_STRUCT *PCCRYPTUI_CERT_MGR_STRUCT; + +BOOL WINAPI CryptUIDlgCertMgr(PCCRYPTUI_CERT_MGR_STRUCT pCryptUICertMgr);

1 0

[cwittich] 26370: implemented DrawCaptionTempA/W (NtUserDrawCaptionTemp is still missing)
by cwittich＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: cwittich Date: Tue Apr 17 15:27:42 2007 New Revision: 26370 URL: http://svn.reactos.org/svn/reactos?rev=26370&view=rev Log: implemented DrawCaptionTempA/W (NtUserDrawCaptionTemp is still missing) Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Tue Apr 17 15:27:42 2007 @@ -1102,13 +1102,13 @@ } /* - * @unimplemented + * @implemented */ BOOL STDCALL DrawCaptionTempW( - HWND hwnd, - HDC hdc, + HWND hWnd, + HDC hDC, const RECT *rect, HFONT hFont, HICON hIcon, @@ -1116,12 +1116,11 @@ UINT uFlags ) { - UNIMPLEMENTED; - return FALSE; + return NtUserDrawCaptionTemp(hWnd, hDC, rect, hFont, hIcon, str, uFlags); } /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -1135,8 +1134,21 @@ UINT uFlags ) { - UNIMPLEMENTED; - return FALSE; + LPWSTR strW; + INT len; + BOOL ret = FALSE; + + if (!(uFlags & DC_TEXT) || !str) + return DrawCaptionTempW(hwnd, hdc, rect, hFont, hIcon, NULL, uFlags); + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if ((strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + { + MultiByteToWideChar(CP_ACP, 0, str, -1, strW, len ); + ret = DrawCaptionTempW(hwnd, hdc, rect, hFont, hIcon, strW, uFlags); + HeapFree(GetProcessHeap(), 0, strW); + } + return ret; } /*********************************************************************** Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Apr 17 15:27:42 2007 @@ -716,16 +716,16 @@ LPCRECT lpRc, UINT uFlags); -DWORD +BOOL STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6); + HWND hWnd, + HDC hDC, + const RECT *rect, + HFONT hFont, + HICON hIcon, + LPCWSTR str, + UINT uFlags); BOOL NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Tue Apr 17 15:27:42 2007 @@ -180,20 +180,19 @@ return 0; } -DWORD +BOOL STDCALL NtUserDrawCaptionTemp( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6) -{ - UNIMPLEMENTED - - return 0; + HWND hWnd, + HDC hDC, + const RECT *rect, + HFONT hFont, + HICON hIcon, + LPCWSTR str, + UINT uFlags) +{ + UNIMPLEMENTED + return FALSE; } BOOL

1 0

[arty] 26369: Add the ability to load freeldr in qemu-system-ppc for the first time. Use '-append bootprep' to force prep mode (not great yet).
by arty＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: arty Date: Tue Apr 17 15:22:30 2007 New Revision: 26369 URL: http://svn.reactos.org/svn/reactos?rev=26369&view=rev Log: Add the ability to load freeldr in qemu-system-ppc for the first time. Use '-append bootprep' to force prep mode (not great yet). Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c branches/powerpc/reactos/tools/ppc.lost+found/bootcd (with props) branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s Tue Apr 17 15:22:30 2007 @@ -16,17 +16,25 @@ stw %r5,ofw_call_addr@l(%r10) bl zero_registers - + /* Zero CTR */ mtcr %r31 lis %r3,PpcInit@ha addi %r3,%r3,PpcInit@l mtlr %r3 - + + /* Check for ofw */ + lis %r3,ofw_call_addr@ha + lwz %r3,ofw_call_addr@l(%r3) + cmpw %r3,%r31 /* Zero? */ + mr %r3,%r31 + beq bootme + lis %r3,call_ofw@ha addi %r3,%r3,call_ofw@l +bootme: blr zero_registers: Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Tue Apr 17 15:22:30 2007 @@ -21,6 +21,7 @@ #include "of.h" #include "mmu.h" #include "ppcboot.h" +#include "prep.h" #include "compat.h" extern void BootMain( LPSTR CmdLine ); @@ -32,12 +33,12 @@ part_handle = -1, kernel_mem = 0; int mmu_handle = 0, FixedMemory = 0; BOOLEAN AcpiPresent = FALSE; -char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; +char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { "bootprep" }; jmp_buf jmp; volatile char *video_mem = 0; boot_infos_t BootInfo; -void PpcPutChar( int ch ) { +void PpcOfwPutChar( int ch ) { char buf[3]; if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } else { buf[0] = ch; buf[1] = 0; } @@ -64,7 +65,7 @@ if( !nth && match ) return parent; - for( i = 0; i < depth; i++ ) PpcPutChar( ' ' ); + for( i = 0; i < depth; i++ ) PpcOfwPutChar( ' ' ); if( depth == 1 ) { if( gotname > 0 ) { @@ -97,17 +98,14 @@ } VOID PpcVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) { - //ofw_print_string("GetDisplaySize\n"); *Width = 80; *Height = 25; *Depth = 16; - //printf("GetDisplaySize(%d,%d,%d)\n", *Width, *Height, *Depth); } ULONG PpcVideoGetBufferSize() { ULONG Width, Height, Depth; - //ofw_print_string("PpcVideoGetBufferSize\n"); - PpcVideoGetDisplaySize( &Width, &Height, &Depth ); + MachVideoGetDisplaySize( &Width, &Height, &Depth ); return Width * Height * Depth / 8; } @@ -137,14 +135,14 @@ PCHAR ChBuf = Buffer; int offset = 0; - PpcVideoGetDisplaySize( &w, &h, &d ); + MachVideoGetDisplaySize( &w, &h, &d ); for( i = 0; i < h; i++ ) { for( j = 0; j < w; j++ ) { offset = (j * 2) + (i * w * 2); if( ChBuf[offset] != video_mem[offset] ) { video_mem[offset] = ChBuf[offset]; - PpcVideoPutChar(ChBuf[offset],0,j+1,i+1); + MachVideoPutChar(ChBuf[offset],0,j+1,i+1); } } } @@ -380,7 +378,7 @@ RemainingPath[0] = 0; } *Device = 0; - return PpcDiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); + return MachDiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType); } BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) { @@ -493,14 +491,15 @@ extern int _bss; typedef unsigned int uint32_t; -void PpcInit( of_proxy the_ofproxy ) { - int len; - ofproxy = the_ofproxy; - + +void PpcOfwInit() +{ //SetPhys(0x900, (19 << 26) | (50 << 1)); chosen_package = ofw_finddevice( "/chosen" ); + ofw_getprop(chosen_package, "bootargs", + CmdLine, sizeof(CmdLine)); ofw_getprop( chosen_package, "stdin", (char *)&stdin_handle, sizeof(stdin_handle) ); ofw_getprop( chosen_package, "stdout", @@ -508,7 +507,7 @@ ofw_getprop( chosen_package, "mmu", (char *)&mmu_handle, sizeof(mmu_handle) ); - MachVtbl.ConsPutChar = PpcPutChar; + MachVtbl.ConsPutChar = PpcOfwPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; MachVtbl.ConsGetCh = PpcConsGetCh; @@ -549,21 +548,27 @@ MachVtbl.HwDetect = PpcHwDetect; + // Allow forcing prep for broken OFW + if(!strncmp(CmdLine, "bootprep", 8)) + { + printf("Going to PREP init...\n"); + PpcPrepInit(); + return; + } + printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); - len = ofw_getprop(chosen_package, "bootargs", - CmdLine, sizeof(CmdLine)); - - if( len < 0 ) len = 0; - CmdLine[len] = 0; - - printf("bootargs: len %d [%s]\n", len, CmdLine); - BootMain( CmdLine ); } +void PpcInit( of_proxy the_ofproxy ) { + ofproxy = the_ofproxy; + if(ofproxy) PpcOfwInit(); + else PpcPrepInit(); +} + void MachInit(const char *CmdLine) { - int len, i; + int i, len; char *sep; BootPart[0] = 0; Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c Tue Apr 17 15:22:30 2007 @@ -32,6 +32,44 @@ "blr" ); +__asm__("\t.globl GetPhysHalf\n" + "GetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lhz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl GetPhysByte\n" + "GetPhysByte:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "isync\n\t" + "sync\n\t" + "lbz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "isync\n\t" + "sync\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + __asm__("\t.globl SetPhys\n" "SetPhys:\t\n" "mflr 0\n\t" @@ -42,6 +80,27 @@ "sync\n\t" "eieio\n\t" "stw 4,0(3)\n\t" /* Set actual value at phys addr r3 */ + "dcbst 0,3\n\t" + "mtmsr 5\n\t" + "sync\n\t" + "eieio\n\t" + "mr 3,4\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +__asm__("\t.globl SetPhysHalf\n" + "SetPhysHalf:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "sync\n\t" + "eieio\n\t" + "sth 4,0(3)\n\t" /* Set actual value at phys addr r3 */ "dcbst 0,3\n\t" "mtmsr 5\n\t" "sync\n\t" Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Tue Apr 17 15:22:30 2007 @@ -1,0 +1,101 @@ +#include "freeldr.h" +#include "machine.h" +#include "mmu.h" +#include "prep.h" + +int prep_serial = 0x800003f8; + +void sync() { __asm__("sync\n\teieio"); } + +/* Simple serial */ + +void PpcPrepPutChar( int ch ) { + if( ch == 0x0a ) { + SetPhysByte(prep_serial, 0x0d); + sync(); + } + SetPhysByte(prep_serial, ch); + sync(); +} + +BOOLEAN PpcPrepDiskReadLogicalSectors +( ULONG DriveNumber, ULONGLONG SectorNumber, + ULONG SectorCount, PVOID Buffer ) { + int secct; + + for(secct = 0; secct < SectorCount; secct++) + { + ide_seek(&ide1_desc, SectorNumber + secct, 0); + ide_read(&ide1_desc, ((PCHAR)Buffer) + secct * 512, 512); + } + /* Never give up! */ + return TRUE; +} + +BOOLEAN PpcPrepConsKbHit() +{ + return GetPhysByte(prep_serial+5) & 1; +} + +int PpcPrepConsGetCh() +{ + while(!PpcPrepConsKbHit()); + return GetPhysByte(prep_serial); +} + +void PpcPrepVideoClearScreen(UCHAR Attr) +{ + printf("\033c"); +} + +VIDEODISPLAYMODE PpcPrepVideoSetDisplayMode( char *DisplayMode, BOOLEAN Init ) +{ + return VideoTextMode; +} + +void PpcPrepVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) +{ + *Width = 80; + *Height = 25; + *Depth = 16; +} + +void PpcPrepVideoPrepareForReactOS() +{ +} + +ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, + ULONG MaxMemoryMapSize ) +{ + // xxx fixme + BiosMemoryMap[0].Type = 1; + BiosMemoryMap[0].BaseAddress = 0; + BiosMemoryMap[0].Length = 64 * 1024 * 1024; + return 1; +} + +void PpcPrepInit() +{ + MachVtbl.ConsPutChar = PpcPrepPutChar; + printf("Breathing ...\n"); + + ide_setup( &ide1_desc ); + + MachVtbl.DiskReadLogicalSectors = PpcPrepDiskReadLogicalSectors; + + MachVtbl.ConsKbHit = PpcPrepConsKbHit; + MachVtbl.ConsGetCh = PpcPrepConsGetCh; + + MachVtbl.VideoClearScreen = PpcPrepVideoClearScreen; + MachVtbl.VideoSetDisplayMode = PpcPrepVideoSetDisplayMode; + MachVtbl.VideoGetDisplaySize = PpcPrepVideoGetDisplaySize; + + MachVtbl.VideoPrepareForReactOS = PpcPrepVideoPrepareForReactOS; + + MachVtbl.GetMemoryMap = PpcPrepGetMemoryMap; + + printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() ); + + BootMain( "" ); +} + Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h Tue Apr 17 15:22:30 2007 @@ -1,0 +1,12 @@ +#ifndef FREELDR_ARCH_POWERPC_PREP_H +#define FREELDR_ARCH_POWERPC_PREP_H + +extern struct _idectl_desc ide1_desc; + +void sync(); +void PpcPrepInit(); +void ide_seek( void *extension, int low, int high ); +void ide_read( void *extension, char *buffer, int bytes ); +void ide_setup( void *extension ); + +#endif//FREELDR_ARCH_POWERPC_PREP_H Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c Tue Apr 17 15:22:30 2007 @@ -1,0 +1,99 @@ +#include "freeldr.h" +#include "machine.h" +#include "mmu.h" +#include "prep.h" + +#define SWAP_W(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)) + +typedef struct _idectl_desc { + int port; + long long seekto; + int seek_cylinder, seek_head, seek_sector; + int cylinders, heads, sectors, bytespersec; +} idectl_desc; + +idectl_desc ide1_desc = { 0x800001f0 }; + +void ide_seek( void *extension, int low, int high ) { + idectl_desc *desc = (idectl_desc *)extension; + long long seekto = ((((long long)high) << 32) | (low & 0xffffffff)) / desc->bytespersec; + /* order = sector, head, cylinder */ + desc->seek_sector = seekto % desc->sectors; + seekto /= desc->sectors; + desc->seek_head = seekto % desc->heads; + seekto /= desc->heads; + desc->seek_cylinder = seekto; + desc->seekto = seekto; +} + +/* Thanks chuck moore. This is based on the color forth ide code */ +/* Wait for ready */ +void ide_rdy( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + while( !(GetPhysByte(desc->port+7) & 8) ) sync(); +} + +void ide_bsy( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + while( GetPhysByte(desc->port+7) & 0x80 ) sync(); +} + +int ide_read( void *extension, char *buffer, int bytes ) { + idectl_desc *desc = (idectl_desc *)extension; + short *databuf = (short *)buffer; + short in; + int inwords; + + ide_bsy( extension ); + SetPhysByte(desc->port+2, bytes / desc->bytespersec); + SetPhysByte(desc->port+3, desc->seek_sector + 1); + SetPhysByte(desc->port+4, desc->seek_cylinder); + SetPhysByte(desc->port+5, desc->seek_cylinder >> 8); + SetPhysByte(desc->port+6, desc->seek_head | 0xa0); + SetPhysByte(desc->port+7, 0x20); + + sync(); + + for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { + ide_rdy( extension ); + in = GetPhysHalf(desc->port); + databuf[inwords] = SWAP_W(in); + sync(); + } + + desc->seekto += desc->bytespersec; + ide_seek( extension, desc->seekto, desc->seekto >> 32 ); + + return bytes - (bytes % desc->bytespersec); +} + +void ide_setup( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + short identbuffer[256]; + char namebuf[41]; + short *databuf = (short *)identbuffer, in; + int inwords; + + ide_bsy( extension ); + SetPhysByte(desc->port+7, 0xec); + desc->bytespersec = 512; + + sync(); + + for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { + ide_rdy( extension ); + in = GetPhysHalf(desc->port); + databuf[inwords] = SWAP_W(in); + sync(); + } + + desc->cylinders = identbuffer[1]; + desc->heads = identbuffer[3]; + desc->sectors = identbuffer[6]; + + /* Debug: Write out hard disc model */ + + strncpy(namebuf, (char *)(identbuffer+0x1b), 41); + printf("HARD DISC MODEL: %s c,h,s %d,%d,%d\n", + namebuf, desc->cylinders, desc->heads, desc->sectors); +} Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Tue Apr 17 15:22:30 2007 @@ -71,6 +71,8 @@ <file>ofw.c</file> <file>mmu.c</file> <file>mach.c</file> + <file>prep.c</file> + <file>prep_ide.c</file> <file>mboot.c</file> </module> </if> Added: branches/powerpc/reactos/tools/ppc.lost+found/bootcd URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/bootcd (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/bootcd Tue Apr 17 15:22:30 2007 @@ -1,0 +1,20 @@ +#!/bin/sh +# +# Create an iso that can be booted under qemu. +# For now, this is just to make ofwldr available to qemu. A disk image will +# still be required yet. +# + +CD=output-ppc/ppcboot +I=$CD/install + +tools/ppc.lost+found/link-freeldr + +mkdir -p $I +cp freeldr.elf $I/yaboot +cp `dirname $0`/ofboot.b $I + +mkisofs -chrp-boot -U -part -hfs -T -r -l -J -A "ReactOS" -sysid PPC \ + -V "ReactOS" -volset 1 -volset-size 1 -volset-seqno 1 \ + -hfs-volid "ReactOS" -hfs-bless $I -map hfsmap.lst \ + -no-desktop -allow-multidot -o ppcboot.iso $CD Propchange: branches/powerpc/reactos/tools/ppc.lost+found/bootcd ------------------------------------------------------------------------------ svn:executable = * Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Tue Apr 17 15:22:30 2007 @@ -53,6 +53,8 @@ obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mmu.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_ide.o \ obj-ppc/boot/freeldr/freeldr/bootmgr.o \ obj-ppc/boot/freeldr/freeldr/drivemap.o \ obj-ppc/boot/freeldr/freeldr/miscboot.o \ Added: branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/ofboot.b Tue Apr 17 15:22:30 2007 @@ -1,0 +1,64 @@ +<CHRP-BOOT> +<COMPATIBLE> +MacRISC MacRISC3 MacRISC4 +</COMPATIBLE> +<DESCRIPTION> +GNU/Linux PPC bootloader +</DESCRIPTION> +<BOOT-SCRIPT> +" screen" output +load-base release-load-area +boot cd:,\install\yaboot +</BOOT-SCRIPT> +<OS-BADGE-ICONS> +1010 +000000000000F8FEACF6000000000000 +0000000000F5FFFFFEFEF50000000000 +00000000002BFAFEFAFCF70000000000 +0000000000F65D5857812B0000000000 +0000000000F5350B2F88560000000000 +0000000000F6335708F8FE0000000000 +00000000005600F600F5FD8100000000 +00000000F9F8000000F5FAFFF8000000 +000000008100F5F50000F6FEFE000000 +000000F8F700F500F50000FCFFF70000 +00000088F70000F50000F5FCFF2B0000 +0000002F582A00F5000008ADE02C0000 +00090B0A35A62B0000002D3B350A0000 +000A0A0B0B3BF60000505E0B0A0B0A00 +002E350B0B2F87FAFCF45F0B2E090000 +00000007335FF82BF72B575907000000 +000000000000ACFFFF81000000000000 +000000000081FFFFFFFF810000000000 +0000000000FBFFFFFFFFAC0000000000 +000000000081DFDFDFFFFB0000000000 +000000000081DD5F83FFFD0000000000 +000000000081DDDF5EACFF0000000000 +0000000000FDF981F981FFFF00000000 +00000000FFACF9F9F981FFFFAC000000 +00000000FFF98181F9F981FFFF000000 +000000ACACF981F981F9F9FFFFAC0000 +000000FFACF9F981F9F981FFFFFB0000 +00000083DFFBF981F9F95EFFFFFC0000 +005F5F5FDDFFFBF9F9F983DDDD5F0000 +005F5F5F5FDD81F9F9E7DF5F5F5F5F00 +0083DD5F5F83FFFFFFFFDF5F835F0000 +000000FBDDDFACFBACFBDFDFFB000000 +000000000000FFFFFFFF000000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFF0000000000 +0000000000FFFFFFFFFFFFFF00000000 +00000000FFFFFFFFFFFFFFFFFF000000 +00000000FFFFFFFFFFFFFFFFFF000000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 +00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 +000000FFFFFFFFFFFFFFFFFFFF000000 +</OS-BADGE-ICONS> +</CHRP-BOOT>

1 0

[ekohl] 26368: - Replace the listview control on the pointer page by an ownerdrawn listbox and add necessary code changes. - Add missing "Horizontal Resize" string resource. - Make the cursor preview work for the system cursors.
by ekohl＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: ekohl Date: Tue Apr 17 14:41:07 2007 New Revision: 26368 URL: http://svn.reactos.org/svn/reactos?rev=26368&view=rev Log: - Replace the listview control on the pointer page by an ownerdrawn listbox and add necessary code changes. - Add missing "Horizontal Resize" string resource. - Make the cursor preview work for the system cursors. Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Sc&héma", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "&Uloit jako...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Odstranit", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "Vl&astní", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Zobrazit stín pod ukazatelem", IDC_CHECK_DROP_SHADOW, 5, 200, 110, 10 PUSHBUTTON "Pouít &výchozí", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Procházet", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Psaní rukou" IDS_NO "Není k dispozici" IDS_SIZENS "Zmìna výky" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonální zmìna velikosti 1" IDS_SIZENESW "Diagonální zmìna velikosti 2" IDS_SIZEALL "Pøesunout" Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Tue Apr 17 14:41:07 2007 @@ -55,14 +55,14 @@ BEGIN GROUPBOX "Tastenkonfiguration", -1, 5, 5, 230, 70 CHECKBOX "&Primäre und sekundäre Taste umschalten", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 145, 10 - CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Aktivieren Sie dieses Kontrollkästchen, um die rechte Maustaste für primäre Funktionen, wie Auswählen und Ziehen zu verwenden.", -1, 10, 30, 150, 31 GROUPBOX "Doppelklickgeschwindigkeit", -1, 5, 75, 230, 70 LTEXT "Doppelklicken Sie auf den Ordner, um die Einstellung zu testen. Verwenden Sie eine langsamere Einstellung, wenn der Ordner sich nicht öffnen oder schließen lässt.", -1, 10, 85, 150, 32 LTEXT "Langsam", -1, 10, 120, 90, 8 LTEXT "Schnell", -1, 140, 120, 30, 8 CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 - CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "KlickEinrasten", -1, 5, 150, 230, 70 CHECKBOX "&KlickEinrasten aktivieren", IDC_CHECK_CLICK_LOCK, 10, 160, 91, 20 PUSHBUTTON "&Einstellungen...", IDC_BUTTON_CLICK_LOCK, 167, 160, 60, 14 @@ -76,11 +76,11 @@ BEGIN GROUPBOX "S&chema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Speichern &unter...", IDC_BUTTON_SAVEAS_SCHEME, 55, 30, 65, 15 PUSHBUTTON "&Löschen", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "An&passen:", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "Zeigerschatten &aktivieren", IDC_CHECK_DROP_SHADOW, 5, 200, 95, 10 PUSHBUTTON "&Standard verwenden", IDC_BUTTON_USE_DEFAULT_CURSOR, 99, 200, 73, 15 PUSHBUTTON "&Durchsuchen...", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 56, 15 @@ -96,7 +96,6 @@ PUSHBUTTON "&OK", IDOK, 60, 45, 50, 15 PUSHBUTTON "&Abbrechen", IDCANCEL, 115, 45, 50, 15 END - IDD_PAGE_OPTION DIALOGEX 0, 0, 246, 228 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION @@ -135,7 +134,7 @@ LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 CONTROL "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 CONTROL "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 END @@ -156,6 +155,7 @@ IDS_NWPEN "Handschrift" IDS_NO "Nicht verfügbar" IDS_SIZENS "Vertikale Größenänderung" + IDS_SIZEWE "Horizontale Größenänderung" IDS_SIZENWSE "Diagonale Größenänderung 1" IDS_SIZENESW "Diagonale Größenänderung 2" IDS_SIZEALL "Verschieben" Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Profil", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&uver...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Effacer", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Modifier", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Afficher l'ombre du curseur", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Par dé&faut", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Choisir", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Écriture" IDS_NO "Indisponible" IDS_SIZENS "Redimensionnement vertical" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Redimensionnement en diagonale 1" IDS_SIZENESW "Redimensionnement en diagonale 2" IDS_SIZEALL "Déplacer" Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Skema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Simpan Seba&gai...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Hapus", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Kustomisasi", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "Hidupkan ba&yangan pointer", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Gunakan Standa&r", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Lihat", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Tulisan tangan" IDS_NO "Tidak tersedia" IDS_SIZENS "Ukur ulang Vertikal" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Ukur ulang Diagonal 1" IDS_SIZENESW "Ukur ulang Diagonal 2" IDS_SIZEALL "Pindah" Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Tue Apr 17 14:41:07 2007 @@ -76,11 +76,11 @@ BEGIN GROUPBOX "Schema", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Salva come...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Cancella", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Personalizza", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Abilita l'ombra del puntatore", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Usa predefinito", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Esplora", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -155,6 +155,7 @@ IDS_NWPEN "Scrittura manuale" IDS_NO "Non disponibile" IDS_SIZENS "Ridimensiona in verticale" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Ridimensiona in Diagonale 1" IDS_SIZENESW "Ridimensiona in Diagonale 2" IDS_SIZEALL "Muovi" Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -153,6 +153,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Tue Apr 17 14:41:07 2007 @@ -73,11 +73,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -152,6 +152,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Tue Apr 17 14:41:07 2007 @@ -74,11 +74,11 @@ BEGIN GROUPBOX "Scheme", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Sa&ve As...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "&Delete", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Customize", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Enable pointer shadow", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "Use De&fault", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Browse", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -154,6 +154,7 @@ IDS_NWPEN "Handwriting" IDS_NO "Unavailable" IDS_SIZENS "Vertical Resize" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Diagonal Resize 1" IDS_SIZENESW "Diagonal Resize 2" IDS_SIZEALL "Move" Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Tue Apr 17 14:41:07 2007 @@ -82,11 +82,11 @@ BEGIN GROUPBOX "Ñõåìà", -1, 5, 5, 170, 45 COMBOBOX IDC_COMBO_CURSOR_SCHEME, 10, 15, 145, 200, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_LISTVIEW_CURSOR ,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 5, 70, 230, 120 PUSHBUTTON "Çáåðåãòè &ÿê...", IDC_BUTTON_SAVEAS_SCHEME, 70, 30, 50, 15 PUSHBUTTON "Â&èäàëèòè", IDC_BUTTON_DELETE_SCHEME, 125, 30, 40, 15 - CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_OWNERDRAW, 195, 15, 35, 35, WS_EX_STATICEDGE + CONTROL "", IDC_IMAGE_CURRENT_CURSOR, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 190, 9, 45, 41, WS_EX_STATICEDGE LTEXT "&Íàëàøòóâàííÿ", -1, 5, 60, 40, 10 + LISTBOX IDC_LISTBOX_CURSOR, 5, 70, 230, 120, WS_VISIBLE | WS_BORDER | WS_TABSTOP | WS_VSCROLL | LBS_OWNERDRAWFIXED | LBS_NOTIFY CHECKBOX "&Ââ³ìêíóòè &ò³íü âêàç³âíèêà", IDC_CHECK_DROP_SHADOW, 5, 200, 100, 10 PUSHBUTTON "&Çà çàìîâ÷óâàííÿì", IDC_BUTTON_USE_DEFAULT_CURSOR, 120, 200, 50, 15 PUSHBUTTON "&Îãëÿä", IDC_BUTTON_BROWSE_CURSOR, 175, 200, 50, 15 @@ -161,6 +161,7 @@ IDS_NWPEN "Ðóêîïèñíå ââåäåííÿ" IDS_NO "Îïåðàö³ÿ íåìîæëèâà" IDS_SIZENS "Çì³íà âåðòèêàëüíèõ ðîçì³ð³â" + IDS_SIZEWE "Horizontal Resize" IDS_SIZENWSE "Çì³íà ðîçì³ð³â ïî ä³àãîíàë³ 1" IDS_SIZENESW "Çì³íà ðîçì³ð³â ïî ä³àãîíàë³ 2" IDS_SIZEALL "Ïåðåì³ùåííÿ" Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Tue Apr 17 14:41:07 2007 @@ -105,6 +105,34 @@ } WHEEL_DATA, *PWHEEL_DATA; +typedef struct _CURSOR_DATA +{ + UINT uStringId; + LPWSTR uDefaultCursorId; + HCURSOR hCursor; + TCHAR szCursorName[MAX_PATH]; + TCHAR szCursorPath[MAX_PATH]; +} CURSOR_DATA, *PCURSOR_DATA; + + +CURSOR_DATA g_CursorData[] = +{{IDS_ARROW, IDC_ARROW, 0, _T(""), _T("")}, + {IDS_HELP, IDC_HELP, 0, _T(""), _T("")}, + {IDS_APPSTARTING, IDC_APPSTARTING, 0, _T(""), _T("")}, + {IDS_WAIT, IDC_WAIT, 0, _T(""), _T("")}, + {IDS_CROSSHAIR, IDC_CROSS, 0, _T(""), _T("")}, + {IDS_IBEAM, IDC_IBEAM, 0, _T(""), _T("")}, + {IDS_NWPEN, 0/*IDC_NWPEN*/, 0, _T(""), _T("")}, + {IDS_NO, IDC_NO, 0, _T(""), _T("")}, + {IDS_SIZENS, IDC_SIZENS, 0, _T(""), _T("")}, + {IDS_SIZEWE, IDC_SIZEWE, 0, _T(""), _T("")}, + {IDS_SIZENWSE, IDC_SIZENWSE, 0, _T(""), _T("")}, + {IDS_SIZENESW, IDC_SIZENESW, 0, _T(""), _T("")}, + {IDS_SIZEALL, IDC_SIZEALL, 0, _T(""), _T("")}, + {IDS_UPARROW, IDC_UPARROW, 0, _T(""), _T("")}, + {IDS_HAND, IDC_HAND, 0, _T(""), _T("")}}; + + TCHAR g_CurrentScheme[MAX_PATH]; TCHAR g_szArrow[MAX_PATH]; TCHAR g_szHelp[MAX_PATH]; @@ -123,6 +151,8 @@ TCHAR g_szHand[MAX_PATH]; TCHAR g_szNewScheme[MAX_PATH]; + + /* Property page dialog callback */ @@ -554,12 +584,13 @@ static VOID RefreshCursorList(HWND hwndDlg) { - TCHAR szCursorName[MAX_PATH]; - HWND hDlgCtrl; - LV_ITEM listItem; - LV_COLUMN column; - INT index = 0; - +// TCHAR szCursorName[MAX_PATH]; +// HWND hDlgCtrl; +// LV_ITEM listItem; +// LV_COLUMN column; + INT index = 0, i; + +#if 0 hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); (void)ListView_DeleteAllItems(hDlgCtrl); @@ -634,6 +665,14 @@ LoadString(hApplet, IDS_HAND, szCursorName, MAX_PATH); listItem.iItem = index++; (void)ListView_InsertItem(hDlgCtrl, &listItem); +#endif + + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_RESETCONTENT, 0, 0); + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + LoadString(hApplet, index, g_CursorData[i].szCursorName, MAX_PATH); + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_ADDSTRING, 0, (LPARAM)i); + } } @@ -720,6 +759,7 @@ static VOID LoadCurrentCursorScheme(LPTSTR lpName, BOOL bSystem) { +#if 0 HKEY hCursorKey; TCHAR szValue[2048]; TCHAR szRaw[256]; @@ -803,6 +843,85 @@ } } } +#endif + + UINT index, i; + + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (g_CursorData[i].hCursor != NULL) + { + DestroyCursor(g_CursorData[i].hCursor); + g_CursorData[i].hCursor = 0; + } + } + + if (lpName == NULL) + { + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + g_CursorData[i].hCursor = LoadCursor(NULL, g_CursorData[i].uDefaultCursorId); + } + } + else + { + + } +} + + +static VOID +OnDrawItem(UINT idCtl, + LPDRAWITEMSTRUCT lpdis) +{ + RECT rc; + + if (lpdis->itemState & ODS_SELECTED) + { + FillRect(lpdis->hDC, + &lpdis->rcItem, + (HBRUSH)(COLOR_HIGHLIGHT + 1)); + SetBkColor(lpdis->hDC, + GetSysColor(COLOR_HIGHLIGHT)); + SetTextColor(lpdis->hDC, + GetSysColor(COLOR_HIGHLIGHTTEXT)); + } + else + { + FillRect(lpdis->hDC, + &lpdis->rcItem, + (HBRUSH)(COLOR_WINDOW + 1)); + SetBkColor(lpdis->hDC, + GetSysColor(COLOR_WINDOW)); + SetTextColor(lpdis->hDC, + GetSysColor(COLOR_WINDOWTEXT)); + } + + if (lpdis->itemID != -1) + { + CopyRect(&rc, &lpdis->rcItem); + rc.left += 5; + DrawText(lpdis->hDC, + g_CursorData[lpdis->itemData].szCursorName, + -1, + &rc, + DT_SINGLELINE | DT_VCENTER | DT_LEFT); + + if (g_CursorData[lpdis->itemData].hCursor != NULL) + { + DrawIcon(lpdis->hDC, + lpdis->rcItem.right - 32 - 4, + lpdis->rcItem.top + 2, + g_CursorData[lpdis->itemData].hCursor); + } + } + + if (lpdis->itemState & ODS_FOCUS) + { + CopyRect(&rc, &lpdis->rcItem); + InflateRect(&rc, -1, -1); + DrawFocusRect(lpdis->hDC, &rc); + } } @@ -832,6 +951,7 @@ EnumerateCursorSchemes(hwndDlg); RefreshCursorList(hwndDlg); + SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_SETCURSEL, 0, 0); /* Get drop shadow setting */ if (!SystemParametersInfo(SPI_GETDROPSHADOW, 0, &pPointerData->bDropShadow, 0)) @@ -845,10 +965,19 @@ SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - if ((INT)wParam == IDC_LISTVIEW_CURSOR) + if ((INT)wParam == IDC_LISTBOX_CURSOR) return TRUE; else return FALSE; + + case WM_MEASUREITEM: + ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 32 + 4; + break; + + case WM_DRAWITEM: + if (wParam == IDC_LISTBOX_CURSOR) + OnDrawItem((UINT)wParam, (LPDRAWITEMSTRUCT)lParam); + return TRUE; case WM_DESTROY: HeapFree(GetProcessHeap(), 0, pPointerData); @@ -873,35 +1002,48 @@ break; case WM_COMMAND: - switch(HIWORD(wParam)) - { - case CBN_SELENDOK: - { - BOOL bEnable; - LPTSTR lpName; - - wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); - if(wParam == CB_ERR) - break; - SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); - LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted - bEnable = FALSE; - else - bEnable = TRUE; - - /* delete button */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); - EnableWindow(hDlgCtrl, bEnable); - - lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); - LoadCurrentCursorScheme(lpName, !bEnable); - break; - } - } - switch (LOWORD(wParam)) { + case IDC_COMBO_CURSOR_SCHEME: + switch(HIWORD(wParam)) + { + case CBN_SELENDOK: + { + BOOL bEnable; + LPTSTR lpName; + + wParam = SendMessage((HWND)lParam, CB_GETCURSEL, 0, 0); + if(wParam == CB_ERR) + break; + SendMessage((HWND)lParam, CB_GETLBTEXT, wParam, (LPARAM)buffer); + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); + if(_tcsstr(buffer, szSystemScheme) || wParam == 0) //avoid the default scheme can be deleted + bEnable = FALSE; + else + bEnable = TRUE; + + /* delete button */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); + EnableWindow(hDlgCtrl, bEnable); + + lpName = (LPTSTR)SendMessage((HWND)lParam, CB_GETITEMDATA, wParam, 0); + LoadCurrentCursorScheme(lpName, !bEnable); + break; + } + } + break; + + case IDC_LISTBOX_CURSOR: + if (HIWORD(wParam) == LBN_SELCHANGE) + { + UINT uSel, uIndex; + uSel = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); + uIndex = (UINT)SendMessage((HWND)lParam, LB_GETITEMDATA, (WPARAM)uSel, 0); + SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, + (LPARAM)g_CursorData[uIndex].hCursor); + } + break; + case IDC_BUTTON_SAVEAS_SCHEME: if (DialogBox(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), hwndDlg, SaveSchemeProc)) { @@ -911,7 +1053,7 @@ break; case IDC_BUTTON_USE_DEFAULT_CURSOR: - hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if (lResult != CB_ERR) { @@ -950,7 +1092,7 @@ case IDC_BUTTON_BROWSE_CURSOR: memset(buffer, 0x0, sizeof(buffer)); - hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); + hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTBOX_CURSOR); lResult = SendMessage(hDlgCtrl, CB_GETCURSEL, 0, 0); if (lResult == CB_ERR) MessageBox(hwndDlg, _T("CB_ERR"), _T(""),MB_ICONERROR); Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Tue Apr 17 14:41:07 2007 @@ -20,10 +20,30 @@ #define IDD_CURSOR_SCHEME_SAVEAS 107 #define IDD_CLICK_LOCK 108 -#define IDS_CPLNAME_1 1000 -#define IDS_CPLDESCRIPTION_1 1001 -#define IDS_CPLNAME_2 1002 -#define IDS_CPLDESCRIPTION_2 1003 +/* Strings */ +#define IDS_CPLNAME_1 1000 +#define IDS_CPLDESCRIPTION_1 1001 +#define IDS_CPLNAME_2 1002 +#define IDS_CPLDESCRIPTION_2 1003 + +#define IDS_ARROW 1016 +#define IDS_HELP 1017 +#define IDS_APPSTARTING 1018 +#define IDS_WAIT 1019 +#define IDS_CROSSHAIR 1020 +#define IDS_IBEAM 1021 +#define IDS_NWPEN 1022 +#define IDS_NO 1023 +#define IDS_SIZENS 1024 +#define IDS_SIZEWE 1025 +#define IDS_SIZENWSE 1026 +#define IDS_SIZENESW 1027 +#define IDS_SIZEALL 1028 +#define IDS_UPARROW 1029 +#define IDS_HAND 1030 +#define IDS_NONE 1031 +#define IDS_SYSTEM_SCHEME 1032 + #define IDC_SWAP_MOUSE_BUTTONS 2000 #define IDC_SLIDER_DOUBLE_CLICK_SPEED 2001 @@ -40,24 +60,8 @@ #define IDC_CHECK_POINTER_TRAIL 2012 #define IDC_CHECK_POINTER_PRECISION 2013 #define IDC_SLIDER_POINTER_TRAIL 2014 -#define IDC_LISTVIEW_CURSOR 2015 -#define IDS_ARROW 2016 -#define IDS_HELP 2017 -#define IDS_APPSTARTING 2018 -#define IDS_WAIT 2019 -#define IDS_CROSSHAIR 2020 -#define IDS_IBEAM 2021 -#define IDS_NWPEN 2022 -#define IDS_NO 2023 -#define IDS_SIZENS 2024 -#define IDS_SIZENWSE 2025 -#define IDS_SIZENESW 2026 -#define IDS_SIZEALL 2027 -#define IDS_UPARROW 2028 -#define IDS_HAND 2029 +#define IDC_LISTBOX_CURSOR 2015 #define IDC_COMBO_CURSOR_SCHEME 2030 -#define IDS_NONE 2031 -#define IDS_SYSTEM_SCHEME 2032 #define IDC_BUTTON_DELETE_SCHEME 2033 #define IDC_CHECK_DROP_SHADOW 2034 #define IDC_IMAGE_SWAP_MOUSE 2035

1 0

[cwittich] 26367: display the icons again - but something is still wrong
by cwittich＠svn.reactos.org 17 Apr '07

17 Apr '07

Author: cwittich Date: Tue Apr 17 05:15:24 2007 New Revision: 26367 URL: http://svn.reactos.org/svn/reactos?rev=26367&view=rev Log: display the icons again - but something is still wrong Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Apr 17 05:15:24 2007 @@ -1841,7 +1841,7 @@ return Ret; } - if (RetCount >= count) + if (RetCount <= count) { SafeBuf = ExAllocatePoolWithTag(PagedPool, count, TAG_GDIOBJ); if(!SafeBuf)

1 0

[dgorbachev] 26366: Detect i8042 IRQs by edge. This should fix endless loop in i8042 driver on machines with VIA and ALI chipsets. (See bug report #2159.) Thanks Peter K. and other testers for help.
by dgorbachev＠svn.reactos.org 16 Apr '07

16 Apr '07

Author: dgorbachev Date: Tue Apr 17 03:03:41 2007 New Revision: 26366 URL: http://svn.reactos.org/svn/reactos?rev=26366&view=rev Log: Detect i8042 IRQs by edge. This should fix endless loop in i8042 driver on machines with VIA and ALI chipsets. (See bug report #2159.) Thanks Peter K. and other testers for help. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Tue Apr 17 03:03:41 2007 @@ -886,7 +886,7 @@ MappedIrqKeyboard, DirqlKeyboard, DirqlMax, - LevelSensitive, + Latched, FALSE, Affinity, FALSE); @@ -902,7 +902,7 @@ MappedIrqMouse, DirqlMouse, DirqlMax, - LevelSensitive, + Latched, FALSE, Affinity, FALSE);

1 0

[dgorbachev] 26365: Do not change reserved ELCR bits.
by dgorbachev＠svn.reactos.org 16 Apr '07

16 Apr '07

Author: dgorbachev Date: Tue Apr 17 03:02:54 2007 New Revision: 26365 URL: http://svn.reactos.org/svn/reactos?rev=26365&view=rev Log: Do not change reserved ELCR bits. Modified: trunk/reactos/hal/halx86/generic/irq.S Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Tue Apr 17 03:02:54 2007 @@ -254,6 +254,7 @@ in al, dx mov dx, 1 shl dx, cl + and dx, 0xDEF8 /* Check if this is a latched interrupt */ cmp dword ptr [esp+12], 0

1 0

[arty] 26364: Streamline freeldr now that we're in BE all the way.
by arty＠svn.reactos.org 16 Apr '07

16 Apr '07

Author: arty Date: Mon Apr 16 17:48:22 2007 New Revision: 26364 URL: http://svn.reactos.org/svn/reactos?rev=26364&view=rev Log: Streamline freeldr now that we're in BE all the way. Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s Removed: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Removed: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s (removed) @@ -1,445 +1,0 @@ - .section .text - .globl ofw_functions - .globl ofw_call_addr -call_ofw: - /* R3 has the function offset to call (n * 4) - * Other arg registers are unchanged. */ - subi %r1,%r1,0x100 - stw %r8,24(%r1) - mflr %r8 - stw %r8,0(%r1) - stw %r3,4(%r1) - stw %r4,8(%r1) - stw %r5,12(%r1) - stw %r6,16(%r1) - stw %r7,20(%r1) - stw %r9,28(%r1) - stw %r10,32(%r1) - stw %r20,36(%r1) - - lis %r10,0xe00000@ha - addi %r8,%r10,ofw_functions@l - add %r8,%r3,%r8 - lwz %r9,0(%r8) - mtctr %r9 - - mr %r3,%r4 - mr %r4,%r5 - mr %r5,%r6 - mr %r6,%r7 - mr %r7,%r8 - mr %r8,%r9 - - /* Call ofw proxy function */ - bctrl - - lwz %r8,0(%r1) - mtlr %r8 - lwz %r4,8(%r1) - lwz %r5,12(%r1) - lwz %r6,16(%r1) - lwz %r7,20(%r1) - lwz %r8,24(%r1) - lwz %r9,28(%r1) - lwz %r10,32(%r1) - lwz %r20,36(%r1) - addi %r1,%r1,0x100 - blr - -prim_strlen: - mr %r5,%r3 -prim_strlen_loop: - lbz %r4,0(%r3) - cmpi 0,0,%r4,0 - beq prim_strlen_done - addi %r3,%r3,1 - b prim_strlen_loop - -prim_strlen_done: - sub %r3,%r3,%r5 - blr - -copy_bits: - cmp 0,0,%r3,%r4 - bgelr - - andi. %r6,%r3,0xfff - beql ofw_dumpregs - mtdec %r3 - - lwz %r6,0(%r3) - stw %r6,0(%r5) - addi %r3,%r3,4 - addi %r5,%r5,4 - b copy_bits - -ofw_print_string: - /* Reserve some stack space */ - subi %r1,%r1,32 - - /* Save args */ - stw %r3,0(%r1) - - /* Save the lr, a scratch register */ - stw %r8,8(%r1) - mflr %r8 - stw %r8,12(%r1) - - /* Load the package name */ - lis %r3,0xe00000@ha - addi %r3,%r3,ofw_chosen_name - _start - - /* Fire */ - bl ofw_finddevice - - /* Load up for getprop */ - stw %r3,16(%r1) - - lis %r4,0xe00000@ha - addi %r4,%r4,ofw_stdout_name - _start - - addi %r5,%r1,20 - - li %r6,4 - - bl ofw_getprop - - /* Measure the string and remember the length */ - lwz %r3,0(%r1) - bl prim_strlen - mr %r5,%r3 - - lwz %r3,20(%r1) - lwz %r4,0(%r1) - - /* Write the string */ - bl ofw_write - - /* Return */ - lwz %r8,12(%r1) - mtlr %r8 - lwz %r8,8(%r1) - - addi %r1,%r1,32 - blr - - /* Print 8 hex digits representing a number in r3 */ -ofw_print_number: - subi %r1,%r1,32 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - stw %r9,8(%r1) - - xor %r9,%r9,%r9 - stw %r9,12(%r1) - - /* Set up and, devide, shift */ - mr %r8,%r3 - lis %r6,0xf0000000@ha - lis %r7,0x10000000@ha - li %r9,8 - -ofw_number_loop: - nop - cmpi 0,0,%r9,0 - beq ofw_number_return - subi %r9,%r9,1 - - /* Body: isolate digit, divide, print */ - and %r5,%r6,%r8 - divwu %r4,%r5,%r7 - srwi %r6,%r6,4 - srwi %r7,%r7,4 - - nop - - cmpi 0,0,%r4,10 - bge ofw_number_letter - addi %r4,%r4,'0' - b ofw_number_digit_out - -ofw_number_letter: - addi %r4,%r4,'A' - 10 - -ofw_number_digit_out: - stb %r4,12(%r1) - addi %r3,%r1,12 - - stw %r6,16(%r1) - stw %r7,20(%r1) - stw %r8,24(%r1) - stw %r9,28(%r1) - - bl ofw_print_string - - lwz %r6,16(%r1) - lwz %r7,20(%r1) - lwz %r8,24(%r1) - lwz %r9,28(%r1) - - b ofw_number_loop - -ofw_number_return: - /* Return */ - lwz %r9,8(%r1) - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,32 - blr - -ofw_print_eol: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x0d0a - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_nothing: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_print_space: - subi %r1,%r1,16 - stw %r8,0(%r1) - mflr %r8 - stw %r8,4(%r1) - li %r4,0x2000 - sth %r4,8(%r1) - xor %r4,%r4,%r4 - sth %r4,10(%r1) - addi %r3,%r1,8 - bl ofw_print_string - lwz %r8,4(%r1) - mtlr %r8 - lwz %r8,0(%r1) - addi %r1,%r1,16 - blr - -ofw_dumpregs: - /* Construct ofw exit call */ - subi %r1,%r1,0xa0 - - stw %r0,0(%r1) - stw %r1,4(%r1) - stw %r2,8(%r1) - stw %r3,12(%r1) - - stw %r4,16(%r1) - stw %r5,20(%r1) - stw %r6,24(%r1) - stw %r7,28(%r1) - - stw %r8,32(%r1) - stw %r9,36(%r1) - stw %r10,40(%r1) - stw %r11,44(%r1) - - stw %r12,48(%r1) - stw %r13,52(%r1) - stw %r14,56(%r1) - stw %r15,60(%r1) - - stw %r16,64(%r1) - stw %r17,68(%r1) - stw %r18,72(%r1) - stw %r19,76(%r1) - - stw %r20,80(%r1) - stw %r21,84(%r1) - stw %r22,88(%r1) - stw %r23,92(%r1) - - stw %r24,96(%r1) - stw %r25,100(%r1) - stw %r26,104(%r1) - stw %r27,108(%r1) - - stw %r28,112(%r1) - stw %r29,116(%r1) - stw %r30,120(%r1) - stw %r31,124(%r1) - - mflr %r0 - stw %r0,128(%r1) - mfcr %r0 - stw %r0,132(%r1) - mfctr %r0 - stw %r0,136(%r1) - mfmsr %r0 - stw %r0,140(%r1) - - /* Count at zero */ - xor %r0,%r0,%r0 - stw %r0,144(%r1) - mr %r3,%r1 - stw %r3,148(%r1) - - /* Body, print the regname, then the register */ -ofw_register_loop: - lwz %r3,144(%r1) - cmpi 0,0,%r3,32 - beq ofw_register_special - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_init - _start - bl ofw_print_string - lwz %r3,144(%r1) - bl ofw_print_number - bl ofw_print_space - lwz %r3,144(%r1) - mulli %r3,%r3,4 - add %r3,%r1,%r3 - lwz %r3,0(%r3) - stw %r3,152(%r1) - bl ofw_print_number - lwz %r3,144(%r1) - addi %r3,%r3,1 - stw %r3,144(%r1) - - bl ofw_print_space - - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_init - _start - bl ofw_print_string - lwz %r3,144(%r1) - bl ofw_print_number - bl ofw_print_space - lwz %r3,144(%r1) - mulli %r3,%r3,4 - add %r3,%r1,%r3 - lwz %r3,0(%r3) - stw %r3,152(%r1) - bl ofw_print_number - lwz %r3,144(%r1) - addi %r3,%r3,1 - stw %r3,144(%r1) - - b done_dump - -dump_optional: - bl ofw_print_space - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,0(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,4(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,8(%r3) - bl ofw_print_number - bl ofw_print_space - lwz %r3,152(%r1) - lwz %r3,12(%r3) - bl ofw_print_number - bl ofw_print_space -done_dump: - bl ofw_print_eol - b ofw_register_loop - -ofw_register_special: - /* LR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_lr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,128(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_cr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,132(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* CTR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_ctr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,136(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* MSR */ - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_reg_msr - _start - bl ofw_print_string - bl ofw_print_space - lwz %r3,140(%r1) - bl ofw_print_number - bl ofw_print_eol - - /* Return */ - lwz %r0,128(%r1) - mtlr %r0 - - lwz %r0,0(%r1) - lwz %r2,8(%r1) - lwz %r3,12(%r1) - - lwz %r4,16(%r1) - lwz %r5,20(%r1) - lwz %r6,24(%r1) - lwz %r7,28(%r1) - - addi %r1,%r1,0xa0 - - blr - -ofw_chosen_name: - .ascii "/chosen\0" - -ofw_stdout_name: - .ascii "stdout\0" - -ofw_memory_name: - .ascii "/memory@0\0" - -ofw_reg_name: - .ascii "reg\0" - -freeldr_reg_init: - .ascii "r\0" - -freeldr_reg_lr: - .ascii "lr \0" - -freeldr_reg_cr: - .ascii "cr \0" - -freeldr_reg_ctr: - .ascii "ctr\0" - -freeldr_reg_msr: - .ascii "msr\0" Removed: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (removed) @@ -1,105 +1,0 @@ - .section .text - -_start: - .long 0xe00000 + 12 - .long 0 - .long 0 - - .globl _begin - .globl call_ofw - .globl ofw_functions -_begin: - sync - isync - - lis %r1,stack@ha - addi %r1,%r1,stack@l - addi %r1,%r1,16384 - 0x10 - - /* Store ofw call addr */ - mr %r21,%r5 - lis %r10,0xe00000@ha - stw %r5,ofw_call_addr - _start@l(%r10) - - lis %r3,0xe00000@ha - addi %r3,%r3,freeldr_banner - _start - - bl ofw_print_string - bl ofw_print_eol - bl zero_registers - - /* Zero CTR */ - mtcr %r31 - - lis %r3,0xe17000@ha - addi %r3,%r3,0xe17000@l - - mtlr %r3 - lis %r3,0xe00000@ha - addi %r3,%r3,call_ofw - _start@l - - blr - -zero_registers: - xor %r2,%r2,%r2 - mr %r0,%r2 - mr %r3,%r2 - - mr %r4,%r2 - mr %r5,%r2 - mr %r6,%r2 - mr %r7,%r2 - - mr %r8,%r2 - mr %r9,%r2 - mr %r10,%r2 - mr %r11,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r12,%r2 - mr %r13,%r2 - mr %r14,%r2 - mr %r15,%r2 - - mr %r16,%r2 - mr %r17,%r2 - mr %r18,%r2 - mr %r19,%r2 - - mr %r20,%r2 - mr %r21,%r2 - mr %r22,%r2 - mr %r23,%r2 - - mr %r24,%r2 - mr %r25,%r2 - mr %r26,%r2 - mr %r27,%r2 - - mr %r28,%r2 - mr %r29,%r2 - mr %r30,%r2 - mr %r31,%r2 - - blr - -freeldr_banner: - .ascii "ReactOS OpenFirmware Boot Program\r\n\0" - -freeldr_halt: - .ascii "ReactOS OpenFirmware Boot Program Halting\r\n\0" - -ofw_memory_size: - .long 0 - .long 0 - .long 0 - .long 0 - - .org 0x1000 -stack: - .space 0x4000 - Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/boot.s Mon Apr 16 17:48:22 2007 @@ -1,6 +1,90 @@ + .section ".text" .extern PpcInit + .globl _start + .globl call_ofw _start: - b PpcInit + sync + isync + + lis %r1,stack@ha + addi %r1,%r1,stack@l + addi %r1,%r1,16384 - 0x10 + + /* Store ofw call addr */ + mr %r21,%r5 + lis %r10,ofw_call_addr@ha + stw %r5,ofw_call_addr@l(%r10) + + bl zero_registers + + /* Zero CTR */ + mtcr %r31 + + lis %r3,PpcInit@ha + addi %r3,%r3,PpcInit@l + mtlr %r3 + + lis %r3,call_ofw@ha + addi %r3,%r3,call_ofw@l + + blr + +zero_registers: + xor %r2,%r2,%r2 + mr %r0,%r2 + mr %r3,%r2 + + mr %r4,%r2 + mr %r5,%r2 + mr %r6,%r2 + mr %r7,%r2 + + mr %r8,%r2 + mr %r9,%r2 + mr %r10,%r2 + mr %r11,%r2 + + mr %r12,%r2 + mr %r13,%r2 + mr %r14,%r2 + mr %r15,%r2 + + mr %r12,%r2 + mr %r13,%r2 + mr %r14,%r2 + mr %r15,%r2 + + mr %r16,%r2 + mr %r17,%r2 + mr %r18,%r2 + mr %r19,%r2 + + mr %r20,%r2 + mr %r21,%r2 + mr %r22,%r2 + mr %r23,%r2 + + mr %r24,%r2 + mr %r25,%r2 + mr %r26,%r2 + mr %r27,%r2 + + mr %r28,%r2 + mr %r29,%r2 + mr %r30,%r2 + mr %r31,%r2 + + blr + +ofw_memory_size: + .long 0 + .long 0 + .long 0 + .long 0 + + .org 0x1000 +stack: + .space 0x4000 .globl _bss .section ".bss" Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Mon Apr 16 17:48:22 2007 @@ -28,7 +28,8 @@ extern ULONG CacheSizeLimit; of_proxy ofproxy; void *PageDirectoryStart, *PageDirectoryEnd; -static int chosen_package, stdin_handle, part_handle = -1, kernel_mem = 0; +static int chosen_package, stdin_handle, stdout_handle, + part_handle = -1, kernel_mem = 0; int mmu_handle = 0, FixedMemory = 0; BOOLEAN AcpiPresent = FALSE; char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; @@ -41,7 +42,7 @@ if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } else { buf[0] = ch; buf[1] = 0; } buf[2] = 0; - ofw_print_string( buf ); + ofw_write(stdout_handle, buf, strlen(buf)); } int PpcFindDevice( int depth, int parent, char *devname, int *nth ) { @@ -93,7 +94,6 @@ } void PpcVideoClearScreen( UCHAR Attr ) { - ofw_print_string("ClearScreen\n"); } VOID PpcVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) { @@ -494,7 +494,7 @@ extern int _bss; typedef unsigned int uint32_t; void PpcInit( of_proxy the_ofproxy ) { - int len, stdin_handle_chosen, mmu_handle_chosen; + int len; ofproxy = the_ofproxy; //SetPhys(0x900, (19 << 26) | (50 << 1)); @@ -502,16 +502,11 @@ chosen_package = ofw_finddevice( "/chosen" ); ofw_getprop( chosen_package, "stdin", - (char *)&stdin_handle_chosen, sizeof(stdin_handle_chosen) ); + (char *)&stdin_handle, sizeof(stdin_handle) ); + ofw_getprop( chosen_package, "stdout", + (char *)&stdout_handle, sizeof(stdout_handle) ); ofw_getprop( chosen_package, "mmu", - (char *)&mmu_handle_chosen, sizeof(mmu_handle_chosen) ); - - ofw_print_string("Found stdin "); - ofw_print_number(stdin_handle_chosen); - ofw_print_string("\r\n"); - - stdin_handle = stdin_handle_chosen; - mmu_handle = mmu_handle_chosen; + (char *)&mmu_handle, sizeof(mmu_handle) ); MachVtbl.ConsPutChar = PpcPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s Mon Apr 16 17:48:22 2007 @@ -1,0 +1,49 @@ + .section .text + .globl ofw_functions + .globl ofw_call_addr + .globl call_ofw +call_ofw: + /* R3 has the function offset to call (n * 4) + * Other arg registers are unchanged. */ + subi %r1,%r1,0x100 + stw %r8,24(%r1) + mflr %r8 + stw %r8,0(%r1) + stw %r3,4(%r1) + stw %r4,8(%r1) + stw %r5,12(%r1) + stw %r6,16(%r1) + stw %r7,20(%r1) + stw %r9,28(%r1) + stw %r10,32(%r1) + stw %r20,36(%r1) + + lis %r10,ofw_functions@ha + addi %r8,%r10,ofw_functions@l + add %r8,%r3,%r8 + lwz %r9,0(%r8) + mtctr %r9 + + mr %r3,%r4 + mr %r4,%r5 + mr %r5,%r6 + mr %r6,%r7 + mr %r7,%r8 + mr %r8,%r9 + + /* Call ofw proxy function */ + bctrl + + lwz %r8,0(%r1) + mtlr %r8 + lwz %r4,8(%r1) + lwz %r5,12(%r1) + lwz %r6,16(%r1) + lwz %r7,20(%r1) + lwz %r8,24(%r1) + lwz %r9,28(%r1) + lwz %r10,32(%r1) + lwz %r20,36(%r1) + addi %r1,%r1,0x100 + blr + Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Mon Apr 16 17:48:22 2007 @@ -66,6 +66,8 @@ <compilerflag>-mno-toc</compilerflag> <compilerflag>-meabi</compilerflag> <file>boot.s</file> + <file>ofw_calls.s</file> + <file>ofw_util.s</file> <file>ofw.c</file> <file>mmu.c</file> <file>mach.c</file> Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Mon Apr 16 17:48:22 2007 @@ -20,12 +20,6 @@ package-to-path 3 1 int char*:arg2 int int # Declare the call-method BE function +call-method 0 0 -# Convenience functions that interact closely with OFW (written in BE asm) --dumpregs 0 0 --print_string 1 0 char* --print_number 1 0 int --print_eol 0 0 --print_space 0 0 # MMU Methods @phys2virt!translate 4 1 int int int int&0 int @virt2phys!translate 2 1 int int&1 int Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Mon Apr 16 17:48:22 2007 @@ -131,7 +131,7 @@ local_offset = (3 + rets + args) * 4; total_stack = round_up(12 + local_offset, 16); - function << "ofw_" << name << ":\n" + function << "asm_ofw_" << name << ":\n" << "\t/* Reserve stack space */\n" << "\tsubi %r1,%r1," << total_stack << "\n" << "\t/* Store r8, r9, lr */\n" @@ -140,8 +140,8 @@ << "\tmflr %r8\n" << "\tstw %r8," << (local_offset + 8) << "(%r1)\n" << "\t/* Get read name */\n" - << "\tlis %r8," << wrapper.base << "@ha\n" - << "\taddi %r9,%r8," << name << "_ofw_name - _start\n" + << "\tlis %r8," << name << "_ofw_name@ha\n" + << "\taddi %r9,%r8," << name << "_ofw_name@l\n" << "\tstw %r9,0(%r1)\n" << "\t/* " << args << " arguments and " << rets << " return */\n" << "\tli %r9," << args << "\n" @@ -153,7 +153,8 @@ function << "\tstw %r" << (i+3) << "," << (4 * (i + 3)) << "(%r1)\n"; function << "\t/* Load up the call address */\n" - << "\tlwz %r9,ofw_call_addr - _start(%r8)\n" + << "\tlis %r10,ofw_call_addr@ha\n" + << "\tlwz %r9,ofw_call_addr@l(%r10)\n" << "\tmtlr %r9\n" << "\t/* Set argument */\n" << "\tmr %r3,%r1\n" @@ -228,7 +229,7 @@ } if( !method_call ) { wrapper.names += name + "_ofw_name:\n\t.asciz \"" + nametext + "\"\n"; - wrapper.calltable += std::string("\t.long ofw_") + name + "\n"; + wrapper.calltable += std::string("\t.long asm_ofw_") + name + "\n"; wrapper.ctindex++; } } @@ -286,6 +287,7 @@ << "\t.section .text\n" << "\t.align 4\n" << "\t.globl _start\n" + << "\t.globl ofw_functions\n" << "\t.globl ofw_call_addr\n" << "ofw_call_addr:\n" << "\t.long 0\n" @@ -294,6 +296,7 @@ << "\n/* Function Names */\n\n" << wrappers.names << "\n/* Function Call Table for Freeldr */\n\n" + << "\t.align 4\n" << "ofw_functions:\n" << wrappers.calltable << "\n/* End */\n"; Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.mak Mon Apr 16 17:48:22 2007 @@ -5,7 +5,7 @@ OFW_INTERFACE_OUT = $(OUTPUT_)$(OFW_INTERFACE_BASE) OFW_INTERFACE_OUT_ = $(OFW_INTERFACE_OUT)$(SEP) -OFW_INTERFACE_OUTPUT = boot/freeldr/bootsect/ofw.s +OFW_INTERFACE_OUTPUT = boot/freeldr/freeldr/arch/powerpc/ofw_calls.s OFW_INTERFACE_SOURCE = boot/freeldr/freeldr/arch/powerpc/ofw.c OFW_INTERFACE_HEADER = boot/freeldr/freeldr/include/of_call.h OFW_INTERFACE_INPUT = $(OFW_INTERFACE_BASE_)calls.ofw Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Mon Apr 16 17:48:22 2007 @@ -5,6 +5,8 @@ -g -nostartfiles -nostdlib -N -Ttext=0xe17000 \ -o freeldr.elf \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_util.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw_calls.o \ obj-ppc/boot/freeldr/freeldr/cache/blocklist.o \ obj-ppc/boot/freeldr/freeldr/cache/cache.o \ obj-ppc/boot/freeldr/freeldr/comm/rs232.o \ @@ -63,9 +65,3 @@ obj-ppc/lib/string/string.a \ obj-ppc/lib/rtl/rtl.a \ /usr/local/pkg/reactos-powerpc/lib/libgcc.a -powerpc-unknown-linux-gnu-objcopy -O binary freeldr.elf freeldr.tmp -(dd if=/dev/zero bs=4k count=16 ; echo 'byebye') >> freeldr.tmp -powerpc-unknown-linux-gnu-objcopy -I binary -B powerpc:common -O elf32-powerpc freeldr.tmp ofwldr.payload -reactos-powerpc-as -mbig -o ofwboot.o boot/freeldr/bootsect/ofwboot.s boot/freeldr/bootsect/ofw_util.s boot/freeldr/bootsect/ofw.s -powerpc-unknown-linux-gnu-ld -EB -Ttext 0xe00000 -Tdata 0xe17000 -e _begin -o ofwldr.x ofwboot.o ofwldr.payload -powerpc-unknown-linux-gnu-objcopy --only-section=.text --only-section=.data --only-section=.bss ofwldr.x ofwldr

1 0

[greatlrd] 26363: Wrote two new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 16 Apr '07

16 Apr '07

Author: greatlrd Date: Mon Apr 16 10:46:25 2007 New Revision: 26363 URL: http://svn.reactos.org/svn/reactos?rev=26363&view=rev Log: Wrote two new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/d3d9caps.h (with props) trunk/reactos/include/dxsdk/d3dcaps.h (with props) Added: trunk/reactos/include/dxsdk/d3d9caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3d9caps.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/d3d9caps.h (added) +++ trunk/reactos/include/dxsdk/d3d9caps.h Mon Apr 16 10:46:25 2007 @@ -1,0 +1,339 @@ +#ifndef _d3d9CAPS_H +#define _d3d9CAPS_H + +#ifndef DIRECT3D_VERSION +#define DIRECT3D_VERSION 0x0900 +#endif //DIRECT3D_VERSION + +// include this file content only if compiling for DX9 interfaces +#if(DIRECT3D_VERSION >= 0x0900) + +#if defined(_X86_) || defined(_IA64) +#pragma pack(4) +#endif + + +#define D3DCAPS_READ_SCANLINE 0x00020000 +#define D3DCAPS2_FULLSCREENGAMMA 0x00020000 +#define D3DCAPS2_CANCALIBRATEGAMMA 0x00100000 +#define D3DCAPS2_RESERVED 0x02000000 +#define D3DCAPS2_CANMANAGERESOURCE 0x10000000 +#define D3DCAPS2_DYNAMICTEXTURES 0x20000000 +#define D3DCAPS2_CANAUTOGENMIPMAP 0x40000000 +#define D3DCAPS3_RESERVED 0x8000001F +#define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020 +#define D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080 +#define D3DCAPS3_COPY_TO_VIDMEM 0x00000100 +#define D3DCAPS3_COPY_TO_SYSTEMMEM 0x00000200 +#define D3DPRESENT_INTERVAL_DEFAULT 0x00000000 +#define D3DPRESENT_INTERVAL_ONE 0x00000001 +#define D3DPRESENT_INTERVAL_TWO 0x00000002 +#define D3DPRESENT_INTERVAL_THREE 0x00000004 +#define D3DPRESENT_INTERVAL_FOUR 0x00000008 +#define D3DPRESENT_INTERVAL_IMMEDIATE 0x80000000 +#define D3DCURSORCAPS_COLOR 0x00000001 +#define D3DCURSORCAPS_LOWRES 0x00000002 +#define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010 +#define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020 +#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040 +#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080 +#define D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100 +#define D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200 +#define D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400 +#define D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800 +#define D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000 +#define D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000 +#define D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000 +#define D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000 +#define D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000 +#define D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000 +#define D3DDEVCAPS_HWRASTERIZATION 0x00080000 +#define D3DDEVCAPS_PUREDEVICE 0x00100000 +#define D3DDEVCAPS_QUINTICRTPATCHES 0x00200000 +#define D3DDEVCAPS_RTPATCHES 0x00400000 +#define D3DDEVCAPS_RTPATCHHANDLEZERO 0x00800000 +#define D3DDEVCAPS_NPATCHES 0x01000000 +#define D3DPMISCCAPS_MASKZ 0x00000002 +#define D3DPMISCCAPS_CULLNONE 0x00000010 +#define D3DPMISCCAPS_CULLCW 0x00000020 +#define D3DPMISCCAPS_CULLCCW 0x00000040 +#define D3DPMISCCAPS_COLORWRITEENABLE 0x00000080 +#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x00000100 +#define D3DPMISCCAPS_CLIPTLVERTS 0x00000200 +#define D3DPMISCCAPS_TSSARGTEMP 0x00000400 +#define D3DPMISCCAPS_BLENDOP 0x00000800 +#define D3DPMISCCAPS_NULLREFERENCE 0x00001000 +#define D3DPMISCCAPS_INDEPENDENTWRITEMASKS 0x00004000 +#define D3DPMISCCAPS_PERSTAGECONSTANT 0x00008000 +#define D3DPMISCCAPS_FOGANDSPECULARALPHA 0x00010000 +#define D3DPMISCCAPS_SEPARATEALPHABLEND 0x00020000 +#define D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS 0x00040000 +#define D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000 +#define D3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000 +#define D3DLINECAPS_TEXTURE 0x00000001 +#define D3DLINECAPS_ZTEST 0x00000002 +#define D3DLINECAPS_BLEND 0x00000004 +#define D3DLINECAPS_ALPHACMP 0x00000008 +#define D3DLINECAPS_FOG 0x00000010 +#define D3DLINECAPS_ANTIALIAS 0x00000020 +#define D3DPRASTERCAPS_DITHER 0x00000001 +#define D3DPRASTERCAPS_ZTEST 0x00000010 +#define D3DPRASTERCAPS_FOGVERTEX 0x00000080 +#define D3DPRASTERCAPS_FOGTABLE 0x00000100 +#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 +#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 +#define D3DPRASTERCAPS_FOGRANGE 0x00010000 +#define D3DPRASTERCAPS_ANISOTROPY 0x00020000 +#define D3DPRASTERCAPS_WBUFFER 0x00040000 +#define D3DPRASTERCAPS_WFOG 0x00100000 +#define D3DPRASTERCAPS_ZFOG 0x00200000 +#define D3DPRASTERCAPS_COLORPERSPECTIVE 0x00400000 +#define D3DPRASTERCAPS_SCISSORTEST 0x01000000 +#define D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS 0x02000000 +#define D3DPRASTERCAPS_DEPTHBIAS 0x04000000 +#define D3DPRASTERCAPS_MULTISAMPLE_TOGGLE 0x08000000 +#define D3DPCMPCAPS_NEVER 0x00000001 +#define D3DPCMPCAPS_LESS 0x00000002 +#define D3DPCMPCAPS_EQUAL 0x00000004 +#define D3DPCMPCAPS_LESSEQUAL 0x00000008 +#define D3DPCMPCAPS_GREATER 0x00000010 +#define D3DPCMPCAPS_NOTEQUAL 0x00000020 +#define D3DPCMPCAPS_GREATEREQUAL 0x00000040 +#define D3DPCMPCAPS_ALWAYS 0x00000080 +#define D3DPBLENDCAPS_ZERO 0x00000001 +#define D3DPBLENDCAPS_ONE 0x00000002 +#define D3DPBLENDCAPS_SRCCOLOR 0x00000004 +#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008 +#define D3DPBLENDCAPS_SRCALPHA 0x00000010 +#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020 +#define D3DPBLENDCAPS_DESTALPHA 0x00000040 +#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080 +#define D3DPBLENDCAPS_DESTCOLOR 0x00000100 +#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200 +#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400 +#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 +#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 +#define D3DPBLENDCAPS_BLENDFACTOR 0x00002000 +#define D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008 +#define D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200 +#define D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000 +#define D3DPSHADECAPS_FOGGOURAUD 0x00080000 +#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001 +#define D3DPTEXTURECAPS_POW2 0x00000002 +#define D3DPTEXTURECAPS_ALPHA 0x00000004 +#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020 +#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040 +#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080 +#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100 +#define D3DPTEXTURECAPS_PROJECTED 0x00000400 +#define D3DPTEXTURECAPS_CUBEMAP 0x00000800 +#define D3DPTEXTURECAPS_VOLUMEMAP 0x00002000 +#define D3DPTEXTURECAPS_MIPMAP 0x00004000 +#define D3DPTEXTURECAPS_MIPVOLUMEMAP 0x00008000 +#define D3DPTEXTURECAPS_MIPCUBEMAP 0x00010000 +#define D3DPTEXTURECAPS_CUBEMAP_POW2 0x00020000 +#define D3DPTEXTURECAPS_VOLUMEMAP_POW2 0x00040000 +#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV 0x00200000 +#define D3DPTFILTERCAPS_MINFPOINT 0x00000100 +#define D3DPTFILTERCAPS_MINFLINEAR 0x00000200 +#define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400 +#define D3DPTFILTERCAPS_MINFPYRAMIDALQUAD 0x00000800 +#define D3DPTFILTERCAPS_MINFGAUSSIANQUAD 0x00001000 +#define D3DPTFILTERCAPS_MIPFPOINT 0x00010000 +#define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000 +#define D3DPTFILTERCAPS_MAGFPOINT 0x01000000 +#define D3DPTFILTERCAPS_MAGFLINEAR 0x02000000 +#define D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000 +#define D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD 0x08000000 +#define D3DPTFILTERCAPS_MAGFGAUSSIANQUAD 0x10000000 +#define D3DPTADDRESSCAPS_WRAP 0x00000001 +#define D3DPTADDRESSCAPS_MIRROR 0x00000002 +#define D3DPTADDRESSCAPS_CLAMP 0x00000004 +#define D3DPTADDRESSCAPS_BORDER 0x00000008 +#define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010 +#define D3DPTADDRESSCAPS_MIRRORONCE 0x00000020 +#define D3DSTENCILCAPS_KEEP 0x00000001 +#define D3DSTENCILCAPS_ZERO 0x00000002 +#define D3DSTENCILCAPS_REPLACE 0x00000004 +#define D3DSTENCILCAPS_INCRSAT 0x00000008 +#define D3DSTENCILCAPS_DECRSAT 0x00000010 +#define D3DSTENCILCAPS_INVERT 0x00000020 +#define D3DSTENCILCAPS_INCR 0x00000040 +#define D3DSTENCILCAPS_DECR 0x00000080 +#define D3DSTENCILCAPS_TWOSIDED 0x00000100 +#define D3DTEXOPCAPS_DISABLE 0x00000001 +#define D3DTEXOPCAPS_SELECTARG1 0x00000002 +#define D3DTEXOPCAPS_SELECTARG2 0x00000004 +#define D3DTEXOPCAPS_MODULATE 0x00000008 +#define D3DTEXOPCAPS_MODULATE2X 0x00000010 +#define D3DTEXOPCAPS_MODULATE4X 0x00000020 +#define D3DTEXOPCAPS_ADD 0x00000040 +#define D3DTEXOPCAPS_ADDSIGNED 0x00000080 +#define D3DTEXOPCAPS_ADDSIGNED2X 0x00000100 +#define D3DTEXOPCAPS_SUBTRACT 0x00000200 +#define D3DTEXOPCAPS_ADDSMOOTH 0x00000400 +#define D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800 +#define D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000 +#define D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000 +#define D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000 +#define D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000 +#define D3DTEXOPCAPS_PREMODULATE 0x00010000 +#define D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000 +#define D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000 +#define D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000 +#define D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000 +#define D3DTEXOPCAPS_BUMPENVMAP 0x00200000 +#define D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000 +#define D3DTEXOPCAPS_DOTPRODUCT3 0x00800000 +#define D3DTEXOPCAPS_MULTIPLYADD 0x01000000 +#define D3DTEXOPCAPS_LERP 0x02000000 +#define D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000FFFF +#define D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000 +#define D3DFVFCAPS_PSIZE 0x00100000 +#define D3DVTXPCAPS_TEXGEN 0x00000001 +#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002 +#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008 +#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010 +#define D3DVTXPCAPS_LOCALVIEWER 0x00000020 +#define D3DVTXPCAPS_TWEENING 0x00000040 +#define D3DVTXPCAPS_TEXGEN_SPHEREMAP 0x00000100 +#define D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER 0x00000200 +#define D3DDEVCAPS2_STREAMOFFSET 0x00000001 +#define D3DDEVCAPS2_DMAPNPATCH 0x00000002 +#define D3DDEVCAPS2_ADAPTIVETESSRTPATCH 0x00000004 +#define D3DDEVCAPS2_ADAPTIVETESSNPATCH 0x00000008 +#define D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES 0x00000010 +#define D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH 0x00000020 +#define D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET 0x00000040 +#define D3DDTCAPS_UBYTE4 0x00000001 +#define D3DDTCAPS_UBYTE4N 0x00000002 +#define D3DDTCAPS_SHORT2N 0x00000004 +#define D3DDTCAPS_SHORT4N 0x00000008 +#define D3DDTCAPS_USHORT2N 0x00000010 +#define D3DDTCAPS_USHORT4N 0x00000020 +#define D3DDTCAPS_UDEC3 0x00000040 +#define D3DDTCAPS_DEC3N 0x00000080 +#define D3DDTCAPS_FLOAT16_2 0x00000100 +#define D3DDTCAPS_FLOAT16_4 0x00000200 +#define D3DVS20CAPS_PREDICATION (1<<0) +#define D3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 +#define D3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH 0 +#define D3DVS20_MAX_NUMTEMPS 32 +#define D3DVS20_MIN_NUMTEMPS 12 +#define D3DVS20_MAX_STATICFLOWCONTROLDEPTH 4 +#define D3DVS20_MIN_STATICFLOWCONTROLDEPTH 1 +#define D3DPS20CAPS_ARBITRARYSWIZZLE (1<<0) +#define D3DPS20CAPS_GRADIENTINSTRUCTIONS (1<<1) +#define D3DPS20CAPS_PREDICATION (1<<2) +#define D3DPS20CAPS_NODEPENDENTREADLIMIT (1<<3) +#define D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT (1<<4) +#define D3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 +#define D3DPS20_MIN_DYNAMICFLOWCONTROLDEPTH 0 +#define D3DPS20_MAX_NUMTEMPS 32 +#define D3DPS20_MIN_NUMTEMPS 12 +#define D3DPS20_MAX_STATICFLOWCONTROLDEPTH 4 +#define D3DPS20_MIN_STATICFLOWCONTROLDEPTH 0 +#define D3DPS20_MAX_NUMINSTRUCTIONSLOTS 512 +#define D3DPS20_MIN_NUMINSTRUCTIONSLOTS 96 +#define D3DMIN30SHADERINSTRUCTIONS 512 +#define D3DMAX30SHADERINSTRUCTIONS 32768 + + + +typedef struct _D3DVSHADERCAPS2_0 +{ + DWORD Caps; + INT DynamicFlowControlDepth; + INT NumTemps; + INT StaticFlowControlDepth; +} D3DVSHADERCAPS2_0; + + +typedef struct _D3DPSHADERCAPS2_0 +{ + DWORD Caps; + INT DynamicFlowControlDepth; + INT NumTemps; + INT StaticFlowControlDepth; + INT NumInstructionSlots; +} D3DPSHADERCAPS2_0; + + +typedef struct _D3DCAPS9 +{ + D3DDEVTYPE DeviceType; + UINT AdapterOrdinal; + DWORD Caps; + DWORD Caps2; + DWORD Caps3; + DWORD PresentationIntervals; + DWORD CursorCaps; + DWORD DevCaps; + DWORD PrimitiveMiscCaps; + DWORD RasterCaps; + DWORD ZCmpCaps; + DWORD SrcBlendCaps; + DWORD DestBlendCaps; + DWORD AlphaCmpCaps; + DWORD ShadeCaps; + DWORD TextureCaps; + DWORD TextureFilterCaps; + DWORD CubeTextureFilterCaps; + DWORD VolumeTextureFilterCaps; + DWORD TextureAddressCaps; + DWORD VolumeTextureAddressCaps; + DWORD LineCaps; + DWORD MaxTextureWidth; + DWORD MaxTextureHeight; + DWORD MaxVolumeExtent; + DWORD MaxTextureRepeat; + DWORD MaxTextureAspectRatio; + DWORD MaxAnisotropy; + float MaxVertexW; + float GuardBandLeft; + float GuardBandTop; + float GuardBandRight; + float GuardBandBottom; + float ExtentsAdjust; + DWORD StencilCaps; + DWORD FVFCaps; + DWORD TextureOpCaps; + DWORD MaxTextureBlendStages; + DWORD MaxSimultaneousTextures; + DWORD VertexProcessingCaps; + DWORD MaxActiveLights; + DWORD MaxUserClipPlanes; + DWORD MaxVertexBlendMatrices; + DWORD MaxVertexBlendMatrixIndex; + float MaxPointSize; + DWORD MaxPrimitiveCount; + DWORD MaxVertexIndex; + DWORD MaxStreams; + DWORD MaxStreamStride; + DWORD VertexShaderVersion; + DWORD MaxVertexShaderConst; + DWORD PixelShaderVersion; + float PixelShader1xMaxValue; + DWORD DevCaps2; + float MaxNpatchTessellationLevel; + DWORD Reserved5; + UINT MasterAdapterOrdinal; + UINT AdapterOrdinalInGroup; + UINT NumberOfAdaptersInGroup; + DWORD DeclTypes; + DWORD NumSimultaneousRTs; + DWORD StretchRectFilterCaps; + D3DVSHADERCAPS2_0 VS20Caps; + D3DPSHADERCAPS2_0 PS20Caps; + DWORD VertexTextureFilterCaps; + DWORD MaxVShaderInstructionsExecuted; + DWORD MaxPShaderInstructionsExecuted; + DWORD MaxVertexShader30InstructionSlots; + DWORD MaxPixelShader30InstructionSlots; +} D3DCAPS9; + +#pragma pack() + +#endif +#endif + Propchange: trunk/reactos/include/dxsdk/d3d9caps.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dcaps.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/d3dcaps.h (added) +++ trunk/reactos/include/dxsdk/d3dcaps.h Mon Apr 16 10:46:25 2007 @@ -1,0 +1,423 @@ + +#ifndef _D3DCAPS_H +#define _D3DCAPS_H + +#include "ddraw.h" + +#ifndef DIRECT3D_VERSION +#define DIRECT3D_VERSION 0x0700 +#endif + +#if defined(_X86_) || defined(_IA64_) +#pragma pack(4) +#endif + +#define D3DTRANSFORMCAPS_CLIP 0x00000001 +#define D3DLIGHTINGMODEL_RGB 0x00000001 +#define D3DLIGHTINGMODEL_MONO 0x00000002 +#define D3DLIGHTCAPS_POINT 0x00000001 +#define D3DLIGHTCAPS_SPOT 0x00000002 +#define D3DLIGHTCAPS_DIRECTIONAL 0x00000004 +#define D3DPMISCCAPS_MASKPLANES 0x00000001 +#define D3DPMISCCAPS_MASKZ 0x00000002 +#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004 +#define D3DPMISCCAPS_CONFORMANT 0x00000008 +#define D3DPMISCCAPS_CULLNONE 0x00000010 +#define D3DPMISCCAPS_CULLCW 0x00000020 +#define D3DPMISCCAPS_CULLCCW 0x00000040 +#define D3DPRASTERCAPS_DITHER 0x00000001 +#define D3DPRASTERCAPS_ROP2 0x00000002 +#define D3DPRASTERCAPS_XOR 0x00000004 +#define D3DPRASTERCAPS_PAT 0x00000008 +#define D3DPRASTERCAPS_ZTEST 0x00000010 +#define D3DPRASTERCAPS_SUBPIXEL 0x00000020 +#define D3DPRASTERCAPS_SUBPIXELX 0x00000040 +#define D3DPRASTERCAPS_FOGVERTEX 0x00000080 +#define D3DPRASTERCAPS_FOGTABLE 0x00000100 +#define D3DPRASTERCAPS_STIPPLE 0x00000200 +#define D3DPCMPCAPS_NEVER 0x00000001 +#define D3DPCMPCAPS_LESS 0x00000002 +#define D3DPCMPCAPS_EQUAL 0x00000004 +#define D3DPCMPCAPS_LESSEQUAL 0x00000008 +#define D3DPCMPCAPS_GREATER 0x00000010 +#define D3DPCMPCAPS_NOTEQUAL 0x00000020 +#define D3DPCMPCAPS_GREATEREQUAL 0x00000040 +#define D3DPCMPCAPS_ALWAYS 0x00000080 +#define D3DPBLENDCAPS_ZERO 0x00000001 +#define D3DPBLENDCAPS_ONE 0x00000002 +#define D3DPBLENDCAPS_SRCCOLOR 0x00000004 +#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008 +#define D3DPBLENDCAPS_SRCALPHA 0x00000010 +#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020 +#define D3DPBLENDCAPS_DESTALPHA 0x00000040 +#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080 +#define D3DPBLENDCAPS_DESTCOLOR 0x00000100 +#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200 +#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400 +#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 +#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 +#define D3DPSHADECAPS_COLORFLATMONO 0x00000001 +#define D3DPSHADECAPS_COLORFLATRGB 0x00000002 +#define D3DPSHADECAPS_COLORGOURAUDMONO 0x00000004 +#define D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008 +#define D3DPSHADECAPS_COLORPHONGMONO 0x00000010 +#define D3DPSHADECAPS_COLORPHONGRGB 0x00000020 +#define D3DPSHADECAPS_SPECULARFLATMONO 0x00000040 +#define D3DPSHADECAPS_SPECULARFLATRGB 0x00000080 +#define D3DPSHADECAPS_SPECULARGOURAUDMONO 0x00000100 +#define D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200 +#define D3DPSHADECAPS_SPECULARPHONGMONO 0x00000400 +#define D3DPSHADECAPS_SPECULARPHONGRGB 0x00000800 +#define D3DPSHADECAPS_ALPHAFLATBLEND 0x00001000 +#define D3DPSHADECAPS_ALPHAFLATSTIPPLED 0x00002000 +#define D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000 +#define D3DPSHADECAPS_ALPHAGOURAUDSTIPPLED 0x00008000 +#define D3DPSHADECAPS_ALPHAPHONGBLEND 0x00010000 +#define D3DPSHADECAPS_ALPHAPHONGSTIPPLED 0x00020000 +#define D3DPSHADECAPS_FOGFLAT 0x00040000 +#define D3DPSHADECAPS_FOGGOURAUD 0x00080000 +#define D3DPSHADECAPS_FOGPHONG 0x00100000 +#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001 +#define D3DPTEXTURECAPS_POW2 0x00000002 +#define D3DPTEXTURECAPS_ALPHA 0x00000004 +#define D3DPTEXTURECAPS_TRANSPARENCY 0x00000008 +#define D3DPTEXTURECAPS_BORDER 0x00000010 +#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020 +#define D3DPTFILTERCAPS_NEAREST 0x00000001 +#define D3DPTFILTERCAPS_LINEAR 0x00000002 +#define D3DPTFILTERCAPS_MIPNEAREST 0x00000004 +#define D3DPTFILTERCAPS_MIPLINEAR 0x00000008 +#define D3DPTFILTERCAPS_LINEARMIPNEAREST 0x00000010 +#define D3DPTFILTERCAPS_LINEARMIPLINEAR 0x00000020 +#define D3DPTBLENDCAPS_DECAL 0x00000001 +#define D3DPTBLENDCAPS_MODULATE 0x00000002 +#define D3DPTBLENDCAPS_DECALALPHA 0x00000004 +#define D3DPTBLENDCAPS_MODULATEALPHA 0x00000008 +#define D3DPTBLENDCAPS_DECALMASK 0x00000010 +#define D3DPTBLENDCAPS_MODULATEMASK 0x00000020 +#define D3DPTBLENDCAPS_COPY 0x00000040 +#define D3DPTADDRESSCAPS_WRAP 0x00000001 +#define D3DPTADDRESSCAPS_MIRROR 0x00000002 +#define D3DPTADDRESSCAPS_CLAMP 0x00000004 +#define D3DDEVICEDESCSIZE (sizeof(D3DDEVICEDESC)) +#define D3DDEVICEDESC7SIZE (sizeof(D3DDEVICEDESC7)) +#define D3DDD_COLORMODEL 0x00000001 +#define D3DDD_DEVCAPS 0x00000002 +#define D3DDD_TRANSFORMCAPS 0x00000004 +#define D3DDD_LIGHTINGCAPS 0x00000008 +#define D3DDD_BCLIPPING 0x00000010 +#define D3DDD_LINECAPS 0x00000020 +#define D3DDD_TRICAPS 0x00000040 +#define D3DDD_DEVICERENDERBITDEPTH 0x00000080 +#define D3DDD_DEVICEZBUFFERBITDEPTH 0x00000100 +#define D3DDD_MAXBUFFERSIZE 0x00000200 +#define D3DDD_MAXVERTEXCOUNT 0x00000400 +#define D3DDEVCAPS_FLOATTLVERTEX 0x00000001 +#define D3DDEVCAPS_SORTINCREASINGZ 0x00000002 +#define D3DDEVCAPS_SORTDECREASINGZ 0X00000004 +#define D3DDEVCAPS_SORTEXACT 0x00000008 +#define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010 +#define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020 +#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040 +#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080 +#define D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100 +#define D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200 +#define D3DFDS_COLORMODEL 0x00000001 +#define D3DFDS_GUID 0x00000002 +#define D3DFDS_HARDWARE 0x00000004 +#define D3DFDS_TRIANGLES 0x00000008 +#define D3DFDS_LINES 0x00000010 +#define D3DFDS_MISCCAPS 0x00000020 +#define D3DFDS_RASTERCAPS 0x00000040 +#define D3DFDS_ZCMPCAPS 0x00000080 +#define D3DFDS_ALPHACMPCAPS 0x00000100 +#define D3DFDS_SRCBLENDCAPS 0x00000200 +#define D3DFDS_DSTBLENDCAPS 0x00000400 +#define D3DFDS_SHADECAPS 0x00000800 +#define D3DFDS_TEXTURECAPS 0x00001000 +#define D3DFDS_TEXTUREFILTERCAPS 0x00002000 +#define D3DFDS_TEXTUREBLENDCAPS 0x00004000 +#define D3DFDS_TEXTUREADDRESSCAPS 0x00008000 +#define D3DDEB_BUFSIZE 0x00000001 +#define D3DDEB_CAPS 0x00000002 +#define D3DDEB_LPDATA 0x00000004 +#define D3DDEBCAPS_SYSTEMMEMORY 0x00000001 +#define D3DDEBCAPS_VIDEOMEMORY 0x00000002 +#define D3DDEBCAPS_MEM (D3DDEBCAPS_SYSTEMMEMORY|D3DDEBCAPS_VIDEOMEMORY) + + + +#if(DIRECT3D_VERSION < 0x700) +#define D3DLIGHTCAPS_PARALLELPOINT 0x00000008 +#endif +#if(DIRECT3D_VERSION < 0x500) +#define D3DLIGHTCAPS_GLSPOT 0x00000010 +#endif + +#if(DIRECT3D_VERSION >= 0x0500) +#define D3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400 +#define D3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800 +#define D3DPRASTERCAPS_ANTIALIASEDGES 0x00001000 +#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 +#define D3DPRASTERCAPS_ZBIAS 0x00004000 +#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 +#define D3DPRASTERCAPS_FOGRANGE 0x00010000 +#define D3DPRASTERCAPS_ANISOTROPY 0x00020000 +#define D3DPTBLENDCAPS_ADD 0x00000080 +#define D3DPTADDRESSCAPS_BORDER 0x00000008 +#define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010 +#define D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400 +#define D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800 +#define D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000 +#endif + +#if(DIRECT3D_VERSION >= 0x0600) +#define D3DPRASTERCAPS_WBUFFER 0x00040000 +#define D3DPRASTERCAPS_TRANSLUCENTSORTINDEPENDENT 0x00080000 +#define D3DPRASTERCAPS_WFOG 0x00100000 +#define D3DPRASTERCAPS_ZFOG 0x00200000 +#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040 +#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080 +#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100 +#define D3DPTFILTERCAPS_MINFPOINT 0x00000100 +#define D3DPTFILTERCAPS_MINFLINEAR 0x00000200 +#define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400 +#define D3DPTFILTERCAPS_MIPFPOINT 0x00010000 +#define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000 +#define D3DPTFILTERCAPS_MAGFPOINT 0x01000000 +#define D3DPTFILTERCAPS_MAGFLINEAR 0x02000000 +#define D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000 +#define D3DPTFILTERCAPS_MAGFAFLATCUBIC 0x08000000 +#define D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC 0x10000000 +#define D3DSTENCILCAPS_KEEP 0x00000001 +#define D3DSTENCILCAPS_ZERO 0x00000002 +#define D3DSTENCILCAPS_REPLACE 0x00000004 +#define D3DSTENCILCAPS_INCRSAT 0x00000008 +#define D3DSTENCILCAPS_DECRSAT 0x00000010 +#define D3DSTENCILCAPS_INVERT 0x00000020 +#define D3DSTENCILCAPS_INCR 0x00000040 +#define D3DSTENCILCAPS_DECR 0x00000080 +#define D3DTEXOPCAPS_DISABLE 0x00000001 +#define D3DTEXOPCAPS_SELECTARG1 0x00000002 +#define D3DTEXOPCAPS_SELECTARG2 0x00000004 +#define D3DTEXOPCAPS_MODULATE 0x00000008 +#define D3DTEXOPCAPS_MODULATE2X 0x00000010 +#define D3DTEXOPCAPS_MODULATE4X 0x00000020 +#define D3DTEXOPCAPS_ADD 0x00000040 +#define D3DTEXOPCAPS_ADDSIGNED 0x00000080 +#define D3DTEXOPCAPS_ADDSIGNED2X 0x00000100 +#define D3DTEXOPCAPS_SUBTRACT 0x00000200 +#define D3DTEXOPCAPS_ADDSMOOTH 0x00000400 +#define D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800 +#define D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000 +#define D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000 +#define D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000 +#define D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000 +#define D3DTEXOPCAPS_PREMODULATE 0x00010000 +#define D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000 +#define D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000 +#define D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000 +#define D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000 +#define D3DTEXOPCAPS_BUMPENVMAP 0x00200000 +#define D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000 +#define D3DTEXOPCAPS_DOTPRODUCT3 0x00800000 +#define D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000FFFF +#define D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000 +#define D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000 +#define D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000 +#define D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000 +#endif + +#if(DIRECT3D_VERSION >= 0x0700) +#define D3DPTEXTURECAPS_PROJECTED 0x00000400 +#define D3DPTEXTURECAPS_CUBEMAP 0x00000800 +#define D3DPTEXTURECAPS_COLORKEYBLEND 0x00001000 +#define D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000 +#define D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000 +#define D3DDEVCAPS_HWRASTERIZATION 0x00080000 +#define D3DVTXPCAPS_TEXGEN 0x00000001 +#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002 +#define D3DVTXPCAPS_VERTEXFOG 0x00000004 +#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008 +#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010 +#define D3DVTXPCAPS_LOCALVIEWER 0x00000020 +#endif + +typedef struct _D3DTRANSFORMCAPS +{ + DWORD dwSize; + DWORD dwCaps; +} D3DTRANSFORMCAPS, *LPD3DTRANSFORMCAPS; + +typedef struct _D3DLIGHTINGCAPS +{ + DWORD dwSize; + DWORD dwCaps; + DWORD dwLightingModel; + DWORD dwNumLights; +} D3DLIGHTINGCAPS, *LPD3DLIGHTINGCAPS; + +typedef struct _D3DPrimCaps +{ + DWORD dwSize; + DWORD dwMiscCaps; + DWORD dwRasterCaps; + DWORD dwZCmpCaps; + DWORD dwSrcBlendCaps; + DWORD dwDestBlendCaps; + DWORD dwAlphaCmpCaps; + DWORD dwShadeCaps; + DWORD dwTextureCaps; + DWORD dwTextureFilterCaps; + DWORD dwTextureBlendCaps; + DWORD dwTextureAddressCaps; + DWORD dwStippleWidth; + DWORD dwStippleHeight; +} D3DPRIMCAPS, *LPD3DPRIMCAPS; + +typedef struct _D3DDeviceDesc +{ + DWORD dwSize; + DWORD dwFlags + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; +#if(DIRECT3D_VERSION >= 0x0500) + DWORD dwMinTextureWidth, dwMinTextureHeight; + DWORD dwMaxTextureWidth, dwMaxTextureHeight; + DWORD dwMinStippleWidth, dwMaxStippleWidth; + DWORD dwMinStippleHeight, dwMaxStippleHeight; +#endif + +#if(DIRECT3D_VERSION >= 0x0600) + DWORD dwMaxTextureRepeat; + DWORD dwMaxTextureAspectRatio; + DWORD dwMaxAnisotropy; + D3DVALUE dvGuardBandLeft; + D3DVALUE dvGuardBandTop; + D3DVALUE dvGuardBandRight; + D3DVALUE dvGuardBandBottom; + D3DVALUE dvExtentsAdjust; + DWORD dwStencilCaps; + DWORD dwFVFCaps; + DWORD dwTextureOpCaps; + WORD wMaxTextureBlendStages; + WORD wMaxSimultaneousTextures; +#endif +} D3DDEVICEDESC, *LPD3DDEVICEDESC; + +#if(DIRECT3D_VERSION >= 0x0700) + typedef struct _D3DDeviceDesc7 + { + DWORD dwDevCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMinTextureWidth; + DWORD dwMinTextureHeight; + DWORD dwMaxTextureWidth; + DWORD dwMaxTextureHeight; + DWORD dwMaxTextureRepeat; + DWORD dwMaxTextureAspectRatio; + DWORD dwMaxAnisotropy; + D3DVALUE dvGuardBandLeft; + D3DVALUE dvGuardBandTop; + D3DVALUE dvGuardBandRight; + D3DVALUE dvGuardBandBottom; + D3DVALUE dvExtentsAdjust; + DWORD dwStencilCaps; + DWORD dwFVFCaps; + DWORD dwTextureOpCaps; + WORD wMaxTextureBlendStages; + WORD wMaxSimultaneousTextures; + DWORD dwMaxActiveLights; + D3DVALUE dvMaxVertexW; + GUID deviceGUID; + WORD wMaxUserClipPlanes; + WORD wMaxVertexBlendMatrices; + DWORD dwVertexProcessingCaps; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + DWORD dwReserved4; +} D3DDEVICEDESC7, *LPD3DDEVICEDESC7; +#endif + +typedef struct _D3DFINDDEVICESEARCH +{ + DWORD dwSize; + DWORD dwFlags; + BOOL bHardware; + D3DCOLORMODEL dcmColorModel; + GUID guid; + DWORD dwCaps; + D3DPRIMCAPS dpcPrimCaps; +} D3DFINDDEVICESEARCH, *LPD3DFINDDEVICESEARCH; + +typedef struct _D3DFINDDEVICERESULT +{ + DWORD dwSize; + GUID guid; + D3DDEVICEDESC ddHwDesc; + D3DDEVICEDESC ddSwDesc; +} D3DFINDDEVICERESULT, *LPD3DFINDDEVICERESULT; + +typedef struct _D3DExecuteBufferDesc +{ + DWORD dwSize; + DWORD dwFlags; + DWORD dwCaps; + DWORD dwBufferSize; + LPVOID lpData; +} D3DEXECUTEBUFFERDESC, *LPD3DEXECUTEBUFFERDESC; + +#if(DIRECT3D_VERSION == 0x0700) +typedef struct _D3DDEVINFO_TEXTUREMANAGER +{ + BOOL bThrashing; + DWORD dwApproxBytesDownloaded; + DWORD dwNumEvicts; + DWORD dwNumVidCreates; + DWORD dwNumTexturesUsed; + DWORD dwNumUsedTexInVid; + DWORD dwWorkingSet; + DWORD dwWorkingSetBytes; + DWORD dwTotalManaged; + DWORD dwTotalBytes; + DWORD dwLastPri; +} D3DDEVINFO_TEXTUREMANAGER, *LPD3DDEVINFO_TEXTUREMANAGER; + +typedef struct _D3DDEVINFO_TEXTURING +{ + DWORD dwNumLoads; + DWORD dwApproxBytesLoaded; + DWORD dwNumPreLoads; + DWORD dwNumSet; + DWORD dwNumCreates; + DWORD dwNumDestroys; + DWORD dwNumSetPriorities; + DWORD dwNumSetLODs; + DWORD dwNumLocks; + DWORD dwNumGetDCs; +} D3DDEVINFO_TEXTURING, *LPD3DDEVINFO_TEXTURING; +#endif + +typedef HRESULT (CALLBACK * LPD3DENUMDEVICESCALLBACK)(GUID *lpGuid, LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC, LPD3DDEVICEDESC, LPVOID); + +#if(DIRECT3D_VERSION >= 0x0700) + typedef HRESULT (CALLBACK * LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID); +#endif + +#pragma pack() + +#endif + Propchange: trunk/reactos/include/dxsdk/d3dcaps.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26362: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 15 Apr '07

15 Apr '07

Author: greatlrd Date: Sun Apr 15 21:29:40 2007 New Revision: 26362 URL: http://svn.reactos.org/svn/reactos?rev=26362&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/uuids.h (with props) Added: trunk/reactos/include/dxsdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/uuids.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/uuids.h (added) +++ trunk/reactos/include/dxsdk/uuids.h Sun Apr 15 21:29:40 2007 @@ -1,0 +1,393 @@ + +#ifndef OUR_GUID_ENTRY + #define OUR_GUID_ENTRY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8); +#endif + +#define MEDIATYPE_NULL GUID_NULL +#define MEDIASUBTYPE_NULL GUID_NULL + +#define MEDIASUBTYPE_HASALPHA(mt) ( ((mt).subtype == MEDIASUBTYPE_ARGB4444) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB32) || \ + ((mt).subtype == MEDIASUBTYPE_AYUV) || \ + ((mt).subtype == MEDIASUBTYPE_AI44) || \ + ((mt).subtype == MEDIASUBTYPE_IA44) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB1555) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB32_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB4444_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB1555_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB32_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB4444_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB1555_D3D_DX9_RT) ) + +#define MEDIASUBTYPE_HASALPHA7(mt) (((mt).subtype == MEDIASUBTYPE_ARGB32_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB4444_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB1555_D3D_DX7_RT) ) + +#define MEDIASUBTYPE_D3D_DX7_RT(mt) (((mt).subtype == MEDIASUBTYPE_ARGB32_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB4444_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB1555_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_RGB32_D3D_DX7_RT) || \ + ((mt).subtype == MEDIASUBTYPE_RGB16_D3D_DX7_RT)) + +#define MEDIASUBTYPE_HASALPHA9(mt) (((mt).subtype == MEDIASUBTYPE_ARGB32_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB4444_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB1555_D3D_DX9_RT) ) + + +#define MEDIASUBTYPE_D3D_DX9_RT(mt) (((mt).subtype == MEDIASUBTYPE_ARGB32_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB4444_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_ARGB1555_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_RGB32_D3D_DX9_RT) || \ + ((mt).subtype == MEDIASUBTYPE_RGB16_D3D_DX9_RT)) + + +#ifndef __DDRAW_INCLUDED__ +OUR_GUID_ENTRY(CLSID_DirectDraw, 0xD7B70EE0,0x4340,0x11CF,0xB0,0x63,0x00,0x20,0xAF,0xC2,0xCD,0x35) +OUR_GUID_ENTRY(CLSID_DirectDrawClipper, 0x593817A0,0x7DB3,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56) +OUR_GUID_ENTRY(IID_IDirectDraw, 0x6C14DB80,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60) +OUR_GUID_ENTRY(IID_IDirectDraw2, 0xB3A6F3E0,0x2B43,0x11CF,0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56) +OUR_GUID_ENTRY(IID_IDirectDrawSurface, 0x6C14DB81,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60) +OUR_GUID_ENTRY(IID_IDirectDrawSurface2, 0x57805885,0x6EEC,0x11CF,0x94,0x41,0xA8,0x23,0x03,0xC1,0x0E,0x27) +OUR_GUID_ENTRY(IID_IDirectDrawSurface3, 0xDA044E00,0x69B2,0x11D0,0xA1,0xD5,0x00,0xAA,0x00,0xB8,0xDF,0xBB) +OUR_GUID_ENTRY(IID_IDirectDrawSurface4, 0x0B2B8630,0xAD35,0x11D0,0x8E,0xA6,0x00,0x60,0x97,0x97,0xEA,0x5B) +OUR_GUID_ENTRY(IID_IDirectDrawSurface7, 0x06675A80,0x3B9b,0x11D2,0xB9,0x2F,0x00,0x60,0x97,0x97,0xEA,0x5B) +OUR_GUID_ENTRY(IID_IDirectDrawPalette, 0x6C14DB84,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60) +OUR_GUID_ENTRY(IID_IDirectDrawClipper, 0x6C14DB85,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60) +OUR_GUID_ENTRY(IID_IDirectDrawColorControl, 0x4B9F0EE0,0x0D7E,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8) +#endif + +#ifndef __DVP_INCLUDED__ +OUR_GUID_ENTRY(IID_IDDVideoPortContainer, 0x6C142760,0xA733,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60) +#endif + +#ifndef __DDKM_INCLUDED__ +OUR_GUID_ENTRY(IID_IDirectDrawKernel, 0x8D56C120,0x6A08,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8) +OUR_GUID_ENTRY(IID_IDirectDrawSurfaceKernel, 0x60755DA0,0x6A40,0x11D0,0x9B,0x06,0x00,0xA0,0xC9,0x03,0xA3,0xB8) +#endif + +OUR_GUID_ENTRY(MEDIASUBTYPE_None, 0xE436EB8E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIATYPE_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_Audio, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_Text, 0x73747874, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_Midi, 0x7364696D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_Stream, 0xE436EB83, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIATYPE_Interleaved, 0x73766169, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_File, 0x656c6966, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_ScriptCommand, 0x73636d64, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_AUXLine21Data, 0x670aea80, 0x3A82, 0x11D0, 0xB7, 0x9B, 0x00, 0xAA, 0x09, 0x37, 0x67, 0xA7) +OUR_GUID_ENTRY(MEDIATYPE_VBI, 0xF72A76E1, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(MEDIATYPE_Timecode, 0x0482DEE3, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIATYPE_LMRT, 0x74726C6D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_URL_STREAM, 0x736c7275, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_CLPL, 0x4C504C43, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_YUYV, 0x56595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IYUV, 0x56555949, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_YVU9, 0x39555659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_Y411, 0x31313459, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_Y41P, 0x50313459, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_YUY2, 0x32595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_YVYU, 0x55595659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_UYVY, 0x59565955, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_Y211, 0x31313259, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_CLJR, 0x524A4C43, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IF09, 0x39304649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_CPLA, 0x414C5043, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_MJPG, 0x47504A4D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_TVMJ, 0x4A4D5654, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_WAKE, 0x454B4157, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_CFCC, 0x43434643, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IJPG, 0x47504A49, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_Plum, 0x6D756C50, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVCS, 0x53435644, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVSD, 0x44535644, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_MDVF, 0x4656444D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB1, 0xE436EB78, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB4, 0xE436EB79, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB8, 0xE436EB7A, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB565, 0xE436EB7B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB555, 0xE436EB7C, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB24, 0xE436EB7D, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB32, 0xE436EB7E, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB1555, 0x297C55AF, 0xE209, 0x4CB3, 0xB7, 0x57, 0xC7, 0x6D, 0x6B, 0x9C, 0x88, 0xA8) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB4444, 0x6E6415E6, 0x5C24, 0x425F, 0x93, 0xCD, 0x80, 0x10, 0x2B, 0x3D, 0x1C, 0xCA) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB32, 0x773C9AC0, 0x3274, 0x11D0, 0xB7, 0x24, 0x00, 0xAA, 0x00, 0x6C, 0x1A, 0x01) +OUR_GUID_ENTRY(MEDIASUBTYPE_A2R10G10B10, 0x2F8BB76D, 0xB644, 0x4550, 0xAC, 0xF3, 0xD3, 0x0C, 0xAA, 0x65, 0xD5, 0xC5) +OUR_GUID_ENTRY(MEDIASUBTYPE_A2B10G10R10, 0x576F7893, 0xBDF6, 0x48C4, 0x87, 0x5F, 0xAE, 0x7B, 0x81, 0x83, 0x45, 0x67) +OUR_GUID_ENTRY(MEDIASUBTYPE_AYUV, 0x56555941, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_AI44, 0x34344941, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IA44, 0x34344149, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB32_D3D_DX7_RT, 0x32335237, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB16_D3D_DX7_RT, 0x36315237, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB32_D3D_DX7_RT, 0x38384137, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB4444_D3D_DX7_RT, 0x34344137, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB1555_D3D_DX7_RT, 0x35314137, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB32_D3D_DX9_RT, 0x32335239, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_RGB16_D3D_DX9_RT, 0x36315239, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB32_D3D_DX9_RT, 0x38384139, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB4444_D3D_DX9_RT, 0x34344139, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_ARGB1555_D3D_DX9_RT, 0x35314139, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_YV12, 0x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_NV12, 0x3231564E, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IMC1, 0x31434D49, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IMC2, 0x32434D49, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IMC3, 0x33434D49, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IMC4, 0x34434D49, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_S340, 0x30343353, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_S342, 0x32343353, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_Overlay, 0xE436EB7F, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Packet, 0xE436EB80, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Payload, 0xE436EB81, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1AudioPayload, 0x00000050, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIATYPE_MPEG1SystemStream, 0xE436EB82, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1System, 0xE436EB84, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1VideoCD, 0xE436EB85, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Video, 0xE436EB86, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG1Audio, 0xE436EB87, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_Avi, 0xE436EB88, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_Asf, 0x3DB80F90, 0x9412, 0x11D1, 0xAD, 0xED, 0x00, 0x00, 0xF8, 0x75, 0x4B, 0x99) +OUR_GUID_ENTRY(MEDIASUBTYPE_QTMovie, 0xE436EB89, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_QTRpza, 0x617A7072, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_QTSmc, 0x20636D73, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_QTRle, 0x20656C72, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_QTJpeg, 0x6765706A, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_PCMAudio_Obsolete, 0xE436EB8A, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_WAVE, 0xE436EB8B, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_AU, 0xE436EB8C, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_AIFF, 0xE436EB8D, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(MEDIASUBTYPE_dvsd, 0x64737664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_dvhd, 0x64687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_dvsl, 0x6C737664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_dv25, 0x35327664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_dv50, 0x30357664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_dvh1, 0x31687664, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_Line21_BytePair, 0x6E8D4A22, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7) +OUR_GUID_ENTRY(MEDIASUBTYPE_Line21_GOPPacket, 0x6E8D4A23, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7) +OUR_GUID_ENTRY(MEDIASUBTYPE_Line21_VBIRawData, 0x6E8D4A24, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7) +OUR_GUID_ENTRY(MEDIASUBTYPE_TELETEXT, 0xF72A76E3, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(MEDIASUBTYPE_WSS, 0x2791D576, 0x8E7A, 0x466F, 0x9E, 0x90, 0x5D, 0x3F, 0x30, 0x83, 0x73, 0x8B) +OUR_GUID_ENTRY(MEDIASUBTYPE_VPS, 0xA1B3F620, 0x9792, 0x4D8D, 0x81, 0xA4, 0x86, 0xAF, 0x25, 0x77, 0x20, 0x90) +OUR_GUID_ENTRY(MEDIASUBTYPE_DRM_Audio, 0x00000009, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3_SPDIF, 0x00000092, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_RAW_SPORT, 0x00000240, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_SPDIF_TAG_241h, 0x00000241, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_DssVideo, 0xA0AF4F81, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(MEDIASUBTYPE_DssAudio, 0xA0AF4F82, 0xE163, 0x11D0, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(MEDIASUBTYPE_VPVideo, 0x5A9B6A40, 0x1A22, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(MEDIASUBTYPE_VPVBI, 0x5A9B6A41, 0x1A22, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(CLSID_CaptureGraphBuilder, 0xBF87B6E0, 0x8C27, 0x11D0, 0xB3, 0xF0, 0x00, 0xAA, 0x00, 0x37, 0x61, 0xC5) +OUR_GUID_ENTRY(CLSID_CaptureGraphBuilder2, 0xBF87B6E1, 0x8C27, 0x11D0, 0xB3, 0xF0, 0x00, 0xAA, 0x00, 0x37, 0x61, 0xC5) +OUR_GUID_ENTRY(CLSID_ProtoFilterGraph, 0xE436EBB0, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_SystemClock, 0xE436EBB1, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_FilterMapper, 0xE436EBB2, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_FilterGraph, 0xE436EBB3, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_FilterGraphNoThread, 0xE436EBB8, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_MPEG1Doc, 0xE4BBD160, 0x4269, 0x11CE, 0x83, 0x8D, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(CLSID_FileSource, 0x701722E0, 0x8AE3, 0x11CE, 0xA8, 0x5C, 0x00, 0xAA, 0x00, 0x2F, 0xEA, 0xB5) +OUR_GUID_ENTRY(CLSID_MPEG1PacketPlayer, 0x26C25940, 0x4CA9, 0x11CE, 0xA8, 0x28, 0x00, 0xAA, 0x00, 0x2F, 0xEA, 0xB5) +OUR_GUID_ENTRY(CLSID_MPEG1Splitter, 0x336475D0, 0x942A, 0x11CE, 0xA8, 0x70, 0x00, 0xAA, 0x00, 0x2F, 0xEA, 0xB5) +OUR_GUID_ENTRY(CLSID_CMpegVideoCodec, 0xFEB50740, 0x7BEF, 0x11CE, 0x9B, 0xD9, 0x00, 0x00, 0xE2, 0x02, 0x59, 0x9C) +OUR_GUID_ENTRY(CLSID_CMpegAudioCodec, 0x4A2286E0, 0x7BEF, 0x11CE, 0x9B, 0xD9, 0x00, 0x00, 0xE2, 0x02, 0x59, 0x9C) +OUR_GUID_ENTRY(CLSID_TextRender, 0xE30629D3, 0x27E5, 0x11CE, 0x87, 0x5D, 0x00, 0x60, 0x8C, 0xB7, 0x80, 0x66) +OUR_GUID_ENTRY(CLSID_InfTee, 0xF8388A40, 0xD5BB, 0x11D0, 0xBE, 0x5A, 0x00, 0x80, 0xC7, 0x06, 0x56, 0x8E) +OUR_GUID_ENTRY(CLSID_AviSplitter, 0x1B544C20, 0xFD0B, 0x11CE, 0x8C, 0x63, 0x00, 0xAA, 0x00, 0x44, 0xB5, 0x1E) +OUR_GUID_ENTRY(CLSID_AviReader, 0x1B544C21, 0xFD0B, 0x11CE, 0x8C, 0x63, 0x00, 0xAA, 0x00, 0x44, 0xB5, 0x1E) +OUR_GUID_ENTRY(CLSID_VfwCapture, 0x1B544C22, 0xFD0B, 0x11CE, 0x8C, 0x63, 0x00, 0xAA, 0x00, 0x44, 0xB5, 0x1E) +OUR_GUID_ENTRY(CLSID_CaptureProperties, 0x1B544C22, 0xFD0B, 0x11CE, 0x8C, 0x63, 0x00, 0xAA, 0x00, 0x44, 0xB5, 0x1F) +OUR_GUID_ENTRY(CLSID_FGControl, 0xE436EBB4, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_MOVReader, 0x44584800, 0xF8EE, 0x11CE, 0xB2, 0xD4, 0x00, 0xDD, 0x01, 0x10, 0x1B, 0x85) +OUR_GUID_ENTRY(CLSID_QuickTimeParser, 0xD51bd5A0, 0x7548, 0x11CF, 0xA5, 0x20, 0x00, 0x80, 0xC7, 0x7E, 0xF5, 0x8A) +OUR_GUID_ENTRY(CLSID_QTDec, 0xFDFE9681, 0x74A3, 0x11D0, 0xAF, 0xA7, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(CLSID_AVIDoc, 0xD3588AB0, 0x0781, 0x11CE, 0xB0, 0x3A, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_VideoRenderer, 0x70E102B0, 0x5556, 0x11CE, 0x97, 0xC0, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(CLSID_Colour, 0x1643E180, 0x90F5, 0x11CE, 0x97, 0xD5, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(CLSID_Dither, 0x1DA08500, 0x9EDC, 0x11CF, 0xBC, 0x10, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6) +OUR_GUID_ENTRY(CLSID_ModexRenderer, 0x07167665, 0x5011, 0x11CF, 0xBF, 0x33, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(CLSID_AudioRender, 0xE30629D1, 0x27e5, 0x11CE, 0x87, 0x5D, 0x00, 0x60, 0x8C, 0xB7, 0x80, 0x66) +OUR_GUID_ENTRY(CLSID_AudioProperties, 0x05589FAF, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(CLSID_DSoundRender, 0x79376820, 0x07D0, 0x11CF, 0xA2, 0x4D, 0x00, 0x20, 0xAF, 0xD7, 0x97, 0x67) +OUR_GUID_ENTRY(CLSID_AudioRecord, 0xE30629D2, 0x27e5, 0x11CE, 0x87, 0x5D, 0x00, 0x60, 0x8C, 0xB7, 0x80, 0x66) +OUR_GUID_ENTRY(CLSID_AudioInputMixerProperties, 0x2CA8CA52, 0x3C3f, 0x11D2, 0xB7, 0x3D, 0x00, 0xC0, 0x4F, 0xB6, 0xBD, 0x3D) +OUR_GUID_ENTRY(CLSID_AVIDec, 0xCF49D4E0, 0x1115, 0x11CE, 0xB0, 0x3A, 0x00, 0x20, 0xAF, 0x0b, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_AVIDraw, 0xA888DF60, 0x1E90, 0x11CF, 0xAC, 0x98, 0x00, 0xAA, 0x00, 0x4C, 0x0F, 0xa9) +OUR_GUID_ENTRY(CLSID_ACMWrapper, 0x6A08CF80, 0x0E18, 0x11CF, 0xA2, 0x4D, 0x00, 0x20, 0xAF, 0xD7, 0x97, 0x67) +OUR_GUID_ENTRY(CLSID_AsyncReader, 0xE436EBB5, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_URLReader, 0xE436EBB6, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_PersistMonikerPID, 0xE436EBB7, 0x524F, 0x11CE, 0x9F, 0x53, 0x00, 0x20, 0xAF, 0x0B, 0xA7, 0x70) +OUR_GUID_ENTRY(CLSID_AVICo, 0xD76E2820, 0x1563, 0x11CF, 0xAC, 0x98, 0x00, 0xAA, 0x00, 0x4C, 0x0F, 0xA9) +OUR_GUID_ENTRY(CLSID_FileWriter, 0x8596E5F0, 0x0DA5, 0x11D0, 0xBD, 0x21, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_AviDest, 0xE2510970, 0xF137, 0x11CE, 0x8B, 0x67, 0x00, 0xAA, 0x00, 0xA3, 0xF1, 0xA6) +OUR_GUID_ENTRY(CLSID_AviMuxProptyPage, 0xC647B5C0, 0x157C, 0x11D0, 0xBD, 0x23, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_AviMuxProptyPage1, 0x0A9AE910, 0x85C0, 0x11D0, 0xBD, 0x42, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_AVIMIDIRender, 0x07B65360, 0xC445, 0x11CE, 0xAF, 0xDE, 0x00, 0xAA, 0x00, 0x6C, 0x14, 0xF4) +OUR_GUID_ENTRY(CLSID_WMAsfReader, 0x187463A0, 0x5BB7, 0x11D3, 0xAC, 0xBE, 0x00, 0x80, 0xC7, 0x5E, 0x24, 0x6E) +OUR_GUID_ENTRY(CLSID_WMAsfWriter, 0x7c23220E, 0x55BB, 0x11D3, 0x8B, 0x16, 0x00, 0xC0, 0x4F, 0xB6, 0xBD, 0x3D) +OUR_GUID_ENTRY(CLSID_MPEG2Demultiplexer, 0xAFB6C280, 0x2C41, 0x11D3, 0x8A, 0x60, 0x00, 0x00, 0xF8, 0x1E, 0x0E, 0x4A) +OUR_GUID_ENTRY(CLSID_MMSPLITTER, 0x3AE86B20, 0x7Be8, 0x11D1, 0xAB, 0xE6, 0x00, 0xA0, 0xC9, 0x05, 0xF3, 0x75) +OUR_GUID_ENTRY(CLSID_StreamBufferSink, 0x2DB47AE5, 0xCF39, 0x43C2, 0xB4, 0xD6, 0x0C, 0xD8, 0xD9, 0x09, 0x46, 0xF4) +OUR_GUID_ENTRY(CLSID_StreamBufferSource, 0xC9F5FE02, 0xF851, 0x4EB5, 0x99, 0xEe, 0xAD, 0x60, 0x2A, 0xF1, 0xE6, 0x19) +OUR_GUID_ENTRY(CLSID_StreamBufferConfig, 0xFA8A68B2, 0xC864, 0x4BA2, 0xAD, 0x53, 0xD3, 0x87, 0x6a, 0x87, 0x49, 0x4B) +OUR_GUID_ENTRY(CLSID_Mpeg2VideoStreamAnalyzer, 0x6CFad761, 0x735D, 0x4AA5, 0x8A, 0xFC, 0xAF, 0x91, 0xA7, 0xD6, 0x1E, 0xBA) +OUR_GUID_ENTRY(CLSID_StreamBufferRecordingAttributes, 0xCCAA63AC, 0x1057, 0x4778, 0xAE, 0x92, 0x12, 0x06, 0xAB, 0x9A, 0xCE, 0xE6) +OUR_GUID_ENTRY(CLSID_StreamBufferComposeRecording, 0xD682C4BA, 0xa90a, 0x42FE, 0xB9, 0xE1, 0x03, 0x10, 0x98, 0x49, 0xC4, 0x23) +OUR_GUID_ENTRY(CLSID_DVVideoCodec, 0xB1B77C00, 0xC3E4, 0x11CF, 0xAF, 0x79, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(CLSID_DVVideoEnc, 0x13AA3650, 0xBB6F, 0x11D0, 0xAF, 0xB9, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(CLSID_DVSplitter, 0x4EB31670, 0x9FC6, 0x11CF, 0xAF, 0x6E, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(CLSID_DVMux, 0x129D7E40, 0xC10D, 0x11D0, 0xAF, 0xB9, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(CLSID_SeekingPassThru, 0x060AF76C, 0x68DD, 0x11D0, 0x8F, 0xC1, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0x9D) +OUR_GUID_ENTRY(CLSID_Line21Decoder, 0x6E8D4A20, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7) +OUR_GUID_ENTRY(CLSID_Line21Decoder2, 0xE4206432, 0x01A1, 0x4BEE, 0xB3, 0xE1, 0x37, 0x02, 0xC8, 0xED, 0xC5, 0x74) +OUR_GUID_ENTRY(CLSID_OverlayMixer, 0xCD8743A1, 0x3736, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(CLSID_VBISurfaces, 0x814B9800, 0x1C88, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(CLSID_WSTDecoder, 0x70BC06E0, 0x5666, 0x11D3, 0xA1, 0x84, 0x00, 0x10, 0x5A, 0xEF, 0x9F, 0x33) +OUR_GUID_ENTRY(CLSID_MjpegDec, 0x301056D0, 0x6Dff, 0x11D2, 0x9E, 0xEB, 0x00, 0x60, 0x08, 0x03, 0x9E, 0x37) +OUR_GUID_ENTRY(CLSID_MJPGEnc, 0xB80ab0A0, 0x7416, 0x11D2, 0x9E, 0xEB, 0x00, 0x60, 0x08, 0x03, 0x9E, 0x37) +OUR_GUID_ENTRY(CLSID_SystemDeviceEnum, 0x62BE5D10, 0x60EB, 0x11D0, 0xBD, 0x3B, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_CDeviceMoniker, 0x4315D437, 0x5B8C, 0x11D0, 0xBD, 0x3B, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_VideoInputDeviceCategory, 0x860BB310, 0x5D01, 0x11D0, 0xBD, 0x3B, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_CVidCapClassManager, 0x860BB310, 0x5D01, 0x11D0, 0xBD, 0x3B, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_LegacyAmFilterCategory, 0x083863F1, 0x70DE, 0x11D0, 0xBD, 0x40, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_CQzFilterClassManager, 0x083863F1, 0x70DE, 0x11D0, 0xBD, 0x40, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_VideoCompressorCategory, 0x33D9A760, 0x90C8, 0x11D0, 0xBD, 0x43, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_CIcmCoClassManager, 0x33D9A760, 0x90C8, 0x11D0, 0xBD, 0x43, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_AudioCompressorCategory, 0x33D9A761, 0x90C8, 0x11D0, 0xBD, 0x43, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_CAcmCoClassManager, 0x33D9A761, 0x90C8, 0x11D0, 0xBD, 0x43, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_AudioInputDeviceCategory, 0x33D9A762, 0x90C8, 0x11D0, 0xBD, 0x43, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_CWaveinClassManager, 0x33D9A762, 0x90C8, 0x11D0, 0xBD, 0x43, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_AudioRendererCategory, 0xE0F158E1, 0xCB04, 0x11D0, 0xBD, 0x4E, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_CWaveOutClassManager, 0xE0F158E1, 0xCB04, 0x11D0, 0xBD, 0x4E, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_MidiRendererCategory, 0x4EFE2452, 0x168A, 0x11D1, 0xBC, 0x76, 0x00, 0xC0, 0x4F, 0xB9, 0x45, 0x3B) +OUR_GUID_ENTRY(CLSID_CMidiOutClassManager, 0x4EFE2452, 0x168A, 0x11D1, 0xBC, 0x76, 0x00, 0xC0, 0x4F, 0xB9, 0x45, 0x3B) +OUR_GUID_ENTRY(CLSID_TransmitCategory, 0xCC7BFB41, 0xF175, 0x11D1, 0xA3, 0x92, 0x00, 0xE0, 0x29, 0x1F, 0x39, 0x59) +OUR_GUID_ENTRY(CLSID_DeviceControlCategory, 0xCC7BFB46, 0xF175, 0x11D1, 0xA3, 0x92, 0x00, 0xE0, 0x29, 0x1F, 0x39, 0x59) +OUR_GUID_ENTRY(CLSID_ActiveMovieCategories, 0xDA4E3DA0, 0xd07d, 0x11D0, 0xBD, 0x50, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_DVDHWDecodersCategory, 0x2721AE20, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(CLSID_MediaEncoderCategory, 0x7D22E920, 0x5CA9, 0x4787, 0x8C, 0x2B, 0xA6, 0x77, 0x9B, 0xD1, 0x17, 0x81) +OUR_GUID_ENTRY(CLSID_MediaMultiplexerCategory, 0x236C9559, 0xADCE, 0x4736, 0xBF, 0x72, 0xBA, 0xB3, 0x4E, 0x39, 0x21, 0x96) +OUR_GUID_ENTRY(CLSID_FilterMapper2, 0xCDA42200, 0xBD88, 0x11D0, 0xBD, 0x4E, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_MemoryAllocator, 0x1E651CC0, 0xB199, 0x11D0, 0x82, 0x12, 0x00, 0xC0, 0x4F, 0xC3, 0x2C, 0x45) +OUR_GUID_ENTRY(CLSID_MediaPropertyBag, 0xCDBD8D00, 0xC193, 0x11D0, 0xBD, 0x4E, 0x00, 0xA0, 0xC9, 0x11, 0xCE, 0x86) +OUR_GUID_ENTRY(CLSID_DvdGraphBuilder, 0xFCC152B7, 0xF372, 0x11D0, 0x8E, 0x00, 0x00, 0xC0, 0x4F, 0xD7, 0xC0, 0x8B) +OUR_GUID_ENTRY(CLSID_DVDNavigator, 0x9B8C4620, 0x2C1A, 0x11D0, 0x84, 0x93, 0x00, 0xA0, 0x24, 0x38, 0xAD, 0x48) +OUR_GUID_ENTRY(CLSID_DVDState, 0xF963C5CF, 0xa659, 0x4A93, 0x96, 0x38, 0xCA, 0xF3, 0xCD, 0x27, 0x7D, 0x13) +OUR_GUID_ENTRY(CLSID_SmartTee, 0xCC58E280, 0x8AA1, 0x11D1, 0xB3, 0xF1, 0x00, 0xAA, 0x00, 0x37, 0x61, 0xC5) +OUR_GUID_ENTRY(FORMAT_None, 0x0F6417D6, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(FORMAT_VideoInfo, 0x05589F80, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(FORMAT_VideoInfo2, 0xF72A76A0, 0xEB0a, 0x11D0, 0xAC, 0xE4, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(FORMAT_WaveFormatEx, 0x05589F81, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(FORMAT_MPEGVideo, 0x05589F82, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(FORMAT_MPEGStreams, 0x05589F83, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(FORMAT_DvInfo, 0x05589F84, 0xC356, 0x11CE, 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(CLSID_DirectDrawProperties, 0x944d4C00, 0xDD52, 0x11CE, 0xBF, 0x0E, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(CLSID_PerformanceProperties, 0x59CE6880, 0xACF8, 0x11CF, 0xB5, 0x6E, 0x00, 0x80, 0xC7, 0xC4, 0xB6, 0x8A) +OUR_GUID_ENTRY(CLSID_QualityProperties, 0x418AFB70, 0xF8B8, 0x11CE, 0xAA, 0xC6, 0x00, 0x20, 0xAF, 0x0B, 0x99, 0xA3) +OUR_GUID_ENTRY(IID_IBaseVideoMixer, 0x61DED640, 0xE912, 0x11CE, 0xA0, 0x99, 0x00, 0xAA, 0x00, 0x47, 0x9A, 0x58) +OUR_GUID_ENTRY(IID_IDirectDrawVideo, 0x36d39EB0, 0xDD75, 0x11CE, 0xBF, 0x0E, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(IID_IQualProp, 0x1BD0ECB0, 0xF8E2, 0x11CE, 0xAA, 0xC6, 0x00, 0x20, 0xAF, 0x0B, 0x99, 0xA3) +OUR_GUID_ENTRY(CLSID_VPObject, 0xCE292861, 0xFC88, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(IID_IVPObject, 0xCE292862, 0xFC88, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(IID_IVPControl, 0x25DF12C1, 0x3De0, 0x11D1, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(CLSID_VPVBIObject, 0x814B9801, 0x1C88, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(IID_IVPVBIObject, 0x814B9802, 0x1C88, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(IID_IVPConfig, 0xBC29A660, 0x30e3, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(IID_IVPNotify, 0xC76794A1, 0xD6c5, 0x11D0, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(IID_IVPNotify2, 0xEBF47183, 0x8764, 0x11D1, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(IID_IVPVBIConfig, 0xEC529B00, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(IID_IVPVBINotify, 0xEC529B01, 0x1A1F, 0x11D1, 0xBA, 0xD9, 0x00, 0x60, 0x97, 0x44, 0x11, 0x1A) +OUR_GUID_ENTRY(IID_IMixerPinConfig, 0x593CDDE1, 0x0759, 0x11D1, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(IID_IMixerPinConfig2, 0xEBF47182, 0x8764, 0x11D1, 0x9E, 0x69, 0x00, 0xC0, 0x4F, 0xD7, 0xC1, 0x5B) +OUR_GUID_ENTRY(CLSID_ModexProperties, 0x0618AA30, 0x6BC4, 0x11CF, 0xBF, 0x36, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(IID_IFullScreenVideo, 0xDD1D7110, 0x7836, 0x11CF, 0xBF, 0x47, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A) +OUR_GUID_ENTRY(IID_IFullScreenVideoEx, 0x53479470, 0xF1DD, 0x11CF, 0xBC, 0x42, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6) +OUR_GUID_ENTRY(CLSID_DVDecPropertiesPage, 0x101193C0, 0x0BFE, 0x11D0, 0xAF, 0x91, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(CLSID_DVEncPropertiesPage, 0x4150F050, 0xBB6F, 0x11D0, 0xAF, 0xB9, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(CLSID_DVMuxPropertyPage, 0x4Db880E0, 0xC10D, 0x11D0, 0xAF, 0xB9, 0x00, 0xAA, 0x00, 0xB6, 0x7A, 0x42) +OUR_GUID_ENTRY(IID_IAMDirectSound, 0x546F4260, 0xD53E, 0x11CF, 0xB3, 0xF0, 0x00, 0xAA, 0x00, 0x37, 0x61, 0xC5) +OUR_GUID_ENTRY(IID_IMpegAudioDecoder, 0xB45DD570, 0x3C77, 0x11D1, 0xAB, 0xE1, 0x00, 0xA0, 0xC9, 0x05, 0xF3, 0x75) +OUR_GUID_ENTRY(IID_IAMLine21Decoder, 0x6E8D4A21, 0x310C, 0x11D0, 0xB7, 0x9A, 0x00, 0xAA, 0x00, 0x37, 0x67, 0xA7) +OUR_GUID_ENTRY(IID_IAMWstDecoder, 0xC056dE21, 0x75c2, 0x11D3, 0xA1, 0x84, 0x00, 0x10, 0x5A, 0xEF, 0x9F, 0x33) +OUR_GUID_ENTRY(CLSID_WstDecoderPropertyPage, 0x004E27F80, 0x91E4, 0x11D3, 0xA1, 0x84, 0x00, 0x10, 0x5A, 0xEF, 0x9F, 0x33) +OUR_GUID_ENTRY(FORMAT_AnalogVideo, 0xE0F158EE0, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIATYPE_AnalogVideo, 0xE0F158EE1, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_NTSC_M, 0xE0F158EE2, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_B, 0xE0F158EE5, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_D, 0xE0F158EE6, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_G, 0xE0F158EE7, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_H, 0xE0F158EE8, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_I, 0xE0F158EE9, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_M, 0xE0F158EEA, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_N, 0xE0F158EEB, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_PAL_N_COMBO, 0xE0F158EEC, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_B, 0xE0F158EF0, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_D, 0xE0F158EF1, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_G, 0xE0F158EF2, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_H, 0xE0F158EF3, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_K, 0xE0F158EF4, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_K1, 0xE0F158EF5, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIASUBTYPE_AnalogVideo_SECAM_L, 0xE0F158EF6, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(MEDIATYPE_AnalogAudio, 0x00482dEE1, 0x7817, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +#include "ksuuids.h" +OUR_GUID_ENTRY(TIME_FORMAT_NONE,0L, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) +OUR_GUID_ENTRY(TIME_FORMAT_FRAME, 0x7B785570, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6) +OUR_GUID_ENTRY(TIME_FORMAT_BYTE, 0x7B785571, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6) +OUR_GUID_ENTRY(TIME_FORMAT_SAMPLE, 0x7B785572, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6) +OUR_GUID_ENTRY(TIME_FORMAT_FIELD, 0x7B785573, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6) +OUR_GUID_ENTRY(TIME_FORMAT_MEDIA_TIME, 0x7B785574, 0x8C82, 0x11CF, 0xBC, 0x0C, 0x00, 0xAA, 0x00, 0xAC, 0x74, 0xF6) +OUR_GUID_ENTRY(AMPROPSETID_Pin, 0x9B00f101, 0x1567, 0x11D1, 0xB3, 0xF1, 0x00, 0xAA, 0x00, 0x37, 0x61, 0xC5) +OUR_GUID_ENTRY(PIN_CATEGORY_CAPTURE, 0xFb6c4281, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_PREVIEW, 0xFb6c4282, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_ANALOGVIDEOIN, 0xFb6c4283, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_VBI, 0xFb6c4284, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_VIDEOPORT, 0xFb6c4285, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_NABTS, 0xFb6c4286, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_EDS, 0xFb6c4287, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_TELETEXT, 0xFb6c4288, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_CC, 0xFb6c4289, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_STILL, 0xFb6c428a, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_TIMECODE, 0xFb6c428b, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(PIN_CATEGORY_VIDEOPORT_VBI, 0xFb6c428c, 0x0353, 0x11D1, 0x90, 0x5F, 0x00, 0x00, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(LOOK_UPSTREAM_ONLY, 0xAC798be0, 0x98e3, 0x11D1, 0xB3, 0xF1, 0x00, 0xAA, 0x00, 0x37, 0x61, 0xC5) +OUR_GUID_ENTRY(LOOK_DOWNSTREAM_ONLY, 0xAC798be1, 0x98e3, 0x11D1, 0xB3, 0xF1, 0x00, 0xAA, 0x00, 0x37, 0x61, 0xC5) +OUR_GUID_ENTRY(CLSID_TVTunerFilterPropertyPage, 0x266eee41, 0x6C63, 0x11CF, 0x8A, 0x03, 0x00, 0xAA, 0x00, 0x6E, 0xCB, 0x65) +OUR_GUID_ENTRY(CLSID_CrossbarFilterPropertyPage, 0x71f96461, 0x78f3, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56) +OUR_GUID_ENTRY(CLSID_TVAudioFilterPropertyPage, 0x71f96463, 0x78f3, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56) +OUR_GUID_ENTRY(CLSID_VideoProcAmpPropertyPage, 0x71f96464, 0x78f3, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56) +OUR_GUID_ENTRY(CLSID_CameraControlPropertyPage, 0x71f96465, 0x78f3, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56) +OUR_GUID_ENTRY(CLSID_AnalogVideoDecoderPropertyPage, 0x71f96466, 0x78f3, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56) +OUR_GUID_ENTRY(CLSID_VideoStreamConfigPropertyPage, 0x71f96467, 0x78f3, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56) +OUR_GUID_ENTRY(CLSID_AudioRendererAdvancedProperties, 0x37e92a92, 0xD9aa, 0x11D2, 0xBF, 0x84, 0x8E, 0xF2, 0xB1, 0x55, 0x5A, 0xED) +OUR_GUID_ENTRY(CLSID_VideoMixingRenderer, 0xB87BEB7B, 0x8D29, 0x423f, 0xAE, 0x4D, 0x65, 0x82, 0xC1, 0x01, 0x75, 0xAC) +OUR_GUID_ENTRY(CLSID_VideoRendererDefault, 0x6BC1CFFA, 0x8FC1, 0x4261, 0xAC, 0x22, 0xCF, 0xB4, 0xCC, 0x38, 0xDB, 0x50) +OUR_GUID_ENTRY(CLSID_AllocPresenter, 0x99d54f63, 0x1A69, 0x41ae, 0xAA, 0x4D, 0xC9, 0x76, 0xEB, 0x3F, 0x07, 0x13) +OUR_GUID_ENTRY(CLSID_AllocPresenterDDXclMode, 0x4444ac9e, 0x242e, 0x471b, 0xA3, 0xC7, 0x45, 0xdc, 0xd4, 0x63, 0x52, 0xBC) +OUR_GUID_ENTRY(CLSID_VideoPortManager, 0x6f26a6cd, 0x967b, 0x47fd, 0x87, 0x4A, 0x7A, 0xED, 0x2C, 0x9D, 0x25, 0xa2) +OUR_GUID_ENTRY(CLSID_VideoMixingRenderer9, 0x51b4abf3, 0x748f, 0x4E3b, 0xa2, 0x76, 0xC8, 0x28, 0x33, 0x0E, 0x92, 0x6a) +OUR_GUID_ENTRY(CLSID_ATSCNetworkProvider, 0x0dad2fdd, 0x5Fd7, 0x11D3, 0x8F, 0x50, 0x00, 0xC0, 0x4F, 0x79, 0x71, 0xE2) +OUR_GUID_ENTRY(CLSID_ATSCNetworkPropertyPage, 0xE3444d16, 0x5Ac4, 0x4386, 0x88, 0xDF, 0x13, 0xFD, 0x23, 0x0E, 0x1D, 0xda) +OUR_GUID_ENTRY(CLSID_DVBSNetworkProvider, 0xFa4b375a, 0x45b4, 0x4D45, 0x84, 0x40, 0x26, 0x39, 0x57, 0xB1, 0x16, 0x23) +OUR_GUID_ENTRY(CLSID_DVBTNetworkProvider, 0x216c62df, 0x6D7f, 0x4E9a, 0x85, 0x71, 0x05, 0xF1, 0x4E, 0xdb, 0x76, 0x6a) +OUR_GUID_ENTRY(CLSID_DVBCNetworkProvider, 0xdc0c0fe7, 0x0485, 0x4266, 0xB9, 0x3F, 0x68, 0xFb, 0xF8, 0x0E, 0xD8, 0x34) +OUR_GUID_ENTRY(CLSID_DShowTVEFilter, 0x05500280, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8) +OUR_GUID_ENTRY(CLSID_TVEFilterTuneProperties, 0x05500281, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8) +OUR_GUID_ENTRY(CLSID_TVEFilterCCProperties, 0x05500282, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8) +OUR_GUID_ENTRY(CLSID_TVEFilterStatsProperties, 0x05500283, 0xFAA5, 0x4DF9, 0x82, 0x46, 0xBF, 0xC2, 0x3A, 0xC5, 0xCE, 0xA8) +OUR_GUID_ENTRY(CLSID_IVideoEncoderProxy, 0xB43c4eec, 0x8C32, 0x4791, 0x91, 0x02, 0x50, 0x8A, 0xda, 0x5E, 0xE8, 0xE7) +OUR_GUID_ENTRY(CLSID_ICodecAPIProxy, 0x7ff0997a, 0x1999, 0x4286, 0xA7, 0x3C, 0x62, 0x2B, 0x88, 0x14, 0xE7, 0xEB ) +OUR_GUID_ENTRY(CLSID_IVideoEncoderCodecAPIProxy, 0xB05dabd9, 0x56e5, 0x4Fdc, 0xAF, 0xA4, 0x8A, 0x47, 0xE9, 0x1F, 0x1C, 0x9C ) + +#ifndef __ENCODER_API_GUIDS__ +#define __ENCODER_API_GUIDS__ +OUR_GUID_ENTRY(ENCAPIPARAM_BITRATE, 0x49cc4c43, 0xCA83, 0x4AD4, 0xa9, 0xAF, 0xF3, 0x69, 0x6a, 0xF6, 0x66, 0xDF) +OUR_GUID_ENTRY(ENCAPIPARAM_PEAK_BITRATE, 0x703f16a9, 0x3D48, 0x44A1, 0xB0, 0x77, 0x01, 0x8D, 0xFF, 0x91, 0x5D, 0x19) +OUR_GUID_ENTRY(ENCAPIPARAM_BITRATE_MODE, 0xEe5fb25c, 0xC713, 0x40D1, 0x9D, 0x58, 0xC0, 0xD7, 0x24, 0x1E, 0x25, 0x0F) +OUR_GUID_ENTRY(CODECAPI_CHANGELISTS, 0x62b12acf, 0xF6B0, 0x47D9, 0x94, 0x56, 0x96, 0xF2, 0x2C, 0x4E, 0x0B, 0x9D) +OUR_GUID_ENTRY(CODECAPI_VIDEO_ENCODER, 0x7112e8e1, 0x3D03, 0x47EF, 0x8E, 0x60, 0x03, 0xF1, 0xCF, 0x53, 0x73, 0x01) +OUR_GUID_ENTRY(CODECAPI_AUDIO_ENCODER, 0xB9d19a3e, 0xF897, 0x429C, 0xBC, 0x46, 0x81, 0x38, 0xB7, 0x27, 0x2B, 0x2D) +OUR_GUID_ENTRY(CODECAPI_SETALLDEFAULTS, 0x6C5e6a7c, 0xACF8, 0x4F55, 0xa9, 0x99, 0x1A, 0x62, 0x81, 0x09, 0x05, 0x1B) +OUR_GUID_ENTRY(CODECAPI_ALLSETTINGS, 0x6a577e92, 0x83E1, 0x4113, 0xAD, 0xC2, 0x4F, 0xCE, 0xC3, 0x2F, 0x83, 0xA1) +OUR_GUID_ENTRY(CODECAPI_SUPPORTSEVENTS, 0x0581af97, 0x7693, 0x4Dbd, 0x9D, 0xCA, 0x3F, 0x9E, 0xBD, 0x65, 0x85, 0xA1 ) +OUR_GUID_ENTRY(CODECAPI_CURRENTCHANGELIST, 0x1Cb14e83, 0x7d72, 0x4657, 0x83, 0xFD, 0x47, 0xa2, 0xC5, 0xB9, 0xD1, 0x3D ) +#endif + +#undef OUR_GUID_ENTRY Propchange: trunk/reactos/include/dxsdk/uuids.h ------------------------------------------------------------------------------ svn:eol-style = native

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