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

Rebase against 9a53298eed493080fb132d0cd57fffa95b00b1ec.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-10-05 05:12:57 +02:00
parent 48c730f761
commit 3945cbfe36
9 changed files with 70 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 438997175c34fbc9e1e146bdecb36f104d80e98e Mon Sep 17 00:00:00 2001
From 1544a5022eee2874dcf492fc9c863ce21344a572 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 4 Dec 2015 10:36:47 +0100
Subject: server: Introduce a new alloc_handle object callback. (v2)
@@ -20,7 +20,7 @@ Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
server/handle.c | 13 +++++++++++--
server/hook.c | 1 +
server/mailslot.c | 3 +++
server/mapping.c | 2 ++
server/mapping.c | 3 +++
server/mutex.c | 1 +
server/named_pipe.c | 4 ++++
server/object.c | 4 ++++
@@ -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, 74 insertions(+), 3 deletions(-)
34 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/server/async.c b/server/async.c
index cf7a434ebca..9c7b9943975 100644
@@ -74,7 +74,7 @@ index 3ff75407d9f..7bebf136a21 100644
atom_table_destroy /* destroy */
};
diff --git a/server/change.c b/server/change.c
index 4dd7933f3ee..9340d4ad85c 100644
index c5c88da58dd..49d577a44de 100644
--- a/server/change.c
+++ b/server/change.c
@@ -172,6 +172,7 @@ static const struct object_ops dir_ops =
@@ -110,7 +110,7 @@ index 8b8983a157f..72dbc5b821f 100644
completion_destroy /* destroy */
};
diff --git a/server/console.c b/server/console.c
index 5b69e769a61..832f0d4af34 100644
index cb6410b7741..89909c3569a 100644
--- a/server/console.c
+++ b/server/console.c
@@ -87,6 +87,7 @@ static const struct object_ops console_input_ops =
@@ -138,7 +138,7 @@ index 5b69e769a61..832f0d4af34 100644
screen_buffer_destroy /* destroy */
};
diff --git a/server/debugger.c b/server/debugger.c
index 37f19347bb6..4d4f0035c2f 100644
index 79b7e527f33..d658fc0625f 100644
--- a/server/debugger.c
+++ b/server/debugger.c
@@ -84,6 +84,7 @@ static const struct object_ops debug_event_ops =
@@ -158,7 +158,7 @@ index 37f19347bb6..4d4f0035c2f 100644
debug_ctx_destroy /* destroy */
};
diff --git a/server/device.c b/server/device.c
index 192395dcc7f..a7844749040 100644
index 90a4b6e8eec..4bb29d897e5 100644
--- a/server/device.c
+++ b/server/device.c
@@ -75,6 +75,7 @@ static const struct object_ops irp_call_ops =
@@ -234,7 +234,7 @@ index cfc0f6afc0d..608fafb94d7 100644
no_destroy /* destroy */
};
diff --git a/server/fd.c b/server/fd.c
index 9322e2c1c15..721432a4ff3 100644
index fa2b18a46b1..9dbf481259c 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -217,6 +217,7 @@ static const struct object_ops fd_ops =
@@ -270,7 +270,7 @@ index 9322e2c1c15..721432a4ff3 100644
no_destroy /* destroy */
};
diff --git a/server/file.c b/server/file.c
index 39c8150cb28..418732c743d 100644
index 6c036acb641..a7d8f95d972 100644
--- a/server/file.c
+++ b/server/file.c
@@ -95,6 +95,7 @@ static const struct object_ops file_ops =
@@ -339,7 +339,7 @@ index 3a0e4b4d1d3..dc653b8c42e 100644
hook_table_destroy /* destroy */
};
diff --git a/server/mailslot.c b/server/mailslot.c
index d7affa514bf..671c969b9a5 100644
index 9fafedbd204..531c9928e2f 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -89,6 +89,7 @@ static const struct object_ops mailslot_ops =
@@ -350,7 +350,7 @@ index d7affa514bf..671c969b9a5 100644
fd_close_handle, /* close_handle */
mailslot_destroy /* destroy */
};
@@ -143,6 +144,7 @@ static const struct object_ops mail_writer_ops =
@@ -144,6 +145,7 @@ static const struct object_ops mail_writer_ops =
no_link_name, /* link_name */
NULL, /* unlink_name */
no_open_file, /* open_file */
@@ -358,7 +358,7 @@ index d7affa514bf..671c969b9a5 100644
fd_close_handle, /* close_handle */
mail_writer_destroy /* destroy */
};
@@ -198,6 +200,7 @@ static const struct object_ops mailslot_device_ops =
@@ -200,6 +202,7 @@ static const struct object_ops mailslot_device_ops =
directory_link_name, /* link_name */
default_unlink_name, /* unlink_name */
mailslot_device_open_file, /* open_file */
@@ -367,7 +367,7 @@ index d7affa514bf..671c969b9a5 100644
mailslot_device_destroy /* destroy */
};
diff --git a/server/mapping.c b/server/mapping.c
index b2d334c7889..f255ce18556 100644
index f9f50edfa60..095cb03d7fb 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -77,6 +77,7 @@ static const struct object_ops ranges_ops =
@@ -378,7 +378,15 @@ index b2d334c7889..f255ce18556 100644
no_close_handle, /* close_handle */
ranges_destroy /* destroy */
};
@@ -131,6 +132,7 @@ static const struct object_ops mapping_ops =
@@ -111,6 +112,7 @@ static const struct object_ops shared_map_ops =
no_link_name, /* link_name */
NULL, /* unlink_name */
no_open_file, /* open_file */
+ no_alloc_handle, /* alloc_handle */
no_close_handle, /* close_handle */
shared_map_destroy /* destroy */
};
@@ -167,6 +169,7 @@ static const struct object_ops mapping_ops =
directory_link_name, /* link_name */
default_unlink_name, /* unlink_name */
no_open_file, /* open_file */
@@ -399,10 +407,10 @@ index d1887e4bc45..a2a0a24bdc3 100644
mutex_destroy /* destroy */
};
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 9cd424fe368..629814a6703 100644
index 6f5b3b0bbd5..d7f8a583c92 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -148,6 +148,7 @@ static const struct object_ops named_pipe_ops =
@@ -136,6 +136,7 @@ static const struct object_ops named_pipe_ops =
named_pipe_link_name, /* link_name */
default_unlink_name, /* unlink_name */
named_pipe_open_file, /* open_file */
@@ -410,7 +418,7 @@ index 9cd424fe368..629814a6703 100644
no_close_handle, /* close_handle */
named_pipe_destroy /* destroy */
};
@@ -184,6 +185,7 @@ static const struct object_ops pipe_server_ops =
@@ -173,6 +174,7 @@ static const struct object_ops pipe_server_ops =
no_link_name, /* link_name */
NULL, /* unlink_name */
no_open_file, /* open_file */
@@ -418,7 +426,7 @@ index 9cd424fe368..629814a6703 100644
fd_close_handle, /* close_handle */
pipe_server_destroy /* destroy */
};
@@ -227,6 +229,7 @@ static const struct object_ops pipe_client_ops =
@@ -216,6 +218,7 @@ static const struct object_ops pipe_client_ops =
no_link_name, /* link_name */
NULL, /* unlink_name */
no_open_file, /* open_file */
@@ -426,7 +434,7 @@ index 9cd424fe368..629814a6703 100644
fd_close_handle, /* close_handle */
pipe_client_destroy /* destroy */
};
@@ -273,6 +276,7 @@ static const struct object_ops named_pipe_device_ops =
@@ -263,6 +266,7 @@ static const struct object_ops named_pipe_device_ops =
directory_link_name, /* link_name */
default_unlink_name, /* unlink_name */
named_pipe_device_open_file, /* open_file */
@@ -558,7 +566,7 @@ index 08ff1536cee..15e73925131 100644
no_destroy /* destroy */
};
diff --git a/server/serial.c b/server/serial.c
index 85dd104bc68..9842f9ef42c 100644
index f7aaebbaf69..94b29c4eef2 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -102,6 +102,7 @@ static const struct object_ops serial_ops =
@@ -594,7 +602,7 @@ index e35588a136c..6e788abde1c 100644
snapshot_destroy /* destroy */
};
diff --git a/server/sock.c b/server/sock.c
index cc9bbccad7e..e903770e4bb 100644
index 1e126182190..0707515be00 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -155,6 +155,7 @@ static const struct object_ops sock_ops =
@@ -605,7 +613,7 @@ index cc9bbccad7e..e903770e4bb 100644
fd_close_handle, /* close_handle */
sock_destroy /* destroy */
};
@@ -978,6 +979,7 @@ static const struct object_ops ifchange_ops =
@@ -979,6 +980,7 @@ static const struct object_ops ifchange_ops =
no_link_name, /* link_name */
NULL, /* unlink_name */
no_open_file, /* open_file */