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
5b056f61
Commit
5b056f61
authored
Jul 03, 2017
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineandroid: Forward the destroy window ioctl to Java even if the window was freed already.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
28c040c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
WineActivity.java
dlls/wineandroid.drv/WineActivity.java
+2
-1
device.c
dlls/wineandroid.drv/device.c
+2
-2
No files found.
dlls/wineandroid.drv/WineActivity.java
View file @
5b056f61
...
...
@@ -358,7 +358,8 @@ public class WineActivity extends Activity
{
if
(
window_group
!=
null
)
{
if
(
parent
!=
null
)
parent
.
client_group
.
removeView
(
window_group
);
if
(
parent
!=
null
&&
parent
.
client_group
!=
null
)
parent
.
client_group
.
removeView
(
window_group
);
window_group
.
destroy_view
();
}
if
(
client_group
!=
null
)
client_group
.
destroy_view
();
...
...
dlls/wineandroid.drv/device.c
View file @
5b056f61
...
...
@@ -604,7 +604,7 @@ static NTSTATUS destroyWindow_ioctl( void *data, DWORD in_size, DWORD out_size,
if
(
in_size
<
sizeof
(
*
res
))
return
STATUS_INVALID_PARAMETER
;
if
(
!
(
win_data
=
get_ioctl_native_win_data
(
&
res
->
hdr
)))
return
STATUS_INVALID_HANDLE
;
win_data
=
get_ioctl_native_win_data
(
&
res
->
hdr
)
;
TRACE
(
"hwnd %08x opengl %u
\n
"
,
res
->
hdr
.
hwnd
,
res
->
hdr
.
opengl
);
...
...
@@ -613,7 +613,7 @@ static NTSTATUS destroyWindow_ioctl( void *data, DWORD in_size, DWORD out_size,
wrap_java_call
();
(
*
jni_env
)
->
CallVoidMethod
(
jni_env
,
object
,
method
,
res
->
hdr
.
hwnd
);
unwrap_java_call
();
free_native_win_data
(
win_data
);
if
(
win_data
)
free_native_win_data
(
win_data
);
return
STATUS_SUCCESS
;
}
...
...
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