From 4a13b7eac7a3d11e1ccfd28797b9504de6f31677 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 13 Jun 2017 20:22:41 +0200 Subject: [PATCH] Rebase against f254aec4498e9926200ea9fd9cd2acf914747d91. --- patches/patchinstall.sh | 4 ++-- ...dd-support-for-128bppRGBAFloat-format.patch | 10 +++++----- ...dd-support-for-32bppCMYK-and-64bppCMY.patch | 18 +++++++++--------- staging/VERSION | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 6c8b4f6f..368ed269 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "74d93d9bc0acadacc97c3dc803ede6ed4b8becb1" + echo "f254aec4498e9926200ea9fd9cd2acf914747d91" } # Show version information version() { - echo "Wine Staging 2.10" + echo "Wine Staging 2.11 (unreleased)" echo "Copyright (C) 2014-2017 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" diff --git a/patches/windowscodecs-TIFF_Support/0009-windowscodecs-Add-support-for-128bppRGBAFloat-format.patch b/patches/windowscodecs-TIFF_Support/0009-windowscodecs-Add-support-for-128bppRGBAFloat-format.patch index 2eab521b..ed5a7152 100644 --- a/patches/windowscodecs-TIFF_Support/0009-windowscodecs-Add-support-for-128bppRGBAFloat-format.patch +++ b/patches/windowscodecs-TIFF_Support/0009-windowscodecs-Add-support-for-128bppRGBAFloat-format.patch @@ -1,4 +1,4 @@ -From 96f1d2f5fdf6f9f40852c170535a2392b51aa7d7 Mon Sep 17 00:00:00 2001 +From 6635ad8a6677055489237ec41b6ea811400d0a1f Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 9 Dec 2016 12:46:00 +0800 Subject: windowscodecs: Add support for 128bppRGBAFloat format to TIFF @@ -85,10 +85,10 @@ index aac21e37d0a..151b999a359 100644 break; case 3: /* RGB Palette */ diff --git a/include/wincodec.idl b/include/wincodec.idl -index 962a6fd6883..f3b99b864ff 100644 +index 1ea6e0e2038..73e867f733b 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl -@@ -213,6 +213,8 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb +@@ -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);") @@ -96,7 +96,7 @@ index 962a6fd6883..f3b99b864ff 100644 + cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") - typedef struct WICRect { + cpp_quote("#if 0") -- -2.12.2 +2.13.1 diff --git a/patches/windowscodecs-TIFF_Support/0011-windowscodecs-Add-support-for-32bppCMYK-and-64bppCMY.patch b/patches/windowscodecs-TIFF_Support/0011-windowscodecs-Add-support-for-32bppCMYK-and-64bppCMY.patch index 09628816..884217d7 100644 --- a/patches/windowscodecs-TIFF_Support/0011-windowscodecs-Add-support-for-32bppCMYK-and-64bppCMY.patch +++ b/patches/windowscodecs-TIFF_Support/0011-windowscodecs-Add-support-for-32bppCMYK-and-64bppCMY.patch @@ -1,4 +1,4 @@ -From 6da55c50c6ab752a39ef43aec768ffb1e2072c6a Mon Sep 17 00:00:00 2001 +From e8d59694358c592df65e9e1f1600df2946f3b2cb Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 9 Dec 2016 12:52:36 +0800 Subject: windowscodecs: Add support for 32bppCMYK and 64bppCMYK formats to @@ -11,7 +11,7 @@ Subject: windowscodecs: Add support for 32bppCMYK and 64bppCMYK formats to 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c -index 2d6a5d2..b5bbff3 100644 +index f695d3e40a5..9024574e808 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1224,6 +1224,8 @@ static GUID const * const tiff_decode_formats[] = { @@ -23,7 +23,7 @@ index 2d6a5d2..b5bbff3 100644 &GUID_WICPixelFormat128bppRGBAFloat, NULL }; -@@ -2020,6 +2022,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { +@@ -2026,6 +2028,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 0 }, @@ -42,7 +42,7 @@ index 2d6a5d2..b5bbff3 100644 "The Wine Project", "128bpp RGBAFloat", diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c -index 48e46d6..15c4b69 100644 +index 151b999a359..414c92195ea 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) @@ -79,17 +79,17 @@ index 48e46d6..15c4b69 100644 case 8: /* CIELab */ default: diff --git a/include/wincodec.idl b/include/wincodec.idl -index 04765b4..c0248cd 100644 +index 73e867f733b..b2fa4a843fe 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl -@@ -222,6 +222,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0 +@@ -218,6 +218,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);") - typedef struct WICRect { - INT X; + cpp_quote("#if 0") + typedef DWORD *ID2D1Device; -- -2.9.0 +2.13.1 diff --git a/staging/VERSION b/staging/VERSION index 138dd3e8..da180da6 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 2.10 +Wine Staging 2.11 (unreleased)