Release 2.7.

README.md

@@ -13,7 +13,7 @@ Installation
 
 Ready-to-use packages for Wine Staging are available for a variety of Linux
 distributions and for Mac OS X. Just follow the
-[installation instructions](https://github.com/wine-compholio/wine-staging/wiki/Installation)
+[installation instructions](https://wine-staging.com/installation.html)
 for your operating system.
 
 On most distributions the `wine-staging` package is installed to

patches/Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch

@@ -0,0 +1,26 @@
+From 43628d9b1905396ff6442e4f1e07c9dd48739b19 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 14 Apr 2017 15:57:18 +0200
+Subject: ole32: Fix compilation with recent versions of gcc.
+
+---
+ dlls/ole32/storage32.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
+index 4fcfd9c362..2b23ab8eb8 100644
+--- a/dlls/ole32/storage32.h
++++ b/dlls/ole32/storage32.h
+@@ -526,6 +526,9 @@ StgStreamImpl* StgStreamImpl_Construct(
+ /******************************************************************************
+  * Endian conversion macros
+  */
++#undef htole32
++#undef htole16
++
+ #ifdef WORDS_BIGENDIAN
+ 
+ #define htole32(x) RtlUlongByteSwap(x)
+-- 
+2.12.2
+

patches/Exagear/0001-ntdll-Implement-emulation-of-SIDT-instruction-when-u.patch

@@ -1,287 +0,0 @@
-From 472184e5801de5d1fb92d275d9c0c7e840c9a0bf Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 11 Nov 2014 03:11:33 +0100
-Subject: ntdll: Implement emulation of SIDT instruction when using Exagear.
-
----
- configure.ac             |   8 ++
- dlls/ntdll/signal_i386.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 231 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 1e6bba3..43bf0db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,7 @@ AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 supp
- AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
- AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
- AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable maintainer-specific build rules]))
-+AC_ARG_ENABLE(exagear-compat, AS_HELP_STRING([--enable-exagear-compat],[use workarounds for known problems in the Exagear emulator]))
- 
- AC_ARG_WITH(alsa,      AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
-             [if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
-@@ -364,6 +365,13 @@ WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false],
-                   [gettext tools not found (or too old), translations won't be built.],
-                   [enable_po])
- 
-+dnl **** Enable Exagear workarounds ****
-+
-+if test "x$enable_exagear_compat" = "xyes"
-+then
-+  AC_DEFINE(EXAGEAR_COMPAT, 1, [Define if you want to enable Exagear emulator workarounds])
-+fi
-+
- dnl **** Check for some libraries ****
- 
- dnl Check for -li386 for NetBSD and OpenBSD
-diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
-index ee8855a..4269329 100644
---- a/dlls/ntdll/signal_i386.c
-+++ b/dlls/ntdll/signal_i386.c
-@@ -96,6 +96,14 @@ typedef struct
-     BYTE Reserved4[96];
- } XMM_SAVE_AREA32;
- 
-+#include "pshpack1.h"
-+struct idtr
-+{
-+    WORD  limit;
-+    BYTE *base;
-+};
-+#include "poppack.h"
-+
- /***********************************************************************
-  * signal context platform-specific definitions
-  */
-@@ -1898,6 +1906,213 @@ static inline DWORD get_fpu_code( const CONTEXT *context )
- }
- 
- 
-+#ifdef EXAGEAR_COMPAT
-+
-+/***********************************************************************
-+ *           INSTR_GetOperandAddr
-+ *
-+ * Return the address of an instruction operand (from the mod/rm byte).
-+ */
-+static BYTE *INSTR_GetOperandAddr( CONTEXT *context, const BYTE *instr,
-+                                   int long_addr, int segprefix, int *len )
-+{
-+    int mod, rm, base = 0, index = 0, ss = 0, off;
-+
-+#define GET_VAL(val,type) \
-+    { *val = *(type *)instr; instr += sizeof(type); *len += sizeof(type); }
-+
-+    *len = 0;
-+    GET_VAL( &mod, BYTE );
-+    rm = mod & 7;
-+    mod >>= 6;
-+
-+    if (mod == 3)
-+    {
-+        switch(rm)
-+        {
-+        case 0: return (BYTE *)&context->Eax;
-+        case 1: return (BYTE *)&context->Ecx;
-+        case 2: return (BYTE *)&context->Edx;
-+        case 3: return (BYTE *)&context->Ebx;
-+        case 4: return (BYTE *)&context->Esp;
-+        case 5: return (BYTE *)&context->Ebp;
-+        case 6: return (BYTE *)&context->Esi;
-+        case 7: return (BYTE *)&context->Edi;
-+        }
-+    }
-+
-+    if (long_addr)
-+    {
-+        if (rm == 4)
-+        {
-+            BYTE sib;
-+            GET_VAL( &sib, BYTE );
-+            rm = sib & 7;
-+            ss = sib >> 6;
-+            switch((sib >> 3) & 7)
-+            {
-+            case 0: index = context->Eax; break;
-+            case 1: index = context->Ecx; break;
-+            case 2: index = context->Edx; break;
-+            case 3: index = context->Ebx; break;
-+            case 4: index = 0; break;
-+            case 5: index = context->Ebp; break;
-+            case 6: index = context->Esi; break;
-+            case 7: index = context->Edi; break;
-+            }
-+        }
-+
-+        switch(rm)
-+        {
-+        case 0: base = context->Eax; break;
-+        case 1: base = context->Ecx; break;
-+        case 2: base = context->Edx; break;
-+        case 3: base = context->Ebx; break;
-+        case 4: base = context->Esp; break;
-+        case 5: base = context->Ebp; break;
-+        case 6: base = context->Esi; break;
-+        case 7: base = context->Edi; break;
-+        }
-+        switch (mod)
-+        {
-+        case 0:
-+            if (rm == 5)  /* special case: ds:(disp32) */
-+            {
-+                GET_VAL( &base, DWORD );
-+            }
-+            break;
-+
-+        case 1:  /* 8-bit disp */
-+            GET_VAL( &off, BYTE );
-+            base += (signed char)off;
-+            break;
-+
-+        case 2:  /* 32-bit disp */
-+            GET_VAL( &off, DWORD );
-+            base += (signed long)off;
-+            break;
-+        }
-+    }
-+    else  /* short address */
-+    {
-+        switch(rm)
-+        {
-+        case 0:  /* ds:(bx,si) */
-+            base = LOWORD(context->Ebx) + LOWORD(context->Esi);
-+            break;
-+        case 1:  /* ds:(bx,di) */
-+            base = LOWORD(context->Ebx) + LOWORD(context->Edi);
-+            break;
-+        case 2:  /* ss:(bp,si) */
-+            base = LOWORD(context->Ebp) + LOWORD(context->Esi);
-+            break;
-+        case 3:  /* ss:(bp,di) */
-+            base = LOWORD(context->Ebp) + LOWORD(context->Edi);
-+            break;
-+        case 4:  /* ds:(si) */
-+            base = LOWORD(context->Esi);
-+            break;
-+        case 5:  /* ds:(di) */
-+            base = LOWORD(context->Edi);
-+            break;
-+        case 6:  /* ss:(bp) */
-+            base = LOWORD(context->Ebp);
-+            break;
-+        case 7:  /* ds:(bx) */
-+            base = LOWORD(context->Ebx);
-+            break;
-+        }
-+
-+        switch(mod)
-+        {
-+        case 0:
-+            if (rm == 6)  /* special case: ds:(disp16) */
-+            {
-+                GET_VAL( &base, WORD );
-+            }
-+            break;
-+
-+        case 1:  /* 8-bit disp */
-+            GET_VAL( &off, BYTE );
-+            base += (signed char)off;
-+            break;
-+
-+        case 2:  /* 16-bit disp */
-+            GET_VAL( &off, WORD );
-+            base += (signed short)off;
-+            break;
-+        }
-+        base &= 0xffff;
-+    }
-+    /* FIXME: we assume that all segments have a base of 0 */
-+    return (BYTE *)(base + (index << ss));
-+#undef GET_VAL
-+}
-+
-+
-+/***********************************************************************
-+ *           check_invalid_instr
-+ *
-+ * Support for instructions not implemented by Exagear.
-+ */
-+static inline BOOL check_invalid_instr( CONTEXT *context )
-+{
-+    const BYTE *instr;
-+    unsigned int prefix_count = 0;
-+    int len, long_addr = 1;
-+
-+    if (!wine_ldt_is_system( context->SegCs )) return FALSE;
-+    instr = (BYTE *)context->Eip;
-+
-+    for (;;) switch (*instr)
-+    {
-+    /* instruction prefixes */
-+    case 0x2e:  /* %cs: */
-+    case 0x36:  /* %ss: */
-+    case 0x3e:  /* %ds: */
-+    case 0x26:  /* %es: */
-+    case 0x64:  /* %fs: */
-+    case 0x65:  /* %gs: */
-+    case 0x66:  /* opcode size */
-+    case 0x67:  /* addr size */
-+    case 0xf0:  /* lock */
-+    case 0xf2:  /* repne */
-+    case 0xf3:  /* repe */
-+        if (++prefix_count >= 15) return FALSE;
-+        if (*instr == 0x67) long_addr = !long_addr; /* addr size */
-+        instr++;
-+        continue;
-+    case 0x0f: /* extended instruction */
-+        switch (instr[1])
-+        {
-+        case 0x01:
-+            if (((instr[2] >> 3) & 7) == 1) /* sidt m */
-+            {
-+                struct idtr ret;
-+                BYTE *addr;
-+
-+                if ((instr[2] >> 6) == 3) return FALSE; /* loading to register not allowed */
-+                addr = INSTR_GetOperandAddr( context, instr + 2, long_addr, 0, &len );
-+
-+                /* fake IDT structure */
-+                ret.limit = 0xfff;
-+                ret.base  = (void *)0xff000000;
-+                memcpy(addr, &ret, sizeof(ret));
-+
-+                context->Eip += prefix_count + len + 2;
-+                return TRUE;
-+            }
-+            break;
-+        }
-+        return FALSE;
-+    default:
-+        return FALSE;
-+    }
-+}
-+
-+#endif /* EXAGEAR_COMPAT */
-+
-+
- /**********************************************************************
-  *		raise_segv_exception
-  */
-@@ -1907,6 +2122,14 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context
- 
-     switch(rec->ExceptionCode)
-     {
-+#ifdef EXAGEAR_COMPAT
-+    case EXCEPTION_ILLEGAL_INSTRUCTION:
-+        {
-+            if (check_invalid_instr( context ))
-+                goto done;
-+        }
-+        break;
-+#endif
-     case EXCEPTION_ACCESS_VIOLATION:
-         if (rec->NumberParameters == 2)
-         {
--- 
-2.7.1
-

patches/Exagear/0002-ntdll-Fix-issues-with-write-watches-when-using-Exage.patch

@@ -1,51 +0,0 @@
-From 5a4827d5c16aefd82029583710b9032a2356917b Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sat, 22 Nov 2014 05:49:30 +0100
-Subject: ntdll: Fix issues with write watches when using Exagear.
-
----
- dlls/ntdll/virtual.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
-index f7aae0b..3fa2027 100644
---- a/dlls/ntdll/virtual.c
-+++ b/dlls/ntdll/virtual.c
-@@ -1558,6 +1558,26 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
-     {
-         void *page = ROUND_ADDR( addr, page_mask );
-         BYTE *vprot = &view->prot[((const char *)page - (const char *)view->base) >> page_shift];
-+#ifdef EXAGEAR_COMPAT
-+        /* Exagear doesn't correctly set err, so always check for write watches, and
-+         * retry after removing the VPROT_WRITEWATCH or VPROT_WRITECOPY flag. In
-+         * contrary to the general implementation below this is not completely race-
-+         * condition safe. When multiple threads trigger the write watch at the same
-+         * time only the first thread will properly continue the execution, the rest
-+         * will crash. */
-+        if ((view->protect & VPROT_WRITEWATCH) && (*vprot & VPROT_WRITEWATCH))
-+        {
-+            *vprot &= ~VPROT_WRITEWATCH;
-+            VIRTUAL_SetProt( view, page, page_size, *vprot );
-+            if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
-+        }
-+        if (*vprot & VPROT_WRITECOPY)
-+        {
-+            *vprot = (*vprot & ~VPROT_WRITECOPY) | VPROT_WRITE;
-+            VIRTUAL_SetProt( view, page, page_size, *vprot );
-+            if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
-+        }
-+#else
-         if (err & EXCEPTION_WRITE_FAULT)
-         {
-             if ((view->protect & VPROT_WRITEWATCH) && (*vprot & VPROT_WRITEWATCH))
-@@ -1573,6 +1593,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
-             /* ignore fault if page is writable now */
-             if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS;
-         }
-+#endif
-         if (!on_signal_stack && (*vprot & VPROT_GUARD))
-         {
-             VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD );
--- 
-2.2.2
-

patches/Exagear/0003-server-Don-t-attempt-to-use-ptrace-when-running-with.patch

@@ -1,25 +0,0 @@
-From 67cc0e23b26d5d9abda7eb771dc2bec309cb8650 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 23 Nov 2014 22:33:51 +0100
-Subject: server: Don't attempt to use ptrace when running with Exagear.
-
----
- server/ptrace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/server/ptrace.c b/server/ptrace.c
-index cb436b6..fb29b5a 100644
---- a/server/ptrace.c
-+++ b/server/ptrace.c
-@@ -531,7 +531,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base,
- 
- 
- #if defined(linux) && (defined(HAVE_SYS_USER_H) || defined(HAVE_ASM_USER_H)) \
--    && (defined(__i386__) || defined(__x86_64__))
-+    && (defined(__i386__) || defined(__x86_64__)) && !defined(EXAGEAR_COMPAT)
- 
- #ifdef HAVE_SYS_USER_H
- #include <sys/user.h>
--- 
-2.1.3
-

patches/Exagear/definition

@@ -1,2 +0,0 @@
-Depends: ntdll-WRITECOPY
-Disabled: true

patches/advapi-LsaLookupPrivilegeName/0003-advapi32-Implement-LsaLookupPrivilegeName.patch

@@ -1,4 +1,4 @@
-From fdc085e009942fa89ef5f0cd4104ab78c9d80b1b Mon Sep 17 00:00:00 2001
+From bee5e0baac722c66ad8c1034a65a2cecfe74716e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 5 Mar 2017 23:50:06 +0100
 Subject: advapi32: Implement LsaLookupPrivilegeName.
@@ -12,20 +12,20 @@ Subject: advapi32: Implement LsaLookupPrivilegeName.
  5 files changed, 60 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
-index 3000973265c..2c599c8bd92 100644
+index 078bb8fc25..124f527282 100644
 --- a/dlls/advapi32/advapi32.spec
 +++ b/dlls/advapi32/advapi32.spec
-@@ -446,7 +446,7 @@
- @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr)
+@@ -469,7 +469,7 @@
  @ stdcall LsaLookupNames(long long ptr ptr ptr)
+ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr)
  @ stub LsaLookupPrivilegeDisplayName
 -# @ stub LsaLookupPrivilegeName
 +@ stdcall LsaLookupPrivilegeName(long ptr ptr)
  # @ stub LsaLookupPrivilegeValue
  @ stdcall LsaLookupSids(ptr long ptr ptr ptr)
- # @ stub LsaManageSidNameMapping
+ # @ stub LsaLookupSids2
 diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h
-index d116ecb836e..ecb07f635a6 100644
+index d116ecb836..ecb07f635a 100644
 --- a/dlls/advapi32/advapi32_misc.h
 +++ b/dlls/advapi32/advapi32_misc.h
 @@ -68,4 +68,6 @@ static inline WCHAR *strdupAW( const char *src )
@@ -36,10 +36,10 @@ index d116ecb836e..ecb07f635a6 100644
 +
  #endif /* __WINE_ADVAPI32MISC_H */
 diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 0f2167d19ab..6a7a69a9eb7 100644
+index 479201bfc1..ceb3b05c05 100644
 --- a/dlls/advapi32/lsa.c
 +++ b/dlls/advapi32/lsa.c
-@@ -1012,3 +1012,41 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification(
+@@ -973,3 +973,41 @@ NTSTATUS WINAPI LsaUnregisterPolicyChangeNotification(
      FIXME("(%d,%p) stub\n", class, event);
      return STATUS_SUCCESS;
  }
@@ -82,7 +82,7 @@ index 0f2167d19ab..6a7a69a9eb7 100644
 +    return STATUS_SUCCESS;
 +}
 diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index b0b368d6abf..24ec3099713 100644
+index e36792cff4..3bc8f48b19 100644
 --- a/dlls/advapi32/security.c
 +++ b/dlls/advapi32/security.c
 @@ -1840,7 +1840,7 @@ static const WCHAR SE_IMPERSONATE_NAME_W[] =
@@ -146,7 +146,7 @@ index b0b368d6abf..24ec3099713 100644
      }
  }
 diff --git a/include/ntsecapi.h b/include/ntsecapi.h
-index 2bb3d312e43..0bf0eca43ed 100644
+index 2bb3d312e4..0bf0eca43e 100644
 --- a/include/ntsecapi.h
 +++ b/include/ntsecapi.h
 @@ -370,6 +370,7 @@ NTSTATUS WINAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING,PLSA_REFEREN

patches/advapi-LsaLookupPrivilegeName/0004-advapi32-Add-stub-for-LsaLookupPrivilegeDisplayName.patch

@@ -1,4 +1,4 @@
-From 01efac6b4fa338715ad775c147a6bfc42e0bc38e Mon Sep 17 00:00:00 2001
+From 63d642a1af3ccc579123cb8fd13959ab5e9136dd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 6 Mar 2017 00:01:53 +0100
 Subject: advapi32: Add stub for LsaLookupPrivilegeDisplayName.
@@ -9,23 +9,23 @@ Subject: advapi32: Add stub for LsaLookupPrivilegeDisplayName.
  2 files changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
-index 2c599c8bd92..ce1838d8c5a 100644
+index 124f527282..0b03cec3f5 100644
 --- a/dlls/advapi32/advapi32.spec
 +++ b/dlls/advapi32/advapi32.spec
-@@ -445,7 +445,7 @@
+@@ -468,7 +468,7 @@
  # @ stub LsaICLookupSidsWithCreds
- @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr)
  @ stdcall LsaLookupNames(long long ptr ptr ptr)
+ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr)
 -@ stub LsaLookupPrivilegeDisplayName
 +@ stdcall LsaLookupPrivilegeDisplayName(long ptr ptr ptr)
  @ stdcall LsaLookupPrivilegeName(long ptr ptr)
  # @ stub LsaLookupPrivilegeValue
  @ stdcall LsaLookupSids(ptr long ptr ptr ptr)
 diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index 6a7a69a9eb7..fdb238f74b2 100644
+index ceb3b05c05..c2e02fb462 100644
 --- a/dlls/advapi32/lsa.c
 +++ b/dlls/advapi32/lsa.c
-@@ -45,6 +45,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
+@@ -44,6 +44,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi);
          return FailureCode; \
  }
  
@@ -38,7 +38,7 @@ index 6a7a69a9eb7..fdb238f74b2 100644
  static void dumpLsaAttributes(const LSA_OBJECT_ATTRIBUTES *oa)
  {
      if (oa)
-@@ -1050,3 +1056,18 @@ NTSTATUS WINAPI LsaLookupPrivilegeName(
+@@ -1011,3 +1017,18 @@ NTSTATUS WINAPI LsaLookupPrivilegeName(
      *name = priv_unicode;
      return STATUS_SUCCESS;
  }

patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch

@@ -1,65 +0,0 @@
-From 97744349e9a23aa024910d87a89bd94652db4914 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Fri, 15 Jan 2016 13:07:09 +0100
-Subject: api-ms-win-core-quirks-l1-1-0: Add dll.
-
----
- configure.ac                                                      | 1 +
- dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in                    | 1 +
- .../api-ms-win-core-quirks-l1-1-0.spec                            | 8 ++++++++
- tools/make_specfiles                                              | 4 ++++
- 4 files changed, 14 insertions(+)
- create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in
- create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-
-diff --git a/configure.ac b/configure.ac
-index 84316f9..e826dd0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2720,6 +2720,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2)
- WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0)
-+WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0)
-diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..9486e8b
---- /dev/null
-+++ b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in
-@@ -0,0 +1 @@
-+MODULE    = api-ms-win-core-quirks-l1-1-0.dll
-diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-new file mode 100644
-index 0000000..54ce373
---- /dev/null
-+++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-@@ -0,0 +1,8 @@
-+@ stub QuirkGetData
-+@ stub QuirkGetData2
-+@ stdcall QuirkIsEnabled(ptr) kernelbase.QuirkIsEnabled
-+@ stub QuirkIsEnabled2
-+@ stub QuirkIsEnabled3
-+@ stub QuirkIsEnabledForPackage
-+@ stub QuirkIsEnabledForPackage2
-+@ stub QuirkIsEnabledForProcess
-diff --git a/tools/make_specfiles b/tools/make_specfiles
-index eba8548..609f7a0 100755
---- a/tools/make_specfiles
-+++ b/tools/make_specfiles
-@@ -239,6 +239,10 @@ my @dll_groups =
-   "api-ms-win-core-bem-l1-1-0",
-  ],
-  [
-+  "kernelbase",
-+  "api-ms-win-core-quirks-l1-1-0",
-+ ],
-+ [
-   "ole32",
-   "api-ms-win-downlevel-ole32-l1-1-0",
-   "api-ms-win-core-com-l1-1-0",
--- 
-2.9.0
-

patches/api-ms-win-Stub_DLLs/0024-kernelbase-Add-stub-for-QuirkIsEnabled3.patch

@@ -1,58 +0,0 @@
-From d0688788458f243ccef2c337d7ab8f59ead75a3b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 4 Feb 2016 06:19:57 +0100
-Subject: kernelbase: Add stub for QuirkIsEnabled3.
-
----
- .../api-ms-win-core-quirks-l1-1-0.spec                         |  2 +-
- dlls/kernelbase/kernelbase.spec                                |  2 +-
- dlls/kernelbase/misc.c                                         | 10 ++++++++++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-index 54ce373..1485512 100644
---- a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-+++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-@@ -2,7 +2,7 @@
- @ stub QuirkGetData2
- @ stdcall QuirkIsEnabled(ptr) kernelbase.QuirkIsEnabled
- @ stub QuirkIsEnabled2
--@ stub QuirkIsEnabled3
-+@ stdcall QuirkIsEnabled3(ptr ptr) kernelbase.QuirkIsEnabled3
- @ stub QuirkIsEnabledForPackage
- @ stub QuirkIsEnabledForPackage2
- @ stub QuirkIsEnabledForProcess
-diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 8fdb80d..c0b2594 100644
---- a/dlls/kernelbase/kernelbase.spec
-+++ b/dlls/kernelbase/kernelbase.spec
-@@ -1189,7 +1189,7 @@
- @ stub QuirkGetData2
- @ stdcall QuirkIsEnabled(ptr)
- @ stub QuirkIsEnabled2
--@ stub QuirkIsEnabled3
-+@ stdcall QuirkIsEnabled3(ptr ptr)
- @ stub QuirkIsEnabledForPackage
- @ stub QuirkIsEnabledForPackage2
- @ stub QuirkIsEnabledForPackage3
-diff --git a/dlls/kernelbase/misc.c b/dlls/kernelbase/misc.c
-index be1591a..e703e6d 100644
---- a/dlls/kernelbase/misc.c
-+++ b/dlls/kernelbase/misc.c
-@@ -35,3 +35,13 @@ BOOL WINAPI QuirkIsEnabled(void *arg)
-     FIXME("(%p): stub\n", arg);
-     return FALSE;
- }
-+
-+/***********************************************************************
-+ *           QuirkIsEnabled3   (KERNELBASE.@)
-+ */
-+BOOL WINAPI QuirkIsEnabled3(void *arg1, void *arg2)
-+{
-+    static int once;
-+    if (!once++) FIXME("(%p, %p): stub\n", arg1, arg2);
-+    return FALSE;
-+}
--- 
-2.7.1
-

patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch

@@ -1,17 +1,17 @@
-From aefdbc0fabb66052164ecd45fecfb0b947a130ac Mon Sep 17 00:00:00 2001
+From 988abb92ab5dc363b9ea734e256959eb542391e2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 12 Apr 2016 01:02:34 +0200
 Subject: uiautomationcore: Add dll and stub some functions.
 
 ---
  dlls/uiautomationcore/Makefile.in           |  1 +
- dlls/uiautomationcore/uia_main.c            | 89 ++++++++++++++++++++++++++++-
- dlls/uiautomationcore/uiautomationcore.spec | 14 +++--
- include/uiautomationcoreapi.h               | 16 ++++++
- 4 files changed, 114 insertions(+), 6 deletions(-)
+ dlls/uiautomationcore/uia_main.c            | 57 +++++++++++++++++++++++++----
+ dlls/uiautomationcore/uiautomationcore.spec |  6 +++
+ include/uiautomationcoreapi.h               |  9 +++--
+ 4 files changed, 61 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index 78d6254a015..029fc2e4995 100644
+index 78d6254a01..029fc2e499 100644
 --- a/dlls/uiautomationcore/Makefile.in
 +++ b/dlls/uiautomationcore/Makefile.in
 @@ -1,4 +1,5 @@
@@ -21,7 +21,7 @@ index 78d6254a015..029fc2e4995 100644
  C_SRCS = \
  	uia_main.c
 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index 994d8e6080b..f1429faeff9 100644
+index 6e795ab88f..37c56dacd5 100644
 --- a/dlls/uiautomationcore/uia_main.c
 +++ b/dlls/uiautomationcore/uia_main.c
 @@ -1,4 +1,5 @@
@@ -30,20 +30,15 @@ index 994d8e6080b..f1429faeff9 100644
   * Copyright 2017 Jacek Caban for CodeWeavers
   *
   * This library is free software; you can redistribute it and/or
-@@ -16,7 +17,11 @@
+@@ -16,6 +17,7 @@
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
  
--#include "uiautomationcore.h"
-+#include <stdarg.h>
-+#include "windef.h"
-+#include "winbase.h"
 +#define COBJMACROS
-+#include "uiautomationcoreapi.h"
+ #include "uiautomation.h"
  
  #include "wine/debug.h"
- 
-@@ -37,11 +42,91 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv)
+@@ -37,12 +39,51 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv)
      return TRUE;
  }
  
@@ -85,47 +80,6 @@ index 994d8e6080b..f1429faeff9 100644
 +};
 +
 +static IUnknown dummy = { &dummy_Vtbl };
-+
-+/***********************************************************************
-+ *          UiaLookupId (uiautomationcore.@)
-+ */
-+int WINAPI UiaLookupId(AutomationIdentifierType type, const GUID *guid)
-+{
-+    FIXME("(%d, %s)\n", type, debugstr_guid(guid));
-+    return 1;
-+}
-+
-+/***********************************************************************
-+ *          UiaGetReservedMixedAttributeValue (uiautomationcore.@)
-+ */
-+HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
-+{
-+    FIXME("(%p): stub\n", value);
-+
-+    *value = &dummy;
-+    return S_OK;
-+}
-+
-+/***********************************************************************
-+ *          UiaGetReservedNotSupportedValue (uiautomationcore.@)
-+ */
-+HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
-+{
-+    FIXME("(%p): stub\n", value);
-+
-+    *value = &dummy;
-+    return S_OK;
-+}
-+
-+/***********************************************************************
-+ *          UiaReturnRawElementProvider (uiautomationcore.@)
-+ */
-+LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lparam,
-+                                           IRawElementProviderSimple *provider)
-+{
-+    FIXME("(%p, %lx, %lx, %p): stub\n", hwnd, wparam, lparam, provider);
-+    return 0;
-+}
 +
  /***********************************************************************
   *          UiaClientsAreListening (uiautomationcore.@)
@@ -136,11 +90,53 @@ index 994d8e6080b..f1429faeff9 100644
 +    FIXME("(): stub\n");
      return FALSE;
  }
+ 
+@@ -51,8 +92,8 @@ BOOL WINAPI UiaClientsAreListening(void)
+  */
+ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
+ {
+-    FIXME("(%p) stub!\n", value);
+-    *value = NULL;
++    FIXME("(%p): stub!\n", value);
++    *value = &dummy;
+     return S_OK;
+ }
+ 
+@@ -61,17 +102,17 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
+  */
+ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
+ {
+-    FIXME("(%p) stub!\n", value);
+-    *value = NULL;
++    FIXME("(%p): stub!\n", value);
++    *value = &dummy;
+     return S_OK;
+ }
+ 
+ /***********************************************************************
+  *          UiaLookupId (uiautomationcore.@)
+  */
+-int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid)
++int WINAPI UiaLookupId(AutomationIdentifierType type, const GUID *guid)
+ {
+-    FIXME("(%d, %s) stub!\n", type, debugstr_guid(guid));
++    FIXME("(%d, %s): stub!\n", type, debugstr_guid(guid));
+     return 1;
+ }
+ 
+@@ -81,6 +122,6 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid)
+ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam,
+         LPARAM lParam, IRawElementProviderSimple *elprov)
+ {
+-    FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov);
++    FIXME("(%p, %lx, %lx, %p): stub!\n", hwnd, wParam, lParam, elprov);
+     return 0;
+ }
 diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
-index 3026001b6b7..221711c41d2 100644
+index bff1303eda..221711c41d 100644
 --- a/dlls/uiautomationcore/uiautomationcore.spec
 +++ b/dlls/uiautomationcore/uiautomationcore.spec
-@@ -53,14 +53,16 @@
+@@ -53,6 +53,8 @@
  @ stub TransformPattern_Rotate
  @ stub UiaAddEvent
  @ stdcall UiaClientsAreListening()
@@ -149,27 +145,15 @@ index 3026001b6b7..221711c41d2 100644
  @ stub UiaEventAddWindow
  @ stub UiaEventRemoveWindow
  @ stub UiaFind
- @ stub UiaGetErrorDescription
- @ stub UiaGetPatternProvider
- @ stub UiaGetPropertyValue
--@ stub UiaGetReservedMixedAttributeValue
--@ stub UiaGetReservedNotSupportedValue
-+@ stdcall UiaGetReservedMixedAttributeValue(ptr)
-+@ stdcall UiaGetReservedNotSupportedValue(ptr)
- @ stub UiaGetRootNode
- @ stub UiaGetRuntimeId
- @ stub UiaGetUpdatedCache
-@@ -69,7 +71,8 @@
+@@ -69,6 +71,7 @@
  @ stub UiaHUiaNodeFromVariant
  @ stub UiaHasServerSideProvider
  @ stub UiaHostProviderFromHwnd
--@ stub UiaLookupId
 +@ stub UiaIAccessibleFromProvider
-+@ stdcall UiaLookupId(long ptr)
+ @ stdcall UiaLookupId(long ptr)
  @ stub UiaNavigate
  @ stub UiaNodeFromFocus
- @ stub UiaNodeFromHandle
-@@ -77,13 +80,16 @@
+@@ -77,10 +80,13 @@
  @ stub UiaNodeFromProvider
  @ stub UiaNodeRelease
  @ stub UiaPatternRelease
@@ -182,52 +166,35 @@ index 3026001b6b7..221711c41d2 100644
 +@ stub UiaRaiseTextEditTextChangedEvent
  @ stub UiaRegisterProviderCallback
  @ stub UiaRemoveEvent
--@ stub UiaReturnRawElementProvider
-+@ stdcall UiaReturnRawElementProvider(long long long ptr)
- @ stub UiaSetFocus
- @ stub UiaTextRangeRelease
- @ stub ValuePattern_SetValue
+ @ stdcall UiaReturnRawElementProvider(long long long ptr)
 diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
-index 340f5005db4..b9107ceb792 100644
+index 6c1752ec64..1a844d0cb7 100644
 --- a/include/uiautomationcoreapi.h
 +++ b/include/uiautomationcoreapi.h
-@@ -19,6 +19,8 @@
- #ifndef _INC_UIAUTOMATIONCOREAPI
- #define _INC_UIAUTOMATIONCOREAPI
- 
-+#include "uiautomationcore.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -34,6 +36,16 @@ extern "C" {
- #define UiaAppendRuntimeId  3
- #define UiaRootObjectId     -25
+@@ -39,18 +39,19 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT);
+ DECLARE_HANDLE(HUIATEXTRANGE);
+ DECLARE_HANDLE(HUIAEVENT);
  
+-enum AutomationIdentifierType
 +typedef enum AutomationIdentifierType
-+{
-+    AutomationIdentifierType_Property,
-+    AutomationIdentifierType_Pattern,
-+    AutomationIdentifierType_Event,
-+    AutomationIdentifierType_ControlType,
+ {
+     AutomationIdentifierType_Property,
+     AutomationIdentifierType_Pattern,
+     AutomationIdentifierType_Event,
+     AutomationIdentifierType_ControlType,
+-    AutomationIdentifierType_TextAttribute
+-};
 +    AutomationIdentifierType_TextAttribute,
 +    AutomationIdentifierType_LandmarkType,
 +} AutomationIdentifierType;
-+
- DECLARE_HANDLE(HUIANODE);
- DECLARE_HANDLE(HUIAPATTERNOBJECT);
- DECLARE_HANDLE(HUIATEXTRANGE);
-@@ -41,6 +53,10 @@ DECLARE_HANDLE(HUIAEVENT);
  
- BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
- BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
+ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value);
+ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
+-int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid);
 +int WINAPI UiaLookupId(AutomationIdentifierType type, const GUID *guid);
-+HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value);
-+HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
-+LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wparam, LPARAM lparam, IRawElementProviderSimple *provider);
- 
- #ifdef __cplusplus
- }
+ BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj);
+ LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov);
+ BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);
 -- 
 2.11.0
 

patches/configure-Absolute_RPATH/0001-configure-Also-add-the-absolute-RPATH-when-linking-a.patch

@@ -12,7 +12,7 @@ index ff74f8d..529c209 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -966,10 +966,10 @@ ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS)
-                       [LDEXECFLAGS="-Wl,--export-dynamic"])
+                       [WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
  
        WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
 -                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"

patches/d3d11-Deferred_Context/0001-d3d11-Add-stub-deferred-rendering-context.patch

@@ -1,4 +1,4 @@
-From 6abf532ce00b767eb8c57593ffec8e69c46fd603 Mon Sep 17 00:00:00 2001
+From c7a3f1e20d97f61080df53a909c90707160ba45b Mon Sep 17 00:00:00 2001
 From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
 Date: Sat, 24 Sep 2016 06:51:24 +0300
 Subject: d3d11: Add stub deferred rendering context.
@@ -8,7 +8,7 @@ Subject: d3d11: Add stub deferred rendering context.
  1 file changed, 993 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 777146d717e..45467480905 100644
+index 259f189f8a..366f330bf0 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
 @@ -25,6 +25,16 @@
@@ -27,8 +27,8 @@ index 777146d717e..45467480905 100644
 +
  static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
  
- const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
-@@ -2110,6 +2120,974 @@ static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *cont
+ static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
+@@ -2417,6 +2427,974 @@ static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *cont
      wined3d_private_store_cleanup(&context->private_store);
  }
  
@@ -1003,7 +1003,7 @@ index 777146d717e..45467480905 100644
  /* ID3D11Device methods */
  
  static HRESULT STDMETHODCALLTYPE d3d11_device_QueryInterface(ID3D11Device *iface, REFIID riid, void **out)
-@@ -2735,9 +3713,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device *iface,
+@@ -3070,9 +4048,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device *iface,
  static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device *iface, UINT flags,
          ID3D11DeviceContext **context)
  {
@@ -1029,5 +1029,5 @@ index 777146d717e..45467480905 100644
  
  static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device *iface, HANDLE resource, REFIID riid,
 -- 
-2.11.0
+2.12.2
 

patches/d3d11-Deferred_Context/0003-d3d11-Initial-implementation-for-deferred-contexts.patch

@@ -1,4 +1,4 @@
-From 498edc59046c38c028f6d9e2d91264ad08d93d57 Mon Sep 17 00:00:00 2001
+From 38079a15e97192b7f0f80b9317a47530d6430a5f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 19 Jan 2017 16:56:56 +0100
 Subject: d3d11: Initial implementation for deferred contexts.
@@ -8,7 +8,7 @@ Subject: d3d11: Initial implementation for deferred contexts.
  1 file changed, 1043 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 45467480905..4ee9d500802 100644
+index 366f330bf0..7aac903b54 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
 @@ -19,12 +19,181 @@
@@ -724,8 +724,8 @@ index 45467480905..4ee9d500802 100644
 +
  static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
  
- const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
-@@ -1139,7 +1830,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
+ static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
+@@ -1133,7 +1824,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
  static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext *iface,
          ID3D11CommandList *command_list, BOOL restore_state)
  {
@@ -747,7 +747,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -1953,7 +2657,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1
+@@ -2260,7 +2964,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D1
  
  static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceContext *iface)
  {
@@ -756,7 +756,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_immediate_context_Flush(ID3D11DeviceContext *iface)
-@@ -2165,6 +2869,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
+@@ -2472,6 +3176,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
  
      if (!refcount)
      {
@@ -764,7 +764,7 @@ index 45467480905..4ee9d500802 100644
          wined3d_private_store_cleanup(&context->private_store);
          ID3D11Device_Release(context->device);
          HeapFree(GetProcessHeap(), 0, context);
-@@ -2216,43 +2921,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
+@@ -2523,43 +3228,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -857,7 +857,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface,
-@@ -2265,53 +3013,171 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
+@@ -2572,53 +3320,171 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource,
          UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource)
  {
@@ -1038,7 +1038,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface,
-@@ -2340,7 +3206,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
+@@ -2647,7 +3513,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
  static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface,
          D3D11_PRIMITIVE_TOPOLOGY topology)
  {
@@ -1056,7 +1056,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -2400,8 +3275,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
+@@ -2707,8 +3582,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
          UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views,
          ID3D11DepthStencilView *depth_stencil_view)
  {
@@ -1086,7 +1086,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorderedAccessViews(
-@@ -2421,15 +3316,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
+@@ -2728,15 +3623,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetBlendState(ID3D11DeviceContext *iface,
          ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask)
  {
@@ -1133,7 +1133,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count,
-@@ -2471,13 +3395,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
+@@ -2778,13 +3702,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetState(ID3D11DeviceContext *iface,
          ID3D11RasterizerState *rasterizer_state)
  {
@@ -1170,7 +1170,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetScissorRects(ID3D11DeviceContext *iface,
-@@ -2592,8 +3537,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
+@@ -2899,8 +3844,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceContext *iface,
          ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
  {
@@ -1190,7 +1190,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface,
-@@ -2606,36 +3561,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
+@@ -2913,36 +3868,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -1258,7 +1258,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -2936,7 +3917,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
+@@ -3243,7 +4224,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_ClearState(ID3D11DeviceContext *iface)
  {
@@ -1275,7 +1275,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Flush(ID3D11DeviceContext *iface)
-@@ -2961,9 +3950,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
+@@ -3268,9 +4257,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_FinishCommandList(ID3D11DeviceContext *iface,
          BOOL restore, ID3D11CommandList **command_list)
  {
@@ -1307,7 +1307,7 @@ index 45467480905..4ee9d500802 100644
  }
  
  static const struct ID3D11DeviceContextVtbl d3d11_deferred_context_vtbl =
-@@ -3724,6 +4733,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
+@@ -4059,6 +5068,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
      object->device = iface;
      object->refcount = 1;
  
@@ -1317,5 +1317,5 @@ index 45467480905..4ee9d500802 100644
      wined3d_private_store_init(&object->private_store);
  
 -- 
-2.11.0
+2.12.2
 

patches/d3d11-ID3D11Texture1D/0017-d3d11-tests-Test-the-creation-of-1d-render-buffers-i.patch

@@ -1,4 +1,4 @@
-From d36a6643bbb79dcea3bc39391dc4a129bd940f31 Mon Sep 17 00:00:00 2001
+From d4e5a58b69c7e8810c811041234134fe5062f931 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 25 Aug 2016 19:52:23 +0200
 Subject: d3d11/tests: Test the creation of 1d render buffers in
@@ -9,10 +9,10 @@ Subject: d3d11/tests: Test the creation of 1d render buffers in
  1 file changed, 40 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index c48ff9a..ec5c296 100644
+index 9aa21584d8..063b30ebf1 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
-@@ -3190,6 +3190,7 @@ static void test_create_rendertarget_view(void)
+@@ -3262,6 +3262,7 @@ static void test_create_rendertarget_view(void)
      D3D11_RENDER_TARGET_VIEW_DESC rtv_desc;
      D3D11_TEXTURE3D_DESC texture3d_desc;
      D3D11_TEXTURE2D_DESC texture2d_desc;
@@ -20,15 +20,15 @@ index c48ff9a..ec5c296 100644
      D3D11_SUBRESOURCE_DATA data = {0};
      ULONG refcount, expected_refcount;
      D3D11_BUFFER_DESC buffer_desc;
-@@ -3197,6 +3198,7 @@ static void test_create_rendertarget_view(void)
+@@ -3269,6 +3270,7 @@ static void test_create_rendertarget_view(void)
      ID3D11Device *device, *tmp;
      ID3D11Texture3D *texture3d;
      ID3D11Texture2D *texture2d;
 +    ID3D11Texture1D *texture1d;
      ID3D11Resource *texture;
      ID3D11Buffer *buffer;
-     IUnknown *iface;
-@@ -3227,6 +3229,23 @@ static void test_create_rendertarget_view(void)
+     unsigned int i;
+@@ -3298,6 +3300,23 @@ static void test_create_rendertarget_view(void)
      }
      tests[] =
      {
@@ -52,7 +52,7 @@ index c48ff9a..ec5c296 100644
          {{ 1, 1, RGBA8_UNORM}, {0},                                    {RGBA8_UNORM, TEX_2D,       0}},
          {{10, 1, RGBA8_UNORM}, {0},                                    {RGBA8_UNORM, TEX_2D,       0}},
          {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D,       0},         {RGBA8_UNORM, TEX_2D,       0}},
-@@ -3388,6 +3407,12 @@ static void test_create_rendertarget_view(void)
+@@ -3460,6 +3479,12 @@ static void test_create_rendertarget_view(void)
      ID3D11RenderTargetView_Release(rtview);
      ID3D11Buffer_Release(buffer);
  
@@ -65,7 +65,7 @@ index c48ff9a..ec5c296 100644
      texture2d_desc.Width = 512;
      texture2d_desc.Height = 512;
      texture2d_desc.SampleDesc.Count = 1;
-@@ -3408,7 +3433,21 @@ static void test_create_rendertarget_view(void)
+@@ -3480,7 +3505,21 @@ static void test_create_rendertarget_view(void)
      {
          D3D11_RENDER_TARGET_VIEW_DESC *current_desc;
  
@@ -89,5 +89,5 @@ index c48ff9a..ec5c296 100644
              texture2d_desc.MipLevels = tests[i].texture.miplevel_count;
              texture2d_desc.ArraySize = tests[i].texture.depth_or_array_size;
 -- 
-2.8.1
+2.12.2
 

patches/d3d11-ID3D11Texture1D/0018-d3d11-tests-Test-the-creation-of-1d-shader-resource-.patch

@@ -1,4 +1,4 @@
-From 0fb8cdfad5e55e814f6cb7c61935dc5e25cfd132 Mon Sep 17 00:00:00 2001
+From 2ba57281f31901b2f9ce05947e44b4a6e7035550 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 25 Aug 2016 19:54:13 +0200
 Subject: d3d11/tests: Test the creation of 1d shader resource views in
@@ -9,10 +9,10 @@ Subject: d3d11/tests: Test the creation of 1d shader resource views in
  1 file changed, 40 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index ec5c296..0dd286d 100644
+index 063b30ebf1..81cced86c3 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
-@@ -3536,6 +3536,7 @@ static void test_create_shader_resource_view(void)
+@@ -3609,6 +3609,7 @@ static void test_create_shader_resource_view(void)
      D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc;
      D3D11_TEXTURE3D_DESC texture3d_desc;
      D3D11_TEXTURE2D_DESC texture2d_desc;
@@ -20,15 +20,15 @@ index ec5c296..0dd286d 100644
      ULONG refcount, expected_refcount;
      ID3D11ShaderResourceView *srview;
      D3D_FEATURE_LEVEL feature_level;
-@@ -3543,6 +3544,7 @@ static void test_create_shader_resource_view(void)
+@@ -3616,6 +3617,7 @@ static void test_create_shader_resource_view(void)
      ID3D11Device *device, *tmp;
      ID3D11Texture3D *texture3d;
      ID3D11Texture2D *texture2d;
 +    ID3D11Texture1D *texture1d;
      ID3D11Resource *texture;
      ID3D11Buffer *buffer;
-     IUnknown *iface;
-@@ -3575,6 +3577,21 @@ static void test_create_shader_resource_view(void)
+     unsigned int i;
+@@ -3647,6 +3649,21 @@ static void test_create_shader_resource_view(void)
      }
      tests[] =
      {
@@ -50,7 +50,7 @@ index ec5c296..0dd286d 100644
          {{10,  1, RGBA8_UNORM}, {0},                                         {RGBA8_UNORM, TEX_2D,       0, 10}},
          {{10,  1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D,       0, ~0u},         {RGBA8_UNORM, TEX_2D,       0, 10}},
          {{10,  1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D,       0, ~0u},         {RGBA8_UNORM, TEX_2D,       0, 10}},
-@@ -3769,6 +3786,12 @@ static void test_create_shader_resource_view(void)
+@@ -3847,6 +3864,12 @@ static void test_create_shader_resource_view(void)
          skip("Structured buffers require feature level 11_0.\n");
      }
  
@@ -63,7 +63,7 @@ index ec5c296..0dd286d 100644
      texture2d_desc.Width = 512;
      texture2d_desc.Height = 512;
      texture2d_desc.SampleDesc.Count = 1;
-@@ -3788,7 +3811,23 @@ static void test_create_shader_resource_view(void)
+@@ -3866,7 +3889,23 @@ static void test_create_shader_resource_view(void)
      {
          D3D11_SHADER_RESOURCE_VIEW_DESC *current_desc;
  
@@ -89,5 +89,5 @@ index ec5c296..0dd286d 100644
              texture2d_desc.MipLevels = tests[i].texture.miplevel_count;
              texture2d_desc.ArraySize = tests[i].texture.depth_or_array_size;
 -- 
-2.8.1
+2.12.2
 

patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch

@@ -1,4 +1,4 @@
-From b02ee3d1c5dc1fd3040f81d87d3b17f5148fe2c5 Mon Sep 17 00:00:00 2001
+From 4ce7612fe0c6fd65f89403c8703e5395fbb4a85d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 28 Jul 2015 17:26:09 +0200
 Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof
@@ -11,18 +11,18 @@ Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof
  3 files changed, 30 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index a0e62f1..e9f7187 100644
+index abb3114e89..4c6d642b7e 100644
 --- a/dlls/d3dx9_36/d3dx9_private.h
 +++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -198,4 +198,6 @@ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval,
- HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device,
-         struct d3dx_param_eval *peval) DECLSPEC_HIDDEN;
+@@ -241,4 +241,6 @@ HRESULT d3dx_param_eval_set_shader_constants(struct IDirect3DDevice9 *device,
+         struct d3dx_param_eval *peval, BOOL update_all) DECLSPEC_HIDDEN;
+ BOOL is_param_eval_input_dirty(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN;
  
 +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN;
 +
  #endif /* __WINE_D3DX9_PRIVATE_H */
 diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 3204ea7..61dd203 100644
+index c26aa7271f..b70f4dcaa4 100644
 --- a/dlls/d3dx9_36/mesh.c
 +++ b/dlls/d3dx9_36/mesh.c
 @@ -3332,6 +3332,13 @@ static HRESULT parse_mesh(ID3DXFileData *filedata, struct mesh_data *mesh_data,
@@ -40,7 +40,7 @@ index 3204ea7..61dd203 100644
  
  end:
 diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
-index f197d33..bed4b9f 100644
+index f197d33582..bed4b9f49d 100644
 --- a/dlls/d3dx9_36/skin.c
 +++ b/dlls/d3dx9_36/skin.c
 @@ -94,7 +94,7 @@ static ULONG WINAPI d3dx9_skin_info_Release(ID3DXSkinInfo *iface)
@@ -77,5 +77,5 @@ index f197d33..bed4b9f 100644
 +    return D3D_OK;
 +}
 -- 
-2.7.1
+2.11.0
 

patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch

@@ -1,4 +1,4 @@
-From caafb5926a24065e96350fc255ea92c0863c2730 Mon Sep 17 00:00:00 2001
+From 56e710b3d2b2631ee63eb1ed076a2a8af99352ad Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 19 Dec 2014 22:31:46 +0100
 Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
@@ -9,10 +9,10 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests.
  2 files changed, 91 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index 42f5aea966b..7c1d1787bf1 100644
+index 8dc4738360..47e79a689a 100644
 --- a/dlls/d3dx9_36/effect.c
 +++ b/dlls/d3dx9_36/effect.c
-@@ -3538,13 +3538,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
+@@ -3667,13 +3667,41 @@ static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DX
      return D3D_OK;
  }
  
@@ -58,11 +58,11 @@ index 42f5aea966b..7c1d1787bf1 100644
  
  static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func,
 diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
-index 56d9fe627be..1b9bea6a55c 100644
+index b1f7f3ef26..95d29d0155 100644
 --- a/dlls/d3dx9_36/tests/effect.c
 +++ b/dlls/d3dx9_36/tests/effect.c
-@@ -4413,6 +4413,65 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device)
-     effect->lpVtbl->Release(effect);
+@@ -6111,6 +6111,65 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device)
+     ok(!refcount, "Effect pool was not properly freed, refcount %u.\n", refcount);
  }
  
 +/*
@@ -127,14 +127,14 @@ index 56d9fe627be..1b9bea6a55c 100644
  START_TEST(effect)
  {
      HWND wnd;
-@@ -4457,6 +4516,7 @@ START_TEST(effect)
-     test_effect_preshader_ops(device);
-     test_effect_isparameterused(device);
-     test_effect_out_of_bounds_selector(device);
+@@ -6160,6 +6219,7 @@ START_TEST(effect)
+     test_effect_state_manager(device);
+     test_cross_effect_handle(device);
+     test_effect_shared_parameters(device);
 +    test_effect_technique_validation(device);
  
      count = IDirect3DDevice9_Release(device);
      ok(count == 0, "The device was not properly freed: refcount %u\n", count);
 -- 
-2.11.0
+2.12.2
 

patches/dmloader-Tests/0001-dmloader-tests-Fix-test-failures.patch

@@ -0,0 +1,31 @@
+From dabf89ee29066b7a133ca2fb1e5c05a8100a0365 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Mon, 1 May 2017 19:49:41 +0200
+Subject: dmloader/tests: Fix test failures.
+
+---
+ dlls/dmloader/tests/loader.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c
+index 6b2ee3ad93..1735994088 100644
+--- a/dlls/dmloader/tests/loader.c
++++ b/dlls/dmloader/tests/loader.c
+@@ -66,11 +66,11 @@ static void test_directory(void)
+     /* Two consecutive SetSearchDirectory with the same path */
+     GetTempPathW(ARRAY_SIZE(path), path);
+     hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0);
+-    todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
++    ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
+     hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, path, 0);
+-    ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr);
++    todo_wine ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr);
+     hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0);
+-    ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
++    todo_wine ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr);
+     hr = IDirectMusicLoader_SetSearchDirectory(loader, &CLSID_DirectSoundWave, path, 0);
+     ok(hr == S_FALSE, "Second SetSearchDirectory failed with %#x\n", hr);
+ 
+-- 
+2.12.2
+