Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[greatlrd] 27087: prepare testkit for GetDeviceIdentifier
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sat Jun 9 17:23:18 2007 New Revision: 27087 URL: http://svn.reactos.org/svn/reactos?rev=27087&view=rev Log: prepare testkit for GetDeviceIdentifier Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.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 Sat Jun 9 17:23:18 2007 @@ -12,8 +12,10 @@ /* The List of tests */ TEST TestList[] = { + { "IDirectDraw: COM Stuff", Test_CreateDDraw }, - { "IDirectDraw: Display Frequency", Test_GetMonitorFrequency }, + { "IDirectDraw: GetDeviceIdentifier", Test_GetDeviceIdentifier }, + { "IDirectDraw: Display Frequency", Test_GetMonitorFrequency }, { "IDirectDraw: Display Modes", Test_DisplayModes }, { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, { "IDirectDraw: GetFourCC", Test_GetFourCCCodes }, 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 17:23:18 2007 @@ -375,7 +375,21 @@ return TRUE; } - +BOOL Test_GetDeviceIdentifier (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; + } + + DirectDraw->Release(); + + return TRUE; +} LONG WINAPI BasicWindowProc (HWND hwnd, UINT message, UINT wParam, LONG lParam)

1 0

[fireball] 27086: - If the module failed to load (e.g. fixup couldn't be done), then don't include it in the list of loaded modules.
by fireball＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: fireball Date: Sat Jun 9 17:10:02 2007 New Revision: 27086 URL: http://svn.reactos.org/svn/reactos?rev=27086&view=rev Log: - If the module failed to load (e.g. fixup couldn't be done), then don't include it in the list of loaded modules. 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 17:10:02 2007 @@ -655,7 +655,13 @@ if (ImageType == 1) FrLdrLoadImage("hal.dll", 10, FALSE); /* Perform import fixups */ - LdrPEFixupImports(LoadBase, Name); + if (!NT_SUCCESS(LdrPEFixupImports(LoadBase, Name))) + { + /* Fixup failed, just don't include it in the list */ + // NextModuleBase = OldNextModuleBase; + LoaderBlock.ModsCount = ImageId; + return NULL; + } /* Return the final mapped address */ return LoadBase;

1 0

[janderwald] 27085: - disable building avtest for now
by janderwald＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: janderwald Date: Sat Jun 9 14:15:00 2007 New Revision: 27085 URL: http://svn.reactos.org/svn/reactos?rev=27085&view=rev Log: - disable building avtest for now Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=27085… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sat Jun 9 14:15:00 2007 @@ -1,7 +1,8 @@ + <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" /> </directory>

1 0

[greatlrd] 27084: commit GetDeviceIdentifier and GetDeviceIdentifier7 both are under devloping, I hope I finish this implement today
by greatlrd＠svn.reactos.org 09 Jun '07

09 Jun '07

Author: greatlrd Date: Sat Jun 9 14:05:41 2007 New Revision: 27084 URL: http://svn.reactos.org/svn/reactos?rev=27084&view=rev Log: commit GetDeviceIdentifier and GetDeviceIdentifier7 both are under devloping, I hope I finish this implement today Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Sat Jun 9 14:05:41 2007 @@ -6,7 +6,8 @@ HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown *); HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE*, LPUNKNOWN); HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); +HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4, LPDDDEVICEIDENTIFIER, DWORD); +HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMSURFACESCALLBACK7); @@ -39,7 +40,7 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface(LPDIRECTDRAW, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE *, IUnknown *); HRESULT WINAPI Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE7 *, IUnknown *); HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); + HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7, DWORD, LPDDSURFACEDESC2, LPVOID, LPDDENUMSURFACESCALLBACK7); 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 14:05:41 2007 @@ -411,6 +411,64 @@ // LeaveCriticalSection(&ddcs); return ret; +} + +/* For DirectDraw 4 - 6 */ +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface, + LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) +{ + HRESULT retVal = DD_OK; + DDDEVICEIDENTIFIER2 pDDDI2; + + ZeroMemory(&pDDDI2,sizeof(DDDEVICEIDENTIFIER2)); + + _SEH_TRY + { + memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER)); + + retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags); + + if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER))) + { + retVal = DDERR_INVALIDPARAMS; + } + else + { + memcpy(pDDDI , &pDDDI2, sizeof(DDDEVICEIDENTIFIER) ); + } + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; +} + +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, + LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) +{ + // HRESULT retVal = DD_OK; + HRESULT retVal = DD_FALSE; + DX_WINDBG_trace(); + + _SEH_TRY + { + if (IsBadWritePtr( pDDDI, sizeof(DDDEVICEIDENTIFIER2) ) ) + { + retVal = DDERR_INVALIDPARAMS; + } + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; } /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ @@ -445,7 +503,7 @@ Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_RestoreAllSurfaces, Main_DirectDraw_TestCooperativeLevel, - Main_DirectDraw_GetDeviceIdentifier, + Main_DirectDraw_GetDeviceIdentifier7, Main_DirectDraw_StartModeTest, Main_DirectDraw_EvaluateMode }; Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sat Jun 9 14:05:41 2007 @@ -117,12 +117,6 @@ DX_STUB; } -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, - LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ - DX_WINDBG_trace(); - DX_STUB; -} HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags)

1 0

[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

← Newer
1
...
24
25
26
27
28
29
30
...
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