DXGL r46 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r45‎ | r46 | r47 >
Date:17:47, 25 December 2011
Author:admin
Status:new
Tags:
Comment:
fix glDirectDrawSurface::Initialize
fix glDirectDraw::Initialize for old versions
Modified paths:
  • /ddraw/glDirectDraw.cpp (modified) (history)
  • /ddraw/glDirectDrawSurface.cpp (modified) (history)

Diff [purge]

Index: ddraw/glDirectDraw.cpp
——@@ -1556,8 +1556,7 @@
15571557 }
15581558 HRESULT WINAPI glDirectDraw1::Initialize(GUID FAR *lpGUID)
15591559 {
1560 - FIXME("IDirectDraw1::Initialize: stub\n");
1561 - ERR(DDERR_DIRECTDRAWALREADYCREATED);
 1560+ return glDD7->Initialize(lpGUID);
15621561 }
15631562 HRESULT WINAPI glDirectDraw1::RestoreDisplayMode()
15641563 {
——@@ -1676,8 +1675,7 @@
16771676 }
16781677 HRESULT WINAPI glDirectDraw2::Initialize(GUID FAR *lpGUID)
16791678 {
1680 - FIXME("IDirectDraw2::Initialize: stub\n");
1681 - ERR(DDERR_DIRECTDRAWALREADYCREATED);
 1679+ return glDD7->Initialize(lpGUID);
16821680 }
16831681 HRESULT WINAPI glDirectDraw2::RestoreDisplayMode()
16841682 {
——@@ -1799,8 +1797,7 @@
18001798 }
18011799 HRESULT WINAPI glDirectDraw4::Initialize(GUID FAR *lpGUID)
18021800 {
1803 - FIXME("IDirectDraw4::Initialize: stub\n");
1804 - ERR(DDERR_DIRECTDRAWALREADYCREATED);
 1801+ return glDD7->Initialize(lpGUID);
18051802 }
18061803 HRESULT WINAPI glDirectDraw4::RestoreDisplayMode()
18071804 {
Index: ddraw/glDirectDrawSurface.cpp
——@@ -916,7 +916,7 @@
917917 }
918918 HRESULT WINAPI glDirectDrawSurface7::Initialize(LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc)
919919 {
920 - ERR(DDERR_ALREADYINITIALIZED);
 920+ return DDERR_ALREADYINITIALIZED;
921921 }
922922 HRESULT WINAPI glDirectDrawSurface7::IsLost()
923923 {
——@@ -1342,8 +1342,7 @@
13431343 }
13441344 HRESULT WINAPI glDirectDrawSurface1::Initialize(LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc)
13451345 {
1346 - FIXME("glDirectDrawSurface1::Initialize: stub\n");
1347 - ERR(DDERR_GENERIC);
 1346+ return DDERR_ALREADYINITIALIZED;
13481347 }
13491348 HRESULT WINAPI glDirectDrawSurface1::IsLost()
13501349 {
——@@ -1523,8 +1522,7 @@
15241523 }
15251524 HRESULT WINAPI glDirectDrawSurface2::Initialize(LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc)
15261525 {
1527 - FIXME("glDirectDrawSurface2::Initialize: stub\n");
1528 - ERR(DDERR_GENERIC);
 1526+ return DDERR_ALREADYINITIALIZED;
15291527 }
15301528 HRESULT WINAPI glDirectDrawSurface2::IsLost()
15311529 {
——@@ -1716,8 +1714,7 @@
17171715 }
17181716 HRESULT WINAPI glDirectDrawSurface3::Initialize(LPDIRECTDRAW lpDD, LPDDSURFACEDESC lpDDSurfaceDesc)
17191717 {
1720 - FIXME("glDirectDrawSurface3::Initialize: stub\n");
1721 - ERR(DDERR_GENERIC);
 1718+ return DDERR_ALREADYINITIALIZED;
17221719 }
17231720 HRESULT WINAPI glDirectDrawSurface3::IsLost()
17241721 {
——@@ -1905,8 +1902,7 @@
19061903 }
19071904 HRESULT WINAPI glDirectDrawSurface4::Initialize(LPDIRECTDRAW lpDD, LPDDSURFACEDESC2 lpDDSurfaceDesc)
19081905 {
1909 - FIXME("glDirectDrawSurface4::Initialize: stub\n");
1910 - ERR(DDERR_GENERIC);
 1906+ return DDERR_ALREADYINITIALIZED;
19111907 }
19121908 HRESULT WINAPI glDirectDrawSurface4::IsLost()
19131909 {
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/46"