mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against c579a81a6353dd7c843270561cd5763ff895de40.
This commit is contained in:
Sebastian Lackner
parent
7b687557c3
commit
d076d04ebc
@ -1,25 +0,0 @@
|
||||
From 6bb09c3a238180db2b88afeef8f5d08aade863c0 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 28 Aug 2017 23:28:00 +0200
|
||||
Subject: kernel32: Fix compile error in load_library function.
|
||||
|
||||
---
|
||||
dlls/kernel32/module.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c
|
||||
index fa6f40b41e3..bfeae34326d 100644
|
||||
--- a/dlls/kernel32/module.c
|
||||
+++ b/dlls/kernel32/module.c
|
||||
@@ -1043,7 +1043,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags )
|
||||
NTSTATUS nts;
|
||||
HMODULE hModule;
|
||||
WCHAR *load_path;
|
||||
- static const DWORD unsupported_flags = load_library_search_flags |
|
||||
+ const DWORD unsupported_flags = load_library_search_flags |
|
||||
LOAD_IGNORE_CODE_AUTHZ_LEVEL |
|
||||
LOAD_LIBRARY_AS_IMAGE_RESOURCE |
|
||||
LOAD_LIBRARY_REQUIRE_SIGNED_TARGET |
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 61ceddca38f26c2df2acc6361c35ced52fe9b098 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 4 Jun 2017 12:58:31 +0200
|
||||
Subject: rsaenh/tests: Avoid compiler warnings with GCC 7.
|
||||
|
||||
---
|
||||
dlls/rsaenh/rsaenh.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
|
||||
index 9af770dfc6e..6978c860278 100644
|
||||
--- a/dlls/rsaenh/rsaenh.c
|
||||
+++ b/dlls/rsaenh/rsaenh.c
|
||||
@@ -1097,7 +1097,7 @@ static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpe
|
||||
*/
|
||||
static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey)
|
||||
{
|
||||
- CHAR szRSABase[MAX_PATH];
|
||||
+ CHAR szRSABase[MAX_PATH + 25];
|
||||
HKEY hRootKey;
|
||||
|
||||
sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName);
|
||||
--
|
||||
2.13.0
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From faf32d6f405bb427714ea2b3767981df1a8c2f65 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 3 Jun 2016 18:49:57 +0800
|
||||
Subject: gdiplus/tests: Add a test for image flags to PNG grayscale image
|
||||
tests.
|
||||
|
||||
---
|
||||
dlls/gdiplus/tests/image.c | 21 +++++++++++++++------
|
||||
1 file changed, 15 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
|
||||
index b4682f7..10b0477 100644
|
||||
--- a/dlls/gdiplus/tests/image.c
|
||||
+++ b/dlls/gdiplus/tests/image.c
|
||||
@@ -4739,22 +4739,24 @@ static void test_png_color_formats(void)
|
||||
{
|
||||
char bit_depth, color_type;
|
||||
PixelFormat format;
|
||||
+ UINT flags;
|
||||
} td[] =
|
||||
{
|
||||
/* 2 - PNG_COLOR_TYPE_RGB */
|
||||
- { 8, 2, PixelFormat24bppRGB },
|
||||
+ { 8, 2, PixelFormat24bppRGB, ImageFlagsColorSpaceRGB },
|
||||
/* 0 - PNG_COLOR_TYPE_GRAY */
|
||||
- { 1, 0, PixelFormat1bppIndexed },
|
||||
- { 2, 0, PixelFormat32bppARGB },
|
||||
- { 4, 0, PixelFormat32bppARGB },
|
||||
- { 8, 0, PixelFormat32bppARGB },
|
||||
- { 16, 0, PixelFormat32bppARGB },
|
||||
+ { 1, 0, PixelFormat1bppIndexed, ImageFlagsColorSpaceRGB },
|
||||
+ { 2, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY },
|
||||
+ { 4, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY },
|
||||
+ { 8, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY },
|
||||
+ { 16, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY },
|
||||
};
|
||||
BYTE buf[sizeof(png_1x1_data)];
|
||||
GpStatus status;
|
||||
GpImage *image;
|
||||
ImageType type;
|
||||
PixelFormat format;
|
||||
+ UINT flags;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
|
||||
@@ -4777,6 +4779,13 @@ static void test_png_color_formats(void)
|
||||
broken(td[i].bit_depth == 1 && td[i].color_type == 0 && format == PixelFormat32bppARGB), /* XP */
|
||||
"%d: expected %#x, got %#x\n", i, td[i].format, format);
|
||||
|
||||
+ status = GdipGetImageFlags(image, &flags);
|
||||
+ expect(Ok, status);
|
||||
+todo_wine_if(td[i].bit_depth > 1 && td[i].color_type == 0)
|
||||
+ ok((flags & td[i].flags) == td[i].flags ||
|
||||
+ broken(td[i].bit_depth == 1 && td[i].color_type == 0 && (flags & ImageFlagsColorSpaceGRAY)), /* XP */
|
||||
+ "%d: expected %#x, got %#x\n", i, td[i].flags, flags);
|
||||
+
|
||||
GdipDisposeImage(image);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.8.0
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From c0115ba521b2be3e061ffbe022ba4c10c78c0706 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 3 Jun 2016 18:39:37 +0800
|
||||
Subject: gdiplus: Set correct color space flags for grayscale images.
|
||||
|
||||
---
|
||||
dlls/gdiplus/image.c | 9 ++++++++-
|
||||
dlls/gdiplus/tests/image.c | 1 -
|
||||
2 files changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
|
||||
index a8d8f2d..38af3d5 100644
|
||||
--- a/dlls/gdiplus/image.c
|
||||
+++ b/dlls/gdiplus/image.c
|
||||
@@ -3709,7 +3709,14 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversi
|
||||
if (status == Ok)
|
||||
{
|
||||
/* Native GDI+ used to be smarter, but since Win7 it just sets these flags. */
|
||||
- bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB;
|
||||
+ bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI;
|
||||
+ if (IsEqualGUID(&wic_format, &GUID_WICPixelFormat2bppGray) ||
|
||||
+ IsEqualGUID(&wic_format, &GUID_WICPixelFormat4bppGray) ||
|
||||
+ IsEqualGUID(&wic_format, &GUID_WICPixelFormat8bppGray) ||
|
||||
+ IsEqualGUID(&wic_format, &GUID_WICPixelFormat16bppGray))
|
||||
+ bitmap->image.flags |= ImageFlagsColorSpaceGRAY;
|
||||
+ else
|
||||
+ bitmap->image.flags |= ImageFlagsColorSpaceRGB;
|
||||
bitmap->image.frame_count = frame_count;
|
||||
bitmap->image.current_frame = active_frame;
|
||||
bitmap->image.decoder = decoder;
|
||||
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
|
||||
index 10b0477..3e64c3a 100644
|
||||
--- a/dlls/gdiplus/tests/image.c
|
||||
+++ b/dlls/gdiplus/tests/image.c
|
||||
@@ -4781,7 +4781,6 @@ static void test_png_color_formats(void)
|
||||
|
||||
status = GdipGetImageFlags(image, &flags);
|
||||
expect(Ok, status);
|
||||
-todo_wine_if(td[i].bit_depth > 1 && td[i].color_type == 0)
|
||||
ok((flags & td[i].flags) == td[i].flags ||
|
||||
broken(td[i].bit_depth == 1 && td[i].color_type == 0 && (flags & ImageFlagsColorSpaceGRAY)), /* XP */
|
||||
"%d: expected %#x, got %#x\n", i, td[i].flags, flags);
|
||||
--
|
||||
2.8.0
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [38622] Force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA
|
||||
@ -1,27 +1,28 @@
|
||||
From d43c0229efb42913a0902ee42817e3a928598587 Mon Sep 17 00:00:00 2001
|
||||
From 0546ec6c4084213cb3ffa4c635d5392305d86726 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Sun, 17 Apr 2016 20:06:46 +0800
|
||||
Subject: kernel32: GetShortPathName should fail when called with a wildcard.
|
||||
|
||||
This patch fixes heap corruption reported in the bug 39355.
|
||||
---
|
||||
dlls/kernel32/path.c | 10 +++++++++-
|
||||
dlls/kernel32/path.c | 11 ++++++++++-
|
||||
dlls/kernel32/tests/path.c | 2 --
|
||||
2 files changed, 9 insertions(+), 3 deletions(-)
|
||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c
|
||||
index a906acc..ecebab2 100644
|
||||
index a3897431717..9cd0b57a65b 100644
|
||||
--- a/dlls/kernel32/path.c
|
||||
+++ b/dlls/kernel32/path.c
|
||||
@@ -43,6 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(file);
|
||||
@@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(file);
|
||||
|
||||
#define MAX_PATHNAME_LEN 1024
|
||||
static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */
|
||||
|
||||
+static const WCHAR wildcardsW[] = {'*','?',0};
|
||||
|
||||
+
|
||||
/* check if a file name is for an executable file (.exe or .com) */
|
||||
static inline BOOL is_executable( const WCHAR *name )
|
||||
@@ -455,7 +456,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
|
||||
{
|
||||
@@ -445,7 +447,7 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
|
||||
WIN32_FIND_DATAW wfd;
|
||||
HANDLE goit;
|
||||
|
||||
@ -30,7 +31,7 @@ index a906acc..ecebab2 100644
|
||||
|
||||
if (!longpath)
|
||||
{
|
||||
@@ -484,6 +485,13 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
|
||||
@@ -474,6 +476,13 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl
|
||||
sp = lp = 4;
|
||||
}
|
||||
|
||||
@ -45,10 +46,10 @@ index a906acc..ecebab2 100644
|
||||
if (longpath[lp] != '/' && longpath[lp + 1] == ':' )
|
||||
{
|
||||
diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c
|
||||
index 0dc8802..3934046 100644
|
||||
index 31a90b4f532..707fb88bab9 100644
|
||||
--- a/dlls/kernel32/tests/path.c
|
||||
+++ b/dlls/kernel32/tests/path.c
|
||||
@@ -1461,9 +1461,7 @@ static void test_GetShortPathNameW(void)
|
||||
@@ -1477,9 +1477,7 @@ static void test_GetShortPathNameW(void)
|
||||
lstrcpyW(ptr, wildW);
|
||||
SetLastError(0xdeadbeef);
|
||||
length = GetShortPathNameW( path, short_path, sizeof(short_path)/sizeof(*short_path) );
|
||||
@ -59,5 +60,5 @@ index 0dc8802..3934046 100644
|
||||
|
||||
lstrcpyW(ptr, a_bcdeW);
|
||||
--
|
||||
2.7.1
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 0aaa4c217073d55d35e7c85bd8ca44b19bb31ede Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Mon, 2 Jan 2017 15:47:52 +0800
|
||||
Subject: kernel32/tests: Fix a module reference leak leading to an undeletable
|
||||
temporary file.
|
||||
|
||||
---
|
||||
dlls/kernel32/tests/loader.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
|
||||
index 4f72c3e599b..9ddfd8d7922 100644
|
||||
--- a/dlls/kernel32/tests/loader.c
|
||||
+++ b/dlls/kernel32/tests/loader.c
|
||||
@@ -1457,6 +1457,7 @@ static void test_import_resolution(void)
|
||||
ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n",
|
||||
(void *)ptr->thunks[0].u1.Function, data.module, data.function.name );
|
||||
ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index );
|
||||
+ FreeLibrary( mod2 );
|
||||
FreeLibrary( mod );
|
||||
break;
|
||||
case 2: /* load without IMAGE_FILE_DLL doesn't resolve imports */
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "dfa1815c02d1661766c8f3a4a290635e7adb4ccf"
|
||||
echo "c579a81a6353dd7c843270561cd5763ff895de40"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -176,7 +176,6 @@ patch_enable_all ()
|
||||
enable_gdi32_Path_Metafile="$1"
|
||||
enable_gdi32_Symbol_Truetype_Font="$1"
|
||||
enable_gdiplus_DC_Handling="$1"
|
||||
enable_gdiplus_Grayscale_PNG="$1"
|
||||
enable_gdiplus_Performance_Improvements="$1"
|
||||
enable_hal_KeQueryPerformanceCounter="$1"
|
||||
enable_hnetcfg_INetFwAuthorizedApplication="$1"
|
||||
@ -802,9 +801,6 @@ patch_enable ()
|
||||
gdiplus-DC_Handling)
|
||||
enable_gdiplus_DC_Handling="$2"
|
||||
;;
|
||||
gdiplus-Grayscale_PNG)
|
||||
enable_gdiplus_Grayscale_PNG="$2"
|
||||
;;
|
||||
gdiplus-Performance-Improvements)
|
||||
enable_gdiplus_Performance_Improvements="$2"
|
||||
;;
|
||||
@ -2350,13 +2346,6 @@ if test "$enable_windowscodecs_TIFF_Support" -eq 1; then
|
||||
enable_windowscodecs_IWICPalette_InitializeFromBitmap=1
|
||||
fi
|
||||
|
||||
if test "$enable_windowscodecs_IWICPalette_InitializeFromBitmap" -eq 1; then
|
||||
if test "$enable_gdiplus_Grayscale_PNG" -gt 1; then
|
||||
abort "Patchset gdiplus-Grayscale_PNG disabled, but windowscodecs-IWICPalette_InitializeFromBitmap depends on that."
|
||||
fi
|
||||
enable_gdiplus_Grayscale_PNG=1
|
||||
fi
|
||||
|
||||
if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then
|
||||
if test "$enable_windowscodecs_Palette_Images" -gt 1; then
|
||||
abort "Patchset windowscodecs-Palette_Images disabled, but windowscodecs-GIF_Encoder depends on that."
|
||||
@ -2364,13 +2353,6 @@ if test "$enable_windowscodecs_GIF_Encoder" -eq 1; then
|
||||
enable_windowscodecs_Palette_Images=1
|
||||
fi
|
||||
|
||||
if test "$enable_windowscodecs_Palette_Images" -eq 1; then
|
||||
if test "$enable_gdiplus_Grayscale_PNG" -gt 1; then
|
||||
abort "Patchset gdiplus-Grayscale_PNG disabled, but windowscodecs-Palette_Images depends on that."
|
||||
fi
|
||||
enable_gdiplus_Grayscale_PNG=1
|
||||
fi
|
||||
|
||||
if test "$enable_uxtheme_GTK_Theming" -eq 1; then
|
||||
if test "$enable_ntdll_DllRedirects" -gt 1; then
|
||||
abort "Patchset ntdll-DllRedirects disabled, but uxtheme-GTK_Theming depends on that."
|
||||
@ -2937,19 +2919,17 @@ fi
|
||||
# | Modified files:
|
||||
# | * dlls/amstream/mediastreamfilter.c, dlls/d2d1/brush.c, dlls/d2d1/geometry.c, dlls/d3d11/view.c, dlls/d3d8/texture.c,
|
||||
# | dlls/d3d9/tests/visual.c, dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dsound/primary.c, dlls/dwrite/font.c,
|
||||
# | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/kernel32/module.c,
|
||||
# | dlls/kernel32/oldconfig.c, dlls/kernel32/tests/heap.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c,
|
||||
# | dlls/ole32/storage32.h, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/rsaenh/rsaenh.c, dlls/vbscript/vbdisp.c,
|
||||
# | dlls/wined3d/glsl_shader.c, dlls/ws2_32/tests/sock.c, dlls/wsdapi/msgparams.c, include/wine/list.h,
|
||||
# | include/wine/rbtree.h, include/winnt.h, tools/makedep.c
|
||||
# | dlls/dwrite/layout.c, dlls/fusion/tests/asmenum.c, dlls/fusion/tests/asmname.c, dlls/kernel32/oldconfig.c,
|
||||
# | dlls/kernel32/tests/heap.c, dlls/msxml3/schema.c, dlls/netapi32/netapi32.c, dlls/ole32/storage32.h,
|
||||
# | dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c, dlls/vbscript/vbdisp.c, dlls/wined3d/glsl_shader.c,
|
||||
# | dlls/ws2_32/tests/sock.c, dlls/wsdapi/msgparams.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h,
|
||||
# | tools/makedep.c
|
||||
# |
|
||||
if test "$enable_Compiler_Warnings" -eq 1; then
|
||||
patch_apply Compiler_Warnings/0001-ole32-Fix-compilation-with-recent-versions-of-gcc.patch
|
||||
patch_apply Compiler_Warnings/0002-kernel32-Fix-compile-error-in-load_library-function.patch
|
||||
patch_apply Compiler_Warnings/0004-fusion-Fix-length-parameter-for-ZeroMemory.patch
|
||||
patch_apply Compiler_Warnings/0005-fusion-tests-Avoid-compiler-warnings-with-GCC-7.patch
|
||||
patch_apply Compiler_Warnings/0006-kernel32-tests-Avoid-compiler-warnings-with-GCC-7.patch
|
||||
patch_apply Compiler_Warnings/0007-rsaenh-tests-Avoid-compiler-warnings-with-GCC-7.patch
|
||||
patch_apply Compiler_Warnings/0008-kernel32-Avoid-compiler-warnings-with-GCC-7.patch
|
||||
patch_apply Compiler_Warnings/0009-ws2_32-tests-Work-around-an-incorrect-detection-in-G.patch
|
||||
patch_apply Compiler_Warnings/0018-Appease-the-blessed-version-of-gcc-4.5-when-Werror-i.patch
|
||||
@ -2969,11 +2949,9 @@ if test "$enable_Compiler_Warnings" -eq 1; then
|
||||
patch_apply Compiler_Warnings/0032-wsdapi-Avoid-implicit-cast-of-interface-pointer.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "ole32: Fix compilation with recent versions of gcc.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "kernel32: Fix compile error in load_library function.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "fusion: Fix length parameter for ZeroMemory.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "fusion/tests: Avoid compiler warnings with GCC 7.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "kernel32/tests: Avoid compiler warnings with GCC 7.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "rsaenh/tests: Avoid compiler warnings with GCC 7.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "kernel32: Avoid compiler warnings with GCC 7.", 1 },';
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "ws2_32/tests: Work around an incorrect detection in GCC 7.", 1 },';
|
||||
printf '%s\n' '+ { "Erich E. Hoover", "Appease the blessed version of gcc (4.5) when -Werror is enabled.", 1 },';
|
||||
@ -4960,23 +4938,6 @@ if test "$enable_gdiplus_DC_Handling" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdiplus-Grayscale_PNG
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38622] Force conversion of 8 bpp grayscale PNG images to 32 bpp BGRA
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c
|
||||
# |
|
||||
if test "$enable_gdiplus_Grayscale_PNG" -eq 1; then
|
||||
patch_apply gdiplus-Grayscale_PNG/0004-gdiplus-tests-Add-a-test-for-image-flags-to-PNG-gray.patch
|
||||
patch_apply gdiplus-Grayscale_PNG/0005-gdiplus-Set-correct-color-space-flags-for-grayscale-.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "gdiplus/tests: Add a test for image flags to PNG grayscale image tests.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "gdiplus: Set correct color space flags for grayscale images.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdiplus-Performance-Improvements
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -5405,13 +5366,11 @@ if test "$enable_kernel32_PE_Loader_Fixes" -eq 1; then
|
||||
patch_apply kernel32-PE_Loader_Fixes/0001-server-All-fields-up-to-CheckSum-are-mandatory-regar.patch
|
||||
patch_apply kernel32-PE_Loader_Fixes/0002-ntdll-If-PE-image-size-is-larger-than-the-backed-fil.patch
|
||||
patch_apply kernel32-PE_Loader_Fixes/0003-kernel32-On-process-entry-store-PEB-address-in-ebx.patch
|
||||
patch_apply kernel32-PE_Loader_Fixes/0004-kernel32-tests-Fix-a-module-reference-leak-leading-t.patch
|
||||
patch_apply kernel32-PE_Loader_Fixes/0005-kernel32-tests-Add-a-PE-test-image-that-resembles-fo.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "server: All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "ntdll: If PE image size is larger than the backed file size then treat file as removable.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "kernel32: On process entry store PEB address in %ebx.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "kernel32/tests: Fix a module reference leak leading to an undeletable temporary file.", 1 },';
|
||||
printf '%s\n' '+ { "Dmitry Timoshkov", "kernel32/tests: Add a PE test image that resembles format of some of 8k demos.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
@ -9066,9 +9025,6 @@ fi
|
||||
|
||||
# Patchset windowscodecs-Palette_Images
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * gdiplus-Grayscale_PNG
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/windowscodecs/bmpdecode.c, dlls/windowscodecs/bmpencode.c, dlls/windowscodecs/imgfactory.c,
|
||||
# | dlls/windowscodecs/info.c, dlls/windowscodecs/pngformat.c, dlls/windowscodecs/regsvr.c,
|
||||
@ -9124,7 +9080,7 @@ fi
|
||||
# Patchset windowscodecs-GIF_Encoder
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * gdiplus-Grayscale_PNG, windowscodecs-Palette_Images
|
||||
# | * windowscodecs-Palette_Images
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c, dlls/windowscodecs/bmpencode.c, dlls/windowscodecs/clsfactory.c,
|
||||
@ -9194,9 +9150,6 @@ fi
|
||||
|
||||
# Patchset windowscodecs-IWICPalette_InitializeFromBitmap
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * gdiplus-Grayscale_PNG
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39890] Implement IWICPalette::InitializeFromBitmap
|
||||
# |
|
||||
@ -9220,8 +9173,7 @@ fi
|
||||
# Patchset windowscodecs-TIFF_Support
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * gdiplus-Grayscale_PNG, windowscodecs-Palette_Images, windowscodecs-GIF_Encoder, windowscodecs-
|
||||
# | IWICPalette_InitializeFromBitmap
|
||||
# | * windowscodecs-Palette_Images, windowscodecs-GIF_Encoder, windowscodecs-IWICPalette_InitializeFromBitmap
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c, dlls/windowscodecs/metadatahandler.c, dlls/windowscodecs/regsvr.c,
|
||||
@ -9267,8 +9219,8 @@ fi
|
||||
# Patchset windowscodecs-32bppPRGBA
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * gdiplus-Grayscale_PNG, windowscodecs-Palette_Images, windowscodecs-GIF_Encoder, windowscodecs-
|
||||
# | IWICPalette_InitializeFromBitmap, windowscodecs-TIFF_Support
|
||||
# | * windowscodecs-Palette_Images, windowscodecs-GIF_Encoder, windowscodecs-IWICPalette_InitializeFromBitmap, windowscodecs-
|
||||
# | TIFF_Support
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/windowscodecs/converter.c, dlls/windowscodecs/info.c, dlls/windowscodecs/regsvr.c,
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
Fixes: [39890] Implement IWICPalette::InitializeFromBitmap
|
||||
Fixes: Implement gdiplus.GdipInitializePalette
|
||||
Depends: gdiplus-Grayscale_PNG
|
||||
|
||||
@ -1,2 +1 @@
|
||||
Fixes: Improve palette support in windowscodecs.dll
|
||||
Depends: gdiplus-Grayscale_PNG
|
||||
|
||||
Loading…
Reference in New Issue
Block a user