Added patch to fix issues with dragging layers between images in Adobe Photoshop 7.0.

This commit is contained in:
Sebastian Lackner
2014-11-25 20:41:19 +01:00
parent e4caae5b65
commit bb565dbad1
5 changed files with 61 additions and 1 deletions

View File

@@ -101,6 +101,7 @@ PATCHLIST := \
user32-DrawTextExW.ok \
user32-GetSystemMetrics.ok \
user32-GetTipText.ok \
user32-Mouse_Message_Hwnd.ok \
user32-WndProc.ok \
wine.inf-ProductId.ok \
wineboot-HKEY_DYN_DATA.ok \
@@ -1541,6 +1542,21 @@ user32-GetTipText.ok:
echo '+ { "Erich E. Hoover", "Fix TOOLTIPS_GetTipText when a NULL instance is used.", 1 },'; \
) > user32-GetTipText.ok
# Patchset user32-Mouse_Message_Hwnd
# |
# | This patchset fixes the following Wine bugs:
# | * [#12007] Fix issues with dragging layers between images in Adobe Photoshop 7.0
# |
# | Modified files:
# | * dlls/user32/message.c, dlls/user32/tests/input.c
# |
.INTERMEDIATE: user32-Mouse_Message_Hwnd.ok
user32-Mouse_Message_Hwnd.ok:
$(call APPLY_FILE,user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch)
@( \
echo '+ { "Dmitry Timoshkov", "user32: Try harder to find a target for mouse messages.", 1 },'; \
) > user32-Mouse_Message_Hwnd.ok
# Patchset user32-WndProc
# |
# | This patchset fixes the following Wine bugs:

View File

@@ -0,0 +1,41 @@
From c13437712f404badbdbdc2352f0ffe0df8ad8265 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@codeweavers.com>
Date: Tue, 25 Nov 2014 20:31:58 +0100
Subject: user32: Try harder to find a target for mouse messages
---
dlls/user32/message.c | 2 +-
dlls/user32/tests/input.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index eac4e4d..da29dc6 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -2501,7 +2501,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H
}
else
{
- msg->hwnd = WINPOS_WindowFromPoint( msg->hwnd, msg->pt, &hittest );
+ msg->hwnd = WINPOS_WindowFromPoint( 0, msg->pt, &hittest );
}
if (!msg->hwnd || !WIN_IsCurrentThread( msg->hwnd ))
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 9b898d3..99ef777 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -1833,8 +1833,8 @@ static void test_Input_mouse(void)
}
}
ok(hittest_no && hittest_no<50, "expected WM_NCHITTEST message\n");
- todo_wine ok(got_button_down, "expected WM_LBUTTONDOWN message\n");
- todo_wine ok(got_button_up, "expected WM_LBUTTONUP message\n");
+ ok(got_button_down, "expected WM_LBUTTONDOWN message\n");
+ ok(got_button_up, "expected WM_LBUTTONUP message\n");
DestroyWindow(static_win);
/* click on HTTRANSPARENT top-level window that belongs to other thread */
--
2.1.3

View File

@@ -0,0 +1 @@
Fixes: [12007] Fix issues with dragging layers between images in Adobe Photoshop 7.0