Release v4.7

The updated ntdll-Junction_Points has replace this patchset.

Thanks for testing Gijs Vermeulen.

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://github.com/wine-compholio/wine-staging/wiki/Usage).
+[usage instructions](https://wiki.winehq.org/Wine-Staging_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://github.com/wine-compholio/wine-staging/wiki/Packaging).
+in our [Wiki](https://wiki.winehq.org/Wine-Staging).
 
 Contributing
 ------------

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

@@ -0,0 +1,61 @@
+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

@@ -1,24 +0,0 @@
-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

@@ -1,67 +0,0 @@
-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/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,18 +1,34 @@
-From 79ff79dba6d5c8008c53e4bcf5e38c3a54271091 Mon Sep 17 00:00:00 2001
+From 2aeb3a9e57142c3f4ff86cb81b206bdbc146552d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:54:26 +0100
-Subject: d2d1: Avoid implicit cast of interface pointer.
+Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
 
 ---
- dlls/d2d1/brush.c    | 8 ++++----
- dlls/d2d1/geometry.c | 6 +++---
- 2 files changed, 7 insertions(+), 7 deletions(-)
+ 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(-)
 
+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 7f4c7bbb763..30d25fec4b4 100644
+index 9c73ae1..a748669 100644
 --- a/dlls/d2d1/brush.c
 +++ b/dlls/d2d1/brush.c
-@@ -251,7 +251,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
+@@ -256,7 +256,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface)
  {
@@ -21,7 +37,7 @@ index 7f4c7bbb763..30d25fec4b4 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface,
-@@ -394,7 +394,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
+@@ -399,7 +399,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
  
  static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface)
  {
@@ -30,7 +46,7 @@ index 7f4c7bbb763..30d25fec4b4 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface,
-@@ -580,7 +580,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEA
+@@ -586,7 +586,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface)
  {
@@ -39,20 +55,46 @@ index 7f4c7bbb763..30d25fec4b4 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface,
-@@ -776,7 +776,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, const D2D1_BRUSH
+@@ -818,7 +818,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
  
- static inline struct d2d_brush *impl_from_ID2D1BitmapBrush(ID2D1BitmapBrush *iface)
+ static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *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(ID2D1BitmapBrush *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)
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
-index a9588985642..b8457a9e1ea 100644
+index 421ba2b..f8db51c 100644
 --- a/dlls/d2d1/geometry.c
 +++ b/dlls/d2d1/geometry.c
-@@ -3024,7 +3024,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
+@@ -2987,7 +2987,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
  
  static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
  {
@@ -61,7 +103,7 @@ index a9588985642..b8457a9e1ea 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
-@@ -3540,7 +3540,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
+@@ -3503,7 +3503,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *factory
  
  static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
  {
@@ -70,7 +112,7 @@ index a9588985642..b8457a9e1ea 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
-@@ -3876,7 +3876,7 @@ fail:
+@@ -3838,7 +3838,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
  {
@@ -79,6 +121,30 @@ index a9588985642..b8457a9e1ea 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);
+ }
 -- 
-2.14.1
+1.9.1
 

patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,7 +1,7 @@
-From 744549e1ecc76c3764079d337c09445d01a3527e Mon Sep 17 00:00:00 2001
+From 5e4c31d0796f2e559889d4f84cdb571130217e7d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
-Subject: dwrite: Avoid implicit cast of interface pointer.
+Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
 
 ---
  dlls/dwrite/font.c   | 4 ++--
@@ -9,10 +9,10 @@ Subject: dwrite: Avoid implicit cast of interface pointer.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index d9ddce0..0a90c20 100644
+index f50133d..1bc7b59 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -1684,7 +1684,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -1815,7 +1815,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -20,8 +20,8 @@ index d9ddce0..0a90c20 100644
 +    return CONTAINING_RECORD((IDWriteFont3 *)iface, struct dwrite_font, IDWriteFont3_iface);
  }
  
- static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -1692,7 +1692,7 @@ static struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace
+ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -1823,7 +1823,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -31,10 +31,10 @@ index d9ddce0..0a90c20 100644
  
  void get_logfont_from_font(IDWriteFont *iface, LOGFONTW *lf)
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 706ed4e..c76a909 100644
+index f27fe9f..ee1eb5a 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -5196,7 +5196,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
+@@ -5622,7 +5622,7 @@ static const IDWriteTextFormat2Vtbl dwritetextformatvtbl = {
  static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
  {
      return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
@@ -44,5 +44,5 @@ index 706ed4e..c76a909 100644
  
  HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style,
 -- 
-2.9.0
+1.9.1
 

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

@@ -1,7 +1,8 @@
-From 59f0bb786dc3ec4e77cb43ea4410743ecd317bbf Mon Sep 17 00:00:00 2001
+From 494fc3abe1eddabcf7cede677ee907284e89eea8 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
-Subject: include: Check element type in CONTAINING_RECORD and similar macros.
+Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
+ macros.
 
 ---
  include/wine/list.h   | 10 ++++++++--
@@ -10,7 +11,7 @@ Subject: include: Check element type in CONTAINING_RECORD and similar macros.
  3 files changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/include/wine/list.h b/include/wine/list.h
-index b4d681f..287ad39 100644
+index b4d681fe..287ad394 100644
 --- a/include/wine/list.h
 +++ b/include/wine/list.h
 @@ -228,7 +228,13 @@ static inline void list_move_head( struct list *dst, struct list *src )
@@ -30,10 +31,10 @@ index b4d681f..287ad39 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index 13452d9..554d239 100644
+index dc50b5e7..8130deb5 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
-@@ -22,8 +22,14 @@
+@@ -23,8 +23,14 @@
  #ifndef __WINE_WINE_RBTREE_H
  #define __WINE_WINE_RBTREE_H
  
@@ -51,12 +52,12 @@ index 13452d9..554d239 100644
  struct wine_rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 559a719..4a711f4 100644
+index 2b489382..a156efc4 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -753,8 +753,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
- 
- #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))
+@@ -760,8 +760,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+ #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
+ #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
  
 -#define CONTAINING_RECORD(address, type, field) \
 -  ((type *)((PCHAR)(address) - offsetof(type, field)))
@@ -69,8 +70,8 @@ index 559a719..4a711f4 100644
 +   ((type *)((PCHAR)(address) - offsetof(type, field)))
 +#endif
  
- /* Types */
- 
+ #ifdef __WINESRC__
+ # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 -- 
-2.7.1
+2.20.1
 

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

@@ -1,29 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,21 +0,0 @@
-#
-# 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/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch

@@ -1,25 +1,25 @@
-From 2e1a505fedd43f0f03ba36e1a8413bf04f8afa83 Mon Sep 17 00:00:00 2001
+From 05ca39b029f8f710ca53aeafc36384fd39fd6b89 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
-Subject: winelib: Append '(Staging)' at the end of the version string.
+Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
  libs/wine/Makefile.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
-index 1b7fea8..780be10 100644
+index 4833eb5..3cfa4f4 100644
 --- a/libs/wine/Makefile.in
 +++ b/libs/wine/Makefile.in
-@@ -112,7 +112,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
+@@ -31,7 +31,7 @@ libwine_LDFLAGS = $(LIBWINE_LDFLAGS)
  libwine_DEPS = $(LIBWINE_DEPENDS)
  
  version.c: dummy
--	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
-+	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1  (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
+-	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
++	version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1  (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
  
  dummy:
  .PHONY: dummy
 -- 
-2.6.2
+1.9.1
 

patches/Staging/0003-loader-Add-commandline-option-patches-to-show-the-pa.patch

@@ -1,23 +1,23 @@
-From f23512417cb3d149a8be4f757282d17cc1f99f9a Mon Sep 17 00:00:00 2001
+From fa73044dd60bae90b9a5ec850205a07579d4db17 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 29 May 2014 23:43:45 +0200
-Subject: loader: Add commandline option --patches to show the patch list.
+Subject: [PATCH] loader: Add commandline option --patches to show the patch
+ list.
 
 ---
  dlls/ntdll/misc.c      |  8 ++++++++
  dlls/ntdll/ntdll.spec  |  1 +
  include/wine/library.h |  1 +
  libs/wine/config.c     |  6 ++++++
- libs/wine/wine.def     |  1 +
  libs/wine/wine.map     |  1 +
  loader/main.c          | 42 +++++++++++++++++++++++++++++++++++++++++-
- 7 files changed, 59 insertions(+), 1 deletion(-)
+ 6 files changed, 58 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
-index ad1b43b..1f985e7 100644
+index bb75d9c..21e2db6 100644
 --- a/dlls/ntdll/misc.c
 +++ b/dlls/ntdll/misc.c
-@@ -55,6 +55,14 @@ const char * CDECL NTDLL_wine_get_version(void)
+@@ -61,6 +61,14 @@ const char * CDECL NTDLL_wine_get_version(void)
  }
  
  /*********************************************************************
@@ -33,10 +33,10 @@ index ad1b43b..1f985e7 100644
   */
  const char * CDECL NTDLL_wine_get_build_id(void)
 diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 51de6e7..ee4ed49 100644
+index 292b0f6..fb45a94 100644
 --- a/dlls/ntdll/ntdll.spec
 +++ b/dlls/ntdll/ntdll.spec
-@@ -1421,6 +1421,7 @@
+@@ -1516,6 +1516,7 @@
  
  # Version
  @ cdecl wine_get_version() NTDLL_wine_get_version
@@ -57,10 +57,10 @@ index 242bb69..fae73fe 100644
  extern void wine_init_argv0_path( const char *argv0 );
  extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index a273502..5262c76 100644
+index 3c9110b..5da6263 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -478,6 +478,12 @@ const char *wine_get_version(void)
+@@ -522,6 +522,12 @@ const char *wine_get_version(void)
      return PACKAGE_VERSION;
  }
  
@@ -73,18 +73,6 @@ index a273502..5262c76 100644
  /* return the build id string */
  const char *wine_get_build_id(void)
  {
-diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index ed315bd..5b42029 100644
---- a/libs/wine/wine.def
-+++ b/libs/wine/wine.def
-@@ -83,6 +83,7 @@ EXPORTS
-     wine_get_sortkey
-     wine_get_user_name
-     wine_get_version
-+    wine_get_patches
-     wine_init
-     wine_init_argv0_path
-     wine_is_dbcs_leadbyte
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
 index 2159fac..7cb2918 100644
 --- a/libs/wine/wine.map
@@ -98,10 +86,10 @@ index 2159fac..7cb2918 100644
      wine_init_argv0_path;
      wine_is_dbcs_leadbyte;
 diff --git a/loader/main.c b/loader/main.c
-index ce21173..4794e51 100644
+index f197cf8..f662912 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -89,7 +89,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -54,7 +54,8 @@ static void check_command_line( int argc, char *argv[] )
      static const char usage[] =
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
@@ -111,7 +99,7 @@ index ce21173..4794e51 100644
  
      if (argc <= 1)
      {
-@@ -106,6 +107,45 @@ static void check_command_line( int argc, char *argv[] )
+@@ -71,6 +72,45 @@ static void check_command_line( int argc, char *argv[] )
          printf( "%s\n", wine_get_build_id() );
          exit(0);
      }
@@ -158,5 +146,5 @@ index ce21173..4794e51 100644
  
  
 -- 
-2.2.1
+1.9.1
 

patches/Staging/0004-loader-Add-commandline-option-check-libs.patch

@@ -1,16 +1,15 @@
-From 41863fd8fdf3a885efa93359a538e4e74258fb30 Mon Sep 17 00:00:00 2001
+From 9618572cf2eace39198fb83b747a70d1865015e3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 28 May 2014 19:50:51 +0200
-Subject: loader: Add commandline option --check-libs.
+Subject: [PATCH] loader: Add commandline option --check-libs.
 
 ---
  include/wine/library.h |   2 +
  libs/wine/config.c     | 124 +++++++++++++++++++++++++++++++++++++++++++++++++
  libs/wine/loader.c     |  36 ++++++++++++++
- libs/wine/wine.def     |   2 +
  libs/wine/wine.map     |   2 +
  loader/main.c          |  50 +++++++++++++++++++-
- 6 files changed, 215 insertions(+), 1 deletion(-)
+ 5 files changed, 213 insertions(+), 1 deletion(-)
 
 diff --git a/include/wine/library.h b/include/wine/library.h
 index fae73fe..7395a11 100644
@@ -33,10 +32,10 @@ index fae73fe..7395a11 100644
  extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
  extern int wine_dlclose( void *handle, char *error, size_t errorsize );
 diff --git a/libs/wine/config.c b/libs/wine/config.c
-index 12f4a67..be9f401 100644
+index 5da6263..6cedfb7 100644
 --- a/libs/wine/config.c
 +++ b/libs/wine/config.c
-@@ -443,6 +443,130 @@ const char *wine_get_build_dir(void)
+@@ -488,6 +488,130 @@ const char *wine_get_build_dir(void)
      return build_dir;
  }
  
@@ -168,10 +167,10 @@ index 12f4a67..be9f401 100644
  const char *wine_get_server_dir(void)
  {
 diff --git a/libs/wine/loader.c b/libs/wine/loader.c
-index b5b32cc..1453a82 100644
+index 649aa22..367dde3 100644
 --- a/libs/wine/loader.c
 +++ b/libs/wine/loader.c
-@@ -1041,6 +1041,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
+@@ -1064,6 +1064,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize
  }
  
  /***********************************************************************
@@ -214,26 +213,6 @@ index b5b32cc..1453a82 100644
   *		wine_dlsym
   */
  void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize )
-diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index 5b42029..6acf329 100644
---- a/libs/wine/wine.def
-+++ b/libs/wine/wine.def
-@@ -64,6 +64,7 @@ EXPORTS
-     wine_dbg_sprintf
-     wine_dbgstr_an
-     wine_dbgstr_wn
-+    wine_dladdr
-     wine_dlclose
-     wine_dll_enum_load_path
-     wine_dll_get_owner
-@@ -79,6 +80,7 @@ EXPORTS
-     wine_get_build_id
-     wine_get_config_dir
-     wine_get_data_dir
-+    wine_get_libs
-     wine_get_server_dir
-     wine_get_sortkey
-     wine_get_user_name
 diff --git a/libs/wine/wine.map b/libs/wine/wine.map
 index 7cb2918..72ffed8 100644
 --- a/libs/wine/wine.map
@@ -255,7 +234,7 @@ index 7cb2918..72ffed8 100644
      wine_get_sortkey;
      wine_get_ss;
 diff --git a/loader/main.c b/loader/main.c
-index 343ea26..44804e1 100644
+index f662912..a2dc40c 100644
 --- a/loader/main.c
 +++ b/loader/main.c
 @@ -36,6 +36,12 @@
@@ -271,7 +250,7 @@ index 343ea26..44804e1 100644
  #include <pthread.h>
  
  #include "wine/library.h"
-@@ -90,7 +96,8 @@ static void check_command_line( int argc, char *argv[] )
+@@ -55,7 +61,8 @@ static void check_command_line( int argc, char *argv[] )
          "Usage: wine PROGRAM [ARGUMENTS...]   Run the specified program\n"
          "       wine --help                   Display this help and exit\n"
          "       wine --version                Output version information and exit\n"
@@ -281,7 +260,7 @@ index 343ea26..44804e1 100644
  
      if (argc <= 1)
      {
-@@ -146,6 +153,47 @@ static void check_command_line( int argc, char *argv[] )
+@@ -111,6 +118,47 @@ static void check_command_line( int argc, char *argv[] )
  
          exit(0);
      }
@@ -330,5 +309,5 @@ index 343ea26..44804e1 100644
  
  
 -- 
-2.7.1
+1.9.1
 

patches/Staging/0005-loader-Print-library-paths-for-check-libs-on-Mac-OS-.patch

@@ -1,28 +1,23 @@
-From b4a2543264f9eb91fc259a81dea872eee3c14aba Mon Sep 17 00:00:00 2001
+From 07ca5e888c3265c57c88ef1758e6c47fbea4fb07 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 27 Jun 2015 19:28:51 +0200
 Subject: loader: Print library paths for --check-libs on Mac OS X.
 
 ---
- loader/main.c | 27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
+ loader/main.c | 30 +++++++++++++++++++++++++++++-
+ 1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/loader/main.c b/loader/main.c
-index 44804e1..4d9126e 100644
+index a2dc40c51c..1642fb0965 100644
 --- a/loader/main.c
 +++ b/loader/main.c
-@@ -48,6 +48,7 @@
- #include "main.h"
+@@ -50,6 +50,30 @@
+ /* the preloader will set this variable */
+ const struct wine_preload_info *wine_main_preload_info = NULL;
  
- #ifdef __APPLE__
++#ifdef __APPLE__
 +#include <mach-o/dyld.h>
- 
- #ifndef __clang__
- __asm__(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x40000000");
-@@ -73,6 +74,26 @@ static inline void reserve_area( void *addr, size_t size )
-     wine_mmap_add_reserved_area( addr, size );
- }
- 
++
 +static const char *get_macho_library_path( const char *libname )
 +{
 +    unsigned int path_len, libname_len = strlen( libname );
@@ -30,7 +25,7 @@ index 44804e1..4d9126e 100644
 +
 +    for (i = 0; i < count; i++)
 +    {
-+        const char *path = _dyld_get_image_name( i );
++       const char *path = _dyld_get_image_name( i );
 +        if (!path) continue;
 +
 +        path_len = strlen( path );
@@ -42,11 +37,12 @@ index 44804e1..4d9126e 100644
 +    }
 +    return NULL;
 +}
++#endif
 +
- #else  /* __APPLE__ */
- 
- /* the preloader will set this variable */
-@@ -181,7 +202,11 @@ static void check_command_line( int argc, char *argv[] )
+ /***********************************************************************
+  *           check_command_line
+  *
+@@ -146,7 +170,11 @@ static void check_command_line( int argc, char *argv[] )
                  else
              #endif
                  {
@@ -60,5 +56,5 @@ index 44804e1..4d9126e 100644
                  wine_dlclose( lib_handle, NULL, 0 );
              }
 -- 
-2.4.3
+2.14.1
 

patches/advapi32-CreateRestrictedToken/0003-server-Correctly-validate-SID-length-in-sd_is_valid.patch

@@ -1,36 +0,0 @@
-From 22a49dfa50cda9b1f5a5c64eabed2d17b0033896 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:52:50 +0200
-Subject: server: Correctly validate SID length in sd_is_valid.
-
----
- server/token.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/server/token.c b/server/token.c
-index acd7a4dedb5..7ab0f634c05 100644
---- a/server/token.c
-+++ b/server/token.c
-@@ -332,8 +332,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size )
-     owner = sd_get_owner( sd );
-     if (owner)
-     {
--        size_t needed_size = security_sid_len( owner );
--        if ((sd->owner_len < sizeof(SID)) || (needed_size > sd->owner_len))
-+        if ((sd->owner_len < sizeof(SID)) || (security_sid_len( owner ) > sd->owner_len))
-             return FALSE;
-     }
-     offset += sd->owner_len;
-@@ -344,8 +343,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size )
-     group = sd_get_group( sd );
-     if (group)
-     {
--        size_t needed_size = security_sid_len( group );
--        if ((sd->group_len < sizeof(SID)) || (needed_size > sd->group_len))
-+        if ((sd->group_len < sizeof(SID)) || (security_sid_len( group ) > sd->group_len))
-             return FALSE;
-     }
-     offset += sd->group_len;
--- 
-2.13.1
-

patches/advapi32-LsaLookupSids/0005-advapi32-tests-Test-prefix-and-use-of-TokenPrimaryGr.patch

@@ -1,95 +0,0 @@
-From f0290aad953e988b1a15e214ecfc57f21dc136af Mon Sep 17 00:00:00 2001
-From: Qian Hong <qhong@codeweavers.com>
-Date: Tue, 28 Apr 2015 23:28:50 +0800
-Subject: advapi32/tests: Test prefix and use of TokenPrimaryGroup Sid.
-
----
- dlls/advapi32/tests/security.c | 35 ++++++++++++++++++++++++++++++-----
- 1 file changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index f3fc682..6a716d6 100644
---- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -2514,19 +2514,21 @@ static void test_granted_access(HANDLE handle, ACCESS_MASK access,
- static void test_process_security(void)
- {
-     BOOL res;
-+    PTOKEN_USER user;
-     PTOKEN_OWNER owner;
-     PTOKEN_PRIMARY_GROUP group;
--    PSID AdminSid = NULL, UsersSid = NULL;
-+    PSID AdminSid = NULL, UsersSid = NULL, UserSid = NULL;
-     PACL Acl = NULL, ThreadAcl = NULL;
-     SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL;
--    char buffer[MAX_PATH];
-+    char buffer[MAX_PATH], account[MAX_PATH], domain[MAX_PATH];
-     PROCESS_INFORMATION info;
-     STARTUPINFOA startup;
-     SECURITY_ATTRIBUTES psa, tsa;
-     HANDLE token, event;
--    DWORD size;
-+    DWORD size, acc_size, dom_size, ret;
-     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
-     PSID EveryoneSid = NULL;
-+    SID_NAME_USE use;
- 
-     Acl = HeapAlloc(GetProcessHeap(), 0, 256);
-     res = InitializeAcl(Acl, 256, ACL_REVISION);
-@@ -2558,7 +2560,8 @@ static void test_process_security(void)
-     owner = HeapAlloc(GetProcessHeap(), 0, size);
-     res = GetTokenInformation( token, TokenOwner, owner, size, &size );
-     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
--    AdminSid = ((TOKEN_OWNER*)owner)->Owner;
-+    AdminSid = owner->Owner;
-+    test_sid_str(AdminSid);
- 
-     res = GetTokenInformation( token, TokenPrimaryGroup, NULL, 0, &size );
-     ok(!res, "Expected failure, got %d\n", res);
-@@ -2568,13 +2571,34 @@ static void test_process_security(void)
-     group = HeapAlloc(GetProcessHeap(), 0, size);
-     res = GetTokenInformation( token, TokenPrimaryGroup, group, size, &size );
-     ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
--    UsersSid = ((TOKEN_PRIMARY_GROUP*)group)->PrimaryGroup;
-+    UsersSid = group->PrimaryGroup;
-+    test_sid_str(UsersSid);
-+
-+    acc_size = sizeof(account);
-+    dom_size = sizeof(domain);
-+    ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use );
-+    ok(ret, "LookupAccountSid failed with %d\n", ret);
-+    todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use);
-+    todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account);
-+
-+    res = GetTokenInformation( token, TokenUser, NULL, 0, &size );
-+    ok(!res, "Expected failure, got %d\n", res);
-+    ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER,
-+       "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
-+
-+    user = HeapAlloc(GetProcessHeap(), 0, size);
-+    res = GetTokenInformation( token, TokenUser, user, size, &size );
-+    ok(res, "GetTokenInformation failed with error %d\n", GetLastError());
-+    UserSid = user->User.Sid;
-+    test_sid_str(UserSid);
-+    todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n");
- 
-     CloseHandle( token );
-     if (!res)
-     {
-         HeapFree(GetProcessHeap(), 0, group);
-         HeapFree(GetProcessHeap(), 0, owner);
-+        HeapFree(GetProcessHeap(), 0, user);
-         HeapFree(GetProcessHeap(), 0, Acl);
-         return;
-     }
-@@ -2681,6 +2705,7 @@ static void test_process_security(void)
-     CloseHandle( event );
-     HeapFree(GetProcessHeap(), 0, group);
-     HeapFree(GetProcessHeap(), 0, owner);
-+    HeapFree(GetProcessHeap(), 0, user);
-     HeapFree(GetProcessHeap(), 0, Acl);
-     HeapFree(GetProcessHeap(), 0, SecurityDescriptor);
-     HeapFree(GetProcessHeap(), 0, ThreadAcl);
--- 
-2.3.5
-

patches/advapi32-LsaLookupSids/definition

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

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

@@ -1,267 +0,0 @@
-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

@@ -1,139 +0,0 @@
-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

@@ -1,380 +0,0 @@
-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
-