Henri Verbeet : wined3d: Rename the IWineD3DPaletteImpl "Flags" field to " flags".
Alexandre Julliard
julliard at winehq.org
Mon Nov 15 13:28:55 CST 2010
Module: wine
Branch: master
Commit: 60b5dc04b73708398d795cbd0b8f584d9d94a87e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b5dc04b73708398d795cbd0b8f584d9d94a87e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Nov 15 13:43:33 2010 +0100
wined3d: Rename the IWineD3DPaletteImpl "Flags" field to "flags".
---
dlls/wined3d/palette.c | 15 ++++++++-------
dlls/wined3d/surface.c | 2 +-
dlls/wined3d/surface_base.c | 4 ++--
dlls/wined3d/wined3d_private.h | 2 +-
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c
index 2b7ce2c..68f823f 100644
--- a/dlls/wined3d/palette.c
+++ b/dlls/wined3d/palette.c
@@ -93,10 +93,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DW
TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt);
if (Flags) return WINED3DERR_INVALIDCALL; /* unchecked */
- if (Start + Count > IWineD3DPaletteImpl_Size(This->Flags))
+ if (Start + Count > IWineD3DPaletteImpl_Size(This->flags))
return WINED3DERR_INVALIDCALL;
- if (This->Flags & WINEDDPCAPS_8BITENTRIES)
+ if (This->flags & WINEDDPCAPS_8BITENTRIES)
{
unsigned int i;
LPBYTE entry = (LPBYTE)PalEnt;
@@ -117,9 +117,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface,
IWineD3DResourceImpl *res;
TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt);
- TRACE("Palette flags: %#x\n", This->Flags);
+ TRACE("Palette flags: %#x.\n", This->flags);
- if (This->Flags & WINEDDPCAPS_8BITENTRIES) {
+ if (This->flags & WINEDDPCAPS_8BITENTRIES)
+ {
unsigned int i;
const BYTE* entry = (const BYTE*)PalEnt;
@@ -130,7 +131,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface,
memcpy(This->palents+Start, PalEnt, Count * sizeof(PALETTEENTRY));
/* When WINEDDCAPS_ALLOW256 isn't set we need to override entry 0 with black and 255 with white */
- if(!(This->Flags & WINEDDPCAPS_ALLOW256))
+ if (!(This->flags & WINEDDPCAPS_ALLOW256))
{
TRACE("WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white\n");
This->palents[0].peRed = 0;
@@ -171,7 +172,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetCaps(IWineD3DPalette *iface, DWORD
IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
TRACE("(%p)->(%p)\n", This, Caps);
- *Caps = This->Flags;
+ *Caps = This->flags;
return WINED3D_OK;
}
@@ -204,7 +205,7 @@ HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *d
palette->ref = 1;
palette->parent = parent;
palette->device = device;
- palette->Flags = flags;
+ palette->flags = flags;
palette->palNumEntries = IWineD3DPaletteImpl_Size(flags);
palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion);
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 570b100..bef7688 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2267,7 +2267,7 @@ void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL
{
table[i][3] = 0x00;
}
- else if(pal->Flags & WINEDDPCAPS_ALPHA)
+ else if (pal->flags & WINEDDPCAPS_ALPHA)
{
table[i][3] = pal->palents[i].peFlags;
}
diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c
index f907ae8..7960b6c 100644
--- a/dlls/wined3d/surface_base.c
+++ b/dlls/wined3d/surface_base.c
@@ -221,14 +221,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD
if (This->palette)
if (This->resource.usage & WINED3DUSAGE_RENDERTARGET)
- This->palette->Flags &= ~WINEDDPCAPS_PRIMARYSURFACE;
+ This->palette->flags &= ~WINEDDPCAPS_PRIMARYSURFACE;
This->palette = PalImpl;
if (PalImpl)
{
if (This->resource.usage & WINED3DUSAGE_RENDERTARGET)
- PalImpl->Flags |= WINEDDPCAPS_PRIMARYSURFACE;
+ PalImpl->flags |= WINEDDPCAPS_PRIMARYSURFACE;
return IWineD3DSurface_RealizePalette(iface);
}
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index f143009..2278cb7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2978,7 +2978,7 @@ struct IWineD3DPaletteImpl {
PALETTEENTRY palents[256]; /*| */
/* This is to store the palette in 'screen format' */
int screen_palents[256];
- DWORD Flags;
+ DWORD flags;
};
HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device,
More information about the wine-cvs
mailing list