From 5b3d99cb8fd78ade55d2c32424dde7aeeaa7e59e Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 18 May 2025 15:51:41 +0200 Subject: [PATCH] miniwin: Remove some unused bits (#108) --- CMakeLists.txt | 1 - miniwin/miniwin/include/miniwin_ddraw.h | 5 +---- miniwin/miniwin/src/include/miniwin_ddclipper_p.h | 14 -------------- miniwin/miniwin/src/include/miniwin_ddpalette_p.h | 1 - miniwin/miniwin/src/include/miniwin_ddsurface_p.h | 2 -- miniwin/miniwin/src/miniwin_ddclipper.cpp | 15 --------------- miniwin/miniwin/src/miniwin_ddpalette.cpp | 5 ----- miniwin/miniwin/src/miniwin_ddraw.cpp | 4 ++-- miniwin/miniwin/src/miniwin_ddsurface.cpp | 11 +---------- 9 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 miniwin/miniwin/src/include/miniwin_ddclipper_p.h delete mode 100644 miniwin/miniwin/src/miniwin_ddclipper.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b523183..5b58261b 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/miniwin/miniwin/include/miniwin_ddraw.h b/miniwin/miniwin/include/miniwin_ddraw.h index 4310779a..99dfe3f3 100644 --- a/miniwin/miniwin/include/miniwin_ddraw.h +++ b/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; diff --git a/miniwin/miniwin/src/include/miniwin_ddclipper_p.h b/miniwin/miniwin/src/include/miniwin_ddclipper_p.h deleted file mode 100644 index 0c094824..00000000 --- a/miniwin/miniwin/src/include/miniwin_ddclipper_p.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include -#include - -class DirectDrawImpl; - -struct DirectDrawClipperImpl : public IDirectDrawClipper { - DirectDrawClipperImpl(DirectDrawImpl* lpDD); - ~DirectDrawClipperImpl() override; - - // IDirectDrawClipper interface - HRESULT SetHWnd(DWORD unnamedParam1, HWND hWnd) override; -}; diff --git a/miniwin/miniwin/src/include/miniwin_ddpalette_p.h b/miniwin/miniwin/src/include/miniwin_ddpalette_p.h index 59c69b6d..98fe64c8 100644 --- a/miniwin/miniwin/src/include/miniwin_ddpalette_p.h +++ b/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; diff --git a/miniwin/miniwin/src/include/miniwin_ddsurface_p.h b/miniwin/miniwin/src/include/miniwin_ddsurface_p.h index e20d42ac..71be1003 100644 --- a/miniwin/miniwin/src/include/miniwin_ddsurface_p.h +++ b/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; diff --git a/miniwin/miniwin/src/miniwin_ddclipper.cpp b/miniwin/miniwin/src/miniwin_ddclipper.cpp deleted file mode 100644 index 79dfa882..00000000 --- a/miniwin/miniwin/src/miniwin_ddclipper.cpp +++ /dev/null @@ -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; -} diff --git a/miniwin/miniwin/src/miniwin_ddpalette.cpp b/miniwin/miniwin/src/miniwin_ddpalette.cpp index 7131ac13..96682a0e 100644 --- a/miniwin/miniwin/src/miniwin_ddpalette.cpp +++ b/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++) { diff --git a/miniwin/miniwin/src/miniwin_ddraw.cpp b/miniwin/miniwin/src/miniwin_ddraw.cpp index b0d60e17..e85b35b9 100644 --- a/miniwin/miniwin/src/miniwin_ddraw.cpp +++ b/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(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) { diff --git a/miniwin/miniwin/src/miniwin_ddsurface.cpp b/miniwin/miniwin/src/miniwin_ddsurface.cpp index 06dae67b..7d0393ff 100644 --- a/miniwin/miniwin/src/miniwin_ddsurface.cpp +++ b/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,