backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

#172 Add support for SetSurfaceDesc (Nancy Drew: Stay Tuned For Danger)

Browse Source
This commit is contained in:
FunkyFr3sh 2022-09-21 16:07:32 +02:00
parent 4a45d7942b
commit d18df5faf1
3 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/ddsurface.h
View File

@ -31,6 +31,7 @@ HRESULT dds_SetColorKey(IDirectDrawSurfaceImpl* This, DWORD dwFlags, LPDDCOLORKE
HRESULT dds_SetPalette(IDirectDrawSurfaceImpl* This, IDirectDrawPaletteImpl* lpDDPalette); HRESULT dds_SetPalette(IDirectDrawSurfaceImpl* This, IDirectDrawPaletteImpl* lpDDPalette);
HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect); HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPRECT lpRect);
HRESULT dds_GetDDInterface(IDirectDrawSurfaceImpl* This, LPVOID* lplpDD); HRESULT dds_GetDDInterface(IDirectDrawSurfaceImpl* This, LPVOID* lplpDD);
HRESULT dds__SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags);
void* dds_GetBuffer(IDirectDrawSurfaceImpl* This); void* dds_GetBuffer(IDirectDrawSurfaceImpl* This);
HRESULT dd_CreateSurface(IDirectDrawImpl* This, LPDDSURFACEDESC lpDDSurfaceDesc, IDirectDrawSurfaceImpl** lpDDSurface, IUnknown FAR* unkOuter); HRESULT dd_CreateSurface(IDirectDrawImpl* This, LPDDSURFACEDESC lpDDSurfaceDesc, IDirectDrawSurfaceImpl** lpDDSurface, IUnknown FAR* unkOuter);

6
src/IDirectDraw/IDirectDrawSurface.c
View File

@ -501,9 +501,9 @@ HRESULT __stdcall IDirectDrawSurface__PageUnlock(IDirectDrawSurfaceImpl* This, D
HRESULT __stdcall IDirectDrawSurface__SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags) HRESULT __stdcall IDirectDrawSurface__SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags)
{ {
TRACE("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); TRACE("-> %s(This=%p, lpDDSD=%p, dwFlags=%08X)\n", __FUNCTION__, This, lpDDSD, dwFlags);
HRESULT ret = DDERR_UNSUPPORTED; HRESULT ret = dds__SetSurfaceDesc(This, lpDDSD, dwFlags);
TRACE("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); TRACE("<- %s\n", __FUNCTION__);
return ret; return ret;
} }

73
src/ddsurface.c
View File

@ -962,6 +962,79 @@ HRESULT dds_GetDDInterface(IDirectDrawSurfaceImpl* This, LPVOID* lplpDD)
return DD_OK; return DD_OK;
} }
HRESULT dds__SetSurfaceDesc(IDirectDrawSurfaceImpl* This, LPDDSURFACEDESC2 lpDDSD, DWORD dwFlags)
{
dbg_dump_dds_flags(lpDDSD->dwFlags);
dbg_dump_dds_caps(lpDDSD->ddsCaps.dwCaps);
DWORD req_flags = DDSD_LPSURFACE | DDSD_PITCH | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT;
if ((lpDDSD->dwFlags & req_flags) != req_flags)
return DDERR_UNSUPPORTED;
if (This->bitmap)
{
DeleteObject(This->bitmap);
This->bitmap = NULL;
}
else if (This->surface && !This->custom_surface)
{
HeapFree(GetProcessHeap(), 0, This->surface);
This->surface = NULL;
}
if (This->hdc)
{
DeleteDC(This->hdc);
This->hdc = NULL;
}
if (This->bmi)
{
HeapFree(GetProcessHeap(), 0, This->bmi);
This->bmi = NULL;
}
if (This->surface_mapping)
{
CloseHandle(This->surface_mapping);
This->surface_mapping = NULL;
}
switch (lpDDSD->ddpfPixelFormat.dwRGBBitCount)
{
case 8:
This->bpp = 8;
break;
case 15:
TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount);
case 16:
This->bpp = 16;
break;
case 24:
TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount);
case 32:
This->bpp = 32;
break;
default:
This->bpp = 8;
TRACE(" NOT_IMPLEMENTED bpp=%u\n", lpDDSD->ddpfPixelFormat.dwRGBBitCount);
break;
}
This->width = lpDDSD->dwWidth;
This->height = lpDDSD->dwHeight;
This->surface = lpDDSD->lpSurface;
This->l_pitch = lpDDSD->lPitch;
This->lx_pitch = This->bpp / 8;
This->size = This->l_pitch * This->height;
This->custom_surface = TRUE;
return DD_OK;
}
void* dds_GetBuffer(IDirectDrawSurfaceImpl* This) void* dds_GetBuffer(IDirectDrawSurfaceImpl* This)
{ {
if (!This) if (!This)