wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 4a315cd78a3c97d76ae06e3185ab01a70eb9a1a2.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/gdi32-MaxPixelFormats/0001-gdi32-Return-maximum-number-of-pixel-formats-when-NU.patch
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

2
patches/gdi32-MaxPixelFormats/definition
View File

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

43
patches/patchinstall.sh
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:

26
patches/regedit-Reg_Parser/0001-regedit-Need-3-bytes-of-room-at-end-of-buffer-for-r-.patch
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

1
patches/regedit-Reg_Parser/definition
View File

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