mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
server-Desktop_Refcount: Add missing alloc_handle() callback.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49463
This commit is contained in:
Zebediah Figura
parent
37fc290f77
commit
b6c2818755
@ -1,4 +1,4 @@
|
||||
From 1a225cf237fa461cffb5ecb9287ffa2c46d26a44 Mon Sep 17 00:00:00 2001
|
||||
From 07f5dd1db6399c54be793ca496546bb28947aaae 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)
|
||||
@ -10,7 +10,7 @@ Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
|
||||
server/change.c | 1 +
|
||||
server/clipboard.c | 1 +
|
||||
server/completion.c | 1 +
|
||||
server/console.c | 3 +++
|
||||
server/console.c | 4 ++++
|
||||
server/debugger.c | 2 ++
|
||||
server/device.c | 4 ++++
|
||||
server/directory.c | 2 ++
|
||||
@ -39,7 +39,7 @@ Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
|
||||
server/timer.c | 1 +
|
||||
server/token.c | 1 +
|
||||
server/winstation.c | 2 ++
|
||||
34 files changed, 78 insertions(+), 4 deletions(-)
|
||||
34 files changed, 79 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/server/async.c b/server/async.c
|
||||
index 03994e8fac2..9feafd01847 100644
|
||||
@ -110,7 +110,7 @@ index db04727b93b..e72a155eeeb 100644
|
||||
completion_destroy /* destroy */
|
||||
};
|
||||
diff --git a/server/console.c b/server/console.c
|
||||
index 729cfa40612..71db7b36f44 100644
|
||||
index 729cfa40612..a0d9bd87ab4 100644
|
||||
--- a/server/console.c
|
||||
+++ b/server/console.c
|
||||
@@ -97,6 +97,7 @@ static const struct object_ops console_input_ops =
|
||||
@ -137,6 +137,14 @@ index 729cfa40612..71db7b36f44 100644
|
||||
no_close_handle, /* close_handle */
|
||||
screen_buffer_destroy /* destroy */
|
||||
};
|
||||
@@ -241,6 +244,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 */
|
||||
+ no_alloc_handle, /* alloc_handle */
|
||||
no_close_handle, /* close_handle */
|
||||
no_destroy /* destroy */
|
||||
};
|
||||
diff --git a/server/debugger.c b/server/debugger.c
|
||||
index 401ce36a47a..b7746d55c0e 100644
|
||||
--- a/server/debugger.c
|
||||
@ -234,10 +242,10 @@ index d339d85aa45..a78d73d9e78 100644
|
||||
no_destroy /* destroy */
|
||||
};
|
||||
diff --git a/server/fd.c b/server/fd.c
|
||||
index df0c5bb3f78..6d999dee17d 100644
|
||||
index 7ea8ac273e5..a4741724fb6 100644
|
||||
--- a/server/fd.c
|
||||
+++ b/server/fd.c
|
||||
@@ -225,6 +225,7 @@ static const struct object_ops fd_ops =
|
||||
@@ -221,6 +221,7 @@ static const struct object_ops fd_ops =
|
||||
NULL, /* unlink_name */
|
||||
no_open_file, /* open_file */
|
||||
no_kernel_obj_list, /* get_kernel_obj_list */
|
||||
@ -245,7 +253,7 @@ index df0c5bb3f78..6d999dee17d 100644
|
||||
no_close_handle, /* close_handle */
|
||||
fd_destroy /* destroy */
|
||||
};
|
||||
@@ -265,6 +266,7 @@ static const struct object_ops device_ops =
|
||||
@@ -261,6 +262,7 @@ static const struct object_ops device_ops =
|
||||
NULL, /* unlink_name */
|
||||
no_open_file, /* open_file */
|
||||
no_kernel_obj_list, /* get_kernel_obj_list */
|
||||
@ -253,7 +261,7 @@ index df0c5bb3f78..6d999dee17d 100644
|
||||
no_close_handle, /* close_handle */
|
||||
device_destroy /* destroy */
|
||||
};
|
||||
@@ -304,6 +306,7 @@ static const struct object_ops inode_ops =
|
||||
@@ -300,6 +302,7 @@ static const struct object_ops inode_ops =
|
||||
NULL, /* unlink_name */
|
||||
no_open_file, /* open_file */
|
||||
no_kernel_obj_list, /* get_kernel_obj_list */
|
||||
@ -261,7 +269,7 @@ index df0c5bb3f78..6d999dee17d 100644
|
||||
no_close_handle, /* close_handle */
|
||||
inode_destroy /* destroy */
|
||||
};
|
||||
@@ -345,6 +348,7 @@ static const struct object_ops file_lock_ops =
|
||||
@@ -341,6 +344,7 @@ static const struct object_ops file_lock_ops =
|
||||
NULL, /* unlink_name */
|
||||
no_open_file, /* open_file */
|
||||
no_kernel_obj_list, /* get_kernel_obj_list */
|
||||
@ -367,7 +375,7 @@ index 781e6f3141a..6f0321393e2 100644
|
||||
mailslot_device_destroy /* destroy */
|
||||
};
|
||||
diff --git a/server/mapping.c b/server/mapping.c
|
||||
index 002f3215af2..da60f768603 100644
|
||||
index 0941dd87c05..42c207b3367 100644
|
||||
--- a/server/mapping.c
|
||||
+++ b/server/mapping.c
|
||||
@@ -79,6 +79,7 @@ static const struct object_ops ranges_ops =
|
||||
@ -492,7 +500,7 @@ 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 5060e760e0a..638d785dafd 100644
|
||||
index 283edc09c5e..3134bf415a0 100644
|
||||
--- a/server/process.c
|
||||
+++ b/server/process.c
|
||||
@@ -88,6 +88,7 @@ static const struct object_ops process_ops =
|
||||
@ -552,7 +560,7 @@ index dcbb3f791e1..6e5eddcd257 100644
|
||||
key_destroy /* destroy */
|
||||
};
|
||||
diff --git a/server/request.c b/server/request.c
|
||||
index 321bb6cfa81..1f34e7e9a54 100644
|
||||
index 4c1f30a5fe7..42cc83c3037 100644
|
||||
--- a/server/request.c
|
||||
+++ b/server/request.c
|
||||
@@ -107,6 +107,7 @@ static const struct object_ops master_socket_ops =
|
||||
@ -684,10 +692,10 @@ index 6460acbf519..2b5ae29a45a 100644
|
||||
timer_destroy /* destroy */
|
||||
};
|
||||
diff --git a/server/token.c b/server/token.c
|
||||
index 23bc1cc13f7..3e8e60016a3 100644
|
||||
index 2fa95e17aaf..8464eaf83eb 100644
|
||||
--- a/server/token.c
|
||||
+++ b/server/token.c
|
||||
@@ -161,6 +161,7 @@ static const struct object_ops token_ops =
|
||||
@@ -157,6 +157,7 @@ static const struct object_ops token_ops =
|
||||
NULL, /* unlink_name */
|
||||
no_open_file, /* open_file */
|
||||
no_kernel_obj_list, /* get_kernel_obj_list */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user