wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix fuzz in patches.

Browse Source
This commit is contained in:
Michael Müller 2014-07-20 22:36:08 +02:00
parent 95bee0aa1e
commit a3d2b4b9e0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/97-Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch
View File

@ -1,6 +1,6 @@
From 46663b2c660db111ba9a208929cec841caa9308a Mon Sep 17 00:00:00 2001
From 343eb8dc82b72e641dc239a339f2419bb7f936c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 27 May 2014 02:53:05 +0200
Date: Sun, 20 Jul 2014 22:22:14 +0200
Subject: wined3d: allow changing strict drawing through an exported function
---
@ -9,21 +9,21 @@ Subject: wined3d: allow changing strict drawing through an exported function
2 files changed, 7 insertions(+)
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index f1a45dd..7ee0914 100644
index a53c74b..7c9ebbd 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -277,3 +277,5 @@
@@ -271,3 +271,5 @@
@ cdecl wined3d_volume_map(ptr ptr ptr long)
@ cdecl wined3d_volume_preload(ptr)
@ cdecl wined3d_volume_set_priority(ptr long)
@ cdecl wined3d_volume_unmap(ptr)
+
+@ cdecl wined3d_strictdrawing_set(long)
\ No newline at end of file
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index e2a7f3f..c160ae0 100644
index 7ab2448..8b4134d 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -509,6 +509,11 @@ void wined3d_unregister_window(HWND window)
@@ -505,6 +505,11 @@ void wined3d_unregister_window(HWND window)
wined3d_wndproc_mutex_unlock();
}

14
patches/98-Miscellaneous/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch
View File

@ -1,14 +1,14 @@
From b1b13aac629c00d03d68dcca64cb81e976e20580 Mon Sep 17 00:00:00 2001
From 018b5f5d6211aa706e5aef762acb98d39240d9f1 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 3 Apr 2014 21:36:33 -0600
Date: Sun, 20 Jul 2014 22:29:02 +0200
Subject: wined3d: Silence repeated resource_check_usage FIXME.
---
dlls/wined3d/resource.c | 5 ++++-
dlls/wined3d/resource.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c
index 3a54dd8..d164681 100644
index 2f44d36..5988c82 100644
--- a/dlls/wined3d/resource.c
+++ b/dlls/wined3d/resource.c
@@ -50,7 +50,7 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool)
@ -20,8 +20,8 @@ index 3a54dd8..d164681 100644
| WINED3DUSAGE_DEPTHSTENCIL
| WINED3DUSAGE_WRITEONLY
| WINED3DUSAGE_DYNAMIC
@@ -60,7 +60,10 @@ static void resource_check_usage(DWORD usage)
| WINED3DUSAGE_TEXTURE;
@@ -66,7 +66,10 @@ static void resource_check_usage(DWORD usage)
* driver. */
if (usage & ~handled)
+ {
@ -32,5 +32,5 @@ index 3a54dd8..d164681 100644
WARN_(d3d_perf)("WINED3DUSAGE_DYNAMIC used without WINED3DUSAGE_WRITEONLY.\n");
}
--
1.7.9.5
1.8.3.2