diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 4677b875..541724f7 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "7b79e3a87b1e1a9478e92d6ea3b5973da4388a82"
+	echo "6e32c011a2b977246f9ab2282d30b69cff90142b"
 }
 
 # Show version information
diff --git a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch
index 4d437c0d..6905ab77 100644
--- a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch
+++ b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch
@@ -1,4 +1,4 @@
-From 534d035e5646d1a76657987894ce7124be0f7312 Mon Sep 17 00:00:00 2001
+From 0ed959d4122e705d8728a7064ff260d2a6955af5 Mon Sep 17 00:00:00 2001
 From: Jactry Zeng <wine@jactry.com>
 Date: Sun, 10 Aug 2014 22:17:57 +0800
 Subject: [PATCH] riched20: Stub for ITextPara interface and implement
@@ -10,10 +10,10 @@ Subject: [PATCH] riched20: Stub for ITextPara interface and implement
  2 files changed, 477 insertions(+)
 
 diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
-index a23f4c82730..7204bb3a0fa 100644
+index afecd34dc2a..6b94ee89902 100644
 --- a/dlls/riched20/richole.c
 +++ b/dlls/riched20/richole.c
-@@ -3553,6 +3553,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface)
+@@ -3563,6 +3563,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface)
      return ref;
  }
  
@@ -30,7 +30,7 @@ index a23f4c82730..7204bb3a0fa 100644
  static HRESULT WINAPI TextPara_GetTypeInfoCount(ITextPara *iface, UINT *pctinfo)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
-@@ -3620,6 +3630,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret)
+@@ -3630,6 +3640,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, ret);
@@ -41,7 +41,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3627,6 +3641,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para)
+@@ -3637,6 +3651,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, para);
@@ -52,7 +52,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3634,6 +3652,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret)
+@@ -3644,6 +3662,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, ret);
@@ -63,7 +63,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3641,6 +3663,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG *
+@@ -3651,6 +3673,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG *
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p %p)\n", This, para, ret);
@@ -74,7 +74,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3648,6 +3674,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value)
+@@ -3658,6 +3684,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -85,7 +85,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3655,6 +3685,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value)
+@@ -3665,6 +3695,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -96,7 +96,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3662,6 +3696,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
+@@ -3672,6 +3706,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -107,7 +107,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3669,6 +3707,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value)
+@@ -3679,6 +3717,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -118,7 +118,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3676,6 +3718,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value)
+@@ -3686,6 +3728,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -129,7 +129,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3683,6 +3729,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value)
+@@ -3693,6 +3739,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -140,7 +140,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3690,6 +3740,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value)
+@@ -3700,6 +3750,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -151,7 +151,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3697,6 +3751,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value
+@@ -3707,6 +3761,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -162,7 +162,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3704,6 +3762,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value)
+@@ -3714,6 +3772,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -173,7 +173,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3711,6 +3773,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value)
+@@ -3721,6 +3783,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -184,7 +184,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3718,6 +3784,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value)
+@@ -3728,6 +3794,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -195,7 +195,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3725,6 +3795,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value)
+@@ -3735,6 +3805,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -206,7 +206,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3732,6 +3806,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value)
+@@ -3742,6 +3816,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -217,7 +217,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3739,6 +3817,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value)
+@@ -3749,6 +3827,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -228,7 +228,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3746,6 +3828,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value)
+@@ -3756,6 +3838,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -239,7 +239,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3753,6 +3839,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value)
+@@ -3763,6 +3849,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -250,7 +250,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3760,6 +3850,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value)
+@@ -3770,6 +3860,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -261,7 +261,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3767,6 +3861,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value)
+@@ -3777,6 +3871,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -272,7 +272,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3774,6 +3872,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value)
+@@ -3784,6 +3882,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -283,7 +283,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3781,6 +3883,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value)
+@@ -3791,6 +3893,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -294,7 +294,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3788,6 +3894,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value)
+@@ -3798,6 +3904,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -305,7 +305,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3795,6 +3905,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value)
+@@ -3805,6 +3915,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -316,7 +316,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3802,6 +3916,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value)
+@@ -3812,6 +3926,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -327,7 +327,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3809,6 +3927,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value)
+@@ -3819,6 +3937,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -338,7 +338,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3816,6 +3938,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value)
+@@ -3826,6 +3948,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -349,7 +349,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3823,6 +3949,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value)
+@@ -3833,6 +3959,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -360,7 +360,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3830,6 +3960,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value)
+@@ -3840,6 +3970,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -371,7 +371,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3837,6 +3971,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value)
+@@ -3847,6 +3981,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -382,7 +382,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3844,6 +3982,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value)
+@@ -3854,6 +3992,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -393,7 +393,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3851,6 +3993,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value)
+@@ -3861,6 +4003,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -404,7 +404,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3858,6 +4004,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value)
+@@ -3868,6 +4014,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -415,7 +415,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3865,6 +4015,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F
+@@ -3875,6 +4025,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f %.2f %.2f)\n", This, StartIndent, LeftIndent, RightIndent);
@@ -426,7 +426,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3872,6 +4026,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing
+@@ -3882,6 +4036,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld %.2f)\n", This, LineSpacingRule, LineSpacing);
@@ -437,7 +437,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3879,6 +4037,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value)
+@@ -3889,6 +4047,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -448,7 +448,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3886,6 +4048,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value)
+@@ -3896,6 +4058,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -459,7 +459,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3893,6 +4059,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value)
+@@ -3903,6 +4069,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -470,7 +470,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3900,6 +4070,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value)
+@@ -3910,6 +4080,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, value);
@@ -481,7 +481,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3907,6 +4081,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value)
+@@ -3917,6 +4091,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -492,7 +492,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3914,6 +4092,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value)
+@@ -3924,6 +4102,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld)\n", This, value);
@@ -503,7 +503,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3921,6 +4103,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value)
+@@ -3931,6 +4113,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%p)\n", This, value);
@@ -514,7 +514,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3928,6 +4114,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig
+@@ -3938,6 +4124,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f %ld %ld)\n", This, tbPos, tbAlign, tbLeader);
@@ -525,7 +525,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3935,6 +4125,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface)
+@@ -3945,6 +4135,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)\n", This);
@@ -536,7 +536,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3942,6 +4136,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos)
+@@ -3952,6 +4146,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos)
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%.2f)\n", This, pos);
@@ -547,7 +547,7 @@ index a23f4c82730..7204bb3a0fa 100644
      return E_NOTIMPL;
  }
  
-@@ -3949,6 +4147,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos
+@@ -3959,6 +4157,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos
  {
      ITextParaImpl *This = impl_from_ITextPara(iface);
      FIXME("(%p)->(%ld %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader);
@@ -559,11 +559,11 @@ index a23f4c82730..7204bb3a0fa 100644
  }
  
 diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
-index 24284a24484..4ea3828033b 100644
+index a01f4e21db8..e44ffc767e7 100644
 --- a/dlls/riched20/tests/richole.c
 +++ b/dlls/riched20/tests/richole.c
-@@ -4249,6 +4249,274 @@ static void test_clipboard(void)
-   ITextRange_Release(range);
+@@ -5439,6 +5439,274 @@ static void test_undo_control(void)
+   release_interfaces(&inst.hwnd, &reole, &inst.doc, &selection);
  }
  
 +static void test_ITextRange_SetStart(void)
@@ -837,7 +837,7 @@ index 24284a24484..4ea3828033b 100644
  START_TEST(richole)
  {
    /* Must explicitly LoadLibrary(). The test has no references to functions in
-@@ -4269,6 +4537,13 @@ START_TEST(richole)
+@@ -5459,6 +5727,13 @@ START_TEST(richole)
    test_ITextRange_SetRange();
    test_ITextRange_GetDuplicate();
    test_ITextRange_Collapse();
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 83f050d4..3994bbfd 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-7b79e3a87b1e1a9478e92d6ea3b5973da4388a82
+6e32c011a2b977246f9ab2282d30b69cff90142b