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

SetWaitableTimerEx FIXME patch accepted upstream.

Browse Source
This commit is contained in:
Erich E. Hoover 2014-04-03 21:37:49 -06:00
parent 7d03df647f
commit 30825c59a9
3 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
patches/98-Miscellaneous/0002-kernel32-Silence-SetWaitableTimerEx-fixme-message.patch
View File

@ -1,31 +0,0 @@
From abc7d034d2a7ba515b01386166c1ef51d7c53eaf Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
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

3
patches/98-Miscellaneous/bbec27ef-61df-44cf-a902-2c1e45573082.def
View File

@ -1,3 +0,0 @@
Revision: 1
Author: Sebastian Lackner
Title: Silence a SetWaitableTimerEx fixme message.

3
patches/patch-list.patch
View File

@ -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 }