wined3d: Const correctness fixes.
Henri Verbeet
hverbeet at codeweavers.com
Tue Nov 25 04:57:39 CST 2008
---
dlls/wined3d/clipper.c | 5 +++--
dlls/wined3d/device.c | 12 +++++++-----
dlls/wined3d/drawprim.c | 36 ++++++++++++++++++------------------
dlls/wined3d/palette.c | 3 ++-
dlls/wined3d/surface.c | 16 +++++++++++-----
dlls/wined3d/surface_base.c | 34 +++++++++++++---------------------
dlls/wined3d/wined3d_private.h | 11 +++++++----
include/wine/wined3d.idl | 24 ++++++++++++------------
8 files changed, 73 insertions(+), 68 deletions(-)
diff --git a/dlls/wined3d/clipper.c b/dlls/wined3d/clipper.c
index feb6e23..2d3184f 100644
--- a/dlls/wined3d/clipper.c
+++ b/dlls/wined3d/clipper.c
@@ -96,7 +96,8 @@ static HRESULT WINAPI IWineD3DClipperImpl_SetHwnd(IWineD3DClipper *iface, DWORD
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DClipperImpl_GetClipList(IWineD3DClipper *iface, RECT *Rect, RGNDATA *ClipList, DWORD *Size)
+static HRESULT WINAPI IWineD3DClipperImpl_GetClipList(IWineD3DClipper *iface, const RECT *Rect,
+ RGNDATA *ClipList, DWORD *Size)
{
IWineD3DClipperImpl *This = (IWineD3DClipperImpl *)iface;
TRACE("(%p,%p,%p,%p)\n", This, Rect, ClipList, Size);
@@ -140,7 +141,7 @@ static HRESULT WINAPI IWineD3DClipperImpl_GetClipList(IWineD3DClipper *iface, RE
}
}
-static HRESULT WINAPI IWineD3DClipperImpl_SetClipList(IWineD3DClipper *iface, RGNDATA *rgn, DWORD Flags)
+static HRESULT WINAPI IWineD3DClipperImpl_SetClipList(IWineD3DClipper *iface, const RGNDATA *rgn, DWORD Flags)
{
IWineD3DClipperImpl *This = (IWineD3DClipperImpl *)iface;
static int warned = 0;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index aa9fa35..55f1548 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2478,7 +2478,8 @@ static void WINAPI IWineD3DDeviceImpl_SetMultithreaded(IWineD3DDevice *iface) {
return;
}
-static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) {
+static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain,
+ const WINED3DDISPLAYMODE* pMode) {
DEVMODEW devmode;
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
LONG ret;
@@ -5131,7 +5132,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa
/* Now process each rect in turn */
for (i = 0; i < Count; i++) {
/* Note gl uses lower left, width/height */
- IntersectRect((RECT *) &curRect, &vp_rect, (RECT *) &pRects[i]);
+ IntersectRect((RECT *)&curRect, &vp_rect, (const RECT *)&pRects[i]);
if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE]) {
IntersectRect((RECT *) &curRect, (RECT *) &curRect, &This->stateBlock->scissorRect);
}
@@ -5875,7 +5876,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface,
return IWineD3DSurface_BltFast(pDestinationSurface,
pDestPoint ? pDestPoint->x : 0,
pDestPoint ? pDestPoint->y : 0,
- pSourceSurface, (RECT *) pSourceRect, 0);
+ pSourceSurface, pSourceRect, 0);
}
if (destFormat == WINED3DFMT_UNKNOWN) {
@@ -6319,7 +6320,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD
memset(&BltFx, 0, sizeof(BltFx));
BltFx.dwSize = sizeof(BltFx);
BltFx.u5.dwFillColor = argb_to_fmt(color, surface->resource.format);
- return IWineD3DSurface_Blt(pSurface, (RECT *) pRect, NULL, NULL, WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE);
+ return IWineD3DSurface_Blt(pSurface, (const RECT *)pRect, NULL, NULL,
+ WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_NONE);
}
}
@@ -7291,7 +7293,7 @@ static void WINAPI IWineD3DDeviceImpl_SetGammaRamp(IWineD3DDevice * iface, UINT
TRACE("Relaying to swapchain\n");
if (IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapchain) == WINED3D_OK) {
- IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, (WINED3DGAMMARAMP *)pRamp);
+ IWineD3DSwapChain_SetGammaRamp(swapchain, Flags, pRamp);
IWineD3DSwapChain_Release(swapchain);
}
return;
diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 545bad1..c5c4f57 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -509,16 +509,16 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData
static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, const UINT index, const void *ptr) {
switch(type) {
case WINED3DDECLTYPE_FLOAT1:
- GL_EXTCALL(glVertexAttrib1fvARB(index, (float *) ptr));
+ GL_EXTCALL(glVertexAttrib1fvARB(index, (const float *)ptr));
break;
case WINED3DDECLTYPE_FLOAT2:
- GL_EXTCALL(glVertexAttrib2fvARB(index, (float *) ptr));
+ GL_EXTCALL(glVertexAttrib2fvARB(index, (const float *)ptr));
break;
case WINED3DDECLTYPE_FLOAT3:
- GL_EXTCALL(glVertexAttrib3fvARB(index, (float *) ptr));
+ GL_EXTCALL(glVertexAttrib3fvARB(index, (const float *)ptr));
break;
case WINED3DDECLTYPE_FLOAT4:
- GL_EXTCALL(glVertexAttrib4fvARB(index, (float *) ptr));
+ GL_EXTCALL(glVertexAttrib4fvARB(index, (const float *)ptr));
break;
case WINED3DDECLTYPE_UBYTE4:
@@ -530,29 +530,29 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co
break;
case WINED3DDECLTYPE_SHORT2:
- GL_EXTCALL(glVertexAttrib4svARB(index, (GLshort *) ptr));
+ GL_EXTCALL(glVertexAttrib4svARB(index, (const GLshort *)ptr));
break;
case WINED3DDECLTYPE_SHORT4:
- GL_EXTCALL(glVertexAttrib4svARB(index, (GLshort *) ptr));
+ GL_EXTCALL(glVertexAttrib4svARB(index, (const GLshort *)ptr));
break;
case WINED3DDECLTYPE_SHORT2N:
{
- GLshort s[4] = {((short *) ptr)[0], ((short *) ptr)[1], 0, 1};
+ GLshort s[4] = {((const GLshort *)ptr)[0], ((const GLshort *)ptr)[1], 0, 1};
GL_EXTCALL(glVertexAttrib4NsvARB(index, s));
break;
}
case WINED3DDECLTYPE_USHORT2N:
{
- GLushort s[4] = {((unsigned short *) ptr)[0], ((unsigned short *) ptr)[1], 0, 1};
+ GLushort s[4] = {((const GLushort *)ptr)[0], ((const GLushort *)ptr)[1], 0, 1};
GL_EXTCALL(glVertexAttrib4NusvARB(index, s));
break;
}
case WINED3DDECLTYPE_SHORT4N:
- GL_EXTCALL(glVertexAttrib4NsvARB(index, (GLshort *) ptr));
+ GL_EXTCALL(glVertexAttrib4NsvARB(index, (const GLshort *)ptr));
break;
case WINED3DDECLTYPE_USHORT4N:
- GL_EXTCALL(glVertexAttrib4NusvARB(index, (GLushort *) ptr));
+ GL_EXTCALL(glVertexAttrib4NusvARB(index, (const GLushort *)ptr));
break;
case WINED3DDECLTYPE_UDEC3:
@@ -569,21 +569,21 @@ static inline void send_attribute(IWineD3DDeviceImpl *This, const DWORD type, co
* byte float according to the IEEE standard
*/
if (GL_SUPPORT(NV_HALF_FLOAT)) {
- GL_EXTCALL(glVertexAttrib2hvNV(index, (GLhalfNV *)ptr));
+ GL_EXTCALL(glVertexAttrib2hvNV(index, (const GLhalfNV *)ptr));
} else {
- float x = float_16_to_32(((unsigned short *) ptr) + 0);
- float y = float_16_to_32(((unsigned short *) ptr) + 1);
+ float x = float_16_to_32(((const unsigned short *)ptr) + 0);
+ float y = float_16_to_32(((const unsigned short *)ptr) + 1);
GL_EXTCALL(glVertexAttrib2fARB(index, x, y));
}
break;
case WINED3DDECLTYPE_FLOAT16_4:
if (GL_SUPPORT(NV_HALF_FLOAT)) {
- GL_EXTCALL(glVertexAttrib4hvNV(index, (GLhalfNV *)ptr));
+ GL_EXTCALL(glVertexAttrib4hvNV(index, (const GLhalfNV *)ptr));
} else {
- float x = float_16_to_32(((unsigned short *) ptr) + 0);
- float y = float_16_to_32(((unsigned short *) ptr) + 1);
- float z = float_16_to_32(((unsigned short *) ptr) + 2);
- float w = float_16_to_32(((unsigned short *) ptr) + 3);
+ float x = float_16_to_32(((const unsigned short *)ptr) + 0);
+ float y = float_16_to_32(((const unsigned short *)ptr) + 1);
+ float z = float_16_to_32(((const unsigned short *)ptr) + 2);
+ float w = float_16_to_32(((const unsigned short *)ptr) + 3);
GL_EXTCALL(glVertexAttrib4fARB(index, x, y, z, w));
}
break;
diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c
index ff98333..8f6e37a 100644
--- a/dlls/wined3d/palette.c
+++ b/dlls/wined3d/palette.c
@@ -105,7 +105,8 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DW
return WINED3D_OK;
}
-static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, DWORD Flags, DWORD Start, DWORD Count, PALETTEENTRY *PalEnt)
+static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface,
+ DWORD Flags, DWORD Start, DWORD Count, const PALETTEENTRY *PalEnt)
{
IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
IWineD3DResourceImpl *res;
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index b147058..beb9f6d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3140,7 +3140,10 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine
}
/* Not called from the VTable */
-static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter) {
+static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const RECT *DestRect,
+ IWineD3DSurface *SrcSurface, const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx,
+ WINED3DTEXTUREFILTERTYPE Filter)
+{
WINED3DRECT rect;
IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice;
IWineD3DSwapChainImpl *srcSwapchain = NULL, *dstSwapchain = NULL;
@@ -3671,7 +3674,8 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT *
return WINED3DERR_INVALIDCALL;
}
-static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx)
+static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, const RECT *DestRect,
+ IWineD3DSurface *SrcSurface, const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx)
{
IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice;
float depth;
@@ -3698,7 +3702,7 @@ static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRec
return IWineD3DDevice_Clear((IWineD3DDevice *) myDevice,
DestRect == NULL ? 0 : 1,
- (WINED3DRECT *) DestRect,
+ (const WINED3DRECT *)DestRect,
WINED3DCLEAR_ZBUFFER,
0x00000000,
depth,
@@ -3709,7 +3713,8 @@ static HRESULT IWineD3DSurfaceImpl_BltZ(IWineD3DSurfaceImpl *This, RECT *DestRec
return WINED3DERR_INVALIDCALL;
}
-static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter) {
+static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *DestRect, IWineD3DSurface *SrcSurface,
+ const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter) {
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface;
IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface;
IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice;
@@ -3748,7 +3753,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *Dest
return IWineD3DBaseSurfaceImpl_Blt(iface, DestRect, SrcSurface, SrcRect, Flags, DDBltFx, Filter);
}
-HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans) {
+HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty,
+ IWineD3DSurface *Source, const RECT *rsrc, DWORD trans) {
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
IWineD3DSurfaceImpl *srcImpl = (IWineD3DSurfaceImpl *) Source;
IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice;
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index b7ee525..5ae80f9 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -269,7 +269,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD
else return WINED3D_OK;
}
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, WINEDDCOLORKEY *CKey) {
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, const WINEDDCOLORKEY *CKey)
+{
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
TRACE("(%p)->(%08x,%p)\n", This, Flags, CKey);
@@ -418,7 +419,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *ifac
return WINED3D_OK;
}
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX) {
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, const RECT *SrcRect,
+ IWineD3DSurface *DstSurface, const RECT *DstRect, DWORD Flags, const WINEDDOVERLAYFX *FX)
+{
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
IWineD3DSurfaceImpl *Dst = (IWineD3DSurfaceImpl *) DstSurface;
TRACE("(%p)->(%p, %p, %p, %08x, %p)\n", This, SrcRect, Dst, DstRect, Flags, FX);
@@ -862,14 +865,8 @@ static HRESULT
* SrcSurface: Source surface, can be NULL
* SrcRect: Source rectangle
*****************************************************************************/
-HRESULT WINAPI
-IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface,
- RECT *DestRect,
- IWineD3DSurface *SrcSurface,
- RECT *SrcRect,
- DWORD Flags,
- WINEDDBLTFX *DDBltFx,
- WINED3DTEXTUREFILTERTYPE Filter)
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *DestRect, IWineD3DSurface *SrcSurface,
+ const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter)
{
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) SrcSurface;
@@ -1504,13 +1501,8 @@ release:
* WINED3D_OK on success
*
*****************************************************************************/
-HRESULT WINAPI
-IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface,
- DWORD dstx,
- DWORD dsty,
- IWineD3DSurface *Source,
- RECT *rsrc,
- DWORD trans)
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty,
+ IWineD3DSurface *Source, const RECT *rsrc, DWORD trans)
{
IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface;
IWineD3DSurfaceImpl *Src = (IWineD3DSurfaceImpl *) Source;
@@ -1548,11 +1540,11 @@ IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface,
if (!rsrc)
{
WARN("rsrc is NULL!\n");
+ rsrc2.left = 0;
+ rsrc2.top = 0;
+ rsrc2.right = Src->currentDesc.Width;
+ rsrc2.bottom = Src->currentDesc.Height;
rsrc = &rsrc2;
- rsrc->left = 0;
- rsrc->top = 0;
- rsrc->right = Src->currentDesc.Width;
- rsrc->bottom = Src->currentDesc.Height;
}
/* Check source rect for validity. Copied from normal Blt. Fixes Baldur's Gate.*/
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index dbbdf4f..e3701e8 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1471,20 +1471,23 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_Restore(IWineD3DSurface *iface);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD3DPalette **Pal);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD3DPalette *Pal);
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, WINEDDCOLORKEY *CKey);
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, const WINEDDCOLORKEY *CKey);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container);
DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_RealizePalette(IWineD3DSurface *iface);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref);
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX);
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, const RECT *SrcRect,
+ IWineD3DSurface *DstSurface, const RECT *DstRect, DWORD Flags, const WINEDDOVERLAYFX *FX);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetClipper(IWineD3DSurface *iface, IWineD3DClipper *clipper);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetClipper(IWineD3DSurface *iface, IWineD3DClipper **clipper);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORMAT format);
HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface);
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter);
-HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans);
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, const RECT *DestRect, IWineD3DSurface *SrcSurface,
+ const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter);
+HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty,
+ IWineD3DSurface *Source, const RECT *rsrc, DWORD trans);
HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags);
void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface);
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 3116a5e..fe88520 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2330,7 +2330,7 @@ interface IWineD3DPalette : IWineD3DBase
[in] DWORD flags,
[in] DWORD start,
[in] DWORD count,
- [in] PALETTEENTRY *entries
+ [in] const PALETTEENTRY *entries
);
}
@@ -2342,7 +2342,7 @@ interface IWineD3DPalette : IWineD3DBase
interface IWineD3DClipper : IWineD3DBase
{
HRESULT GetClipList(
- [in] RECT *rect,
+ [in] const RECT *rect,
[out] RGNDATA *clip_list,
[in, out] DWORD *clip_list_size
);
@@ -2353,7 +2353,7 @@ interface IWineD3DClipper : IWineD3DBase
[out] BOOL *changed
);
HRESULT SetClipList(
- [in] RGNDATA *clip_list,
+ [in] const RGNDATA *clip_list,
[in] DWORD flags
);
HRESULT SetHWnd(
@@ -2394,11 +2394,11 @@ interface IWineD3DSurface : IWineD3DResource
[in] DWORD flags
);
HRESULT Blt(
- [in] RECT *dst_rect,
+ [in] const RECT *dst_rect,
[in] IWineD3DSurface *src_surface,
- [in] RECT *src_rect,
+ [in] const RECT *src_rect,
[in] DWORD flags,
- [in] WINEDDBLTFX *blt_fx,
+ [in] const WINEDDBLTFX *blt_fx,
[in] WINED3DTEXTUREFILTERTYPE filter
);
HRESULT GetBltStatus(
@@ -2415,7 +2415,7 @@ interface IWineD3DSurface : IWineD3DResource
[in] DWORD dst_x,
[in] DWORD dst_y,
[in] IWineD3DSurface *src_surface,
- [in] RECT *src_rect,
+ [in] const RECT *src_rect,
[in] DWORD trans
);
HRESULT GetPalette(
@@ -2428,7 +2428,7 @@ interface IWineD3DSurface : IWineD3DResource
);
HRESULT SetColorKey(
[in] DWORD flags,
- [in] WINEDDCOLORKEY *color_key
+ [in] const WINEDDCOLORKEY *color_key
);
DWORD GetPitch(
);
@@ -2448,11 +2448,11 @@ interface IWineD3DSurface : IWineD3DResource
[in] IWineD3DSurface *ref
);
HRESULT UpdateOverlay(
- [in] RECT *src_rect,
+ [in] const RECT *src_rect,
[in] IWineD3DSurface *dst_surface,
- [in] RECT *dst_rect,
+ [in] const RECT *dst_rect,
[in] DWORD flags,
- [in] WINEDDOVERLAYFX *fx
+ [in] const WINEDDOVERLAYFX *fx
);
HRESULT SetClipper(
[in] IWineD3DClipper *clipper
@@ -3013,7 +3013,7 @@ interface IWineD3DDevice : IWineD3DBase
);
HRESULT SetDisplayMode(
[in] UINT swapchain_idx,
- [in] WINED3DDISPLAYMODE *mode
+ [in] const WINED3DDISPLAYMODE *mode
);
UINT GetNumberOfSwapChains(
);
--
1.5.6.4
--------------000905050203020309080607--
More information about the wine-patches
mailing list