Release v20

This also disables a single patch which is causing an assert in
user32: struct user_thread_info

xxx9-user32-Cache-the-result-of-GetForegroundWindow.patch

patches/Makefile

@@ -1,21 +0,0 @@
-#
-# This file is deprecated and will be deleted in the future.
-# Please use patchinstall.sh instead, to apply the Wine Staging patches.
-#
-
-CURDIR ?= ${.CURDIR}
-
-.PHONY: install
-install:
-	@echo "WARNING: Using this Makefile is deprecated!" >&2
-	"$(CURDIR)/patchinstall.sh" DESTDIR="$(DESTDIR)" --all
-
-.PHONY: install-git
-install-git:
-	@echo "WARNING: Using this Makefile is deprecated!" >&2
-	"$(CURDIR)/patchinstall.sh" DESTDIR="$(DESTDIR)" --all --backend=git-am
-
-.PHONY: series
-series:
-	@echo "ERROR: Using this Makefile is deprecated!" >&2
-	@false

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

@@ -1,7 +1,7 @@
-From 4b428e09733605affb987d369f56ec09d2525858 Mon Sep 17 00:00:00 2001
+From c8dc0ec6406e8449b59c219ede2e9bd88d8a56fa 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: server: Implement token elevation information.
+Subject: [PATCH] server: Implement token elevation information.
 
 ---
  dlls/ntdll/nt.c     | 16 ++++++++++++----
@@ -10,10 +10,10 @@ Subject: server: Implement token elevation information.
  3 files changed, 39 insertions(+), 7 deletions(-)
 
 diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index 5822dec9b15..dda6cabe1cf 100644
+index cd271fde9c..b1dd999cf5 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
-@@ -597,18 +597,26 @@ NTSTATUS WINAPI NtQueryInformationToken(
+@@ -625,18 +625,26 @@ NTSTATUS WINAPI NtQueryInformationToken(
          SERVER_END_REQ;
          break;
      case TokenElevationType:
@@ -45,10 +45,10 @@ index 5822dec9b15..dda6cabe1cf 100644
      case TokenSessionId:
          {
 diff --git a/server/protocol.def b/server/protocol.def
-index b3dce66eb9c..33f1d5f0ab8 100644
+index 90af9df7f4..93afaabca1 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3673,6 +3673,14 @@ struct handle_info
+@@ -3643,6 +3643,14 @@ struct handle_info
  @END
  
  
@@ -64,10 +64,10 @@ index b3dce66eb9c..33f1d5f0ab8 100644
  @REQ(create_completion)
      unsigned int access;          /* desired access to a port */
 diff --git a/server/token.c b/server/token.c
-index 7ab0f634c05..6a1085bae12 100644
+index 6d193603b4..64f20e1b57 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -126,6 +126,7 @@ struct token
+@@ -112,6 +112,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 */
@@ -75,7 +75,7 @@ index 7ab0f634c05..6a1085bae12 100644
  };
  
  struct privilege
-@@ -566,7 +567,7 @@ static struct token *create_token( unsigned primary, const SID *user,
+@@ -545,7 +546,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,
@@ -84,7 +84,7 @@ index 7ab0f634c05..6a1085bae12 100644
  {
      struct token *token = alloc_object( &token_ops );
      if (token)
-@@ -588,6 +589,7 @@ static struct token *create_token( unsigned primary, const SID *user,
+@@ -567,6 +568,7 @@ static struct token *create_token( unsigned primary, const SID *user,
              token->impersonation_level = impersonation_level;
          token->default_dacl = NULL;
          token->primary_group = NULL;
@@ -92,7 +92,7 @@ index 7ab0f634c05..6a1085bae12 100644
  
          /* copy user */
          token->user = memdup( user, security_sid_len( user ));
-@@ -700,7 +702,8 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
+@@ -682,7 +684,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,
@@ -102,16 +102,16 @@ index 7ab0f634c05..6a1085bae12 100644
      if (!token) return token;
  
      /* copy groups */
-@@ -904,7 +907,7 @@ struct token *token_create_admin( void )
+@@ -888,7 +891,7 @@ struct token *token_create_admin( void )
          static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}};
-         token = create_token( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]),
-                               admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl,
+         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 );
      }
-@@ -1652,6 +1655,19 @@ DECL_HANDLER(get_token_statistics)
+@@ -1627,6 +1630,19 @@ DECL_HANDLER(get_token_statistics)
      }
  }
  
@@ -132,5 +132,5 @@ index 7ab0f634c05..6a1085bae12 100644
  {
      struct token *token;
 -- 
-2.13.1
+2.19.1
 

patches/advapi32-Token_Integrity_Level/0004-server-Implement-token-integrity-level.patch

@@ -1,4 +1,4 @@
-From 971789f2af6149998e54382522569b3790309cf2 Mon Sep 17 00:00:00 2001
+From ae503e8e7eb8f4fcb9bf3e642458c2a1bba6ccaa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 7 Aug 2017 02:28:35 +0200
 Subject: [PATCH] server: Implement token integrity level.
@@ -10,19 +10,19 @@ Subject: [PATCH] server: Implement token integrity level.
  3 files changed, 48 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
-index 9e60196..59c6e49 100644
+index ca26ab15..8aab0a48 100644
 --- a/dlls/ntdll/nt.c
 +++ b/dlls/ntdll/nt.c
-@@ -340,7 +340,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
+@@ -400,7 +400,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
          0,    /* TokenAccessInformation */
          0,    /* TokenVirtualizationAllowed */
-         0,    /* TokenVirtualizationEnabled */
+         sizeof(DWORD), /* TokenVirtualizationEnabled */
 -        sizeof(TOKEN_MANDATORY_LABEL) + sizeof(SID), /* TokenIntegrityLevel [sizeof(SID) includes one SubAuthority] */
 +        0,    /* TokenIntegrityLevel */
          0,    /* TokenUIAccess */
          0,    /* TokenMandatoryPolicy */
          0,    /* TokenLogonSid */
-@@ -593,18 +593,23 @@ NTSTATUS WINAPI NtQueryInformationToken(
+@@ -659,18 +659,23 @@ NTSTATUS WINAPI NtQueryInformationToken(
          }
          break;
      case TokenIntegrityLevel:
@@ -55,10 +55,10 @@ index 9e60196..59c6e49 100644
      case TokenAppContainerSid:
          {
 diff --git a/server/protocol.def b/server/protocol.def
-index c961eaf..0bb04cd 100644
+index 11221d7d..1bfe3234 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3388,6 +3388,13 @@ enum caret_state
+@@ -3405,6 +3405,13 @@ enum caret_state
      VARARG(sid,SID);              /* the sid specified by which_sid from the token */
  @END
  
@@ -73,10 +73,10 @@ index c961eaf..0bb04cd 100644
      obj_handle_t    handle;       /* handle to the token */
  @REPLY
 diff --git a/server/token.c b/server/token.c
-index 355a523..1ed994a 100644
+index ccde0c2d..2d81118a 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -112,6 +112,7 @@ struct token
+@@ -113,6 +113,7 @@ struct token
      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 */
@@ -84,7 +84,7 @@ index 355a523..1ed994a 100644
  };
  
  struct privilege
-@@ -544,7 +545,8 @@ static struct token *create_token( unsigned primary, const SID *user,
+@@ -546,7 +547,8 @@ 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,
@@ -94,7 +94,7 @@ index 355a523..1ed994a 100644
  {
      struct token *token = alloc_object( &token_ops );
      if (token)
-@@ -625,6 +627,7 @@ static struct token *create_token( unsigned primary, const SID *user,
+@@ -630,6 +632,7 @@ static struct token *create_token( unsigned primary, const SID *user,
          }
  
          token->source = source;
@@ -102,7 +102,7 @@ index 355a523..1ed994a 100644
      }
      return token;
  }
-@@ -680,7 +683,8 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
+@@ -685,7 +688,8 @@ struct token *token_duplicate( struct token *src_token, unsigned primary,
                            NULL, 0, src_token->default_dacl,
                            src_token->source, modified_id,
                            impersonation_level,
@@ -112,16 +112,16 @@ index 355a523..1ed994a 100644
      if (!token) return token;
  
      /* copy groups */
-@@ -884,7 +888,7 @@ struct token *token_create_admin( void )
+@@ -890,7 +894,7 @@ struct token *token_create_admin( void )
          static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}};
-         token = create_token( TRUE, user_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]),
-                               admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), default_dacl,
+         token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ),
+                               admin_privs, ARRAY_SIZE( admin_privs ), default_dacl,
 -                              admin_source, NULL, -1, TokenElevationTypeFull );
 +                              admin_source, NULL, -1, TokenElevationTypeFull, &high_label_sid );
          /* we really need a primary group */
          assert( token->primary_group );
      }
-@@ -1530,6 +1534,26 @@ DECL_HANDLER(get_token_sid)
+@@ -1524,6 +1528,26 @@ DECL_HANDLER(get_token_sid)
      }
  }
  
@@ -149,5 +149,5 @@ index 355a523..1ed994a 100644
  DECL_HANDLER(get_token_groups)
  {
 -- 
-1.9.1
+2.19.1
 

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

@@ -1,109 +0,0 @@
-From 6dc2138136a0699c8e8d1337b646a09b93cd8b0f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 5 Aug 2017 04:02:16 +0200
-Subject: [PATCH] kernel32: Implement CreateProcessInternalW.
-
----
- dlls/kernel32/kernel32.spec     |  2 +-
- dlls/kernel32/process.c         | 24 ++++++++++++++----------
- dlls/kernelbase/kernelbase.spec |  2 +-
- include/winbase.h               |  1 +
- 4 files changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
-index cb9c73a..98d5000 100644
---- a/dlls/kernel32/kernel32.spec
-+++ b/dlls/kernel32/kernel32.spec
-@@ -315,7 +315,7 @@
- @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr)
- # @ stub CreateProcessAsUserW
- # @ stub CreateProcessInternalA
--# @ stub CreateProcessInternalW
-+@ stdcall CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr)
- # @ stub CreateProcessInternalWSecure
- @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr)
- @ stdcall CreateRemoteThread(long ptr long ptr long long ptr)
-diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index 658a0b1..15460aa 100644
---- a/dlls/kernel32/process.c
-+++ b/dlls/kernel32/process.c
-@@ -2588,12 +2588,13 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer,
-     return ret;
- }
- 
--
--/* Steam hotpatches CreateProcessA and W, so to prevent it from crashing use an internal function */
--static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr,
--                                 LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags,
--                                 LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info,
--                                 LPPROCESS_INFORMATION info )
-+/**********************************************************************
-+ *      CreateProcessInternalW    (KERNEL32.@)
-+ */
-+BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr,
-+                                    LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags,
-+                                    LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info,
-+                                    LPPROCESS_INFORMATION info, HANDLE *new_token )
- {
-     BOOL retv = FALSE;
-     HANDLE hFile = 0;
-@@ -2608,6 +2609,9 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A
- 
-     TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
- 
-+    if (token) FIXME("Creating a process with a token is not yet implemented\n");
-+    if (new_token) FIXME("No support for returning created process token\n");
-+
-     if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ), &hFile, &is_64bit )))
-         return FALSE;
-     if (hFile == INVALID_HANDLE_VALUE) goto done;
-@@ -2774,8 +2778,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, L
-       FIXME("StartupInfo.lpReserved is used, please report (%s)\n",
-             debugstr_a(startup_info->lpReserved));
- 
--    ret = create_process_impl( app_nameW, cmd_lineW, process_attr, thread_attr,
--                               inherit, flags, env, cur_dirW, &infoW, info );
-+    ret = CreateProcessInternalW( NULL, app_nameW, cmd_lineW, process_attr, thread_attr,
-+                                  inherit, flags, env, cur_dirW, &infoW, info, NULL );
- done:
-     HeapFree( GetProcessHeap(), 0, app_nameW );
-     HeapFree( GetProcessHeap(), 0, cmd_lineW );
-@@ -2794,8 +2798,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line,
-                                               LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info,
-                                               LPPROCESS_INFORMATION info )
- {
--    return create_process_impl( app_name, cmd_line, process_attr, thread_attr,
--                                inherit, flags, env, cur_dir, startup_info, info);
-+    return CreateProcessInternalW( NULL, app_name, cmd_line, process_attr, thread_attr,
-+                                   inherit, flags, env, cur_dir, startup_info, info, NULL);
- }
- 
- 
-diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 7d8439f..cfc3bec 100644
---- a/dlls/kernelbase/kernelbase.spec
-+++ b/dlls/kernelbase/kernelbase.spec
-@@ -209,7 +209,7 @@
- @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) advapi32.CreateProcessAsUserA
- @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW
- # @ stub CreateProcessInternalA
--# @ stub CreateProcessInternalW
-+@ stdcall CreateProcessInternalW(long wstr wstr ptr ptr long long ptr wstr ptr ptr ptr) kernel32.CreateProcessInternalW
- @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW
- @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread
- @ stdcall CreateRemoteThreadEx(long ptr long ptr ptr long ptr ptr) kernel32.CreateRemoteThreadEx
-diff --git a/include/winbase.h b/include/winbase.h
-index de52e5a..99e761e 100644
---- a/include/winbase.h
-+++ b/include/winbase.h
-@@ -1863,6 +1863,7 @@ WINBASEAPI BOOL        WINAPI CreateProcessW(LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTE
- WINADVAPI  BOOL        WINAPI CreateProcessAsUserA(HANDLE,LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION);
- WINADVAPI  BOOL        WINAPI CreateProcessAsUserW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION);
- #define                       CreateProcessAsUser WINELIB_NAME_AW(CreateProcessAsUser)
-+WINBASEAPI BOOL        WINAPI CreateProcessInternalW(HANDLE,LPCWSTR,LPWSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION,HANDLE*);
- WINADVAPI  BOOL        WINAPI CreateProcessWithLogonW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPCWSTR,LPWSTR,DWORD,LPVOID,LPCWSTR,LPSTARTUPINFOW,LPPROCESS_INFORMATION);
- WINBASEAPI HANDLE      WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD);
- WINBASEAPI HANDLE      WINAPI CreateRemoteThreadEx(HANDLE,LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPPROC_THREAD_ATTRIBUTE_LIST,LPDWORD);
--- 
-2.7.4
-

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

@@ -1,33 +1,33 @@
-From 5128e0ff8263d52792c16c465869a90736ec76de Mon Sep 17 00:00:00 2001
+From e571cdf9236e083f196c09d0fc96ed7c98fae440 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 6 Aug 2017 02:08:05 +0200
 Subject: [PATCH] server: Implement support for creating processes using a
  token.
 
 ---
- dlls/kernel32/process.c | 33 ++++++++++++++++++---------------
- server/process.c        | 29 +++++++++++++++++++++++++----
+ dlls/kernel32/process.c | 27 +++++++++++++++------------
+ server/process.c        | 39 +++++++++++++++++++++++++++++++++++----
  server/process.h        |  2 +-
  server/protocol.def     |  1 +
  server/request.c        |  2 +-
  server/security.h       |  2 ++
  server/token.c          | 11 +++++++++++
- 7 files changed, 59 insertions(+), 21 deletions(-)
+ 7 files changed, 66 insertions(+), 18 deletions(-)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index c2042b0..5e94fb0 100644
+index bb6cc3e..7b202db 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -2207,7 +2207,7 @@ static NTSTATUS alloc_object_attributes( const SECURITY_ATTRIBUTES *attr, struct
+@@ -2289,7 +2289,7 @@ static BOOL replace_process( HANDLE handle, const RTL_USER_PROCESS_PARAMETERS *p
   * Create a new process. If hFile is a valid handle we have an exe
   * file, otherwise it is a Winelib app.
   */
--static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPWSTR env,
-+static BOOL create_process( HANDLE token, HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPWSTR env,
-                             LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-                             BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
-                             LPPROCESS_INFORMATION info, LPCSTR unixdir,
-@@ -2314,6 +2314,7 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW
+-static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
++static BOOL create_process( HANDLE token, HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
+                             BOOL inherit, DWORD flags, const RTL_USER_PROCESS_PARAMETERS *params,
+                             LPPROCESS_INFORMATION info, LPCSTR unixdir, const pe_image_info_t *pe_info )
+ {
+@@ -2356,6 +2356,7 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_
          req->access         = PROCESS_ALL_ACCESS;
          req->cpu            = pe_info->cpu;
          req->info_size      = startup_info_size;
@@ -35,45 +35,46 @@ index c2042b0..5e94fb0 100644
          wine_server_add_data( req, objattr, attr_len );
          wine_server_add_data( req, startup_info, startup_info_size );
          wine_server_add_data( req, params->Environment, (env_end - params->Environment) * sizeof(WCHAR) );
-@@ -2431,7 +2432,7 @@ error:
+@@ -2526,7 +2527,7 @@ static RTL_USER_PROCESS_PARAMETERS *get_vdm_params( const RTL_USER_PROCESS_PARAM
   *
   * Create a new VDM process for a 16-bit or DOS application.
   */
--static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, LPCWSTR cur_dir,
-+static BOOL create_vdm_process( HANDLE token, LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, LPCWSTR cur_dir,
-                                 LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
-                                 BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
-                                 LPPROCESS_INFORMATION info, LPCSTR unixdir, int exec_only )
-@@ -2456,7 +2457,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L
-     sprintfW(new_cmd_line, argsW, winevdm, buffer, cmd_line);
-     memset( &pe_info, 0, sizeof(pe_info) );
-     pe_info.cpu = CPU_x86;
--    ret = create_process( 0, winevdm, new_cmd_line, env, cur_dir, psa, tsa, inherit,
-+    ret = create_process( token, 0, winevdm, new_cmd_line, env, cur_dir, psa, tsa, inherit,
-                           flags, startup, info, unixdir, &pe_info, exec_only );
-     HeapFree( GetProcessHeap(), 0, new_cmd_line );
+-static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
++static BOOL create_vdm_process( HANDLE token, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
+                                 BOOL inherit, DWORD flags, const RTL_USER_PROCESS_PARAMETERS *params,
+                                 LPPROCESS_INFORMATION info, LPCSTR unixdir )
+ {
+@@ -2536,7 +2537,7 @@ static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES
+ 
+     if (!(new_params = get_vdm_params( params, &pe_info ))) return FALSE;
+ 
+-    ret = create_process( 0, psa, tsa, inherit, flags, new_params, info, unixdir, &pe_info );
++    ret = create_process( token, 0, psa, tsa, inherit, flags, new_params, info, unixdir, &pe_info );
+     RtlDestroyProcessParameters( new_params );
      return ret;
-@@ -2468,7 +2469,7 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L
+ }
+@@ -2547,7 +2548,7 @@ static BOOL create_vdm_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES
   *
   * Create a new cmd shell process for a .BAT file.
   */
--static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, LPCWSTR cur_dir,
-+static BOOL create_cmd_process( HANDLE token, LPCWSTR filename, LPWSTR cmd_line, LPVOID env, LPCWSTR cur_dir,
-                                 LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
+-static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
++static BOOL create_cmd_process( HANDLE token, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
                                  BOOL inherit, DWORD flags, LPSTARTUPINFOW startup,
+                                 const RTL_USER_PROCESS_PARAMETERS *params,
                                  LPPROCESS_INFORMATION info )
-@@ -2496,8 +2497,8 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L
-     strcatW( newcmdline, quotW );
-     strcatW( newcmdline, cmd_line );
+@@ -2577,9 +2578,9 @@ static BOOL create_cmd_process( LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES
+     strcatW( newcmdline, params->CommandLine.Buffer );
      strcatW( newcmdline, quotW );
+     if (params->CurrentDirectory.DosPath.Length) cur_dir = params->CurrentDirectory.DosPath.Buffer;
 -    ret = CreateProcessW( comspec, newcmdline, psa, tsa, inherit,
--                          flags, env, cur_dir, startup, info );
 +    ret = CreateProcessInternalW( token, comspec, newcmdline, psa, tsa, inherit,
-+                                  flags, env, cur_dir, startup, info, NULL );
+                           flags | CREATE_UNICODE_ENVIRONMENT, params->Environment, cur_dir,
+-                          startup, info );
++                          startup, info, NULL );
      HeapFree( GetProcessHeap(), 0, newcmdline );
      return ret;
  }
-@@ -2609,7 +2610,9 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
+@@ -2692,7 +2693,9 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
  
      TRACE("app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) );
  
@@ -84,83 +85,58 @@ index c2042b0..5e94fb0 100644
      if (new_token) FIXME("No support for returning created process token\n");
  
      if (!(tidy_cmdline = get_file_name( app_name, cmd_line, name, ARRAY_SIZE( name ), &hFile, &is_64bit )))
-@@ -2696,18 +2699,18 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
+@@ -2760,17 +2763,17 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
                 debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32,
                 wine_dbgstr_longlong(pe_info.base), wine_dbgstr_longlong(pe_info.base + pe_info.map_size),
                 cpu_names[pe_info.cpu] );
--        retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-+        retv = create_process( NULL, hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-                                inherit, flags, startup_info, info, unixdir, &pe_info, FALSE );
+-        retv = create_process( hFile, process_attr, thread_attr,
++        retv = create_process( token, hFile, process_attr, thread_attr,
+                                inherit, flags, params, info, unixdir, &pe_info );
          break;
      case BINARY_WIN16:
          TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) );
--        retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-+        retv = create_vdm_process( token, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-                                    inherit, flags, startup_info, info, unixdir, FALSE );
+-        retv = create_vdm_process( process_attr, thread_attr, inherit, flags, params, info, unixdir );
++        retv = create_vdm_process( token, process_attr, thread_attr, inherit, flags, params, info, unixdir );
          break;
      case BINARY_UNIX_LIB:
          TRACE( "starting %s as %d-bit Winelib app\n",
                 debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32 );
--        retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-+        retv = create_process( token, hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-                                inherit, flags, startup_info, info, unixdir, &pe_info, FALSE );
+-        retv = create_process( hFile, process_attr, thread_attr,
++        retv = create_process( token, hFile, process_attr, thread_attr,
+                                inherit, flags, params, info, unixdir, &pe_info );
          break;
      case BINARY_UNKNOWN:
-@@ -2717,14 +2720,14 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
+@@ -2780,14 +2783,14 @@ BOOL WINAPI CreateProcessInternalW( HANDLE token, LPCWSTR app_name, LPWSTR cmd_l
              if (!strcmpiW( p, comW ) || !strcmpiW( p, pifW ))
              {
                  TRACE( "starting %s as DOS binary\n", debugstr_w(name) );
--                retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-+                retv = create_vdm_process( token, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-                                            inherit, flags, startup_info, info, unixdir, FALSE );
+-                retv = create_vdm_process( process_attr, thread_attr,
++                retv = create_vdm_process( token, process_attr, thread_attr,
+                                            inherit, flags, params, info, unixdir );
                  break;
              }
              if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) )
              {
                  TRACE( "starting %s as batch binary\n", debugstr_w(name) );
--                retv = create_cmd_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-+                retv = create_cmd_process( token, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,
-                                            inherit, flags, startup_info, info );
+-                retv = create_cmd_process( process_attr, thread_attr,
++                retv = create_cmd_process( token, process_attr, thread_attr,
+                                            inherit, flags, startup_info, params, info );
                  break;
              }
-@@ -2840,12 +2843,12 @@ static void exec_process( LPCWSTR name )
-                debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32,
-                wine_dbgstr_longlong(pe_info.base), wine_dbgstr_longlong(pe_info.base + pe_info.map_size),
-                cpu_names[pe_info.cpu] );
--        create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL,
-+        create_process( NULL, hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL,
-                         FALSE, 0, &startup_info, &info, NULL, &pe_info, TRUE );
-         break;
-     case BINARY_UNIX_LIB:
-         TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) );
--        create_process( hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL,
-+        create_process( NULL, hFile, name, GetCommandLineW(), NULL, NULL, NULL, NULL,
-                         FALSE, 0, &startup_info, &info, NULL, &pe_info, TRUE );
-         break;
-     case BINARY_UNKNOWN:
-@@ -2855,7 +2858,7 @@ static void exec_process( LPCWSTR name )
-         /* fall through */
-     case BINARY_WIN16:
-         TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) );
--        create_vdm_process( name, GetCommandLineW(), NULL, NULL, NULL, NULL,
-+        create_vdm_process( NULL, name, GetCommandLineW(), NULL, NULL, NULL, NULL,
-                             FALSE, 0, &startup_info, &info, NULL, TRUE );
-         break;
-     default:
 diff --git a/server/process.c b/server/process.c
-index 653e513..2bb49e2 100644
+index af2ba3d..57bf0ec 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -486,7 +486,7 @@ static void start_sigkill_timer( struct process *process )
  /* create a new process */
  /* if the function fails the fd is closed */
- struct process *create_process( int fd, struct thread *parent_thread, int inherit_all,
+ struct process *create_process( int fd, struct process *parent, int inherit_all,
 -                                const struct security_descriptor *sd )
 +                                const struct security_descriptor *sd, struct token *token )
  {
      struct process *process;
  
-@@ -562,7 +562,7 @@ struct process *create_process( int fd, struct thread *parent_thread, int inheri
+@@ -561,7 +561,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all,
                                         : alloc_handle_table( process, 0 );
          /* Note: for security reasons, starting a new process does not attempt
           * to use the current impersonation token for the new process */
@@ -169,7 +145,7 @@ index 653e513..2bb49e2 100644
          process->affinity = parent->affinity;
      }
      if (!process->handles || !process->token) goto error;
-@@ -1128,6 +1128,7 @@ DECL_HANDLER(new_process)
+@@ -1127,6 +1127,7 @@ DECL_HANDLER(new_process)
      const struct security_descriptor *sd;
      const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL );
      struct process *process = NULL;
@@ -177,7 +153,7 @@ index 653e513..2bb49e2 100644
      struct process *parent = current->process;
      int socket_fd = thread_get_inflight_fd( current, req->socket_fd );
  
-@@ -1168,13 +1169,31 @@ DECL_HANDLER(new_process)
+@@ -1167,10 +1168,39 @@ DECL_HANDLER(new_process)
          return;
      }
  
@@ -198,19 +174,18 @@ index 653e513..2bb49e2 100644
 +        }
 +    }
 +
-     if (!req->info_size)  /* create an orphaned process */
-     {
--        if ((process = create_process( socket_fd, NULL, 0, sd )))
++    if (!req->info_size)  /* create an orphaned process */
++    {
 +        if ((process = create_process( socket_fd, NULL, 0, sd, token )))
-         {
-             create_thread( -1, process, NULL );
-             release_object( process );
-         }
++        {
++            create_thread( -1, process, NULL );
++            release_object( process );
++        }
 +        if (token) release_object( token );
-         return;
-     }
- 
-@@ -1182,6 +1201,7 @@ DECL_HANDLER(new_process)
++        return;
++    }
++
+     /* build the startup info for a new process */
      if (!(info = alloc_object( &startup_info_ops )))
      {
          close( socket_fd );
@@ -218,16 +193,16 @@ index 653e513..2bb49e2 100644
          return;
      }
      info->process  = NULL;
-@@ -1228,7 +1248,7 @@ DECL_HANDLER(new_process)
+@@ -1217,7 +1247,7 @@ DECL_HANDLER(new_process)
  #undef FIXUP_LEN
      }
  
--    if (!(process = create_process( socket_fd, current, req->inherit_all, sd ))) goto done;
-+    if (!(process = create_process( socket_fd, current, req->inherit_all, sd, token ))) goto done;
+-    if (!(process = create_process( socket_fd, parent, req->inherit_all, sd ))) goto done;
++    if (!(process = create_process( socket_fd, parent, req->inherit_all, sd, token ))) goto done;
  
      process->startup_info = (struct startup_info *)grab_object( info );
  
-@@ -1290,6 +1310,7 @@ DECL_HANDLER(new_process)
+@@ -1279,6 +1309,7 @@ DECL_HANDLER(new_process)
      reply->handle = alloc_handle_no_access_check( parent, process, req->access, objattr->attributes );
  
   done:
@@ -235,21 +210,30 @@ index 653e513..2bb49e2 100644
      if (process) release_object( process );
      release_object( info );
  }
+@@ -1311,7 +1342,7 @@ DECL_HANDLER(exec_process)
+         close( socket_fd );
+         return;
+     }
+-    if (!(process = create_process( socket_fd, NULL, 0, NULL ))) return;
++    if (!(process = create_process( socket_fd, NULL, 0, NULL, NULL ))) return;
+     create_thread( -1, process, NULL );
+     release_object( process );
+ }
 diff --git a/server/process.h b/server/process.h
-index 1128dba..ec44e02 100644
+index 029b328..ea28091 100644
 --- a/server/process.h
 +++ b/server/process.h
 @@ -116,7 +116,7 @@ extern unsigned int alloc_ptid( void *ptr );
  extern void free_ptid( unsigned int id );
  extern void *get_ptid_entry( unsigned int id );
- extern struct process *create_process( int fd, struct thread *parent_thread, int inherit_all,
+ extern struct process *create_process( int fd, struct process *parent, int inherit_all,
 -                                       const struct security_descriptor *sd );
 +                                       const struct security_descriptor *sd, struct token *token );
  extern data_size_t init_process( struct thread *thread );
  extern struct thread *get_process_first_thread( struct process *process );
  extern struct process *get_process_from_id( process_id_t id );
 diff --git a/server/protocol.def b/server/protocol.def
-index aebac70..3dc82b3 100644
+index 607644e..1b5e6de 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
 @@ -744,6 +744,7 @@ struct rawinput_device
@@ -287,7 +271,7 @@ index 21e90cc..32dfe5f 100644
  static inline const ACE_HEADER *ace_next( const ACE_HEADER *ace )
  {
 diff --git a/server/token.c b/server/token.c
-index de1d624..2804247 100644
+index 1184241..5db97b4 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -836,6 +836,12 @@ int token_assign_label( struct token *token, PSID label )
@@ -303,7 +287,7 @@ index de1d624..2804247 100644
  struct token *token_create_admin( void )
  {
      struct token *token = NULL;
-@@ -1263,6 +1269,11 @@ const SID *token_get_primary_group( struct token *token )
+@@ -1262,6 +1268,11 @@ const SID *token_get_primary_group( struct token *token )
      return token->primary_group;
  }
  

patches/advapi32-Token_Integrity_Level/0011-advapi32-Use-token-in-CreateProcessAsUserW-and-Creat.patch

@@ -1,62 +0,0 @@
-From bddfc5e460ca5d5751bf7d9069379e0e0462ae94 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sun, 6 Aug 2017 02:11:15 +0200
-Subject: advapi32: Use token in CreateProcessAsUserW and
- CreateProcessWithTokenW.
-
----
- dlls/advapi32/security.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
-index c531e45c9a0..4fc27ef82f9 100644
---- a/dlls/advapi32/security.c
-+++ b/dlls/advapi32/security.c
-@@ -5700,13 +5700,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserW(
-         LPSTARTUPINFOW lpStartupInfo,
-         LPPROCESS_INFORMATION lpProcessInformation )
- {
--    FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - semi-stub\n", hToken,
-+    TRACE("%p %s %s %p %p %d 0x%08x %p %s %p %p\n", hToken,
-           debugstr_w(lpApplicationName), debugstr_w(lpCommandLine), lpProcessAttributes,
-           lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, 
-           debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation);
- 
-     /* We should create the process with a suspended main thread */
--    if (!CreateProcessW (lpApplicationName,
-+    if (!CreateProcessInternalW(hToken,
-+                         lpApplicationName,
-                          lpCommandLine,
-                          lpProcessAttributes,
-                          lpThreadAttributes,
-@@ -5715,7 +5716,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessAsUserW(
-                          lpEnvironment,
-                          lpCurrentDirectory,
-                          lpStartupInfo,
--                         lpProcessInformation))
-+                         lpProcessInformation,
-+                         NULL))
-     {
-       return FALSE;
-     }
-@@ -5742,14 +5744,14 @@ BOOL WINAPI CreateProcessWithTokenW(HANDLE token, DWORD logon_flags, LPCWSTR app
-         DWORD creation_flags, void *environment, LPCWSTR current_directory, STARTUPINFOW *startup_info,
-         PROCESS_INFORMATION *process_information )
- {
--    FIXME("%p 0x%08x %s %s 0x%08x %p %s %p %p - semi-stub\n", token,
-+    TRACE("%p 0x%08x %s %s 0x%08x %p %s %p %p\n", token,
-           logon_flags, debugstr_w(application_name), debugstr_w(command_line),
-           creation_flags, environment, debugstr_w(current_directory),
-           startup_info, process_information);
- 
-     /* FIXME: check if handles should be inherited */
--    return CreateProcessW( application_name, command_line, NULL, NULL, FALSE, creation_flags, environment,
--                           current_directory, startup_info, process_information );
-+    return CreateProcessInternalW( token, application_name, command_line, NULL, NULL, FALSE, creation_flags, environment,
-+                                   current_directory, startup_info, process_information, NULL );
- }
- 
- /******************************************************************************
--- 
-2.13.1
-

patches/browseui-Progress_Dialog/0002-browseui-Implement-PROGDLG_AUTOTIME-flag-for-IProgre.patch

@@ -1,161 +0,0 @@
-From 61fce27e29e7e61b76916d0e1014a3294217fb54 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 28 Feb 2015 02:28:08 +0100
-Subject: browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog.
-
----
- dlls/browseui/browseui.rc   |  5 ++++
- dlls/browseui/progressdlg.c | 64 +++++++++++++++++++++++++++++++++++++++++----
- dlls/browseui/resids.h      |  5 ++++
- 3 files changed, 69 insertions(+), 5 deletions(-)
-
-diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc
-index 833b139..64b859d 100644
---- a/dlls/browseui/browseui.rc
-+++ b/dlls/browseui/browseui.rc
-@@ -25,6 +25,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
- STRINGTABLE
- {
-     IDS_CANCELLING    "Canceling..."
-+    IDS_REMAINING1    "%u %s remaining"
-+    IDS_REMAINING2    "%u %s and %u %s remaining"
-+    IDS_SECONDS       "seconds"
-+    IDS_MINUTES       "minutes"
-+    IDS_HOURS         "hours"
- }
- 
- IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85
-diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c
-index 598197b..d632860 100644
---- a/dlls/browseui/progressdlg.c
-+++ b/dlls/browseui/progressdlg.c
-@@ -73,6 +73,9 @@ typedef struct tagProgressDialog {
-     ULONGLONG ullCompleted;
-     ULONGLONG ullTotal;
-     HWND hwndDisabledParent;    /* For modal dialog: the parent that need to be re-enabled when the dialog ends */
-+    ULONGLONG startTime;
-+    LPWSTR remainingMsg[2];
-+    LPWSTR timeMsg[3];
- } ProgressDialog;
- 
- static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface)
-@@ -257,14 +260,18 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter)
- 
- static void ProgressDialog_Destructor(ProgressDialog *This)
- {
-+    int i;
-     TRACE("destroying %p\n", This);
-     if (This->hwnd)
-         end_dialog(This);
--    heap_free(This->lines[0]);
--    heap_free(This->lines[1]);
--    heap_free(This->lines[2]);
-+    for (i = 0; i < 3; i++)
-+        heap_free(This->lines[i]);
-     heap_free(This->cancelMsg);
-     heap_free(This->title);
-+    for (i = 0; i < 2; i++)
-+        heap_free(This->remainingMsg[i]);
-+    for (i = 0; i < 3; i++)
-+        heap_free(This->timeMsg[i]);
-     This->cs.DebugInfo->Spare[0] = 0;
-     DeleteCriticalSection(&This->cs);
-     heap_free(This);
-@@ -326,8 +333,6 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface,
-     TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved);
-     if (punkEnableModeless || reserved)
-         FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved);
--    if (dwFlags & PROGDLG_AUTOTIME)
--        FIXME("Flags PROGDLG_AUTOTIME not supported\n");
-     if (dwFlags & PROGDLG_NOTIME)
-         FIXME("Flags PROGDLG_NOTIME not supported\n");
- 
-@@ -358,6 +363,7 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface,
-             This->hwndDisabledParent = hwndDisable;
-     }
- 
-+    This->startTime = GetTickCount64();
-     LeaveCriticalSection(&This->cs);
- 
-     return S_OK;
-@@ -406,6 +412,52 @@ static BOOL WINAPI ProgressDialog_HasUserCancelled(IProgressDialog *iface)
-     return This->isCancelled;
- }
- 
-+static void load_time_strings(ProgressDialog *This)
-+{
-+    int i;
-+
-+    for (i = 0; i < 2; i++)
-+    {
-+        if (!This->remainingMsg[i])
-+            This->remainingMsg[i] = load_string(BROWSEUI_hinstance, IDS_REMAINING1 + i);
-+    }
-+    for (i = 0; i < 3; i++)
-+    {
-+        if (!This->timeMsg[i])
-+            This->timeMsg[i] = load_string(BROWSEUI_hinstance, IDS_SECONDS + i);
-+    }
-+}
-+
-+static void update_time_remaining(ProgressDialog *This, ULONGLONG ullCompleted, ULONGLONG ullTotal)
-+{
-+    unsigned int remaining, remainder = 0;
-+    ULONGLONG elapsed;
-+    WCHAR line[128];
-+    int i;
-+
-+    if (!This->startTime || !ullCompleted || !ullTotal)
-+        return;
-+
-+    load_time_strings(This);
-+
-+    elapsed = GetTickCount64() - This->startTime;
-+    remaining = (elapsed * ullTotal / ullCompleted - elapsed) / 1000;
-+
-+    for (i = 0; remaining >= 60 && i < 2; i++)
-+    {
-+        remainder = remaining % 60;
-+        remaining /= 60;
-+    }
-+
-+    if (i > 0 && remaining < 2 && remainder != 0)
-+        wsprintfW(line, This->remainingMsg[1], remaining, This->timeMsg[i], remainder, This->timeMsg[i-1]);
-+    else
-+        wsprintfW(line, This->remainingMsg[0], remaining, This->timeMsg[i]);
-+
-+    set_buffer(&This->lines[2], line);
-+    This->dwUpdate |= UPDATE_LINE3;
-+}
-+
- static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONGLONG ullCompleted, ULONGLONG ullTotal)
- {
-     ProgressDialog *This = impl_from_IProgressDialog(iface);
-@@ -418,6 +470,8 @@ static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONG
-     This->ullCompleted = ullCompleted;
-     This->dwUpdate |= UPDATE_PROGRESS;
-     hwnd = This->hwnd;
-+    if (This->dwFlags & PROGDLG_AUTOTIME)
-+        update_time_remaining(This, ullCompleted, ullTotal);
-     LeaveCriticalSection(&This->cs);
- 
-     if (hwnd)
-diff --git a/dlls/browseui/resids.h b/dlls/browseui/resids.h
-index cd44a8e..865cdd1 100644
---- a/dlls/browseui/resids.h
-+++ b/dlls/browseui/resids.h
-@@ -21,6 +21,11 @@
- #include "commctrl.h"
- 
- #define IDS_CANCELLING      16
-+#define IDS_REMAINING1      17
-+#define IDS_REMAINING2      18
-+#define IDS_SECONDS         19
-+#define IDS_MINUTES         20
-+#define IDS_HOURS           21
- 
- #define IDC_ANIMATION           100
- #define IDC_PROGRESS_BAR        102
--- 
-2.3.0
-

patches/d3d11-Deferred_Context/0002-wined3d-Add-wined3d_resource_map_info-function.patch

@@ -1,4 +1,4 @@
-From 3755d929ed2c1ceb101bf0741e78888624fbcf44 Mon Sep 17 00:00:00 2001
+From 837daae12d4c7fd40a35511d8d45299b46e91b38 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:54:42 +0100
 Subject: [PATCH] wined3d: Add wined3d_resource_map_info function.
@@ -13,11 +13,11 @@ Subject: [PATCH] wined3d: Add wined3d_resource_map_info function.
  6 files changed, 70 insertions(+)
 
 diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
-index 3f4552f..2350661 100644
+index 4c90d820..8065839d 100644
 --- a/dlls/wined3d/buffer.c
 +++ b/dlls/wined3d/buffer.c
-@@ -1275,6 +1275,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
-     return wined3d_buffer_map(buffer, offset, size, (BYTE **)&map_desc->data, flags);
+@@ -1306,6 +1306,24 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc
+     return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags);
  }
  
 +static HRESULT buffer_resource_sub_resource_map_info(struct wined3d_resource *resource, unsigned int sub_resource_idx,
@@ -31,8 +31,8 @@ index 3f4552f..2350661 100644
 +        return E_INVALIDARG;
 +    }
 +
-+    info->row_pitch   = buffer->desc.byte_width;
-+    info->slice_pitch = buffer->desc.byte_width;
++    info->row_pitch   = resource->size;
++    info->slice_pitch = resource->size;
 +    info->size        = buffer->resource.size;
 +
 +    return WINED3D_OK;
@@ -41,7 +41,7 @@ index 3f4552f..2350661 100644
  static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
  {
      if (sub_resource_idx)
-@@ -1294,6 +1312,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
+@@ -1325,6 +1343,7 @@ static const struct wined3d_resource_ops buffer_resource_ops =
      buffer_resource_preload,
      buffer_unload,
      buffer_resource_sub_resource_map,
@@ -50,10 +50,10 @@ index 3f4552f..2350661 100644
  };
  
 diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
-index b5dcdf0..28581a1 100644
+index a1b2cbd2..dd4ca20c 100644
 --- a/dlls/wined3d/resource.c
 +++ b/dlls/wined3d/resource.c
-@@ -358,6 +358,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
+@@ -361,6 +361,14 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i
      return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags);
  }
  
@@ -69,10 +69,10 @@ index b5dcdf0..28581a1 100644
  {
      TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx);
 diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
-index dadcd03..ed63158 100644
+index 87998d55..45ee3d3d 100644
 --- a/dlls/wined3d/texture.c
 +++ b/dlls/wined3d/texture.c
-@@ -2345,6 +2345,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
+@@ -2698,6 +2698,36 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour
      return WINED3D_OK;
  }
  
@@ -109,19 +109,19 @@ index dadcd03..ed63158 100644
  static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx)
  {
      struct wined3d_texture_sub_resource *sub_resource;
-@@ -2396,6 +2426,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
+@@ -2749,6 +2779,7 @@ static const struct wined3d_resource_ops texture_resource_ops =
      texture_resource_preload,
-     wined3d_texture_unload,
+     wined3d_texture_gl_unload,
      texture_resource_sub_resource_map,
 +    texture_resource_sub_resource_map_info,
      texture_resource_sub_resource_unmap,
  };
  
 diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
-index bf29e20..58dc0a9 100644
+index ee702211..f4944564 100644
 --- a/dlls/wined3d/wined3d.spec
 +++ b/dlls/wined3d/wined3d.spec
-@@ -229,6 +229,7 @@
+@@ -220,6 +220,7 @@
  @ cdecl wined3d_resource_get_parent(ptr)
  @ cdecl wined3d_resource_get_priority(ptr)
  @ cdecl wined3d_resource_map(ptr long ptr ptr long)
@@ -130,10 +130,10 @@ index bf29e20..58dc0a9 100644
  @ cdecl wined3d_resource_set_parent(ptr ptr)
  @ cdecl wined3d_resource_set_priority(ptr long)
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index b297799..ed08c4b 100644
+index 9a01ed29..9f8f784e 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -3030,6 +3030,8 @@ struct wined3d_resource_ops
+@@ -3096,6 +3096,8 @@ struct wined3d_resource_ops
      void (*resource_unload)(struct wined3d_resource *resource);
      HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx,
              struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
@@ -143,10 +143,10 @@ index b297799..ed08c4b 100644
  };
  
 diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
-index 15e14e5..fa929e5 100644
+index dc491d3b..8e0cf665 100644
 --- a/include/wine/wined3d.h
 +++ b/include/wine/wined3d.h
-@@ -1806,6 +1806,13 @@ struct wined3d_map_desc
+@@ -1835,6 +1835,13 @@ struct wined3d_map_desc
      void *data;
  };
  
@@ -160,7 +160,7 @@ index 15e14e5..fa929e5 100644
  struct wined3d_sub_resource_data
  {
      const void *data;
-@@ -2584,6 +2591,8 @@ void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resour
+@@ -2606,6 +2613,8 @@ void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resour
  DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resource);
  HRESULT __cdecl wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx,
          struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags);
@@ -170,5 +170,5 @@ index 15e14e5..fa929e5 100644
  void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent);
  DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority);
 -- 
-1.9.1
+2.19.1
 

patches/ddraw-Device_Caps/0003-ddraw-Set-ddsOldCaps-correctly-in-ddraw7_GetCaps.patch

@@ -1,4 +1,4 @@
-From 82d0d3038097d3410feb4e405e4b9f8cd9ced21d Mon Sep 17 00:00:00 2001
+From 8397d7b777db5ef44825b639d4009f6e372ca9ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Mar 2016 22:22:42 +0100
 Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
@@ -12,7 +12,7 @@ Subject: [PATCH] ddraw: Set ddsOldCaps correctly in ddraw7_GetCaps.
  5 files changed, 106 insertions(+)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 37e44e8..a740995 100644
+index 8247214..d70f2e2 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
 @@ -1544,6 +1544,8 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD
@@ -25,10 +25,10 @@ index 37e44e8..a740995 100644
  
      if(DriverCaps)
 diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
-index ee4fa5b..c7b992e 100644
+index 1f93a97..9a862e1 100644
 --- a/dlls/ddraw/tests/ddraw1.c
 +++ b/dlls/ddraw/tests/ddraw1.c
-@@ -11539,6 +11539,31 @@ static void test_execute_data(void)
+@@ -11543,6 +11543,31 @@ static void test_execute_data(void)
      DestroyWindow(window);
  }
  
@@ -60,7 +60,7 @@ index ee4fa5b..c7b992e 100644
  static void test_viewport(void)
  {
      static struct
-@@ -11973,6 +11998,7 @@ START_TEST(ddraw1)
+@@ -12030,6 +12055,7 @@ START_TEST(ddraw1)
      test_depth_readback();
      test_clear();
      test_enum_surfaces();
@@ -69,10 +69,10 @@ index ee4fa5b..c7b992e 100644
      test_viewport();
      test_find_device();
 diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
-index 9394705..bc213db 100644
+index 95cdf8b..d317cc1 100644
 --- a/dlls/ddraw/tests/ddraw2.c
 +++ b/dlls/ddraw/tests/ddraw2.c
-@@ -12801,6 +12801,31 @@ static void test_enum_surfaces(void)
+@@ -12805,6 +12805,31 @@ static void test_enum_surfaces(void)
      IDirectDraw2_Release(ddraw);
  }
  
@@ -104,20 +104,20 @@ index 9394705..bc213db 100644
  static void test_viewport(void)
  {
      static struct
-@@ -13264,6 +13289,7 @@ START_TEST(ddraw2)
+@@ -13321,6 +13346,7 @@ START_TEST(ddraw2)
      test_depth_readback();
      test_clear();
      test_enum_surfaces();
 +    test_caps();
      test_viewport();
      test_find_device();
- }
+     test_killfocus();
 diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
-index 6a3630a..1c9acf8 100644
+index a62aaf0..e11ec0c 100644
 --- a/dlls/ddraw/tests/ddraw4.c
 +++ b/dlls/ddraw/tests/ddraw4.c
-@@ -15247,6 +15247,31 @@ static void test_find_device(void)
-     IDirectDraw4_Release(ddraw);
+@@ -15318,6 +15318,31 @@ static void test_killfocus(void)
+     UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL));
  }
  
 +static void test_caps(void)
@@ -148,20 +148,20 @@ index 6a3630a..1c9acf8 100644
  START_TEST(ddraw4)
  {
      DDDEVICEIDENTIFIER identifier;
-@@ -15372,6 +15397,7 @@ START_TEST(ddraw4)
+@@ -15443,6 +15468,7 @@ START_TEST(ddraw4)
      test_depth_readback();
      test_clear();
      test_enum_surfaces();
 +    test_caps();
      test_viewport();
      test_find_device();
- }
+     test_killfocus();
 diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
-index 70318a8..f3dde43 100644
+index 04048d4..ad4f63d 100644
 --- a/dlls/ddraw/tests/ddraw7.c
 +++ b/dlls/ddraw/tests/ddraw7.c
-@@ -15035,6 +15035,31 @@ static void test_color_vertex(void)
-     DestroyWindow(window);
+@@ -15106,6 +15106,31 @@ static void test_killfocus(void)
+     UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL));
  }
  
 +static void test_caps(void)
@@ -192,12 +192,13 @@ index 70318a8..f3dde43 100644
  START_TEST(ddraw7)
  {
      DDDEVICEIDENTIFIER2 identifier;
-@@ -15172,5 +15197,6 @@ START_TEST(ddraw7)
+@@ -15243,6 +15268,7 @@ START_TEST(ddraw7)
      test_enum_surfaces();
      test_viewport();
      test_device_load();
 +    test_caps();
      test_color_vertex();
+     test_killfocus();
  }
 -- 
 1.9.1

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

@@ -1,4 +1,4 @@
-From 37a07b352d184b7d7c53084eb6e2d3190f8f581d Mon Sep 17 00:00:00 2001
+From cf433894ff56fda93491753843e0f4f658f67c8c 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.
@@ -8,14 +8,14 @@ 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       | 21 +++++++++++++++++++--
- 4 files changed, 38 insertions(+), 15 deletions(-)
+ dlls/ddraw/surface.c       | 36 ++++++++++++++++++++++++++++++++++--
+ 4 files changed, 53 insertions(+), 15 deletions(-)
 
 diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index e9e06ee..6677220 100644
+index 9a40bc9..6f3d058 100644
 --- a/dlls/ddraw/ddraw.c
 +++ b/dlls/ddraw/ddraw.c
-@@ -4211,7 +4211,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
+@@ -4210,7 +4210,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid,
      TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -24,7 +24,7 @@ index e9e06ee..6677220 100644
      {
          *device = &object->IDirect3DDevice7_iface;
      }
-@@ -4240,7 +4240,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
+@@ -4239,7 +4239,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid,
          return CLASS_E_NOAGGREGATION;
  
      wined3d_mutex_lock();
@@ -33,7 +33,7 @@ index e9e06ee..6677220 100644
      {
          *device = &device_impl->IDirect3DDevice3_iface;
      }
-@@ -4266,7 +4266,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
+@@ -4265,7 +4265,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid,
              iface, debugstr_guid(riid), surface, device);
  
      wined3d_mutex_lock();
@@ -64,7 +64,7 @@ index 495cb8b..4af638b 100644
  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 7866c28..81ace96 100644
+index 0d48c7d..2bef17d 100644
 --- a/dlls/ddraw/device.c
 +++ b/dlls/ddraw/device.c
 @@ -1854,7 +1854,7 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface,
@@ -152,7 +152,7 @@ index 7866c28..81ace96 100644
          WARN("Failed to initialize device, hr %#x.\n", hr);
          heap_free(object);
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index d201d9d..41fe6a1 100644
+index 5ce1d85..e729348 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
 @@ -226,7 +226,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
@@ -164,11 +164,26 @@ index d201d9d..41fe6a1 100644
                          1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface)))
                  {
                      This->device1 = NULL;
-@@ -6155,7 +6155,24 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_
+@@ -6162,7 +6162,39 @@ 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->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
@@ -180,7 +195,7 @@ index d201d9d..41fe6a1 100644
 +        if ((desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) &&
 +            SUCCEEDED(hr = wined3d_check_device_format(ddraw->wined3d, WINED3DADAPTER_DEFAULT,
 +                        WINED3D_DEVICE_TYPE_HAL, mode.format_id, WINED3DUSAGE_RENDERTARGET,
-+                        WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format)))
++                        bind_flags, WINED3D_RTYPE_TEXTURE_2D, wined3d_desc.format)))
 +        {
 +            FIXME("Application wants to create rendering target in system memory, using video memory instead\n");
 +            wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET;
@@ -191,5 +206,5 @@ index d201d9d..41fe6a1 100644
      }
      else
 -- 
-2.7.4
+1.9.1
 

patches/ddraw-Rendering_Targets/definition

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

patches/dwrite-FontFallback/0001-dwrite-Test-IDWriteTextFormat-with-nonexistent-font.patch

@@ -1,77 +0,0 @@
-From e2978c13fca913a14991e286c463ede69f61831d Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucianposton@pm.me>
-Date: Sun, 20 May 2018 21:40:39 -0700
-Subject: [PATCH 1/6] dwrite: Test IDWriteTextFormat with nonexistent font
-
-Signed-off-by: Lucian Poston <lucianposton@pm.me>
----
- dlls/dwrite/tests/layout.c | 46 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index 652f6b78ac..4198b8a1b1 100644
---- a/dlls/dwrite/tests/layout.c
-+++ b/dlls/dwrite/tests/layout.c
-@@ -30,6 +30,7 @@
- #include "wine/test.h"
- 
- static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0};
-+static const WCHAR nonExistentFontW[]  = {'B','l','a','h','!',0};
- static const WCHAR enusW[] = {'e','n','-','u','s',0};
- 
- struct testanalysissink
-@@ -3292,6 +3293,51 @@ todo_wine
-     ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-     IDWriteTextLayout_Release(layout);
- 
-+    IDWriteTextFormat_Release(format);
-+
-+    /* nonexistent font */
-+    hr = IDWriteFactory_CreateTextFormat(factory, nonExistentFontW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
-+        DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+
-+    hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 500.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+
-+    count = 0;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+todo_wine
-+    ok(count == 4, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+todo_wine
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+todo_wine
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+todo_wine
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+todo_wine
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+todo_wine
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+todo_wine
-+    ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth);
-+todo_wine
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+todo_wine
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+todo_wine
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+
-+    IDWriteTextLayout_Release(layout);
-+
-     IDWriteTextFormat_Release(format);
-     IDWriteFactory_Release(factory);
- }
--- 
-2.18.0
-

patches/dwrite-FontFallback/0002-dwrite-Test-GetMetrics-with-custom-fontcollection.patch

@@ -1,323 +0,0 @@
-From 22fd0a86b6be3d2e203beee7a0b55f717f32436b Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucianposton@pm.me>
-Date: Wed, 23 May 2018 00:01:42 -0700
-Subject: [PATCH 2/6] dwrite: Test GetMetrics with custom fontcollection
-
-Signed-off-by: Lucian Poston <lucianposton@pm.me>
----
- dlls/dwrite/tests/layout.c | 278 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 278 insertions(+)
-
-diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index 4198b8a1b1..7542cad8d7 100644
---- a/dlls/dwrite/tests/layout.c
-+++ b/dlls/dwrite/tests/layout.c
-@@ -4489,6 +4489,7 @@ static void test_SetWordWrapping(void)
- /* Collection dedicated to fallback testing */
- 
- static const WCHAR g_blahfontW[] = {'B','l','a','h',0};
-+static const WCHAR g_fontNotInCollectionW[] = {'n','o','t','B','l','a','h',0};
- static HRESULT WINAPI fontcollection_QI(IDWriteFontCollection *iface, REFIID riid, void **obj)
- {
-     if (IsEqualIID(riid, &IID_IDWriteFontCollection) || IsEqualIID(riid, &IID_IUnknown)) {
-@@ -4548,6 +4549,9 @@ static HRESULT WINAPI fontcollection_FindFamilyName(IDWriteFontCollection *iface
-         *index = 123456;
-         *exists = TRUE;
-         return S_OK;
-+    } else if (!lstrcmpW(name, g_fontNotInCollectionW)) {
-+        *exists = FALSE;
-+        return S_OK;
-     }
-     ok(0, "unexpected call, name %s\n", wine_dbgstr_w(name));
-     return E_NOTIMPL;
-@@ -5568,6 +5572,279 @@ static void test_GetOverhangMetrics(void)
-     IDWriteFactory_Release(factory);
- }
- 
-+static void test_GetMetrics_with_custom_fontcollection(void)
-+{
-+    static const WCHAR emptystringW[] = {0};
-+    static const WCHAR mappedW[] = {'a','b','c','d',0};
-+    static const WCHAR notmappedW[] = {'a',0xffff,'b',0}; // u+ffff = not a unicode character
-+    DWRITE_CLUSTER_METRICS clusters[4];
-+    DWRITE_TEXT_METRICS metrics;
-+    IDWriteTextFormat *format;
-+    IDWriteTextLayout *layout;
-+    IDWriteFactory *factory;
-+    UINT32 count, i;
-+    FLOAT width;
-+    HRESULT hr;
-+
-+    factory = create_factory();
-+
-+    /* font is in font collection */
-+    hr = IDWriteFactory_CreateTextFormat(factory, g_blahfontW, &fallbackcollection,
-+            DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
-+            DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+
-+    /* text is mapped by fontfallback */
-+    hr = IDWriteFactory_CreateTextLayout(factory, mappedW, 4, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(count == 4, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    /* text is not mapped by fontfallback */
-+    hr = IDWriteFactory_CreateTextLayout(factory, notmappedW, 4, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(count == 4, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    /* empty string */
-+    hr = IDWriteFactory_CreateTextLayout(factory, emptystringW, 4, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(count == 4, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    /* zero-length empty string */
-+    hr = IDWriteFactory_CreateTextLayout(factory, emptystringW, 0, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(count == 0, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    IDWriteTextFormat_Release(format);
-+
-+    /* font not in font collection */
-+    hr = IDWriteFactory_CreateTextFormat(factory, g_fontNotInCollectionW, &fallbackcollection,
-+            DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL,
-+            DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+
-+    /* text is mapped by fontfallback */
-+    hr = IDWriteFactory_CreateTextLayout(factory, mappedW, 4, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    todo_wine
-+    ok(count == 4, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    todo_wine
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    todo_wine
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    todo_wine
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    todo_wine
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    todo_wine
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    todo_wine
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    todo_wine
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    todo_wine
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    todo_wine
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    /* text is not mapped by fontfallback */
-+    hr = IDWriteFactory_CreateTextLayout(factory, notmappedW, 4, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    todo_wine
-+    ok(count == 4, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    todo_wine
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    todo_wine
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    todo_wine
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    todo_wine
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    todo_wine
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    todo_wine
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    todo_wine
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    todo_wine
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    todo_wine
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    /* empty string */
-+    hr = IDWriteFactory_CreateTextLayout(factory, emptystringW, 4, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    todo_wine
-+    ok(count == 4, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    todo_wine
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    todo_wine
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    todo_wine
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    todo_wine
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    todo_wine
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    todo_wine
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    todo_wine
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    todo_wine
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    todo_wine
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    /* zero-length empty string */
-+    hr = IDWriteFactory_CreateTextLayout(factory, emptystringW, 0, format, 1000.0, 1000.0, &layout);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    count = 9999;
-+    hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    ok(count == 0, "got %u\n", count);
-+    for (i = 0, width = 0.0; i < count; i++)
-+        width += clusters[i].width;
-+    memset(&metrics, 0xcc, sizeof(metrics));
-+    hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
-+    todo_wine
-+    ok(hr == S_OK, "got 0x%08x\n", hr);
-+    todo_wine
-+    ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
-+    todo_wine
-+    ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
-+    todo_wine
-+    ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
-+    todo_wine
-+    ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-+        metrics.widthIncludingTrailingWhitespace, width);
-+    todo_wine
-+    ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
-+    todo_wine
-+    ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
-+    todo_wine
-+    ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
-+    todo_wine
-+    ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-+    todo_wine
-+    ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-+    IDWriteTextLayout_Release(layout);
-+
-+    IDWriteTextFormat_Release(format);
-+
-+    IDWriteFactory_Release(factory);
-+}
-+
- START_TEST(layout)
- {
-     IDWriteFactory *factory;
-@@ -5601,6 +5878,7 @@ START_TEST(layout)
-     test_SetFontStretch();
-     test_SetStrikethrough();
-     test_GetMetrics();
-+    test_GetMetrics_with_custom_fontcollection();
-     test_SetFlowDirection();
-     test_SetDrawingEffect();
-     test_GetLineMetrics();
--- 
-2.18.0
-

patches/dwrite-FontFallback/0003-dwrite-Skip-failing-font-metrics-test-for-Goha.patch

@@ -1,42 +0,0 @@
-From ffc4081c4705362d89632dc82ed251c440e1c00f Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucianposton@pm.me>
-Date: Mon, 21 May 2018 19:40:03 -0700
-Subject: [PATCH 3/6] dwrite: Skip failing font metrics test for Goha
-
-Signed-off-by: Lucian Poston <lucianposton@pm.me>
----
- dlls/dwrite/tests/layout.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index 7542cad8d7..c8f3f5a00f 100644
---- a/dlls/dwrite/tests/layout.c
-+++ b/dlls/dwrite/tests/layout.c
-@@ -620,6 +620,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface,
- {
-     struct renderer_context *ctxt = (struct renderer_context*)context;
-     struct drawcall_entry entry = { 0 };
-+    static const WCHAR gohaW[] = {'G','o','h','a','-','T','i','b','e','b',' ','Z','e','m','e','n',0};
- 
-     if (ctxt)
-         TEST_MEASURING_MODE(ctxt, underline->measuringMode);
-@@ -635,9 +636,13 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface,
-         IDWriteFontFace_GetMetrics(fontface, &metrics);
- 
-         ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize);
--        /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */
--        ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n",
--                metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW));
-+        if (lstrcmpW(gohaW, ctxt->familyW)) {
-+            /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */
-+            ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n",
-+                    metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW));
-+        } else {
-+            skip("%s is an invalid font, rejected by windows.\n", wine_dbgstr_w(gohaW));
-+        }
- 
-         IDWriteFontFace_Release(fontface);
-     }
--- 
-2.18.0
-

patches/dwrite-FontFallback/0004-dwrite-Use-font-fallback-when-mapping-characters.patch

@@ -1,352 +0,0 @@
-From add69d1d24330592891222674844dccf104d6d73 Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucianposton@pm.me>
-Date: Mon, 21 May 2018 18:13:00 -0700
-Subject: [PATCH 4/6] dwrite: Use font fallback when mapping characters
-
-Signed-off-by: Lucian Poston <lucianposton@pm.me>
----
- dlls/dwrite/analyzer.c     | 77 +++++++++++++++++++++++-------
- dlls/dwrite/layout.c       |  6 +++
- dlls/dwrite/tests/layout.c | 97 +++++++++++++-------------------------
- 3 files changed, 98 insertions(+), 82 deletions(-)
-
-diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
-index 8d553c6d56..21da783fe6 100644
---- a/dlls/dwrite/analyzer.c
-+++ b/dlls/dwrite/analyzer.c
-@@ -2078,6 +2078,7 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback,
-         IDWriteFont **mapped_font)
- {
-     const struct fallback_mapping *mapping;
-+    IDWriteFontCollection *collection;
-     HRESULT hr;
-     UINT32 i;
- 
-@@ -2089,9 +2090,15 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback,
-         return E_FAIL;
-     }
- 
-+    if (mapping->collection) {
-+        collection = mapping->collection;
-+    } else {
-+        collection = (IDWriteFontCollection *)fallback->systemcollection;
-+    }
-+
-     /* Now let's see what fallback can handle. Pick first font that could be created. */
-     for (i = 0; i < mapping->families_count; i++) {
--        hr = create_matching_font((IDWriteFontCollection *)fallback->systemcollection, mapping->families[i],
-+        hr = create_matching_font(collection, mapping->families[i],
-                 weight, style, stretch, mapped_font);
-         if (hr == S_OK) {
-             TRACE("Created fallback font using family %s.\n", debugstr_w(mapping->families[i]));
-@@ -2148,32 +2155,66 @@ static HRESULT WINAPI fontfallback_MapCharacters(IDWriteFontFallback *iface, IDW
- 
-     if (basefamily && *basefamily) {
-         hr = create_matching_font(basecollection, basefamily, weight, style, stretch, ret_font);
--        if (FAILED(hr))
--            goto done;
--
--        hr = fallback_map_characters(*ret_font, text, length, mapped_length);
--        if (FAILED(hr))
--            goto done;
-+        if (SUCCEEDED(hr)) {
-+            hr = fallback_map_characters(*ret_font, text, length, mapped_length);
-+            if (FAILED(hr)) {
-+                IDWriteFont_Release(*ret_font);
-+                *ret_font = NULL;
-+                WARN("Mapping with requested family %s failed, hr %#x.\n", debugstr_w(basefamily), hr);
-+            }
-+        }
-     }
- 
-     if (!*mapped_length) {
--        IDWriteFont *mapped_font;
-+        if (*ret_font) {
-+            IDWriteFont_Release(*ret_font);
-+            *ret_font = NULL;
-+        }
- 
--        hr = fallback_get_fallback_font(fallback, text, length, weight, style, stretch, mapped_length, &mapped_font);
-+        hr = fallback_get_fallback_font(fallback, text, length, weight, style, stretch, mapped_length, ret_font);
-         if (FAILED(hr)) {
--            /* fallback wasn't found, keep base font if any, so we can get at least some visual output */
--            if (*ret_font) {
--                *mapped_length = length;
--                hr = S_OK;
--            }
-+            WARN("Mapping with fallback families failed, hr %#x.\n", hr);
-         }
--        else {
--            if (*ret_font)
--                IDWriteFont_Release(*ret_font);
--            *ret_font = mapped_font;
-+    }
-+
-+    /**
-+     * This is a rough hack. We search the system font collection because
-+     * the system fontfallback, which would have been searched above, is not
-+     * fully implemented as it isn't populated with any system fonts. Once
-+     * implemented, the block below can be removed.
-+     * */
-+    if (!*mapped_length) {
-+        IDWriteFontFamily *family;
-+        IDWriteFont *font;
-+        UINT32 i, count = IDWriteFontCollection_GetFontFamilyCount((IDWriteFontCollection *)fallback->systemcollection);
-+        for (i = 0; i < count; i++) {
-+            hr = IDWriteFontCollection_GetFontFamily((IDWriteFontCollection *)fallback->systemcollection, i, &family);
-+            if (FAILED(hr)) {
-+                ERR("Failed to get font family.\n");
-+                continue;
-+            }
-+
-+            hr = IDWriteFontFamily_GetFirstMatchingFont(family, weight, stretch, style, &font);
-+            IDWriteFontFamily_Release(family);
-+            if (FAILED(hr)) {
-+                continue;
-+            }
-+
-+            hr = fallback_map_characters(font, text, length, mapped_length);
-+            if (SUCCEEDED(hr) && mapped_length > 0) {
-+                *ret_font = font;
-+                break;
-+            }
-+
-+            IDWriteFont_Release(font);
-         }
-     }
- 
-+    if (!*mapped_length) {
-+        *mapped_length = length == 0 ? 0 : 1;
-+        hr = S_OK;
-+    }
-+
- done:
-     heap_free(buff);
-     return hr;
-diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 65e0a57678..df3f3beabb 100644
---- a/dlls/dwrite/layout.c
-+++ b/dlls/dwrite/layout.c
-@@ -878,6 +878,12 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout)
-                 goto fatal;
-             }
- 
-+            if (!font) {
-+                hr = E_FAIL;
-+                WARN("Failed to create font face, hr %#x.\n", hr);
-+                goto fatal;
-+            }
-+
-             hr = IDWriteFont_CreateFontFace(font, &run->run.fontFace);
-             IDWriteFont_Release(font);
-             if (FAILED(hr)) {
-diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index c8f3f5a00f..430bb1f0eb 100644
---- a/dlls/dwrite/tests/layout.c
-+++ b/dlls/dwrite/tests/layout.c
-@@ -3310,35 +3310,23 @@ todo_wine
- 
-     count = 0;
-     hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
--todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--todo_wine
-     ok(count == 4, "got %u\n", count);
-     for (i = 0, width = 0.0; i < count; i++)
-         width += clusters[i].width;
- 
-     memset(&metrics, 0xcc, sizeof(metrics));
-     hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
--todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--todo_wine
-     ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
--todo_wine
-     ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
--todo_wine
-     ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
--todo_wine
-     ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-         metrics.widthIncludingTrailingWhitespace, width);
--todo_wine
-     ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
--todo_wine
-     ok(metrics.layoutWidth == 500.0, "got %.2f\n", metrics.layoutWidth);
--todo_wine
-     ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
--todo_wine
-     ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
--todo_wine
-     ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
- 
-     IDWriteTextLayout_Release(layout);
-@@ -4637,16 +4625,13 @@ static void test_MapCharacters(void)
-     font = NULL;
-     hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
-         DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
--todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     ok(mappedlength == 1, "got %u\n", mappedlength);
--}
-     ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
-     ok(font != NULL, "got %p\n", font);
--if (font) {
--    IDWriteFont_Release(font);
--}
-+    if (font) {
-+        IDWriteFont_Release(font);
-+    }
-     /* same latin text, full length */
-     g_source = strW;
-     mappedlength = 0;
-@@ -4654,16 +4639,13 @@ if (font) {
-     font = NULL;
-     hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
-         DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
--todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     ok(mappedlength == 3, "got %u\n", mappedlength);
--}
-     ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
-     ok(font != NULL, "got %p\n", font);
--if (font) {
--    IDWriteFont_Release(font);
--}
-+    if (font) {
-+        IDWriteFont_Release(font);
-+    }
-     /* string 'a\x3058b' */
-     g_source = str2W;
-     mappedlength = 0;
-@@ -4671,38 +4653,32 @@ if (font) {
-     font = NULL;
-     hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
-         DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
--todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     ok(mappedlength == 1, "got %u\n", mappedlength);
--}
-     ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
-     ok(font != NULL, "got %p\n", font);
--if (font) {
--    IDWriteFont_Release(font);
--}
-+    if (font) {
-+        IDWriteFont_Release(font);
-+    }
-     g_source = str2W;
-     mappedlength = 0;
-     scale = 0.0f;
-     font = NULL;
-     hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 1, 2, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL,
-         DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale);
--todo_wine {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     ok(mappedlength == 1, "got %u\n", mappedlength);
--}
-     ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
-     ok(font != NULL, "got %p\n", font);
--if (font) {
--    /* font returned for Hiragana character, check if it supports Latin too */
--    exists = FALSE;
--    hr = IDWriteFont_HasCharacter(font, 'b', &exists);
--    ok(hr == S_OK, "got 0x%08x\n", hr);
--    ok(exists, "got %d\n", exists);
-+    if (font) {
-+        /* font returned for Hiragana character, check if it supports Latin too */
-+        exists = FALSE;
-+        hr = IDWriteFont_HasCharacter(font, 'b', &exists);
-+        ok(hr == S_OK, "got 0x%08x\n", hr);
-+        ok(exists, "got %d\n", exists);
- 
--    IDWriteFont_Release(font);
--}
-+        IDWriteFont_Release(font);
-+    }
-     /* Try with explicit collection, Tahoma will be forced. */
-     /* 1. Latin part */
-     g_source = str2W;
-@@ -4725,7 +4701,10 @@ if (font) {
-     IDWriteLocalizedStrings_Release(strings);
-     IDWriteFont_Release(font);
- 
--    /* 2. Hiragana character, force Tahoma font does not support Japanese */
-+    /**
-+     * 2. Hiragana character. Tahoma is requested, but it doesn't support
-+     * Japanese. A NULL font is returned if there is no fallback for Japanese.
-+     */
-     g_source = str2W;
-     mappedlength = 0;
-     scale = 0.0f;
-@@ -4735,17 +4714,19 @@ if (font) {
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     ok(mappedlength == 1, "got %u\n", mappedlength);
-     ok(scale == 1.0f, "got %f\n", scale);
--    ok(font != NULL, "got %p\n", font);
- 
--    exists = FALSE;
--    hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists);
--    ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists);
--    hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, ARRAY_SIZE(buffW));
--    ok(hr == S_OK, "got 0x%08x\n", hr);
--todo_wine
--    ok(lstrcmpW(buffW, tahomaW), "%s\n", wine_dbgstr_w(buffW));
--    IDWriteLocalizedStrings_Release(strings);
--    IDWriteFont_Release(font);
-+    if (!font) {
-+        skip("Missing system font for Japanese.\n");
-+    } else {
-+        exists = FALSE;
-+        hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists);
-+        ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists);
-+        hr = IDWriteLocalizedStrings_GetString(strings, 0, buffW, ARRAY_SIZE(buffW));
-+        ok(hr == S_OK, "got 0x%08x\n", hr);
-+        ok(lstrcmpW(buffW, tahomaW), "%s\n", wine_dbgstr_w(buffW));
-+        IDWriteLocalizedStrings_Release(strings);
-+        IDWriteFont_Release(font);
-+    }
- 
-     IDWriteFontFallback_Release(fallback);
-     IDWriteFactory2_Release(factory2);
-@@ -5708,34 +5689,22 @@ static void test_GetMetrics_with_custom_fontcollection(void)
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     count = 9999;
-     hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
--    todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--    todo_wine
-     ok(count == 4, "got %u\n", count);
-     for (i = 0, width = 0.0; i < count; i++)
-         width += clusters[i].width;
-     memset(&metrics, 0xcc, sizeof(metrics));
-     hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
--    todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--    todo_wine
-     ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
--    todo_wine
-     ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
--    todo_wine
-     ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
--    todo_wine
-     ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-         metrics.widthIncludingTrailingWhitespace, width);
--    todo_wine
-     ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
--    todo_wine
-     ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
--    todo_wine
-     ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
--    todo_wine
-     ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
--    todo_wine
-     ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-     IDWriteTextLayout_Release(layout);
- 
--- 
-2.18.0
-

patches/dwrite-FontFallback/0005-dwrite-Use-MapCharacters-for-non-visual-characters.patch

@@ -1,128 +0,0 @@
-From 838b8a5edeca6c06c20bdc301f4d5d658e835cc9 Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucianposton@pm.me>
-Date: Wed, 23 May 2018 05:59:20 -0700
-Subject: [PATCH 5/6] dwrite: Use MapCharacters for non-visual characters
-
-Signed-off-by: Lucian Poston <lucianposton@pm.me>
----
- dlls/dwrite/layout.c       | 22 +++++++++++++++-------
- dlls/dwrite/tests/layout.c | 24 ------------------------
- 2 files changed, 15 insertions(+), 31 deletions(-)
-
-diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index df3f3beabb..5d06bf9348 100644
---- a/dlls/dwrite/layout.c
-+++ b/dlls/dwrite/layout.c
-@@ -822,7 +822,8 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout)
-     LIST_FOR_EACH_ENTRY(r, &layout->runs, struct layout_run, entry) {
-         struct regular_layout_run *run = &r->u.regular;
-         IDWriteFont *font;
--        UINT32 length;
-+        UINT32 length, mapped_length;
-+        FLOAT scale;
- 
-         if (r->kind == LAYOUT_RUN_INLINE)
-             continue;
-@@ -830,12 +831,19 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout)
-         range = get_layout_range_by_pos(layout, run->descr.textPosition);
- 
-         if (run->sa.shapes == DWRITE_SCRIPT_SHAPES_NO_VISUAL) {
--            IDWriteFontCollection *collection;
--
--            collection = range->collection ? range->collection : sys_collection;
--
--            if (FAILED(hr = create_matching_font(collection, range->fontfamily, range->weight, range->style,
--                    range->stretch, &font))) {
-+            hr = IDWriteFontFallback_MapCharacters(fallback,
-+                (IDWriteTextAnalysisSource *)&layout->IDWriteTextAnalysisSource1_iface,
-+                run->descr.textPosition,
-+                run->descr.stringLength,
-+                range->collection,
-+                range->fontfamily,
-+                range->weight,
-+                range->style,
-+                range->stretch,
-+                &mapped_length,
-+                &font,
-+                &scale);
-+            if (FAILED(hr)) {
-                 WARN("%s: failed to create matching font for non visual run, family %s, collection %p\n",
-                         debugstr_rundescr(&run->descr), debugstr_w(range->fontfamily), range->collection);
-                 break;
-diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index 430bb1f0eb..cf1d5d7060 100644
---- a/dlls/dwrite/tests/layout.c
-+++ b/dlls/dwrite/tests/layout.c
-@@ -5713,34 +5713,22 @@ static void test_GetMetrics_with_custom_fontcollection(void)
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     count = 9999;
-     hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
--    todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--    todo_wine
-     ok(count == 4, "got %u\n", count);
-     for (i = 0, width = 0.0; i < count; i++)
-         width += clusters[i].width;
-     memset(&metrics, 0xcc, sizeof(metrics));
-     hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
--    todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--    todo_wine
-     ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
--    todo_wine
-     ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
--    todo_wine
-     ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
--    todo_wine
-     ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-         metrics.widthIncludingTrailingWhitespace, width);
--    todo_wine
-     ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
--    todo_wine
-     ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
--    todo_wine
-     ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
--    todo_wine
-     ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
--    todo_wine
-     ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-     IDWriteTextLayout_Release(layout);
- 
-@@ -5749,34 +5737,22 @@ static void test_GetMetrics_with_custom_fontcollection(void)
-     ok(hr == S_OK, "got 0x%08x\n", hr);
-     count = 9999;
-     hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
--    todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--    todo_wine
-     ok(count == 4, "got %u\n", count);
-     for (i = 0, width = 0.0; i < count; i++)
-         width += clusters[i].width;
-     memset(&metrics, 0xcc, sizeof(metrics));
-     hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
--    todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--    todo_wine
-     ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
--    todo_wine
-     ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
--    todo_wine
-     ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
--    todo_wine
-     ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-         metrics.widthIncludingTrailingWhitespace, width);
--    todo_wine
-     ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
--    todo_wine
-     ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
--    todo_wine
-     ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
--    todo_wine
-     ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
--    todo_wine
-     ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
-     IDWriteTextLayout_Release(layout);
- 
--- 
-2.18.0
-

patches/dwrite-FontFallback/0006-dwrite-Use-MapCharacters-for-dummy-line-metrics.patch

@@ -1,96 +0,0 @@
-From a0f4bde380003f7a8e3b713028215bf985dbb3c0 Mon Sep 17 00:00:00 2001
-From: Lucian Poston <lucianposton@pm.me>
-Date: Wed, 23 May 2018 07:03:44 -0700
-Subject: [PATCH 6/6] dwrite: Use MapCharacters for dummy line metrics
-
-Fixes: https://bugs.winehq.org/show_bug.cgi?id=44052
-
-Signed-off-by: Lucian Poston <lucianposton@pm.me>
----
- dlls/dwrite/layout.c       | 29 +++++++++++++++++++++++++++++
- dlls/dwrite/tests/layout.c |  8 --------
- 2 files changed, 29 insertions(+), 8 deletions(-)
-
-diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 5d06bf9348..2213717f92 100644
---- a/dlls/dwrite/layout.c
-+++ b/dlls/dwrite/layout.c
-@@ -1808,8 +1808,11 @@ static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, U
-     DWRITE_FONT_METRICS fontmetrics;
-     struct layout_range *range;
-     IDWriteFontFace *fontface;
-+    IDWriteFontFallback *fallback;
-     IDWriteFont *font;
-     HRESULT hr;
-+    UINT32 mapped_length;
-+    FLOAT scale;
- 
-     range = get_layout_range_by_pos(layout, pos);
-     hr = create_matching_font(range->collection,
-@@ -1818,8 +1821,34 @@ static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, U
-         range->style,
-         range->stretch,
-         &font);
-+
-+    if (FAILED(hr)) {
-+        if (layout->format.fallback) {
-+            fallback = layout->format.fallback;
-+            IDWriteFontFallback_AddRef(fallback);
-+        } else if (FAILED(hr = IDWriteFactory5_GetSystemFontFallback(layout->factory, &fallback))) {
-+            WARN("Failed to get system fallback, hr %#x.\n", hr);
-+            return hr;
-+        }
-+
-+        hr = IDWriteFontFallback_MapCharacters(fallback,
-+                (IDWriteTextAnalysisSource *)&layout->IDWriteTextAnalysisSource1_iface,
-+                pos,
-+                layout->len,
-+                range->collection,
-+                range->fontfamily,
-+                range->weight,
-+                range->style,
-+                range->stretch,
-+                &mapped_length,
-+                &font,
-+                &scale);
-+        IDWriteFontFallback_Release(fallback);
-+    }
-     if (FAILED(hr))
-         return hr;
-+    if (font == NULL)
-+        return S_OK;
-     hr = IDWriteFont_CreateFontFace(font, &fontface);
-     IDWriteFont_Release(font);
-     if (FAILED(hr))
-diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index cf1d5d7060..6ed7b3c334 100644
---- a/dlls/dwrite/tests/layout.c
-+++ b/dlls/dwrite/tests/layout.c
-@@ -5767,24 +5767,16 @@ static void test_GetMetrics_with_custom_fontcollection(void)
-         width += clusters[i].width;
-     memset(&metrics, 0xcc, sizeof(metrics));
-     hr = IDWriteTextLayout_GetMetrics(layout, &metrics);
--    todo_wine
-     ok(hr == S_OK, "got 0x%08x\n", hr);
--    todo_wine
-     ok(metrics.left == 0.0, "got %.2f\n", metrics.left);
--    todo_wine
-     ok(metrics.top == 0.0, "got %.2f\n", metrics.top);
--    todo_wine
-     ok(metrics.width == width, "got %.2f, expected %.2f\n", metrics.width, width);
--    todo_wine
-     ok(metrics.widthIncludingTrailingWhitespace == width, "got %.2f, expected %.2f\n",
-         metrics.widthIncludingTrailingWhitespace, width);
-     todo_wine
-     ok(metrics.height > 0.0, "got %.2f\n", metrics.height);
--    todo_wine
-     ok(metrics.layoutWidth == 1000.0, "got %.2f\n", metrics.layoutWidth);
--    todo_wine
-     ok(metrics.layoutHeight == 1000.0, "got %.2f\n", metrics.layoutHeight);
--    todo_wine
-     ok(metrics.maxBidiReorderingDepth == 1, "got %u\n", metrics.maxBidiReorderingDepth);
-     todo_wine
-     ok(metrics.lineCount == 1, "got %u\n", metrics.lineCount);
--- 
-2.18.0
-

patches/dwrite-FontFallback/definition

@@ -1 +0,0 @@
-Fixes: [44052] - Support for font fallback.

patches/hid-HidD_FlushQueue/0001-hid-Implement-HidD_FlushQueue.patch

@@ -0,0 +1,41 @@
+From 25d8d0cbbab19ec990505c7cf1af4bcfcf7f5bfd Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Tue, 16 Oct 2018 15:34:38 +1100
+Subject: [PATCH] hid: Implement HidD_FlushQueue
+
+Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45878
+Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+---
+ dlls/hid/hid.spec | 2 +-
+ dlls/hid/hidd.c   | 8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec
+index cbae14c..549ceea 100644
+--- a/dlls/hid/hid.spec
++++ b/dlls/hid/hid.spec
+@@ -1,4 +1,4 @@
+-@ stub HidD_FlushQueue
++@ stdcall HidD_FlushQueue(ptr)
+ @ stdcall HidD_FreePreparsedData(ptr)
+ @ stdcall HidD_GetAttributes(long ptr)
+ @ stub HidD_GetConfiguration
+diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c
+index 614e7c4..fa96bf9 100644
+--- a/dlls/hid/hidd.c
++++ b/dlls/hid/hidd.c
+@@ -145,3 +145,11 @@ BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer,
+     TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength);
+     return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL);
+ }
++
++BOOLEAN WINAPI HidD_FlushQueue(HANDLE HidDeviceObject)
++{
++    DWORD RetLen;
++    TRACE("(%p)\n", HidDeviceObject);
++
++    return DeviceIoControl(HidDeviceObject, IOCTL_HID_FLUSH_QUEUE, NULL, 0, NULL, 0,&RetLen, NULL);
++}
+-- 
+1.9.1
+

patches/hid-HidD_FlushQueue/definition

@@ -0,0 +1 @@
+Fixes: [45878] Implement HidD_FlushQueue