Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[mbosma] 27117: Add tests for IDirectDrawSurface methods: - GetCaps - GetDC / ReleaseDC - ChangeUniquenessValue / GetUniquenessValue - GetPixelFormat - GetSurfaceDesc - GetDDInterface

by mbosma＠svn.reactos.org

Author: mbosma Date: Sun Jun 10 18:32:19 2007 New Revision: 27117 URL: http://svn.reactos.org/svn/reactos?rev=27117&view=rev Log: Add tests for IDirectDrawSurface methods: - GetCaps - GetDC / ReleaseDC - ChangeUniquenessValue / GetUniquenessValue - GetPixelFormat - GetSurfaceDesc - GetDDInterface Added: trunk/rostests/dxtest/ddraw/Surface/misc.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/helper.cpp trunk/rostests/dxtest/ddraw/testlist.cpp Added: trunk/rostests/dxtest/ddraw/Surface/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/misc… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/misc.cpp (added) +++ trunk/rostests/dxtest/ddraw/Surface/misc.cpp Sun Jun 10 18:32:19 2007 @@ -1,0 +1,64 @@ +BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface); + +BOOL Test_Misc (INT* passed, INT* failed) +{ + LPDIRECTDRAWSURFACE7 Surface; + if(!CreateSurface(&Surface)) + return FALSE; + + TEST (Surface->Initialize(NULL, NULL) == DDERR_ALREADYINITIALIZED); + + // GetCaps + DDSCAPS2 Caps; + TEST (Surface->GetCaps((DDSCAPS2*)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->GetCaps(&Caps) == DD_OK && Caps.dwCaps == 0x10004040 + && Caps.dwCaps2 == Caps.dwCaps3 == Caps.dwCaps4 == 0); // FIXME: Replace 0x10004040 + + // GetDC / ReleaseDC + HDC hdc; + TEST (Surface->GetDC((HDC*)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->ReleaseDC((HDC)0xdeadbeef) == DDERR_NODC); + TEST (Surface->ReleaseDC(GetDC(NULL)) == DDERR_NODC); + + TEST (Surface->GetDC(&hdc) == DD_OK); + TEST (MoveToEx(hdc, 0, 0, NULL) == TRUE); // validate hdc + TEST (Surface->Blt(NULL, NULL, NULL, 0, NULL) == DDERR_SURFACEBUSY); // check lock + TEST (Surface->ReleaseDC(hdc) == DD_OK); + + // ChangeUniquenessValue / GetUniquenessValue + DWORD Value; + // FIXME: find out other apis which increases the uniqueness value + TEST (Surface->GetUniquenessValue(&Value) == DD_OK && Value == 2); + TEST (Surface->Blt(NULL, NULL, NULL, 0, NULL) == DDERR_INVALIDPARAMS); // Even this increases the uniqueness value + TEST (Surface->GetUniquenessValue(&Value) == DD_OK && Value == 3); + TEST (Surface->ChangeUniquenessValue() == DD_OK); + TEST (Surface->GetUniquenessValue(&Value) == DD_OK && Value == 4); + + // GetPixelFormat + DDPIXELFORMAT PixelFormat = {0}; + // FIXME: Produce DDERR_INVALIDSURFACETYPE + TEST (Surface->GetPixelFormat((LPDDPIXELFORMAT)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->GetPixelFormat(&PixelFormat)); + PixelFormat.dwSize = sizeof(DDPIXELFORMAT); + TEST (Surface->GetPixelFormat(&PixelFormat) == DD_OK && PixelFormat.dwFlags == 0x40); // FIXME: Find out what 0x40 is + + // GetSurfaceDesc / SetSurfaceDesc + DDSURFACEDESC2 Desc = {0}; + // FIXME: Produce DDERR_INVALIDSURFACETYPE + TEST (Surface->GetSurfaceDesc((LPDDSURFACEDESC2)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST (Surface->GetSurfaceDesc(&Desc)); + Desc.dwSize = sizeof(DDSURFACEDESC2); + TEST (Surface->GetSurfaceDesc(&Desc) == DD_OK && Desc.dwFlags == 0x100f); // FIXME: Find out what 0x100f is + TEST (memcmp ((PVOID)&Desc.ddpfPixelFormat, (PVOID)&PixelFormat, sizeof(DDPIXELFORMAT)) == 0); + // FIXME: Test SetSurfaceDesc + + // GetDDInterface + IUnknown* iface; + TEST(Surface->GetDDInterface((LPVOID*)0xdeadbeef) == DDERR_INVALIDPARAMS); + TEST(Surface->GetDDInterface((LPVOID*)&iface) == DD_OK && iface); + TEST(iface->Release() == 1); // FIXME: Test the interface further + + Surface->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/Surface/misc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/Surface/misc.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: 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 (original) +++ trunk/rostests/dxtest/ddraw/helper.cpp Sun Jun 10 18:32:19 2007 @@ -24,7 +24,6 @@ return CreateWindow("DDrawTest", "ReactOS DirectDraw Test", WS_POPUP, 0, 0, 10, 10, NULL, NULL, GetModuleHandle(NULL), NULL); } - BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface) { 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 18:32:19 2007 @@ -9,6 +9,7 @@ #include "DDraw/display_modes.cpp" #include "Surface/create.cpp" #include "Surface/private_data.cpp" +#include "Surface/misc.cpp" /* The List of tests */ TEST TestList[] = @@ -20,8 +21,9 @@ { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, { "IDirectDraw: GetFourCC", Test_GetFourCCCodes }, { "IDirectDraw: Cooperative Levels", Test_SetCooperativeLevel }, - { "IDirectDraw: CreateSurface", Test_CreateSurface }, + { "IDirectDrawSurface: Creation", Test_CreateSurface }, { "IDirectDrawSurface: Private Data", Test_PrivateData }, + { "IDirectDrawSurface: Miscellaneous Tests", Test_Misc }, }; /* The function that gives us the number of tests */

17 years, 6 months

[dreimer] 27116: First commit in the Direction of a Config.rbuild editor. Right now only a bunch of commands, without any real sense, but getting them made my head almost explode, so I want to have them secure.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sun Jun 10 18:08:15 2007 New Revision: 27116 URL: http://svn.reactos.org/svn/reactos?rev=27116&view=rev Log: First commit in the Direction of a Config.rbuild editor. Right now only a bunch of commands, without any real sense, but getting them made my head almost explode, so I want to have them secure. Added: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/config.rbuild Modified: trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/README.txt trunk/tools/RosBE-Windows/Root/RosBE.mac Added: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (added) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Jun 10 18:08:15 2007 @@ -1,0 +1,20 @@ +sed "s/\"SARCH\" value=\"\"/\"SARCH\" value=\%1"\"/g;s/\"SARCH\" value=\"xbox\"/\"SARCH\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"OPTIMIZE\" value=\"[0-5]\"/\"OPTIMIZE\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"MP\" value=\"[0-1]\"/\"MP\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"KDBG\" value=\"[0-1]\"/\"KDBG\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"DBG\" value=\"[0-1]\"/\"DBG\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"GDB\" value=\"[0-1]\"/\"GDB\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"NSWPAT\" value=\"[0-1]\"/\"NSWPAT\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"NTLPC\" value=\"[0-1]\"/\"NTLPC\" value=\"%1\"/g" config.rbuild > config2.rbuild +sed "s/\"_WINKD_\" value=\"[0-1]\"/\"_WINKD_\" value=\"%1\"/g" config.rbuild > config2.rbuild + +grep SARCH config.rbuild|cut -d "\"" -f 4 +grep OARCH config.rbuild|cut -d "\"" -f 4 +grep OPTIMIZE config.rbuild|cut -d "\"" -f 4 +grep MP config.rbuild|cut -d "\"" -f 4 +grep KDBG config.rbuild|cut -d "\"" -f 4 +grep DBG config.rbuild|cut -d "\"" -f 4 +grep GDB config.rbuild|cut -d "\"" -f 4 +grep NSWPAT config.rbuild|cut -d "\"" -f 4 +grep NTLPC config.rbuild|cut -d "\"" -f 4 +grep _WINKD_ config.rbuild|cut -d "\"" -f 4 Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Sun Jun 10 18:08:15 2007 @@ -21,6 +21,8 @@ echo specific command. echo svn [OPTIONS] - Create, Update or clean up your ReactOS Source echo tree. + echo config - Configures the way, ReactOS will be built. + echo echo basedir - Switch back to the ReactOS source directory. goto :EOF ) Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… ============================================================================== --- trunk/tools/RosBE-Windows/Root/README.txt (original) +++ trunk/tools/RosBE-Windows/Root/README.txt Sun Jun 10 18:08:15 2007 @@ -42,7 +42,7 @@ NSIS (Nullsoft Scriptable Install System) http://nsis.sourceforge.net/ -The GnuWin32 Project (tee/test and their dependencies were obtained here) +The GnuWin32 Project (tee/test/sed/cut/grep and their dependencies were obtained here) http://gnuwin32.sourceforge.net/ Inspired by blight's ReactOS Build Environment v0.2-3.4.4 Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.mac (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.mac Sun Jun 10 18:08:15 2007 @@ -1,6 +1,7 @@ BASEDIR = cd /d "%_ROSSOURCEDIR%" CLEAN = "%ROSBEBASEDIR%\Clean.cmd" $* SVN = "%ROSBEBASEDIR%\SVN.cmd" $* +CONFIG = "%ROSBEBASEDIR%\Config.cmd" $* HELP = "%ROSBEBASEDIR%\Help.cmd" $* MAKE = "%ROSBEBASEDIR%\Build.cmd" $* MAKEX = "%ROSBEBASEDIR%\Build-Multi.cmd" $* Added: trunk/tools/RosBE-Windows/Root/config.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/config.rb… ============================================================================== --- trunk/tools/RosBE-Windows/Root/config.rbuild (added) +++ trunk/tools/RosBE-Windows/Root/config.rbuild Sun Jun 10 18:08:15 2007 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + +<property name="ARCH" value="i386" /> +<property name="SARCH" value="" /> +<property name="OARCH" value="pentium" /> +<property name="OPTIMIZE" value="1" /> +<property name="MP" value="0" /> +<property name="KDBG" value="0" /> +<property name="DBG" value="1" /> +<property name="GDB" value="0" /> +<property name="NSWPAT" value="0" /> +<property name="NTLPC" value="1" /> +<property name="_WINKD_" value="0" /> + +</rbuild>

17 years, 6 months

[mbosma] 27115: added wrong file

by mbosma＠svn.reactos.org

Author: mbosma Date: Sun Jun 10 16:03:01 2007 New Revision: 27115 URL: http://svn.reactos.org/svn/reactos?rev=27115&view=rev Log: added wrong file Added: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp (with props) Removed: trunk/rostests/dxtest/ddraw/Surface/overlay.cpp Removed: 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 (original) +++ trunk/rostests/dxtest/ddraw/Surface/overlay.cpp (removed) @@ -1,7 +1,0 @@ -//AddOverlayDirtyRect -//EnumOverlayZOrders -//GetOverlayPosition -//SetOverlayPosition -//UpdateOverlay -//UpdateOverlayDisplay -//UpdateOverlayZOrder Added: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/priv… ============================================================================== --- trunk/rostests/dxtest/ddraw/Surface/private_data.cpp (added) +++ trunk/rostests/dxtest/ddraw/Surface/private_data.cpp Sun Jun 10 16:03:01 2007 @@ -1,0 +1,49 @@ +BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface); + +BOOL Test_PrivateData (INT* passed, INT* failed) +{ + LPDIRECTDRAWSURFACE7 Surface; + DWORD size, dummy = 0xBAADF00D; + GUID guid = { 0 }; + GUID guid2 = { 0x1 }; + + if(!CreateSurface(&Surface)) + return FALSE; + + // General test + TEST(Surface->SetPrivateData(guid, NULL, 0, 0) == DDERR_INVALIDPARAMS); + TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, 0, 0) == DDERR_INVALIDPARAMS); + TEST(Surface->SetPrivateData(guid, (LPVOID)0xdeadbeef, sizeof(DWORD), 0) == DDERR_INVALIDPARAMS); + TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, sizeof(DWORD), 0) == DD_OK); + + TEST(Surface->GetPrivateData(guid, NULL, 0) == DDERR_INVALIDPARAMS); + TEST(Surface->GetPrivateData(guid, &dummy, 0) == DDERR_INVALIDPARAMS); + size = 0; + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DDERR_MOREDATA && size == sizeof(DWORD)); + size = 2; + TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_MOREDATA && size == sizeof(DWORD)); + TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_INVALIDPARAMS); + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DD_OK && dummy == 0xBAADF00D); + TEST(Surface->GetPrivateData(guid2, NULL, 0) == DDERR_NOTFOUND); + + TEST(Surface->FreePrivateData(guid) == DD_OK); + TEST(Surface->FreePrivateData(guid) == DDERR_NOTFOUND); + + // Test for DDSPD_VOLATILE flag + TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, sizeof(DWORD), DDSPD_VOLATILE) == DD_OK); + size = 0; + TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_MOREDATA && size == sizeof(DWORD)); + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DD_OK && dummy == 0xBAADF00D); + + DDBLTFX bltfx; + bltfx.dwSize = sizeof(DDBLTFX); + bltfx.dwFillColor = RGB(0, 0, 0); + if(Surface->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &bltfx) != DD_OK) + printf("ERROR: Failed to draw to surface !"); + TEST(Surface->GetPrivateData(guid, &dummy, &size) == DDERR_EXPIRED); + + // TODO: Test for DDSPD_IUNKNOWNPOINTER (see http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/ddraw7/dir…) + + Surface->Release(); + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision

17 years, 6 months

[arty] 27114: - Fix hash function - Set 2nd hash bit for secondary reloads - Use dar for data reloads - Some debug for when it's needed

by arty＠svn.reactos.org

Author: arty Date: Sun Jun 10 15:57:39 2007 New Revision: 27114 URL: http://svn.reactos.org/svn/reactos?rev=27114&view=rev Log: - Fix hash function - Set 2nd hash bit for secondary reloads - Use dar for data reloads - Some debug for when it's needed Modified: branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h branches/powerpc/reactos/lib/mmu/mmuobject.c branches/powerpc/reactos/lib/mmu/mmuutil.c Modified: branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h (original) +++ branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h Sun Jun 10 15:57:39 2007 @@ -81,7 +81,7 @@ typedef struct _ppc_trap_frame_t { unsigned long gpr[32]; - unsigned long lr, ctr, srr0, srr1, dsisr; + unsigned long lr, cr, ctr, srr0, srr1, dsisr, dar; } ppc_trap_frame_t; typedef int (*MmuPageCallback)(int inst, ppc_trap_frame_t *trap); Modified: branches/powerpc/reactos/lib/mmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuobje… ============================================================================== --- branches/powerpc/reactos/lib/mmu/mmuobject.c (original) +++ branches/powerpc/reactos/lib/mmu/mmuobject.c Sun Jun 10 15:57:39 2007 @@ -1,3 +1,4 @@ +#include <stdarg.h> #include "mmu.h" #include "mmuutil.h" #include "mmuobject.h" @@ -63,6 +64,7 @@ MmuVsidTree *NextTreePage = 0; MmuFreeTree *FreeTree; MmuVsidInfo *Segs[16], *VsidHead = 0; +extern void fmtout(const char *fmt, ...); __asm__(".text\n\t" ".globl mmumain\n\t" @@ -122,7 +124,9 @@ "lwz 0,128(1)\n\t" "mtlr 0\n\t" "lwz 0,132(1)\n\t" - "mfctr 0\n\t" + "mtcr 0\n\t" + "lwz 0,136(1)\n\t" + "mtctr 0\n\t" "lwz 0,4(1)\n\t" "mfsprg1 1\n\t" "lwz 0,0(1)\n\t" @@ -175,14 +179,18 @@ "stw 31,124(1)\n\t" "mflr 0\n\t" "stw 0,128(1)\n\t" + "mfcr 0\n\t" + "stw 0,132(1)\n\t" "mfctr 0\n\t" - "stw 0,132(1)\n\t" + "stw 0,136(1)\n\t" "mfsrr0 0\n\t" - "stw 0,136(1)\n\t" + "stw 0,140(1)\n\t" "mfsrr1 0\n\t" - "stw 0,140(1)\n\t" + "stw 0,144(1)\n\t" "mfdsisr 0\n\t" - "stw 0,144(1)\n\t" + "stw 0,148(1)\n\t" + "mfdar 0\n\t" + "stw 0,152(1)\n\t" "li 3,100\n\t" "mr 4,1\n\t" "lis 5,data_miss_finish_start@ha\n\t" @@ -253,14 +261,14 @@ freevsid((int)arg1); break; case 100: - if(!ptegreload(trap_frame)) + if(!ptegreload(trap_frame, trap_frame->dar)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); callback(0,arg1); } break; case 101: - if(!ptegreload(trap_frame)) + if(!ptegreload(trap_frame, trap_frame->srr0)) { __asm__("mfmsr 3\n\tori 3,3,0x30\n\tmtmsr 3\n\t"); callback(1,arg1); @@ -273,13 +281,70 @@ return ret; } +void outchar(char c) +{ + SetPhysByte(0x800003f8, c); +} + +void outstr(const char *str) +{ + while(*str) outchar(*str); +} + +void outdig(int dig) +{ + if(dig < 10) outchar(dig + '0'); + else outchar(dig - 10 + 'A'); +} + +void outnum(unsigned long num) +{ + int i; + for( i = 0; i < 8; i++ ) + { + outdig(num >> 28); + num <<= 4; + } +} + +void fmtout(const char *str, ...) +{ + va_list ap; + va_start(ap, str); + while(*str) + { + if(*str == '%') + { + if(str[1] == '%') + { + outchar('%'); + } + else if(str[1] == 's') + { + outstr(va_arg(ap, const char *)); + } + else + { + outnum(va_arg(ap, int)); + } + str++; + } + else + { + outchar(*str); + } + str++; + } + va_end(ap); +} + void mmusetramsize(paddr_t ramsize) { ppc_map_t *last_map = &PpcPageTable[PPC_PAGE_NUMBER(ramsize)]; if(!RamSize) { RamSize = ramsize; - FirstUsablePage = ROUND_UP((paddr_t)last_map, PPC_PAGE_ADDR(1)); + FirstUsablePage = (paddr_t)last_map; NextPage = PPC_PAGE_NUMBER(FirstUsablePage); } } @@ -299,7 +364,7 @@ SetPhys((paddr_t)target, *start); } - (&data_miss_start)[46]++; + (&data_miss_start)[50]++; for(target = (int *)0x400, start = &data_miss_start; start < &data_miss_end; start++, target++) { @@ -339,7 +404,7 @@ else if(TreeAlloc >= 3 || !NextTreePage) { ppc_map_t *map = allocpage(); - NextTreePage = (MmuVsidTree*)PPC_PAGE_ADDR(map - PpcPageTable); + NextTreePage = (MmuVsidTree*)PPC_PAGE_ADDR((map - PpcPageTable)); TreeAlloc = 1; return NextTreePage; } @@ -362,7 +427,7 @@ MmuVsidInfo *info; if(!map) return 0; map->pte.pteh = map->pte.ptel = 0; - info = (MmuVsidInfo*)PPC_PAGE_ADDR(map - PpcPageTable); + info = (MmuVsidInfo*)PPC_PAGE_ADDR((map - PpcPageTable)); info->vsid = vsid; info->next = VsidHead; VsidHead = info; @@ -423,13 +488,13 @@ } } - phys = PPC_PAGE_ADDR(PagePtr - PpcPageTable); + phys = PPC_PAGE_ADDR((PagePtr - PpcPageTable)); ptelo = phys & ~PPC_PAGE_MASK; - + /* Update page data */ PagePtr->pte.pteh = ptehi; PagePtr->pte.ptel = ptelo; - PagePtr->proc = info->proc; + PagePtr->proc = info[i].proc; PagePtr->addr = virt; vsid_table_hi = virt >> 20 & 255; @@ -531,13 +596,20 @@ } } -int ptegreload(ppc_trap_frame_t *frame) -{ - int addr = frame->srr0, ptegnum = PtegNumber(addr, (Clock >> 3) & 1); +int ptegreload(ppc_trap_frame_t *frame, vaddr_t addr) +{ + int hfun = (Clock >> 3) & 1, ptegnum = PtegNumber(addr, hfun); int vsid = GetSR((addr >> 28) & 15) & PPC_VSID_MASK; ppc_map_t *map = mmuvirtmap(addr, vsid); if(!map) return 0; + map->pte.pteh |= hfun << 6; PpcHashedPTE[ptegnum].block[Clock & 7] = map->pte; +#if 0 + fmtout("Reloading addr %x (phys %x) at %x[%x] (%x:%x)\r\n", + addr, PPC_PAGE_ADDR(map - PpcPageTable), ptegnum, Clock & 15, + PpcHashedPTE[ptegnum].block[Clock&7].pteh, + PpcHashedPTE[ptegnum].block[Clock&7].ptel); +#endif Clock++; __asm__("tlbie %0\n\tsync\n\tisync" : : "r" (addr)); return 1; Modified: branches/powerpc/reactos/lib/mmu/mmuutil.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/mmu/mmuutil… ============================================================================== --- branches/powerpc/reactos/lib/mmu/mmuutil.c (original) +++ branches/powerpc/reactos/lib/mmu/mmuutil.c Sun Jun 10 15:57:39 2007 @@ -407,5 +407,5 @@ { int sr = GetSR( (virt >> 28) & 0xf ); int vsid = sr & PPC_VSID_MASK; - return (((vsid & 0x7ffff) ^ ((virt >> 12) & 0xffff)) ^ (hfun ? -1 : 0)) & ((HTABSIZ - 1) >> 3); -} + return ((((vsid & 0x7ffff) ^ ((virt >> 12) & 0xffff)) ^ (hfun ? -1 : 0)) & ((HTABSIZ - 1) >> 3) & 0x3ff); +}

17 years, 6 months

[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

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 ***************************************************************/

17 years, 6 months

[mbosma] 27112: Some more movement.

by mbosma＠svn.reactos.org

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 */

17 years, 6 months

[weiden] 27111: convert a switch statement with a range to an if statement (msvc compatibility)

by weiden＠svn.reactos.org

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); } }

17 years, 6 months

[mbosma] 27110: - some rearrangement - tests for GetPrivateData, SetPrivateData, FreePrivateData of IDirectDrawSurface

by mbosma＠svn.reactos.org

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 */

17 years, 6 months

[weiden] 27109: Fix accidentally introduced thread and memory leak when the cache should be run down

by weiden＠svn.reactos.org

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); + } }

17 years, 6 months

[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

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.

17 years, 6 months

← Newer
1
...
21
22
23
24
25
26
27
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2007