Rebase against 4a315cd78a3c97d76ae06e3185ab01a70eb9a1a2.

This commit is contained in:
Sebastian Lackner 2015-11-26 19:30:18 +01:00
parent a7b8b87d73
commit a85a3e8533
7 changed files with 22 additions and 102 deletions

View File

@ -34,7 +34,12 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features in Wine Staging 1.8-rc2 [262]:**
**Bug fixes and features included in the next upcoming release [1]:**
* Fix font loading in Capella ([Wine Bug #12377](https://bugs.winehq.org/show_bug.cgi?id=12377))
**Bug fixes and features in Wine Staging 1.8-rc1 [268]:**
*Note: The following list only contains features and bug fixes which are not
yet available in vanilla Wine. They are removed from the list as soon as they
@ -47,6 +52,7 @@ for more details.*
* Add IHTMLLocation::hash property's getter implementation ([Wine Bug #32967](https://bugs.winehq.org/show_bug.cgi?id=32967))
* Add a ProfileList\<UserSID> registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670))
* Add a stub driver for tdi.sys ([Wine Bug #35693](https://bugs.winehq.org/show_bug.cgi?id=35693))
* ~~Add implementation for IDXGIOutput::GetDesc~~ ([Wine Bug #32006](https://bugs.winehq.org/show_bug.cgi?id=32006))
* Add implementation for comctl32.PROPSHEET_InsertPage. ([Wine Bug #25625](https://bugs.winehq.org/show_bug.cgi?id=25625))
* Add implementation for mfplat.MFTEnum ([Wine Bug #39309](https://bugs.winehq.org/show_bug.cgi?id=39309))
* Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811))
@ -102,6 +108,7 @@ for more details.*
* Avoid race-conditions in NtReadFile() operations with write watches.
* Avoid race-conditions of async WSARecv() operations with write watches.
* Avoid race-conditions with write watches in WS2_async_accept.
* ~~Avseq crashes when multisampling is enabled~~ ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
* Basic handling of write watches triggered while we're on the signal stack.
* Basic support for CUDA
* Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
@ -126,6 +133,7 @@ for more details.*
* Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
* Export additional OpenAL32 functions ([Wine Bug #38972](https://bugs.winehq.org/show_bug.cgi?id=38972))
* Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
* ~~FEAR 1 installer expects basic_string_wchar_dtor to return NULL~~ ([Wine Bug #37358](https://bugs.winehq.org/show_bug.cgi?id=37358))
* Fake success in IViewObject::Draw stub ([Wine Bug #30611](https://bugs.winehq.org/show_bug.cgi?id=30611))
* Fake success in kernel32.SetFileCompletionNotificationModes ([Wine Bug #38960](https://bugs.winehq.org/show_bug.cgi?id=38960))
* Fallback to default comspec when %COMSPEC% is not set
@ -140,18 +148,19 @@ for more details.*
* Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
* Fix detection of case-insensitive systems in MSYS2
* Fix device paths in HKLM\SYSTEM\MountedDevices ([Wine Bug #38235](https://bugs.winehq.org/show_bug.cgi?id=38235))
* Fix endless loop in regedit when importing files with very long lines
* ~~Fix endless loop in regedit when importing files with very long lines~~
* Fix error handling in DeferWindowPos when passing an invalid HWND ([Wine Bug #23187](https://bugs.winehq.org/show_bug.cgi?id=23187))
* Fix font loading in Capella ([Wine Bug #12377](https://bugs.winehq.org/show_bug.cgi?id=12377))
* Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
* Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
* Fix graphical corruption in FarCry 3 with NVIDIA drivers ([Wine Bug #35062](https://bugs.winehq.org/show_bug.cgi?id=35062))
* ~~Fix gray screen on startup introduced by pixelformat changes.~~ ([Wine Bug #35975](https://bugs.winehq.org/show_bug.cgi?id=35975))
* Fix handling of ANSI NTLM credentials ([Wine Bug #37063](https://bugs.winehq.org/show_bug.cgi?id=37063))
* Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
* Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
* Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
* Fix implementation of msvcrt.close when stdout == stderr
* Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
* ~~Fix missing video introduced by pixelformat changes.~~ ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
* Fix multithreading issues with fullscreen clipping ([Wine Bug #38087](https://bugs.winehq.org/show_bug.cgi?id=38087))
* Fix possible segfault in pulse_rd_loop of PulseAudio backend
* Fix race-condition when threads are killed during shutdown
@ -176,6 +185,7 @@ for more details.*
* Implement FileNamesInformation class support for NtQueryDirectoryFile
* Implement FolderImpl_Items and stubbed FolderItems interface
* Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
* ~~Implement IDXGIOutput::GetDesc~~
* Implement SystemHandleInformation info class
* Implement a Courier New replacement font ([Wine Bug #20456](https://bugs.winehq.org/show_bug.cgi?id=20456))
* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
@ -247,6 +257,7 @@ for more details.*
* Return dummy ID3DXSkinInfo interface when skinning info not present ([Wine Bug #33904](https://bugs.winehq.org/show_bug.cgi?id=33904))
* 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 to prepare GL resources before calling context_apply_fbo_state~~ ([Wine Bug #39536](https://bugs.winehq.org/show_bug.cgi?id=39536))
* SHFileOperation with FO_MOVE should create new directory on Vista+ ([Wine Bug #25207](https://bugs.winehq.org/show_bug.cgi?id=25207))
* SO_CONNECT_TIME returns the appropriate time
* Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
@ -304,5 +315,5 @@ for more details.*
* XEMBED support for embedding Wine windows inside Linux applications
* eRacer Demo doesn't correctly display text ([Wine Bug #29598](https://bugs.winehq.org/show_bug.cgi?id=29598))
* ntdll is missing WinSqm[Start|End]Session implementation ([Wine Bug #31971](https://bugs.winehq.org/show_bug.cgi?id=31971))
* wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
* ~~wglDescribePixelFormat should return max index for NULL descriptor~~ ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))

View File

@ -1,27 +0,0 @@
From 69bb805398645531fbc224319ab99dab29129c68 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 8 Nov 2014 11:32:11 +0100
Subject: gdi32: Return maximum number of pixel formats when NULL pointer is
passed to wglDescribePixelFormat.
---
dlls/gdi32/dibdrv/opengl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c
index 28a03f4..edbd2e9 100644
--- a/dlls/gdi32/dibdrv/opengl.c
+++ b/dlls/gdi32/dibdrv/opengl.c
@@ -149,7 +149,8 @@ static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORM
{
int ret = sizeof(pixel_formats) / sizeof(pixel_formats[0]);
- if (fmt <= 0 || fmt > ret) return ret;
+ if (!descr) return ret;
+ if (fmt <= 0 || fmt > ret) return ret; /* FIXME: should this be 0? */
if (size < sizeof(*descr)) return 0;
memset( descr, 0, sizeof(*descr) );
--
2.1.3

View File

@ -1,2 +0,0 @@
Fixes: [6176] wglDescribePixelFormat should return max index for NULL descriptor
Category: stable

View File

@ -52,13 +52,13 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "6790d825d1b2c41de73ffe5cb5df28c1d1cc8878"
echo "4a315cd78a3c97d76ae06e3185ab01a70eb9a1a2"
}
# Show version information
version()
{
echo "Wine Staging 1.8-rc2"
echo "Wine Staging 1.8-rc2 (unreleased)"
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
@ -136,7 +136,6 @@ patch_enable_all ()
enable_dxva2_Video_Decoder="$1"
enable_fonts_Missing_Fonts="$1"
enable_gdi32_Lazy_Font_Initialization="$1"
enable_gdi32_MaxPixelFormats="$1"
enable_gdi32_MultiMonitor="$1"
enable_gdi32_Symbol_Truetype_Font="$1"
enable_hal_KeQueryPerformanceCounter="$1"
@ -232,7 +231,6 @@ patch_enable_all ()
enable_opengl32_Revert_Disable_Ext="$1"
enable_quartz_MediaSeeking_Positions="$1"
enable_rasapi32_RasEnumDevicesA="$1"
enable_regedit_Reg_Parser="$1"
enable_riched20_IText_Interface="$1"
enable_rpcrt4_Pipe_Transport="$1"
enable_secur32_ANSI_NTLM_Credentials="$1"
@ -516,9 +514,6 @@ patch_enable ()
gdi32-Lazy_Font_Initialization)
enable_gdi32_Lazy_Font_Initialization="$2"
;;
gdi32-MaxPixelFormats)
enable_gdi32_MaxPixelFormats="$2"
;;
gdi32-MultiMonitor)
enable_gdi32_MultiMonitor="$2"
;;
@ -804,9 +799,6 @@ patch_enable ()
rasapi32-RasEnumDevicesA)
enable_rasapi32_RasEnumDevicesA="$2"
;;
regedit-Reg_Parser)
enable_regedit_Reg_Parser="$2"
;;
riched20-IText_Interface)
enable_riched20_IText_Interface="$2"
;;
@ -1532,9 +1524,6 @@ if test "$enable_category_stable" -eq 1; then
if test "$enable_fonts_Missing_Fonts" -gt 1; then
abort "Patchset fonts-Missing_Fonts disabled, but category-stable depends on that."
fi
if test "$enable_gdi32_MaxPixelFormats" -gt 1; then
abort "Patchset gdi32-MaxPixelFormats disabled, but category-stable depends on that."
fi
if test "$enable_kernel32_CompareStringEx" -gt 1; then
abort "Patchset kernel32-CompareStringEx disabled, but category-stable depends on that."
fi
@ -1699,7 +1688,6 @@ if test "$enable_category_stable" -eq 1; then
enable_dbghelp_Debug_Symbols=1
enable_ddraw_EnumSurfaces=1
enable_fonts_Missing_Fonts=1
enable_gdi32_MaxPixelFormats=1
enable_kernel32_CompareStringEx=1
enable_kernel32_Named_Pipe=1
enable_libs_Debug_Channel=1
@ -3107,21 +3095,6 @@ if test "$enable_gdi32_Lazy_Font_Initialization" -eq 1; then
) >> "$patchlist"
fi
# Patchset gdi32-MaxPixelFormats
# |
# | This patchset fixes the following Wine bugs:
# | * [#6176] wglDescribePixelFormat should return max index for NULL descriptor
# |
# | Modified files:
# | * dlls/gdi32/dibdrv/opengl.c
# |
if test "$enable_gdi32_MaxPixelFormats" -eq 1; then
patch_apply gdi32-MaxPixelFormats/0001-gdi32-Return-maximum-number-of-pixel-formats-when-NU.patch
(
echo '+ { "Sebastian Lackner", "gdi32: Return maximum number of pixel formats when NULL pointer is passed to wglDescribePixelFormat.", 1 },';
) >> "$patchlist"
fi
# Patchset gdi32-MultiMonitor
# |
# | This patchset fixes the following Wine bugs:
@ -4765,18 +4738,6 @@ if test "$enable_rasapi32_RasEnumDevicesA" -eq 1; then
) >> "$patchlist"
fi
# Patchset regedit-Reg_Parser
# |
# | Modified files:
# | * programs/regedit/regproc.c
# |
if test "$enable_regedit_Reg_Parser" -eq 1; then
patch_apply regedit-Reg_Parser/0001-regedit-Need-3-bytes-of-room-at-end-of-buffer-for-r-.patch
(
echo '+ { "Jiaxing Wang", "regedit: Need 3 bytes of room at end of buffer for \\\\r\\\\n\\\\0 to avoid endless loop.", 1 },';
) >> "$patchlist"
fi
# Patchset riched20-IText_Interface
# |
# | Modified files:

View File

@ -1,26 +0,0 @@
From cda8b02c4668966712fb2eeca1e821b22f500575 Mon Sep 17 00:00:00 2001
From: Jiaxing Wang <hello.wjx@gmail.com>
Date: Thu, 21 May 2015 19:14:53 +0800
Subject: regedit: Need 3 bytes of room at end of buffer for \r\n\0 to avoid
endless loop.
---
programs/regedit/regproc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 643b559..2d766de 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -641,7 +641,7 @@ static void processRegLinesA(FILE *in, char* first_chars)
/* Do we need to expand the buffer ? */
assert (s >= line && s <= line + lineSize);
size_remaining = lineSize - (s-line);
- if (size_remaining < 2) /* room for 1 character and the \0 */
+ if (size_remaining < 3) /* need at least 3 bytes of room for \r\n\0 */
{
char *new_buffer;
size_t new_size = lineSize + REG_VAL_BUF_SIZE;
--
2.4.2

View File

@ -1 +0,0 @@
Fixes: Fix endless loop in regedit when importing files with very long lines

View File

@ -1,9 +1,13 @@
wine-staging (1.8~rc2) unstable; urgency=low
wine-staging (1.8~rc2) UNRELEASED; urgency=low
* Removed patch to revert "prepare GLresources before calling
context_apply_fbo_state" commit.
* Removed patch to set EAX to 0 in Basic_string_wchar_dtor (accepted
upstream).
* Removed patch for IDXGIOutput::GetDesc (fixed upstream).
* Removed patch to fix possible endless loop in regedit when importing
specific files (accepted upstream).
* Removed patch to add NULL pointer check in dibdrv_wglDescribePixelFormat
(accepted upstream).
-- Sebastian Lackner <sebastian@fds-team.de> Wed, 25 Nov 2015 20:21:46 +0100
wine-staging (1.8~rc1) unstable; urgency=low