Release v4.0-rc6

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

@@ -1362,7 +1362,7 @@ index c930248..80f73de 100644
 +    object->device = iface;
 +    object->refcount = 1;
 +
-+    ID3D11Device_AddRef(iface);
++    ID3D11Device2_AddRef(iface);
 +    wined3d_private_store_init(&object->private_store);
 +
 +    *context = &object->ID3D11DeviceContext_iface;

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

@@ -1,4 +1,4 @@
-From b8d301b085b39fba7f61409a0ebe17a4ff7b810a Mon Sep 17 00:00:00 2001
+From 07c70b0b20919d9908b408322d65c62ad459f09e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 19 Jan 2017 16:56:56 +0100
 Subject: [PATCH] d3d11: Initial implementation for deferred contexts.
@@ -8,7 +8,7 @@ Subject: [PATCH] d3d11: Initial implementation for deferred contexts.
  1 file changed, 1040 insertions(+), 31 deletions(-)
 
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index 9127d01..94156e4 100644
+index ebe8c03..791b959 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
 @@ -19,12 +19,181 @@
@@ -725,7 +725,7 @@ index 9127d01..94156e4 100644
  static void STDMETHODCALLTYPE d3d_null_wined3d_object_destroyed(void *parent) {}
  
  static const struct wined3d_parent_ops d3d_null_wined3d_parent_ops =
-@@ -1217,7 +1908,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
+@@ -1221,7 +1912,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ResolveSubresource(ID3D11D
  static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11DeviceContext1 *iface,
          ID3D11CommandList *command_list, BOOL restore_state)
  {
@@ -747,7 +747,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext1 *iface,
-@@ -2972,6 +3676,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
+@@ -2855,6 +3559,7 @@ static ULONG STDMETHODCALLTYPE d3d11_deferred_context_Release(ID3D11DeviceContex
  
      if (!refcount)
      {
@@ -755,7 +755,7 @@ index 9127d01..94156e4 100644
          wined3d_private_store_cleanup(&context->private_store);
          ID3D11Device_Release(context->device);
          HeapFree(GetProcessHeap(), 0, context);
-@@ -3023,43 +3728,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
+@@ -2906,43 +3611,86 @@ static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_SetPrivateDataInterface(
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -848,7 +848,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *iface,
-@@ -3072,53 +3820,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
+@@ -2955,53 +3703,169 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_Draw(ID3D11DeviceContext *i
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource,
          UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource)
  {
@@ -1027,7 +1027,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_DrawInstanced(ID3D11DeviceContext *iface,
-@@ -3147,7 +4011,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
+@@ -3030,7 +3894,16 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_GSSetShader(ID3D11DeviceCon
  static void STDMETHODCALLTYPE d3d11_deferred_context_IASetPrimitiveTopology(ID3D11DeviceContext *iface,
          D3D11_PRIMITIVE_TOPOLOGY topology)
  {
@@ -1045,7 +1045,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_VSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3207,8 +4080,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
+@@ -3090,8 +3963,28 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargets(ID3D11De
          UINT render_target_view_count, ID3D11RenderTargetView *const *render_target_views,
          ID3D11DepthStencilView *depth_stencil_view)
  {
@@ -1075,7 +1075,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorderedAccessViews(
-@@ -3228,15 +4121,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
+@@ -3111,15 +4004,44 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetRenderTargetsAndUnorde
  static void STDMETHODCALLTYPE d3d11_deferred_context_OMSetBlendState(ID3D11DeviceContext *iface,
          ID3D11BlendState *blend_state, const float blend_factor[4], UINT sample_mask)
  {
@@ -1122,7 +1122,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_SOSetTargets(ID3D11DeviceContext *iface, UINT buffer_count,
-@@ -3278,13 +4200,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
+@@ -3161,13 +4083,34 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_DispatchIndirect(ID3D11Devi
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetState(ID3D11DeviceContext *iface,
          ID3D11RasterizerState *rasterizer_state)
  {
@@ -1159,7 +1159,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_RSSetScissorRects(ID3D11DeviceContext *iface,
-@@ -3399,8 +4342,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
+@@ -3282,8 +4225,18 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShaderResources(ID3D11
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetShader(ID3D11DeviceContext *iface,
          ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count)
  {
@@ -1179,7 +1179,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceContext *iface,
-@@ -3413,36 +4366,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
+@@ -3296,36 +4249,62 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetSamplers(ID3D11DeviceC
  static void STDMETHODCALLTYPE d3d11_deferred_context_HSSetConstantBuffers(ID3D11DeviceContext *iface,
          UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers)
  {
@@ -1247,7 +1247,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_CSSetShaderResources(ID3D11DeviceContext *iface,
-@@ -3743,7 +4722,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
+@@ -3626,7 +4605,15 @@ static void STDMETHODCALLTYPE d3d11_deferred_context_CSGetConstantBuffers(ID3D11
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_ClearState(ID3D11DeviceContext *iface)
  {
@@ -1264,7 +1264,7 @@ index 9127d01..94156e4 100644
  }
  
  static void STDMETHODCALLTYPE d3d11_deferred_context_Flush(ID3D11DeviceContext *iface)
-@@ -3768,9 +4755,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
+@@ -3651,9 +4638,29 @@ static UINT STDMETHODCALLTYPE d3d11_deferred_context_GetContextFlags(ID3D11Devic
  static HRESULT STDMETHODCALLTYPE d3d11_deferred_context_FinishCommandList(ID3D11DeviceContext *iface,
          BOOL restore, ID3D11CommandList **command_list)
  {
@@ -1296,13 +1296,13 @@ index 9127d01..94156e4 100644
  }
  
  static const struct ID3D11DeviceContextVtbl d3d11_deferred_context_vtbl =
-@@ -4385,6 +5392,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
+@@ -4268,6 +5275,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDeferredContext(ID3D11Device
      object->device = iface;
      object->refcount = 1;
  
 +    list_init(&object->commands);
 +
-     ID3D11Device_AddRef(iface);
+     ID3D11Device2_AddRef(iface);
      wined3d_private_store_init(&object->private_store);
  
 -- 

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

@@ -198,7 +198,7 @@ index 8190442..c73981b 100644
 +                        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 = wined3d_desc.bind_flags;
++            wined3d_desc.bind_flags = bind_flags;
 +        }
 +        else
 +            wined3d_desc.access = WINED3D_RESOURCE_ACCESS_CPU

patches/patchinstall.sh

@@ -52,13 +52,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "2058505cebc7bb069e1e2d0d738353336e943b7b"
+	echo "2d6de2d129b39d2a0c4ffafa84dabed21c0e830e"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 4.0-rc4"
+	echo "Wine Staging 4.0-rc6"
 	echo "Copyright (C) 2014-2018 the Wine Staging project authors."
 	echo "Copyright (C) 2018 Alistair Leslie-Hughes"
 	echo ""
@@ -6573,8 +6573,10 @@ fi
 # |
 if test "$enable_user32_msgbox_Support_WM_COPY_mesg" -eq 1; then
 	patch_apply user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch
+	patch_apply user32-msgbox-Support-WM_COPY-mesg/0002-user32-msgbox-Use-a-windows-hook-to-trap-Ctrl-C.patch
 	(
 		printf '%s\n' '+    { "Alistair Leslie-Hughes", "user32/msgbox: Support WM_COPY Message.", 1 },';
+		printf '%s\n' '+    { "Alistair Leslie-Hughes", "user32/msgbox: Use a windows hook to trap Ctrl+C.", 1 },';
 	) >> "$patchlist"
 fi
 

patches/user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch

@@ -1,4 +1,4 @@
-From 1e0e23280f08a6ff0a3bcbf36255c5743f48d1d1 Mon Sep 17 00:00:00 2001
+From 48940cf80a165efd218fed37d4d964197cccf36a Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Thu, 7 Apr 2016 16:04:36 +1000
 Subject: [PATCH] user32/msgbox: Support WM_COPY Message
@@ -130,7 +130,7 @@ index 457c3ae..8a1b89f 100644
     case WM_COMMAND:
      switch (LOWORD(wParam))
 diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c
-index 631f3d3..6f10391 100644
+index 8c9bd21..139d589 100644
 --- a/dlls/user32/tests/dialog.c
 +++ b/dlls/user32/tests/dialog.c
 @@ -40,6 +40,7 @@
@@ -141,7 +141,7 @@ index 631f3d3..6f10391 100644
  
  #define MAXHWNDS 1024
  static HWND hwnd [MAXHWNDS];
-@@ -1900,6 +1901,187 @@ static void test_MessageBoxFontTest(void)
+@@ -1973,6 +1974,187 @@ static void test_MessageBoxFontTest(void)
      DestroyWindow(hDlg);
  }
  
@@ -329,7 +329,7 @@ index 631f3d3..6f10391 100644
  static void test_SaveRestoreFocus(void)
  {
      HWND hDlg;
-@@ -2103,4 +2285,5 @@ START_TEST(dialog)
+@@ -2176,4 +2358,5 @@ START_TEST(dialog)
      test_SaveRestoreFocus();
      test_timer_message();
      test_MessageBox();

patches/user32-msgbox-Support-WM_COPY-mesg/0002-user32-msgbox-Use-a-windows-hook-to-trap-Ctrl-C.patch

@@ -0,0 +1,65 @@
+From 27c59d8785c0c81039c4c307496c1e64d896a333 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 10 Jan 2019 16:17:33 +1100
+Subject: [PATCH] user32/msgbox: Use a windows hook to trap Ctrl+C
+
+---
+ dlls/user32/msgbox.c | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
+index 8a1b89f..52b0852 100644
+--- a/dlls/user32/msgbox.c
++++ b/dlls/user32/msgbox.c
+@@ -388,6 +388,22 @@ static void MSGBOX_CopyToClipbaord( HWND hwnd )
+     }
+ }
+ 
++HHOOK msghook_handle;
++
++LRESULT CALLBACK msg_hook_proc(int nCode, WPARAM wParam, LPARAM lParam)
++{
++    MSG *msg = (MSG *)lParam;
++    if (nCode == MSGF_DIALOGBOX && msg->message == WM_KEYUP)
++    {
++        if ( (msg->wParam == 'C' || msg->wParam == 'c') && (GetKeyState(VK_CONTROL) & 0x8000))
++        {
++            MSGBOX_CopyToClipbaord(GetParent(msg->hwnd));
++        }
++    }
++
++    return CallNextHookEx(msghook_handle, nCode, wParam, lParam);
++}
++
+ /**************************************************************************
+  *           MSGBOX_DlgProc
+  *
+@@ -403,6 +419,7 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
+        SetWindowContextHelpId(hwnd, mbp->dwContextHelpId);
+        MSGBOX_OnInit(hwnd, mbp);
+        SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", mbp->lpfnMsgBoxCallback);
++       msghook_handle = SetWindowsHookExA(WH_MSGFILTER, msg_hook_proc, GetModuleHandleA(NULL), 0);
+        break;
+    }
+    case WM_COPY:
+@@ -410,6 +427,9 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
+         MSGBOX_CopyToClipbaord(hwnd);
+         break;
+    }
++   case WM_DESTROY:
++       UnhookWindowsHookEx(msghook_handle);
++       break;
+ 
+    case WM_COMMAND:
+     switch (LOWORD(wParam))
+@@ -454,7 +474,6 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
+   return 0;
+ }
+ 
+-
+ /**************************************************************************
+  *		MessageBoxA (USER32.@)
+  */
+-- 
+1.9.1
+

patches/windowscodecs-TIFF_Support/0014-windowscodecs-Add-some-tests-for-various-TIFF-color-.patch

@@ -1,17 +1,17 @@
-From 05d258140cf227a2e51530afc11f8decf0bf156e Mon Sep 17 00:00:00 2001
+From 8baa01305598f32635ea565768e42fd2a362a912 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 9 Dec 2016 13:02:07 +0800
 Subject: [PATCH] windowscodecs: Add some tests for various TIFF color formats.
 
 ---
- dlls/windowscodecs/tests/tiffformat.c | 436 ++++++++++++++++++++++++++++++++++
- 1 file changed, 436 insertions(+)
+ dlls/windowscodecs/tests/tiffformat.c | 439 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 438 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c
-index 0f40295b9c..5671dfbfbc 100644
+index cfb16be..ac6a471 100644
 --- a/dlls/windowscodecs/tests/tiffformat.c
 +++ b/dlls/windowscodecs/tests/tiffformat.c
-@@ -312,6 +312,61 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma
+@@ -361,6 +361,61 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma
      return hr;
  }
  
@@ -73,8 +73,18 @@ index 0f40295b9c..5671dfbfbc 100644
  static void test_tiff_1bpp_palette(void)
  {
      HRESULT hr;
-@@ -631,6 +686,386 @@ static void test_tiff_resolution(void)
-     }
+@@ -694,7 +749,8 @@ static void test_tiff_24bpp(void)
+     BYTE data[3];
+     static const BYTE expected_data[] = { 0x33,0x22,0x11 };
+ 
+-    decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data));
++    hr = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data), &decoder);
++    ok(hr == S_OK, "got %#x\n", hr);
+     ok(decoder != NULL, "Failed to load TIFF image data\n");
+ 
+     hr = IWICBitmapDecoder_GetFrameCount(decoder, &count);
+@@ -744,6 +800,386 @@ todo_wine_if(stride > 3)
+     IWICBitmapDecoder_Release(decoder);
  }
  
 +#include "pshpack2.h"
@@ -460,7 +470,7 @@ index 0f40295b9c..5671dfbfbc 100644
  START_TEST(tiffformat)
  {
      HRESULT hr;
-@@ -642,6 +1077,7 @@ START_TEST(tiffformat)
+@@ -755,6 +1191,7 @@ START_TEST(tiffformat)
      ok(hr == S_OK, "CoCreateInstance error %#x\n", hr);
      if (FAILED(hr)) return;
  
@@ -469,5 +479,5 @@ index 0f40295b9c..5671dfbfbc 100644
      test_tiff_8bpp_palette();
      test_QueryCapability();
 -- 
-2.16.1
+1.9.1
 

staging/VERSION

@@ -1 +1 @@
-Wine Staging 4.0-rc4
+Wine Staging 4.0-rc6