Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 27113: - Cleaning up - Move mmucode init earlier - Fix remaining reloc bugs - Alloc vsids - New mmu api - Fix memory bounds
by arty＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: arty Date: Sun Jun 10 15:55:56 2007 New Revision: 27113 URL: http://svn.reactos.org/svn/reactos?rev=27113&view=rev Log: - Cleaning up - Move mmucode init earlier - Fix remaining reloc bugs - Alloc vsids - New mmu api - Fix memory bounds Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c branches/powerpc/reactos/boot/freeldr/freeldr/windows/conversion.c branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Sun Jun 10 15:55:56 2007 @@ -159,7 +159,6 @@ NTAPI FrLdrStartup(ULONG Magic) { - int x; KernelEntryFn KernelEntryAddress = (KernelEntryFn)(KernelEntry + KernelBase); ULONG_PTR i, page; @@ -168,52 +167,52 @@ LoaderBlock.ArchExtra = (ULONG)LocalBootInfo; ppc_map_info_t *info = MmAllocateMemory(0x80 * sizeof(*info)); - MmuInit(); + /* We'll use vsid 1 for freeldr (expendable) */ + for(i = 0; i < 8; i++) + { + MmuAllocVsid(16 + i); + MmuSetVsid(i, i+1, 1); + } + /* Vsid 0 is reactos kernel */ + for(i = 8; i < 16; i++) + { + MmuAllocVsid(i); + MmuSetVsid(i, i+1, 0); + } + MmuSetPageCallback(MmuPageMiss); - /* Map freeldr space */ - for( i = 0xe00000, page = 0; i < 0xe80000; i += (1<<PFN_SHIFT) ) { - info[page].flags = MMU_ALL_RW; - info[page++].phys = PpcVirt2phys(i, 0); - } - - MmuMapPage((void *)0xe00000, info, page); - MmFreeMemory(info); - - info = MmAllocateMemory((KernelMemorySize >> 12) * sizeof(*info)); - - printf("First Kernel Instr (log: %x) %x\n", ((PCHAR)KernelMemory + KernelEntry), *((PINT)(((PCHAR)KernelMemory) + KernelEntry))); - - x = PpcVirt2phys((int)KernelMemory, 1); - printf("First Kernel Instr (phys: %x) %x\n", x, GetPhys(x)); + info = MmAllocateMemory((KernelMemorySize >> PAGE_SHIFT) * sizeof(*info)); /* Map kernel space 0x80000000 ... */ for( i = (ULONG)KernelMemory, page = 0; i < (ULONG)KernelMemory + KernelMemorySize; - i += (1<<PFN_SHIFT) ) { + i += (1<<PFN_SHIFT), page++ ) { + info[page].proc = 0; + info[page].addr = KernelBase + (page << PAGE_SHIFT); + info[page].phys = i; //PpcVirt2phys(i, 1); info[page].flags = MMU_ALL_RW; - info[page++].phys = i;/*PpcVirt2phys(i, 0);*/ - } - - MmuMapPage((void *)KernelBase, info, page); + } + + MmuMapPage(info, page); /* Map module name strings */ for( i = 0; i < LoaderBlock.ModsCount; i++ ) { page = ROUND_DOWN(((ULONG)reactos_modules[i].String), (1<<PFN_SHIFT)); info[i].flags = MMU_ALL_RW; - info[i].phys = page; - MmuMapPage((void *)page, info, 1); - } - - /* Tell them we're booting */ - DrawNumber(LocalBootInfo,(ULONG)&LoaderBlock,10,100); - - MmuTurnOn(); - - DrawNumber(LocalBootInfo,(ULONG)KernelEntryAddress,100,100); - printf("First Kernel Instr (map: %x) %x\n", KernelEntryAddress, *((PINT)(((PCHAR)KernelEntryAddress) + KernelEntry))); - KernelEntryAddress( (void*)&LoaderBlock ); + info[i].proc = 1; + info[i].addr = page; + info[i].phys = page; // PpcVirt2phys(page, 0); + MmuMapPage(info, 1); + } + + info[i].addr = (ULONG)&LoaderBlock; + info[i].phys = PpcVirt2phys(info[i].addr, 1); + MmuMapPage(info, 1); + + MmuTurnOn(KernelEntryAddress, (void*)&LoaderBlock); + /* Nothing more */ while(1); } @@ -257,7 +256,7 @@ * will be used by the Kernel. * *--*/ -static VOID +VOID FASTCALL FrLdrGetKernelBase(VOID) { @@ -381,16 +380,6 @@ printf("Couldn't read the elf header\n"); return FALSE; } - - printf("Elf header: (%c%c%c type %d machine %d version %d entry %x shoff %x shentsize %d shnum %d)\n", - ehdr.e_ident[1], ehdr.e_ident[2], ehdr.e_ident[3], - ehdr.e_type, - ehdr.e_machine, - ehdr.e_version, - ehdr.e_entry, - ehdr.e_shoff, - ehdr.e_shentsize, - ehdr.e_shnum); /* Start by getting elf headers */ phsize = ehdr.e_phentsize; @@ -441,7 +430,7 @@ Section = COFF_FIRST_SECTION(NtHeader); SectionCount = SWAPW(NtHeader->FileHeader.NumberOfSections); - printf("Section headers at %x\n", ((PCHAR)Section) - ((PCHAR)KernelAddr)); + printf("Section headers at %x\n", Section); /* Walk each section */ for (i=0; i < SectionCount; i++, Section++) @@ -449,10 +438,8 @@ shdr = ELF_SECTION((SWAPD(Section->PointerToRawData)+1)); shdr->sh_addr = SectionAddr = SWAPD(Section->VirtualAddress); - - printf("Section %d (NT Header) is elf section %d\n", - i, SWAPD(Section->PointerToRawData)); - + shdr->sh_addr += KernelAddr; + Section->PointerToRawData = SWAPD((Section->VirtualAddress - KernelAddr)); if (shdr->sh_type != SHT_NOBITS) @@ -497,9 +484,6 @@ if (!ELF_SECTION(targetSection)->sh_addr) continue; - printf("Found reloc section %d (symbols %d target %d base %x) with %d relocs\n", - i, shdr->sh_link, shdr->sh_info, ELF_SECTION(targetSection)->sh_addr, numreloc); - RelocSection = MmAllocateMemory(shdr->sh_size); FsSetFilePointer(KernelImage, relstart); FsReadFile(KernelImage, shdr->sh_size, NULL, RelocSection); @@ -522,21 +506,23 @@ memcpy(&symbol, SymbolSection + (ELF32_R_SYM(reloc.r_info) * sizeof(symbol)), sizeof(symbol)); /* Compute addends */ - S = symbol.st_value + ELF_SECTION(symbol.st_shndx)->sh_addr + KernelAddr + reloc.r_addend; + S = symbol.st_value + ELF_SECTION(symbol.st_shndx)->sh_addr; A = reloc.r_addend; P = reloc.r_offset + ELF_SECTION(targetSection)->sh_addr; #if 0 - printf("Symbol %d -> %d(%x:%x) -> %x@%x\n", + printf("Symbol[%d] %d -> %d(%x:%x) -> %x(+%x)@%x\n", + ELF32_R_TYPE(reloc.r_info), ELF32_R_SYM(reloc.r_info), symbol.st_shndx, ELF_SECTION(symbol.st_shndx)->sh_addr, symbol.st_value, S, + A, P); #endif - Target32 = (ULONG*)(((PCHAR)MemLoadAddr) + P); + Target32 = (ULONG*)(((PCHAR)MemLoadAddr) + (P - KernelAddr)); Target16 = (USHORT *)Target32; x = *Target32; Modified: 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 (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Sun Jun 10 15:55:56 2007 @@ -65,6 +65,8 @@ pci_setup(&pci1_desc); } +int mmu_initialized = 0; + ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { @@ -72,6 +74,12 @@ BiosMemoryMap[0].Type = 1; BiosMemoryMap[0].BaseAddress = 0xe80000; BiosMemoryMap[0].Length = (64 * 1024 * 1024) - BiosMemoryMap[0].BaseAddress; + if(!mmu_initialized) + { + MmuInit(); + mmu_initialized = 1; + } + MmuSetMemorySize(BiosMemoryMap[0].Length + BiosMemoryMap[0].BaseAddress); return 1; } Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/windows/conversion.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/windows/conversion.c Sun Jun 10 15:55:56 2007 @@ -25,21 +25,13 @@ PVOID VaToPa(PVOID Va) { -#ifdef _M_IX86 return (PVOID)((ULONG_PTR)Va & ~KSEG0_BASE); -#elif defined(_M_PPC) - return (PVOID)PpcVirt2phys((ULONG_PTR)Va,0); -#endif } PVOID PaToVa(PVOID Pa) { -#ifdef _M_IX86 return (PVOID)((ULONG_PTR)Pa | KSEG0_BASE); -#elif defined(_M_PPC) - return (PVOID)ofw_phys2virt(mmu_handle,0,(ULONG_PTR)Pa,0); -#endif } VOID Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlmemory.c Sun Jun 10 15:55:56 2007 @@ -104,8 +104,6 @@ extern ULONG_PTR i386PageFault; // exc 14 extern ULONG_PTR i386CoprocessorError; // exc 16 extern ULONG_PTR i386AlignmentCheck; // exc 17 -#else -typedef unsigned long long HARDWARE_PTE, *PHARDWARE_PTE; #endif /* GLOBALS ***************************************************************/

1 0

[mbosma] 27112: Some more movement.
by mbosma＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: mbosma Date: Sun Jun 10 15:50:56 2007 New Revision: 27112 URL: http://svn.reactos.org/svn/reactos?rev=27112&view=rev Log: Some more movement. Added: trunk/rostests/dxtest/ddraw/DDraw/create.cpp - copied unchanged from r27110, trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp - copied unchanged from r27110, trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp trunk/rostests/dxtest/ddraw/Surface/create.cpp - copied unchanged from r27110, trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp Removed: trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp Modified: trunk/rostests/dxtest/ddraw/testlist.cpp Removed: trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp (removed) @@ -1,423 +1,0 @@ -#include "ddrawtest.h" - -HWND CreateBasicWindow (VOID); - -BOOL Test_CreateDDraw (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - IDirectDraw* DirectDraw2; - - /*** FIXME: Test first parameter using EnumDisplayDrivers ***/ - DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL); - - TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION); - TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS); - TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); - - DirectDraw = NULL; - TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) == DD_OK); - if(DirectDraw) - { - TEST (DirectDraw->Initialize(NULL) == DDERR_ALREADYINITIALIZED); - TEST (DirectDraw->Release() == 0); - } - - DirectDraw2 = NULL; - TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK); - if(DirectDraw2) - { - TEST (DirectDraw2->QueryInterface(IID_IDirectDraw7, (PVOID*)&DirectDraw) == 0); - TEST (DirectDraw2->AddRef() == 2); - TEST (DirectDraw->AddRef() == 2); - TEST (DirectDraw->Release() == 1); - TEST (DirectDraw->Release() == 0); - TEST (DirectDraw2->Release() == 1); - TEST (DirectDraw2->Release() == 0); - } - - return TRUE; -} - -BOOL Test_SetCooperativeLevel (INT* passed, INT* failed) -{ - HWND hwnd; - LPDIRECTDRAW7 DirectDraw; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - if(!( hwnd = CreateBasicWindow() )) - { - printf("ERROR: Failed to create window\n"); - DirectDraw->Release(); - return FALSE; - } - - /* The Test */ - TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) == DDERR_INVALIDPARAMS); - TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_ALLOWMODEX) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->SetCooperativeLevel ((HWND)0xdeadbeef, DDSCL_NORMAL) == DDERR_INVALIDPARAMS); - - TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) == DD_OK); - TEST ( DirectDraw->Compact() == DD_OK ); - TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE | DDSCL_ALLOWMODEX) == DD_OK); - TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_NORMAL) == DD_OK ); - TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) == DD_OK ); - TEST ( DirectDraw->Compact() == DDERR_NOEXCLUSIVEMODE ); - - TEST ( DirectDraw->TestCooperativeLevel() == DD_OK ); // I do not get what this API does it always seems to return DD_OK - - DirectDraw->Release(); - - return TRUE; -} - -BOOL Test_GetAvailableVidMem (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - /* Here we go */ - DWORD Total, Free; - DDSCAPS2 Caps = { 0 }; - - TEST (DirectDraw->GetAvailableVidMem(&Caps, NULL, NULL) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->GetAvailableVidMem(NULL, &Total, &Free) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - - /* testing caps */ - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ALPHA; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_BACKBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_COMPLEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_FLIP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_FRONTBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OVERLAY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_PALETTE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_PRIMARYSURFACE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED3; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_SYSTEMMEMORY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_TEXTURE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_3DDEVICE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VIDEOMEMORY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VISIBLE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_WRITEONLY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ZBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_OWNDC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_LIVEVIDEO; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_HWCODEC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_MODEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_MIPMAP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_RESERVED2; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_ALLOCONLOAD; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_VIDEOPORT; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_LOCALVIDMEM; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps = DDSCAPS_NONLOCALVIDMEM; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = 0x01; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED4; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTDYNAMIC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTSTATIC; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED2; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_OPAQUE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_HINTANTIALIASING; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEX; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEZ; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_D3DTEXTUREMANAGE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_DONOTPERSIST; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_STEREOSURFACELEFT; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_VOLUME; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_NOTUSERLOCKABLE; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_POINTS; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RTPATCHES; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_NPATCHES; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_RESERVED3; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_DISCARDBACKBUFFER; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_ENABLEALPHACHANNEL; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_EXTENDEDFORMATPRIMARY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = ~(DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = (DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps4 = 1; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS ); - - DirectDraw->Release(); - - return TRUE; -} - -BOOL Test_GetFourCCCodes (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - /* Here we go */ - DWORD dwNumCodes, *lpCodes; - TEST (DirectDraw->GetFourCCCodes(NULL, (PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS); - - TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, NULL) == DD_OK && dwNumCodes); - lpCodes = (PDWORD)HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)*dwNumCodes); - *lpCodes = 0; - TEST ( DirectDraw->GetFourCCCodes(NULL, lpCodes) == DDERR_INVALIDPARAMS ); - TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, lpCodes) == DD_OK && *lpCodes ); - - DirectDraw->Release(); - - return TRUE; -} - -BOOL Test_GetDeviceIdentifier (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - DDDEVICEIDENTIFIER2 pDDDI; - //OLECHAR GuidStr[100]; - - - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - TEST ( DirectDraw->GetDeviceIdentifier(NULL, 0) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->GetDeviceIdentifier(NULL, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->GetDeviceIdentifier(NULL, DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); - - - memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); - TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, 0) == DD_OK ); - -/* - StringFromGUID2(pDDDI.guidDeviceIdentifier, GuidStr, 100); - printf("1. \n"); - printf("szDriver : %s\n",pDDDI.szDriver); - printf("szDescription : %s\n",pDDDI.szDescription); - printf("liDriverVersion : 0x%08x . 0x%08x\n", pDDDI.liDriverVersion.HighPart, pDDDI.liDriverVersion.LowPart); - printf("dwVendorId : 0x%08x\n",pDDDI.dwVendorId); - printf("dwDeviceId : 0x%08x\n",pDDDI.dwDeviceId); - printf("dwSubSysId : 0x%08x\n",pDDDI.dwSubSysId); - printf("dwRevision : 0x%08x\n",pDDDI.dwRevision); - printf("guidDeviceIdentifier : %ls\n",GuidStr); - printf("dwWHQLLevel : 0x%08x\n",pDDDI.dwWHQLLevel); -*/ - - memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); - TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, DDGDI_GETHOSTIDENTIFIER) == DD_OK ); - memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2)); - TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, ~DDGDI_GETHOSTIDENTIFIER) == DDERR_INVALIDPARAMS ); - - DirectDraw->Release(); - - return TRUE; -} Removed: trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp (removed) @@ -1,210 +1,0 @@ -HWND CreateBasicWindow (VOID); - -BOOL Test_CreateSurface (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - LPDIRECTDRAWSURFACE7 DirectDrawSurface = NULL; - HWND hwnd; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - if(!( hwnd = CreateBasicWindow() )) - { - printf("ERROR: Failed to create window\n"); - DirectDraw->Release(); - return FALSE; - } - - if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK) - { - printf("ERROR: Could not set cooperative level\n"); - DirectDraw->Release(); - return 0; - } - - /* The Test */ - - DDSURFACEDESC2 Desc = { 0 }; - - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, (IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION ); - TEST ( DirectDraw->CreateSurface(NULL, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->CreateSurface(&Desc, NULL, NULL) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); - - Desc.dwHeight = 200; - Desc.dwWidth = 200; - - Desc.dwFlags = DDSD_CAPS; - Desc.dwSize = sizeof (DDSURFACEDESC2); - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_3DDEVICE; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_ALLOCONLOAD; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_ALPHA; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_FLIP; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_HWCODEC; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_LIVEVIDEO; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_MIPMAP; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_MODEX; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_NONLOCALVIDMEM; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_OPTIMIZED; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_OVERLAY; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; -#if 0 - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; -#endif - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_OWNDC; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_UNSUPPORTED); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_PALETTE; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_STANDARDVGAMODE; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - DirectDrawSurface = NULL; - Desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - Desc.dwFlags = DDSD_CAPS; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_VIDEOPORT; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK); - TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 ); - DirectDrawSurface = NULL; - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_VISIBLE; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS; - Desc.ddsCaps.dwCaps = DDSCAPS_WRITEONLY; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS); - - Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; - Desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS); - - DirectDraw->Release(); - - return TRUE; -} Removed: trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/Displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp (removed) @@ -1,131 +1,0 @@ -typedef struct -{ - INT* passed; - INT* failed; - LPDIRECTDRAW7 DirectDraw; -} ENUMCONTEXT; - -HRESULT CALLBACK DummyEnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context ) -{ - return DDENUMRET_OK; -} - -HRESULT CALLBACK EnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context ) -{ - static int setcout = 0; - if(setcout >= 5) - return DDENUMRET_OK; - - DWORD lpdwFrequency = 0; - INT* passed = Context->passed; - INT* failed = Context->failed; - DDSURFACEDESC2 DisplayMode = {0}; - DisplayMode.dwSize = sizeof(DDSURFACEDESC2); - - TEST ( pDDSD->dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE); - TEST ( pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB | DDPF_PALETTEINDEXED8 || pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB ); - TEST ( Context->DirectDraw->SetDisplayMode (pDDSD->dwWidth, pDDSD->dwHeight, pDDSD->ddpfPixelFormat.dwRGBBitCount, pDDSD->dwRefreshRate, 0) == DD_OK); - TEST ( Context->DirectDraw->GetMonitorFrequency (&lpdwFrequency) == DD_OK && lpdwFrequency == pDDSD->dwRefreshRate); - TEST ( Context->DirectDraw->GetDisplayMode (&DisplayMode) == DD_OK - && pDDSD->dwHeight == DisplayMode.dwHeight - && pDDSD->dwWidth == DisplayMode.dwWidth - && pDDSD->dwRefreshRate == DisplayMode.dwRefreshRate - && pDDSD->ddpfPixelFormat.dwRGBBitCount == DisplayMode.ddpfPixelFormat.dwRGBBitCount - && DisplayMode.dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE ); - - setcout++; - return DDENUMRET_OK; -} - -BOOL Test_DisplayModes (INT* passed, INT* failed) -{ - /*** FIXME: Also test with surface as parameter; try busy/locked surface as well ***/ - LPDIRECTDRAW7 DirectDraw; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - - ENUMCONTEXT Context = {passed, failed, DirectDraw}; - - /* The Test */ - - /* First try with some generic display modes */ - TEST ( DirectDraw->SetDisplayMode (1586, 895, 0, 0, 0) == DDERR_UNSUPPORTED ); - TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0x123) == DDERR_INVALIDPARAMS ); - - // does this change the display mode to DDSCL_EXCLUSIVE ? - TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0) == DD_OK ); - TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); - TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); - - TEST ( DirectDraw->GetMonitorFrequency (NULL) == DDERR_INVALIDPARAMS ); - TEST ( DirectDraw->GetDisplayMode (NULL) == DDERR_INVALIDPARAMS ); - DDSURFACEDESC2 DisplayMode = {0}; - TEST ( DirectDraw->GetDisplayMode (&DisplayMode) == DDERR_INVALIDPARAMS ); - - //* Now try getting vaild modes from drive */ - TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context, NULL) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->EnumDisplayModes(0, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK ); - TEST (DirectDraw->EnumDisplayModes(DDEDM_REFRESHRATES, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK ); - TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK ); - TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES|DDEDM_REFRESHRATES, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)EnumDisplayModes) == DD_OK); - - TEST (DirectDraw->RestoreDisplayMode() == DD_OK); - - DirectDraw->Release(); - - - return TRUE; -} - - -BOOL Test_GetMonitorFrequency (INT* passed, INT* failed) -{ - LPDIRECTDRAW7 DirectDraw; - LPDDRAWI_DIRECTDRAW_INT This; - - /* Preparations */ - if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) - { - printf("ERROR: Failed to set up ddraw\n"); - return FALSE; - } - This = (LPDDRAWI_DIRECTDRAW_INT)DirectDraw; - - /* Here we go */ - DWORD lpFreq; - DWORD temp; - HRESULT retVal; - TEST (DirectDraw->GetMonitorFrequency((PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS); - TEST (DirectDraw->GetMonitorFrequency(NULL) == DDERR_INVALIDPARAMS); - - /* This test depns on which graphice card you have */ - retVal = DirectDraw->GetMonitorFrequency((PDWORD)&lpFreq); - - if ( retVal == DDERR_UNSUPPORTED) - { - retVal = DD_OK; - } - TEST ( retVal == DD_OK); - - /* hacking testing */ - - /* shall return DDERR_UNSUPPORTED */ - This->lpLcl->lpGbl->dwMonitorFrequency = 0; - TEST (DirectDraw->GetMonitorFrequency(&temp) == DDERR_UNSUPPORTED); - - /* shall return DD_OK */ - This->lpLcl->lpGbl->dwMonitorFrequency = 85; - TEST (DirectDraw->GetMonitorFrequency(&temp) == DD_OK); - - /* restore */ - This->lpLcl->lpGbl->dwMonitorFrequency = lpFreq; - - DirectDraw->Release(); - - return TRUE; -} Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun Jun 10 15:50:56 2007 @@ -5,9 +5,9 @@ #include "debug.cpp" /* include the tests */ -#include "DDraw/CreateDDraw.cpp" -#include "DDraw/DisplayModes.cpp" -#include "DDraw/CreateSurface.cpp" +#include "DDraw/create.cpp" +#include "DDraw/display_modes.cpp" +#include "Surface/create.cpp" #include "Surface/private_data.cpp" /* The List of tests */

1 0

[weiden] 27111: convert a switch statement with a range to an if statement (msvc compatibility)
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 15:50:48 2007 New Revision: 27111 URL: http://svn.reactos.org/svn/reactos?rev=27111&view=rev Log: convert a switch statement with a range to an if statement (msvc compatibility) Modified: trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c Sun Jun 10 15:50:48 2007 @@ -2337,15 +2337,12 @@ if (uiCmdId != 0) { - switch (uiCmdId) - { - case ID_SHELL_CMD_FIRST ... ID_SHELL_CMD_LAST: - { - CMINVOKECOMMANDINFO cmici = {0}; - - if (pcm == NULL) - break; - + if (uiCmdId >= ID_SHELL_CMD_FIRST && uiCmdId <= ID_SHELL_CMD_LAST) + { + CMINVOKECOMMANDINFO cmici = {0}; + + if (pcm != NULL) + { /* Setup and invoke the shell command */ cmici.cbSize = sizeof(cmici); cmici.hwnd = hWndOwner; @@ -2354,13 +2351,12 @@ IContextMenu_InvokeCommand(pcm, &cmici); - break; - } - - default: - ITrayWindow_ExecContextMenuCmd(ITrayWindow_from_impl(This), - uiCmdId); - break; + } + } + else + { + ITrayWindow_ExecContextMenuCmd(ITrayWindow_from_impl(This), + uiCmdId); } }

1 0

[mbosma] 27110: - some rearrangement - tests for GetPrivateData, SetPrivateData, FreePrivateData of IDirectDrawSurface
by mbosma＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: mbosma Date: Sun Jun 10 15:42:58 2007 New Revision: 27110 URL: http://svn.reactos.org/svn/reactos?rev=27110&view=rev Log: - some rearrangement - tests for GetPrivateData, SetPrivateData, FreePrivateData of IDirectDrawSurface Added: trunk/rostests/dxtest/ddraw/DDraw/ - copied from r27104, trunk/rostests/dxtest/ddraw/tests/ trunk/rostests/dxtest/ddraw/Surface/ trunk/rostests/dxtest/ddraw/Surface/overlay.cpp (with props) trunk/rostests/dxtest/ddraw/helper.cpp (with props) Removed: trunk/rostests/dxtest/ddraw/tests/ Modified: trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/ddraw.rbuild trunk/rostests/dxtest/ddraw/testlist.cpp Modified: trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp Sun Jun 10 15:42:58 2007 @@ -421,29 +421,3 @@ return TRUE; } - - -LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) -{ - switch (message) - { - case WM_DESTROY: - { - PostQuitMessage (0); - return 0; - } break; - } - - return DefWindowProc (hwnd, message, wParam, lParam); -} - -HWND CreateBasicWindow (VOID) -{ - WNDCLASS wndclass = {0}; - wndclass.lpfnWndProc = BasicWindowProc; - wndclass.hInstance = GetModuleHandle(NULL); - wndclass.lpszClassName = "DDrawTest"; - RegisterClass(&wndclass); - - return CreateWindow("DDrawTest", "ReactOS DirectDraw Test", WS_POPUP, 0, 0, 10, 10, NULL, NULL, GetModuleHandle(NULL), NULL); -} Added: trunk/rostests/dxtest/ddraw/Surface/overlay.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/over… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/overlay.cpp (added) +++ trunk/rostests/dxtest/ddraw/Surface/overlay.cpp Sun Jun 10 15:42:58 2007 @@ -1,0 +1,7 @@ +//AddOverlayDirtyRect +//EnumOverlayZOrders +//GetOverlayPosition +//SetOverlayPosition +//UpdateOverlay +//UpdateOverlayDisplay +//UpdateOverlayZOrder Propchange: trunk/rostests/dxtest/ddraw/Surface/overlay.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/Surface/overlay.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw.rbuild (original) +++ trunk/rostests/dxtest/ddraw/ddraw.rbuild Sun Jun 10 15:42:58 2007 @@ -9,5 +9,6 @@ <library>ddraw</library> <library>dxguid</library> <file>ddraw_test.cpp</file> + <file>helper.cpp</file> <file>testlist.cpp</file> </module> Added: trunk/rostests/dxtest/ddraw/helper.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/helper.cpp?r… ============================================================================== --- trunk/rostests/dxtest/ddraw/helper.cpp (added) +++ trunk/rostests/dxtest/ddraw/helper.cpp Sun Jun 10 15:42:58 2007 @@ -1,0 +1,74 @@ +#include "ddrawtest.h" + +LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) +{ + switch (message) + { + case WM_DESTROY: + { + PostQuitMessage (0); + return 0; + } break; + } + + return DefWindowProc (hwnd, message, wParam, lParam); +} + +HWND CreateBasicWindow (VOID) +{ + WNDCLASS wndclass = {0}; + wndclass.lpfnWndProc = BasicWindowProc; + wndclass.hInstance = GetModuleHandle(NULL); + wndclass.lpszClassName = "DDrawTest"; + RegisterClass(&wndclass); + + return CreateWindow("DDrawTest", "ReactOS DirectDraw Test", WS_POPUP, 0, 0, 10, 10, NULL, NULL, GetModuleHandle(NULL), NULL); +} + + +BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface) +{ + LPDIRECTDRAW7 DirectDraw; + LPDIRECTDRAWSURFACE7 Surface; + HWND hwnd; + + // Create DDraw Object + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + if(!( hwnd = CreateBasicWindow() )) + { + printf("ERROR: Failed to create window\n"); + DirectDraw->Release(); + return FALSE; + } + + if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK) + { + printf("ERROR: Could not set cooperative level\n"); + DirectDraw->Release(); + return 0; + } + + // Creat Surface + DDSURFACEDESC2 Desc = { 0 }; + Desc.dwHeight = 200; + Desc.dwWidth = 200; + Desc.dwSize = sizeof (DDSURFACEDESC2); + Desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + + if(DirectDraw->CreateSurface(&Desc, &Surface, NULL) != DD_OK) + { + printf("ERROR: Faild to create Surface\n"); + return FALSE; + } + + DirectDraw->Release(); + + *pSurface = Surface; + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/helper.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/helper.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/testlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp… ============================================================================== --- trunk/rostests/dxtest/ddraw/testlist.cpp (original) +++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun Jun 10 15:42:58 2007 @@ -5,14 +5,14 @@ #include "debug.cpp" /* include the tests */ -#include "tests/CreateDDraw.cpp" -#include "tests/DisplayModes.cpp" -#include "tests/CreateSurface.cpp" +#include "DDraw/CreateDDraw.cpp" +#include "DDraw/DisplayModes.cpp" +#include "DDraw/CreateSurface.cpp" +#include "Surface/private_data.cpp" /* The List of tests */ TEST TestList[] = { - { "IDirectDraw: COM Stuff", Test_CreateDDraw }, { "IDirectDraw: GetDeviceIdentifier", Test_GetDeviceIdentifier }, { "IDirectDraw: Display Frequency", Test_GetMonitorFrequency }, @@ -21,6 +21,7 @@ { "IDirectDraw: GetFourCC", Test_GetFourCCCodes }, { "IDirectDraw: Cooperative Levels", Test_SetCooperativeLevel }, { "IDirectDraw: CreateSurface", Test_CreateSurface }, + { "IDirectDrawSurface: Private Data", Test_PrivateData }, }; /* The function that gives us the number of tests */

1 0

[weiden] 27109: Fix accidentally introduced thread and memory leak when the cache should be run down
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 15:24:34 2007 New Revision: 27109 URL: http://svn.reactos.org/svn/reactos?rev=27109&view=rev Log: Fix accidentally introduced thread and memory leak when the cache should be run down Modified: trunk/reactos/dll/win32/aclui/sidcache.c Modified: trunk/reactos/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/sidcache.c… ============================================================================== --- trunk/reactos/dll/win32/aclui/sidcache.c (original) +++ trunk/reactos/dll/win32/aclui/sidcache.c Sun Jun 10 15:24:34 2007 @@ -158,7 +158,11 @@ static VOID DereferenceSidCacheMgr(IN PSIDCACHEMGR scm) { - InterlockedDecrement(&scm->RefCount); + if (InterlockedDecrement(&scm->RefCount) == 0) + { + /* Signal the lookup thread so it can terminate */ + SetEvent(scm->LookupEvent); + } }

1 0

[weiden] 27108: Display nice images taken (and modified) from http://www.lullabot.com/articles/free_gpl_icons_lullacons_pack_1, which are licensed under the GPL.
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 15:17:38 2007 New Revision: 27108 URL: http://svn.reactos.org/svn/reactos?rev=27108&view=rev Log: Display nice images taken (and modified) from http://www.lullabot.com/articles/free_gpl_icons_lullacons_pack_1, which are licensed under the GPL. Modified: trunk/reactos/dll/win32/aclui/aclui.c trunk/reactos/dll/win32/aclui/res/usrgrp.bmp Modified: trunk/reactos/dll/win32/aclui/aclui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.c?re… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.c (original) +++ trunk/reactos/dll/win32/aclui/aclui.c Sun Jun 10 15:17:38 2007 @@ -1363,13 +1363,28 @@ LVS_EX_FULLROWSELECT, LVS_EX_FULLROWSELECT); - sp->hiPrincipals = ImageList_LoadBitmap(hDllInstance, - MAKEINTRESOURCE(IDB_USRGRPIMAGES), - 16, - 3, - RGB(255, - 0, - 255)); + sp->hiPrincipals = ImageList_Create(16, + 16, + ILC_COLOR32 | ILC_MASK, + 0, + 3); + if (sp->hiPrincipals != NULL) + { + HBITMAP hbmImages; + + hbmImages = LoadBitmap(hDllInstance, + MAKEINTRESOURCE(IDB_USRGRPIMAGES)); + if (hbmImages != NULL) + { + ImageList_AddMasked(sp->hiPrincipals, + hbmImages, + RGB(255, + 0, + 255)); + + DeleteObject(hbmImages); + } + } /* setup the listview control */ if (sp->hiPrincipals != NULL) Modified: trunk/reactos/dll/win32/aclui/res/usrgrp.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/res/usrgrp… ============================================================================== Binary files - no diff available.

1 0

[dgorbachev] 27107: Fix issue #2151.
by dgorbachev＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: dgorbachev Date: Sun Jun 10 15:11:05 2007 New Revision: 27107 URL: http://svn.reactos.org/svn/reactos?rev=27107&view=rev Log: Fix issue #2151. Modified: trunk/reactos/ntoskrnl/mm/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c Sun Jun 10 15:11:05 2007 @@ -1767,7 +1767,7 @@ NtHeader->OptionalHeader.AddressOfEntryPoint); LdrEntry->SizeOfImage = DriverSize; LdrEntry->CheckSum = NtHeader->OptionalHeader.CheckSum; - LdrEntry->SectionPointer = LdrEntry; + LdrEntry->SectionPointer = NULL; // ? /* Now write the DLL name */ LdrEntry->BaseDllName.Buffer = (PVOID)(LdrEntry + 1);

1 0

[weiden] 27106: Display the owner of the security descriptor
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 14:45:38 2007 New Revision: 27106 URL: http://svn.reactos.org/svn/reactos?rev=27106&view=rev Log: Display the owner of the security descriptor Modified: trunk/reactos/dll/win32/aclui/aclui.c trunk/reactos/dll/win32/aclui/aclui_En.rc trunk/reactos/dll/win32/aclui/precomp.h trunk/reactos/dll/win32/aclui/resource.h trunk/reactos/dll/win32/aclui/sidcache.c Modified: trunk/reactos/dll/win32/aclui/aclui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.c?re… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.c (original) +++ trunk/reactos/dll/win32/aclui/aclui.c Sun Jun 10 14:45:38 2007 @@ -90,6 +90,9 @@ DestroySidCacheMgr(sp->SidCacheMgr); + if (sp->OwnerSid != NULL) + LocalFree((HLOCAL)sp->OwnerSid); + HeapFree(GetProcessHeap(), 0, sp); @@ -309,34 +312,44 @@ } static LPWSTR +GetDisplayStringFromSidRequestResult(IN PSIDREQRESULT SidReqResult) +{ + LPWSTR lpDisplayString = NULL; + + if (SidReqResult->SidNameUse == SidTypeUser || + SidReqResult->SidNameUse == SidTypeGroup) + { + LoadAndFormatString(hDllInstance, + IDS_USERDOMAINFORMAT, + &lpDisplayString, + SidReqResult->AccountName, + SidReqResult->DomainName, + SidReqResult->AccountName); + } + else + { + LoadAndFormatString(hDllInstance, + IDS_USERFORMAT, + &lpDisplayString, + SidReqResult->AccountName); + } + + return lpDisplayString; +} + +static LPWSTR GetPrincipalDisplayString(IN PPRINCIPAL_LISTITEM PrincipalListItem) { LPWSTR lpDisplayString = NULL; if (PrincipalListItem->SidReqResult != NULL) { - if (PrincipalListItem->SidReqResult->SidNameUse == SidTypeUser || - PrincipalListItem->SidReqResult->SidNameUse == SidTypeGroup) - { - LoadAndFormatString(hDllInstance, - IDS_USERDOMAINFORMAT, - &lpDisplayString, - PrincipalListItem->SidReqResult->AccountName, - PrincipalListItem->SidReqResult->DomainName, - PrincipalListItem->SidReqResult->AccountName); - } - else - { - LoadAndFormatString(hDllInstance, - IDS_USERFORMAT, - &lpDisplayString, - PrincipalListItem->SidReqResult->AccountName); - } + lpDisplayString = GetDisplayStringFromSidRequestResult(PrincipalListItem->SidReqResult); } else { - ConvertSidToStringSid((PSID)(PrincipalListItem + 1), - &lpDisplayString); + ConvertSidToStringSidW((PSID)(PrincipalListItem + 1), + &lpDisplayString); } return lpDisplayString; @@ -491,8 +504,11 @@ ReloadPrincipalsList(IN PSECURITY_PAGE sp) { PSECURITY_DESCRIPTOR SecurityDescriptor; - BOOL DaclPresent, DaclDefaulted; + BOOL DaclPresent, DaclDefaulted, OwnerDefaulted; PACL Dacl = NULL; + PSID OwnerSid = NULL; + LPTSTR OwnerSidString; + DWORD SidLen; HRESULT hRet; /* delete the cached ACL */ @@ -501,11 +517,67 @@ /* query the ACL */ hRet = sp->psi->lpVtbl->GetSecurity(sp->psi, - DACL_SECURITY_INFORMATION, + DACL_SECURITY_INFORMATION | OWNER_SECURITY_INFORMATION, &SecurityDescriptor, FALSE); if (SUCCEEDED(hRet) && SecurityDescriptor != NULL) { + if (GetSecurityDescriptorOwner(SecurityDescriptor, + &OwnerSid, + &OwnerDefaulted)) + { + sp->OwnerDefaulted = OwnerDefaulted; + if (sp->OwnerSid != NULL) + { + LocalFree((HLOCAL)sp->OwnerSid); + sp->OwnerSid = NULL; + } + + SidLen = GetLengthSid(OwnerSid); + if (SidLen == 0) + goto ClearOwner; + + sp->OwnerSid = (PSID)LocalAlloc(LMEM_FIXED, + SidLen); + if (sp->OwnerSid != NULL) + { + if (CopySid(SidLen, + sp->OwnerSid, + OwnerSid)) + { + /* Lookup the SID now */ + if (!LookupSidCache(sp->SidCacheMgr, + sp->OwnerSid, + SidLookupCompletion, + sp)) + { + /* Lookup was deferred */ + if (ConvertSidToStringSid(sp->OwnerSid, + &OwnerSidString)) + { + SetDlgItemText(sp->hWnd, + IDC_OWNER, + OwnerSidString); + LocalFree((HLOCAL)OwnerSidString); + } + else + goto ClearOwner; + } + } + else + goto ClearOwner; + } + else + goto ClearOwner; + } + else + { +ClearOwner: + SetDlgItemText(sp->hWnd, + IDC_OWNER, + NULL); + } + if (GetSecurityDescriptorDacl(SecurityDescriptor, &DaclPresent, &Dacl, @@ -605,6 +677,29 @@ IN PSIDLOOKUPNOTIFYINFO LookupInfo) { PPRINCIPAL_LISTITEM CurItem; + LPWSTR DisplayName; + + if (sp->OwnerSid != NULL && + EqualSid(sp->OwnerSid, + LookupInfo->Sid)) + { + if (LookupInfo->SidRequestResult != NULL) + DisplayName = GetDisplayStringFromSidRequestResult(LookupInfo->SidRequestResult); + else if (!ConvertSidToStringSidW(LookupInfo->Sid, + &DisplayName)) + { + DisplayName = NULL; + } + + if (DisplayName != NULL) + { + SetDlgItemTextW(sp->hWnd, + IDC_OWNER, + DisplayName); + + LocalFree((HLOCAL)DisplayName); + } + } for (CurItem = sp->PrincipalsListHead; CurItem != NULL; @@ -1422,6 +1517,9 @@ return NULL; } + ZeroMemory(sPage, + sizeof(*sPage)); + sPage->psi = psi; sPage->ObjectInfo = ObjectInfo; sPage->ServerName = SystemName; Modified: trunk/reactos/dll/win32/aclui/aclui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_En.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_En.rc (original) +++ trunk/reactos/dll/win32/aclui/aclui_En.rc Sun Jun 10 14:45:38 2007 @@ -5,8 +5,10 @@ CAPTION "Security" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Group or user names:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Group or user names:", -1, 7, 21, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 31, 213, 52, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + LTEXT "&Owner:", -1, 7, 7, 49, 8 + EDITTEXT IDC_OWNER, 63, 4, 156, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY PUSHBUTTON "A&dd...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "&Remove", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX Modified: trunk/reactos/dll/win32/aclui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/aclui/precomp.h (original) +++ trunk/reactos/dll/win32/aclui/precomp.h Sun Jun 10 14:45:38 2007 @@ -50,6 +50,9 @@ HWND hWndPrincipalsList; PPRINCIPAL_LISTITEM PrincipalsListHead; + PSID OwnerSid; + BOOL OwnerDefaulted; + INT ControlsMargin; INT SpecialPermCheckIndex; Modified: trunk/reactos/dll/win32/aclui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/resource.h… ============================================================================== --- trunk/reactos/dll/win32/aclui/resource.h (original) +++ trunk/reactos/dll/win32/aclui/resource.h Sun Jun 10 14:45:38 2007 @@ -12,6 +12,7 @@ #define IDC_ADVANCED 1007 #define IDC_LABEL_ADVANCED 1008 #define IDC_LABEL_PERMISSIONS_FOR 1009 +#define IDC_OWNER 1010 #define IDS_PSP_TITLE 1001 #define IDS_UNKNOWN 1002 Modified: trunk/reactos/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/sidcache.c… ============================================================================== --- trunk/reactos/dll/win32/aclui/sidcache.c (original) +++ trunk/reactos/dll/win32/aclui/sidcache.c Sun Jun 10 14:45:38 2007 @@ -36,7 +36,7 @@ typedef struct _SIDCACHEMGR { - LONG RefCount; + volatile LONG RefCount; LSA_HANDLE LsaHandle; CRITICAL_SECTION Lock; LIST_ENTRY QueueListHead; @@ -109,12 +109,6 @@ static VOID CleanupSidCacheMgr(IN PSIDCACHEMGR scm) { - /* make sure the lookup thread runs down */ - SetEvent(scm->LookupEvent); - WaitForSingleObject(scm->LookupThread, - INFINITE); - - LsaClose(scm->LsaHandle); CloseHandle(scm->LookupEvent); CloseHandle(scm->LookupThread); @@ -164,14 +158,7 @@ static VOID DereferenceSidCacheMgr(IN PSIDCACHEMGR scm) { - if (InterlockedDecrement(&scm->RefCount) == 0) - { - CleanupSidCacheMgr(scm); - - HeapFree(scm->Heap, - 0, - scm); - } + InterlockedDecrement(&scm->RefCount); } @@ -456,7 +443,17 @@ static DWORD WINAPI LookupThreadProc(IN LPVOID lpParameter) { + HMODULE hModule; PSIDCACHEMGR scm = (PSIDCACHEMGR)lpParameter; + + /* Reference the dll to avoid problems in case of accidental + FreeLibrary calls... */ + if (!GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (LPCWSTR)hDllInstance, + &hModule)) + { + hModule = NULL; + } while (scm->RefCount != 0) { @@ -564,6 +561,19 @@ FreeQueueEntry(scm, QueueEntry); } + } + + CleanupSidCacheMgr(scm); + + HeapFree(scm->Heap, + 0, + scm); + + if (hModule != NULL) + { + /* dereference the library and exit */ + FreeLibraryAndExitThread(hModule, + 0); } return 0;

1 0

[weiden] 27105: Add GUIDs for IID_IBandSite, CLSID_RebarBandSite and IID_IDeskBand
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 13:32:11 2007 New Revision: 27105 URL: http://svn.reactos.org/svn/reactos?rev=27105&view=rev Log: Add GUIDs for IID_IBandSite, CLSID_RebarBandSite and IID_IDeskBand Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=27… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c Sun Jun 10 13:32:11 2007 @@ -89,3 +89,7 @@ DEFINE_GUID(CLSID_Picture_Metafile, 0x00000315,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_Picture_Dib, 0x00000316,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_StdGlobalInterfaceTable,0x00000323,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); + +DEFINE_GUID(IID_IBandSite, 0x4CF504B0, 0xDE96, 0x11D0, 0x8B, 0x3F, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE5); +DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); +DEFINE_GUID(IID_IDeskBand, 0xEB0FE172, 0x1A3A, 0x11D0, 0x89, 0xB3, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC);

1 0

[weiden] 27104: Add a very experimental explorer that heavily relies on the shell. It's still very buggy, not very functional and will not work on ReactOS due to the lack of support in shell32.dll and friends. It will not be built by default. - todo.h is a header that contains definitions and GUIDs that we miss in the public sdk headers. - undoc.h contains functions that are not publicly documented. It also contains internal (not yet complete) COM interfaces used with the start menu and SHCreate
by weiden＠svn.reactos.org 10 Jun '07

10 Jun '07

Author: weiden Date: Sun Jun 10 12:09:42 2007 New Revision: 27104 URL: http://svn.reactos.org/svn/reactos?rev=27104&view=rev Log: Add a very experimental explorer that heavily relies on the shell. It's still very buggy, not very functional and will not work on ReactOS due to the lack of support in shell32.dll and friends. It will not be built by default. - todo.h is a header that contains definitions and GUIDs that we miss in the public sdk headers. - undoc.h contains functions that are not publicly documented. It also contains internal (not yet complete) COM interfaces used with the start menu and SHCreateDesktop. Added: trunk/reactos/base/shell/explorer-new/ trunk/reactos/base/shell/explorer-new/comcsup.h (with props) trunk/reactos/base/shell/explorer-new/desktop.c (with props) trunk/reactos/base/shell/explorer-new/dragdrop.c (with props) trunk/reactos/base/shell/explorer-new/explorer.c (with props) trunk/reactos/base/shell/explorer-new/explorer.rbuild (with props) trunk/reactos/base/shell/explorer-new/explorer.rc (with props) trunk/reactos/base/shell/explorer-new/lang/ trunk/reactos/base/shell/explorer-new/lang/en-US.rc (with props) trunk/reactos/base/shell/explorer-new/manifest.xml (with props) trunk/reactos/base/shell/explorer-new/precomp.h (with props) trunk/reactos/base/shell/explorer-new/res/ trunk/reactos/base/shell/explorer-new/res/logov.bmp (with props) trunk/reactos/base/shell/explorer-new/res/start.ico (with props) trunk/reactos/base/shell/explorer-new/resource.h (with props) trunk/reactos/base/shell/explorer-new/startmnu.c (with props) trunk/reactos/base/shell/explorer-new/taskband.c (with props) trunk/reactos/base/shell/explorer-new/taskswnd.c (with props) trunk/reactos/base/shell/explorer-new/tbsite.c (with props) trunk/reactos/base/shell/explorer-new/todo.h (with props) trunk/reactos/base/shell/explorer-new/trayntfy.c (with props) trunk/reactos/base/shell/explorer-new/trayprop.c (with props) trunk/reactos/base/shell/explorer-new/traywnd.c (with props) trunk/reactos/base/shell/explorer-new/undoc.h (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/shell/explorer-new/comcsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/co… Added: trunk/reactos/base/shell/explorer-new/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/de… Added: trunk/reactos/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/dr… Added: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Added: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/shell/explorer-new/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ma… Added: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… Added: trunk/reactos/base/shell/explorer-new/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… Added: trunk/reactos/base/shell/explorer-new/res/start.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… Added: trunk/reactos/base/shell/explorer-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… Added: trunk/reactos/base/shell/explorer-new/startmnu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st… Added: trunk/reactos/base/shell/explorer-new/taskband.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… Added: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… Added: trunk/reactos/base/shell/explorer-new/tbsite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb… Added: trunk/reactos/base/shell/explorer-new/todo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/to… Added: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… Added: trunk/reactos/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… Added: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… Added: trunk/reactos/base/shell/explorer-new/undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/un…

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