[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH 1/7] wined3d: Rename wined3d_window_state_restore_from_fullscreen() to
From:       Henri Verbeet <hverbeet () codeweavers ! com>
Date:       2019-07-31 20:41:45
Message-ID: 20190731202951.3683-1-hverbeet () codeweavers ! com
[Download RAW message or body]

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
---
 dlls/wined3d/swapchain.c       | 8 ++++----
 dlls/wined3d/wined3d_private.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index eb77e0e4220..5e207be37e5 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -85,14 +85,14 @@ static void swapchain_cleanup(struct wined3d_swapchain \
*swapchain)  
             if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT)
             {
-                wined3d_window_state_restore_from_fullscreen(&swapchain->state,
+                wined3d_swapchain_state_restore_from_fullscreen(&swapchain->state,
                         swapchain->device_window, &swapchain->original_window_rect);
                 wined3d_device_release_focus_window(swapchain->device);
             }
         }
         else
         {
-            wined3d_window_state_restore_from_fullscreen(&swapchain->state, \
swapchain->device_window, NULL); +            \
wined3d_swapchain_state_restore_from_fullscreen(&swapchain->state, \
swapchain->device_window, NULL);  }
     }
 
@@ -1450,7 +1450,7 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct \
wined3d_swapchain_state  return WINED3D_OK;
 }
 
-void wined3d_window_state_restore_from_fullscreen(struct wined3d_swapchain_state \
*state, +void wined3d_swapchain_state_restore_from_fullscreen(struct \
wined3d_swapchain_state *state,  HWND window, const RECT *window_rect)
 {
     unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOZORDER | \
SWP_NOACTIVATE; @@ -1582,7 +1582,7 @@ HRESULT CDECL \
wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha  RECT *window_rect \
= NULL;  if (state->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT)
             window_rect = &swapchain->original_window_rect;
-        wined3d_window_state_restore_from_fullscreen(state, \
swapchain->device_window, window_rect); +        \
wined3d_swapchain_state_restore_from_fullscreen(state, swapchain->device_window, \
window_rect);  }
 
     state->desc.windowed = swapchain_desc->windowed;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 7ad0c113641..74f115f4f80 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -4183,7 +4183,7 @@ struct wined3d_swapchain_state
     LONG exstyle;
 };
 
-void wined3d_window_state_restore_from_fullscreen(struct wined3d_swapchain_state \
*state, +void wined3d_swapchain_state_restore_from_fullscreen(struct \
wined3d_swapchain_state *state,  HWND window, const RECT *window_rect) \
DECLSPEC_HIDDEN;  HRESULT wined3d_swapchain_state_setup_fullscreen(struct \
wined3d_swapchain_state *state,  HWND window, unsigned int w, unsigned int h) \
                DECLSPEC_HIDDEN;
-- 
2.11.0


[prev in list] [next in list] [prev in thread] [next in thread]