Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 27265: small redesgin do not type cast DirectDraw COM to LPDDRAWI_DIRECTDRAW_INT, use LPDDRAWI_DIRECTDRAW_INT as prototype in all directdraw functions.
by greatlrd＠svn.reactos.org 22 Jun '07

22 Jun '07

Author: greatlrd Date: Sat Jun 23 00:03:04 2007 New Revision: 27265 URL: http://svn.reactos.org/svn/reactos?rev=27265&view=rev Log: small redesgin do not type cast DirectDraw COM to LPDDRAWI_DIRECTDRAW_INT, use LPDDRAWI_DIRECTDRAW_INT as prototype in all directdraw functions. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/cleanup.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Sat Jun 23 00:03:04 2007 @@ -25,11 +25,10 @@ HRESULT WINAPI -Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, +Main_DirectDraw_GetCaps( LPDDRAWI_DIRECTDRAW_INT This, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { HRESULT retVal = DDERR_INVALIDPARAMS; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); @@ -50,7 +49,7 @@ DWORD dwTotal = 0; DWORD dwFree = 0; - Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); + Main_DirectDraw_GetAvailableVidMem4(This, &ddscaps, &dwTotal, &dwFree); switch (pDriverCaps->dwSize) { @@ -158,7 +157,7 @@ DWORD dwTotal = 0; DWORD dwFree = 0; - Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); + Main_DirectDraw_GetAvailableVidMem4(This, &ddscaps, &dwTotal, &dwFree); switch (pHELCaps->dwSize) { Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c Sat Jun 23 00:03:04 2007 @@ -25,7 +25,7 @@ #include <pseh/pseh.h> /* For DirectDraw 4 - 6 */ HRESULT WINAPI -Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4 iface, +Main_DirectDraw_GetDeviceIdentifier(LPDDRAWI_DIRECTDRAW_INT This, LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) { HRESULT retVal = DD_OK; @@ -37,7 +37,7 @@ { memcpy(&pDDDI2 , pDDDI, sizeof(DDDEVICEIDENTIFIER)); - retVal = Main_DirectDraw_GetDeviceIdentifier7((LPDIRECTDRAW7)iface, &pDDDI2, dwFlags); + retVal = Main_DirectDraw_GetDeviceIdentifier7(This, &pDDDI2, dwFlags); if (IsBadWritePtr(pDDDI, sizeof(DDDEVICEIDENTIFIER))) { @@ -58,7 +58,7 @@ } HRESULT WINAPI -Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7 iface, +Main_DirectDraw_GetDeviceIdentifier7(LPDDRAWI_DIRECTDRAW_INT This, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) { HRESULT retVal = DDERR_INVALIDPARAMS; @@ -72,8 +72,6 @@ char *pdest; char* pcCnvEnd; long *lpdata; - - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; DX_WINDBG_trace(); Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Sat Jun 23 00:03:04 2007 @@ -1,68 +1,175 @@ -// public interfaces -HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 , REFIID , LPVOID *); -ULONG WINAPI Main_DirectDraw_AddRef(LPDIRECTDRAW7 ); -ULONG WINAPI Main_DirectDraw_Release(LPDIRECTDRAW7 ); -HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 ); -HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown *); -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE*, LPUNKNOWN); -HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7*); -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW4, LPDDDEVICEIDENTIFIER, DWORD); -HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier7(LPDIRECTDRAW7, LPDDDEVICEIDENTIFIER2, DWORD); +/* public interfaces we doing pur type cast here instead in the code, it will make more cleaner code */ -HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7, DWORD, LPDDSURFACEDESC2, LPVOID, - LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI +Main_DirectDraw_QueryInterface ( + LPDDRAWI_DIRECTDRAW_INT This, + REFIID id, + LPVOID *obj); -HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7); -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7, HDC, LPDIRECTDRAWSURFACE7 *); -HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7, LPDDCAPS pDriverCaps, LPDDCAPS); -HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7, LPDWORD pNumCodes, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7 *); -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7, DWORD dwFlags, HANDLE); -HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7, LPBOOL); -HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7); -HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7, HWND, DWORD); -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD); -HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface); -HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface); -HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID); -HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags); -HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b); +ULONG WINAPI +Main_DirectDraw_AddRef (LPDDRAWI_DIRECTDRAW_INT This); -HRESULT WINAPI Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 , REFIID , LPVOID *); -ULONG WINAPI Main_DirectDraw_AddRef(LPDIRECTDRAW7 ); -ULONG WINAPI Main_DirectDraw_Release(LPDIRECTDRAW7 ); -HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 ); -HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7, DWORD, LPDIRECTDRAWCLIPPER *, IUnknown *); -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7, DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE*, LPUNKNOWN); -HRESULT WINAPI Main_DirectDraw_CreateSurface(LPDIRECTDRAW, LPDDSURFACEDESC, LPDIRECTDRAWSURFACE *, IUnknown *); -HRESULT WINAPI Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7, LPDDSURFACEDESC2, LPDIRECTDRAWSURFACE7 *, IUnknown *); -HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7, LPDIRECTDRAWSURFACE7*); +ULONG WINAPI +Main_DirectDraw_Release (LPDDRAWI_DIRECTDRAW_INT This); + +HRESULT WINAPI +Main_DirectDraw_Compact(LPDDRAWI_DIRECTDRAW_INT This); + +HRESULT WINAPI +Main_DirectDraw_CreateClipper( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreatePalette( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPPALETTEENTRY palent, + LPDIRECTDRAWPALETTE* ppPalette, + LPUNKNOWN pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreateSurface4( + LPDDRAWI_DIRECTDRAW_INT This, + LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_DuplicateSurface( + LPDDRAWI_DIRECTDRAW_INT This, + LPDIRECTDRAWSURFACE7 src, + LPDIRECTDRAWSURFACE7* dst); + +HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDDSURFACEDESC2 pDDSD, + LPVOID pContext, + LPDDENUMMODESCALLBACK2 pCallback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK7 callback); + +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDDRAWI_DIRECTDRAW_INT This); + +HRESULT WINAPI +Main_DirectDraw_GetCaps( + LPDDRAWI_DIRECTDRAW_INT This, + LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps); + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode ( + LPDDRAWI_DIRECTDRAW_INT This, + LPDDSURFACEDESC2 pDDSD); + +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes( + LPDDRAWI_DIRECTDRAW_INT This, + LPDWORD lpNumCodes, + LPDWORD lpCodes); + +HRESULT WINAPI +Main_DirectDraw_GetGDISurface( + LPDDRAWI_DIRECTDRAW_INT This, + LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface); + +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency ( + LPDDRAWI_DIRECTDRAW_INT This, + LPDWORD lpFreq); -HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7, DWORD, LPDDSURFACEDESC2, LPVOID, - LPDDENUMSURFACESCALLBACK7); +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDDRAWI_DIRECTDRAW_INT This, + LPDWORD lpdwScanLine); -HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7); -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7, LPDDSURFACEDESC2); -HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7, HDC, LPDIRECTDRAWSURFACE7 *); -HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7, LPDDCAPS pDriverCaps, LPDDCAPS); -HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7, LPDWORD pNumCodes, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7, LPDIRECTDRAWSURFACE7 *); -HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7, DWORD dwFlags, HANDLE); -HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7, LPDWORD); -HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7, LPBOOL); -HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7); -HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7, HWND, DWORD); -HRESULT WINAPI Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD); -HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface); -HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface); -HRESULT WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID); -HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags); -HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b); +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus( + LPDDRAWI_DIRECTDRAW_INT This, + LPBOOL lpbIsInVB); + +HRESULT WINAPI +Main_DirectDraw_Initialize ( + LPDDRAWI_DIRECTDRAW_INT This, + LPGUID lpGUID); + + +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode (LPDDRAWI_DIRECTDRAW_INT This); + +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel ( + LPDDRAWI_DIRECTDRAW_INT This, + HWND hwnd, + DWORD cooplevel); + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwBPP, + DWORD dwRefreshRate, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwFlags, + HANDLE h); + + +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem4( + LPDDRAWI_DIRECTDRAW_INT This, + LPDDSCAPS2 ddscaps, + LPDWORD dwTotal, + LPDWORD dwFree); + +HRESULT WINAPI +Main_DirectDraw_GetSurfaceFromDC( + LPDDRAWI_DIRECTDRAW_INT This, + HDC hdc, + LPDIRECTDRAWSURFACE7 *lpDDS); + +HRESULT WINAPI +Main_DirectDraw_RestoreAllSurfaces(LPDDRAWI_DIRECTDRAW_INT This); + +HRESULT WINAPI +Main_DirectDraw_TestCooperativeLevel(LPDDRAWI_DIRECTDRAW_INT This); + +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier7( + LPDDRAWI_DIRECTDRAW_INT This, + LPDDDEVICEIDENTIFIER2 pDDDI, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_StartModeTest( + LPDDRAWI_DIRECTDRAW_INT This, + LPSIZE pModes, + DWORD dwNumModes, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_EvaluateMode( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD a, + DWORD* b); + + + // hel callbacks Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Sat Jun 23 00:03:04 2007 @@ -15,11 +15,10 @@ #include <pseh/pseh.h> HRESULT WINAPI -Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, +Main_DirectDraw_EnumDisplayModes(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID pContext, LPDDENUMMODESCALLBACK2 pCallback) { HRESULT ret = DD_OK; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; INT iMode = 0; DEVMODE DevMode; @@ -117,10 +116,9 @@ } HRESULT WINAPI -Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, +Main_DirectDraw_SetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; HRESULT ret = DD_OK; DX_STUB_str("here\n"); @@ -181,7 +179,7 @@ BOOL ModeChanged; This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); - StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); + StartDirectDraw((LPDIRECTDRAW)This, 0, TRUE); } } } @@ -195,9 +193,8 @@ } HRESULT WINAPI -Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW7 iface) -{ - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; +Main_DirectDraw_RestoreDisplayMode (LPDDRAWI_DIRECTDRAW_INT This) +{ DX_WINDBG_trace(); _SEH_TRY @@ -211,7 +208,7 @@ This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); - StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); + StartDirectDraw((LPDIRECTDRAW)This, 0, TRUE); } _SEH_HANDLE { @@ -223,10 +220,9 @@ } HRESULT WINAPI -Main_DirectDraw_GetMonitorFrequency (LPDIRECTDRAW7 iface, LPDWORD lpFreq) +Main_DirectDraw_GetMonitorFrequency (LPDDRAWI_DIRECTDRAW_INT This, LPDWORD lpFreq) { HRESULT retVal = DD_OK; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); _SEH_TRY @@ -257,10 +253,9 @@ } HRESULT WINAPI -Main_DirectDraw_GetDisplayMode (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) +Main_DirectDraw_GetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD) { HRESULT retVal = DD_OK; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); _SEH_TRY Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sat Jun 23 00:03:04 2007 @@ -22,12 +22,11 @@ #include <pseh/pseh.h> HRESULT WINAPI -Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, +Main_DirectDraw_QueryInterface (LPDDRAWI_DIRECTDRAW_INT This, REFIID id, LPVOID *obj) { HRESULT retVal = DD_OK; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); @@ -55,13 +54,13 @@ newThis->lpLcl = This->lpLcl; newThis->lpLink = This; *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + Main_DirectDraw_AddRef(newThis); } } else { *obj = This; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } } else if (IsEqualGUID(&IID_IDirectDraw4, id)) @@ -82,13 +81,13 @@ newThis->lpLcl = This->lpLcl; newThis->lpLink = This; *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + Main_DirectDraw_AddRef(newThis); } } else { *obj = This; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } } else if (IsEqualGUID(&IID_IDirectDraw2, id)) @@ -109,13 +108,13 @@ newThis->lpLcl = This->lpLcl; newThis->lpLink = This; *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + Main_DirectDraw_AddRef(newThis); } } else { *obj = This; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } } else if (IsEqualGUID(&IID_IDirectDraw, id)) @@ -136,13 +135,13 @@ newThis->lpLcl = This->lpLcl; newThis->lpLink = This; *obj = &newThis->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)newThis); + Main_DirectDraw_AddRef(newThis); } } else { *obj = This; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } } else @@ -161,10 +160,9 @@ } ULONG WINAPI -Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) +Main_DirectDraw_AddRef (LPDDRAWI_DIRECTDRAW_INT This) { ULONG retValue = 0; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); @@ -200,15 +198,14 @@ ULONG WINAPI -Main_DirectDraw_Release (LPDIRECTDRAW7 iface) +Main_DirectDraw_Release (LPDDRAWI_DIRECTDRAW_INT This) { ULONG Counter = 0; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - DX_WINDBG_trace(); - _SEH_TRY - { - if (iface!=NULL) + + DX_WINDBG_trace(); + _SEH_TRY + { + if (This!=NULL) { This->lpLcl->dwLocalRefCnt--; This->dwIntRefCnt--; @@ -226,7 +223,7 @@ ChangeDisplaySettings(NULL, 0); }*/ - Cleanup(iface); + Cleanup(This); } /* FIXME cleanup being not call why ?? */ @@ -245,7 +242,7 @@ } HRESULT WINAPI -Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) +Main_DirectDraw_Initialize (LPDDRAWI_DIRECTDRAW_INT This, LPGUID lpGUID) { return DDERR_ALREADYINITIALIZED; } @@ -256,10 +253,9 @@ * when no exclusive owner are set in corpativelevel */ HRESULT WINAPI -Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) +Main_DirectDraw_Compact(LPDDRAWI_DIRECTDRAW_INT This) { HRESULT retVal = DD_OK; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT) iface; DX_WINDBG_trace(); // EnterCriticalSection(&ddcs); @@ -280,7 +276,7 @@ } HRESULT WINAPI -Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW2 iface, LPDDSCAPS ddscaps, LPDWORD dwTotal, LPDWORD dwFree) +Main_DirectDraw_GetAvailableVidMem(LPDDRAWI_DIRECTDRAW_INT This, LPDDSCAPS ddscaps, LPDWORD dwTotal, LPDWORD dwFree) { DDSCAPS2 myddscaps; HRESULT retValue = DD_OK; @@ -290,7 +286,7 @@ _SEH_TRY { myddscaps.dwCaps = ddscaps->dwCaps; - retValue = Main_DirectDraw_GetAvailableVidMem4((LPDIRECTDRAW7)iface, &myddscaps, dwTotal, dwFree); + retValue = Main_DirectDraw_GetAvailableVidMem4(This, &myddscaps, dwTotal, dwFree); } _SEH_HANDLE { @@ -302,12 +298,12 @@ } HRESULT WINAPI -Main_DirectDraw_GetAvailableVidMem4(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, +Main_DirectDraw_GetAvailableVidMem4(LPDDRAWI_DIRECTDRAW_INT This, LPDDSCAPS2 ddscaps, LPDWORD dwTotal, LPDWORD dwFree) { HRESULT retVal = DD_OK; DDHAL_GETAVAILDRIVERMEMORYDATA memdata; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); _SEH_TRY @@ -402,9 +398,8 @@ } HRESULT WINAPI -Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD lpNumCodes, LPDWORD lpCodes) -{ - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; +Main_DirectDraw_GetFourCCCodes(LPDDRAWI_DIRECTDRAW_INT This, LPDWORD lpNumCodes, LPDWORD lpCodes) +{ HRESULT retVal = DD_OK; DX_WINDBG_trace(); @@ -463,7 +458,7 @@ /* For DirectDraw 1 - 3 */ HRESULT WINAPI -Main_DirectDraw_CreateSurface (LPDIRECTDRAW iface, LPDDSURFACEDESC pDDSD, +Main_DirectDraw_CreateSurface (LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC pDDSD, LPDIRECTDRAWSURFACE *ppSurf, IUnknown *pUnkOuter) { HRESULT ret = DDERR_GENERIC; @@ -477,7 +472,7 @@ if (pDDSD->dwSize == sizeof(DDSURFACEDESC)) { CopyDDSurfDescToDDSurfDesc2(&dd_desc_v2, (LPDDSURFACEDESC)pDDSD); - ret = Internal_CreateSurface((LPDDRAWI_DIRECTDRAW_INT)iface, + ret = Internal_CreateSurface(This, &dd_desc_v2, (LPDIRECTDRAWSURFACE7 *)ppSurf, pUnkOuter); @@ -499,7 +494,7 @@ /* For DirectDraw 4 - 7 */ HRESULT WINAPI -Main_DirectDraw_CreateSurface4(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, +Main_DirectDraw_CreateSurface4(LPDDRAWI_DIRECTDRAW_INT This, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { HRESULT ret; @@ -507,7 +502,7 @@ // EnterCriticalSection(&ddcs); _SEH_TRY { - ret = Internal_CreateSurface( (LPDDRAWI_DIRECTDRAW_INT)iface,pDDSD, ppSurf,pUnkOuter); + ret = Internal_CreateSurface(This, pDDSD, ppSurf,pUnkOuter); } _SEH_HANDLE { Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_setcooperativelevel.c Sat Jun 23 00:03:04 2007 @@ -14,13 +14,10 @@ #include <pseh/pseh.h> HRESULT WINAPI -Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) +Main_DirectDraw_SetCooperativeLevel (LPDDRAWI_DIRECTDRAW_INT This, HWND hwnd, DWORD cooplevel) { - - - HRESULT retVal = DD_OK; - HWND window; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + HRESULT retVal = DD_OK; + DX_WINDBG_trace(); Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Sat Jun 23 00:03:04 2007 @@ -15,7 +15,7 @@ */ HRESULT WINAPI -Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, +Main_DirectDraw_CreateClipper(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) @@ -24,14 +24,14 @@ DX_STUB; } -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, +HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, +HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) { DX_WINDBG_trace(); @@ -39,7 +39,7 @@ } HRESULT WINAPI -Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, +Main_DirectDraw_EnumSurfaces(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { @@ -51,7 +51,7 @@ * Status: Implentation removed due to rewrite */ HRESULT WINAPI -Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) +Main_DirectDraw_FlipToGDISurface(LPDDRAWI_DIRECTDRAW_INT This) { DX_WINDBG_trace(); DX_STUB; @@ -59,7 +59,7 @@ HRESULT WINAPI -Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, +Main_DirectDraw_GetGDISurface(LPDDRAWI_DIRECTDRAW_INT This, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { DX_WINDBG_trace(); @@ -67,14 +67,14 @@ } HRESULT WINAPI -Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) +Main_DirectDraw_GetScanLine(LPDDRAWI_DIRECTDRAW_INT This, LPDWORD lpdwScanLine) { DX_WINDBG_trace(); DX_STUB; } HRESULT WINAPI -Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) +Main_DirectDraw_GetVerticalBlankStatus(LPDDRAWI_DIRECTDRAW_INT This, LPBOOL lpbIsInVB) { DX_WINDBG_trace(); DX_STUB; @@ -84,41 +84,41 @@ * Status: Implentation removed due to rewrite */ HRESULT WINAPI -Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, +Main_DirectDraw_WaitForVerticalBlank(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, HANDLE h) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, +HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDDRAWI_DIRECTDRAW_INT This, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) +HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDDRAWI_DIRECTDRAW_INT This) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) +HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDDRAWI_DIRECTDRAW_INT This) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, +HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDDRAWI_DIRECTDRAW_INT This, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { DX_WINDBG_trace(); DX_STUB; } -HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) +HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDDRAWI_DIRECTDRAW_INT This,DWORD a,DWORD* b) { DX_WINDBG_trace(); DX_STUB; Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Sat Jun 23 00:03:04 2007 @@ -51,10 +51,9 @@ HRESULT WINAPI Main_DDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach); HRESULT WINAPI Main_DDrawSurface_AddOverlayDirtyRect(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect); HRESULT WINAPI Main_DDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD); -HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback); HRESULT WINAPI Main_DDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, DDSURFACEDESC2 *DDSD, DWORD Flags); -HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW2 iface, LPDDSCAPS ddscaps, LPDWORD total, LPDWORD free); -HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem4(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free); + + // hel callbacks DWORD CALLBACK HelDdDestroyDriver(LPDDHAL_DESTROYDRIVERDATA lpDestroyDriver); @@ -68,9 +67,4 @@ DWORD CALLBACK HelDdSetExclusiveMode(LPDDHAL_SETEXCLUSIVEMODEDATA lpSetExclusiveMode); DWORD CALLBACK HelDdFlipToGDISurface(LPDDHAL_FLIPTOGDISURFACEDATA lpFlipToGDISurface); -// internal functions -HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); -HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); -HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT That,LPDDRAWI_DDRAWSURFACE_LCL lpLcl, LPDDSURFACEDESC2 pDDSD); - Modified: 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 (original) +++ trunk/reactos/dll/directx/ddraw/cleanup.c Sat Jun 23 00:03:04 2007 @@ -13,10 +13,8 @@ #include "d3dhal.h" VOID -Cleanup(LPDIRECTDRAW7 iface) +Cleanup(LPDDRAWI_DIRECTDRAW_INT This) { - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - DX_WINDBG_trace(); if (ddgbl.lpDDCBtmp != NULL) 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 Sat Jun 23 00:03:04 2007 @@ -85,7 +85,7 @@ void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc); /* DirectDraw Cleanup code only internal use */ -VOID Cleanup(LPDIRECTDRAW7 iface); +VOID Cleanup(LPDDRAWI_DIRECTDRAW_INT iface); /* own macro to alloc memmory */ 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 Sat Jun 23 00:03:04 2007 @@ -109,28 +109,28 @@ This->lpVtbl = &DirectDraw7_Vtable; This->lpLcl->dwLocalFlags = This->lpLcl->dwLocalFlags + DDRAWILCL_DIRECTDRAW7; *pIface = (LPDIRECTDRAW)&This->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } else if (IsEqualGUID(&IID_IDirectDraw4, id)) { /* DirectDraw4 Vtable */ This->lpVtbl = &DirectDraw4_Vtable; *pIface = (LPDIRECTDRAW)&This->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } else if (IsEqualGUID(&IID_IDirectDraw2, id)) { /* DirectDraw2 Vtable */ This->lpVtbl = &DirectDraw2_Vtable; *pIface = (LPDIRECTDRAW)&This->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } else if (IsEqualGUID(&IID_IDirectDraw, id)) { /* DirectDraw Vtable */ This->lpVtbl = &DirectDraw_Vtable; *pIface = (LPDIRECTDRAW)&This->lpVtbl; - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); + Main_DirectDraw_AddRef(This); } if ( This->lpVtbl != 0)

1 0

[greatlrd] 27264: Fixing comping waring, also diamble our debug macro (it does not work for full screen for some reason
by greatlrd＠svn.reactos.org 22 Jun '07

22 Jun '07

Author: greatlrd Date: Fri Jun 22 23:34:06 2007 New Revision: 27264 URL: http://svn.reactos.org/svn/reactos?rev=27264&view=rev Log: Fixing comping waring, also diamble our debug macro (it does not work for full screen for some reason Added: trunk/reactos/dll/directx/ddraw/Vtable/ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (with props) trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c Fri Jun 22 23:34:06 2007 @@ -48,7 +48,7 @@ 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) { Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Fri Jun 22 23:34:06 2007 @@ -522,127 +522,10 @@ /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ -IDirectDraw7Vtbl DirectDraw7_Vtable = -{ - Main_DirectDraw_QueryInterface, /* (QueryInterface testing / devloping) */ - Main_DirectDraw_AddRef, /* (AddRef done) */ - Main_DirectDraw_Release, /* (QueryInterface testing / devloping) */ - Main_DirectDraw_Compact, /* (Compact done) */ - Main_DirectDraw_CreateClipper, - Main_DirectDraw_CreatePalette, - Main_DirectDraw_CreateSurface4, /* (CreateSurface4 testing / devloping) */ - Main_DirectDraw_DuplicateSurface, - Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */ - Main_DirectDraw_EnumSurfaces, - Main_DirectDraw_FlipToGDISurface, - Main_DirectDraw_GetCaps, /* (GetCaps done) */ - Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */ - Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */ - Main_DirectDraw_GetGDISurface, - Main_DirectDraw_GetMonitorFrequency, /* (GetMonitorFrequency done) */ - Main_DirectDraw_GetScanLine, - Main_DirectDraw_GetVerticalBlankStatus, - Main_DirectDraw_Initialize, /* (Initialize done) */ - Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */ - Main_DirectDraw_SetCooperativeLevel, /* (SetCooperativeLevel testing / devloping) */ - Main_DirectDraw_SetDisplayMode, /* (SetDisplayMode testing / devloping) */ - Main_DirectDraw_WaitForVerticalBlank, - Main_DirectDraw_GetAvailableVidMem4, /* (GetAvailableVidMem4 done) */ - Main_DirectDraw_GetSurfaceFromDC, - Main_DirectDraw_RestoreAllSurfaces, - Main_DirectDraw_TestCooperativeLevel, - Main_DirectDraw_GetDeviceIdentifier7, /* (GetDeviceIdentifier done) */ - Main_DirectDraw_StartModeTest, - Main_DirectDraw_EvaluateMode -}; - - -IDirectDraw4Vtbl DirectDraw4_Vtable = -{ - Main_DirectDraw_QueryInterface, - Main_DirectDraw_AddRef, - Main_DirectDraw_Release, - Main_DirectDraw_Compact, - Main_DirectDraw_CreateClipper, - Main_DirectDraw_CreatePalette, - Main_DirectDraw_CreateSurface4, - Main_DirectDraw_DuplicateSurface, - Main_DirectDraw_EnumDisplayModes, - Main_DirectDraw_EnumSurfaces, - Main_DirectDraw_FlipToGDISurface, - Main_DirectDraw_GetCaps, - Main_DirectDraw_GetDisplayMode, - Main_DirectDraw_GetFourCCCodes, - Main_DirectDraw_GetGDISurface, - Main_DirectDraw_GetMonitorFrequency, - Main_DirectDraw_GetScanLine, - Main_DirectDraw_GetVerticalBlankStatus, - Main_DirectDraw_Initialize, - Main_DirectDraw_RestoreDisplayMode, - Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, - Main_DirectDraw_WaitForVerticalBlank, - Main_DirectDraw_GetAvailableVidMem4, - Main_DirectDraw_GetSurfaceFromDC, - Main_DirectDraw_RestoreAllSurfaces, - Main_DirectDraw_TestCooperativeLevel, - Main_DirectDraw_GetDeviceIdentifier -}; - -IDirectDraw2Vtbl DirectDraw2_Vtable = -{ - Main_DirectDraw_QueryInterface, - Main_DirectDraw_AddRef, - Main_DirectDraw_Release, - Main_DirectDraw_Compact, - Main_DirectDraw_CreateClipper, - Main_DirectDraw_CreatePalette, - Main_DirectDraw_CreateSurface, - Main_DirectDraw_DuplicateSurface, - Main_DirectDraw_EnumDisplayModes, - Main_DirectDraw_EnumSurfaces, - Main_DirectDraw_FlipToGDISurface, - Main_DirectDraw_GetCaps, - Main_DirectDraw_GetDisplayMode, - Main_DirectDraw_GetFourCCCodes, - Main_DirectDraw_GetGDISurface, - Main_DirectDraw_GetMonitorFrequency, - Main_DirectDraw_GetScanLine, - Main_DirectDraw_GetVerticalBlankStatus, - Main_DirectDraw_Initialize, - Main_DirectDraw_RestoreDisplayMode, - Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, - Main_DirectDraw_WaitForVerticalBlank, - Main_DirectDraw_GetAvailableVidMem -}; - -IDirectDrawVtbl DirectDraw_Vtable = -{ - Main_DirectDraw_QueryInterface, - Main_DirectDraw_AddRef, - Main_DirectDraw_Release, - Main_DirectDraw_Compact, - Main_DirectDraw_CreateClipper, - Main_DirectDraw_CreatePalette, - Main_DirectDraw_CreateSurface, - Main_DirectDraw_DuplicateSurface, - Main_DirectDraw_EnumDisplayModes, - Main_DirectDraw_EnumSurfaces, - Main_DirectDraw_FlipToGDISurface, - Main_DirectDraw_GetCaps, - Main_DirectDraw_GetDisplayMode, - Main_DirectDraw_GetFourCCCodes, - Main_DirectDraw_GetGDISurface, - Main_DirectDraw_GetMonitorFrequency, - Main_DirectDraw_GetScanLine, - Main_DirectDraw_GetVerticalBlankStatus, - Main_DirectDraw_Initialize, - Main_DirectDraw_RestoreDisplayMode, - Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, - Main_DirectDraw_WaitForVerticalBlank -}; - - - + + + + + + + Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c Fri Jun 22 23:34:06 2007 @@ -1,0 +1,184 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI +Main_DirectDraw_QueryInterface ( + LPDIRECTDRAW2 iface, + REFIID id, + LPVOID *obj); + +ULONG WINAPI +Main_DirectDraw_AddRef (LPDIRECTDRAW2 iface); + +ULONG WINAPI +Main_DirectDraw_Release (LPDIRECTDRAW2 iface); + +HRESULT WINAPI +Main_DirectDraw_Compact(LPDIRECTDRAW2 iface); + +HRESULT WINAPI +Main_DirectDraw_CreateClipper( + LPDIRECTDRAW2 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreatePalette( + LPDIRECTDRAW2 iface, + DWORD dwFlags, + LPPALETTEENTRY palent, + LPDIRECTDRAWPALETTE* ppPalette, + LPUNKNOWN pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreateSurface( + LPDIRECTDRAW2 iface, + LPDDSURFACEDESC pDDSD, + LPDIRECTDRAWSURFACE *ppSurf, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_DuplicateSurface( + LPDIRECTDRAW2 iface, + LPDIRECTDRAWSURFACE2 src, + LPDIRECTDRAWSURFACE2* dst); + +HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes( + LPDIRECTDRAW2 iface, + DWORD dwFlags, + LPDDSURFACEDESC pDDSD, + LPVOID pContext, + LPDDENUMMODESCALLBACK pCallback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces( + LPDIRECTDRAW2 iface, + DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD, + LPVOID context, + LPDDENUMSURFACESCALLBACK callback); + +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW2 iface); + +HRESULT WINAPI +Main_DirectDraw_GetCaps( + LPDIRECTDRAW2 iface, + LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps); + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode ( + LPDIRECTDRAW2 iface, + LPDDSURFACEDESC pDDSD); + +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes( + LPDIRECTDRAW2 iface, + LPDWORD lpNumCodes, + LPDWORD lpCodes); + +HRESULT WINAPI +Main_DirectDraw_GetGDISurface( + LPDIRECTDRAW2 iface, + LPDIRECTDRAWSURFACE *lplpGDIDDSSurface); + +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency ( + LPDIRECTDRAW2 iface, + LPDWORD lpFreq); + + +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDIRECTDRAW2 iface, + LPDWORD lpdwScanLine); + +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus( + LPDIRECTDRAW2 iface, + LPBOOL lpbIsInVB); + +HRESULT WINAPI +Main_DirectDraw_Initialize ( + LPDIRECTDRAW2 iface, + LPGUID lpGUID); + + +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW2 iface); + +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel ( + LPDIRECTDRAW2 iface, + HWND hwnd, + DWORD cooplevel); + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode( + LPDIRECTDRAW2 iface, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwBPP, + DWORD dwRefreshRate, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank( + LPDIRECTDRAW2 iface, + DWORD dwFlags, + HANDLE h); + + +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem( + LPDIRECTDRAW2 iface, + LPDDSCAPS ddscaps, + LPDWORD dwTotal, + LPDWORD dwFree); + + +IDirectDraw2Vtbl DirectDraw2_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank, + Main_DirectDraw_GetAvailableVidMem +}; + + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Fri Jun 22 23:34:06 2007 @@ -1,0 +1,205 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI +Main_DirectDraw_QueryInterface ( + LPDIRECTDRAW4 iface, + REFIID id, + LPVOID *obj); + +ULONG WINAPI +Main_DirectDraw_AddRef (LPDIRECTDRAW4 iface); + +ULONG WINAPI +Main_DirectDraw_Release (LPDIRECTDRAW4 iface); + +HRESULT WINAPI +Main_DirectDraw_Compact(LPDIRECTDRAW4 iface); + +HRESULT WINAPI +Main_DirectDraw_CreateClipper( + LPDIRECTDRAW4 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreatePalette( + LPDIRECTDRAW4 iface, + DWORD dwFlags, + LPPALETTEENTRY palent, + LPDIRECTDRAWPALETTE* ppPalette, + LPUNKNOWN pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreateSurface4( + LPDIRECTDRAW4 iface, + LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE4 *ppSurf, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_DuplicateSurface( + LPDIRECTDRAW4 iface, + LPDIRECTDRAWSURFACE4 src, + LPDIRECTDRAWSURFACE4* dst); + +HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes( + LPDIRECTDRAW4 iface, + DWORD dwFlags, + LPDDSURFACEDESC2 pDDSD, + LPVOID pContext, + LPDDENUMMODESCALLBACK2 pCallback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces( + LPDIRECTDRAW4 iface, + DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK7 callback); + +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW4 iface); + +HRESULT WINAPI +Main_DirectDraw_GetCaps( + LPDIRECTDRAW4 iface, + LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps); + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode ( + LPDIRECTDRAW4 iface, + LPDDSURFACEDESC2 pDDSD); + +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes( + LPDIRECTDRAW4 iface, + LPDWORD lpNumCodes, + LPDWORD lpCodes); + +HRESULT WINAPI +Main_DirectDraw_GetGDISurface( + LPDIRECTDRAW4 iface, + LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface); + +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency ( + LPDIRECTDRAW4 iface, + LPDWORD lpFreq); + + +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDIRECTDRAW4 iface, + LPDWORD lpdwScanLine); + +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus( + LPDIRECTDRAW4 iface, + LPBOOL lpbIsInVB); + +HRESULT WINAPI +Main_DirectDraw_Initialize ( + LPDIRECTDRAW4 iface, + LPGUID lpGUID); + + +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW4 iface); + +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel ( + LPDIRECTDRAW4 iface, + HWND hwnd, + DWORD cooplevel); + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode( + LPDIRECTDRAW4 iface, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwBPP, + DWORD dwRefreshRate, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank( + LPDIRECTDRAW4 iface, + DWORD dwFlags, + HANDLE h); + + +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem4( + LPDIRECTDRAW4 iface, + LPDDSCAPS2 ddscaps, + LPDWORD dwTotal, + LPDWORD dwFree); + +HRESULT WINAPI +Main_DirectDraw_GetSurfaceFromDC( + LPDIRECTDRAW4 iface, + HDC hdc, + LPDIRECTDRAWSURFACE7 *lpDDS); + +HRESULT WINAPI +Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW4 iface); + +HRESULT WINAPI +Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW4 iface); + +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier( + LPDIRECTDRAW4 iface, + LPDDDEVICEIDENTIFIER pDDDI, + DWORD dwFlags); + + + +IDirectDraw4Vtbl DirectDraw4_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface4, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank, + Main_DirectDraw_GetAvailableVidMem4, + Main_DirectDraw_GetSurfaceFromDC, + Main_DirectDraw_RestoreAllSurfaces, + Main_DirectDraw_TestCooperativeLevel, + Main_DirectDraw_GetDeviceIdentifier +}; Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Fri Jun 22 23:34:06 2007 @@ -1,0 +1,223 @@ + +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + + + + +HRESULT WINAPI +Main_DirectDraw_QueryInterface ( + LPDIRECTDRAW7 iface, + REFIID id, + LPVOID *obj); + +ULONG WINAPI +Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface); + +ULONG WINAPI +Main_DirectDraw_Release (LPDIRECTDRAW7 iface); + +HRESULT WINAPI +Main_DirectDraw_Compact(LPDIRECTDRAW7 iface); + +HRESULT WINAPI +Main_DirectDraw_CreateClipper( + LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreatePalette( + LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPPALETTEENTRY palent, + LPDIRECTDRAWPALETTE* ppPalette, + LPUNKNOWN pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreateSurface4( + LPDIRECTDRAW7 iface, + LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_DuplicateSurface( + LPDIRECTDRAW7 iface, + LPDIRECTDRAWSURFACE7 src, + LPDIRECTDRAWSURFACE7* dst); + +HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes( + LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDDSURFACEDESC2 pDDSD, + LPVOID pContext, + LPDDENUMMODESCALLBACK2 pCallback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces( + LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK7 callback); + +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface); + +HRESULT WINAPI +Main_DirectDraw_GetCaps( + LPDIRECTDRAW7 iface, + LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps); + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode ( + LPDIRECTDRAW7 iface, + LPDDSURFACEDESC2 pDDSD); + +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes( + LPDIRECTDRAW7 iface, + LPDWORD lpNumCodes, + LPDWORD lpCodes); + +HRESULT WINAPI +Main_DirectDraw_GetGDISurface( + LPDIRECTDRAW7 iface, + LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface); + +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency ( + LPDIRECTDRAW7 iface, + LPDWORD lpFreq); + + +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, + LPDWORD lpdwScanLine); + +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus( + LPDIRECTDRAW7 iface, + LPBOOL lpbIsInVB); + +HRESULT WINAPI +Main_DirectDraw_Initialize ( + LPDIRECTDRAW7 iface, + LPGUID lpGUID); + + +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW7 iface); + +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel ( + LPDIRECTDRAW7 iface, + HWND hwnd, + DWORD cooplevel); + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode( + LPDIRECTDRAW7 iface, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwBPP, + DWORD dwRefreshRate, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank( + LPDIRECTDRAW7 iface, + DWORD dwFlags, + HANDLE h); + + +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem4( + LPDIRECTDRAW7 iface, + LPDDSCAPS2 ddscaps, + LPDWORD dwTotal, + LPDWORD dwFree); + +HRESULT WINAPI +Main_DirectDraw_GetSurfaceFromDC( + LPDIRECTDRAW7 iface, + HDC hdc, + LPDIRECTDRAWSURFACE7 *lpDDS); + +HRESULT WINAPI +Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface); + +HRESULT WINAPI +Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface); + +HRESULT WINAPI +Main_DirectDraw_GetDeviceIdentifier7( + LPDIRECTDRAW7 iface, + LPDDDEVICEIDENTIFIER2 pDDDI, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_StartModeTest( + LPDIRECTDRAW7 iface, + LPSIZE pModes, + DWORD dwNumModes, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_EvaluateMode( + LPDIRECTDRAW7 iface, + DWORD a, + DWORD* b); + +IDirectDraw7Vtbl DirectDraw7_Vtable = +{ + Main_DirectDraw_QueryInterface, /* (QueryInterface testing / devloping) */ + Main_DirectDraw_AddRef, /* (AddRef done) */ + Main_DirectDraw_Release, /* (QueryInterface testing / devloping) */ + Main_DirectDraw_Compact, /* (Compact done) */ + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface4, /* (CreateSurface4 testing / devloping) */ + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */ + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, /* (GetCaps done) */ + Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */ + Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */ + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, /* (GetMonitorFrequency done) */ + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, /* (Initialize done) */ + Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */ + Main_DirectDraw_SetCooperativeLevel, /* (SetCooperativeLevel testing / devloping) */ + Main_DirectDraw_SetDisplayMode, /* (SetDisplayMode testing / devloping) */ + Main_DirectDraw_WaitForVerticalBlank, + Main_DirectDraw_GetAvailableVidMem4, /* (GetAvailableVidMem4 done) */ + Main_DirectDraw_GetSurfaceFromDC, + Main_DirectDraw_RestoreAllSurfaces, + Main_DirectDraw_TestCooperativeLevel, + Main_DirectDraw_GetDeviceIdentifier7, /* (GetDeviceIdentifier done) */ + Main_DirectDraw_StartModeTest, + Main_DirectDraw_EvaluateMode +}; + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c (added) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c Fri Jun 22 23:34:06 2007 @@ -1,0 +1,173 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +HRESULT WINAPI +Main_DirectDraw_QueryInterface ( + LPDIRECTDRAW iface, + REFIID id, + LPVOID *obj); + +ULONG WINAPI +Main_DirectDraw_AddRef (LPDIRECTDRAW iface); + +ULONG WINAPI +Main_DirectDraw_Release (LPDIRECTDRAW iface); + +HRESULT WINAPI +Main_DirectDraw_Compact(LPDIRECTDRAW iface); + +HRESULT WINAPI +Main_DirectDraw_CreateClipper( + LPDIRECTDRAW iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreatePalette( + LPDIRECTDRAW iface, + DWORD dwFlags, + LPPALETTEENTRY palent, + LPDIRECTDRAWPALETTE* ppPalette, + LPUNKNOWN pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_CreateSurface( + LPDIRECTDRAW iface, + LPDDSURFACEDESC pDDSD, + LPDIRECTDRAWSURFACE *ppSurf, + IUnknown *pUnkOuter); + +HRESULT WINAPI +Main_DirectDraw_DuplicateSurface( + LPDIRECTDRAW iface, + LPDIRECTDRAWSURFACE src, + LPDIRECTDRAWSURFACE *dst); + +HRESULT WINAPI +Main_DirectDraw_EnumDisplayModes( + LPDIRECTDRAW iface, + DWORD dwFlags, + LPDDSURFACEDESC pDDSD, + LPVOID pContext, + LPDDENUMMODESCALLBACK pCallback); + +HRESULT WINAPI +Main_DirectDraw_EnumSurfaces( + LPDIRECTDRAW iface, + DWORD dwFlags, + LPDDSURFACEDESC2 lpDDSD2, + LPVOID context, + LPDDENUMSURFACESCALLBACK7 callback); + +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW iface); + +HRESULT WINAPI +Main_DirectDraw_GetCaps( + LPDIRECTDRAW iface, + LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps); + +HRESULT WINAPI +Main_DirectDraw_GetDisplayMode ( + LPDIRECTDRAW iface, + LPDDSURFACEDESC pDDSD); + +HRESULT WINAPI +Main_DirectDraw_GetFourCCCodes( + LPDIRECTDRAW iface, + LPDWORD lpNumCodes, + LPDWORD lpCodes); + +HRESULT WINAPI +Main_DirectDraw_GetGDISurface( + LPDIRECTDRAW iface, + LPDIRECTDRAWSURFACE *lplpGDIDDSSurface); + +HRESULT WINAPI +Main_DirectDraw_GetMonitorFrequency ( + LPDIRECTDRAW iface, + LPDWORD lpFreq); + + +HRESULT WINAPI +Main_DirectDraw_GetScanLine(LPDIRECTDRAW iface, + LPDWORD lpdwScanLine); + +HRESULT WINAPI +Main_DirectDraw_GetVerticalBlankStatus( + LPDIRECTDRAW iface, + LPBOOL lpbIsInVB); + +HRESULT WINAPI +Main_DirectDraw_Initialize ( + LPDIRECTDRAW iface, + LPGUID lpGUID); + + +HRESULT WINAPI +Main_DirectDraw_RestoreDisplayMode (LPDIRECTDRAW iface); + +HRESULT WINAPI +Main_DirectDraw_SetCooperativeLevel ( + LPDIRECTDRAW iface, + HWND hwnd, + DWORD cooplevel); + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode( + LPDIRECTDRAW iface, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwBPP, + DWORD dwRefreshRate, + DWORD dwFlags); + +HRESULT WINAPI +Main_DirectDraw_WaitForVerticalBlank( + LPDIRECTDRAW iface, + DWORD dwFlags, + HANDLE h); + +IDirectDrawVtbl DirectDraw_Vtable = +{ + Main_DirectDraw_QueryInterface, + Main_DirectDraw_AddRef, + Main_DirectDraw_Release, + Main_DirectDraw_Compact, + Main_DirectDraw_CreateClipper, + Main_DirectDraw_CreatePalette, + Main_DirectDraw_CreateSurface, + Main_DirectDraw_DuplicateSurface, + Main_DirectDraw_EnumDisplayModes, + Main_DirectDraw_EnumSurfaces, + Main_DirectDraw_FlipToGDISurface, + Main_DirectDraw_GetCaps, + Main_DirectDraw_GetDisplayMode, + Main_DirectDraw_GetFourCCCodes, + Main_DirectDraw_GetGDISurface, + Main_DirectDraw_GetMonitorFrequency, + Main_DirectDraw_GetScanLine, + Main_DirectDraw_GetVerticalBlankStatus, + Main_DirectDraw_Initialize, + Main_DirectDraw_RestoreDisplayMode, + Main_DirectDraw_SetCooperativeLevel, + Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_WaitForVerticalBlank +}; + Propchange: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Fri Jun 22 23:34:06 2007 @@ -57,4 +57,10 @@ <directory name="Videoport"> <file>videoport_stubs.c</file> </directory> + <directory name="Vtable"> + <file>DirectDraw7_Vtable.c</file> + <file>DirectDraw4_Vtable.c</file> + <file>DirectDraw2_Vtable.c</file> + <file>DirectDraw_Vtable.c</file> + </directory> </module> 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 Fri Jun 22 23:34:06 2007 @@ -20,14 +20,66 @@ extern WNDCLASSW wnd_class; extern CRITICAL_SECTION ddcs; extern IDirectDraw7Vtbl DirectDraw7_Vtable; - -HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW iface, LPGUID pGUID, BOOL reenable); -HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable); -HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW iface, BOOL reenable); -HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); -HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW iface); -HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); +extern IDirectDraw4Vtbl DirectDraw4_Vtable; +extern IDirectDraw2Vtbl DirectDraw2_Vtable; +extern IDirectDrawVtbl DirectDraw_Vtable; + + +extern IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable; +extern IDirectDrawSurface3Vtbl DirectDrawSurface3_VTable; +extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable; +extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable; +extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable; +extern IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable; +extern IDirectDrawKernelVtbl DirectDrawKernel_Vtable; +extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable; + +/* Start up direct hal or hel + * iface = a pointer to the com object + * pGUID = guid hardware acclations or software acclation this can be NULL + * reenable = FALSE if we whant create a new directdraw com + * = TRUE if we really whant rebuild the whole com interface (not in use) + */ + +HRESULT WINAPI +StartDirectDraw( + LPDIRECTDRAW iface, + LPGUID pGUID, + BOOL reenable); + +/* iface = a pointer to the com object + * reenable = FALSE / TRUE rebuld dx hal interface, this is need if we doing a mode change + */ + +HRESULT WINAPI +StartDirectDrawHal( + LPDIRECTDRAW iface, + BOOL reenable); + +/* iface = a pointer to the com object + * reenable = FALSE / TRUE rebuld dx hel interface, this is need if we doing a mode change + */ + +HRESULT WINAPI +StartDirectDrawHel( + LPDIRECTDRAW iface, + BOOL reenable); + +HRESULT WINAPI +Create_DirectDraw ( + LPGUID pGUID, + LPDIRECTDRAW* pIface, + REFIID id, + BOOL ex); + +HRESULT WINAPI +ReCreateDirectDraw(LPDIRECTDRAW iface); +HRESULT +Internal_CreateSurface( + LPDDRAWI_DIRECTDRAW_INT pDDraw, + LPDDSURFACEDESC2 pDDSD, + LPDIRECTDRAWSURFACE7 *ppSurf, + IUnknown *pUnkOuter); /* convert DDSURFACEDESC to DDSURFACEDESC2 */ void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc); @@ -98,22 +150,11 @@ /* now to real info that are for private use and are our own */ -/*********** VTables ************/ -extern IDirectDrawVtbl DirectDraw_Vtable; -extern IDirectDraw2Vtbl DirectDraw2_Vtable; -extern IDirectDraw4Vtbl DirectDraw4_Vtable; -extern IDirectDraw7Vtbl DirectDraw7_Vtable; - - -extern IDirectDrawSurface7Vtbl DirectDrawSurface7_Vtable; -extern IDirectDrawSurface3Vtbl DirectDrawSurface3_VTable; - -extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable; -extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable; -extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable; -extern IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable; -extern IDirectDrawKernelVtbl DirectDrawKernel_Vtable; -extern IDirectDrawSurfaceKernelVtbl DirectDrawSurfaceKernel_Vtable; + + + + + /********* Prototypes **********/ VOID Hal_DirectDraw_Release (LPDIRECTDRAW7); @@ -192,42 +233,33 @@ } \ return DD_OK; - //#ifdef __GNU__ -#define DX_STUB_str(x) \ - { \ + +/* + #define DX_STUB_str(x) \ + { \ char buffer[1024]; \ - sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ + sprintf ( buffer, "Function %s %s (%s:%d)\n", __FUNCTION__,x,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + } + + + #define DX_WINDBG_trace() \ + static BOOL firstcallx = TRUE; \ + if (firstcallx) \ + { \ + char buffer[1024]; \ + sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ + OutputDebugStringA(buffer); \ + firstcallx = TRUE; \ } - -#define DX_WINDBG_trace() \ - static BOOL firstcallx = TRUE; \ - if (firstcallx) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Enter Function %s (%s:%d)\n", __FUNCTION__,__FILE__,__LINE__ ); \ - OutputDebugStringA(buffer); \ - firstcallx = TRUE; \ - } - - - -#define DX_WINDBG_trace_res(width,height,bpp) \ - static BOOL firstcallxx = TRUE; \ - if (firstcallxx) \ - { \ - char buffer[1024]; \ - sprintf ( buffer, "Setmode have been req width=%d, height=%d bpp=%d\n",width,height,bpp); \ - OutputDebugStringA(buffer); \ - firstcallxx = FALSE; \ - } -/* -#else +*/ + + + #define DX_WINDBG_trace() // #define DX_STUB_str(x) // - #define DX_WINDBG_trace_res(width,height,bpp) // -#endif -*/ + + #endif /* __DDRAW_PRIVATE */

1 0

[greatlrd] 27263: fixing a member that are not being set
by greatlrd＠svn.reactos.org 22 Jun '07

22 Jun '07

Author: greatlrd Date: Fri Jun 22 20:50:36 2007 New Revision: 27263 URL: http://svn.reactos.org/svn/reactos?rev=27263&view=rev Log: fixing a member that are not being set Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Fri Jun 22 20:50:36 2007 @@ -185,6 +185,8 @@ * devicetypes = 3 : both hel are enable * devicetypes = 4 :loading a guid drv from the register */ + + ddgbl.lpDriverHandle = &ddgbl; if (reenable == FALSE) { @@ -558,7 +560,7 @@ This->lpLcl->lpGbl->dwNumFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; This->lpLcl->lpGbl->lpdwFourCC = mpFourCC; - This->lpLcl->lpGbl->dwMonitorFrequency = mHALInfo.dwMonitorFrequency; + This->lpLcl->lpGbl->dwMonitorFrequency = mHALInfo.dwMonitorFrequency; // 0 This->lpLcl->lpGbl->dwModeIndex = mHALInfo.dwModeIndex; This->lpLcl->lpGbl->dwNumModes = mHALInfo.dwNumModes; This->lpLcl->lpGbl->lpModeInfo = mHALInfo.lpModeInfo;

1 0

[greatlrd] 27262: Fixing smaller bugs, like save the internal surface list, document up some members what they do
by greatlrd＠svn.reactos.org 22 Jun '07

22 Jun '07

Author: greatlrd Date: Fri Jun 22 19:11:59 2007 New Revision: 27262 URL: http://svn.reactos.org/svn/reactos?rev=27262&view=rev Log: Fixing smaller bugs, like save the internal surface list, document up some members what they do Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Fri Jun 22 19:11:59 2007 @@ -187,10 +187,11 @@ ThisSurfLcl->dwProcessId = GetCurrentProcessId(); /* FIXME the lpLnk */ - /* FIXME the ref counter */ Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)ThisSurfInt); } + + pDDraw->lpLcl->lpGbl->dsList = (LPDDRAWI_DDRAWSURFACE_INT) slist_int; /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ @@ -231,7 +232,7 @@ return mDdCreateSurface.ddRVal; } - *ppSurf = &slist_int[0]->lpVtbl; + *ppSurf = (LPDIRECTDRAWSURFACE7) &slist_int[0]->lpVtbl; return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw_st… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw_structures.txt (original) +++ trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Fri Jun 22 19:11:59 2007 @@ -37,7 +37,7 @@ ULONG_PTR hWnd; ULONG_PTR hDC; // create HDC and save it to this pointer DWORD dwErrorMode; - LPDDRAWI_DDRAWSURFACE_INT lpPrimary; + LPDDRAWI_DDRAWSURFACE_INT lpPrimary; // The primary surface LPDDRAWI_DDRAWSURFACE_INT lpCB; DWORD dwPreferredMode; HINSTANCE hD3DInstance; @@ -49,7 +49,7 @@ DWORD dwHotTracking; DWORD dwIMEState; ULONG_PTR hWndPopup; - ULONG_PTR hDD; + ULONG_PTR hDD; // from Gdientry1 copy the _DDRAWI_DIRECTDRAW_GBL hDD after startup then copy this back each time we need hDD ULONG_PTR hGammaCalibrator; LPDDGAMMACALIBRATORPROC lpGammaCalibrator; } DDRAWI_DIRECTDRAW_LCL; @@ -62,20 +62,20 @@ DWORD dwInternal1; DWORD dwUnused1[9]; LPDDHAL_CALLBACKS lpDDCBtmp; - LPDDRAWI_DDRAWSURFACE_INT dsList; + LPDDRAWI_DDRAWSURFACE_INT dsList; // list of all created directdraw surface, it is a pointer list LPDDRAWI_DDRAWPALETTE_INT palList; LPDDRAWI_DDRAWCLIPPER_INT clipperList; LPDDRAWI_DIRECTDRAW_GBL lp16DD; // pointer to it self (DDRAWI_DIRECTDRAW_GBL) DWORD dwMaxOverlays; DWORD dwCurrOverlays; - DWORD dwMonitorFrequency; + DWORD dwMonitorFrequency; // current mointor freq, (nivida always set this to 0, it is a bug in nvida drv) DDCORECAPS ddHELCaps; DWORD dwUnused2[50]; DDCOLORKEY ddckCKDestOverlay; DDCOLORKEY ddckCKSrcOverlay; VIDMEMINFO vmiData; LPVOID lpDriverHandle; - LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; + LPDDRAWI_DIRECTDRAW_LCL lpExclusiveOwner; // which local directdraw comobject is in Exclusive mode and own this DWORD dwModeIndex; DWORD dwModeIndexOrig; DWORD dwNumFourCC; @@ -118,7 +118,7 @@ ULONG_PTR lpD3DExtendedCaps; DWORD dwDOSBoxEvent; RECT rectDesktop; - char cDriverName[MAX_DRIVER_NAME]; + char cDriverName[MAX_DRIVER_NAME]; // driver name, if we send in CreateDirectDraw(NULL, ...) this will be fill in the name "display" ULONG_PTR lpD3DHALCallbacks3; DWORD dwNumZPixelFormats; LPDDPIXELFORMAT lpZPixelFormats;

1 0

[gedmurphy] 27259: fix deleting rows from the data table
by gedmurphy＠svn.reactos.org 22 Jun '07

22 Jun '07

Author: gedmurphy Date: Fri Jun 22 14:47:24 2007 New Revision: 27259 URL: http://svn.reactos.org/svn/reactos?rev=27259&view=rev Log: fix deleting rows from the data table Modified: trunk/tools/RosTE/GUI/DeleteVM.cs trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/VMDataBase.cs Modified: trunk/tools/RosTE/GUI/DeleteVM.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/DeleteVM.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/DeleteVM.cs (original) +++ trunk/tools/RosTE/GUI/DeleteVM.cs Fri Jun 22 14:47:24 2007 @@ -10,6 +10,11 @@ { public partial class DeleteVM : Form { + public bool DeleteFullVM + { + get { return deleteFullVM.Checked; } + } + public DeleteVM(string text) { InitializeComponent(); Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Fri Jun 22 14:47:24 2007 @@ -25,7 +25,6 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("ReactOS", 0); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.VirtMachListView = new System.Windows.Forms.ListView(); this.columnName = new System.Windows.Forms.ColumnHeader(); @@ -74,8 +73,6 @@ this.columnAudio, this.columnDebug}); this.VirtMachListView.FullRowSelect = true; - this.VirtMachListView.Items.AddRange(new System.Windows.Forms.ListViewItem[] { - listViewItem1}); this.VirtMachListView.Location = new System.Drawing.Point(12, 52); this.VirtMachListView.Name = "VirtMachListView"; this.VirtMachListView.Size = new System.Drawing.Size(516, 237); Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Fri Jun 22 14:47:24 2007 @@ -184,12 +184,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPhJREFUOE/Fk8sK - glAQhiu6EdErWSHhwl0dL7lw52v4XFnQfVVtupPae1TW5C8F3UMhEj7OwTPzzz/HMRb71SMIQsYwjJRp - mokoNeJMrlKZLx799YS9ruvZUEKSUvRsZ0NWs0GSUjuIopgLJYDqjmtTs2WRn7xnjOW/CqBfjuOSfnAa - 1q8CSl3aaZpW+CiAPi+cUL0i8Ed36wQOVE32bs6DuCcxvHTcjY9NSMQKOt32Hd1e570ALm0w7FN/0PvI - WwePNseTEQG+UsbnvLb42sFjT0iYL2YBslryQs8BBFbrZUBkgdl8SiCSAIZHVtkBYI9/4+sg/SXgDMzW - 31aooBNSAAAAAElFTkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPxJREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P+OzvZ/gfQ/EDs+Pp6DJIPCIuz/3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7Ld1d357917d8Au + iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzs + 6giKTpgXsbsA3U8gDVeuXgbj8EiHPySnA5AB129cA2OyDbh85dJ/ECbLAFDiCY8M/Q3CIDYobxBMSAOi + AACfld9D5OrnOQAAAABJRU5ErkJggg== </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -204,19 +204,19 @@ <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAttJREFUOE+FU11I - U2EYXllBF3VjW91JklGUmCnCZCYqjswl/RCYNwOVTAm8mLkg6EQlYi7/2s/ZMBqlKQpd2I9S1rpwNiO8 - EQsKJJu5qcydv3l2zs45b+f7TMl10YGH853zPe/7Pe/zvt82TdLjuFBRJGafqJR37zmtaKQDaHu7Zkc4 - hWfHdn75+vTawPBEcgz+Jghil+eUPjBw9Ij80eeTOY4FURRBEASgqCj43ozJzw5nyIiDuFuSDA0NpXiy - skLvrdclMRQCfioANE1BNBrBoOkoxPwTsDYzA2N1VyTERTGbSTwF+R8GzOaEODcHdG0tUIWFQId+4SQM - QwEdXgSqpARoazPw09PwROWiGJzAebEiuyv9oMTPzgJtNgNdXAyRykoYPGtKqFLjCIPnKhLRmhpgysuB - tliAm/RDV1qaRJ43ndR0tNx2vH3Uq3CvXgJlMMBqVRWQOq3iKit1Et3EXgSPuib365RoQwNWwo6+Bt/z - Ydl256ZL09lp+xGJrKhGrQITDsGIySSSJYVdyU47jUUP3hUYJG5lCXPDalkoFrkfj8U4bBZ6Y9nqqckJ - sBp1j+fX/hhLYS5OgFqGWsXzsf8mEIQ45iKDcQIkY3l5SXWbAZ5l4MXVOoEsK21PVkAaiztGLZa4oCpg - GBoWFxfWS0BG+Pr7ZK63F5j6eqDGx6EvPV0my4yODRNdZ4z2/oxDMvv9GzAt94C1PwSfyymjBmhQK9xa - rcJZrUDp9cARBNB+P4zcsIo9diKOMEIQYuznPMS8XqDy8oCprgYyNVVBI4CVevV5E4HcXIg1NQGVnw9s - czMgqZKUUCFBQhSA7enGwaw6D5OZmYBiNstEY/n4+LGVQE4OsI2NwLpJXCeawnXQwDrs+GQUjLhbRnnj - Mnn1+s9unU751N4mLSwEsdsIwWAQptpaJbd2n4I4/1ymvx23X75k6Lx7y22ztc/ft7UKCGiN/qGrntyd - 36RWL0Zej41dAAAAAElFTkSuQmCC + U2EYXllBF3VjW91JklGUmCnCbCUqjswl/RCYNwOVTAm8mLkg6ERliS6Xtp/jElqkDhS6sB9FrHXhZEZ4 + IxYUSDZzU5k7f/PsnJ1z3s73mZLrogMP5zvne973e97nfb9tmpTHeamyWMw9USXv3nNW0UgH0PZ2zY5I + Gs+O7vzy9eUN39BEagz+Jghil+eMPug7ekSe9PtljmNBFEUQBAEoKgb+sVF54HCWjDiIuyXJ4OBgmicn + J/zBelMSw2Hgp4JA0xTEYlEMmo5BPDABazMzMFp/TUJcFLOZxHO68OOA2ZwU5+aArqsDqqgI6PAvnIRh + KKAji0CVlgJtbQF+ehpeqFwUgxO4Llfm2jMPSvzsLNBmM9AlJRCtqgLfeVNSlZpA8F2oTMZqa4GpqADa + YgFuMgD2jAyJvGg6qelsvesc632mcG/fAGUwwGp1Nbh1WsVdXuYiuoi9CB517d6vU2KNjVgJO/IO/K+G + ZNu9226N3W77EY2uqEatAhMJw7DJJJKlRU9SnXYZix+/N5ySuJUlzI2oZaFY5H4iHuewWeiNZaunpibA + atQ9nl/7YyyFuTgBahlqFc/H/5tAEBKYiwzGCZCM5eUl1W0GeJaB19frBbK8rCNVAWks6RyxWBKCqoBh + aFhcXFgvARnh7++Tud5eYBoagBofh77MTJksNzo3THSfMzr6sw7J7PdvwLQ+ANbxFPxul4waoEGtILVa + hbNagdLrgSMIoAMBGL5lFbsdRAJhmCDE+M95iHu9QBUUAFNTA+70dAWNAFbq1RdMBPPzId7cDFRhIbAt + LYCkSlJShQRJUQC2uwsHs+o8TGZnA4rZLBON5fPjx1aCeXnANjUB20PiOtEUroMG1unAJ6NgxN0yyhuX + yavXfyZ1OuVTe5u0sBDCbiOEQiGYansokdp9CuL8c5n+dtxx9YrBfv9Oj83WMd9ueyQgoDX6h656and+ + A3eWLzBoR3SlAAAAAElFTkSuQmCC </value> </data> <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> Modified: trunk/tools/RosTE/GUI/VMDataBase.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMDataBase.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/VMDataBase.cs (original) +++ trunk/tools/RosTE/GUI/VMDataBase.cs Fri Jun 22 14:47:24 2007 @@ -65,6 +65,15 @@ return dt.Rows.Count; } + private static void PrintRows(DataTable dt) + { + for (int i = 0; i < dt.Rows.Count; i++) + { + string str = "row: " + i + ", VMConfigID: " + dt.Rows[i]["VMConfigID"] + ", Path " + dt.Rows[i]["Path"]; + MessageBox.Show(str); + } + } + public MainConfig(Data dataIn) { data = dataIn; @@ -108,8 +117,8 @@ { DataRow dr; DataTable dt = data.DataSet.Tables["MainConfig"]; - //dt.Rows.re.RemoveAt(index); - //dr = dt.LoadDataRow( + //dt.Rows[index].Delete(); + dt.Rows.RemoveAt(index); } public void SaveMainConfig()

1 0

[gedmurphy] 27258: add some random code before I loose it. for example: - map out an ADO database design - add a delete dialog - add VM's as an array list - fix some bug in the NewVMWizard
by gedmurphy＠svn.reactos.org 21 Jun '07

21 Jun '07

Author: gedmurphy Date: Fri Jun 22 01:30:34 2007 New Revision: 27258 URL: http://svn.reactos.org/svn/reactos?rev=27258&view=rev Log: add some random code before I loose it. for example: - map out an ADO database design - add a delete dialog - add VM's as an array list - fix some bug in the NewVMWizard Added: trunk/tools/RosTE/GUI/DeleteVM.Designer.cs trunk/tools/RosTE/GUI/DeleteVM.cs trunk/tools/RosTE/GUI/DeleteVM.resx trunk/tools/RosTE/GUI/MainConfig.xsd trunk/tools/RosTE/GUI/MainConfig.xsx trunk/tools/RosTE/GUI/Resources/warning.png (with props) trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VMConfig.xsx Removed: trunk/tools/RosTE/GUI/Config.xsd trunk/tools/RosTE/GUI/Config.xsx Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/NewVMWizard.Designer.cs trunk/tools/RosTE/GUI/NewVMWizard.cs trunk/tools/RosTE/GUI/NewVMWizard.resx trunk/tools/RosTE/GUI/RosTEGUI.csproj trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/VMDataBase.cs trunk/tools/RosTE/GUI/VirtualMachine.cs [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/tools/RosTE/GUI/Config.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Config.xsd?rev=272… Removed: trunk/tools/RosTE/GUI/Config.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Config.xsx?rev=272… Added: trunk/tools/RosTE/GUI/DeleteVM.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/DeleteVM.Designer.… Added: trunk/tools/RosTE/GUI/DeleteVM.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/DeleteVM.cs?rev=27… Added: trunk/tools/RosTE/GUI/DeleteVM.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/DeleteVM.resx?rev=… Added: trunk/tools/RosTE/GUI/MainConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsd?rev… Added: trunk/tools/RosTE/GUI/MainConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsx?rev… Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… Modified: trunk/tools/RosTE/GUI/NewVMWizard.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.Design… Modified: trunk/tools/RosTE/GUI/NewVMWizard.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.cs?rev… Modified: trunk/tools/RosTE/GUI/NewVMWizard.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.resx?r… Added: trunk/tools/RosTE/GUI/Resources/warning.png URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Resources/warning.… Modified: trunk/tools/RosTE/GUI/RosTEGUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTEGUI.csproj?re… Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… Added: trunk/tools/RosTE/GUI/VMConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2… Added: trunk/tools/RosTE/GUI/VMConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=2… Modified: trunk/tools/RosTE/GUI/VMDataBase.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMDataBase.cs?rev=… Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…

1 0

[fireball] 27257: - Set GDT and IDT to the values ReactOS kernel expects. This gets us lots farther in the kernel, up to the BSOD with CONFIG_INITIALIZATION_FAILED.
by fireball＠svn.reactos.org 21 Jun '07

21 Jun '07

Author: fireball Date: Fri Jun 22 01:18:19 2007 New Revision: 27257 URL: http://svn.reactos.org/svn/reactos?rev=27257&view=rev Log: - Set GDT and IDT to the values ReactOS kernel expects. This gets us lots farther in the kernel, up to the BSOD with CONFIG_INITIALIZATION_FAILED. Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/arch.S branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/arch.S (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/arch.S Fri Jun 22 01:18:19 2007 @@ -480,7 +480,7 @@ .word 0x0000 /* GDT table pointer */ -gdtptr: +EXTERN(gdtptr) .word 0x27 /* Limit */ .long gdt /* Base Address */ Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c Fri Jun 22 01:18:19 2007 @@ -19,6 +19,8 @@ */ #define _NTSYSTEM_ #include <freeldr.h> + +#include <arch.h> #define NDEBUG #include <debug.h> @@ -56,6 +58,10 @@ PUCHAR SymbolName, USHORT Hint); +VOID FASTCALL +FrLdrResetGdtIdt(); + + /* FUNCTIONS *****************************************************************/ /*++ @@ -87,12 +93,54 @@ /* Re-initalize EFLAGS */ Ke386EraseFlags(); + /* Point GDT+IDT to FreeLdr instead of OFW */ + FrLdrResetGdtIdt(); + /* Initialize the page directory */ FrLdrSetupPageDirectory(); /* Initialize Paging, Write-Protection and Load NTOSKRNL */ FrLdrSetupPae(Magic); } + +/*++ + * FrLdrResetGdtIdt + * INTERNAL + * + * Sets GDT and IDT as to what ReactOS expects + * + * Params: + * Magic - Multiboot Magic + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +VOID +FASTCALL +FrLdrResetGdtIdt() +{ + /* Load the GDT and IDT */ + asm("lgdt gdtptr\n\ + lidt i386idtptr\n"); + + /* Clear prefetch queue & correct CS, + * jump to low mem */ + asm("ljmp $0x08, $mb4\n\ + mb4:\n"); + + /* Reload segment selectors */ + asm("movw $0x10,%dx\n\ + movw %dx,%ds\n\ + movw %dx,%es\n\ + movw %dx,%fs\n\ + movw %dx,%gs\n\ + movw %dx,%ss\n"); +} + /*++ * FrLdrSetupPae

1 0

[fireball] 27256: - Map framebuffer before jumping to the kernel (so we can do text output in the kernel early boot stage). - Shut down USB controller before jumping to the kernel. - Fix memory map (convert int property), also add a hack there to not touch anything above 0x700000.
by fireball＠svn.reactos.org 21 Jun '07

21 Jun '07

Author: fireball Date: Thu Jun 21 23:59:47 2007 New Revision: 27256 URL: http://svn.reactos.org/svn/reactos?rev=27256&view=rev Log: - Map framebuffer before jumping to the kernel (so we can do text output in the kernel early boot stage). - Shut down USB controller before jumping to the kernel. - Fix memory map (convert int property), also add a hack there to not touch anything above 0x700000. Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c branches/olpc/boot/freeldr/freeldr/arch/i386/mb.S Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c Thu Jun 21 23:59:47 2007 @@ -44,6 +44,11 @@ extern PAGE_DIRECTORY_X86 apic_pagetable; extern PAGE_DIRECTORY_X86 kpcr_pagetable; extern PAGE_DIRECTORY_X86 kuser_pagetable; +extern PAGE_DIRECTORY_X86 framebuffer_pagetable; + +#define FRAMEBUFFER_PHYS 0xFD000000 +#define FRAMEBUFFER_VIRT 0xFF000000 +#define FRAMEBUFFER_SIZE 2 * 1024 * 1024 PVOID NTAPI @@ -73,6 +78,9 @@ NTAPI FrLdrStartup(ULONG Magic) { + /* Goodbye OFW */ + OFInterpret0("usb-quiet"); + /* Disable Interrupts */ _disable(); @@ -189,6 +197,11 @@ PageDir->Pde[KuserPageTableIndex].Valid = 1; PageDir->Pde[KuserPageTableIndex].Write = 1; PageDir->Pde[KuserPageTableIndex].PageFrameNumber = PaPtrToPfn(kuser_pagetable); + + /* Set up framebuffer mapping PDE */ + PageDir->Pde[FRAMEBUFFER_VIRT >> PDE_SHIFT].Valid = 1; + PageDir->Pde[FRAMEBUFFER_VIRT >> PDE_SHIFT].Write = 1; + PageDir->Pde[FRAMEBUFFER_VIRT >> PDE_SHIFT].PageFrameNumber = PaPtrToPfn(framebuffer_pagetable); /* Set up Low Memory PTEs */ PageDir = (PPAGE_DIRECTORY_X86)&lowmem_pagetable; @@ -238,6 +251,16 @@ PageDir->Pde[i].Owner = 1; PageDir->Pde[i].PageFrameNumber = PaToPfn(KI_USER_SHARED_DATA + i * PAGE_SIZE); } + + /* Set up Framebuffer PTEs */ + PageDir = (PPAGE_DIRECTORY_X86)&framebuffer_pagetable; + for (i=0; i<512; i++) + { + PageDir->Pde[i].Valid = 1; + PageDir->Pde[i].Write = 1; + PageDir->Pde[i].PageFrameNumber = PaToPfn(FRAMEBUFFER_PHYS + i * PAGE_SIZE); + } + } PLOADER_MODULE Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c Thu Jun 21 23:59:47 2007 @@ -28,11 +28,13 @@ char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { "bootprep" }; +int decode_int(UCHAR *p); VOID OlpcVideoInit(); VOID XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +ULONG_PTR MemMin, MemMax; // OFW can report whole physical memory region VOID OlpcMachInit(const char *CmdLine_) @@ -151,10 +153,25 @@ memhandle = OFFinddevice("/memory"); + /* Get Max/Min memory boundaries */ + returned = OFGetprop(memhandle, "reg", + (char *)memdata, sizeof(memdata)); + + ofwprintf("Returned 'reg' data: %d\n", returned); + if( returned == -1 ) + { + ofwprintf("getprop /memory[@reg] failed\n"); + return 0; + } + MemMin = decode_int(&memdata[0]); + MemMax = MemMin + decode_int(&memdata[1]); + ofwprintf("Memory start: %x, memory end: %x\n", MemMin, MemMax); + + /* Get unclaimed regions */ returned = OFGetprop(memhandle, "available", (char *)memdata, sizeof(memdata)); - ofwprintf("Returned data: %d\n", returned); + ofwprintf("Returned 'available' data: %d\n", returned); if( returned == -1 ) { ofwprintf("getprop /memory[@reg] failed\n"); return 0; @@ -165,36 +182,40 @@ } ofwprintf("\n"); - for( i = 0; i < returned / 2; i++ ) { - BiosMemoryMap[slots].Type = 1/*MEMTYPE_USABLE*/; - BiosMemoryMap[slots].BaseAddress = memdata[i*2]; - BiosMemoryMap[slots].Length = memdata[i*2+1]; - ofwprintf("MemoryMap[%d] = (%x:%x)\n", - i, - (int)BiosMemoryMap[slots].BaseAddress, - (int)BiosMemoryMap[slots].Length); - - /* Hack for pearpc */ - if(/* kernel_mem */FALSE) { - /*BiosMemoryMap[slots].Length = kernel_mem * 1024; - if( !FixedMemory ) { - OFClaim((int)BiosMemoryMap[slots].BaseAddress, - (int)BiosMemoryMap[slots].Length, - 0x1000); - FixedMemory = BiosMemoryMap[slots].BaseAddress; - } - total += BiosMemoryMap[slots].Length; - slots++;*/ - break; - /* Normal way */ - } else if( BiosMemoryMap[slots].Length && - OFClaim((int)BiosMemoryMap[slots].BaseAddress, - (int)BiosMemoryMap[slots].Length, - 0x1000) ) { - total += BiosMemoryMap[slots].Length; - slots++; - } - } + for( i = 0; i < returned / 2; i++ ) + { + if (decode_int(&memdata[i*2]) > 0x7000000) + continue; + + BiosMemoryMap[slots].Type = 1/*MEMTYPE_USABLE*/; + BiosMemoryMap[slots].BaseAddress = decode_int(&memdata[i*2]); + BiosMemoryMap[slots].Length = decode_int(&memdata[i*2+1]); + ofwprintf("MemoryMap[%d] = (%x:%x)\n", + i, + (int)BiosMemoryMap[slots].BaseAddress, + (int)BiosMemoryMap[slots].Length); + + /* Hack for pearpc */ + if(/* kernel_mem */FALSE) { + /*BiosMemoryMap[slots].Length = kernel_mem * 1024; + if( !FixedMemory ) { + OFClaim((int)BiosMemoryMap[slots].BaseAddress, + (int)BiosMemoryMap[slots].Length, + 0x1000); + FixedMemory = BiosMemoryMap[slots].BaseAddress; + } + total += BiosMemoryMap[slots].Length; + slots++;*/ + break; + /* Normal way */ + } else if( BiosMemoryMap[slots].Length && + OFClaim((int)BiosMemoryMap[slots].BaseAddress, + (int)BiosMemoryMap[slots].Length, + 0x1000) ) { + total += BiosMemoryMap[slots].Length; + slots++; + } + } ofwprintf( "Returning memory map (%dk total)\n", total / 1024 ); Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/mb.S URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/mb.S (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/mb.S Thu Jun 21 23:59:47 2007 @@ -38,6 +38,7 @@ .globl _apic_pagetable .globl _kpcr_pagetable .globl _kuser_pagetable + .globl _framebuffer_pagetable .globl _PageDirectoryEnd @@ -76,4 +77,7 @@ _kuser_pagetable: .fill 4096, 1, 0 +_framebuffer_pagetable: + .fill 4096, 1, 0 + _PageDirectoryEnd:

1 0

[cfinck] 27255: Add the links to the RosCMS v2 Interfaces until RosCMS v3 is fully ready
by cfinck＠svn.reactos.org 21 Jun '07

21 Jun '07

Author: cfinck Date: Thu Jun 21 23:03:55 2007 New Revision: 27255 URL: http://svn.reactos.org/svn/reactos?rev=27255&view=rev Log: Add the links to the RosCMS v2 Interfaces until RosCMS v3 is fully ready Modified: trunk/web/reactos.org/htdocs/roscms/inc/home.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/home.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/home.php (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/home.php Thu Jun 21 23:03:55 2007 @@ -27,6 +27,21 @@ } else { ?> + <h4>RosCMS v3 Information</h4> + <p> + We are currently testing a new version 3 of our Content Management System RosCMS on the ReactOS-Website.<br><br> + + If you want to edit something, please use the old interfaces until RosCMS v3 is fully ready: + <ul> + <?php + if ($roscms_intern_usrgrp_trans == true) { ?><li><a href="?page=trans">Translator Interface</a></li><?php } + if ($roscms_intern_usrgrp_team == true) { ?><li><a href="?page=team">Team Interface</a></li><?php } + if ($roscms_intern_usrgrp_dev == true) { ?><li><a href="?page=dev">Developer Interface</a></li><?php } + if ($roscms_intern_usrgrp_admin == true) { ?><li><a href="?page=admin">Admin Interface</a></li><?php } + ?> + </ul> + </p> + <h4>Translator Information</h4> <p>Language maintainer contact information [...]</p> <?php

1 0

[cfinck] 27254: Fix the "Previous revision" button
by cfinck＠svn.reactos.org 21 Jun '07

21 Jun '07

Author: cfinck Date: Thu Jun 21 21:31:09 2007 New Revision: 27254 URL: http://svn.reactos.org/svn/reactos?rev=27254&view=rev Log: Fix the "Previous revision" button Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php Thu Jun 21 21:31:09 2007 @@ -271,7 +271,7 @@ { if( getRevNums() ) { - startrev--; + inputbox_startrev--; // 25700 is the lowest rev on the server at the time, when this script has been written // There is no harm if this rev does not exist anymore on the FTP server, it's just a min value

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs