Henri Verbeet : wined3d: Make the present_parameters parameter to wined3d_device_reset() const.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d607586d62cd5626bc0c7e7c5c12d77ef8b9c468
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d607586d62cd5626bc0c7e7c5c...

Author: Henri Verbeet 
Date:   Tue Oct 18 20:46:14 2011 +0200

wined3d: Make the present_parameters parameter to wined3d_device_reset() const.

---

dlls/d3d8/device.c     |   14 --------------
 dlls/d3d9/device.c     |   19 +------------------
 dlls/wined3d/device.c  |    2 +-
 include/wine/wined3d.h |    2 +-
 4 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 1c8829f..2a78117 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -596,20 +596,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(IDirect3DDevice8 *iface,
     }
     wined3d_mutex_unlock();

-    pPresentationParameters->BackBufferWidth                    = localParameters.BackBufferWidth;
-    pPresentationParameters->BackBufferHeight                   = localParameters.BackBufferHeight;
-    pPresentationParameters->BackBufferFormat                   = d3dformat_from_wined3dformat(localParameters.BackBufferFormat);
-    pPresentationParameters->BackBufferCount                    = localParameters.BackBufferCount;
-    pPresentationParameters->MultiSampleType                    = localParameters.MultiSampleType;
-    pPresentationParameters->SwapEffect                         = localParameters.SwapEffect;
-    pPresentationParameters->hDeviceWindow                      = localParameters.hDeviceWindow;
-    pPresentationParameters->Windowed                           = localParameters.Windowed;
-    pPresentationParameters->EnableAutoDepthStencil             = localParameters.EnableAutoDepthStencil;
-    pPresentationParameters->AutoDepthStencilFormat             = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat);
-    pPresentationParameters->Flags                              = localParameters.Flags;
-    pPresentationParameters->FullScreen_RefreshRateInHz         = localParameters.FullScreen_RefreshRateInHz;
-    pPresentationParameters->FullScreen_PresentationInterval    = localParameters.PresentationInterval;
-
     return hr;
 }

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 8dc7334..0372239 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -582,26 +582,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(IDirect3DDevi

hr = wined3d_device_reset(This->wined3d_device, &localParameters, reset_enum_callback);
     if (FAILED(hr))
-    {
         This->notreset = TRUE;
-
-        pPresentationParameters->BackBufferWidth            = localParameters.BackBufferWidth;
-        pPresentationParameters->BackBufferHeight           = localParameters.BackBufferHeight;
-        pPresentationParameters->BackBufferFormat           = d3dformat_from_wined3dformat(localParameters.BackBufferFormat);
-        pPresentationParameters->BackBufferCount            = localParameters.BackBufferCount;
-        pPresentationParameters->MultiSampleType            = localParameters.MultiSampleType;
-        pPresentationParameters->MultiSampleQuality         = localParameters.MultiSampleQuality;
-        pPresentationParameters->SwapEffect                 = localParameters.SwapEffect;
-        pPresentationParameters->hDeviceWindow              = localParameters.hDeviceWindow;
-        pPresentationParameters->Windowed                   = localParameters.Windowed;
-        pPresentationParameters->EnableAutoDepthStencil     = localParameters.EnableAutoDepthStencil;
-        pPresentationParameters->AutoDepthStencilFormat     = d3dformat_from_wined3dformat(localParameters.AutoDepthStencilFormat);
-        pPresentationParameters->Flags                      = localParameters.Flags;
-        pPresentationParameters->FullScreen_RefreshRateInHz = localParameters.FullScreen_RefreshRateInHz;
-        pPresentationParameters->PresentationInterval       = localParameters.PresentationInterval;
-    } else {
+    else
         This->notreset = FALSE;
-    }

wined3d_mutex_unlock();

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 10acdce..999794f 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5524,7 +5524,7 @@ err:

/* Do not call while under the GL lock. */
 HRESULT CDECL wined3d_device_reset(struct wined3d_device *device,
-        WINED3DPRESENT_PARAMETERS *present_parameters,
+        const WINED3DPRESENT_PARAMETERS *present_parameters,
         wined3d_device_reset_cb callback)
 {
     struct wined3d_resource *resource, *cursor;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 7e382e1..e66fe16 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2282,7 +2282,7 @@ HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device,
         const struct wined3d_vertex_declaration *declaration, DWORD flags, DWORD dst_fvf);
 void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device);
 HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device,
-        WINED3DPRESENT_PARAMETERS *present_parameters, wined3d_device_reset_cb callback);
+        const WINED3DPRESENT_PARAMETERS *present_parameters, wined3d_device_reset_cb callback);
 void __cdecl wined3d_device_restore_fullscreen_window(struct wined3d_device *device, HWND window);
 HRESULT __cdecl wined3d_device_set_base_vertex_index(struct wined3d_device *device, INT base_index);
 HRESULT __cdecl wined3d_device_set_clip_plane(struct wined3d_device *device, UINT plane_idx, const float *plane);