Rebase against d3cb5c24a5ebbc7dcfb181a56f0f55cf3d1a1c30.

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

@@ -1,4 +1,4 @@
-From b46fe984533047235c49722a6e0d48960a487cdb Mon Sep 17 00:00:00 2001
+From 20f08d1d7a69425048bd824722097e5c04e1d1de 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)
@@ -86,16 +86,16 @@ index 7c0ca99..753bf66 100644
      dir_destroy               /* destroy */
  };
 diff --git a/server/clipboard.c b/server/clipboard.c
-index 7b92706..fa3aa51 100644
+index 8396ec3..73028e4 100644
 --- a/server/clipboard.c
 +++ b/server/clipboard.c
-@@ -68,6 +68,7 @@ static const struct object_ops clipboard_ops =
+@@ -72,6 +72,7 @@ static const struct object_ops clipboard_ops =
      no_link_name,                 /* link_name */
      NULL,                         /* unlink_name */
      no_open_file,                 /* open_file */
 +    no_alloc_handle,              /* alloc_handle */
      no_close_handle,              /* close_handle */
-     no_destroy                    /* destroy */
+     clipboard_destroy             /* destroy */
  };
 diff --git a/server/completion.c b/server/completion.c
 index 8b8983a..72dbc5b 100644
@@ -110,7 +110,7 @@ index 8b8983a..72dbc5b 100644
      completion_destroy         /* destroy */
  };
 diff --git a/server/console.c b/server/console.c
-index 4d275f0..5575c9d 100644
+index 32d3137..4fcb1e6 100644
 --- a/server/console.c
 +++ b/server/console.c
 @@ -87,6 +87,7 @@ static const struct object_ops console_input_ops =
@@ -129,7 +129,7 @@ index 4d275f0..5575c9d 100644
      no_close_handle,                  /* close_handle */
      console_input_events_destroy      /* destroy */
  };
-@@ -175,6 +177,7 @@ static const struct object_ops screen_buffer_ops =
+@@ -177,6 +179,7 @@ static const struct object_ops screen_buffer_ops =
      no_link_name,                     /* link_name */
      NULL,                             /* unlink_name */
      no_open_file,                     /* open_file */
@@ -158,7 +158,7 @@ index 2eb794a..a2c07ba 100644
      debug_ctx_destroy              /* destroy */
  };
 diff --git a/server/device.c b/server/device.c
-index 22ade88..b949548 100644
+index e4f55c7..071b71f 100644
 --- a/server/device.c
 +++ b/server/device.c
 @@ -81,6 +81,7 @@ static const struct object_ops irp_call_ops =
@@ -194,7 +194,7 @@ index 22ade88..b949548 100644
      device_file_destroy               /* destroy */
  };
 diff --git a/server/directory.c b/server/directory.c
-index 96555bb..26600f8 100644
+index 7ffaedc..d903ff2 100644
 --- a/server/directory.c
 +++ b/server/directory.c
 @@ -67,6 +67,7 @@ static const struct object_ops object_type_ops =
@@ -339,7 +339,7 @@ index 3a0e4b4..dc653b8 100644
      hook_table_destroy            /* destroy */
  };
 diff --git a/server/mailslot.c b/server/mailslot.c
-index ea28825..a745a54 100644
+index 13e6703..021ef99 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 ea28825..a745a54 100644
      mailslot_device_destroy         /* destroy */
  };
 diff --git a/server/mapping.c b/server/mapping.c
-index fe30450..a612766 100644
+index f82907b..7c7759b 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
 @@ -94,6 +94,7 @@ static const struct object_ops mapping_ops =
@@ -379,7 +379,7 @@ index fe30450..a612766 100644
      mapping_destroy              /* destroy */
  };
 diff --git a/server/mutex.c b/server/mutex.c
-index 3693095..e96bfd0 100644
+index d1887e4..a2a0a24 100644
 --- a/server/mutex.c
 +++ b/server/mutex.c
 @@ -71,6 +71,7 @@ static const struct object_ops mutex_ops =
@@ -391,7 +391,7 @@ index 3693095..e96bfd0 100644
      mutex_destroy              /* destroy */
  };
 diff --git a/server/named_pipe.c b/server/named_pipe.c
-index 0661c12..eb0696e 100644
+index cfee4d5..cffa254 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
 @@ -135,6 +135,7 @@ static const struct object_ops named_pipe_ops =
@@ -442,7 +442,7 @@ index ad22ec1..f5d7d9f 100644
  {
      return 1;  /* ok to close */
 diff --git a/server/object.h b/server/object.h
-index 687f730..f82fb67 100644
+index b5c50e1..72ad852 100644
 --- a/server/object.h
 +++ b/server/object.h
 @@ -89,8 +89,10 @@ struct object_ops
@@ -606,7 +606,7 @@ index dc10d2a..a11964f 100644
      ifchange_destroy         /* destroy */
  };
 diff --git a/server/symlink.c b/server/symlink.c
-index e176267..034ecdd 100644
+index 9199bc5..ecc0e43 100644
 --- a/server/symlink.c
 +++ b/server/symlink.c
 @@ -70,6 +70,7 @@ static const struct object_ops symlink_ops =
@@ -682,5 +682,5 @@ index a0be058..5f96be8 100644
      desktop_destroy               /* destroy */
  };
 -- 
-2.8.0
+2.9.0