wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Updated server-Desktop_Refcount patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-04-23 15:54:22 +10:00
parent a0708adf42
commit 4e7071e4f1
8 changed files with 297 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

405
patches/server-Desktop_Refcount/0001-server-Introduce-a-new-alloc_handle-object-callback..patch
View File

File diff suppressed because it is too large Load Diff

40
patches/server-Desktop_Refcount/0002-server-Track-desktop-handle-count-more-correctly.patch
View File

@@ -1,7 +1,7 @@
From 02981c79c3ad972000fd3f397371f284ce9fade6 Mon Sep 17 00:00:00 2001
From eb47d6b708c171ca94c3e6d22a7c783d5d016256 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 4 Dec 2015 01:22:29 +0100
Subject: server: Track desktop handle count more correctly.
Subject: [PATCH 2/3] server: Track desktop handle count more correctly.
Desktop objects should stay valid, as long as there is a handle from a
(non-system) process. Counting only process->desktop references is not
@@ -17,7 +17,7 @@ Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
5 files changed, 65 insertions(+), 47 deletions(-)
diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 2b8502b..b59ed4e 100644
index 27b9b24..381012a 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -37,6 +37,8 @@
@@ -29,7 +29,7 @@ index 2b8502b..b59ed4e 100644
#define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769))
#define DESKTOP_ALL_ACCESS 0x01ff
@@ -1024,8 +1026,22 @@ void manage_desktop( WCHAR *arg )
@@ -1030,8 +1032,22 @@ void manage_desktop( WCHAR *arg )
/* run the desktop message loop */
if (hwnd)
{
@@ -54,10 +54,10 @@ index 2b8502b..b59ed4e 100644
}
diff --git a/server/handle.c b/server/handle.c
index eb83a3b..38f38d5 100644
index 4737825..f993a18 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -490,7 +490,7 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object
@@ -498,7 +498,7 @@ obj_handle_t find_inherited_handle( struct process *process, const struct object
/* enumerate handles of a given type */
/* this is needed for window stations and desktops */
obj_handle_t enumerate_handles( struct process *process, const struct object_ops *ops,
@@ -66,7 +66,7 @@ index eb83a3b..38f38d5 100644
{
struct handle_table *table = process->handles;
unsigned int i;
@@ -503,6 +503,7 @@ obj_handle_t enumerate_handles( struct process *process, const struct object_ops
@@ -511,6 +511,7 @@ obj_handle_t enumerate_handles( struct process *process, const struct object_ops
if (!entry->ptr) continue;
if (entry->ptr->ops != ops) continue;
*index = i + 1;
@@ -88,7 +88,7 @@ index f1deb79..1347836 100644
extern struct handle_table *alloc_handle_table( struct process *process, int count );
extern struct handle_table *copy_handle_table( struct process *process, struct process *parent );
diff --git a/server/process.c b/server/process.c
index cc9c01c..b43e1f8 100644
index c1b39f8..7b41ca3 100644
--- a/server/process.c
+++ b/server/process.c
@@ -838,7 +838,6 @@ static void process_killed( struct process *process )
@@ -100,10 +100,10 @@ index cc9c01c..b43e1f8 100644
process->desktop = 0;
close_process_handles( process );
diff --git a/server/winstation.c b/server/winstation.c
index 17c312a..46ade3b 100644
index f0a5287..fde6b68 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -51,6 +51,7 @@ static unsigned int winstation_map_access( struct object *obj, unsigned int acce
@@ -53,6 +53,7 @@ static unsigned int winstation_map_access( struct object *obj, unsigned int acce
static void desktop_dump( struct object *obj, int verbose );
static struct object_type *desktop_get_type( struct object *obj );
static int desktop_link_name( struct object *obj, struct object_name *name, struct object *parent );
@@ -111,16 +111,16 @@ index 17c312a..46ade3b 100644
static int desktop_close_handle( struct object *obj, struct process *process, obj_handle_t handle );
static void desktop_destroy( struct object *obj );
static unsigned int desktop_map_access( struct object *obj, unsigned int access );
@@ -97,7 +98,7 @@ static const struct object_ops desktop_ops =
desktop_link_name, /* link_name */
@@ -76,7 +77,7 @@ static const struct object_ops winstation_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
- no_alloc_handle, /* alloc_handle */
+ desktop_alloc_handle, /* alloc_handle */
desktop_close_handle, /* close_handle */
desktop_destroy /* destroy */
winstation_close_handle, /* close_handle */
winstation_destroy /* destroy */
};
@@ -253,14 +254,54 @@ static int desktop_link_name( struct object *obj, struct object_name *name, stru
@@ -273,14 +274,54 @@ static int desktop_link_name( struct object *obj, struct object_name *name, stru
return 1;
}
@@ -175,7 +175,7 @@ index 17c312a..46ade3b 100644
return 1;
}
@@ -268,6 +309,7 @@ static void desktop_destroy( struct object *obj )
@@ -288,6 +329,7 @@ static void desktop_destroy( struct object *obj )
{
struct desktop *desktop = (struct desktop *)obj;
@@ -183,7 +183,7 @@ index 17c312a..46ade3b 100644
free_hotkeys( desktop, 0 );
if (desktop->top_window) destroy_window( desktop->top_window );
if (desktop->msg_window) destroy_window( desktop->msg_window );
@@ -294,40 +336,6 @@ struct desktop *get_thread_desktop( struct thread *thread, unsigned int access )
@@ -314,40 +356,6 @@ struct desktop *get_thread_desktop( struct thread *thread, unsigned int access )
return get_desktop_obj( thread->process, thread->desktop, access );
}
@@ -224,7 +224,7 @@ index 17c312a..46ade3b 100644
/* set the process default desktop handle */
void set_process_default_desktop( struct process *process, struct desktop *desktop,
obj_handle_t handle )
@@ -344,12 +352,6 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt
@@ -364,12 +372,6 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt
LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry )
if (!thread->desktop) thread->desktop = handle;
@@ -237,7 +237,7 @@ index 17c312a..46ade3b 100644
if (old_desktop) release_object( old_desktop );
}
@@ -399,8 +401,8 @@ done:
@@ -419,8 +421,8 @@ done:
void close_process_desktop( struct process *process )
{
struct desktop *desktop;
@@ -249,5 +249,5 @@ index 17c312a..46ade3b 100644
remove_desktop_user( desktop );
release_object( desktop );
--
2.7.0
1.9.1

14
patches/server-Desktop_Refcount/0004-server-Assign-random-name-when-no-name-was-passed-to.patch
View File

@@ -1,7 +1,7 @@
From 5ae23a4a5d6c964035bdb8ecddb3fe7a74dc691d Mon Sep 17 00:00:00 2001
From 7db6d5b2412223cc16ff726502c7b3c66eab41c3 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 24 Feb 2016 19:18:52 +0100
Subject: server: Assign random name when no name was passed to
Subject: [PATCH 3/3] server: Assign random name when no name was passed to
create_winstation.
---
@@ -10,7 +10,7 @@ Subject: server: Assign random name when no name was passed to
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
index 94be4c9..33f50d8 100644
index 6bebfe9..1ca71a1 100644
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.c
@@ -220,8 +220,8 @@ static void test_handles(void)
@@ -25,10 +25,10 @@ index 94be4c9..33f50d8 100644
SetLastError( 0xdeadbeef );
w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
diff --git a/server/winstation.c b/server/winstation.c
index 0034343..39131d5 100644
index fde6b68..f96936f 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -111,9 +111,30 @@ static const struct object_ops desktop_ops =
@@ -113,9 +113,30 @@ static const struct object_ops desktop_ops =
static struct winstation *create_winstation( struct object *root, const struct unicode_str *name,
unsigned int attr, unsigned int flags )
{
@@ -60,7 +60,7 @@ index 0034343..39131d5 100644
{
if (get_error() != STATUS_OBJECT_NAME_EXISTS)
{
@@ -131,6 +152,7 @@ static struct winstation *create_winstation( struct object *root, const struct u
@@ -133,6 +154,7 @@ static struct winstation *create_winstation( struct object *root, const struct u
}
else clear_error();
}
@@ -69,5 +69,5 @@ index 0034343..39131d5 100644
}
--
2.8.0
1.9.1

2
patches/server-Desktop_Refcount/definition
View File

@@ -1,3 +1,3 @@
Fixes: Fix possible leak of explorer.exe processes and implement proper desktop refcounting
Fixes: Assign random name when trying to create Window Station without name
Disabled: True
Fixes: [46967] GOG Galaxy doesn't run in virtual desktop.