mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 8039941c52758113955d376bd7b6b6e1e5b5f76c
This commit is contained in:
Alistair Leslie-Hughes
parent
133bed10d3
commit
05f918ddb4
@ -1,29 +1,30 @@
|
||||
From 9774b93b25d11fe143fcf4ab7159135334916045 Mon Sep 17 00:00:00 2001
|
||||
From 8a5768bc4dc64dd9a0df5d7b781a569622b8c9b6 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Wed, 27 Aug 2014 00:31:23 +0200
|
||||
Subject: configure: Also add the absolute RPATH when linking against libwine.
|
||||
Subject: [PATCH] configure: Also add the absolute RPATH when linking against
|
||||
libwine.
|
||||
|
||||
---
|
||||
configure.ac | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 2222c687d9..513bdef795 100644
|
||||
index e6acb786a4d..bd3fe968839 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -943,10 +943,10 @@ case $host_os in
|
||||
@@ -956,10 +956,10 @@ case $host_os in
|
||||
WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000"
|
||||
|
||||
WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
|
||||
WINE_TRY_CFLAGS([-Wl,--rpath,\$ORIGIN/../lib],
|
||||
- [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
|
||||
+ [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`:\$(DESTDIR)\${libdir}"
|
||||
LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"],
|
||||
[WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
|
||||
[WINE_TRY_CFLAGS([-Wl,-R,\$ORIGIN/../lib],
|
||||
- [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
|
||||
+ [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`:\$(DESTDIR)\${libdir}"
|
||||
LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])])
|
||||
|
||||
WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
|
||||
--
|
||||
2.14.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
From 6b854028f5c0aa5ae5cdea1e1ee9a9193fd14eb0 Mon Sep 17 00:00:00 2001
|
||||
From 5e533251f60d54e5660b81ff847f09408ed3d281 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Wed, 20 Jun 2018 15:10:08 -0500
|
||||
Subject: [PATCH 58/83] server: Don't check for a hung queue when sending
|
||||
low-level hooks.
|
||||
Subject: [PATCH] server: Don't check for a hung queue when sending low-level
|
||||
hooks.
|
||||
|
||||
Since user32 does this.
|
||||
|
||||
@ -12,7 +12,7 @@ This logic is independent of the SMTO_ABORTIFHUNG logic on Windows. In fact, IsH
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/server/queue.c b/server/queue.c
|
||||
index 16ed7c5d3..174a4ac09 100644
|
||||
index 16ed7c5d3dc..174a4ac09f9 100644
|
||||
--- a/server/queue.c
|
||||
+++ b/server/queue.c
|
||||
@@ -1688,7 +1688,6 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From 8546a498af3b79503e310f80d132abe6b4b49670 Mon Sep 17 00:00:00 2001
|
||||
From a7cf9dff0dc87d7711df856971d1d6c2465ceba0 Mon Sep 17 00:00:00 2001
|
||||
From: Zebediah Figura <z.figura12@gmail.com>
|
||||
Date: Tue, 26 Jun 2018 18:44:44 -0500
|
||||
Subject: [PATCH] kernel32/tests: Zigzag test.
|
||||
|
||||
The primary function is to check for races. The secondary function is to measure performance.
|
||||
---
|
||||
dlls/kernel32/tests/sync.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/kernel32/tests/sync.c | 79 ++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 79 insertions(+)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c
|
||||
index 66ec3af..5960e92 100644
|
||||
index 5896211214f..f4307d1a5b6 100644
|
||||
--- a/dlls/kernel32/tests/sync.c
|
||||
+++ b/dlls/kernel32/tests/sync.c
|
||||
@@ -3025,6 +3025,84 @@ todo_wine
|
||||
DeleteCriticalSection(&cs);
|
||||
@@ -3044,6 +3044,84 @@ static void test_crit_section(void)
|
||||
ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo);
|
||||
}
|
||||
|
||||
+static int zigzag_state, zigzag_count[2], zigzag_stop;
|
||||
@ -97,7 +97,7 @@ index 66ec3af..5960e92 100644
|
||||
START_TEST(sync)
|
||||
{
|
||||
char **argv;
|
||||
@@ -3084,5 +3162,6 @@ START_TEST(sync)
|
||||
@@ -3104,5 +3182,6 @@ START_TEST(sync)
|
||||
test_srwlock_example();
|
||||
test_alertable_wait();
|
||||
test_apc_deadlock();
|
||||
@ -105,5 +105,5 @@ index 66ec3af..5960e92 100644
|
||||
test_crit_section();
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
From 2f853c3bc210e0aa49e47cade7ae81f47c3bd430 Mon Sep 17 00:00:00 2001
|
||||
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
|
||||
Date: Sat, 26 Jul 2014 12:31:50 -0600
|
||||
Subject: iphlpapi: Implement AllocateAndGetTcpExTableFromStack. (v2)
|
||||
|
||||
Based on a patch by Ralf Habacker.
|
||||
---
|
||||
dlls/iphlpapi/iphlpapi.spec | 1 +
|
||||
dlls/iphlpapi/ipstats.c | 36 ++++++++++++++++++++++++++++++++++++
|
||||
include/iphlpapi.h | 1 +
|
||||
3 files changed, 38 insertions(+)
|
||||
|
||||
diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec
|
||||
index 1686644..4769c3c 100644
|
||||
--- a/dlls/iphlpapi/iphlpapi.spec
|
||||
+++ b/dlls/iphlpapi/iphlpapi.spec
|
||||
@@ -5,6 +5,7 @@
|
||||
@ stdcall AllocateAndGetIpAddrTableFromStack( ptr long long long )
|
||||
@ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long )
|
||||
@ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long )
|
||||
+@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long long )
|
||||
@ stdcall AllocateAndGetTcpTableFromStack( ptr long long long )
|
||||
@ stdcall AllocateAndGetUdpTableFromStack( ptr long long long )
|
||||
@ stdcall CancelIPChangeNotify( ptr )
|
||||
diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c
|
||||
index 863edd3..2d7bdfd 100644
|
||||
--- a/dlls/iphlpapi/ipstats.c
|
||||
+++ b/dlls/iphlpapi/ipstats.c
|
||||
@@ -2330,6 +2330,42 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO
|
||||
return build_tcp_table( TCP_TABLE_BASIC_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL );
|
||||
}
|
||||
|
||||
+/******************************************************************
|
||||
+ * AllocateAndGetTcpExTableFromStack (IPHLPAPI.@)
|
||||
+ *
|
||||
+ * Get the TCP connection table.
|
||||
+ * Like GetTcpTable(), but allocate the returned table from heap.
|
||||
+ *
|
||||
+ * PARAMS
|
||||
+ * ppTcpTable [Out] pointer into which the MIB_TCPTABLE_EX is
|
||||
+ * allocated and returned.
|
||||
+ * bOrder [In] whether to sort the table
|
||||
+ * heap [In] heap from which the table is allocated
|
||||
+ * flags [In] flags to HeapAlloc
|
||||
+ * family [In] address family [AF_INET|AF_INET6]
|
||||
+ *
|
||||
+ * RETURNS
|
||||
+ * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable()
|
||||
+ * returns otherwise.
|
||||
+ */
|
||||
+DWORD WINAPI AllocateAndGetTcpExTableFromStack( VOID **ppTcpTable, BOOL bOrder,
|
||||
+ HANDLE heap, DWORD flags, DWORD family )
|
||||
+{
|
||||
+ TRACE("table %p, bOrder %d, heap %p, flags 0x%08x, family %u\n",
|
||||
+ ppTcpTable, bOrder, heap, flags, family);
|
||||
+
|
||||
+ if (!ppTcpTable) return ERROR_INVALID_PARAMETER;
|
||||
+ if (!family) return ERROR_INVALID_PARAMETER;
|
||||
+
|
||||
+ if (family != WS_AF_INET)
|
||||
+ {
|
||||
+ FIXME( "family = %u not supported\n", family );
|
||||
+ return ERROR_NOT_SUPPORTED;
|
||||
+ }
|
||||
+
|
||||
+ return build_tcp_table( TCP_TABLE_OWNER_PID_ALL, ppTcpTable, bOrder, heap, flags, NULL );
|
||||
+}
|
||||
+
|
||||
static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size )
|
||||
{
|
||||
DWORD table_size;
|
||||
diff --git a/include/iphlpapi.h b/include/iphlpapi.h
|
||||
index 54d93d1..8ed6c78 100644
|
||||
--- a/include/iphlpapi.h
|
||||
+++ b/include/iphlpapi.h
|
||||
@@ -156,6 +156,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved,
|
||||
|
||||
DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags);
|
||||
DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags);
|
||||
+DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family);
|
||||
DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags);
|
||||
DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags);
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [34372] Support for AllocateAndGetTcpExTableFromStack
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "5bd1b2652c844a2522131bd26feb95231f718986"
|
||||
echo "8039941c52758113955d376bd7b6b6e1e5b5f76c"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -157,7 +157,6 @@ patch_enable_all ()
|
||||
enable_inseng_Implementation="$1"
|
||||
enable_iphlpapi_GetBestRoute2="$1"
|
||||
enable_iphlpapi_System_Ping="$1"
|
||||
enable_iphlpapi_TCP_Table="$1"
|
||||
enable_kernel32_CopyFileEx="$1"
|
||||
enable_kernel32_Debugger="$1"
|
||||
enable_kernel32_FindFirstFile="$1"
|
||||
@ -607,9 +606,6 @@ patch_enable ()
|
||||
iphlpapi-System_Ping)
|
||||
enable_iphlpapi_System_Ping="$2"
|
||||
;;
|
||||
iphlpapi-TCP_Table)
|
||||
enable_iphlpapi_TCP_Table="$2"
|
||||
;;
|
||||
kernel32-CopyFileEx)
|
||||
enable_kernel32_CopyFileEx="$2"
|
||||
;;
|
||||
@ -3799,7 +3795,6 @@ if test "$enable_eventfd_synchronization" -eq 1; then
|
||||
printf '%s\n' '+ { "Zebediah Figura", "ntdll: Let the server know when we are doing a message wait.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "ntdll: Avoid server_select() when waiting for critical sections.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "user32: Remove hooks that time out.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "server: Don'\''t check for a hung queue when sending low-level hooks.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "kernel32/tests: Zigzag test.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "=?UTF-8?q?server:=20Try=20to=20remove=20a=20pre?= =?UTF-8?q?=C3=ABxisting=20shm=20file.?=.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "ntdll: Implement NtQuerySemaphore().", 1 },';
|
||||
@ -4087,21 +4082,6 @@ if test "$enable_iphlpapi_System_Ping" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset iphlpapi-TCP_Table
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#34372] Support for AllocateAndGetTcpExTableFromStack
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/iphlpapi/iphlpapi.spec, dlls/iphlpapi/ipstats.c, include/iphlpapi.h
|
||||
# |
|
||||
if test "$enable_iphlpapi_TCP_Table" -eq 1; then
|
||||
patch_apply iphlpapi-TCP_Table/0001-iphlpapi-Implement-AllocateAndGetTcpExTableFromStack.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Erich E. Hoover", "iphlpapi: Implement AllocateAndGetTcpExTableFromStack.", 2 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-File_Permissions
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4cc906486ee06960c3031bb7eaeda7ebf046be66 Mon Sep 17 00:00:00 2001
|
||||
From 23aaa7e61202ea8fd85a632203039d0f2c02ed49 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 6 Jun 2015 06:53:34 +0200
|
||||
Subject: [PATCH] wined3d: Use real values for memory accounting on NVIDIA
|
||||
@ -8,16 +8,16 @@ FIXME: Reimplement wined3d_device_get_available_texture_mem
|
||||
without using the context on the main thread.
|
||||
---
|
||||
dlls/d3d9/tests/device.c | 11 +++++++----
|
||||
dlls/wined3d/adapter_gl.c | 10 ++++++++++
|
||||
dlls/wined3d/adapter_gl.c | 12 ++++++++++++
|
||||
dlls/wined3d/device.c | 23 +++++++++++++++++++++++
|
||||
dlls/wined3d/wined3d_gl.h | 1 +
|
||||
4 files changed, 41 insertions(+), 4 deletions(-)
|
||||
4 files changed, 43 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
|
||||
index cabd15a..84746a9 100644
|
||||
index f5c89723cb..60836094cf 100644
|
||||
--- a/dlls/d3d9/tests/device.c
|
||||
+++ b/dlls/d3d9/tests/device.c
|
||||
@@ -9505,10 +9505,13 @@ static void test_vidmem_accounting(void)
|
||||
@@ -9579,10 +9579,13 @@ static void test_vidmem_accounting(void)
|
||||
}
|
||||
vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device);
|
||||
|
||||
@ -36,10 +36,10 @@ index cabd15a..84746a9 100644
|
||||
for (i = 0; i < ARRAY_SIZE(textures); i++)
|
||||
{
|
||||
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
|
||||
index 2a3514a..637bb6f 100644
|
||||
index cedd012c89..ace63ed0c8 100644
|
||||
--- a/dlls/wined3d/adapter_gl.c
|
||||
+++ b/dlls/wined3d/adapter_gl.c
|
||||
@@ -225,6 +225,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
|
||||
@@ -227,6 +227,7 @@ static const struct wined3d_extension_map gl_extension_map[] =
|
||||
{"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2 },
|
||||
{"GL_NV_vertex_program2_option", NV_VERTEX_PROGRAM2_OPTION },
|
||||
{"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3 },
|
||||
@ -47,9 +47,9 @@ index 2a3514a..637bb6f 100644
|
||||
};
|
||||
|
||||
static const struct wined3d_extension_map wgl_extension_map[] =
|
||||
@@ -1007,6 +1008,15 @@ static const struct wined3d_gpu_description *query_gpu_description(const struct
|
||||
TRACE("Card reports vendor PCI ID 0x%04x, device PCI ID 0x%04x, 0x%s bytes of video memory.\n",
|
||||
vendor, device, wine_dbgstr_longlong(*vram_bytes));
|
||||
@@ -1010,6 +1011,17 @@ static const struct wined3d_gpu_description *query_gpu_description(const struct
|
||||
|
||||
gpu_description = wined3d_get_gpu_description(vendor, device);
|
||||
}
|
||||
+ else if (gl_info->supported[NVX_GPU_MEMORY_INFO])
|
||||
+ {
|
||||
@ -59,15 +59,17 @@ index 2a3514a..637bb6f 100644
|
||||
+ *vram_bytes = (UINT64)vram_kb * 1024;
|
||||
+ TRACE("Got 0x%s as video memory from NVX_GPU_MEMORY_INFO extension.\n",
|
||||
+ wine_dbgstr_longlong(*vram_bytes));
|
||||
+
|
||||
+ gpu_description = wined3d_get_gpu_description(vendor, device);
|
||||
+ }
|
||||
|
||||
if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE)
|
||||
{
|
||||
if ((gpu_description_override = wined3d_get_user_override_gpu_description(vendor, device)))
|
||||
gpu_description = gpu_description_override;
|
||||
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
|
||||
index a89a33d..4ce7031 100644
|
||||
index 23ba41c56b..19744f778d 100644
|
||||
--- a/dlls/wined3d/device.c
|
||||
+++ b/dlls/wined3d/device.c
|
||||
@@ -1308,6 +1308,29 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device
|
||||
@@ -1266,6 +1266,29 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device
|
||||
|
||||
driver_info = &device->adapter->driver_info;
|
||||
|
||||
@ -98,7 +100,7 @@ index a89a33d..4ce7031 100644
|
||||
wine_dbgstr_longlong(driver_info->vram_bytes),
|
||||
wine_dbgstr_longlong(device->adapter->vram_bytes_used),
|
||||
diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h
|
||||
index a02073c..6e9e58c 100644
|
||||
index 5241b6c41e..1aaf108366 100644
|
||||
--- a/dlls/wined3d/wined3d_gl.h
|
||||
+++ b/dlls/wined3d/wined3d_gl.h
|
||||
@@ -206,6 +206,7 @@ enum wined3d_gl_extension
|
||||
@ -110,5 +112,5 @@ index a02073c..6e9e58c 100644
|
||||
WGL_ARB_PIXEL_FORMAT,
|
||||
WGL_EXT_SWAP_CONTROL,
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user