wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 3ddf3a720f2a342141550c973f10854b573d80ed

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2020-03-21 10:20:01 +11:00
parent d1a8b6bc14
commit 7c7868f4bb
5 changed files with 36 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch
View File

@ -1,4 +1,4 @@
From ad23e816eb724d81032306f8ac6d4faa96ccaf4a Mon Sep 17 00:00:00 2001
From 3a94f82a0cf783abf7c7d17335914bed3c6791bb Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Tue, 12 Nov 2019 18:13:20 +0800
Subject: [PATCH] comctl32: Bump version to 6.0.
@ -40,7 +40,7 @@ index c9aa1ba6253..be6e2425193 100644
#define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
diff --git a/include/commctrl.h b/include/commctrl.h
index 700b335fbb7..029a4b45457 100644
index dfd2f4a37d2..0784478ce14 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -51,7 +51,7 @@ enum _LI_METRIC
@ -50,8 +50,8 @@ index 700b335fbb7..029a4b45457 100644
-#define COMCTL32_VERSION 5 /* dll version */
+#define COMCTL32_VERSION 6 /* dll version */
#ifndef _WIN32_IE
#define _WIN32_IE 0x0400
#define ICC_LISTVIEW_CLASSES 0x00000001 /* listview, header */
#define ICC_TREEVIEW_CLASSES 0x00000002 /* treeview, tooltips */
--
2.24.1
2.25.1

2
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "aaa625217b202dc0a22d67e63e941b027146a456"
echo "3ddf3a720f2a342141550c973f10854b573d80ed"
}
# Show version information

26
patches/user32-rawinput-mouse/0003-user32-tests-Add-rawinput-test-for-cross-process-int.patch
View File

@ -1,7 +1,7 @@
From 35e259f69a7c5a6a065833eaeaca28d92591056b Mon Sep 17 00:00:00 2001
From 66869bba59b74f8bb77b4c1b7c44ef3c6ca7e4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 14 Nov 2019 18:44:28 +0100
Subject: [PATCH 03/12] user32/tests: Add rawinput test for cross-process
Subject: [PATCH] user32/tests: Add rawinput test for cross-process
interactions.
Validating the rest of the assumption, rawinput messages are not
@ -11,18 +11,18 @@ received anymore if the foreground window is from another process.
1 file changed, 84 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index bdcc6834d9d..cc7babd1af4 100644
index 1738706c8a5..79d6a046a8b 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -49,6 +49,7 @@
#define _WIN32_IE 0x0500
@@ -46,6 +46,7 @@
*/
#include <stdarg.h>
+#include <stdio.h>
#include <assert.h>
#include "windef.h"
@@ -1877,8 +1878,36 @@ struct rawinput_mouse_thread_params
@@ -1874,8 +1875,36 @@ struct rawinput_mouse_thread_params
HWND window;
HANDLE ready;
HANDLE start;
@ -59,7 +59,7 @@ index bdcc6834d9d..cc7babd1af4 100644
static DWORD WINAPI rawinput_mouse_thread(void *arg)
{
struct rawinput_mouse_thread_params *params = arg;
@@ -1886,6 +1915,11 @@ static DWORD WINAPI rawinput_mouse_thread(void *arg)
@@ -1883,6 +1912,11 @@ static DWORD WINAPI rawinput_mouse_thread(void *arg)
RECT rect_110 = { 110, 110, 110, 110 };
HWND window;
int i;
@ -71,7 +71,7 @@ index bdcc6834d9d..cc7babd1af4 100644
while (WaitForSingleObject(params->ready, INFINITE) == 0)
{
@@ -1945,6 +1979,39 @@ static DWORD WINAPI rawinput_mouse_thread(void *arg)
@@ -1942,6 +1976,39 @@ static DWORD WINAPI rawinput_mouse_thread(void *arg)
DestroyWindow(window);
break;
@ -111,7 +111,7 @@ index bdcc6834d9d..cc7babd1af4 100644
default:
return 0;
}
@@ -1967,7 +2034,7 @@ struct rawinput_mouse_test
@@ -1964,7 +2031,7 @@ struct rawinput_mouse_test
BOOL todo;
};
@ -120,7 +120,7 @@ index bdcc6834d9d..cc7babd1af4 100644
{
struct rawinput_mouse_thread_params params;
RAWINPUTDEVICE raw_devices[1];
@@ -1988,11 +2055,17 @@ static void test_rawinput_mouse(void)
@@ -1985,11 +2052,17 @@ static void test_rawinput_mouse(void)
/* same-process foreground tests */
{ TRUE, TRUE, 0, 2, 2, 0, 0, TRUE },
{ TRUE, TRUE, RIDEV_INPUTSINK, 2, 2, 0, 0, TRUE },
@ -138,7 +138,7 @@ index bdcc6834d9d..cc7babd1af4 100644
rawinput_wndproc_done = CreateEventA(NULL, FALSE, FALSE, NULL);
ok(rawinput_wndproc_done != NULL, "CreateEvent failed\n");
@@ -3555,11 +3628,20 @@ static void test_GetKeyboardLayoutList(void)
@@ -3552,11 +3625,20 @@ static void test_GetKeyboardLayoutList(void)
START_TEST(input)
{
@ -159,7 +159,7 @@ index bdcc6834d9d..cc7babd1af4 100644
test_Input_blackbox();
test_Input_whitebox();
test_Input_unicode();
@@ -3578,7 +3660,7 @@ START_TEST(input)
@@ -3575,7 +3657,7 @@ START_TEST(input)
test_GetRawInputData();
test_GetKeyboardLayoutList();
test_RegisterRawInputDevices();
@ -169,5 +169,5 @@ index bdcc6834d9d..cc7babd1af4 100644
if(pGetMouseMovePointsEx)
test_GetMouseMovePointsEx();
--
2.24.1
2.25.1

34
patches/windowscodecs-TIFF_Support/0009-windowscodecs-Add-support-for-128bppRGBAFloat-format.patch
View File

@ -1,17 +1,16 @@
From 6635ad8a6677055489237ec41b6ea811400d0a1f Mon Sep 17 00:00:00 2001
From 31e282ee90cefd3a051041be22566a87367c243f Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 9 Dec 2016 12:46:00 +0800
Subject: windowscodecs: Add support for 128bppRGBAFloat format to TIFF
Subject: [PATCH] windowscodecs: Add support for 128bppRGBAFloat format to TIFF
decoder.
---
dlls/windowscodecs/regsvr.c | 18 ++++++++++++++++++
dlls/windowscodecs/tiffformat.c | 12 ++++++++++--
include/wincodec.idl | 2 ++
3 files changed, 30 insertions(+), 2 deletions(-)
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index d1649fa955a..f695d3e40a5 100644
index 94b7a100bab..a35c7bbc9f5 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1224,6 +1224,7 @@ static GUID const * const tiff_decode_formats[] = {
@ -22,7 +21,7 @@ index d1649fa955a..f695d3e40a5 100644
NULL
};
@@ -1752,6 +1753,11 @@ static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1753,6 +1754,11 @@ static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 };
@ -34,7 +33,7 @@ index d1649fa955a..f695d3e40a5 100644
static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 };
static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 };
static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c };
@@ -1769,6 +1775,7 @@ static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit,
@@ -1770,6 +1776,7 @@ static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit,
channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4};
static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit };
@ -42,7 +41,7 @@ index d1649fa955a..f695d3e40a5 100644
static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit,
channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 };
@@ -2019,6 +2026,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = {
@@ -2053,6 +2060,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = {
WICPixelFormatNumericRepresentationUnsignedInteger,
0
},
@ -61,10 +60,10 @@ index d1649fa955a..f695d3e40a5 100644
};
diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
index aac21e37d0a..151b999a359 100644
index 60799641142..0a3d5b70102 100644
--- a/dlls/windowscodecs/tiffformat.c
+++ b/dlls/windowscodecs/tiffformat.c
@@ -466,9 +466,17 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
@@ -467,9 +467,17 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
return E_FAIL;
}
break;
@ -84,19 +83,6 @@ index aac21e37d0a..151b999a359 100644
}
break;
case 3: /* RGB Palette */
diff --git a/include/wincodec.idl b/include/wincodec.idl
index 1ea6e0e2038..73e867f733b 100644
--- a/include/wincodec.idl
+++ b/include/wincodec.idl
@@ -215,6 +215,8 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb
cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);")
cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x17);")
+cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppRGBAFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x19);")
+
cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);")
cpp_quote("#if 0")
--
2.13.1
2.25.1

27
patches/windowscodecs-TIFF_Support/0011-windowscodecs-Add-support-for-32bppCMYK-and-64bppCMY.patch
View File

@ -1,4 +1,4 @@
From 56e077897f2c8d6821724de4b846b69f7f052747 Mon Sep 17 00:00:00 2001
From 3b7298588452ac95cdcfdedb9ed14b4d43b54ab4 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 9 Dec 2016 12:52:36 +0800
Subject: [PATCH] windowscodecs: Add support for 32bppCMYK and 64bppCMYK
@ -7,11 +7,10 @@ Subject: [PATCH] windowscodecs: Add support for 32bppCMYK and 64bppCMYK
---
dlls/windowscodecs/regsvr.c | 13 +++++++++++++
dlls/windowscodecs/tiffformat.c | 25 ++++++++++++++++++++++++-
include/wincodec.idl | 1 +
3 files changed, 38 insertions(+), 1 deletion(-)
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index cfb3e26..4ea51f6 100644
index a35c7bbc9f5..158329dd845 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1224,6 +1224,8 @@ static GUID const * const tiff_decode_formats[] = {
@ -23,7 +22,7 @@ index cfb3e26..4ea51f6 100644
&GUID_WICPixelFormat128bppRGBAFloat,
NULL
};
@@ -2024,6 +2026,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = {
@@ -2060,6 +2062,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = {
WICPixelFormatNumericRepresentationUnsignedInteger,
0
},
@ -42,10 +41,10 @@ index cfb3e26..4ea51f6 100644
"The Wine Project",
"128bpp RGBAFloat",
diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
index 7d7c620..090db31 100644
index 0a3d5b70102..33934db6eb3 100644
--- a/dlls/windowscodecs/tiffformat.c
+++ b/dlls/windowscodecs/tiffformat.c
@@ -507,8 +507,31 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
@@ -508,8 +508,31 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
return E_NOTIMPL;
}
break;
@ -78,18 +77,6 @@ index 7d7c620..090db31 100644
case 6: /* YCbCr */
case 8: /* CIELab */
default:
diff --git a/include/wincodec.idl b/include/wincodec.idl
index c283301..29e0968 100644
--- a/include/wincodec.idl
+++ b/include/wincodec.idl
@@ -232,6 +232,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0
cpp_quote("DEFINE_GUID(GUID_WICPixelFormat128bppRGBAFloat, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x19);")
cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);")
+cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1f);")
cpp_quote("#if 0")
typedef DWORD *D2D1_PIXEL_FORMAT;
--
1.9.1
2.25.1