Rebase against 6bc0ce26a853b51f11958545bfa5570bdcb1cf01.

[authz-Stub_Functions]
Removed patch to implement additional stub functions in authz.dll (accepted
upstream).
This commit is contained in:
Sebastian Lackner
2016-03-20 06:25:56 +01:00
parent 15c75d5194
commit c6c15ab214
4 changed files with 13 additions and 148 deletions

View File

@@ -1,25 +1,26 @@
From a347c9baa86ec4503d51b03c1659d08a7062839a Mon Sep 17 00:00:00 2001
From 8ff4dfbdec69e2244204a7157c918ef14cf6afc7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 4 May 2014 00:53:51 +0200
Subject: wined3d: Silence repeated wined3d_swapchain_present FIXME.
---
dlls/wined3d/swapchain.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
dlls/wined3d/swapchain.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 75e6628..10c3911 100644
index 7d02375..db93328 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -136,12 +136,17 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain,
const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override,
const RGNDATA *dirty_region, DWORD flags)
@@ -135,14 +135,18 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN
HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain,
const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags)
{
+ static DWORD notified_flags = 0;
+
TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n",
RECT s, d;
TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, flags %#x.\n",
swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect),
dst_window_override, dirty_region, flags);
dst_window_override, flags);
- if (flags)
- FIXME("Ignoring flags %#x.\n", flags);
@@ -32,5 +33,5 @@ index 75e6628..10c3911 100644
if (!swapchain->back_buffers)
{
--
1.7.9.5
2.7.1