From e381e0f4dff1599436f2790fabbadc732facc163 Mon Sep 17 00:00:00 2001 From: Maarten Bosma Date: Tue, 15 May 2007 17:52:00 +0000 Subject: [PATCH] Fix types in startup.c. svn path=/trunk/; revision=26795 --- reactos/dll/directx/ddraw/Ddraw/ddraw_main.c | 2 +- reactos/dll/directx/ddraw/rosdraw.h | 8 ++++---- reactos/dll/directx/ddraw/startup.c | 17 +++++++---------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c index b84e0e7d403..66280963294 100644 --- a/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c +++ b/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c @@ -171,7 +171,7 @@ Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeig // Update Interals BOOL ModeChanged; DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); - StartDirectDraw((LPDIRECTDRAW*)iface, 0, TRUE); + StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); return DD_OK; } diff --git a/reactos/dll/directx/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h index 61dd313060e..bae1f9f4ecc 100644 --- a/reactos/dll/directx/ddraw/rosdraw.h +++ b/reactos/dll/directx/ddraw/rosdraw.h @@ -20,11 +20,11 @@ extern WNDCLASSW wnd_class; extern CRITICAL_SECTION ddcs; extern IDirectDraw7Vtbl DirectDraw7_Vtable; -HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable); -HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable); -HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable); +HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW iface, LPGUID pGUID, BOOL reenable); +HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable); +HRESULT WINAPI StartDirectDrawHel(LPDIRECTDRAW iface, BOOL reenable); HRESULT WINAPI Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, REFIID id, BOOL ex); -HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW* iface); +HRESULT WINAPI ReCreateDirectDraw(LPDIRECTDRAW iface); HRESULT Internal_CreateSurface( LPDDRAWI_DIRECTDRAW_INT pDDraw, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter); diff --git a/reactos/dll/directx/ddraw/startup.c b/reactos/dll/directx/ddraw/startup.c index 198cb0c9e01..d9762e5b4f2 100644 --- a/reactos/dll/directx/ddraw/startup.c +++ b/reactos/dll/directx/ddraw/startup.c @@ -21,12 +21,9 @@ WNDCLASSW wnd_class; -HRESULT -WINAPI -Create_DirectDraw (LPGUID pGUID, - LPDIRECTDRAW* pIface, - REFIID id, - BOOL ex) +HRESULT WINAPI +Create_DirectDraw (LPGUID pGUID, LPDIRECTDRAW* pIface, + REFIID id, BOOL ex) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; @@ -89,7 +86,7 @@ Create_DirectDraw (LPGUID pGUID, { DX_STUB_str("Got iface"); - if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID, FALSE) == DD_OK); + if (StartDirectDraw((LPDIRECTDRAW)This, pGUID, FALSE) == DD_OK); { DX_STUB_str("here"); @@ -123,7 +120,7 @@ Create_DirectDraw (LPGUID pGUID, HRESULT WINAPI -StartDirectDraw(LPDIRECTDRAW* iface, LPGUID lpGuid, BOOL reenable) +StartDirectDraw(LPDIRECTDRAW iface, LPGUID lpGuid, BOOL reenable) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DWORD hal_ret = DD_FALSE; @@ -277,7 +274,7 @@ StartDirectDraw(LPDIRECTDRAW* iface, LPGUID lpGuid, BOOL reenable) } HRESULT WINAPI -StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable) +StartDirectDrawHel(LPDIRECTDRAW iface, BOOL reenable) { LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; @@ -355,7 +352,7 @@ StartDirectDrawHel(LPDIRECTDRAW* iface, BOOL reenable) HRESULT WINAPI -StartDirectDrawHal(LPDIRECTDRAW* iface, BOOL reenable) +StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable) { LPDWORD mpFourCC;