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

Removed first patch of series ws2_32_WriteWatches (accepted upstream).

Browse Source
This commit is contained in:
Sebastian Lackner
2015-03-19 20:23:42 +01:00
parent 5fe90fc2e8
commit 42b6978464
16 changed files with 150 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From bd0fc951470cce05795929f159a541c7ca84c318 Mon Sep 17 00:00:00 2001
From 6f4e0b9da2720ac9b3e37b419e5599cb0f0fb99d 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 c62998a..b16dd3f 100644
index 3818cfa..89a51ac 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -741,14 +741,27 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
@@ -871,14 +871,27 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
return S_OK;
}
@@ -42,7 +42,7 @@ index c62998a..b16dd3f 100644
}
static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
@@ -764,14 +777,27 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
@@ -894,14 +907,27 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
return S_OK;
}
@@ -72,7 +72,7 @@ index c62998a..b16dd3f 100644
}
static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **pFont)
@@ -1751,11 +1777,16 @@ static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFir
@@ -1881,11 +1907,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 c62998a..b16dd3f 100644
}
static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
@@ -1775,11 +1806,16 @@ static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
@@ -1905,11 +1936,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,10 +111,10 @@ index c62998a..b16dd3f 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 a89ee55..a0d0d17 100644
index b4fbaa1..5550e30 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1028,6 +1028,137 @@ static void test_IOleWindow_GetWindow(void)
@@ -1081,6 +1081,137 @@ static void test_IOleInPlaceSite_GetWindow(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -252,7 +252,7 @@ index a89ee55..a0d0d17 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1040,12 +1171,16 @@ START_TEST(richole)
@@ -1093,12 +1224,16 @@ START_TEST(richole)
test_ITextSelection_GetText();
test_ITextSelection_GetChar();
test_ITextSelection_GetStart_GetEnd();
@@ -268,7 +268,7 @@ index a89ee55..a0d0d17 100644
+ test_ITextRange_SetEnd();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
test_IOleInPlaceSite_GetWindow();
--
2.3.2

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

@@ -1,4 +1,4 @@
From b79278e3883ff38659fd4aaf6f9d9036f6d48956 Mon Sep 17 00:00:00 2001
From 602f1e247562b48297664865dbd676cb329f5257 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,10 +10,10 @@ 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 b16dd3f..5612ff9 100644
index 89a51ac..eaf1c4d 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
@@ -45,10 +45,12 @@ DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0x
DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
@@ -26,7 +26,7 @@ index b16dd3f..5612ff9 100644
typedef struct IRichEditOleImpl {
IUnknown IUnknown_inner;
@@ -62,8 +64,19 @@ typedef struct IRichEditOleImpl {
@@ -61,8 +63,19 @@ typedef struct IRichEditOleImpl {
ITextSelectionImpl *txtSel;
IOleClientSiteImpl *clientSite;
struct list rangelist;
@@ -63,7 +63,7 @@ index b16dd3f..5612ff9 100644
heap_free(This);
}
return ref;
@@ -548,6 +564,744 @@ static const IRichEditOleVtbl revt = {
@@ -678,6 +694,744 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@@ -808,7 +808,7 @@ index b16dd3f..5612ff9 100644
/* ITextRange interface */
static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface)
{
@@ -800,14 +1554,42 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
@@ -930,14 +1684,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 b16dd3f..5612ff9 100644
}
static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1821,11 +2603,24 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
@@ -1951,11 +2733,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 b16dd3f..5612ff9 100644
}
static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *pFont)
@@ -2459,6 +3254,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
@@ -2589,6 +3384,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 b16dd3f..5612ff9 100644
reo->outer_unk = outer_unk;
else
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index a0d0d17..8673aa9 100644
index 5550e30..a2d1a11 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1159,6 +1159,97 @@ static void test_ITextSelection_SetEnd(void)
@@ -1212,6 +1212,97 @@ static void test_ITextSelection_SetEnd(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
}
@@ -990,7 +990,7 @@ index a0d0d17..8673aa9 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1174,6 +1265,7 @@ START_TEST(richole)
@@ -1227,6 +1318,7 @@ START_TEST(richole)
test_ITextSelection_SetStart();
test_ITextSelection_SetEnd();
test_ITextSelection_Collapse();
@@ -998,14 +998,14 @@ index a0d0d17..8673aa9 100644
test_ITextDocument_Range();
test_ITextRange_GetChar();
test_ITextRange_GetStart_GetEnd();
@@ -1181,6 +1273,7 @@ START_TEST(richole)
@@ -1234,6 +1326,7 @@ START_TEST(richole)
test_ITextRange_Collapse();
test_ITextRange_SetStart();
test_ITextRange_SetEnd();
+ test_ITextRange_GetFont();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
test_IOleInPlaceSite_GetWindow();
--
2.3.2

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

@@ -1,4 +1,4 @@
From a9fa015b0c2d9bcc66980fab03bc5417623f2718 Mon Sep 17 00:00:00 2001
From 094eeb4fd0d44d2af4440aed623ceaf30a5bf959 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,10 +10,10 @@ 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 5612ff9..b5069e4 100644
index eaf1c4d..d815142 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
@@ -46,11 +46,13 @@ DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xa
DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
DEFINE_GUID(IID_ITextFont, 0x8cc497c3, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d);
@@ -27,7 +27,7 @@ index 5612ff9..b5069e4 100644
typedef struct IRichEditOleImpl {
IUnknown IUnknown_inner;
@@ -65,8 +67,19 @@ typedef struct IRichEditOleImpl {
@@ -64,8 +66,19 @@ typedef struct IRichEditOleImpl {
IOleClientSiteImpl *clientSite;
struct list rangelist;
struct list fontlist;
@@ -64,7 +64,7 @@ index 5612ff9..b5069e4 100644
heap_free(This);
}
return ref;
@@ -564,6 +580,641 @@ static const IRichEditOleVtbl revt = {
@@ -694,6 +710,641 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@@ -706,7 +706,7 @@ index 5612ff9..b5069e4 100644
/* ITextFont interface */
static inline ITextFontImpl *impl_from_ITextFont(ITextFont *iface)
{
@@ -1602,14 +2253,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1732,14 +2383,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
return E_NOTIMPL;
}
@@ -751,7 +751,7 @@ index 5612ff9..b5069e4 100644
}
static HRESULT WINAPI ITextRange_fnSetPara(ITextRange *me, ITextPara *pPara)
@@ -3255,6 +3934,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
@@ -3385,6 +4064,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 5612ff9..b5069e4 100644
reo->outer_unk = outer_unk;
else
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 8673aa9..afe8af9 100644
index a2d1a11..89b3839 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1250,6 +1250,52 @@ static void test_ITextSelection_GetFont(void)
@@ -1303,6 +1303,52 @@ static void test_ITextSelection_GetFont(void)
ITextFont_Release(txtFont);
}
@@ -816,14 +816,14 @@ index 8673aa9..afe8af9 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1274,6 +1320,7 @@ START_TEST(richole)
@@ -1327,6 +1373,7 @@ START_TEST(richole)
test_ITextRange_SetStart();
test_ITextRange_SetEnd();
test_ITextRange_GetFont();
+ test_ITextRange_GetPara();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
test_IOleInPlaceSite_GetWindow();
--
2.3.2

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

@@ -1,4 +1,4 @@
From 481415ab4d8f622ef27182aecc0f4a0635cfb44d Mon Sep 17 00:00:00 2001
From 49d6ee6879df42615d3b8c97bd320382fb580585 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().

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

@@ -1,4 +1,4 @@
From 1a1ce59d29cd53547810110ba1e201b070ea23bc Mon Sep 17 00:00:00 2001
From d0ddbc33e67637ac5ea3d73720d1260d37899bf8 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 b5069e4..e0a1d6e 100644
index d815142..12146ff 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2043,14 +2043,40 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R
@@ -2173,14 +2173,40 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R
return E_NOTIMPL;
}
@@ -55,7 +55,7 @@ index b5069e4..e0a1d6e 100644
}
static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr)
@@ -3127,8 +3153,6 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr)
@@ -3257,8 +3283,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 b5069e4..e0a1d6e 100644
if (!This->reOle)
return CO_E_RELEASED;
@@ -3137,23 +3161,7 @@ static HRESULT WINAPI ITextSelection_fnGetText(ITextSelection *me, BSTR *pbstr)
@@ -3267,23 +3291,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 b5069e4..e0a1d6e 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 afe8af9..192ff90 100644
index 89b3839..33b777b 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1296,6 +1296,43 @@ static void test_ITextRange_GetPara(void)
@@ -1349,6 +1349,43 @@ static void test_ITextRange_GetPara(void)
ITextPara_Release(txtPara);
}
@@ -137,14 +137,14 @@ index afe8af9..192ff90 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1321,6 +1358,7 @@ START_TEST(richole)
@@ -1374,6 +1411,7 @@ START_TEST(richole)
test_ITextRange_SetEnd();
test_ITextRange_GetFont();
test_ITextRange_GetPara();
+ test_ITextRange_GetText();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
test_IOleInPlaceSite_GetWindow();
--
2.3.2

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

@@ -1,4 +1,4 @@
From 1376e708ee270ff14de14cf761ee1965e6842c5e Mon Sep 17 00:00:00 2001
From d0269eafaac5cf25dfa223e1d9a9edd2572b3755 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 e0a1d6e..fb6c5b0 100644
index 12146ff..cfe0138 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2399,14 +2399,36 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Inde
@@ -2529,14 +2529,36 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Inde
return E_NOTIMPL;
}
@@ -51,7 +51,7 @@ index e0a1d6e..fb6c5b0 100644
}
static HRESULT WINAPI ITextRange_fnInRange(ITextRange *me, ITextRange *pRange, LONG *pb)
@@ -3001,26 +3023,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
@@ -3131,26 +3153,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
ITextRange** ppRange)
{
IRichEditOleImpl *This = impl_from_ITextDocument(me);
@@ -80,10 +80,10 @@ index e0a1d6e..fb6c5b0 100644
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 192ff90..312fad7 100644
index 33b777b..a943393 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1333,6 +1333,40 @@ static void test_ITextRange_GetText(void)
@@ -1386,6 +1386,40 @@ static void test_ITextRange_GetText(void)
TEST_TXTRGE_GETTEXT(1, 1, NULL)
}
@@ -124,14 +124,14 @@ index 192ff90..312fad7 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1359,6 +1393,7 @@ START_TEST(richole)
@@ -1412,6 +1446,7 @@ START_TEST(richole)
test_ITextRange_GetFont();
test_ITextRange_GetPara();
test_ITextRange_GetText();
+ test_ITextRange_SetRange();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
test_IOleInPlaceSite_GetWindow();
--
2.3.2

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

@@ -1,4 +1,4 @@
From 96742bfcb5ac8a1f95fee81246ef31c56c6613e5 Mon Sep 17 00:00:00 2001
From dd58c449f3fd930e7067f4910d82fc4a118cb585 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 fb6c5b0..ce1a2dd 100644
index cfe0138..73e1916 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2451,14 +2451,29 @@ static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, L
@@ -2581,14 +2581,29 @@ static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, L
return E_NOTIMPL;
}
@@ -45,10 +45,10 @@ index fb6c5b0..ce1a2dd 100644
static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 312fad7..d114fe2 100644
index a943393..6b1bada 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1367,6 +1367,52 @@ static void test_ITextRange_SetRange(void)
@@ -1420,6 +1420,52 @@ static void test_ITextRange_SetRange(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -101,14 +101,14 @@ index 312fad7..d114fe2 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1394,6 +1440,7 @@ START_TEST(richole)
@@ -1447,6 +1493,7 @@ START_TEST(richole)
test_ITextRange_GetPara();
test_ITextRange_GetText();
test_ITextRange_SetRange();
+ test_ITextRange_IsEqual();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
test_IOleInPlaceSite_GetWindow();
--
2.3.2

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

@@ -1,4 +1,4 @@
From 96767fde7d9558498176d82d2b509b0b458c7762 Mon Sep 17 00:00:00 2001
From 5606c81aa12ad51c3028d7e48a419e5000a0053a 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 ce1a2dd..6def896 100644
index 73e1916..525c7c1 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2333,8 +2333,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
@@ -2463,8 +2463,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
if (!This->reOle)
return CO_E_RELEASED;
@@ -26,10 +26,10 @@ index ce1a2dd..6def896 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 d114fe2..4e662da 100644
index 6b1bada..4e1a5a6 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1413,6 +1413,37 @@ static void test_ITextRange_IsEqual(void)
@@ -1466,6 +1466,37 @@ static void test_ITextRange_IsEqual(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -67,14 +67,14 @@ index d114fe2..4e662da 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1441,6 +1472,7 @@ START_TEST(richole)
@@ -1494,6 +1525,7 @@ START_TEST(richole)
test_ITextRange_GetText();
test_ITextRange_SetRange();
test_ITextRange_IsEqual();
+ test_ITextRange_GetStoryLength();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
}
test_IOleInPlaceSite_GetWindow();
--
2.3.2