Alexandre Julliard : user32: Rename rectClient to client_rect for consistency.
Alexandre Julliard
julliard at winehq.org
Tue Jun 5 17:06:41 CDT 2018
Module: wine
Branch: master
Commit: 0a75a1b62bc2b6762e30fba89793f857c5b88af2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a75a1b62bc2b6762e30fba89793f857c5b88af2
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jun 5 17:00:38 2018 +0200
user32: Rename rectClient to client_rect for consistency.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/painting.c | 4 ++--
dlls/user32/win.c | 16 ++++++++--------
dlls/user32/win.h | 2 +-
dlls/user32/winpos.c | 18 +++++++++---------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c
index bf3f180..79db230 100644
--- a/dlls/user32/painting.c
+++ b/dlls/user32/painting.c
@@ -838,8 +838,8 @@ void move_window_bits_parent( HWND hwnd, HWND parent, const RECT *window_rect, c
TRACE( "copying %s -> %s\n", wine_dbgstr_rect( &src ), wine_dbgstr_rect( &dst ));
MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), parent, (POINT *)&src, 2 );
- OffsetRect( &src, win->rectClient.left - win->visible_rect.left,
- win->rectClient.top - win->visible_rect.top );
+ OffsetRect( &src, win->client_rect.left - win->visible_rect.left,
+ win->client_rect.top - win->visible_rect.top );
OffsetRect( &dst, -window_rect->left, -window_rect->top );
window_surface_add_ref( surface );
WIN_ReleasePtr( win );
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 7c12825..2435a6f 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -856,15 +856,15 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind
}
if (win != WND_OTHER_PROCESS)
{
- RECT window_rect = win->rectWindow, client_rect = win->rectClient;
+ RECT window_rect = win->rectWindow, client_rect = win->client_rect;
switch (relative)
{
case COORDS_CLIENT:
- OffsetRect( &window_rect, -win->rectClient.left, -win->rectClient.top );
- OffsetRect( &client_rect, -win->rectClient.left, -win->rectClient.top );
+ OffsetRect( &window_rect, -win->client_rect.left, -win->client_rect.top );
+ OffsetRect( &client_rect, -win->client_rect.left, -win->client_rect.top );
if (win->dwExStyle & WS_EX_LAYOUTRTL)
- mirror_rect( &win->rectClient, &window_rect );
+ mirror_rect( &win->client_rect, &window_rect );
break;
case COORDS_WINDOW:
OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top );
@@ -890,8 +890,8 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind
}
if (parent->dwExStyle & WS_EX_LAYOUTRTL)
{
- mirror_rect( &parent->rectClient, &window_rect );
- mirror_rect( &parent->rectClient, &client_rect );
+ mirror_rect( &parent->client_rect, &window_rect );
+ mirror_rect( &parent->client_rect, &client_rect );
}
WIN_ReleasePtr( parent );
}
@@ -915,8 +915,8 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind
win = parent;
if (win->parent)
{
- OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top );
- OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top );
+ OffsetRect( &window_rect, win->client_rect.left, win->client_rect.top );
+ OffsetRect( &client_rect, win->client_rect.left, win->client_rect.top );
}
}
break;
diff --git a/dlls/user32/win.h b/dlls/user32/win.h
index 41b6033..9f954dc 100644
--- a/dlls/user32/win.h
+++ b/dlls/user32/win.h
@@ -43,7 +43,7 @@ typedef struct tagWND
WNDPROC winproc; /* Window procedure */
DWORD tid; /* Owner thread id */
HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */
- RECT rectClient; /* Client area rel. to parent client area */
+ RECT client_rect; /* Client area rel. to parent client area */
RECT rectWindow; /* Whole window rel. to parent client area */
RECT visible_rect; /* Visible part of the whole rect, rel. to parent client area */
RECT normal_rect; /* Normal window rect saved when maximized/minimized */
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 19ab297..a06ae7e 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -428,12 +428,12 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI
if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL)
{
mirror_from = TRUE;
- offset.x += wndPtr->rectClient.right - wndPtr->rectClient.left;
+ offset.x += wndPtr->client_rect.right - wndPtr->client_rect.left;
}
while (wndPtr->parent)
{
- offset.x += wndPtr->rectClient.left;
- offset.y += wndPtr->rectClient.top;
+ offset.x += wndPtr->client_rect.left;
+ offset.y += wndPtr->client_rect.top;
hwnd = wndPtr->parent;
WIN_ReleasePtr( wndPtr );
if (!(wndPtr = WIN_GetPtr( hwnd ))) break;
@@ -463,12 +463,12 @@ static BOOL WINPOS_GetWinOffset( HWND hwndFrom, HWND hwndTo, BOOL *mirrored, POI
if (wndPtr->dwExStyle & WS_EX_LAYOUTRTL)
{
mirror_to = TRUE;
- offset.x -= wndPtr->rectClient.right - wndPtr->rectClient.left;
+ offset.x -= wndPtr->client_rect.right - wndPtr->client_rect.left;
}
while (wndPtr->parent)
{
- offset.x -= wndPtr->rectClient.left;
- offset.y -= wndPtr->rectClient.top;
+ offset.x -= wndPtr->client_rect.left;
+ offset.y -= wndPtr->client_rect.top;
hwnd = wndPtr->parent;
WIN_ReleasePtr( wndPtr );
if (!(wndPtr = WIN_GetPtr( hwnd ))) break;
@@ -2087,7 +2087,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
return FALSE;
}
old_visible_rect = win->visible_rect;
- old_client_rect = win->rectClient;
+ old_client_rect = win->client_rect;
old_surface = win->surface;
if (old_surface != new_surface) swp_flags |= SWP_FRAMECHANGED; /* force refreshing non-client area */
@@ -2118,7 +2118,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
win->dwStyle = reply->new_style;
win->dwExStyle = reply->new_ex_style;
win->rectWindow = *window_rect;
- win->rectClient = *client_rect;
+ win->client_rect = *client_rect;
win->visible_rect = visible_rect;
win->surface = new_surface;
surface_win = wine_server_ptr_handle( reply->surface_win );
@@ -2128,7 +2128,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags,
RECT client;
GetClientRect( win->parent, &client );
mirror_rect( &client, &win->rectWindow );
- mirror_rect( &client, &win->rectClient );
+ mirror_rect( &client, &win->client_rect );
mirror_rect( &client, &win->visible_rect );
}
/* if an RTL window is resized the children have moved */
More information about the wine-cvs
mailing list