Huw Davies : riched20: Merge the richole object with the text services object.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 43d377c260538847395a6844edec09727fc8d47e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=43d377c260538847395a6844edec09727fc8d47e

Author: Huw Davies <huw at codeweavers.com>
Date:   Wed Mar 31 12:23:04 2021 +0100

riched20: Merge the richole object with the text services object.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/riched20/editor.c  |  31 +-
 dlls/riched20/editor.h  |   4 +-
 dlls/riched20/editstr.h |  26 +-
 dlls/riched20/richole.c | 897 +++++++++++++++++++++---------------------------
 dlls/riched20/txtsrv.c  |  29 +-
 5 files changed, 444 insertions(+), 543 deletions(-)

Diff:   https://source.winehq.org/git/wine.git/?a=commitdiff;h=43d377c260538847395a6844edec09727fc8d47e