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 7efe31d9294275f2505361c19afa4e8e50be2c8d.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-05-29 15:02:34 +02:00
parent 412af27a17
commit 016e539659
4 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 58674bc10a5ef2c3dd6a3b2d143b21521c6bb3af Mon Sep 17 00:00:00 2001
From c8561b8c1e51a425fa58a7a1ed3ce178930448b2 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 5795dd3..8a86a11 100644
index 33eeca8..26a6da6 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -1700,8 +1700,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
@@ -1876,8 +1876,10 @@ static HRESULT WINAPI ITextRange_fnGetStoryLength(ITextRange *me, LONG *pcch)
if (!This->reOle)
return CO_E_RELEASED;
@@ -24,12 +24,12 @@ index 5795dd3..8a86a11 100644
+ return S_OK;
}
static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *pValue)
static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *value)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 451d888..f30d077 100644
index e905321..72f324e 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -3177,6 +3177,37 @@ static void test_ITextRange_IsEqual2(void)
@@ -3448,6 +3448,37 @@ static void test_ITextRange_IsEqual2(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -67,7 +67,7 @@ index 451d888..f30d077 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -3205,6 +3236,7 @@ START_TEST(richole)
@@ -3476,6 +3507,7 @@ START_TEST(richole)
test_ITextRange_GetText();
test_ITextRange_SetRange();
test_ITextRange_IsEqual2();
@@ -76,5 +76,5 @@ index 451d888..f30d077 100644
test_IOleWindow_GetWindow();
test_IOleInPlaceSite_GetWindow();
--
2.4.1
2.4.2

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

@@ -1,4 +1,4 @@
From 218106498ce512c7879c15e2859901f67c9d6160 Mon Sep 17 00:00:00 2001
From 2ca1d411b5123260dff81a0cc62b589f0ff99f8c 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.
@@ -9,10 +9,10 @@ Subject: riched20: Implement ITextSelection::GetStoryLength.
2 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 4ec4513..5d017e9 100644
index 26a6da6..c1b350b 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -3829,8 +3829,10 @@ static HRESULT WINAPI ITextSelection_fnGetStoryLength(ITextSelection *me, LONG *
@@ -4544,8 +4544,10 @@ static HRESULT WINAPI ITextSelection_fnGetStoryLength(ITextSelection *me, LONG *
if (!This->reOle)
return CO_E_RELEASED;
@@ -24,12 +24,12 @@ index 4ec4513..5d017e9 100644
+ return S_OK;
}
static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *pValue)
static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *value)
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index dd6cad4..cd9931b 100644
index 72f324e..0cada69 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -1831,6 +1831,35 @@ static void test_ITextRange_GetStoryLength(void)
@@ -3479,6 +3479,35 @@ static void test_ITextRange_GetStoryLength(void)
release_interfaces(&w, &reOle, &txtDoc, NULL);
}
@@ -65,7 +65,7 @@ index dd6cad4..cd9931b 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -1847,6 +1876,7 @@ START_TEST(richole)
@@ -3495,6 +3524,7 @@ START_TEST(richole)
test_ITextSelection_SetEnd();
test_ITextSelection_Collapse();
test_ITextSelection_GetFont();
@@ -74,5 +74,5 @@ index dd6cad4..cd9931b 100644
test_ITextRange_GetChar();
test_ITextRange_GetStart_GetEnd();
--
2.4.0
2.4.2