Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug for Main_DirectDraw_SetDisplayMode for DirectX 1 it did accepted to many param

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


svn path=/trunk/; revision=31050
This commit is contained in:
Magnus Olsen 2007-12-06 19:56:53 +00:00
parent 122793a01a
commit 847f27f307
6 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/directx/ddraw/Ddraw/ddraw.h
View file

@ -116,6 +116,13 @@ Main_DirectDraw_SetCooperativeLevel (
HRESULT WINAPI HRESULT WINAPI
Main_DirectDraw_SetDisplayMode( Main_DirectDraw_SetDisplayMode(
LPDDRAWI_DIRECTDRAW_INT This,
DWORD dwWidth,
DWORD dwHeight,
DWORD dwBPP);
HRESULT WINAPI
Main_DirectDraw_SetDisplayMode2(
LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DIRECTDRAW_INT This,
DWORD dwWidth, DWORD dwWidth,
DWORD dwHeight, DWORD dwHeight,

8
reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c
View file

@ -109,7 +109,13 @@ Main_DirectDraw_EnumDisplayModes(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags,
} }
HRESULT WINAPI HRESULT WINAPI
Main_DirectDraw_SetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, 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) DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags)
{ {
HRESULT ret = DD_OK; HRESULT ret = DD_OK;

4
reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c
View file

@ -130,7 +130,7 @@ Main_DirectDraw_SetCooperativeLevel (
DWORD cooplevel); DWORD cooplevel);
HRESULT WINAPI HRESULT WINAPI
Main_DirectDraw_SetDisplayMode( Main_DirectDraw_SetDisplayMode2(
LPDIRECTDRAW2 iface, LPDIRECTDRAW2 iface,
DWORD dwWidth, DWORD dwWidth,
DWORD dwHeight, DWORD dwHeight,
@ -176,7 +176,7 @@ IDirectDraw2Vtbl DirectDraw2_Vtable =
Main_DirectDraw_Initialize, Main_DirectDraw_Initialize,
Main_DirectDraw_RestoreDisplayMode, Main_DirectDraw_RestoreDisplayMode,
Main_DirectDraw_SetCooperativeLevel, Main_DirectDraw_SetCooperativeLevel,
Main_DirectDraw_SetDisplayMode, Main_DirectDraw_SetDisplayMode2,
Main_DirectDraw_WaitForVerticalBlank, Main_DirectDraw_WaitForVerticalBlank,
Main_DirectDraw_GetAvailableVidMem Main_DirectDraw_GetAvailableVidMem
}; };

4
reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c
View file

@ -130,7 +130,7 @@ Main_DirectDraw_SetCooperativeLevel (
DWORD cooplevel); DWORD cooplevel);
HRESULT WINAPI HRESULT WINAPI
Main_DirectDraw_SetDisplayMode( Main_DirectDraw_SetDisplayMode2(
LPDIRECTDRAW4 iface, LPDIRECTDRAW4 iface,
DWORD dwWidth, DWORD dwWidth,
DWORD dwHeight, DWORD dwHeight,
@ -195,7 +195,7 @@ IDirectDraw4Vtbl DirectDraw4_Vtable =
Main_DirectDraw_Initialize, Main_DirectDraw_Initialize,
Main_DirectDraw_RestoreDisplayMode, Main_DirectDraw_RestoreDisplayMode,
Main_DirectDraw_SetCooperativeLevel, Main_DirectDraw_SetCooperativeLevel,
Main_DirectDraw_SetDisplayMode, Main_DirectDraw_SetDisplayMode2,
Main_DirectDraw_WaitForVerticalBlank, Main_DirectDraw_WaitForVerticalBlank,
Main_DirectDraw_GetAvailableVidMem4, Main_DirectDraw_GetAvailableVidMem4,
Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_GetSurfaceFromDC,

4
reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c
View file

@ -134,7 +134,7 @@ Main_DirectDraw_SetCooperativeLevel (
DWORD cooplevel); DWORD cooplevel);
HRESULT WINAPI HRESULT WINAPI
Main_DirectDraw_SetDisplayMode( Main_DirectDraw_SetDisplayMode2(
LPDIRECTDRAW7 iface, LPDIRECTDRAW7 iface,
DWORD dwWidth, DWORD dwWidth,
DWORD dwHeight, DWORD dwHeight,
@ -210,7 +210,7 @@ IDirectDraw7Vtbl DirectDraw7_Vtable =
Main_DirectDraw_Initialize, /* (Initialize done) */ Main_DirectDraw_Initialize, /* (Initialize done) */
Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */ Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */
Main_DirectDraw_SetCooperativeLevel, /* (SetCooperativeLevel 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_WaitForVerticalBlank,
Main_DirectDraw_GetAvailableVidMem4, /* (GetAvailableVidMem4 done) */ Main_DirectDraw_GetAvailableVidMem4, /* (GetAvailableVidMem4 done) */
Main_DirectDraw_GetSurfaceFromDC, Main_DirectDraw_GetSurfaceFromDC,

4
reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c
View file

@ -134,9 +134,7 @@ Main_DirectDraw_SetDisplayMode(
LPDIRECTDRAW iface, LPDIRECTDRAW iface,
DWORD dwWidth, DWORD dwWidth,
DWORD dwHeight, DWORD dwHeight,
DWORD dwBPP, DWORD dwBPP);
DWORD dwRefreshRate,
DWORD dwFlags);
HRESULT WINAPI HRESULT WINAPI
Main_DirectDraw_WaitForVerticalBlank( Main_DirectDraw_WaitForVerticalBlank(