Release v6.4

This is fixed upstream now.

.github/workflows/macOS.yml

@@ -0,0 +1,128 @@
+name: MacOS
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  workflow_dispatch:
+
+jobs:
+  wine-staging:
+    runs-on:  macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          brew install --cask xquartz
+          brew install  bison \
+                        faudio \
+                        gphoto2 \
+                        gst-plugins-base \
+                        little-cms2 \
+                        mingw-w64 \
+                        molten-vk \
+                        mpg123
+
+      - name: Add bison & krb5 to $PATH
+        run: |
+          set -eu
+          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
+
+      - name: Get upstream-commit
+        run: |
+          mkdir $GITHUB_WORKSPACE/wine
+          cd wine
+          git init
+          git fetch https://github.com/wine-mirror/wine.git $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit) --depth=1
+          git checkout $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit)
+
+      - name: Run patchinstall.sh --all
+        run: |
+          $GITHUB_WORKSPACE/patches/patchinstall.sh DESTDIR=$GITHUB_WORKSPACE/wine --all
+
+      - name: Configure wine64
+        env:
+          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
+          # Avoid weird linker errors with Xcode 10 and later
+          MACOSX_DEPLOYMENT_TARGET: "10.14"
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+          ./configure   --enable-win64 \
+                        --without-alsa \
+                        --without-capi \
+                        --without-dbus \
+                        --without-inotify \
+                        --without-oss \
+                        --without-pulse \
+                        --without-udev \
+                        --without-v4l2 \
+                        --x-include=/opt/X11/include \
+                        --x-lib=/opt/X11/lib
+
+      - name: Build wine64
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+          make -j$(sysctl -n hw.ncpu 2>/dev/null)
+
+  wine-devel:
+    runs-on:  macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          brew install --cask xquartz
+          brew install  bison \
+                        faudio \
+                        gphoto2 \
+                        gst-plugins-base \
+                        little-cms2 \
+                        mingw-w64 \
+                        molten-vk \
+                        mpg123
+
+      - name: Add bison & krb5 to $PATH
+        run: |
+          set -eu
+          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
+          echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
+
+      - name: Get upstream-commit
+        run: |
+          mkdir $GITHUB_WORKSPACE/wine
+          cd wine
+          git init
+          git fetch https://github.com/wine-mirror/wine.git $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit) --depth=1
+          git checkout $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit)
+
+      - name: Configure wine64
+        env:
+          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
+          # Avoid weird linker errors with Xcode 10 and later
+          MACOSX_DEPLOYMENT_TARGET: "10.14"
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+
+          cd $GITHUB_WORKSPACE/wine
+          ./configure   --enable-win64 \
+                        --without-alsa \
+                        --without-capi \
+                        --without-dbus \
+                        --without-inotify \
+                        --without-oss \
+                        --without-pulse \
+                        --without-udev \
+                        --without-v4l2 \
+                        --x-include=/opt/X11/include \
+                        --x-lib=/opt/X11/lib
+
+      - name: Build wine64
+        run: |
+          cd $GITHUB_WORKSPACE/wine
+          make -j$(sysctl -n hw.ncpu 2>/dev/null)

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

@@ -1,15 +1,14 @@
-From ce5e1fc75139e4de9d92dfe27b4a513a96da013c Mon Sep 17 00:00:00 2001
+From cfcc687562d4fa68b507cbf2c29722ef523d26aa Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
- Makefile.in            | 2 +-
- dlls/ntdll/Makefile.in | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 307a95b3b1a..61019fed949 100644
+index b52495f741f..d5a8cad20da 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -116,7 +116,7 @@ install-manpages:: manpages
@@ -21,15 +20,6 @@ index 307a95b3b1a..61019fed949 100644
  
  programs/winetest/build.rc: dummy
  	@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
-diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index f39ffb42c6f..67847bb9392 100644
---- a/dlls/ntdll/Makefile.in
-+++ b/dlls/ntdll/Makefile.in
-@@ -79,3 +79,4 @@ unix_loader_EXTRADEFS = \
- 	-DBINDIR=\"${bindir}\" \
- 	-DDLL_TO_BINDIR=\"`${MAKEDEP} -R ${dlldir} ${bindir}`\" \
- 	-DBIN_TO_DATADIR=\"`${MAKEDEP} -R ${bindir} ${datadir}/wine`\"
-+
 -- 
-2.28.0
+2.20.1
 

patches/Staging/definition

@@ -1 +0,0 @@
-#Depends: ntdll-NtAlertThreadByThreadId

patches/advapi32-Token_Integrity_Level/0002-server-Implement-token-elevation-information.patch

@@ -1,137 +0,0 @@
-From d2e98b2054a5af671fd81ded32f2cf60a062312c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 5 Aug 2017 00:26:03 +0200
-Subject: [PATCH] server: Implement token elevation information.
-
----
- dlls/ntdll/unix/security.c | 16 ++++++++++++----
- server/protocol.def        |  8 ++++++++
- server/token.c             | 22 +++++++++++++++++++---
- 3 files changed, 39 insertions(+), 7 deletions(-)
-
-diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c
-index d063d43d6d4..03a81afa46e 100644
---- a/dlls/ntdll/unix/security.c
-+++ b/dlls/ntdll/unix/security.c
-@@ -390,19 +390,27 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c
-         break;
- 
-     case TokenElevationType:
-+        SERVER_START_REQ( get_token_elevation_type )
-         {
-             TOKEN_ELEVATION_TYPE *type = info;
--            FIXME("QueryInformationToken( ..., TokenElevationType, ...) semi-stub\n");
--            *type = TokenElevationTypeFull;
-+            req->handle = wine_server_obj_handle( token );
-+            status = wine_server_call( req );
-+            if (status == STATUS_SUCCESS)
-+                *type = reply->elevation;
-         }
-+        SERVER_END_REQ;
-         break;
- 
-     case TokenElevation:
-+        SERVER_START_REQ( get_token_elevation_type )
-         {
-             TOKEN_ELEVATION *elevation = info;
--            FIXME("QueryInformationToken( ..., TokenElevation, ...) semi-stub\n");
--            elevation->TokenIsElevated = TRUE;
-+            req->handle = wine_server_obj_handle( token );
-+            status = wine_server_call( req );
-+            if (status == STATUS_SUCCESS)
-+                elevation->TokenIsElevated = (reply->elevation == TokenElevationTypeFull);
-         }
-+        SERVER_END_REQ;
-         break;
- 
-     case TokenSessionId:
-diff --git a/server/protocol.def b/server/protocol.def
-index ee07b1eca14..84f0b577d72 100644
---- a/server/protocol.def
-+++ b/server/protocol.def
-@@ -3566,6 +3566,14 @@ struct handle_info
- @END
- 
- 
-+/* Get elevation level of token */
-+@REQ(get_token_elevation_type)
-+    obj_handle_t   handle;        /* handle to the object */
-+@REPLY
-+    unsigned int   elevation;     /* elevation level */
-+@END
-+
-+
- /* Create I/O completion port */
- @REQ(create_completion)
-     unsigned int access;          /* desired access to a port */
-diff --git a/server/token.c b/server/token.c
-index 38a4c203d54..14343637af5 100644
---- a/server/token.c
-+++ b/server/token.c
-@@ -110,6 +110,7 @@ struct token
-     ACL           *default_dacl;    /* the default DACL to assign to objects created by this user */
-     TOKEN_SOURCE   source;          /* source of the token */
-     int            impersonation_level; /* impersonation level this token is capable of if non-primary token */
-+    TOKEN_ELEVATION_TYPE elevation; /* elevation level */
- };
- 
- struct privilege
-@@ -552,7 +553,7 @@ static struct token *create_token( unsigned primary, const SID *user,
-                                    const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count,
-                                    const ACL *default_dacl, TOKEN_SOURCE source,
-                                    const luid_t *modified_id,
--                                   int impersonation_level )
-+                                   int impersonation_level, TOKEN_ELEVATION_TYPE elevation )
- {
-     struct token *token = alloc_object( &token_ops );
-     if (token)
-@@ -574,6 +575,7 @@ static struct token *create_token( unsigned primary, const SID *user,
-             token->impersonation_level = impersonation_level;
-         token->default_dacl = NULL;
-         token->primary_group = NULL;
-+        token->elevation = elevation;
- 
-         /* copy user */
-         token->user = memdup( user, security_sid_len( user ));
-@@ -689,7 +691,8 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
-     token = create_token( primary, src_token->user, NULL, 0,
-                           NULL, 0, src_token->default_dacl,
-                           src_token->source, modified_id,
--                          impersonation_level );
-+                          impersonation_level,
-+                          src_token->elevation );
-     if (!token) return token;
- 
-     /* copy groups */
-@@ -895,7 +898,7 @@ struct token *token_create_admin( void )
-         static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}};
-         token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ),
-                               admin_privs, ARRAY_SIZE( admin_privs ), default_dacl,
--                              admin_source, NULL, -1 );
-+                              admin_source, NULL, -1, TokenElevationTypeFull );
-         /* we really need a primary group */
-         assert( token->primary_group );
-     }
-@@ -1634,6 +1637,19 @@ DECL_HANDLER(get_token_statistics)
-     }
- }
- 
-+DECL_HANDLER(get_token_elevation_type)
-+{
-+    struct token *token;
-+
-+    if ((token = (struct token *)get_handle_obj( current->process, req->handle,
-+                                                 TOKEN_QUERY,
-+                                                 &token_ops )))
-+    {
-+        reply->elevation = token->elevation;
-+        release_object( token );
-+    }
-+}
-+
- DECL_HANDLER(get_token_default_dacl)
- {
-     struct token *token;
--- 
-2.27.0
-

patches/advapi32-Token_Integrity_Level/0005-server-Use-all-group-attributes-in-create_token.patch

@@ -1,46 +0,0 @@
-From 48f4c131f9e8ffc091dde12437ad0772ed1c5ca6 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 6 Aug 2017 15:16:33 +0200
-Subject: server: Use all group attributes in create_token.
-
----
- server/token.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/server/token.c b/server/token.c
-index 0019b3a..2a56664 100644
---- a/server/token.c
-+++ b/server/token.c
-@@ -592,13 +592,13 @@ static struct token *create_token( unsigned primary, const SID *user,
-                 return NULL;
-             }
-             memcpy( &group->sid, groups[i].Sid, security_sid_len( groups[i].Sid ));
--            group->enabled = TRUE;
--            group->def = TRUE;
--            group->logon = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0;
-             group->mandatory = (groups[i].Attributes & SE_GROUP_MANDATORY) != 0;
--            group->owner = (groups[i].Attributes & SE_GROUP_OWNER) != 0;
--            group->resource = FALSE;
--            group->deny_only = FALSE;
-+            group->def       = (groups[i].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) != 0;
-+            group->enabled   = (groups[i].Attributes & SE_GROUP_ENABLED) != 0;
-+            group->owner     = (groups[i].Attributes & SE_GROUP_OWNER) != 0;
-+            group->deny_only = (groups[i].Attributes & SE_GROUP_USE_FOR_DENY_ONLY) != 0;
-+            group->logon     = (groups[i].Attributes & SE_GROUP_LOGON_ID) != 0;
-+            group->resource  = (groups[i].Attributes & SE_GROUP_RESOURCE) != 0;
-             list_add_tail( &token->groups, &group->entry );
-             /* Use first owner capable group as owner and primary group */
-             if (!token->primary_group && group->owner)
-@@ -1603,8 +1603,8 @@ DECL_HANDLER(get_token_groups)
-                     if (group->enabled) *attr_ptr |= SE_GROUP_ENABLED;
-                     if (group->owner) *attr_ptr |= SE_GROUP_OWNER;
-                     if (group->deny_only) *attr_ptr |= SE_GROUP_USE_FOR_DENY_ONLY;
--                    if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE;
-                     if (group->logon) *attr_ptr |= SE_GROUP_LOGON_ID;
-+                    if (group->resource) *attr_ptr |= SE_GROUP_RESOURCE;
- 
-                     memcpy(sid_ptr, &group->sid, security_sid_len( &group->sid ));
- 
--- 
-2.7.4
-

patches/advapi32-Token_Integrity_Level/0006-ntdll-Add-function-to-create-new-tokens-for-elevatio.patch

@@ -1,219 +0,0 @@
-From c47977a8bbd739483589d1f01cfece435be1c100 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 5 Aug 2017 01:45:29 +0200
-Subject: [PATCH] ntdll: Add function to create new tokens for elevation
- purposes.
-
----
- dlls/ntdll/ntdll.spec   |  3 ++
- dlls/ntdll/ntdll_misc.h |  3 ++
- dlls/ntdll/process.c    | 18 +++++++++
- server/protocol.def     |  8 ++++
- server/security.h       |  1 +
- server/token.c          | 84 +++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 117 insertions(+)
-
-diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
-index 0997c310110..8e3786e1972 100644
---- a/dlls/ntdll/ntdll.spec
-+++ b/dlls/ntdll/ntdll.spec
-@@ -1600,6 +1600,9 @@
- # Virtual memory
- @ cdecl __wine_locked_recvmsg(long ptr long)
- 
-+# Token
-+@ cdecl __wine_create_default_token(long)
-+
- # Version
- @ cdecl wine_get_version()
- @ cdecl wine_get_build_id()
-diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 63ceac42e94..5a98501381b 100644
---- a/dlls/ntdll/ntdll_misc.h
-+++ b/dlls/ntdll/ntdll_misc.h
-@@ -67,6 +67,9 @@ extern void init_user_process_params(void) DECLSPEC_HIDDEN;
- extern NTSTATUS restart_process( RTL_USER_PROCESS_PARAMETERS *params, NTSTATUS status ) DECLSPEC_HIDDEN;
- extern void CDECL DECLSPEC_NORETURN signal_start_thread( CONTEXT *ctx ) DECLSPEC_HIDDEN;
- 
-+/* token */
-+extern HANDLE CDECL __wine_create_default_token(BOOL admin);
-+
- /* server support */
- extern BOOL is_wow64 DECLSPEC_HIDDEN;
- 
-diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c
-index 77ba5b371e2..3e91a1fa9c4 100644
---- a/dlls/ntdll/process.c
-+++ b/dlls/ntdll/process.c
-@@ -72,6 +72,24 @@ HANDLE CDECL __wine_make_process_system(void)
-     return ret;
- }
- 
-+/***********************************************************************
-+ *           __wine_create_default_token   (NTDLL.@)
-+ *
-+ * Creates a default limited or admin token.
-+ */
-+HANDLE CDECL __wine_create_default_token( BOOL admin )
-+{
-+    HANDLE ret = NULL;
-+    SERVER_START_REQ( create_token )
-+    {
-+        req->admin = admin;
-+        if (!wine_server_call( req ))
-+            ret = wine_server_ptr_handle( reply->token );
-+    }
-+    SERVER_END_REQ;
-+    return ret;
-+}
-+
- /***********************************************************************
-  *           restart_process
-  */
-diff --git a/server/protocol.def b/server/protocol.def
-index 30a102d7b82..a9308904afc 100644
---- a/server/protocol.def
-+++ b/server/protocol.def
-@@ -3481,6 +3481,14 @@ struct handle_info
- @END
- 
- 
-+/* Create a new token */
-+@REQ(create_token)
-+    unsigned int  admin;        /* admin or limited token */
-+@REPLY
-+    obj_handle_t  token;        /* handle for new token */
-+@END
-+
-+
- /* Create I/O completion port */
- @REQ(create_completion)
-     unsigned int access;          /* desired access to a port */
-diff --git a/server/security.h b/server/security.h
-index 6c337143c3d..21e90ccf23f 100644
---- a/server/security.h
-+++ b/server/security.h
-@@ -49,6 +49,7 @@ extern const PSID security_builtin_users_sid;
- extern const PSID security_builtin_admins_sid;
- extern const PSID security_domain_users_sid;
- extern const PSID security_high_label_sid;
-+extern const PSID security_medium_label_sid;
- 
- 
- /* token functions */
-diff --git a/server/token.c b/server/token.c
-index c4f1cd943c2..970ed1838da 100644
---- a/server/token.c
-+++ b/server/token.c
-@@ -77,6 +77,7 @@ static const SID anonymous_logon_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORIT
- static const SID authenticated_user_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_AUTHENTICATED_USER_RID } };
- static const SID local_system_sid = { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } };
- static const SID high_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_HIGH_RID } };
-+static const SID medium_label_sid = { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY }, { SECURITY_MANDATORY_MEDIUM_RID } };
- static const SID_N(5) local_user_sid = { SID_REVISION, 5, { SECURITY_NT_AUTHORITY }, { SECURITY_NT_NON_UNIQUE, 0, 0, 0, 1000 } };
- static const SID_N(2) builtin_admins_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS } };
- static const SID_N(2) builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } };
-@@ -93,6 +94,7 @@ const PSID security_builtin_admins_sid = (PSID)&builtin_admins_sid;
- const PSID security_builtin_users_sid = (PSID)&builtin_users_sid;
- const PSID security_domain_users_sid = (PSID)&domain_users_sid;
- const PSID security_high_label_sid = (PSID)&high_label_sid;
-+const PSID security_medium_label_sid = (PSID)&medium_label_sid;
- 
- static luid_t prev_luid_value = { 1000, 0 };
- 
-@@ -915,6 +917,64 @@ struct token *token_create_admin( void )
-     return token;
- }
- 
-+static struct token *token_create_limited( void )
-+{
-+    struct token *token = NULL;
-+    static const SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY };
-+    static const unsigned int alias_admins_subauth[] = { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS };
-+    static const unsigned int alias_users_subauth[] = { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS };
-+    /* on Windows, this value changes every time the user logs on */
-+    static const unsigned int logon_subauth[] = { SECURITY_LOGON_IDS_RID, 0, 1 /* FIXME: should be randomly generated when tokens are inherited by new processes */ };
-+    PSID alias_admins_sid;
-+    PSID alias_users_sid;
-+    PSID logon_sid;
-+    const SID *user_sid = security_unix_uid_to_sid( getuid() );
-+    ACL *default_dacl = create_default_dacl( user_sid );
-+
-+    alias_admins_sid = security_sid_alloc( &nt_authority, sizeof(alias_admins_subauth)/sizeof(alias_admins_subauth[0]),
-+                                           alias_admins_subauth );
-+    alias_users_sid = security_sid_alloc( &nt_authority, sizeof(alias_users_subauth)/sizeof(alias_users_subauth[0]),
-+                                          alias_users_subauth );
-+    logon_sid = security_sid_alloc( &nt_authority, sizeof(logon_subauth)/sizeof(logon_subauth[0]),
-+                                    logon_subauth );
-+
-+    if (alias_admins_sid && alias_users_sid && logon_sid && default_dacl)
-+    {
-+        const LUID_AND_ATTRIBUTES user_privs[] =
-+        {
-+            { SeChangeNotifyPrivilege        , SE_PRIVILEGE_ENABLED },
-+            { SeShutdownPrivilege            , 0                    },
-+            { SeUndockPrivilege              , 0                    },
-+        };
-+        /* note: we don't include non-builtin groups here for the user -
-+         * telling us these is the job of a client-side program */
-+        const SID_AND_ATTRIBUTES user_groups[] =
-+        {
-+            { security_world_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-+            { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-+            { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-+            { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-+            { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER },
-+            { alias_admins_sid, SE_GROUP_USE_FOR_DENY_ONLY },
-+            { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY },
-+            { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID },
-+        };
-+        static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}};
-+        token = create_token( TRUE, user_sid, user_groups, sizeof(user_groups)/sizeof(user_groups[0]),
-+                              user_privs, sizeof(user_privs)/sizeof(user_privs[0]), default_dacl,
-+                              admin_source, NULL, -1, TokenElevationTypeLimited, &medium_label_sid );
-+        /* we really need a primary group */
-+        assert( token->primary_group );
-+    }
-+
-+    free( logon_sid );
-+    free( alias_admins_sid );
-+    free( alias_users_sid );
-+    free( default_dacl );
-+
-+    return token;
-+}
-+
- static struct privilege *token_find_privilege( struct token *token, const LUID *luid, int enabled_only )
- {
-     struct privilege *privilege;
-@@ -1720,3 +1780,27 @@ DECL_HANDLER(set_token_default_dacl)
-         release_object( token );
-     }
- }
-+
-+DECL_HANDLER(create_token)
-+{
-+    struct token *token;
-+    PSID label;
-+
-+    if (req->admin)
-+    {
-+        token = token_create_admin();
-+        label = security_high_label_sid;
-+    }
-+    else
-+    {
-+        token = token_create_limited();
-+        label = security_medium_label_sid;
-+    }
-+
-+    if (token)
-+    {
-+        if (token_assign_label( token, label ))
-+            reply->token = alloc_handle( current->process, token, TOKEN_ALL_ACCESS, 0 );
-+        release_object( token );
-+    }
-+}
--- 
-2.28.0
-

patches/advapi32-Token_Integrity_Level/0007-shell32-Implement-process-elevation-using-runas-verb.patch

@@ -1,66 +0,0 @@
-From cf24ca0854a5b0dca2055f0991fd9a932125c65e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 5 Aug 2017 02:03:20 +0200
-Subject: shell32: Implement process elevation using runas verb.
-
----
- dlls/shell32/shlexec.c | 22 ++++++++++++++++++++--
- 1 file changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
-index 0cf112b6373..af50078dbca 100644
---- a/dlls/shell32/shlexec.c
-+++ b/dlls/shell32/shlexec.c
-@@ -50,6 +50,8 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(exec);
- 
-+extern HANDLE CDECL __wine_create_default_token(BOOL admin);
-+
- static const WCHAR wszOpen[] = {'o','p','e','n',0};
- static const WCHAR wszExe[] = {'.','e','x','e',0};
- static const WCHAR wszILPtr[] = {':','%','p',0};
-@@ -312,6 +314,8 @@ static HRESULT SHELL_GetPathFromIDListForExecuteW(LPCITEMIDLIST pidl, LPWSTR psz
- static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
- 			    const SHELLEXECUTEINFOW *psei, LPSHELLEXECUTEINFOW psei_out)
- {
-+    static WCHAR runasW[] = {'r','u','n','a','s',0};
-+    HANDLE token = NULL;
-     STARTUPINFOW  startup;
-     PROCESS_INFORMATION info;
-     UINT_PTR retval = SE_ERR_NOASSOC;
-@@ -344,8 +348,20 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
-     dwCreationFlags = CREATE_UNICODE_ENVIRONMENT;
-     if (!(psei->fMask & SEE_MASK_NO_CONSOLE))
-         dwCreationFlags |= CREATE_NEW_CONSOLE;
--    if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env,
--                       lpDirectory, &startup, &info))
-+
-+    /* Spawning a process with runas verb means that the process should be
-+     * executed with admin rights. This function ignores the manifest data,
-+     * and allows programs to elevate rights on-demand. On Windows a complex
-+     * RPC menchanism is used, using CreateProcessAsUser would fail because
-+     * it can only be used to drop rights. */
-+    if (psei->lpVerb && !strcmpiW(psei->lpVerb, runasW))
-+    {
-+        if (!(token = __wine_create_default_token(TRUE)))
-+            ERR("Failed to create admin token\n");
-+    }
-+
-+    if (CreateProcessAsUserW(token, NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE,
-+                             dwCreationFlags, env, lpDirectory, &startup, &info))
-     {
-         /* Give 30 seconds to the app to come up, if desired. Probably only needed
-            when starting app immediately before making a DDE connection. */
-@@ -365,6 +381,8 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
-         retval = ERROR_BAD_FORMAT;
-     }
- 
-+    if (token) CloseHandle(token);
-+
-     TRACE("returning %lu\n", retval);
- 
-     psei_out->hInstApp = (HINSTANCE)retval;
--- 
-2.13.1
-

patches/advapi32-Token_Integrity_Level/0015-ntdll-Add-semi-stub-for-TokenLinkedToken-info-class.patch

@@ -1,67 +0,0 @@
-From e34d019222909281390f83149be755a4145024c4 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Mon, 7 Aug 2017 15:28:33 +0200
-Subject: [PATCH] ntdll: Add semi-stub for TokenLinkedToken info class.
-
----
- dlls/ntdll/unix/security.c | 30 +++++++++++++++++++++++++++++-
- 1 file changed, 29 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c
-index f0057116dee..2769e5f6a7b 100644
---- a/dlls/ntdll/unix/security.c
-+++ b/dlls/ntdll/unix/security.c
-@@ -138,6 +138,7 @@ NTSTATUS WINAPI NtDuplicateToken( HANDLE token, ACCESS_MASK access, OBJECT_ATTRI
-     return status;
- }
- 
-+extern HANDLE CDECL __wine_create_default_token(BOOL admin);
- 
- /***********************************************************************
-  *             NtQueryInformationToken  (NTDLL.@)
-@@ -166,7 +167,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c
-         0,    /* TokenAuditPolicy */
-         0,    /* TokenOrigin */
-         sizeof(TOKEN_ELEVATION_TYPE), /* TokenElevationType */
--        0,    /* TokenLinkedToken */
-+        sizeof(TOKEN_LINKED_TOKEN), /* TokenLinkedToken */
-         sizeof(TOKEN_ELEVATION), /* TokenElevation */
-         0,    /* TokenHasRestrictions */
-         0,    /* TokenAccessInformation */
-@@ -401,6 +402,33 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c
-         SERVER_END_REQ;
-         break;
- 
-+    case TokenLinkedToken:
-+        SERVER_START_REQ( get_token_elevation_type )
-+        {
-+            TOKEN_LINKED_TOKEN *linked_token = info;
-+            req->handle = wine_server_obj_handle( token );
-+            status = wine_server_call( req );
-+            if (status == STATUS_SUCCESS)
-+            {
-+                HANDLE token;
-+                /* FIXME: On Wine we do not have real linked tokens yet. Typically, a
-+                 * program running with admin privileges is linked to a limited token,
-+                 * and vice versa. We just create a new token instead of storing links
-+                 * on the wineserver side. Using TokenLinkedToken twice should return
-+                 * back the original token. */
-+                if ((reply->elevation == TokenElevationTypeFull || reply->elevation == TokenElevationTypeLimited) &&
-+                    (token = __wine_create_default_token( reply->elevation != TokenElevationTypeFull )))
-+                {
-+                    status = NtDuplicateToken( token, 0, NULL, SecurityIdentification, TokenImpersonation, &linked_token->LinkedToken );
-+                    NtClose( token );
-+                }
-+                else
-+                    status = STATUS_NO_TOKEN;
-+            }
-+        }
-+        SERVER_END_REQ;
-+        break;
-+
-     case TokenElevation:
-         SERVER_START_REQ( get_token_elevation_type )
-         {
--- 
-2.27.0
-

patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch

@@ -1,23 +1,23 @@
-From 19683a27eaaed9c23635e9b5fa768a6c120a2ace Mon Sep 17 00:00:00 2001
+From 9bdd47614e24f12a292c18bdc9d81e55744b6e5f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 01:11:46 +0100
 Subject: [PATCH] iertutil: Add dll and add stub for ordinal 811.
 
 ---
  configure.ac                |   1 +
- dlls/iertutil/Makefile.in   |   4 +
- dlls/iertutil/iertutil.spec | 521 ++++++++++++++++++++++++++++++++++++++++++++
- dlls/iertutil/main.c        |  48 ++++
- 4 files changed, 574 insertions(+)
+ dlls/iertutil/Makefile.in   |   6 +
+ dlls/iertutil/iertutil.spec | 521 ++++++++++++++++++++++++++++++++++++
+ dlls/iertutil/main.c        |  31 +++
+ 4 files changed, 559 insertions(+)
  create mode 100644 dlls/iertutil/Makefile.in
  create mode 100644 dlls/iertutil/iertutil.spec
  create mode 100644 dlls/iertutil/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 5c97c1c..d70dcea 100644
+index caff5d1fe52..91b95b8e7b1 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3286,6 +3286,7 @@ WINE_CONFIG_MAKEFILE(dlls/icmp)
+@@ -3342,6 +3342,7 @@ WINE_CONFIG_MAKEFILE(dlls/icmp)
  WINE_CONFIG_MAKEFILE(dlls/ieframe)
  WINE_CONFIG_MAKEFILE(dlls/ieframe/tests)
  WINE_CONFIG_MAKEFILE(dlls/ieproxy)
@@ -27,17 +27,19 @@ index 5c97c1c..d70dcea 100644
  WINE_CONFIG_MAKEFILE(dlls/imagehlp)
 diff --git a/dlls/iertutil/Makefile.in b/dlls/iertutil/Makefile.in
 new file mode 100644
-index 0000000..268026e
+index 00000000000..47f9d228812
 --- /dev/null
 +++ b/dlls/iertutil/Makefile.in
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,6 @@
 +MODULE    = iertutil.dll
 +
++EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
++
 +C_SRCS = \
 +	main.c
 diff --git a/dlls/iertutil/iertutil.spec b/dlls/iertutil/iertutil.spec
 new file mode 100644
-index 0000000..a13779b
+index 00000000000..a13779bebbd
 --- /dev/null
 +++ b/dlls/iertutil/iertutil.spec
 @@ -0,0 +1,521 @@
@@ -564,10 +566,10 @@ index 0000000..a13779b
 +@ stub UriFromHostAndScheme
 diff --git a/dlls/iertutil/main.c b/dlls/iertutil/main.c
 new file mode 100644
-index 0000000..2b993a4
+index 00000000000..4e5e9f086b3
 --- /dev/null
 +++ b/dlls/iertutil/main.c
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,31 @@
 +/*
 + * Copyright 2016 Michael Müller
 + *
@@ -586,7 +588,6 @@ index 0000000..2b993a4
 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 + */
 +
-+#include "config.h"
 +#include <stdarg.h>
 +
 +#include "windef.h"
@@ -595,27 +596,11 @@ index 0000000..2b993a4
 +
 +WINE_DEFAULT_DEBUG_CHANNEL(iertutil);
 +
-+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
-+{
-+    TRACE("(%p, %u, %p)\n", instance, reason, reserved);
-+
-+    switch (reason)
-+    {
-+        case DLL_WINE_PREATTACH:
-+            return FALSE;  /* prefer native version */
-+        case DLL_PROCESS_ATTACH:
-+            DisableThreadLibraryCalls(instance);
-+            break;
-+    }
-+
-+    return TRUE;
-+}
-+
 +BOOL WINAPI IERTUTIL_811(void *unknown)
 +{
 +    FIXME("(%p): stub\n", unknown);
 +    return FALSE;
 +}
 -- 
-1.9.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 21b4b65eadc9e39008ccadc48307fcfea05a24fb Mon Sep 17 00:00:00 2001
+From 0e65ed108eb8bab24668f9a58c5757a3ad36104f 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: [PATCH] uiautomationcore: Add dll and stub some functions.
@@ -9,7 +9,7 @@ Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
  2 files changed, 48 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index b6edec5f6a9..bf2204d5ab4 100644
+index 5c4acb232a4..412f1dbbe19 100644
 --- a/dlls/uiautomationcore/Makefile.in
 +++ b/dlls/uiautomationcore/Makefile.in
 @@ -1,5 +1,6 @@
@@ -17,10 +17,10 @@ index b6edec5f6a9..bf2204d5ab4 100644
  IMPORTLIB = uiautomationcore
 +IMPORTS   = uuid
  
- EXTRADLLFLAGS = -mno-cygwin
+ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
  
 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index f0d8247724d..b9c24b4b963 100644
+index 42014af6035..61e165d83c0 100644
 --- a/dlls/uiautomationcore/uia_main.c
 +++ b/dlls/uiautomationcore/uia_main.c
 @@ -1,4 +1,5 @@
@@ -29,7 +29,7 @@ index f0d8247724d..b9c24b4b963 100644
   * Copyright 2017 Jacek Caban for CodeWeavers
   *
   * This library is free software; you can redistribute it and/or
-@@ -16,6 +17,7 @@
+@@ -16,18 +17,58 @@
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
  
@@ -37,9 +37,8 @@ index f0d8247724d..b9c24b4b963 100644
  #include "uiautomation.h"
  
  #include "wine/debug.h"
-@@ -37,12 +39,51 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv)
-     return TRUE;
- }
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
  
 +static HRESULT WINAPI dummy_QueryInterface(IUnknown *iface, REFIID iid, void **ppv)
 +{
@@ -90,7 +89,7 @@ index f0d8247724d..b9c24b4b963 100644
      return FALSE;
  }
  
-@@ -51,8 +92,8 @@ BOOL WINAPI UiaClientsAreListening(void)
+@@ -36,8 +77,8 @@ BOOL WINAPI UiaClientsAreListening(void)
   */
  HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
  {
@@ -101,7 +100,7 @@ index f0d8247724d..b9c24b4b963 100644
      return S_OK;
  }
  
-@@ -61,8 +102,8 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
+@@ -46,8 +87,8 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
   */
  HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
  {
@@ -112,7 +111,7 @@ index f0d8247724d..b9c24b4b963 100644
      return S_OK;
  }
  
-@@ -81,7 +122,7 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid)
+@@ -66,7 +107,7 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid)
  LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam,
          LPARAM lParam, IRawElementProviderSimple *elprov)
  {
@@ -122,5 +121,5 @@ index f0d8247724d..b9c24b4b963 100644
  }
  
 -- 
-2.17.1
+2.20.1
 

patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch

@@ -1,4 +1,4 @@
-From 645cdde83d5430c5096fcb4ec4191aab7e8063ce Mon Sep 17 00:00:00 2001
+From 50bd67fb1fd718eaaf9f5600fba7ab86e4b71a76 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 5 Jul 2019 13:20:23 +0800
 Subject: [PATCH] cryptext: Implement CryptExtOpenCER.
@@ -17,10 +17,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  create mode 100644 dlls/cryptext/tests/cryptext.c
 
 diff --git a/configure b/configure
-index 8567a9ca4ef..9b4ff8a2d7a 100755
+index 2b20133cd65..f3ef3aef3a9 100755
 --- a/configure
 +++ b/configure
-@@ -20276,6 +20276,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -20350,6 +20350,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
  wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg
  wine_fn_config_makefile dlls/cryptdll enable_cryptdll
  wine_fn_config_makefile dlls/cryptext enable_cryptext
@@ -29,10 +29,10 @@ index 8567a9ca4ef..9b4ff8a2d7a 100755
  wine_fn_config_makefile dlls/cryptnet/tests enable_tests
  wine_fn_config_makefile dlls/cryptsp enable_cryptsp
 diff --git a/configure.ac b/configure.ac
-index 0549a9ee78a..b58b05d4dd7 100644
+index 24f5c8847d6..f71fb6f401d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3070,6 +3070,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -3083,6 +3083,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
@@ -41,7 +41,7 @@ index 0549a9ee78a..b58b05d4dd7 100644
  WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptsp)
 diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
-index 9c9f84cee87..0e817ffda6c 100644
+index 3acce60ae88..590074a806f 100644
 --- a/dlls/cryptext/Makefile.in
 +++ b/dlls/cryptext/Makefile.in
 @@ -1,4 +1,5 @@
@@ -49,7 +49,7 @@ index 9c9f84cee87..0e817ffda6c 100644
 +MODULE  = cryptext.dll
 +IMPORTS = crypt32 cryptui user32
  
- EXTRADLLFLAGS = -mno-cygwin
+ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
  
 diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec
 index 0dba38e3934..911ab2f4ba4 100644
@@ -67,7 +67,7 @@ index 0dba38e3934..911ab2f4ba4 100644
  @ stub CryptExtOpenCRLW
  @ stub CryptExtOpenCTL
 diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c
-index f7c7bd1f554..2a381782d68 100644
+index 537ba66cd3b..f9e34d1f8c5 100644
 --- a/dlls/cryptext/cryptext_main.c
 +++ b/dlls/cryptext/cryptext_main.c
 @@ -22,10 +22,29 @@
@@ -97,10 +97,10 @@ index f7c7bd1f554..2a381782d68 100644
 +    return ret;
 +}
 +
- BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
- {
-     TRACE("(%p, %u, %p)\n", instance, reason, reserved);
-@@ -59,3 +78,48 @@ HRESULT WINAPI CryptExtAddPFXW(LPCWSTR filename)
+ /***********************************************************************
+  * CryptExtAddPFX (CRYPTEXT.@)
+  */
+@@ -43,3 +62,48 @@ HRESULT WINAPI CryptExtAddPFXW(LPCWSTR filename)
      FIXME("stub: %s\n", debugstr_w(filename));
      return E_NOTIMPL;
  }

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

@@ -1,20 +1,20 @@
-From 896b9be78dfd979ddea8f098ae66473956d4147c Mon Sep 17 00:00:00 2001
+From db0d249ec00a19f9ffbe26ee966eb222921fb36e Mon Sep 17 00:00:00 2001
 From: Kimmo Myllyvirta <kimmo.myllyvirta@gmail.com>
 Date: Sat, 24 Sep 2016 06:51:24 +0300
 Subject: [PATCH] d3d11: Add stub deferred rendering context.
 
 ---
- dlls/d3d11/device.c      | 1268 +++++++++++++++++++++++++++++++++-----
+ dlls/d3d11/device.c      | 1270 +++++++++++++++++++++++++++++++++-----
  dlls/d3d11/tests/d3d11.c |    4 +-
- 2 files changed, 1132 insertions(+), 140 deletions(-)
+ 2 files changed, 1133 insertions(+), 141 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 31c7f35fc25..dca5a88caa0 100644
+index 066bf9880c4..454003128dc 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
-@@ -22,6 +22,16 @@
- 
- WINE_DEFAULT_DEBUG_CHANNEL(d3d11);
+@@ -48,6 +48,16 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S
+     return TRUE;
+ }
  
 +/* ID3D11DeviceContext - deferred context */
 +struct d3d11_deferred_context
@@ -29,7 +29,7 @@ index 31c7f35fc25..dca5a88caa0 100644
  static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
  
  static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
-@@ -2883,218 +2893,1186 @@ static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *cont
+@@ -3114,218 +3124,1186 @@ static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *cont
      wined3d_private_store_cleanup(&context->private_store);
  }
  
@@ -130,11 +130,11 @@ index 31c7f35fc25..dca5a88caa0 100644
 -    HRESULT hr;
 -
 -    TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture);
-+    struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
- 
+-
 -    if (FAILED(hr = d3d_texture2d_create(device, desc, data, &object)))
 -        return hr;
--
++    struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
+ 
 -    *texture = &object->ID3D11Texture2D_iface;
 +    TRACE("iface %p, device %p.\n", iface, device);
  
@@ -151,13 +151,13 @@ index 31c7f35fc25..dca5a88caa0 100644
 -    struct d3d_device *device = impl_from_ID3D11Device2(iface);
 -    struct d3d_texture3d *object;
 -    HRESULT hr;
-+    struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
- 
+-
 -    TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture);
 -
 -    if (FAILED(hr = d3d_texture3d_create(device, desc, data, &object)))
 -        return hr;
--
++    struct d3d11_deferred_context *context = impl_from_deferred_ID3D11DeviceContext(iface);
+ 
 -    *texture = &object->ID3D11Texture3D_iface;
 +    TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data);
  
@@ -205,11 +205,14 @@ index 31c7f35fc25..dca5a88caa0 100644
 -    struct d3d_device *device = impl_from_ID3D11Device2(iface);
 -    struct d3d11_unordered_access_view *object;
 -    HRESULT hr;
+-
+-    TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
 +    FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n",
 +            iface, start_slot, buffer_count, buffers);
 +}
  
--    TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
+-    if (FAILED(hr = d3d11_unordered_access_view_create(device, resource, desc, &object)))
+-        return hr;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_PSSetShaderResources(ID3D11DeviceContext *iface,
 +        UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
 +{
@@ -217,8 +220,7 @@ index 31c7f35fc25..dca5a88caa0 100644
 +            iface, start_slot, view_count, views);
 +}
  
--    if (FAILED(hr = d3d11_unordered_access_view_create(device, resource, desc, &object)))
--        return hr;
+-    *view = &object->ID3D11UnorderedAccessView_iface;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_PSSetShader(ID3D11DeviceContext *iface,
 +        ID3D11PixelShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
 +{
@@ -226,35 +228,36 @@ index 31c7f35fc25..dca5a88caa0 100644
 +            iface, shader, class_instances, class_instance_count);
 +}
  
--    *view = &object->ID3D11UnorderedAccessView_iface;
+-    return S_OK;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_PSSetSamplers(ID3D11DeviceContext *iface,
 +        UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
 +{
 +    FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
 +            iface, start_slot, sampler_count, samplers);
-+}
- 
--    return S_OK;
-+static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShader(ID3D11DeviceContext *iface,
-+        ID3D11VertexShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
-+{
-+    FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n",
-+            iface, shader, class_instances, class_instance_count);
  }
  
 -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Device2 *iface,
 -        ID3D11Resource *resource, const D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11RenderTargetView **view)
-+static void STDMETHODCALLTYPE d3d11_deferred_context_DrawIndexed(ID3D11DeviceContext *iface,
-+        UINT index_count, UINT start_index_location, INT base_vertex_location)
++static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShader(ID3D11DeviceContext *iface,
++        ID3D11VertexShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
  {
 -    struct d3d_device *device = impl_from_ID3D11Device2(iface);
 -    struct d3d_rendertarget_view *object;
 -    HRESULT hr;
++    FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n",
++            iface, shader, class_instances, class_instance_count);
++}
+ 
+-    TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
++static void STDMETHODCALLTYPE d3d11_deferred_context_DrawIndexed(ID3D11DeviceContext *iface,
++        UINT index_count, UINT start_index_location, INT base_vertex_location)
++{
 +    FIXME("iface %p, index_count %u, start_index_location %u, base_vertex_location %d stub!\n",
 +            iface, index_count, start_index_location, base_vertex_location);
 +}
  
--    TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
+-    if (!resource)
+-        return E_INVALIDARG;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface,
 +        UINT vertex_count, UINT start_vertex_location)
 +{
@@ -262,46 +265,46 @@ index 31c7f35fc25..dca5a88caa0 100644
 +            iface, vertex_count, start_vertex_location);
 +}
  
--    if (!resource)
--        return E_INVALIDARG;
+-    if (FAILED(hr = d3d_rendertarget_view_create(device, resource, desc, &object)))
+-        return hr;
 +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)
 +{
 +    FIXME("iface %p, resource %p, subresource_idx %u, map_type %u, map_flags %#x, mapped_subresource %p stub!\n",
 +            iface, resource, subresource_idx, map_type, map_flags, mapped_subresource);
  
--    if (FAILED(hr = d3d_rendertarget_view_create(device, resource, desc, &object)))
--        return hr;
+-    *view = &object->ID3D11RenderTargetView_iface;
 +    return E_NOTIMPL;
 +}
  
--    *view = &object->ID3D11RenderTargetView_iface;
+-    return S_OK;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_Unmap(ID3D11DeviceContext *iface, ID3D11Resource *resource,
 +        UINT subresource_idx)
 +{
 +    FIXME("iface %p, resource %p, subresource_idx %u stub!\n", iface, resource, subresource_idx);
-+}
- 
--    return S_OK;
-+static void STDMETHODCALLTYPE d3d11_deferred_context_PSSetConstantBuffers(ID3D11DeviceContext *iface,
-+        UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
-+{
-+    FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n",
-+            iface, start_slot, buffer_count, buffers);
  }
  
 -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device2 *iface,
 -        ID3D11Resource *resource, const D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11DepthStencilView **view)
-+static void STDMETHODCALLTYPE d3d11_deferred_context_IASetInputLayout(ID3D11DeviceContext *iface,
-+        ID3D11InputLayout *input_layout)
++static void STDMETHODCALLTYPE d3d11_deferred_context_PSSetConstantBuffers(ID3D11DeviceContext *iface,
++        UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
 -    struct d3d_device *device = impl_from_ID3D11Device2(iface);
 -    struct d3d_depthstencil_view *object;
 -    HRESULT hr;
-+    FIXME("iface %p, input_layout %p stub!\n", iface, input_layout);
++    FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n",
++            iface, start_slot, buffer_count, buffers);
 +}
  
 -    TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view);
++static void STDMETHODCALLTYPE d3d11_deferred_context_IASetInputLayout(ID3D11DeviceContext *iface,
++        ID3D11InputLayout *input_layout)
++{
++    FIXME("iface %p, input_layout %p stub!\n", iface, input_layout);
++}
+ 
+-    if (FAILED(hr = d3d_depthstencil_view_create(device, resource, desc, &object)))
+-        return hr;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_IASetVertexBuffers(ID3D11DeviceContext *iface,
 +        UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *strides, const UINT *offsets)
 +{
@@ -309,8 +312,7 @@ index 31c7f35fc25..dca5a88caa0 100644
 +            iface, start_slot, buffer_count, buffers, strides, offsets);
 +}
  
--    if (FAILED(hr = d3d_depthstencil_view_create(device, resource, desc, &object)))
--        return hr;
+-    *view = &object->ID3D11DepthStencilView_iface;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_IASetIndexBuffer(ID3D11DeviceContext *iface,
 +        ID3D11Buffer *buffer, DXGI_FORMAT format, UINT offset)
 +{
@@ -318,7 +320,7 @@ index 31c7f35fc25..dca5a88caa0 100644
 +            iface, buffer, debug_dxgi_format(format), offset);
 +}
  
--    *view = &object->ID3D11DepthStencilView_iface;
+-    return S_OK;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_DrawIndexedInstanced(ID3D11DeviceContext *iface,
 +        UINT instance_index_count, UINT instance_count, UINT start_index_location, INT base_vertex_location,
 +        UINT start_instance_location)
@@ -327,34 +329,36 @@ index 31c7f35fc25..dca5a88caa0 100644
 +            "base_vertex_location %d, start_instance_location %u stub!\n",
 +            iface, instance_index_count, instance_count, start_index_location,
 +            base_vertex_location, start_instance_location);
-+}
- 
--    return S_OK;
-+static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface,
-+        UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location)
-+{
-+    FIXME("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, "
-+            "start_instance_location %u stub!\n",
-+            iface, instance_vertex_count, instance_count, start_vertex_location,
-+            start_instance_location);
  }
  
 -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateInputLayout(ID3D11Device2 *iface,
 -        const D3D11_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code,
 -        SIZE_T shader_byte_code_length, ID3D11InputLayout **input_layout)
-+static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetConstantBuffers(ID3D11DeviceContext *iface,
-+        UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
++static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface,
++        UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location)
  {
 -    struct d3d_device *device = impl_from_ID3D11Device2(iface);
 -    struct d3d_input_layout *object;
 -    HRESULT hr;
-+    FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n",
-+            iface, start_slot, buffer_count, buffers);
++    FIXME("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, "
++            "start_instance_location %u stub!\n",
++            iface, instance_vertex_count, instance_count, start_vertex_location,
++            start_instance_location);
 +}
  
 -    TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p, shader_byte_code_length %lu, "
 -            "input_layout %p.\n", iface, element_descs, element_count, shader_byte_code,
 -            shader_byte_code_length, input_layout);
++static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetConstantBuffers(ID3D11DeviceContext *iface,
++        UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
++{
++    FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n",
++            iface, start_slot, buffer_count, buffers);
++}
+ 
+-    if (FAILED(hr = d3d_input_layout_create(device, element_descs, element_count,
+-            shader_byte_code, shader_byte_code_length, &object)))
+-        return hr;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceContext *iface,
 +        ID3D11GeometryShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
 +{
@@ -362,44 +366,35 @@ index 31c7f35fc25..dca5a88caa0 100644
 +            iface, shader, class_instances, class_instance_count);
 +}
  
--    if (FAILED(hr = d3d_input_layout_create(device, element_descs, element_count,
--            shader_byte_code, shader_byte_code_length, &object)))
--        return hr;
+-    *input_layout = &object->ID3D11InputLayout_iface;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface,
 +        D3D11_PRIMITIVE_TOPOLOGY topology)
 +{
 +    FIXME("iface %p, topology %u stub!\n", iface, topology);
 +}
  
--    *input_layout = &object->ID3D11InputLayout_iface;
+-    return S_OK;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface,
 +        UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
 +{
 +    FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views);
-+}
- 
--    return S_OK;
-+static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetSamplers(ID3D11DeviceContext *iface,
-+        UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
-+{
-+    FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
-+            iface, start_slot, sampler_count, samplers);
  }
  
 -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateVertexShader(ID3D11Device2 *iface, const void *byte_code,
 -        SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11VertexShader **shader)
-+static void STDMETHODCALLTYPE d3d11_deferred_context_Begin(ID3D11DeviceContext *iface,
-+        ID3D11Asynchronous *asynchronous)
++static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetSamplers(ID3D11DeviceContext *iface,
++        UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
  {
 -    struct d3d_device *device = impl_from_ID3D11Device2(iface);
 -    struct d3d_vertex_shader *object;
 -    HRESULT hr;
-+    FIXME("iface %p, asynchronous %p stub!\n", iface, asynchronous);
++    FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
++            iface, start_slot, sampler_count, samplers);
 +}
  
 -    TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n",
 -            iface, byte_code, byte_code_length, class_linkage, shader);
-+static void STDMETHODCALLTYPE d3d11_deferred_context_End(ID3D11DeviceContext *iface,
++static void STDMETHODCALLTYPE d3d11_deferred_context_Begin(ID3D11DeviceContext *iface,
 +        ID3D11Asynchronous *asynchronous)
 +{
 +    FIXME("iface %p, asynchronous %p stub!\n", iface, asynchronous);
@@ -407,44 +402,50 @@ index 31c7f35fc25..dca5a88caa0 100644
  
 -    if (class_linkage)
 -        FIXME("Class linkage is not implemented yet.\n");
++static void STDMETHODCALLTYPE d3d11_deferred_context_End(ID3D11DeviceContext *iface,
++        ID3D11Asynchronous *asynchronous)
++{
++    FIXME("iface %p, asynchronous %p stub!\n", iface, asynchronous);
++}
+ 
+-    if (FAILED(hr = d3d_vertex_shader_create(device, byte_code, byte_code_length, &object)))
+-        return hr;
 +static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_GetData(ID3D11DeviceContext *iface,
 +        ID3D11Asynchronous *asynchronous, void *data, UINT data_size, UINT data_flags)
 +{
 +    FIXME("iface %p, asynchronous %p, data %p, data_size %u, data_flags %#x stub!\n",
 +            iface, asynchronous, data, data_size, data_flags);
  
--    if (FAILED(hr = d3d_vertex_shader_create(device, byte_code, byte_code_length, &object)))
--        return hr;
+-    *shader = &object->ID3D11VertexShader_iface;
 +    return E_NOTIMPL;
 +}
  
--    *shader = &object->ID3D11VertexShader_iface;
+-    return S_OK;
 +static void STDMETHODCALLTYPE d3d11_deferred_context_SetPredication(ID3D11DeviceContext *iface,
 +        ID3D11Predicate *predicate, BOOL value)
 +{
 +    FIXME("iface %p, predicate %p, value %#x stub!\n", iface, predicate, value);
-+}
- 
--    return S_OK;
-+static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShaderResources(ID3D11DeviceContext *iface,
-+        UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
-+{
-+    FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views);
  }
  
 -static HRESULT STDMETHODCALLTYPE d3d11_device_CreateGeometryShader(ID3D11Device2 *iface, const void *byte_code,
 -        SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11GeometryShader **shader)
-+static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetSamplers(ID3D11DeviceContext *iface,
-+        UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
++static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShaderResources(ID3D11DeviceContext *iface,
++        UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views)
  {
 -    struct d3d_device *device = impl_from_ID3D11Device2(iface);
 -    struct d3d_geometry_shader *object;
 -    HRESULT hr;
-+    FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
-+            iface, start_slot, sampler_count, samplers);
++    FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views);
 +}
  
 -    TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n",
++static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetSamplers(ID3D11DeviceContext *iface,
++        UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers)
++{
++    FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n",
++            iface, start_slot, sampler_count, samplers);
++}
++
 +static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11DeviceContext *iface,
 +        UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views,
 +        ID3D11DepthStencilView *depth_stencil_view)
@@ -1352,7 +1353,7 @@ index 31c7f35fc25..dca5a88caa0 100644
              iface, byte_code, byte_code_length, class_linkage, shader);
  
      if (class_linkage)
-@@ -3362,10 +4340,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface
+@@ -3593,10 +4571,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateCounter(ID3D11Device2 *iface
  static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device2 *iface, UINT flags,
          ID3D11DeviceContext **context)
  {
@@ -1379,10 +1380,10 @@ index 31c7f35fc25..dca5a88caa0 100644
  
  static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device2 *iface, HANDLE resource, REFIID iid,
 diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
-index da4627d7a85..dadeac27662 100644
+index 32a9dc2e530..362962a9099 100644
 --- a/dlls/d3d11/tests/d3d11.c
 +++ b/dlls/d3d11/tests/d3d11.c
-@@ -2231,6 +2231,8 @@ static void test_create_deferred_context(void)
+@@ -2266,6 +2266,8 @@ static void test_create_deferred_context(void)
  
      hr = ID3D11Device_CreateDeferredContext(device, 0, &context);
      todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Failed to create deferred context, hr %#x.\n", hr);
@@ -1391,7 +1392,7 @@ index da4627d7a85..dadeac27662 100644
  
      refcount = ID3D11Device_Release(device);
      ok(!refcount, "Device has %u references left.\n", refcount);
-@@ -2243,7 +2245,7 @@ static void test_create_deferred_context(void)
+@@ -2278,7 +2280,7 @@ static void test_create_deferred_context(void)
  
      expected_refcount = get_refcount(device) + 1;
      hr = ID3D11Device_CreateDeferredContext(device, 0, &context);
@@ -1401,5 +1402,5 @@ index da4627d7a85..dadeac27662 100644
          goto done;
      refcount = get_refcount(device);
 -- 
-2.23.0
+2.30.0
 

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

@@ -1,26 +1,27 @@
-From c093321833140c3aadacae32c43d160e83483d17 Mon Sep 17 00:00:00 2001
+From 504969929eb7932fe22880768461f2172080f0eb 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: [PATCH] d3d11: Initial implementation for deferred contexts.
 
 ---
- dlls/d3d11/device.c | 1073 +++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 1042 insertions(+), 31 deletions(-)
+ dlls/d3d11/device.c | 1072 +++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 1041 insertions(+), 31 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index dca5a88caa..738f1d19d4 100644
+index 454003128dc..4beb7cea4fa 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
-@@ -17,11 +17,181 @@
+@@ -16,6 +16,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   *
   */
- 
 +#include "wine/list.h"
-+
+ 
  #define NONAMELESSUNION
  #include "d3d11_private.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(d3d11);
+@@ -48,6 +49,174 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S
+     return TRUE;
+ }
  
 +enum deferred_cmd
 +{
@@ -193,7 +194,7 @@ index dca5a88caa..738f1d19d4 100644
  /* ID3D11DeviceContext - deferred context */
  struct d3d11_deferred_context
  {
-@@ -29,9 +199,532 @@ struct d3d11_deferred_context
+@@ -55,9 +224,532 @@ struct d3d11_deferred_context
      ID3D11Device *device;
      LONG refcount;
  
@@ -726,7 +727,7 @@ index dca5a88caa..738f1d19d4 100644
  static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
  
  static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
-@@ -1226,7 +1919,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
+@@ -1415,7 +2107,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
  static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext1 *iface,
          ID3D11CommandList *command_list, BOOL restore_state)
  {
@@ -748,7 +749,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext1 *iface,
-@@ -2938,6 +3644,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
+@@ -3169,6 +3874,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
  
      if (!refcount)
      {
@@ -756,7 +757,7 @@ index dca5a88caa..738f1d19d4 100644
          wined3d_private_store_cleanup(&context->private_store);
          ID3D11Device_Release(context->device);
          HeapFree(GetProcessHeap(), 0, context);
-@@ -2989,43 +3696,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
+@@ -3220,43 +3926,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)
  {
@@ -849,7 +850,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface,
-@@ -3038,53 +3788,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
+@@ -3269,53 +4018,169 @@ 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)
  {
@@ -1028,7 +1029,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface,
-@@ -3113,7 +3979,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
+@@ -3344,7 +4209,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
  static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface,
          D3D11_PRIMITIVE_TOPOLOGY topology)
  {
@@ -1046,7 +1047,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3173,8 +4048,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
+@@ -3404,8 +4278,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
          UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views,
          ID3D11DepthStencilView *depth_stencil_view)
  {
@@ -1076,7 +1077,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorderedAccessViews(
-@@ -3194,15 +4089,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
+@@ -3425,15 +4319,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)
  {
@@ -1123,7 +1124,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count,
-@@ -3244,13 +4168,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
+@@ -3475,13 +4398,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetState(ID3D11DeviceContext *iface,
          ID3D11RasterizerState *rasterizer_state)
  {
@@ -1160,7 +1161,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetScissorRects(ID3D11DeviceContext *iface,
-@@ -3365,8 +4310,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
+@@ -3596,8 +4540,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)
  {
@@ -1180,7 +1181,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface,
-@@ -3379,36 +4334,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
+@@ -3610,36 +4564,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)
  {
@@ -1248,7 +1249,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3709,7 +4690,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
+@@ -3940,7 +4920,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_ClearState(ID3D11DeviceContext *iface)
  {
@@ -1265,7 +1266,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Flush(ID3D11DeviceContext *iface)
-@@ -3734,9 +4723,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
+@@ -3965,9 +4953,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_FinishCommandList(ID3D11DeviceContext *iface,
          BOOL restore, ID3D11CommandList **command_list)
  {
@@ -1297,7 +1298,7 @@ index dca5a88caa..738f1d19d4 100644
  }
  
  static const struct ID3D11DeviceContextVtbl d3d11_deferred_context_vtbl =
-@@ -4351,6 +5360,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
+@@ -4582,6 +5590,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
      object->device = (ID3D11Device *)iface;
      object->refcount = 1;
  
@@ -1307,5 +1308,5 @@ index dca5a88caa..738f1d19d4 100644
      wined3d_private_store_init(&object->private_store);
  
 -- 
-2.21.0
+2.30.0
 

patches/ddraw-Device_Caps/0001-ddraw-Don-t-set-HWTRANSFORMANDLIGHT-flag-on-d3d7-RGB.patch

@@ -1,8 +1,7 @@
-From 980d867a89c72225b595b6e2a7313c1ddd42c9ad Mon Sep 17 00:00:00 2001
+From 861cd6c6409efce4eb03aad3bc01f5df772e77fb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 6 Feb 2016 01:15:07 +0100
-Subject: [PATCH 1/3] ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB
- device.
+Subject: [PATCH] ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB device.
 
 ---
  dlls/ddraw/ddraw.c        |  9 +++++++++
@@ -10,10 +9,10 @@ Subject: [PATCH 1/3] ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB
  2 files changed, 27 insertions(+)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 97a11ef..9a19536 100644
+index 705d0335d95..1d916f93c4f 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
-@@ -50,6 +50,7 @@ static struct enum_device_entry
+@@ -49,6 +49,7 @@ static struct enum_device_entry
      char interface_name[100];
      char device_name[100];
      const GUID *device_guid;
@@ -21,7 +20,7 @@ index 97a11ef..9a19536 100644
  } device_list7[] =
  {
      /* T&L HAL device */
-@@ -57,6 +58,7 @@ static struct enum_device_entry
+@@ -56,6 +57,7 @@ static struct enum_device_entry
          "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D",
          "Wine D3D7 T&L HAL",
          &IID_IDirect3DTnLHalDevice,
@@ -29,7 +28,7 @@ index 97a11ef..9a19536 100644
      },
  
      /* HAL device */
-@@ -64,6 +66,7 @@ static struct enum_device_entry
+@@ -63,6 +65,7 @@ static struct enum_device_entry
          "WINE Direct3D7 Hardware acceleration using WineD3D",
          "Direct3D HAL",
          &IID_IDirect3DHALDevice,
@@ -37,7 +36,7 @@ index 97a11ef..9a19536 100644
      },
  
      /* RGB device */
-@@ -71,6 +74,7 @@ static struct enum_device_entry
+@@ -70,6 +73,7 @@ static struct enum_device_entry
          "WINE Direct3D7 RGB Software Emulation using WineD3D",
          "Wine D3D7 RGB",
          &IID_IDirect3DRGBDevice,
@@ -45,7 +44,7 @@ index 97a11ef..9a19536 100644
      },
  };
  
-@@ -3627,6 +3631,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+@@ -3749,6 +3753,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
  {
      struct ddraw *ddraw = impl_from_IDirect3D7(iface);
      D3DDEVICEDESC7 device_desc7;
@@ -53,7 +52,7 @@ index 97a11ef..9a19536 100644
      HRESULT hr;
      size_t i;
  
-@@ -3643,11 +3648,15 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
+@@ -3765,11 +3770,15 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
          return hr;
      }
  
@@ -70,11 +69,11 @@ index 97a11ef..9a19536 100644
          if (ret != DDENUMRET_OK)
          {
 diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
-index 3f433a6..aa7214a 100644
+index d641595baa2..54cc18b74f2 100644
 --- a/dlls/ddraw/tests/ddraw7.c
 +++ b/dlls/ddraw/tests/ddraw7.c
-@@ -311,6 +311,19 @@ static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7
-     return DDENUMRET_OK;
+@@ -577,6 +577,19 @@ static IDirect3DDevice7 *create_device_ex(HWND window, DWORD coop_level, const G
+     return device;
  }
  
 +static HRESULT WINAPI enum_devtype_software_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx)
@@ -92,26 +91,26 @@ index 3f433a6..aa7214a 100644
 +
  static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
  {
-     IDirectDrawSurface7 *surface, *ds;
-@@ -321,6 +334,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
-     IDirect3D7 *d3d7;
-     HRESULT hr;
+     const GUID *device_guid = &IID_IDirect3DHALDevice;
+@@ -6719,6 +6732,7 @@ static void test_surface_lock(void)
+     ULONG refcount;
+     DDPIXELFORMAT z_fmt;
      BOOL hal_ok = FALSE;
 +    BOOL software_ok = FALSE;
      const GUID *devtype = &IID_IDirect3DHALDevice;
+     D3DDEVICEDESC7 device_desc;
+     BOOL cubemap_supported;
+@@ -6844,6 +6858,10 @@ static void test_surface_lock(void)
+     if (hal_ok)
+         devtype = &IID_IDirect3DTnLHalDevice;
  
-     if (!(ddraw = create_ddraw()))
-@@ -364,6 +378,10 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
-     ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr);
-     if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice;
- 
-+    hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_software_cb , &software_ok);
++    hr = IDirect3D7_EnumDevices(d3d, enum_devtype_software_cb, &software_ok);
 +    ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr);
 +    if (!software_ok) win_skip("RGB device not found, unable to check flags\n");
 +
      memset(&z_fmt, 0, sizeof(z_fmt));
-     hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt);
+     hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt);
      if (FAILED(hr) || !z_fmt.dwSize)
 -- 
-2.7.4
+2.20.1
 

patches/ddraw-IDirect3DTexture2_Load/0001-ddraw-Allow-size-and-format-conversions-in-IDirect3D.patch

@@ -1,18 +1,18 @@
-From 87c1fab3efb367d863fcfb4870a4a1b1485f65f7 Mon Sep 17 00:00:00 2001
+From a6a89266f71551cd6ee6b80dc758825957087a37 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 30 May 2015 02:55:03 +0200
 Subject: [PATCH] ddraw: Allow size and format conversions in
  IDirect3DTexture2::Load.
 
 ---
- dlls/ddraw/surface.c | 151 +++++++++++++++++++++++++++------------------------
- 1 file changed, 80 insertions(+), 71 deletions(-)
+ dlls/ddraw/surface.c | 152 +++++++++++++++++++++++--------------------
+ 1 file changed, 81 insertions(+), 71 deletions(-)
 
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index 47a143a..a30b44f 100644
+index 19a1ae3d2d2..ed46ff0534a 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
-@@ -5187,6 +5187,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
+@@ -5310,6 +5310,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
      return impl_from_IDirectDrawSurface7(next_level);
  }
  
@@ -59,7 +59,7 @@ index 47a143a..a30b44f 100644
  /*****************************************************************************
   * IDirect3DTexture2::Load
   *
-@@ -5208,7 +5248,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5331,7 +5371,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  {
      struct ddraw_surface *dst_surface = impl_from_IDirect3DTexture2(iface);
      struct ddraw_surface *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture);
@@ -68,12 +68,12 @@ index 47a143a..a30b44f 100644
      HRESULT hr;
  
      TRACE("iface %p, src_texture %p.\n", iface, src_texture);
-@@ -5221,90 +5261,60 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5344,90 +5384,61 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  
      wined3d_mutex_lock();
  
--    dst_resource = wined3d_texture_get_resource(dst_surface->wined3d_texture);
--    src_resource = wined3d_texture_get_resource(src_surface->wined3d_texture);
+-    dst_resource = wined3d_texture_get_resource(ddraw_surface_get_default_texture(dst_surface, DDRAW_SURFACE_WRITE));
+-    src_resource = wined3d_texture_get_resource(ddraw_surface_get_default_texture(src_surface, DDRAW_SURFACE_READ));
 -
 -    if (((src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
 -            != (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP))
@@ -184,9 +184,10 @@ index 47a143a..a30b44f 100644
  
 -            wined3d_resource_unmap(dst_resource, dst_surface->sub_resource_idx);
 -            wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx);
-+        hr = wined3d_texture_blt(dst_surface->wined3d_texture, dst_surface->sub_resource_idx, &dst_rect,
-+                                 src_surface->wined3d_texture, src_surface->sub_resource_idx, &src_rect,
-+                                 0, NULL, WINED3D_TEXF_LINEAR);
++        hr = wined3d_texture_blt(ddraw_surface_get_default_texture(dst_surface, DDRAW_SURFACE_WRITE),
++                dst_surface->sub_resource_idx, &dst_rect,
++                ddraw_surface_get_default_texture(src_surface, DDRAW_SURFACE_READ),
++                src_surface->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_LINEAR);
 +        if (FAILED(hr))
 +        {
 +            ERR("Failed to blit surface, hr %#x.\n", hr);
@@ -195,7 +196,7 @@ index 47a143a..a30b44f 100644
          }
  
          if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
-@@ -5317,12 +5327,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5440,12 +5451,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
          else
              dst_surface = NULL;
  
@@ -212,5 +213,5 @@ index 47a143a..a30b44f 100644
  
      wined3d_mutex_unlock();
 -- 
-1.9.1
+2.20.1
 

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

@@ -1,213 +0,0 @@
-From 2097fbe83a66a3a423bdd148ecfc4f16c1237110 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.
-
-Based on a patch by Henri Verbeet.
----
- dlls/ddraw/ddraw.c         |  6 +++---
- dlls/ddraw/ddraw_private.h |  3 ++-
- dlls/ddraw/device.c        | 23 +++++++++++++---------
- dlls/ddraw/surface.c       | 39 ++++++++++++++++++++++++++++++++++++--
- 4 files changed, 56 insertions(+), 15 deletions(-)
-
-diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 050f625f7..9655f9e47 100644
---- a/dlls/ddraw/ddraw.c
-+++ b/dlls/ddraw/ddraw.c
-@@ -4214,7 +4214,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();
--    if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL)))
-+    if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, target, (IUnknown *)surface, 7, &object, NULL)))
-     {
-         *device = &object->IDirect3DDevice7_iface;
-     }
-@@ -4243,7 +4243,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
-         return CLASS_E_NOAGGREGATION;
- 
-     wined3d_mutex_lock();
--    if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL)))
-+    if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL)))
-     {
-         *device = &device_impl->IDirect3DDevice3_iface;
-     }
-@@ -4269,7 +4269,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
-             iface, debugstr_guid(riid), surface, device);
- 
-     wined3d_mutex_lock();
--    if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL)))
-+    if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL)))
-     {
-         *device = &device_impl->IDirect3DDevice2_iface;
-     }
-diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
-index f4fe970a6..ba0ec73d8 100644
---- a/dlls/ddraw/ddraw_private.h
-+++ b/dlls/ddraw/ddraw_private.h
-@@ -313,6 +313,7 @@ struct d3d_device
-     IUnknown IUnknown_inner;
-     LONG ref;
-     UINT version;
-+    BOOL hw;
- 
-     IUnknown *outer_unknown;
-     struct wined3d_device *wined3d_device;
-@@ -360,7 +361,7 @@ struct d3d_device
-     const struct wined3d_stateblock_state *stateblock_state;
- };
- 
--HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface,
-+HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface,
-         UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN;
- enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN;
- 
-diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index 048ba7fba..ce74a0fb8 100644
---- a/dlls/ddraw/device.c
-+++ b/dlls/ddraw/device.c
-@@ -1858,7 +1858,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface,
-         return DDERR_INVALIDCAPS;
-     }
- 
--    if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-+    if (device->hw && !(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-     {
-         WARN("Surface %p is not in video memory.\n", target_impl);
-         wined3d_mutex_unlock();
-@@ -1934,7 +1934,7 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface,
-         return DDERR_INVALIDPIXELFORMAT;
-     }
- 
--    if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-+    if (device->hw && !(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-     {
-         WARN("Surface %p is not in video memory.\n", target_impl);
-         IDirectDrawSurface4_AddRef(target);
-@@ -1983,7 +1983,7 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface,
-         return DDERR_INVALIDPIXELFORMAT;
-     }
- 
--    if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-+    if (device->hw && !(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-     {
-         WARN("Surface %p is not in video memory.\n", target_impl);
-         IDirectDrawSurface_AddRef(target);
-@@ -6951,7 +6951,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw)
-     wined3d_stateblock_set_scissor_rect(ddraw->state, &rect);
- }
- 
--static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
-+static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, BOOL hw,
-         struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown)
- {
-     static const struct wined3d_matrix ident =
-@@ -6974,6 +6974,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
-     device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl;
-     device->ref = 1;
-     device->version = version;
-+    device->hw = hw;
- 
-     if (outer_unknown)
-         device->outer_unknown = outer_unknown;
-@@ -7032,14 +7033,18 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw,
-     return D3D_OK;
- }
- 
--HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface,
-+HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface,
-         UINT version, struct d3d_device **device, IUnknown *outer_unknown)
- {
-     struct d3d_device *object;
-+    BOOL hw = TRUE;
-     HRESULT hr;
- 
--    TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n",
--            ddraw, target, version, device, outer_unknown);
-+    TRACE("ddraw %p, guid %s, target %p, version %u, device %p, outer_unknown %p.\n",
-+            ddraw, debugstr_guid(guid), target, version, device, outer_unknown);
-+
-+    if (IsEqualGUID(guid, &IID_IDirect3DRGBDevice))
-+        hw = FALSE;
- 
-     if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
-             || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER))
-@@ -7062,7 +7067,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
-         return DDERR_OUTOFMEMORY;
-     }
- 
--    if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-+    if (hw && !(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY))
-     {
-         WARN("Surface %p is not in video memory.\n", target);
-         return D3DERR_SURFACENOTINVIDMEM;
-@@ -7080,7 +7085,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn
-         return DDERR_OUTOFMEMORY;
-     }
- 
--    if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown)))
-+    if (FAILED(hr = d3d_device_init(object, ddraw, hw, target, rt_iface, version, outer_unknown)))
-     {
-         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 85c1ef496..01522f515 100644
---- a/dlls/ddraw/surface.c
-+++ b/dlls/ddraw/surface.c
-@@ -223,7 +223,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
-             {
-                 HRESULT hr;
- 
--                if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface,
-+                if (FAILED(hr = d3d_device_create(This->ddraw, riid, This, (IUnknown *)&This->IDirectDrawSurface_iface,
-                         1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface)))
-                 {
-                     This->device1 = NULL;
-@@ -6192,7 +6192,42 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
- 
-     if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)
-     {
--        wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU
-+        unsigned int bind_flags = 0;
-+
-+        if (!(desc->dwFlags & DDSD_LPSURFACE))
-+        {
-+            if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP)
-+            {
-+                bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
-+            }
-+            else if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE)
-+            {
-+                bind_flags |= WINED3D_BIND_SHADER_RESOURCE;
-+            }
-+
-+            if (desc->ddsCaps.dwCaps & DDSCAPS_ZBUFFER)
-+                bind_flags |= WINED3D_BIND_DEPTH_STENCIL;
-+            else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE)
-+                bind_flags |= WINED3D_BIND_RENDER_TARGET;
-+        }
-+        /*
-+         * The ddraw RGB device allows to use system memory surfaces as rendering target.
-+         * This does not cause problems because the RGB device does software rasterization
-+         * though it will fail with hardware accelerated ddraw. In order to be partially
-+         * compatible with games requesting explicitly the RGB device, we ignore the
-+         * specified location and try to create rendering targets in video memory if
-+         * possible.
-+         */
-+        if (bind_flags
-+                && SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, ddraw->wined3d_adapter,
-+                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.bind_flags = bind_flags;
-+        }
-+        else
-+            wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU
-                 | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
-     }
-     else
--- 
-2.25.1
-

patches/ddraw-Rendering_Targets/definition

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

patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch

@@ -1,4 +1,4 @@
-From 5706ea39b9a1074431d13e4c7354e0432af819a3 Mon Sep 17 00:00:00 2001
+From 3cf6891f84548a9519bed5db83ad19e801ad8d22 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Thu, 4 Apr 2019 02:25:00 +0300
 Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
@@ -6,15 +6,15 @@ Subject: [PATCH] ddraw: Allow setting texture without DDSCAPS_TEXTURE for
 
 Signed-off-by: Paul Gofman <gofmanp@gmail.com>
 ---
- dlls/ddraw/device.c       |  20 ++++--
- dlls/ddraw/tests/ddraw4.c | 128 +++++++++++++++++++++++++++++++++++++-
- 2 files changed, 141 insertions(+), 7 deletions(-)
+ dlls/ddraw/device.c       |  20 ++++++--
+ dlls/ddraw/tests/ddraw4.c | 102 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 118 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c
-index 5bd5b2c7091..010fed30396 100644
+index c99eafc7524..49aae2feef5 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
-@@ -4776,7 +4776,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
+@@ -4822,7 +4822,8 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
      struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture);
      struct wined3d_texture *wined3d_texture = NULL;
  
@@ -23,8 +23,8 @@ index 5bd5b2c7091..010fed30396 100644
 +            iface, stage, texture, surf, surf ? surf->surface_desc.ddsCaps.dwCaps : 0);
  
      if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
-         wined3d_texture = surf->wined3d_texture;
-@@ -4812,19 +4813,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
+         wined3d_texture = surf->draw_texture ? surf->draw_texture : surf->wined3d_texture;
+@@ -4858,19 +4859,30 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
  {
      struct d3d_device *device = impl_from_IDirect3DDevice3(iface);
      struct ddraw_surface *tex = unsafe_impl_from_IDirect3DTexture2(texture);
@@ -36,7 +36,7 @@ index 5bd5b2c7091..010fed30396 100644
      wined3d_mutex_lock();
  
 -    hr = IDirect3DDevice7_SetTexture(&device->IDirect3DDevice7_iface, stage, &tex->IDirectDrawSurface7_iface);
-+    if (tex && ((tex->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) || !device->hw))
++    if (tex && ((tex->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) || !device->hardware_device))
 +    {
 +        if (!(tex->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE))
 +            WARN("Setting texture without DDSCAPS_TEXTURE.\n");
@@ -59,73 +59,14 @@ index 5bd5b2c7091..010fed30396 100644
  
  static const struct tss_lookup
 diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
-index d438132764f..1c6c227cc6b 100644
+index 5af824c3f78..032ae01fbf8 100644
 --- a/dlls/ddraw/tests/ddraw4.c
 +++ b/dlls/ddraw/tests/ddraw4.c
-@@ -359,7 +359,7 @@ static IDirectDraw4 *create_ddraw(void)
-     return ddraw4;
+@@ -18326,6 +18326,107 @@ static void run_for_each_device_type(void (*test_func)(const GUID *))
+     test_func(&IID_IDirect3DRGBDevice);
  }
  
--static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
-+static IDirect3DDevice3 *create_device_ex(HWND window, DWORD coop_level, BOOL software)
- {
-     IDirectDrawSurface4 *surface, *ds;
-     IDirect3DDevice3 *device = NULL;
-@@ -379,6 +379,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
-     surface_desc.dwSize = sizeof(surface_desc);
-     surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
-     surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE;
-+    if (software)
-+        surface_desc.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
-     surface_desc.dwWidth = 640;
-     surface_desc.dwHeight = 480;
- 
-@@ -407,7 +409,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
-     }
- 
-     memset(&z_fmt, 0, sizeof(z_fmt));
--    hr = IDirect3D3_EnumZBufferFormats(d3d3, &IID_IDirect3DHALDevice, enum_z_fmt, &z_fmt);
-+    hr = IDirect3D3_EnumZBufferFormats(d3d3, software ? &IID_IDirect3DRGBDevice
-+            : &IID_IDirect3DHALDevice, enum_z_fmt, &z_fmt);
-     if (FAILED(hr) || !z_fmt.dwSize)
-     {
-         IDirect3D3_Release(d3d3);
-@@ -419,6 +422,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
-     surface_desc.dwSize = sizeof(surface_desc);
-     surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT;
-     surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
-+    if (software)
-+        surface_desc.ddsCaps.dwCaps |= DDSCAPS_SYSTEMMEMORY;
-     U4(surface_desc).ddpfPixelFormat = z_fmt;
-     surface_desc.dwWidth = 640;
-     surface_desc.dwHeight = 480;
-@@ -441,7 +446,8 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
-         return NULL;
-     }
- 
--    hr = IDirect3D3_CreateDevice(d3d3, &IID_IDirect3DHALDevice, surface, &device, NULL);
-+    hr = IDirect3D3_CreateDevice(d3d3, software ? &IID_IDirect3DRGBDevice
-+            : &IID_IDirect3DHALDevice, surface, &device, NULL);
-     IDirect3D3_Release(d3d3);
-     IDirectDrawSurface4_Release(surface);
-     if (FAILED(hr))
-@@ -450,6 +456,11 @@ static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
-     return device;
- }
- 
-+static IDirect3DDevice3 *create_device(HWND window, DWORD coop_level)
-+{
-+    return create_device_ex(window, coop_level, FALSE);
-+}
-+
- static IDirect3DViewport3 *create_viewport(IDirect3DDevice3 *device, UINT x, UINT y, UINT w, UINT h)
- {
-     IDirect3DViewport3 *viewport;
-@@ -17867,6 +17878,116 @@ done:
-     IDirectDraw4_Release(ddraw);
- }
- 
-+static void test_texture_wrong_caps_(BOOL software)
++static void test_texture_wrong_caps(const GUID *device_guid)
 +{
 +    static struct
 +    {
@@ -158,7 +99,7 @@ index d438132764f..1c6c227cc6b 100644
 +    HRESULT hr;
 +
 +    window = create_window();
-+    if (!(device = create_device_ex(window, DDSCL_NORMAL, software)))
++    if (!(device = create_device_ex(window, DDSCL_NORMAL, device_guid)))
 +    {
 +        skip("Failed to create a 3D device, skipping test.\n");
 +        DestroyWindow(window);
@@ -213,7 +154,7 @@ index d438132764f..1c6c227cc6b 100644
 +    hr = IDirect3DDevice3_EndScene(device);
 +    ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
 +
-+    expected_color = software ? 0x0000ff00 : 0x00ffffff;
++    expected_color = is_software_device_type(device_guid) ? 0x0000ff00 : 0x00ffffff;
 +    color = get_surface_color(rt, 320, 240);
 +    ok(color == expected_color, "Got color 0x%08x, expected 0x%08x.\n", color, expected_color);
 +
@@ -225,27 +166,18 @@ index d438132764f..1c6c227cc6b 100644
 +    ok(!refcount, "Device has %u references left.\n", refcount);
 +    DestroyWindow(window);
 +}
-+
-+static void test_texture_wrong_caps(void)
-+{
-+    trace("Hardware device.\n");
-+    test_texture_wrong_caps_(FALSE);
-+
-+    trace("Software device.\n");
-+    test_texture_wrong_caps_(TRUE);
-+}
 +
  START_TEST(ddraw4)
  {
      DDDEVICEIDENTIFIER identifier;
-@@ -17999,6 +18120,7 @@ START_TEST(ddraw4)
+@@ -18458,6 +18559,7 @@ START_TEST(ddraw4)
      test_gdi_surface();
      test_alphatest();
      test_clipper_refcount();
-+    test_texture_wrong_caps();
++    run_for_each_device_type(test_texture_wrong_caps);
      test_caps();
      test_d32_support();
      test_surface_format_conversion_alpha();
 -- 
-2.28.0
+2.20.1
 

patches/ddraw-Texture_Wrong_Caps/definition

@@ -1,3 +1 @@
 Fixes: [46948] Allow setting texture without DDSCAPS_TEXTURE for software device
-Depends: ddraw-Rendering_Targets
-

patches/dinput-joy-mappings/0002-dinput-Allow-empty-Joystick-mappings.patch

@@ -1,4 +1,4 @@
-From bce769d9179ffbcbc634e73ad124528e28c5c7a8 Mon Sep 17 00:00:00 2001
+From ccc18e41eb660dbbe3d08fd478aefbc6e7701adf Mon Sep 17 00:00:00 2001
 From: Jetro Jormalainen <jje-wine@jv.jetro.fi>
 Date: Tue, 30 Apr 2019 09:20:54 +1000
 Subject: [PATCH] dinput: Allow empty Joystick mappings.
@@ -12,7 +12,7 @@ Subject: [PATCH] dinput: Allow empty Joystick mappings.
  5 files changed, 125 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index d1bf934a827..6107ab26538 100644
+index 289c3a0ec6a..22dcfde7021 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
 @@ -30,6 +30,7 @@
@@ -23,7 +23,7 @@ index d1bf934a827..6107ab26538 100644
  #include "windef.h"
  #include "winbase.h"
  #include "winreg.h"
-@@ -643,12 +644,29 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic)
+@@ -659,12 +660,29 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic)
      return type | (0x0000ff00 & (obj_instance << 8));
  }
  
@@ -54,7 +54,7 @@ index d1bf934a827..6107ab26538 100644
  {
      static const WCHAR subkey[] = {
          'S','o','f','t','w','a','r','e','\\',
-@@ -663,8 +681,11 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
+@@ -679,8 +697,11 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
      sprintfW(keyname, subkey, username, device, guid);
  
      /* The key used is HKCU\Software\Wine\DirectInput\Mappings\[username]\[device]\[mapping_guid] */
@@ -68,7 +68,7 @@ index d1bf934a827..6107ab26538 100644
  
      HeapFree(GetProcessHeap(), 0, keyname);
  
-@@ -684,7 +705,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
+@@ -700,7 +721,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return DI_SETTINGSNOTSAVED;
  
@@ -79,7 +79,7 @@ index d1bf934a827..6107ab26538 100644
  
      if (!hkey)
      {
-@@ -719,7 +742,7 @@ BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMATW lpdia
+@@ -735,7 +758,7 @@ BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMATW lpdia
      HKEY hkey;
      WCHAR *guid_str;
      DIDEVICEINSTANCEW didev;
@@ -88,7 +88,7 @@ index d1bf934a827..6107ab26538 100644
  
      didev.dwSize = sizeof(didev);
      IDirectInputDevice8_GetDeviceInfo(&This->IDirectInputDevice8W_iface, &didev);
-@@ -727,7 +750,7 @@ BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMATW lpdia
+@@ -743,7 +766,7 @@ BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMATW lpdia
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return FALSE;
  
@@ -97,19 +97,19 @@ index d1bf934a827..6107ab26538 100644
  
      if (!hkey)
      {
-@@ -748,15 +771,21 @@ BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMATW lpdia
+@@ -764,15 +787,21 @@ BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMATW lpdia
          {
              lpdiaf->rgoAction[i].dwObjID = id;
              lpdiaf->rgoAction[i].guidInstance = didev.guidInstance;
 -            lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT;
 -            mapped += 1;
 +            lpdiaf->rgoAction[i].dwHow = DIAH_USERCONFIG;
-+        }
+         }
 +        else
 +        {
 +            memset(&lpdiaf->rgoAction[i].guidInstance, 0, sizeof(GUID));
 +            lpdiaf->rgoAction[i].dwHow = DIAH_UNMAPPED;
-         }
++        }
 +
      }
  
@@ -121,8 +121,8 @@ index d1bf934a827..6107ab26538 100644
 +    return TRUE;
  }
  
- HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df)
-@@ -779,13 +808,18 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf,
+ static BOOL set_app_data(IDirectInputDeviceImpl *dev, int offset, UINT_PTR app_data)
+@@ -835,13 +864,18 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf,
          load_success = load_mapping_settings(This, lpdiaf, username);
      }
  
@@ -145,7 +145,7 @@ index d1bf934a827..6107ab26538 100644
          if ((lpdiaf->rgoAction[i].dwSemantic & devMask) == devMask)
          {
              DWORD obj_id = semantic_to_obj_id(This, lpdiaf->rgoAction[i].dwSemantic);
-@@ -816,6 +850,14 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf,
+@@ -872,6 +906,14 @@ HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf,
          }
      }
  
@@ -160,15 +160,15 @@ index d1bf934a827..6107ab26538 100644
      if (!has_actions) return DI_NOEFFECT;
  
      return  IDirectInputDevice8WImpl_BuildActionMap(iface, lpdiaf, lpszUserName, dwFlags);
-@@ -831,6 +873,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
+@@ -887,6 +929,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
      DIPROPSTRING dps;
      WCHAR username[MAX_PATH];
      DWORD username_size = MAX_PATH;
 +    DWORD new_crc = 0;
      int i, action = 0, num_actions = 0;
      unsigned int offset = 0;
- 
-@@ -841,12 +884,23 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
+     ActionMap *action_map;
+@@ -898,12 +941,23 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
      data_format.dwFlags = DIDF_RELAXIS;
      data_format.dwDataSize = lpdiaf->dwDataSize;
  
@@ -191,13 +191,13 @@ index d1bf934a827..6107ab26538 100644
 +    /* update dwCRC to track if action format has changed */
 +    lpdiaf->dwCRC = new_crc;
  
-     This->num_actions = num_actions;
- 
+     /* Construct the dataformat and actionmap */
+     obj_df = HeapAlloc(GetProcessHeap(), 0, sizeof(DIOBJECTDATAFORMAT)*num_actions);
 diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c
-index 66d6cfdffb9..73215dac0d5 100644
+index 1986e610d08..a5ad0d4def2 100644
 --- a/dlls/dinput/joystick.c
 +++ b/dlls/dinput/joystick.c
-@@ -847,7 +847,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
+@@ -861,7 +861,7 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
          else
              lstrcpynW(username, lpszUserName, size);
  
@@ -206,7 +206,7 @@ index 66d6cfdffb9..73215dac0d5 100644
          heap_free(username);
      }
  
-@@ -957,6 +957,8 @@ HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+@@ -971,6 +971,8 @@ HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
  
      hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags);
  
@@ -216,10 +216,10 @@ index 66d6cfdffb9..73215dac0d5 100644
      HeapFree(GetProcessHeap(), 0, lpszUserNameW);
  
 diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
-index b5e665933ec..0747f5d8c8b 100644
+index 9981372d957..ec7d8985079 100644
 --- a/dlls/dinput/keyboard.c
 +++ b/dlls/dinput/keyboard.c
-@@ -690,6 +690,8 @@ static HRESULT WINAPI SysKeyboardAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+@@ -686,6 +686,8 @@ static HRESULT WINAPI SysKeyboardAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
  
      hr = SysKeyboardWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags);
  
@@ -229,10 +229,10 @@ index b5e665933ec..0747f5d8c8b 100644
      HeapFree(GetProcessHeap(), 0, lpszUserNameW);
  
 diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c
-index 52a766b2a1a..796f1fa2977 100644
+index e50731fda41..9e2154ea463 100644
 --- a/dlls/dinput/mouse.c
 +++ b/dlls/dinput/mouse.c
-@@ -862,6 +862,8 @@ static HRESULT WINAPI SysMouseAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+@@ -946,6 +946,8 @@ static HRESULT WINAPI SysMouseAImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
  
      hr = SysMouseWImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, lpszUserNameW, dwFlags);
  
@@ -242,7 +242,7 @@ index 52a766b2a1a..796f1fa2977 100644
      HeapFree(GetProcessHeap(), 0, lpszUserNameW);
  
 diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
-index f3e7b542355..bec2a6b863c 100644
+index 3e6da23b4ab..445d98e3887 100644
 --- a/dlls/dinput8/tests/device.c
 +++ b/dlls/dinput8/tests/device.c
 @@ -38,6 +38,8 @@ struct enum_data {
@@ -254,7 +254,7 @@ index f3e7b542355..bec2a6b863c 100644
  enum {
      DITEST_AXIS,
      DITEST_BUTTON,
-@@ -365,6 +367,17 @@ static void test_action_mapping(void)
+@@ -429,6 +431,17 @@ static void test_action_mapping(void)
          hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0);
          ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%08x\n", hr);
  
@@ -272,7 +272,7 @@ index f3e7b542355..bec2a6b863c 100644
          af.dwDataSize = 4 * ARRAY_SIZE(actionMapping);
          af.dwNumActions = ARRAY_SIZE(actionMapping);
  
-@@ -556,6 +569,43 @@ static void test_save_settings(void)
+@@ -620,6 +633,43 @@ static void test_save_settings(void)
          "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[1], af.rgoAction[1].dwObjID);
      ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n");
  
@@ -317,5 +317,5 @@ index f3e7b542355..bec2a6b863c 100644
      IDirectInput_Release(pDI);
  }
 -- 
-2.17.1
+2.20.1