ddraw: Constify some variables
Andrew Talbot
Andrew.Talbot at talbotville.com
Sat Apr 21 16:16:34 CDT 2007
Changelog:
ddraw: Constify some variables.
diff -urN a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
--- a/dlls/ddraw/ddraw_private.h 2007-01-19 12:31:05.000000000 +0000
+++ b/dlls/ddraw/ddraw_private.h 2007-04-21 11:08:13.000000000 +0100
@@ -598,10 +598,10 @@
(((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1)
void PixelFormat_WineD3DtoDD(DDPIXELFORMAT *DDPixelFormat, WINED3DFORMAT WineD3DFormat);
-WINED3DFORMAT PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat);
+WINED3DFORMAT PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat);
void DDRAW_dump_surface_desc(const DDSURFACEDESC2 *lpddsd);
void DDRAW_dump_pixelformat(const DDPIXELFORMAT *PixelFormat);
-void dump_D3DMATRIX(D3DMATRIX *mat);
+void dump_D3DMATRIX(const D3DMATRIX *mat);
void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps);
DWORD get_flexible_vertex_size(DWORD d3dvtVertexType);
void DDRAW_dump_DDSCAPS2(const DDSCAPS2 *in);
@@ -609,7 +609,7 @@
/* This only needs to be here as long the processvertices functionality of
* IDirect3DExecuteBuffer isn't in WineD3D */
-void multiply_matrix(LPD3DMATRIX dest, LPD3DMATRIX src1, LPD3DMATRIX src2);
+void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2);
/* Used for generic dumping */
typedef struct
diff -urN a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c
--- a/dlls/ddraw/executebuffer.c 2006-10-12 11:48:42.000000000 +0100
+++ b/dlls/ddraw/executebuffer.c 2007-04-21 10:58:41.000000000 +0100
@@ -55,14 +55,14 @@
*
*****************************************************************************/
-static void _dump_executedata(LPD3DEXECUTEDATA lpData) {
+static void _dump_executedata(const D3DEXECUTEDATA *lpData) {
DPRINTF("dwSize : %d\n", lpData->dwSize);
DPRINTF("Vertex Offset : %d Count : %d\n", lpData->dwVertexOffset, lpData->dwVertexCount);
DPRINTF("Instruction Offset : %d Length : %d\n", lpData->dwInstructionOffset, lpData->dwInstructionLength);
DPRINTF("HVertex Offset : %d\n", lpData->dwHVertexOffset);
}
-static void _dump_D3DEXECUTEBUFFERDESC(LPD3DEXECUTEBUFFERDESC lpDesc) {
+static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) {
DPRINTF("dwSize : %d\n", lpDesc->dwSize);
DPRINTF("dwFlags : %x\n", lpDesc->dwFlags);
DPRINTF("dwCaps : %x\n", lpDesc->dwCaps);
diff -urN a/dlls/ddraw/light.c b/dlls/ddraw/light.c
--- a/dlls/ddraw/light.c 2006-10-11 11:53:44.000000000 +0100
+++ b/dlls/ddraw/light.c 2007-04-21 10:59:04.000000000 +0100
@@ -158,7 +158,7 @@
* DDERR_INVALIDPARAMS if Light is NULL
*
*****************************************************************************/
-static void dump_light(LPD3DLIGHT2 light)
+static void dump_light(const D3DLIGHT2 *light)
{
DPRINTF(" - dwSize : %d\n", light->dwSize);
}
diff -urN a/dlls/ddraw/main.c b/dlls/ddraw/main.c
--- a/dlls/ddraw/main.c 2007-03-20 13:12:32.000000000 +0000
+++ b/dlls/ddraw/main.c 2007-04-21 10:59:17.000000000 +0100
@@ -95,7 +95,7 @@
*
***********************************************************************/
static HRESULT
-DDRAW_Create(GUID *guid,
+DDRAW_Create(const GUID *guid,
void **DD,
IUnknown *UnkOuter,
REFIID iid)
diff -urN a/dlls/ddraw/material.c b/dlls/ddraw/material.c
--- a/dlls/ddraw/material.c 2006-10-11 11:53:44.000000000 +0100
+++ b/dlls/ddraw/material.c 2007-04-21 10:59:28.000000000 +0100
@@ -47,7 +47,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d7);
WINE_DECLARE_DEBUG_CHANNEL(ddraw_thunk);
-static void dump_material(LPD3DMATERIAL mat)
+static void dump_material(const D3DMATERIAL *mat)
{
DPRINTF(" dwSize : %d\n", mat->dwSize);
}
diff -urN a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c
--- a/dlls/ddraw/utils.c 2007-01-18 12:46:38.000000000 +0000
+++ b/dlls/ddraw/utils.c 2007-04-21 10:59:38.000000000 +0100
@@ -337,7 +337,7 @@
* WINED3DFMT_UNKNOWN if a matching format wasn't found
*****************************************************************************/
WINED3DFORMAT
-PixelFormat_DD2WineD3D(DDPIXELFORMAT *DDPixelFormat)
+PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat)
{
TRACE("Convert a DirectDraw Pixelformat to a WineD3D Pixelformat\n");
if(TRACE_ON(ddraw))
@@ -874,7 +874,7 @@
}
void
-dump_D3DMATRIX(D3DMATRIX *mat)
+dump_D3DMATRIX(const D3DMATRIX *mat)
{
DPRINTF(" %f %f %f %f\n", mat->_11, mat->_12, mat->_13, mat->_14);
DPRINTF(" %f %f %f %f\n", mat->_21, mat->_22, mat->_23, mat->_24);
@@ -1129,8 +1129,8 @@
*****************************************************************************/
void
multiply_matrix(D3DMATRIX *dest,
- D3DMATRIX *src1,
- D3DMATRIX *src2)
+ const D3DMATRIX *src1,
+ const D3DMATRIX *src2)
{
D3DMATRIX temp;
diff -urN a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
--- a/dlls/ddraw/viewport.c 2006-11-07 16:19:06.000000000 +0000
+++ b/dlls/ddraw/viewport.c 2007-04-21 11:00:14.000000000 +0100
@@ -95,7 +95,7 @@
* Writes viewport information to TRACE
*
*****************************************************************************/
-static void _dump_D3DVIEWPORT(D3DVIEWPORT *lpvp)
+static void _dump_D3DVIEWPORT(const D3DVIEWPORT *lpvp)
{
TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY);
@@ -109,7 +109,7 @@
lpvp->dvMinZ, lpvp->dvMaxZ);
}
-static void _dump_D3DVIEWPORT2(D3DVIEWPORT2 *lpvp)
+static void _dump_D3DVIEWPORT2(const D3DVIEWPORT2 *lpvp)
{
TRACE(" - dwSize = %d dwX = %d dwY = %d\n",
lpvp->dwSize, lpvp->dwX, lpvp->dwY);
More information about the wine-patches
mailing list