Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 02:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixing more format from tab to space

Browse source 
svn path=/trunk/; revision=25148
This commit is contained in:
Magnus Olsen 2006-12-13 21:28:52 +00:00
parent ca82e66f85
commit b7bb710426
4 changed files with 430 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/directx/ddraw/callbacks_surf_hel.c
View file

@ -70,7 +70,6 @@ DWORD CALLBACK HelDdSurfSetColorKey(LPDDHAL_SETCOLORKEYDATA lpSetColorKeyData)
DX_STUB; DX_STUB;
} }
DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData) DWORD CALLBACK HelDdSurfSetOverlayPosition(LPDDHAL_SETOVERLAYPOSITIONDATA lpSetOverlayPositionData)
{ {
DX_STUB; DX_STUB;

2
reactos/dll/directx/ddraw/cleanup.c
View file

@ -21,5 +21,3 @@ Cleanup(LPDIRECTDRAW7 iface)
} }

38
reactos/dll/directx/ddraw/main/ddraw_main.c
View file

@ -8,16 +8,9 @@
* *
*/ */
/*
* IMPLEMENT
* Status ok
*/
#include "../rosdraw.h" #include "../rosdraw.h"
HRESULT HRESULT
WINAPI WINAPI
Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
@ -47,6 +40,7 @@ Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface,
Main_DirectDraw_AddRef(iface); Main_DirectDraw_AddRef(iface);
return S_OK; return S_OK;
} }
/* /*
* IMPLEMENT * IMPLEMENT
* Status ok * Status ok
@ -72,10 +66,7 @@ Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface)
return This->dwIntRefCnt; return This->dwIntRefCnt;
} }
/*
* IMPLEMENT
* Status ok
*/
ULONG ULONG
WINAPI WINAPI
Main_DirectDraw_Release (LPDIRECTDRAW7 iface) Main_DirectDraw_Release (LPDIRECTDRAW7 iface)
@ -146,9 +137,7 @@ Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface,
return CLASS_E_NOAGGREGATION; return CLASS_E_NOAGGREGATION;
} }
That = (LPDDRAWI_DDRAWCLIPPER_INT) DxHeapMemAlloc(sizeof(DDRAWI_DDRAWCLIPPER_INT)); That = (LPDDRAWI_DDRAWCLIPPER_INT) DxHeapMemAlloc(sizeof(DDRAWI_DDRAWCLIPPER_INT));
if (That == NULL) if (That == NULL)
{ {
return DDERR_OUTOFMEMORY; //E_OUTOFMEMORY; return DDERR_OUTOFMEMORY; //E_OUTOFMEMORY;
@ -163,7 +152,6 @@ Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface,
return DirectDrawClipper_Initialize((LPDIRECTDRAWCLIPPER)That, (LPDIRECTDRAW)iface, dwFlags); return DirectDrawClipper_Initialize((LPDIRECTDRAWCLIPPER)That, (LPDIRECTDRAW)iface, dwFlags);
} }
HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags,
LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter)
{ {
@ -229,7 +217,6 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
* checked how ms ddraw behivor * checked how ms ddraw behivor
*/ */
/* FIXME /* FIXME
* Alloc memory for the ppSurf pointer * Alloc memory for the ppSurf pointer
* we expect it is NULL, But we maybe should add a NULL check * we expect it is NULL, But we maybe should add a NULL check
@ -276,7 +263,6 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
return DDERR_OUTOFMEMORY; return DDERR_OUTOFMEMORY;
} }
/* setup some value */ /* setup some value */
*ppSurf = (LPDIRECTDRAWSURFACE7)That; *ppSurf = (LPDIRECTDRAWSURFACE7)That;
@ -343,7 +329,6 @@ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDE
else else
{ {
RECT rect; RECT rect;
if(GetWindowRect((HWND)This->lpLcl->hWnd, &rect)) if(GetWindowRect((HWND)This->lpLcl->hWnd, &rect))
{ {
That->lpLcl->lpGbl->wWidth = rect.right - rect.left; That->lpLcl->lpGbl->wWidth = rect.right - rect.left;
@ -614,7 +599,6 @@ Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
LPDDCAPS pHELCaps) LPDDCAPS pHELCaps)
{ {
DDSCAPS2 ddscaps = {0}; DDSCAPS2 ddscaps = {0};
DWORD status = DD_FALSE; DWORD status = DD_FALSE;
LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface;
@ -644,7 +628,6 @@ Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps,
RtlCopyMemory(pDriverCaps,&This->lpLcl->lpGbl->ddHELCaps,sizeof(DDCORECAPS)); RtlCopyMemory(pDriverCaps,&This->lpLcl->lpGbl->ddHELCaps,sizeof(DDCORECAPS));
status = DD_OK; status = DD_OK;
} }
return status; return status;
} }
@ -828,6 +811,12 @@ Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD coopl
This->lpLcl->dwLocalFlags |= DDRAWILCL_ISFULLSCREEN; This->lpLcl->dwLocalFlags |= DDRAWILCL_ISFULLSCREEN;
} }
if (cooplevel & DDSCL_EXCLUSIVE)
{
This->lpLcl->lpGbl->lpExclusiveOwner = This->lpLcl;
}
/* This code should be a callback */ /* This code should be a callback */
This->lpLcl->hWnd = hwnd; This->lpLcl->hWnd = hwnd;
This->lpLcl->hFocusWnd = hwnd; This->lpLcl->hFocusWnd = hwnd;
@ -912,7 +901,6 @@ Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeig
(This->lpLcl->lpGbl->vmiData.dwDisplayWidth == dwWidth) && (This->lpLcl->lpGbl->vmiData.dwDisplayWidth == dwWidth) &&
(This->lpLcl->lpGbl->vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) (This->lpLcl->lpGbl->vmiData.ddpfDisplay.dwRGBBitCount == dwBPP))
{ {
return DD_OK; return DD_OK;
} }
@ -956,8 +944,6 @@ Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeig
return DDERR_UNSUPPORTEDMODE; return DDERR_UNSUPPORTEDMODE;
} }
mDdSetMode.dwModeIndex = iMode; mDdSetMode.dwModeIndex = iMode;
mDdSetMode.SetMode(&mDdSetMode); mDdSetMode.SetMode(&mDdSetMode);
@ -999,12 +985,14 @@ Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags,
mDdWaitForVerticalBlank.lpDD = This->lpLcl->lpGbl; mDdWaitForVerticalBlank.lpDD = This->lpLcl->lpGbl;
mDdWaitForVerticalBlank.WaitForVerticalBlank = This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank; mDdWaitForVerticalBlank.WaitForVerticalBlank = This->lpLcl->lpDDCB->cbDDCallbacks.WaitForVerticalBlank;
if (mDdWaitForVerticalBlank.WaitForVerticalBlank(&mDdWaitForVerticalBlank)==DDHAL_DRIVER_HANDLED); if (mDdWaitForVerticalBlank.WaitForVerticalBlank(&mDdWaitForVerticalBlank)
!= DDHAL_DRIVER_HANDLED)
{ {
return mDdWaitForVerticalBlank.ddRVal; return DDERR_NODRIVERSUPPORT;
} }
return DDERR_NODRIVERSUPPORT;
return mDdWaitForVerticalBlank.ddRVal;
} }
/* /*