wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f11563c65fa50e2f8b7e39cade34bb7a998b26f7.

Browse Source
This commit is contained in:
Zebediah Figura
2018-09-28 16:57:12 -05:00
parent 732d40058d
commit 761ca063a0
6 changed files with 74 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/riched20-IText_Interface/0006-riched20-Implement-ITextRange-SetRange.patch
View File

@@ -1,4 +1,4 @@
From 1d213a01d28a273c2b1b46dac6b606864cc88321 Mon Sep 17 00:00:00 2001
From ac8cabefac07d17d2fdf33b26444b74e5c910abf Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Wed, 13 Aug 2014 17:17:14 +0800
Subject: riched20: Implement ITextRange::SetRange.
@@ -9,10 +9,10 @@ Subject: riched20: Implement ITextRange::SetRange.
2 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index cc1a3c9..e432c79 100644
index 76f70a6..71fdf29 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2003,6 +2003,23 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG unit, LONG inde
@@ -2016,6 +2016,23 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG unit, LONG inde
return E_NOTIMPL;
}
@@ -36,7 +36,7 @@ index cc1a3c9..e432c79 100644
static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG active)
{
ITextRangeImpl *This = impl_from_ITextRange(me);
@@ -2012,7 +2029,13 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG ac
@@ -2025,7 +2042,13 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG ac
if (!This->child.reole)
return CO_E_RELEASED;
@@ -51,10 +51,10 @@ index cc1a3c9..e432c79 100644
}
static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG *ret)
@@ -4263,26 +4286,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
ITextRange** ppRange)
@@ -4317,26 +4340,12 @@ static HRESULT WINAPI ITextDocument2Old_fnRange(ITextDocument2Old *iface, LONG c
ITextRange **ppRange)
{
IRichEditOleImpl *This = impl_from_ITextDocument(me);
IRichEditOleImpl *This = impl_from_ITextDocument2Old(iface);
- const int len = ME_GetTextLength(This->editor) + 1;
TRACE("%p %p %d %d\n", This, ppRange, cp1, cp2);
@@ -80,10 +80,10 @@ index cc1a3c9..e432c79 100644
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 051d9fe..6e00b21 100644
index dfc6799..c98b536 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -3556,6 +3556,40 @@ static void test_ITextRange_GetText(void)
@@ -4009,6 +4009,40 @@ static void test_ITextRange_GetText(void)
TEST_TXTRGE_GETTEXT(1, 1, NULL)
}
@@ -124,7 +124,7 @@ index 051d9fe..6e00b21 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -3582,6 +3616,7 @@ START_TEST(richole)
@@ -4036,6 +4070,7 @@ START_TEST(richole)
test_ITextRange_GetFont();
test_ITextRange_GetPara();
test_ITextRange_GetText();
@@ -133,5 +133,5 @@ index 051d9fe..6e00b21 100644
test_IOleWindow_GetWindow();
test_IOleInPlaceSite_GetWindow();
--
2.4.3
2.7.4