wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e0e3b6bc91f7db956e3a66f2938eea45d4055a39.

Browse Source
This commit is contained in:
Zebediah Figura
2020-07-07 17:59:50 -05:00
parent 21a97e1f88
commit b1765ff74e
28 changed files with 205 additions and 1491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 07f5dd1db6399c54be793ca496546bb28947aaae Mon Sep 17 00:00:00 2001
From 057f64581fd7acc3834bae2c6ebccd812f26b722 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 4 Dec 2015 10:36:47 +0100
Subject: [PATCH] server: Introduce a new alloc_handle object callback. (v2)
@@ -32,14 +32,13 @@ Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
server/semaphore.c | 1 +
server/serial.c | 1 +
server/signal.c | 1 +
server/snapshot.c | 1 +
server/sock.c | 2 ++
server/symlink.c | 1 +
server/thread.c | 3 +++
server/timer.c | 1 +
server/token.c | 1 +
server/winstation.c | 2 ++
34 files changed, 79 insertions(+), 4 deletions(-)
33 files changed, 78 insertions(+), 4 deletions(-)
diff --git a/server/async.c b/server/async.c
index 03994e8fac2..9feafd01847 100644
@@ -110,10 +109,10 @@ index db04727b93b..e72a155eeeb 100644
completion_destroy /* destroy */
};
diff --git a/server/console.c b/server/console.c
index 729cfa40612..a0d9bd87ab4 100644
index d6673dca1bd..8ed0c1f2d81 100644
--- a/server/console.c
+++ b/server/console.c
@@ -97,6 +97,7 @@ static const struct object_ops console_input_ops =
@@ -99,6 +99,7 @@ static const struct object_ops console_input_ops =
NULL, /* unlink_name */
console_input_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
@@ -121,7 +120,7 @@ index 729cfa40612..a0d9bd87ab4 100644
no_close_handle, /* close_handle */
console_input_destroy /* destroy */
};
@@ -132,6 +133,7 @@ static const struct object_ops console_input_events_ops =
@@ -134,6 +135,7 @@ static const struct object_ops console_input_events_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
@@ -129,7 +128,7 @@ index 729cfa40612..a0d9bd87ab4 100644
no_close_handle, /* close_handle */
console_input_events_destroy /* destroy */
};
@@ -195,6 +197,7 @@ static const struct object_ops screen_buffer_ops =
@@ -197,6 +199,7 @@ static const struct object_ops screen_buffer_ops =
NULL, /* unlink_name */
screen_buffer_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
@@ -137,7 +136,7 @@ index 729cfa40612..a0d9bd87ab4 100644
no_close_handle, /* close_handle */
screen_buffer_destroy /* destroy */
};
@@ -241,6 +244,7 @@ static const struct object_ops console_device_ops =
@@ -244,6 +247,7 @@ static const struct object_ops console_device_ops =
default_unlink_name, /* unlink_name */
console_device_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
@@ -375,7 +374,7 @@ index 781e6f3141a..6f0321393e2 100644
mailslot_device_destroy /* destroy */
};
diff --git a/server/mapping.c b/server/mapping.c
index 0941dd87c05..42c207b3367 100644
index 07c51c246d6..796855ac8e5 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -79,6 +79,7 @@ static const struct object_ops ranges_ops =
@@ -500,10 +499,10 @@ index f0b889d5899..13c59694c46 100644
extern void no_destroy( struct object *obj );
#ifdef DEBUG_OBJECTS
diff --git a/server/process.c b/server/process.c
index 283edc09c5e..3134bf415a0 100644
index 9482da98be5..4166f1ce8df 100644
--- a/server/process.c
+++ b/server/process.c
@@ -88,6 +88,7 @@ static const struct object_ops process_ops =
@@ -89,6 +89,7 @@ static const struct object_ops process_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
process_get_kernel_obj_list, /* get_kernel_obj_list */
@@ -511,7 +510,7 @@ index 283edc09c5e..3134bf415a0 100644
no_close_handle, /* close_handle */
process_destroy /* destroy */
};
@@ -138,6 +139,7 @@ static const struct object_ops startup_info_ops =
@@ -139,6 +140,7 @@ static const struct object_ops startup_info_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
@@ -519,7 +518,7 @@ index 283edc09c5e..3134bf415a0 100644
no_close_handle, /* close_handle */
startup_info_destroy /* destroy */
};
@@ -183,6 +185,7 @@ static const struct object_ops job_ops =
@@ -184,6 +186,7 @@ static const struct object_ops job_ops =
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
@@ -528,7 +527,7 @@ index 283edc09c5e..3134bf415a0 100644
job_destroy /* destroy */
};
diff --git a/server/queue.c b/server/queue.c
index c3925dd6646..e30cc0c13ad 100644
index a65eab38bdc..d658c48323f 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -182,6 +182,7 @@ static const struct object_ops msg_queue_ops =
@@ -607,18 +606,6 @@ index c81f6b8e989..b8dd87d86f1 100644
no_close_handle, /* close_handle */
handler_destroy /* destroy */
};
diff --git a/server/snapshot.c b/server/snapshot.c
index a0f2ea17a3e..d5ba720980a 100644
--- a/server/snapshot.c
+++ b/server/snapshot.c
@@ -72,6 +72,7 @@ static const struct object_ops snapshot_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
snapshot_destroy /* destroy */
};
diff --git a/server/sock.c b/server/sock.c
index 5095a6ef9f0..7b10b74cc4e 100644
--- a/server/sock.c
@@ -652,7 +639,7 @@ index 7a2f8642d5f..7bb28c8d7ce 100644
symlink_destroy /* destroy */
};
diff --git a/server/thread.c b/server/thread.c
index e2bfa50c7ba..9faef2dcd34 100644
index 9b14174578e..e3783351eb1 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -121,6 +121,7 @@ static const struct object_ops thread_apc_ops =