wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ab313dd3beb7e495b36f8320ffc2354b9c854d51.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-07-14 08:09:51 +02:00
parent c852826507
commit 201e62615e
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "989a9dc91778c94d0cf0c769709f10dcc92a5ead"
echo "ab313dd3beb7e495b36f8320ffc2354b9c854d51"
}
# Show version information
@ -444,7 +444,6 @@ patch_enable_all ()
enable_wined3d_WINED3DFMT_R32G32_UINT="$1"
enable_wined3d_buffer_create="$1"
enable_wined3d_sample_c_lz="$1"
enable_wined3d_wined3d_event_query_create="$1"
enable_wined3d_wined3d_guess_gl_vendor="$1"
enable_winedbg_Process_Arguments="$1"
enable_winedevice_Default_Drivers="$1"
@ -1585,9 +1584,6 @@ patch_enable ()
wined3d-sample_c_lz)
enable_wined3d_sample_c_lz="$2"
;;
wined3d-wined3d_event_query_create)
enable_wined3d_wined3d_event_query_create="$2"
;;
wined3d-wined3d_guess_gl_vendor)
enable_wined3d_wined3d_guess_gl_vendor="$2"
;;
@ -9288,18 +9284,6 @@ if test "$enable_wined3d_sample_c_lz" -eq 1; then
) >> "$patchlist"
fi
# Patchset wined3d-wined3d_event_query_create
# |
# | Modified files:
# | * dlls/wined3d/query.c
# |
if test "$enable_wined3d_wined3d_event_query_create" -eq 1; then
patch_apply wined3d-wined3d_event_query_create/0001-wined3d-Return-hr-result-in-wined3d_event_query_crea.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "wined3d: Return hr result in wined3d_event_query_create.", 1 },';
) >> "$patchlist"
fi
# Patchset wined3d-wined3d_guess_gl_vendor
# |
# | This patchset fixes the following Wine bugs:

25
patches/wined3d-wined3d_event_query_create/0001-wined3d-Return-hr-result-in-wined3d_event_query_crea.patch
View File

@ -1,25 +0,0 @@
From 7ba4a4ba6a474f812418040fc7e9aaafd0fb5c6c Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 12 Jul 2017 04:02:26 +0200
Subject: wined3d: Return hr result in wined3d_event_query_create.
---
dlls/wined3d/query.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 7d726d08832..f1e780396bc 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -945,7 +945,7 @@ static HRESULT wined3d_event_query_create(struct wined3d_device *device,
{
WARN("Event queries not supported.\n");
HeapFree(GetProcessHeap(), 0, object);
- return WINED3DERR_NOTAVAILABLE;
+ return hr;
}
wined3d_query_init(&object->query, device, type, &object->signalled,
--
2.13.1