Release 3.5

README.md

@@ -22,7 +22,7 @@ parallel. If this is the case for your distribution, you will have to type
 `/opt/wine-staging/bin/wine` instead of just `wine`. The same also applies for
 other wine-specific programs like `winecfg`. To learn more about how to use
 Wine Staging, please take a look at the
-[usage instructions](https://wiki.winehq.org/Wine-Staging_Usage).
+[usage instructions](https://github.com/wine-compholio/wine-staging/wiki/Usage).
 
 Building
 --------
@@ -73,7 +73,7 @@ Before you proceed with the compilation, please make sure that you installed all
 additional build dependencies required for the Wine Staging features you are
 interested in (check output of `./configure`). More information about building
 Wine Staging, optional build dependencies, and hints for packagers are collected
-in our [Wiki](https://wiki.winehq.org/Wine-Staging).
+in our [Wiki](https://github.com/wine-compholio/wine-staging/wiki/Packaging).
 
 Contributing
 ------------

patches/Compiler_Warnings/0001-windowscodecs-Avoid-implicit-cast-of-interface-point.patch

@@ -1,61 +0,0 @@
-From fc5c0462f64e0976d596bd726da4d7f0e4857384 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 19 Sep 2018 09:03:19 +1000
-Subject: [PATCH] windowscodecs: Avoid implicit cast of interface pointer.
-
----
- dlls/windowscodecs/info.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c
-index 0a86266..8c81574 100644
---- a/dlls/windowscodecs/info.c
-+++ b/dlls/windowscodecs/info.c
-@@ -222,7 +222,7 @@ typedef struct {
- 
- static inline BitmapDecoderInfo *impl_from_IWICBitmapDecoderInfo(IWICBitmapDecoderInfo *iface)
- {
--    return CONTAINING_RECORD(iface, BitmapDecoderInfo, base.IWICComponentInfo_iface);
-+    return CONTAINING_RECORD((IWICComponentInfo*)iface, BitmapDecoderInfo, base.IWICComponentInfo_iface);
- }
- 
- static HRESULT WINAPI BitmapDecoderInfo_QueryInterface(IWICBitmapDecoderInfo *iface, REFIID iid,
-@@ -713,7 +713,7 @@ typedef struct {
- 
- static inline BitmapEncoderInfo *impl_from_IWICBitmapEncoderInfo(IWICBitmapEncoderInfo *iface)
- {
--    return CONTAINING_RECORD(iface, BitmapEncoderInfo, base.IWICComponentInfo_iface);
-+    return CONTAINING_RECORD((IWICComponentInfo*)iface, BitmapEncoderInfo, base.IWICComponentInfo_iface);
- }
- 
- static HRESULT WINAPI BitmapEncoderInfo_QueryInterface(IWICBitmapEncoderInfo *iface, REFIID iid,
-@@ -1005,7 +1005,7 @@ typedef struct {
- 
- static inline FormatConverterInfo *impl_from_IWICFormatConverterInfo(IWICFormatConverterInfo *iface)
- {
--    return CONTAINING_RECORD(iface, FormatConverterInfo, base.IWICComponentInfo_iface);
-+    return CONTAINING_RECORD((IWICComponentInfo*)iface, FormatConverterInfo, base.IWICComponentInfo_iface);
- }
- 
- static HRESULT WINAPI FormatConverterInfo_QueryInterface(IWICFormatConverterInfo *iface, REFIID iid,
-@@ -1219,7 +1219,7 @@ typedef struct {
- 
- static inline PixelFormatInfo *impl_from_IWICPixelFormatInfo2(IWICPixelFormatInfo2 *iface)
- {
--    return CONTAINING_RECORD(iface, PixelFormatInfo, base.IWICComponentInfo_iface);
-+    return CONTAINING_RECORD((IWICComponentInfo*)iface, PixelFormatInfo, base.IWICComponentInfo_iface);
- }
- 
- static HRESULT WINAPI PixelFormatInfo_QueryInterface(IWICPixelFormatInfo2 *iface, REFIID iid,
-@@ -1531,7 +1531,7 @@ static struct metadata_container *get_metadata_container(MetadataReaderInfo *inf
- 
- static inline MetadataReaderInfo *impl_from_IWICMetadataReaderInfo(IWICMetadataReaderInfo *iface)
- {
--    return CONTAINING_RECORD(iface, MetadataReaderInfo, base.IWICComponentInfo_iface);
-+    return CONTAINING_RECORD((IWICComponentInfo*)iface, MetadataReaderInfo, base.IWICComponentInfo_iface);
- }
- 
- static HRESULT WINAPI MetadataReaderInfo_QueryInterface(IWICMetadataReaderInfo *iface,
--- 
-1.9.1
-

patches/Compiler_Warnings/0009-ws2_32-tests-Work-around-an-incorrect-detection-in-G.patch

@@ -0,0 +1,24 @@
+From 560a25c662f7b56d2b895759be1ea65c64d0f5af Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 Jun 2017 12:57:17 +0200
+Subject: ws2_32/tests: Work around an incorrect detection in GCC 7.
+
+---
+ dlls/ws2_32/tests/sock.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
+index 677a750ec6b..65c82e36524 100644
+--- a/dlls/ws2_32/tests/sock.c
++++ b/dlls/ws2_32/tests/sock.c
+@@ -3601,6 +3601,7 @@ static DWORD WINAPI SelectReadThread(void *param)
+     struct sockaddr_in addr;
+     struct timeval select_timeout;
+ 
++    memset(&readfds, 0, sizeof(readfds));
+     FD_ZERO(&readfds);
+     FD_SET(par->s, &readfds);
+     select_timeout.tv_sec=5;
+-- 
+2.13.0
+

patches/Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch

@@ -0,0 +1,67 @@
+From cd34de81164087b3593d0ec9416e2f157a5df40d Mon Sep 17 00:00:00 2001
+From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
+Date: Fri, 8 Aug 2014 19:33:14 -0600
+Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
+
+---
+ dlls/d3d9/tests/visual.c   | 2 +-
+ dlls/netapi32/netapi32.c   | 2 +-
+ dlls/wined3d/glsl_shader.c | 2 +-
+ tools/makedep.c            | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
+index c8a6a1fa5a8..0261d3708e6 100644
+--- a/dlls/d3d9/tests/visual.c
++++ b/dlls/d3d9/tests/visual.c
+@@ -12304,7 +12304,7 @@ static void yuv_layout_test(void)
+     IDirect3D9 *d3d;
+     D3DCOLOR color;
+     DWORD ref_color;
+-    BYTE *buf, *chroma_buf, *u_buf, *v_buf;
++    BYTE *buf, *chroma_buf, *u_buf = NULL, *v_buf = NULL;
+     UINT width = 20, height = 16;
+     IDirect3DDevice9 *device;
+     ULONG refcount;
+diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
+index 278d4528b01..1c5f110b828 100644
+--- a/dlls/netapi32/netapi32.c
++++ b/dlls/netapi32/netapi32.c
+@@ -780,7 +780,7 @@ static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigne
+ static NET_API_STATUS share_add( LMSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err )
+ {
+     char *server = NULL;
+-    unsigned char *info;
++    unsigned char *info = NULL;
+     NET_API_STATUS status;
+ 
+     if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY;
+diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
+index f96f48d97d1..8fe3318cd78 100644
+--- a/dlls/wined3d/glsl_shader.c
++++ b/dlls/wined3d/glsl_shader.c
+@@ -9721,7 +9721,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
+     GLuint ds_id = 0;
+     GLuint gs_id = 0;
+     GLuint ps_id = 0;
+-    struct list *ps_list, *vs_list;
++    struct list *ps_list = NULL, *vs_list = NULL;
+     WORD attribs_map;
+     struct wined3d_string_buffer *tmp_name;
+ 
+diff --git a/tools/makedep.c b/tools/makedep.c
+index 296356b0a57..5a2873b56f1 100644
+--- a/tools/makedep.c
++++ b/tools/makedep.c
+@@ -1608,7 +1608,7 @@ static const char *get_make_variable( const struct makefile *make, const char *n
+ static char *get_expanded_make_variable( const struct makefile *make, const char *name )
+ {
+     const char *var;
+-    char *p, *end, *expand, *tmp;
++    char *p, *end, *expand, *tmp = NULL;
+ 
+     var = get_make_variable( make, name );
+     if (!var) return NULL;
+-- 
+2.13.1
+

patches/Compiler_Warnings/0019-dsound-Avoid-implicit-cast-of-interface-pointer.patch

@@ -0,0 +1,26 @@
+From de9dbd542143b13741886c3e4b9f96ffcbfaa432 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Wed, 16 Mar 2016 05:46:33 +0100
+Subject: dsound: Avoid implicit cast of interface pointer.
+
+Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
+---
+ dlls/dsound/primary.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
+index 3f8a478..6f280f8 100644
+--- a/dlls/dsound/primary.c
++++ b/dlls/dsound/primary.c
+@@ -626,7 +626,7 @@ out:
+ static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer(IDirectSoundBuffer *iface)
+ {
+     /* IDirectSoundBuffer and IDirectSoundBuffer8 use the same iface. */
+-    return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface);
++    return CONTAINING_RECORD((IDirectSoundBuffer8 *)iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface);
+ }
+ 
+ /* This sets this format for the primary buffer only */
+-- 
+2.7.1
+

patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,34 +1,18 @@
-From 2aeb3a9e57142c3f4ff86cb81b206bdbc146552d Mon Sep 17 00:00:00 2001
+From 79ff79dba6d5c8008c53e4bcf5e38c3a54271091 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:54:26 +0100
-Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
+Subject: d2d1: Avoid implicit cast of interface pointer.
 
 ---
- dlls/d2d1/bitmap.c             | 2 +-
- dlls/d2d1/brush.c              | 8 ++++----
- dlls/d2d1/dc_render_target.c   | 2 +-
- dlls/d2d1/device.c             | 2 +-
- dlls/d2d1/geometry.c           | 6 +++---
- dlls/d2d1/hwnd_render_target.c | 2 +-
- dlls/d2d1/state_block.c        | 2 +-
- 7 files changed, 12 insertions(+), 12 deletions(-)
+ dlls/d2d1/brush.c    | 8 ++++----
+ dlls/d2d1/geometry.c | 6 +++---
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
-index c0aef3c..8a4b517 100644
---- a/dlls/d2d1/bitmap.c
-+++ b/dlls/d2d1/bitmap.c
-@@ -626,5 +626,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
-     if (!iface)
-         return NULL;
-     assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl);
--    return CONTAINING_RECORD(iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
-+    return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
- }
 diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
-index 9c73ae1..a748669 100644
+index 7f4c7bbb763..30d25fec4b4 100644
 --- a/dlls/d2d1/brush.c
 +++ b/dlls/d2d1/brush.c
-@@ -256,7 +256,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
+@@ -251,7 +251,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface)
  {
@@ -37,7 +21,7 @@ index 9c73ae1..a748669 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface,
-@@ -399,7 +399,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
+@@ -394,7 +394,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
  
  static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface)
  {
@@ -46,7 +30,7 @@ index 9c73ae1..a748669 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface,
-@@ -586,7 +586,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
+@@ -580,7 +580,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEA
  
  static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface)
  {
@@ -55,46 +39,20 @@ index 9c73ae1..a748669 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface,
-@@ -818,7 +818,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
+@@ -776,7 +776,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, const D2D1_BRUSH
  
- static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *iface)
+ static inline struct d2d_brush *impl_from_ID2D1BitmapBrush(ID2D1BitmapBrush *iface)
  {
 -    return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface);
 +    return CONTAINING_RECORD((ID2D1Brush *)iface, struct d2d_brush, ID2D1Brush_iface);
  }
  
- static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
-diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
-index b095008..6030826 100644
---- a/dlls/d2d1/dc_render_target.c
-+++ b/dlls/d2d1/dc_render_target.c
-@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
- 
- static inline struct d2d_dc_render_target *impl_from_IUnknown(IUnknown *iface)
- {
--    return CONTAINING_RECORD(iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface);
-+    return CONTAINING_RECORD((ID2D1DCRenderTarget*)iface, struct d2d_dc_render_target, ID2D1DCRenderTarget_iface);
- }
- 
- static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
-diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
-index 45b2258..bf32c23 100644
---- a/dlls/d2d1/device.c
-+++ b/dlls/d2d1/device.c
-@@ -207,7 +207,7 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic
- 
- static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface)
- {
--    return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface);
-+    return CONTAINING_RECORD((ID2D1DeviceContext*)iface, struct d2d_device_context, ID2D1DeviceContext_iface);
- }
- 
- static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out)
+ static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush *iface,
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
-index 421ba2b..f8db51c 100644
+index a9588985642..b8457a9e1ea 100644
 --- a/dlls/d2d1/geometry.c
 +++ b/dlls/d2d1/geometry.c
-@@ -2987,7 +2987,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
+@@ -3024,7 +3024,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
  
  static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
  {
@@ -103,7 +61,7 @@ index 421ba2b..f8db51c 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
-@@ -3503,7 +3503,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
+@@ -3540,7 +3540,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
  
  static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
  {
@@ -112,7 +70,7 @@ index 421ba2b..f8db51c 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
-@@ -3838,7 +3838,7 @@ fail:
+@@ -3876,7 +3876,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
  {
@@ -121,30 +79,6 @@ index 421ba2b..f8db51c 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
-diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
-index d0b9695..429561e 100644
---- a/dlls/d2d1/hwnd_render_target.c
-+++ b/dlls/d2d1/hwnd_render_target.c
-@@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
- 
- static inline struct d2d_hwnd_render_target *impl_from_IUnknown(IUnknown *iface)
- {
--    return CONTAINING_RECORD(iface, struct d2d_hwnd_render_target, ID2D1HwndRenderTarget_iface);
-+    return CONTAINING_RECORD((ID2D1HwndRenderTarget*)iface, struct d2d_hwnd_render_target, ID2D1HwndRenderTarget_iface);
- }
- 
- static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown)
-diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
-index b15384e..4e7e34b 100644
---- a/dlls/d2d1/state_block.c
-+++ b/dlls/d2d1/state_block.c
-@@ -190,5 +190,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
-     if (!iface)
-         return NULL;
-     assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl);
--    return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
-+    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
- }
 -- 
-1.9.1
+2.14.1
 

patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch

@@ -1,8 +1,7 @@
-From 42dbdf9479e2e09734fa183b854d5ddfe987f203 Mon Sep 17 00:00:00 2001
+From 59f0bb786dc3ec4e77cb43ea4410743ecd317bbf Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
-Subject: [PATCH] include: Check element type in CONTAINING_RECORD and
- similar macros.
+Subject: include: Check element type in CONTAINING_RECORD and similar macros.
 
 ---
  include/wine/list.h   | 10 ++++++++--
@@ -31,10 +30,10 @@ index b4d681f..287ad39 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index dc50b5e..8130deb 100644
+index 13452d9..554d239 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
-@@ -23,8 +23,14 @@
+@@ -22,8 +22,14 @@
  #ifndef __WINE_WINE_RBTREE_H
  #define __WINE_WINE_RBTREE_H
  
@@ -52,10 +51,10 @@ index dc50b5e..8130deb 100644
  struct wine_rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 7f822c4..ccfe73b 100644
+index 559a719..4a711f4 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -756,8 +756,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+@@ -753,8 +753,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
  
  #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))
  
@@ -70,8 +69,8 @@ index 7f822c4..ccfe73b 100644
 +   ((type *)((PCHAR)(address) - offsetof(type, field)))
 +#endif
  
- #ifdef __WINESRC__
- # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+ /* Types */
+ 
 -- 
-1.9.1
+2.7.1
 

patches/Coverity/0001-sfnt2fon-Don-t-leak-output-name-if-specified-multipl.patch

@@ -0,0 +1,29 @@
+From 6f561502fe458837f3a5b27f477b1a52f33d88ba Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
+Date: Mon, 16 Nov 2015 22:36:40 +0100
+Subject: sfnt2fon: Don't leak output name if specified multiple times
+ (Coverity)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: André Hentschel <nerv@dawncrow.de>
+---
+ tools/sfnt2fon/sfnt2fon.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c
+index 7612bc2..f825ae4 100644
+--- a/tools/sfnt2fon/sfnt2fon.c
++++ b/tools/sfnt2fon/sfnt2fon.c
+@@ -654,6 +654,7 @@ static char **parse_options( int argc, char **argv )
+             option_defchar = atoi( optarg );
+             break;
+         case 'o':
++            free( option_output );
+             option_output = strdup( optarg );
+             break;
+         case 'q':
+-- 
+2.6.2
+

patches/Coverity/0002-winedump-Free-debug-string-in-case-it-was-not-freed-.patch

@@ -0,0 +1,30 @@
+From 792e99d66b40481fb81042d51a12c861d8b33b51 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= <nerv@dawncrow.de>
+Date: Mon, 16 Nov 2015 22:36:38 +0100
+Subject: winedump: Free debug string in case it was not freed in for-loop
+ (Coverity)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: André Hentschel <nerv@dawncrow.de>
+---
+ tools/winedump/msc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c
+index 5890b29..3f1fd98 100644
+--- a/tools/winedump/msc.c
++++ b/tools/winedump/msc.c
+@@ -1378,6 +1378,8 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size)
+             dump_data((const void*)sym, sym->generic.len + 2, "  ");
+         }
+     }
++
++    free(curr_func);
+     return TRUE;
+ }
+ 
+-- 
+2.6.2
+

patches/Makefile

@@ -0,0 +1,21 @@
+#
+# This file is deprecated and will be deleted in the future.
+# Please use patchinstall.sh instead, to apply the Wine Staging patches.
+#
+
+CURDIR ?= ${.CURDIR}
+
+.PHONY: install
+install:
+	@echo "WARNING: Using this Makefile is deprecated!" >&2
+	"$(CURDIR)/patchinstall.sh" DESTDIR="$(DESTDIR)" --all
+
+.PHONY: install-git
+install-git:
+	@echo "WARNING: Using this Makefile is deprecated!" >&2
+	"$(CURDIR)/patchinstall.sh" DESTDIR="$(DESTDIR)" --all --backend=git-am
+
+.PHONY: series
+series:
+	@echo "ERROR: Using this Makefile is deprecated!" >&2
+	@false

patches/advapi32-BuildSecurityDescriptor/0001-advapi32-Implement-BuildSecurityDescriptorW.patch

@@ -0,0 +1,268 @@
+From 95fd708dbdd9f8d61fdd8f1571c44e98c54b8988 Mon Sep 17 00:00:00 2001
+From: Andrew Wesie <awesie@gmail.com>
+Date: Tue, 2 May 2017 00:59:49 -0500
+Subject: [PATCH] advapi32: Implement BuildSecurityDescriptorW.
+
+---
+ dlls/advapi32/security.c | 218 +++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 164 insertions(+), 54 deletions(-)
+
+diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
+index 6f4fb44..3737827 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -48,6 +48,7 @@
+ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
+ 
+ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes);
++static DWORD trustee_to_sid(DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee);
+ 
+ typedef struct _ACEFLAG
+ {
+@@ -1255,16 +1256,122 @@ DWORD WINAPI BuildSecurityDescriptorW(
+     IN ULONG cCountOfAccessEntries,
+     IN PEXPLICIT_ACCESSW pListOfAccessEntries,
+     IN ULONG cCountOfAuditEntries,
+-    IN PEXPLICIT_ACCESSW pListofAuditEntries,
++    IN PEXPLICIT_ACCESSW pListOfAuditEntries,
+     IN PSECURITY_DESCRIPTOR pOldSD,
+     IN OUT PULONG lpdwBufferLength,
+     OUT PSECURITY_DESCRIPTOR* pNewSD)
+ { 
+-    FIXME("(%p,%p,%d,%p,%d,%p,%p,%p,%p) stub!\n",pOwner,pGroup,
+-          cCountOfAccessEntries,pListOfAccessEntries,cCountOfAuditEntries,
+-          pListofAuditEntries,pOldSD,lpdwBufferLength,pNewSD);
++    SECURITY_DESCRIPTOR desc;
++    NTSTATUS status;
++    DWORD ret = ERROR_SUCCESS;
++
++    TRACE("(%p,%p,%d,%p,%d,%p,%p,%p,%p)\n", pOwner, pGroup,
++          cCountOfAccessEntries, pListOfAccessEntries, cCountOfAuditEntries,
++          pListOfAuditEntries, pOldSD, lpdwBufferLength, pNewSD);
+  
+-    return ERROR_CALL_NOT_IMPLEMENTED;
++    if (pOldSD)
++    {
++        SECURITY_DESCRIPTOR_CONTROL control;
++        DWORD desc_size, dacl_size = 0, sacl_size = 0, owner_size = 0, group_size = 0;
++        PACL dacl = NULL, sacl = NULL;
++        PSID owner = NULL, group = NULL;
++        DWORD revision;
++
++        if ((status = RtlGetControlSecurityDescriptor( pOldSD, &control, &revision )) != STATUS_SUCCESS)
++            return RtlNtStatusToDosError( status );
++        if (!(control & SE_SELF_RELATIVE))
++            return ERROR_INVALID_SECURITY_DESCR;
++
++        desc_size = sizeof(desc);
++        status = RtlSelfRelativeToAbsoluteSD( pOldSD, &desc, &desc_size, dacl, &dacl_size, sacl, &sacl_size,
++                                              owner, &owner_size, group, &group_size );
++        if (status == STATUS_BUFFER_TOO_SMALL)
++        {
++            if (dacl_size)
++                dacl = LocalAlloc( LMEM_FIXED, dacl_size );
++            if (sacl_size)
++                sacl = LocalAlloc( LMEM_FIXED, sacl_size );
++            if (owner_size)
++                owner = LocalAlloc( LMEM_FIXED, owner_size );
++            if (group_size)
++                group = LocalAlloc( LMEM_FIXED, group_size );
++
++            desc_size = sizeof(desc);
++            status = RtlSelfRelativeToAbsoluteSD( pOldSD, &desc, &desc_size, dacl, &dacl_size, sacl, &sacl_size,
++                                                  owner, &owner_size, group, &group_size );
++        }
++        if (status != STATUS_SUCCESS)
++        {
++            LocalFree( dacl );
++            LocalFree( sacl );
++            LocalFree( owner );
++            LocalFree( group );
++            return RtlNtStatusToDosError( status );
++        }
++    }
++    else
++    {
++        if ((status = RtlCreateSecurityDescriptor( &desc, SECURITY_DESCRIPTOR_REVISION )) != STATUS_SUCCESS)
++            return RtlNtStatusToDosError( status );
++    }
++
++    if (pOwner)
++    {
++        LocalFree( desc.Owner );
++        desc.Owner = LocalAlloc( LMEM_FIXED, sizeof(MAX_SID) );
++        if ((ret = trustee_to_sid( sizeof(MAX_SID), desc.Owner, pOwner )))
++            goto done;
++    }
++
++    if (pGroup)
++    {
++        LocalFree( desc.Group );
++        desc.Group = LocalAlloc( LMEM_FIXED, sizeof(MAX_SID) );
++        if ((ret = trustee_to_sid( sizeof(MAX_SID), desc.Group, pGroup )))
++            goto done;
++    }
++
++    if (pListOfAccessEntries)
++    {
++        PACL new_dacl;
++
++        if ((ret = SetEntriesInAclW( cCountOfAccessEntries, pListOfAccessEntries, desc.Dacl, &new_dacl )))
++            goto done;
++
++        LocalFree( desc.Dacl );
++        desc.Dacl = new_dacl;
++        desc.Control |= SE_DACL_PRESENT;
++    }
++
++    if (pListOfAuditEntries)
++    {
++        PACL new_sacl;
++
++        if ((ret = SetEntriesInAclW( cCountOfAuditEntries, pListOfAuditEntries, desc.Sacl, &new_sacl )))
++            goto done;
++
++        LocalFree( desc.Sacl );
++        desc.Sacl = new_sacl;
++        desc.Control |= SE_SACL_PRESENT;
++    }
++
++    *lpdwBufferLength = RtlLengthSecurityDescriptor( &desc );
++    *pNewSD = LocalAlloc( LMEM_FIXED, *lpdwBufferLength );
++
++    if ((status = RtlMakeSelfRelativeSD( &desc, *pNewSD, lpdwBufferLength )) != STATUS_SUCCESS)
++    {
++        ret = RtlNtStatusToDosError( status );
++        LocalFree( *pNewSD );
++        *pNewSD = NULL;
++    }
++
++done:
++    /* free absolute descriptor */
++    LocalFree( desc.Owner );
++    LocalFree( desc.Group );
++    LocalFree( desc.Sacl );
++    LocalFree( desc.Dacl );
++    return ret;
+ } 
+ 
+ /******************************************************************************
+@@ -3754,6 +3861,56 @@ static void free_trustee_name(TRUSTEE_FORM form, WCHAR *trustee_nameW)
+     }
+ }
+ 
++static DWORD trustee_to_sid( DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee )
++{
++    if (pTrustee->MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE)
++    {
++        WARN("bad multiple trustee operation %d\n", pTrustee->MultipleTrusteeOperation);
++        return ERROR_INVALID_PARAMETER;
++    }
++
++    switch (pTrustee->TrusteeForm)
++    {
++    case TRUSTEE_IS_SID:
++        if (!CopySid(nDestinationSidLength, pDestinationSid, pTrustee->ptstrName))
++        {
++            WARN("bad sid %p\n", pTrustee->ptstrName);
++            return ERROR_INVALID_PARAMETER;
++        }
++        break;
++    case TRUSTEE_IS_NAME:
++    {
++        DWORD sid_size = nDestinationSidLength;
++        DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1;
++        SID_NAME_USE use;
++        if (!strcmpW( pTrustee->ptstrName, CURRENT_USER ))
++        {
++            if (!lookup_user_account_name( pDestinationSid, &sid_size, NULL, &domain_size, &use ))
++            {
++                return GetLastError();
++            }
++        }
++        else if (!LookupAccountNameW(NULL, pTrustee->ptstrName, pDestinationSid, &sid_size, NULL, &domain_size, &use))
++        {
++            WARN("bad user name %s\n", debugstr_w(pTrustee->ptstrName));
++            return ERROR_INVALID_PARAMETER;
++        }
++        break;
++    }
++    case TRUSTEE_IS_OBJECTS_AND_SID:
++        FIXME("TRUSTEE_IS_OBJECTS_AND_SID unimplemented\n");
++        break;
++    case TRUSTEE_IS_OBJECTS_AND_NAME:
++        FIXME("TRUSTEE_IS_OBJECTS_AND_NAME unimplemented\n");
++        break;
++    default:
++        WARN("bad trustee form %d\n", pTrustee->TrusteeForm);
++        return ERROR_INVALID_PARAMETER;
++    }
++
++    return ERROR_SUCCESS;
++}
++
+ /******************************************************************************
+  * SetEntriesInAclA [ADVAPI32.@]
+  */
+@@ -3849,56 +4006,9 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries,
+               pEntries[i].Trustee.TrusteeForm, pEntries[i].Trustee.TrusteeType,
+               pEntries[i].Trustee.ptstrName);
+ 
+-        if (pEntries[i].Trustee.MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE)
+-        {
+-            WARN("bad multiple trustee operation %d for trustee %d\n", pEntries[i].Trustee.MultipleTrusteeOperation, i);
+-            ret = ERROR_INVALID_PARAMETER;
+-            goto exit;
+-        }
+-
+-        switch (pEntries[i].Trustee.TrusteeForm)
+-        {
+-        case TRUSTEE_IS_SID:
+-            if (!CopySid(FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]),
+-                         ppsid[i], pEntries[i].Trustee.ptstrName))
+-            {
+-                WARN("bad sid %p for trustee %d\n", pEntries[i].Trustee.ptstrName, i);
+-                ret = ERROR_INVALID_PARAMETER;
+-                goto exit;
+-            }
+-            break;
+-        case TRUSTEE_IS_NAME:
+-        {
+-            DWORD sid_size = FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]);
+-            DWORD domain_size = MAX_COMPUTERNAME_LENGTH + 1;
+-            SID_NAME_USE use;
+-            if (!strcmpW( pEntries[i].Trustee.ptstrName, CURRENT_USER ))
+-            {
+-                if (!lookup_user_account_name( ppsid[i], &sid_size, NULL, &domain_size, &use ))
+-                {
+-                    ret = GetLastError();
+-                    goto exit;
+-                }
+-            }
+-            else if (!LookupAccountNameW(NULL, pEntries[i].Trustee.ptstrName, ppsid[i], &sid_size, NULL, &domain_size, &use))
+-            {
+-                WARN("bad user name %s for trustee %d\n", debugstr_w(pEntries[i].Trustee.ptstrName), i);
+-                ret = ERROR_INVALID_PARAMETER;
+-                goto exit;
+-            }
+-            break;
+-        }
+-        case TRUSTEE_IS_OBJECTS_AND_SID:
+-            FIXME("TRUSTEE_IS_OBJECTS_AND_SID unimplemented\n");
+-            break;
+-        case TRUSTEE_IS_OBJECTS_AND_NAME:
+-            FIXME("TRUSTEE_IS_OBJECTS_AND_NAME unimplemented\n");
+-            break;
+-        default:
+-            WARN("bad trustee form %d for trustee %d\n", pEntries[i].Trustee.TrusteeForm, i);
+-            ret = ERROR_INVALID_PARAMETER;
++        ret = trustee_to_sid( FIELD_OFFSET(SID, SubAuthority[SID_MAX_SUB_AUTHORITIES]), ppsid[i], &pEntries[i].Trustee);
++        if (ret)
+             goto exit;
+-        }
+ 
+         /* Note: we overestimate the ACL size here as a tradeoff between
+          * instructions (simplicity) and memory */
+-- 
+1.9.1
+

patches/advapi32-BuildSecurityDescriptor/0002-advapi32-tests-Add-basic-tests-for-BuildSecurityDesc.patch

@@ -0,0 +1,69 @@
+From 09d62cfc4fa999eacc89af2ad414810e22c910a9 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 5 May 2017 00:18:50 +0200
+Subject: advapi32/tests: Add basic tests for BuildSecurityDescriptor.
+
+---
+ dlls/advapi32/tests/security.c | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+
+diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
+index ca5edffae5..db5a0f934c 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -7217,6 +7217,44 @@ static void test_GetExplicitEntriesFromAclW(void)
+     HeapFree(GetProcessHeap(), 0, old_acl);
+ }
+ 
++static void test_BuildSecurityDescriptorW(void)
++{
++    SECURITY_DESCRIPTOR old_sd, *new_sd, *rel_sd;
++    ULONG new_sd_size;
++    DWORD buf_size;
++    char buf[1024];
++    BOOL success;
++    DWORD ret;
++
++    InitializeSecurityDescriptor(&old_sd, SECURITY_DESCRIPTOR_REVISION);
++
++    buf_size = sizeof(buf);
++    rel_sd = (SECURITY_DESCRIPTOR *)buf;
++    success = MakeSelfRelativeSD(&old_sd, rel_sd, &buf_size);
++    ok(success, "MakeSelfRelativeSD failed with %u\n", GetLastError());
++
++    new_sd = NULL;
++    new_sd_size = 0;
++    ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, NULL, &new_sd_size, (void **)&new_sd);
++    ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret);
++    ok(new_sd != NULL, "expected new_sd != NULL\n");
++    ok(new_sd_size == sizeof(old_sd), "expected new_sd_size == sizeof(old_sd), got %u\n", new_sd_size);
++    LocalFree(new_sd);
++
++    new_sd = (void *)0xdeadbeef;
++    ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, &old_sd, &new_sd_size, (void **)&new_sd);
++    ok(ret == ERROR_INVALID_SECURITY_DESCR, "expected ERROR_INVALID_SECURITY_DESCR, got %u\n", ret);
++    ok(new_sd == (void *)0xdeadbeef, "expected new_sd == 0xdeadbeef, got %p\n", new_sd);
++
++    new_sd = NULL;
++    new_sd_size = 0;
++    ret = BuildSecurityDescriptorW(NULL, NULL, 0, NULL, 0, NULL, rel_sd, &new_sd_size, (void **)&new_sd);
++    ok(ret == ERROR_SUCCESS, "BuildSecurityDescriptor failed with %u\n", ret);
++    ok(new_sd != NULL, "expected new_sd != NULL\n");
++    ok(new_sd_size == sizeof(old_sd), "expected new_sd_size == sizeof(old_sd), got %u\n", new_sd_size);
++    LocalFree(new_sd);
++}
++
+ START_TEST(security)
+ {
+     init();
+@@ -7271,6 +7309,7 @@ START_TEST(security)
+     test_maximum_allowed();
+     test_token_label();
+     test_GetExplicitEntriesFromAclW();
++    test_BuildSecurityDescriptorW();
+ 
+     /* Must be the last test, modifies process token */
+     test_token_security_descriptor();
+-- 
+2.13.1
+

patches/advapi32-BuildSecurityDescriptor/definition

@@ -0,0 +1 @@
+Fixes: [37594] Initial implementation of advapi32.BuildSecurityDescriptorW

patches/advapi32-CreateRestrictedToken/0001-ntdll-Implement-NtFilterToken.patch

@@ -1,4 +1,4 @@
-From 1eb8acd819f9eee8fdf154d0ef43881008265916 Mon Sep 17 00:00:00 2001
+From 3f314cc8251f62f592013abe7b1c3b977de0699a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Aug 2017 02:33:14 +0200
 Subject: ntdll: Implement NtFilterToken.
@@ -15,10 +15,10 @@ Subject: ntdll: Implement NtFilterToken.
  8 files changed, 162 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index c3f5df3..59a08de 100644
+index 93554e929be..5822dec9b15 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
-@@ -119,6 +119,65 @@ NTSTATUS WINAPI NtDuplicateToken(
+@@ -136,6 +136,65 @@ NTSTATUS WINAPI NtDuplicateToken(
  }
  
  /******************************************************************************
@@ -85,10 +85,10 @@ index c3f5df3..59a08de 100644
   *  ZwOpenProcessToken		[NTDLL.@]
   */
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index c260b0d..3c5e69c 100644
+index 4f7ee496437..275fda57970 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -176,7 +176,7 @@
+@@ -179,7 +179,7 @@
  # @ stub NtEnumerateSystemEnvironmentValuesEx
  @ stdcall NtEnumerateValueKey(long long long ptr long ptr)
  @ stub NtExtendSection
@@ -98,10 +98,10 @@ index c260b0d..3c5e69c 100644
  @ stdcall NtFlushBuffersFile(long ptr)
  @ stdcall NtFlushInstructionCache(long ptr long)
 diff --git a/include/winnt.h b/include/winnt.h
-index 16d96d8..4e238f9 100644
+index f91f81eb559..891c9b6d4bb 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -3904,6 +3904,11 @@ typedef enum _TOKEN_INFORMATION_CLASS {
+@@ -3844,6 +3844,11 @@ typedef enum _TOKEN_INFORMATION_CLASS {
  					TOKEN_ADJUST_SESSIONID | \
  					TOKEN_ADJUST_DEFAULT )
  
@@ -114,10 +114,10 @@ index 16d96d8..4e238f9 100644
  #define _SECURITY_DEFINED
  
 diff --git a/include/winternl.h b/include/winternl.h
-index c84e6d7..288f93e 100644
+index 140669b0105..899e8324d67 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
-@@ -2303,6 +2303,7 @@ NTSYSAPI NTSTATUS  WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES
+@@ -2348,6 +2348,7 @@ NTSYSAPI NTSTATUS  WINAPI NtDuplicateToken(HANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES
  NTSYSAPI NTSTATUS  WINAPI NtEnumerateKey(HANDLE,ULONG,KEY_INFORMATION_CLASS,void *,DWORD,DWORD *);
  NTSYSAPI NTSTATUS  WINAPI NtEnumerateValueKey(HANDLE,ULONG,KEY_VALUE_INFORMATION_CLASS,PVOID,ULONG,PULONG);
  NTSYSAPI NTSTATUS  WINAPI NtExtendSection(HANDLE,PLARGE_INTEGER);
@@ -126,10 +126,10 @@ index c84e6d7..288f93e 100644
  NTSYSAPI NTSTATUS  WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*);
  NTSYSAPI NTSTATUS  WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,SIZE_T);
 diff --git a/server/process.c b/server/process.c
-index f8739d0..71d9d6d 100644
+index cbe726afe81..f0f60edcd3f 100644
 --- a/server/process.c
 +++ b/server/process.c
-@@ -566,7 +566,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit
+@@ -571,7 +571,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit
                                         : alloc_handle_table( process, 0 );
          /* Note: for security reasons, starting a new process does not attempt
           * to use the current impersonation token for the new process */
@@ -139,10 +139,10 @@ index f8739d0..71d9d6d 100644
      }
      if (!process->handles || !process->token) goto error;
 diff --git a/server/protocol.def b/server/protocol.def
-index 35824ae..6ee6d28 100644
+index fc6e343af52..b3dce66eb9c 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3356,6 +3356,16 @@ enum caret_state
+@@ -3391,6 +3391,16 @@ enum caret_state
      obj_handle_t  new_handle; /* duplicated handle */
  @END
  
@@ -160,10 +160,10 @@ index 35824ae..6ee6d28 100644
      obj_handle_t    handle; /* handle to the token */
      unsigned int    desired_access; /* desired access to the object */
 diff --git a/server/security.h b/server/security.h
-index 873bbc6..bc4a8f6 100644
+index 606dbb2ab2c..6c337143c3d 100644
 --- a/server/security.h
 +++ b/server/security.h
-@@ -55,7 +55,9 @@ extern const PSID security_high_label_sid;
+@@ -56,7 +56,9 @@ extern const PSID security_high_label_sid;
  extern struct token *token_create_admin(void);
  extern int token_assign_label( struct token *token, PSID label );
  extern struct token *token_duplicate( struct token *src_token, unsigned primary,
@@ -175,10 +175,10 @@ index 873bbc6..bc4a8f6 100644
                                     const LUID_AND_ATTRIBUTES *reqprivs,
                                     unsigned int count, LUID_AND_ATTRIBUTES *usedprivs);
 diff --git a/server/token.c b/server/token.c
-index 0810a61..2f6a467 100644
+index 74db66e1e24..acd7a4dedb5 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -276,6 +276,19 @@ static int acl_is_valid( const ACL *acl, data_size_t size )
+@@ -299,6 +299,19 @@ static int acl_is_valid( const ACL *acl, data_size_t size )
      return TRUE;
  }
  
@@ -198,7 +198,7 @@ index 0810a61..2f6a467 100644
  /* checks whether all members of a security descriptor fit inside the size
   * of memory specified */
  int sd_is_valid( const struct security_descriptor *sd, data_size_t size )
-@@ -619,8 +632,36 @@ static struct token *create_token( unsigned primary, const SID *user,
+@@ -639,8 +652,36 @@ static struct token *create_token( unsigned primary, const SID *user,
      return token;
  }
  
@@ -236,7 +236,7 @@ index 0810a61..2f6a467 100644
  {
      const luid_t *modified_id =
          primary || (impersonation_level == src_token->impersonation_level) ?
-@@ -656,6 +697,12 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
+@@ -676,6 +717,12 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
              return NULL;
          }
          memcpy( newgroup, group, size );
@@ -248,8 +248,8 @@ index 0810a61..2f6a467 100644
 +        }
          list_add_tail( &token->groups, &newgroup->entry );
          if (src_token->primary_group == &group->sid)
-         {
-@@ -667,11 +714,14 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
+             token->primary_group = &newgroup->sid;
+@@ -684,11 +731,14 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
  
      /* copy privileges */
      LIST_FOR_EACH_ENTRY( privilege, &src_token->privileges, struct privilege, entry )
@@ -264,7 +264,7 @@ index 0810a61..2f6a467 100644
  
      if (sd) default_set_sd( &token->obj, sd, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION |
                              DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION );
-@@ -1304,7 +1354,7 @@ DECL_HANDLER(duplicate_token)
+@@ -1322,7 +1372,7 @@ DECL_HANDLER(duplicate_token)
                                                       TOKEN_DUPLICATE,
                                                       &token_ops )))
      {
@@ -273,7 +273,7 @@ index 0810a61..2f6a467 100644
          if (token)
          {
              reply->new_handle = alloc_handle_no_access_check( current->process, token, req->access, objattr->attributes );
-@@ -1314,6 +1364,36 @@ DECL_HANDLER(duplicate_token)
+@@ -1332,6 +1382,36 @@ DECL_HANDLER(duplicate_token)
      }
  }
  
@@ -311,5 +311,5 @@ index 0810a61..2f6a467 100644
  DECL_HANDLER(check_token_privileges)
  {
 -- 
-2.7.4
+2.13.1
 

patches/advapi32-LsaLookupSids/definition

@@ -1 +1,2 @@
 Depends: server-Misc_ACL
+Depends: server-CreateProcess_ACLs

patches/advapi32-Performance_Counters/0001-advapi32-tests-Add-more-tests-for-performance-counte.patch

@@ -0,0 +1,267 @@
+From e950724c38a4f81efb97bb9595dc59c5fb925da0 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Wed, 12 Apr 2017 12:33:31 +0800
+Subject: advapi32/tests: Add more tests for performance counters.
+
+---
+ dlls/advapi32/tests/registry.c | 196 ++++++++++++++++++++++++++++++++++++++++-
+ include/winreg.h               |   2 +
+ 2 files changed, 194 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
+index 846f1c49628..d850f6a3aa7 100644
+--- a/dlls/advapi32/tests/registry.c
++++ b/dlls/advapi32/tests/registry.c
+@@ -3520,35 +3520,73 @@ static void test_RegNotifyChangeKeyValue(void)
+     CloseHandle(event);
+ }
+ 
++static const char *dbgstr_longlong(ULONGLONG ll)
++{
++    static char buf[16][64];
++    static int idx;
++
++    idx &= 0x0f;
++
++    if (sizeof(ll) > sizeof(unsigned long) && ll >> 32)
++        sprintf(buf[idx], "0x%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll);
++    else
++        sprintf(buf[idx], "0x%08lx", (unsigned long)ll);
++
++    return buf[idx++];
++}
++
++#define cmp_li(a, b, c) cmp_li_real(a, b, c, __LINE__)
++static void cmp_li_real(LARGE_INTEGER *l1, LARGE_INTEGER *l2, LONGLONG slack, int line)
++{
++    LONGLONG diff = l2->QuadPart - l1->QuadPart;
++    if (diff < 0) diff = -diff;
++    ok_(__FILE__, line)(diff <= slack, "values don't match: %s/%s\n",
++        dbgstr_longlong(l1->QuadPart), dbgstr_longlong(l2->QuadPart));
++}
++
+ static void test_RegQueryValueExPerformanceData(void)
+ {
+-    DWORD cbData, len;
++    static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 };
++    static const WCHAR dummyW[5] = { 'd','u','m','m','y' };
++    static const char * const names[] = { NULL, "", "Global", "2" "invalid counter name" };
++    DWORD cbData, len, i, type;
+     BYTE *value;
+     DWORD dwret;
+     LONG limit = 6;
+     PERF_DATA_BLOCK *pdb;
++    HKEY hkey;
++    BYTE buf[256 + sizeof(PERF_DATA_BLOCK)];
+ 
+     /* Test with data == NULL */
+     dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData );
+     todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
+ 
++    dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData );
++    todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
++
+     /* Test ERROR_MORE_DATA, start with small buffer */
+     len = 10;
+     value = HeapAlloc(GetProcessHeap(), 0, len);
+     cbData = len;
+-    dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData );
++    type = 0xdeadbeef;
++    dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData );
+     todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
++todo_wine
++    ok(type == REG_BINARY, "got %u\n", type);
+     while( dwret == ERROR_MORE_DATA && limit)
+     {
+         len = len * 10;
+         value = HeapReAlloc( GetProcessHeap(), 0, value, len );
+         cbData = len;
+-        dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData );
++        type = 0xdeadbeef;
++        dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData );
+         limit--;
+     }
+     ok(limit > 0, "too many times ERROR_MORE_DATA returned\n");
+ 
+     todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret);
++todo_wine
++    ok(type == REG_BINARY, "got %u\n", type);
+ 
+     /* Check returned data */
+     if (dwret == ERROR_SUCCESS)
+@@ -3565,8 +3603,158 @@ static void test_RegQueryValueExPerformanceData(void)
+     }
+ 
+     HeapFree(GetProcessHeap(), 0, value);
+-}
+ 
++    for (i = 0; i < sizeof(names)/sizeof(names[0]); i++)
++    {
++        cbData = 0xdeadbeef;
++        dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData);
++todo_wine
++        ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
++        ok(cbData == 0, "got %u\n", cbData);
++
++        cbData = 0;
++        dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData);
++todo_wine
++        ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
++        ok(cbData == 0, "got %u\n", cbData);
++
++        cbData = 0xdeadbeef;
++        dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData);
++todo_wine
++        ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
++        ok(cbData == 0, "got %u\n", cbData);
++
++        cbData = 0;
++        dwret = RegQueryValueExA(HKEY_PERFORMANCE_TEXT, names[i], NULL, NULL, NULL, &cbData);
++todo_wine
++        ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
++        ok(cbData == 0, "got %u\n", cbData);
++
++        cbData = 0xdeadbeef;
++        dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData);
++todo_wine
++        ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
++        ok(cbData == 0, "got %u\n", cbData);
++
++        cbData = 0;
++        dwret = RegQueryValueExA(HKEY_PERFORMANCE_NLSTEXT, names[i], NULL, NULL, NULL, &cbData);
++todo_wine
++        ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
++        ok(cbData == 0, "got %u\n", cbData);
++    }
++
++    memset(buf, 0x77, sizeof(buf));
++    type = 0xdeadbeef;
++    cbData = sizeof(buf);
++    dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData);
++todo_wine
++    ok(dwret == ERROR_SUCCESS, "got %u\n", dwret);
++todo_wine
++    ok(type == REG_BINARY, "got %u\n", type);
++    if (dwret == ERROR_SUCCESS)
++    {
++        SYSTEMTIME st;
++        WCHAR sysname[MAX_COMPUTERNAME_LENGTH + 1];
++        DWORD sysname_len;
++        LARGE_INTEGER counter, freq, ftime;
++
++        GetSystemTime(&st);
++        GetSystemTimeAsFileTime((FILETIME *)&ftime);
++        QueryPerformanceCounter(&counter);
++        QueryPerformanceFrequency(&freq);
++
++        sysname_len = MAX_COMPUTERNAME_LENGTH + 1;
++        GetComputerNameW(sysname, &sysname_len);
++
++        pdb = (PERF_DATA_BLOCK *)buf;
++        ok(pdb->Signature[0] == 'P', "got '%c'\n", pdb->Signature[0]);
++        ok(pdb->Signature[1] == 'E', "got '%c'\n", pdb->Signature[1]);
++        ok(pdb->Signature[2] == 'R', "got '%c'\n", pdb->Signature[2]);
++        ok(pdb->Signature[3] == 'F', "got '%c'\n", pdb->Signature[3]);
++
++        ok(pdb->LittleEndian == 1, "got %u\n", pdb->LittleEndian);
++        ok(pdb->Version == 1, "got %u\n", pdb->Version);
++        ok(pdb->Revision == 1, "got %u\n", pdb->Revision);
++        len = (sizeof(*pdb) + pdb->SystemNameLength + 7) & ~7;
++        ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len);
++        ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength);
++        ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes);
++        ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject);
++        ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear);
++        ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth);
++        ok(pdb->SystemTime.wDayOfWeek == st.wDayOfWeek, "got %u\n", pdb->SystemTime.wDayOfWeek);
++        ok(pdb->SystemTime.wDay == st.wDay, "got %u\n", pdb->SystemTime.wDay);
++        if (U(pdb->PerfTime).LowPart != 0x77777777) /* TestBot is broken */
++            cmp_li(&pdb->PerfTime, &counter, freq.QuadPart);
++        if (U(pdb->PerfFreq).LowPart != 0x77777777) /* TestBot is broken */
++            cmp_li(&pdb->PerfFreq, &freq, 0);
++        cmp_li(&pdb->PerfTime100nSec, &ftime, 200000); /* TestBot needs huge slack value */
++        ok(pdb->SystemNameLength == (sysname_len + 1) * sizeof(WCHAR), "expected %u, got %u\n",
++           (sysname_len + 1) * sizeof(WCHAR), pdb->SystemNameLength);
++        ok(pdb->SystemNameOffset == sizeof(*pdb), "got %u\n", pdb->SystemNameOffset);
++        ok(!lstrcmpW(sysname, (LPCWSTR)(pdb + 1)), "%s != %s\n",
++           wine_dbgstr_w(sysname), wine_dbgstr_w((LPCWSTR)(pdb + 1)));
++
++        len = pdb->TotalByteLength - (sizeof(*pdb) + pdb->SystemNameLength);
++        if (len)
++        {
++            BYTE remainder[8], *p;
++
++            memset(remainder, 0x77, sizeof(remainder));
++            p = buf + sizeof(*pdb) + pdb->SystemNameLength;
++            ok(!memcmp(p, remainder, len), "remainder: %02x,%02x...\n", p[0], p[1]);
++        }
++    }
++
++    dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, NULL, &hkey);
++todo_wine
++    ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++
++    dwret = RegOpenKeyA(HKEY_PERFORMANCE_DATA, "Global", &hkey);
++todo_wine
++    ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++
++    dwret = RegOpenKeyExA(HKEY_PERFORMANCE_DATA, "Global", 0, KEY_READ, &hkey);
++todo_wine
++    ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++
++    dwret = RegQueryValueA(HKEY_PERFORMANCE_DATA, "Global", NULL, (LONG *)&cbData);
++todo_wine
++    ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++
++    dwret = RegSetValueA(HKEY_PERFORMANCE_DATA, "Global", REG_SZ, "dummy", 4);
++todo_wine
++    ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++
++    dwret = RegSetValueExA(HKEY_PERFORMANCE_DATA, "Global", 0, REG_SZ, (const BYTE *)"dummy", 40);
++todo_wine
++    ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++
++    cbData = sizeof(buf);
++    dwret = RegEnumKeyA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, cbData);
++todo_wine
++    ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++
++    cbData = sizeof(buf);
++    dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, (LPSTR)buf, &cbData, NULL, NULL, NULL, NULL);
++todo_wine
++    ok(dwret == ERROR_MORE_DATA, "got %u\n", dwret);
++todo_wine
++    ok(cbData == sizeof(buf), "got %u\n", cbData);
++
++    dwret = RegEnumValueA(HKEY_PERFORMANCE_DATA, 0, NULL, &cbData, NULL, NULL, NULL, NULL);
++    ok(dwret == ERROR_INVALID_PARAMETER, "got %u\n", dwret);
++
++    if (pRegSetKeyValueW)
++    {
++        dwret = pRegSetKeyValueW(HKEY_PERFORMANCE_DATA, NULL, globalW, REG_SZ, dummyW, sizeof(dummyW));
++todo_wine
++        ok(dwret == ERROR_INVALID_HANDLE, "got %u\n", dwret);
++    }
++
++    dwret = RegCloseKey(HKEY_PERFORMANCE_DATA);
++    ok(dwret == ERROR_SUCCESS, "got %u\n", dwret);
++}
+ 
+ START_TEST(registry)
+ {
+diff --git a/include/winreg.h b/include/winreg.h
+index 42b77251ae4..ddbd9293783 100644
+--- a/include/winreg.h
++++ b/include/winreg.h
+@@ -32,6 +32,8 @@ extern "C" {
+ #define HKEY_PERFORMANCE_DATA   ((HKEY)(LONG_PTR)(LONG)0x80000004)
+ #define HKEY_CURRENT_CONFIG     ((HKEY)(LONG_PTR)(LONG)0x80000005)
+ #define HKEY_DYN_DATA           ((HKEY)(LONG_PTR)(LONG)0x80000006)
++#define HKEY_PERFORMANCE_TEXT   ((HKEY)(LONG_PTR)(LONG)0x80000050)
++#define HKEY_PERFORMANCE_NLSTEXT ((HKEY)(LONG_PTR)(LONG)0x80000060)
+ 
+ /*
+  *	registry provider structs
+-- 
+2.13.1
+

patches/advapi32-Performance_Counters/0002-include-Add-more-definitions-for-performance-counter.patch

@@ -0,0 +1,139 @@
+From f72de28ee3a7a3cb25165f0aaee0c7e17eb7e6d7 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Wed, 12 Apr 2017 12:48:29 +0800
+Subject: include: Add more definitions for performance counters.
+
+---
+ include/winperf.h | 113 ++++++++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 97 insertions(+), 16 deletions(-)
+
+diff --git a/include/winperf.h b/include/winperf.h
+index dce1a6d648d..113bfbae40f 100644
+--- a/include/winperf.h
++++ b/include/winperf.h
+@@ -67,25 +67,106 @@
+ #define PERF_DETAIL_EXPERT      300
+ #define PERF_DETAIL_WIZARD      400
+ 
++#include <pshpack8.h>
++
+ /* Performance data structure header
+  * returned in answer to HKEY_PERFORMANCE_DATA request
+  */
+ 
+-typedef struct _PERF_DATA_BLOCK {
+-  WCHAR         Signature[4];
+-  DWORD         LittleEndian;
+-  DWORD         Version;
+-  DWORD         Revision;
+-  DWORD         TotalByteLength;
+-  DWORD         HeaderLength;
+-  DWORD         NumObjectTypes;
+-  DWORD         DefaultObject;
+-  SYSTEMTIME    SystemTime;
+-  LARGE_INTEGER PerfTime;
+-  LARGE_INTEGER PerfFreq;
+-  LARGE_INTEGER PerfTime100nSec;
+-  DWORD         SystemNameLength;
+-  DWORD         SystemNameOffset;
+-} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK, *LPPERF_DATA_BLOCK;
++#define PERF_DATA_VERSION 1
++#define PERF_DATA_REVISION 1
++
++typedef struct _PERF_DATA_BLOCK
++{
++    WCHAR Signature[4];
++    DWORD LittleEndian;
++    DWORD Version;
++    DWORD Revision;
++    DWORD TotalByteLength;
++    DWORD HeaderLength;
++    DWORD NumObjectTypes;
++    DWORD DefaultObject;
++    SYSTEMTIME SystemTime;
++    LARGE_INTEGER PerfTime;
++    LARGE_INTEGER PerfFreq;
++    LARGE_INTEGER PerfTime100nSec;
++    DWORD SystemNameLength;
++    DWORD SystemNameOffset;
++} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK;
++
++#define PERF_NO_INSTANCES -1
++
++typedef struct _PERF_OBJECT_TYPE
++{
++    DWORD TotalByteLength;
++    DWORD DefinitionLength;
++    DWORD HeaderLength;
++    DWORD ObjectNameTitleIndex;
++#ifdef _WIN64
++    DWORD ObjectNameTitle;
++#else
++    LPWSTR ObjectNameTitle;
++#endif
++    DWORD ObjectHelpTitleIndex;
++#ifdef _WIN64
++    DWORD ObjectHelpTitle;
++#else
++    LPWSTR ObjectHelpTitle;
++#endif
++    DWORD DetailLevel;
++    DWORD NumCounters;
++    LONG DefaultCounter;
++    LONG NumInstances;
++    DWORD CodePage;
++    LARGE_INTEGER PerfTime;
++    LARGE_INTEGER PerfFreq;
++} PERF_OBJECT_TYPE, *PPERF_OBJECT_TYPE;
++
++typedef struct _PERF_COUNTER_DEFINITION
++{
++    DWORD ByteLength;
++    DWORD CounterNameTitleIndex;
++#ifdef _WIN64
++    DWORD CounterNameTitle;
++#else
++    LPWSTR CounterNameTitle;
++#endif
++    DWORD CounterHelpTitleIndex;
++#ifdef _WIN64
++    DWORD CounterHelpTitle;
++#else
++    LPWSTR CounterHelpTitle;
++#endif
++    LONG DefaultScale;
++    DWORD DetailLevel;
++    DWORD CounterType;
++    DWORD CounterSize;
++    DWORD CounterOffset;
++} PERF_COUNTER_DEFINITION, *PPERF_COUNTER_DEFINITION;
++
++#define PERF_NO_UNIQUE_ID -1
++
++typedef struct _PERF_INSTANCE_DEFINITION
++{
++    DWORD ByteLength;
++    DWORD ParentObjectTitleIndex;
++    DWORD ParentObjectInstance;
++    LONG UniqueID;
++    DWORD NameOffset;
++    DWORD NameLength;
++} PERF_INSTANCE_DEFINITION, *PPERF_INSTANCE_DEFINITION;
++
++typedef struct _PERF_COUNTER_BLOCK
++{
++    DWORD ByteLength;
++} PERF_COUNTER_BLOCK, *PPERF_COUNTER_BLOCK;
++
++
++#include <poppack.h>
++
++typedef DWORD (APIENTRY PM_OPEN_PROC)(LPWSTR);
++typedef DWORD (APIENTRY PM_COLLECT_PROC)(LPWSTR,LPVOID *,LPDWORD,LPDWORD);
++typedef DWORD (APIENTRY PM_CLOSE_PROC)(void);
++typedef DWORD (APIENTRY PM_QUERY_PROC)(LPDWORD,LPVOID *,LPDWORD,LPDWORD);
+ 
+ #endif /* _WINPERF_ */
+-- 
+2.13.1
+

patches/advapi32-Performance_Counters/0003-advapi32-Add-initial-support-for-querying-performanc.patch

@@ -0,0 +1,380 @@
+From 4fc763b4564cf0dc7e9e27826d785255133c8187 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Wed, 12 Apr 2017 13:59:20 +0800
+Subject: advapi32: Add initial support for querying performance counters data.
+ (v2)
+
+---
+ dlls/advapi32/registry.c       | 244 ++++++++++++++++++++++++++++++++++++++++-
+ dlls/advapi32/tests/registry.c |  17 +--
+ 2 files changed, 249 insertions(+), 12 deletions(-)
+
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index 7a26fffc55e..4dd29d3ba72 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -2,6 +2,7 @@
+  * Registry management
+  *
+  * Copyright (C) 1999 Alexandre Julliard
++ * Copyright (C) 2017 Dmitry Timoshkov
+  *
+  * Based on misc/registry.c code
+  * Copyright (C) 1996 Marcus Meissner
+@@ -36,6 +37,7 @@
+ #include "winreg.h"
+ #include "winerror.h"
+ #include "winternl.h"
++#include "winperf.h"
+ #include "winuser.h"
+ #include "sddl.h"
+ #include "advapi32_misc.h"
+@@ -1482,6 +1484,234 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type,
+     return ret;
+ }
+ 
++struct perf_provider
++{
++    HMODULE perflib;
++    PM_OPEN_PROC *pOpen;
++    PM_CLOSE_PROC *pClose;
++    PM_COLLECT_PROC *pCollect;
++};
++
++static void *get_provider_entry(HKEY perf, HMODULE perflib, const char *name)
++{
++    char buf[MAX_PATH];
++    DWORD err, type, len;
++
++    len = sizeof(buf) - 1;
++    err = RegQueryValueExA(perf, name, NULL, &type, (BYTE *)buf, &len);
++    if (err != ERROR_SUCCESS || type != REG_SZ)
++        return NULL;
++
++    buf[len] = 0;
++    TRACE("Loading function pointer for %s: %s\n", name, debugstr_a(buf));
++
++    return GetProcAddress(perflib, buf);
++}
++
++static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *provider)
++{
++    static const WCHAR performanceW[] = { 'P','e','r','f','o','r','m','a','n','c','e',0 };
++    static const WCHAR libraryW[] = { 'L','i','b','r','a','r','y',0 };
++    WCHAR buf[MAX_PATH], buf2[MAX_PATH];
++    DWORD err, type, len;
++    HKEY service, perf;
++
++    err = RegOpenKeyExW(root, name, 0, KEY_READ, &service);
++    if (err != ERROR_SUCCESS)
++        return FALSE;
++
++    err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf);
++    RegCloseKey(service);
++    if (err != ERROR_SUCCESS)
++        return FALSE;
++
++    len = sizeof(buf) - sizeof(WCHAR);
++    err = RegQueryValueExW(perf, libraryW, NULL, &type, (BYTE *)buf, &len);
++    if (err != ERROR_SUCCESS || !(type == REG_SZ || type == REG_EXPAND_SZ))
++        goto error;
++
++    buf[len / sizeof(WCHAR)] = 0;
++    if (type == REG_EXPAND_SZ)
++    {
++        len = ExpandEnvironmentStringsW(buf, buf2, MAX_PATH);
++        if (!len || len > MAX_PATH) goto error;
++        strcpyW(buf, buf2);
++    }
++
++    if (!(provider->perflib = LoadLibraryW(buf)))
++    {
++        WARN("Failed to load %s\n", debugstr_w(buf));
++        goto error;
++    }
++
++    GetModuleFileNameW(provider->perflib, buf, MAX_PATH);
++    TRACE("Loaded provider %s\n", wine_dbgstr_w(buf));
++
++    provider->pOpen = get_provider_entry(perf, provider->perflib, "Open");
++    provider->pClose = get_provider_entry(perf, provider->perflib, "Close");
++    provider->pCollect = get_provider_entry(perf, provider->perflib, "Collect");
++    if (provider->pOpen && provider->pClose && provider->pCollect)
++    {
++        RegCloseKey(perf);
++        return TRUE;
++    }
++
++    TRACE("Provider is missing required exports\n");
++    FreeLibrary(provider->perflib);
++
++error:
++    RegCloseKey(perf);
++    return FALSE;
++}
++
++static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count)
++{
++    DWORD err;
++
++    err = provider->pOpen(NULL);
++    if (err != ERROR_SUCCESS)
++    {
++        TRACE("Open error %u (%#x)\n", err, err);
++        return err;
++    }
++
++    *obj_count = 0;
++    err = provider->pCollect((WCHAR *)query, data, size, obj_count);
++    if (err != ERROR_SUCCESS)
++    {
++        TRACE("Collect error %u (%#x)\n", err, err);
++        *obj_count = 0;
++    }
++
++    provider->pClose();
++    return err;
++}
++
++#define MAX_SERVICE_NAME 260
++
++static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD *ret_size)
++{
++    static const WCHAR SZ_SERVICES_KEY[] = { 'S','y','s','t','e','m','\\',
++        'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',
++        'S','e','r','v','i','c','e','s',0 };
++    DWORD err, i, data_size;
++    HKEY root;
++    PERF_DATA_BLOCK *pdb;
++
++    if (!ret_size)
++        return ERROR_INVALID_PARAMETER;
++
++    data_size = *ret_size;
++    *ret_size = 0;
++
++    if (type)
++        *type = REG_BINARY;
++
++    if (!data || data_size < sizeof(*pdb))
++        return ERROR_MORE_DATA;
++
++    pdb = data;
++
++    pdb->Signature[0] = 'P';
++    pdb->Signature[1] = 'E';
++    pdb->Signature[2] = 'R';
++    pdb->Signature[3] = 'F';
++#ifdef WORDS_BIGENDIAN
++    pdb->LittleEndian = FALSE;
++#else
++    pdb->LittleEndian = TRUE;
++#endif
++    pdb->Version = PERF_DATA_VERSION;
++    pdb->Revision = PERF_DATA_REVISION;
++    pdb->TotalByteLength = 0;
++    pdb->HeaderLength = sizeof(*pdb);
++    pdb->NumObjectTypes = 0;
++    pdb->DefaultObject = 0;
++    QueryPerformanceCounter(&pdb->PerfTime);
++    QueryPerformanceFrequency(&pdb->PerfFreq);
++
++    data = pdb + 1;
++    pdb->SystemNameOffset = sizeof(*pdb);
++    pdb->SystemNameLength = (data_size - sizeof(*pdb)) / sizeof(WCHAR);
++    if (!GetComputerNameW(data, &pdb->SystemNameLength))
++        return ERROR_MORE_DATA;
++
++    pdb->SystemNameLength++;
++    pdb->SystemNameLength *= sizeof(WCHAR);
++
++    pdb->HeaderLength += pdb->SystemNameLength;
++
++    /* align to 8 bytes */
++    if (pdb->SystemNameLength & 7)
++        pdb->HeaderLength += 8 - (pdb->SystemNameLength & 7);
++
++    if (data_size < pdb->HeaderLength)
++        return ERROR_MORE_DATA;
++
++    pdb->TotalByteLength = pdb->HeaderLength;
++
++    data_size -= pdb->HeaderLength;
++    data = (char *)data + pdb->HeaderLength;
++
++    err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, SZ_SERVICES_KEY, 0, KEY_READ, &root);
++    if (err != ERROR_SUCCESS)
++        return err;
++
++    i = 0;
++    for (;;)
++    {
++        DWORD collected_size = data_size, obj_count = 0;
++        struct perf_provider provider;
++        WCHAR name[MAX_SERVICE_NAME];
++        void *collected_data = data;
++
++        err = RegEnumKeyW(root, i++, name, MAX_SERVICE_NAME);
++        if (err == ERROR_NO_MORE_ITEMS)
++        {
++            err = ERROR_SUCCESS;
++            break;
++        }
++
++        if (err != ERROR_SUCCESS)
++            continue;
++
++        if (!load_provider(root, name, &provider))
++            continue;
++
++        err = collect_data(&provider, query, &collected_data, &collected_size, &obj_count);
++        FreeLibrary(provider.perflib);
++
++        if (err == ERROR_MORE_DATA)
++            break;
++
++        if (err == ERROR_SUCCESS)
++        {
++            PERF_OBJECT_TYPE *obj = (PERF_OBJECT_TYPE *)data;
++
++            TRACE("Collect: obj->TotalByteLength %u, collected_size %u\n",
++                obj->TotalByteLength, collected_size);
++
++            data_size -= collected_size;
++            data = collected_data;
++
++            pdb->TotalByteLength += collected_size;
++            pdb->NumObjectTypes += obj_count;
++        }
++    }
++
++    RegCloseKey(root);
++
++    if (err == ERROR_SUCCESS)
++    {
++        *ret_size = pdb->TotalByteLength;
++
++        GetSystemTime(&pdb->SystemTime);
++        GetSystemTimeAsFileTime((FILETIME *)&pdb->PerfTime100nSec);
++    }
++
++    return err;
++}
++
+ /******************************************************************************
+  * RegQueryValueExW   [ADVAPI32.@]
+  *
+@@ -1502,6 +1732,10 @@ LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDW
+           (count && data) ? *count : 0 );
+ 
+     if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
++
++    if (hkey == HKEY_PERFORMANCE_DATA)
++        return query_perf_data(name, type, data, count);
++
+     if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE;
+ 
+     RtlInitUnicodeString( &name_str, name );
+@@ -1592,7 +1826,8 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO
+           hkey, debugstr_a(name), reserved, type, data, count, count ? *count : 0 );
+ 
+     if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER;
+-    if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE;
++    if (hkey != HKEY_PERFORMANCE_DATA && !(hkey = get_special_root_hkey( hkey, 0 )))
++        return ERROR_INVALID_HANDLE;
+ 
+     if (count) datalen = *count;
+     if (!data && count) *count = 0;
+@@ -1604,6 +1839,13 @@ LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExA( HKEY hkey, LPCSTR name, LPDWO
+     if ((status = RtlAnsiStringToUnicodeString( &nameW, &nameA, TRUE )))
+         return RtlNtStatusToDosError(status);
+ 
++    if (hkey == HKEY_PERFORMANCE_DATA)
++    {
++        DWORD ret = query_perf_data( nameW.Buffer, type, data, count );
++        RtlFreeUnicodeString( &nameW );
++        return ret;
++    }
++
+     status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation,
+                               buffer, sizeof(buffer), &total_size );
+     if (status && status != STATUS_BUFFER_OVERFLOW) goto done;
+diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
+index 43599359ac6..9706478a135 100644
+--- a/dlls/advapi32/tests/registry.c
++++ b/dlls/advapi32/tests/registry.c
+@@ -3520,10 +3520,10 @@ static void test_RegQueryValueExPerformanceData(void)
+ 
+     /* Test with data == NULL */
+     dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData );
+-    todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
++    ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
+ 
+     dwret = RegQueryValueExW( HKEY_PERFORMANCE_DATA, globalW, NULL, NULL, NULL, &cbData );
+-    todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
++    ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
+ 
+     /* Test ERROR_MORE_DATA, start with small buffer */
+     len = 10;
+@@ -3531,8 +3531,7 @@ static void test_RegQueryValueExPerformanceData(void)
+     cbData = len;
+     type = 0xdeadbeef;
+     dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, &type, value, &cbData );
+-    todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
+-todo_wine
++    ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret );
+     ok(type == REG_BINARY, "got %u\n", type);
+     while( dwret == ERROR_MORE_DATA && limit)
+     {
+@@ -3545,14 +3544,13 @@ todo_wine
+     }
+     ok(limit > 0, "too many times ERROR_MORE_DATA returned\n");
+ 
+-    todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret);
+-todo_wine
++    ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret);
+     ok(type == REG_BINARY, "got %u\n", type);
+ 
+     /* Check returned data */
+     if (dwret == ERROR_SUCCESS)
+     {
+-        todo_wine ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len);
++        ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len);
+         if (len >= sizeof(PERF_DATA_BLOCK)) {
+             pdb = (PERF_DATA_BLOCK*) value;
+             ok(pdb->Signature[0] == 'P', "expected Signature[0] = 'P', got 0x%x\n", pdb->Signature[0]);
+@@ -3569,13 +3567,11 @@ todo_wine
+     {
+         cbData = 0xdeadbeef;
+         dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData);
+-todo_wine
+         ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
+         ok(cbData == 0, "got %u\n", cbData);
+ 
+         cbData = 0;
+         dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, names[i], NULL, NULL, NULL, &cbData);
+-todo_wine
+         ok(dwret == ERROR_MORE_DATA, "%u/%s: got %u\n", i, names[i], dwret);
+         ok(cbData == 0, "got %u\n", cbData);
+ 
+@@ -3608,9 +3604,7 @@ todo_wine
+     type = 0xdeadbeef;
+     cbData = sizeof(buf);
+     dwret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "invalid counter name", NULL, &type, buf, &cbData);
+-todo_wine
+     ok(dwret == ERROR_SUCCESS, "got %u\n", dwret);
+-todo_wine
+     ok(type == REG_BINARY, "got %u\n", type);
+     if (dwret == ERROR_SUCCESS)
+     {
+@@ -3640,6 +3634,7 @@ todo_wine
+         ok(pdb->TotalByteLength == len, "got %u vs %u\n", pdb->TotalByteLength, len);
+         ok(pdb->HeaderLength == pdb->TotalByteLength, "got %u\n", pdb->HeaderLength);
+         ok(pdb->NumObjectTypes == 0, "got %u\n", pdb->NumObjectTypes);
++todo_wine
+         ok(pdb->DefaultObject != 0, "got %u\n", pdb->DefaultObject);
+         ok(pdb->SystemTime.wYear == st.wYear, "got %u\n", pdb->SystemTime.wYear);
+         ok(pdb->SystemTime.wMonth == st.wMonth, "got %u\n", pdb->SystemTime.wMonth);
+-- 
+2.13.1
+