Release 2.10-3 (macOS preloader fixes).

For wine64-preloader we already do that, but apparently there are also kernel
versions which enforce a PAGEZERO section for 32-bit executables.

(cherry picked from commit 907dc4eae6)

patches/Compiler_Warnings/0003-shell32-Fix-length-parameter-for-ZeroMemory.patch

@@ -0,0 +1,25 @@
+From 33717bde9e702520e23ae014c398bd7076902d43 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 Jun 2017 12:56:47 +0200
+Subject: shell32: Fix length parameter for ZeroMemory.
+
+---
+ dlls/shell32/shfldr_fs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
+index c7259276d1d..10653f92b52 100644
+--- a/dlls/shell32/shfldr_fs.c
++++ b/dlls/shell32/shfldr_fs.c
+@@ -1315,7 +1315,7 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl,
+ 
+         if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) {
+             SHGetPathFromIDListW (pidl, wszSrcPathRoot);
+-            ZeroMemory(wszDstPath, MAX_PATH+1);
++            ZeroMemory(wszDstPath, sizeof(wszDstPath));
+             if (This->sPathTarget)
+                 lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH);
+             PathAddBackslashW(wszSrcPathRoot);
+-- 
+2.13.0
+

patches/Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch

@@ -0,0 +1,25 @@
+From 2b5e9f330770221eee2eda2aab251eba8d370a60 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 Jun 2017 13:17:54 +0200
+Subject: fusion: Fix length parameter for ZeroMemory.
+
+---
+ dlls/fusion/tests/asmname.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c
+index 5fb14a48291..21cd4874edc 100644
+--- a/dlls/fusion/tests/asmname.c
++++ b/dlls/fusion/tests/asmname.c
+@@ -358,7 +358,7 @@ static void test_assembly_name_props_line(IAssemblyName *name,
+         to_widechar(expect, vals[i].val);
+ 
+         size = MAX_PATH;
+-        ZeroMemory(str, MAX_PATH);
++        ZeroMemory(str, sizeof(str));
+         hr = IAssemblyName_GetProperty(name, i, str, &size);
+         to_multibyte(val, str);
+ 
+-- 
+2.13.0
+

patches/Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch

@@ -0,0 +1,34 @@
+From 3e59710a3091a4a61b7cce00606ed23b7b66dfda Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 Jun 2017 12:55:31 +0200
+Subject: fusion/tests: Avoid compiler warnings with GCC 7.
+
+---
+ dlls/fusion/tests/asmenum.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c
+index 1dc34a286e5..8b95f2a6bd5 100644
+--- a/dlls/fusion/tests/asmenum.c
++++ b/dlls/fusion/tests/asmenum.c
+@@ -223,7 +223,7 @@ typedef struct _tagASMNAME
+ static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path)
+ {
+     WIN32_FIND_DATAA ffd;
+-    CHAR buf[MAX_PATH];
++    CHAR buf[MAX_PATH + 37];
+     CHAR disp[MAX_PATH];
+     ASMNAME *name;
+     HANDLE hfind;
+@@ -248,7 +248,7 @@ static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path)
+         else if (depth == 1)
+         {
+             char culture[MAX_PATH];
+-            char dll[MAX_PATH], exe[MAX_PATH];
++            char dll[MAX_PATH + 6], exe[MAX_PATH + 6];
+ 
+             /* Directories with no dll or exe will not be enumerated */
+             sprintf(dll, "%s\\%s\\%s.dll", path, ffd.cFileName, parent);
+-- 
+2.13.0
+

patches/Compiler_Warnings/0006-kernel32-tests-Avoid-compiler-warnings-with-GCC-7.patch

@@ -0,0 +1,34 @@
+From d1eafd34d4c0619f956afd365ddbde79680a18dc Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 Jun 2017 12:56:10 +0200
+Subject: kernel32/tests: Avoid compiler warnings with GCC 7.
+
+---
+ dlls/kernel32/tests/heap.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c
+index 0acf109dff0..70ba674bc91 100644
+--- a/dlls/kernel32/tests/heap.c
++++ b/dlls/kernel32/tests/heap.c
+@@ -109,6 +109,9 @@ static void test_heap(void)
+     }
+ 
+     /* test some border cases of HeapAlloc and HeapReAlloc */
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wpragmas"
++#pragma GCC diagnostic ignored "-Walloc-size-larger-than="
+     mem = HeapAlloc(GetProcessHeap(), 0, 0);
+     ok(mem != NULL, "memory not allocated for size 0\n");
+     msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7);
+@@ -125,6 +128,7 @@ static void test_heap(void)
+     ok(size == 0 || broken(size == 1) /* some vista and win7 */,
+        "HeapSize should have returned 0 instead of %lu\n", size);
+     HeapFree(GetProcessHeap(), 0, msecond);
++#pragma GCC diagnostic pop
+ 
+     /* large blocks must be 16-byte aligned */
+     mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024);
+-- 
+2.13.1
+

patches/Compiler_Warnings/0007-rsaenh-tests-Avoid-compiler-warnings-with-GCC-7.patch

@@ -0,0 +1,25 @@
+From 61ceddca38f26c2df2acc6361c35ced52fe9b098 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 Jun 2017 12:58:31 +0200
+Subject: rsaenh/tests: Avoid compiler warnings with GCC 7.
+
+---
+ dlls/rsaenh/rsaenh.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
+index 9af770dfc6e..6978c860278 100644
+--- a/dlls/rsaenh/rsaenh.c
++++ b/dlls/rsaenh/rsaenh.c
+@@ -1097,7 +1097,7 @@ static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpe
+  */
+ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey)
+ {
+-    CHAR szRSABase[MAX_PATH];
++    CHAR szRSABase[MAX_PATH + 25];
+     HKEY hRootKey;
+ 
+     sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
+-- 
+2.13.0
+

patches/Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch

@@ -0,0 +1,46 @@
+From 67ed53ca67214d7dbdea7f342b9f2ff0356a220b Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 4 Jun 2017 12:59:10 +0200
+Subject: kernel32: Avoid compiler warnings with GCC 7.
+
+---
+ dlls/kernel32/oldconfig.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c
+index 6c80dc614f0..3e628757283 100644
+--- a/dlls/kernel32/oldconfig.c
++++ b/dlls/kernel32/oldconfig.c
+@@ -290,7 +290,8 @@ static void create_hardware_branch(void)
+         {
+             if (strncmp(dent->d_name, "hd", 2) == 0)
+             {
+-                sprintf(cStr, procname_ide_media, dent->d_name);
++                result = snprintf(cStr, sizeof(cStr), procname_ide_media, dent->d_name);
++                if (result < 0 || result >= sizeof(cStr)) continue;
+                 procfile = fopen(cStr, "r");
+                 if (!procfile)
+                 {
+@@ -306,7 +307,8 @@ static void create_hardware_branch(void)
+                     if (nType == DRIVE_UNKNOWN) continue;
+                 }
+ 
+-                sprintf(cStr, procname_ide_model, dent->d_name);
++                result = snprintf(cStr, sizeof(cStr), procname_ide_model, dent->d_name);
++                if (result < 0 || result >= sizeof(cStr)) continue;
+                 procfile = fopen(cStr, "r");
+                 if (!procfile)
+                 {
+@@ -322,7 +324,8 @@ static void create_hardware_branch(void)
+                     cDevModel[strlen(cDevModel) - 1] = 0;
+                 }
+ 
+-                sprintf(cUnixDeviceName, "/dev/%s", dent->d_name);
++                result = snprintf(cUnixDeviceName, sizeof(cUnixDeviceName), "/dev/%s", dent->d_name);
++                if (result < 0 || result >= sizeof(cUnixDeviceName)) continue;
+                 scsi_addr.PortNumber = (dent->d_name[2] - 'a') / 2;
+                 scsi_addr.PathId = 0;
+                 scsi_addr.TargetId = (dent->d_name[2] - 'a') % 2;
+-- 
+2.13.0
+

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/0010-oleaut32-typelib.c-fix-cursor2-having-the-wrong-type.patch

@@ -0,0 +1,37 @@
+From 9d0f651d9cb5c3ae68810e37dd6030373c7aeab6 Mon Sep 17 00:00:00 2001
+From: Nils Kuhnhenn <kuhnhenn.nils@gmail.com>
+Date: Wed, 24 Aug 2016 19:56:00 +0200
+Subject: oleaut32: Use variable with the correct type in LIST_FOR_EACH_ENTRY_SAFE macro.
+
+---
+ dlls/oleaut32/typelib.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
+index b9318fba423..5a6dad496ed 100644
+--- a/dlls/oleaut32/typelib.c
++++ b/dlls/oleaut32/typelib.c
+@@ -4830,10 +4830,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
+     if (!ref)
+     {
+       TLBImpLib *pImpLib, *pImpLibNext;
+-      TLBRefType *ref_type;
++      TLBRefType *ref_type, *ref_type_next;
+       TLBString *tlbstr, *tlbstr_next;
+       TLBGuid *tlbguid, *tlbguid_next;
+-      void *cursor2;
+       int i;
+ 
+       /* remove cache entry */
+@@ -4883,7 +4882,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
+           heap_free(pImpLib);
+       }
+ 
+-      LIST_FOR_EACH_ENTRY_SAFE(ref_type, cursor2, &This->ref_list, TLBRefType, entry)
++      LIST_FOR_EACH_ENTRY_SAFE(ref_type, ref_type_next, &This->ref_list, TLBRefType, entry)
+       {
+           list_remove(&ref_type->entry);
+           heap_free(ref_type);
+-- 
+2.13.1
+

patches/Compiler_Warnings/0011-gdiplus-Initialize-containers-list-in-GdipCloneImage.patch

@@ -0,0 +1,24 @@
+From 380543910f8912374a13b9773738e018bd638341 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Sun, 11 Jun 2017 02:42:47 +0200
+Subject: gdiplus: Initialize containers list in GdipCloneImage.
+
+---
+ dlls/gdiplus/image.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
+index ce2194317ff..b28606e916c 100644
+--- a/dlls/gdiplus/image.c
++++ b/dlls/gdiplus/image.c
+@@ -1339,6 +1339,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage)
+         result->unit = metafile->unit;
+         result->metafile_type = metafile->metafile_type;
+         result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL);
++        list_init(&result->containers);
+ 
+         if (!result->hemf)
+         {
+-- 
+2.13.1
+

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

@@ -1,4 +1,4 @@
-From 35e7be609df3c37eded9a3fd117ba0cef02f24c7 Mon Sep 17 00:00:00 2001
+From b6b1e5da04ed867251253410e37d412109a4cec2 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.
@@ -12,10 +12,10 @@ Subject: Appease the blessed version of gcc (4.5) when -Werror is enabled.
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
-index 55140c6..2facbfb 100644
+index c8a6a1fa5a8..0261d3708e6 100644
 --- a/dlls/d3d9/tests/visual.c
 +++ b/dlls/d3d9/tests/visual.c
-@@ -12034,7 +12034,7 @@ static void yuv_layout_test(void)
+@@ -12304,7 +12304,7 @@ static void yuv_layout_test(void)
      IDirect3D9 *d3d;
      D3DCOLOR color;
      DWORD ref_color;
@@ -25,7 +25,7 @@ index 55140c6..2facbfb 100644
      IDirect3DDevice9 *device;
      ULONG refcount;
 diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
-index bb61e7f..cf4c466 100644
+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
@@ -38,7 +38,7 @@ index bb61e7f..cf4c466 100644
  
      if (servername && !(server = strdup_unixcp( servername ))) return ERROR_OUTOFMEMORY;
 diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
-index 14eac39..ebff9f1 100644
+index 2ecb111e218..b285705509c 100644
 --- a/dlls/winealsa.drv/mmdevdrv.c
 +++ b/dlls/winealsa.drv/mmdevdrv.c
 @@ -359,7 +359,7 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha
@@ -51,11 +51,11 @@ index 14eac39..ebff9f1 100644
      static const WCHAR dashW[] = {' ','-',' ',0};
      static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1;
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index 44e7090..429ae90 100644
+index ce960853362..f4275d8dd48 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
-@@ -6893,7 +6893,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const
-     GLuint vs_id = 0;
+@@ -9316,7 +9316,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;
@@ -64,10 +64,10 @@ index 44e7090..429ae90 100644
      struct wined3d_string_buffer *tmp_name;
  
 diff --git a/tools/makedep.c b/tools/makedep.c
-index d8cf2f5..280f62f 100644
+index add722f80a9..24b06bbfcb2 100644
 --- a/tools/makedep.c
 +++ b/tools/makedep.c
-@@ -1559,7 +1559,7 @@ static const char *get_make_variable( const struct makefile *make, const char *n
+@@ -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;
@@ -77,5 +77,5 @@ index d8cf2f5..280f62f 100644
      var = get_make_variable( make, name );
      if (!var) return NULL;
 -- 
-2.6.2
+2.12.2
 

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

@@ -0,0 +1,268 @@
+From 994fe46f1b68d851d285a29cce904bd9f22540ea Mon Sep 17 00:00:00 2001
+From: Andrew Wesie <awesie@gmail.com>
+Date: Tue, 2 May 2017 00:59:49 -0500
+Subject: 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 24ec3099713..82bb6689d43 100644
+--- a/dlls/advapi32/security.c
++++ b/dlls/advapi32/security.c
+@@ -58,6 +58,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor(
+     SECURITY_DESCRIPTOR_RELATIVE* SecurityDescriptor,
+     LPDWORD cBytes);
+ static DWORD ParseAclStringFlags(LPCWSTR* StringAcl);
++static DWORD trustee_to_sid(DWORD nDestinationSidLength, PSID pDestinationSid, PTRUSTEEW pTrustee);
+ 
+ typedef struct _ACEFLAG
+ {
+@@ -1264,16 +1265,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;
+ } 
+ 
+ /******************************************************************************
+@@ -3766,6 +3873,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.@]
+  */
+@@ -3861,56 +4018,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 */
+-- 
+2.12.2
+

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

@@ -0,0 +1,69 @@
+From 63082c3863d8be466ed14f532653ddf35e40328a 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 d6ea3a19fad..c591f7b6e5f 100644
+--- a/dlls/advapi32/tests/security.c
++++ b/dlls/advapi32/tests/security.c
+@@ -7489,6 +7489,44 @@ static void test_child_token_sd(void)
+     HeapFree(GetProcessHeap(), 0, sd);
+ }
+ 
++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();
+@@ -7542,6 +7580,7 @@ START_TEST(security)
+     test_pseudo_tokens();
+     test_maximum_allowed();
+     test_GetExplicitEntriesFromAclW();
++    test_BuildSecurityDescriptorW();
+ 
+     /* must be the last test, modifies process token */
+     test_token_security_descriptor();
+-- 
+2.12.2
+

patches/advapi32-BuildSecurityDescriptor/definition

@@ -0,0 +1,2 @@
+Fixes: Initial implementation of advapi32.BuildSecurityDescriptorW
+Depends: server-LABEL_SECURITY_INFORMATION

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
+

patches/advapi32-Performance_Counters/0004-winspool.drv-Add-performance-counters-service-stubs.patch

@@ -0,0 +1,93 @@
+From efdcec40d501c6b27e3f3460ad0ad5fe26643e9d Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Wed, 12 Apr 2017 15:04:03 +0800
+Subject: winspool.drv: Add performance counters service stubs.
+
+---
+ dlls/winspool.drv/info.c            | 29 +++++++++++++++++++++++++++++
+ dlls/winspool.drv/winspool.drv.spec |  6 +++---
+ loader/wine.inf.in                  |  7 +++++++
+ 3 files changed, 39 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c
+index f09745d1e6b..330ce236b45 100644
+--- a/dlls/winspool.drv/info.c
++++ b/dlls/winspool.drv/info.c
+@@ -8681,3 +8681,32 @@ HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWST
+           flags, hwnd, dst, dstlen);
+     return E_NOTIMPL;
+ }
++
++/*****************************************************************************
++ *          PerfOpen [WINSPOOL.@]
++ */
++DWORD WINAPI PerfOpen(LPWSTR context)
++{
++    FIXME("%s: stub\n", debugstr_w(context));
++    return ERROR_SUCCESS;
++}
++
++/*****************************************************************************
++ *          PerfClose [WINSPOOL.@]
++ */
++DWORD WINAPI PerfClose(void)
++{
++    FIXME("stub\n");
++    return ERROR_SUCCESS;
++}
++
++/*****************************************************************************
++ *          PerfCollect [WINSPOOL.@]
++ */
++DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_count)
++{
++    FIXME("%s,%p,%p,%p: stub\n", debugstr_w(query), data, size, obj_count);
++    *size = 0;
++    *obj_count = 0;
++    return ERROR_SUCCESS;
++}
+diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec
+index 58dc60bcc9f..a23ea2ced99 100644
+--- a/dlls/winspool.drv/winspool.drv.spec
++++ b/dlls/winspool.drv/winspool.drv.spec
+@@ -2,9 +2,9 @@
+ 101 stub -noname ClusterSplOpen
+ 102 stub -noname ClusterSplClose
+ 103 stub -noname ClusterSplIsAlive
+-104 stub PerfClose
+-105 stub PerfCollect
+-106 stub PerfOpen
++104 stdcall PerfClose()
++105 stdcall PerfCollect(wstr ptr ptr ptr)
++106 stdcall PerfOpen(wstr)
+ 201 stdcall GetDefaultPrinterA(ptr ptr)
+ 202 stdcall SetDefaultPrinterA(str)
+ 203 stdcall GetDefaultPrinterW(ptr ptr)
+diff --git a/loader/wine.inf.in b/loader/wine.inf.in
+index 176647b8beb..a83cc209a96 100644
+--- a/loader/wine.inf.in
++++ b/loader/wine.inf.in
+@@ -3353,6 +3353,7 @@ StartType=3
+ ErrorControl=1
+ 
+ [SpoolerService]
++AddReg=SpoolerServiceKeys
+ Description="Loads files to memory for later printing"
+ DisplayName="Print Spooler"
+ ServiceBinary="%11%\spoolsv.exe"
+@@ -3361,6 +3362,12 @@ StartType=3
+ ErrorControl=1
+ LoadOrderGroup="SpoolerGroup"
+ 
++[SpoolerServiceKeys]
++HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Library",,"winspool.drv"
++HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Open",,"PerfOpen"
++HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Close",,"PerfClose"
++HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Collect",,"PerfCollect"
++
+ [TerminalServices]
+ Description="Remote desktop access"
+ DisplayName="Terminal Services"
+-- 
+2.13.1
+

patches/advapi32-Performance_Counters/0005-advapi32-Performance-providers-Open-expects-to-see-t.patch

@@ -0,0 +1,72 @@
+From ea1f7f191b65313ed472e660a10d75e609a31dfc Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 14 Apr 2017 16:39:21 +0800
+Subject: advapi32: Performance providers' Open() expects to see the configured
+ name as its parameter.
+
+---
+ dlls/advapi32/registry.c | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index a6e5c7903cf..37462380c40 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -1487,6 +1487,7 @@ LONG WINAPI RegSetKeyValueA( HKEY hkey, LPCSTR subkey, LPCSTR name, DWORD type,
+ struct perf_provider
+ {
+     HMODULE perflib;
++    WCHAR linkage[MAX_PATH];
+     PM_OPEN_PROC *pOpen;
+     PM_CLOSE_PROC *pClose;
+     PM_COLLECT_PROC *pCollect;
+@@ -1512,6 +1513,8 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr
+ {
+     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 };
++    static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 };
++    static const WCHAR exportW[] = { 'E','x','p','o','r','t',0 };
+     WCHAR buf[MAX_PATH], buf2[MAX_PATH];
+     DWORD err, type, len;
+     HKEY service, perf;
+@@ -1520,6 +1523,21 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr
+     if (err != ERROR_SUCCESS)
+         return FALSE;
+ 
++    provider->linkage[0] = 0;
++    err = RegOpenKeyExW(service, linkageW, 0, KEY_READ, &perf);
++    if (err == ERROR_SUCCESS)
++    {
++        len = sizeof(buf) - sizeof(WCHAR);
++        err = RegQueryValueExW(perf, exportW, NULL, &type, (BYTE *)buf, &len);
++        if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ))
++        {
++            memcpy(provider->linkage, buf, len);
++            provider->linkage[len / sizeof(WCHAR)] = 0;
++            TRACE("Export: %s\n", debugstr_w(provider->linkage));
++        }
++        RegCloseKey(perf);
++    }
++
+     err = RegOpenKeyExW(service, performanceW, 0, KEY_READ, &perf);
+     RegCloseKey(service);
+     if (err != ERROR_SUCCESS)
+@@ -1563,12 +1581,13 @@ error:
+ 
+ static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count)
+ {
++    WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL;
+     DWORD err;
+ 
+-    err = provider->pOpen(NULL);
++    err = provider->pOpen(linkage);
+     if (err != ERROR_SUCCESS)
+     {
+-        TRACE("Open error %u (%#x)\n", err, err);
++        TRACE("Open(%s) error %u (%#x)\n", debugstr_w(linkage), err, err);
+         return err;
+     }
+ 
+-- 
+2.13.1
+

patches/advapi32-Performance_Counters/0006-advapi32-If-the-query-is-not-specified-the-default-q.patch

@@ -0,0 +1,31 @@
+From f734e1d94b068a78cc10600c190bb2d527ab4866 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 14 Apr 2017 16:40:43 +0800
+Subject: advapi32: If the query is not specified the default query is
+ "Global".
+
+---
+ dlls/advapi32/registry.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index 37462380c40..0aa38c5b9b3 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -1581,9 +1581,13 @@ error:
+ 
+ static DWORD collect_data(struct perf_provider *provider, const WCHAR *query, void **data, DWORD *size, DWORD *obj_count)
+ {
++    static const WCHAR globalW[] = { 'G','l','o','b','a','l',0 };
+     WCHAR *linkage = provider->linkage[0] ? provider->linkage : NULL;
+     DWORD err;
+ 
++    if (!query || !query[0])
++        query = globalW;
++
+     err = provider->pOpen(linkage);
+     if (err != ERROR_SUCCESS)
+     {
+-- 
+2.13.1
+

patches/advapi32-Performance_Counters/0007-advapi32-Read-the-configured-object-list-for-the-per.patch

@@ -0,0 +1,53 @@
+From de80831314ecb76ac22b19b249467a600129a9e3 Mon Sep 17 00:00:00 2001
+From: Dmitry Timoshkov <dmitry@baikal.ru>
+Date: Fri, 14 Apr 2017 16:43:31 +0800
+Subject: advapi32: Read the configured object list for the performance
+ provider.
+
+FIXME: it's not currently used, but the queries should be matched
+against the configured object lists, and the providers should be
+loaded and called only in case of a match.
+---
+ dlls/advapi32/registry.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index 0aa38c5b9b3..5af8128748b 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -1488,6 +1488,7 @@ struct perf_provider
+ {
+     HMODULE perflib;
+     WCHAR linkage[MAX_PATH];
++    WCHAR objects[MAX_PATH];
+     PM_OPEN_PROC *pOpen;
+     PM_CLOSE_PROC *pClose;
+     PM_COLLECT_PROC *pCollect;
+@@ -1511,6 +1512,7 @@ static void *get_provider_entry(HKEY perf, HMODULE perflib, const char *name)
+ 
+ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *provider)
+ {
++    static const WCHAR object_listW[] = { 'O','b','j','e','c','t',' ','L','i','s','t',0 };
+     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 };
+     static const WCHAR linkageW[] = { 'L','i','n','k','a','g','e',0 };
+@@ -1543,6 +1545,16 @@ static BOOL load_provider(HKEY root, const WCHAR *name, struct perf_provider *pr
+     if (err != ERROR_SUCCESS)
+         return FALSE;
+ 
++    provider->objects[0] = 0;
++    len = sizeof(buf) - sizeof(WCHAR);
++    err = RegQueryValueExW(perf, object_listW, NULL, &type, (BYTE *)buf, &len);
++    if (err == ERROR_SUCCESS && (type == REG_SZ || type == REG_MULTI_SZ))
++    {
++        memcpy(provider->objects, buf, len);
++        provider->objects[len / sizeof(WCHAR)] = 0;
++        TRACE("Object List: %s\n", debugstr_w(provider->objects));
++    }
++
+     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))
+-- 
+2.13.1
+