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

Updated patches in riched20-IText_Interface.

Browse Source
This commit is contained in:
Sebastian Lackner 2014-08-13 03:13:36 +02:00
parent 69e14bd36b
commit 046a795ef1
10 changed files with 86 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/Makefile
View File

@ -499,7 +499,7 @@ quartz-MediaSeeking_Positions.ok:
# Patchset riched20-IText_Interface
# |
# | Included patches:
# | * Implement Stubs for ITextRange interface. [rev 2, by Jactry Zeng]
# | * Implement Stubs for ITextRange interface. [rev 3, by Jactry Zeng]
# | * Implement IText{Range,Selection}::{GetChar,GetStart,GetEnd,GetDuplicate,Collapse,SetStart,SetEnd}. [by Jactry Zeng]
# | * Implement Stubs for ITextFont interface. [rev 2, by Jactry Zeng]
# | * Implement Stubs for ITextPara interface. [rev 2, by Jactry Zeng]
@ -522,7 +522,7 @@ riched20-IText_Interface.ok:
$(call APPLY_FILE,riched20-IText_Interface/0007-riched20-Stub-for-ITextFont-interface-and-implement-.patch)
$(call APPLY_FILE,riched20-IText_Interface/0008-riched20-Stub-for-ITextPara-interface-and-implement-.patch)
@( \
echo '+ { "riched20-IText_Interface", "Jactry Zeng", "Implement Stubs for ITextRange interface. [rev 2]" },'; \
echo '+ { "riched20-IText_Interface", "Jactry Zeng", "Implement Stubs for ITextRange interface. [rev 3]" },'; \
echo '+ { "riched20-IText_Interface", "Jactry Zeng", "Implement IText{Range,Selection}::{GetChar,GetStart,GetEnd,GetDuplicate,Collapse,SetStart,SetEnd}." },'; \
echo '+ { "riched20-IText_Interface", "Jactry Zeng", "Implement Stubs for ITextFont interface. [rev 2]" },'; \
echo '+ { "riched20-IText_Interface", "Jactry Zeng", "Implement Stubs for ITextPara interface. [rev 2]" },'; \

22
patches/riched20-IText_Interface/0001-riched20-Stub-for-ITextRange-interface-and-implement.patch
View File

@ -1,16 +1,16 @@
From 31fc24d0900889d69dcdba411420216ba15675c0 Mon Sep 17 00:00:00 2001
From bbe2850e3277120e570c47fd3dde1e3e90dc84e3 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 21:50:03 +0800
Date: Mon, 11 Aug 2014 13:29:06 +0800
Subject: riched20: Stub for ITextRange interface and implement
ITextDocument::Range.
---
dlls/riched20/richole.c | 726 ++++++++++++++++++++++++++++++++++++++++-
dlls/riched20/richole.c | 730 ++++++++++++++++++++++++++++++++++++++++-
dlls/riched20/tests/richole.c | 35 +-
2 files changed, 758 insertions(+), 3 deletions(-)
2 files changed, 762 insertions(+), 3 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 487fcda..8ec5314 100644
index 487fcda..5e2ffd0 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -49,6 +49,7 @@ DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0x
@ -54,7 +54,7 @@ index 487fcda..8ec5314 100644
heap_free(This);
}
return ref;
@@ -443,6 +457,680 @@ static const IRichEditOleVtbl revt = {
@@ -443,6 +457,682 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@ -138,6 +138,8 @@ index 487fcda..8ec5314 100644
+ UINT *puArgErr)
+{
+ ITextRangeImpl *This = impl_from_ITextRange(me);
+ if (!This->reOle)
+ return CO_E_RELEASED;
+
+ FIXME("not implemented %p\n", This);
+ return E_NOTIMPL;
@ -735,7 +737,7 @@ index 487fcda..8ec5314 100644
static HRESULT WINAPI
ITextDocument_fnQueryInterface(ITextDocument* me, REFIID riid,
void** ppvObject)
@@ -646,13 +1334,46 @@ ITextDocument_fnRedo(ITextDocument* me, LONG Count, LONG* prop)
@@ -646,13 +1336,48 @@ ITextDocument_fnRedo(ITextDocument* me, LONG Count, LONG* prop)
return E_NOTIMPL;
}
@ -772,11 +774,13 @@ index 487fcda..8ec5314 100644
+ cp2 = min(cp2, len);
+ if (cp1 > cp2)
+ {
+ int tmp;
+ LONG tmp;
+ tmp = cp1;
+ cp1 = cp2;
+ cp2 = tmp;
+ }
+ if (cp1 == len)
+ cp1 = cp2 = len - 1;
+ txtRge = heap_alloc(sizeof(ITextRangeImpl));
+ if (!txtRge)
+ return E_OUTOFMEMORY;
@ -784,7 +788,7 @@ index 487fcda..8ec5314 100644
}
static HRESULT WINAPI
@@ -1548,6 +2269,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
@@ -1548,6 +2273,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
}
TRACE("Created %p\n",reo);
*ppObj = reo;

8
patches/riched20-IText_Interface/0002-riched20-Implement-ITextSelection-GetChar-and-ITextR.patch
View File

@ -1,4 +1,4 @@
From 880c4eeef11d2898a6ea5e66118429f862da9e2d Mon Sep 17 00:00:00 2001
From f2671157f09140350a3dccda9dbc65890d4c0567 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 21:55:44 +0800
Subject: riched20: Implement ITextSelection::GetChar and ITextRange::GetChar.
@ -9,10 +9,10 @@ Subject: riched20: Implement ITextSelection::GetChar and ITextRange::GetChar.
2 files changed, 94 insertions(+), 4 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 8ec5314..bfc5004 100644
index 5e2ffd0..f39e0ae 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -562,14 +562,29 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr)
@@ -564,14 +564,29 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr)
return E_NOTIMPL;
}
@ -44,7 +44,7 @@ index 8ec5314..bfc5004 100644
}
static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch)
@@ -1547,11 +1562,16 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr)
@@ -1551,11 +1566,16 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr)
static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);

34
patches/riched20-IText_Interface/0003-riched20-Implement-IText-Selection-Range-Get-Start-E.patch
View File

@ -1,18 +1,18 @@
From 4e32169f71847a72ede19be796935c95848c079c Mon Sep 17 00:00:00 2001
From 9ec3f81caf3544b782cda012e7737d1784c1978b Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Thu, 7 Aug 2014 14:59:13 +0800
Date: Mon, 11 Aug 2014 10:58:26 +0800
Subject: riched20: Implement IText{Selection, Range}::Get{Start, End}.
---
dlls/riched20/richole.c | 30 ++++++++++++++++++-------
dlls/riched20/tests/richole.c | 50 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 8 deletions(-)
dlls/riched20/richole.c | 30 +++++++++++++++++-------
dlls/riched20/tests/richole.c | 52 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 8 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index bfc5004..d8382b7 100644
index f39e0ae..071496d 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -633,8 +633,11 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
@@ -635,8 +635,11 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
if (!This->reOle)
return CO_E_RELEASED;
@ -26,7 +26,7 @@ index bfc5004..d8382b7 100644
}
static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG cpFirst)
@@ -653,8 +656,11 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
@@ -655,8 +658,11 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
if (!This->reOle)
return CO_E_RELEASED;
@ -40,7 +40,7 @@ index bfc5004..d8382b7 100644
}
static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
@@ -1617,11 +1623,15 @@ static HRESULT WINAPI ITextSelection_fnSetFormattedText(ITextSelection *me, ITex
@@ -1621,11 +1627,15 @@ static HRESULT WINAPI ITextSelection_fnSetFormattedText(ITextSelection *me, ITex
static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFirst)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
@ -58,7 +58,7 @@ index bfc5004..d8382b7 100644
}
static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst)
@@ -1637,11 +1647,15 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst
@@ -1641,11 +1651,15 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst
static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
@ -77,10 +77,10 @@ index bfc5004..d8382b7 100644
static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 152d144..22ee4b5 100644
index 152d144..e46e2af 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -586,6 +586,55 @@ static void test_ITextRange_GetChar(void)
@@ -586,6 +586,57 @@ static void test_ITextRange_GetChar(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@ -111,9 +111,10 @@ index 152d144..22ee4b5 100644
+ ok(end == expected_end, "got wrong end value: %d\n", end); \
+ ITextRange_Release(txtRge);
+
+ TEST_TXTRGE_GETSTARTEND(1, 6, 1, 6);
+ TEST_TXTRGE_GETSTARTEND(6, 1, 1, 6);
+ TEST_TXTRGE_GETSTARTEND(-1, 13, 0, 13);
+ TEST_TXTRGE_GETSTARTEND(1, 6, 1, 6)
+ TEST_TXTRGE_GETSTARTEND(6, 1, 1, 6)
+ TEST_TXTRGE_GETSTARTEND(-1, 13, 0, 13)
+ TEST_TXTRGE_GETSTARTEND(13, 13, 12, 12)
+
+ /* tests for ITextSelection::Get{Start, End} */
+#define TEST_TXTSEL_GETSTARTEND(first, lim, expected_start, expected_end) \
@ -129,6 +130,7 @@ index 152d144..22ee4b5 100644
+ TEST_TXTSEL_GETSTARTEND(2, 5, 2, 5)
+ TEST_TXTSEL_GETSTARTEND(5, 2, 2, 5)
+ TEST_TXTSEL_GETSTARTEND(0, -1, 0, strlen(test_text1)+1)
+ TEST_TXTSEL_GETSTARTEND(13, 13, 12, 12)
+
+ release_interfaces(&w, &reOle, &txtDoc, &txtSel);
+}
@ -136,7 +138,7 @@ index 152d144..22ee4b5 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -599,4 +648,5 @@ START_TEST(richole)
@@ -599,4 +650,5 @@ START_TEST(richole)
test_ITextSelection_GetChar();
test_ITextDocument_Range();
test_ITextRange_GetChar();

12
patches/riched20-IText_Interface/0004-riched20-Implement-ITextRange-GetDuplicate.patch
View File

@ -1,4 +1,4 @@
From 98c934438ec14a885d07fd0caa220f244b13a5c2 Mon Sep 17 00:00:00 2001
From 8f98440f78071eaa1487ddb86749a9850f834811 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 20:43:41 +0800
Subject: riched20: Implement ITextRange::GetDuplicate.
@ -9,10 +9,10 @@ Subject: riched20: Implement ITextRange::GetDuplicate.
2 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index d8382b7..e0e5417 100644
index 071496d..96c1222 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -597,14 +597,24 @@ static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch)
@@ -599,14 +599,24 @@ static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch)
return E_NOTIMPL;
}
@ -40,10 +40,10 @@ index d8382b7..e0e5417 100644
static HRESULT WINAPI ITextRange_fnGetFormattedText(ITextRange *me, ITextRange **ppRange)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 22ee4b5..bc04c84 100644
index e46e2af..b90d6c5 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -635,6 +635,40 @@ static void test_GetStart_GetEnd(void)
@@ -637,6 +637,40 @@ static void test_GetStart_GetEnd(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
}
@ -84,7 +84,7 @@ index 22ee4b5..bc04c84 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -648,5 +682,6 @@ START_TEST(richole)
@@ -650,5 +684,6 @@ START_TEST(richole)
test_ITextSelection_GetChar();
test_ITextDocument_Range();
test_ITextRange_GetChar();

14
patches/riched20-IText_Interface/0005-riched20-Implement-ITextRange-Collapse-and-ITextSele.patch
View File

@ -1,4 +1,4 @@
From 2661099a3f5936b20a46aef4c2114498bac68611 Mon Sep 17 00:00:00 2001
From 3aed8c6d2529035b486cd9cb78c090b882e87db8 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 06:02:02 +0800
Subject: riched20: Implement ITextRange::Collapse and
@ -10,10 +10,10 @@ Subject: riched20: Implement ITextRange::Collapse and
2 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index e0e5417..553a6b5 100644
index 96c1222..d178192 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -743,14 +743,26 @@ static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *pValue)
@@ -745,14 +745,26 @@ static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *pValue)
return E_NOTIMPL;
}
@ -43,7 +43,7 @@ index e0e5417..553a6b5 100644
}
static HRESULT WINAPI ITextRange_fnExpand(ITextRange *me, LONG Unit, LONG *pDelta)
@@ -1741,11 +1753,16 @@ static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *pV
@@ -1745,11 +1757,16 @@ static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *pV
static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
@ -63,10 +63,10 @@ index e0e5417..553a6b5 100644
static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG Unit, LONG *pDelta)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index bc04c84..7effc3d 100644
index b90d6c5..ce14406 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -669,6 +669,84 @@ static void test_ITextRange_GetDuplicate(void)
@@ -671,6 +671,84 @@ static void test_ITextRange_GetDuplicate(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@ -151,7 +151,7 @@ index bc04c84..7effc3d 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -680,8 +758,10 @@ START_TEST(richole)
@@ -682,8 +760,10 @@ START_TEST(richole)
test_ITextDocument_Open();
test_ITextSelection_GetText();
test_ITextSelection_GetChar();

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

@ -1,4 +1,4 @@
From 10f9009d2591fc867371a0e966225d562446387a Mon Sep 17 00:00:00 2001
From 323889ff346b8e10fa13fede8241263fb9f34c0d 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 553a6b5..ca54cf5 100644
index d178192..86a226b 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -650,14 +650,27 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
@@ -652,14 +652,27 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst)
return S_OK;
}
@ -42,7 +42,7 @@ index 553a6b5..ca54cf5 100644
}
static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
@@ -673,14 +686,27 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
@@ -675,14 +688,27 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim)
return S_OK;
}
@ -72,7 +72,7 @@ index 553a6b5..ca54cf5 100644
}
static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **pFont)
@@ -1659,11 +1685,16 @@ static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFir
@@ -1663,11 +1689,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 553a6b5..ca54cf5 100644
}
static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
@@ -1683,11 +1714,16 @@ static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim)
@@ -1687,11 +1718,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 553a6b5..ca54cf5 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 7effc3d..2916bc5 100644
index ce14406..46cea63 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -747,6 +747,137 @@ static void test_ITextSelection_Collapse(void)
@@ -749,6 +749,137 @@ static void test_ITextSelection_Collapse(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
}
@ -252,7 +252,7 @@ index 7effc3d..2916bc5 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -758,10 +889,14 @@ START_TEST(richole)
@@ -760,10 +891,14 @@ START_TEST(richole)
test_ITextDocument_Open();
test_ITextSelection_GetText();
test_ITextSelection_GetChar();

32
patches/riched20-IText_Interface/0007-riched20-Stub-for-ITextFont-interface-and-implement-.patch
View File

@ -1,16 +1,16 @@
From b7fdf9c52e9ba093755f118d438910f0a10a77a5 Mon Sep 17 00:00:00 2001
From ee362b1b02e5ca39a70c13628c7c4ca11bf09ba6 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 21:47:48 +0800
Date: Mon, 11 Aug 2014 13:51:55 +0800
Subject: riched20: Stub for ITextFont interface and implement
ITextRange::GetFont and ITextSelection::GetFont.
---
dlls/riched20/richole.c | 800 ++++++++++++++++++++++++++++++++++++++++-
dlls/riched20/richole.c | 804 ++++++++++++++++++++++++++++++++++++++++-
dlls/riched20/tests/richole.c | 93 +++++
2 files changed, 889 insertions(+), 4 deletions(-)
2 files changed, 893 insertions(+), 4 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index ca54cf5..d171963 100644
index 86a226b..6a8cdbb 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
@ -62,7 +62,7 @@ index ca54cf5..d171963 100644
heap_free(This);
}
return ref;
@@ -457,6 +473,740 @@ static const IRichEditOleVtbl revt = {
@@ -457,6 +473,744 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@ -152,7 +152,11 @@ index ca54cf5..d171963 100644
+ VARIANT *pVarResult, EXCEPINFO *pExcepInfo,
+ UINT *puArgErr)
+{
+ FIXME("not implemented\n");
+ ITextFontImpl *This = impl_from_ITextFont(me);
+ if (!This->reOle)
+ return CO_E_RELEASED;
+
+ FIXME("not implemented: %p\n", This);
+ return E_NOTIMPL;
+}
+
@ -803,7 +807,7 @@ index ca54cf5..d171963 100644
/* ITextRange interface */
static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface)
{
@@ -709,14 +1459,42 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
@@ -711,14 +1465,42 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
return range_SetEnd(This->reOle->editor, cpLim, &This->start, &This->end);
}
@ -848,7 +852,7 @@ index ca54cf5..d171963 100644
}
static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1729,11 +2507,24 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
@@ -1733,11 +2515,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);
@ -875,7 +879,7 @@ index ca54cf5..d171963 100644
}
static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *pFont)
@@ -2367,6 +3158,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
@@ -2371,6 +3166,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
TRACE("Created %p\n",reo);
*ppObj = reo;
list_init(&reo->rangelist);
@ -884,10 +888,10 @@ index ca54cf5..d171963 100644
return 1;
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 2916bc5..69d4453 100644
index 46cea63..3d308c5 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -878,6 +878,97 @@ static void test_ITextSelection_SetEnd(void)
@@ -880,6 +880,97 @@ static void test_ITextSelection_SetEnd(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
}
@ -985,7 +989,7 @@ index 2916bc5..69d4453 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -892,6 +983,7 @@ START_TEST(richole)
@@ -894,6 +985,7 @@ START_TEST(richole)
test_ITextSelection_SetStart();
test_ITextSelection_SetEnd();
test_ITextSelection_Collapse();
@ -993,7 +997,7 @@ index 2916bc5..69d4453 100644
test_ITextDocument_Range();
test_ITextRange_GetChar();
test_ITextRange_GetDuplicate();
@@ -899,4 +991,5 @@ START_TEST(richole)
@@ -901,4 +993,5 @@ START_TEST(richole)
test_ITextRange_Collapse();
test_ITextRange_SetStart();
test_ITextRange_SetEnd();

16
patches/riched20-IText_Interface/0008-riched20-Stub-for-ITextPara-interface-and-implement-.patch
View File

@ -1,4 +1,4 @@
From 54ca28ec8417735f945883923a72893ff9e5363e Mon Sep 17 00:00:00 2001
From af810f9f3a3c1ffbdc0099a2eb3088e30be3a8a3 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 d171963..0897c4f 100644
index 6a8cdbb..241c681 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
@ -158,7 +158,7 @@ index d171963..0897c4f 100644
+ if (!This->reOle)
+ return CO_E_RELEASED;
+
+ FIXME("not implemented\n");
+ FIXME("not implemented: %p\n", This);
+ return E_NOTIMPL;
+}
+
@ -706,7 +706,7 @@ index d171963..0897c4f 100644
/* ITextFont interface */
static inline ITextFontImpl *impl_from_ITextFont(ITextFont *iface)
{
@@ -1507,14 +2158,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1513,14 +2164,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
return E_NOTIMPL;
}
@ -751,7 +751,7 @@ index d171963..0897c4f 100644
}
static HRESULT WINAPI ITextRange_fnSetPara(ITextRange *me, ITextPara *pPara)
@@ -3159,6 +3838,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
@@ -3167,6 +3846,7 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj)
*ppObj = reo;
list_init(&reo->rangelist);
list_init(&reo->fontlist);
@ -760,10 +760,10 @@ index d171963..0897c4f 100644
return 1;
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 69d4453..6c65798 100644
index 3d308c5..f7f27d1 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -969,6 +969,52 @@ static void test_ITextSelection_GetFont(void)
@@ -971,6 +971,52 @@ static void test_ITextSelection_GetFont(void)
ITextFont_Release(txtFont);
}
@ -816,7 +816,7 @@ index 69d4453..6c65798 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -992,4 +1038,5 @@ START_TEST(richole)
@@ -994,4 +1040,5 @@ START_TEST(richole)
test_ITextRange_SetStart();
test_ITextRange_SetEnd();
test_ITextRange_GetFont();

2
patches/riched20-IText_Interface/definition
View File

@ -1,6 +1,6 @@
Author: Jactry Zeng
Subject: Implement Stubs for ITextRange interface.
Revision: 2
Revision: 3
Author: Jactry Zeng
Subject: Implement IText{Range,Selection}::{GetChar,GetStart,GetEnd,GetDuplicate,Collapse,SetStart,SetEnd}.