Rebase against e72a16b57f66b63a16bb3d1619ac4d42632cb141.

patches/mshtml-TranslateAccelerator/0001-mshtml-Improve-IOleInPlaceActiveObject-TranslateAcce.patch

@@ -1,4 +1,4 @@
-From 85a401a87c2550aab3b2eb85e518ac43ed2ff533 Mon Sep 17 00:00:00 2001
+From 6059fc95c799ed70419bb170c99ddb11507e66f9 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
@@ -9,13 +9,13 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37058
  1 file changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
-index 274db8c22b..ba02e811cc 100644
+index a9bd8a3d558..444551778e1 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)
+@@ -1413,8 +1413,28 @@ static HRESULT WINAPI DocObjOleInPlaceActiveObject_ContextSensitiveHelp(IOleInPl
+ static HRESULT WINAPI DocObjOleInPlaceActiveObject_TranslateAccelerator(IOleInPlaceActiveObject *iface, LPMSG lpmsg)
  {
-     HTMLDocument *This = impl_from_IOleInPlaceActiveObject(iface);
+     HTMLDocumentObj *This = HTMLDocumentObj_from_IOleInPlaceActiveObject(iface);
 -    FIXME("(%p)->(%p)\n", This, lpmsg);
 -    return E_NOTIMPL;
 +    HRESULT hres = S_FALSE;
@@ -42,7 +42,7 @@ index 274db8c22b..ba02e811cc 100644
 +    return hres;
  }
  
- static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface,
+ static HRESULT WINAPI DocObjOleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceActiveObject *iface,
 -- 
-2.17.1
+2.37.2
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e3f00bf7c944f1cde6151fde969f2b49649c3de7"
+	echo "e72a16b57f66b63a16bb3d1619ac4d42632cb141"
 }
 
 # Show version information
@@ -2528,7 +2528,6 @@ fi
 if test "$enable_sapi_iteration_tokens" -eq 1; then
 	patch_apply sapi-iteration-tokens/0004-sapi-EnumTokens-setup-enumeration-members.patch
 	patch_apply sapi-iteration-tokens/0005-sapi-Implement-ISpObjectTokenEnumBuilder-Item.patch
-	patch_apply sapi-iteration-tokens/0007-sapi-Implement-ISpObjectToken-OpenKey.patch
 	patch_apply sapi-iteration-tokens/0008-sapi-Add-default-voice-registry-key.patch
 	patch_apply sapi-iteration-tokens/0009-sapi-Return-dump-object-in-ISpObjectTokenEnumBuilder.patch
 fi

patches/sapi-iteration-tokens/0007-sapi-Implement-ISpObjectToken-OpenKey.patch

@@ -1,48 +0,0 @@
-From 26a5401b90c60a267646975321a7a25126fc165c Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 22 Sep 2021 19:01:44 +1000
-Subject: [PATCH 7/8] sapi: Implement ISpObjectToken OpenKey
-
----
- dlls/sapi/token.c | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c
-index 4b9ca15fe11..06f1250a40b 100644
---- a/dlls/sapi/token.c
-+++ b/dlls/sapi/token.c
-@@ -982,8 +982,29 @@ static HRESULT WINAPI token_GetDWORD( ISpObjectToken *iface,
- static HRESULT WINAPI token_OpenKey( ISpObjectToken *iface,
-                                      LPCWSTR name, ISpDataKey **sub_key )
- {
--    FIXME( "stub\n" );
--    return E_NOTIMPL;
-+    struct object_token *This = impl_from_ISpObjectToken( iface );
-+    ISpRegDataKey *spregkey;
-+    HRESULT hr;
-+    HKEY key;
-+    LONG ret;
-+
-+    TRACE( "%p, %s, %p\n", This, debugstr_w(name), sub_key );
-+
-+    ret = RegOpenKeyExW (This->token_key, name, 0, KEY_ALL_ACCESS, &key);
-+    if (ret != ERROR_SUCCESS)
-+        return HRESULT_FROM_WIN32(ret);
-+
-+    hr = data_key_create(NULL, &IID_ISpRegDataKey, (void**)&spregkey);
-+    if (hr == S_OK)
-+    {
-+        hr = ISpRegDataKey_SetKey(spregkey, key, FALSE);
-+        if (hr == S_OK)
-+        {
-+            hr = ISpRegDataKey_QueryInterface(spregkey, &IID_ISpDataKey, (void**)sub_key);
-+            ISpRegDataKey_Release(spregkey);
-+        }
-+    }
-+    return hr;
- }
- 
- static HRESULT WINAPI token_CreateKey( ISpObjectToken *iface,
--- 
-2.33.0
-

staging/upstream-commit

@@ -1 +1 @@
-e3f00bf7c944f1cde6151fde969f2b49649c3de7
+e72a16b57f66b63a16bb3d1619ac4d42632cb141