diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw.h b/reactos/dll/directx/ddraw/Ddraw/ddraw.h index 0fc9ddba016..6f4a4154d9f 100644 --- a/reactos/dll/directx/ddraw/Ddraw/ddraw.h +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw.h @@ -116,6 +116,13 @@ Main_DirectDraw_SetCooperativeLevel ( HRESULT WINAPI Main_DirectDraw_SetDisplayMode( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwWidth, + DWORD dwHeight, + DWORD dwBPP); + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode2( LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c index 6cf20c877ea..6b7ffdbea01 100644 --- a/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c @@ -109,8 +109,14 @@ Main_DirectDraw_EnumDisplayModes(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, } 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(); diff --git a/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c b/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c index 78dfcee1490..28300eca80e 100644 --- a/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c +++ b/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c @@ -130,7 +130,7 @@ Main_DirectDraw_SetCooperativeLevel ( DWORD cooplevel); HRESULT WINAPI -Main_DirectDraw_SetDisplayMode( +Main_DirectDraw_SetDisplayMode2( LPDIRECTDRAW2 iface, DWORD dwWidth, DWORD dwHeight, @@ -176,7 +176,7 @@ IDirectDraw2Vtbl DirectDraw2_Vtable = Main_DirectDraw_Initialize, Main_DirectDraw_RestoreDisplayMode, Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_SetDisplayMode2, Main_DirectDraw_WaitForVerticalBlank, Main_DirectDraw_GetAvailableVidMem }; diff --git a/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c b/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c index faf416c133d..5fad5a6c7d3 100644 --- a/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c +++ b/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c @@ -130,7 +130,7 @@ Main_DirectDraw_SetCooperativeLevel ( DWORD cooplevel); HRESULT WINAPI -Main_DirectDraw_SetDisplayMode( +Main_DirectDraw_SetDisplayMode2( LPDIRECTDRAW4 iface, DWORD dwWidth, DWORD dwHeight, @@ -195,7 +195,7 @@ IDirectDraw4Vtbl DirectDraw4_Vtable = Main_DirectDraw_Initialize, Main_DirectDraw_RestoreDisplayMode, Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_SetDisplayMode2, Main_DirectDraw_WaitForVerticalBlank, Main_DirectDraw_GetAvailableVidMem4, Main_DirectDraw_GetSurfaceFromDC, diff --git a/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c b/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c index 37633fdc462..13440b0718c 100644 --- a/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c +++ b/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c @@ -134,7 +134,7 @@ Main_DirectDraw_SetCooperativeLevel ( DWORD cooplevel); HRESULT WINAPI -Main_DirectDraw_SetDisplayMode( +Main_DirectDraw_SetDisplayMode2( LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, @@ -210,7 +210,7 @@ IDirectDraw7Vtbl DirectDraw7_Vtable = 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, diff --git a/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c b/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c index 110b0c568e6..c5e4ae3634f 100644 --- a/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c +++ b/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c @@ -134,9 +134,7 @@ Main_DirectDraw_SetDisplayMode( LPDIRECTDRAW iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, - DWORD dwRefreshRate, - DWORD dwFlags); + DWORD dwBPP); HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(