Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 27083: - Don't load a module with the same name more than once.
by fireball＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: fireball Date: Sat Jun 9 14:03:33 2007 New Revision: 27083 URL: http://svn.reactos.org/svn/reactos?rev=27083&view=rev Log: - Don't load a module with the same name more than once. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sat Jun 9 14:03:33 2007 @@ -596,6 +596,14 @@ ULONG ImageSize; NTSTATUS Status = STATUS_SUCCESS; + /* Try to see, maybe it's loaded already */ + if (LdrGetModuleObject(Name) != NULL) + { + /* It's loaded, return NULL. It would be wise to return + correct LoadBase, but it seems to be ignored almost everywhere */ + return NULL; + } + /* Set the virtual (image) and physical (load) addresses */ LoadBase = (PVOID)NextModuleBase; ImageBase = RVA(LoadBase , -KERNEL_BASE_PHYS + KSEG0_BASE);

1 0

[greatlrd] 27082: commit which api are under developing and hard tested. mark which one have been completed and acts like ms ddraw does.
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat Jun 9 03:32:13 2007 New Revision: 27082 URL: http://svn.reactos.org/svn/reactos?rev=27082&view=rev Log: commit which api are under developing and hard tested. mark which one have been completed and acts like ms ddraw does. 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 Sat Jun 9 03:32:13 2007 @@ -412,32 +412,36 @@ // LeaveCriticalSection(&ddcs); return ret; } + +/* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ +/* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ + IDirectDraw7Vtbl DirectDraw7_Vtable = { - Main_DirectDraw_QueryInterface, - Main_DirectDraw_AddRef, - Main_DirectDraw_Release, - Main_DirectDraw_Compact, + Main_DirectDraw_QueryInterface, /* (QueryInterface testing / devloping) */ + Main_DirectDraw_AddRef, /* (AddRef done) */ + Main_DirectDraw_Release, /* (QueryInterface testing / devloping) */ + Main_DirectDraw_Compact, /* (Compact done) */ Main_DirectDraw_CreateClipper, Main_DirectDraw_CreatePalette, - Main_DirectDraw_CreateSurface4, + Main_DirectDraw_CreateSurface4, /* (CreateSurface4 testing / devloping) */ Main_DirectDraw_DuplicateSurface, - Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */ Main_DirectDraw_EnumSurfaces, Main_DirectDraw_FlipToGDISurface, Main_DirectDraw_GetCaps, - Main_DirectDraw_GetDisplayMode, - Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */ + Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */ Main_DirectDraw_GetGDISurface, - Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetMonitorFrequency, /* (GetMonitorFrequency done) */ Main_DirectDraw_GetScanLine, Main_DirectDraw_GetVerticalBlankStatus, Main_DirectDraw_Initialize, - Main_DirectDraw_RestoreDisplayMode, - Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */ + Main_DirectDraw_SetCooperativeLevel, /* (SetCooperativeLevel testing / devloping) */ + Main_DirectDraw_SetDisplayMode, /* (SetDisplayMode testing / devloping) */ Main_DirectDraw_WaitForVerticalBlank, - Main_DirectDraw_GetAvailableVidMem4, + Main_DirectDraw_GetAvailableVidMem4, /* (GetAvailableVidMem4 done) */ Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_RestoreAllSurfaces, Main_DirectDraw_TestCooperativeLevel,

1 0

[greatlrd] 27081: rename Main_DirectDraw_GetAvailableVidMem to Main_DirectDraw_GetAvailableVidMem4 Fixing smaller bugs in Main_DirectDraw_GetAvailableVidMem4, complete works simluare now to ms version of this api Implement Main_DirectDraw_GetAvailableVidMem for directdraw2 and directdraw3
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat Jun 9 00:55:48 2007 New Revision: 27081 URL: http://svn.reactos.org/svn/reactos?rev=27081&view=rev Log: rename Main_DirectDraw_GetAvailableVidMem to Main_DirectDraw_GetAvailableVidMem4 Fixing smaller bugs in Main_DirectDraw_GetAvailableVidMem4, complete works simluare now to ms version of this api Implement Main_DirectDraw_GetAvailableVidMem for directdraw2 and directdraw3 Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.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 Sat Jun 9 00:55:48 2007 @@ -173,7 +173,29 @@ } HRESULT WINAPI -Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, +Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW2 iface, LPDDSCAPS ddscaps, LPDWORD dwTotal, LPDWORD dwFree) +{ + DDSCAPS2 myddscaps; + HRESULT retValue = DD_OK; + + ZeroMemory(&myddscaps, sizeof(DDSCAPS2)); + + _SEH_TRY + { + myddscaps.dwCaps = ddscaps->dwCaps; + retValue = Main_DirectDraw_GetAvailableVidMem4((LPDIRECTDRAW7)iface, &myddscaps, dwTotal, dwFree); + } + _SEH_HANDLE + { + retValue = DDERR_INVALIDPARAMS; + } + _SEH_END; + + return retValue; +} + +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem4(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD dwTotal, LPDWORD dwFree) { HRESULT retVal = DD_OK; @@ -218,15 +240,14 @@ _SEH_LEAVE; } - /* fixme - if ( ddscaps->dwCaps3 & (DDSCAPS_BACKBUFFER | DDSCAPS_COMPLEX | DDSCAPS_FLIP | - DDSCAPS_FRONTBUFFER | DDSCAPS_PALETTE | DDSCAPS_SYSTEMMEMORY | - DDSCAPS_VISIBLE | DDSCAPS_WRITEONLY | DDSCAPS_OWNDC)) - { - retVal = DDERR_INVALIDPARAMS; + if ( ddscaps->dwCaps3 & ~( DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | + DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | + DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | + DDSCAPS3_DMAP)) + { + retVal = DDERR_INVALIDCAPS; _SEH_LEAVE; } - */ if ( ddscaps->dwCaps4) { @@ -246,6 +267,12 @@ if (This->lpLcl->lpDDCB->HALDDMiscellaneous.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) { retVal = DDERR_NODIRECTDRAWHW; + + if (dwTotal) + *dwTotal = 0; + + if (dwFree) + *dwFree = 0; } else { @@ -410,7 +437,7 @@ Main_DirectDraw_SetCooperativeLevel, Main_DirectDraw_SetDisplayMode, Main_DirectDraw_WaitForVerticalBlank, - Main_DirectDraw_GetAvailableVidMem, + Main_DirectDraw_GetAvailableVidMem4, Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_RestoreAllSurfaces, Main_DirectDraw_TestCooperativeLevel, Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sat Jun 9 00:55:48 2007 @@ -53,7 +53,8 @@ HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD); HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback); HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags); -HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free); +HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW2 iface, LPDDSCAPS ddscaps, LPDWORD total, LPDWORD free); +HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem4(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free); // hel callbacks DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver); Modified: trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/thunks/d… ============================================================================== --- trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c (original) +++ trunk/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c Sat Jun 9 00:55:48 2007 @@ -775,36 +775,9 @@ return Main_DirectDraw_WaitForVerticalBlank((LPDIRECTDRAW7) iface, dwFlags, hEvent); } -HRESULT WINAPI -ThunkDirectDraw2_GetAvailableVidMem(LPDIRECTDRAW2 iface, LPDDSCAPS pCaps, LPDWORD pdwTotal, LPDWORD pdwFree) -{ - HRESULT retValue = DDERR_GENERIC; - - DX_WINDBG_trace(); - - if (pCaps != NULL) - { - DDSCAPS2 pCaps2; - ZeroMemory(&pCaps2,sizeof(DDSCAPS2)); - memcpy(&pCaps2, pCaps, sizeof(DDSCAPS)); - retValue = Main_DirectDraw_GetAvailableVidMem((LPDIRECTDRAW7) iface, &pCaps2, pdwTotal, pdwFree); - memcpy(pCaps, &pCaps2, sizeof(DDSCAPS)); - } - else - { - retValue = Main_DirectDraw_GetAvailableVidMem((LPDIRECTDRAW7) iface, NULL, pdwTotal, pdwFree); - } - - return retValue; -} - -HRESULT WINAPI -ThunkDirectDraw4_GetAvailableVidMem(LPDIRECTDRAW4 iface, LPDDSCAPS2 pCaps, LPDWORD pdwTotal, LPDWORD pdwFree) -{ - DX_WINDBG_trace(); - - return Main_DirectDraw_GetAvailableVidMem((LPDIRECTDRAW7) iface, pCaps, pdwTotal, pdwFree); -} + + + HRESULT WINAPI ThunkDirectDraw4_GetSurfaceFromDC(LPDIRECTDRAW4 iface, HDC hdc, LPDIRECTDRAWSURFACE4 *pSurf)

1 0

[greatlrd] 27080: last testcase for getavailmemory
by greatlrd＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: greatlrd Date: Sat Jun 9 00:30:07 2007 New Revision: 27080 URL: http://svn.reactos.org/svn/reactos?rev=27080&view=rev Log: last testcase for getavailmemory 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 Sat Jun 9 00:30:07 2007 @@ -332,21 +332,17 @@ Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY; TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - // FIXME - memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = 0; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - - /* dwCaps does not accpect any input param */ - memset(&Caps,0,sizeof(DDSCAPS2)); + 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();

1 0

[janderwald] 27079: - include ddk
by janderwald＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: janderwald Date: Sat Jun 9 00:03:56 2007 New Revision: 27079 URL: http://svn.reactos.org/svn/reactos?rev=27079&view=rev Log: - include ddk Modified: trunk/rosapps/avtest/entry.c Modified: trunk/rosapps/avtest/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/avtest/entry.c?rev=27079&r… ============================================================================== --- trunk/rosapps/avtest/entry.c (original) +++ trunk/rosapps/avtest/entry.c Sat Jun 9 00:03:56 2007 @@ -1,3 +1,4 @@ +#include <ddk/ntddk.h> #include <debug.h> #include <ks.h>

1 0

[greatlrd] 27078: Fixing smaller 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 23:25:39 2007 New Revision: 27078 URL: http://svn.reactos.org/svn/reactos?rev=27078&view=rev Log: Fixing smaller 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 23:25:39 2007 @@ -205,15 +205,20 @@ _SEH_LEAVE; } + + /* ddscaps->dwCaps2 & 0x01 + this flag is outdate and are + set to 0 in ms dxsdk the name of + this flag is DDSCAPS2_HARDWAREDEINTERLACE + */ + + if ( ddscaps->dwCaps2 & 0x01) + { + retVal = DDERR_INVALIDCAPS; + _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))

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs