wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 22983f2b65dc40bfa90a73e3e3bd2e13cc90e22f.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-05-28 16:57:14 +02:00
parent c10eb9a4a1
commit 79e542c24a
5 changed files with 31 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -55,7 +55,7 @@ version()
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
echo " commit 39d71c52ef7839fe7daad97b009d029b71f691ba"
echo " commit 22983f2b65dc40bfa90a73e3e3bd2e13cc90e22f"
echo ""
}

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

@ -1,4 +1,4 @@
From 2c3ed1eb642962a893824507dbe35aaef0dddf65 Mon Sep 17 00:00:00 2001
From c7baa273ffbfe58fa195d5f61a9a5a03ed86dceb 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}.
@ -8,11 +8,11 @@ Subject: riched20: Implement IText{Selection, Range}::Set{Start, End}.
1 file changed, 135 insertions(+)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 7d90a98..45ec28a 100644
index 3e41ede..49d4652 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -2487,6 +2487,137 @@ static void test_SetText(void)
ITextRange_Release(range);
@@ -2806,6 +2806,137 @@ static void test_Select(void)
ITextSelection_Release(selection);
}
+static void test_ITextRange_SetStart(void)
@ -149,7 +149,7 @@ index 7d90a98..45ec28a 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -2499,12 +2630,16 @@ START_TEST(richole)
@@ -2818,12 +2949,16 @@ START_TEST(richole)
test_GetText();
test_ITextSelection_GetChar();
test_ITextSelection_GetStart_GetEnd();

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

@ -1,4 +1,4 @@
From bf01cfc213a0430c1086fd70dd92bfe7a684bd5d Mon Sep 17 00:00:00 2001
From cbae34419bf155b9bebae7bf28a90722b81fde5a 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 4aee91f..fc9875f 100644
index 1d22a3d..5795dd3 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1354,14 +1354,36 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Inde
@@ -1766,14 +1766,36 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG Unit, LONG Inde
return E_NOTIMPL;
}
@ -50,8 +50,8 @@ index 4aee91f..fc9875f 100644
+ return S_OK;
}
static HRESULT WINAPI ITextRange_fnInRange(ITextRange *me, ITextRange *pRange, LONG *pb)
@@ -3436,26 +3458,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
static HRESULT textrange_inrange(LONG start, LONG end, ITextRange *range, LONG *ret)
@@ -3956,26 +3978,12 @@ ITextDocument_fnRange(ITextDocument* me, LONG cp1, LONG cp2,
ITextRange** ppRange)
{
IRichEditOleImpl *This = impl_from_ITextDocument(me);
@ -80,10 +80,10 @@ index 4aee91f..fc9875f 100644
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 44b1f4c..1529c3c 100644
index d4cc049..529d2e0 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1720,6 +1720,40 @@ static void test_ITextRange_GetText(void)
@@ -3097,6 +3097,40 @@ static void test_ITextRange_GetText(void)
TEST_TXTRGE_GETTEXT(1, 1, NULL)
}
@ -124,7 +124,7 @@ index 44b1f4c..1529c3c 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1746,6 +1780,7 @@ START_TEST(richole)
@@ -3123,6 +3157,7 @@ START_TEST(richole)
test_ITextRange_GetFont();
test_ITextRange_GetPara();
test_ITextRange_GetText();
@ -133,5 +133,5 @@ index 44b1f4c..1529c3c 100644
test_IOleWindow_GetWindow();
test_IOleInPlaceSite_GetWindow();
--
2.4.0
2.4.1

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

@ -1,58 +1,21 @@
From 02798a813a2f584e7e884531e4a89b6615d6ed4a Mon Sep 17 00:00:00 2001
From c3c1be38502880aa25b1ec2f26765802ba87d3dc 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.
---
dlls/riched20/richole.c | 19 +++++++++++++++--
dlls/riched20/tests/richole.c | 47 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 64 insertions(+), 2 deletions(-)
1 file changed, 47 insertions(+)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index fc9875f..0052448 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1406,14 +1406,29 @@ static HRESULT WINAPI ITextRange_fnInStory(ITextRange *me, ITextRange *pRange, L
return E_NOTIMPL;
}
+static HRESULT range_IsEqual(LONG start, LONG end, ITextRange *pRange, LONG *pb)
+{
+ ITextRangeImpl *pRangeImpl = impl_from_ITextRange(pRange);
+ if (start == pRangeImpl->start && end == pRangeImpl->end)
+ {
+ if (pb)
+ *pb = tomTrue;
+ return S_OK;
+ }
+ if (pb)
+ *pb = tomFalse;
+ return S_FALSE;
+}
+
static HRESULT WINAPI ITextRange_fnIsEqual(ITextRange *me, ITextRange *pRange, LONG *pb)
{
ITextRangeImpl *This = impl_from_ITextRange(me);
if (!This->reOle)
return CO_E_RELEASED;
- FIXME("not implemented %p\n", This);
- return E_NOTIMPL;
+ if (!pRange)
+ return S_FALSE;
+ return range_IsEqual(This->start, This->end, pRange, pb);
}
static HRESULT WINAPI ITextRange_fnSelect(ITextRange *me)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 1529c3c..e158a61 100644
index 529d2e0..451d888 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1754,6 +1754,52 @@ static void test_ITextRange_SetRange(void)
@@ -3131,6 +3131,52 @@ static void test_ITextRange_SetRange(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
+static void test_ITextRange_IsEqual(void)
+static void test_ITextRange_IsEqual2(void)
+{
+ HWND w;
+ IRichEditOle *reOle = NULL;
@ -101,14 +64,14 @@ index 1529c3c..e158a61 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1781,6 +1827,7 @@ START_TEST(richole)
@@ -3158,6 +3204,7 @@ START_TEST(richole)
test_ITextRange_GetPara();
test_ITextRange_GetText();
test_ITextRange_SetRange();
+ test_ITextRange_IsEqual();
+ test_ITextRange_IsEqual2();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
test_IOleInPlaceSite_GetWindow();
--
2.4.0
2.4.1

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

@ -1,4 +1,4 @@
From d98c00a85b52d4d440b48ae7618cc9ec15bc1c82 Mon Sep 17 00:00:00 2001
From 58674bc10a5ef2c3dd6a3b2d143b21521c6bb3af 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 0052448..4ec4513 100644
index 5795dd3..8a86a11 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1288,8 +1288,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
@@ -1700,8 +1700,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
if (!This->reOle)
return CO_E_RELEASED;
@ -26,10 +26,10 @@ index 0052448..4ec4513 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 e158a61..dd6cad4 100644
index 451d888..f30d077 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1800,6 +1800,37 @@ static void test_ITextRange_IsEqual(void)
@@ -3177,6 +3177,37 @@ static void test_ITextRange_IsEqual2(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@ -67,14 +67,14 @@ index e158a61..dd6cad4 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1828,6 +1859,7 @@ START_TEST(richole)
@@ -3205,6 +3236,7 @@ START_TEST(richole)
test_ITextRange_GetText();
test_ITextRange_SetRange();
test_ITextRange_IsEqual();
test_ITextRange_IsEqual2();
+ test_ITextRange_GetStoryLength();
test_IOleClientSite_QueryInterface();
test_IOleWindow_GetWindow();
test_IOleInPlaceSite_GetWindow();
--
2.4.0
2.4.1