From 2e4d11137f34d008119dfceb7184401d582436f4 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 31 Oct 2015 16:50:11 +0100 Subject: [PATCH] Added patch for SetCoalescableTimer stub function. --- README.md | 3 +- debian/changelog | 1 + patches/patchinstall.sh | 19 ++++++++ ...-user32-add-SetCoalescableTimer-stub.patch | 43 +++++++++++++++++++ patches/user32-SetCoalescableTimer/definition | 1 + 5 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 patches/user32-SetCoalescableTimer/0001-user32-add-SetCoalescableTimer-stub.patch create mode 100644 patches/user32-SetCoalescableTimer/definition diff --git a/README.md b/README.md index bfa9d3de..046f97f7 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,9 @@ Wine. All those differences are also documented on the Included bug fixes and improvements ----------------------------------- -**Bug fixes and features included in the next upcoming release [5]:** +**Bug fixes and features included in the next upcoming release [6]:** +* Add stub for SetCoalescableTimer ([Wine Bug #39509](https://bugs.winehq.org/show_bug.cgi?id=39509)) * Do not allow interruption of system APC in server_select ([Wine Bug #14697](https://bugs.winehq.org/show_bug.cgi?id=14697)) * Implement FileNamesInformation class support for NtQueryDirectoryFile * Implement hal.KeQueryPerformanceCounter ([Wine Bug #39500](https://bugs.winehq.org/show_bug.cgi?id=39500)) diff --git a/debian/changelog b/debian/changelog index 5e8842e6..322e5b88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ wine-staging (1.7.54) UNRELEASED; urgency=low management functions. * Added patch to improve INetFwAuthorizedApplication::get_ProcessImageFileName stub. + * Added patch for SetCoalescableTimer stub function. * Removed patch to implement kernel32.GetPhysicallyInstalledSystemMemory (accepted upstream). * Partially removed patches for ws2_32 TransmitFile (accepted upstream). diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 86096d70..73525899 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -278,6 +278,7 @@ patch_enable_all () enable_user32_Painting="$1" enable_user32_Refresh_MDI_Menus="$1" enable_user32_ScrollWindowEx="$1" + enable_user32_SetCoalescableTimer="$1" enable_user32_WndProc="$1" enable_uxtheme_GTK_Theming="$1" enable_version_VerQueryValue="$1" @@ -930,6 +931,9 @@ patch_enable () user32-ScrollWindowEx) enable_user32_ScrollWindowEx="$2" ;; + user32-SetCoalescableTimer) + enable_user32_SetCoalescableTimer="$2" + ;; user32-WndProc) enable_user32_WndProc="$2" ;; @@ -5404,6 +5408,21 @@ if test "$enable_user32_ScrollWindowEx" -eq 1; then ) >> "$patchlist" fi +# Patchset user32-SetCoalescableTimer +# | +# | This patchset fixes the following Wine bugs: +# | * [#39509] Add stub for SetCoalescableTimer +# | +# | Modified files: +# | * dlls/user32/message.c, dlls/user32/user32.spec +# | +if test "$enable_user32_SetCoalescableTimer" -eq 1; then + patch_apply user32-SetCoalescableTimer/0001-user32-add-SetCoalescableTimer-stub.patch + ( + echo '+ { "Austin English", "user32: add SetCoalescableTimer stub.", 1 },'; + ) >> "$patchlist" +fi + # Patchset user32-WndProc # | # | This patchset fixes the following Wine bugs: diff --git a/patches/user32-SetCoalescableTimer/0001-user32-add-SetCoalescableTimer-stub.patch b/patches/user32-SetCoalescableTimer/0001-user32-add-SetCoalescableTimer-stub.patch new file mode 100644 index 00000000..0c542fbe --- /dev/null +++ b/patches/user32-SetCoalescableTimer/0001-user32-add-SetCoalescableTimer-stub.patch @@ -0,0 +1,43 @@ +From 763a849b4702851cc1536cbc719a870d693935fe Mon Sep 17 00:00:00 2001 +From: Austin English +Date: Tue, 27 Oct 2015 11:51:39 -0500 +Subject: user32: add SetCoalescableTimer stub + +Signed-off-by: Austin English +--- + dlls/user32/message.c | 9 +++++++++ + dlls/user32/user32.spec | 1 + + 2 files changed, 10 insertions(+) + +diff --git a/dlls/user32/message.c b/dlls/user32/message.c +index d122980..ce92bac 100644 +--- a/dlls/user32/message.c ++++ b/dlls/user32/message.c +@@ -4620,3 +4620,12 @@ BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action, + FIXME( "%p %x %d %p\n", hwnd, message, action, changefilter ); + return TRUE; + } ++ ++/****************************************************************** ++ * SetCoalescableTimer (USER32.@) ++ */ ++UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ) ++{ ++ FIXME( "%p %lx %u %p %u: semi-stub\n", hwnd, id, timeout, proc, tolerance ); ++ return SetTimer( hwnd, id, timeout, proc ); ++} +diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec +index 9b409df..163ae46 100644 +--- a/dlls/user32/user32.spec ++++ b/dlls/user32/user32.spec +@@ -620,6 +620,7 @@ + @ stdcall SetClassWord(long long long) + @ stdcall SetClipboardData(long long) + @ stdcall SetClipboardViewer(long) ++@ stdcall SetCoalescableTimer(long long long ptr long) + # @ stub SetConsoleReserveKeys + @ stdcall SetCursor(long) + @ stub SetCursorContents +-- +2.6.1 + diff --git a/patches/user32-SetCoalescableTimer/definition b/patches/user32-SetCoalescableTimer/definition new file mode 100644 index 00000000..b4df0746 --- /dev/null +++ b/patches/user32-SetCoalescableTimer/definition @@ -0,0 +1 @@ +Fixes: [39509] Add stub for SetCoalescableTimer