Rebase against 853351698842c92db62bddedd2f531b7c5e745d1

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

@@ -1,7 +1,7 @@
-From 18631bae9b0750d47ce23a4164e49b7ae1f3fe31 Mon Sep 17 00:00:00 2001
+From 231b7707b5a3f79c63ac3542ba58bf39fc04e972 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)
+Subject: [PATCH] server: Introduce a new alloc_handle object callback. (v2)
 
 Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
 ---
@@ -42,10 +42,10 @@ Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
  34 files changed, 75 insertions(+), 3 deletions(-)
 
 diff --git a/server/async.c b/server/async.c
-index adbadc5..7f7b255 100644
+index f2674bb..4828bcb 100644
 --- a/server/async.c
 +++ b/server/async.c
-@@ -78,6 +78,7 @@ static const struct object_ops async_ops =
+@@ -79,6 +79,7 @@ static const struct object_ops async_ops =
      no_link_name,              /* link_name */
      NULL,                      /* unlink_name */
      no_open_file,              /* open_file */
@@ -53,7 +53,7 @@ index adbadc5..7f7b255 100644
      no_close_handle,           /* close_handle */
      async_destroy              /* destroy */
  };
-@@ -461,6 +462,7 @@ static const struct object_ops iosb_ops =
+@@ -467,6 +468,7 @@ static const struct object_ops iosb_ops =
      no_link_name,             /* link_name */
      NULL,                     /* unlink_name */
      no_open_file,             /* open_file */
@@ -74,7 +74,7 @@ index 3ff7540..7bebf13 100644
      atom_table_destroy            /* destroy */
  };
 diff --git a/server/change.c b/server/change.c
-index 1f2f7c5..441c510 100644
+index d00a885..a4ed5df 100644
 --- a/server/change.c
 +++ b/server/change.c
 @@ -172,6 +172,7 @@ static const struct object_ops dir_ops =
@@ -86,7 +86,7 @@ index 1f2f7c5..441c510 100644
      dir_destroy               /* destroy */
  };
 diff --git a/server/clipboard.c b/server/clipboard.c
-index 160eb46..70b7e32 100644
+index 162725b..0898150 100644
 --- a/server/clipboard.c
 +++ b/server/clipboard.c
 @@ -87,6 +87,7 @@ static const struct object_ops clipboard_ops =
@@ -158,7 +158,7 @@ index 79b7e52..d658fc0 100644
      debug_ctx_destroy              /* destroy */
  };
 diff --git a/server/device.c b/server/device.c
-index dcc2946..47fe000 100644
+index ac7d88f..55e6c7d 100644
 --- a/server/device.c
 +++ b/server/device.c
 @@ -75,6 +75,7 @@ static const struct object_ops irp_call_ops =
@@ -194,7 +194,7 @@ index dcc2946..47fe000 100644
      device_file_destroy               /* destroy */
  };
 diff --git a/server/directory.c b/server/directory.c
-index 7ffaedc..d903ff2 100644
+index 6aa3a55..699eb70f 100644
 --- a/server/directory.c
 +++ b/server/directory.c
 @@ -67,6 +67,7 @@ static const struct object_ops object_type_ops =
@@ -234,10 +234,10 @@ index cfc0f6a..608fafb 100644
      no_destroy                   /* destroy */
  };
 diff --git a/server/fd.c b/server/fd.c
-index 6118f52..9dc953f 100644
+index e2d6143..52f70a3 100644
 --- a/server/fd.c
 +++ b/server/fd.c
-@@ -217,6 +217,7 @@ static const struct object_ops fd_ops =
+@@ -218,6 +218,7 @@ static const struct object_ops fd_ops =
      no_link_name,             /* link_name */
      NULL,                     /* unlink_name */
      no_open_file,             /* open_file */
@@ -245,7 +245,7 @@ index 6118f52..9dc953f 100644
      no_close_handle,          /* close_handle */
      fd_destroy                /* destroy */
  };
-@@ -256,6 +257,7 @@ static const struct object_ops device_ops =
+@@ -257,6 +258,7 @@ static const struct object_ops device_ops =
      no_link_name,             /* link_name */
      NULL,                     /* unlink_name */
      no_open_file,             /* open_file */
@@ -253,7 +253,7 @@ index 6118f52..9dc953f 100644
      no_close_handle,          /* close_handle */
      device_destroy            /* destroy */
  };
-@@ -294,6 +296,7 @@ static const struct object_ops inode_ops =
+@@ -295,6 +297,7 @@ static const struct object_ops inode_ops =
      no_link_name,             /* link_name */
      NULL,                     /* unlink_name */
      no_open_file,             /* open_file */
@@ -261,7 +261,7 @@ index 6118f52..9dc953f 100644
      no_close_handle,          /* close_handle */
      inode_destroy             /* destroy */
  };
-@@ -334,6 +337,7 @@ static const struct object_ops file_lock_ops =
+@@ -335,6 +338,7 @@ static const struct object_ops file_lock_ops =
      no_link_name,               /* link_name */
      NULL,                       /* unlink_name */
      no_open_file,               /* open_file */
@@ -270,7 +270,7 @@ index 6118f52..9dc953f 100644
      no_destroy                  /* destroy */
  };
 diff --git a/server/file.c b/server/file.c
-index 446621a..cbfc257 100644
+index 6840223..5eb5e65 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 3a0e4b4..dc653b8 100644
      hook_table_destroy            /* destroy */
  };
 diff --git a/server/mailslot.c b/server/mailslot.c
-index f4c7007..bc169dd 100644
+index 95308c4..bc9089b 100644
 --- a/server/mailslot.c
 +++ b/server/mailslot.c
 @@ -89,6 +89,7 @@ static const struct object_ops mailslot_ops =
@@ -367,7 +367,7 @@ index f4c7007..bc169dd 100644
      mailslot_device_destroy         /* destroy */
  };
 diff --git a/server/mapping.c b/server/mapping.c
-index 1ed8c9d..8bfaa8e 100644
+index 1be6680..fb58376 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
 @@ -77,6 +77,7 @@ static const struct object_ops ranges_ops =
@@ -407,10 +407,10 @@ index d1887e4..a2a0a24 100644
      mutex_destroy              /* destroy */
  };
 diff --git a/server/named_pipe.c b/server/named_pipe.c
-index ba6f507..215c838 100644
+index 19a5426..bc4d28f 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
-@@ -128,6 +128,7 @@ static const struct object_ops named_pipe_ops =
+@@ -134,6 +134,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 */
@@ -418,7 +418,7 @@ index ba6f507..215c838 100644
      no_close_handle,              /* close_handle */
      named_pipe_destroy            /* destroy */
  };
-@@ -169,6 +170,7 @@ static const struct object_ops pipe_server_ops =
+@@ -176,6 +177,7 @@ static const struct object_ops pipe_server_ops =
      no_link_name,                 /* link_name */
      NULL,                         /* unlink_name */
      no_open_file,                 /* open_file */
@@ -426,7 +426,7 @@ index ba6f507..215c838 100644
      fd_close_handle,              /* close_handle */
      pipe_server_destroy           /* destroy */
  };
-@@ -210,6 +212,7 @@ static const struct object_ops pipe_client_ops =
+@@ -217,6 +219,7 @@ static const struct object_ops pipe_client_ops =
      no_link_name,                 /* link_name */
      NULL,                         /* unlink_name */
      no_open_file,                 /* open_file */
@@ -434,14 +434,14 @@ index ba6f507..215c838 100644
      fd_close_handle,              /* close_handle */
      pipe_end_destroy              /* destroy */
  };
-@@ -258,6 +261,7 @@ static const struct object_ops named_pipe_device_ops =
-     directory_link_name,              /* link_name */
+@@ -263,6 +266,7 @@ static const struct object_ops named_pipe_device_ops =
      default_unlink_name,              /* unlink_name */
      named_pipe_device_open_file,      /* open_file */
-+    no_alloc_handle,                  /* alloc_handle */
-     fd_close_handle,                  /* close_handle */
+     no_close_handle,                  /* close_handle */
++    fd_close_handle,                  /* close_handle */
      named_pipe_device_destroy         /* destroy */
  };
+ 
 diff --git a/server/object.c b/server/object.c
 index 4455718..14cd38e 100644
 --- a/server/object.c
@@ -482,10 +482,10 @@ index b5c50e1..72ad852 100644
  extern void no_destroy( struct object *obj );
  #ifdef DEBUG_OBJECTS
 diff --git a/server/process.c b/server/process.c
-index f8739d0..c269b50 100644
+index 5938fb4..c0a0113 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -84,6 +84,7 @@ static const struct object_ops process_ops =
+@@ -85,6 +85,7 @@ static const struct object_ops process_ops =
      no_link_name,                /* link_name */
      NULL,                        /* unlink_name */
      no_open_file,                /* open_file */
@@ -510,7 +510,7 @@ index f8739d0..c269b50 100644
      job_destroy                    /* destroy */
  };
 diff --git a/server/queue.c b/server/queue.c
-index c479b38..382f14f 100644
+index f5d3b19..f51a8f0 100644
 --- a/server/queue.c
 +++ b/server/queue.c
 @@ -181,6 +181,7 @@ static const struct object_ops msg_queue_ops =
@@ -530,7 +530,7 @@ index c479b38..382f14f 100644
      thread_input_destroy          /* destroy */
  };
 diff --git a/server/registry.c b/server/registry.c
-index 8ad97d4..50b6a0b 100644
+index 9e6815d..21a6be5 100644
 --- a/server/registry.c
 +++ b/server/registry.c
 @@ -170,6 +170,7 @@ static const struct object_ops key_ops =
@@ -542,7 +542,7 @@ index 8ad97d4..50b6a0b 100644
      key_destroy              /* destroy */
  };
 diff --git a/server/request.c b/server/request.c
-index 6120bc5..83e6089 100644
+index 86f293f..f75f21e 100644
 --- a/server/request.c
 +++ b/server/request.c
 @@ -107,6 +107,7 @@ static const struct object_ops master_socket_ops =
@@ -566,7 +566,7 @@ index 08ff153..15e7392 100644
      no_destroy                     /* destroy */
  };
 diff --git a/server/serial.c b/server/serial.c
-index bb976a1..089f47c 100644
+index f0adf92..1722149 100644
 --- a/server/serial.c
 +++ b/server/serial.c
 @@ -102,6 +102,7 @@ static const struct object_ops serial_ops =
@@ -590,7 +590,7 @@ index 74416fa..4b2b8c4 100644
      handler_destroy           /* destroy */
  };
 diff --git a/server/snapshot.c b/server/snapshot.c
-index e35588a..6e788ab 100644
+index a32207c..47316d0 100644
 --- a/server/snapshot.c
 +++ b/server/snapshot.c
 @@ -71,6 +71,7 @@ static const struct object_ops snapshot_ops =
@@ -602,7 +602,7 @@ index e35588a..6e788ab 100644
      snapshot_destroy              /* destroy */
  };
 diff --git a/server/sock.c b/server/sock.c
-index 84f54f6..43456f0 100644
+index a8e6e28..cd9a8fa 100644
 --- a/server/sock.c
 +++ b/server/sock.c
 @@ -155,6 +155,7 @@ static const struct object_ops sock_ops =
@@ -634,7 +634,7 @@ index 9199bc5..ecc0e43 100644
      symlink_destroy               /* destroy */
  };
 diff --git a/server/thread.c b/server/thread.c
-index 2cf5054..30ef3d2 100644
+index 79e7e1a..b52649e 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -120,6 +120,7 @@ static const struct object_ops thread_apc_ops =
@@ -666,10 +666,10 @@ index 3a786fb..95df28f 100644
      timer_destroy              /* destroy */
  };
 diff --git a/server/token.c b/server/token.c
-index 0810a61..e51dccc 100644
+index e7b64b2..5df4e35 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -155,6 +155,7 @@ static const struct object_ops token_ops =
+@@ -161,6 +161,7 @@ static const struct object_ops token_ops =
      no_link_name,              /* link_name */
      NULL,                      /* unlink_name */
      no_open_file,              /* open_file */
@@ -698,5 +698,5 @@ index a0be058..5f96be8 100644
      desktop_destroy               /* destroy */
  };
 -- 
-2.7.4
+1.9.1