From 036250b6da61f0df892bb09cc9e4d8d70be2b967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 2 May 2014 20:50:58 +0200 Subject: [PATCH] Update timer patch --- ...minimum-SetTimer-interval-from-15-to.patch | 25 ------------------- ...se-minimum-SetTimer-interval-to-5-ms.patch | 25 +++++++++++++++++++ .../0b21d7ac-0387-4493-aa38-fbafe3e749f5.def | 4 +-- patches/patch-list.patch | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-from-15-to.patch create mode 100644 patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch diff --git a/patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-from-15-to.patch b/patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-from-15-to.patch deleted file mode 100644 index 5614df5e..00000000 --- a/patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-from-15-to.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ed6d82faea2efb04dda99738f8eea9ac8c9de1df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Thu, 9 Jan 2014 02:54:31 +0100 -Subject: user32: Decrease minimum SetTimer interval from 15 to 5 ms - ---- - dlls/user32/message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/user32/message.c b/dlls/user32/message.c -index 2cd1472..8a4aa7d 100644 ---- a/dlls/user32/message.c -+++ b/dlls/user32/message.c -@@ -4407,7 +4407,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) - - /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing - * indicates that the true minimum is closer to 15.6 ms. */ -- timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); -+ timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM ); - - SERVER_START_REQ( set_win_timer ) - { --- -1.8.3.2 - diff --git a/patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch b/patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch new file mode 100644 index 00000000..aa7c445a --- /dev/null +++ b/patches/97-Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch @@ -0,0 +1,25 @@ +From 70d9c625738a8c368e6276be3bed8baab9103083 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Fri, 2 May 2014 20:46:19 +0200 +Subject: user32: Decrease minimum SetTimer interval to 5 ms + +--- + dlls/user32/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dlls/user32/message.c b/dlls/user32/message.c +index be5d995..a371f72 100644 +--- a/dlls/user32/message.c ++++ b/dlls/user32/message.c +@@ -4439,7 +4439,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) + + if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); + +- timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); ++ timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM ); + + SERVER_START_REQ( set_win_timer ) + { +-- +1.8.3.2 + diff --git a/patches/97-Pipelight/0b21d7ac-0387-4493-aa38-fbafe3e749f5.def b/patches/97-Pipelight/0b21d7ac-0387-4493-aa38-fbafe3e749f5.def index 23e43c45..7032f931 100644 --- a/patches/97-Pipelight/0b21d7ac-0387-4493-aa38-fbafe3e749f5.def +++ b/patches/97-Pipelight/0b21d7ac-0387-4493-aa38-fbafe3e749f5.def @@ -1,3 +1,3 @@ -Revision: 1 +Revision: 2 Author: Michael Müller -Title: Decrease minimum SetTimer interval from 15 to 5 ms. +Title: Decrease minimum SetTimer interval to 5 ms. diff --git a/patches/patch-list.patch b/patches/patch-list.patch index 9944fe41..c0f604f7 100644 --- a/patches/patch-list.patch +++ b/patches/patch-list.patch @@ -56,7 +56,7 @@ index a273502..5fa0cd5 100644 + { "4cd13e94-7f2d-11e3-b5eb-0090f5c75ad5:1", "Erich E. Hoover", "Support for junction points/reparse points." }, + { "5fb1f5c8-7f17-11e3-9b62-0090f5c75ad5:1", "Erich E. Hoover", "Implement TransmitFile." }, + { "3d7c4774-9e7f-11e3-9cfc-0090f5c75ad5:1", "Erich E. Hoover", "Implement missing fonts expected by Silverlight." }, -+ { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:1", "Michael Müller", "Decrease minimum SetTimer interval from 15 to 5 ms." }, ++ { "0b21d7ac-0387-4493-aa38-fbafe3e749f5:2", "Michael Müller", "Decrease minimum SetTimer interval 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." }, + { "acff3012-0f75-4710-9941-08b5ce4c61f3:1", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME." },