Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[greatlrd] 27077: small code cleanup
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Fri Jun 8 23:18:45 2007 New Revision: 27077 URL: http://svn.reactos.org/svn/reactos?rev=27077&view=rev Log: small code cleanup Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Fri Jun 8 23:18:45 2007 @@ -124,6 +124,7 @@ return DDERR_GENERIC; } */ + This->lpLcl->hDD = ddgbl.hDD; return DD_OK; } } @@ -282,8 +283,7 @@ /* Fill some basic info for Surface */ This->lpLcl->lpGbl->dwFlags = dwFlags | DDRAWI_ATTACHEDTODESKTOP; This->lpLcl->lpDDCB = This->lpLcl->lpGbl->lpDDCBtmp; - This->lpLcl->hDD = This->lpLcl->lpGbl->hDD; - ddgbl.hDD = This->lpLcl->lpGbl->hDD; + This->lpLcl->hDD = ddgbl.hDD; DX_STUB_str("DD_OK\n"); return DD_OK;

1 0

[greatlrd] 27076: adding allot more testcase for Test_GetAvailableVidMem it is not complete but we testing allot more now
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Fri Jun 8 23:17:46 2007 New Revision: 27076 URL: http://svn.reactos.org/svn/reactos?rev=27076&view=rev Log: adding allot more testcase for Test_GetAvailableVidMem it is not complete but we testing allot more now Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Fri Jun 8 23:17:46 2007 @@ -93,89 +93,259 @@ /* 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); - Caps.dwCaps = 0; + 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); + // FIXME - Caps.dwCaps2 = 0; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - Caps.dwCaps = 0; - Caps.dwCaps2 = 0; - - // FIXME + memset(&Caps,0,sizeof(DDSCAPS2)); Caps.dwCaps3 = 0; TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - Caps.dwCaps = 0; - Caps.dwCaps2 = 0; - Caps.dwCaps3 = 0; - - // FIXME - Caps.dwCaps4 = 0; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + /* dwCaps does not accpect any input param */ + memset(&Caps,0,sizeof(DDSCAPS2)); + 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();

1 0

[greatlrd] 27075: Fixing allot bugs in Main_DirectDraw_GetAvailableVidMem, it is still buggi
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Fri Jun 8 21:12:05 2007 New Revision: 27075 URL: http://svn.reactos.org/svn/reactos?rev=27075&view=rev Log: Fixing allot bugs in Main_DirectDraw_GetAvailableVidMem, it is still buggi Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Fri Jun 8 21:12:05 2007 @@ -184,7 +184,8 @@ _SEH_TRY { // There is no HEL implentation of this api - if (!(This->lpLcl->lpDDCB->cbDDMiscellaneousCallbacks.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) + if (!(This->lpLcl->lpDDCB->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY) || + (This->lpLcl->lpGbl->dwFlags & DDRAWI_NOHARDWARE) ) { retVal = DDERR_NODIRECTDRAWHW; } @@ -193,31 +194,63 @@ if ((!dwTotal && !dwFree) || !ddscaps) { retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if ( ddscaps->dwCaps & (DDSCAPS_BACKBUFFER | DDSCAPS_COMPLEX | DDSCAPS_FLIP | + DDSCAPS_FRONTBUFFER | DDSCAPS_PALETTE | DDSCAPS_SYSTEMMEMORY | + DDSCAPS_VISIBLE | DDSCAPS_WRITEONLY | DDSCAPS_OWNDC)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + /* fixme + if ( ddscaps->dwCaps2 & (DDSCAPS_BACKBUFFER | DDSCAPS_COMPLEX | DDSCAPS_FLIP | + DDSCAPS_FRONTBUFFER | DDSCAPS_PALETTE | DDSCAPS_SYSTEMMEMORY | + DDSCAPS_VISIBLE | DDSCAPS_WRITEONLY | DDSCAPS_OWNDC)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if ( ddscaps->dwCaps3 & (DDSCAPS_BACKBUFFER | DDSCAPS_COMPLEX | DDSCAPS_FLIP | + DDSCAPS_FRONTBUFFER | DDSCAPS_PALETTE | DDSCAPS_SYSTEMMEMORY | + DDSCAPS_VISIBLE | DDSCAPS_WRITEONLY | DDSCAPS_OWNDC)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + */ + + if ( ddscaps->dwCaps4) + { + retVal = DDERR_INVALIDCAPS; + _SEH_LEAVE; + } + + ZeroMemory(&memdata, sizeof(DDHAL_GETAVAILDRIVERMEMORYDATA)); + memdata.lpDD = This->lpLcl->lpGbl; + memdata.ddRVal = DDERR_INVALIDPARAMS; + + memdata.ddsCapsEx.dwCaps2 = ddscaps->dwCaps2; + memdata.ddsCapsEx.dwCaps3 = ddscaps->dwCaps3; + + This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; + + if (This->lpLcl->lpDDCB->HALDDMiscellaneous.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) + { + retVal = DDERR_NODIRECTDRAWHW; } else { - - ZeroMemory(&memdata, sizeof(DDHAL_GETAVAILDRIVERMEMORYDATA)); - memdata.lpDD = This->lpLcl->lpGbl; - memdata.ddRVal = DDERR_INVALIDPARAMS; - memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2)); - - This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; - - if (This->lpLcl->lpDDCB->HALDDMiscellaneous.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) - { - retVal = DDERR_NODIRECTDRAWHW; - } - else - { - if (dwTotal) - *dwTotal = memdata.dwTotal; - - if (dwFree) - *dwFree = memdata.dwFree; + if (dwTotal) + *dwTotal = memdata.dwTotal; + + if (dwFree) + *dwFree = memdata.dwFree; - retVal = memdata.ddRVal; - } + retVal = memdata.ddRVal; } } }

1 0

[greatlrd] 27074: adding allot more testcase for Test_GetAvailableVidMem it is not complete but we testing allot more now
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Fri Jun 8 20:46:50 2007 New Revision: 27074 URL: http://svn.reactos.org/svn/reactos?rev=27074&view=rev Log: adding allot more testcase for Test_GetAvailableVidMem it is not complete but we testing allot more now Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Fri Jun 8 20:46:50 2007 @@ -95,11 +95,88 @@ 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 && Total == 0 && Free == 0 ); - - // TODO: Try to produce DDERR_INVALIDCAPS + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + + /* testing caps */ + Caps.dwCaps = DDSCAPS_RESERVED1; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_ALPHA; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_BACKBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_COMPLEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_FLIP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_FRONTBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_OVERLAY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_PALETTE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_PRIMARYSURFACE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_RESERVED3; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_SYSTEMMEMORY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_TEXTURE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_3DDEVICE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); Caps.dwCaps = DDSCAPS_VIDEOMEMORY; TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_VISIBLE; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_WRITEONLY; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_ZBUFFER; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_OWNDC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDPARAMS ); + Caps.dwCaps = DDSCAPS_LIVEVIDEO; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_HWCODEC; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_MODEX; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_MIPMAP; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_RESERVED2; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_ALLOCONLOAD; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_VIDEOPORT; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + Caps.dwCaps = DDSCAPS_LOCALVIDMEM; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + Caps.dwCaps = DDSCAPS_NONLOCALVIDMEM; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + Caps.dwCaps = 0; + + // FIXME + Caps.dwCaps2 = 0; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + Caps.dwCaps = 0; + Caps.dwCaps2 = 0; + + // FIXME + Caps.dwCaps3 = 0; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + + Caps.dwCaps = 0; + Caps.dwCaps2 = 0; + Caps.dwCaps3 = 0; + + // FIXME + Caps.dwCaps4 = 0; + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); + DirectDraw->Release();

1 0

[mbosma] 26758: - Release Ddraw Object Test_CreateDDraw - First Surface Test of many to follow - GetMonitorFrequency and whitespace changes by EmuandCo
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sun May 13 21:31:35 2007 New Revision: 26758 URL: http://svn.reactos.org/svn/reactos?rev=26758&view=rev Log: - Release Ddraw Object Test_CreateDDraw - First Surface Test of many to follow - GetMonitorFrequency and whitespace changes by EmuandCo Modified: trunk/rostests/dxtest/ddraw/debug.cpp trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Modified: trunk/rostests/dxtest/ddraw/debug.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/debug.cpp?re… ============================================================================== --- trunk/rostests/dxtest/ddraw/debug.cpp (original) +++ trunk/rostests/dxtest/ddraw/debug.cpp Sun May 13 21:31:35 2007 @@ -5,7 +5,7 @@ { switch (hResult) { - case DD_OK: return "DD_OK"; + case DD_OK: return "DD_OK"; case DDERR_ALREADYINITIALIZED: return "DDERR_ALREADYINITIALIZED"; case DDERR_CANNOTATTACHSURFACE: return "DDERR_CANNOTATTACHSURFACE"; case DDERR_CANNOTDETACHSURFACE: return "DDERR_CANNOTDETACHSURFACE"; 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 May 13 21:31:35 2007 @@ -15,7 +15,8 @@ { "DirectDrawCreate(Ex)", Test_CreateDDraw }, { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel }, // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes }, // uncomment this test if you have enough time and patience - { "IDirectDraw::CreateSurface", Test_CreateSurface } + { "IDirectDraw::CreateSurface", Test_CreateSurface }, + { "IDirectDraw::GetMonitorFrequency", Test_GetMonitorFrequency }, }; /* The function that gives us the number of tests */ Modified: trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateDDraw.cpp Sun May 13 21:31:35 2007 @@ -4,8 +4,8 @@ BOOL Test_CreateDDraw (INT* passed, INT* failed) { - LPDIRECTDRAW7 DirectDraw; - IDirectDraw* DirectDraw2; + LPDIRECTDRAW7 DirectDraw = NULL; + IDirectDraw* DirectDraw2 = NULL; /*** FIXME: Test first parameter using EnumDisplayDrivers ***/ @@ -13,16 +13,19 @@ TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) == DD_OK); + TEST (DirectDraw && DirectDraw->Release()); TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK); + TEST (DirectDraw2 && DirectDraw2->Release()); + return TRUE; } BOOL Test_SetCooperativeLevel (INT* passed, INT* failed) { - HWND hwnd; + HWND hwnd; LPDIRECTDRAW7 DirectDraw; - + /* Preparations */ if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) { @@ -36,9 +39,10 @@ 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 ); @@ -54,27 +58,27 @@ return TRUE; } -LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) -{ +LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam) +{ switch (message) { case WM_DESTROY: { - PostQuitMessage (0); + 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); + wndclass.lpszClassName = "DDrawTest"; + RegisterClass(&wndclass); return CreateWindow("DDrawTest", "ReactOS DirectDraw Test", WS_POPUP, 0, 0, 10, 10, NULL, NULL, GetModuleHandle(NULL), NULL); } Modified: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Sun May 13 21:31:35 2007 @@ -4,7 +4,7 @@ BOOL Test_CreateSurface (INT* passed, INT* failed) { LPDIRECTDRAW7 DirectDraw; - LPDIRECTDRAWSURFACE7 DirectDrawSurface; + LPDIRECTDRAWSURFACE7 DirectDrawSurface = NULL; HWND hwnd; /* Preparations */ @@ -40,7 +40,17 @@ Desc.dwSize = sizeof (DDSURFACEDESC2); TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + Desc.dwFlags = DDSD_CAPS; + Desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + + DirectDrawSurface = NULL; + Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK ); + TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK ); + DirectDraw->Release(); return TRUE; -} +} Modified: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Sun May 13 21:31:35 2007 @@ -22,7 +22,7 @@ { /*** 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) { @@ -34,12 +34,12 @@ /* The Test */ - // First try with some generic display modes + // 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 ); TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0) == DD_OK ); - TEST ( DirectDraw->SetDisplayMode (800, 600, 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 ); // does this change the display mode to DDSCL_EXCLUSIVE ? @@ -55,3 +55,31 @@ return TRUE; } + +BOOL Test_GetMonitorFrequency (INT* passed, INT* failed) +{ + HWND hwnd; + DWORD lpdwFrequency; + 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->GetMonitorFrequency (NULL) == DDERR_INVALIDPARAMS ); + TEST ( DirectDraw->GetMonitorFrequency (&lpdwFrequency) == DD_OK ); + TEST ( lpdwFrequency != 0 ); + + return TRUE; +}

1 0

[ion] 26757: - Fix critical bug in CmpCopyName, it wasn't compressing names at all. - Implement new cmlib routines: HvIsCellAllocated, Doesn't really work fully since we don't support mapped-file hives, but works for the kinds of hives we currently use. HvIsCellDirty, should work as expected. - Implement new cm routines: CmpMarkValueDataDirty, CmpFreeValueData, CmpFreeValue. There are generic so they can deal with Big, Small or Normal keys. - Implement CmpAddValueToList, CmpSetValueDataNew. - Ad
by ion＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: ion Date: Sun May 13 20:58:54 2007 New Revision: 26757 URL: http://svn.reactos.org/svn/reactos?rev=26757&view=rev Log: - Fix critical bug in CmpCopyName, it wasn't compressing names at all. - Implement new cmlib routines: HvIsCellAllocated, Doesn't really work fully since we don't support mapped-file hives, but works for the kinds of hives we currently use. HvIsCellDirty, should work as expected. - Implement new cm routines: CmpMarkValueDataDirty, CmpFreeValueData, CmpFreeValue. There are generic so they can deal with Big, Small or Normal keys. - Implement CmpAddValueToList, CmpSetValueDataNew. - Add RtlCheckBit to winddk.h, it's inlined instead of being an actual function call. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmvalue.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Sun May 13 20:58:54 2007 @@ -4277,6 +4277,8 @@ PULONG Buffer; } RTL_BITMAP, *PRTL_BITMAP; +#define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1) + typedef struct _RTL_BITMAP_RUN { ULONG StartingIndex; ULONG NumberOfBits; @@ -5806,12 +5808,14 @@ IN ULONG Base OPTIONAL, IN OUT PULONG Value); +#if 0 NTSYSAPI ULONG NTAPI RtlCheckBit( IN PRTL_BITMAP BitMapHeader, IN ULONG BitPosition); +#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2675… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Sun May 13 20:58:54 2007 @@ -183,6 +183,12 @@ SIZE_T Size, HV_STORAGE_TYPE Storage); +BOOLEAN CMAPI +HvIsCellAllocated( + IN PHHIVE RegistryHive, + IN HCELL_INDEX CellIndex +); + HCELL_INDEX CMAPI HvReallocateCell( PHHIVE RegistryHive, @@ -198,6 +204,12 @@ HvMarkCellDirty( PHHIVE RegistryHive, HCELL_INDEX CellOffset); + +BOOLEAN CMAPI +HvIsCellDirty( + IN PHHIVE Hive, + IN HCELL_INDEX Cell +); BOOLEAN CMAPI HvSyncHive( Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Sun May 13 20:58:54 2007 @@ -39,6 +39,32 @@ } } +BOOLEAN CMAPI +HvIsCellAllocated(IN PHHIVE RegistryHive, + IN HCELL_INDEX CellIndex) +{ + ULONG Type, Block; + + /* If it's a flat hive, the cell is always allocated */ + if (RegistryHive->Flat) return TRUE; + + /* Otherwise, get the type and make sure it's valid */ + Type = HvGetCellType(CellIndex); + if (((CellIndex % ~HCELL_TYPE_MASK) > RegistryHive->Storage[Type].Length) || + (CellIndex % (RegistryHive->Version >= 2 ? 8 : 16))) + { + /* Invalid cell index */ + return FALSE; + } + + /* Try to get the cell block */ + Block = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + if (RegistryHive->Storage[Type].BlockList[Block].Block) return TRUE; + + /* No valid block, fail */ + return FALSE; +} + PVOID CMAPI HvGetCell( PHHIVE RegistryHive, @@ -92,6 +118,20 @@ RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); +} + +BOOLEAN CMAPI +HvIsCellDirty(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + /* Sanity checks */ + ASSERT(Hive->ReadOnly == FALSE); + + /* Volatile cells are always "dirty" */ + if (HvGetCellType(Cell) == HvVolatile) return TRUE; + + /* Check if the dirty bit is set */ + return RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE); } static ULONG __inline CMAPI Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Sun May 13 20:58:54 2007 @@ -39,6 +39,9 @@ #define HCELL_TYPE_SHIFT 31 #define HCELL_BLOCK_SHIFT 12 #define HCELL_OFFSET_SHIFT 0 + +#define HvGetCellType(Cell) \ + ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) #include <pshpack1.h> Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Sun May 13 20:58:54 2007 @@ -35,6 +35,13 @@ #else #define CMTRACE(x, ...) DPRINT(__VA_ARGS__) #endif + + +// +// Hack since bigkeys are not yet supported +// +#define ASSERT_VALUE_BIG(h, s) \ + ASSERTMSG("Big keys not supported!", !CmpIsKeyValueBig(h, s)); // // Tag for all registry allocations @@ -678,6 +685,8 @@ extern KTIMER CmiWorkerTimer; VOID NTAPI CmiWorkerThread(IN PVOID Param); PVOID NTAPI CmpRosGetHardwareHive(OUT PULONG Length); +NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); +VOID CmiSyncHives(VOID); #define HIVE_NO_FILE 0x00000002 /////////////////////////////////////////////////////////////////////////////// @@ -1010,6 +1019,34 @@ IN PHHIVE Hive, IN PCM_KEY_VALUE Value, OUT PULONG Length +); + +NTSTATUS +NTAPI +CmpSetValueDataNew( + IN PHHIVE Hive, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN HCELL_INDEX ValueCell, + OUT PHCELL_INDEX DataCell +); + +NTSTATUS +NTAPI +CmpAddValueToList( + IN PHHIVE Hive, + IN HCELL_INDEX ValueCell, + IN ULONG Index, + IN ULONG Type, + IN OUT PCHILD_LIST ChildList +); + +BOOLEAN +NTAPI +CmpFreeValue( + IN PHHIVE Hive, + IN HCELL_INDEX Cell ); // Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Sun May 13 20:58:54 2007 @@ -45,7 +45,7 @@ } /* Copy this character */ - Destination[i] = Source->Buffer[i]; + ((PCHAR)Destination)[i] = (CHAR)(Source->Buffer[i]); } /* Compressed name, return length */ Modified: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c Sun May 13 20:58:54 2007 @@ -13,9 +13,87 @@ #define NDEBUG #include "debug.h" -/* GLOBALS *******************************************************************/ - /* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +CmpMarkValueDataDirty(IN PHHIVE Hive, + IN PCM_KEY_VALUE Value) +{ + ULONG KeySize; + PAGED_CODE(); + + /* Make sure there's actually any data */ + if (Value->Data != HCELL_NIL) + { + /* If this is a small key, there's no need to have it dirty */ + if (CmpIsKeyValueSmall(&KeySize, Value->DataLength)) return TRUE; + + /* Check if this is a big key */ + ASSERT_VALUE_BIG(Hive, KeySize); + + /* Normal value, just mark it dirty */ + HvMarkCellDirty(Hive, Value->Data); + } + + /* Operation complete */ + return TRUE; +} + +BOOLEAN +NTAPI +CmpFreeValueData(IN PHHIVE Hive, + IN HCELL_INDEX DataCell, + IN ULONG DataLength) +{ + ULONG KeySize; + PAGED_CODE(); + + /* If this is a small key, the data is built-in */ + if (!CmpIsKeyValueSmall(&KeySize, DataLength)) + { + /* If there's no data cell, there's nothing to do */ + if (DataCell == HCELL_NIL) return TRUE; + + /* Make sure the data cell is allocated */ + ASSERT(HvIsCellAllocated(Hive, DataCell)); + + /* Unsupported value type */ + ASSERT_VALUE_BIG(Hive, KeySize); + + /* Normal value, just free the data cell */ + HvFreeCell(Hive, DataCell); + } + + /* Operation complete */ + return TRUE; +} + +BOOLEAN +NTAPI +CmpFreeValue(IN PHHIVE Hive, + IN HCELL_INDEX Cell) +{ + PCM_KEY_VALUE Value; + PAGED_CODE(); + + /* Get the cell data */ + Value = (PCM_KEY_VALUE)HvGetCell(Hive, Cell); + if (!Value) ASSERT(FALSE); + + /* Free it */ + if (!CmpFreeValueData(Hive, Value->Data, Value->DataLength)) + { + /* We failed to free the data, return failure */ + HvReleaseCell(Hive, Cell); + return FALSE; + } + + /* Release the cell and free it */ + HvReleaseCell(Hive, Cell); + HvFreeCell(Hive, Cell); + return TRUE; +} HCELL_INDEX NTAPI @@ -67,13 +145,8 @@ return TRUE; } - /* Check if this is a big cell */ - if (CmpIsKeyValueBig(Hive, *Length)) - { - /* FIXME: We don't support big cells */ - DPRINT1("Unsupported cell type!\n"); - while (TRUE); - } + /* Unsupported */ + ASSERT_VALUE_BIG(Hive, *Length); /* Get the data from the cell */ *Buffer = HvGetCell(Hive, Value->Data); @@ -123,3 +196,114 @@ /* Otherwise, return the cell data */ return Buffer; } + +NTSTATUS +NTAPI +CmpAddValueToList(IN PHHIVE Hive, + IN HCELL_INDEX ValueCell, + IN ULONG Index, + IN ULONG Type, + IN OUT PCHILD_LIST ChildList) +{ + HCELL_INDEX ListCell; + ULONG ChildCount, Length, i; + PCELL_DATA CellData; + PAGED_CODE(); + + /* Sanity check */ + ASSERT((((LONG)Index) >= 0) && (Index <= ChildList->Count)); + + /* Get the number of entries in the child list */ + ChildCount = ChildList->Count; + ChildCount++; + if (ChildCount > 1) + { + /* The cell should be dirty at this point */ + ASSERT(HvIsCellDirty(Hive, ChildList->List)); + + /* Check if we have less then 100 children */ + if (ChildCount < 100) + { + /* Allocate just enough as requested */ + Length = ChildCount * sizeof(HCELL_INDEX); + } + else + { + /* Otherwise, we have quite a few, so allocate a batch */ + Length = ROUND_UP(ChildCount, 100) * sizeof(HCELL_INDEX); + if (Length > HBLOCK_SIZE) + { + /* But make sure we don't allocate beyond our block size */ + Length = ROUND_UP(Length, HBLOCK_SIZE); + } + } + + /* Perform the allocation */ + ListCell = HvReallocateCell(Hive, ChildList->List, Length); + } + else + { + /* This is our first child, so allocate a single cell */ + ListCell = HvAllocateCell(Hive, sizeof(HCELL_INDEX), Type); + } + + /* Fail if we couldn't get a cell */ + if (!ListCell) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set this cell as the child list's list cell */ + ChildList->List = ListCell; + + /* Get the actual key list memory */ + CellData = HvGetCell(Hive, ListCell); + if (!CellData) ASSERT(FALSE); + + /* Loop all the children */ + for (i = ChildCount - 1; i > Index; i--) + { + /* Move them all down */ + CellData->u.KeyList[i] = CellData->u.KeyList[i - 1]; + } + + /* Insert us on top now */ + CellData->u.KeyList[Index] = ValueCell; + ChildList->Count = ChildCount; + + /* Release the list cell and make sure the value cell is dirty */ + HvReleaseCell(Hive, ListCell); + ASSERT(HvIsCellDirty(Hive, ValueCell)); + + /* We're done here */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CmpSetValueDataNew(IN PHHIVE Hive, + IN PVOID Data, + IN ULONG DataSize, + IN ULONG StorageType, + IN HCELL_INDEX ValueCell, + OUT PHCELL_INDEX DataCell) +{ + PCELL_DATA CellData; + PAGED_CODE(); + ASSERT(DataSize > CM_KEY_VALUE_SMALL); + + /* Check if this is a big key */ + ASSERT_VALUE_BIG(Hive, DataSize); + + /* Allocate a data cell */ + *DataCell = HvAllocateCell(Hive, DataSize, StorageType); + if (*DataCell == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the actual data */ + CellData = HvGetCell(Hive, *DataCell); + if (!CellData) ASSERT(FALSE); + + /* Copy our buffer into it */ + RtlCopyMemory(CellData, Data, DataSize); + + /* All done */ + return STATUS_SUCCESS; +} +

1 0

[greatlrd] 26756: adding more check for createsurface
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sun May 13 20:51:15 2007 New Revision: 26756 URL: http://svn.reactos.org/svn/reactos?rev=26756&view=rev Log: adding more check for createsurface Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 20:51:15 2007 @@ -12,7 +12,7 @@ /* * all param have been checked if they are vaild before they are call to * Internal_CreateSurface, if not please fix the code in the functions - * call to Internal_CreateSurface, ppSurf are being vaildate in + * call to Internal_CreateSurface, ppSurf,pDDSD,pDDraw are being vaildate in * Internal_CreateSurface */ @@ -20,47 +20,69 @@ Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { + DDSURFACEDESC2 desc; + + /* Test se if the pointers are vaild */ + if ((IsBadReadPtr(pDDraw,sizeof(LPDDRAWI_DIRECTDRAW_INT))) || + (IsBadReadPtr(pDDSD,sizeof(LPDDSURFACEDESC2))) || + (IsBadWritePtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7))) || + (IsBadReadPtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7)))) + { + return DDERR_INVALIDPARAMS; + } + + /* make local backup of DDSURFACEDESC2 */ + RtlCopyMemory(&desc, pDDSD, sizeof(DDSURFACEDESC2)); /* * pDDSD->dwCaps can not contain both DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY * if both are define ddraw.dll will return error code 0x88760064 */ - if ( (pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && - (pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) + if ( (desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && + (desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { return DDERR_INVALIDCAPS; } /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ - if (pDDSD->dwFlags & DDSD_LPSURFACE) - { - - if (pDDSD->ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | + if (desc.dwFlags & DDSD_LPSURFACE) + { + /* + * DDSD_LPSURFACE flag is set now we start vaildate see if + * pDDSD->lpSurface are a pointer or not + */ + if (IsBadReadPtr(desc.lpSurface,sizeof(LPVOID)) || + (desc.dwFlags - (desc.dwFlags & DDSD_ALL))) + { + return DDERR_INVALIDPARAMS; + } + + /* only support dx7 interface for DDSD_LPSURFACE older interface do not support it */ + if (pDDraw->lpVtbl != &DirectDraw7_Vtable) + { + return DDERR_INVALIDPARAMS; + } + + /* vaildate the caps */ + if (desc.ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) { return DDERR_INVALIDCAPS; } - /* - * DDSD_LPSURFACE flag is set now we start vaildate see if - * pDDSD->lpSurface are a pointer or not - */ - if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID)) || - (pDDSD->dwFlags - (pDDSD->dwFlags & DDSD_ALL))) - { - return DDERR_INVALIDPARAMS; - } - /* more code will follow */ } else { - /* - * DDSD_LPSURFACE flag is not set we do not handler this case yet - */ - - /* more code will follow */ - } + /* + * DDSD_LPSURFACE flag are not set + * remove all wrong flags are being set + */ + + desc.dwFlags = desc.dwFlags & DDSD_ALL; + } + + return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun May 13 20:51:15 2007 @@ -18,6 +18,7 @@ extern WCHAR classname[128]; extern WNDCLASSW wnd_class; extern CRITICAL_SECTION ddcs; +extern IDirectDraw7Vtbl DirectDraw7_Vtable; HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable); HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable);

1 0

[mbosma] 26755: Beginning of CreateSurface test.
by mbosma＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: mbosma Date: Sun May 13 20:37:58 2007 New Revision: 26755 URL: http://svn.reactos.org/svn/reactos?rev=26755&view=rev Log: Beginning of CreateSurface test. Added: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (with props) Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp 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 May 13 20:37:58 2007 @@ -7,13 +7,15 @@ /* include the tests */ #include "tests/CreateDDraw.cpp" #include "tests/DisplayModes.cpp" +#include "tests/CreateSurface.cpp" /* The List of tests */ TEST TestList[] = { { "DirectDrawCreate(Ex)", Test_CreateDDraw }, { "IDirectDraw::SetCooperativeLevel", Test_SetCooperativeLevel }, - // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes } // uncomment this test if you have enough time and patience + // { "IDirectDraw::EnumDisplayModes/SetDisplayMode", Test_DisplayModes }, // uncomment this test if you have enough time and patience + { "IDirectDraw::CreateSurface", Test_CreateSurface } }; /* The function that gives us the number of tests */ Added: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Create… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp (added) +++ trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp Sun May 13 20:37:58 2007 @@ -1,0 +1,46 @@ + +HWND CreateBasicWindow (VOID); + +BOOL Test_CreateSurface (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + LPDIRECTDRAWSURFACE7 DirectDrawSurface; + 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: you 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.dwSize = sizeof (DDSURFACEDESC2); + TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS ); + + DirectDraw->Release(); + + return TRUE; +} Propchange: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/dxtest/ddraw/tests/CreateSurface.cpp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/tests/Displa… ============================================================================== --- trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp (original) +++ trunk/rostests/dxtest/ddraw/tests/DisplayModes.cpp Sun May 13 20:37:58 2007 @@ -42,6 +42,8 @@ TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK ); TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK ); + // does this change the display mode to DDSCL_EXCLUSIVE ? + // Now try getting vaild modes from driver TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context, NULL) == DDERR_INVALIDPARAMS); TEST (DirectDraw->EnumDisplayModes(0, NULL, (PVOID)&Context, (LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK );

1 0

[hpoussin] 26754: Move itss.idl to the place it belongs
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Sun May 13 18:38:27 2007 New Revision: 26754 URL: http://svn.reactos.org/svn/reactos?rev=26754&view=rev Log: Move itss.idl to the place it belongs Added: trunk/reactos/include/reactos/wine/itss.idl - copied unchanged from r26686, trunk/reactos/dll/win32/hhctrl.ocx/itss.idl trunk/reactos/include/reactos/wine/wineheaders.rbuild (with props) Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.idl Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/include/reactos/reactos.rbuild trunk/reactos/include/reactos/wine/ (props changed) Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Sun May 13 18:38:27 2007 @@ -8,6 +8,7 @@ <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> + <dependency>wineheaders</dependency> <library>wine</library> <library>uuid</library> <library>kernel32</library> @@ -27,7 +28,6 @@ <file>hhctrl.c</file> <file>regsvr.c</file> <file>webbrowser.c</file> - <file>itss.idl</file> <file>hhctrl.rc</file> <file>hhctrl.ocx.spec</file> </module> Removed: trunk/reactos/dll/win32/hhctrl.ocx/itss.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/itss.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/itss.idl (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/itss.idl (removed) @@ -1,95 +1,0 @@ -/* - * Copyright (C) 2004 Mike McCormack - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -import "oaidl.idl"; - -typedef struct _ITS_Control_Data -{ - UINT cdwControlData; - UINT adwControlData[1]; - -} ITS_Control_Data, *PITS_Control_Data; - -typedef enum ECompactionLev { - COMPACT_DATA = 0, - COMPACT_DATA_AND_PATH -} ECompactionLev; - -[ - object, - uuid(88cc31de-27ab-11d0-9df9-00a0c922e6ec), - pointer_default(unique) -] -interface IITStorage : IUnknown -{ - HRESULT StgCreateDocfile( - [in] const WCHAR * pwcsName, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgCreateDocfileOnILockBytes( - [in] ILockBytes * plkbyt, - [in] DWORD grfMode, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - - HRESULT StgIsStorageFile( - [in] const WCHAR * pwcsName); - - HRESULT StgIsStorageILockBytes( - [in] ILockBytes * plkbyt); - - HRESULT StgOpenStorage( - [in] const WCHAR * pwcsName, - [in] IStorage * pstgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgOpenStorageOnILockBytes( - [in] ILockBytes * plkbyt, - [in] IStorage * pStgPriority, - [in] DWORD grfMode, - [in] SNB snbExclude, - [in] DWORD reserved, - [out] IStorage ** ppstgOpen); - - HRESULT StgSetTimes( - [in] WCHAR const * lpszName, - [in] FILETIME const * pctime, - [in] FILETIME const * patime, - [in] FILETIME const * pmtime); - - HRESULT SetControlData( - [in] PITS_Control_Data pControlData); - - HRESULT DefaultControlData( - [out] PITS_Control_Data * ppControlData); - - HRESULT Compact( - [in] const WCHAR * pwcsName, - [in] ECompactionLev iLev); -} - -cpp_quote("DEFINE_GUID(CLSID_ITStorage,0x5d02926a,0x212e,0x11d0,0x9d,0xf9,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSFSStore,0xd54eee56,0xaaab,0x11d0,0x9e,0x1d,0x00,0xa0,0xc9,0x22,0xe6,0xec);") -cpp_quote("DEFINE_GUID(CLSID_MSITStore,0x9d148290,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") -cpp_quote("DEFINE_GUID(CLSID_ITSProtocol,0x9d148291,0xb9c8,0x11d0,0xa4,0xcc,0x00,0x00,0xf8,0x01,0x49,0xf6);") Modified: trunk/reactos/include/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/reactos.rb… ============================================================================== --- trunk/reactos/include/reactos/reactos.rbuild (original) +++ trunk/reactos/include/reactos/reactos.rbuild Sun May 13 18:38:27 2007 @@ -1,3 +1,8 @@ +<group> <directory name="idl"> <xi:include href="idl/idl.rbuild" /> </directory> +<directory name="wine"> + <xi:include href="wine/wineheaders.rbuild" /> +</directory> +</group> Propchange: trunk/reactos/include/reactos/wine/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun May 13 18:38:27 2007 @@ -1,0 +1,1 @@ +itss.h Added: trunk/reactos/include/reactos/wine/wineheaders.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wineh… ============================================================================== --- trunk/reactos/include/reactos/wine/wineheaders.rbuild (added) +++ trunk/reactos/include/reactos/wine/wineheaders.rbuild Sun May 13 18:38:27 2007 @@ -1,0 +1,3 @@ +<module name="wineheaders" type="idlheader"> + <file>itss.idl</file> +</module> Propchange: trunk/reactos/include/reactos/wine/wineheaders.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26753: adding more check
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sun May 13 17:14:54 2007 New Revision: 26753 URL: http://svn.reactos.org/svn/reactos?rev=26753&view=rev Log: adding more check Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun May 13 17:14:54 2007 @@ -34,11 +34,19 @@ /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ if (pDDSD->dwFlags & DDSD_LPSURFACE) { + + if (pDDSD->ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | + DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) + { + return DDERR_INVALIDCAPS; + } + /* * DDSD_LPSURFACE flag is set now we start vaildate see if * pDDSD->lpSurface are a pointer or not */ - if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID))) + if (IsBadReadPtr(pDDSD->lpSurface,sizeof(LPVOID)) || + (pDDSD->dwFlags - (pDDSD->dwFlags & DDSD_ALL))) { return DDERR_INVALIDPARAMS; }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
42
Older →

Jump to page:

2025

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