mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against e9c69fde09f0aca171652aaa2e26db2ef075d243.
This commit is contained in:
Sebastian Lackner
parent
726c476b6a
commit
788e74086e
@ -1,2 +1,2 @@
|
||||
Fixes: Implement support for validating ECDSA certificate chains
|
||||
Fixes: [35902] Implement support for validating ECDSA certificate chains
|
||||
Depends: bcrypt-Improvements
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7c59478156e8e41714b825635740ec62b0f8bcb2 Mon Sep 17 00:00:00 2001
|
||||
From 7387aaf6f9344405a95f7fb6c27dfd0f87870d94 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 21 Feb 2015 15:06:03 +0100
|
||||
Subject: dxva2: Implement stubbed DirectX Software VideoProcessor interface.
|
||||
@ -290,7 +290,7 @@ index 936aa37b43c..46e431a7f29 100644
|
||||
}
|
||||
|
||||
diff --git a/include/dxva2api.idl b/include/dxva2api.idl
|
||||
index 7a291570368..7388b373097 100644
|
||||
index 8dd1d961335..838411b22eb 100644
|
||||
--- a/include/dxva2api.idl
|
||||
+++ b/include/dxva2api.idl
|
||||
@@ -86,6 +86,11 @@ cpp_quote("#define DXVA2_ModeVC1_VLD DXVA2_ModeVC1_D")
|
||||
@ -302,9 +302,9 @@ index 7a291570368..7388b373097 100644
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_VideoProcBobDevice, 0x335aa36e, 0x7884,0x43a4, 0x9c, 0x91, 0x7f, 0x87, 0xfa, 0xf3, 0xe3, 0x7e);")
|
||||
+cpp_quote("DEFINE_GUID(DXVA2_VideoProcSoftwareDevice, 0x4553d47f, 0xee7e,0x4e3f, 0x94, 0x75, 0xdb, 0xf1, 0x37, 0x6c, 0x48, 0x10);")
|
||||
+
|
||||
cpp_quote("#ifndef REFERENCE_TIME_DEFINED")
|
||||
cpp_quote("#define REFERENCE_TIME_DEFINED")
|
||||
typedef LONGLONG REFERENCE_TIME;
|
||||
|
||||
enum
|
||||
--
|
||||
2.11.0
|
||||
2.14.1
|
||||
|
||||
|
||||
@ -52,13 +52,13 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "4a2505a93a699baf9668af2cdfdd7b662d13c976"
|
||||
echo "e9c69fde09f0aca171652aaa2e26db2ef075d243"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
version()
|
||||
{
|
||||
echo "Wine Staging 2.18"
|
||||
echo "Wine Staging 2.19 (unreleased)"
|
||||
echo "Copyright (C) 2014-2017 the Wine Staging project authors."
|
||||
echo ""
|
||||
echo "Patchset to be applied on upstream Wine:"
|
||||
@ -327,7 +327,6 @@ patch_enable_all ()
|
||||
enable_packager_DllMain="$1"
|
||||
enable_quartz_MediaSeeking_Positions="$1"
|
||||
enable_quartz_Silence_FIXMEs="$1"
|
||||
enable_regedit_export_string_data="$1"
|
||||
enable_riched20_Class_Tests="$1"
|
||||
enable_riched20_IText_Interface="$1"
|
||||
enable_rpcrt4_Race_Condition="$1"
|
||||
@ -1269,9 +1268,6 @@ patch_enable ()
|
||||
quartz-Silence_FIXMEs)
|
||||
enable_quartz_Silence_FIXMEs="$2"
|
||||
;;
|
||||
regedit-export_string_data)
|
||||
enable_regedit_export_string_data="$2"
|
||||
;;
|
||||
riched20-Class_Tests)
|
||||
enable_riched20_Class_Tests="$2"
|
||||
;;
|
||||
@ -3799,6 +3795,9 @@ fi
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * bcrypt-Improvements
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#35902] Implement support for validating ECDSA certificate chains
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/bcrypt/bcrypt.spec, dlls/bcrypt/bcrypt_main.c, dlls/bcrypt/tests/bcrypt.c, dlls/crypt32/Makefile.in,
|
||||
# | dlls/crypt32/cert.c, dlls/crypt32/chain.c, dlls/crypt32/crypt32_private.h, dlls/crypt32/decode.c, dlls/crypt32/oid.c,
|
||||
@ -7605,21 +7604,6 @@ if test "$enable_quartz_Silence_FIXMEs" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset regedit-export_string_data
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#43805] Fix crash when exporting REG_SZ data if size == 0
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * programs/regedit/regproc.c
|
||||
# |
|
||||
if test "$enable_regedit_export_string_data" -eq 1; then
|
||||
patch_apply regedit-export_string_data/0001-regedit-Don-t-crash-if-REG_SZ-is-empty.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Fabian Maurer", "regedit: Don'\''t crash if REG_SZ is empty.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset riched20-Class_Tests
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 66a5b81f6d880bcb6f3ea251e1fe695a60a27379 Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Maurer <dark.shadow4@web.de>
|
||||
Date: Sat, 30 Sep 2017 18:14:11 +0200
|
||||
Subject: regedit: Don't crash if REG_SZ is empty
|
||||
|
||||
Some reg files can result in an REG_SZ with length 0, like
|
||||
"Value"=hex(1):
|
||||
When exporting with size == 0 we need to account for this case
|
||||
and set the length to 0 to avoid an underflow.
|
||||
|
||||
Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
|
||||
---
|
||||
programs/regedit/regproc.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
|
||||
index 6e6ea473c75..aa1d6fa90fe 100644
|
||||
--- a/programs/regedit/regproc.c
|
||||
+++ b/programs/regedit/regproc.c
|
||||
@@ -1243,11 +1243,12 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode)
|
||||
|
||||
static void export_string_data(WCHAR **buf, WCHAR *data, size_t size)
|
||||
{
|
||||
- size_t len, line_len;
|
||||
+ size_t len = 0, line_len;
|
||||
WCHAR *str;
|
||||
static const WCHAR fmt[] = {'"','%','s','"',0};
|
||||
|
||||
- len = size / sizeof(WCHAR) - 1;
|
||||
+ if(size)
|
||||
+ len = size / sizeof(WCHAR) - 1;
|
||||
str = REGPROC_escape_string(data, len, &line_len);
|
||||
*buf = heap_xalloc((line_len + 3) * sizeof(WCHAR));
|
||||
sprintfW(*buf, fmt, str);
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [43805] Fix crash when exporting REG_SZ data if size == 0
|
||||
@ -1 +1 @@
|
||||
Wine Staging 2.18
|
||||
Wine Staging 2.19 (unreleased)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user