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 5b3681f62ddd2977924424d6f326ce729de9102a.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-03-29 16:12:15 +02:00
parent c43b0d8ac0
commit a1621d692a
6 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From eb8033132c15abb87c53f2e8b52c6fb6622f333b Mon Sep 17 00:00:00 2001
From 3d02c5ffcad36616c63a8814fe98f9b531fce27a 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,10 +8,10 @@ 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 fd4d9e8..3be6320 100644
index 6da3ce3..8047f4b 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -3251,6 +3251,137 @@ static void test_ITextSelection_GetDuplicate(void)
@@ -3397,6 +3397,137 @@ static void test_Expand(void)
ITextRange_Release(range);
}
@@ -149,7 +149,7 @@ index fd4d9e8..3be6320 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -3263,11 +3394,15 @@ START_TEST(richole)
@@ -3409,12 +3540,16 @@ START_TEST(richole)
test_GetText();
test_ITextSelection_GetChar();
test_ITextSelection_GetStart_GetEnd();
@@ -158,6 +158,7 @@ index fd4d9e8..3be6320 100644
test_ITextSelection_Collapse();
test_ITextDocument_Range();
test_ITextRange_GetChar();
test_ITextRange_ScrollIntoView();
test_ITextRange_GetStart_GetEnd();
test_ITextRange_GetDuplicate();
+ test_ITextRange_SetStart();
@@ -166,5 +167,5 @@ index fd4d9e8..3be6320 100644
test_GetClientSite();
test_IOleWindow_GetWindow();
--
2.4.2
2.7.1

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

@@ -1,4 +1,4 @@
From fb297f3423e913e7c25e433a0257a12970666d57 Mon Sep 17 00:00:00 2001
From c1711e301579aa2469cad8b0d3ba5567edc4611b 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, 113 insertions(+)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index d39bce7..64809cc 100644
index 1013e67..9e7d853 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -2544,6 +2544,10 @@ static HRESULT WINAPI TextFont_SetDuplicate(ITextFont *iface, ITextFont *pFont)
@@ -2654,6 +2654,10 @@ static HRESULT WINAPI TextFont_SetDuplicate(ITextFont *iface, ITextFont *pFont)
{
ITextFontImpl *This = impl_from_ITextFont(iface);
FIXME("(%p)->(%p): stub\n", This, pFont);
@@ -24,7 +24,7 @@ index d39bce7..64809cc 100644
return E_NOTIMPL;
}
@@ -2551,6 +2555,10 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret)
@@ -2661,6 +2665,10 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret)
{
ITextFontImpl *This = impl_from_ITextFont(iface);
FIXME("(%p)->(%p): stub\n", This, ret);
@@ -35,7 +35,7 @@ index d39bce7..64809cc 100644
return E_NOTIMPL;
}
@@ -2558,6 +2566,10 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *
@@ -2668,6 +2676,10 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *
{
ITextFontImpl *This = impl_from_ITextFont(iface);
FIXME("(%p)->(%p %p): stub\n", This, font, ret);
@@ -46,7 +46,7 @@ index d39bce7..64809cc 100644
return E_NOTIMPL;
}
@@ -2731,6 +2743,10 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value)
@@ -2841,6 +2853,10 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value)
{
ITextFontImpl *This = impl_from_ITextFont(iface);
FIXME("(%p)->(%p): stub\n", This, value);
@@ -57,7 +57,7 @@ index d39bce7..64809cc 100644
return E_NOTIMPL;
}
@@ -2738,6 +2754,10 @@ static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value)
@@ -2848,6 +2864,10 @@ static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value)
{
ITextFontImpl *This = impl_from_ITextFont(iface);
FIXME("(%p)->(%d): stub\n", This, value);
@@ -69,10 +69,10 @@ index d39bce7..64809cc 100644
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 3be6320..5f8e1cc 100644
index 8047f4b..851ae9a 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -3382,6 +3382,97 @@ static void test_ITextSelection_SetEnd(void)
@@ -3528,6 +3528,97 @@ static void test_ITextSelection_SetEnd(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
}
@@ -170,15 +170,15 @@ index 3be6320..5f8e1cc 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -3397,6 +3488,7 @@ START_TEST(richole)
@@ -3543,6 +3634,7 @@ START_TEST(richole)
test_ITextSelection_SetStart();
test_ITextSelection_SetEnd();
test_ITextSelection_Collapse();
+ test_ITextSelection_GetFont();
test_ITextDocument_Range();
test_ITextRange_GetChar();
test_ITextRange_GetStart_GetEnd();
@@ -3404,6 +3496,7 @@ START_TEST(richole)
test_ITextRange_ScrollIntoView();
@@ -3551,6 +3643,7 @@ START_TEST(richole)
test_ITextRange_SetStart();
test_ITextRange_SetEnd();
test_ITextRange_Collapse();
@@ -187,5 +187,5 @@ index 3be6320..5f8e1cc 100644
test_IOleWindow_GetWindow();
test_IOleInPlaceSite_GetWindow();
--
2.4.2
2.7.1

12
patches/riched20-IText_Interface/0009-riched20-Implement-ITextSelection-GetStoryLength.patch
View File

@@ -1,4 +1,4 @@
From 56bf18bcf782cea24efa378eb3ec58b171083e71 Mon Sep 17 00:00:00 2001
From e5dad19d1dbab38b6a6c31bd23fe7dac278e6d1a Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Mon, 18 Aug 2014 14:47:14 +0800
Subject: riched20: Implement ITextSelection::GetStoryLength.
@@ -8,10 +8,10 @@ Subject: riched20: Implement ITextSelection::GetStoryLength.
1 file changed, 30 insertions(+)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 55d27d4..854ec09 100644
index c7d6299..38a8f80 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -3667,6 +3667,35 @@ static void test_ITextRange_GetStoryLength(void)
@@ -3813,6 +3813,35 @@ static void test_ITextRange_GetStoryLength(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -47,14 +47,14 @@ index 55d27d4..854ec09 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -3683,6 +3712,7 @@ START_TEST(richole)
@@ -3829,6 +3858,7 @@ START_TEST(richole)
test_ITextSelection_SetEnd();
test_ITextSelection_Collapse();
test_ITextSelection_GetFont();
+ test_ITextSelection_GetStoryLength();
test_ITextDocument_Range();
test_ITextRange_GetChar();
test_ITextRange_GetStart_GetEnd();
test_ITextRange_ScrollIntoView();
--
2.4.2
2.7.1