DXGL r52 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r51‎ | r52 | r53 >
Date:00:24, 28 December 2011
Author:admin
Status:new
Tags:
Comment:
Make glDirect3DDevice7 link by stubbing all member functions for now
Modified paths:
  • /ddraw/glDirect3DDevice.cpp (modified) (history)

Diff [purge]

Index: ddraw/glDirect3DDevice.cpp
——@@ -20,7 +20,7 @@
2121 #include "glDirectDrawSurface.h"
2222 #include "glDirect3DDevice.h"
2323
24 -/*
 24+
2525 glDirect3DDevice7::glDirect3DDevice7(glDirect3D7 *glD3D7, glDirectDrawSurface7 *glDDS7)
2626 {
2727 refcount = 1;
——@@ -71,52 +71,234 @@
7272 }
7373 HRESULT WINAPI glDirect3DDevice7::CaptureStateBlock(DWORD dwBlockHandle)
7474 {
75 - FIXME("glDirectDraw::CaptureStateBlock: stub");
 75+ FIXME("glDirect3DDevice7::CaptureStateBlock: stub");
7676 ERR(DDERR_GENERIC);
77 -}*/
78 -/*
79 -HRESULT WINAPI glDirect3DDevice7::CreateStateBlock(D3DSTATEBLOCKTYPE d3dsbtype, LPDWORD lpdwBlockHandle);
80 -HRESULT WINAPI glDirect3DDevice7::Clear(DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags, DWORD dwColor, D3DVALUE dvZ, DWORD dwStencil);
81 -HRESULT WINAPI glDirect3DDevice7::ComputeSphereVisibility(LPD3DVECTOR lpCenters, LPD3DVALUE lpRadii, DWORD dwNumSpheres, DWORD dwFlags, LPDWORD lpdwReturnValues);
82 -HRESULT WINAPI glDirect3DDevice7::DeleteStateBlock(DWORD dwBlockHandle);
83 -HRESULT WINAPI glDirect3DDevice7::DrawIndexedPrimitive(D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD dwVertexTypeDesc, LPVOID lpvVertices, DWORD dwVertexCount, LPWORD lpwIndices, DWORD dwIndexCount, DWORD dwFlags);
84 -HRESULT WINAPI glDirect3DDevice7::DrawIndexedPrimitiveStrided(D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD dwVertexTypeDesc, LPD3DDRAWPRIMITIVESTRIDEDDATA lpvVerticexArray, DWORD dwVertexCount, LPWORD lpwIndices, DWORD dwIndexCount, DWORD dwFlags);
85 -HRESULT WINAPI glDirect3DDevice7::DrawIndexedPrimitiveVB(D3DPRIMITIVETYPE d3dptPrimitiveType, LPDIRECT3DVERTEXBUFFER7 lpd3dVertexBuffer, DWORD dwStartVertex, DWORD dwNumVertices, LPWORD lpwIndices, DWORD dwIndexCount, DWORD dwFlags);
86 -HRESULT WINAPI glDirect3DDevice7::DrawPrimitive(D3DPRIMITIVETYPE dptPrimitiveType, DWORD dwVertexTypeDesc, LPVOID lpVertices, DWORD dwVertexCount, DWORD dwFlags);
87 -HRESULT WINAPI glDirect3DDevice7::DrawPrimitiveStrided(D3DPRIMITIVETYPE dptPrimitiveType, DWORD dwVertexTypeDesc, LPD3DDRAWPRIMITIVESTRIDEDDATA lpVertexArray, DWORD dwVertexCount, DWORD dwFlags);
88 -HRESULT WINAPI glDirect3DDevice7::DrawPrimitiveVB(D3DPRIMITIVETYPE d3dptPrimitiveType, LPDIRECT3DVERTEXBUFFER7 lpd3dVertexBuffer, DWORD dwStartVertex, DWORD dwNumVertices, DWORD dwFlags);
89 -HRESULT WINAPI glDirect3DDevice7::EndScene();
90 -HRESULT WINAPI glDirect3DDevice7::EndStateBlock(LPDWORD lpdwBlockHandle);
91 -HRESULT WINAPI glDirect3DDevice7::EnumTextureFormats(LPD3DENUMPIXELFORMATSCALLBACK lpd3dEnumPixelProc, LPVOID lpArg);
92 -HRESULT WINAPI glDirect3DDevice7::GetCaps(LPD3DDEVICEDESC7 lpD3DDevDesc);
93 -HRESULT WINAPI glDirect3DDevice7::GetClipPlane(DWORD dwIndex, D3DVALUE *pPlaneEquation);
94 -HRESULT WINAPI glDirect3DDevice7::GetClipStatus(LPD3DCLIPSTATUS lpD3DClipStatus);
95 -HRESULT WINAPI glDirect3DDevice7::GetDirect3D(LPDIRECT3D7 *lplpD3D);
96 -HRESULT WINAPI glDirect3DDevice7::GetInfo(DWORD dwDevInfoID, LPVOID pDevInfoStruct, DWORD dwSize);
97 -HRESULT WINAPI glDirect3DDevice7::GetLight(DWORD dwLightIndex, LPD3DLIGHT7 lpLight);
98 -HRESULT WINAPI glDirect3DDevice7::GetLightEnable(DWORD dwLightIndex, BOOL* pbEnable);
99 -HRESULT WINAPI glDirect3DDevice7::GetMaterial(LPD3DMATERIAL7 lpMaterial);
100 -HRESULT WINAPI glDirect3DDevice7::GetRenderState(D3DRENDERSTATETYPE dwRenderStateType, LPDWORD lpdwRenderState);
101 -HRESULT WINAPI glDirect3DDevice7::GetRenderTarget(LPDIRECTDRAWSURFACE7 lplpRenderTarget);
102 -HRESULT WINAPI glDirect3DDevice7::GetStateData(DWORD dwState, LPVOID* lplpStateData);
103 -HRESULT WINAPI glDirect3DDevice7::GetTexture(DWORD dwStage, LPDIRECTDRAWSURFACE7 *lplpTexture);
104 -HRESULT WINAPI glDirect3DDevice7::GetTextureStageState(DWORD dwStage, D3DTEXTURESTAGESTATETYPE dwState, LPDWORD lpdwValue);
105 -HRESULT WINAPI glDirect3DDevice7::GetTransform(D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix);
106 -HRESULT WINAPI glDirect3DDevice7::GetViewport(LPD3DVIEWPORT7 lpViewport);
107 -HRESULT WINAPI glDirect3DDevice7::LightEnable(DWORD dwLightIndex, BOOL bEnable);
108 -HRESULT WINAPI glDirect3DDevice7::Load(LPDIRECTDRAWSURFACE7 lpDestTex, LPPOINT lpDestPoint, LPDIRECTDRAWSURFACE7 lpSrcTex, LPRECT lprcSrcRect, DWORD dwFlags);
109 -HRESULT WINAPI glDirect3DDevice7::MultiplyTransform(D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix);
110 -HRESULT WINAPI glDirect3DDevice7::PreLoad(LPDIRECTDRAWSURFACE7 lpddsTexture);
111 -HRESULT WINAPI glDirect3DDevice7::SetClipPlane(DWORD dwIndex, D3DVALUE* pPlaneEquation);
112 -HRESULT WINAPI glDirect3DDevice7::SetClipStatus(LPD3DCLIPSTATUS lpD3DClipStatus);
113 -HRESULT WINAPI glDirect3DDevice7::SetLight(DWORD dwLightIndex, LPD3DLIGHT7 lpLight);
114 -HRESULT WINAPI glDirect3DDevice7::SetMaterial(LPD3DMATERIAL7 lpMaterial);
115 -HRESULT WINAPI glDirect3DDevice7::SetRenderState(D3DRENDERSTATETYPE dwRendStateType, DWORD dwRenderState);
116 -HRESULT WINAPI glDirect3DDevice7::SetRenderTarget(LPDIRECTDRAWSURFACE7 lpNewRenderTarget, DWORD dwFlags);
117 -HRESULT WINAPI glDirect3DDevice7::SetStateData(DWORD dwState, LPVOID lpStateData);
118 -HRESULT WINAPI glDirect3DDevice7::SetTexture(DWORD dwStage, LPDIRECTDRAWSURFACE7 lpTexture);
119 -HRESULT WINAPI glDirect3DDevice7::SetTextureStageState(DWORD dwStage, D3DTEXTURESTAGESTATETYPE dwState, DWORD dwValue);
120 -HRESULT WINAPI glDirect3DDevice7::SetTransform(D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix);
121 -HRESULT WINAPI glDirect3DDevice7::SetViewport(LPD3DVIEWPORT7 lpViewport);
122 -HRESULT WINAPI glDirect3DDevice7::ValidateDevice(LPDWORD lpdwPasses);
123 -*/
\ No newline at end of file
 77+}
 78+HRESULT WINAPI glDirect3DDevice7::CreateStateBlock(D3DSTATEBLOCKTYPE d3dsbtype, LPDWORD lpdwBlockHandle)
 79+{
 80+ FIXME("glDirect3DDevice7::CreateStateBlock: stub");
 81+ ERR(DDERR_GENERIC);
 82+}
 83+HRESULT WINAPI glDirect3DDevice7::Clear(DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags, DWORD dwColor, D3DVALUE dvZ, DWORD dwStencil)
 84+{
 85+ FIXME("glDirect3DDevice7::Clear: stub");
 86+ ERR(DDERR_GENERIC);
 87+}
 88+HRESULT WINAPI glDirect3DDevice7::ComputeSphereVisibility(LPD3DVECTOR lpCenters, LPD3DVALUE lpRadii, DWORD dwNumSpheres,
 89+ DWORD dwFlags, LPDWORD lpdwReturnValues)
 90+{
 91+ FIXME("glDirect3DDevice7::ComputeSphereVisibility: stub");
 92+ ERR(DDERR_GENERIC);
 93+}
 94+HRESULT WINAPI glDirect3DDevice7::DeleteStateBlock(DWORD dwBlockHandle)
 95+{
 96+ FIXME("glDirect3DDevice7::DeleteStateBlock: stub");
 97+ ERR(DDERR_GENERIC);
 98+}
 99+HRESULT WINAPI glDirect3DDevice7::DrawIndexedPrimitive(D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD dwVertexTypeDesc,
 100+ LPVOID lpvVertices, DWORD dwVertexCount, LPWORD lpwIndices, DWORD dwIndexCount, DWORD dwFlags)
 101+{
 102+ FIXME("glDirect3DDevice7::DrawIndexedPrimitive: stub");
 103+ ERR(DDERR_GENERIC);
 104+}
 105+HRESULT WINAPI glDirect3DDevice7::DrawIndexedPrimitiveStrided(D3DPRIMITIVETYPE d3dptPrimitiveType, DWORD dwVertexTypeDesc,
 106+ LPD3DDRAWPRIMITIVESTRIDEDDATA lpvVerticexArray, DWORD dwVertexCount, LPWORD lpwIndices, DWORD dwIndexCount, DWORD dwFlags)
 107+{
 108+ FIXME("glDirect3DDevice7::DrawIndexedPrimitiveStrided: stub");
 109+ ERR(DDERR_GENERIC);
 110+}
 111+HRESULT WINAPI glDirect3DDevice7::DrawIndexedPrimitiveVB(D3DPRIMITIVETYPE d3dptPrimitiveType, LPDIRECT3DVERTEXBUFFER7 lpd3dVertexBuffer,
 112+ DWORD dwStartVertex, DWORD dwNumVertices, LPWORD lpwIndices, DWORD dwIndexCount, DWORD dwFlags)
 113+{
 114+ FIXME("glDirect3DDevice7::DrawIndexedPrimitiveVB: stub");
 115+ ERR(DDERR_GENERIC);
 116+}
 117+HRESULT WINAPI glDirect3DDevice7::DrawPrimitive(D3DPRIMITIVETYPE dptPrimitiveType, DWORD dwVertexTypeDesc, LPVOID lpVertices,
 118+ DWORD dwVertexCount, DWORD dwFlags)
 119+{
 120+ FIXME("glDirect3DDevice7::DrawPrimitive: stub");
 121+ ERR(DDERR_GENERIC);
 122+}
 123+HRESULT WINAPI glDirect3DDevice7::DrawPrimitiveStrided(D3DPRIMITIVETYPE dptPrimitiveType, DWORD dwVertexTypeDesc,
 124+ LPD3DDRAWPRIMITIVESTRIDEDDATA lpVertexArray, DWORD dwVertexCount, DWORD dwFlags)
 125+{
 126+ FIXME("glDirect3DDevice7::DrawPrimitiveStrided: stub");
 127+ ERR(DDERR_GENERIC);
 128+}
 129+HRESULT WINAPI glDirect3DDevice7::DrawPrimitiveVB(D3DPRIMITIVETYPE d3dptPrimitiveType, LPDIRECT3DVERTEXBUFFER7 lpd3dVertexBuffer,
 130+ DWORD dwStartVertex, DWORD dwNumVertices, DWORD dwFlags)
 131+{
 132+ FIXME("glDirect3DDevice7::DrawPrimitiveVB: stub");
 133+ ERR(DDERR_GENERIC);
 134+}
 135+HRESULT WINAPI glDirect3DDevice7::EndScene()
 136+{
 137+ FIXME("glDirect3DDevice7::EndScene: stub");
 138+ ERR(DDERR_GENERIC);
 139+}
 140+HRESULT WINAPI glDirect3DDevice7::EndStateBlock(LPDWORD lpdwBlockHandle)
 141+{
 142+ FIXME("glDirect3DDevice7::EndStateBlock: stub");
 143+ ERR(DDERR_GENERIC);
 144+}
 145+HRESULT WINAPI glDirect3DDevice7::EnumTextureFormats(LPD3DENUMPIXELFORMATSCALLBACK lpd3dEnumPixelProc, LPVOID lpArg)
 146+{
 147+ FIXME("glDirect3DDevice7::EnumTextureFormats: stub");
 148+ ERR(DDERR_GENERIC);
 149+}
 150+HRESULT WINAPI glDirect3DDevice7::GetCaps(LPD3DDEVICEDESC7 lpD3DDevDesc)
 151+{
 152+ FIXME("glDirect3DDevice7::GetCaps: stub");
 153+ ERR(DDERR_GENERIC);
 154+}
 155+HRESULT WINAPI glDirect3DDevice7::GetClipPlane(DWORD dwIndex, D3DVALUE *pPlaneEquation)
 156+{
 157+ FIXME("glDirect3DDevice7::GetClipPlane: stub");
 158+ ERR(DDERR_GENERIC);
 159+}
 160+HRESULT WINAPI glDirect3DDevice7::GetClipStatus(LPD3DCLIPSTATUS lpD3DClipStatus)
 161+{
 162+ FIXME("glDirect3DDevice7::GetClipStatus: stub");
 163+ ERR(DDERR_GENERIC);
 164+}
 165+HRESULT WINAPI glDirect3DDevice7::GetDirect3D(LPDIRECT3D7 *lplpD3D)
 166+{
 167+ *lplpD3D = glD3D7;
 168+ return D3D_OK;
 169+}
 170+HRESULT WINAPI glDirect3DDevice7::GetInfo(DWORD dwDevInfoID, LPVOID pDevInfoStruct, DWORD dwSize)
 171+{
 172+ FIXME("glDirect3DDevice7::GetInfo: stub");
 173+ ERR(DDERR_GENERIC);
 174+}
 175+HRESULT WINAPI glDirect3DDevice7::GetLight(DWORD dwLightIndex, LPD3DLIGHT7 lpLight)
 176+{
 177+ FIXME("glDirect3DDevice7::GetLight: stub");
 178+ ERR(DDERR_GENERIC);
 179+}
 180+HRESULT WINAPI glDirect3DDevice7::GetLightEnable(DWORD dwLightIndex, BOOL* pbEnable)
 181+{
 182+ FIXME("glDirect3DDevice7::GetLightEnalbe: stub");
 183+ ERR(DDERR_GENERIC);
 184+}
 185+HRESULT WINAPI glDirect3DDevice7::GetMaterial(LPD3DMATERIAL7 lpMaterial)
 186+{
 187+ FIXME("glDirect3DDevice7::GetMaterial: stub");
 188+ ERR(DDERR_GENERIC);
 189+}
 190+HRESULT WINAPI glDirect3DDevice7::GetRenderState(D3DRENDERSTATETYPE dwRenderStateType, LPDWORD lpdwRenderState)
 191+{
 192+ FIXME("glDirect3DDevice7::GetRenderState: stub");
 193+ ERR(DDERR_GENERIC);
 194+}
 195+HRESULT WINAPI glDirect3DDevice7::GetRenderTarget(LPDIRECTDRAWSURFACE7 lplpRenderTarget)
 196+{
 197+ FIXME("glDirect3DDevice7::GetRenderTarget: stub");
 198+ ERR(DDERR_GENERIC);
 199+}
 200+HRESULT WINAPI glDirect3DDevice7::GetStateData(DWORD dwState, LPVOID* lplpStateData)
 201+{
 202+ FIXME("glDirect3DDevice7::GetStateData: stub");
 203+ ERR(DDERR_GENERIC);
 204+}
 205+HRESULT WINAPI glDirect3DDevice7::GetTexture(DWORD dwStage, LPDIRECTDRAWSURFACE7 *lplpTexture)
 206+{
 207+ FIXME("glDirect3DDevice7::GetTexture: stub");
 208+ ERR(DDERR_GENERIC);
 209+}
 210+HRESULT WINAPI glDirect3DDevice7::GetTextureStageState(DWORD dwStage, D3DTEXTURESTAGESTATETYPE dwState, LPDWORD lpdwValue)
 211+{
 212+ FIXME("glDirect3DDevice7::GetTextureStageState: stub");
 213+ ERR(DDERR_GENERIC);
 214+}
 215+HRESULT WINAPI glDirect3DDevice7::GetTransform(D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix)
 216+{
 217+ FIXME("glDirect3DDevice7::GetTransform: stub");
 218+ ERR(DDERR_GENERIC);
 219+}
 220+HRESULT WINAPI glDirect3DDevice7::GetViewport(LPD3DVIEWPORT7 lpViewport)
 221+{
 222+ FIXME("glDirect3DDevice7::GetViewport: stub");
 223+ ERR(DDERR_GENERIC);
 224+}
 225+HRESULT WINAPI glDirect3DDevice7::LightEnable(DWORD dwLightIndex, BOOL bEnable)
 226+{
 227+ FIXME("glDirect3DDevice7::LightEnable: stub");
 228+ ERR(DDERR_GENERIC);
 229+}
 230+HRESULT WINAPI glDirect3DDevice7::Load(LPDIRECTDRAWSURFACE7 lpDestTex, LPPOINT lpDestPoint, LPDIRECTDRAWSURFACE7 lpSrcTex,
 231+ LPRECT lprcSrcRect, DWORD dwFlags)
 232+{
 233+ FIXME("glDirect3DDevice7::Load: stub");
 234+ ERR(DDERR_GENERIC);
 235+}
 236+HRESULT WINAPI glDirect3DDevice7::MultiplyTransform(D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix)
 237+{
 238+ FIXME("glDirect3DDevice7::MultiplyTransform: stub");
 239+ ERR(DDERR_GENERIC);
 240+}
 241+HRESULT WINAPI glDirect3DDevice7::PreLoad(LPDIRECTDRAWSURFACE7 lpddsTexture)
 242+{
 243+ FIXME("glDirect3DDevice7::PreLoad: stub");
 244+ ERR(DDERR_GENERIC);
 245+}
 246+HRESULT WINAPI glDirect3DDevice7::SetClipPlane(DWORD dwIndex, D3DVALUE* pPlaneEquation)
 247+{
 248+ FIXME("glDirect3DDevice7::SetClipPland: stub");
 249+ ERR(DDERR_GENERIC);
 250+}
 251+HRESULT WINAPI glDirect3DDevice7::SetClipStatus(LPD3DCLIPSTATUS lpD3DClipStatus)
 252+{
 253+ FIXME("glDirect3DDevice7::SetClipStatus: stub");
 254+ ERR(DDERR_GENERIC);
 255+}
 256+HRESULT WINAPI glDirect3DDevice7::SetLight(DWORD dwLightIndex, LPD3DLIGHT7 lpLight)
 257+{
 258+ FIXME("glDirect3DDevice7::SetLight: stub");
 259+ ERR(DDERR_GENERIC);
 260+}
 261+HRESULT WINAPI glDirect3DDevice7::SetMaterial(LPD3DMATERIAL7 lpMaterial)
 262+{
 263+ FIXME("glDirect3DDevice7::SetMaterial: stub");
 264+ ERR(DDERR_GENERIC);
 265+}
 266+HRESULT WINAPI glDirect3DDevice7::SetRenderState(D3DRENDERSTATETYPE dwRendStateType, DWORD dwRenderState)
 267+{
 268+ FIXME("glDirect3DDevice7::SetRenderState: stub");
 269+ ERR(DDERR_GENERIC);
 270+}
 271+HRESULT WINAPI glDirect3DDevice7::SetRenderTarget(LPDIRECTDRAWSURFACE7 lpNewRenderTarget, DWORD dwFlags)
 272+{
 273+ FIXME("glDirect3DDevice7::SetRenderTarget: stub");
 274+ ERR(DDERR_GENERIC);
 275+}
 276+HRESULT WINAPI glDirect3DDevice7::SetStateData(DWORD dwState, LPVOID lpStateData)
 277+{
 278+ FIXME("glDirect3DDevice7::SetStateData: stub");
 279+ ERR(DDERR_GENERIC);
 280+}
 281+HRESULT WINAPI glDirect3DDevice7::SetTexture(DWORD dwStage, LPDIRECTDRAWSURFACE7 lpTexture)
 282+{
 283+ FIXME("glDirect3DDevice7::SetTexture: stub");
 284+ ERR(DDERR_GENERIC);
 285+}
 286+HRESULT WINAPI glDirect3DDevice7::SetTextureStageState(DWORD dwStage, D3DTEXTURESTAGESTATETYPE dwState, DWORD dwValue)
 287+{
 288+ FIXME("glDirect3DDevice7::SetTextureStageState: stub");
 289+ ERR(DDERR_GENERIC);
 290+}
 291+HRESULT WINAPI glDirect3DDevice7::SetTransform(D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix)
 292+{
 293+ FIXME("glDirect3DDevice7::SetTransform: stub");
 294+ ERR(DDERR_GENERIC);
 295+}
 296+HRESULT WINAPI glDirect3DDevice7::SetViewport(LPD3DVIEWPORT7 lpViewport)
 297+{
 298+ FIXME("glDirect3DDevice7::SetViewport: stub");
 299+ ERR(DDERR_GENERIC);
 300+}
 301+HRESULT WINAPI glDirect3DDevice7::ValidateDevice(LPDWORD lpdwPasses)
 302+{
 303+ FIXME("glDirect3DDevice7::ValidateDevice: stub");
 304+ ERR(DDERR_GENERIC);
 305+}
\ No newline at end of file
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/52"