Rebase against c91a531957acaf4cf7cdb985b5ba47a273f5f9b2.

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

@@ -1,4 +1,4 @@
-From 0d08cd53ad5041a9ed09bfcc558719306c022f4c Mon Sep 17 00:00:00 2001
+From 438997175c34fbc9e1e146bdecb36f104d80e98e 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    |  1 +
+ server/mapping.c    |  2 ++
  server/mutex.c      |  1 +
  server/named_pipe.c |  4 ++++
  server/object.c     |  4 ++++
@@ -39,10 +39,10 @@ Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
  server/timer.c      |  1 +
  server/token.c      |  1 +
  server/winstation.c |  2 ++
- 34 files changed, 73 insertions(+), 3 deletions(-)
+ 34 files changed, 74 insertions(+), 3 deletions(-)
 
 diff --git a/server/async.c b/server/async.c
-index 020580728de..cfda29ec8c0 100644
+index cf7a434ebca..9c7b9943975 100644
 --- a/server/async.c
 +++ b/server/async.c
 @@ -78,6 +78,7 @@ static const struct object_ops async_ops =
@@ -53,7 +53,7 @@ index 020580728de..cfda29ec8c0 100644
      no_close_handle,           /* close_handle */
      async_destroy              /* destroy */
  };
-@@ -452,6 +453,7 @@ static const struct object_ops iosb_ops =
+@@ -459,6 +460,7 @@ static const struct object_ops iosb_ops =
      no_link_name,             /* link_name */
      NULL,                     /* unlink_name */
      no_open_file,             /* open_file */
@@ -138,7 +138,7 @@ index 5b69e769a61..832f0d4af34 100644
      screen_buffer_destroy             /* destroy */
  };
 diff --git a/server/debugger.c b/server/debugger.c
-index 2eb794aaf25..a2c07ba95c3 100644
+index 37f19347bb6..4d4f0035c2f 100644
 --- a/server/debugger.c
 +++ b/server/debugger.c
 @@ -84,6 +84,7 @@ static const struct object_ops debug_event_ops =
@@ -270,7 +270,7 @@ index 9322e2c1c15..721432a4ff3 100644
      no_destroy                  /* destroy */
  };
 diff --git a/server/file.c b/server/file.c
-index 3809012dc8f..e2826c73725 100644
+index 39c8150cb28..418732c743d 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -95,6 +95,7 @@ static const struct object_ops file_ops =
@@ -367,10 +367,18 @@ index d7affa514bf..671c969b9a5 100644
      mailslot_device_destroy         /* destroy */
  };
 diff --git a/server/mapping.c b/server/mapping.c
-index f03ea7a6f63..a465bf5f2dd 100644
+index b2d334c7889..f255ce18556 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
-@@ -94,6 +94,7 @@ static const struct object_ops mapping_ops =
+@@ -77,6 +77,7 @@ static const struct object_ops ranges_ops =
+     no_link_name,              /* link_name */
+     NULL,                      /* unlink_name */
+     no_open_file,              /* open_file */
++    no_alloc_handle,           /* alloc_handle */
+     no_close_handle,           /* close_handle */
+     ranges_destroy             /* destroy */
+ };
+@@ -131,6 +132,7 @@ static const struct object_ops mapping_ops =
      directory_link_name,         /* link_name */
      default_unlink_name,         /* unlink_name */
      no_open_file,                /* open_file */
@@ -391,7 +399,7 @@ index d1887e4bc45..a2a0a24bdc3 100644
      mutex_destroy              /* destroy */
  };
 diff --git a/server/named_pipe.c b/server/named_pipe.c
-index 80363cb971a..abacf0a4b76 100644
+index 9cd424fe368..629814a6703 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
 @@ -148,6 +148,7 @@ static const struct object_ops named_pipe_ops =
@@ -466,7 +474,7 @@ index b5c50e1cee8..72ad8528c5a 100644
  extern void no_destroy( struct object *obj );
  #ifdef DEBUG_OBJECTS
 diff --git a/server/process.c b/server/process.c
-index 2327a2664b3..22406d109f8 100644
+index f8739d00b64..c269b50c313 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -84,6 +84,7 @@ static const struct object_ops process_ops =
@@ -618,7 +626,7 @@ index 9199bc559d7..ecc0e4300c4 100644
      symlink_destroy               /* destroy */
  };
 diff --git a/server/thread.c b/server/thread.c
-index 70f5f28739e..5b0b6377e85 100644
+index 2c864a607d0..a641509d601 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -120,6 +120,7 @@ static const struct object_ops thread_apc_ops =
@@ -682,5 +690,5 @@ index a0be0586523..5f96be8e13f 100644
      desktop_destroy               /* destroy */
  };
 -- 
-2.13.1
+2.14.1