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 upstream changes.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-03-16 17:13:28 +01:00
parent 9fd51f90ef
commit 17a3d8c2ea
14 changed files with 113 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/riched20-IText_Interface/0001-riched20-Implement-IText-Selection-Range-Set-Start-E.patch
View File

@@ -1,4 +1,4 @@
From 32cac6b3baa18e853028012d6cb9b36ff74f1f85 Mon Sep 17 00:00:00 2001
From bd0fc951470cce05795929f159a541c7ca84c318 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Fri, 8 Aug 2014 21:32:57 +0800
Subject: riched20: Implement IText{Selection, Range}::Set{Start, End}.
@@ -9,10 +9,10 @@ Subject: riched20: Implement IText{Selection, Range}::Set{Start, End}.
2 files changed, 179 insertions(+), 8 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 0788125..8b5f2ba 100644
index c62998a..b16dd3f 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -674,14 +674,27 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
@@ -741,14 +741,27 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
return S_OK;
}
@@ -42,7 +42,7 @@ index 0788125..8b5f2ba 100644
}
static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
@@ -697,14 +710,27 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
@@ -764,14 +777,27 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
return S_OK;
}
@@ -72,7 +72,7 @@ index 0788125..8b5f2ba 100644
}
static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **pFont)
@@ -1684,11 +1710,16 @@ static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFir
@@ -1751,11 +1777,16 @@ static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFir
static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
@@ -91,7 +91,7 @@ index 0788125..8b5f2ba 100644
}
static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
@@ -1708,11 +1739,16 @@ static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
@@ -1775,11 +1806,16 @@ static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
@@ -111,11 +111,11 @@ index 0788125..8b5f2ba 100644
static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **pFont)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index eed335c..2268211 100644
index a89ee55..a0d0d17 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -941,6 +941,137 @@ static void test_ITextSelection_Collapse(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
@@ -1028,6 +1028,137 @@ static void test_IOleWindow_GetWindow(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
+static void test_ITextRange_SetStart(void)
@@ -252,7 +252,7 @@ index eed335c..2268211 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -953,10 +1084,14 @@ START_TEST(richole)
@@ -1040,12 +1171,16 @@ START_TEST(richole)
test_ITextSelection_GetText();
test_ITextSelection_GetChar();
test_ITextSelection_GetStart_GetEnd();
@@ -266,7 +266,9 @@ index eed335c..2268211 100644
test_ITextRange_Collapse();
+ test_ITextRange_SetStart();
+ test_ITextRange_SetEnd();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
--
2.1.2
2.3.2

28
patches/riched20-IText_Interface/0002-riched20-Stub-for-ITextFont-interface-and-implement-.patch
View File

@@ -1,4 +1,4 @@
From 8f95372e011674226be25a4456db6dd2952da804 Mon Sep 17 00:00:00 2001
From b79278e3883ff38659fd4aaf6f9d9036f6d48956 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Mon, 11 Aug 2014 13:51:55 +0800
Subject: riched20: Stub for ITextFont interface and implement
@@ -10,7 +10,7 @@ Subject: riched20: Stub for ITextFont interface and implement
2 files changed, 893 insertions(+), 4 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 276c795..df43621 100644
index b16dd3f..5612ff9 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -46,10 +46,12 @@ DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0x
@@ -46,7 +46,7 @@ index 276c795..df43621 100644
struct ITextRangeImpl {
ITextRange ITextRange_iface;
LONG ref;
@@ -145,6 +158,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
@@ -146,6 +159,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
if (!ref)
{
ITextRangeImpl *txtRge;
@@ -54,7 +54,7 @@ index 276c795..df43621 100644
TRACE("Destroying %p\n", This);
This->txtSel->reOle = NULL;
@@ -153,6 +167,8 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
@@ -154,6 +168,8 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
IOleClientSite_Release(&This->clientSite->IOleClientSite_iface);
LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry)
txtRge->reOle = NULL;
@@ -63,7 +63,7 @@ index 276c795..df43621 100644
heap_free(This);
}
return ref;
@@ -492,6 +508,744 @@ static const IRichEditOleVtbl revt = {
@@ -548,6 +564,744 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@@ -808,7 +808,7 @@ index 276c795..df43621 100644
/* ITextRange interface */
static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface)
{
@@ -744,14 +1498,42 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
@@ -800,14 +1554,42 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
return range_SetEnd(This->reOle->editor, cpLim, &This->start, &This->end);
}
@@ -853,7 +853,7 @@ index 276c795..df43621 100644
}
static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1765,11 +2547,24 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
@@ -1821,11 +2603,24 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **pFont)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
@@ -880,7 +880,7 @@ index 276c795..df43621 100644
}
static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *pFont)
@@ -2403,6 +3198,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
@@ -2459,6 +3254,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
}
TRACE("Created %p\n",reo);
list_init(&reo->rangelist);
@@ -889,10 +889,10 @@ index 276c795..df43621 100644
reo->outer_unk = outer_unk;
else
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 2268211..e9618d8 100644
index a0d0d17..8673aa9 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1072,6 +1072,97 @@ static void test_ITextSelection_SetEnd(void)
@@ -1159,6 +1159,97 @@ static void test_ITextSelection_SetEnd(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
}
@@ -990,7 +990,7 @@ index 2268211..e9618d8 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1087,6 +1178,7 @@ START_TEST(richole)
@@ -1174,6 +1265,7 @@ START_TEST(richole)
test_ITextSelection_SetStart();
test_ITextSelection_SetEnd();
test_ITextSelection_Collapse();
@@ -998,12 +998,14 @@ index 2268211..e9618d8 100644
test_ITextDocument_Range();
test_ITextRange_GetChar();
test_ITextRange_GetStart_GetEnd();
@@ -1094,4 +1186,5 @@ START_TEST(richole)
@@ -1181,6 +1273,7 @@ START_TEST(richole)
test_ITextRange_Collapse();
test_ITextRange_SetStart();
test_ITextRange_SetEnd();
+ test_ITextRange_GetFont();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
--
1.9.1
2.3.2

24
patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch
View File

@@ -1,4 +1,4 @@
From 19911f4b2960e524c1701273c9460d281643d03c Mon Sep 17 00:00:00 2001
From a9fa015b0c2d9bcc66980fab03bc5417623f2718 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 22:17:57 +0800
Subject: riched20: Stub for ITextPara interface and implement
@@ -10,7 +10,7 @@ Subject: riched20: Stub for ITextPara interface and implement
2 files changed, 729 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index df43621..f98f147 100644
index 5612ff9..b5069e4 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -47,11 +47,13 @@ DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xa
@@ -47,7 +47,7 @@ index df43621..f98f147 100644
struct ITextFontImpl {
ITextFont ITextFont_iface;
LONG ref;
@@ -159,6 +172,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
@@ -160,6 +173,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
{
ITextRangeImpl *txtRge;
ITextFontImpl *txtFont;
@@ -55,7 +55,7 @@ index df43621..f98f147 100644
TRACE("Destroying %p\n", This);
This->txtSel->reOle = NULL;
@@ -169,6 +183,8 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
@@ -170,6 +184,8 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
txtRge->reOle = NULL;
LIST_FOR_EACH_ENTRY(txtFont, &This->fontlist, ITextFontImpl, entry)
txtFont->reOle = NULL;
@@ -64,7 +64,7 @@ index df43621..f98f147 100644
heap_free(This);
}
return ref;
@@ -508,6 +524,641 @@ static const IRichEditOleVtbl revt = {
@@ -564,6 +580,641 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@@ -706,7 +706,7 @@ index df43621..f98f147 100644
/* ITextFont interface */
static inline ITextFontImpl *impl_from_ITextFont(ITextFont *iface)
{
@@ -1546,14 +2197,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1602,14 +2253,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
return E_NOTIMPL;
}
@@ -751,7 +751,7 @@ index df43621..f98f147 100644
}
static HRESULT WINAPI ITextRange_fnSetPara(ITextRange *me, ITextPara *pPara)
@@ -3199,6 +3878,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
@@ -3255,6 +3934,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
TRACE("Created %p\n",reo);
list_init(&reo->rangelist);
list_init(&reo->fontlist);
@@ -760,10 +760,10 @@ index df43621..f98f147 100644
reo->outer_unk = outer_unk;
else
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index e9618d8..909d27e 100644
index 8673aa9..afe8af9 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1163,6 +1163,52 @@ static void test_ITextSelection_GetFont(void)
@@ -1250,6 +1250,52 @@ static void test_ITextSelection_GetFont(void)
ITextFont_Release(txtFont);
}
@@ -816,12 +816,14 @@ index e9618d8..909d27e 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1187,4 +1233,5 @@ START_TEST(richole)
@@ -1274,6 +1320,7 @@ START_TEST(richole)
test_ITextRange_SetStart();
test_ITextRange_SetEnd();
test_ITextRange_GetFont();
+ test_ITextRange_GetPara();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
--
1.9.1
2.3.2

4
patches/riched20-IText_Interface/0004-riched20-Fix-ME_RunOfsFromCharOfs-when-nCharOfs-strl.patch
View File

@@ -1,4 +1,4 @@
From 48d9ee478bda1e5305965e0793af9ba844f704a5 Mon Sep 17 00:00:00 2001
From 481415ab4d8f622ef27182aecc0f4a0635cfb44d 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().
@@ -37,5 +37,5 @@ index 38d0270..ad08b82 100644
/******************************************************************************
--
2.1.2
2.3.2

20
patches/riched20-IText_Interface/0005-riched20-Implement-ITextRange-GetText.patch
View File

@@ -1,4 +1,4 @@
From 2980acb7084bfaddaa37a19e9961493a0a20cb0c Mon Sep 17 00:00:00 2001
From 1a1ce59d29cd53547810110ba1e201b070ea23bc Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Wed, 13 Aug 2014 15:40:11 +0800
Subject: riched20: Implement ITextRange::GetText.
@@ -9,10 +9,10 @@ Subject: riched20: Implement ITextRange::GetText.
2 files changed, 67 insertions(+), 21 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 76fc51d..63e0142 100644
index b5069e4..e0a1d6e 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1970,14 +1970,40 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R
@@ -2043,14 +2043,40 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R
return E_NOTIMPL;
}
@@ -55,7 +55,7 @@ index 76fc51d..63e0142 100644
}
static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr)
@@ -3054,8 +3080,6 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr)
@@ -3127,8 +3153,6 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
ME_Cursor *start = NULL, *end = NULL;
@@ -64,7 +64,7 @@ index 76fc51d..63e0142 100644
if (!This->reOle)
return CO_E_RELEASED;
@@ -3064,23 +3088,7 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr)
@@ -3137,23 +3161,7 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr)
return E_INVALIDARG;
ME_GetSelection(This->reOle->editor, &start, &end);
@@ -90,10 +90,10 @@ index 76fc51d..63e0142 100644
static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 909d27e..0079b39 100644
index afe8af9..192ff90 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1209,6 +1209,43 @@ static void test_ITextRange_GetPara(void)
@@ -1296,6 +1296,43 @@ static void test_ITextRange_GetPara(void)
ITextPara_Release(txtPara);
}
@@ -137,12 +137,14 @@ index 909d27e..0079b39 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1234,4 +1271,5 @@ START_TEST(richole)
@@ -1321,6 +1358,7 @@ START_TEST(richole)
test_ITextRange_SetEnd();
test_ITextRange_GetFont();
test_ITextRange_GetPara();
+ test_ITextRange_GetText();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
--
2.1.2
2.3.2

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

@@ -1,4 +1,4 @@
From 6f514567079f943943d176edb86e15c85db3477b Mon Sep 17 00:00:00 2001
From 1376e708ee270ff14de14cf761ee1965e6842c5e 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(+), 17 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 63e0142..0a59388 100644
index e0a1d6e..fb6c5b0 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2326,14 +2326,36 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Inde
@@ -2399,14 +2399,36 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Inde
return E_NOTIMPL;
}
@@ -51,7 +51,7 @@ index 63e0142..0a59388 100644
}
static HRESULT WINAPI ITextRange_fnInRange(ITextRange *me, ITextRange *pRange, LONG *pb)
@@ -2928,26 +2950,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
@@ -3001,26 +3023,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
ITextRange** ppRange)
{
IRichEditOleImpl *This = impl_from_ITextDocument(me);
@@ -80,10 +80,10 @@ index 63e0142..0a59388 100644
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 0079b39..e7618f9 100644
index 192ff90..312fad7 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1246,6 +1246,40 @@ static void test_ITextRange_GetText(void)
@@ -1333,6 +1333,40 @@ static void test_ITextRange_GetText(void)
TEST_TXTRGE_GETTEXT(1, 1, NULL)
}
@@ -124,12 +124,14 @@ index 0079b39..e7618f9 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1272,4 +1306,5 @@ START_TEST(richole)
@@ -1359,6 +1393,7 @@ START_TEST(richole)
test_ITextRange_GetFont();
test_ITextRange_GetPara();
test_ITextRange_GetText();
+ test_ITextRange_SetRange();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
--
2.1.2
2.3.2

16
patches/riched20-IText_Interface/0007-riched20-Implement-ITextRange-IsEqual.patch
View File

@@ -1,4 +1,4 @@
From 6ccbe61f2439e6af6919257535eec784e8398c2d Mon Sep 17 00:00:00 2001
From 96742bfcb5ac8a1f95fee81246ef31c56c6613e5 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Fri, 15 Aug 2014 14:27:21 +0800
Subject: riched20: Implement ITextRange::IsEqual.
@@ -9,10 +9,10 @@ Subject: riched20: Implement ITextRange::IsEqual.
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 0a59388..3bb1b5a 100644
index fb6c5b0..ce1a2dd 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2378,14 +2378,29 @@ static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, L
@@ -2451,14 +2451,29 @@ static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, L
return E_NOTIMPL;
}
@@ -45,10 +45,10 @@ index 0a59388..3bb1b5a 100644
static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index e7618f9..7a4c8b5 100644
index 312fad7..d114fe2 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1280,6 +1280,52 @@ static void test_ITextRange_SetRange(void)
@@ -1367,6 +1367,52 @@ static void test_ITextRange_SetRange(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -101,12 +101,14 @@ index e7618f9..7a4c8b5 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1307,4 +1353,5 @@ START_TEST(richole)
@@ -1394,6 +1440,7 @@ START_TEST(richole)
test_ITextRange_GetPara();
test_ITextRange_GetText();
test_ITextRange_SetRange();
+ test_ITextRange_IsEqual();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
--
2.1.2
2.3.2

16
patches/riched20-IText_Interface/0008-riched20-Implement-ITextRange-GetStoryLength.patch
View File

@@ -1,4 +1,4 @@
From b3ca01e489e57615c3b5849bd301ecee19ddf4b1 Mon Sep 17 00:00:00 2001
From 96767fde7d9558498176d82d2b509b0b458c7762 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Mon, 18 Aug 2014 14:38:50 +0800
Subject: riched20: Implement ITextRange::GetStoryLength.
@@ -9,10 +9,10 @@ Subject: riched20: Implement ITextRange::GetStoryLength.
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 3bb1b5a..0bc302b 100644
index ce1a2dd..6def896 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2260,8 +2260,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
@@ -2333,8 +2333,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
if (!This->reOle)
return CO_E_RELEASED;
@@ -26,10 +26,10 @@ index 3bb1b5a..0bc302b 100644
static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *pValue)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 7a4c8b5..543f3ec 100644
index d114fe2..4e662da 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1326,6 +1326,37 @@ static void test_ITextRange_IsEqual(void)
@@ -1413,6 +1413,37 @@ static void test_ITextRange_IsEqual(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -67,12 +67,14 @@ index 7a4c8b5..543f3ec 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1354,4 +1385,5 @@ START_TEST(richole)
@@ -1441,6 +1472,7 @@ START_TEST(richole)
test_ITextRange_GetText();
test_ITextRange_SetRange();
test_ITextRange_IsEqual();
+ test_ITextRange_GetStoryLength();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
--
2.1.2
2.3.2