use older version of structs by default and cast to newer ones if needed

This commit is contained in:
FunkyFr3sh 2021-06-14 09:57:26 +02:00
parent 76b384e0cd
commit f29f712016
17 changed files with 5916 additions and 51 deletions

View file

@ -240,7 +240,12 @@ HRESULT __stdcall IDirectDraw__CreateSurface(
lpDDSurface,
unkOuter);
HRESULT ret = dd_CreateSurface(This, lpDDSurfaceDesc, (IDirectDrawSurfaceImpl**)lpDDSurface, unkOuter);
HRESULT ret =
dd_CreateSurface(
This,
(LPDDSURFACEDESC)lpDDSurfaceDesc,
(IDirectDrawSurfaceImpl**)lpDDSurface,
unkOuter);
TRACE("<- %s\n", __FUNCTION__);
return ret;
@ -273,7 +278,12 @@ HRESULT __stdcall IDirectDraw__EnumDisplayModes(
lpContext,
lpEnumModesCallback);
HRESULT ret = dd_EnumDisplayModes(dwFlags, lpDDSurfaceDesc, lpContext, lpEnumModesCallback);
HRESULT ret =
dd_EnumDisplayModes(
dwFlags,
(LPDDSURFACEDESC)lpDDSurfaceDesc,
lpContext,
(LPDDENUMMODESCALLBACK)lpEnumModesCallback);
TRACE("<- %s\n", __FUNCTION__);
return ret;
@ -311,7 +321,7 @@ HRESULT __stdcall IDirectDraw__GetCaps(IDirectDrawImpl* This, LPDDCAPS lpDDDrive
HRESULT __stdcall IDirectDraw__GetDisplayMode(IDirectDrawImpl* This, LPDDSURFACEDESC2 lpDDSurfaceDesc)
{
TRACE("-> %s(This=%p)\n", __FUNCTION__, This);
HRESULT ret = dd_GetDisplayMode(lpDDSurfaceDesc);
HRESULT ret = dd_GetDisplayMode((LPDDSURFACEDESC)lpDDSurfaceDesc);
TRACE("<- %s\n", __FUNCTION__);
return ret;
}
@ -434,7 +444,7 @@ HRESULT __stdcall IDirectDraw__GetAvailableVidMem(
lpdwTotal,
lpdwFree);
HRESULT ret = dd_GetAvailableVidMem(lpDDCaps, lpdwTotal, lpdwFree);
HRESULT ret = dd_GetAvailableVidMem((LPDDSCAPS)lpDDCaps, lpdwTotal, lpdwFree);
TRACE("<- %s\n", __FUNCTION__);
return ret;

View file

@ -213,7 +213,7 @@ HRESULT __stdcall IDirectDrawSurface__EnumAttachedSurfaces(
lpContext,
lpEnumSurfacesCallback);
HRESULT ret = dds_EnumAttachedSurfaces(This, lpContext, lpEnumSurfacesCallback);
HRESULT ret = dds_EnumAttachedSurfaces(This, lpContext, (LPDDENUMSURFACESCALLBACK)lpEnumSurfacesCallback);
TRACE("<- %s\n", __FUNCTION__);
return ret;
@ -255,7 +255,7 @@ HRESULT __stdcall IDirectDrawSurface__GetAttachedSurface(
LPDIRECTDRAWSURFACE7 FAR* lpDDsurface)
{
TRACE("-> %s(This=%p, dwCaps=%08X, lpDDsurface=%p)\n", __FUNCTION__, This, lpDdsCaps->dwCaps, lpDDsurface);
HRESULT ret = dds_GetAttachedSurface(This, lpDdsCaps, (IDirectDrawSurfaceImpl**)lpDDsurface);
HRESULT ret = dds_GetAttachedSurface(This, (LPDDSCAPS)lpDdsCaps, (IDirectDrawSurfaceImpl**)lpDDsurface);
TRACE("<- %s\n", __FUNCTION__);
return ret;
}
@ -271,7 +271,7 @@ HRESULT __stdcall IDirectDrawSurface__GetBltStatus(IDirectDrawSurfaceImpl* This,
HRESULT __stdcall IDirectDrawSurface__GetCaps(IDirectDrawSurfaceImpl* This, LPDDSCAPS2 lpDDSCaps)
{
TRACE("-> %s(This=%p, lpDDSCaps=%p)\n", __FUNCTION__, This, lpDDSCaps);
HRESULT ret = dds_GetCaps(This, lpDDSCaps);
HRESULT ret = dds_GetCaps(This, (LPDDSCAPS)lpDDSCaps);
TRACE("<- %s\n", __FUNCTION__);
return ret;
}
@ -335,7 +335,7 @@ HRESULT __stdcall IDirectDrawSurface__GetPixelFormat(IDirectDrawSurfaceImpl* Thi
HRESULT __stdcall IDirectDrawSurface__GetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSurfaceDesc)
{
TRACE_EXT("-> %s(This=%p, lpDDSurfaceDesc=%p)\n", __FUNCTION__, This, lpDDSurfaceDesc);
HRESULT ret = dds_GetSurfaceDesc(This, lpDDSurfaceDesc);
HRESULT ret = dds_GetSurfaceDesc(This, (LPDDSURFACEDESC)lpDDSurfaceDesc);
TRACE_EXT("<- %s\n", __FUNCTION__);
return ret;
}
@ -375,7 +375,7 @@ HRESULT __stdcall IDirectDrawSurface__Lock(
dwFlags,
hEvent);
HRESULT ret = dds_Lock(This, lpDestRect, lpDDSurfaceDesc, dwFlags, hEvent);
HRESULT ret = dds_Lock(This, lpDestRect, (LPDDSURFACEDESC)lpDDSurfaceDesc, dwFlags, hEvent);
TRACE_EXT("<- %s\n", __FUNCTION__);
return ret;