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
6a9f5e18
Commit
6a9f5e18
authored
Sep 24, 2012
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winex11: Add window data structure locking to the ShowWindow entry point.
parent
5f9be705
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
window.c
dlls/winex11.drv/window.c
+11
-7
No files found.
dlls/winex11.drv/window.c
View file @
6a9f5e18
...
...
@@ -2208,20 +2208,20 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
Window
root
,
top
;
DWORD
style
=
GetWindowLongW
(
hwnd
,
GWL_STYLE
);
struct
x11drv_thread_data
*
thread_data
=
x11drv_thread_data
();
struct
x11drv_win_data
*
data
=
X11DRV_
get_win_data
(
hwnd
);
struct
x11drv_win_data
*
data
=
get_win_data
(
hwnd
);
if
(
!
data
||
!
data
->
whole_window
||
!
data
->
managed
||
!
data
->
mapped
||
data
->
iconic
)
return
swp
;
if
(
style
&
WS_MINIMIZE
)
return
swp
;
if
(
IsRectEmpty
(
rect
))
return
swp
;
if
(
!
data
||
!
data
->
whole_window
||
!
data
->
managed
||
!
data
->
mapped
||
data
->
iconic
)
goto
done
;
if
(
style
&
WS_MINIMIZE
)
goto
done
;
if
(
IsRectEmpty
(
rect
))
goto
done
;
/* only fetch the new rectangle if the ShowWindow was a result of a window manager event */
if
(
!
thread_data
->
current_event
||
thread_data
->
current_event
->
xany
.
window
!=
data
->
whole_window
)
return
swp
;
goto
done
;
if
(
thread_data
->
current_event
->
type
!=
ConfigureNotify
&&
thread_data
->
current_event
->
type
!=
PropertyNotify
)
return
swp
;
goto
done
;
TRACE
(
"win %p/%lx cmd %d at %s flags %08x
\n
"
,
hwnd
,
data
->
whole_window
,
cmd
,
wine_dbgstr_rect
(
rect
),
swp
);
...
...
@@ -2235,7 +2235,11 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp )
rect
->
bottom
=
y
+
height
;
OffsetRect
(
rect
,
virtual_screen_rect
.
left
,
virtual_screen_rect
.
top
);
X11DRV_X_to_window_rect
(
data
,
rect
);
return
swp
&
~
(
SWP_NOMOVE
|
SWP_NOCLIENTMOVE
|
SWP_NOSIZE
|
SWP_NOCLIENTSIZE
);
swp
&=
~
(
SWP_NOMOVE
|
SWP_NOCLIENTMOVE
|
SWP_NOSIZE
|
SWP_NOCLIENTSIZE
);
done:
release_win_data
(
data
);
return
swp
;
}
...
...
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