wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5a66eab725423951860676aef49feeb3668eb20c.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-02-18 10:54:02 +11:00
parent 4b36169b46
commit dec87df6ec
11 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch
View File

@@ -1,4 +1,4 @@
From 565f80adaf7cc5c83f4661bbcf7d89bef679a29f Mon Sep 17 00:00:00 2001
From 30aea20dba9df4a8ddea1f85ad18c31b069dd5d0 Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 22:17:57 +0800
Subject: [PATCH] riched20: Stub for ITextPara interface and implement
@@ -10,10 +10,10 @@ Subject: [PATCH] riched20: Stub for ITextPara interface and implement
2 files changed, 472 insertions(+)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 72840a4cafa..1588009432f 100644
index 74a25a96830..485a1f630d2 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -3551,6 +3551,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface)
@@ -3552,6 +3552,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface)
return ref;
}
@@ -30,7 +30,7 @@ index 72840a4cafa..1588009432f 100644
static HRESULT WINAPI TextPara_GetTypeInfoCount(ITextPara *iface, UINT *pctinfo)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
@@ -3618,6 +3628,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret)
@@ -3619,6 +3629,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, ret);
@@ -41,7 +41,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3625,6 +3639,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para)
@@ -3626,6 +3640,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, para);
@@ -52,7 +52,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3632,6 +3650,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret)
@@ -3633,6 +3651,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, ret);
@@ -63,7 +63,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3639,6 +3661,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG *
@@ -3640,6 +3662,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG *
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p %p)\n", This, para, ret);
@@ -74,10 +74,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3646,6 +3672,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value)
@@ -3647,6 +3673,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -85,7 +85,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3653,6 +3683,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value)
@@ -3654,6 +3684,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -96,10 +96,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3660,6 +3694,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
@@ -3661,6 +3695,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -107,7 +107,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3667,6 +3705,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value)
@@ -3668,6 +3706,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -118,10 +118,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3674,6 +3716,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value)
@@ -3675,6 +3717,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -129,7 +129,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3681,6 +3727,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value)
@@ -3682,6 +3728,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -140,10 +140,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3688,6 +3738,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value)
@@ -3689,6 +3739,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -151,7 +151,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3695,6 +3749,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value
@@ -3696,6 +3750,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -162,7 +162,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3702,6 +3760,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value)
@@ -3703,6 +3761,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -173,10 +173,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3709,6 +3771,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value)
@@ -3710,6 +3772,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -184,7 +184,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3716,6 +3782,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value)
@@ -3717,6 +3783,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -195,10 +195,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3723,6 +3793,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value)
@@ -3724,6 +3794,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -206,7 +206,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3730,6 +3804,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value)
@@ -3731,6 +3805,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -217,7 +217,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3737,6 +3815,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value)
@@ -3738,6 +3816,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -228,7 +228,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3744,6 +3826,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value)
@@ -3745,6 +3827,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -239,7 +239,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3751,6 +3837,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value)
@@ -3752,6 +3838,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -250,10 +250,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3758,6 +3848,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value)
@@ -3759,6 +3849,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -261,7 +261,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3765,6 +3859,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value)
@@ -3766,6 +3860,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -272,10 +272,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3772,6 +3870,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value)
@@ -3773,6 +3871,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -283,7 +283,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3779,6 +3881,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value)
@@ -3780,6 +3882,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -294,10 +294,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3786,6 +3892,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value)
@@ -3787,6 +3893,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -305,7 +305,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3793,6 +3903,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value)
@@ -3794,6 +3904,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -316,7 +316,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3800,6 +3914,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value)
@@ -3801,6 +3915,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%.2f)\n", This, value);
@@ -327,7 +327,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3807,6 +3925,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value)
@@ -3808,6 +3926,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -338,10 +338,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3814,6 +3936,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value)
@@ -3815,6 +3937,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -349,7 +349,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3821,6 +3947,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value)
@@ -3822,6 +3948,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -360,10 +360,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3828,6 +3958,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value)
@@ -3829,6 +3959,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -371,7 +371,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3835,6 +3969,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value)
@@ -3836,6 +3970,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -382,10 +382,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3842,6 +3980,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value)
@@ -3843,6 +3981,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -393,7 +393,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3849,6 +3991,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value)
@@ -3850,6 +3992,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -404,7 +404,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3856,6 +4002,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value)
@@ -3857,6 +4003,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%.2f)\n", This, value);
@@ -415,7 +415,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3863,6 +4013,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F
@@ -3864,6 +4014,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%.2f %.2f %.2f)\n", This, StartIndent, LeftIndent, RightIndent);
@@ -426,10 +426,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3870,6 +4024,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing
@@ -3871,6 +4025,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d %.2f)\n", This, LineSpacingRule, LineSpacing);
FIXME("(%p)->(%ld %.2f)\n", This, LineSpacingRule, LineSpacing);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -437,7 +437,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3877,6 +4035,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value)
@@ -3878,6 +4036,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -448,7 +448,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3884,6 +4046,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value)
@@ -3885,6 +4047,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%.2f)\n", This, value);
@@ -459,7 +459,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3891,6 +4057,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value)
@@ -3892,6 +4058,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -470,7 +470,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3898,6 +4068,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value)
@@ -3899,6 +4069,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%.2f)\n", This, value);
@@ -481,7 +481,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3905,6 +4079,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value)
@@ -3906,6 +4080,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -492,10 +492,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3912,6 +4090,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value)
@@ -3913,6 +4091,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d)\n", This, value);
FIXME("(%p)->(%ld)\n", This, value);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -503,7 +503,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3919,6 +4101,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value)
@@ -3920,6 +4102,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%p)\n", This, value);
@@ -514,10 +514,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3926,6 +4112,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig
@@ -3927,6 +4113,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%.2f %d %d)\n", This, tbPos, tbAlign, tbLeader);
FIXME("(%p)->(%.2f %ld %ld)\n", This, tbPos, tbAlign, tbLeader);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -525,7 +525,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3933,6 +4123,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface)
@@ -3934,6 +4124,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)\n", This);
@@ -536,7 +536,7 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3940,6 +4134,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos)
@@ -3941,6 +4135,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos)
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%.2f)\n", This, pos);
@@ -547,10 +547,10 @@ index 72840a4cafa..1588009432f 100644
return E_NOTIMPL;
}
@@ -3947,6 +4145,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos
@@ -3948,6 +4146,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos
{
ITextParaImpl *This = impl_from_ITextPara(iface);
FIXME("(%p)->(%d %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader);
FIXME("(%p)->(%ld %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader);
+
+ if (!para_get_reole(This))
+ return CO_E_RELEASED;
@@ -559,10 +559,10 @@ index 72840a4cafa..1588009432f 100644
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index e6329c5b1b6..20910c0617d 100644
index c06be02bd89..dd89cf26183 100644
--- a/dlls/riched20/tests/richole.c
+++ b/dlls/riched20/tests/richole.c
@@ -4100,6 +4100,274 @@ static void test_clipboard(void)
@@ -4246,6 +4246,274 @@ static void test_clipboard(void)
ITextRange_Release(range);
}
@@ -837,7 +837,7 @@ index e6329c5b1b6..20910c0617d 100644
START_TEST(richole)
{
/* Must explicitly LoadLibrary(). The test has no references to functions in
@@ -4120,6 +4388,8 @@ START_TEST(richole)
@@ -4266,6 +4534,8 @@ START_TEST(richole)
test_ITextRange_SetRange();
test_ITextRange_GetDuplicate();
test_ITextRange_Collapse();
@@ -847,5 +847,5 @@ index e6329c5b1b6..20910c0617d 100644
test_IOleWindow_GetWindow();
test_IOleInPlaceSite_GetWindow();
--
2.30.2
2.34.1