From 80498dd4408b93dd4591d46928b5ec7f8aca6144 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 16 Oct 2020 08:52:16 +1100
Subject: [PATCH] Rebase against de679af492ed93d70c99dff7f7cfc01cc8f25eb0.

---
 patches/patchinstall.sh                       |  5 +--
 ...RunOfsFromCharOfs-when-nCharOfs-strl.patch | 41 -------------------
 staging/upstream-commit                       |  2 +-
 3 files changed, 3 insertions(+), 45 deletions(-)
 delete mode 100644 patches/riched20-IText_Interface/0004-riched20-Fix-ME_RunOfsFromCharOfs-when-nCharOfs-strl.patch

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index c7fb0cec..17f1833b 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e909986e6ea5ecd49b2b847f321ad89b2ae4f6f1"
+	echo "de679af492ed93d70c99dff7f7cfc01cc8f25eb0"
 }
 
 # Show version information
@@ -3545,11 +3545,10 @@ fi
 # Patchset riched20-IText_Interface
 # |
 # | Modified files:
-# |   *	dlls/riched20/richole.c, dlls/riched20/run.c, dlls/riched20/tests/richole.c
+# |   *	dlls/riched20/richole.c, dlls/riched20/tests/richole.c
 # |
 if test "$enable_riched20_IText_Interface" -eq 1; then
 	patch_apply riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch
-	patch_apply riched20-IText_Interface/0004-riched20-Fix-ME_RunOfsFromCharOfs-when-nCharOfs-strl.patch
 	patch_apply riched20-IText_Interface/0010-riched20-Silence-repeated-FIXMEs-triggered-by-Adobe-.patch
 fi
 
diff --git a/patches/riched20-IText_Interface/0004-riched20-Fix-ME_RunOfsFromCharOfs-when-nCharOfs-strl.patch b/patches/riched20-IText_Interface/0004-riched20-Fix-ME_RunOfsFromCharOfs-when-nCharOfs-strl.patch
deleted file mode 100644
index d73f4d73..00000000
--- a/patches/riched20-IText_Interface/0004-riched20-Fix-ME_RunOfsFromCharOfs-when-nCharOfs-strl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9dee4d943b4dbbc64dbdaaf9052c094a6bb27ff3 Mon Sep 17 00:00:00 2001
-From: Jactry Zeng <wine@jactry.com>
-Date: Wed, 13 Aug 2014 14:57:52 +0800
-Subject: riched20: Fix ME_RunOfsFromCharOfs() when nCharOfs > strlen().
-
----
- dlls/riched20/run.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c
-index 38d0270..ad08b82 100644
---- a/dlls/riched20/run.c
-+++ b/dlls/riched20/run.c
-@@ -181,9 +181,10 @@ void ME_RunOfsFromCharOfs(ME_TextEditor *editor,
-                           int *pOfs)
- {
-   ME_DisplayItem *item, *next_item;
-+  int endOfs = nCharOfs, len = ME_GetTextLength(editor);
- 
-   nCharOfs = max(nCharOfs, 0);
--  nCharOfs = min(nCharOfs, ME_GetTextLength(editor));
-+  nCharOfs = min(nCharOfs, len);
- 
-   /* Find the paragraph at the offset. */
-   next_item = editor->pBuffer->pFirst->member.para.next_para;
-@@ -206,7 +207,11 @@ void ME_RunOfsFromCharOfs(ME_TextEditor *editor,
-   nCharOfs -= item->member.run.nCharOfs;
- 
-   if (ppRun) *ppRun = item;
--  if (pOfs) *pOfs = nCharOfs;
-+  if (pOfs) {
-+    if (((*ppRun)->member.run.nFlags & MERF_ENDPARA) && endOfs > len)
-+      *pOfs = (*ppRun)->member.run.len;
-+    else *pOfs = nCharOfs;
-+  }
- }
- 
- /******************************************************************************
--- 
-2.4.2
-
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 7b886925..c45e7ffe 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-e909986e6ea5ecd49b2b847f321ad89b2ae4f6f1
+de679af492ed93d70c99dff7f7cfc01cc8f25eb0