Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 26853: fixing thread safe in GetFourCCCodes
by greatlrd＠svn.reactos.org 21 May '07

21 May '07

Author: greatlrd Date: Mon May 21 20:23:43 2007 New Revision: 26853 URL: http://svn.reactos.org/svn/reactos?rev=26853&view=rev Log: fixing thread safe in GetFourCCCodes 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 Mon May 21 20:23:43 2007 @@ -131,7 +131,7 @@ memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2)); if (This->lpLcl->lpDDCB->cbDDMiscellaneousCallbacks.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_NODIRECTDRAWHW; + return DDERR_NODIRECTDRAWHW; if (dwTotal) *dwTotal = memdata.dwTotal; @@ -148,15 +148,20 @@ LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); - if(!lpNumCodes) - return DDERR_INVALIDPARAMS; - - if(lpCodes) - memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)*(*lpNumCodes)); - else - *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; - - return DD_OK; + /* FIXME protect with SEH or something else if lpCodes or lpNumCodes for bad user pointers */ + EnterCriticalSection(&ddcs); + + if(!lpNumCodes) + return DDERR_INVALIDPARAMS; + + if(lpCodes) + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)*(*lpNumCodes)); + else + *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; + + + LeaveCriticalSection(&ddcs); + return DD_OK; } HRESULT WINAPI

1 0

[mbosma] 26852: Implement IDirectDraw7::GetFourCCCodes
by mbosma＠svn.reactos.org 21 May '07

21 May '07

Author: mbosma Date: Mon May 21 19:47:39 2007 New Revision: 26852 URL: http://svn.reactos.org/svn/reactos?rev=26852&view=rev Log: Implement IDirectDraw7::GetFourCCCodes Modified: 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_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 Mon May 21 19:47:39 2007 @@ -140,6 +140,23 @@ *dwFree = memdata.dwFree; return memdata.ddRVal; +} + +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD lpNumCodes, LPDWORD lpCodes) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + if(!lpNumCodes) + return DDERR_INVALIDPARAMS; + + if(lpCodes) + memcpy(lpCodes, This->lpLcl->lpGbl->lpdwFourCC, sizeof(DWORD)*(*lpNumCodes)); + else + *lpNumCodes = This->lpLcl->lpGbl->dwNumFourCC; + + return DD_OK; } HRESULT WINAPI 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 Mon May 21 19:47:39 2007 @@ -63,13 +63,6 @@ HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI -Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { DX_WINDBG_trace(); DX_STUB;

1 0

[greatlrd] 26851: Fixing minors bugs 1. The linking interface was use when we req no linking interface. 2. The no linking was use when we req linking interface 3. cleanup the linking interface code so it getting simplire, like reuse same dx handler and other stuff. (have not check if ms ddraw resue it or not)
by greatlrd＠svn.reactos.org 21 May '07

21 May '07

Author: greatlrd Date: Mon May 21 19:44:27 2007 New Revision: 26851 URL: http://svn.reactos.org/svn/reactos?rev=26851&view=rev Log: Fixing minors bugs 1. The linking interface was use when we req no linking interface. 2. The no linking was use when we req linking interface 3. cleanup the linking interface code so it getting simplire, like reuse same dx handler and other stuff. (have not check if ms ddraw resue it or not) 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 Mon May 21 19:44:27 2007 @@ -52,16 +52,26 @@ DX_STUB_str("DDERR_OUTOFMEMORY"); return DDERR_OUTOFMEMORY; } + + /* Fixme release memory alloc if we fail */ + This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + if (This->lpLcl == NULL) + { + DX_STUB_str("DDERR_OUTOFMEMORY"); + return DDERR_OUTOFMEMORY; + } + This->lpLcl->lpGbl = &ddgbl; } else { DX_STUB_str("2.linking\n"); /* We got the DirectDraw interface alloc and we need create the link */ LPDDRAWI_DIRECTDRAW_INT newThis; + newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); if (newThis == NULL) { - DX_STUB_str("DDERR_OUTOFMEMORY"); + DX_STUB_str("DDERR_OUTOFMEMORY\n"); return DDERR_OUTOFMEMORY; } @@ -71,22 +81,26 @@ if (pGUID !=NULL) { This = newThis; - DX_STUB_str("DDERR_INVALIDDIRECTDRAWGUID"); + DX_STUB_str("DDERR_INVALIDDIRECTDRAWGUID\n"); return DDERR_INVALIDDIRECTDRAWGUID; } } newThis->lpLink = This; + + newThis->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); + if (newThis->lpLcl == NULL) + { + This = newThis; + DX_STUB_str("DDERR_OUTOFMEMORY"); + return DDERR_OUTOFMEMORY; + } + RtlCopyMemory(newThis->lpLcl, This->lpLcl, sizeof(DDRAWI_DIRECTDRAW_LCL)); + This = newThis; - } - - /* Fixme release memory alloc if we fail */ - This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); - if (This->lpLcl == NULL) - { - DX_STUB_str("DDERR_OUTOFMEMORY"); - return DDERR_OUTOFMEMORY; - } - This->lpLcl->lpGbl = &ddgbl; + + DX_STUB_str("here\n"); + + } *pIface = (LPDIRECTDRAW)This; @@ -451,12 +465,13 @@ DxHeapMemFree(mpFourCC); DxHeapMemFree(ddgbl.lpDDCBtmp); // FIXME Close DX fristcall and second call - return DD_FALSE; - } - } + } + } + /* Get all basic data from the driver */ - if (!DdQueryDirectDrawObject(This->lpLcl->lpGbl, + if (!DdQueryDirectDrawObject( + This->lpLcl->lpGbl, &mHALInfo, &ddgbl.lpDDCBtmp->HALDD, &ddgbl.lpDDCBtmp->HALDDSurface, @@ -476,7 +491,9 @@ } memcpy(&ddgbl.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO)); - memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); + + + memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); This->lpLcl->lpGbl->dwNumFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; This->lpLcl->lpGbl->lpdwFourCC = mpFourCC; @@ -485,11 +502,9 @@ This->lpLcl->lpGbl->dwModeIndex = mHALInfo.dwModeIndex; This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo; - This->lpLcl->lpGbl->hInstance = mHALInfo.hInstance; - This->lpLcl->lpGbl->lp16DD = This->lpLcl->lpGbl; /* FIXME convert mpTextures to DDHALMODEINFO */ - DxHeapMemFree(mpTextures); + // DxHeapMemFree( mpTextures); /* FIXME D3D setup mD3dCallbacks and mD3dDriverData */ DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 };

1 0

[mbosma] 26850: Test for IDirectDraw7::GetFourCCCodes
by mbosma＠svn.reactos.org 21 May '07

21 May '07

Author: mbosma Date: Mon May 21 19:24:57 2007 New Revision: 26850 URL: http://svn.reactos.org/svn/reactos?rev=26850&view=rev Log: Test for IDirectDraw7::GetFourCCCodes Modified: trunk/rostests/dxtest/ddraw/testlist.cpp trunk/rostests/dxtest/ddraw/tests/CreateDDraw.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 Mon May 21 19:24:57 2007 @@ -15,6 +15,7 @@ { "IDirectDraw: COM Stuff", Test_CreateDDraw }, { "IDirectDraw: Display Modes", Test_DisplayModes }, { "IDirectDraw: Available Video Memory", Test_GetAvailableVidMem }, + { "IDirectDraw: GetFourCC", Test_GetFourCCCodes }, { "IDirectDraw: Cooperative Levels", Test_SetCooperativeLevel }, { "IDirectDraw: CreateSurface", Test_CreateSurface }, }; 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 Mon May 21 19:24:57 2007 @@ -97,8 +97,35 @@ 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 Caps.dwCaps = DDSCAPS_VIDEOMEMORY; TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK ); + + DirectDraw->Release(); + + return TRUE; +} + +BOOL Test_GetFourCCCodes (INT* passed, INT* failed) +{ + LPDIRECTDRAW7 DirectDraw; + + /* Preparations */ + if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK) + { + printf("ERROR: Failed to set up ddraw\n"); + return FALSE; + } + + /* Here we go */ + DWORD dwNumCodes, *lpCodes; + TEST (DirectDraw->GetFourCCCodes(NULL, NULL) == DDERR_INVALIDPARAMS); + TEST ( DirectDraw->GetFourCCCodes(NULL, lpCodes) == DDERR_INVALIDPARAMS ); + + TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, NULL) == DD_OK && dwNumCodes); + lpCodes = (PDWORD)HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)*dwNumCodes); + *lpCodes = 0; + TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, lpCodes) == DD_OK && *lpCodes ); DirectDraw->Release(); 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 Mon May 21 19:24:57 2007 @@ -12,25 +12,27 @@ HRESULT CALLBACK EnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context ) { + static int setcout = 0; + if(setcout >= 5) + return DDENUMRET_OK; + DWORD lpdwFrequency = 0; INT* passed = Context->passed; INT* failed = Context->failed; - static int setcout = 0; - DDSURFACEDESC2 DisplayMode = {0}; DisplayMode.dwSize = sizeof(DDSURFACEDESC2); - if(setcout < 5) - { - TEST ( Context->DirectDraw->SetDisplayMode (pDDSD->dwWidth, pDDSD->dwHeight, pDDSD->ddpfPixelFormat.dwRGBBitCount, pDDSD->dwRefreshRate, 0) == DD_OK); - TEST ( Context->DirectDraw->GetMonitorFrequency (&lpdwFrequency) == DD_OK && lpdwFrequency == pDDSD->dwRefreshRate); - TEST ( Context->DirectDraw->GetDisplayMode (&DisplayMode) == DD_OK - && pDDSD->dwHeight == DisplayMode.dwHeight - && pDDSD->dwWidth == DisplayMode.dwWidth - && pDDSD->dwRefreshRate == DisplayMode.dwRefreshRate - && pDDSD->ddpfPixelFormat.dwRGBBitCount == DisplayMode.ddpfPixelFormat.dwRGBBitCount); - - } + TEST ( pDDSD->dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE); + TEST ( pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB | DDPF_PALETTEINDEXED8 || pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB ); + TEST ( Context->DirectDraw->SetDisplayMode (pDDSD->dwWidth, pDDSD->dwHeight, pDDSD->ddpfPixelFormat.dwRGBBitCount, pDDSD->dwRefreshRate, 0) == DD_OK); + TEST ( Context->DirectDraw->GetMonitorFrequency (&lpdwFrequency) == DD_OK && lpdwFrequency == pDDSD->dwRefreshRate); + TEST ( Context->DirectDraw->GetDisplayMode (&DisplayMode) == DD_OK + && pDDSD->dwHeight == DisplayMode.dwHeight + && pDDSD->dwWidth == DisplayMode.dwWidth + && pDDSD->dwRefreshRate == DisplayMode.dwRefreshRate + && pDDSD->ddpfPixelFormat.dwRGBBitCount == DisplayMode.ddpfPixelFormat.dwRGBBitCount + && DisplayMode.dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE ); + setcout++; return DDENUMRET_OK; }

1 0

[mbosma] 26849: Implement IDirectDraw7::EnumDisplayModes and IDirectDraw7::RestoreDisplayMode
by mbosma＠svn.reactos.org 21 May '07

21 May '07

Author: mbosma Date: Mon May 21 16:01:07 2007 New Revision: 26849 URL: http://svn.reactos.org/svn/reactos?rev=26849&view=rev Log: Implement IDirectDraw7::EnumDisplayModes and IDirectDraw7::RestoreDisplayMode Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Mon May 21 16:01:07 2007 @@ -11,6 +11,68 @@ #include "rosdraw.h" +HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, + LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + if(!pCallback) + return DDERR_INVALIDPARAMS; + + // FIXME: Process DDEDM_STANDARDVGAMODES flag + + int i; + for (i=0; i<This->lpLcl->lpGbl->dwNumModes; i++) + { + DDSURFACEDESC2 SurfaceDesc; + + // FIXME: do we need to set/test more sturcture members ? + SurfaceDesc.dwSize = sizeof (DDSURFACEDESC2); + SurfaceDesc.dwFlags = DDSD_HEIGHT | DDSD_WIDTH | DDSD_REFRESHRATE | DDSD_WIDTH | DDSD_PIXELFORMAT; + SurfaceDesc.dwHeight = This->lpLcl->lpGbl->lpModeInfo[i].dwWidth; + SurfaceDesc.dwWidth = This->lpLcl->lpGbl->lpModeInfo[i].dwHeight; + SurfaceDesc.lPitch = This->lpLcl->lpGbl->lpModeInfo[i].lPitch; + SurfaceDesc.dwRefreshRate = This->lpLcl->lpGbl->lpModeInfo[i].wRefreshRate; + + SurfaceDesc.ddpfPixelFormat.dwSize = sizeof (DDPIXELFORMAT); + SurfaceDesc.ddpfPixelFormat.dwFlags = DDPF_RGB; + SurfaceDesc.ddpfPixelFormat.dwRBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwRBitMask; + SurfaceDesc.ddpfPixelFormat.dwGBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwGBitMask; + SurfaceDesc.ddpfPixelFormat.dwBBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwBBitMask; + SurfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask = This->lpLcl->lpGbl->lpModeInfo[i].dwAlphaBitMask; + SurfaceDesc.ddpfPixelFormat.dwRGBBitCount = This->lpLcl->lpGbl->lpModeInfo[i].dwBPP; + + if(dwFlags & DDEDM_REFRESHRATES && SurfaceDesc.dwRefreshRate != This->lpLcl->lpGbl->dwMonitorFrequency) + { + continue; + } + + if(pDDSD) + { + if(pDDSD->dwFlags & DDSD_HEIGHT && pDDSD->dwHeight != SurfaceDesc.dwHeight) + continue; + + else if(pDDSD->dwFlags & DDSD_WIDTH && pDDSD->dwWidth != SurfaceDesc.dwWidth) + continue; + + else if(pDDSD->dwFlags & DDSD_PITCH && pDDSD->lPitch != SurfaceDesc.lPitch) + continue; + + else if(pDDSD->dwFlags & DDSD_REFRESHRATE && pDDSD->dwRefreshRate != SurfaceDesc.dwRefreshRate) + continue; + + else if(pDDSD->dwFlags & DDSD_PIXELFORMAT && pDDSD->ddpfPixelFormat.dwRGBBitCount != SurfaceDesc.ddpfPixelFormat.dwRGBBitCount) + continue; // FIXME: test for the other members of ddpfPixelFormat as well + } + + (*pCallback)(&SurfaceDesc, pContext); + } + + return DD_OK; +} + HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) @@ -20,7 +82,7 @@ // FIXME: Check primary if surface is locked / busy etc. - // Check Parameter + // Check Parameters if(dwFlags != 0) { return DDERR_INVALIDPARAMS; @@ -71,6 +133,22 @@ } HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW7 iface) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + ChangeDisplaySettings(NULL, 0); + + // Update Interals + BOOL ModeChanged; + DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); + StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); + + return DD_OK; +} + +HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency (LPDIRECTDRAW7 iface, LPDWORD lpFreq) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; @@ -96,6 +174,8 @@ if (pDDSD->dwSize != sizeof(LPDDSURFACEDESC2)) return DDERR_INVALIDPARAMS; + // FIXME: More stucture members might need to be filled + pDDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; pDDSD->dwHeight = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; pDDSD->dwWidth = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; 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 Mon May 21 16:01:07 2007 @@ -33,16 +33,6 @@ HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Status: Implentation removed due to rewrite - */ -HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { DX_WINDBG_trace(); DX_STUB; @@ -111,16 +101,6 @@ * Status: Implentation removed due to rewrite */ HRESULT WINAPI -Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Status: Implentation removed due to rewrite - */ -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) {

1 0

[mbosma] 26848: - Implement IDirectDraw7::GetMonitorFrequency, GetDisplayMode - Outsource display mode related APIs into own file - Some formatting and spelling fixes
by mbosma＠svn.reactos.org 21 May '07

21 May '07

Author: mbosma Date: Mon May 21 14:11:10 2007 New Revision: 26848 URL: http://svn.reactos.org/svn/reactos?rev=26848&view=rev Log: - Implement IDirectDraw7::GetMonitorFrequency, GetDisplayMode - Outsource display mode related APIs into own file - Some formatting and spelling fixes Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild Added: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Mon May 21 14:11:10 2007 @@ -1,0 +1,107 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_displaymode.c + * PURPOSE: IDirectDraw7 Implementation + * PROGRAMMER: Maarten Bosma + * + */ + + +#include "rosdraw.h" + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + // FIXME: Check primary if surface is locked / busy etc. + + // Check Parameter + if(dwFlags != 0) + { + return DDERR_INVALIDPARAMS; + } + + if ((!dwHeight || This->lpLcl->lpGbl->vmiData.dwDisplayHeight == dwHeight) && + (!dwWidth || This->lpLcl->lpGbl->vmiData.dwDisplayWidth == dwWidth) && + (!dwBPP || This->lpLcl->lpGbl->vmiData.ddpfDisplay.dwRGBBitCount == dwBPP) && + (!dwRefreshRate || This->lpLcl->lpGbl->dwMonitorFrequency == dwRefreshRate)) + { + return DD_OK; // nothing to do here for us + } + + // Here we go + DEVMODE DevMode; + DevMode.dmFields = 0; + if(dwHeight) + DevMode.dmFields |= DM_PELSHEIGHT; + if(dwWidth) + DevMode.dmFields |= DM_PELSWIDTH; + if(dwBPP) + DevMode.dmFields |= DM_BITSPERPEL; + if(dwRefreshRate) + DevMode.dmFields |= DM_DISPLAYFREQUENCY; + + DevMode.dmPelsHeight = dwHeight; + DevMode.dmPelsWidth = dwWidth; + DevMode.dmBitsPerPel = dwBPP; + DevMode.dmDisplayFrequency = dwRefreshRate; + + LONG retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN); /* FIXME: Are we supposed to set CDS_SET_PRIMARY as well ? */ + + if(retval == DISP_CHANGE_BADMODE) + { + return DDERR_UNSUPPORTED; + } + else if(retval != DISP_CHANGE_SUCCESSFUL) + { + return DDERR_GENERIC; + } + + // Update Interals + BOOL ModeChanged; + DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); + StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); + + return DD_OK; +} + +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency (LPDIRECTDRAW7 iface, LPDWORD lpFreq) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + if (lpFreq == NULL) + return DDERR_INVALIDPARAMS; + + *lpFreq = This->lpLcl->lpGbl->dwMonitorFrequency; + + return DD_OK; +} + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + if (pDDSD == NULL) + return DDERR_INVALIDPARAMS; + + if (pDDSD->dwSize != sizeof(LPDDSURFACEDESC2)) + return DDERR_INVALIDPARAMS; + + pDDSD->dwFlags |= DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_REFRESHRATE; + pDDSD->dwHeight = This->lpLcl->lpGbl->vmiData.dwDisplayWidth; + pDDSD->dwWidth = This->lpLcl->lpGbl->vmiData.dwDisplayHeight; + pDDSD->ddpfPixelFormat = This->lpLcl->lpGbl->vmiData.ddpfDisplay; + pDDSD->dwRefreshRate = This->lpLcl->lpGbl->dwMonitorFrequency; + pDDSD->lPitch = This->lpLcl->lpGbl->vmiData.lDisplayPitch; + + return DD_OK; +} Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision 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 Mon May 21 14:11:10 2007 @@ -11,8 +11,7 @@ #include "rosdraw.h" -HRESULT -WINAPI +HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, REFIID id, LPVOID *obj) @@ -21,8 +20,8 @@ DX_WINDBG_trace(); - /* fixme - the D3D object cab be optain from here + /* FIXME + the D3D object can be optained from here Direct3D7 */ if (IsEqualGUID(&IID_IDirectDraw7, id)) @@ -44,12 +43,7 @@ return DD_OK; } -/* - * IMPLEMENT - * Status ok - */ -ULONG -WINAPI +ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; @@ -69,9 +63,7 @@ return This->dwIntRefCnt; } - -ULONG -WINAPI +ULONG WINAPI Main_DirectDraw_Release (LPDIRECTDRAW7 iface) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; @@ -103,70 +95,16 @@ return This->dwIntRefCnt; } -HRESULT -WINAPI +HRESULT WINAPI +Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +{ + return DDERR_ALREADYINITIALIZED; +} + +HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { - return DD_OK; // not implemented in ms ddraw -} - -HRESULT WINAPI -Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - DX_WINDBG_trace(); - - // FIXME: Check primary if surface is locked / busy etc. - - // Check Parameter - if(dwFlags != 0) - { - return DDERR_INVALIDPARAMS; - } - - if ((!dwHeight || This->lpLcl->lpGbl->vmiData.dwDisplayHeight == dwHeight) && - (!dwWidth || This->lpLcl->lpGbl->vmiData.dwDisplayWidth == dwWidth) && - (!dwBPP || This->lpLcl->lpGbl->vmiData.ddpfDisplay.dwRGBBitCount == dwBPP) && - (!dwRefreshRate || This->lpLcl->lpGbl->dwMonitorFrequency == dwRefreshRate)) - { - return DD_OK; // nothing to do here for us - } - - // Here we go - DEVMODE DevMode; - DevMode.dmFields = 0; - if(dwHeight) - DevMode.dmFields |= DM_PELSHEIGHT; - if(dwWidth) - DevMode.dmFields |= DM_PELSWIDTH; - if(dwBPP) - DevMode.dmFields |= DM_BITSPERPEL; - if(dwRefreshRate) - DevMode.dmFields |= DM_DISPLAYFREQUENCY; - - DevMode.dmPelsHeight = dwHeight; - DevMode.dmPelsWidth = dwWidth; - DevMode.dmBitsPerPel = dwBPP; - DevMode.dmDisplayFrequency = dwRefreshRate; - - LONG retval = ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN); /* FIXME: Are we supposed to set CDS_SET_PRIMARY as well ? */ - - if(retval == DISP_CHANGE_BADMODE) - { - return DDERR_UNSUPPORTED; - } - else if(retval != DISP_CHANGE_SUCCESSFUL) - { - return DDERR_GENERIC; - } - - // Update Interals - BOOL ModeChanged; - DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); - StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); - - return DD_OK; + return DD_OK; // not implemented in ms ddraw either } HRESULT WINAPI @@ -204,8 +142,9 @@ return memdata.ddRVal; } -HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +HRESULT WINAPI +Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { HRESULT ret; DDSURFACEDESC2 dd_desc_v2; @@ -258,7 +197,7 @@ return DDERR_INVALIDPARAMS; } - /* check if this process belong to this ddraw */ + /* Check if this process belongs to this ddraw object */ if ( dd_int->lpLcl->dwProcessId != GetCurrentProcessId() ) { /* FIXME send back right return code */ @@ -270,7 +209,6 @@ LeaveCriticalSection(&ddcs); return ret; } - IDirectDraw7Vtbl DirectDraw7_Vtable = 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 Mon May 21 14:11:10 2007 @@ -78,15 +78,6 @@ DX_STUB; } -/* - * Status: Implentation removed due to rewrite - */ -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - DX_WINDBG_trace(); - DX_STUB; -} - HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { @@ -103,13 +94,6 @@ } HRESULT WINAPI -Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { DX_WINDBG_trace(); @@ -118,17 +102,6 @@ HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Status: Implentation removed due to rewrite - */ -HRESULT -WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) { DX_WINDBG_trace(); DX_STUB; Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Mon May 21 14:11:10 2007 @@ -23,9 +23,10 @@ <file>cleanup.c</file> <directory name="Ddraw"> + <file>ddraw_main.c</file> + <file>ddraw_displaymode.c</file> + <file>ddraw_setcooperativelevel.c</file> <file>ddraw_stubs.c</file> - <file>ddraw_setcooperativelevel.c</file> - <file>ddraw_main.c</file> <file>callbacks_dd_hel.c</file> </directory> <directory name="Surface">

1 0

[fireball] 26847: - Make 2 disk read error messages different, so it's possible to see what fails more exactly.
by fireball＠svn.reactos.org 21 May '07

21 May '07

Author: fireball Date: Mon May 21 12:46:18 2007 New Revision: 26847 URL: http://svn.reactos.org/svn/reactos?rev=26847&view=rev Log: - Make 2 disk read error messages different, so it's possible to see what fails more exactly. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Mon May 21 12:46:18 2007 @@ -121,7 +121,7 @@ } // If we get here then the read failed - DiskError("Disk Read Failed", RegsOut.b.ah); + DiskError("Disk Read Failed in LBA mode", RegsOut.b.ah); return FALSE; } @@ -244,7 +244,7 @@ // If we retried 3 times then fail if (RetryCount >= 3) { - DiskError("Disk Read Failed", RegsOut.b.ah); + DiskError("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah); return FALSE; }

1 0

[mbosma] 26846: Sorry, I forgot this one.
by mbosma＠svn.reactos.org 20 May '07

20 May '07

Author: mbosma Date: Mon May 21 02:56:32 2007 New Revision: 26846 URL: http://svn.reactos.org/svn/reactos?rev=26846&view=rev Log: Sorry, I forgot this one. 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 Mon May 21 02:56:32 2007 @@ -497,7 +497,7 @@ DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->cbDDMiscellaneousCallbacks; DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); - if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.dwExpectedSize) + if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.ddRVal != DD_OK) { DxHeapMemFree(mpFourCC); DxHeapMemFree(mpTextures);

1 0

[mbosma] 26845: Implement IDirectDraw7::GetAvailableVidMem.
by mbosma＠svn.reactos.org 20 May '07

20 May '07

Author: mbosma Date: Mon May 21 02:48:19 2007 New Revision: 26845 URL: http://svn.reactos.org/svn/reactos?rev=26845&view=rev Log: Implement IDirectDraw7::GetAvailableVidMem. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/startup.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 Mon May 21 02:48:19 2007 @@ -39,7 +39,6 @@ return E_NOINTERFACE; } - Main_DirectDraw_AddRef(iface); DX_STUB_str("DD_OK"); return DD_OK; @@ -104,17 +103,11 @@ return This->dwIntRefCnt; } -/* - * IMPLEMENT - * Status ok - */ HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { - /* MSDN say not implement but my question what does it return then */ - DX_WINDBG_trace(); - return DD_OK; + return DD_OK; // not implemented in ms ddraw } HRESULT WINAPI @@ -176,8 +169,41 @@ return DD_OK; } -/* - */ +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD dwTotal, LPDWORD dwFree) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + // There is no HEL implentation of this api + if (!(This->lpLcl->lpDDCB->cbDDMiscellaneousCallbacks.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) + { + return DDERR_NODIRECTDRAWHW; + } + + if ((!dwTotal && !dwFree) || !ddscaps) + { + return DDERR_INVALIDPARAMS; + } + + DDHAL_GETAVAILDRIVERMEMORYDATA memdata; + memdata.lpDD = This->lpLcl->lpGbl; + memdata.ddRVal = DDERR_INVALIDPARAMS; + memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2)); + + if (This->lpLcl->lpDDCB->cbDDMiscellaneousCallbacks.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_NODIRECTDRAWHW; + + if (dwTotal) + *dwTotal = memdata.dwTotal; + + if (dwFree) + *dwFree = memdata.dwFree; + + return memdata.ddRVal; +} + HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { 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 Mon May 21 02:48:19 2007 @@ -155,17 +155,6 @@ DX_STUB; } -/* - * Status: Implentation removed due to rewrite - */ -HRESULT WINAPI -Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); - DX_STUB; -} - HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { 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 Mon May 21 02:48:19 2007 @@ -18,7 +18,6 @@ WCHAR classname[128]; WNDCLASSW wnd_class; - HRESULT WINAPI @@ -140,7 +139,6 @@ DX_WINDBG_trace(); - /* * ddgbl.dwPDevice is not longer in use in windows 2000 and higher * I am using it for device type @@ -149,8 +147,6 @@ * devicetypes = 3 : both hel are enable * devicetypes = 4 :loading a guid drv from the register */ - - if (reenable == FALSE) { @@ -364,7 +360,6 @@ HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable) { - LPDWORD mpFourCC; DDHALINFO mHALInfo; BOOL newmode = FALSE; @@ -381,7 +376,6 @@ RtlZeroMemory(&mD3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); RtlZeroMemory(&mD3dBufferCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); - if (reenable == FALSE) { if (ddgbl.lpDDCBtmp == NULL) @@ -406,8 +400,6 @@ DxHeapMemFree(ddgbl.lpDDCBtmp); return DD_FALSE; } - - /* Some card disable the dx after it have been created so * we are force reanble it @@ -456,17 +448,15 @@ mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats); if (mpTextures == NULL) { - DxHeapMemFree( mpFourCC); + DxHeapMemFree(mpFourCC); DxHeapMemFree(ddgbl.lpDDCBtmp); // FIXME Close DX fristcall and second call - } - return DD_FALSE; - } - + return DD_FALSE; + } + } /* Get all basic data from the driver */ - if (!DdQueryDirectDrawObject( - This->lpLcl->lpGbl, + if (!DdQueryDirectDrawObject(This->lpLcl->lpGbl, &mHALInfo, &ddgbl.lpDDCBtmp->HALDD, &ddgbl.lpDDCBtmp->HALDDSurface, @@ -478,15 +468,15 @@ mpFourCC, NULL)) { - DxHeapMemFree( mpFourCC); - DxHeapMemFree( mpTextures); + DxHeapMemFree(mpFourCC); + DxHeapMemFree(mpTextures); DxHeapMemFree(ddgbl.lpDDCBtmp); // FIXME Close DX fristcall and second call return DD_FALSE; } memcpy(&ddgbl.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO)); - memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); + memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); This->lpLcl->lpGbl->dwNumFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; This->lpLcl->lpGbl->lpdwFourCC = mpFourCC; @@ -499,8 +489,22 @@ This->lpLcl->lpGbl->lp16DD = This->lpLcl->lpGbl; /* FIXME convert mpTextures to DDHALMODEINFO */ - DxHeapMemFree( mpTextures); + DxHeapMemFree(mpTextures); /* FIXME D3D setup mD3dCallbacks and mD3dDriverData */ + DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 }; + DdGetDriverInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); + DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->cbDDMiscellaneousCallbacks; + DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); + if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.dwExpectedSize) + { + DxHeapMemFree(mpFourCC); + DxHeapMemFree(mpTextures); + DxHeapMemFree(ddgbl.lpDDCBtmp); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + return DD_OK; }

1 0

[fireball] 26844: - Fix WebBrowser struct declaration to conform with a new WIDL.
by fireball＠svn.reactos.org 20 May '07

20 May '07

Author: fireball Date: Sun May 20 15:29:22 2007 New Revision: 26844 URL: http://svn.reactos.org/svn/reactos?rev=26844&view=rev Log: - Fix WebBrowser struct declaration to conform with a new WIDL. Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h Sun May 20 15:29:22 2007 @@ -61,7 +61,7 @@ typedef struct ConnectionPoint ConnectionPoint; -typedef struct { +struct WebBrowser { /* Interfaces available via WebBrowser object */ const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; @@ -115,7 +115,7 @@ ConnectionPoint *cp_wbe2; ConnectionPoint *cp_wbe; ConnectionPoint *cp_pns; -} WebBrowser; +}; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) #define WEBBROWSER2(x) ((IWebBrowser2*) &(x)->lpWebBrowser2Vtbl)

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