Release 3.13.1

Fixes the lockup in League of Legends.

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 42dbdf9479e2e09734fa183b854d5ddfe987f203 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 ++++++++--
@@ -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 dc50b5e..8130deb 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,10 +52,10 @@ index 13452d9..554d239 100644
  struct wine_rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 559a719..4a711f4 100644
+index 7f822c4..ccfe73b 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -753,8 +753,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+@@ -756,8 +756,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
  
  #define FIELD_OFFSET(type, field) ((LONG)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
+1.9.1
 

patches/Compiler_Warnings/definition

@@ -0,0 +1,2 @@
+Depends: ml-array_size
+Depends: ml-patches

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/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
-

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

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

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

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

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

patches/advapi32-Performance_Counters/definition

@@ -1 +0,0 @@
-Fixes: [33037] Add support for querying performance counters data

patches/advapi32-Token_Integrity_Level/0009-kernel32-Implement-CreateProcessInternalW.patch

@@ -1,4 +1,4 @@
-From a7af0ee96959aab299e543e9d6938e2533780c47 Mon Sep 17 00:00:00 2001
+From 45713db2d90bd8833415ad2af1920cc792767535 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 5 Aug 2017 04:02:16 +0200
 Subject: [PATCH] kernel32: Implement CreateProcessInternalW.
@@ -11,7 +11,7 @@ Subject: [PATCH] kernel32: Implement CreateProcessInternalW.
  4 files changed, 17 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index e78c1ca..fde5f18 100644
+index de6f007..a3607d1 100644
 --- a/dlls/kernel32/kernel32.spec
 +++ b/dlls/kernel32/kernel32.spec
 @@ -315,7 +315,7 @@
@@ -24,10 +24,10 @@ index e78c1ca..fde5f18 100644
  @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr)
  @ stdcall CreateRemoteThread(long ptr long ptr long long ptr)
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 2075dfd..f9606be 100644
+index f568022..e270ca7 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -2436,12 +2436,13 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer,
+@@ -2438,12 +2438,13 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer,
      return ret;
  }
  
@@ -47,17 +47,17 @@ index 2075dfd..f9606be 100644
  {
      BOOL retv = FALSE;
      HANDLE hFile = 0;
-@@ -2454,6 +2455,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A
+@@ -2456,6 +2457,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A
  
      TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
  
 +    if (token) FIXME("Creating a process with a token is not yet implemented\n");
 +    if (new_token) FIXME("No support for returning created process token\n");
 +
-     if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, sizeof(name)/sizeof(WCHAR),
+     if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ),
                                          &hFile, &binary_info )))
          return FALSE;
-@@ -2605,8 +2609,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, L
+@@ -2607,8 +2611,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, L
        FIXME("StartupInfo.lpReserved is used, please report (%s)\n",
              debugstr_a(startup_info->lpReserved));
  
@@ -68,7 +68,7 @@ index 2075dfd..f9606be 100644
  done:
      HeapFree( GetProcessHeap(), 0, app_nameW );
      HeapFree( GetProcessHeap(), 0, cmd_lineW );
-@@ -2625,8 +2629,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line,
+@@ -2627,8 +2631,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line,
                                                LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info,
                                                LPPROCESS_INFORMATION info )
  {
@@ -80,7 +80,7 @@ index 2075dfd..f9606be 100644
  
  
 diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 8cac67f..e8fd7aa 100644
+index fb7fafe..9d6c5f9 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -209,7 +209,7 @@
@@ -93,7 +93,7 @@ index 8cac67f..e8fd7aa 100644
  @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread
  @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx
 diff --git a/include/winbase.h b/include/winbase.h
-index 4ddc1d3..e21cf6e 100644
+index 667df96..b77bced 100644
 --- a/include/winbase.h
 +++ b/include/winbase.h
 @@ -1856,6 +1856,7 @@ WINBASEAPI BOOL        WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTE

patches/advapi32-Token_Integrity_Level/0010-server-Implement-support-for-creating-processes-usin.patch

@@ -1,4 +1,4 @@
-From 23181e8cbe07ac0fd3b6effd04624122a6b0024f Mon Sep 17 00:00:00 2001
+From b534f2d905c3ba205c9a4f895149e6be8425b31e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 6 Aug 2017 02:08:05 +0200
 Subject: [PATCH] server: Implement support for creating processes using a
@@ -15,10 +15,10 @@ Subject: [PATCH] server: Implement support for creating processes using a
  7 files changed, 59 insertions(+), 21 deletions(-)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index f9606be..c0b89f9 100644
+index e270ca7..633065b 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -2034,7 +2034,7 @@ static NTSTATUS create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_des
+@@ -2036,7 +2036,7 @@ static NTSTATUS create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_des
   * Create a new process. If hFile is a valid handle we have an exe
   * file, otherwise it is a Winelib app.
   */
@@ -27,7 +27,7 @@ index f9606be..c0b89f9 100644
                              LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
                              BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
                              LPPROCESS_INFORMATION info, LPCSTR unixdir,
-@@ -2180,6 +2180,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW
+@@ -2182,6 +2182,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW
          req->info_size      = startup_info_size;
          req->env_size       = (env_end - env) * sizeof(WCHAR);
          req->process_sd_size = process_sd_size;
@@ -35,7 +35,7 @@ index f9606be..c0b89f9 100644
  
          wine_server_add_data( req, startup_info, startup_info_size );
          wine_server_add_data( req, env, (env_end - env) * sizeof(WCHAR) );
-@@ -2280,7 +2281,7 @@ error:
+@@ -2282,7 +2283,7 @@ error:
   *
   * Create a new VDM process for a 16-bit or DOS application.
   */
@@ -44,7 +44,7 @@ index f9606be..c0b89f9 100644
                                  LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
                                  BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
                                  LPPROCESS_INFORMATION info, LPCSTR unixdir,
-@@ -2304,7 +2305,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L
+@@ -2306,7 +2307,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L
          return FALSE;
      }
      sprintfW(new_cmd_line, argsW, winevdmW, buffer, cmd_line);
@@ -53,7 +53,7 @@ index f9606be..c0b89f9 100644
                            flags, startup, info, unixdir, binary_info, exec_only );
      HeapFree( GetProcessHeap(), 0, new_cmd_line );
      return ret;
-@@ -2316,7 +2317,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L
+@@ -2318,7 +2319,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L
   *
   * Create a new cmd shell process for a .BAT file.
   */
@@ -62,7 +62,7 @@ index f9606be..c0b89f9 100644
                                  LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
                                  BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
                                  LPPROCESS_INFORMATION info )
-@@ -2344,8 +2345,8 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L
+@@ -2346,8 +2347,8 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L
      strcatW( newcmdline, quotW );
      strcatW( newcmdline, cmd_line );
      strcatW( newcmdline, quotW );
@@ -73,7 +73,7 @@ index f9606be..c0b89f9 100644
      HeapFree( GetProcessHeap(), 0, newcmdline );
      return ret;
  }
-@@ -2455,7 +2456,9 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
+@@ -2457,7 +2458,9 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
  
      TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
  
@@ -83,8 +83,8 @@ index f9606be..c0b89f9 100644
 +
      if (new_token) FIXME("No support for returning created process token\n");
  
-     if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, sizeof(name)/sizeof(WCHAR),
-@@ -2513,20 +2516,20 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
+     if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ),
+@@ -2515,20 +2518,20 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
                 debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32,
                 wine_dbgstr_longlong(binary_info.res_start), wine_dbgstr_longlong(binary_info.res_end),
                 binary_info.arch, (binary_info.flags & BINARY_FLAG_FAKEDLL) ? ", fakedll" : "" );
@@ -108,7 +108,7 @@ index f9606be..c0b89f9 100644
                                 inherit, flags, startup_info, info, unixdir, &binary_info, FALSE );
          break;
      case BINARY_UNKNOWN:
-@@ -2538,7 +2541,7 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
+@@ -2540,7 +2543,7 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
                  TRACE( "starting %s as DOS binary\n", debugstr_w(name) );
                  binary_info.type = BINARY_DOS;
                  binary_info.arch = IMAGE_FILE_MACHINE_I386;
@@ -117,7 +117,7 @@ index f9606be..c0b89f9 100644
                                             inherit, flags, startup_info, info, unixdir,
                                             &binary_info, FALSE );
                  break;
-@@ -2546,7 +2549,7 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
+@@ -2548,7 +2551,7 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
              if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) )
              {
                  TRACE( "starting %s as batch binary\n", debugstr_w(name) );
@@ -126,7 +126,7 @@ index f9606be..c0b89f9 100644
                                             inherit, flags, startup_info, info );
                  break;
              }
-@@ -2666,12 +2669,12 @@ static void exec_process( LPCWSTR name )
+@@ -2668,12 +2671,12 @@ static void exec_process( LPCWSTR name )
                 debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32,
                 wine_dbgstr_longlong(binary_info.res_start), wine_dbgstr_longlong(binary_info.res_end),
                 binary_info.arch );
@@ -141,7 +141,7 @@ index f9606be..c0b89f9 100644
                          FALSE, 0, &startup_info, &info, NULL, &binary_info, TRUE );
          break;
      case BINARY_UNKNOWN:
-@@ -2685,7 +2688,7 @@ static void exec_process( LPCWSTR name )
+@@ -2687,7 +2690,7 @@ static void exec_process( LPCWSTR name )
      case BINARY_WIN16:
      case BINARY_DOS:
          TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) );
@@ -248,7 +248,7 @@ index 78e88ec..313c36a 100644
  extern struct thread *get_process_first_thread( struct process *process );
  extern struct process *get_process_from_id( process_id_t id );
 diff --git a/server/protocol.def b/server/protocol.def
-index 5fb6e38..f0bc83b 100644
+index b29df0a..95a120e 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
 @@ -748,6 +748,7 @@ struct rawinput_device

patches/api-ms-win-Stub_DLLs/definition

@@ -1,21 +1,5 @@
-Fixes: Add api-ms-win-core-quirks-l1-1-0 dll
-Fixes: Add api-ms-win-appmodel-runtime-l1-1-1 dll
-Fixes: Add api-ms-win-core-apiquery-l1-1-0 dll
-Fixes: Add api-ms-win-core-heap-l2-1-0 dll
-Fixes: Add api-ms-win-shcore-obsolete-l1-1-0 dll
-Fixes: Add ext-ms-win-xaml-pal-l1-1-0 dll
-Fixes: Add ext-ms-win-appmodel-usercontext-l1-1-0 dll
-Fixes: Add api-ms-win-shcore-thread-l1-1-0 dll
-Fixes: Add api-ms-win-core-memory-l1-1-2 dll
-Fixes: Add api-ms-win-core-shlwapi-obsolete-l1-2-0 dll
-Fixes: Add api-ms-win-shcore-stream-l1-1-0 dll
-Fixes: Add ext-ms-win-ntuser-mouse-l1-1-0 dll
-Fixes: Add ext-ms-win-uxtheme-themes-l1-1-0 dll
-Fixes: Add api-ms-win-rtcore-ntuser-window-l1-1-0 dll
-Fixes: Add ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 dll
-Fixes: Add api-ms-win-rtcore-ntuser-draw-l1-1-0 dll
-Fixes: Add ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 dll
-Fixes: Add ext-ms-win-kernel32-package-current-l1-1-0 dll
+Fixes: Add ext-ms-win-xaml-pal-l1-1-0 dll and XamlBehaviourEnabled() stub
+Fixes: Add ext-ms-win-xaml-pal-l1-1-0.GetThemeServices() stub
+Fixes: Add ext-ms-win-appmodel-usercontext-l1-1-0 dll and UserContextExtInitialize() stub
 Fixes: Add iertutil dll
-Fixes: Add shcore dll
-Fixes: [40451] Add feclient dll
+Fixes: Return dummy interface in some uiautomationcore functions

patches/bcrypt-BCryptGenerateKeyPair/0001-bcrypt-Add-support-for-algorithm-ECDH-P256.patch

@@ -1,18 +1,19 @@
-From 41147c17b99a8e9c556449613228315e16f067b7 Mon Sep 17 00:00:00 2001
+From ee38b7a672771d088ee5c4e58300623259020fb6 Mon Sep 17 00:00:00 2001
 From: Maxime Lombard <berillions@gmail.com>
 Date: Sun, 10 Jun 2018 14:47:01 +0200
 Subject: [PATCH 1/3] bcrypt: Add support for algorithm ECDH P256.
 
 ---
- dlls/bcrypt/bcrypt_main.c | 3 +++
- include/bcrypt.h          | 1 +
- 2 files changed, 4 insertions(+)
+ dlls/bcrypt/bcrypt_internal.h | 1 +
+ dlls/bcrypt/bcrypt_main.c     | 2 ++
+ include/bcrypt.h              | 1 +
+ 3 files changed, 4 insertions(+)
 
-diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 29a0a785d9..f2f4c93ab8 100644
---- a/dlls/bcrypt/bcrypt_main.c
-+++ b/dlls/bcrypt/bcrypt_main.c
-@@ -288,6 +288,7 @@ enum alg_id
+diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h
+index 11c8b30..fd8cc90 100644
+--- a/dlls/bcrypt/bcrypt_internal.h
++++ b/dlls/bcrypt/bcrypt_internal.h
+@@ -137,6 +137,7 @@ enum alg_id
      ALG_ID_SHA256,
      ALG_ID_SHA384,
      ALG_ID_SHA512,
@@ -20,15 +21,19 @@ index 29a0a785d9..f2f4c93ab8 100644
      ALG_ID_ECDSA_P256,
      ALG_ID_ECDSA_P384,
  };
-@@ -322,6 +323,7 @@ alg_props[] =
+diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
+index 24065c1..003e8f3 100644
+--- a/dlls/bcrypt/bcrypt_main.c
++++ b/dlls/bcrypt/bcrypt_main.c
+@@ -114,6 +114,7 @@ alg_props[] =
      /* ALG_ID_SHA256 */ {  286,   32,  512, BCRYPT_SHA256_ALGORITHM, FALSE },
      /* ALG_ID_SHA384 */ {  382,   48, 1024, BCRYPT_SHA384_ALGORITHM, FALSE },
      /* ALG_ID_SHA512 */ {  382,   64, 1024, BCRYPT_SHA512_ALGORITHM, FALSE },
-+    /* ALG_ID_ECDH_P256 */ { 0,   0,     0, BCRYPT_ECDH_P256_ALGORITHM, FALSE  },
++    /* ALG_ID_ECDH_P256 */  { 0,   0,     0, BCRYPT_ECDH_P256_ALGORITHM, FALSE },
      /* ALG_ID_ECDSA_P256 */ { 0,   0,     0, BCRYPT_ECDSA_P256_ALGORITHM, FALSE  },
      /* ALG_ID_ECDSA_P384 */ { 0,   0,     0, BCRYPT_ECDSA_P384_ALGORITHM, FALSE  },
  };
-@@ -400,6 +402,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
+@@ -184,6 +185,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR
      else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256;
      else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384;
      else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512;
@@ -37,17 +42,17 @@ index 29a0a785d9..f2f4c93ab8 100644
      else if (!strcmpW( id, BCRYPT_ECDSA_P384_ALGORITHM )) alg_id = ALG_ID_ECDSA_P384;
      else
 diff --git a/include/bcrypt.h b/include/bcrypt.h
-index df54f621fa..d39920c3f6 100644
+index d3e4b99..676db72 100644
 --- a/include/bcrypt.h
 +++ b/include/bcrypt.h
 @@ -81,6 +81,7 @@ typedef LONG NTSTATUS;
  #define BCRYPT_SHA256_ALGORITHM     (const WCHAR []){'S','H','A','2','5','6',0}
  #define BCRYPT_SHA384_ALGORITHM     (const WCHAR []){'S','H','A','3','8','4',0}
  #define BCRYPT_SHA512_ALGORITHM     (const WCHAR []){'S','H','A','5','1','2',0}
-+#define BCRYPT_ECDH_P256_ALGORITHM (const WCHAR []){'E','C','D','H','_','P','2','5','6',0}
++#define BCRYPT_ECDH_P256_ALGORITHM  (const WCHAR []){'E','C','D','H','_','P','2','5','6',0}
  #define BCRYPT_ECDSA_P256_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','2','5','6',0}
  #define BCRYPT_ECDSA_P384_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','3','8','4',0}
  #define BCRYPT_ECDSA_P521_ALGORITHM (const WCHAR []){'E','C','D','S','A','_','P','5','2','1',0}
 -- 
-2.17.1
+1.9.1
 

patches/bcrypt-BCryptGenerateKeyPair/0002-bcrypt-Add-BCryptGenerateKeyPair-stub.patch

@@ -1,4 +1,4 @@
-From 392cf1c3f3ddb6fa7935a6cd1f16d46004667aab Mon Sep 17 00:00:00 2001
+From 8ebad635c033bf41392e23ee50494195fdce73b9 Mon Sep 17 00:00:00 2001
 From: Maxime Lombard <berillions@gmail.com>
 Date: Sun, 10 Jun 2018 14:50:31 +0200
 Subject: [PATCH 2/3] bcrypt: Add BCryptGenerateKeyPair stub.
@@ -10,10 +10,10 @@ Subject: [PATCH 2/3] bcrypt: Add BCryptGenerateKeyPair stub.
  3 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 78824d73b3..ccfec632d6 100644
+index f4d9a57..1e81ad1 100644
 --- a/dlls/bcrypt/bcrypt.spec
 +++ b/dlls/bcrypt/bcrypt.spec
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
  @ stdcall BCryptFinishHash(ptr ptr long long)
  @ stub BCryptFreeBuffer
  @ stdcall BCryptGenRandom(ptr ptr long long)
@@ -23,12 +23,12 @@ index 78824d73b3..ccfec632d6 100644
  @ stdcall BCryptGetFipsAlgorithmMode(ptr)
  @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long)
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index f2f4c93ab8..b4ac0168e6 100644
+index 003e8f3..0d94634 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -336,6 +336,12 @@ struct algorithm
-     BOOL hmac;
- };
+@@ -160,6 +160,12 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c
+     return STATUS_NOT_IMPLEMENTED;
+ }
  
 +NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, ULONG input_len, ULONG flags)
 +{
@@ -36,14 +36,14 @@ index f2f4c93ab8..b4ac0168e6 100644
 +    return STATUS_SUCCESS;
 +}
 +
- NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG count, ULONG flags)
+ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
  {
-     const DWORD supported_flags = BCRYPT_USE_SYSTEM_PREFERRED_RNG;
+     const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
 diff --git a/include/bcrypt.h b/include/bcrypt.h
-index d39920c3f6..e6b7d4a9ac 100644
+index 676db72..ce11685 100644
 --- a/include/bcrypt.h
 +++ b/include/bcrypt.h
-@@ -223,6 +223,7 @@ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
+@@ -224,6 +224,7 @@ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
  NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
  NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
  NTSTATUS WINAPI BCryptFinishHash(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
@@ -52,5 +52,5 @@ index d39920c3f6..e6b7d4a9ac 100644
  NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG);
  NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *);
 -- 
-2.17.1
+1.9.1
 

patches/bcrypt-BCryptGenerateKeyPair/0003-bcrypt-Add-BCryptFinalizeKeyPair-stub.patch

@@ -1,4 +1,4 @@
-From 85e1f780a0d26d6c1e286c944fbcf25e762633b9 Mon Sep 17 00:00:00 2001
+From 046863d1eb6db25555743cbbc257260387b31c19 Mon Sep 17 00:00:00 2001
 From: Maxime Lombard <berillions@gmail.com>
 Date: Sun, 10 Jun 2018 14:52:31 +0200
 Subject: [PATCH 3/3] bcrypt: Add BCryptFinalizeKeyPair stub.
@@ -10,10 +10,10 @@ Subject: [PATCH 3/3] bcrypt: Add BCryptFinalizeKeyPair stub.
  3 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index ccfec632d6..891381f2a8 100644
+index 1e81ad1..052a099 100644
 --- a/dlls/bcrypt/bcrypt.spec
 +++ b/dlls/bcrypt/bcrypt.spec
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
  @ stub BCryptEnumProviders
  @ stub BCryptEnumRegisteredProviders
  @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long)
@@ -23,12 +23,12 @@ index ccfec632d6..891381f2a8 100644
  @ stub BCryptFreeBuffer
  @ stdcall BCryptGenRandom(ptr ptr long long)
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index b4ac0168e6..69037971bf 100644
+index 0d94634..40a3405 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -336,6 +336,12 @@ struct algorithm
-     BOOL hmac;
- };
+@@ -166,6 +166,12 @@ NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HA
+     return STATUS_SUCCESS;
+ }
  
 +NTSTATUS WINAPI BCryptFinalizeKeyPair(BCRYPT_KEY_HANDLE key, ULONG dwflags)
 +{
@@ -36,14 +36,14 @@ index b4ac0168e6..69037971bf 100644
 +    return STATUS_SUCCESS;
 +}
 +
- NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, ULONG input_len, ULONG flags)
+ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
  {
-     FIXME("%p, %p, %u, %08x - stub\n", algorithm, handle, input_len, flags);
+     const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
 diff --git a/include/bcrypt.h b/include/bcrypt.h
-index e6b7d4a9ac..b5844a144d 100644
+index ce11685..b8e93a6 100644
 --- a/include/bcrypt.h
 +++ b/include/bcrypt.h
-@@ -222,6 +222,7 @@ NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
+@@ -223,6 +223,7 @@ NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
  NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
  NTSTATUS WINAPI BCryptEncrypt(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG);
  NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG, ULONG *, BCRYPT_ALGORITHM_IDENTIFIER **, ULONG);
@@ -52,5 +52,5 @@ index e6b7d4a9ac..b5844a144d 100644
  NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, ULONG, ULONG);
  NTSTATUS WINAPI BCryptGenerateSymmetricKey(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG);
 -- 
-2.17.1
+1.9.1
 

patches/browseui-Progress_Dialog/0001-browseui-Implement-IProgressDialog-SetAnimation.patch

@@ -1,53 +0,0 @@
-From fe4f06bfdb1a53e0be15aca8f1f8f897f7fef632 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 27 Feb 2015 17:46:11 +0100
-Subject: browseui: Implement IProgressDialog::SetAnimation.
-
----
- dlls/browseui/progressdlg.c | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
-index 598197b..a14fa17 100644
---- a/dlls/browseui/progressdlg.c
-+++ b/dlls/browseui/progressdlg.c
-@@ -175,6 +175,7 @@ static INT_PTR CALLBACK dialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
-         case WM_INITDIALOG:
-         {
-             struct create_params *params = (struct create_params *)lParam;
-+            LONG_PTR style;
- 
-             /* Note: until we set the hEvent, the object is protected by
-              * the critical section held by StartProgress */
-@@ -191,6 +192,10 @@ static INT_PTR CALLBACK dialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
-             if (This->dwFlags & PROGDLG_NOMINIMIZE)
-                 SetWindowLongW(hwnd, GWL_STYLE, GetWindowLongW(hwnd, GWL_STYLE) & (~WS_MINIMIZEBOX));
- 
-+            style = GetWindowLongPtrW(GetDlgItem(hwnd, IDC_ANIMATION), GWL_STYLE);
-+            style |= ACS_AUTOPLAY | ACS_TRANSPARENT;
-+            SetWindowLongPtrW(GetDlgItem(hwnd, IDC_ANIMATION), GWL_STYLE, style);
-+
-             update_dialog(This, 0xffffffff);
-             This->dwUpdate = 0;
-             This->isCancelled = FALSE;
-@@ -396,7 +401,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw
- 
- static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId)
- {
--    FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId);
-+    ProgressDialog *This = impl_from_IProgressDialog(iface);
-+
-+    TRACE("(%p, %p, %d)\n", iface, hInstance, uiResourceId);
-+
-+    if (uiResourceId & ~0xFFFF)
-+        return S_OK;
-+
-+    if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId))
-+        WARN("Failed to load animation\n");
-+
-     return S_OK;
- }
- 
--- 
-2.3.0
-

patches/crypt32-ECDSA_Cert_Chains/0006-crypt32-tests-Basic-tests-for-decoding-ECDSA-signed-.patch

@@ -1,18 +1,17 @@
-From 929e67829c47d2fcb99f0aac8ac983f0c3a56836 Mon Sep 17 00:00:00 2001
+From 484fbc0054dadaf4a410ae3497ccf3338ef7d81c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 27 Sep 2017 18:31:07 +0200
 Subject: crypt32/tests: Basic tests for decoding ECDSA signed certificate.
 
 ---
  dlls/crypt32/tests/encode.c | 168 ++++++++++++++++++++++++++++++++++++++++++++
- include/wincrypt.h          |  15 ++++
- 2 files changed, 183 insertions(+)
+ 1 file changed, 168 insertions(+)
 
 diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
-index 8cb384c3395..fa389c41ff1 100644
+index a4daec0..729f3e4 100644
 --- a/dlls/crypt32/tests/encode.c
 +++ b/dlls/crypt32/tests/encode.c
-@@ -8352,6 +8352,173 @@ static void testPortPublicKeyInfo(void)
+@@ -8509,6 +8509,173 @@ static void testPortPublicKeyInfo(void)
      ok(ret,"CryptAcquireContextA failed\n");
  }
  
@@ -186,66 +185,12 @@ index 8cb384c3395..fa389c41ff1 100644
  START_TEST(encode)
  {
      static const DWORD encodings[] = { X509_ASN_ENCODING, PKCS_7_ASN_ENCODING,
-@@ -8445,4 +8612,5 @@ START_TEST(encode)
+@@ -8602,4 +8769,5 @@ START_TEST(encode)
          test_decodeRsaPrivateKey(encodings[i]);
      }
      testPortPublicKeyInfo();
 +    testECDSACert();
  }
-diff --git a/include/wincrypt.h b/include/wincrypt.h
-index 8b120206cd8..22ff350923a 100644
---- a/include/wincrypt.h
-+++ b/include/wincrypt.h
-@@ -288,6 +288,11 @@ typedef struct _CERT_KEY_ATTRIBUTES_INFO {
-     PCERT_PRIVATE_KEY_VALIDITY pPrivateKeyUsagePeriod;
- } CERT_KEY_ATTRIBUTES_INFO, *PCERT_KEY_ATTRIBUTES_INFO;
- 
-+typedef struct _CERT_ECC_SIGNATURE {
-+    CRYPT_UINT_BLOB r;
-+    CRYPT_UINT_BLOB s;
-+} CERT_ECC_SIGNATURE, *PCERT_ECC_SIGNATURE;
-+
- /* byte 0 */
- #define CERT_DIGITAL_SIGNATURE_KEY_USAGE 0x80
- #define CERT_NON_REPUDIATION_KEY_USAGE   0x40
-@@ -2878,6 +2883,12 @@ typedef struct _CTL_FIND_SUBJECT_PARA
- #define szOID_X957                          "1.2.840.10040"
- #define szOID_X957_DSA                      "1.2.840.10040.4.1"
- #define szOID_X957_SHA1DSA                  "1.2.840.10040.4.3"
-+#define szOID_ECC_PUBLIC_KEY                "1.2.840.10045.2.1"
-+#define szOID_ECC_CURVE_P256                "1.2.840.10045.3.1.7"
-+#define szOID_ECDSA_SPECIFIED               "1.2.840.10045.4.3"
-+#define szOID_ECDSA_SHA256                  "1.2.840.10045.4.3.2"
-+#define szOID_ECDSA_SHA384                  "1.2.840.10045.4.3.3"
-+#define szOID_ECDSA_SHA512                  "1.2.840.10045.4.3.4"
- #define szOID_DS                            "2.5"
- #define szOID_DSALG                         "2.5.8"
- #define szOID_DSALG_CRPT                    "2.5.8.1"
-@@ -2919,6 +2930,8 @@ typedef struct _CTL_FIND_SUBJECT_PARA
- #define szOID_OIWDIR_SIGN                   "1.3.14.7.2.3"
- #define szOID_OIWDIR_md2                    "1.3.14.7.2.2.1"
- #define szOID_OIWDIR_md2RSA                 "1.3.14.7.2.3.1"
-+#define szOID_ECC_CURVE_P384                "1.3.132.0.34"
-+#define szOID_ECC_CURVE_P521                "1.3.132.0.35"
- #define szOID_INFOSEC                       "2.16.840.1.101.2.1"
- #define szOID_INFOSEC_sdnsSignature         "2.16.840.1.101.2.1.1.1"
- #define szOID_INFOSEC_mosaicSignature       "2.16.840.1.101.2.1.1.2"
-@@ -3224,6 +3237,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA
- #define X509_PKIX_POLICY_QUALIFIER_USERNOTICE ((LPCSTR)46)
- #define X509_DH_PUBLICKEY                    X509_MULTI_BYTE_UINT
- #define X509_DH_PARAMETERS                   ((LPCSTR)47)
-+#define X509_ECC_SIGNATURE                   ((LPCSTR)47)
- #define PKCS_ATTRIBUTES                      ((LPCSTR)48)
- #define PKCS_SORTED_CTL                      ((LPCSTR)49)
- #define X942_DH_PARAMETERS                   ((LPCSTR)50)
-@@ -3241,6 +3255,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA
- #define CMC_ADD_EXTENSIONS                   ((LPCSTR)62)
- #define CMC_ADD_ATTRIBUTES                   ((LPCSTR)63)
- #define X509_CERTIFICATE_TEMPLATE            ((LPCSTR)64)
-+#define X509_OBJECT_IDENTIFIER               ((LPCSTR)73)
- #define PKCS7_SIGNER_INFO                    ((LPCSTR)500)
- #define CMS_SIGNER_INFO                      ((LPCSTR)501)
- 
 -- 
-2.14.1
+2.7.4