mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against a8f45dff604058d419bd6c2e070f65a13a6ddfdb.
This commit is contained in:
Sebastian Lackner
parent
a8303d406b
commit
9f011de1b5
10
README.md
10
README.md
@ -156,14 +156,14 @@ for more details.*
|
||||
* Fix wrong defition of ntoskrnl.IoReleaseCancelSpinLock function.
|
||||
* Fix wrong version of ID3DXEffect interface for d3dx9_24
|
||||
* Fix wrong version of ID3DXEffect interface for d3dx9_25 ([Wine Bug #25138](https://bugs.winehq.org/show_bug.cgi?id=25138))
|
||||
* Forward GIF encoder requests to windowscodecs ([Wine Bug #34356](https://bugs.winehq.org/show_bug.cgi?id=34356))
|
||||
* ~~Forward GIF encoder requests to windowscodecs~~ ([Wine Bug #34356](https://bugs.winehq.org/show_bug.cgi?id=34356))
|
||||
* Free RPC parameters allocated by application before anything else ([Wine Bug #36743](https://bugs.winehq.org/show_bug.cgi?id=36743))
|
||||
* GetMessage should remove already seen messages with higher priority ([Wine Bug #28884](https://bugs.winehq.org/show_bug.cgi?id=28884))
|
||||
* GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
|
||||
* GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
|
||||
* Globally invalidate key state on changes in other threads ([Wine Bug #29871](https://bugs.winehq.org/show_bug.cgi?id=29871))
|
||||
* Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
|
||||
* Ignore garbage after decoding gif lines ([Wine Bug #32227](https://bugs.winehq.org/show_bug.cgi?id=32227))
|
||||
* ~~Ignore garbage after decoding gif lines~~ ([Wine Bug #32227](https://bugs.winehq.org/show_bug.cgi?id=32227))
|
||||
* Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
|
||||
* Implement D3DXGetShaderOutputSemantics
|
||||
* Implement DDENUMSURFACES_CANBECREATED in IDirectDraw7::EnumSurfaces ([Wine Bug #17233](https://bugs.winehq.org/show_bug.cgi?id=17233))
|
||||
@ -193,7 +193,7 @@ for more details.*
|
||||
* Improve stubs for AEV_{Get,Set}MasterVolumeLevel
|
||||
* Improve stubs for AEV_{Get,Set}Mute
|
||||
* Improvement for heap allocation performance
|
||||
* Increase buffer size in widl/typegen.c to avoid buffer overflow ([Wine Bug #37129](https://bugs.winehq.org/show_bug.cgi?id=37129))
|
||||
* ~~Increase buffer size in widl/typegen.c to avoid buffer overflow~~ ([Wine Bug #37129](https://bugs.winehq.org/show_bug.cgi?id=37129))
|
||||
* Initialize *lpcDevices in RasEnumDevicesA ([Wine Bug #30378](https://bugs.winehq.org/show_bug.cgi?id=30378))
|
||||
* Initialize System\CurrentControlSet\Control\TimeZoneInformation registry keys
|
||||
* Jedi Knight: Dark Forces II crashes with winmm set to native ([Wine Bug #37983](https://bugs.winehq.org/show_bug.cgi?id=37983))
|
||||
@ -218,7 +218,7 @@ for more details.*
|
||||
* Return default palette entries from GetSystemPaletteEntries for non-palette-based devices
|
||||
* Return fake device type when systemroot is located on virtual disk ([Wine Bug #36546](https://bugs.winehq.org/show_bug.cgi?id=36546))
|
||||
* Return proper status codes when NtReadFile/NtWriteFile is called on closed (but not disconnected) pipe
|
||||
* Revert patch causing crash in IrfanView when using the WebP plugin ([Wine Bug #38895](https://bugs.winehq.org/show_bug.cgi?id=38895))
|
||||
* ~~Revert patch causing crash in IrfanView when using the WebP plugin~~ ([Wine Bug #38895](https://bugs.winehq.org/show_bug.cgi?id=38895))
|
||||
* SO_CONNECT_TIME returns the appropriate time
|
||||
* Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
|
||||
* ~~SecuROM 5.x media validation fails~~ ([Wine Bug #21448](https://bugs.winehq.org/show_bug.cgi?id=21448))
|
||||
@ -229,7 +229,7 @@ for more details.*
|
||||
* Skip unknown item when decoding a CMS certificate ([Wine Bug #34388](https://bugs.winehq.org/show_bug.cgi?id=34388))
|
||||
* Software support for Environmental Audio Extensions (EAX)
|
||||
* Super Mario 3: Mario Forever fails to load keyboard mapping from profile files. ([Wine Bug #18099](https://bugs.winehq.org/show_bug.cgi?id=18099))
|
||||
* Support for 8bpp grayscale TIFF images with 8bpp alpha channel ([Wine Bug #38027](https://bugs.winehq.org/show_bug.cgi?id=38027))
|
||||
* ~~Support for 8bpp grayscale TIFF images with 8bpp alpha channel~~ ([Wine Bug #38027](https://bugs.winehq.org/show_bug.cgi?id=38027))
|
||||
* Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372))
|
||||
* Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
|
||||
* Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674))
|
||||
|
||||
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -4,6 +4,14 @@ wine-staging (1.7.48) UNRELEASED; urgency=low
|
||||
(accepted upstream).
|
||||
* Removed patch to improve IoGetDeviceObjectPointer stub to appease SecuROM
|
||||
5.x (accepted upstream).
|
||||
* Removed patch to forward GIF encoder requests to Windowscodecs (accepted
|
||||
upstream).
|
||||
* Removed patch to ignore garbage after decoding gif lines (accepted
|
||||
upstream).
|
||||
* Removed patch to increase buffer size in widl/typegen.c (accepted upstream).
|
||||
* Removed patch to revert security cookie changes in loader (fixed upstream).
|
||||
* Removed patch to add support 8bpp grayscale TIFF images with 8bpp alpha
|
||||
channel (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 13 Jul 2015 02:29:48 +0200
|
||||
|
||||
wine-staging (1.7.47) unstable; urgency=low
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From c6b2b1df5a754ac292ee66d091d7892e8252c5c3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sun, 21 Jun 2015 20:00:18 +0200
|
||||
Subject: configure.ac: Search for otool using AC_CHECK_TOOL. (v2)
|
||||
|
||||
This is necessary to allow using otool from custom host toolchains like i686-apple-darwin12-otool.
|
||||
---
|
||||
aclocal.m4 | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index 3d43721..f7a12f1 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -42,6 +42,7 @@ dnl Usage: WINE_PATH_PKG_CONFIG
|
||||
dnl
|
||||
AC_DEFUN([WINE_PATH_SONAME_TOOLS],
|
||||
[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH)
|
||||
+AC_CHECK_TOOL(OTOOL,otool,otool)
|
||||
AC_CHECK_TOOL(READELF,[readelf],true)])
|
||||
|
||||
AC_DEFUN([WINE_PATH_PKG_CONFIG],
|
||||
@@ -62,7 +63,7 @@ LIBS="-l$1 $5 $LIBS"
|
||||
AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
|
||||
[case "$LIBEXT" in
|
||||
dll) AS_VAR_SET(ac_Lib,[`$ac_cv_path_LDD conftest.exe | grep "$1" | sed -e "s/dll.*/dll/"';2,$d'`]) ;;
|
||||
- dylib) AS_VAR_SET(ac_Lib,[`otool -L conftest$ac_exeext | grep "ac_lib_pattern\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(ac_lib_pattern\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;;
|
||||
+ dylib) AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "ac_lib_pattern\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/\(ac_lib_pattern\.[[0-9A-Za-z.]]*dylib\).*$/\1/"';2,$d'`]) ;;
|
||||
*) AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*ac_lib_pattern\\.$LIBEXT" | sed -e "s/^.*\\m4_dquote(\\(ac_lib_pattern\\.$LIBEXT[[^ ]]*\\)\\).*$/\1/"';2,$d'`])
|
||||
AS_VAR_IF([ac_Lib],[],
|
||||
[AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "ac_lib_pattern\\.$LIBEXT" | sed -e "s/^.*\(ac_lib_pattern\.$LIBEXT[[^ ]]*\).*$/\1/"';2,$d'`])]) ;;
|
||||
--
|
||||
2.4.4
|
||||
|
||||
@ -1,151 +0,0 @@
|
||||
From 5a9241dd76874080df0938618a2fbbb022250791 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Tue, 9 Jun 2015 05:46:41 +0200
|
||||
Subject: gdiplus: Forward GIF encoder requests to windowscodecs.
|
||||
|
||||
---
|
||||
dlls/gdiplus/image.c | 10 ++++--
|
||||
dlls/gdiplus/tests/image.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 94 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
|
||||
index 86802a5..1d2d6fa 100644
|
||||
--- a/dlls/gdiplus/image.c
|
||||
+++ b/dlls/gdiplus/image.c
|
||||
@@ -4401,6 +4401,12 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream,
|
||||
return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params);
|
||||
}
|
||||
|
||||
+static GpStatus encode_image_gif(GpImage *image, IStream* stream,
|
||||
+ GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params)
|
||||
+{
|
||||
+ return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params);
|
||||
+}
|
||||
+
|
||||
/*****************************************************************************
|
||||
* GdipSaveImageToStream [GDIPLUS.@]
|
||||
*/
|
||||
@@ -4611,14 +4617,14 @@ static const struct image_codec codecs[NUM_CODECS] = {
|
||||
/* FormatDescription */ gif_format,
|
||||
/* FilenameExtension */ gif_extension,
|
||||
/* MimeType */ gif_mimetype,
|
||||
- /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin,
|
||||
+ /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsEncoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin,
|
||||
/* Version */ 1,
|
||||
/* SigCount */ 2,
|
||||
/* SigSize */ 6,
|
||||
/* SigPattern */ gif_sig_pattern,
|
||||
/* SigMask */ gif_sig_mask,
|
||||
},
|
||||
- NULL,
|
||||
+ encode_image_gif,
|
||||
decode_image_gif,
|
||||
select_frame_gif
|
||||
},
|
||||
diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
|
||||
index 63fc96e..8a85828 100644
|
||||
--- a/dlls/gdiplus/tests/image.c
|
||||
+++ b/dlls/gdiplus/tests/image.c
|
||||
@@ -4544,6 +4544,91 @@ static void test_CloneBitmapArea(void)
|
||||
GdipDisposeImage((GpImage *)bitmap);
|
||||
}
|
||||
|
||||
+static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid)
|
||||
+{
|
||||
+ GpStatus status;
|
||||
+ UINT n_codecs, info_size, i;
|
||||
+ ImageCodecInfo *info;
|
||||
+ BOOL ret = FALSE;
|
||||
+
|
||||
+ status = GdipGetImageEncodersSize(&n_codecs, &info_size);
|
||||
+ expect(Ok, status);
|
||||
+
|
||||
+ info = GdipAlloc(info_size);
|
||||
+
|
||||
+ status = GdipGetImageEncoders(n_codecs, info_size, info);
|
||||
+ expect(Ok, status);
|
||||
+
|
||||
+ for (i = 0; i < n_codecs; i++)
|
||||
+ {
|
||||
+ if (!lstrcmpW(info[i].MimeType, mime))
|
||||
+ {
|
||||
+ *format = info[i].FormatID;
|
||||
+ *clsid = info[i].Clsid;
|
||||
+ ret = TRUE;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ GdipFree(info);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static void test_supported_encoders(void)
|
||||
+{
|
||||
+ static const WCHAR bmp_mimetype[] = {'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p', 0};
|
||||
+ static const WCHAR jpeg_mimetype[] = {'i','m','a','g','e','/','j','p','e','g', 0};
|
||||
+ static const WCHAR gif_mimetype[] = {'i','m','a','g','e','/','g','i','f', 0};
|
||||
+ static const WCHAR tiff_mimetype[] = {'i','m','a','g','e','/','t','i','f','f', 0};
|
||||
+ static const WCHAR png_mimetype[] = {'i','m','a','g','e','/','p','n','g', 0};
|
||||
+ static const struct test_data
|
||||
+ {
|
||||
+ LPCWSTR mime;
|
||||
+ const GUID *format;
|
||||
+ BOOL todo;
|
||||
+ } td[] =
|
||||
+ {
|
||||
+ { bmp_mimetype, &ImageFormatBMP, FALSE },
|
||||
+ { jpeg_mimetype, &ImageFormatJPEG, FALSE },
|
||||
+ { gif_mimetype, &ImageFormatGIF, TRUE },
|
||||
+ { tiff_mimetype, &ImageFormatTIFF, FALSE },
|
||||
+ { png_mimetype, &ImageFormatPNG, FALSE }
|
||||
+ };
|
||||
+ GUID format, clsid;
|
||||
+ BOOL ret;
|
||||
+ HRESULT hr;
|
||||
+ GpStatus status;
|
||||
+ GpBitmap *bm;
|
||||
+ IStream *stream;
|
||||
+ HGLOBAL hmem;
|
||||
+ int i;
|
||||
+
|
||||
+ status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bm);
|
||||
+ ok(status == Ok, "GdipCreateBitmapFromScan0 error %d\n", status);
|
||||
+
|
||||
+ for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
|
||||
+ {
|
||||
+ ret = get_encoder_clsid(td[i].mime, &format, &clsid);
|
||||
+ ok(ret, "%s encoder is not in the list\n", wine_dbgstr_w(td[i].mime));
|
||||
+ expect_guid(td[i].format, &format, __LINE__, FALSE);
|
||||
+
|
||||
+ hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD, 16);
|
||||
+
|
||||
+ hr = CreateStreamOnHGlobal(hmem, TRUE, &stream);
|
||||
+ ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr);
|
||||
+
|
||||
+ status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL);
|
||||
+ if (td[i].todo)
|
||||
+ todo_wine ok(status == Ok, "GdipSaveImageToStream error %d\n", status);
|
||||
+ else
|
||||
+ ok(status == Ok, "GdipSaveImageToStream error %d\n", status);
|
||||
+
|
||||
+ IStream_Release(stream);
|
||||
+ }
|
||||
+
|
||||
+ GdipDisposeImage((GpImage *)bm);
|
||||
+}
|
||||
+
|
||||
START_TEST(image)
|
||||
{
|
||||
struct GdiplusStartupInput gdiplusStartupInput;
|
||||
@@ -4556,6 +4641,7 @@ START_TEST(image)
|
||||
|
||||
GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
|
||||
|
||||
+ test_supported_encoders();
|
||||
test_CloneBitmapArea();
|
||||
test_ARGB_conversion();
|
||||
test_DrawImage_scale();
|
||||
--
|
||||
2.4.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [34356] Forward GIF encoder requests to windowscodecs
|
||||
@ -1,51 +0,0 @@
|
||||
From 2322a6e69849a1537724b0fe7dd08a3edea83e0c Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 10 Jul 2015 20:40:01 +0200
|
||||
Subject: Revert "ntdll: Randomize security cookie when available."
|
||||
|
||||
This reverts commit 7e1c886fbfd362376b6aebe5381ab7d4433c3371.
|
||||
---
|
||||
dlls/ntdll/virtual.c | 20 --------------------
|
||||
1 file changed, 20 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index 410e060..bc3f7cd 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -1067,8 +1067,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
|
||||
IMAGE_SECTION_HEADER sections[96];
|
||||
IMAGE_SECTION_HEADER *sec;
|
||||
IMAGE_DATA_DIRECTORY *imports;
|
||||
- IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg;
|
||||
- ULONG loadcfg_size;
|
||||
NTSTATUS status = STATUS_CONFLICTING_ADDRESSES;
|
||||
int i;
|
||||
off_t pos;
|
||||
@@ -1280,24 +1278,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
|
||||
}
|
||||
}
|
||||
|
||||
- /* randomize security cookie */
|
||||
-
|
||||
- loadcfg = RtlImageDirectoryEntryToData( (HMODULE)ptr, TRUE,
|
||||
- IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size );
|
||||
- if (loadcfg && loadcfg_size >= sizeof(*loadcfg))
|
||||
- {
|
||||
- static ULONG seed;
|
||||
- ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie;
|
||||
-
|
||||
- if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId();
|
||||
- if (cookie)
|
||||
- {
|
||||
- *cookie = RtlRandom( &seed );
|
||||
- if (sizeof(ULONG_PTR) > sizeof(ULONG)) /* fill up, but keep the highest word clear */
|
||||
- *cookie ^= (ULONG_PTR)RtlRandom( &seed ) << 16;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
/* set the image protections */
|
||||
|
||||
VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ );
|
||||
--
|
||||
2.4.5
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
# Fixes: [38897] Revert patch causing crash in Word Viewer when opening docx files
|
||||
Fixes: [38895] Revert patch causing crash in IrfanView when using the WebP plugin
|
||||
@ -55,7 +55,7 @@ version()
|
||||
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
|
||||
echo ""
|
||||
echo "Patchset to be applied on upstream Wine:"
|
||||
echo " commit c3dd56c99332c4ad9dbd095935d2c17c53463154"
|
||||
echo " commit a8f45dff604058d419bd6c2e070f65a13a6ddfdb"
|
||||
echo ""
|
||||
}
|
||||
|
||||
@ -118,7 +118,6 @@ patch_enable_all ()
|
||||
enable_gdi32_Default_Palette="$1"
|
||||
enable_gdi32_MaxPixelFormats="$1"
|
||||
enable_gdi32_MultiMonitor="$1"
|
||||
enable_gdiplus_GIF_Encoder="$1"
|
||||
enable_gdiplus_GdipCreateEffect="$1"
|
||||
enable_imagehlp_BindImageEx="$1"
|
||||
enable_imagehlp_ImageLoad="$1"
|
||||
@ -167,7 +166,6 @@ patch_enable_all ()
|
||||
enable_ntdll_NtQuerySection="$1"
|
||||
enable_ntdll_NtSetLdtEntries="$1"
|
||||
enable_ntdll_Pipe_SpecialCharacters="$1"
|
||||
enable_ntdll_Revert_Security_Cookie="$1"
|
||||
enable_ntdll_RtlIpStringToAddress="$1"
|
||||
enable_ntdll_ThreadTime="$1"
|
||||
enable_ntdll_Threading="$1"
|
||||
@ -237,9 +235,6 @@ patch_enable_all ()
|
||||
enable_wbemdisp_ISWbemSecurity="$1"
|
||||
enable_wbemdisp_Timeout="$1"
|
||||
enable_wiaservc_IEnumWIA_DEV_INFO="$1"
|
||||
enable_widl_Buffer_Overflow="$1"
|
||||
enable_windowscodecs_GIF_Decoder="$1"
|
||||
enable_windowscodecs_TIFF_Decoder="$1"
|
||||
enable_wine_inf_Performance="$1"
|
||||
enable_wine_inf_ProfileList_UserSID="$1"
|
||||
enable_wineboot_HKEY_DYN_DATA="$1"
|
||||
@ -428,9 +423,6 @@ patch_enable ()
|
||||
gdi32-MultiMonitor)
|
||||
enable_gdi32_MultiMonitor="$2"
|
||||
;;
|
||||
gdiplus-GIF_Encoder)
|
||||
enable_gdiplus_GIF_Encoder="$2"
|
||||
;;
|
||||
gdiplus-GdipCreateEffect)
|
||||
enable_gdiplus_GdipCreateEffect="$2"
|
||||
;;
|
||||
@ -575,9 +567,6 @@ patch_enable ()
|
||||
ntdll-Pipe_SpecialCharacters)
|
||||
enable_ntdll_Pipe_SpecialCharacters="$2"
|
||||
;;
|
||||
ntdll-Revert_Security_Cookie)
|
||||
enable_ntdll_Revert_Security_Cookie="$2"
|
||||
;;
|
||||
ntdll-RtlIpStringToAddress)
|
||||
enable_ntdll_RtlIpStringToAddress="$2"
|
||||
;;
|
||||
@ -785,15 +774,6 @@ patch_enable ()
|
||||
wiaservc-IEnumWIA_DEV_INFO)
|
||||
enable_wiaservc_IEnumWIA_DEV_INFO="$2"
|
||||
;;
|
||||
widl-Buffer_Overflow)
|
||||
enable_widl_Buffer_Overflow="$2"
|
||||
;;
|
||||
windowscodecs-GIF_Decoder)
|
||||
enable_windowscodecs_GIF_Decoder="$2"
|
||||
;;
|
||||
windowscodecs-TIFF_Decoder)
|
||||
enable_windowscodecs_TIFF_Decoder="$2"
|
||||
;;
|
||||
wine.inf-Performance)
|
||||
enable_wine_inf_Performance="$2"
|
||||
;;
|
||||
@ -1448,9 +1428,6 @@ if test "$enable_category_stable" -eq 1; then
|
||||
if test "$enable_user32_WndProc" -gt 1; then
|
||||
abort "Patchset user32-WndProc disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_windowscodecs_GIF_Decoder" -gt 1; then
|
||||
abort "Patchset windowscodecs-GIF_Decoder disabled, but category-stable depends on that."
|
||||
fi
|
||||
if test "$enable_wine_inf_Performance" -gt 1; then
|
||||
abort "Patchset wine.inf-Performance disabled, but category-stable depends on that."
|
||||
fi
|
||||
@ -1568,7 +1545,6 @@ if test "$enable_category_stable" -eq 1; then
|
||||
enable_urlmon_CoInternetSetFeatureEnabled=1
|
||||
enable_user32_DrawTextExW=1
|
||||
enable_user32_WndProc=1
|
||||
enable_windowscodecs_GIF_Decoder=1
|
||||
enable_wine_inf_Performance=1
|
||||
enable_wine_inf_ProfileList_UserSID=1
|
||||
enable_wineboot_HKEY_DYN_DATA=1
|
||||
@ -1971,6 +1947,23 @@ if test "$enable_Staging" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-Misc_ACL
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#15980] GetSecurityInfo returns NULL DACL for process object
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/tests/security.c, server/process.c, server/security.h, server/token.c
|
||||
# |
|
||||
if test "$enable_server_Misc_ACL" -eq 1; then
|
||||
patch_apply server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
|
||||
patch_apply server-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
|
||||
(
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor ownership for processes.", 1 },';
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor DACL for processes.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-CreateProcess_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -1990,23 +1983,6 @@ if test "$enable_server_CreateProcess_ACLs" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-Misc_ACL
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#15980] GetSecurityInfo returns NULL DACL for process object
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/tests/security.c, server/process.c, server/security.h, server/token.c
|
||||
# |
|
||||
if test "$enable_server_Misc_ACL" -eq 1; then
|
||||
patch_apply server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
|
||||
patch_apply server-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
|
||||
(
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor ownership for processes.", 1 },';
|
||||
echo '+ { "Erich E. Hoover", "server: Add default security descriptor DACL for processes.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-LsaLookupSids
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2094,13 +2070,11 @@ fi
|
||||
# Patchset configure-Crosscompiling
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * aclocal.m4, configure.ac
|
||||
# | * configure.ac
|
||||
# |
|
||||
if test "$enable_configure_Crosscompiling" -eq 1; then
|
||||
patch_apply configure-Crosscompiling/0001-configure.ac-Search-for-otool-using-AC_CHECK_TOOL.patch
|
||||
patch_apply configure-Crosscompiling/0002-configure.ac-Remove-check-for-strength-reduce-bug.patch
|
||||
patch_apply configure-Crosscompiling/0001-configure.ac-Remove-check-for-strength-reduce-bug.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "configure.ac: Search for otool using AC_CHECK_TOOL.", 2 },';
|
||||
echo '+ { "Michael Müller", "configure.ac: Remove check for strength-reduce bug.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
@ -2710,21 +2684,6 @@ if test "$enable_gdi32_MultiMonitor" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdiplus-GIF_Encoder
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#34356] Forward GIF encoder requests to windowscodecs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/gdiplus/image.c, dlls/gdiplus/tests/image.c
|
||||
# |
|
||||
if test "$enable_gdiplus_GIF_Encoder" -eq 1; then
|
||||
patch_apply gdiplus-GIF_Encoder/0001-gdiplus-Forward-GIF-encoder-requests-to-windowscodec.patch
|
||||
(
|
||||
echo '+ { "Dmitry Timoshkov", "gdiplus: Forward GIF encoder requests to windowscodecs.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset gdiplus-GdipCreateEffect
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -2823,6 +2782,18 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-File_Permissions
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2886,18 +2857,6 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-CopyFileEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3554,21 +3513,6 @@ if test "$enable_ntdll_Pipe_SpecialCharacters" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-Revert_Security_Cookie
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38895] Revert patch causing crash in IrfanView when using the WebP plugin
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/virtual.c
|
||||
# |
|
||||
if test "$enable_ntdll_Revert_Security_Cookie" -eq 1; then
|
||||
patch_apply ntdll-Revert_Security_Cookie/0001-Revert-ntdll-Randomize-security-cookie-when-availabl.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "Revert \"ntdll: Randomize security cookie when available.\".", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-RtlIpStringToAddress
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -4654,51 +4598,6 @@ if test "$enable_wiaservc_IEnumWIA_DEV_INFO" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset widl-Buffer_Overflow
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#37129] Increase buffer size in widl/typegen.c to avoid buffer overflow
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * tools/widl/typegen.c
|
||||
# |
|
||||
if test "$enable_widl_Buffer_Overflow" -eq 1; then
|
||||
patch_apply widl-Buffer_Overflow/0001-widl-Increase-buffer-size-in-typegen.c.patch
|
||||
(
|
||||
echo '+ { "Jarkko Korpi", "widl: Increase buffer size in typegen.c.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset windowscodecs-GIF_Decoder
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#32227] Ignore garbage after decoding gif lines
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/windowscodecs/ungif.c
|
||||
# |
|
||||
if test "$enable_windowscodecs_GIF_Decoder" -eq 1; then
|
||||
patch_apply windowscodecs-GIF_Decoder/0001-windowscodecs-Don-t-fail-to-decode-GIF-if-an-image-h.patch
|
||||
(
|
||||
echo '+ { "Dmitry Timoshkov", "windowscodecs: Don'\''t fail to decode GIF if an image has been already loaded.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset windowscodecs-TIFF_Decoder
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38027] Support for 8bpp grayscale TIFF images with 8bpp alpha channel
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/windowscodecs/tests/tiffformat.c, dlls/windowscodecs/tiffformat.c
|
||||
# |
|
||||
if test "$enable_windowscodecs_TIFF_Decoder" -eq 1; then
|
||||
patch_apply windowscodecs-TIFF_Decoder/0001-windowscodecs-Add-support-for-8bpp-grayscale-TIFF-im.patch
|
||||
(
|
||||
echo '+ { "Dmitry Timoshkov", "windowscodecs: Add support for 8bpp grayscale TIFF images with 8bpp alpha channel.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wine.inf-Performance
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 6f484b8e9cb7dcfcc8c3f0103012576b43572422 Mon Sep 17 00:00:00 2001
|
||||
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
|
||||
Date: Fri, 10 Jul 2015 18:49:44 +0300
|
||||
Subject: widl: Increase buffer size in typegen.c.
|
||||
|
||||
---
|
||||
tools/widl/typegen.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c
|
||||
index 4bb4cc4..045a5b7 100644
|
||||
--- a/tools/widl/typegen.c
|
||||
+++ b/tools/widl/typegen.c
|
||||
@@ -1142,7 +1142,7 @@ static unsigned char get_func_oi2_flags( const var_t *func )
|
||||
static unsigned int write_new_procformatstring_type(FILE *file, int indent, const var_t *var,
|
||||
int is_return, unsigned int *stack_offset)
|
||||
{
|
||||
- char buffer[64];
|
||||
+ char buffer[128];
|
||||
unsigned int stack_size, typestring_offset;
|
||||
unsigned short flags;
|
||||
unsigned char fc = get_parameter_fc( var, is_return, &flags, &stack_size, &typestring_offset );
|
||||
--
|
||||
2.4.5
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [37129] Increase buffer size in widl/typegen.c to avoid buffer overflow
|
||||
@ -1,26 +0,0 @@
|
||||
From ccd2fe7c16c909728d157283d38419af6decfdaf Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Fri, 25 Apr 2014 12:13:56 +0900
|
||||
Subject: windowscodecs: Don't fail to decode GIF if an image has been already
|
||||
loaded.
|
||||
|
||||
---
|
||||
dlls/windowscodecs/ungif.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c
|
||||
index 427b32f..e08cb4b 100644
|
||||
--- a/dlls/windowscodecs/ungif.c
|
||||
+++ b/dlls/windowscodecs/ungif.c
|
||||
@@ -491,7 +491,7 @@ DGifGetLine(GifFileType * GifFile,
|
||||
* image until empty block (size 0) detected. We use GetCodeNext. */
|
||||
do
|
||||
if (DGifGetCodeNext(GifFile, &Dummy) == GIF_ERROR)
|
||||
- return GIF_ERROR;
|
||||
+ break;
|
||||
while (Dummy != NULL) ;
|
||||
}
|
||||
return GIF_OK;
|
||||
--
|
||||
2.3.5
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
Fixes: [32227] Ignore garbage after decoding gif lines
|
||||
Category: stable
|
||||
@ -1,246 +0,0 @@
|
||||
From 62f8f2989fd6f2116fbd93ae9c7a6b9332c2cd77 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 1 Apr 2015 03:06:29 +0200
|
||||
Subject: windowscodecs: Add support for 8bpp grayscale TIFF images with 8bpp
|
||||
alpha channel.
|
||||
|
||||
---
|
||||
dlls/windowscodecs/tests/tiffformat.c | 103 ++++++++++++++++++++++++++++++++++
|
||||
dlls/windowscodecs/tiffformat.c | 66 ++++++++++++++++++++--
|
||||
2 files changed, 164 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c
|
||||
index cc1951e..d07caa3 100644
|
||||
--- a/dlls/windowscodecs/tests/tiffformat.c
|
||||
+++ b/dlls/windowscodecs/tests/tiffformat.c
|
||||
@@ -92,6 +92,48 @@ static const struct tiff_1bpp_data
|
||||
{ 900, 3 },
|
||||
{ 0x11, 0x22, 0x33, 0 }
|
||||
};
|
||||
+
|
||||
+static const struct tiff_8bpp_alpha
|
||||
+{
|
||||
+ USHORT byte_order;
|
||||
+ USHORT version;
|
||||
+ ULONG dir_offset;
|
||||
+ USHORT number_of_entries;
|
||||
+ struct IFD_entry entry[15];
|
||||
+ ULONG next_IFD;
|
||||
+ struct IFD_rational res;
|
||||
+ BYTE pixel_data[8];
|
||||
+} tiff_8bpp_alpha =
|
||||
+{
|
||||
+#ifdef WORDS_BIGENDIAN
|
||||
+ 'M' | 'M' << 8,
|
||||
+#else
|
||||
+ 'I' | 'I' << 8,
|
||||
+#endif
|
||||
+ 42,
|
||||
+ FIELD_OFFSET(struct tiff_8bpp_alpha, number_of_entries),
|
||||
+ 15,
|
||||
+ {
|
||||
+ { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */
|
||||
+ { 0x100, IFD_LONG, 1, 2 }, /* IMAGEWIDTH */
|
||||
+ { 0x101, IFD_LONG, 1, 2 }, /* IMAGELENGTH */
|
||||
+ { 0x102, IFD_SHORT, 2, MAKELONG(8, 8) }, /* BITSPERSAMPLE */
|
||||
+ { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */
|
||||
+ { 0x106, IFD_SHORT, 1, 1 }, /* PHOTOMETRIC */
|
||||
+ { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, pixel_data) }, /* STRIPOFFSETS */
|
||||
+ { 0x115, IFD_SHORT, 1, 2 }, /* SAMPLESPERPIXEL */
|
||||
+ { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */
|
||||
+ { 0x117, IFD_LONG, 1, 8 }, /* STRIPBYTECOUNT */
|
||||
+ { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) },
|
||||
+ { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_8bpp_alpha, res) },
|
||||
+ { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */
|
||||
+ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */
|
||||
+ { 0x152, IFD_SHORT, 1, 1 } /* EXTRASAMPLES: 1 - Associated alpha with pre-multiplied color */
|
||||
+ },
|
||||
+ 0,
|
||||
+ { 96, 1 },
|
||||
+ { 0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88 }
|
||||
+};
|
||||
#include "poppack.h"
|
||||
|
||||
static IWICImagingFactory *factory;
|
||||
@@ -264,6 +306,66 @@ todo_wine
|
||||
IStream_Release(stream);
|
||||
}
|
||||
|
||||
+static void test_tiff_8bpp_alpha(void)
|
||||
+{
|
||||
+ HRESULT hr;
|
||||
+ IWICBitmapDecoder *decoder;
|
||||
+ IWICBitmapFrameDecode *frame;
|
||||
+ UINT frame_count, width, height, i;
|
||||
+ double dpi_x, dpi_y;
|
||||
+ IWICPalette *palette;
|
||||
+ GUID format;
|
||||
+ WICRect rc;
|
||||
+ BYTE data[16];
|
||||
+ static const BYTE expected_data[16] = { 0x11,0x11,0x11,0x22,0x33,0x33,0x33,0x44,
|
||||
+ 0x55,0x55,0x55,0x66,0x77,0x77,0x77,0x88 };
|
||||
+
|
||||
+ decoder = create_decoder(&tiff_8bpp_alpha, sizeof(tiff_8bpp_alpha));
|
||||
+ ok(decoder != 0, "Failed to load TIFF image data\n");
|
||||
+
|
||||
+ hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count);
|
||||
+ ok(hr == S_OK, "GetFrameCount error %#x\n", hr);
|
||||
+ ok(frame_count == 1, "expected 1, got %u\n", frame_count);
|
||||
+
|
||||
+ hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame);
|
||||
+ ok(hr == S_OK, "GetFrame error %#x\n", hr);
|
||||
+
|
||||
+ hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height);
|
||||
+ ok(hr == S_OK, "GetSize error %#x\n", hr);
|
||||
+ ok(width == 2, "expected 2, got %u\n", width);
|
||||
+ ok(height == 2, "expected 2, got %u\n", height);
|
||||
+
|
||||
+ hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y);
|
||||
+ ok(hr == S_OK, "GetResolution error %#x\n", hr);
|
||||
+ ok(dpi_x == 96.0, "expected 96.0, got %f\n", dpi_x);
|
||||
+ ok(dpi_y == 96.0, "expected 96.0, got %f\n", dpi_y);
|
||||
+
|
||||
+ hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format);
|
||||
+ ok(hr == S_OK, "GetPixelFormat error %#x\n", hr);
|
||||
+ ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppPBGRA),
|
||||
+ "got wrong format %s\n", wine_dbgstr_guid(&format));
|
||||
+
|
||||
+ hr = IWICImagingFactory_CreatePalette(factory, &palette);
|
||||
+ ok(hr == S_OK, "CreatePalette error %#x\n", hr);
|
||||
+ hr = IWICBitmapFrameDecode_CopyPalette(frame, palette);
|
||||
+ ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE,
|
||||
+ "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %#x\n", hr);
|
||||
+ IWICPalette_Release(palette);
|
||||
+
|
||||
+ rc.X = 0;
|
||||
+ rc.Y = 0;
|
||||
+ rc.Width = 2;
|
||||
+ rc.Height = 2;
|
||||
+ hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, 8, sizeof(data), data);
|
||||
+ ok(hr == S_OK, "CopyPixels error %#x\n", hr);
|
||||
+
|
||||
+ for (i = 0; i < sizeof(data); i++)
|
||||
+ ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]);
|
||||
+
|
||||
+ IWICBitmapFrameDecode_Release(frame);
|
||||
+ IWICBitmapDecoder_Release(decoder);
|
||||
+}
|
||||
+
|
||||
START_TEST(tiffformat)
|
||||
{
|
||||
HRESULT hr;
|
||||
@@ -277,6 +379,7 @@ START_TEST(tiffformat)
|
||||
|
||||
test_tiff_palette();
|
||||
test_QueryCapability();
|
||||
+ test_tiff_8bpp_alpha();
|
||||
|
||||
IWICImagingFactory_Release(factory);
|
||||
CoUninitialize();
|
||||
diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
|
||||
index 7f987de..51e940f 100644
|
||||
--- a/dlls/windowscodecs/tiffformat.c
|
||||
+++ b/dlls/windowscodecs/tiffformat.c
|
||||
@@ -236,7 +236,7 @@ typedef struct {
|
||||
const WICPixelFormatGUID *format;
|
||||
int bps;
|
||||
int samples;
|
||||
- int bpp;
|
||||
+ int bpp, source_bpp;
|
||||
int planar;
|
||||
int indexed;
|
||||
int reverse_bgr;
|
||||
@@ -326,23 +326,63 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info)
|
||||
decode_info->invert_grayscale = 1;
|
||||
/* fall through */
|
||||
case 1: /* BlackIsZero */
|
||||
- if (samples != 1)
|
||||
+ if (samples == 2)
|
||||
+ {
|
||||
+ ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples);
|
||||
+ if (!ret)
|
||||
+ {
|
||||
+ extra_sample_count = 1;
|
||||
+ extra_sample = 0;
|
||||
+ extra_samples = &extra_sample;
|
||||
+ }
|
||||
+ }
|
||||
+ else if (samples != 1)
|
||||
{
|
||||
- FIXME("unhandled grayscale sample count %u\n", samples);
|
||||
+ FIXME("unhandled %dbpp sample count %u\n", bps, samples);
|
||||
return E_FAIL;
|
||||
}
|
||||
|
||||
- decode_info->bpp = bps;
|
||||
+ decode_info->bpp = bps * samples;
|
||||
+ decode_info->source_bpp = decode_info->bpp;
|
||||
switch (bps)
|
||||
{
|
||||
case 1:
|
||||
+ if (samples != 1)
|
||||
+ {
|
||||
+ FIXME("unhandled 1bpp sample count %u\n", samples);
|
||||
+ return E_FAIL;
|
||||
+ }
|
||||
decode_info->format = &GUID_WICPixelFormatBlackWhite;
|
||||
break;
|
||||
case 4:
|
||||
+ if (samples != 1)
|
||||
+ {
|
||||
+ FIXME("unhandled 4bpp grayscale sample count %u\n", samples);
|
||||
+ return E_FAIL;
|
||||
+ }
|
||||
decode_info->format = &GUID_WICPixelFormat4bppGray;
|
||||
break;
|
||||
case 8:
|
||||
- decode_info->format = &GUID_WICPixelFormat8bppGray;
|
||||
+ if (samples == 1)
|
||||
+ decode_info->format = &GUID_WICPixelFormat8bppGray;
|
||||
+ else
|
||||
+ {
|
||||
+ decode_info->bpp = 32;
|
||||
+
|
||||
+ switch(extra_samples[0])
|
||||
+ {
|
||||
+ case 1: /* Associated (pre-multiplied) alpha data */
|
||||
+ decode_info->format = &GUID_WICPixelFormat32bppPBGRA;
|
||||
+ break;
|
||||
+ case 0: /* Unspecified data */
|
||||
+ case 2: /* Unassociated alpha data */
|
||||
+ decode_info->format = &GUID_WICPixelFormat32bppBGRA;
|
||||
+ break;
|
||||
+ default:
|
||||
+ FIXME("unhandled extra sample type %u\n", extra_samples[0]);
|
||||
+ return E_FAIL;
|
||||
+ }
|
||||
+ }
|
||||
break;
|
||||
default:
|
||||
FIXME("unhandled greyscale bit count %u\n", bps);
|
||||
@@ -943,6 +983,22 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT
|
||||
hr = E_FAIL;
|
||||
}
|
||||
|
||||
+ /* 8bpp grayscale with extra alpha */
|
||||
+ if (hr == S_OK && This->decode_info.source_bpp == 16 && This->decode_info.samples == 2 && This->decode_info.bpp == 32)
|
||||
+ {
|
||||
+ BYTE *src;
|
||||
+ DWORD *dst, count = This->decode_info.tile_width * This->decode_info.tile_height;
|
||||
+
|
||||
+ src = This->cached_tile + This->decode_info.tile_width * This->decode_info.tile_height * 2 - 2;
|
||||
+ dst = (DWORD *)(This->cached_tile + This->decode_info.tile_size - 4);
|
||||
+
|
||||
+ while (count--)
|
||||
+ {
|
||||
+ *dst-- = src[0] | (src[0] << 8) | (src[0] << 16) | (src[1] << 24);
|
||||
+ src -= 2;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (hr == S_OK && This->decode_info.reverse_bgr)
|
||||
{
|
||||
if (This->decode_info.bps == 8)
|
||||
--
|
||||
2.3.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [38027] Support for 8bpp grayscale TIFF images with 8bpp alpha channel
|
||||
Loading…
Reference in New Issue
Block a user