From 807da03757db7edb6fcf8a1320be4ab0e3660918 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 4 May 2014 00:55:43 +0200 Subject: [PATCH] Add additional patch to silence repeated wined3d_swapchain_present FIXMEs. --- ...repeated-wined3d_swapchain_present-F.patch | 36 +++++++++++++++++++ .../c7263660-be78-439b-979f-e745a8d87120.def | 3 ++ patches/patch-list.patch | 3 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 patches/98-Miscellaneous/0004-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch create mode 100644 patches/98-Miscellaneous/c7263660-be78-439b-979f-e745a8d87120.def diff --git a/patches/98-Miscellaneous/0004-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch b/patches/98-Miscellaneous/0004-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch new file mode 100644 index 00000000..444f82d3 --- /dev/null +++ b/patches/98-Miscellaneous/0004-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch @@ -0,0 +1,36 @@ +From a347c9baa86ec4503d51b03c1659d08a7062839a Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +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(-) + +diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c +index 75e6628..10c3911 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) + { ++ static DWORD notified_flags = 0; ++ + TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n", + swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), + dst_window_override, dirty_region, flags); + +- if (flags) +- FIXME("Ignoring flags %#x.\n", flags); ++ if (flags & ~notified_flags) ++ { ++ FIXME("Ignoring flags %#x.\n", flags & ~notified_flags); ++ notified_flags |= flags; ++ } + + if (!swapchain->back_buffers) + { +-- +1.7.9.5 + diff --git a/patches/98-Miscellaneous/c7263660-be78-439b-979f-e745a8d87120.def b/patches/98-Miscellaneous/c7263660-be78-439b-979f-e745a8d87120.def new file mode 100644 index 00000000..835e4832 --- /dev/null +++ b/patches/98-Miscellaneous/c7263660-be78-439b-979f-e745a8d87120.def @@ -0,0 +1,3 @@ +Revision: 1 +Author: Sebastian Lackner +Title: wined3d: Silence repeated wined3d_swapchain_present FIXME. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index 63af310d..0589ce31 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -37,7 +37,7 @@ diff --git a/libs/wine/config.c b/libs/wine/config.c index a273502..5fa0cd5 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -478,6 +478,37 @@ const char *wine_get_version(void) +@@ -478,6 +478,38 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -61,6 +61,7 @@ index a273502..5fa0cd5 100644 + { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." }, + { "325645ba-d39d-4de4-9c94-3fe694eedaab:1", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." }, + { "acff3012-0f75-4710-9941-08b5ce4c61f3:2", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." }, ++ { "c7263660-be78-439b-979f-e745a8d87120:1", "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME." }, + { "eec5dea8-879d-417b-9f97-364deaae6576:1", "Sebastian Lackner", "Add tests for IVMRMonitorConfig." }, + { "e46b26df-3c1b-419c-9579-f0d1e1c50bea:1", "Sebastian Lackner", "Workaround for broken implementation of shlwapi url functions." }, + { NULL, NULL, NULL }