wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code.

dlls/d3d8/device.c

@@ -197,7 +197,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE8
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;
     localParameters.MultiSampleType                = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType;
     localParameters.MultiSampleQuality             = NULL; /* d3d9 only */
-    localParameters.SwapEffect                     = &pPresentationParameters->SwapEffect;
+    localParameters.SwapEffect                     = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect;
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;
     localParameters.Windowed                       = &pPresentationParameters->Windowed;
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;
@@ -230,7 +230,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PA
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;
     localParameters.MultiSampleType                = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType;
     localParameters.MultiSampleQuality             = NULL; /* D3d9 only */
-    localParameters.SwapEffect                     = &pPresentationParameters->SwapEffect;
+    localParameters.SwapEffect                     = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect;
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;
     localParameters.Windowed                       = &pPresentationParameters->Windowed;
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;

dlls/d3d8/directx.c

@@ -314,7 +314,7 @@ HRESULT  WINAPI  IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapter, D3
     localParameters.MultiSampleType                = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType;
     /* d3d9 only */
     localParameters.MultiSampleQuality             = NULL;
-    localParameters.SwapEffect                     = &pPresentationParameters->SwapEffect;
+    localParameters.SwapEffect                     = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect;
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;
     localParameters.Windowed                       = &pPresentationParameters->Windowed;
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;

dlls/d3d9/device.c

@@ -172,7 +172,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;            
     localParameters.MultiSampleType                = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType;            
     localParameters.MultiSampleQuality             = &pPresentationParameters->MultiSampleQuality;         
-    localParameters.SwapEffect                     = &pPresentationParameters->SwapEffect;                 
+    localParameters.SwapEffect                     = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect;                 
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;              
     localParameters.Windowed                       = &pPresentationParameters->Windowed;                   
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;     

dlls/d3d9/directx.c

@@ -298,7 +298,7 @@ HRESULT  WINAPI  IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;
     localParameters.MultiSampleType                = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType;
     localParameters.MultiSampleQuality             = &pPresentationParameters->MultiSampleQuality;
-    localParameters.SwapEffect                     = &pPresentationParameters->SwapEffect;
+    localParameters.SwapEffect                     = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect;
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;
     localParameters.Windowed                       = &pPresentationParameters->Windowed;
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;

dlls/d3d9/swapchain.c

@@ -128,7 +128,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWAPCHAIN9
     winePresentParameters.BackBufferCount = &pPresentationParameters->BackBufferCount;
     winePresentParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType;
     winePresentParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality;
-    winePresentParameters.SwapEffect = &pPresentationParameters->SwapEffect;
+    winePresentParameters.SwapEffect = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect;
     winePresentParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow;
     winePresentParameters.Windowed = &pPresentationParameters->Windowed;
     winePresentParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil;
@@ -178,7 +178,7 @@ HRESULT  WINAPI  IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE
     localParameters.BackBufferCount                = &pPresentationParameters->BackBufferCount;
     localParameters.MultiSampleType                = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType;
     localParameters.MultiSampleQuality             = &pPresentationParameters->MultiSampleQuality;
-    localParameters.SwapEffect                     = &pPresentationParameters->SwapEffect;
+    localParameters.SwapEffect                     = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect;
     localParameters.hDeviceWindow                  = &pPresentationParameters->hDeviceWindow;
     localParameters.Windowed                       = &pPresentationParameters->Windowed;
     localParameters.EnableAutoDepthStencil         = &pPresentationParameters->EnableAutoDepthStencil;

dlls/wined3d/swapchain.c

@@ -314,7 +314,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST REC
     LEAVE_GL();
     /* Although this is not strictly required, a simple demo showed this does occur
        on (at least non-debug) d3d                                                  */
-    if (This->presentParms.SwapEffect & D3DSWAPEFFECT_DISCARD) {
+    if (This->presentParms.SwapEffect & WINED3DSWAPEFFECT_DISCARD) {
 
         TRACE("Clearing\n");
 

include/wine/wined3d_types.h

@@ -479,7 +479,7 @@ typedef struct _WINED3DPRESENT_PARAMETERS {
     UINT                    *BackBufferCount;
     WINED3DMULTISAMPLE_TYPE *MultiSampleType;
     DWORD                   *MultiSampleQuality;
-    D3DSWAPEFFECT           *SwapEffect;
+    WINED3DSWAPEFFECT       *SwapEffect;
     HWND                    *hDeviceWindow;
     BOOL                    *Windowed;
     BOOL                    *EnableAutoDepthStencil;