isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-14 08:27:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Run clang-format

Browse Source
This commit is contained in:
Anonymous Maarten 2025-05-13 18:12:35 +02:00
parent 7837d73eb0
commit 997297d163
8 changed files with 140 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/format.yml vendored
View File

@ -12,7 +12,7 @@ jobs:
- name: Run clang-format - name: Run clang-format
run: | run: |
find CONFIG LEGO1 ISLE -iname '*.h' -o -iname '*.cpp' | xargs \ find CONFIG LEGO1 ISLE miniwin -iname '*.h' -o -iname '*.cpp' | xargs \
pipx run "clang-format>=17,<18" \ pipx run "clang-format>=17,<18" \
--style=file \ --style=file \
-i -i

1
miniwin/minimfc/include/minimfc.h
View File

@ -60,7 +60,6 @@ struct CCommandLineInfo {
virtual void ParseParam(LPCSTR pszParam, BOOL bFlag, BOOL bLast) {} virtual void ParseParam(LPCSTR pszParam, BOOL bFlag, BOOL bLast) {}
}; };
inline BOOL IsDlgButtonChecked(int nIDButton) inline BOOL IsDlgButtonChecked(int nIDButton)
{ {
return 0; return 0;

11
miniwin/minimfc/src/minimfc.cpp
View File

@ -1,9 +1,9 @@
#include "minimfc.h" #include "minimfc.h"
#include "miniwin.h" #include "miniwin.h"
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
#include <SDL3/SDL_main.h> #include <SDL3/SDL_main.h>
#include <stdlib.h> #include <stdlib.h>
char* afxCurrentAppName; char* afxCurrentAppName;
@ -13,7 +13,8 @@ CWinApp* wndTop;
SDL_Window* window; SDL_Window* window;
const char* title = "Configure LEGO Island"; const char* title = "Configure LEGO Island";
CWinApp::CWinApp() { CWinApp::CWinApp()
{
if (wndTop != NULL) { if (wndTop != NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "There can only be one CWinApp!"); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "There can only be one CWinApp!");
abort(); abort();
@ -41,7 +42,8 @@ int CWinApp::ExitInstance()
return 0; return 0;
} }
static char *get_base_filename(const char *path) { static char* get_base_filename(const char* path)
{
for (;;) { for (;;) {
const char* next = SDL_strpbrk(path, "/\\"); const char* next = SDL_strpbrk(path, "/\\");
if (next == NULL) { if (next == NULL) {
@ -53,7 +55,8 @@ static char *get_base_filename(const char *path) {
size_t len; size_t len;
if (end == NULL) { if (end == NULL) {
len = SDL_strlen(path); len = SDL_strlen(path);
} else { }
else {
len = end - path; len = end - path;
} }
char* filename = new char[len + 1]; char* filename = new char[len + 1];

7
miniwin/miniwin/include/miniwin_d3drm.h
View File

@ -244,7 +244,12 @@ struct D3DRMPICKDESC {
struct IDirect3DRMPickedArray : public IUnknown { struct IDirect3DRMPickedArray : public IUnknown {
virtual DWORD GetSize() = 0; virtual DWORD GetSize() = 0;
virtual HRESULT GetPick(DWORD index, IDirect3DRMVisual** visual, IDirect3DRMFrameArray** frameArray, D3DRMPICKDESC* desc) = 0; virtual HRESULT GetPick(
DWORD index,
IDirect3DRMVisual** visual,
IDirect3DRMFrameArray** frameArray,
D3DRMPICKDESC* desc
) = 0;
}; };
typedef IDirect3DRMPickedArray* LPDIRECT3DRMPICKEDARRAY; typedef IDirect3DRMPickedArray* LPDIRECT3DRMPICKEDARRAY;

8
miniwin/miniwin/include/miniwin_ddraw.h
View File

@ -236,7 +236,13 @@ struct IDirectDrawSurface : public IUnknown {
DWORD dwFlags, DWORD dwFlags,
LPDDBLTFX lpDDBltFx LPDDBLTFX lpDDBltFx
) = 0; ) = 0;
virtual HRESULT BltFast(DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) = 0; virtual HRESULT BltFast(
DWORD dwX,
DWORD dwY,
LPDIRECTDRAWSURFACE lpDDSrcSurface,
LPRECT lpSrcRect,
DWORD dwTrans
) = 0;
virtual HRESULT DeleteAttachedSurface(DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSAttachedSurface) = 0; virtual HRESULT DeleteAttachedSurface(DWORD dwFlags, LPDIRECTDRAWSURFACE lpDDSAttachedSurface) = 0;
virtual HRESULT Flip(LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DWORD dwFlags) = 0; virtual HRESULT Flip(LPDIRECTDRAWSURFACE lpDDSurfaceTargetOverride, DWORD dwFlags) = 0;
virtual HRESULT GetAttachedSurface(LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE* lplpDDAttachedSurface) = 0; virtual HRESULT GetAttachedSurface(LPDDSCAPS lpDDSCaps, LPDIRECTDRAWSURFACE* lplpDDAttachedSurface) = 0;

61
miniwin/miniwin/src/miniwin_ddraw.cpp
View File

@ -1,25 +1,27 @@
#include "miniwin_ddraw.h" #include "miniwin_ddraw.h"
#include "miniwin_d3d.h" #include "miniwin_d3d.h"
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
struct DirectDrawImpl : public IDirectDraw2, public IDirect3D2 { struct DirectDrawImpl : public IDirectDraw2, public IDirect3D2 {
DirectDrawImpl() DirectDrawImpl() : m_refCount(1) {}
: m_refCount(1) {
}
// IUnknown interface // IUnknown interface
ULONG AddRef() override { ULONG AddRef() override
{
m_refCount += 1; m_refCount += 1;
return m_refCount; return m_refCount;
}; }
ULONG Release() override { ULONG Release() override
{
m_refCount -= 1; m_refCount -= 1;
if (m_refCount == 0) { if (m_refCount == 0) {
delete this; delete this;
} }
return m_refCount; return m_refCount;
} }
HRESULT QueryInterface(const GUID& riid, void** ppvObject) override { HRESULT QueryInterface(const GUID& riid, void** ppvObject) override
{
if (SDL_memcmp(&riid, &IID_IDirectDraw2, sizeof(GUID)) == 0) { if (SDL_memcmp(&riid, &IID_IDirectDraw2, sizeof(GUID)) == 0) {
AddRef(); AddRef();
*ppvObject = static_cast<IDirectDraw2*>(this); *ppvObject = static_cast<IDirectDraw2*>(this);
@ -34,7 +36,8 @@ struct DirectDrawImpl : public IDirectDraw2, public IDirect3D2 {
return E_NOINTERFACE; return E_NOINTERFACE;
} }
// IDirecdtDraw interface // IDirecdtDraw interface
HRESULT CreateClipper(DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) override { HRESULT CreateClipper(DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, IUnknown* pUnkOuter) override
{
return DDERR_GENERIC; return DDERR_GENERIC;
} }
HRESULT CreatePalette( HRESULT CreatePalette(
@ -42,14 +45,13 @@ struct DirectDrawImpl : public IDirectDraw2, public IDirect3D2 {
LPPALETTEENTRY lpColorTable, LPPALETTEENTRY lpColorTable,
LPDIRECTDRAWPALETTE* lplpDDPalette, LPDIRECTDRAWPALETTE* lplpDDPalette,
IUnknown* pUnkOuter IUnknown* pUnkOuter
) override { ) override
{
return DDERR_GENERIC; return DDERR_GENERIC;
} }
HRESULT CreateSurface( HRESULT CreateSurface(LPDDSURFACEDESC lpDDSurfaceDesc, LPDIRECTDRAWSURFACE* lplpDDSurface, IUnknown* pUnkOuter)
LPDDSURFACEDESC lpDDSurfaceDesc, override
LPDIRECTDRAWSURFACE* lplpDDSurface, {
IUnknown* pUnkOuter
) override {
return DDERR_GENERIC; return DDERR_GENERIC;
} }
HRESULT EnumDisplayModes( HRESULT EnumDisplayModes(
@ -63,33 +65,24 @@ struct DirectDrawImpl : public IDirectDraw2, public IDirect3D2 {
LPDDSURFACEDESC lpDDSD, LPDDSURFACEDESC lpDDSD,
LPVOID lpContext, LPVOID lpContext,
LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback
) override { ) override
return DD_OK; {
}
HRESULT FlipToGDISurface() override {
return DD_OK; return DD_OK;
} }
HRESULT FlipToGDISurface() override { return DD_OK; }
HRESULT GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) override; HRESULT GetCaps(LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) override;
HRESULT GetDisplayMode(LPDDSURFACEDESC lpDDSurfaceDesc) override { HRESULT GetDisplayMode(LPDDSURFACEDESC lpDDSurfaceDesc) override { return DD_OK; }
return DD_OK; HRESULT Initialize(GUID* lpGUID) override { return DD_OK; }
} HRESULT RestoreDisplayMode() override { return DD_OK; }
HRESULT Initialize(GUID* lpGUID) override { HRESULT SetCooperativeLevel(HWND hWnd, DWORD dwFlags) override { return DD_OK; }
return DD_OK; HRESULT SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) override { return DD_OK; }
}
HRESULT RestoreDisplayMode() override {
return DD_OK;
}
HRESULT SetCooperativeLevel(HWND hWnd, DWORD dwFlags) override {
return DD_OK;
}
HRESULT SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) override {
return DD_OK;
}
// IDirect3D2 interface // IDirect3D2 interface
HRESULT CreateDevice(const GUID& guid, void* pBackBuffer, IDirect3DDevice2** ppDirect3DDevice) override { HRESULT CreateDevice(const GUID& guid, void* pBackBuffer, IDirect3DDevice2** ppDirect3DDevice) override
{
return DDERR_GENERIC; return DDERR_GENERIC;
} }
HRESULT EnumDevices(LPD3DENUMDEVICESCALLBACK cb, void* ctx) override; HRESULT EnumDevices(LPD3DENUMDEVICESCALLBACK cb, void* ctx) override;
private: private:
int m_refCount; int m_refCount;
}; };