From 6b2db2d85bafd70828ddb0805993198153b066c1 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Thu, 19 Jun 2025 06:40:03 +0200 Subject: [PATCH] Correct some types for IDirect3DRMMesh (#344) --- miniwin/include/miniwin/d3drm.h | 32 ++++++++++++------------- miniwin/src/d3drm/d3drmmesh.cpp | 34 +++++++++++++-------------- miniwin/src/internal/d3drmmesh_impl.h | 34 +++++++++++++-------------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/miniwin/include/miniwin/d3drm.h b/miniwin/include/miniwin/d3drm.h index 6d2e5395..365046a5 100644 --- a/miniwin/include/miniwin/d3drm.h +++ b/miniwin/include/miniwin/d3drm.h @@ -188,27 +188,27 @@ struct IDirect3DRMMesh : public IDirect3DRMVisual { D3DRMGROUPINDEX* groupIndex ) = 0; virtual HRESULT GetGroup( - DWORD groupIndex, - DWORD* vertexCount, - DWORD* faceCount, - DWORD* vertexPerFace, + D3DRMGROUPINDEX groupIndex, + unsigned int* vertexCount, + unsigned int* faceCount, + unsigned int* vertexPerFace, DWORD* indexCount, - DWORD* indices + unsigned int* indices ) = 0; virtual DWORD GetGroupCount() = 0; - virtual HRESULT SetGroupColor(DWORD groupIndex, D3DCOLOR color) = 0; - virtual HRESULT SetGroupColorRGB(DWORD groupIndex, float r, float g, float b) = 0; - virtual HRESULT SetGroupTexture(DWORD groupIndex, IDirect3DRMTexture* texture) = 0; - virtual HRESULT SetGroupMaterial(DWORD groupIndex, IDirect3DRMMaterial* material) = 0; + virtual HRESULT SetGroupColor(D3DRMGROUPINDEX groupIndex, D3DCOLOR color) = 0; + virtual HRESULT SetGroupColorRGB(D3DRMGROUPINDEX groupIndex, float r, float g, float b) = 0; + virtual HRESULT SetGroupTexture(D3DRMGROUPINDEX groupIndex, IDirect3DRMTexture* texture) = 0; + virtual HRESULT SetGroupMaterial(D3DRMGROUPINDEX groupIndex, IDirect3DRMMaterial* material) = 0; virtual HRESULT SetGroupMapping(D3DRMGROUPINDEX groupIndex, D3DRMMAPPING mapping) = 0; - virtual HRESULT SetGroupQuality(DWORD groupIndex, D3DRMRENDERQUALITY quality) = 0; - virtual HRESULT SetVertices(DWORD groupIndex, int offset, int count, D3DRMVERTEX* vertices) = 0; - virtual HRESULT GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) = 0; - virtual D3DRMMAPPING GetGroupMapping(DWORD groupIndex) = 0; - virtual HRESULT GetGroupMaterial(DWORD groupIndex, LPDIRECT3DRMMATERIAL* material) = 0; - virtual D3DRMRENDERQUALITY GetGroupQuality(DWORD groupIndex) = 0; + virtual HRESULT SetGroupQuality(D3DRMGROUPINDEX groupIndex, D3DRMRENDERQUALITY quality) = 0; + virtual HRESULT SetVertices(D3DRMGROUPINDEX groupIndex, int offset, int count, D3DRMVERTEX* vertices) = 0; + virtual HRESULT GetGroupTexture(D3DRMGROUPINDEX groupIndex, LPDIRECT3DRMTEXTURE* texture) = 0; + virtual D3DRMMAPPING GetGroupMapping(D3DRMGROUPINDEX groupIndex) = 0; + virtual HRESULT GetGroupMaterial(D3DRMGROUPINDEX groupIndex, LPDIRECT3DRMMATERIAL* material) = 0; + virtual D3DRMRENDERQUALITY GetGroupQuality(D3DRMGROUPINDEX groupIndex) = 0; virtual D3DCOLOR GetGroupColor(D3DRMGROUPINDEX index) = 0; - virtual HRESULT GetVertices(DWORD groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) = 0; + virtual HRESULT GetVertices(D3DRMGROUPINDEX groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) = 0; }; struct IDirect3DRMLight : public IDirect3DRMObject { diff --git a/miniwin/src/d3drm/d3drmmesh.cpp b/miniwin/src/d3drm/d3drmmesh.cpp index 653f993d..dc8c8686 100644 --- a/miniwin/src/d3drm/d3drmmesh.cpp +++ b/miniwin/src/d3drm/d3drmmesh.cpp @@ -68,12 +68,12 @@ HRESULT Direct3DRMMeshImpl::AddGroup( } HRESULT Direct3DRMMeshImpl::GetGroup( - DWORD groupIndex, - DWORD* vertexCount, - DWORD* faceCount, - DWORD* vertexPerFace, + D3DRMGROUPINDEX groupIndex, + unsigned int* vertexCount, + unsigned int* faceCount, + unsigned int* vertexPerFace, DWORD* indexCount, - DWORD* indices + unsigned int* indices ) { if (groupIndex >= m_groups.size()) { @@ -101,7 +101,7 @@ HRESULT Direct3DRMMeshImpl::GetGroup( return DD_OK; } -const MeshGroup& Direct3DRMMeshImpl::GetGroup(DWORD groupIndex) +const MeshGroup& Direct3DRMMeshImpl::GetGroup(D3DRMGROUPINDEX groupIndex) { return m_groups[groupIndex]; } @@ -111,7 +111,7 @@ DWORD Direct3DRMMeshImpl::GetGroupCount() return m_groups.size(); } -HRESULT Direct3DRMMeshImpl::SetGroupColor(DWORD groupIndex, D3DCOLOR color) +HRESULT Direct3DRMMeshImpl::SetGroupColor(D3DRMGROUPINDEX groupIndex, D3DCOLOR color) { if (groupIndex >= m_groups.size()) { return DDERR_INVALIDPARAMS; @@ -126,7 +126,7 @@ HRESULT Direct3DRMMeshImpl::SetGroupColor(DWORD groupIndex, D3DCOLOR color) return DD_OK; } -HRESULT Direct3DRMMeshImpl::SetGroupColorRGB(DWORD groupIndex, float r, float g, float b) +HRESULT Direct3DRMMeshImpl::SetGroupColorRGB(D3DRMGROUPINDEX groupIndex, float r, float g, float b) { if (groupIndex >= m_groups.size()) { return DDERR_INVALIDPARAMS; @@ -148,7 +148,7 @@ D3DCOLOR Direct3DRMMeshImpl::GetGroupColor(D3DRMGROUPINDEX index) return (color.a << 24) | (color.r << 16) | (color.g << 8) | color.b; } -HRESULT Direct3DRMMeshImpl::SetGroupMaterial(DWORD groupIndex, IDirect3DRMMaterial* material) +HRESULT Direct3DRMMeshImpl::SetGroupMaterial(D3DRMGROUPINDEX groupIndex, IDirect3DRMMaterial* material) { if (groupIndex >= m_groups.size()) { return DDERR_INVALIDPARAMS; @@ -164,7 +164,7 @@ HRESULT Direct3DRMMeshImpl::SetGroupMaterial(DWORD groupIndex, IDirect3DRMMateri return DD_OK; } -HRESULT Direct3DRMMeshImpl::SetGroupTexture(DWORD groupIndex, IDirect3DRMTexture* texture) +HRESULT Direct3DRMMeshImpl::SetGroupTexture(D3DRMGROUPINDEX groupIndex, IDirect3DRMTexture* texture) { if (groupIndex >= m_groups.size()) { return DDERR_INVALIDPARAMS; @@ -181,7 +181,7 @@ HRESULT Direct3DRMMeshImpl::SetGroupTexture(DWORD groupIndex, IDirect3DRMTexture return DD_OK; } -HRESULT Direct3DRMMeshImpl::GetGroupMaterial(DWORD groupIndex, LPDIRECT3DRMMATERIAL* material) +HRESULT Direct3DRMMeshImpl::GetGroupMaterial(D3DRMGROUPINDEX groupIndex, LPDIRECT3DRMMATERIAL* material) { if (groupIndex >= m_groups.size()) { return DDERR_GENERIC; @@ -197,7 +197,7 @@ HRESULT Direct3DRMMeshImpl::GetGroupMaterial(DWORD groupIndex, LPDIRECT3DRMMATER return DD_OK; } -HRESULT Direct3DRMMeshImpl::GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) +HRESULT Direct3DRMMeshImpl::GetGroupTexture(D3DRMGROUPINDEX groupIndex, LPDIRECT3DRMTEXTURE* texture) { if (groupIndex >= m_groups.size()) { return DDERR_GENERIC; @@ -218,12 +218,12 @@ HRESULT Direct3DRMMeshImpl::SetGroupMapping(D3DRMGROUPINDEX groupIndex, D3DRMMAP return DD_OK; } -D3DRMMAPPING Direct3DRMMeshImpl::GetGroupMapping(DWORD groupIndex) +D3DRMMAPPING Direct3DRMMeshImpl::GetGroupMapping(D3DRMGROUPINDEX groupIndex) { return D3DRMMAP_PERSPCORRECT; } -HRESULT Direct3DRMMeshImpl::SetGroupQuality(DWORD groupIndex, D3DRMRENDERQUALITY quality) +HRESULT Direct3DRMMeshImpl::SetGroupQuality(D3DRMGROUPINDEX groupIndex, D3DRMRENDERQUALITY quality) { if (groupIndex >= m_groups.size()) { return DDERR_INVALIDPARAMS; @@ -243,7 +243,7 @@ HRESULT Direct3DRMMeshImpl::SetGroupQuality(DWORD groupIndex, D3DRMRENDERQUALITY return DD_OK; } -D3DRMRENDERQUALITY Direct3DRMMeshImpl::GetGroupQuality(DWORD groupIndex) +D3DRMRENDERQUALITY Direct3DRMMeshImpl::GetGroupQuality(D3DRMGROUPINDEX groupIndex) { if (groupIndex >= m_groups.size()) { return D3DRMRENDER_GOURAUD; @@ -252,7 +252,7 @@ D3DRMRENDERQUALITY Direct3DRMMeshImpl::GetGroupQuality(DWORD groupIndex) return m_groups[groupIndex].quality; } -HRESULT Direct3DRMMeshImpl::SetVertices(DWORD groupIndex, int offset, int count, D3DRMVERTEX* vertices) +HRESULT Direct3DRMMeshImpl::SetVertices(D3DRMGROUPINDEX groupIndex, int offset, int count, D3DRMVERTEX* vertices) { if (count <= 0 || offset < 0 || groupIndex < 0 || groupIndex >= static_cast(m_groups.size())) { return DDERR_INVALIDPARAMS; @@ -274,7 +274,7 @@ HRESULT Direct3DRMMeshImpl::SetVertices(DWORD groupIndex, int offset, int count, return DD_OK; } -HRESULT Direct3DRMMeshImpl::GetVertices(DWORD groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) +HRESULT Direct3DRMMeshImpl::GetVertices(D3DRMGROUPINDEX groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) { if (count <= 0 || startIndex < 0 || groupIndex < 0 || groupIndex >= static_cast(m_groups.size())) { return DDERR_INVALIDPARAMS; diff --git a/miniwin/src/internal/d3drmmesh_impl.h b/miniwin/src/internal/d3drmmesh_impl.h index b33a3934..ca72dbc6 100644 --- a/miniwin/src/internal/d3drmmesh_impl.h +++ b/miniwin/src/internal/d3drmmesh_impl.h @@ -70,28 +70,28 @@ struct Direct3DRMMeshImpl : public Direct3DRMObjectBaseImpl { HRESULT AddGroup(int vertexCount, int faceCount, int vertexPerFace, DWORD* faceBuffer, D3DRMGROUPINDEX* groupIndex) override; HRESULT GetGroup( - DWORD groupIndex, - DWORD* vertexCount, - DWORD* faceCount, - DWORD* vertexPerFace, + D3DRMGROUPINDEX groupIndex, + unsigned int* vertexCount, + unsigned int* faceCount, + unsigned int* vertexPerFace, DWORD* indexCount, - DWORD* indices + unsigned int* indices ) override; - const MeshGroup& GetGroup(DWORD groupIndex); + const MeshGroup& GetGroup(D3DRMGROUPINDEX groupIndex); DWORD GetGroupCount() override; - HRESULT SetGroupColor(DWORD groupIndex, D3DCOLOR color) override; - HRESULT SetGroupColorRGB(DWORD groupIndex, float r, float g, float b) override; + HRESULT SetGroupColor(D3DRMGROUPINDEX groupIndex, D3DCOLOR color) override; + HRESULT SetGroupColorRGB(D3DRMGROUPINDEX groupIndex, float r, float g, float b) override; D3DCOLOR GetGroupColor(D3DRMGROUPINDEX index) override; - HRESULT SetGroupMaterial(DWORD groupIndex, IDirect3DRMMaterial* material) override; - HRESULT SetGroupTexture(DWORD groupIndex, IDirect3DRMTexture* texture) override; - HRESULT GetGroupTexture(DWORD groupIndex, LPDIRECT3DRMTEXTURE* texture) override; - HRESULT GetGroupMaterial(DWORD groupIndex, LPDIRECT3DRMMATERIAL* material) override; + HRESULT SetGroupMaterial(D3DRMGROUPINDEX groupIndex, IDirect3DRMMaterial* material) override; + HRESULT SetGroupTexture(D3DRMGROUPINDEX groupIndex, IDirect3DRMTexture* texture) override; + HRESULT GetGroupTexture(D3DRMGROUPINDEX groupIndex, LPDIRECT3DRMTEXTURE* texture) override; + HRESULT GetGroupMaterial(D3DRMGROUPINDEX groupIndex, LPDIRECT3DRMMATERIAL* material) override; HRESULT SetGroupMapping(D3DRMGROUPINDEX groupIndex, D3DRMMAPPING mapping) override; - D3DRMMAPPING GetGroupMapping(DWORD groupIndex) override; - HRESULT SetGroupQuality(DWORD groupIndex, D3DRMRENDERQUALITY quality) override; - D3DRMRENDERQUALITY GetGroupQuality(DWORD groupIndex) override; - HRESULT SetVertices(DWORD groupIndex, int offset, int count, D3DRMVERTEX* vertices) override; - HRESULT GetVertices(DWORD groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) override; + D3DRMMAPPING GetGroupMapping(D3DRMGROUPINDEX groupIndex) override; + HRESULT SetGroupQuality(D3DRMGROUPINDEX groupIndex, D3DRMRENDERQUALITY quality) override; + D3DRMRENDERQUALITY GetGroupQuality(D3DRMGROUPINDEX groupIndex) override; + HRESULT SetVertices(D3DRMGROUPINDEX groupIndex, int offset, int count, D3DRMVERTEX* vertices) override; + HRESULT GetVertices(D3DRMGROUPINDEX groupIndex, int startIndex, int count, D3DRMVERTEX* vertices) override; HRESULT GetBox(D3DRMBOX* box) override; private: