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 90ed96a766b4b627a5dd18d601b41257c4f8e390.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-05-22 15:22:57 +02:00
parent ca8ffcd619
commit baa05e4719
8 changed files with 25 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 815bce1478d691786f20e5f1e432e492e866464f Mon Sep 17 00:00:00 2001
From 0d277bcbe13729530afaa53db2a5d0a55320011f 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, 300 insertions(+)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index f93f086..b304fb3 100644
index 3706411..8d78df1 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1761,9 +1761,21 @@ static ULONG WINAPI TextFont_Release(ITextFont *iface)
@@ -109,7 +109,7 @@ index f93f086..b304fb3 100644
@@ -1822,6 +1861,10 @@ static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *
{
ITextFontImpl *This = impl_from_ITextFont(iface);
FIXME("(%p)->(%p): stub\n", This, ret);
FIXME("(%p)->(%p %p): stub\n", This, font, ret);
+
+ if (!font_get_reole(This))
+ return CO_E_RELEASED;
@@ -120,7 +120,7 @@ index f93f086..b304fb3 100644
@@ -1829,6 +1872,10 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value)
{
ITextFontImpl *This = impl_from_ITextFont(iface);
FIXME("(%p): stub\n", This);
FIXME("(%p)->(%d): stub\n", This, value);
+
+ if (!font_get_reole(This))
+ return CO_E_RELEASED;
@@ -569,10 +569,10 @@ index f93f086..b304fb3 100644
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index e654653..6bd3790 100644
index 0d0bb41..26f97d1 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1701,6 +1701,97 @@ static void test_ITextSelection_SetEnd(void)
@@ -1704,6 +1704,97 @@ static void test_ITextSelection_SetEnd(void)
release_interfaces(&w, &reOle, &txtDoc, &txtSel);
}
@@ -670,7 +670,7 @@ index e654653..6bd3790 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1716,6 +1807,7 @@ START_TEST(richole)
@@ -1719,6 +1810,7 @@ START_TEST(richole)
test_ITextSelection_SetStart();
test_ITextSelection_SetEnd();
test_ITextSelection_Collapse();
@@ -678,7 +678,7 @@ index e654653..6bd3790 100644
test_ITextDocument_Range();
test_ITextRange_GetChar();
test_ITextRange_GetStart_GetEnd();
@@ -1723,6 +1815,7 @@ START_TEST(richole)
@@ -1726,6 +1818,7 @@ START_TEST(richole)
test_ITextRange_Collapse();
test_ITextRange_SetStart();
test_ITextRange_SetEnd();