mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 5101a90bca2bd2618b488f37624af43efe17a0e0.
[secur32-Gnutls_Algorithms] Removed patch to define missing gnutls_kx_algorithm_t values for old gnutls versions (accepted upstream). [taskmgr-Memory_Usage] Removed patch to use sysinfo to report correct number of physical pages (accepted upstream).
This commit is contained in:
Sebastian Lackner
parent
31baacffe2
commit
f788007dc4
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "1bcc7ce75f64f2894de43379674bc5c53c52bb3a"
|
||||
echo "5101a90bca2bd2618b488f37624af43efe17a0e0"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -271,7 +271,6 @@ patch_enable_all ()
|
||||
enable_riched20_IText_Interface="$1"
|
||||
enable_rpcrt4_Pipe_Transport="$1"
|
||||
enable_rpcrt4_RpcBindingServerFromClient="$1"
|
||||
enable_secur32_Gnutls_Algorithms="$1"
|
||||
enable_secur32_Zero_Buffer_Length="$1"
|
||||
enable_server_ClipCursor="$1"
|
||||
enable_server_CreateProcess_ACLs="$1"
|
||||
@ -990,9 +989,6 @@ patch_enable ()
|
||||
rpcrt4-RpcBindingServerFromClient)
|
||||
enable_rpcrt4_RpcBindingServerFromClient="$2"
|
||||
;;
|
||||
secur32-Gnutls_Algorithms)
|
||||
enable_secur32_Gnutls_Algorithms="$2"
|
||||
;;
|
||||
secur32-Zero_Buffer_Length)
|
||||
enable_secur32_Zero_Buffer_Length="$2"
|
||||
;;
|
||||
@ -5817,18 +5813,6 @@ if test "$enable_rpcrt4_RpcBindingServerFromClient" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset secur32-Gnutls_Algorithms
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/secur32/schannel_gnutls.c
|
||||
# |
|
||||
if test "$enable_secur32_Gnutls_Algorithms" -eq 1; then
|
||||
patch_apply secur32-Gnutls_Algorithms/0001-secur32-Define-missing-gnutls_kx_algorithm_t-values-.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "secur32: Define missing gnutls_kx_algorithm_t values for old gnutls versions.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset secur32-Zero_Buffer_Length
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -6608,16 +6592,14 @@ fi
|
||||
# Patchset taskmgr-Memory_Usage
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/ntdll/nt.c, dlls/ntdll/virtual.c, programs/taskmgr/font.bmp, programs/taskmgr/graph.c,
|
||||
# | programs/taskmgr/resource.h, programs/taskmgr/taskmgr.c, programs/taskmgr/taskmgr.rc
|
||||
# | * dlls/ntdll/nt.c, programs/taskmgr/font.bmp, programs/taskmgr/graph.c, programs/taskmgr/resource.h,
|
||||
# | programs/taskmgr/taskmgr.c, programs/taskmgr/taskmgr.rc
|
||||
# |
|
||||
if test "$enable_taskmgr_Memory_Usage" -eq 1; then
|
||||
patch_apply taskmgr-Memory_Usage/0001-ntdll-Use-sysinfo-to-report-correct-number-of-physic.patch
|
||||
patch_apply taskmgr-Memory_Usage/0002-ntdll-Report-system-information-SystemPerformanceInf.patch
|
||||
patch_apply taskmgr-Memory_Usage/0003-taskmgr-Use-system-font-instead-of-special-bitmap-fo.patch
|
||||
patch_apply taskmgr-Memory_Usage/0004-taskmgr-Use-different-units-depending-on-memory-usag.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "ntdll: Use sysinfo to report correct number of physical pages.", 1 },';
|
||||
echo '+ { "Michael Müller", "ntdll: Report system information SystemPerformanceInformation info class.", 1 },';
|
||||
echo '+ { "Michael Müller", "taskmgr: Use system font instead of special bitmap font.", 1 },';
|
||||
echo '+ { "Michael Müller", "taskmgr: Use different units depending on memory usage.", 1 },';
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 7ce6926804895efc9abe5ebee6190fd47a79421a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 10 Jul 2016 06:35:28 +0200
|
||||
Subject: secur32: Define missing gnutls_kx_algorithm_t values for old gnutls
|
||||
versions.
|
||||
|
||||
---
|
||||
dlls/secur32/schannel_gnutls.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c
|
||||
index 7f2dbd6..9a96634 100644
|
||||
--- a/dlls/secur32/schannel_gnutls.c
|
||||
+++ b/dlls/secur32/schannel_gnutls.c
|
||||
@@ -82,6 +82,11 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function);
|
||||
#define GNUTLS_CIPHER_AES_192_CBC 92
|
||||
#define GNUTLS_CIPHER_AES_128_GCM 93
|
||||
#define GNUTLS_CIPHER_AES_256_GCM 94
|
||||
+
|
||||
+#define GNUTLS_KX_ANON_ECDH 11
|
||||
+#define GNUTLS_KX_ECDHE_RSA 12
|
||||
+#define GNUTLS_KX_ECDHE_ECDSA 13
|
||||
+#define GNUTLS_KX_ECDHE_PSK 14
|
||||
#endif
|
||||
|
||||
static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher)
|
||||
--
|
||||
2.8.0
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From cfc7a0a240df174882997f8b69d37848543e12dd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Wed, 27 Jan 2016 04:54:15 +0100
|
||||
Subject: ntdll: Use sysinfo to report correct number of physical pages.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/ntdll/virtual.c | 14 ++++++++++++++
|
||||
2 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 59fc4fa..3909cd5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -502,6 +502,7 @@ AC_CHECK_HEADERS(\
|
||||
sys/statvfs.h \
|
||||
sys/strtio.h \
|
||||
sys/syscall.h \
|
||||
+ sys/sysinfo.h \
|
||||
sys/tihdr.h \
|
||||
sys/time.h \
|
||||
sys/timeout.h \
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index f4ca487..b9a59fc 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -38,6 +38,9 @@
|
||||
#ifdef HAVE_SYS_MMAN_H
|
||||
# include <sys/mman.h>
|
||||
#endif
|
||||
+#ifdef HAVE_SYS_SYSINFO_H
|
||||
+# include <sys/sysinfo.h>
|
||||
+#endif
|
||||
#ifdef HAVE_VALGRIND_VALGRIND_H
|
||||
# include <valgrind/valgrind.h>
|
||||
#endif
|
||||
@@ -1356,11 +1359,22 @@ void virtual_init_threading(void)
|
||||
*/
|
||||
void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info )
|
||||
{
|
||||
+#ifdef HAVE_SYS_SYSINFO_H
|
||||
+ struct sysinfo sinfo;
|
||||
+#endif
|
||||
+
|
||||
info->unknown = 0;
|
||||
info->KeMaximumIncrement = 0; /* FIXME */
|
||||
info->PageSize = page_size;
|
||||
info->MmLowestPhysicalPage = 1;
|
||||
info->MmHighestPhysicalPage = 0x7fffffff / page_size;
|
||||
+#ifdef HAVE_SYS_SYSINFO_H
|
||||
+ if (!sysinfo(&sinfo))
|
||||
+ {
|
||||
+ ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit;
|
||||
+ info->MmHighestPhysicalPage = max(1, total / page_size);
|
||||
+ }
|
||||
+#endif
|
||||
info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage;
|
||||
info->AllocationGranularity = get_mask(0) + 1;
|
||||
info->LowestUserAddress = (void *)0x10000;
|
||||
--
|
||||
2.6.4
|
||||
|
||||
@ -3878,7 +3878,7 @@ diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
|
||||
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
|
||||
--- a/dlls/wined3d/shader.c
|
||||
+++ b/dlls/wined3d/shader.c
|
||||
@@ -3057,7 +3057,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
|
||||
@@ -3036,7 +3036,11 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
|
||||
UINT i;
|
||||
|
||||
memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user