Alexandre Julliard : wined3d: Use unsigned int instead of size_t for element counts.
Module: wine Branch: master Commit: 980ee365a06682c9f310921f0c92a58b4224154d URL: http://source.winehq.org/git/wine.git/?a=commit;h=980ee365a06682c9f310921f0c... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 17:17:04 2008 +0100 wined3d: Use unsigned int instead of size_t for element counts. --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 2 +- dlls/d3d8/vertexdeclaration.c | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/vertexdeclaration.c | 8 ++++---- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/vertexdeclaration.c | 4 ++-- include/wine/wined3d_interface.h | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 229762b..2998351 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -634,7 +634,7 @@ typedef struct IDirect3DPixelShader8Impl { * to see how not defined it here */ void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader); -size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements); +UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements); /* Callbacks */ extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 66b2a62..01abc28 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1472,7 +1472,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevi IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexDeclaration8Impl *object; WINED3DVERTEXELEMENT *wined3d_elements; - size_t wined3d_element_count; + UINT wined3d_element_count; HRESULT hr = D3D_OK; TRACE("(%p) : declaration %p\n", This, declaration); diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 3a53c11..57d0337 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -272,7 +272,7 @@ static const wined3d_usage_t wined3d_usage_lookup[] = { }; /* TODO: find out where rhw (or positionT) is for declaration8 */ -size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements) +UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements) { const DWORD *token = d3d8_elements; WINED3DVERTEXELEMENT *element; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 160cb67..ff3b921 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -482,7 +482,7 @@ typedef struct IDirect3DVertexDeclaration9Impl { LONG ref; D3DVERTEXELEMENT9 *elements; - size_t element_count; + UINT element_count; /* IDirect3DVertexDeclaration9 fields */ IWineD3DVertexDeclaration *wineD3DVertexDeclaration; diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 0c48aff..d26d09d 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -289,10 +289,10 @@ static const IDirect3DVertexDeclaration9Vtbl Direct3DVertexDeclaration9_Vtbl = IDirect3DVertexDeclaration9Impl_GetDeclaration }; -static size_t convert_to_wined3d_declaration(const D3DVERTEXELEMENT9* d3d9_elements, WINED3DVERTEXELEMENT **wined3d_elements) { +static UINT convert_to_wined3d_declaration(const D3DVERTEXELEMENT9* d3d9_elements, WINED3DVERTEXELEMENT **wined3d_elements) { const D3DVERTEXELEMENT9* element; - size_t element_count = 1; - size_t i; + UINT element_count = 1; + UINT i; TRACE("d3d9_elements %p, wined3d_elements %p\n", d3d9_elements, wined3d_elements); @@ -323,7 +323,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DVertexDeclaration9Impl *object = NULL; WINED3DVERTEXELEMENT* wined3d_elements; - size_t element_count; + UINT element_count; HRESULT hr = D3D_OK; TRACE("(%p) : Relay\n", iface); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e9970a3..b30333d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1700,7 +1700,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, U * Vertex Declaration *****/ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* iface, IWineD3DVertexDeclaration** ppVertexDeclaration, - IUnknown *parent, const WINED3DVERTEXELEMENT *elements, size_t element_count) { + IUnknown *parent, const WINED3DVERTEXELEMENT *elements, UINT element_count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DVertexDeclarationImpl *object = NULL; HRESULT hr = WINED3D_OK; @@ -1719,8 +1719,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice* return hr; } -static size_t ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the GL info, which has the type table */ - DWORD fvf, WINED3DVERTEXELEMENT** ppVertexElements) { +static unsigned int ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the GL info, which has the type table */ + DWORD fvf, WINED3DVERTEXELEMENT** ppVertexElements) { unsigned int idx, idx2; unsigned int offset; @@ -1849,7 +1849,7 @@ static size_t ConvertFvfToDeclaration(IWineD3DDeviceImpl *This, /* For the GL in static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3DDevice* iface, IWineD3DVertexDeclaration** ppVertexDeclaration, IUnknown *Parent, DWORD Fvf) { WINED3DVERTEXELEMENT* elements = NULL; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - size_t size; + unsigned int size; DWORD hr; size = ConvertFvfToDeclaration(This, Fvf, &elements); diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 1984d6b..0802b1f 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -103,7 +103,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDevice(IWineD3DVertexDecl } static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration(IWineD3DVertexDeclaration *iface, - WINED3DVERTEXELEMENT *elements, size_t *element_count) { + WINED3DVERTEXELEMENT *elements, UINT *element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; HRESULT hr = WINED3D_OK; @@ -119,7 +119,7 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_GetDeclaration(IWineD3DVerte } static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVertexDeclaration *iface, - const WINED3DVERTEXELEMENT *elements, size_t element_count) { + const WINED3DVERTEXELEMENT *elements, UINT element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; HRESULT hr = WINED3D_OK; int i, j; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 6335eb9..ce23907 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -363,7 +363,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(CreateCubeTexture)(THIS_ UINT EdgeLength, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DCubeTexture** ppCubeTexture, HANDLE* pSharedHandle, IUnknown *parent, D3DCB_CREATESURFACEFN pFn) PURE; STDMETHOD(CreateQuery)(THIS_ WINED3DQUERYTYPE Type, struct IWineD3DQuery **ppQuery, IUnknown *pParent); STDMETHOD(CreateAdditionalSwapChain)(THIS_ WINED3DPRESENT_PARAMETERS *pPresentationParameters, struct IWineD3DSwapChain **pSwapChain, IUnknown *pParent, D3DCB_CREATERENDERTARGETFN pFn, D3DCB_CREATEDEPTHSTENCILSURFACEFN pFn2); - STDMETHOD(CreateVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, const WINED3DVERTEXELEMENT *elements, size_t element_count) PURE; + STDMETHOD(CreateVertexDeclaration)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, const WINED3DVERTEXELEMENT *elements, UINT element_count) PURE; STDMETHOD(CreateVertexDeclarationFromFVF)(THIS_ struct IWineD3DVertexDeclaration** ppDecl, IUnknown* pParent, DWORD Fvf) PURE; STDMETHOD(CreateVertexShader)(THIS_ struct IWineD3DVertexDeclaration *vertex_declaration, CONST DWORD* pFunction, struct IWineD3DVertexShader** ppShader, IUnknown *pParent) PURE; STDMETHOD(CreatePixelShader)(THIS_ CONST DWORD* pFunction, struct IWineD3DPixelShader** ppShader, IUnknown *pParent) PURE; @@ -1278,8 +1278,8 @@ DECLARE_INTERFACE_(IWineD3DVertexDeclaration,IWineD3DBase) STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; /*** IWineD3DVertexDeclaration methods ***/ STDMETHOD(GetDevice)(THIS_ IWineD3DDevice **ppDevice) PURE; - STDMETHOD(GetDeclaration)(THIS_ WINED3DVERTEXELEMENT *elements, size_t *elements_count) PURE; - STDMETHOD(SetDeclaration)(THIS_ const WINED3DVERTEXELEMENT *elements, size_t element_count) PURE; + STDMETHOD(GetDeclaration)(THIS_ WINED3DVERTEXELEMENT *elements, UINT *elements_count) PURE; + STDMETHOD(SetDeclaration)(THIS_ const WINED3DVERTEXELEMENT *elements, UINT element_count) PURE; }; #undef INTERFACE
participants (1)
-
Alexandre Julliard