Re: [PATCH] wined3d: Add missing ckey, fx, and pal directdraw caps.

[Stefan Dösinger]

Looks OK to me.
(unless there are whitespace issues which I can't see in my current mail client)
Am 01.09.2010 um 06:44 schrieb Octavian Voicu:
> Fixes regression described in bug 24226.
>
> dlls/wined3d/directx.c |    7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
> index 01b4e46..9e50f78 100644
> --- a/dlls/wined3d/directx.c
> +++ b/dlls/wined3d/directx.c
> @@ -4259,7 +4259,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
>     int ps_selected_mode;
>     struct shader_caps shader_caps;
>     struct fragment_caps fragment_caps;
> - DWORD ckey_caps, blit_caps, fx_caps;
> -
>
> DWORD ckey_caps, blit_caps, fx_caps, pal_caps;
>
> TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps);
>
> @@ -4786,6 +4786,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
>                                         WINEDDCAPS_COLORKEY                 |
>                                         WINEDDCAPS_COLORKEYHWASSIST         |
>                                         WINEDDCAPS_ALIGNBOUNDARYSRC;
> -
>
> pal_caps =                          WINEDDPCAPS_8BIT                    |
> -
>                                    WINEDDPCAPS_PRIMARYSURFACE;
>
> /* Fill the ddraw caps structure */
>   pCaps->DirectDrawCaps.Caps =        WINEDDCAPS_GDI                      |
>
> @@ -4796,6 +4798,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
>                                         WINEDDCAPS2_PRIMARYGAMMA             |
>                                         WINEDDCAPS2_WIDESURFACES             |
>                                         WINEDDCAPS2_CANRENDERWINDOWED;
> - pCaps->DirectDrawCaps.CKeyCaps =    ckey_caps;
> - pCaps->DirectDrawCaps.FXCaps =      fx_caps;
> - pCaps->DirectDrawCaps.PalCaps =     pal_caps;
> pCaps->DirectDrawCaps.SVBCaps =     blit_caps;
> pCaps->DirectDrawCaps.SVBCKeyCaps = ckey_caps;
> pCaps->DirectDrawCaps.SVBFXCaps =   fx_caps;
>
> -- 
> 1.7.0.4