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
6560135c
Commit
6560135c
authored
Jun 05, 2013
by
Stefan Dösinger
Committed by
Alexandre Julliard
Jun 06, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Update the focus window after recreating the swapchain.
parent
f8ce7ed9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
ddraw.c
dlls/ddraw/ddraw.c
+16
-16
No files found.
dlls/ddraw/ddraw.c
View file @
6560135c
...
...
@@ -814,10 +814,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND windo
This
->
focuswindow
=
NULL
;
}
if
((
This
->
cooperative_level
&
DDSCL_EXCLUSIVE
)
&&
(
window
!=
This
->
dest_window
||
!
(
cooplevel
&
DDSCL_EXCLUSIVE
)))
wined3d_device_release_focus_window
(
This
->
wined3d_device
);
if
((
cooplevel
&
DDSCL_FULLSCREEN
)
!=
(
This
->
cooperative_level
&
DDSCL_FULLSCREEN
)
||
window
!=
This
->
dest_window
)
{
if
(
This
->
cooperative_level
&
DDSCL_FULLSCREEN
)
...
...
@@ -833,18 +829,6 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND windo
}
}
if
((
cooplevel
&
DDSCL_EXCLUSIVE
)
&&
(
window
!=
This
->
dest_window
||
!
(
This
->
cooperative_level
&
DDSCL_EXCLUSIVE
)))
{
hr
=
wined3d_device_acquire_focus_window
(
This
->
wined3d_device
,
window
);
if
(
FAILED
(
hr
))
{
ERR
(
"Failed to acquire focus window, hr %#x.
\n
"
,
hr
);
wined3d_mutex_unlock
();
return
hr
;
}
}
if
(
cooplevel
&
DDSCL_MULTITHREADED
&&
!
(
This
->
cooperative_level
&
DDSCL_MULTITHREADED
))
wined3d_device_set_multithreaded
(
This
->
wined3d_device
);
...
...
@@ -896,6 +880,22 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND windo
wined3d_stateblock_decref
(
stateblock
);
}
if
((
This
->
cooperative_level
&
DDSCL_EXCLUSIVE
)
&&
(
window
!=
This
->
dest_window
||
!
(
cooplevel
&
DDSCL_EXCLUSIVE
)))
wined3d_device_release_focus_window
(
This
->
wined3d_device
);
if
((
cooplevel
&
DDSCL_EXCLUSIVE
)
&&
(
window
!=
This
->
dest_window
||
!
(
This
->
cooperative_level
&
DDSCL_EXCLUSIVE
)))
{
hr
=
wined3d_device_acquire_focus_window
(
This
->
wined3d_device
,
window
);
if
(
FAILED
(
hr
))
{
ERR
(
"Failed to acquire focus window, hr %#x.
\n
"
,
hr
);
wined3d_mutex_unlock
();
return
hr
;
}
}
/* Unhandled flags */
if
(
cooplevel
&
DDSCL_ALLOWREBOOT
)
WARN
(
"(%p) Unhandled flag DDSCL_ALLOWREBOOT, harmless
\n
"
,
This
);
...
...
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