Module: wine Branch: master Commit: bf7f80f4b343fa014f56acd049fb5a473a531b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf7f80f4b343fa014f56acd049...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Dec 12 10:23:32 2013 +0100
ddraw: Store the palette flags in the ddraw palette.
---
dlls/ddraw/ddraw_private.h | 5 ++--- dlls/ddraw/palette.c | 17 ++--------------- dlls/wined3d/palette.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 5 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ce08db7..b24376d 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -379,9 +379,8 @@ struct ddraw_palette LONG ref;
struct wined3d_palette *wineD3DPalette; - - /* IDirectDrawPalette fields */ - IUnknown *ifaceToRelease; + IUnknown *ifaceToRelease; + DWORD flags; };
static inline struct ddraw_palette *impl_from_IDirectDrawPalette(IDirectDrawPalette *iface) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 5e53af5..0c9534d 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -130,20 +130,6 @@ static HRESULT WINAPI ddraw_palette_Initialize(IDirectDrawPalette *iface, return DDERR_ALREADYINITIALIZED; }
-/***************************************************************************** - * IDirectDrawPalette::GetCaps - * - * Returns the palette description - * - * Params: - * Caps: Address to store the caps at - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Caps is NULL - * For more details, see IWineD3DPalette::GetCaps - * - *****************************************************************************/ static HRESULT WINAPI ddraw_palette_GetCaps(IDirectDrawPalette *iface, DWORD *caps) { struct ddraw_palette *palette = impl_from_IDirectDrawPalette(iface); @@ -151,7 +137,7 @@ static HRESULT WINAPI ddraw_palette_GetCaps(IDirectDrawPalette *iface, DWORD *ca TRACE("iface %p, caps %p.\n", iface, caps);
wined3d_mutex_lock(); - *caps = wined3d_palette_get_flags(palette->wineD3DPalette); + *caps = palette->flags; wined3d_mutex_unlock();
return D3D_OK; @@ -257,6 +243,7 @@ HRESULT ddraw_palette_init(struct ddraw_palette *palette,
palette->IDirectDrawPalette_iface.lpVtbl = &ddraw_palette_vtbl; palette->ref = 1; + palette->flags = flags;
if (FAILED(hr = wined3d_palette_create(ddraw->wined3d_device, flags, entries, &palette->wineD3DPalette))) { diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 20ff3f9..555a962 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -145,13 +145,6 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, return WINED3D_OK; }
-DWORD CDECL wined3d_palette_get_flags(const struct wined3d_palette *palette) -{ - TRACE("palette %p.\n", palette); - - return palette->flags; -} - static HRESULT wined3d_palette_init(struct wined3d_palette *palette, struct wined3d_device *device, DWORD flags, const PALETTEENTRY *entries) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c3bf2d1..bbd5775 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -159,7 +159,6 @@ @ cdecl wined3d_palette_create(ptr long ptr ptr) @ cdecl wined3d_palette_decref(ptr) @ cdecl wined3d_palette_get_entries(ptr long long long ptr) -@ cdecl wined3d_palette_get_flags(ptr) @ cdecl wined3d_palette_incref(ptr) @ cdecl wined3d_palette_set_entries(ptr long long long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bd41e8a..1c85396 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2239,7 +2239,6 @@ HRESULT __cdecl wined3d_palette_create(struct wined3d_device *device, DWORD flag ULONG __cdecl wined3d_palette_decref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_get_entries(const struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, PALETTEENTRY *entries); -DWORD __cdecl wined3d_palette_get_flags(const struct wined3d_palette *palette); ULONG __cdecl wined3d_palette_incref(struct wined3d_palette *palette); HRESULT __cdecl wined3d_palette_set_entries(struct wined3d_palette *palette, DWORD flags, DWORD start, DWORD count, const PALETTEENTRY *entries);