Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 18928: Another few cosmetic changes and also except DDSURFACEDESC as parameter for CreateSurface.
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

Another few cosmetic changes and also except DDSURFACEDESC as parameter for CreateSurface. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 12:02:12 UTC (rev 18927) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 12:17:25 UTC (rev 18928) @@ -287,7 +287,7 @@ HRESULT Hal_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; @@ -379,7 +379,6 @@ HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 12:02:12 UTC (rev 18927) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 12:17:25 UTC (rev 18928) @@ -161,7 +161,7 @@ if (pUnkOuter!=NULL) return DDERR_INVALIDPARAMS; - if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize) + if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) return DDERR_UNSUPPORTED; // the nasty com stuff @@ -370,7 +370,7 @@ HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, @@ -395,13 +395,13 @@ HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) @@ -411,40 +411,40 @@ HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) { - DX_STUB; + DX_STUB; } IDirectDraw7Vtbl DirectDraw7_Vtable =

1 0

[mbosma] 18927: Add call to DdReenableDirectDrawObject (GdiEntry10) where it is needed.
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

Add call to DdReenableDirectDrawObject (GdiEntry10) where it is needed. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 11:35:01 UTC (rev 18926) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 12:02:12 UTC (rev 18927) @@ -22,6 +22,8 @@ if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) return DDERR_INVALIDPARAMS; + BOOL dummy; + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); /* alloc all the space */ This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -226,7 +228,6 @@ DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the NTCallbacks */ /* Fill in wher DriverInfo.guidInfo = GUID_NTCallbacks; @@ -476,8 +477,11 @@ { return DDERR_NODRIVERSUPPORT; } + + BOOL dummy; + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); - return mode.ddRVal + return mode.ddRVal; } #endif _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:35:01 UTC (rev 18926) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 12:02:12 UTC (rev 18927) @@ -82,17 +82,20 @@ HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DWORD ret; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; /* FIXME implement hal setMode */ - if((ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, - dwBPP, dwRefreshRate, dwFlags)) == DD_OK) + if(Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, + dwBPP, dwRefreshRate, dwFlags) == DD_OK) { - return ret; + return DD_OK; } - ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + DWORD ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + BOOL dummy; + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); + return ret; }

1 0

[mbosma] 18926: fix compiling again, sorry.
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

fix compiling again, sorry. Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:32:35 UTC (rev 18925) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:35:01 UTC (rev 18926) @@ -290,10 +290,11 @@ pDDSD->lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; pDDSD->dwRefreshRate = This->DirectDrawGlobal.dwMonitorFrequency; - /* have not check where I should get hold of this info yet */ - DWORD dwBackBufferCount; + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.dd pfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCO RECAPS)); /* have not check where I should get hold of this info yet + DWORD dwBackBufferCount; DWORD dwAlphaBitDepth; DWORD dwReserved; LPVOID lpSurface; @@ -304,17 +305,11 @@ } DDCOLORKEY ddckCKDestBlt; DDCOLORKEY ddckCKSrcOverlay; - DDCOLORKEY ddckCKSrcBlt; - */ - - RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->DirectDrawGlobal.vmiData.dd pfDisplay,sizeof(DDPIXELFORMAT)); - RtlCopyMemory(&pDDSD->ddsCaps,&This->DirectDrawGlobal.ddCaps,sizeof(DDCO RECAPS)); - - /* have not check where I should get hold of this info yet + DDCOLORKEY ddckCKSrcBlt; DWORD dwTextureStage; */ - return DD_OK; + return DD_OK; } HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,

1 0

[mbosma] 18925: Some cosmetic changes like replacing tabs with spaces and grouping all stubs together.
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

Some cosmetic changes like replacing tabs with spaces and grouping all stubs together. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 09:59:21 UTC (rev 18924) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 11:32:35 UTC (rev 18925) @@ -15,317 +15,296 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - /* point to it self */ - This->DirectDrawGlobal.lp16DD = &This->DirectDrawGlobal; + /* point to it self */ + This->DirectDrawGlobal.lp16DD = &This->DirectDrawGlobal; - /* get the object */ - if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) - return DDERR_INVALIDPARAMS; + /* get the object */ + if(!DdCreateDirectDrawObject (&This->DirectDrawGlobal, This->hdc)) + return DDERR_INVALIDPARAMS; - - /* alloc all the space */ - This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDHAL_CALLBACKS)); + + /* alloc all the space */ + This->DirectDrawGlobal.lpDDCBtmp = (LPDDHAL_CALLBACKS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDHAL_CALLBACKS)); - This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, - sizeof(D3DHAL_CALLBACKS)); + This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + sizeof(D3DHAL_CALLBACKS)); - This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_GLOBALDRIVERDATA)); - - /* Fill in some info */ - This->HalInfo.lpD3DGlobalDriverData = This->DirectDrawGlobal.lpD3DGlobalDriverData; - This->HalInfo.lpD3DHALCallbacks = This->DirectDrawGlobal.lpD3DHALCallbacks; - This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDD; - This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf; - This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette; - This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface; - - /* query all kinds of infos from the driver */ - if(!DdQueryDirectDrawObject ( - &This->DirectDrawGlobal, - &This->HalInfo, - This->HalInfo.lpDDCallbacks, - This->HalInfo.lpDDSurfaceCallbacks, - This->HalInfo.lpDDPaletteCallbacks, - (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, - (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, - This->HalInfo.lpDDExeBufCallbacks, - NULL, - NULL, - NULL )) - { - return DD_FALSE; - } - - This->HalInfo.vmiData.pvmList = (LPVIDMEM) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); + This->DirectDrawGlobal.lpD3DGlobalDriverData = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_GLOBALDRIVERDATA)); + + /* Fill in some info */ + This->HalInfo.lpD3DGlobalDriverData = This->DirectDrawGlobal.lpD3DGlobalDriverData; + This->HalInfo.lpD3DHALCallbacks = This->DirectDrawGlobal.lpD3DHALCallbacks; + This->HalInfo.lpDDCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDD; + This->HalInfo.lpDDExeBufCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf; + This->HalInfo.lpDDPaletteCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDPalette; + This->HalInfo.lpDDSurfaceCallbacks = &This->DirectDrawGlobal.lpDDCBtmp->HALDDSurface; + + /* query all kinds of infos from the driver */ + if(!DdQueryDirectDrawObject ( + &This->DirectDrawGlobal, + &This->HalInfo, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, + NULL, + NULL, + NULL )) + { + return DD_FALSE; + } + + This->HalInfo.vmiData.pvmList = (LPVIDMEM) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(VIDMEM) * This->HalInfo.vmiData.dwNumHeaps); - This->DirectDrawGlobal.lpdwFourCC = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = - (LPDDSURFACEDESC) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); + This->DirectDrawGlobal.lpdwFourCC = (DWORD *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DWORD) * This->HalInfo.ddCaps.dwNumFourCCCodes); + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats = + (LPDDSURFACEDESC) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->dwNumTextureFormats); - if(!DdQueryDirectDrawObject ( - &This->DirectDrawGlobal, - &This->HalInfo, - This->HalInfo.lpDDCallbacks, - This->HalInfo.lpDDSurfaceCallbacks, - This->HalInfo.lpDDPaletteCallbacks, - (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, - (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, - This->HalInfo.lpDDExeBufCallbacks, - ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats, - This->DirectDrawGlobal.lpdwFourCC, - This->HalInfo.vmiData.pvmList - )) - { - return DD_FALSE; - } - - /* Copy HalInfo to DirectDrawGlobal (Not complete)*/ - - RtlCopyMemory(&This->DirectDrawGlobal.vmiData,&This->HalInfo.vmiData,siz eof(VIDMEMINFO)); - RtlCopyMemory(&This->DirectDrawGlobal.ddCaps,&This->HalInfo.ddCaps,sizeo f(DDCORECAPS)); - This->DirectDrawGlobal.dwMonitorFrequency = This->HalInfo.dwMonitorFrequency; + if(!DdQueryDirectDrawObject ( + &This->DirectDrawGlobal, + &This->HalInfo, + This->HalInfo.lpDDCallbacks, + This->HalInfo.lpDDSurfaceCallbacks, + This->HalInfo.lpDDPaletteCallbacks, + (LPD3DHAL_CALLBACKS)This->DirectDrawGlobal.lpD3DHALCallbacks, + (LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData, + This->HalInfo.lpDDExeBufCallbacks, + ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats, + This->DirectDrawGlobal.lpdwFourCC, + This->HalInfo.vmiData.pvmList + )) + { + return DD_FALSE; + } + + /* Copy HalInfo to DirectDrawGlobal (Not complete)*/ + RtlCopyMemory(&This->DirectDrawGlobal.vmiData,&This->HalInfo.vmiData,siz eof(VIDMEMINFO)); + RtlCopyMemory(&This->DirectDrawGlobal.ddCaps,&This->HalInfo.ddCaps,sizeo f(DDCORECAPS)); + This->DirectDrawGlobal.dwMonitorFrequency = This->HalInfo.dwMonitorFrequency; This->DirectDrawGlobal.dwModeIndex = This->HalInfo.dwModeIndex; This->DirectDrawGlobal.dwNumModes = This->HalInfo.dwNumModes; This->DirectDrawGlobal.lpModeInfo = This->HalInfo.lpModeInfo; - - /* Unsure which of these two for lpPDevice + /* Unsure which of these two for lpPDevice This->DirectDrawGlobal.dwPDevice = This->HalInfo.lpPDevice; - This->lpDriverHandle = This->HalInfo.lpPDevice; - */ - + This->lpDriverHandle = This->HalInfo.lpPDevice; + */ This->DirectDrawGlobal.hInstance = This->HalInfo.hInstance; + RtlCopyMemory(&This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf, + &This->HalInfo.lpDDExeBufCallbacks,sizeof(DDHAL_DDEXEBUFCALLBACKS)); - RtlCopyMemory(&This->DirectDrawGlobal.lpDDCBtmp->HALDDExeBuf,&This->HalI nfo.lpDDExeBufCallbacks,sizeof(DDHAL_DDEXEBUFCALLBACKS)); + /*********************************************************************** */ + /* Set up the rest of the callbacks all callbacks we get back from */ + /* gdi32.dll is user mode */ + /*********************************************************************** */ - - - /*********************************************************************** */ - /* Set up the rest of the callbacks all callbacks we get back from */ - /* gdi32.dll is user mode */ - /*********************************************************************** */ + /* Todo add a check see if HalInfo.GetDriverInfo is supported or not */ + /* Do not trust msdn what it say about dwContext it is not in use for + windows nt, it is in use for all os, and it always pont to + DirectDrawGlobal.hDD */ - /* Todo add a check see if HalInfo.GetDriverInfo is supported or not */ + /* FIXME add all callback that have been commect out to gpl */ + /* FIXME free the memmor that being alloc when ddraw.dll exists */ + /* FIXME add check for DriverInfo if the handle or not */ - /* Do not trust msdn what it say about dwContext it is not in use for - windows nt, it is in use for all os, and it always pont to - DirectDrawGlobal.hDD */ + DDHAL_GETDRIVERINFODATA DriverInfo; + memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); + DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); + DriverInfo.dwContext = This->DirectDrawGlobal.hDD; - /* FIXME add all callback that have been commect out to gpl */ - /* FIXME free the memmor that being alloc when ddraw.dll exists */ - /* FIXME add check for DriverInfo if the handle or not */ + /* Get ColorControlCallbacks */ + DriverInfo.guidInfo = GUID_ColorControlCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDColorControl; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDCOLORCONTROLCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the GUID_D3DCallbacks callback */ + /* Problem with include files + DDHAL_DDMISCELLANEOUSCALLBACKS misc; + DriverInfo.guidInfo = GUID_D3DCallbacks; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo);*/ + + /* Get the D3DCallbacks2 */ + This->DirectDrawGlobal.lpD3DHALCallbacks2 = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_CALLBACKS2)); + DriverInfo.guidInfo = GUID_D3DCallbacks2; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks2; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS2); + This->HalInfo.GetDriverInfo(&DriverInfo); - DDHAL_GETDRIVERINFODATA DriverInfo; - memset(&DriverInfo,0, sizeof(DDHAL_GETDRIVERINFODATA)); - DriverInfo.dwSize = sizeof(DDHAL_GETDRIVERINFODATA); - DriverInfo.dwContext = This->DirectDrawGlobal.hDD; - - - /* Get ColorControlCallbacks */ - DriverInfo.guidInfo = GUID_ColorControlCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDColorControl; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDCOLORCONTROLCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the GUID_D3DCallbacks callback */ - - /* Problem with include files - DDHAL_DDMISCELLANEOUSCALLBACKS misc; - DriverInfo.guidInfo = GUID_D3DCallbacks; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo);*/ - - /* Get the D3DCallbacks2 */ - This->DirectDrawGlobal.lpD3DHALCallbacks2 = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_CALLBACKS2)); - DriverInfo.guidInfo = GUID_D3DCallbacks2; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks2; - DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS2); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the D3DCallbacks3 */ + + /* Get the D3DCallbacks3 */ This->DirectDrawGlobal.lpD3DHALCallbacks = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_CALLBACKS3)); - DriverInfo.guidInfo = GUID_D3DCallbacks3; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks; - DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS3); - This->HalInfo.GetDriverInfo( &DriverInfo); - + sizeof(D3DHAL_CALLBACKS3)); + DriverInfo.guidInfo = GUID_D3DCallbacks3; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_CALLBACKS3); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the misc callback */ + /* Problem with include files + DriverInfo.guidInfo = GUID_D3DCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ - /* Get the misc callback */ - /* Problem with include files - DriverInfo.guidInfo = GUID_D3DCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the D3DExtendedCaps */ - - This->DirectDrawGlobal.lpD3DExtendedCaps = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(D3DHAL_D3DEXTENDEDCAPS)); - DriverInfo.guidInfo = GUID_D3DExtendedCaps; - DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpD3DExtendedCaps; - DriverInfo.dwExpectedSize = sizeof(D3DHAL_D3DEXTENDEDCAPS); - This->HalInfo.GetDriverInfo( &DriverInfo); + /* Get the D3DExtendedCaps */ + This->DirectDrawGlobal.lpD3DExtendedCaps = (ULONG_PTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(D3DHAL_D3DEXTENDEDCAPS)); + DriverInfo.guidInfo = GUID_D3DExtendedCaps; + DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpD3DExtendedCaps; + DriverInfo.dwExpectedSize = sizeof(D3DHAL_D3DEXTENDEDCAPS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the D3DParseUnknownCommandCallback */ - /* D3dDrawPrimitives2 callback where should it be fill in - DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); + /* Get the D3DParseUnknownCommandCallback */ + /* D3dDrawPrimitives2 callback where should it be fill in + DriverInfo.guidInfo = GUID_D3DParseUnknownCommandCallback; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); */ - /* Get the GetHeapAlignment */ - /* where should it be fill in - DriverInfo.guidInfo = GUID_GetHeapAlignment; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - - /* Get the KernelCallbacks */ - DriverInfo.guidInfo = GUID_KernelCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the GetHeapAlignment */ + /* where should it be fill in + DriverInfo.guidInfo = GUID_GetHeapAlignment; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the KernelCallbacks */ + DriverInfo.guidInfo = GUID_KernelCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDKernel; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the KernelCaps */ - This->DirectDrawGlobal.lpDDKernelCaps = (LPDDKERNELCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDHAL_DDKERNELCALLBACKS)); - DriverInfo.guidInfo = GUID_KernelCaps; - DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpDDKernelCaps; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the KernelCaps */ + This->DirectDrawGlobal.lpDDKernelCaps = (LPDDKERNELCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDHAL_DDKERNELCALLBACKS)); + DriverInfo.guidInfo = GUID_KernelCaps; + DriverInfo.lpvData = (PVOID) This->DirectDrawGlobal.lpDDKernelCaps; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDKERNELCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the MiscellaneousCallbacks */ - DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the MiscellaneousCallbacks */ + DriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the Miscellaneous2Callbacks */ - /* Not in the DDRAWI_DIRECTDRAW_GBL we map it up as private - Contain CreatesurfaceEx and other nice callbacks */ - DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; - DriverInfo.lpvData = &This->Misc2Callback; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the Miscellaneous2Callbacks */ + /* Not in the DDRAWI_DIRECTDRAW_GBL we map it up as private + Contain CreatesurfaceEx and other nice callbacks */ + DriverInfo.guidInfo = GUID_Miscellaneous2Callbacks; + DriverInfo.lpvData = &This->Misc2Callback; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); - /* Get the MotionCompCallbacks */ - DriverInfo.guidInfo = GUID_MotionCompCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMotionComp; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMOTIONCOMPCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + /* Get the MotionCompCallbacks */ + DriverInfo.guidInfo = GUID_MotionCompCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDMotionComp; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMOTIONCOMPCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); /* Get the NonLocalVidMemCaps */ - This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDNONLOCALVIDMEMCAPS)); - DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpddNLVCaps; - DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); - This->HalInfo.GetDriverInfo( &DriverInfo); - + This->DirectDrawGlobal.lpddNLVCaps = (LPDDNONLOCALVIDMEMCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDNONLOCALVIDMEMCAPS)); + DriverInfo.guidInfo = GUID_NonLocalVidMemCaps; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpddNLVCaps; + DriverInfo.dwExpectedSize = sizeof(DDNONLOCALVIDMEMCAPS); + This->HalInfo.GetDriverInfo(&DriverInfo); + /* Get the NTCallbacks */ - /* Fill in wher - DriverInfo.guidInfo = GUID_NTCallbacks; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the NTPrivateDriverCaps */ - /* Fill in wher - DriverInfo.guidInfo = GUID_NTPrivateDriverCaps; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the UpdateNonLocalHeap */ - /* Fill in where - DriverInfo.guidInfo = GUID_UpdateNonLocalHeap; - DriverInfo.lpvData = &misc; - DriverInfo.dwExpectedSize = sizeof(); - This->HalInfo.GetDriverInfo( &DriverInfo); - */ - - /* Get the VideoPortCallbacks */ - DriverInfo.guidInfo = GUID_VideoPortCallbacks; - DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort; - DriverInfo.dwExpectedSize = sizeof(DDHAL_DDVIDEOPORTCALLBACKS); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the VideoPortCaps */ - This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDVIDEOPORTCAPS)); - DriverInfo.guidInfo = GUID_VideoPortCaps; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpDDVideoPortCaps; - DriverInfo.dwExpectedSize = sizeof(DDVIDEOPORTCAPS); - This->HalInfo.GetDriverInfo( &DriverInfo); - - - /* Get the ZPixelFormats */ - This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); - DriverInfo.guidInfo = GUID_ZPixelFormats; - DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; - DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); - This->HalInfo.GetDriverInfo( &DriverInfo); - - /* Setup some info from the callbacks we got */ - DDHAL_GETAVAILDRIVERMEMORYDATA mem; - mem.lpDD = &This->DirectDrawGlobal; - - This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); - - This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; - This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; - - /* Now all setup for HAL is done */ - return DD_OK; + /* Fill in wher + DriverInfo.guidInfo = GUID_NTCallbacks; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the NTPrivateDriverCaps */ + /* Fill in wher + DriverInfo.guidInfo = GUID_NTPrivateDriverCaps; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the UpdateNonLocalHeap */ + /* Fill in where + DriverInfo.guidInfo = GUID_UpdateNonLocalHeap; + DriverInfo.lpvData = &misc; + DriverInfo.dwExpectedSize = sizeof(); + This->HalInfo.GetDriverInfo( &DriverInfo); + */ + + /* Get the VideoPortCallbacks */ + DriverInfo.guidInfo = GUID_VideoPortCallbacks; + DriverInfo.lpvData = &This->DirectDrawGlobal.lpDDCBtmp->HALDDVideoPort; + DriverInfo.dwExpectedSize = sizeof(DDHAL_DDVIDEOPORTCALLBACKS); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the VideoPortCaps */ + This->DirectDrawGlobal.lpDDVideoPortCaps = (LPDDVIDEOPORTCAPS)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDVIDEOPORTCAPS)); + DriverInfo.guidInfo = GUID_VideoPortCaps; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpDDVideoPortCaps; + DriverInfo.dwExpectedSize = sizeof(DDVIDEOPORTCAPS); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Get the ZPixelFormats */ + This->DirectDrawGlobal.lpZPixelFormats = (LPDDPIXELFORMAT) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDPIXELFORMAT) * This->DirectDrawGlobal.dwNumZPixelFormats); + DriverInfo.guidInfo = GUID_ZPixelFormats; + DriverInfo.lpvData = (PVOID)This->DirectDrawGlobal.lpZPixelFormats; + DriverInfo.dwExpectedSize = sizeof(DDPIXELFORMAT); + This->HalInfo.GetDriverInfo(&DriverInfo); + + /* Setup some info from the callbacks we got */ + DDHAL_GETAVAILDRIVERMEMORYDATA mem; + mem.lpDD = &This->DirectDrawGlobal; + This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemor y(&mem); + This->DirectDrawGlobal.ddCaps.dwVidMemFree = mem.dwFree; + This->DirectDrawGlobal.ddCaps.dwVidMemTotal = mem.dwTotal; + + /* Now all setup for HAL is done */ + return DD_OK; } HRESULT Hal_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) + { + return DDERR_NODRIVERSUPPORT; + } - SetExclusiveMode.lpDD = &This->DirectDrawGlobal; + SetExclusiveMode.lpDD = &This->DirectDrawGlobal; SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; - SetExclusiveMode.dwEnterExcl = This->cooperative_level; + SetExclusiveMode.dwEnterExcl = This->cooperative_level; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode(&SetExclusiveM ode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode(&SetExclusiveM ode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - return SetExclusiveMode.ddRVal; + return SetExclusiveMode.ddRVal; } @@ -333,166 +312,172 @@ { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DdDeleteDirectDrawObject (&This->DirectDrawGlobal); + DdDeleteDirectDrawObject (&This->DirectDrawGlobal); - if(This->DirectDrawGlobal.lpDDKernelCaps) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDKernelCaps); + if(This->DirectDrawGlobal.lpDDKernelCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDKernelCaps); - if(This->DirectDrawGlobal.lpddNLVCaps) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpddNLVCaps); + if(This->DirectDrawGlobal.lpddNLVCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpddNLVCaps); - if(This->DirectDrawGlobal.lpDDVideoPortCaps) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDVideoPortCaps); + if(This->DirectDrawGlobal.lpDDVideoPortCaps) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDVideoPortCaps); - if(This->DirectDrawGlobal.lpdwFourCC) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC); + if(This->DirectDrawGlobal.lpdwFourCC) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpdwFourCC); - if(This->DirectDrawGlobal.lpZPixelFormats) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpZPixelFormats); + if(This->DirectDrawGlobal.lpZPixelFormats) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpZPixelFormats); - if(This->HalInfo.vmiData.pvmList) - HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); - - if(((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverD ata)->lpTextureFormats) - HeapFree(GetProcessHeap(), 0, ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats); - - if(This->DirectDrawGlobal.lpDDCBtmp) - HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDCBtmp); - - if(This->DirectDrawGlobal.lpD3DHALCallbacks) - HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks); - - if(This->DirectDrawGlobal.lpD3DGlobalDriverData) - HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); + if(This->HalInfo.vmiData.pvmList) + HeapFree(GetProcessHeap(), 0, This->HalInfo.vmiData.pvmList); + + if(((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverD ata)->lpTextureFormats) + HeapFree(GetProcessHeap(), 0, ((LPD3DHAL_GLOBALDRIVERDATA)This->DirectDrawGlobal.lpD3DGlobalDriverData )->lpTextureFormats); + + if(This->DirectDrawGlobal.lpDDCBtmp) + HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDCBtmp); + + if(This->DirectDrawGlobal.lpD3DHALCallbacks) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DHALCallbacks); + + if(This->DirectDrawGlobal.lpD3DGlobalDriverData) + HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); } HRESULT Hal_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) + LPDWORD total, LPDWORD free) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - DDHAL_GETAVAILDRIVERMEMORYDATA mem; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DDHAL_GETAVAILDRIVERMEMORYDATA mem; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) + { + return DDERR_NODRIVERSUPPORT; + } - mem.lpDD = &This->DirectDrawGlobal; - mem.ddRVal = DDERR_NOTPALETTIZED; + mem.lpDD = &This->DirectDrawGlobal; + mem.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemo ry(&mem) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.GetAvailDriverMemo ry(&mem) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - ddscaps->dwCaps = mem.DDSCaps.dwCaps; - ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; + ddscaps->dwCaps = mem.DDSCaps.dwCaps; + ddscaps->dwCaps2 = mem.ddsCapsEx.dwCaps2; ddscaps->dwCaps3 = mem.ddsCapsEx.dwCaps3; - ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; - *total = mem.dwTotal; - *free = mem.dwFree; - - return mem.ddRVal; + ddscaps->dwCaps4 = mem.ddsCapsEx.dwCaps4; + *total = mem.dwTotal; + *free = mem.dwFree; + + return mem.ddRVal; } HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; + DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) - { - return DDERR_NODRIVERSUPPORT; - } - - WaitVectorData.lpDD = &This->DirectDrawGlobal; - WaitVectorData.dwFlags = dwFlags; - WaitVectorData.hEvent = (DWORD)h; - WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) + { + return DDERR_NODRIVERSUPPORT; + } + + WaitVectorData.lpDD = &This->DirectDrawGlobal; + WaitVectorData.dwFlags = dwFlags; + WaitVectorData.hEvent = (DWORD)h; + WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVecto rData) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVecto rData) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - return WaitVectorData.ddRVal; + return WaitVectorData.ddRVal; } HRESULT Hal_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDHAL_GETSCANLINEDATA GetScan; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE)) + { + return DDERR_NODRIVERSUPPORT; + } - GetScan.lpDD = &This->DirectDrawGlobal; + GetScan.lpDD = &This->DirectDrawGlobal; GetScan.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.GetScanLine(&GetScan) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.GetScanLine(&GetScan) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } - *lpdwScanLine = GetScan.ddRVal; - return GetScan.ddRVal; + *lpdwScanLine = GetScan.ddRVal; + return GetScan.ddRVal; } HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_FLIPTOGDISURFACEDATA FlipGdi; + DDHAL_FLIPTOGDISURFACEDATA FlipGdi; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE)) + { + return DDERR_NODRIVERSUPPORT; + } - FlipGdi.lpDD = &This->DirectDrawGlobal; + FlipGdi.lpDD = &This->DirectDrawGlobal; FlipGdi.ddRVal = DDERR_NOTPALETTIZED; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.FlipToGDISurface(&FlipGdi) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - /* FIXME where should FlipGdi.dwToGDI be fill in */ - return FlipGdi.ddRVal; + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.FlipToGDISurface(&FlipGdi) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + /* FIXME where should FlipGdi.dwToGDI be fill in */ + return FlipGdi.ddRVal; } HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DDHAL_SETMODEDATA mode; + DX_STUB; +} - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; +#if 0 +HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) - { - return DDERR_NODRIVERSUPPORT; - } + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) + { + return DDERR_NODRIVERSUPPORT; + } - mode.lpDD = &This->DirectDrawGlobal; - mode.ddRVal = DDERR_NODRIVERSUPPORT; + DDHAL_SETMODEDATA mode; + mode.lpDD = &This->DirectDrawGlobal; + mode.ddRVal = DDERR_NODRIVERSUPPORT; - /* FIXME : add search for which mode.ModeIndex we should use */ - /* FIXME : fill the mode.inexcl; */ - /* FIXME : fill the mode.useRefreshRate; */ + // FIXME : add search for which mode.ModeIndex we should use + // FIXME : fill the mode.inexcl; + // FIXME : fill the mode.useRefreshRate; - /* - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetMode(&mode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - */ - DX_STUB; - /* return mode.ddRVal */ + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.SetMode(&mode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return mode.ddRVal } +#endif + _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 09:59:21 UTC (rev 18924) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 11:32:35 UTC (rev 18925) @@ -14,90 +14,86 @@ HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - HRESULT ret; + HRESULT ret; - + // this if it is not called by DirectDrawCreate + if(FALSE) + return DDERR_ALREADYINITIALIZED; - // this if it is not called by DirectDrawCreate - if(FALSE) - return DDERR_ALREADYINITIALIZED; + // save the parameter + This->lpGUID = lpGUID; - // save the parameter - This->lpGUID = lpGUID; + // get the HDC + This->hdc = GetWindowDC(GetDesktopWindow()); + This->Height = GetDeviceCaps(This->hdc, VERTRES); + This->Width = GetDeviceCaps(This->hdc, HORZRES); + This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL); - // get the HDC - This->hdc = GetWindowDC(GetDesktopWindow()); - This->Height = GetDeviceCaps(This->hdc, VERTRES); - This->Width = GetDeviceCaps(This->hdc, HORZRES); - This->Bpp = GetDeviceCaps(This->hdc, BITSPIXEL); - - // call software first - if((ret = Hal_DirectDraw_Initialize (iface)) != DD_OK) - return ret; - - // ... then overwrite with hal - if((ret = Hel_DirectDraw_Initialize (iface)) != DD_OK) - return ret; - + // call software first + if((ret = Hal_DirectDraw_Initialize (iface)) != DD_OK) + return ret; + + // ... then overwrite with hal + if((ret = Hel_DirectDraw_Initialize (iface)) != DD_OK) + return ret; - return DD_OK; + return DD_OK; } HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) { - // TODO: - // - create a scaner that check which driver we should get the HDC from - // for now we always asume it is the active dirver that should be use. - // - allow more Flags + // TODO: + // - create a scaner that check which driver we should get the HDC from + // for now we always asume it is the active dirver that should be use. + // - allow more Flags IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - // check the parameters - if (This->cooperative_level == cooplevel && This->window == hwnd) - return DD_OK; + // check the parameters + if (This->cooperative_level == cooplevel && This->window == hwnd) + return DD_OK; - if (This->window) - return DDERR_HWNDALREADYSET; + if (This->window) + return DDERR_HWNDALREADYSET; - if (This->cooperative_level) - return DDERR_EXCLUSIVEMODEALREADYSET; + if (This->cooperative_level) + return DDERR_EXCLUSIVEMODEALREADYSET; - if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) - return DDERR_INVALIDPARAMS; + if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) + return DDERR_INVALIDPARAMS; - if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) - return DDERR_INVALIDPARAMS; + if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) + return DDERR_INVALIDPARAMS; - // set the data - This->window = hwnd; - This->hdc = GetDC(hwnd); - This->cooperative_level = cooplevel; + // set the data + This->window = hwnd; + This->hdc = GetDC(hwnd); + This->cooperative_level = cooplevel; - if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE) - { - return Hal_DirectDraw_SetCooperativeLevel (iface); - } + { + return Hal_DirectDraw_SetCooperativeLevel (iface); + } - return Hel_DirectDraw_SetCooperativeLevel(iface); + return Hel_DirectDraw_SetCooperativeLevel(iface); } HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DWORD ret; + DWORD ret; /* FIXME implement hal setMode */ - if((ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, + if((ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags)) == DD_OK) - { - return ret; - } + { + return ret; + } - ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); - return ret; + return ret; } ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) @@ -105,7 +101,7 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; ULONG ref = InterlockedIncrement((PLONG)&This->DirectDrawGlobal.dwRefCnt); - return ref; [truncated at 1000 lines; 533 more skipped]

1 0

[mbosma] 18924: fix compile
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

fix compile Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c Modified: trunk/reactos/lib/ddraw/main/surface_main.c _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 09:50:29 UTC (rev 18923) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 09:59:21 UTC (rev 18924) @@ -324,7 +324,7 @@ /* FIXME Do not use DUMMYUNIONNAME1 some how union lPitch does not see by the compiler but rest of the union are visable. more header problem ??? */ - pDDSD->DUMMYUNIONNAME1.lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; + pDDSD->lPitch = This->DirectDrawGlobal.vmiData.lDisplayPitch; /* have not check where I should get hold of this info yet _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:50:29 UTC (rev 18923) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:59:21 UTC (rev 18924) @@ -21,27 +21,27 @@ This->owner = (IDirectDrawImpl*)pDD; /************ fill the discription of our primary surface ***********************/ - memset (&ddsd, 0, sizeof(DDSURFACEDESC)); - ddsd.dwSize = sizeof(DDSURFACEDESC); + memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); + This->ddsd.dwSize = sizeof(DDSURFACEDESC); - RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); - RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); - RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); - RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); - RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); - RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); + RtlCopyMemory(&This->ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(Th is->ddsd.ddckCKDestBlt)); + RtlCopyMemory(&This->ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,s izeof(This->ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&This->ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(This ->ddsd.ddckCKSrcBlt)); + RtlCopyMemory(&This->ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,siz eof(This->ddsd.ddckCKSrcOverlay)); + RtlCopyMemory(&This->ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeo f(This->ddsd.ddpfPixelFormat)); + RtlCopyMemory(&This->ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(This->ddsd.dds Caps)); - ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; - ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; - ddsd.dwFlags = pDDSD2->dwFlags; - ddsd.dwHeight = pDDSD2->dwHeight; - ddsd.dwLinearSize = pDDSD2->dwLinearSize; - ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; - ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; - ddsd.dwReserved = pDDSD2->dwReserved; - ddsd.dwWidth = pDDSD2->dwWidth; - ddsd.lPitch = pDDSD2->lPitch; - ddsd.lpSurface = pDDSD2->lpSurface; + This->ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + This->ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + This->ddsd.dwFlags = pDDSD2->dwFlags; + This->ddsd.dwHeight = pDDSD2->dwHeight; + This->ddsd.dwLinearSize = pDDSD2->dwLinearSize; + This->ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + This->ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + This->ddsd.dwReserved = pDDSD2->dwReserved; + This->ddsd.dwWidth = pDDSD2->dwWidth; + This->ddsd.lPitch = pDDSD2->lPitch; + This->ddsd.lpSurface = pDDSD2->lpSurface; /************ Test see if we can Create Surface ***********************/ if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) @@ -50,7 +50,7 @@ DDHAL_CANCREATESURFACEDATA CanCreateData; memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&ddsd; + CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; @@ -64,8 +64,8 @@ /* FIXME we are skipping filling in some data, I do not care for now */ LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; - ddsd.dwFlags = DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + This->ddsd.dwFlags = DDSD_CAPS; + This->ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; /* surface global struct */ memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); @@ -86,7 +86,7 @@ This->Local.lpSurfMore = &This->More; /* FIXME do a memcopy */ - This->Local.ddsCaps = *(DDSCAPS*)&ddsd.ddsCaps; + This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; /* for the double pointer below */ DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; @@ -97,7 +97,7 @@ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); CreateData.lpDD = pDirectDrawGlobal; - CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &ddsd; + CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal; CreateData.ddRVal = DD_FALSE;

1 0

[mbosma] 18923: Fixed the "header problems".
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

Fixed the "header problems". Modified: trunk/reactos/lib/ddraw/main/surface_main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:48:01 UTC (rev 18922) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 09:50:29 UTC (rev 18923) @@ -18,39 +18,31 @@ if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) return DDERR_UNSUPPORTED; - This->owner = (IDirectDrawImpl*)pDD; - /************ fill the discription of our primary surface ***********************/ - DDSURFACEDESC ddsd; - memset (&ddsd, 0, sizeof(DDSURFACEDESC)); - ddsd.dwSize = sizeof(DDSURFACEDESC); + /************ fill the discription of our primary surface ***********************/ + memset (&ddsd, 0, sizeof(DDSURFACEDESC)); + ddsd.dwSize = sizeof(DDSURFACEDESC); - /* FIXME Fill the rest from ddsd2 to ddsd */ + RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); + RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); + RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); + RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); + RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); - RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); - RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); - RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); - RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); - RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); - RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); + ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + ddsd.dwFlags = pDDSD2->dwFlags; + ddsd.dwHeight = pDDSD2->dwHeight; + ddsd.dwLinearSize = pDDSD2->dwLinearSize; + ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + ddsd.dwReserved = pDDSD2->dwReserved; + ddsd.dwWidth = pDDSD2->dwWidth; + ddsd.lPitch = pDDSD2->lPitch; + ddsd.lpSurface = pDDSD2->lpSurface; - ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; - ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; - ddsd.dwFlags = pDDSD2->dwFlags; - ddsd.dwHeight = pDDSD2->dwHeight; - /* FIXME ddsd.dwLinearSize = pDDSD2->dwLinearSize; Problem with our header for dx */ - ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; - ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; - ddsd.dwReserved = pDDSD2->dwReserved; - ddsd.dwWidth = pDDSD2->dwWidth; - /* FIXME ddsd.dwZBufferBitDepth where in pDDSD2 */ - /* FIXME ddsd.lPitch = pDDSD2->lPitch; Problem with our header for dx */ - ddsd.lpSurface = pDDSD2->lpSurface; - - - - /************ Test see if we can Create Surface ***********************/ if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { @@ -67,7 +59,6 @@ return CanCreateData.ddRVal; } - /************ Create Surface ***********************/ /* FIXME we are skipping filling in some data, I do not care for now */ @@ -109,9 +100,8 @@ CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &ddsd; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal; - CreateData.ddRVal = DD_FALSE; + CreateData.ddRVal = DD_FALSE; - /* this is the call we were waiting for */ if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateD ata) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 09:48:01 UTC (rev 18922) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 09:50:29 UTC (rev 18923) @@ -45,6 +45,7 @@ DDRAWI_DDRAWSURFACE_MORE More; DDRAWI_DDRAWSURFACE_LCL Local; DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; + DDSURFACEDESC ddsd; } IDirectDrawSurfaceImpl;

1 0

[mbosma] 18922: Remove DUMMYUNIONNAMEs since it fixes compile problems.
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

Remove DUMMYUNIONNAMEs since it fixes compile problems. Modified: trunk/reactos/w32api/include/ddraw.h _____ Modified: trunk/reactos/w32api/include/ddraw.h --- trunk/reactos/w32api/include/ddraw.h 2005-11-01 08:37:43 UTC (rev 18921) +++ trunk/reactos/w32api/include/ddraw.h 2005-11-01 09:48:01 UTC (rev 18922) @@ -998,13 +998,13 @@ union { LONG lPitch; /* 10: distance to start of next line (return value only)*/ DWORD dwLinearSize; - } DUMMYUNIONNAME1; + }; DWORD dwBackBufferCount;/* 14: number of back buffers requested*/ union { DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/ DWORD dwZBufferBitDepth;/*18: depth of Z buffer requested*/ DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/ - } DUMMYUNIONNAME2; + }; DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/ DWORD dwReserved; /* 20:reserved*/ LPVOID lpSurface; /* 24:pointer to the associated surface memory*/ @@ -1025,28 +1025,27 @@ union { LONG lPitch; /*10: distance to start of next line (return value only)*/ DWORD dwLinearSize; /*10: formless late-allocated optimized surface size */ - } DUMMYUNIONNAME1; + }; DWORD dwBackBufferCount;/* 14: number of back buffers requested*/ union { DWORD dwMipMapCount;/* 18:number of mip-map levels requested*/ DWORD dwRefreshRate;/* 18:refresh rate (used when display mode is described)*/ DWORD dwSrcVBHandle;/* 18:source used in VB::Optimize */ - } DUMMYUNIONNAME2; + }; DWORD dwAlphaBitDepth;/* 1C:depth of alpha buffer requested*/ DWORD dwReserved; /* 20:reserved*/ LPVOID lpSurface; /* 24:pointer to the associated surface memory*/ union { DDCOLORKEY ddckCKDestOverlay; /* 28: CK for dest overlay use*/ DWORD dwEmptyFaceColor; /* 28: color for empty cubemap faces */ - } DUMMYUNIONNAME3; + }; DDCOLORKEY ddckCKDestBlt; /* 30: CK for destination blt use*/ DDCOLORKEY ddckCKSrcOverlay;/* 38: CK for source overlay use*/ DDCOLORKEY ddckCKSrcBlt; /* 40: CK for source blt use*/ - union { DDPIXELFORMAT ddpfPixelFormat;/* 48: pixel format description of the surface*/ DWORD dwFVF; /* 48: vertex format description of vertex buffers */ - } DUMMYUNIONNAME4; + }; DDSCAPS2 ddsCaps; /* 68: DDraw surface caps */ DWORD dwTextureStage; /* 78: stage in multitexture cascade */ } DDSURFACEDESC2,*LPDDSURFACEDESC2;

1 0

[mbosma] 18921: Created makefile for alphablend-test in rosapps.
by mbosma＠svn.reactos.com 01 Nov '05

01 Nov '05

Created makefile for alphablend-test in rosapps. Modified: trunk/rosapps/directory.xml Deleted: trunk/rosapps/tests/Makefile Added: trunk/rosapps/tests/alphablend/alphablend.xml Deleted: trunk/rosapps/tests/alphablend/makefile Modified: trunk/rosapps/tests/directory.xml _____ Modified: trunk/rosapps/directory.xml --- trunk/rosapps/directory.xml 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/directory.xml 2005-11-01 08:37:43 UTC (rev 18921) @@ -45,6 +45,9 @@ <directory name="templates"> <xi:include href="templates/directory.xml" /> </directory> +<directory name="tests"> + <xi:include href="tests/directory.xml" /> +</directory> <!-- <directory name="welcome"> <xi:include href="welcome/welcome.xml" /> _____ Deleted: trunk/rosapps/tests/Makefile --- trunk/rosapps/tests/Makefile 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/Makefile 2005-11-01 08:37:43 UTC (rev 18921) @@ -1,132 +0,0 @@ -# -# ReactOS test applications makefile -# - -PATH_TO_TOP = ../../reactos - -include $(PATH_TO_TOP)/rules.mak - -# Broken tests -# dnsapi iptest lan regdump subclass - -TEST_APPS = \ -accelerator \ -alive \ -alphablend \ -apc \ -apc2 \ -args \ -atomtest \ -bench \ -bitblt \ -button \ -button2 \ -capclock \ -carets \ -combo \ -consume \ -copymove \ -count \ -create-links \ -dibtest \ -dirdlg \ -diskspeed \ -dnsquery \ -edit \ -enhmetafile \ -enumfonts \ -enumwnd \ -enumws \ -event \ -eventpair \ -fiber \ -global_mem \ -gradient \ -guithreadinfo \ -hello \ -hivetest \ -icontest \ -isotest \ -lineclip \ -linetest \ -lpc \ -map_dup_inherit \ -mdi \ -mktime \ -moztest \ -mstest \ -multithrdwin \ -multiwin \ -mutex \ -nameserverlist \ -noexecute \ -nptest \ -oskittcp \ -p_dup_handle \ -palbitblt \ -patblt \ -polytest \ -popupmenu \ -primitives \ -pteb \ -regqueryvalue \ -regtest \ -sectest \ -sertest \ -shaptest \ -shm \ -statst \ -statst2 \ -stretchblt \ -suspend \ -tcpsvr \ -terminate \ -thread \ -thread_msg \ -threadwait \ -tmrqueue \ -tokentest \ -txtscale \ -vmtest \ -winhello \ -wm_erasebkgnd \ -wm_paint \ -zwcontinue - -# Deactivated tests: -# dump_shared_data -# miditest - -all: $(TEST_APPS) - -depends: - -implib: $(TEST_APPS:%=%_implib) - -clean: $(TEST_APPS:%=%_clean) - -install: $(TEST_APPS:%=%_install) - -.PHONY: all depends implib clean install - -# -# Test Applications -# -$(TEST_APPS): %: - $(MAKE) -C $* - -$(TEST_APPS:%=%_implib): %_implib: - $(MAKE) -C $* implib - -$(TEST_APPS:%=%_clean): %_clean: - $(MAKE) -C $* clean - -$(TEST_APPS:%=%_install): %_install: - $(MAKE) -C $* install - -.PHONY: $(TEST_APPS) $(TEST_APPS:%=%_implib) $(TEST_APPS:%=%_clean) $(TEST_APPS:%=%_install) - -etags: - find . -name "*.[ch]" -print | etags --language=c - - -# EOF _____ Added: trunk/rosapps/tests/alphablend/alphablend.xml --- trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/alphablend/alphablend.xml 2005-11-01 08:37:43 UTC (rev 18921) @@ -0,0 +1,10 @@ +<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____ Deleted: trunk/rosapps/tests/alphablend/makefile --- trunk/rosapps/tests/alphablend/makefile 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/alphablend/makefile 2005-11-01 08:37:43 UTC (rev 18921) @@ -1,22 +0,0 @@ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = alphablend - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____ Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-11-01 01:39:45 UTC (rev 18920) +++ trunk/rosapps/tests/directory.xml 2005-11-01 08:37:43 UTC (rev 18921) @@ -1,271 +1,3 @@ -<directory name="accelerator"> - <xi:include href="accelerator/accelerator.xml" /> -</directory> -<directory name="alive"> - <xi:include href="alive/alive.xml" /> -</directory> <directory name="alphablend"> <xi:include href="alphablend/alphablend.xml" /> -</directory> -<directory name="apc"> - <xi:include href="apc/apc.xml" /> -</directory> -<directory name="apc2"> - <xi:include href="apc2/apc2.xml" /> -</directory> -<directory name="args"> - <xi:include href="args/args.xml" /> -</directory> -<directory name="atomtest"> - <xi:include href="atomtest/atomtest.xml" /> -</directory> -<directory name="bench"> - <xi:include href="bench/bench.xml" /> -</directory> -<directory name="bitblt"> - <xi:include href="bitblt/bitblt.xml" /> -</directory> -<directory name="button"> - <xi:include href="button/button.xml" /> -</directory> -<directory name="button2"> - <xi:include href="button2/button2.xml" /> -</directory> -<directory name="capclock"> - <xi:include href="capclock/capclock.xml" /> -</directory> -<directory name="carets"> - <xi:include href="carets/carets.xml" /> -</directory> -<directory name="combo"> - <xi:include href="combo/combo.xml" /> -</directory> -<directory name="consume"> - <xi:include href="consume/consume.xml" /> -</directory> -<directory name="copymove"> - <xi:include href="copymove/copymove.xml" /> -</directory> -<directory name="count"> - <xi:include href="count/count.xml" /> -</directory> -<directory name="create-links"> - <xi:include href="create-links/create-links.xml" /> -</directory> -<directory name="dibtest"> - <xi:include href="dibtest/dibtest.xml" /> -</directory> -<directory name="dirdlg"> - <xi:include href="dirdlg/dirdlg.xml" /> -</directory> -<directory name="diskspeed"> - <xi:include href="diskspeed/diskspeed.xml" /> -</directory> -<directory name="dnsapi"> - <xi:include href="dnsapi/dnsapi.xml" /> -</directory> -<directory name="dnsquery"> - <xi:include href="dnsquery/dnsquery.xml" /> -</directory> -<directory name="dump_shared_data"> - <xi:include href="dump_shared_data/dump_shared_data.xml" /> -</directory> -<directory name="edit"> - <xi:include href="edit/edit.xml" /> -</directory> -<directory name="enhmetafile"> - <xi:include href="enhmetafile/enhmetafile.xml" /> -</directory> -<directory name="enumfonts"> - <xi:include href="enumfonts/enumfonts.xml" /> -</directory> -<directory name="enumwnd"> - <xi:include href="enumwnd/enumwnd.xml" /> -</directory> -<directory name="enumws"> - <xi:include href="enumws/enumws.xml" /> -</directory> -<directory name="event"> - <xi:include href="event/event.xml" /> -</directory> -<directory name="eventpair"> - <xi:include href="eventpair/eventpair.xml" /> -</directory> -<directory name="fiber"> - <xi:include href="fiber/fiber.xml" /> -</directory> -<directory name="gethostbyname"> - <xi:include href="gethostbyname/gethostbyname.xml" /> -</directory> -<directory name="global_mem"> - <xi:include href="global_mem/global_mem.xml" /> -</directory> -<directory name="gradient"> - <xi:include href="gradient/gradient.xml" /> -</directory> -<directory name="guithreadinfo"> - <xi:include href="guithreadinfo/guithreadinfo.xml" /> -</directory> -<directory name="hello"> - <xi:include href="hello/hello.xml" /> -</directory> -<directory name="hivetest"> - <xi:include href="hivetest/hivetest.xml" /> -</directory> -<directory name="icontest"> - <xi:include href="icontest/icontest.xml" /> -</directory> -<directory name="iptest"> - <xi:include href="iptest/iptest.xml" /> -</directory> -<directory name="isotest"> - <xi:include href="isotest/isotest.xml" /> -</directory> -<directory name="lan"> - <xi:include href="lan/lan.xml" /> -</directory> -<directory name="lineclip"> - <xi:include href="lineclip/lineclip.xml" /> -</directory> -<directory name="linetest"> - <xi:include href="linetest/linetest.xml" /> -</directory> -<directory name="lpc"> - <xi:include href="lpc/lpc.xml" /> -</directory> -<directory name="map_dup_inherit"> - <xi:include href="map_dup_inherit/map_dup_inherit.xml" /> -</directory> -<directory name="mdi"> - <xi:include href="mdi/mdi.xml" /> -</directory> -<directory name="miditest"> - <xi:include href="miditest/miditest.xml" /> -</directory> -<directory name="mktime"> - <xi:include href="mktime/mktime.xml" /> -</directory> -<directory name="moztest"> - <xi:include href="moztest/moztest.xml" /> -</directory> -<directory name="mstest"> - <xi:include href="mstest/mstest.xml" /> -</directory> -<directory name="multithrdwin"> - <xi:include href="multithrdwin/multithrdwin.xml" /> -</directory> -<directory name="multiwin"> - <xi:include href="multiwin/multiwin.xml" /> -</directory> -<directory name="mutex"> - <xi:include href="mutex/mutex.xml" /> -</directory> -<directory name="nameserverlist"> - <xi:include href="nameserverlist/nameserverlist.xml" /> -</directory> -<directory name="noexecute"> - <xi:include href="noexecute/noexecute.xml" /> -</directory> -<directory name="nptest"> - <xi:include href="nptest/nptest.xml" /> -</directory> -<directory name="oskittcp"> - <xi:include href="oskittcp/oskittcp.xml" /> -</directory> -<directory name="palbitblt"> - <xi:include href="palbitblt/palbitblt.xml" /> -</directory> -<directory name="patblt"> - <xi:include href="patblt/patblt.xml" /> -</directory> -<directory name="p_dup_handle"> - <xi:include href="p_dup_handle/p_dup_handle.xml" /> -</directory> -<directory name="polytest"> - <xi:include href="polytest.xml" /> -</directory> -<directory name="popupmenu"> - <xi:include href="popupmenu/popupmenu.xml" /> -</directory> -<directory name="primitives"> - <xi:include href="primitives/primitives.xml" /> -</directory> -<directory name="pteb"> - <xi:include href="pteb/pteb.xml" /> -</directory> -<directory name="regdump"> - <xi:include href="regdump/regdump.xml" /> -</directory> -<directory name="regqueryvalue"> - <xi:include href="regqueryvalue/regqueryvalue.xml" /> -</directory> -<directory name="regtest"> - <xi:include href="regtest/regtest.xml" /> -</directory> -<directory name="sectest"> - <xi:include href="sectest/sectest.xml" /> -</directory> -<directory name="sertest"> - <xi:include href="sertest/sertest.xml" /> -</directory> -<directory name="shaptest"> - <xi:include href="shaptest/shaptest.xml" /> -</directory> -<directory name="shm"> - <xi:include href="shm/shm.xml" /> -</directory> -<directory name="statst"> - <xi:include href="statst/statst.xml" /> -</directory> -<directory name="statst2"> - <xi:include href="statst2/statst2.xml" /> -</directory> -<directory name="stretchblt"> - <xi:include href="stretchblt/stretchblt.xml" /> -</directory> -<directory name="subclass"> - <xi:include href="subclass/subclass.xml" /> -</directory> -<directory name="suspend"> - <xi:include href="suspend/suspend.xml" /> -</directory> -<directory name="tcpsvr"> - <xi:include href="tcpsvr/tcpsvr.xml" /> -</directory> -<directory name="terminate"> - <xi:include href="terminate/terminate.xml" /> -</directory> -<directory name="thread"> - <xi:include href="thread/thread.xml" /> -</directory> -<directory name="thread_msg"> - <xi:include href="thread_msg/thread_msg.xml" /> -</directory> -<directory name="threadwait"> - <xi:include href="threadwait/threadwait.xml" /> -</directory> -<directory name="tmrqueue"> - <xi:include href="tmrqueue/tmrqueue.xml" /> -</directory> -<directory name="tokentest"> - <xi:include href="tokentest/tokentest.xml" /> -</directory> -<directory name="txtscale"> - <xi:include href="txtscale/txtscale.xml" /> -</directory> -<directory name="vmtest"> - <xi:include href="vmtest/vmtest.xml" /> -</directory> -<directory name="winhello"> - <xi:include href="winhello/winhello.xml" /> -</directory> -<directory name="wm_erasebkgnd"> - <xi:include href="wm_erasebkgnd/wm_erasebkgnd.xml" /> -</directory> -<directory name="wm_paint"> - <xi:include href="wm_paint/wm_paint.xml" /> -</directory> -<directory name="zwcontinue"> - <xi:include href="zwcontinue/zwcontinue.xml" /> -</directory> - +</directory> \ No newline at end of file

1 0

[mf] 18920: correctly call HCR_GetFolderAttributes() in SHELL32_GetItemAttributes() to fix explorer's start menu root
by mf＠svn.reactos.com 01 Nov '05

01 Nov '05

correctly call HCR_GetFolderAttributes() in SHELL32_GetItemAttributes() to fix explorer's start menu root Modified: trunk/reactos/lib/shell32/shlfolder.c _____ Modified: trunk/reactos/lib/shell32/shlfolder.c --- trunk/reactos/lib/shell32/shlfolder.c 2005-10-31 20:43:06 UTC (rev 18919) +++ trunk/reactos/lib/shell32/shlfolder.c 2005-11-01 01:39:45 UTC (rev 18920) @@ -411,14 +411,13 @@ *pdwAttributes &= dwSupportedAttr; } + dwAttributes = *pdwAttributes; + if (_ILIsDrive (pidl)) { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK; - } else if (_ILGetGUIDPointer (pidl)) { - if (!HCR_GetFolderAttributes (pidl, pdwAttributes)) { - *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR| - SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; - } + } else if (_ILGetGUIDPointer (pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) { + *pdwAttributes = dwAttributes; } else if (_ILGetDataPointer (pidl)) { dwAttributes = _ILGetFileAttributes (pidl, NULL, 0);

1 0

[greatlrd] 18919: fill in the DDSD we got from the call of createsurface it is not complete
by greatlrd＠svn.reactos.com 31 Oct '05

31 Oct '05

fill in the DDSD we got from the call of createsurface it is not complete Modified: trunk/reactos/lib/ddraw/main/surface_main.c _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 20:35:03 UTC (rev 18918) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 20:43:06 UTC (rev 18919) @@ -18,8 +18,6 @@ if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) return DDERR_UNSUPPORTED; - if(!(pDDSD2->dwFlags & DDSD_CAPS)) - return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD; @@ -29,6 +27,29 @@ ddsd.dwSize = sizeof(DDSURFACEDESC); /* FIXME Fill the rest from ddsd2 to ddsd */ + + RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); + RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); + RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); + RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); + RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); + + ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + ddsd.dwFlags = pDDSD2->dwFlags; + ddsd.dwHeight = pDDSD2->dwHeight; + /* FIXME ddsd.dwLinearSize = pDDSD2->dwLinearSize; Problem with our header for dx */ + ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + ddsd.dwReserved = pDDSD2->dwReserved; + ddsd.dwWidth = pDDSD2->dwWidth; + /* FIXME ddsd.dwZBufferBitDepth where in pDDSD2 */ + /* FIXME ddsd.lPitch = pDDSD2->lPitch; Problem with our header for dx */ + ddsd.lpSurface = pDDSD2->lpSurface; + + + /************ Test see if we can Create Surface ***********************/ if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE)

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