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

support GetDDInterface

Browse Source
This commit is contained in:
FunkyFr3sh 2021-05-29 20:51:19 +02:00
parent 21555e06f7
commit c3dd35f122
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/IDirectDrawSurface.h
View File

@ -5,6 +5,7 @@
#include <windows.h> #include <windows.h>
#include "IDirectDrawPalette.h" #include "IDirectDrawPalette.h"
#include "IDirectDrawClipper.h" #include "IDirectDrawClipper.h"
#include "IDirectDraw.h"
#include "ddraw.h" #include "ddraw.h"
@ -41,6 +42,7 @@ typedef struct IDirectDrawSurfaceImpl
struct IDirectDrawSurfaceImpl* backbuffer; struct IDirectDrawSurfaceImpl* backbuffer;
struct IDirectDrawClipperImpl* clipper; struct IDirectDrawClipperImpl* clipper;
struct IDirectDrawImpl* ddraw;
} IDirectDrawSurfaceImpl; } IDirectDrawSurfaceImpl;

4
inc/ddsurface.h
View File

@ -5,6 +5,7 @@
#include <windows.h> #include <windows.h>
#include "ddraw.h" #include "ddraw.h"
#include "IDirectDrawSurface.h" #include "IDirectDrawSurface.h"
#include "IDirectDraw.h"
// enables redraw via blt/unlock if there wasn't any flip for X ms // enables redraw via blt/unlock if there wasn't any flip for X ms
#define FLIP_REDRAW_TIMEOUT 1000 / 10 #define FLIP_REDRAW_TIMEOUT 1000 / 10
@ -28,8 +29,9 @@ HRESULT dds_SetColorKey(IDirectDrawSurfaceImpl* This, DWORD flags, LPDDCOLORKEY
HRESULT dds_SetClipper(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWCLIPPER lpClipper); HRESULT dds_SetClipper(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWCLIPPER lpClipper);
HRESULT dds_SetPalette(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWPALETTE lpDDPalette); HRESULT dds_SetPalette(IDirectDrawSurfaceImpl* This, LPDIRECTDRAWPALETTE lpDDPalette);
HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPVOID lpRect); HRESULT dds_Unlock(IDirectDrawSurfaceImpl* This, LPVOID lpRect);
HRESULT dds_GetDDInterface(IDirectDrawSurfaceImpl* This, LPVOID* lplpDD);
void* dds_GetBuffer(IDirectDrawSurfaceImpl* This); void* dds_GetBuffer(IDirectDrawSurfaceImpl* This);
HRESULT dd_CreateSurface(LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE FAR* lpDDSurface, IUnknown FAR* unkOuter); HRESULT dd_CreateSurface(IDirectDrawImpl* This, LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE FAR* lpDDSurface, IUnknown FAR* unkOuter);
#endif #endif

6
src/IDirectDraw/IDirectDrawSurface.c
View File

@ -376,9 +376,9 @@ HRESULT __stdcall IDirectDrawSurface__UpdateOverlayZOrder(IDirectDrawSurfaceImpl
HRESULT __stdcall IDirectDrawSurface__GetDDInterface(IDirectDrawSurfaceImpl *This, LPVOID* lplpDD) HRESULT __stdcall IDirectDrawSurface__GetDDInterface(IDirectDrawSurfaceImpl *This, LPVOID* lplpDD)
{ {
dprintf("NOT_IMPLEMENTED -> %s(This=%p)\n", __FUNCTION__, This); dprintf("-> %s(This=%p)\n", __FUNCTION__, This);
HRESULT ret = DDERR_INVALIDOBJECT; HRESULT ret = dds_GetDDInterface(This, lplpDD);
dprintf("NOT_IMPLEMENTED <- %s\n", __FUNCTION__); dprintf("<- %s\n", __FUNCTION__);
return ret; return ret;
} }

16
src/ddsurface.c
View File

@ -1021,6 +1021,17 @@ HRESULT dds_Unlock(IDirectDrawSurfaceImpl *This, LPVOID lpRect)
return DD_OK; return DD_OK;
} }
HRESULT dds_GetDDInterface(IDirectDrawSurfaceImpl* This, LPVOID* lplpDD)
{
if (!lplpDD)
return DDERR_INVALIDPARAMS;
*lplpDD = This->ddraw;
IDirectDraw_AddRef(This->ddraw);
return DD_OK;
}
void* dds_GetBuffer(IDirectDrawSurfaceImpl* This) void* dds_GetBuffer(IDirectDrawSurfaceImpl* This)
{ {
if (!This) if (!This)
@ -1032,7 +1043,7 @@ void* dds_GetBuffer(IDirectDrawSurfaceImpl* This)
return This->surface; return This->surface;
} }
HRESULT dd_CreateSurface(LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE FAR *lpDDSurface, IUnknown FAR * unkOuter) HRESULT dd_CreateSurface(IDirectDrawImpl* This, LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE FAR *lpDDSurface, IUnknown FAR * unkOuter)
{ {
dbg_dump_dds_flags(lpDDSurfaceDesc->dwFlags); dbg_dump_dds_flags(lpDDSurfaceDesc->dwFlags);
dbg_dump_dds_caps(lpDDSurfaceDesc->ddsCaps.dwCaps); dbg_dump_dds_caps(lpDDSurfaceDesc->ddsCaps.dwCaps);
@ -1059,6 +1070,7 @@ HRESULT dd_CreateSurface(LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE FA
dst_surface->bpp = g_ddraw->bpp == 0 ? 16 : g_ddraw->bpp; dst_surface->bpp = g_ddraw->bpp == 0 ? 16 : g_ddraw->bpp;
dst_surface->flags = lpDDSurfaceDesc->dwFlags; dst_surface->flags = lpDDSurfaceDesc->dwFlags;
dst_surface->caps = lpDDSurfaceDesc->ddsCaps.dwCaps; dst_surface->caps = lpDDSurfaceDesc->ddsCaps.dwCaps;
dst_surface->ddraw = This;
if (dst_surface->caps & DDSCAPS_PRIMARYSURFACE) if (dst_surface->caps & DDSCAPS_PRIMARYSURFACE)
{ {
@ -1156,7 +1168,7 @@ HRESULT dd_CreateSurface(LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE FA
desc.dwWidth = dst_surface->width; desc.dwWidth = dst_surface->width;
desc.dwHeight = dst_surface->height; desc.dwHeight = dst_surface->height;
dd_CreateSurface(&desc, (LPDIRECTDRAWSURFACE*)&dst_surface->backbuffer, unkOuter); dd_CreateSurface(This, &desc, (LPDIRECTDRAWSURFACE*)&dst_surface->backbuffer, unkOuter);
} }
} }