Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[greatlrd] 23270: Kill more of the old design.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Tue Jul 25 01:00:01 2006 New Revision: 23270 URL: http://svn.reactos.org/svn/reactos?rev=23270&view=rev Log: Kill more of the old design. Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c Tue Jul 25 01:00:01 2006 @@ -69,32 +69,6 @@ } -HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETMODEDATA mode; - - if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) - { - return DDERR_NODRIVERSUPPORT; - } - - mode.lpDD = &This->mDDrawGlobal; - mode.ddRVal = DDERR_NODRIVERSUPPORT; - - - - // FIXME : add search for which mode.ModeIndex we should use - // FIXME : fill the mode.inexcl; - // FIXME : fill the mode.useRefreshRate; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.SetMode(&mode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return mode.ddRVal; -} + Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Tue Jul 25 01:00:01 2006 @@ -1022,7 +1022,11 @@ IDirectDrawImpl* This = (IDirectDrawImpl*)iface; BOOL dummy = TRUE; - DWORD ret; + DEVMODE DevMode; + int iMode=0; + int Width=0; + int Height=0; + int BPP=0; /* FIXME check the refresrate if it same if it not same do the mode switch */ if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && @@ -1033,29 +1037,49 @@ return DD_OK; } + if (This->mDdSetMode.SetMode == NULL) + { + return DDERR_NODRIVERSUPPORT; + } + /* Check use the Hal or Hel for SetMode */ - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE) - { - ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); - - } - else - { - ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); - } - - if (ret == DD_OK) - { - DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - /* FIXME fill the This->DirectDrawGlobal.vmiData right */ - } - - //This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC( (HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd); - - - - - return ret; + // this only for exclusive mode + if(!(This->cooperative_level & DDSCL_EXCLUSIVE)) + { + return DDERR_NOEXCLUSIVEMODE; + } + + DevMode.dmSize = (WORD)sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; + + while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0 ) != 0) + { + + if ((dwWidth == DevMode.dmPelsWidth) && (dwHeight == DevMode.dmPelsHeight) && ( dwBPP == DevMode.dmBitsPerPel)) + { + Width = DevMode.dmPelsWidth; + Height = DevMode.dmPelsHeight; + BPP = DevMode.dmBitsPerPel; + break; + } + iMode++; + } + + if ((dwWidth != DevMode.dmPelsWidth) || (dwHeight != DevMode.dmPelsHeight) || ( dwBPP != DevMode.dmBitsPerPel)) + { + return DDERR_UNSUPPORTEDMODE; + } + + This->mDdSetMode.ddRVal = DDERR_NOTPALETTIZED; + + This->mDdSetMode.dwModeIndex = iMode; + This->mDdSetMode.SetMode(&This->mDdSetMode); + + DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); + + /* FIXME fill the This->DirectDrawGlobal.vmiData right */ + //This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC( (HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd); + return This->mDdSetMode.ddRVal; } Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Tue Jul 25 01:00:01 2006 @@ -29,56 +29,3 @@ - - -HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - // this only for exclusive mode - if(!(This->cooperative_level & DDSCL_EXCLUSIVE)) - return DDERR_NOEXCLUSIVEMODE; - - // change the resolution using normal WinAPI function - DEVMODE mode; - mode.dmSize = sizeof(mode); - mode.dmPelsWidth = dwWidth; - mode.dmPelsHeight = dwHeight; - mode.dmBitsPerPel = dwBPP; - - //mode.dmDisplayFrequency = dwRefreshRate; - mode.dmFields = 0; - - DX_STUB_str("in hel"); - - if(dwWidth) - mode.dmFields |= DM_PELSWIDTH; - if(dwHeight) - mode.dmFields |= DM_PELSHEIGHT; - if(dwBPP) - mode.dmFields |= DM_BITSPERPEL; - /* - if(dwRefreshRate) - mode.dmFields |= DM_DISPLAYFREQUENCY; - */ - if (ChangeDisplaySettings(&mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - return DDERR_UNSUPPORTEDMODE; - - - // TODO: reactivate ddraw object, maximize window, set it in foreground - // and set excluive mode (if implemented by the driver) - - /* FIXME fill the DirectDrawGlobal right the modeindex old and new */ - - //if(dwWidth) - // This->Height = dwWidth; - //if(dwHeight) - // This->Width = dwHeight; - //if(dwBPP) - // This->Bpp = dwBPP; - - return DD_OK; -} - - Modified: trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Tue Jul 25 01:00:01 2006 @@ -36,8 +36,33 @@ */ DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode) -{ - DX_STUB; +{ + DEVMODE DevMode; + + DX_STUB_str("in hel"); + + DevMode.dmSize = (WORD)sizeof(DEVMODE); + DevMode.dmDriverExtra = 0; + + SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; + + if (EnumDisplaySettingsEx(NULL, SetMode->dwModeIndex, &DevMode, 0 ) != 0) + { + DX_WINDBG_trace_res((int)DevMode.dmPelsWidth, (int)DevMode.dmPelsHeight, (int)DevMode.dmBitsPerPel ); + + if (ChangeDisplaySettings(&DevMode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) + { + DX_STUB_str("FAIL"); + SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; + } + else + { + DX_STUB_str("OK"); + SetMode->ddRVal = DD_OK; + } + } + + return DDHAL_DRIVER_HANDLED; } DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank)

18 years, 5 months

[greatlrd] 23269: Kill more of the old design.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 24 23:13:31 2006 New Revision: 23269 URL: http://svn.reactos.org/svn/reactos?rev=23269&view=rev Log: Kill more of the old design. Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c Mon Jul 24 23:13:31 2006 @@ -68,32 +68,6 @@ return WaitVectorData.ddRVal; } -HRESULT Hal_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - DDHAL_GETSCANLINEDATA GetScan; - - if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE)) - { - return DDERR_NODRIVERSUPPORT; - } - - GetScan.lpDD = &This->mDDrawGlobal; - GetScan.ddRVal = DDERR_NOTPALETTIZED; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.GetScanLine(&GetScan) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - *lpdwScanLine = GetScan.ddRVal; - return GetScan.ddRVal; -} - - - - HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Mon Jul 24 23:13:31 2006 @@ -806,6 +806,127 @@ } +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (pDDSD == NULL) + { + return DD_FALSE; + } + + pDDSD->dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE | DDSD_WIDTH; + pDDSD->dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + pDDSD->dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + pDDSD->lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + pDDSD->dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + pDDSD->dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&pDDSD->ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + + RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); + RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); + + /* have not check where I should get hold of this info yet + DWORD dwBackBufferCount; + DWORD dwReserved; + LPVOID lpSurface; + DDCOLORKEY ddckCKDestBlt; + DDCOLORKEY ddckCKSrcBlt; + DWORD dwTextureStage; + */ + + return DD_OK; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI +Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, + LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (freq == NULL) + { + return DD_FALSE; + } + + *freq = This->mDDrawGlobal.dwMonitorFrequency; + return DD_OK; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) +{ + + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + *lpdwScanLine = 0; + + if (This->mDdGetScanLine.GetScanLine == NULL) + { + return DDERR_NODRIVERSUPPORT; + } + + This->mDdGetScanLine.ddRVal = DDERR_NOTPALETTIZED; + This->mDdGetScanLine.dwScanLine = 0; + + if (This->mDdGetScanLine.GetScanLine(&This->mDdGetScanLine)==DDHAL_DRIVER_HANDLED); + { + *lpdwScanLine = This->mDdGetScanLine.dwScanLine; + return This->mDdGetScanLine.ddRVal; + } + + return DDERR_NODRIVERSUPPORT; +} + + + + + + + + /* * IMPLEMENT @@ -959,42 +1080,6 @@ -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - - if (pDDSD == NULL) - { - return DD_FALSE; - } - - - pDDSD->dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE | DDSD_WIDTH; - pDDSD->dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; - pDDSD->dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; - pDDSD->lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; - pDDSD->dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - pDDSD->dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; - - RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); - RtlCopyMemory(&pDDSD->ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - - RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); - RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); - - /* have not check where I should get hold of this info yet - DWORD dwBackBufferCount; - DWORD dwReserved; - LPVOID lpSurface; - DDCOLORKEY ddckCKDestBlt; - DDCOLORKEY ddckCKSrcBlt; - DWORD dwTextureStage; - */ - - return DD_OK; -} HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) @@ -1027,34 +1112,9 @@ return Hel_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); } -HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - - if (freq == NULL) - { - return DD_FALSE; - } - - *freq = This->mDDrawGlobal.dwMonitorFrequency; - return DD_OK; -} - -HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) - { - return Hal_DirectDraw_GetScanLine( iface, lpdwScanLine); - } - - return Hel_DirectDraw_GetScanLine( iface, lpdwScanLine); -} + + + HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { @@ -1075,18 +1135,9 @@ -HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, - LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) -{ - DX_WINDBG_trace(); - DX_STUB; -} + + + HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) { Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Mon Jul 24 23:13:31 2006 @@ -27,10 +27,7 @@ DX_STUB; } -HRESULT Hel_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - DX_STUB; -} +

18 years, 5 months

[greatlrd] 23268: Sorry I have create a mess in ddraw.c 1. found why createsurface did stop working, fixed 2. Split some surface member betwin gbl and lcl struct 3. Reimplement the revert I did, implement Revision: 23263 and Revision: 23262 again 4. Revert new createsurface code and setdisplay mode code that was intrudes 5. Alot other changes as well. 6. Todo Need remove the old code for HAL and HEL split. 7. move Our ddraw working again with apps it did work with. 8. Almost complete kill the fi

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 24 22:29:02 2006 New Revision: 23268 URL: http://svn.reactos.org/svn/reactos?rev=23268&view=rev Log: Sorry I have create a mess in ddraw.c 1. found why createsurface did stop working, fixed 2. Split some surface member betwin gbl and lcl struct 3. Reimplement the revert I did, implement Revision: 23263 and Revision: 23262 again 4. Revert new createsurface code and setdisplay mode code that was intrudes 5. Alot other changes as well. 6. Todo Need remove the old code for HAL and HEL split. 7. move Our ddraw working again with apps it did work with. 8. Almost complete kill the file ddraw_hal.c some api is left be kill for at moment they are in use Added: trunk/reactos/dll/directx/ddraw/cleanup.c Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c trunk/reactos/dll/directx/ddraw/startup.c Added: trunk/reactos/dll/directx/ddraw/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/cleanup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/cleanup.c (added) +++ trunk/reactos/dll/directx/ddraw/cleanup.c Mon Jul 24 22:29:02 2006 @@ -1,0 +1,51 @@ +/* $Id: main.c 21434 2006-04-01 19:12:56Z greatlrd $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: lib/ddraw/ddraw.c + * PURPOSE: DirectDraw Library + * PROGRAMMER: Magnus Olsen (greatlrd) + * + */ + +#include <windows.h> +#include "rosdraw.h" +#include "d3dhal.h" + +VOID +Cleanup(LPDIRECTDRAW7 iface) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (This->mDDrawGlobal.hDD != 0) + { + DdDeleteDirectDrawObject (&This->mDDrawGlobal); + } + + if (This->mpTextures != NULL) + { + DxHeapMemFree(This->mpTextures); + } + + if (This->mpFourCC != NULL) + { + DxHeapMemFree(This->mpFourCC); + } + + if (This->mpvmList != NULL) + { + DxHeapMemFree(This->mpvmList); + } + + if (This->mpModeInfos != NULL) + { + DxHeapMemFree(This->mpModeInfos); + } + + if (This->hdc != NULL) + { + DeleteDC(This->hdc); + } + +} + Modified: trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/ddra… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/ddraw_hal.c Mon Jul 24 22:29:02 2006 @@ -9,6 +9,8 @@ */ #include "rosdraw.h" + + HRESULT @@ -42,7 +44,29 @@ return mem.ddRVal; } +HRESULT Hal_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_WAITFORVERTICALBLANKDATA WaitVectorData; + + if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK)) + { + return DDERR_NODRIVERSUPPORT; + } + + WaitVectorData.lpDD = &This->mDDrawGlobal; + WaitVectorData.dwFlags = dwFlags; + WaitVectorData.hEvent = (DWORD)h; + WaitVectorData.ddRVal = DDERR_NOTPALETTIZED; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.WaitForVerticalBlank(&WaitVectorData) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return WaitVectorData.ddRVal; +} HRESULT Hal_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { @@ -67,31 +91,36 @@ return GetScan.ddRVal; } -HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - DDHAL_FLIPTOGDISURFACEDATA FlipGdi; - - if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE)) - { - return DDERR_NODRIVERSUPPORT; - } - - FlipGdi.lpDD = &This->mDDrawGlobal; - FlipGdi.ddRVal = DDERR_NOTPALETTIZED; - - if (This->mDDrawGlobal.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) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_SETMODEDATA mode; + + if (!(This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) + { + return DDERR_NODRIVERSUPPORT; + } + + mode.lpDD = &This->mDDrawGlobal; + mode.ddRVal = DDERR_NODRIVERSUPPORT; + + + + // FIXME : add search for which mode.ModeIndex we should use + // FIXME : fill the mode.inexcl; + // FIXME : fill the mode.useRefreshRate; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.SetMode(&mode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return mode.ddRVal; +} Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Mon Jul 24 22:29:02 2006 @@ -35,9 +35,9 @@ return DDERR_NODRIVERSUPPORT; } - mDdBlt.lpDDDestSurface = This->Owner->mpPrimaryLocals[0]; - - if (!DdResetVisrgn(This->Owner->mpPrimaryLocals[0], NULL)) + mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->Surf->mpPrimaryLocals[0], NULL)) { return DDERR_NOGDI; } @@ -113,7 +113,7 @@ Lock.lpDD = &This->Owner->mDDrawGlobal; Lock.lpSurfData = NULL; - if (!DdResetVisrgn(&This->Owner->mPrimaryLocal, NULL)) + if (!DdResetVisrgn(&This->Surf->mPrimaryLocal, NULL)) { OutputDebugStringA("Here DdResetVisrgn lock"); return DDERR_UNSUPPORTED; @@ -138,13 +138,13 @@ { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); // FIXME the interanl mddsdPrimary shall be DDSURFACEDESC2 - memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); + memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); pDDSD->dwSize = sizeof(DDSURFACEDESC2); } if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC)); - memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); + memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); pDDSD->dwSize = sizeof(DDSURFACEDESC); } Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Mon Jul 24 22:29:02 2006 @@ -8,12 +8,13 @@ * */ -#include "rosdraw.h" - /* * IMPLEMENT * Status ok */ + +#include "rosdraw.h" + HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, @@ -49,7 +50,6 @@ Main_DirectDraw_AddRef(iface); return S_OK; } - /* * IMPLEMENT * Status ok @@ -104,6 +104,7 @@ } return ref; } + /* * IMPLEMENT * Status ok @@ -131,16 +132,14 @@ DX_WINDBG_trace(); if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; + return CLASS_E_NOAGGREGATION; IDirectDrawClipperImpl* That; That = (IDirectDrawClipperImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawClipperImpl)); if (That == NULL) return E_OUTOFMEMORY; - - ZeroMemory(That, sizeof(IDirectDrawClipperImpl)); - + That->lpVtbl = &DirectDrawClipper_Vtable; That->ref = 1; *ppClipper = (LPDIRECTDRAWCLIPPER)That; @@ -148,7 +147,10 @@ return That->lpVtbl->Initialize (*ppClipper, (LPDIRECTDRAW)iface, dwFlags); } - +/* + * IMPLEMENT + * Status ok + */ HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) { @@ -258,318 +260,10 @@ return DDERR_NODRIVERSUPPORT; } - - -const DDPIXELFORMAT pixelformats[] = -{ - /* 8bpp paletted */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 15bpp 5/5/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, - { 0x1F } }, - /* 16bpp 5/6/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, - { 0x1F } }, - /* 24bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 32bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } } -}; - -const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); - -/* more surface format not adding it */ - /* 4 bit paletted 0 */ - // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 - - ///* 8bpp paletted 1 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, - - ///* 15bpp 5:5:5 RGB 2 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, - - ///* 15bpp 1:5:5:5 ARGB 3 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, - - ///* 16bpp 5:6:5 RGB 4 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} - - ///* 16bpp 4:4:4:4 ARGB 5 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, - - /* 24bpp 8/8/8 RGB 6 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, - - /* 32bpp 8:8:8 RGB 7 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, - - /* 32bpp 8:8:8:8 ARGB 8*/ - // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} - - - - -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ -HRESULT -WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (iface==NULL) - { - return DDERR_NOTINITIALIZED; - } - - if (This->InitializeDraw == TRUE) - { - return DDERR_ALREADYINITIALIZED; - } - else - { - This->InitializeDraw = TRUE; - } - - return DD_OK; -} - - - - - - -/* - * IMPLEMENT - * Status - * not finish yet but is working fine - * it prevent memmory leaks at exit - */ - - - - - - -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 - - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; - - // check the parameters - if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) - return DD_OK; - - if (This->cooperative_level) - return DDERR_EXCLUSIVEMODEALREADYSET; - - if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) - return DDERR_INVALIDPARAMS; - - if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) - return DDERR_INVALIDPARAMS; - - // set the data - This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; - This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); - - - /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ - //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags - - This->cooperative_level = cooplevel; - - if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) - { - DX_STUB_str("HAL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; - } - else - { - DX_STUB_str("HEL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; - } - - SetExclusiveMode.lpDD = &This->mDDrawGlobal; - SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; - SetExclusiveMode.dwEnterExcl = This->cooperative_level; - - if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return SetExclusiveMode.ddRVal; -} - -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //BOOL dummy = TRUE; - - DX_WINDBG_trace_res((int)dwWidth, (int)dwHeight, (int)dwBPP ); - /* FIXME check the refresrate if it same if it not same do the mode switch */ - if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && - (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && - (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) - { - - return DD_OK; - } - - if (This->mDdSetMode.SetMode == NULL ) - { - return DDERR_NODRIVERSUPPORT; - } - - - This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; - - // FIXME : fill the mode.inexcl; - // FIXME : fill the mode.useRefreshRate; - - /* FIXME - we hardcoding modIndex list we should - try getting it from ReactOS instead and compare it - for now a small hack for do, using VBE 3.0 mode - index table todo it. - */ - - /* 320x200 15, 16, 32 */ - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x10d; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x10e; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x10f; - } - - - /* 640x400 8 */ - if ((dwHeight == 400) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x100; - } - - /* 640x480 8, 15, 16 , 32*/ - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x101; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x110; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x111; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x112; - } - - /* 800x600 4, 8, 15, 16 , 32*/ - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x102; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x103; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x113; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x114; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x115; - } - - /* 1024x768 8, 15, 16 , 32*/ - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x104; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x105; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x116; - } - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x117; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x118; - } - - /* not coding for 1280x1024 */ - - - if (This->mDdSetMode.SetMode(&This->mDdSetMode)==DDHAL_DRIVER_HANDLED); - { - - //if (This->mDdSetMode.ddRVal == DD_OK) - //{ - // // DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - // /* FIXME fill the This->DirectDrawGlobal.vmiData right */ - //} - - return This->mDdSetMode.ddRVal; - } - return DDERR_NODRIVERSUPPORT; -} - - - - - - +/* + * stub + * Status not done + */ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { @@ -631,10 +325,10 @@ if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Owner->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Owner->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; + This->mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { @@ -654,26 +348,26 @@ That->Owner->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; That->Owner->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - memset(&That->Owner->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Owner->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Owner->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Owner->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; - That->Owner->mPrimaryLocal.lpSurfMore = &That->Owner->mPrimaryMore; - That->Owner->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); /* FIXME Check the flags if we shall create a primaresurface for overlay or something else Examine windows which flags are being set for we assume this is right unsue I think */ //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - That->Owner->mPrimaryLocal.ddsCaps.dwCaps = That->Owner->mddsdPrimary.ddsCaps.dwCaps; - That->Owner->mpPrimaryLocals[0] = &That->Owner->mPrimaryLocal; + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; - This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; - This->mDdCreateSurface.lplpSList = That->Owner->mpPrimaryLocals; + This->mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdPrimary; + This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; @@ -700,8 +394,8 @@ DDSD_ZBUFFERBITDEPTH */ - That->Owner->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Owner->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; + RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); //RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); @@ -709,35 +403,35 @@ if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Owner->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; + That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; } if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Owner->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; + That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; } if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Owner->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; + That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; } if ( This->mDDrawGlobal.dwMonitorFrequency != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Owner->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; + That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; } if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Owner->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; + That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; } - That->Surf->mpInUseSurfaceLocals[0] = &That->Owner->mPrimaryLocal; + That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; return DD_OK; } @@ -873,188 +567,10 @@ } - - -// This function is exported by the dll -HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, - LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) -{ - DX_WINDBG_trace(); - - return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); -} - - - -HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) -{ - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) - { - return Hal_DirectDraw_FlipToGDISurface( iface); - } - - return Hel_DirectDraw_FlipToGDISurface( iface); -} - -HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, - LPDDCAPS pHELCaps) -{ - DX_WINDBG_trace(); - - DDSCAPS2 ddscaps; - DWORD status = DD_FALSE; - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - - if (pDriverCaps != NULL) - { - - - - Main_DirectDraw_GetAvailableVidMem(iface, - &ddscaps, - &This->mDDrawGlobal.ddCaps.dwVidMemTotal, - &This->mDDrawGlobal.ddCaps.dwVidMemFree); - - RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - pDriverCaps->dwSize=sizeof(DDCAPS); - - status = DD_OK; - } - - if (pHELCaps != NULL) - { - Main_DirectDraw_GetAvailableVidMem(iface, - &ddscaps, - &This->mDDrawGlobal.ddHELCaps.dwVidMemTotal, - &This->mDDrawGlobal.ddHELCaps.dwVidMemFree); - - RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddHELCaps,sizeof(DDCORECAPS)); - status = DD_OK; - } - - return status; -} - -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - - if (pDDSD == NULL) - { - return DD_FALSE; - } - - - pDDSD->dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE | DDSD_WIDTH; - pDDSD->dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; - pDDSD->dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; - pDDSD->lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; - pDDSD->dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - pDDSD->dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; - - RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); - RtlCopyMemory(&pDDSD->ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - - RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); - RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); - - /* have not check where I should get hold of this info yet - DWORD dwBackBufferCount; - DWORD dwReserved; - LPVOID lpSurface; - DDCOLORKEY ddckCKDestBlt; - DDCOLORKEY ddckCKSrcBlt; - DWORD dwTextureStage; - */ - - return DD_OK; -} - -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, - HANDLE h) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (This->mDdWaitForVerticalBlank.WaitForVerticalBlank == NULL) - { - return DDERR_NODRIVERSUPPORT; - } - - This->mDdWaitForVerticalBlank.dwFlags = dwFlags; - This->mDdWaitForVerticalBlank.hEvent = (DWORD)h; - This->mDdWaitForVerticalBlank.ddRVal = DDERR_NOTPALETTIZED; - - if (This->mDdWaitForVerticalBlank.WaitForVerticalBlank(&This->mDdWaitForVerticalBlank) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return This->mDdWaitForVerticalBlank.ddRVal; -} - -HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - - if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY) - { - return Hal_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); - } - - return Hel_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); -} - -HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl *This = (IDirectDrawImpl *)iface; - - if (freq == NULL) - { - return DD_FALSE; - } - - *freq = This->mDDrawGlobal.dwMonitorFrequency; - return DD_OK; -} - -HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) - { - return Hal_DirectDraw_GetScanLine( iface, lpdwScanLine); - } - - return Hel_DirectDraw_GetScanLine( iface, lpdwScanLine); -} - -HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - ChangeDisplaySettings(NULL, 0); - return DD_OK; -} - -/********************************** Stubs **********************************/ - - - +/* + * stub + * Status not done + */ HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) { @@ -1062,25 +578,24 @@ DX_STUB; } +/* + * IMPLEMENT + * Status ok + */ HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { - DX_WINDBG_trace(); - + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; DDSURFACEDESC2 desc_callback; DEVMODE DevMode; int iMode=0; - - if (pDDSD!=NULL) - { - // FIXME fill in pDDSD - } - - RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); - desc_callback.dwSize = sizeof(DDSURFACEDESC2); - - desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_CAPS | DDSD_PITCH; + + RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); + + desc_callback.dwSize = sizeof(DDSURFACEDESC2); + + desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH; if (dwFlags & DDEDM_REFRESHRATES) { @@ -1089,7 +604,7 @@ } - /// FIXME check if the mode are suppretd before sending it back + /* FIXME check if the mode are suppretd before sending it back */ while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) { @@ -1104,65 +619,106 @@ (pDDSD->ddpfPixelFormat.dwRGBBitCount != DevMode.dmBitsPerPel)) continue; } - desc_callback.dwHeight = DevMode.dmPelsHeight; desc_callback.dwWidth = DevMode.dmPelsWidth; - + if (DevMode.dmFields & DM_DISPLAYFREQUENCY) { desc_callback.dwRefreshRate = DevMode.dmDisplayFrequency; } - - switch(DevMode.dmBitsPerPel) + + if (desc_callback.dwRefreshRate == 0) + { + DX_STUB_str("dwRefreshRate = 0, we hard code it to value 60"); + desc_callback.dwRefreshRate = 60; /* Maybe the valye should be biger */ + } + + /* above same as wine */ + if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) ) + { + switch(DevMode.dmBitsPerPel) + { + case 8: + desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc_callback.ddpfPixelFormat.dwFourCC = 0; + desc_callback.ddpfPixelFormat.dwRGBBitCount=8; + /* FIXME right value */ + desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + desc_callback.ddpfPixelFormat.dwGBitMask = 0; /* Green bitmask */ + desc_callback.ddpfPixelFormat.dwBBitMask = 0; /* Blue bitmask */ + break; + + case 15: + desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc_callback.ddpfPixelFormat.dwFourCC = 0; + desc_callback.ddpfPixelFormat.dwRGBBitCount=15; + /* FIXME right value */ + desc_callback.ddpfPixelFormat.dwRBitMask = 0x7C00; /* red bitmask */ + desc_callback.ddpfPixelFormat.dwGBitMask = 0x3E0; /* Green bitmask */ + desc_callback.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + break; + + case 16: + desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc_callback.ddpfPixelFormat.dwFourCC = 0; + desc_callback.ddpfPixelFormat.dwRGBBitCount=16; + /* FIXME right value */ + desc_callback.ddpfPixelFormat.dwRBitMask = 0xF800; /* red bitmask */ + desc_callback.ddpfPixelFormat.dwGBitMask = 0x7E0; /* Green bitmask */ + desc_callback.ddpfPixelFormat.dwBBitMask = 0x1F; /* Blue bitmask */ + break; + + case 24: + desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc_callback.ddpfPixelFormat.dwFourCC = 0; + desc_callback.ddpfPixelFormat.dwRGBBitCount=24; + /* FIXME right value */ + desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + desc_callback.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + desc_callback.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + break; + + case 32: + desc_callback.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + desc_callback.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc_callback.ddpfPixelFormat.dwFourCC = 0; + desc_callback.ddpfPixelFormat.dwRGBBitCount=8; + /* FIXME right value */ + desc_callback.ddpfPixelFormat.dwRBitMask = 0xFF0000; /* red bitmask */ + desc_callback.ddpfPixelFormat.dwGBitMask = 0x00FF00; /* Green bitmask */ + desc_callback.ddpfPixelFormat.dwBBitMask = 0x0000FF; /* Blue bitmask */ + break; + + default: + break; + } + desc_callback.ddsCaps.dwCaps = 0; + if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) + { + /* FIXME srt DDCS Caps flag */ + desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; + } + } + + if (DevMode.dmBitsPerPel==15) + { + desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; + } + else + { + desc_callback.lPitch = DevMode.dmPelsWidth * (DevMode.dmBitsPerPel / 8); + desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; + } + + if (callback(&desc_callback, context) == DDENUMRET_CANCEL) { - case 8: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[0],sizeof(DDPIXELFORMAT)); - break; - - case 15: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[1],sizeof(DDPIXELFORMAT)); - break; - - case 16: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[2],sizeof(DDPIXELFORMAT)); - break; - - - case 24: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[3],sizeof(DDPIXELFORMAT)); - break; - - case 32: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[4],sizeof(DDPIXELFORMAT)); - break; - - default: - break; + return DD_OK; } - - if (desc_callback.ddpfPixelFormat.dwRGBBitCount==15) - { - desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; - } - else - { - desc_callback.lPitch = DevMode.dmPelsWidth * (desc_callback.ddpfPixelFormat.dwRGBBitCount / 8); - desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; - } - - desc_callback.ddsCaps.dwCaps = 0; - if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) - { - desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; - } - - - if (callback(&desc_callback, context) == DDENUMRET_CANCEL) - { - - return DD_OK; - } iMode++; } @@ -1170,13 +726,353 @@ return DD_OK; } -HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, +/* + * stub + * Status not done + */ +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { DX_WINDBG_trace(); DX_STUB; } + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) +{ + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (This->mDdFlipToGDISurface.FlipToGDISurface == NULL) + { + return DDERR_NODRIVERSUPPORT; + } + + This->mDdFlipToGDISurface.ddRVal = DDERR_NOTPALETTIZED; + This->mDdFlipToGDISurface.dwToGDI = TRUE; + + if (This->mDdFlipToGDISurface.FlipToGDISurface(&This->mDdFlipToGDISurface)==DDHAL_DRIVER_HANDLED); + { + return This->mDdFlipToGDISurface.ddRVal; + } + + return DDERR_NODRIVERSUPPORT; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps) +{ + DX_WINDBG_trace(); + + DDSCAPS2 ddscaps; + DWORD status = DD_FALSE; + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (pDriverCaps != NULL) + { + Main_DirectDraw_GetAvailableVidMem(iface, + &ddscaps, + &This->mDDrawGlobal.ddCaps.dwVidMemTotal, + &This->mDDrawGlobal.ddCaps.dwVidMemFree); + + RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + pDriverCaps->dwSize=sizeof(DDCAPS); + + status = DD_OK; + } + + if (pHELCaps != NULL) + { + Main_DirectDraw_GetAvailableVidMem(iface, + &ddscaps, + &This->mDDrawGlobal.ddHELCaps.dwVidMemTotal, + &This->mDDrawGlobal.ddHELCaps.dwVidMemFree); + + RtlCopyMemory(pDriverCaps,&This->mDDrawGlobal.ddHELCaps,sizeof(DDCORECAPS)); + status = DD_OK; + } + + return status; +} + + + +/* + * IMPLEMENT + * Status this api is finish and is 100% correct + */ +HRESULT +WINAPI +Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (iface==NULL) + { + return DDERR_NOTINITIALIZED; + } + + if (This->InitializeDraw == TRUE) + { + return DDERR_ALREADYINITIALIZED; + } + else + { + This->InitializeDraw = TRUE; + } + + 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 + + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + + // check the parameters + if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) + return DD_OK; + + if (This->cooperative_level) + return DDERR_EXCLUSIVEMODEALREADYSET; + + if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) + return DDERR_INVALIDPARAMS; + + if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) + return DDERR_INVALIDPARAMS; + + // set the data + This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; + This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); + + + /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ + //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags + + This->cooperative_level = cooplevel; + + if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) + { + DX_STUB_str("HAL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; + } + else + { + DX_STUB_str("HEL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; + } + + SetExclusiveMode.lpDD = &This->mDDrawGlobal; + SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; + SetExclusiveMode.dwEnterExcl = This->cooperative_level; + + if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return SetExclusiveMode.ddRVal; +} + +HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + BOOL dummy = TRUE; + DWORD ret; + + /* FIXME check the refresrate if it same if it not same do the mode switch */ + if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && + (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && + (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) + { + + return DD_OK; + } + + /* Check use the Hal or Hel for SetMode */ + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE) + { + ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + + } + else + { + ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + } + + if (ret == DD_OK) + { + DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); + /* FIXME fill the This->DirectDrawGlobal.vmiData right */ + } + + //This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC( (HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd); + + + + + return ret; +} + + + + + + + + + +// This function is exported by the dll +HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, + LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) +{ + DX_WINDBG_trace(); + + return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); +} + + + + + + +HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (pDDSD == NULL) + { + return DD_FALSE; + } + + + pDDSD->dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE | DDSD_WIDTH; + pDDSD->dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + pDDSD->dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + pDDSD->lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + pDDSD->dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + pDDSD->dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + + RtlCopyMemory(&pDDSD->ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + RtlCopyMemory(&pDDSD->ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + + RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); + RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); + + /* have not check where I should get hold of this info yet + DWORD dwBackBufferCount; + DWORD dwReserved; + LPVOID lpSurface; + DDCOLORKEY ddckCKDestBlt; + DDCOLORKEY ddckCKSrcBlt; + DWORD dwTextureStage; + */ + + return DD_OK; +} + +HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, + HANDLE h) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_WAITFORVERTICALBLANK) + { + return Hal_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h); + } + + return Hel_DirectDraw_WaitForVerticalBlank( iface, dwFlags, h); +} + +HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD total, LPDWORD free) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + + if (This->mDDrawGlobal.lpDDCBtmp->HALDDMiscellaneous.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY) + { + return Hal_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); + } + + return Hel_DirectDraw_GetAvailableVidMem (iface,ddscaps,total,free); +} + +HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; + + if (freq == NULL) + { + return DD_FALSE; + } + + *freq = This->mDDrawGlobal.dwMonitorFrequency; + return DD_OK; +} + +HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_GETSCANLINE) + { + return Hal_DirectDraw_GetScanLine( iface, lpdwScanLine); + } + + return Hel_DirectDraw_GetScanLine( iface, lpdwScanLine); +} + +HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + ChangeDisplaySettings(NULL, 0); + return DD_OK; +} + +/********************************** Stubs **********************************/ + + + + + + + + HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Mon Jul 24 22:29:02 2006 @@ -125,7 +125,7 @@ That = (IDirectDrawSurfaceImpl*)pAttach; //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) - return DdAttachSurface( That->Owner->mpPrimaryLocals[0],This->Owner->mpPrimaryLocals[0]); + return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); } /* MSDN: "not currently implemented." */ @@ -274,7 +274,7 @@ This = (IDirectDrawSurfaceImpl*)iface; RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); - pCaps->dwCaps = This->Owner->mddsdPrimary.ddsCaps.dwCaps; + pCaps->dwCaps = This->Surf->mddsdPrimary.ddsCaps.dwCaps; return DD_OK; } @@ -321,14 +321,14 @@ for now we aussme the surface exits and create the hDC for it */ - if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) - { - This->Owner->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); - *phDC = (HDC)This->Owner->mPrimaryLocal.hDC; + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) + { + This->Surf->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); + *phDC = (HDC)This->Surf->mPrimaryLocal.hDC; } else { - *phDC = (HDC)This->Owner->mpPrimaryLocals[0]->hDC; + *phDC = (HDC)This->Surf->mpPrimaryLocals[0]->hDC; } return DD_OK; @@ -420,7 +420,7 @@ } RtlZeroMemory(pDDSD,dwSize); - memcpy(pDDSD, &This->Owner->mddsdPrimary, sizeof(DDSURFACEDESC)); + memcpy(pDDSD, &This->Surf->mddsdPrimary, sizeof(DDSURFACEDESC)); pDDSD->dwSize = dwSize; return DD_OK; @@ -482,7 +482,7 @@ /* FIXME check if surface exits or not */ - if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) { return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Mon Jul 24 22:29:02 2006 @@ -71,7 +71,10 @@ DWORD *mpFourCC; UINT mcTextures; - DDSURFACEDESC2 *mpTextures; + DDSURFACEDESC *mpTextures; + + + /* ExclusiveOwner */ @@ -82,7 +85,7 @@ /* HEL stuff */ DWORD HELMemoryAvilable; - + /* DD Callbacks info */ DDHAL_DESTROYDRIVERDATA mDdDestroyDriver; DDHAL_CREATESURFACEDATA mDdCreateSurface; @@ -95,24 +98,25 @@ DDHAL_SETEXCLUSIVEMODEDATA mDdSetExclusiveMode; DDHAL_FLIPTOGDISURFACEDATA mDdFlipToGDISurface; - /* Primarey surface we must reach it from every where */ DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + + /* adding a switch */ + DWORD devicetype; + +} IDirectDrawImpl; + +/******** Surface Object ********/ +typedef struct +{ + /* Primarey surface we must reach it from every where */ + DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - DDSURFACEDESC2 mddsdPrimary; - - /* adding a switch */ - DWORD devicetype; - -} IDirectDrawImpl; - -/******** Surface Object ********/ -typedef struct -{ + DDSURFACEDESC mddsdPrimary; DDRAWI_DDRAWSURFACE_LCL *mpInUseSurfaceLocals[1]; Modified: trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/ddraw_hel.c Mon Jul 24 22:29:02 2006 @@ -21,12 +21,67 @@ return DD_OK; } + +HRESULT Hel_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,HANDLE h) +{ + DX_STUB; +} + HRESULT Hel_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { DX_STUB; } -HRESULT Hel_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) + + +HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - DX_STUB; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + // this only for exclusive mode + if(!(This->cooperative_level & DDSCL_EXCLUSIVE)) + return DDERR_NOEXCLUSIVEMODE; + + // change the resolution using normal WinAPI function + DEVMODE mode; + mode.dmSize = sizeof(mode); + mode.dmPelsWidth = dwWidth; + mode.dmPelsHeight = dwHeight; + mode.dmBitsPerPel = dwBPP; + + //mode.dmDisplayFrequency = dwRefreshRate; + mode.dmFields = 0; + + DX_STUB_str("in hel"); + + if(dwWidth) + mode.dmFields |= DM_PELSWIDTH; + if(dwHeight) + mode.dmFields |= DM_PELSHEIGHT; + if(dwBPP) + mode.dmFields |= DM_BITSPERPEL; + /* + if(dwRefreshRate) + mode.dmFields |= DM_DISPLAYFREQUENCY; + */ + if (ChangeDisplaySettings(&mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) + return DDERR_UNSUPPORTEDMODE; + + + // TODO: reactivate ddraw object, maximize window, set it in foreground + // and set excluive mode (if implemented by the driver) + + /* FIXME fill the DirectDrawGlobal right the modeindex old and new */ + + //if(dwWidth) + // This->Height = dwWidth; + //if(dwHeight) + // This->Width = dwHeight; + //if(dwBPP) + // This->Bpp = dwBPP; + + return DD_OK; } + + Modified: trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/soft/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/soft/surface_callbacks_hel.c Mon Jul 24 22:29:02 2006 @@ -28,187 +28,16 @@ DX_STUB; } - +/* DWORD CALLBACK HelDdSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKey) { DX_STUB; } - +*/ DWORD CALLBACK HelDdSetMode(LPDDHAL_SETMODEDATA SetMode) -{ - // change the resolution using normal WinAPI function - DEVMODE mode; - mode.dmSize = sizeof(DEVMODE); - mode.dmPelsWidth = 0; - mode.dmPelsHeight = 0; - mode.dmBitsPerPel = 0; - - /* FIXME use emuate display to get the res */ - - /* 320x200 15, 16, 32 */ - if (SetMode->dwModeIndex == 0x10d) - { - mode.dmPelsWidth = 320; - mode.dmPelsHeight = 200; - mode.dmBitsPerPel = 15; - } - - if (SetMode->dwModeIndex == 0x10e) - { - mode.dmPelsWidth = 320; - mode.dmPelsHeight = 200; - mode.dmBitsPerPel = 16; - } - - if (SetMode->dwModeIndex == 0x10f) - { - mode.dmPelsWidth = 320; - mode.dmPelsHeight = 200; - mode.dmBitsPerPel = 32; - } - - /* 640x400 8 */ - if (SetMode->dwModeIndex == 0x100) - { - mode.dmPelsWidth = 640; - mode.dmPelsHeight = 400; - mode.dmBitsPerPel = 8; - } - - /* 640x480 8, 15, 16 , 32*/ - if (SetMode->dwModeIndex == 0x101) - { - mode.dmPelsWidth = 640; - mode.dmPelsHeight = 480; - mode.dmBitsPerPel = 8; - } - - if (SetMode->dwModeIndex == 0x110) - { - mode.dmPelsWidth = 640; - mode.dmPelsHeight = 480; - mode.dmBitsPerPel = 15; - } - - if (SetMode->dwModeIndex == 0x111) - { - mode.dmPelsWidth = 640; - mode.dmPelsHeight = 480; - mode.dmBitsPerPel = 16; - } - - if (SetMode->dwModeIndex == 0x112) - { - mode.dmPelsWidth = 640; - mode.dmPelsHeight = 480; - mode.dmBitsPerPel = 32; - } - - /* 800x600 4, 8, 15, 16 , 32*/ - if (SetMode->dwModeIndex == 0x102) - { - mode.dmPelsWidth = 800; - mode.dmPelsHeight = 600; - mode.dmBitsPerPel = 4; - } - - if (SetMode->dwModeIndex == 0x103) - { - mode.dmPelsWidth = 800; - mode.dmPelsHeight = 600; - mode.dmBitsPerPel = 8; - } - - if (SetMode->dwModeIndex == 0x113) - { - mode.dmPelsWidth = 800; - mode.dmPelsHeight = 600; - mode.dmBitsPerPel = 15; - } - - - if (SetMode->dwModeIndex == 0x114) - { - mode.dmPelsWidth = 800; - mode.dmPelsHeight = 600; - mode.dmBitsPerPel = 16; - } - - if (SetMode->dwModeIndex == 0x115) - { - mode.dmPelsWidth = 800; - mode.dmPelsHeight = 600; - mode.dmBitsPerPel = 32; - } - - /* 1024x768 8, 15, 16 , 32*/ - - if (SetMode->dwModeIndex == 0x104) - { - mode.dmPelsWidth = 1024; - mode.dmPelsHeight = 768; - mode.dmBitsPerPel = 4; - } - - if (SetMode->dwModeIndex == 0x105) - { - mode.dmPelsWidth = 1024; - mode.dmPelsHeight = 768; - mode.dmBitsPerPel = 8; - } - - if (SetMode->dwModeIndex == 0x116) - { - mode.dmPelsWidth = 1024; - mode.dmPelsHeight = 768; - mode.dmBitsPerPel = 15; - } - - if (SetMode->dwModeIndex == 0x117) - { - mode.dmPelsWidth = 1024; - mode.dmPelsHeight = 768; - mode.dmBitsPerPel = 16; - } - - if (SetMode->dwModeIndex == 0x118) - { - mode.dmPelsWidth = 1024; - mode.dmPelsHeight = 768; - mode.dmBitsPerPel = 32; - } - - //mode.dmDisplayFrequency = dwRefreshRate; - mode.dmFields = 0; - - DX_STUB_str("in hel"); - - if(mode.dmPelsWidth != 0) - mode.dmFields |= DM_PELSWIDTH; - if(mode.dmPelsHeight != 0) - mode.dmFields |= DM_PELSHEIGHT; - if( mode.dmBitsPerPel != 0) - mode.dmFields |= DM_BITSPERPEL; - /* - if(dwRefreshRate) - mode.dmFields |= DM_DISPLAYFREQUENCY; - */ - - DX_WINDBG_trace_res((int)mode.dmPelsWidth, (int)mode.dmPelsHeight, (int)mode.dmBitsPerPel ); - - if (ChangeDisplaySettings(&mode, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - { - DX_STUB_str("FAIL"); - SetMode->ddRVal = DDERR_UNSUPPORTEDMODE; - } - else - { - DX_STUB_str("OK"); - SetMode->ddRVal = DD_OK; - } - - return DDHAL_DRIVER_HANDLED; +{ + DX_STUB; } DWORD CALLBACK HelDdWaitForVerticalBlank(LPDDHAL_WAITFORVERTICALBLANKDATA lpWaitForVerticalBlank) 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 Jul 24 22:29:02 2006 @@ -291,7 +291,7 @@ } This->mcTextures = This->mD3dDriverData.dwNumTextureFormats; - This->mpTextures = (DDSURFACEDESC2*) DxHeapMemAlloc(sizeof(DDSURFACEDESC2) * This->mcTextures); + This->mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * This->mcTextures); if (This->mpTextures == NULL) { DxHeapMemFree( This->mpFourCC); @@ -364,6 +364,16 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); + /* Setup global surface */ + /*This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch;*/ + + /* FIXME free it in cleanup */ + This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); return DD_OK; }

18 years, 5 months

[hpoussin] 23267: Entries in HKLM\SYSTEM\CurrentControlSet\Control\NLS\Locale should be of type REG_SZ, not REG_DWORD

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 24 20:46:23 2006 New Revision: 23267 URL: http://svn.reactos.org/svn/reactos?rev=23267&view=rev Log: Entries in HKLM\SYSTEM\CurrentControlSet\Control\NLS\Locale should be of type REG_SZ, not REG_DWORD Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Mon Jul 24 20:46:23 2006 @@ -249,105 +249,105 @@ ; If you add/uncomment an entry here, please also add the appropriate Language ; in the previous section. HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00010001,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000807",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c07",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001407",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000408",0x00010001,"4" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000409",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000809",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c09",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001009",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001409",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001809",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c09",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002009",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003009",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003409",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100a",0x00010001,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c0a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000200a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000240a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000280a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002c0a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000300a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000340a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000380a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003c0a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000400a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000440a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000480a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00004c0a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000500a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040b",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040c",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080c",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0c",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00010001,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00010001,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00010001,"" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00010001,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000414",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000814",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000415",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000416",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000816",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000418",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000419",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041a",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081a",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c1a",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00010001,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00010001,"6" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00010001,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000422",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000423",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000424",0x00010001,"2" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000425",0x00010001,"3" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00010001,"3" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00010001,"3" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00010001,"" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00010001,"" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00010001,"" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00010001,"6" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00010001,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00010001,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00010001,"" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00010001,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00010001,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00010001,"5" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000440",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000441",0x00010001,"1" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000443",0x00010001,"6" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000843",0x00010001,"5" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000456",0x00010001,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000807",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c07",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001407",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000408",0x00000000,"4" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000409",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000809",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c09",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001009",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001409",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001809",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c09",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002009",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003009",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003409",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100a",0x00000000,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c0a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000200a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000240a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000280a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002c0a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000300a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000340a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000380a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003c0a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000400a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000440a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000480a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00004c0a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000500a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040b",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040c",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080c",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0c",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00000000,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000414",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000814",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000415",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000416",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000816",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000418",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000419",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041a",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081a",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c1a",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000422",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000423",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000424",0x00000000,"2" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000425",0x00000000,"3" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00000000,"3" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,"" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00000000,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00000000,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00000000,"5" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000440",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000441",0x00000000,"1" +;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000443",0x00000000,"6" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000843",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000456",0x00000000,"1" ; Some installers check for SP6 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600

18 years, 5 months

[greatlrd] 23266: revert Revision: 23263 and Revision: 23262 something is wrong with them

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 24 19:37:03 2006 New Revision: 23266 URL: http://svn.reactos.org/svn/reactos?rev=23266&view=rev Log: revert Revision: 23263 and Revision: 23262 something is wrong with them Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Mon Jul 24 19:37:03 2006 @@ -35,9 +35,9 @@ return DDERR_NODRIVERSUPPORT; } - mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; - - if (!DdResetVisrgn(This->Surf->mpPrimaryLocals[0], NULL)) + mDdBlt.lpDDDestSurface = This->Owner->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->Owner->mpPrimaryLocals[0], NULL)) { return DDERR_NOGDI; } @@ -113,7 +113,7 @@ Lock.lpDD = &This->Owner->mDDrawGlobal; Lock.lpSurfData = NULL; - if (!DdResetVisrgn(&This->Surf->mPrimaryLocal, NULL)) + if (!DdResetVisrgn(&This->Owner->mPrimaryLocal, NULL)) { OutputDebugStringA("Here DdResetVisrgn lock"); return DDERR_UNSUPPORTED; @@ -138,13 +138,13 @@ { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); // FIXME the interanl mddsdPrimary shall be DDSURFACEDESC2 - memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC2)); + memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); pDDSD->dwSize = sizeof(DDSURFACEDESC2); } if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC)); - memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); + memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); pDDSD->dwSize = sizeof(DDSURFACEDESC); } Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Mon Jul 24 19:37:03 2006 @@ -260,6 +260,315 @@ +const DDPIXELFORMAT pixelformats[] = +{ + /* 8bpp paletted */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } }, + /* 15bpp 5/5/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, + { 0x1F } }, + /* 16bpp 5/6/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, + { 0x1F } }, + /* 24bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } }, + /* 32bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } } +}; + +const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); + +/* more surface format not adding it */ + /* 4 bit paletted 0 */ + // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 + + ///* 8bpp paletted 1 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, + + ///* 15bpp 5:5:5 RGB 2 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, + + ///* 15bpp 1:5:5:5 ARGB 3 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, + + ///* 16bpp 5:6:5 RGB 4 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} + + ///* 16bpp 4:4:4:4 ARGB 5 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, + + /* 24bpp 8/8/8 RGB 6 */ + // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, + + /* 32bpp 8:8:8 RGB 7 */ + // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, + + /* 32bpp 8:8:8:8 ARGB 8*/ + // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} + + + + +/* + * IMPLEMENT + * Status this api is finish and is 100% correct + */ +HRESULT +WINAPI +Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (iface==NULL) + { + return DDERR_NOTINITIALIZED; + } + + if (This->InitializeDraw == TRUE) + { + return DDERR_ALREADYINITIALIZED; + } + else + { + This->InitializeDraw = TRUE; + } + + return DD_OK; +} + + + + + + +/* + * IMPLEMENT + * Status + * not finish yet but is working fine + * it prevent memmory leaks at exit + */ + + + + + + +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 + + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + + // check the parameters + if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) + return DD_OK; + + if (This->cooperative_level) + return DDERR_EXCLUSIVEMODEALREADYSET; + + if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) + return DDERR_INVALIDPARAMS; + + if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) + return DDERR_INVALIDPARAMS; + + // set the data + This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; + This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); + + + /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ + //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags + + This->cooperative_level = cooplevel; + + if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) + { + DX_STUB_str("HAL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; + } + else + { + DX_STUB_str("HEL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; + } + + SetExclusiveMode.lpDD = &This->mDDrawGlobal; + SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; + SetExclusiveMode.dwEnterExcl = This->cooperative_level; + + if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return SetExclusiveMode.ddRVal; +} + +HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + //BOOL dummy = TRUE; + + DX_WINDBG_trace_res((int)dwWidth, (int)dwHeight, (int)dwBPP ); + /* FIXME check the refresrate if it same if it not same do the mode switch */ + if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && + (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && + (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) + { + + return DD_OK; + } + + if (This->mDdSetMode.SetMode == NULL ) + { + return DDERR_NODRIVERSUPPORT; + } + + + This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; + + // FIXME : fill the mode.inexcl; + // FIXME : fill the mode.useRefreshRate; + + /* FIXME + we hardcoding modIndex list we should + try getting it from ReactOS instead and compare it + for now a small hack for do, using VBE 3.0 mode + index table todo it. + */ + + /* 320x200 15, 16, 32 */ + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x10d; + } + + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x10e; + } + + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x10f; + } + + + /* 640x400 8 */ + if ((dwHeight == 400) && (dwWidth == 640) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x100; + } + + /* 640x480 8, 15, 16 , 32*/ + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x101; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x110; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x111; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x112; + } + + /* 800x600 4, 8, 15, 16 , 32*/ + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 4)) + { + This->mDdSetMode.dwModeIndex = 0x102; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x103; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x113; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x114; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x115; + } + + /* 1024x768 8, 15, 16 , 32*/ + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 4)) + { + This->mDdSetMode.dwModeIndex = 0x104; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x105; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x116; + } + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x117; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x118; + } + + /* not coding for 1280x1024 */ + + + if (This->mDdSetMode.SetMode(&This->mDdSetMode)==DDHAL_DRIVER_HANDLED); + { + + //if (This->mDdSetMode.ddRVal == DD_OK) + //{ + // // DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); + // /* FIXME fill the This->DirectDrawGlobal.vmiData right */ + //} + + return This->mDdSetMode.ddRVal; + } + return DDERR_NODRIVERSUPPORT; +} + + + + + HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) @@ -268,140 +577,113 @@ DxSurf *surf; - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + if (pUnkOuter!=NULL) + return DDERR_INVALIDPARAMS; + + if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) + return DDERR_UNSUPPORTED; + + // the nasty com stuff + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; IDirectDrawSurfaceImpl* That; - - if (pUnkOuter!=NULL) - { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface CLASS_E_NOAGGREGATION"); - return CLASS_E_NOAGGREGATION; - } - - if( sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) - { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_UNSUPPORTED1"); - return DDERR_UNSUPPORTED; - } - - if( This == NULL) - { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_UNSUPPORTED2"); - return DDERR_UNSUPPORTED; - } - - if (This->mDDrawGlobal.dsList == NULL) - { - /* Fail alloc memmory at startup */ - DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY1"); - return E_OUTOFMEMORY; - } - - if (pDDSD->ddsCaps.dwCaps == 0) - { - pDDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - } - - if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) - { - pDDSD->dwFlags &= ~DDSD_LPSURFACE; - } - - if ((pDDSD->dwFlags & DDSD_LPSURFACE) && (pDDSD->lpSurface == NULL)) - { - pDDSD->dwFlags &= ~DDSD_LPSURFACE; - } - - That = (IDirectDrawSurfaceImpl*)DxHeapMemAlloc(sizeof(IDirectDrawSurfaceImpl)); + That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); + if (That == NULL) { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY2"); return E_OUTOFMEMORY; } - - surf = (DxSurf*)DxHeapMemAlloc(sizeof(DxSurf)); + ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); + + surf = (DxSurf*)HeapAlloc(GetProcessHeap(), 0, sizeof(DxSurf)); + if (surf == NULL) { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY3"); - DxHeapMemFree(That); + // FIXME Free memmory at exit return E_OUTOFMEMORY; } - - // the nasty com stuff + + That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; - *ppSurf = (LPDIRECTDRAWSURFACE7)That; - - /* setup some stuff */ + *ppSurf = (LPDIRECTDRAWSURFACE7)That; + + // FIXME free This->mDDrawGlobal.dsList on release + This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(DDRAWI_DDRAWSURFACE_INT)); That->Owner = (IDirectDrawImpl *)This; That->Owner->mDDrawGlobal.dsList->dwIntRefCnt =1; - That->Surf = surf; /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ That->Owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; - + + + That->Surf = surf; + + // UINT i; + //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + //IDirectDrawSurfaceImpl* That = ppSurf; + + + + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + memcpy(&That->Owner->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Owner->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED1"); - DxHeapMemFree(That); - DxHeapMemFree(surf); + { return DDERR_NOTINITIALIZED; } if (This->mDdCanCreateSurface.ddRVal != DD_OK) { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED2"); - DxHeapMemFree(That); - DxHeapMemFree(surf); return DDERR_NOTINITIALIZED; } - memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Surf->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; - That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; - That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + memset(&That->Owner->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Owner->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->Owner->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + That->Owner->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Owner->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + That->Owner->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + That->Owner->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + memset(&That->Owner->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Owner->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Owner->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Owner->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; + That->Owner->mPrimaryLocal.lpSurfMore = &That->Owner->mPrimaryMore; + That->Owner->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); /* FIXME Check the flags if we shall create a primaresurface for overlay or something else Examine windows which flags are being set for we assume this is right unsue I think */ //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - - /* - FIXME we are now supproting DDSURFACEDESC2 in rosdraw.h we need make use of it it - */ - That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; - That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; + That->Owner->mPrimaryLocal.ddsCaps.dwCaps = That->Owner->mddsdPrimary.ddsCaps.dwCaps; + That->Owner->mpPrimaryLocals[0] = &That->Owner->mPrimaryLocal; + - This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; - This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; + + This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; + This->mDdCreateSurface.lplpSList = That->Owner->mpPrimaryLocals; This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED3"); - DxHeapMemFree(That); - DxHeapMemFree(surf); return DDERR_NOTINITIALIZED; } if (This->mDdCreateSurface.ddRVal != DD_OK) { - DX_STUB_str("Fail Main_DirectDraw_CreateSurface ERROR"); - DxHeapMemFree(That); - DxHeapMemFree(surf); return This->mDdCreateSurface.ddRVal; } @@ -418,51 +700,157 @@ DDSD_ZBUFFERBITDEPTH */ - That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + That->Owner->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; + RtlCopyMemory(&That->Owner->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); //RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); + //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) { - That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + That->Owner->mddsdPrimary.dwFlags += DDSD_HEIGHT ; + That->Owner->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; } if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) { - That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + That->Owner->mddsdPrimary.dwFlags += DDSD_WIDTH ; + That->Owner->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; } if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) { - That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + That->Owner->mddsdPrimary.dwFlags += DDSD_PITCH ; + That->Owner->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; } if ( This->mDDrawGlobal.dwMonitorFrequency != 0) { - That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + That->Owner->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; + That->Owner->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; } if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) { - That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + That->Owner->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; + That->Owner->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; } - That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; - - DX_STUB_str("Fail Main_DirectDraw_CreateSurface OK"); + That->Surf->mpInUseSurfaceLocals[0] = &That->Owner->mPrimaryLocal; return DD_OK; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - DX_STUB_str( "Can not create overlay surface"); + memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); + memcpy(&That->Surf->mddsdOverlay, pDDSD, sizeof(DDSURFACEDESC)); + That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); + That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; + That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + + That->Surf->mddsdOverlay.dwWidth = pDDSD->dwWidth; //pels; + That->Surf->mddsdOverlay.dwHeight = pDDSD->dwHeight; // lines; + That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; + + That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize = pDDSD->ddpfPixelFormat.dwSize; + That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = pDDSD->ddpfPixelFormat.dwFlags; + That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = pDDSD->ddpfPixelFormat.dwRGBBitCount; + + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; + mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; + mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; + + if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } + + + memset(&That->Surf->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + That->Surf->mOverlayGlobal.dwGlobalFlags = 0; + That->Surf->mOverlayGlobal.lpDD = &This->mDDrawGlobal; + That->Surf->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; + That->Surf->mOverlayGlobal.wWidth = (WORD)That->Surf->mddsdOverlay.dwWidth; + That->Surf->mOverlayGlobal.wHeight = (WORD)That->Surf->mddsdOverlay.dwHeight; + That->Surf->mOverlayGlobal.lPitch = -1; + That->Surf->mOverlayGlobal.ddpfSurface = That->Surf->mddsdOverlay.ddpfPixelFormat; + + memset(&That->Surf->mOverlayMore[0], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mOverlayMore[0].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mOverlayLocal[0], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mOverlayLocal[0].lpGbl = &That->Surf->mOverlayGlobal; + That->Surf->mOverlayLocal[0].lpSurfMore = &That->Surf->mOverlayMore[0]; + That->Surf-> mOverlayLocal[0].dwProcessId = GetCurrentProcessId(); + That->Surf->mOverlayLocal[0].dwFlags = DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER; + + That->Surf->mOverlayLocal[0].dwFlags |= + DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| + DDRAWISURF_HASPIXELFORMAT| + DDRAWISURF_HASOVERLAYDATA; + + That->Surf->mOverlayLocal[0].ddsCaps.dwCaps = That->Surf->mddsdOverlay.ddsCaps.dwCaps; + That->Surf->mpOverlayLocals[0] = &That->Surf->mOverlayLocal[0]; + + + DDHAL_CREATESURFACEDATA mDdCreateSurface; + mDdCreateSurface.lpDD = &This->mDDrawGlobal; + mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; + mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; + mDdCreateSurface.lplpSList = That->Surf->mpOverlayLocals; //cSurfaces; + mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + +/* + DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; + mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; + mDdUpdateOverlay.lpDDDestSurface = This->mpPrimaryLocals[0]; + mDdUpdateOverlay.lpDDSrcSurface = That->Surf->mpOverlayLocals[0];//pDDSurface; + mDdUpdateOverlay.dwFlags = DDOVER_SHOW; + + + mDdUpdateOverlay.rDest.top = 0; + mDdUpdateOverlay.rDest.left = 0; + mDdUpdateOverlay.rDest.right = 50; + mDdUpdateOverlay.rDest.bottom = 50; + + mDdUpdateOverlay.rSrc.top = 0; + mDdUpdateOverlay.rSrc.left = 0; + mDdUpdateOverlay.rSrc.right = 50; + mDdUpdateOverlay.rSrc.bottom = 50; + + if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdUpdateOverlay.ddRVal != DD_OK) + { + return mDdUpdateOverlay.ddRVal; + } +*/ + + That->Surf->mpInUseSurfaceLocals[0] = That->Surf->mpOverlayLocals[0]; + return DD_OK; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) { @@ -481,276 +869,9 @@ DX_STUB_str( "Can not create offscreenplain surface"); } - DxHeapMemFree(That); - DxHeapMemFree(surf); return DDERR_INVALIDSURFACETYPE; } - - - - - - -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ -HRESULT -WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (iface==NULL) - { - return DDERR_NOTINITIALIZED; - } - - if (This->InitializeDraw == TRUE) - { - return DDERR_ALREADYINITIALIZED; - } - else - { - This->InitializeDraw = TRUE; - } - - return DD_OK; -} - - - - - - -/* - * IMPLEMENT - * Status - * not finish yet but is working fine - * it prevent memmory leaks at exit - */ - - - - - - -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 - - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; - - // check the parameters - if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) - return DD_OK; - - if (This->cooperative_level) - return DDERR_EXCLUSIVEMODEALREADYSET; - - if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) - return DDERR_INVALIDPARAMS; - - if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) - return DDERR_INVALIDPARAMS; - - // set the data - This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; - This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); - - - /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ - //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags - - This->cooperative_level = cooplevel; - - if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) - { - DX_STUB_str("HAL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; - } - else - { - DX_STUB_str("HEL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; - } - - SetExclusiveMode.lpDD = &This->mDDrawGlobal; - SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; - SetExclusiveMode.dwEnterExcl = This->cooperative_level; - - if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return SetExclusiveMode.ddRVal; -} - -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //BOOL dummy = TRUE; - - DX_WINDBG_trace_res((int)dwWidth, (int)dwHeight, (int)dwBPP ); - /* FIXME check the refresrate if it same if it not same do the mode switch */ - if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && - (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && - (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) - { - - return DD_OK; - } - - if (This->mDdSetMode.SetMode == NULL ) - { - return DDERR_NODRIVERSUPPORT; - } - - - This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; - - // FIXME : fill the mode.inexcl; - // FIXME : fill the mode.useRefreshRate; - - /* FIXME - we hardcoding modIndex list we should - try getting it from ReactOS instead and compare it - for now a small hack for do, using VBE 3.0 mode - index table todo it. - */ - - /* 320x200 15, 16, 32 */ - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x10d; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x10e; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x10f; - } - - - /* 640x400 8 */ - if ((dwHeight == 400) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x100; - } - - /* 640x480 8, 15, 16 , 32*/ - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x101; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x110; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x111; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x112; - } - - /* 800x600 4, 8, 15, 16 , 32*/ - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x102; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x103; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x113; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x114; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x115; - } - - /* 1024x768 8, 15, 16 , 32*/ - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x104; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x105; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x116; - } - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x117; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x118; - } - - /* not coding for 1280x1024 */ - - - if (This->mDdSetMode.SetMode(&This->mDdSetMode)==DDHAL_DRIVER_HANDLED); - { - - //if (This->mDdSetMode.ddRVal == DD_OK) - //{ - // // DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - // /* FIXME fill the This->DirectDrawGlobal.vmiData right */ - //} - - return This->mDdSetMode.ddRVal; - } - return DDERR_NODRIVERSUPPORT; -} - - - - - - - @@ -945,7 +1066,108 @@ LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { DX_WINDBG_trace(); - DX_STUB; + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDSURFACEDESC2 desc_callback; + DEVMODE DevMode; + int iMode=0; + + if (pDDSD!=NULL) + { + // FIXME fill in pDDSD + } + + RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); + desc_callback.dwSize = sizeof(DDSURFACEDESC2); + + desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_CAPS | DDSD_PITCH; + + if (dwFlags & DDEDM_REFRESHRATES) + { + desc_callback.dwFlags |= DDSD_REFRESHRATE; + desc_callback.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + } + + + /// FIXME check if the mode are suppretd before sending it back + + while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) + { + + if (pDDSD) + { + if ((pDDSD->dwFlags & DDSD_WIDTH) && (pDDSD->dwWidth != DevMode.dmPelsWidth)) + continue; + if ((pDDSD->dwFlags & DDSD_HEIGHT) && (pDDSD->dwHeight != DevMode.dmPelsHeight)) + continue; + if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) && + (pDDSD->ddpfPixelFormat.dwRGBBitCount != DevMode.dmBitsPerPel)) + continue; + } + + + desc_callback.dwHeight = DevMode.dmPelsHeight; + desc_callback.dwWidth = DevMode.dmPelsWidth; + + if (DevMode.dmFields & DM_DISPLAYFREQUENCY) + { + desc_callback.dwRefreshRate = DevMode.dmDisplayFrequency; + } + + switch(DevMode.dmBitsPerPel) + { + case 8: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[0],sizeof(DDPIXELFORMAT)); + break; + + case 15: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[1],sizeof(DDPIXELFORMAT)); + break; + + case 16: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[2],sizeof(DDPIXELFORMAT)); + break; + + + case 24: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[3],sizeof(DDPIXELFORMAT)); + break; + + case 32: + memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[4],sizeof(DDPIXELFORMAT)); + break; + + default: + break; + } + + if (desc_callback.ddpfPixelFormat.dwRGBBitCount==15) + { + desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; + } + else + { + desc_callback.lPitch = DevMode.dmPelsWidth * (desc_callback.ddpfPixelFormat.dwRGBBitCount / 8); + desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; + } + + desc_callback.ddsCaps.dwCaps = 0; + if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) + { + desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; + } + + + if (callback(&desc_callback, context) == DDENUMRET_CANCEL) + { + + return DD_OK; + } + + iMode++; + } + + return DD_OK; } HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Mon Jul 24 19:37:03 2006 @@ -125,7 +125,7 @@ That = (IDirectDrawSurfaceImpl*)pAttach; //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) - return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); + return DdAttachSurface( That->Owner->mpPrimaryLocals[0],This->Owner->mpPrimaryLocals[0]); } /* MSDN: "not currently implemented." */ @@ -274,7 +274,7 @@ This = (IDirectDrawSurfaceImpl*)iface; RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); - pCaps->dwCaps = This->Surf->mddsdPrimary.ddsCaps.dwCaps; + pCaps->dwCaps = This->Owner->mddsdPrimary.ddsCaps.dwCaps; return DD_OK; } @@ -321,14 +321,14 @@ for now we aussme the surface exits and create the hDC for it */ - if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) - { - This->Surf->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); - *phDC = (HDC)This->Surf->mPrimaryLocal.hDC; + if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) + { + This->Owner->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); + *phDC = (HDC)This->Owner->mPrimaryLocal.hDC; } else { - *phDC = (HDC)This->Surf->mpPrimaryLocals[0]->hDC; + *phDC = (HDC)This->Owner->mpPrimaryLocals[0]->hDC; } return DD_OK; @@ -420,7 +420,7 @@ } RtlZeroMemory(pDDSD,dwSize); - memcpy(pDDSD, &This->Surf->mddsdPrimary, sizeof(DDSURFACEDESC)); + memcpy(pDDSD, &This->Owner->mddsdPrimary, sizeof(DDSURFACEDESC)); pDDSD->dwSize = dwSize; return DD_OK; @@ -482,7 +482,7 @@ /* FIXME check if surface exits or not */ - if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) + if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) { return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Mon Jul 24 19:37:03 2006 @@ -94,27 +94,25 @@ DDHAL_GETSCANLINEDATA mDdGetScanLine; DDHAL_SETEXCLUSIVEMODEDATA mDdSetExclusiveMode; DDHAL_FLIPTOGDISURFACEDATA mDdFlipToGDISurface; - - /* adding a switch */ - DWORD devicetype; - - /* Primarey surface we must reach it from every where */ - DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; - DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - -} IDirectDrawImpl; - -/******** Surface Object ********/ -typedef struct -{ - /* Primarey surface we must reach it from every where */ + + /* Primarey surface we must reach it from every where */ + DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; - DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; - DDSURFACEDESC2 mddsdPrimary; - - + DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; + DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; + + DDSURFACEDESC2 mddsdPrimary; + + /* adding a switch */ + DWORD devicetype; + +} IDirectDrawImpl; + +/******** Surface Object ********/ +typedef struct +{ DDRAWI_DDRAWSURFACE_LCL *mpInUseSurfaceLocals[1]; @@ -140,6 +138,12 @@ IDirectDrawSurface3Vtbl* lpVtbl_v3; IDirectDrawImpl* Owner; + + DDRAWI_DDRAWSURFACE_GBL Global; + DDRAWI_DDRAWSURFACE_MORE More; + DDRAWI_DDRAWSURFACE_LCL Local; + DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; + DDSURFACEDESC ddsd; DxSurf *Surf; 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 Jul 24 19:37:03 2006 @@ -364,17 +364,6 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); - /* Setup global surface */ - This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - /* FIXME free it in cleanup */ - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); - return DD_OK; }

18 years, 5 months

[fireball] 23265: ReactOS Status Report July 2006. If no major issues will be found, it's going to be published today

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 24 17:10:18 2006 New Revision: 23265 URL: http://svn.reactos.org/svn/reactos?rev=23265&view=rev Log: ReactOS Status Report July 2006. If no major issues will be found, it's going to be published today Added: trunk/press-media/Status Reports/July 2006/ trunk/press-media/Status Reports/July 2006/ReactOS status report.doc (with props) Added: trunk/press-media/Status Reports/July 2006/ReactOS status report.doc URL: http://svn.reactos.org/svn/reactos/trunk/press-media/Status%20Reports/July%… ============================================================================== Binary file - no diff available. Propchange: trunk/press-media/Status Reports/July 2006/ReactOS status report.doc ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

18 years, 5 months

[hpoussin] 23264: Don't try to free twice a pointer.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Jul 24 16:14:26 2006 New Revision: 23264 URL: http://svn.reactos.org/svn/reactos?rev=23264&view=rev Log: Don't try to free twice a pointer. Modified: trunk/reactos/dll/win32/setupapi/driver.c Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c (original) +++ trunk/reactos/dll/win32/setupapi/driver.c Mon Jul 24 16:14:26 2006 @@ -307,7 +307,7 @@ &RequiredSize); if (Result) { - /* We know know the needed buffer size */ + /* We know the needed buffer size */ ProviderName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); if (!ProviderName) { @@ -405,7 +405,10 @@ cleanup: if (!ret) + { HeapFree(GetProcessHeap(), 0, ProviderName); + *pProviderName = NULL; + } HeapFree(GetProcessHeap(), 0, DriverVer); return ret;

18 years, 5 months

[greatlrd] 23263: Kill a ungly hack; I will rewrite it later

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 24 12:34:18 2006 New Revision: 23263 URL: http://svn.reactos.org/svn/reactos?rev=23263&view=rev Log: Kill a ungly hack; I will rewrite it later Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Mon Jul 24 12:34:18 2006 @@ -488,55 +488,7 @@ } -const DDPIXELFORMAT pixelformats[] = -{ - /* 8bpp paletted */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 15bpp 5/5/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, - { 0x1F } }, - /* 16bpp 5/6/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, - { 0x1F } }, - /* 24bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 32bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } } -}; - -const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); - -/* more surface format not adding it */ - /* 4 bit paletted 0 */ - // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 - - ///* 8bpp paletted 1 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, - - ///* 15bpp 5:5:5 RGB 2 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, - - ///* 15bpp 1:5:5:5 ARGB 3 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, - - ///* 16bpp 5:6:5 RGB 4 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} - - ///* 16bpp 4:4:4:4 ARGB 5 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, - - /* 24bpp 8/8/8 RGB 6 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, - - /* 32bpp 8:8:8 RGB 7 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, - - /* 32bpp 8:8:8:8 ARGB 8*/ - // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} - + @@ -993,108 +945,7 @@ LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDSURFACEDESC2 desc_callback; - DEVMODE DevMode; - int iMode=0; - - if (pDDSD!=NULL) - { - // FIXME fill in pDDSD - } - - RtlZeroMemory(&desc_callback, sizeof(DDSURFACEDESC2)); - desc_callback.dwSize = sizeof(DDSURFACEDESC2); - - desc_callback.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_CAPS | DDSD_PITCH; - - if (dwFlags & DDEDM_REFRESHRATES) - { - desc_callback.dwFlags |= DDSD_REFRESHRATE; - desc_callback.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; - } - - - /// FIXME check if the mode are suppretd before sending it back - - while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0)) - { - - if (pDDSD) - { - if ((pDDSD->dwFlags & DDSD_WIDTH) && (pDDSD->dwWidth != DevMode.dmPelsWidth)) - continue; - if ((pDDSD->dwFlags & DDSD_HEIGHT) && (pDDSD->dwHeight != DevMode.dmPelsHeight)) - continue; - if ((pDDSD->dwFlags & DDSD_PIXELFORMAT) && (pDDSD->ddpfPixelFormat.dwFlags & DDPF_RGB) && - (pDDSD->ddpfPixelFormat.dwRGBBitCount != DevMode.dmBitsPerPel)) - continue; - } - - - desc_callback.dwHeight = DevMode.dmPelsHeight; - desc_callback.dwWidth = DevMode.dmPelsWidth; - - if (DevMode.dmFields & DM_DISPLAYFREQUENCY) - { - desc_callback.dwRefreshRate = DevMode.dmDisplayFrequency; - } - - switch(DevMode.dmBitsPerPel) - { - case 8: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[0],sizeof(DDPIXELFORMAT)); - break; - - case 15: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[1],sizeof(DDPIXELFORMAT)); - break; - - case 16: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[2],sizeof(DDPIXELFORMAT)); - break; - - - case 24: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[3],sizeof(DDPIXELFORMAT)); - break; - - case 32: - memcpy(&desc_callback.ddpfPixelFormat,&pixelformats[4],sizeof(DDPIXELFORMAT)); - break; - - default: - break; - } - - if (desc_callback.ddpfPixelFormat.dwRGBBitCount==15) - { - desc_callback.lPitch = DevMode.dmPelsWidth + (8 - ( DevMode.dmPelsWidth % 8)) % 8; - } - else - { - desc_callback.lPitch = DevMode.dmPelsWidth * (desc_callback.ddpfPixelFormat.dwRGBBitCount / 8); - desc_callback.lPitch = desc_callback.lPitch + (8 - (desc_callback.lPitch % 8)) % 8; - } - - desc_callback.ddsCaps.dwCaps = 0; - if (desc_callback.ddpfPixelFormat.dwFlags & DDPF_PALETTEINDEXED8) - { - desc_callback.ddsCaps.dwCaps |= DDSCAPS_PALETTE; - } - - - if (callback(&desc_callback, context) == DDENUMRET_CANCEL) - { - - return DD_OK; - } - - iMode++; - } - - return DD_OK; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags,

18 years, 5 months

[greatlrd] 23262: 1. move some member from global DirectDraw struct to Surface struct. 2. Free some memory I forget 3. Move some surface code to startup.c for it is global info. 4. Cleaning up bit more in ddraw_main.c Regress to createsurface for some apps that did work. Can not be help at moment. only 1 ms dx sdk 6 directdraw apps work, and DrFred demo apps. will fix this regress later.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 24 12:31:22 2006 New Revision: 23262 URL: http://svn.reactos.org/svn/reactos?rev=23262&view=rev Log: 1. move some member from global DirectDraw struct to Surface struct. 2. Free some memory I forget 3. Move some surface code to startup.c for it is global info. 4. Cleaning up bit more in ddraw_main.c Regress to createsurface for some apps that did work. Can not be help at moment. only 1 ms dx sdk 6 directdraw apps work, and DrFred demo apps. will fix this regress later. Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/main/surface_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/hal/surface_hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/hal/surf… ============================================================================== --- trunk/reactos/dll/directx/ddraw/hal/surface_hal.c (original) +++ trunk/reactos/dll/directx/ddraw/hal/surface_hal.c Mon Jul 24 12:31:22 2006 @@ -35,9 +35,9 @@ return DDERR_NODRIVERSUPPORT; } - mDdBlt.lpDDDestSurface = This->Owner->mpPrimaryLocals[0]; - - if (!DdResetVisrgn(This->Owner->mpPrimaryLocals[0], NULL)) + mDdBlt.lpDDDestSurface = This->Surf->mpPrimaryLocals[0]; + + if (!DdResetVisrgn(This->Surf->mpPrimaryLocals[0], NULL)) { return DDERR_NOGDI; } @@ -113,7 +113,7 @@ Lock.lpDD = &This->Owner->mDDrawGlobal; Lock.lpSurfData = NULL; - if (!DdResetVisrgn(&This->Owner->mPrimaryLocal, NULL)) + if (!DdResetVisrgn(&This->Surf->mPrimaryLocal, NULL)) { OutputDebugStringA("Here DdResetVisrgn lock"); return DDERR_UNSUPPORTED; @@ -138,13 +138,13 @@ { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC2)); // FIXME the interanl mddsdPrimary shall be DDSURFACEDESC2 - memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); + memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC2)); pDDSD->dwSize = sizeof(DDSURFACEDESC2); } if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { RtlZeroMemory(pDDSD,sizeof(DDSURFACEDESC)); - memcpy(pDDSD,&This->Owner->mddsdPrimary,sizeof(DDSURFACEDESC)); + memcpy(pDDSD,&This->Surf->mddsdPrimary,sizeof(DDSURFACEDESC)); pDDSD->dwSize = sizeof(DDSURFACEDESC); } Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Mon Jul 24 12:31:22 2006 @@ -260,315 +260,6 @@ -const DDPIXELFORMAT pixelformats[] = -{ - /* 8bpp paletted */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 15bpp 5/5/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, - { 0x1F } }, - /* 16bpp 5/6/5 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, - { 0x1F } }, - /* 24bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } }, - /* 32bpp 8/8/8 */ - { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, - { 0x00FF00 }, { 0x0000FF } } -}; - -const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); - -/* more surface format not adding it */ - /* 4 bit paletted 0 */ - // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 - - ///* 8bpp paletted 1 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, - - ///* 15bpp 5:5:5 RGB 2 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, - - ///* 15bpp 1:5:5:5 ARGB 3 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, - - ///* 16bpp 5:6:5 RGB 4 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} - - ///* 16bpp 4:4:4:4 ARGB 5 */ - //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, - - /* 24bpp 8/8/8 RGB 6 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, - - /* 32bpp 8:8:8 RGB 7 */ - // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, - - /* 32bpp 8:8:8:8 ARGB 8*/ - // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} - - - - -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ -HRESULT -WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - if (iface==NULL) - { - return DDERR_NOTINITIALIZED; - } - - if (This->InitializeDraw == TRUE) - { - return DDERR_ALREADYINITIALIZED; - } - else - { - This->InitializeDraw = TRUE; - } - - return DD_OK; -} - - - - - - -/* - * IMPLEMENT - * Status - * not finish yet but is working fine - * it prevent memmory leaks at exit - */ - - - - - - -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 - - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; - - // check the parameters - if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) - return DD_OK; - - if (This->cooperative_level) - return DDERR_EXCLUSIVEMODEALREADYSET; - - if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) - return DDERR_INVALIDPARAMS; - - if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) - return DDERR_INVALIDPARAMS; - - // set the data - This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; - This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); - - - /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ - //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags - - This->cooperative_level = cooplevel; - - if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) - { - DX_STUB_str("HAL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; - } - else - { - DX_STUB_str("HEL \n"); - SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; - } - - SetExclusiveMode.lpDD = &This->mDDrawGlobal; - SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; - SetExclusiveMode.dwEnterExcl = This->cooperative_level; - - if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) - { - return DDERR_NODRIVERSUPPORT; - } - - return SetExclusiveMode.ddRVal; -} - -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_WINDBG_trace(); - - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //BOOL dummy = TRUE; - - DX_WINDBG_trace_res((int)dwWidth, (int)dwHeight, (int)dwBPP ); - /* FIXME check the refresrate if it same if it not same do the mode switch */ - if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && - (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && - (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) - { - - return DD_OK; - } - - if (This->mDdSetMode.SetMode == NULL ) - { - return DDERR_NODRIVERSUPPORT; - } - - - This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; - - // FIXME : fill the mode.inexcl; - // FIXME : fill the mode.useRefreshRate; - - /* FIXME - we hardcoding modIndex list we should - try getting it from ReactOS instead and compare it - for now a small hack for do, using VBE 3.0 mode - index table todo it. - */ - - /* 320x200 15, 16, 32 */ - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x10d; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x10e; - } - - if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x10f; - } - - - /* 640x400 8 */ - if ((dwHeight == 400) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x100; - } - - /* 640x480 8, 15, 16 , 32*/ - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x101; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x110; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x111; - } - - if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x112; - } - - /* 800x600 4, 8, 15, 16 , 32*/ - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x102; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x103; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x113; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x114; - } - - if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x115; - } - - /* 1024x768 8, 15, 16 , 32*/ - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 4)) - { - This->mDdSetMode.dwModeIndex = 0x104; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 8)) - { - This->mDdSetMode.dwModeIndex = 0x105; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 15)) - { - This->mDdSetMode.dwModeIndex = 0x116; - } - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 16)) - { - This->mDdSetMode.dwModeIndex = 0x117; - } - - if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 32)) - { - This->mDdSetMode.dwModeIndex = 0x118; - } - - /* not coding for 1280x1024 */ - - - if (This->mDdSetMode.SetMode(&This->mDdSetMode)==DDHAL_DRIVER_HANDLED); - { - - //if (This->mDdSetMode.ddRVal == DD_OK) - //{ - // // DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); - // /* FIXME fill the This->DirectDrawGlobal.vmiData right */ - //} - - return This->mDdSetMode.ddRVal; - } - return DDERR_NODRIVERSUPPORT; -} - - - - - HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) @@ -577,113 +268,140 @@ DxSurf *surf; - if (pUnkOuter!=NULL) - return DDERR_INVALIDPARAMS; - - if(sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) - return DDERR_UNSUPPORTED; + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + IDirectDrawSurfaceImpl* That; + + + if (pUnkOuter!=NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface CLASS_E_NOAGGREGATION"); + return CLASS_E_NOAGGREGATION; + } + + if( sizeof(DDSURFACEDESC2)!=pDDSD->dwSize && sizeof(DDSURFACEDESC)!=pDDSD->dwSize) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_UNSUPPORTED1"); + return DDERR_UNSUPPORTED; + } + + if( This == NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_UNSUPPORTED2"); + return DDERR_UNSUPPORTED; + } + + if (This->mDDrawGlobal.dsList == NULL) + { + /* Fail alloc memmory at startup */ + DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY1"); + return E_OUTOFMEMORY; + } + + if (pDDSD->ddsCaps.dwCaps == 0) + { + pDDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + } + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) + { + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + if ((pDDSD->dwFlags & DDSD_LPSURFACE) && (pDDSD->lpSurface == NULL)) + { + pDDSD->dwFlags &= ~DDSD_LPSURFACE; + } + + That = (IDirectDrawSurfaceImpl*)DxHeapMemAlloc(sizeof(IDirectDrawSurfaceImpl)); + if (That == NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY2"); + return E_OUTOFMEMORY; + } + + surf = (DxSurf*)DxHeapMemAlloc(sizeof(DxSurf)); + if (surf == NULL) + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface E_OUTOFMEMORY3"); + DxHeapMemFree(That); + return E_OUTOFMEMORY; + } // the nasty com stuff - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - - IDirectDrawSurfaceImpl* That; - - That = (IDirectDrawSurfaceImpl*)HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectDrawSurfaceImpl)); - - if (That == NULL) - { - return E_OUTOFMEMORY; - } - ZeroMemory(That, sizeof(IDirectDrawSurfaceImpl)); - - surf = (DxSurf*)HeapAlloc(GetProcessHeap(), 0, sizeof(DxSurf)); - - if (surf == NULL) - { - // FIXME Free memmory at exit - return E_OUTOFMEMORY; - } - - That->lpVtbl = &DirectDrawSurface7_Vtable; That->lpVtbl_v3 = &DDRAW_IDDS3_Thunk_VTable; - *ppSurf = (LPDIRECTDRAWSURFACE7)That; - - // FIXME free This->mDDrawGlobal.dsList on release - This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(DDRAWI_DDRAWSURFACE_INT)); + *ppSurf = (LPDIRECTDRAWSURFACE7)That; + + /* setup some stuff */ That->Owner = (IDirectDrawImpl *)This; That->Owner->mDDrawGlobal.dsList->dwIntRefCnt =1; + That->Surf = surf; /* we alwasy set to use the DirectDrawSurface7_Vtable as internel */ That->Owner->mDDrawGlobal.dsList->lpVtbl = (PVOID) &DirectDrawSurface7_Vtable; - - - That->Surf = surf; - - // UINT i; - //IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - //IDirectDrawSurfaceImpl* That = ppSurf; - - - - - + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - memcpy(&That->Owner->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); - That->Owner->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + memcpy(&That->Surf->mddsdPrimary,pDDSD,sizeof(DDSURFACEDESC)); + That->Surf->mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); This->mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; - This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; + This->mDdCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; if (This->mDdCanCreateSurface.CanCreateSurface(&This->mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { + { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED1"); + DxHeapMemFree(That); + DxHeapMemFree(surf); return DDERR_NOTINITIALIZED; } if (This->mDdCanCreateSurface.ddRVal != DD_OK) { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED2"); + DxHeapMemFree(That); + DxHeapMemFree(surf); return DDERR_NOTINITIALIZED; } - memset(&That->Owner->mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - That->Owner->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - That->Owner->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; - That->Owner->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; - That->Owner->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; - That->Owner->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; - That->Owner->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; - - memset(&That->Owner->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Owner->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Owner->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Owner->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; - That->Owner->mPrimaryLocal.lpSurfMore = &That->Owner->mPrimaryMore; - That->Owner->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + memset(&That->Surf->mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + That->Surf->mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&That->Surf->mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + That->Surf->mPrimaryLocal.lpGbl = &That->Owner->mPrimaryGlobal; + That->Surf->mPrimaryLocal.lpSurfMore = &That->Surf->mPrimaryMore; + That->Surf->mPrimaryLocal.dwProcessId = GetCurrentProcessId(); /* FIXME Check the flags if we shall create a primaresurface for overlay or something else Examine windows which flags are being set for we assume this is right unsue I think */ //That->Surf->mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - That->Owner->mPrimaryLocal.ddsCaps.dwCaps = That->Owner->mddsdPrimary.ddsCaps.dwCaps; - That->Owner->mpPrimaryLocals[0] = &That->Owner->mPrimaryLocal; - + + /* + FIXME we are now supproting DDSURFACEDESC2 in rosdraw.h we need make use of it it + */ + That->Surf->mPrimaryLocal.ddsCaps.dwCaps = That->Surf->mddsdPrimary.ddsCaps.dwCaps; + That->Surf->mpPrimaryLocals[0] = &That->Surf->mPrimaryLocal; - - This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Owner->mddsdPrimary; - This->mDdCreateSurface.lplpSList = That->Owner->mpPrimaryLocals; + This->mDdCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&That->Surf->mddsdPrimary; + This->mDdCreateSurface.lplpSList = That->Surf->mpPrimaryLocals; This->mDdCreateSurface.dwSCnt = This->mDDrawGlobal.dsList->dwIntRefCnt ; if (This->mDdCreateSurface.CreateSurface(&This->mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface DDERR_NOTINITIALIZED3"); + DxHeapMemFree(That); + DxHeapMemFree(surf); return DDERR_NOTINITIALIZED; } if (This->mDdCreateSurface.ddRVal != DD_OK) { + DX_STUB_str("Fail Main_DirectDraw_CreateSurface ERROR"); + DxHeapMemFree(That); + DxHeapMemFree(surf); return This->mDdCreateSurface.ddRVal; } @@ -700,157 +418,51 @@ DDSD_ZBUFFERBITDEPTH */ - That->Owner->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; - RtlCopyMemory(&That->Owner->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); + That->Surf->mddsdPrimary.dwFlags = DDSD_CAPS + DDSD_PIXELFORMAT; + RtlCopyMemory(&That->Surf->mddsdPrimary.ddpfPixelFormat,&This->mDDrawGlobal.vmiData.ddpfDisplay,sizeof(DDPIXELFORMAT)); //RtlCopyMemory(&That->Surf->mddsdPrimary.ddsCaps,&This->mDDrawGlobal.ddCaps,sizeof(DDCORECAPS)); - //RtlCopyMemory(&pDDSD->ddckCKDestOverlay,&This->mDDrawGlobal.ddckCKDestOverlay,sizeof(DDCOLORKEY)); //RtlCopyMemory(&pDDSD->ddckCKSrcOverlay,&This->mDDrawGlobal.ddckCKSrcOverlay,sizeof(DDCOLORKEY)); if (This->mDDrawGlobal.vmiData.dwDisplayHeight != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_HEIGHT ; - That->Owner->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; + That->Surf->mddsdPrimary.dwFlags += DDSD_HEIGHT ; + That->Surf->mddsdPrimary.dwHeight = This->mDDrawGlobal.vmiData.dwDisplayHeight; } if (This->mDDrawGlobal.vmiData.dwDisplayWidth != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_WIDTH ; - That->Owner->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; + That->Surf->mddsdPrimary.dwFlags += DDSD_WIDTH ; + That->Surf->mddsdPrimary.dwWidth = This->mDDrawGlobal.vmiData.dwDisplayWidth; } if (This->mDDrawGlobal.vmiData.lDisplayPitch != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_PITCH ; - That->Owner->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; + That->Surf->mddsdPrimary.dwFlags += DDSD_PITCH ; + That->Surf->mddsdPrimary.lPitch = This->mDDrawGlobal.vmiData.lDisplayPitch; } if ( This->mDDrawGlobal.dwMonitorFrequency != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; - That->Owner->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; + That->Surf->mddsdPrimary.dwFlags += DDSD_REFRESHRATE ; + That->Surf->mddsdPrimary.dwRefreshRate = This->mDDrawGlobal.dwMonitorFrequency; } if (This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth != 0) { - That->Owner->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; - That->Owner->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; + That->Surf->mddsdPrimary.dwFlags += DDSD_ALPHABITDEPTH ; + That->Surf->mddsdPrimary.dwAlphaBitDepth = This->mDDrawGlobal.vmiData.ddpfDisplay.dwAlphaBitDepth; } - That->Surf->mpInUseSurfaceLocals[0] = &That->Owner->mPrimaryLocal; + That->Surf->mpInUseSurfaceLocals[0] = &That->Surf->mPrimaryLocal; + + DX_STUB_str("Fail Main_DirectDraw_CreateSurface OK"); return DD_OK; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) { - memset(&That->Surf->mddsdOverlay, 0, sizeof(DDSURFACEDESC)); - memcpy(&That->Surf->mddsdOverlay, pDDSD, sizeof(DDSURFACEDESC)); - That->Surf->mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); - That->Surf->mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; - That->Surf->mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - - That->Surf->mddsdOverlay.dwWidth = pDDSD->dwWidth; //pels; - That->Surf->mddsdOverlay.dwHeight = pDDSD->dwHeight; // lines; - That->Surf->mddsdOverlay.dwBackBufferCount = 1; //cBuffers; - - That->Surf->mddsdOverlay.ddpfPixelFormat.dwSize = pDDSD->ddpfPixelFormat.dwSize; - That->Surf->mddsdOverlay.ddpfPixelFormat.dwFlags = pDDSD->ddpfPixelFormat.dwFlags; - That->Surf->mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = pDDSD->ddpfPixelFormat.dwRGBBitCount; - - DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; - mDdCanCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCanCreateSurface.CanCreateSurface = This->mCallbacks.HALDD.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay; // pDDSD; - - if (This->mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - return DDERR_NOTINITIALIZED; - } - - - memset(&That->Surf->mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - That->Surf->mOverlayGlobal.dwGlobalFlags = 0; - That->Surf->mOverlayGlobal.lpDD = &This->mDDrawGlobal; - That->Surf->mOverlayGlobal.lpDDHandle = &This->mDDrawGlobal; - That->Surf->mOverlayGlobal.wWidth = (WORD)That->Surf->mddsdOverlay.dwWidth; - That->Surf->mOverlayGlobal.wHeight = (WORD)That->Surf->mddsdOverlay.dwHeight; - That->Surf->mOverlayGlobal.lPitch = -1; - That->Surf->mOverlayGlobal.ddpfSurface = That->Surf->mddsdOverlay.ddpfPixelFormat; - - memset(&That->Surf->mOverlayMore[0], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - That->Surf->mOverlayMore[0].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - memset(&That->Surf->mOverlayLocal[0], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - That->Surf->mOverlayLocal[0].lpGbl = &That->Surf->mOverlayGlobal; - That->Surf->mOverlayLocal[0].lpSurfMore = &That->Surf->mOverlayMore[0]; - That->Surf-> mOverlayLocal[0].dwProcessId = GetCurrentProcessId(); - That->Surf->mOverlayLocal[0].dwFlags = DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER; - - That->Surf->mOverlayLocal[0].dwFlags |= - DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| - DDRAWISURF_HASPIXELFORMAT| - DDRAWISURF_HASOVERLAYDATA; - - That->Surf->mOverlayLocal[0].ddsCaps.dwCaps = That->Surf->mddsdOverlay.ddsCaps.dwCaps; - That->Surf->mpOverlayLocals[0] = &That->Surf->mOverlayLocal[0]; - - - DDHAL_CREATESURFACEDATA mDdCreateSurface; - mDdCreateSurface.lpDD = &This->mDDrawGlobal; - mDdCreateSurface.CreateSurface = This->mCallbacks.HALDD.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &That->Surf->mddsdOverlay;//pDDSD; - mDdCreateSurface.lplpSList = That->Surf->mpOverlayLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - - if (This->mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - - if (mDdCreateSurface.ddRVal != DD_OK) - { - return mDdCreateSurface.ddRVal; - } - -/* - DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; - mDdUpdateOverlay.lpDD = &This->mDDrawGlobal; - mDdUpdateOverlay.UpdateOverlay = This->mCallbacks.HALDDSurface.UpdateOverlay; - mDdUpdateOverlay.lpDDDestSurface = This->mpPrimaryLocals[0]; - mDdUpdateOverlay.lpDDSrcSurface = That->Surf->mpOverlayLocals[0];//pDDSurface; - mDdUpdateOverlay.dwFlags = DDOVER_SHOW; - - - mDdUpdateOverlay.rDest.top = 0; - mDdUpdateOverlay.rDest.left = 0; - mDdUpdateOverlay.rDest.right = 50; - mDdUpdateOverlay.rDest.bottom = 50; - - mDdUpdateOverlay.rSrc.top = 0; - mDdUpdateOverlay.rSrc.left = 0; - mDdUpdateOverlay.rSrc.right = 50; - mDdUpdateOverlay.rSrc.bottom = 50; - - if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) - { - return DDERR_NOTINITIALIZED; - } - - if (mDdUpdateOverlay.ddRVal != DD_OK) - { - return mDdUpdateOverlay.ddRVal; - } -*/ - - That->Surf->mpInUseSurfaceLocals[0] = That->Surf->mpOverlayLocals[0]; - return DD_OK; + DX_STUB_str( "Can not create overlay surface"); } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_BACKBUFFER) { @@ -869,9 +481,324 @@ DX_STUB_str( "Can not create offscreenplain surface"); } + DxHeapMemFree(That); + DxHeapMemFree(surf); return DDERR_INVALIDSURFACETYPE; } + + +const DDPIXELFORMAT pixelformats[] = +{ + /* 8bpp paletted */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } }, + /* 15bpp 5/5/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0x7C00 }, { 0x3E0 }, + { 0x1F } }, + /* 16bpp 5/6/5 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 16 }, { 0xF800 }, { 0x7E0 }, + { 0x1F } }, + /* 24bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 24 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } }, + /* 32bpp 8/8/8 */ + { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, { 32 }, { 0xFF0000 }, + { 0x00FF00 }, { 0x0000FF } } +}; + +const DWORD pixelformatsCount = sizeof(pixelformats) / sizeof(DDPIXELFORMAT); + +/* more surface format not adding it */ + /* 4 bit paletted 0 */ + // sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_PALETTEINDEXED4, 0, 4, 0x00, 0x00, 0x00, 0x00 + + ///* 8bpp paletted 1 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB|DDPF_PALETTEINDEXED8, 0, 8, 0, 0, 0, 0}, + + ///* 15bpp 5:5:5 RGB 2 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x7c00, 0x03e0, 0x001f, 0}, + + ///* 15bpp 1:5:5:5 ARGB 3 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 16, 0x7c00, 0x03e0, 0x001f, 0x8000}, + + ///* 16bpp 5:6:5 RGB 4 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0xf800, 0x07e0, 0x001f, 0} + + ///* 16bpp 4:4:4:4 ARGB 5 */ + //{sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS,´0, 16, 0x0f00, 0x00f0, 0x000f, 0xf000}, + + /* 24bpp 8/8/8 RGB 6 */ + // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24 , 0x00FF0000, 0x0000FF00 , 0x000000FF, 0 }, + + /* 32bpp 8:8:8 RGB 7 */ + // {sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0}, + + /* 32bpp 8:8:8:8 ARGB 8*/ + // {sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000} + + + + +/* + * IMPLEMENT + * Status this api is finish and is 100% correct + */ +HRESULT +WINAPI +Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + if (iface==NULL) + { + return DDERR_NOTINITIALIZED; + } + + if (This->InitializeDraw == TRUE) + { + return DDERR_ALREADYINITIALIZED; + } + else + { + This->InitializeDraw = TRUE; + } + + return DD_OK; +} + + + + + + +/* + * IMPLEMENT + * Status + * not finish yet but is working fine + * it prevent memmory leaks at exit + */ + + + + + + +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 + + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_SETEXCLUSIVEMODEDATA SetExclusiveMode; + + // check the parameters + if ((This->cooperative_level == cooplevel) && ((HWND)This->mDDrawGlobal.lpExclusiveOwner->hWnd == hwnd)) + return DD_OK; + + if (This->cooperative_level) + return DDERR_EXCLUSIVEMODEALREADYSET; + + if ((cooplevel&DDSCL_EXCLUSIVE) && !(cooplevel&DDSCL_FULLSCREEN)) + return DDERR_INVALIDPARAMS; + + if (cooplevel&DDSCL_NORMAL && cooplevel&DDSCL_FULLSCREEN) + return DDERR_INVALIDPARAMS; + + // set the data + This->mDDrawGlobal.lpExclusiveOwner->hWnd = (ULONG_PTR) hwnd; + This->mDDrawGlobal.lpExclusiveOwner->hDC = (ULONG_PTR)GetDC(hwnd); + + + /* FIXME : fill the mDDrawGlobal.lpExclusiveOwner->dwLocalFlags right */ + //mDDrawGlobal.lpExclusiveOwner->dwLocalFlags + + This->cooperative_level = cooplevel; + + if ((This->mDDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETEXCLUSIVEMODE)) + { + DX_STUB_str("HAL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HALDD.SetExclusiveMode; + } + else + { + DX_STUB_str("HEL \n"); + SetExclusiveMode.SetExclusiveMode = This->mDDrawGlobal.lpDDCBtmp->HELDD.SetExclusiveMode; + } + + SetExclusiveMode.lpDD = &This->mDDrawGlobal; + SetExclusiveMode.ddRVal = DDERR_NOTPALETTIZED; + SetExclusiveMode.dwEnterExcl = This->cooperative_level; + + if (SetExclusiveMode.SetExclusiveMode(&SetExclusiveMode) != DDHAL_DRIVER_HANDLED) + { + return DDERR_NODRIVERSUPPORT; + } + + return SetExclusiveMode.ddRVal; +} + +HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +{ + DX_WINDBG_trace(); + + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + //BOOL dummy = TRUE; + + DX_WINDBG_trace_res((int)dwWidth, (int)dwHeight, (int)dwBPP ); + /* FIXME check the refresrate if it same if it not same do the mode switch */ + if ((This->mDDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && + (This->mDDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && + (This->mDDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) + { + + return DD_OK; + } + + if (This->mDdSetMode.SetMode == NULL ) + { + return DDERR_NODRIVERSUPPORT; + } + + + This->mDdSetMode.ddRVal = DDERR_NODRIVERSUPPORT; + + // FIXME : fill the mode.inexcl; + // FIXME : fill the mode.useRefreshRate; + + /* FIXME + we hardcoding modIndex list we should + try getting it from ReactOS instead and compare it + for now a small hack for do, using VBE 3.0 mode + index table todo it. + */ + + /* 320x200 15, 16, 32 */ + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x10d; + } + + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x10e; + } + + if ((dwHeight == 200) && (dwWidth == 320) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x10f; + } + + + /* 640x400 8 */ + if ((dwHeight == 400) && (dwWidth == 640) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x100; + } + + /* 640x480 8, 15, 16 , 32*/ + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x101; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x110; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x111; + } + + if ((dwHeight == 480) && (dwWidth == 640) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x112; + } + + /* 800x600 4, 8, 15, 16 , 32*/ + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 4)) + { + This->mDdSetMode.dwModeIndex = 0x102; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x103; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x113; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x114; + } + + if ((dwHeight == 600) && (dwWidth == 800) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x115; + } + + /* 1024x768 8, 15, 16 , 32*/ + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 4)) + { + This->mDdSetMode.dwModeIndex = 0x104; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 8)) + { + This->mDdSetMode.dwModeIndex = 0x105; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 15)) + { + This->mDdSetMode.dwModeIndex = 0x116; + } + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 16)) + { + This->mDdSetMode.dwModeIndex = 0x117; + } + + if ((dwHeight == 768) && (dwWidth == 1024) && (dwBPP == 32)) + { + This->mDdSetMode.dwModeIndex = 0x118; + } + + /* not coding for 1280x1024 */ + + + if (This->mDdSetMode.SetMode(&This->mDdSetMode)==DDHAL_DRIVER_HANDLED); + { + + //if (This->mDdSetMode.ddRVal == DD_OK) + //{ + // // DdReenableDirectDrawObject(&This->mDDrawGlobal, &dummy); + // /* FIXME fill the This->DirectDrawGlobal.vmiData right */ + //} + + return This->mDdSetMode.ddRVal; + } + return DDERR_NODRIVERSUPPORT; +} + + + + + + + Modified: trunk/reactos/dll/directx/ddraw/main/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/sur… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/surface_main.c Mon Jul 24 12:31:22 2006 @@ -125,7 +125,7 @@ That = (IDirectDrawSurfaceImpl*)pAttach; //FIXME Have I put This and That in right order ?? DdAttachSurface(from, to) - return DdAttachSurface( That->Owner->mpPrimaryLocals[0],This->Owner->mpPrimaryLocals[0]); + return DdAttachSurface( That->Surf->mpPrimaryLocals[0],This->Surf->mpPrimaryLocals[0]); } /* MSDN: "not currently implemented." */ @@ -274,7 +274,7 @@ This = (IDirectDrawSurfaceImpl*)iface; RtlZeroMemory(pCaps,sizeof(DDSCAPS2)); - pCaps->dwCaps = This->Owner->mddsdPrimary.ddsCaps.dwCaps; + pCaps->dwCaps = This->Surf->mddsdPrimary.ddsCaps.dwCaps; return DD_OK; } @@ -321,14 +321,14 @@ for now we aussme the surface exits and create the hDC for it */ - if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) - { - This->Owner->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); - *phDC = (HDC)This->Owner->mPrimaryLocal.hDC; + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) + { + This->Surf->mPrimaryLocal.hDC = (ULONG_PTR)GetDC((HWND)This->Owner->mDDrawGlobal.lpExclusiveOwner->hWnd); + *phDC = (HDC)This->Surf->mPrimaryLocal.hDC; } else { - *phDC = (HDC)This->Owner->mpPrimaryLocals[0]->hDC; + *phDC = (HDC)This->Surf->mpPrimaryLocals[0]->hDC; } return DD_OK; @@ -420,7 +420,7 @@ } RtlZeroMemory(pDDSD,dwSize); - memcpy(pDDSD, &This->Owner->mddsdPrimary, sizeof(DDSURFACEDESC)); + memcpy(pDDSD, &This->Surf->mddsdPrimary, sizeof(DDSURFACEDESC)); pDDSD->dwSize = dwSize; return DD_OK; @@ -482,7 +482,7 @@ /* FIXME check if surface exits or not */ - if ((HDC)This->Owner->mPrimaryLocal.hDC == NULL) + if ((HDC)This->Surf->mPrimaryLocal.hDC == NULL) { return DDERR_GENERIC; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Mon Jul 24 12:31:22 2006 @@ -94,25 +94,27 @@ DDHAL_GETSCANLINEDATA mDdGetScanLine; DDHAL_SETEXCLUSIVEMODEDATA mDdSetExclusiveMode; DDHAL_FLIPTOGDISURFACEDATA mDdFlipToGDISurface; - - /* Primarey surface we must reach it from every where */ - DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + + /* adding a switch */ + DWORD devicetype; + + /* Primarey surface we must reach it from every where */ + DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; + +} IDirectDrawImpl; + +/******** Surface Object ********/ +typedef struct +{ + /* Primarey surface we must reach it from every where */ DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; - DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; - DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; - - DDSURFACEDESC2 mddsdPrimary; - - /* adding a switch */ - DWORD devicetype; - -} IDirectDrawImpl; - -/******** Surface Object ********/ -typedef struct -{ + DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; + DDSURFACEDESC2 mddsdPrimary; + + DDRAWI_DDRAWSURFACE_LCL *mpInUseSurfaceLocals[1]; @@ -138,12 +140,6 @@ IDirectDrawSurface3Vtbl* lpVtbl_v3; IDirectDrawImpl* Owner; - - DDRAWI_DDRAWSURFACE_GBL Global; - DDRAWI_DDRAWSURFACE_MORE More; - DDRAWI_DDRAWSURFACE_LCL Local; - DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; - DDSURFACEDESC ddsd; DxSurf *Surf; 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 Jul 24 12:31:22 2006 @@ -364,6 +364,17 @@ DriverInfo.dwExpectedSize = sizeof(DDHAL_DDMISCELLANEOUSCALLBACKS); This->mHALInfo.GetDriverInfo(&DriverInfo); + /* Setup global surface */ + This->mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + This->mPrimaryGlobal.lpDD = &This->mDDrawGlobal; + This->mPrimaryGlobal.lpDDHandle = &This->mDDrawGlobal; + This->mPrimaryGlobal.wWidth = (WORD)This->mpModeInfos[0].dwWidth; + This->mPrimaryGlobal.wHeight = (WORD)This->mpModeInfos[0].dwHeight; + This->mPrimaryGlobal.lPitch = This->mpModeInfos[0].lPitch; + + /* FIXME free it in cleanup */ + This->mDDrawGlobal.dsList = (LPDDRAWI_DDRAWSURFACE_INT)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_INT)); + return DD_OK; }

18 years, 5 months

[greatlrd] 23261: Revert 23251 it causing regress and it is ungly hack

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Jul 24 10:28:30 2006 New Revision: 23261 URL: http://svn.reactos.org/svn/reactos?rev=23261&view=rev Log: Revert 23251 it causing regress and it is ungly hack Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Mon Jul 24 10:28:30 2006 @@ -1506,17 +1506,6 @@ { DPRINT1("Failed to reference window class!\n"); RETURN(NULL); - } - - if (Class->System) - { - if (hWndParent) - { - /* HACK - * use supplied window handle for notifications - */ - ParentWindowHandle = hWndParent; - } } WinSta = PsGetCurrentThreadWin32Thread()->Desktop->WindowStation;

18 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006