Release v4.0rc2

This was fixed by 414c73feabb6d33be969f3927f8b3e8a8075bcd4.

patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch

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

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

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

patches/advapi32-RegLoadAppKey/0001-advapi32-Add-RegLoadAppKeyA-RegLoadAppKeyW-stubs.patch

@@ -0,0 +1,125 @@
+From 2b29014573fcb38388dd82e33fa16f67b1a43a8c Mon Sep 17 00:00:00 2001
+From: Austin English <austinenglish@gmail.com>
+Date: Sun, 23 Oct 2016 16:15:45 -0500
+Subject: [PATCH] advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41591
+Signed-off-by: Austin English <austinenglish@gmail.com>
+---
+ dlls/advapi32/advapi32.spec                        |  4 ++--
+ dlls/advapi32/registry.c                           | 24 ++++++++++++++++++++++
+ .../api-ms-win-core-registry-l1-1-0.spec           |  4 ++--
+ .../api-ms-win-downlevel-advapi32-l1-1-0.spec      |  4 ++--
+ dlls/kernelbase/kernelbase.spec                    |  4 ++--
+ include/winreg.h                                   |  3 +++
+ 6 files changed, 35 insertions(+), 8 deletions(-)
+
+diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
+index e870a5d..042a523 100644
+--- a/dlls/advapi32/advapi32.spec
++++ b/dlls/advapi32/advapi32.spec
+@@ -648,8 +648,8 @@
+ @ stdcall RegGetKeySecurity(long long ptr ptr)
+ @ stdcall RegGetValueA(long str str long ptr ptr ptr)
+ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr)
+-# @ stub RegLoadAppKeyA
+-# @ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long)
++@ stdcall RegLoadAppKeyW(wstr ptr long long long)
+ @ stdcall RegLoadKeyA(long str str)
+ @ stdcall RegLoadKeyW(long wstr wstr)
+ @ stdcall RegLoadMUIStringA(long str str long ptr long str)
+diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
+index 3018372..55df6de 100644
+--- a/dlls/advapi32/registry.c
++++ b/dlls/advapi32/registry.c
+@@ -3513,3 +3513,27 @@ LONG WINAPI RegDisableReflectionKey(HKEY base)
+     FIXME("%p: stub\n", base);
+     return ERROR_SUCCESS;
+ }
++
++/******************************************************************************
++ * RegLoadAppKeyA [ADVAPI32.@]
++ *
++ */
++LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
++{
++    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_a(file), result, sam, options, reserved);
++
++    *result = (HKEY)0xbeefcafe;
++    return ERROR_SUCCESS;
++}
++
++/******************************************************************************
++ * RegLoadAppKeyW [ADVAPI32.@]
++ *
++ */
++LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
++{
++    FIXME("%s %p %u %u %u: stub\n", wine_dbgstr_w(file), result, sam, options, reserved);
++
++    *result = (HKEY)0xbeefcafe;
++    return ERROR_SUCCESS;
++}
+diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
+index 7a48e3b..f81f027 100644
+--- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
++++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec
+@@ -17,8 +17,8 @@
+ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity
+ @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA
+ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW
+-@ stub RegLoadAppKeyA
+-@ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
++@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
+ @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA
+ @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW
+ @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA
+diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
+index 5bdad41..b2dcc17 100644
+--- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
++++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec
+@@ -102,8 +102,8 @@
+ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity
+ @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA
+ @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW
+-@ stub RegLoadAppKeyA
+-@ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
++@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
+ @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA
+ @ stdcall RegLoadKeyW(long wstr wstr) advapi32.RegLoadKeyW
+ @ stdcall RegLoadMUIStringA(long str str long ptr long str) advapi32.RegLoadMUIStringA
+diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
+index 286dae0..c114622 100644
+--- a/dlls/kernelbase/kernelbase.spec
++++ b/dlls/kernelbase/kernelbase.spec
+@@ -1288,8 +1288,8 @@
+ # @ stub RegKrnResetAppKeyLoaded
+ # @ stub RegKrnSetDllHasThreadStateGlobal
+ # @ stub RegKrnSetTermsrvRegistryExtensionFlags
+-# @ stub RegLoadAppKeyA
+-# @ stub RegLoadAppKeyW
++@ stdcall RegLoadAppKeyA(str ptr long long long) advapi32.RegLoadAppKeyA
++@ stdcall RegLoadAppKeyW(wstr ptr long long long) advapi32.RegLoadAppKeyW
+ @ stdcall -private RegLoadKeyA(long str str) kernel32.RegLoadKeyA
+ @ stdcall -private RegLoadKeyW(long wstr wstr) kernel32.RegLoadKeyW
+ @ stdcall -private RegLoadMUIStringA(long str str long ptr long str) kernel32.RegLoadMUIStringA
+diff --git a/include/winreg.h b/include/winreg.h
+index 51e9f02..5656eec 100644
+--- a/include/winreg.h
++++ b/include/winreg.h
+@@ -133,6 +133,9 @@ WINADVAPI LSTATUS   WINAPI RegGetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY
+ WINADVAPI LSTATUS   WINAPI RegGetValueA(HKEY,LPCSTR,LPCSTR,DWORD,LPDWORD,PVOID,LPDWORD);
+ WINADVAPI LSTATUS   WINAPI RegGetValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,LPDWORD,PVOID,LPDWORD);
+ #define                    RegGetValue WINELIB_NAME_AW(RegGetValue)
++WINADVAPI LSTATUS   WINAPI RegLoadAppKeyA(const char*,HKEY*,REGSAM,DWORD,DWORD);
++WINADVAPI LSTATUS   WINAPI RegLoadAppKeyW(const WCHAR*,HKEY*,REGSAM,DWORD,DWORD);
++#define                    RegLoadAppKey WINELIB_NAME_AW(RegLoadAppKey)
+ WINADVAPI LSTATUS   WINAPI RegLoadKeyA(HKEY,LPCSTR,LPCSTR);
+ WINADVAPI LSTATUS   WINAPI RegLoadKeyW(HKEY,LPCWSTR,LPCWSTR);
+ #define                    RegLoadKey WINELIB_NAME_AW(RegLoadKey)
+-- 
+1.9.1
+

patches/advapi32-RegLoadAppKey/definition

@@ -0,0 +1 @@
+Fixes: [41591] advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs

patches/atl-AtlAxDialogBox/0001-atl-Implement-AtlAxDialogBox-A-W.patch

@@ -0,0 +1,100 @@
+From 452c42b4855e2f6338fa9b8746377ff9fe9ee706 Mon Sep 17 00:00:00 2001
+From: Qian Hong <qhong@codeweavers.com>
+Date: Wed, 23 Apr 2014 04:16:53 +0800
+Subject: [PATCH] atl: Implement AtlAxDialogBox[A,W]
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32749
+---
+ dlls/atl/atl_ax.c | 60 +++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 50 insertions(+), 10 deletions(-)
+
+diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c
+index 8121278..92fcb84 100644
+--- a/dlls/atl/atl_ax.c
++++ b/dlls/atl/atl_ax.c
+@@ -28,6 +28,7 @@
+ #include "winerror.h"
+ #include "winuser.h"
+ #include "wine/debug.h"
++#include "wine/heap.h"
+ #include "objbase.h"
+ #include "objidl.h"
+ #include "ole2.h"
+@@ -1407,25 +1408,64 @@ HRESULT WINAPI AtlAxGetControl(HWND hWnd, IUnknown **pUnk)
+ }
+ 
+ /***********************************************************************
+- *           AtlAxDialogBoxW              [atl100.35]
++ *           AtlAxDialogBoxA              [atl100.@]
+  *
+  */
+-INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInstance, LPCWSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc,
+-        LPARAM dwInitParam)
++INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInst, LPCSTR name, HWND owner, DLGPROC dlgProc, LPARAM param)
+ {
+-    FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_w(lpTemplateName), hWndParent, lpDialogProc, dwInitParam);
+-    return 0;
++    INT_PTR res = 0;
++    int length;
++    WCHAR *nameW;
++
++    if (IS_INTRESOURCE(name))
++        return AtlAxDialogBoxW( hInst, (LPCWSTR) name, owner, dlgProc, param );
++
++    length = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 );
++    nameW = heap_alloc( length * sizeof(WCHAR) );
++    if (nameW)
++    {
++        MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, length );
++        res = AtlAxDialogBoxW( hInst, nameW, owner, dlgProc, param );
++        heap_free( nameW );
++    }
++    return res;
+ }
+ 
+ /***********************************************************************
+- *           AtlAxDialogBoxA              [atl100.36]
++ *           AtlAxDialogBoxW              [atl100.@]
+  *
+  */
+-INT_PTR WINAPI AtlAxDialogBoxA(HINSTANCE hInstance, LPCSTR lpTemplateName, HWND hWndParent, DLGPROC lpDialogProc,
+-        LPARAM dwInitParam)
++INT_PTR WINAPI AtlAxDialogBoxW(HINSTANCE hInst, LPCWSTR name, HWND owner, DLGPROC dlgProc, LPARAM param)
+ {
+-    FIXME("(%p %s %p %p %lx)\n", hInstance, debugstr_a(lpTemplateName), hWndParent, lpDialogProc, dwInitParam);
+-    return 0;
++    HRSRC hrsrc;
++    HGLOBAL hgl;
++    LPCDLGTEMPLATEW ptr;
++    LPDLGTEMPLATEW newptr;
++    INT_PTR res;
++
++    TRACE("(%p %s %p %p %lx)\n", hInst, debugstr_w(name), owner, dlgProc, param);
++
++    hrsrc = FindResourceW( hInst, name, (LPWSTR)RT_DIALOG );
++    if ( !hrsrc )
++        return 0;
++    hgl = LoadResource (hInst, hrsrc);
++    if ( !hgl )
++        return 0;
++    ptr = LockResource ( hgl );
++    if (!ptr)
++    {
++        FreeResource( hgl );
++        return 0;
++    }
++    newptr = AX_ConvertDialogTemplate( ptr );
++    if ( newptr )
++    {
++        res = DialogBoxIndirectParamW( hInst, newptr, owner, dlgProc, param );
++        heap_free( newptr );
++    } else
++        res = 0;
++    FreeResource ( hrsrc );
++    return res;
+ }
+ 
+ /***********************************************************************
+-- 
+1.9.1
+

patches/atl-AtlAxDialogBox/definition

@@ -0,0 +1 @@
+Fixes: [32749] atl: Implemented AtlAxDialogBox[A,W]

patches/bcrypt-BCryptDeriveKeyPBKDF2/0001-bcrypt-Implement-BCryptDeriveKeyPBKDF2-and-add-test-.patch

@@ -1,4 +1,4 @@
-From a324685a2f4f48d5d9da8c3000164800152dc297 Mon Sep 17 00:00:00 2001
+From ff1967f048d2b32ad98e91b4f39edba0c425a8a9 Mon Sep 17 00:00:00 2001
 From: Jack Grigg <me@jackgrigg.com>
 Date: Sat, 17 Mar 2018 21:14:05 +1100
 Subject: [PATCH] bcrypt: Implement BCryptDeriveKeyPBKDF2 and add test vectors.
@@ -17,8 +17,9 @@ Signed-off-by: Jack Grigg <me@jackgrigg.com>
  dlls/bcrypt/bcrypt.spec    |   1 +
  dlls/bcrypt/bcrypt_main.c  | 163 +++++++++++++++++++++++++++++++++++++++++++++
  dlls/bcrypt/tests/bcrypt.c |  83 +++++++++++++++++++++++
+ dlls/ncrypt/ncrypt.spec    |   2 +-
  include/bcrypt.h           |   1 +
- 4 files changed, 248 insertions(+)
+ 5 files changed, 249 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
 index 78824d7..f4d9a57 100644
@@ -33,10 +34,10 @@ index 78824d7..f4d9a57 100644
  @ stdcall BCryptDestroyKey(ptr)
  @ stub BCryptDestroySecret
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 29a0a78..33c1da53 100644
+index 2b9ae0b..49ccb13 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
-@@ -2315,6 +2315,169 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA
+@@ -1316,6 +1316,169 @@ NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHA
      }
  }
  
@@ -320,6 +321,19 @@ index 6865e87..5c4df6a 100644
 +
      FreeLibrary(module);
  }
+diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
+index e7b12e0..adc0999 100644
+--- a/dlls/ncrypt/ncrypt.spec
++++ b/dlls/ncrypt/ncrypt.spec
+@@ -9,7 +9,7 @@
+ @ stub BCryptDeleteContext
+ @ stub BCryptDeriveKey
+ @ stub BCryptDeriveKeyCapi
+-@ stub BCryptDeriveKeyPBKDF2
++@ stdcall BCryptDeriveKeyPBKDF2(ptr ptr long ptr long int64 ptr long long) bcrypt.BCryptDeriveKeyPBKDF2
+ @ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash
+ @ stdcall BCryptDestroyKey(ptr) bcrypt.BCryptDestroyKey
+ @ stub BCryptDestroySecret
 diff --git a/include/bcrypt.h b/include/bcrypt.h
 index df54f62..d3e4b99 100644
 --- a/include/bcrypt.h

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

@@ -1,4 +1,4 @@
-From 8ebad635c033bf41392e23ee50494195fdce73b9 Mon Sep 17 00:00:00 2001
+From 480ec9b4f559237e618ede31ecd158340783ab80 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.
@@ -6,14 +6,15 @@ Subject: [PATCH 2/3] bcrypt: Add BCryptGenerateKeyPair stub.
 ---
  dlls/bcrypt/bcrypt.spec   | 2 +-
  dlls/bcrypt/bcrypt_main.c | 6 ++++++
+ dlls/ncrypt/ncrypt.spec   | 2 +-
  include/bcrypt.h          | 1 +
- 3 files changed, 8 insertions(+), 1 deletion(-)
+ 4 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index f4d9a57..1e81ad1 100644
+index 78824d7..ccfec63 100644
 --- a/dlls/bcrypt/bcrypt.spec
 +++ b/dlls/bcrypt/bcrypt.spec
-@@ -26,7 +26,7 @@
+@@ -25,7 +25,7 @@
  @ stdcall BCryptFinishHash(ptr ptr long long)
  @ stub BCryptFreeBuffer
  @ stdcall BCryptGenRandom(ptr ptr long long)
@@ -23,7 +24,7 @@ index f4d9a57..1e81ad1 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 003e8f3..0d94634 100644
+index 0381b65..623ccb5 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
 @@ -160,6 +160,12 @@ NTSTATUS WINAPI BCryptGenRandom(BCRYPT_ALG_HANDLE handle, UCHAR *buffer, ULONG c
@@ -39,11 +40,24 @@ index 003e8f3..0d94634 100644
  NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
  {
      const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
+diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
+index e7b12e0..e667e75 100644
+--- a/dlls/ncrypt/ncrypt.spec
++++ b/dlls/ncrypt/ncrypt.spec
+@@ -27,7 +27,7 @@
+ @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash
+ @ stub BCryptFreeBuffer
+ @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom
+-@ stub BCryptGenerateKeyPair
++@ stdcall BCryptGenerateKeyPair(ptr ptr long long) bcrypt.BCryptGenerateKeyPair
+ @ stdcall BCryptGenerateSymmetricKey(ptr ptr ptr long ptr long long) bcrypt.BCryptGenerateSymmetricKey
+ @ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode
+ @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty
 diff --git a/include/bcrypt.h b/include/bcrypt.h
-index 676db72..ce11685 100644
+index 7966f76..2ef073b 100644
 --- a/include/bcrypt.h
 +++ b/include/bcrypt.h
-@@ -224,6 +224,7 @@ NTSTATUS WINAPI BCryptDestroyKey(BCRYPT_KEY_HANDLE);
+@@ -223,6 +223,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);

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

@@ -1,4 +1,4 @@
-From 046863d1eb6db25555743cbbc257260387b31c19 Mon Sep 17 00:00:00 2001
+From e765bec7193e3ffa27492abe76ed4e56db0f4fc7 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.
@@ -6,14 +6,15 @@ Subject: [PATCH 3/3] bcrypt: Add BCryptFinalizeKeyPair stub.
 ---
  dlls/bcrypt/bcrypt.spec   | 2 +-
  dlls/bcrypt/bcrypt_main.c | 6 ++++++
+ dlls/ncrypt/ncrypt.spec   | 2 +-
  include/bcrypt.h          | 1 +
- 3 files changed, 8 insertions(+), 1 deletion(-)
+ 4 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec
-index 1e81ad1..052a099 100644
+index ccfec63..891381f 100644
 --- a/dlls/bcrypt/bcrypt.spec
 +++ b/dlls/bcrypt/bcrypt.spec
-@@ -22,7 +22,7 @@
+@@ -21,7 +21,7 @@
  @ stub BCryptEnumProviders
  @ stub BCryptEnumRegisteredProviders
  @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long)
@@ -23,7 +24,7 @@ index 1e81ad1..052a099 100644
  @ stub BCryptFreeBuffer
  @ stdcall BCryptGenRandom(ptr ptr long long)
 diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
-index 0d94634..40a3405 100644
+index 623ccb5..90af6aa 100644
 --- a/dlls/bcrypt/bcrypt_main.c
 +++ b/dlls/bcrypt/bcrypt_main.c
 @@ -166,6 +166,12 @@ NTSTATUS WINAPI BCryptGenerateKeyPair(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HA
@@ -39,11 +40,24 @@ index 0d94634..40a3405 100644
  NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR id, LPCWSTR implementation, DWORD flags )
  {
      const DWORD supported_flags = BCRYPT_ALG_HANDLE_HMAC_FLAG;
+diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec
+index e667e75..c6e7f7f 100644
+--- a/dlls/ncrypt/ncrypt.spec
++++ b/dlls/ncrypt/ncrypt.spec
+@@ -23,7 +23,7 @@
+ @ stub BCryptEnumProviders
+ @ stub BCryptEnumRegisteredProviders
+ @ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey
+-@ stub BCryptFinalizeKeyPair
++@ stdcall BCryptFinalizeKeyPair(ptr long) bcrypt.BCryptFinalizeKeyPair
+ @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash
+ @ stub BCryptFreeBuffer
+ @ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom
 diff --git a/include/bcrypt.h b/include/bcrypt.h
-index ce11685..b8e93a6 100644
+index 2ef073b..6826c86 100644
 --- a/include/bcrypt.h
 +++ b/include/bcrypt.h
-@@ -223,6 +223,7 @@ NTSTATUS WINAPI BCryptDestroyHash(BCRYPT_HASH_HANDLE);
+@@ -222,6 +222,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);

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

@@ -1,4 +1,4 @@
-From 53bf52b313245d965619802729ef59ada1806660 Mon Sep 17 00:00:00 2001
+From 9774b93b25d11fe143fcf4ab7159135334916045 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 27 Aug 2014 00:31:23 +0200
 Subject: configure: Also add the absolute RPATH when linking against libwine.
@@ -8,11 +8,11 @@ Subject: configure: Also add the absolute RPATH when linking against libwine.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ff74f8d..529c209 100644
+index 2222c687d9..513bdef795 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -966,10 +966,10 @@ ${wine_binary}_LDFLAGS = $LDEXECFLAGS -lwine \$(PTHREAD_LIBS)
-                       [WINELOADER_LDFLAGS="-Wl,--export-dynamic"])
+@@ -943,10 +943,10 @@ case $host_os in
+       WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000"
  
        WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
 -                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
@@ -25,5 +25,5 @@ index ff74f8d..529c209 100644
  
        WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
 -- 
-2.6.1
+2.14.1
 

patches/d3dx9_36-D3DXMatrixTransformation/definition

@@ -0,0 +1 @@
+Fixes: [33456] d3dx9_36: D3DXMatrixTransformation support NULL scaling matrix

patches/d3dx9_36-DXTn/0001-d3dx9_36-Add-dxtn-support.patch

@@ -1,4 +1,4 @@
-From 54da28ec1779f20790f48721ec0c0b62e8ebcfc1 Mon Sep 17 00:00:00 2001
+From 30578b99bc059003a1223e2e9752bb07d449c34e Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Fri, 30 Mar 2018 08:22:02 +0000
 Subject: [PATCH] d3dx9_36: add DXTn support
@@ -17,8 +17,8 @@ Subject: [PATCH] d3dx9_36: add DXTn support
  dlls/d3dx9_34/Makefile.in     |   2 +-
  dlls/d3dx9_35/Makefile.in     |   2 +-
  dlls/d3dx9_36/Makefile.in     |   2 +-
- dlls/d3dx9_36/surface.c       | 100 +++++++++++++++++++++++++++++++++++++++---
- dlls/d3dx9_36/tests/surface.c |   8 ++--
+ dlls/d3dx9_36/surface.c       | 101 +++++++++++++++++++++++++++++++---
+ dlls/d3dx9_36/tests/surface.c |   8 +--
  dlls/d3dx9_37/Makefile.in     |   2 +-
  dlls/d3dx9_38/Makefile.in     |   2 +-
  dlls/d3dx9_39/Makefile.in     |   2 +-
@@ -26,10 +26,10 @@ Subject: [PATCH] d3dx9_36: add DXTn support
  dlls/d3dx9_41/Makefile.in     |   2 +-
  dlls/d3dx9_42/Makefile.in     |   2 +-
  dlls/d3dx9_43/Makefile.in     |   2 +-
- 22 files changed, 117 insertions(+), 31 deletions(-)
+ 22 files changed, 117 insertions(+), 32 deletions(-)
 
 diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in
-index 482c92d..d969a55 100644
+index 482c92d64e2..d969a55b106 100644
 --- a/dlls/d3dx9_24/Makefile.in
 +++ b/dlls/d3dx9_24/Makefile.in
 @@ -1,6 +1,6 @@
@@ -41,7 +41,7 @@ index 482c92d..d969a55 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in
-index be4c769..b232290 100644
+index be4c76980e1..b232290d255 100644
 --- a/dlls/d3dx9_25/Makefile.in
 +++ b/dlls/d3dx9_25/Makefile.in
 @@ -1,6 +1,6 @@
@@ -53,7 +53,7 @@ index be4c769..b232290 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in
-index c5e9e85..525009d 100644
+index c5e9e85bfb7..525009d292c 100644
 --- a/dlls/d3dx9_26/Makefile.in
 +++ b/dlls/d3dx9_26/Makefile.in
 @@ -1,6 +1,6 @@
@@ -65,7 +65,7 @@ index c5e9e85..525009d 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in
-index ee7f0e2..da98482 100644
+index ee7f0e2449c..da98482d243 100644
 --- a/dlls/d3dx9_27/Makefile.in
 +++ b/dlls/d3dx9_27/Makefile.in
 @@ -1,6 +1,6 @@
@@ -77,7 +77,7 @@ index ee7f0e2..da98482 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in
-index 0944200..d50e035 100644
+index 094420013d0..d50e035853f 100644
 --- a/dlls/d3dx9_28/Makefile.in
 +++ b/dlls/d3dx9_28/Makefile.in
 @@ -1,6 +1,6 @@
@@ -89,7 +89,7 @@ index 0944200..d50e035 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in
-index 88cb110..cfc1a15 100644
+index 88cb110ff5e..cfc1a150349 100644
 --- a/dlls/d3dx9_29/Makefile.in
 +++ b/dlls/d3dx9_29/Makefile.in
 @@ -1,6 +1,6 @@
@@ -101,7 +101,7 @@ index 88cb110..cfc1a15 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in
-index 6ab2ff2..726c92e 100644
+index 6ab2ff24514..726c92e8fd5 100644
 --- a/dlls/d3dx9_30/Makefile.in
 +++ b/dlls/d3dx9_30/Makefile.in
 @@ -1,6 +1,6 @@
@@ -113,7 +113,7 @@ index 6ab2ff2..726c92e 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in
-index 3d44da1..2014301 100644
+index 3d44da147dc..201430127ce 100644
 --- a/dlls/d3dx9_31/Makefile.in
 +++ b/dlls/d3dx9_31/Makefile.in
 @@ -1,6 +1,6 @@
@@ -125,7 +125,7 @@ index 3d44da1..2014301 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in
-index 37cc279..442258d 100644
+index 37cc2797afd..442258d8f31 100644
 --- a/dlls/d3dx9_32/Makefile.in
 +++ b/dlls/d3dx9_32/Makefile.in
 @@ -1,6 +1,6 @@
@@ -137,7 +137,7 @@ index 37cc279..442258d 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
-index 5b03ec1..cc98ed2 100644
+index 5b03ec134dd..cc98ed25016 100644
 --- a/dlls/d3dx9_33/Makefile.in
 +++ b/dlls/d3dx9_33/Makefile.in
 @@ -1,6 +1,6 @@
@@ -149,7 +149,7 @@ index 5b03ec1..cc98ed2 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in
-index b7f9c46..4862fe9 100644
+index b7f9c46d5e7..4862fe94af1 100644
 --- a/dlls/d3dx9_34/Makefile.in
 +++ b/dlls/d3dx9_34/Makefile.in
 @@ -1,6 +1,6 @@
@@ -161,7 +161,7 @@ index b7f9c46..4862fe9 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in
-index 9c196ea..3f529c9 100644
+index 9c196ea038b..3f529c99154 100644
 --- a/dlls/d3dx9_35/Makefile.in
 +++ b/dlls/d3dx9_35/Makefile.in
 @@ -1,6 +1,6 @@
@@ -173,7 +173,7 @@ index 9c196ea..3f529c9 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in
-index da8098d..166031e 100644
+index da8098dd8d1..166031e6a4e 100644
 --- a/dlls/d3dx9_36/Makefile.in
 +++ b/dlls/d3dx9_36/Makefile.in
 @@ -1,7 +1,7 @@
@@ -186,7 +186,7 @@ index da8098d..166031e 100644
  C_SRCS = \
  	animation.c \
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 0a6e20e..a33b6e2 100644
+index 7d48cc6b132..85db27acadf 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
 @@ -27,6 +27,8 @@
@@ -223,22 +223,28 @@ index 0a6e20e..a33b6e2 100644
  /************************************************************
   * D3DXLoadSurfaceFromMemory
   *
-@@ -1756,6 +1776,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1753,12 +1773,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+         DWORD filter, D3DCOLOR color_key)
+ {
+     const struct pixel_format_desc *srcformatdesc, *destformatdesc;
++    void *tmp_src_memory = NULL, *tmp_dst_memory = NULL;
++    dxtn_conversion_func pre_convert = NULL, post_convert = NULL;
+     IDirect3DSurface9 *surface = dst_surface;
+     IDirect3DDevice9 *device;
      D3DSURFACE_DESC surfdesc;
      D3DLOCKED_RECT lockrect;
      struct volume src_size, dst_size;
-+    HRESULT ret = D3D_OK;
+-    HRESULT hr;
++    HRESULT hr = D3D_OK;
  
      TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n",
              dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format,
-@@ -1837,8 +1858,15 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1856,18 +1878,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
      }
      else /* Stretching or format conversion. */
      {
 -        if (!is_conversion_from_supported(srcformatdesc)
 -                || !is_conversion_to_supported(destformatdesc))
-+        dxtn_conversion_func pre_convert, post_convert;
-+        void *tmp_src_memory = NULL, *tmp_dst_memory = NULL;
 +        UINT tmp_src_pitch, tmp_dst_pitch;
 +
 +        pre_convert  = get_dxtn_conversion_func(srcformatdesc->format, FALSE);
@@ -248,10 +254,9 @@ index 0a6e20e..a33b6e2 100644
 +                (!post_convert && !is_conversion_to_supported(destformatdesc)))
          {
              FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format);
-             return E_NOTIMPL;
-@@ -1847,10 +1875,52 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
-         if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0)))
-             return D3DXERR_INVALIDDATA;
+             hr = E_NOTIMPL;
+             goto done;
+         }
  
 +        /* handle pre-conversion */
 +        if (pre_convert)
@@ -259,15 +264,15 @@ index 0a6e20e..a33b6e2 100644
 +            tmp_src_memory = HeapAlloc(GetProcessHeap(), 0, src_size.width * src_size.height * sizeof(DWORD));
 +            if (!tmp_src_memory)
 +            {
-+                ret = E_OUTOFMEMORY;
-+                goto error;
++                hr = E_OUTOFMEMORY;
++                goto done;
 +            }
 +            tmp_src_pitch = src_size.width * sizeof(DWORD);
 +            if (!pre_convert(src_memory, tmp_src_memory, src_pitch, tmp_src_pitch,
 +                    WINED3DFMT_B8G8R8A8_UNORM, src_size.width, src_size.height))
 +            {
-+                ret = E_FAIL;
-+                goto error;
++                hr = E_FAIL;
++                goto done;
 +            }
 +            srcformatdesc = get_format_info(D3DFMT_A8R8G8B8);
 +        }
@@ -283,8 +288,8 @@ index 0a6e20e..a33b6e2 100644
 +            tmp_dst_memory = HeapAlloc(GetProcessHeap(), 0, dst_size.width * dst_size.height * sizeof(DWORD));
 +            if (!tmp_dst_memory)
 +            {
-+                ret = E_OUTOFMEMORY;
-+                goto error;
++                hr = E_OUTOFMEMORY;
++                goto done;
 +            }
 +            tmp_dst_pitch = dst_size.width * sizeof(DWORD);
 +            destformatdesc = get_format_info(D3DFMT_A8R8G8B8);
@@ -304,7 +309,7 @@ index 0a6e20e..a33b6e2 100644
          }
          else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */
          {
-@@ -1859,14 +1929,30 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
+@@ -1876,12 +1945,22 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
  
              /* Always apply a point filter until D3DX_FILTER_LINEAR,
               * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */
@@ -320,29 +325,34 @@ index 0a6e20e..a33b6e2 100644
 +            if (!post_convert(tmp_dst_memory, lockrect.pBits, tmp_dst_pitch, lockrect.Pitch,
 +                    WINED3DFMT_B8G8R8A8_UNORM, dst_size.width, dst_size.height))
 +            {
-+                ret = E_FAIL;
-+                goto error;
++                hr = E_FAIL;
++                goto done;
 +            }
          }
+     }
  
-+error:
+-    hr = D3D_OK;
+ done:
+     IDirect3DSurface9_UnlockRect(surface);
+     if (surface != dst_surface)
+@@ -1893,6 +1972,12 @@ done:
+             IDirect3DDevice9_Release(device);
+         }
+         IDirect3DSurface9_Release(surface);
++
 +        if (pre_convert)
 +            HeapFree(GetProcessHeap(), 0, tmp_src_memory);
 +        if (post_convert)
 +            HeapFree(GetProcessHeap(), 0, tmp_dst_memory);
-         IDirect3DSurface9_UnlockRect(dst_surface);
++        IDirect3DSurface9_UnlockRect(dst_surface);
      }
  
--    return D3D_OK;
-+    return ret;
- }
- 
- /************************************************************
+     return hr;
 diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c
-index 37c488b..5697f93 100644
+index f153cd92c65..9cdf60a54c7 100644
 --- a/dlls/d3dx9_36/tests/surface.c
 +++ b/dlls/d3dx9_36/tests/surface.c
-@@ -1179,7 +1179,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1199,7 +1199,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -351,7 +361,7 @@ index 37c488b..5697f93 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1205,7 +1205,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1225,7 +1225,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -360,7 +370,7 @@ index 37c488b..5697f93 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
          }
-@@ -1218,10 +1218,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
+@@ -1238,10 +1238,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device)
              hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf);
              ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr);
              hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0);
@@ -374,7 +384,7 @@ index 37c488b..5697f93 100644
              check_release((IUnknown*)newsurf, 1);
              check_release((IUnknown*)tex, 0);
 diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in
-index ab790a4..51382c7 100644
+index ab790a4d5c4..51382c7109a 100644
 --- a/dlls/d3dx9_37/Makefile.in
 +++ b/dlls/d3dx9_37/Makefile.in
 @@ -1,6 +1,6 @@
@@ -386,7 +396,7 @@ index ab790a4..51382c7 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in
-index 6125c2d..f6257cb 100644
+index 6125c2da678..f6257cbdec7 100644
 --- a/dlls/d3dx9_38/Makefile.in
 +++ b/dlls/d3dx9_38/Makefile.in
 @@ -1,6 +1,6 @@
@@ -398,7 +408,7 @@ index 6125c2d..f6257cb 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in
-index d97a787..a68ee9f 100644
+index d97a787c67a..a68ee9f3ad5 100644
 --- a/dlls/d3dx9_39/Makefile.in
 +++ b/dlls/d3dx9_39/Makefile.in
 @@ -1,6 +1,6 @@
@@ -410,7 +420,7 @@ index d97a787..a68ee9f 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in
-index 36c5a21..7f2cfe1 100644
+index 36c5a210cdb..7f2cfe1a47c 100644
 --- a/dlls/d3dx9_40/Makefile.in
 +++ b/dlls/d3dx9_40/Makefile.in
 @@ -1,6 +1,6 @@
@@ -422,7 +432,7 @@ index 36c5a21..7f2cfe1 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in
-index d4552cf..c5c3ab1 100644
+index d4552cf608e..c5c3ab1aae5 100644
 --- a/dlls/d3dx9_41/Makefile.in
 +++ b/dlls/d3dx9_41/Makefile.in
 @@ -1,6 +1,6 @@
@@ -434,7 +444,7 @@ index d4552cf..c5c3ab1 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in
-index 5806fce..e9a8e89 100644
+index 5806fce66c6..e9a8e89da5f 100644
 --- a/dlls/d3dx9_42/Makefile.in
 +++ b/dlls/d3dx9_42/Makefile.in
 @@ -1,6 +1,6 @@
@@ -446,7 +456,7 @@ index 5806fce..e9a8e89 100644
  
  C_SRCS = \
 diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in
-index 72ba8b4..33185bf 100644
+index 72ba8b4c1e0..33185bf7a8a 100644
 --- a/dlls/d3dx9_43/Makefile.in
 +++ b/dlls/d3dx9_43/Makefile.in
 @@ -1,6 +1,6 @@
@@ -458,5 +468,5 @@ index 72ba8b4..33185bf 100644
  
  C_SRCS = \
 -- 
-1.9.1
+2.19.1
 

patches/ddraw-Prevent_viewport_crash/0001-ddraw-Prevent-division-by-zero-in-viewport_acti.patch

@@ -1,31 +0,0 @@
-From 1cee10b74621b8d70ff31b6e358ee52bd57e695e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
-Date: Sat, 2 Jan 2016 11:48:45 +0100
-Subject: [PATCH] ddraw: Prevent division by zero in viewport_activate.
-Reply-To: wine-devel <wine-devel@winehq.org>
-
-This just stop the crash, without fixing the actual cause.
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36763
----
- dlls/ddraw/viewport.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c
-index 5ebc41e..16cdad4 100644
---- a/dlls/ddraw/viewport.c
-+++ b/dlls/ddraw/viewport.c
-@@ -71,6 +71,10 @@ void viewport_activate(struct d3d_viewport *This, BOOL ignore_lights)
-     /* And copy the values in the structure used by the device */
-     if (This->use_vp2)
-     {
-+        if (!This->viewports.vp2.dvMinZ && !This->viewports.vp2.dvMaxZ
-+                && !This->viewports.vp2.dvClipWidth && !This->viewports.vp2.dvClipHeight)
-+            return;
-+
-         vp.dwX = This->viewports.vp2.dwX;
-         vp.dwY = This->viewports.vp2.dwY;
-         vp.dwHeight = This->viewports.vp2.dwHeight;
--- 
-2.4.10
-

patches/ddraw-Prevent_viewport_crash/definition

@@ -1 +0,0 @@
-Fixes: [36763] Prevent division by zero in viewport_activate

patches/ddraw-Rendering_Targets/0001-ddraw-Create-rendering-targets-in-video-memory-if-po.patch

@@ -1,4 +1,4 @@
-From cf433894ff56fda93491753843e0f4f658f67c8c Mon Sep 17 00:00:00 2001
+From 599d50340aaf37f2eb39a789a4034e677d52e92c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 29 Jul 2015 17:09:50 +0200
 Subject: [PATCH] ddraw: Create rendering targets in video memory if possible.
@@ -12,10 +12,10 @@ Based on a patch by Henri Verbeet.
  4 files changed, 53 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 9a40bc9..6f3d058 100644
+index 6b2abe3..dfd52a0 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
-@@ -4210,7 +4210,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
+@@ -4209,7 +4209,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
      TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -24,7 +24,7 @@ index 9a40bc9..6f3d058 100644
      {
          *device = &object->IDirect3DDevice7_iface;
      }
-@@ -4239,7 +4239,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
+@@ -4238,7 +4238,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
          return CLASS_E_NOAGGREGATION;
  
      wined3d_mutex_lock();
@@ -33,7 +33,7 @@ index 9a40bc9..6f3d058 100644
      {
          *device = &device_impl->IDirect3DDevice3_iface;
      }
-@@ -4265,7 +4265,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
+@@ -4264,7 +4264,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
              iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -43,7 +43,7 @@ index 9a40bc9..6f3d058 100644
          *device = &device_impl->IDirect3DDevice2_iface;
      }
 diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
-index 495cb8b..4af638b 100644
+index b035a7e..699f719 100644
 --- a/dlls/ddraw/ddraw_private.h
 +++ b/dlls/ddraw/ddraw_private.h
 @@ -303,6 +303,7 @@ struct d3d_device
@@ -152,7 +152,7 @@ index 0d48c7d..2bef17d 100644
          WARN("Failed to initialize device, hr %#x.\n", hr);
          heap_free(object);
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index 5ce1d85..e729348 100644
+index 8190442..c73981b 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
 @@ -226,7 +226,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
@@ -194,11 +194,11 @@ index 5ce1d85..e729348 100644
 +         */
 +        if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) &&
 +            SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT,
-+                        WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_RENDERTARGET,
++                        WINED3D_DEVICE_TYPE_HAL, mode.format_id, 0,
 +                        bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format)))
 +        {
 +            FIXME("Application wants to create rendering target in system memory, using video memory instead\n");
-+            wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET;
++            wined3d_desc.usage = wined3d_desc.bind_flags;
 +        }
 +        else
 +            wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU

patches/ddraw-Rendering_Targets/definition

@@ -1,2 +1 @@
 Fixes: [34906] Use video memory for rendering targets if possible
-Disabled: True

patches/dsound-EAX/0001-dsound-Apply-filters-before-sound-is-multiplied-to-s.patch

@@ -1,4 +1,4 @@
-From a259cb0c3a69913d6656ef3043a263ec5ad3ea05 Mon Sep 17 00:00:00 2001
+From f02dd0110ae95771a6e44a608c724d964fab7f68 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 28 Mar 2015 08:18:10 +0100
 Subject: dsound: Apply filters before sound is multiplied to speakers.
@@ -7,24 +7,24 @@ Based on a patch by Mark Harmstone.
 ---
  dlls/dsound/dsound.c         |   2 +
  dlls/dsound/dsound_private.h |   4 +-
- dlls/dsound/mixer.c          | 110 ++++++++++++++++++++++++++++++-------------
+ dlls/dsound/mixer.c          | 110 ++++++++++++++++++++++++-----------
  3 files changed, 81 insertions(+), 35 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 68902d723af..449830ae83f 100644
+index 71ede7d8..cc8b4444 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
-@@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
-             IAudioStreamVolume_Release(device->volume);
+@@ -233,6 +233,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
          if(device->mmdevice)
              IMMDevice_Release(device->mmdevice);
+         CloseHandle(device->sleepev);
 +
 +        HeapFree(GetProcessHeap(), 0, device->dsp_buffer);
          HeapFree(GetProcessHeap(), 0, device->tmp_buffer);
          HeapFree(GetProcessHeap(), 0, device->cp_buffer);
          HeapFree(GetProcessHeap(), 0, device->buffer);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 985a7a2526b..45232cbd729 100644
+index c9ae7fd7..371cc5fb 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -90,8 +90,8 @@ struct DirectSoundDevice
@@ -39,7 +39,7 @@ index 985a7a2526b..45232cbd729 100644
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 23e5bbcf7c7..e5211deaeeb 100644
+index 1643e7d4..d4dbdc15 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -278,23 +278,22 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -231,5 +231,5 @@ index 23e5bbcf7c7..e5211deaeeb 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.13.1
+2.19.1
 

patches/dwmapi-DwmGetTransportAttributes/0001-dwmapi-return-DWM_E_COMPOSITIONDISABLED-instead-of-ENOTIMPL-in-DwmGetTransportAttributes.patch

@@ -0,0 +1,43 @@
+From: Louis Lenders <xerox.xerox2000x@gmail.com>
+Subject: [PATCH 1/2] dwmapi: return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes
+Message-Id: <20181205121826.2124-1-xerox.xerox2000x@gmail.com>
+Date: Wed,  5 Dec 2018 13:18:25 +0100
+
+This versioh is with tests; 
+
+Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
+---
+ dlls/dwmapi/dwmapi_main.c | 2 +-
+ include/winerror.h        | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
+index c1ee067122..eb06d15507 100644
+--- a/dlls/dwmapi/dwmapi_main.c
++++ b/dlls/dwmapi/dwmapi_main.c
+@@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected
+ {
+     FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration);
+ 
+-    return E_NOTIMPL;
++    return DWM_E_COMPOSITIONDISABLED;
+ }
+ 
+ /**********************************************************************
+diff --git a/include/winerror.h b/include/winerror.h
+index d78c91e84e..a97b405c34 100644
+--- a/include/winerror.h
++++ b/include/winerror.h
+@@ -3090,6 +3090,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
+ #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY        _HRESULT_TYPEDEF_(0x80072f8e)
+ #define WININET_E_DECODING_FAILED                          _HRESULT_TYPEDEF_(0x80072f8f)
+ 
++#define DWM_E_COMPOSITIONDISABLED                          _HRESULT_TYPEDEF_(0x80263001)
++
+ #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS          _HRESULT_TYPEDEF_(0x887c0001)
+ #define D3D11_ERROR_FILE_NOT_FOUND                         _HRESULT_TYPEDEF_(0x887c0002)
+ #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS           _HRESULT_TYPEDEF_(0x887c0003)
+
+-- 
+2.17.1
+

patches/dwmapi-DwmGetTransportAttributes/0002-dwmapi-add-initial-tests.patch

@@ -0,0 +1,185 @@
+From: Louis Lenders <xerox.xerox2000x@gmail.com>
+Subject: [PATCH 2/2] dwampi: add initial tests
+Message-Id: <20181205121826.2124-2-xerox.xerox2000x@gmail.com>
+Date: Wed,  5 Dec 2018 13:18:26 +0100
+In-Reply-To: <20181205121826.2124-1-xerox.xerox2000x@gmail.com>
+References: <20181205121826.2124-1-xerox.xerox2000x@gmail.com>
+
+Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
+---
+ configure                     |   1 +
+ configure.ac                  |   1 +
+ dlls/dwmapi/tests/Makefile.in |   5 ++
+ dlls/dwmapi/tests/dwmapi.c    | 108 ++++++++++++++++++++++++++++++++++
+ include/dwmapi.h              |   3 +
+ 5 files changed, 118 insertions(+)
+ create mode 100644 dlls/dwmapi/tests/Makefile.in
+ create mode 100644 dlls/dwmapi/tests/dwmapi.c
+
+diff --git a/configure b/configure
+index d00057ba2f..e1dde1813b 100755
+--- a/configure
++++ b/configure
+@@ -19392,6 +19392,7 @@ wine_fn_config_makefile dlls/dssenh/tests enable_tests
+ wine_fn_config_makefile dlls/dswave enable_dswave
+ wine_fn_config_makefile dlls/dswave/tests enable_tests
+ wine_fn_config_makefile dlls/dwmapi enable_dwmapi
++wine_fn_config_makefile dlls/dwmapi/tests enable_tests
+ wine_fn_config_makefile dlls/dwrite enable_dwrite
+ wine_fn_config_makefile dlls/dwrite/tests enable_tests
+ wine_fn_config_makefile dlls/dx8vb enable_dx8vb
+diff --git a/configure.ac b/configure.ac
+index 50cf9a0bd0..607a46f5a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3255,6 +3255,7 @@ WINE_CONFIG_MAKEFILE(dlls/dssenh/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dswave)
+ WINE_CONFIG_MAKEFILE(dlls/dswave/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dwmapi)
++WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dwrite)
+ WINE_CONFIG_MAKEFILE(dlls/dwrite/tests)
+ WINE_CONFIG_MAKEFILE(dlls/dx8vb)
+diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in
+new file mode 100644
+index 0000000000..f365f96c72
+--- /dev/null
++++ b/dlls/dwmapi/tests/Makefile.in
+@@ -0,0 +1,5 @@
++TESTDLL   = dwmapi.dll
++IMPORTS   = dwmapi
++
++C_SRCS = \
++	dwmapi.c
+diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c
+new file mode 100644
+index 0000000000..fe5ee33996
+--- /dev/null
++++ b/dlls/dwmapi/tests/dwmapi.c
+@@ -0,0 +1,108 @@
++/*
++ * Unit tests for dwmapi
++ *
++ * Copyright 2018 Louis Lenders
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
++ *
++ */
++
++#include "dwmapi.h"
++
++#include "wine/test.h"
++
++static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL*);
++static HRESULT (WINAPI *pDwmEnableComposition)(UINT);
++static HRESULT (WINAPI *pDwmGetTransportAttributes)(BOOL*,BOOL*,DWORD*);
++
++BOOL dwmenabled;
++
++static void test_isdwmenabled(void)
++{
++    HRESULT res;
++    BOOL ret;
++
++    ret = -1;
++    res = pDwmIsCompositionEnabled(&ret);
++    ok((res == S_OK && ret == TRUE) || (res == S_OK && ret == FALSE), "got %x and %d\n", res, ret);
++
++    if (res == S_OK && ret == TRUE)
++        dwmenabled = TRUE;
++    else
++        dwmenabled = FALSE;
++    /*tested on win7 by enabling/disabling DWM service via services.msc*/
++    if (dwmenabled)
++    {
++        res = pDwmEnableComposition(DWM_EC_DISABLECOMPOSITION); /* try disable and reenable dwm*/
++        ok(res == S_OK, "got %x expected S_OK\n", res);
++
++        ret = -1;
++        res = pDwmIsCompositionEnabled(&ret);
++        ok((res == S_OK && ret == FALSE) /*wvista win7*/ || (res == S_OK && ret == TRUE) /*>win7*/, "got %x and %d\n", res, ret);
++
++        res = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION);
++        ok(res == S_OK, "got %x\n", res);
++
++        ret = -1;
++        res = pDwmIsCompositionEnabled(&ret);
++        todo_wine ok(res == S_OK && ret == TRUE, "got %x and %d\n", res, ret);
++    }
++    else
++    {
++        res = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION); /*cannot enable DWM composition this way*/
++        ok(res == S_OK /*win7 testbot*/ || res == DWM_E_COMPOSITIONDISABLED /*win7 laptop*/, "got %x\n", res);
++        if (winetest_debug > 1)
++            trace("returning %x\n", res);
++
++        ret = -1;       
++        res = pDwmIsCompositionEnabled(&ret);
++        ok(res == S_OK && ret == FALSE, "got %x  and %d\n", res, ret);
++    }
++}
++
++static void test_dwm_get_transport_attributes(void)
++{
++    BOOL isremoting, isconnected;
++    DWORD generation;
++    HRESULT res;
++
++    res = pDwmGetTransportAttributes(&isremoting, &isconnected, &generation);
++    if (dwmenabled)
++        ok(res == S_OK, "got %x\n", res);
++    else
++    {
++        ok(res == S_OK /*win7 testbot*/ || res == DWM_E_COMPOSITIONDISABLED /*win7 laptop*/, "got %x\n", res);
++        if (winetest_debug > 1)
++            trace("returning %x\n", res);
++    }
++}
++
++START_TEST(dwmapi)
++{
++    HMODULE hmod = LoadLibraryA("dwmapi.dll");
++
++    if (!hmod)
++    {
++        trace("dwmapi not found, skipping tests\n");
++        return;
++    }
++
++    pDwmIsCompositionEnabled = (void *)GetProcAddress(hmod, "DwmIsCompositionEnabled");
++    pDwmEnableComposition = (void *)GetProcAddress(hmod, "DwmEnableComposition");
++    pDwmGetTransportAttributes = (void *)GetProcAddress(hmod, "DwmGetTransportAttributes");
++
++    test_isdwmenabled();
++    test_dwm_get_transport_attributes();
++}
+diff --git a/include/dwmapi.h b/include/dwmapi.h
+index b2f39deae5..12527aee62 100644
+--- a/include/dwmapi.h
++++ b/include/dwmapi.h
+@@ -101,6 +101,9 @@ typedef struct _MilMatrix3x2D
+     DOUBLE DY;
+ } MilMatrix3x2D;
+ 
++#define DWM_EC_DISABLECOMPOSITION     0
++#define DWM_EC_ENABLECOMPOSITION      1
++
+ #define DWM_BB_ENABLE                 0x00000001
+ #define DWM_BB_BLURREGION             0x00000002
+ #define DWM_BB_TRANSITIONONMAXIMIZED  0x00000004
+
+-- 
+2.17.1
+