miniwin: Remove some unused bits (#108)

CMakeLists.txt

@@ -87,7 +87,6 @@ endif()
 #if (NOT WIN32)
 add_library(miniwin STATIC EXCLUDE_FROM_ALL
   miniwin/miniwin/src/miniwin.cpp
-  miniwin/miniwin/src/miniwin_ddclipper.cpp
   miniwin/miniwin/src/miniwin_ddpalette.cpp
   miniwin/miniwin/src/miniwin_ddsurface.cpp
   miniwin/miniwin/src/miniwin_ddraw.cpp

miniwin/miniwin/include/miniwin_ddraw.h

@@ -292,14 +292,13 @@ typedef LOGPALETTE* LPLOGPALETTE;
 
 typedef struct IDirectDraw* LPDIRECTDRAW;
 struct IDirectDrawPalette : virtual public IUnknown {
-	virtual HRESULT GetCaps(LPDWORD lpdwCaps) = 0;
 	virtual HRESULT GetEntries(DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) = 0;
 	virtual HRESULT SetEntries(DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) = 0;
 };
 typedef struct IDirectDrawPalette* LPDIRECTDRAWPALETTE;
 
 struct IDirectDrawClipper : virtual public IUnknown {
-	virtual HRESULT SetHWnd(DWORD unnamedParam1, HWND hWnd) = 0;
+	virtual HRESULT SetHWnd(DWORD unnamedParam1, HWND hWnd) { return DD_OK; }
 };
 typedef IDirectDrawClipper* LPDIRECTDRAWCLIPPER;
 
@@ -323,9 +322,7 @@ struct IDirectDrawSurface : virtual public IUnknown {
 	) = 0;
 	virtual HRESULT Flip(LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DDFlipFlags dwFlags) = 0;
 	virtual HRESULT GetAttachedSurface(LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE* lplpDDAttachedSurface) = 0;
-	virtual HRESULT GetCaps(LPDDSCAPS lpDDSCaps) = 0;
 	virtual HRESULT GetDC(HDC* lphDC) = 0;
-	virtual HRESULT GetOverlayPosition(LPLONG lplX, LPLONG lplY) = 0;
 	virtual HRESULT GetPalette(LPDIRECTDRAWPALETTE* lplpDDPalette) = 0;
 	virtual HRESULT GetPixelFormat(LPDDPIXELFORMAT lpDDPixelFormat) = 0;
 	virtual HRESULT GetSurfaceDesc(LPDDSURFACEDESC lpDDSurfaceDesc) = 0;

miniwin/miniwin/src/include/miniwin_ddclipper_p.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <SDL3/SDL.h>
-#include <miniwin_ddraw.h>
-
-class DirectDrawImpl;
-
-struct DirectDrawClipperImpl : public IDirectDrawClipper {
-	DirectDrawClipperImpl(DirectDrawImpl* lpDD);
-	~DirectDrawClipperImpl() override;
-
-	// IDirectDrawClipper interface
-	HRESULT SetHWnd(DWORD unnamedParam1, HWND hWnd) override;
-};

miniwin/miniwin/src/include/miniwin_ddpalette_p.h

@@ -5,7 +5,6 @@
 struct DirectDrawPaletteImpl : public IDirectDrawPalette {
 	DirectDrawPaletteImpl(LPPALETTEENTRY lpColorTable);
 	~DirectDrawPaletteImpl() override;
-	HRESULT GetCaps(LPDWORD lpdwCaps) override;
 	HRESULT GetEntries(DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries) override;
 	HRESULT SetEntries(DWORD dwFlags, DWORD dwStartingEntry, DWORD dwCount, LPPALETTEENTRY lpEntries) override;
 

miniwin/miniwin/src/include/miniwin_ddsurface_p.h

@@ -23,9 +23,7 @@ struct DirectDrawSurfaceImpl : public IDirectDrawSurface3 {
 		override;
 	HRESULT Flip(LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DDFlipFlags dwFlags) override;
 	HRESULT GetAttachedSurface(LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE* lplpDDAttachedSurface) override;
-	HRESULT GetCaps(LPDDSCAPS lpDDSCaps) override;
 	HRESULT GetDC(HDC* lphDC) override;
-	HRESULT GetOverlayPosition(LPLONG lplX, LPLONG lplY) override;
 	HRESULT GetPalette(LPDIRECTDRAWPALETTE* lplpDDPalette) override;
 	HRESULT GetPixelFormat(LPDDPIXELFORMAT lpDDPixelFormat) override;
 	HRESULT GetSurfaceDesc(LPDDSURFACEDESC lpDDSurfaceDesc) override;

miniwin/miniwin/src/miniwin_ddclipper.cpp

@@ -1,15 +0,0 @@
-#include "miniwin_ddclipper_p.h"
-#include "miniwin_ddraw_p.h"
-
-DirectDrawClipperImpl::DirectDrawClipperImpl(DirectDrawImpl* lpDD)
-{
-}
-
-DirectDrawClipperImpl::~DirectDrawClipperImpl()
-{
-}
-
-HRESULT DirectDrawClipperImpl::SetHWnd(DWORD unnamedParam1, HWND hWnd)
-{
-	return DD_OK;
-}

miniwin/miniwin/src/miniwin_ddpalette.cpp

@@ -14,11 +14,6 @@ DirectDrawPaletteImpl::~DirectDrawPaletteImpl()
 	SDL_DestroyPalette(m_palette);
 }
 
-HRESULT DirectDrawPaletteImpl::GetCaps(LPDWORD lpdwCaps)
-{
-	return DD_OK;
-}
-
 HRESULT DirectDrawPaletteImpl::GetEntries(DWORD dwFlags, DWORD dwBase, DWORD dwNumEntries, LPPALETTEENTRY lpEntries)
 {
 	for (int i = dwBase; i < dwNumEntries; i++) {

miniwin/miniwin/src/miniwin_ddraw.cpp

@@ -1,6 +1,5 @@
 
 #include "miniwin_d3d.h"
-#include "miniwin_ddclipper_p.h"
 #include "miniwin_ddpalette_p.h"
 #include "miniwin_ddraw_p.h"
 #include "miniwin_ddsurface_p.h"
@@ -33,7 +32,7 @@ HRESULT DirectDrawImpl::QueryInterface(const GUID& riid, void** ppvObject)
 // IDirectDraw interface
 HRESULT DirectDrawImpl::CreateClipper(DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter)
 {
-	*lplpDDClipper = static_cast<IDirectDrawClipper*>(new DirectDrawClipperImpl(this));
+	*lplpDDClipper = new IDirectDrawClipper;
 
 	return DD_OK;
 }
@@ -272,6 +271,7 @@ HRESULT DirectDrawImpl::SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBP
 {
 	return DD_OK;
 }
+
 // IDirect3D2 interface
 HRESULT DirectDrawImpl::CreateDevice(const GUID& guid, void* pBackBuffer, IDirect3DDevice2** ppDirect3DDevice)
 {

miniwin/miniwin/src/miniwin_ddsurface.cpp

@@ -119,21 +119,11 @@ HRESULT DirectDrawSurfaceImpl::GetAttachedSurface(LPDDSCAPS lpDDSCaps, LPDIRECTD
 	return DD_OK;
 }
 
-HRESULT DirectDrawSurfaceImpl::GetCaps(LPDDSCAPS lpDDSCaps)
-{
-	return DD_OK;
-}
-
 HRESULT DirectDrawSurfaceImpl::GetDC(HDC* lphDC)
 {
 	return DD_OK;
 }
 
-HRESULT DirectDrawSurfaceImpl::GetOverlayPosition(LPLONG lplX, LPLONG lplY)
-{
-	return DD_OK;
-}
-
 HRESULT DirectDrawSurfaceImpl::GetPalette(LPDIRECTDRAWPALETTE* lplpDDPalette)
 {
 	if (!m_palette) {
@@ -169,6 +159,7 @@ HRESULT DirectDrawSurfaceImpl::IsLost()
 {
 	return DD_OK;
 }
+
 HRESULT DirectDrawSurfaceImpl::Lock(
 	LPRECT lpDestRect,
 	LPDDSURFACEDESC lpDDSurfaceDesc,