Added mshtml-TranslateAccelerator patchset

This commit is contained in:
Alistair Leslie-Hughes 2019-06-21 11:01:13 +10:00
parent be5814e428
commit 3bba693408
3 changed files with 69 additions and 1 deletions

View File

@ -0,0 +1,48 @@
From 85a401a87c2550aab3b2eb85e518ac43ed2ff533 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 11 Jun 2019 15:27:50 +1000
Subject: [PATCH] mshtml: Improve IOleInPlaceActiveObject TranslateAccelerator
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37058
---
dlls/mshtml/oleobj.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index 274db8c22b..ba02e811cc 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -1024,8 +1024,28 @@ static HRESULT WINAPI OleInPlaceActiveObject_ContextSensitiveHelp(IOleInPlaceAct
static HRESULT WINAPI OleInPlaceActiveObject_TranslateAccelerator(IOleInPlaceActiveObject *iface, LPMSG lpmsg)
{
HTMLDocument *This = impl_from_IOleInPlaceActiveObject(iface);
- FIXME("(%p)->(%p)\n", This, lpmsg);
- return E_NOTIMPL;
+ HRESULT hres = S_FALSE;
+
+ TRACE("(%p)->(%p)\n", This, lpmsg);
+
+ switch(lpmsg->message)
+ {
+ case WM_KEYDOWN:
+ break;
+ case WM_KEYUP:
+ {
+ TRACE("Processing key %ld\n", lpmsg->wParam);
+ if (lpmsg->wParam == VK_F5)
+ hres = IOleCommandTarget_Exec(&This->IOleCommandTarget_iface, NULL, OLECMDID_REFRESH, 0, NULL, NULL);
+
+ break;
+ }
+ default:
+ FIXME("Unsupported message %04x\n", lpmsg->message);
+ }
+
+ TRACE("result 0x%08x\n", hres);
+ return hres;
}
static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface,
--
2.17.1

View File

@ -0,0 +1 @@
Fixes: [37058] mshtml: Improve IOleInPlaceActiveObject TranslateAccelerator

View File

@ -170,6 +170,7 @@ patch_enable_all ()
enable_mountmgr_DosDevices="$1"
enable_mscoree_CorValidateImage="$1"
enable_mshtml_HTMLLocation_put_hash="$1"
enable_mshtml_TranslateAccelerator="$1"
enable_msi_msi_vcl_get_cost="$1"
enable_msvcrt_Math_Precision="$1"
enable_ntdll_APC_Performance="$1"
@ -634,6 +635,9 @@ patch_enable ()
mshtml-HTMLLocation_put_hash)
enable_mshtml_HTMLLocation_put_hash="$2"
;;
mshtml-TranslateAccelerator)
enable_mshtml_TranslateAccelerator="$2"
;;
msi-msi_vcl_get_cost)
enable_msi_msi_vcl_get_cost="$2"
;;
@ -4316,6 +4320,21 @@ if test "$enable_mshtml_HTMLLocation_put_hash" -eq 1; then
) >> "$patchlist"
fi
# Patchset mshtml-TranslateAccelerator
# |
# | This patchset fixes the following Wine bugs:
# | * [#37058] mshtml: Improve IOleInPlaceActiveObject TranslateAccelerator
# |
# | Modified files:
# | * dlls/mshtml/oleobj.c
# |
if test "$enable_mshtml_TranslateAccelerator" -eq 1; then
patch_apply mshtml-TranslateAccelerator/0001-mshtml-Improve-IOleInPlaceActiveObject-TranslateAcce.patch
(
printf '%s\n' '+ { "Alistair Leslie-Hughes", "mshtml: Improve IOleInPlaceActiveObject TranslateAccelerator.", 1 },';
) >> "$patchlist"
fi
# Patchset msi-msi_vcl_get_cost
# |
# | Modified files:
@ -5770,7 +5789,7 @@ fi
# Patchset shlwapi-UrlCombine
# |
# | Modified files:
# | * dlls/shlwapi/tests/url.c
# | * dlls/kernelbase/path.c, dlls/shlwapi/tests/url.c
# |
if test "$enable_shlwapi_UrlCombine" -eq 1; then
patch_apply shlwapi-UrlCombine/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch