wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against b70f0d723a768b9fdc89cd835b23718f6cd61f31

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2018-05-25 08:47:46 +10:00
parent 51557bbf6e
commit 06caa35518
6 changed files with 17 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
patches/d2d1-ID2D1Factory1/0001-d2d1-Add-d2d1_1.idl-for-drawing-ID2D1Bitmap1.patch
View File

@ -1,4 +1,4 @@
From 9eee499bc9b042041d32d0350b02f7ada9b89548 Mon Sep 17 00:00:00 2001
From 2401cee08c5c55115552da35daab7d68a7bde1e0 Mon Sep 17 00:00:00 2001
From: Lucian Poston <lucian.poston@gmail.com>
Date: Wed, 2 May 2018 22:38:33 -0700
Subject: [PATCH] d2d1: Add d2d1_1.idl for drawing ID2D1Bitmap1
@ -7,12 +7,12 @@ https://bugs.winehq.org/show_bug.cgi?id=44052
Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
---
include/d2d1_1.idl | 436 ++++++++++++++++++++++++++++++++++++++++++++++++++--
include/d2d1_1.idl | 416 ++++++++++++++++++++++++++++++++++++++++++++++++++++
include/dcommon.idl | 15 ++
2 files changed, 441 insertions(+), 10 deletions(-)
2 files changed, 431 insertions(+)
diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl
index 4b6224a..26c6e70 100644
index 4b6224a..24b997e 100644
--- a/include/d2d1_1.idl
+++ b/include/d2d1_1.idl
@@ -18,6 +18,11 @@
@ -27,37 +27,10 @@ index 4b6224a..26c6e70 100644
interface ID2D1DeviceContext;
interface ID2D1StrokeStyle1;
interface ID2D1PathGeometry1;
@@ -77,16 +82,6 @@ typedef enum D2D1_COLOR_SPACE
D2D1_COLOR_SPACE_FORCE_DWORD = 0xffffffff,
} D2D1_COLOR_SPACE;
-typedef enum D2D1_BITMAP_OPTIONS
-{
- D2D1_BITMAP_OPTIONS_NONE = 0x0,
- D2D1_BITMAP_OPTIONS_TARGET = 0x1,
- D2D1_BITMAP_OPTIONS_CANNOT_DRAW = 0x2,
- D2D1_BITMAP_OPTIONS_CPU_READ = 0x4,
- D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE = 0x8,
- D2D1_BITMAP_OPTIONS_FORCE_DWORD = 0xffffffff,
-} D2D1_BITMAP_OPTIONS;
-
typedef enum D2D1_MAP_OPTIONS
{
D2D1_MAP_OPTIONS_NONE = 0x0,
@@ -96,6 +91,73 @@ typedef enum D2D1_MAP_OPTIONS
@@ -96,6 +101,63 @@ typedef enum D2D1_MAP_OPTIONS
D2D1_MAP_OPTIONS_FORCE_DWORD = 0xffffffff,
} D2D1_MAP_OPTIONS;
+typedef enum D2D1_BITMAP_OPTIONS
+{
+ D2D1_BITMAP_OPTIONS_NONE = 0,
+ D2D1_BITMAP_OPTIONS_TARGET = 1,
+ D2D1_BITMAP_OPTIONS_CANNOT_DRAW = 2,
+ D2D1_BITMAP_OPTIONS_CPU_READ = 4,
+ D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE = 8,
+ D2D1_BITMAP_OPTIONS_FORCE_DWORD = 0xffffffff,
+} D2D1_BITMAP_OPTIONS;
+
+typedef enum D2D1_INTERPOLATION_MODE
+{
+ D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR,

238
patches/dxdiagn-Display_Information/0001-dxdiagn-Add-several-more-fields-for-DisplayDevices.patch
View File

@ -1,238 +0,0 @@
From 90a30be3a8ef4132092e26c05695521449e68d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 6 Feb 2016 17:48:00 +0100
Subject: dxdiagn: Add several more fields for DisplayDevices.
---
dlls/dxdiagn/provider.c | 159 +++++++++++++++++++++++++++++++++++++++++
dlls/dxdiagn/tests/container.c | 2 +
2 files changed, 161 insertions(+)
diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index 5665d01..4f964ad 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -60,6 +60,8 @@ static const WCHAR dwHeight[] = {'d','w','H','e','i','g','h','t',0};
static const WCHAR dwBpp[] = {'d','w','B','p','p',0};
static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0};
static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0};
+static const WCHAR szDisplayModeLocalized[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','L','o','c','a','l','i','z','e','d',0};
+static const WCHAR szDisplayModeEnglish[] = {'s','z','D','i','s','p','l','a','y','M','o','d','e','E','n','g','l','i','s','h',0};
static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0};
static const WCHAR szDriverVersion[] = {'s','z','D','r','i','v','e','r','V','e','r','s','i','o','n',0};
static const WCHAR szSubSysId[] = {'s','z','S','u','b','S','y','s','I','d',0};
@@ -69,6 +71,30 @@ static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','
static const WCHAR szChipType[] = {'s','z','C','h','i','p','T','y','p','e',0};
static const WCHAR szDACType[] = {'s','z','D','A','C','T','y','p','e',0};
static const WCHAR szRevision[] = {'s','z','R','e','v','i','s','i','o','n',0};
+static const WCHAR szMonitorName[] = {'s','z','M','o','n','i','t','o','r','N','a','m','e',0};
+static const WCHAR szMonitorMaxRes[] = {'s','z','M','o','n','i','t','o','r','M','a','x','R','e','s',0};
+static const WCHAR szDriverAttributes[] = {'s','z','D','r','i','v','e','r','A','t','t','r','i','b','u','t','e','s',0};
+static const WCHAR szDriverLanguageEnglish[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0};
+static const WCHAR szDriverLanguageLocalized[] = {'s','z','D','r','i','v','e','r','L','a','n','g','u','a','g','e','L','o','c','a','l','i','z','e','d',0};
+static const WCHAR szDriverDateEnglish[] = {'s','z','D','r','i','v','e','r','D','a','t','e','E','n','g','l','i','s','h',0};
+static const WCHAR szDriverDateLocalized[] = {'s','z','D','r','i','v','e','r','D','a','t','e','L','o','c','a','l','i','z','e','d',0};
+static const WCHAR lDriverSize[] = {'l','D','r','i','v','e','r','S','i','z','e',0};
+static const WCHAR szMiniVdd[] = {'s','z','M','i','n','i','V','d','d',0};
+static const WCHAR szMiniVddDateLocalized[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','L','o','c','a','l','i','z','e','d',0};
+static const WCHAR szMiniVddDateEnglish[] = {'s','z','M','i','n','i','V','d','d','D','a','t','e','E','n','g','l','i','s','h',0};
+static const WCHAR lMiniVddSize[] = {'l','M','i','n','i','V','d','d','S','i','z','e',0};
+static const WCHAR szVdd[] = {'s','z','V','d','d',0};
+static const WCHAR bCanRenderWindow[] = {'b','C','a','n','R','e','n','d','e','r','W','i','n','d','o','w',0};
+static const WCHAR bDriverBeta[] = {'b','D','r','i','v','e','r','B','e','t','a',0};
+static const WCHAR bDriverDebug[] = {'b','D','r','i','v','e','r','D','e','b','u','g',0};
+static const WCHAR bDriverSigned[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d',0};
+static const WCHAR bDriverSignedValid[] = {'b','D','r','i','v','e','r','S','i','g','n','e','d','V','a','l','i','d',0};
+static const WCHAR szDriverSignDate[] = {'s','z','D','r','i','v','e','r','S','i','g','n','D','a','t','e',0};
+static const WCHAR dwDDIVersion[] = {'d','w','D','D','I','V','e','r','s','i','o','n',0};
+static const WCHAR szDDIVersionEnglish[] = {'s','z','D','D','I','V','e','r','s','i','o','n','E','n','g','l','i','s','h',0};
+static const WCHAR szDDIVersionLocalized[] = {'s','z','D','D','I','V','e','r','s','i','o','n','L','o','c','a','l','i','z','e','d',0};
+static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0};
+static const WCHAR dwWHQLLevel[] = {'d','w','W','H','Q','L','L','e','v','e','l',0};
struct IDxDiagProviderImpl
{
@@ -326,6 +352,23 @@ static inline HRESULT add_ui4_property(IDxDiagContainerImpl_Container *node, con
return S_OK;
}
+static inline HRESULT add_i4_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, LONG data)
+{
+ IDxDiagContainerImpl_Property *prop;
+
+ prop = allocate_property_information(propName);
+ if (!prop)
+ return E_OUTOFMEMORY;
+
+ V_VT(&prop->vProp) = VT_I4;
+ V_I4(&prop->vProp) = data;
+
+ list_add_tail(&node->properties, &prop->entry);
+ ++node->nProperties;
+
+ return S_OK;
+}
+
static inline HRESULT add_bool_property(IDxDiagContainerImpl_Container *node, const WCHAR *propName, BOOL data)
{
IDxDiagContainerImpl_Property *prop;
@@ -925,6 +968,15 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node
static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
static const WCHAR bNoHardware[] = {'b','N','o','H','a','r','d','w','a','r','e',0};
+ static const WCHAR mode_fmtW[] = {'%','d',' ','x',' ','%','d',' ','(','%','d',' ','b','i','t',')',' ','(','%','d','H','z',')',0};
+ static const WCHAR gernericPNPMonitorW[] = {'G','e','n','e','r','i','c',' ','P','n','P',' ','M','o','n','i','t','o','r',0};
+ static const WCHAR failedToGetParameterW[] = {'F','a','i','l','e','d',' ','t','o',' ','g','e','t',' ','p','a','r','a','m','e','t','e','r',0};
+ static const WCHAR driverAttributesW[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0};
+ static const WCHAR englishW[] = {'E','n','g','l','i','s','h',0};
+ static const WCHAR driverDateEnglishW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',0};
+ static const WCHAR driverDateLocalW[] = {'1','/','1','/','2','0','1','6',' ','1','0',':','0','0',':','0','0',' ','A','M',0};
+ static const WCHAR naW[] = {'n','/','a',0};
+ static const WCHAR ddi11W[] = {'1','1',0};
D3DADAPTER_IDENTIFIER9 adapter_info;
D3DDISPLAYMODE adapter_mode;
@@ -1021,6 +1073,17 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node
hr = add_ui4_property(display_adapter, dwBpp, depth_for_pixelformat(adapter_mode.Format));
if (FAILED(hr))
goto cleanup;
+
+ snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), mode_fmtW, adapter_mode.Width, adapter_mode.Height,
+ depth_for_pixelformat(adapter_mode.Format), adapter_mode.RefreshRate);
+
+ hr = add_bstr_property(display_adapter, szDisplayModeLocalized, buffer);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDisplayModeEnglish, buffer);
+ if (FAILED(hr))
+ goto cleanup;
}
hr = add_bstr_property(display_adapter, szKeyDeviceKey, szEmpty);
@@ -1074,6 +1137,102 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node
hr = add_bool_property(display_adapter, bNoHardware, FALSE);
if (FAILED(hr))
goto cleanup;
+
+ hr = add_bool_property(display_adapter, bCanRenderWindow, TRUE);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szMonitorName, gernericPNPMonitorW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szMonitorMaxRes, failedToGetParameterW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDriverAttributes, driverAttributesW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDriverLanguageEnglish, englishW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDriverLanguageLocalized, englishW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDriverDateEnglish, driverDateEnglishW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDriverDateLocalized, driverDateLocalW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_i4_property(display_adapter, lDriverSize, 10 * 1024 * 1024);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szMiniVdd, naW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szMiniVddDateLocalized, naW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szMiniVddDateEnglish, naW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_i4_property(display_adapter, lMiniVddSize, 0);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szVdd, naW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bool_property(display_adapter, bDriverBeta, FALSE);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bool_property(display_adapter, bDriverDebug, FALSE);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bool_property(display_adapter, bDriverSigned, TRUE);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bool_property(display_adapter, bDriverSignedValid, TRUE);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDriverSignDate, naW);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_ui4_property(display_adapter, dwDDIVersion, 11);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDDIVersionEnglish, ddi11W);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_bstr_property(display_adapter, szDDIVersionLocalized, ddi11W);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_ui4_property(display_adapter, iAdapter, index);
+ if (FAILED(hr))
+ goto cleanup;
+
+ hr = add_ui4_property(display_adapter, dwWHQLLevel, 0);
+ if (FAILED(hr))
+ goto cleanup;
}
hr = S_OK;
diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c
index 5bc5161..e5afba7 100644
--- a/dlls/dxdiagn/tests/container.c
+++ b/dlls/dxdiagn/tests/container.c
@@ -942,6 +942,7 @@ static void test_DxDiag_DisplayDevices(void)
static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0};
static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
+ static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0};
static const struct property_test property_tests[] =
{
@@ -966,6 +967,7 @@ static void test_DxDiag_DisplayDevices(void)
{b3DAccelerationExists, VT_BOOL},
{b3DAccelerationEnabled, VT_BOOL},
{bDDAccelerationEnabled, VT_BOOL},
+ {iAdapter, VT_UI4},
};
IDxDiagContainer *display_cont = NULL;
--
2.7.0

2
patches/dxdiagn-Display_Information/definition
View File

@ -1,2 +0,0 @@
Fixes: [34686] Return additional properties for display devices in dxdiagn
Fixes: [42599] Application crashes because of missing properties in dxdiagn

20
patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch
View File

@ -1,7 +1,7 @@
From 0cd366658b21ef8afbc34daea08cacacf04039d4 Mon Sep 17 00:00:00 2001
From 81cc694e55e5febfc063f6b323fea0546c75984a Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Tue, 19 Aug 2014 22:10:49 -0600
Subject: [PATCH 1/8] ntdll: Implement retrieving DOS attributes in
Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
NtQueryInformationFile.
---
@ -14,18 +14,18 @@ Subject: [PATCH 1/8] ntdll: Implement retrieving DOS attributes in
create mode 100644 libs/port/xattr.c
diff --git a/configure.ac b/configure.ac
index 2e99320..a912870 100644
index dfa130e..affa3f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,7 @@ AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF]))
AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)]))
@@ -83,6 +83,7 @@ AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug an
AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)]))
AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
+AC_ARG_WITH(xattr, AS_HELP_STRING([--without-xattr],[do not use xattr (security attributes support)]))
AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
@@ -700,6 +701,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -716,6 +717,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@ -44,7 +44,7 @@ index 2e99320..a912870 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index b9d2425..dd03ae3 100644
index 8e4f52c..af6f6a4 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -122,6 +122,22 @@ mode_t FILE_umask = 0;
@ -89,7 +89,7 @@ index b9d2425..dd03ae3 100644
}
diff --git a/include/wine/port.h b/include/wine/port.h
index fb7251e..056c9ae 100644
index a3b6c6f..f3b6eb5 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -391,6 +391,14 @@ extern int mkstemps(char *template, int suffix_len);
@ -108,7 +108,7 @@ index fb7251e..056c9ae 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index c87b99d..111807a 100644
index c87b99de..111807a 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -106,4 +106,5 @@ C_SRCS = \
@ -164,5 +164,5 @@ index 0000000..94b7713
+#endif
+}
--
2.7.4
1.9.1

26
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "bf4d0982fd88f9c8848b9e27bb1391d45d18b68e"
echo "b70f0d723a768b9fdc89cd835b23718f6cd61f31"
}
# Show version information
@ -143,7 +143,6 @@ patch_enable_all ()
enable_dsound_EAX="$1"
enable_dsound_Fast_Mixer="$1"
enable_dsound_Revert_Cleanup="$1"
enable_dxdiagn_Display_Information="$1"
enable_dxdiagn_Enumerate_DirectSound="$1"
enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1"
enable_dxgi_GammaRamp="$1"
@ -605,9 +604,6 @@ patch_enable ()
dsound-Revert_Cleanup)
enable_dsound_Revert_Cleanup="$2"
;;
dxdiagn-Display_Information)
enable_dxdiagn_Display_Information="$2"
;;
dxdiagn-Enumerate_DirectSound)
enable_dxdiagn_Enumerate_DirectSound="$2"
;;
@ -3690,22 +3686,6 @@ if test "$enable_dsound_EAX" -eq 1; then
) >> "$patchlist"
fi
# Patchset dxdiagn-Display_Information
# |
# | This patchset fixes the following Wine bugs:
# | * [#34686] Return additional properties for display devices in dxdiagn
# | * [#42599] Application crashes because of missing properties in dxdiagn
# |
# | Modified files:
# | * dlls/dxdiagn/provider.c, dlls/dxdiagn/tests/container.c
# |
if test "$enable_dxdiagn_Display_Information" -eq 1; then
patch_apply dxdiagn-Display_Information/0001-dxdiagn-Add-several-more-fields-for-DisplayDevices.patch
(
printf '%s\n' '+ { "Michael Müller", "dxdiagn: Add several more fields for DisplayDevices.", 1 },';
) >> "$patchlist"
fi
# Patchset dxdiagn-Enumerate_DirectSound
# |
# | This patchset fixes the following Wine bugs:
@ -7197,7 +7177,7 @@ fi
# | * windowscodecs-Palette_Images
# |
# | Modified files:
# | * dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c, dlls/windowscodecs/bmpencode.c, dlls/windowscodecs/clsfactory.c,
# | * dlls/gdiplus/tests/image.c, dlls/windowscodecs/bmpencode.c, dlls/windowscodecs/clsfactory.c,
# | dlls/windowscodecs/converter.c, dlls/windowscodecs/gifformat.c, dlls/windowscodecs/info.c,
# | dlls/windowscodecs/jpegformat.c, dlls/windowscodecs/pngformat.c, dlls/windowscodecs/regsvr.c,
# | dlls/windowscodecs/tests/converter.c, dlls/windowscodecs/tiffformat.c, dlls/windowscodecs/wincodecs_private.h,
@ -7209,7 +7189,6 @@ if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then
patch_apply windowscodecs-GIF_Encoder/0004-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch
patch_apply windowscodecs-GIF_Encoder/0006-windowscodecs-Implement-IWICBitmapEncoder-GetEncoder.patch
patch_apply windowscodecs-GIF_Encoder/0008-windowscodecs-Add-initial-implementation-of-the-GIF-.patch
patch_apply windowscodecs-GIF_Encoder/0009-gdiplus-Fix-a-typo-in-GIF-container-format-passed-to.patch
patch_apply windowscodecs-GIF_Encoder/0010-windowscodecs-Initialize-empty-property-bag-in-GIF-e.patch
patch_apply windowscodecs-GIF_Encoder/0011-windowscodecs-Add-registration-for-GUID_WICPixelForm.patch
patch_apply windowscodecs-GIF_Encoder/0012-windowscodecs-Implement-IWICBitmapDecoder-GetMetadat.patch
@ -7234,7 +7213,6 @@ if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG encoder.", 1 },';
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in TIFF encoder.", 1 },';
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add initial implementation of the GIF encoder.", 1 },';
printf '%s\n' '+ { "Dmitry Timoshkov", "gdiplus: Fix a typo in GIF container format passed to encode_image_wic().", 1 },';
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Initialize empty property bag in GIF encoder'\''s CreateNewFrame implementation.", 1 },';
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.", 1 },';
printf '%s\n' '+ { "Dmitry Timoshkov", "windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder.", 1 },';

35
patches/windowscodecs-GIF_Encoder/0009-gdiplus-Fix-a-typo-in-GIF-container-format-passed-to.patch
View File

@ -1,35 +0,0 @@
From b20d8d374c84cd6fc2056c24b92832e9279ffaca Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Mon, 17 Oct 2016 15:23:39 +0800
Subject: gdiplus: Fix a typo in GIF container format passed to
encode_image_wic().
---
dlls/gdiplus/image.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 80ad65f050d..5ff48f8131e 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -4579,7 +4579,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream,
static GpStatus encode_image_gif(GpImage *image, IStream* stream,
GDIPCONST EncoderParameters* params)
{
- return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params);
+ return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params);
}
/*****************************************************************************
@@ -4592,7 +4592,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream,
encode_image_func encode_image;
int i;
- TRACE("%p %p %p %p\n", image, stream, clsid, params);
+ TRACE("%p %p %s %p\n", image, stream, wine_dbgstr_guid(clsid), params);
if(!image || !stream)
return InvalidParameter;
--
2.13.1