Commit 60b5dc04 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Rename the IWineD3DPaletteImpl "Flags" field to "flags".

parent ce4de8ff
...@@ -93,10 +93,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DW ...@@ -93,10 +93,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DW
TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt); TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt);
if (Flags) return WINED3DERR_INVALIDCALL; /* unchecked */ if (Flags) return WINED3DERR_INVALIDCALL; /* unchecked */
if (Start + Count > IWineD3DPaletteImpl_Size(This->Flags)) if (Start + Count > IWineD3DPaletteImpl_Size(This->flags))
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
if (This->Flags & WINEDDPCAPS_8BITENTRIES) if (This->flags & WINEDDPCAPS_8BITENTRIES)
{ {
unsigned int i; unsigned int i;
LPBYTE entry = (LPBYTE)PalEnt; LPBYTE entry = (LPBYTE)PalEnt;
...@@ -117,9 +117,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, ...@@ -117,9 +117,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface,
IWineD3DResourceImpl *res; IWineD3DResourceImpl *res;
TRACE("(%p)->(%08x,%d,%d,%p)\n",This,Flags,Start,Count,PalEnt); 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; unsigned int i;
const BYTE* entry = (const BYTE*)PalEnt; const BYTE* entry = (const BYTE*)PalEnt;
...@@ -130,7 +131,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface, ...@@ -130,7 +131,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface,
memcpy(This->palents+Start, PalEnt, Count * sizeof(PALETTEENTRY)); 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 */ /* 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"); TRACE("WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white\n");
This->palents[0].peRed = 0; This->palents[0].peRed = 0;
...@@ -171,7 +172,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetCaps(IWineD3DPalette *iface, DWORD ...@@ -171,7 +172,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetCaps(IWineD3DPalette *iface, DWORD
IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface; IWineD3DPaletteImpl *This = (IWineD3DPaletteImpl *)iface;
TRACE("(%p)->(%p)\n", This, Caps); TRACE("(%p)->(%p)\n", This, Caps);
*Caps = This->Flags; *Caps = This->flags;
return WINED3D_OK; return WINED3D_OK;
} }
...@@ -204,7 +205,7 @@ HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *d ...@@ -204,7 +205,7 @@ HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *d
palette->ref = 1; palette->ref = 1;
palette->parent = parent; palette->parent = parent;
palette->device = device; palette->device = device;
palette->Flags = flags; palette->flags = flags;
palette->palNumEntries = IWineD3DPaletteImpl_Size(flags); palette->palNumEntries = IWineD3DPaletteImpl_Size(flags);
palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion); palette->hpal = CreatePalette((const LOGPALETTE *)&palette->palVersion);
......
...@@ -2267,7 +2267,7 @@ void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL ...@@ -2267,7 +2267,7 @@ void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL
{ {
table[i][3] = 0x00; table[i][3] = 0x00;
} }
else if(pal->Flags & WINEDDPCAPS_ALPHA) else if (pal->flags & WINEDDPCAPS_ALPHA)
{ {
table[i][3] = pal->palents[i].peFlags; table[i][3] = pal->palents[i].peFlags;
} }
......
...@@ -221,14 +221,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD ...@@ -221,14 +221,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD
if (This->palette) if (This->palette)
if (This->resource.usage & WINED3DUSAGE_RENDERTARGET) if (This->resource.usage & WINED3DUSAGE_RENDERTARGET)
This->palette->Flags &= ~WINEDDPCAPS_PRIMARYSURFACE; This->palette->flags &= ~WINEDDPCAPS_PRIMARYSURFACE;
This->palette = PalImpl; This->palette = PalImpl;
if (PalImpl) if (PalImpl)
{ {
if (This->resource.usage & WINED3DUSAGE_RENDERTARGET) if (This->resource.usage & WINED3DUSAGE_RENDERTARGET)
PalImpl->Flags |= WINEDDPCAPS_PRIMARYSURFACE; PalImpl->flags |= WINEDDPCAPS_PRIMARYSURFACE;
return IWineD3DSurface_RealizePalette(iface); return IWineD3DSurface_RealizePalette(iface);
} }
......
...@@ -2978,7 +2978,7 @@ struct IWineD3DPaletteImpl { ...@@ -2978,7 +2978,7 @@ struct IWineD3DPaletteImpl {
PALETTEENTRY palents[256]; /*| */ PALETTEENTRY palents[256]; /*| */
/* This is to store the palette in 'screen format' */ /* This is to store the palette in 'screen format' */
int screen_palents[256]; int screen_palents[256];
DWORD Flags; DWORD flags;
}; };
HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device, HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *device,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment