Rebase against a96abff8082d3c6ac7f1acb57727656a94a6bde9.

This commit is contained in:
Sebastian Lackner
2016-01-29 22:52:04 +01:00
parent da7ef4474e
commit 89a3c598c3
4 changed files with 144 additions and 144 deletions

View File

@@ -1,4 +1,4 @@
From 8794d625750d35293adecbedc32cc02257817b05 Mon Sep 17 00:00:00 2001
From 4be2da4492530a2704a8135dc2f65781c968f625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 20 Jul 2014 22:22:14 +0200
Subject: wined3d: allow changing strict drawing through an exported function
@@ -9,23 +9,23 @@ 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 7a77003..5519a48 100644
index cd8174c..34afb71 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -219,6 +219,8 @@
@@ -222,6 +222,8 @@
@ cdecl wined3d_stateblock_decref(ptr)
@ cdecl wined3d_stateblock_incref(ptr)
+@ cdecl wined3d_strictdrawing_set(long)
+
@ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long)
@ cdecl wined3d_surface_decref(ptr)
@ cdecl wined3d_surface_from_resource(ptr)
@ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c
index 758ba43..7ccd3a1 100644
index 0543d97..78cc3a2 100644
--- a/dlls/wined3d/wined3d_main.c
+++ b/dlls/wined3d/wined3d_main.c
@@ -505,6 +505,11 @@ void wined3d_unregister_window(HWND window)
@@ -515,6 +515,11 @@ void wined3d_unregister_window(HWND window)
wined3d_wndproc_mutex_unlock();
}
@@ -38,5 +38,5 @@ index 758ba43..7ccd3a1 100644
BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
--
2.1.3
2.7.0