[ros-diffs] [greatlrd] 31050: Fixed a bug for Main_DirectDraw_SetDisplayMode for DirectX 1 it did accepted to many param Thx Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to found this bug

Author: greatlrd
Date: Thu Dec  6 22:56:53 2007
New Revision: 31050

URL: http://svn.reactos.org/svn/reactos?rev=31050&view=rev
Log:
Fixed a bug for Main_DirectDraw_SetDisplayMode for DirectX 1 it did accepted to many param

Thx Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to found this bug


Modified:
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h
    trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c
    trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c

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 Thu Dec  6 22:56:53 2007
@@ -119,6 +119,13 @@
                                LPDDRAWI_DIRECTDRAW_INT This,
                                DWORD dwWidth,
                                DWORD dwHeight,
+                               DWORD dwBPP);
+
+HRESULT WINAPI
+Main_DirectDraw_SetDisplayMode2(
+                               LPDDRAWI_DIRECTDRAW_INT This,
+                               DWORD dwWidth,
+                               DWORD dwHeight,
                                DWORD dwBPP,
                                DWORD dwRefreshRate,
                                DWORD dwFlags);

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 Thu Dec  6 22:56:53 2007
@@ -109,8 +109,14 @@
 }
 
 HRESULT WINAPI
-Main_DirectDraw_SetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD
dwHeight,
-                                                                DWORD dwBPP, DWORD
dwRefreshRate, DWORD dwFlags)
+Main_DirectDraw_SetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD
dwHeight, DWORD dwBPP)
+{
+    return Main_DirectDraw_SetDisplayMode2 (This, dwWidth, dwHeight, dwBPP, 0, 0 );
+}
+
+HRESULT WINAPI
+Main_DirectDraw_SetDisplayMode2 (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD
dwHeight,
+                                 DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags)
 {
     HRESULT ret = DD_OK;
     DX_WINDBG_trace();

Modified: 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 (original)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c Thu Dec  6 22:56:53 2007
@@ -130,7 +130,7 @@
                                      DWORD cooplevel);
 
 HRESULT WINAPI
-Main_DirectDraw_SetDisplayMode(
+Main_DirectDraw_SetDisplayMode2(
                                LPDIRECTDRAW2 iface,
                                DWORD dwWidth,
                                DWORD dwHeight,
@@ -176,7 +176,7 @@
     Main_DirectDraw_Initialize,
     Main_DirectDraw_RestoreDisplayMode,
     Main_DirectDraw_SetCooperativeLevel,
-    Main_DirectDraw_SetDisplayMode,
+    Main_DirectDraw_SetDisplayMode2,
     Main_DirectDraw_WaitForVerticalBlank,
     Main_DirectDraw_GetAvailableVidMem
 };

Modified: 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 (original)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Thu Dec  6 22:56:53 2007
@@ -130,7 +130,7 @@
                                      DWORD cooplevel);
 
 HRESULT WINAPI
-Main_DirectDraw_SetDisplayMode(
+Main_DirectDraw_SetDisplayMode2(
                                LPDIRECTDRAW4 iface,
                                DWORD dwWidth,
                                DWORD dwHeight,
@@ -195,7 +195,7 @@
     Main_DirectDraw_Initialize,
     Main_DirectDraw_RestoreDisplayMode,
     Main_DirectDraw_SetCooperativeLevel,
-    Main_DirectDraw_SetDisplayMode,
+    Main_DirectDraw_SetDisplayMode2,
     Main_DirectDraw_WaitForVerticalBlank,
     Main_DirectDraw_GetAvailableVidMem4,
     Main_DirectDraw_GetSurfaceFromDC,

Modified: 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 (original)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Thu Dec  6 22:56:53 2007
@@ -134,7 +134,7 @@
                                      DWORD cooplevel);
 
 HRESULT WINAPI
-Main_DirectDraw_SetDisplayMode(
+Main_DirectDraw_SetDisplayMode2(
                                LPDIRECTDRAW7 iface,
                                DWORD dwWidth,
                                DWORD dwHeight,
@@ -210,7 +210,7 @@
     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_SetDisplayMode2,             /* (SetDisplayMode testing / devloping)
*/
     Main_DirectDraw_WaitForVerticalBlank,
     Main_DirectDraw_GetAvailableVidMem4,        /* (GetAvailableVidMem4 done) */
     Main_DirectDraw_GetSurfaceFromDC,

Modified: 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 (original)
+++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c Thu Dec  6 22:56:53 2007
@@ -134,9 +134,7 @@
                                LPDIRECTDRAW iface,
                                DWORD dwWidth,
                                DWORD dwHeight,
-                               DWORD dwBPP,
-                               DWORD dwRefreshRate,
-                               DWORD dwFlags);
+                               DWORD dwBPP);
 
 HRESULT WINAPI
 Main_DirectDraw_WaitForVerticalBlank(