Alexandre Julliard : user32: Rename rectWindow to window_rect for consistency.
Alexandre Julliard
julliard at winehq.org
Tue Jun 5 17:06:41 CDT 2018
Module: wine
Branch: master
Commit: 52be6f0ecca20ad67ee1f9e3d97db98074ebe0ab
URL: https://source.winehq.org/git/wine.git/?a=commit;h=52be6f0ecca20ad67ee1f9e3d97db98074ebe0ab
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jun 5 17:03:16 2018 +0200
user32: Rename rectWindow to window_rect for consistency.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/win.c | 8 ++++----
dlls/user32/win.h | 2 +-
dlls/user32/winpos.c | 16 ++++++++--------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index 2435a6f..1398458 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -856,7 +856,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind
}
if (win != WND_OTHER_PROCESS)
{
- RECT window_rect = win->rectWindow, client_rect = win->client_rect;
+ RECT window_rect = win->window_rect, client_rect = win->client_rect;
switch (relative)
{
@@ -867,10 +867,10 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind
mirror_rect( &win->client_rect, &window_rect );
break;
case COORDS_WINDOW:
- OffsetRect( &window_rect, -win->rectWindow.left, -win->rectWindow.top );
- OffsetRect( &client_rect, -win->rectWindow.left, -win->rectWindow.top );
+ OffsetRect( &window_rect, -win->window_rect.left, -win->window_rect.top );
+ OffsetRect( &client_rect, -win->window_rect.left, -win->window_rect.top );
if (win->dwExStyle & WS_EX_LAYOUTRTL)
- mirror_rect( &win->rectWindow, &client_rect );
+ mirror_rect( &win->window_rect, &client_rect );
break;
case COORDS_PARENT:
if (win->parent)
diff --git a/dlls/user32/win.h b/dlls/user32/win.h
index 9f954dc..9794aab 100644
--- a/dlls/user32/win.h
+++ b/dlls/user32/win.h
@@ -44,7 +44,7 @@ typedef struct tagWND
DWORD tid; /* Owner thread id */
HINSTANCE hInstance; /* Window hInstance (from CreateWindow) */
RECT client_rect; /* Client area rel. to parent client area */
- RECT rectWindow; /* Whole window rel. to parent client area */
+ RECT window_rect; /* 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 */
POINT min_pos; /* Position for minimized window */
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index a06ae7e..d527409 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -704,7 +704,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow )
TRACE("%p %i\n", hwnd, (bShow != 0) );
if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return;
- if (win->rectWindow.left == -32000 || win->rectWindow.top == -32000)
+ if (win->window_rect.left == -32000 || win->window_rect.top == -32000)
{
TRACE( "not showing title for hidden icon %p\n", hwnd );
bShow = FALSE;
@@ -1318,17 +1318,17 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl )
/* update the placement according to the current style */
if (pWnd->dwStyle & WS_MINIMIZE)
{
- pWnd->min_pos.x = pWnd->rectWindow.left;
- pWnd->min_pos.y = pWnd->rectWindow.top;
+ pWnd->min_pos.x = pWnd->window_rect.left;
+ pWnd->min_pos.y = pWnd->window_rect.top;
}
else if (pWnd->dwStyle & WS_MAXIMIZE)
{
- pWnd->max_pos.x = pWnd->rectWindow.left;
- pWnd->max_pos.y = pWnd->rectWindow.top;
+ pWnd->max_pos.x = pWnd->window_rect.left;
+ pWnd->max_pos.y = pWnd->window_rect.top;
}
else
{
- pWnd->normal_rect = pWnd->rectWindow;
+ pWnd->normal_rect = pWnd->window_rect;
}
wndpl->length = sizeof(*wndpl);
@@ -2117,7 +2117,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->window_rect = *window_rect;
win->client_rect = *client_rect;
win->visible_rect = visible_rect;
win->surface = new_surface;
@@ -2127,7 +2127,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->window_rect );
mirror_rect( &client, &win->client_rect );
mirror_rect( &client, &win->visible_rect );
}
More information about the wine-cvs
mailing list