From 30825c59a9316f8ca905b9c4a68c27d16a0ef3c4 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 3 Apr 2014 21:37:49 -0600 Subject: [PATCH] SetWaitableTimerEx FIXME patch accepted upstream. --- ...nce-SetWaitableTimerEx-fixme-message.patch | 31 ------------------- .../bbec27ef-61df-44cf-a902-2c1e45573082.def | 3 -- patches/patch-list.patch | 3 +- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 patches/98-Miscellaneous/0002-kernel32-Silence-SetWaitableTimerEx-fixme-message.patch delete mode 100644 patches/98-Miscellaneous/bbec27ef-61df-44cf-a902-2c1e45573082.def diff --git a/patches/98-Miscellaneous/0002-kernel32-Silence-SetWaitableTimerEx-fixme-message.patch b/patches/98-Miscellaneous/0002-kernel32-Silence-SetWaitableTimerEx-fixme-message.patch deleted file mode 100644 index 84fdb727..00000000 --- a/patches/98-Miscellaneous/0002-kernel32-Silence-SetWaitableTimerEx-fixme-message.patch +++ /dev/null @@ -1,31 +0,0 @@ -From abc7d034d2a7ba515b01386166c1ef51d7c53eaf Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Thu, 3 Apr 2014 05:25:38 +0200 -Subject: kernel32: Silence SetWaitableTimerEx fixme message - ---- - dlls/kernel32/sync.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c -index 6c452a4..d363e1f 100644 ---- a/dlls/kernel32/sync.c -+++ b/dlls/kernel32/sync.c -@@ -1183,8 +1183,12 @@ BOOL WINAPI SetWaitableTimer( HANDLE handle, const LARGE_INTEGER *when, LONG per - BOOL WINAPI SetWaitableTimerEx( HANDLE handle, const LARGE_INTEGER *when, LONG period, - PTIMERAPCROUTINE callback, LPVOID arg, REASON_CONTEXT *context, ULONG tolerabledelay ) - { -- FIXME("(%p, %p, %d, %p, %p, %p, %d) semi-stub\n", -- handle, when, period, callback, arg, context, tolerabledelay); -+ static int once; -+ if (!once++) -+ { -+ FIXME("(%p, %p, %d, %p, %p, %p, %d) semi-stub\n", -+ handle, when, period, callback, arg, context, tolerabledelay); -+ } - return SetWaitableTimer(handle, when, period, callback, arg, FALSE); - } - --- -1.7.9.5 - diff --git a/patches/98-Miscellaneous/bbec27ef-61df-44cf-a902-2c1e45573082.def b/patches/98-Miscellaneous/bbec27ef-61df-44cf-a902-2c1e45573082.def deleted file mode 100644 index 6d3f67ce..00000000 --- a/patches/98-Miscellaneous/bbec27ef-61df-44cf-a902-2c1e45573082.def +++ /dev/null @@ -1,3 +0,0 @@ -Revision: 1 -Author: Sebastian Lackner -Title: Silence a SetWaitableTimerEx fixme message. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index bb54acb2..e4f6e7e7 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,38 @@ const char *wine_get_version(void) +@@ -478,6 +478,37 @@ const char *wine_get_version(void) return PACKAGE_VERSION; } @@ -61,7 +61,6 @@ index a273502..5fa0cd5 100644 + { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:1", "Michael Müller", "Decrease minimum SetTimer interval from 15 to 5 ms." }, + { "19835498-8d90-4673-867e-2376af4d7c76:1", "Sebastian Lackner", "Allow to set wined3d strictDrawOrdering via environment variable." }, + { "59bd38b7-bbdc-4cfd-9ccd-1c72c4ed84c0:1", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." }, -+ { "bbec27ef-61df-44cf-a902-2c1e45573082:1", "Sebastian Lackner", "Silence a SetWaitableTimerEx fixme message." }, + { "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 }