Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
deb83097
Commit
deb83097
authored
Sep 24, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Fix initial computation of client area in WM_NCCALCSIZE for RTL windows.
parent
d7d9cd5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
controls.h
dlls/user32/controls.h
+1
-1
defwnd.c
dlls/user32/defwnd.c
+1
-1
nonclient.c
dlls/user32/nonclient.c
+6
-2
No files found.
dlls/user32/controls.h
View file @
deb83097
...
@@ -167,7 +167,7 @@ extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN;
...
@@ -167,7 +167,7 @@ extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN;
/* nonclient area */
/* nonclient area */
extern
LRESULT
NC_HandleNCPaint
(
HWND
hwnd
,
HRGN
clip
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCPaint
(
HWND
hwnd
,
HRGN
clip
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCActivate
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCActivate
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCCalcSize
(
HWND
hwnd
,
RECT
*
winRect
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCCalcSize
(
HWND
hwnd
,
WPARAM
wParam
,
RECT
*
winRect
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCHitTest
(
HWND
hwnd
,
POINT
pt
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCHitTest
(
HWND
hwnd
,
POINT
pt
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCLButtonDown
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCLButtonDown
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCLButtonDblClk
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
)
DECLSPEC_HIDDEN
;
extern
LRESULT
NC_HandleNCLButtonDblClk
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
)
DECLSPEC_HIDDEN
;
...
...
dlls/user32/defwnd.c
View file @
deb83097
...
@@ -309,7 +309,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
...
@@ -309,7 +309,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
}
}
case
WM_NCCALCSIZE
:
case
WM_NCCALCSIZE
:
return
NC_HandleNCCalcSize
(
hwnd
,
(
RECT
*
)
lParam
);
return
NC_HandleNCCalcSize
(
hwnd
,
wParam
,
(
RECT
*
)
lParam
);
case
WM_WINDOWPOSCHANGING
:
case
WM_WINDOWPOSCHANGING
:
return
WINPOS_HandleWindowPosChanging
(
hwnd
,
(
WINDOWPOS
*
)
lParam
);
return
WINPOS_HandleWindowPosChanging
(
hwnd
,
(
WINDOWPOS
*
)
lParam
);
...
...
dlls/user32/nonclient.c
View file @
deb83097
...
@@ -410,7 +410,7 @@ BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exSty
...
@@ -410,7 +410,7 @@ BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exSty
*
*
* Handle a WM_NCCALCSIZE message. Called from DefWindowProc().
* Handle a WM_NCCALCSIZE message. Called from DefWindowProc().
*/
*/
LRESULT
NC_HandleNCCalcSize
(
HWND
hwnd
,
RECT
*
winRect
)
LRESULT
NC_HandleNCCalcSize
(
HWND
hwnd
,
WPARAM
wparam
,
RECT
*
winRect
)
{
{
RECT
tmpRect
=
{
0
,
0
,
0
,
0
};
RECT
tmpRect
=
{
0
,
0
,
0
,
0
};
LRESULT
result
=
0
;
LRESULT
result
=
0
;
...
@@ -451,7 +451,11 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, RECT *winRect )
...
@@ -451,7 +451,11 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, RECT *winRect )
-
GetSystemMetrics
(
SM_CYEDGE
));
-
GetSystemMetrics
(
SM_CYEDGE
));
if
(
style
&
WS_VSCROLL
)
if
(
style
&
WS_VSCROLL
)
if
(
winRect
->
right
-
winRect
->
left
>=
GetSystemMetrics
(
SM_CXVSCROLL
)){
if
(
winRect
->
right
-
winRect
->
left
>=
GetSystemMetrics
(
SM_CXVSCROLL
))
{
/* rectangle is in screen coords when wparam is false */
if
(
!
wparam
&&
(
exStyle
&
WS_EX_LAYOUTRTL
))
exStyle
^=
WS_EX_LEFTSCROLLBAR
;
if
((
exStyle
&
WS_EX_LEFTSCROLLBAR
)
!=
0
)
if
((
exStyle
&
WS_EX_LEFTSCROLLBAR
)
!=
0
)
winRect
->
left
+=
GetSystemMetrics
(
SM_CXVSCROLL
);
winRect
->
left
+=
GetSystemMetrics
(
SM_CXVSCROLL
);
else
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment