From 5d79afb1961067b3ce27479ea5b0f172da6880fd Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 23 Mar 2022 10:34:48 +1100 Subject: [PATCH] Updated riched20-IText_Interface patchset Warning fixes. --- ...r-ITextPara-interface-and-implement-.patch | 135 +++++++++--------- 1 file changed, 70 insertions(+), 65 deletions(-) diff --git a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch index 0c28f190..4d437c0d 100644 --- a/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch +++ b/patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch @@ -1,4 +1,4 @@ -From 30aea20dba9df4a8ddea1f85ad18c31b069dd5d0 Mon Sep 17 00:00:00 2001 +From 534d035e5646d1a76657987894ce7124be0f7312 Mon Sep 17 00:00:00 2001 From: Jactry Zeng Date: Sun, 10 Aug 2014 22:17:57 +0800 Subject: [PATCH] riched20: Stub for ITextPara interface and implement @@ -6,14 +6,14 @@ Subject: [PATCH] riched20: Stub for ITextPara interface and implement --- dlls/riched20/richole.c | 202 +++++++++++++++++++++++++ - dlls/riched20/tests/richole.c | 270 ++++++++++++++++++++++++++++++++++ - 2 files changed, 472 insertions(+) + dlls/riched20/tests/richole.c | 275 ++++++++++++++++++++++++++++++++++ + 2 files changed, 477 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c -index 74a25a96830..485a1f630d2 100644 +index a23f4c82730..7204bb3a0fa 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c -@@ -3552,6 +3552,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface) +@@ -3553,6 +3553,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface) return ref; } @@ -30,7 +30,7 @@ index 74a25a96830..485a1f630d2 100644 static HRESULT WINAPI TextPara_GetTypeInfoCount(ITextPara *iface, UINT *pctinfo) { ITextParaImpl *This = impl_from_ITextPara(iface); -@@ -3619,6 +3629,10 @@ static HRESULT WINAPI TextPara_GetDuplicate(ITextPara *iface, ITextPara **ret) +@@ -3620,6 +3630,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3626,6 +3640,10 @@ static HRESULT WINAPI TextPara_SetDuplicate(ITextPara *iface, ITextPara *para) +@@ -3627,6 +3641,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3633,6 +3651,10 @@ static HRESULT WINAPI TextPara_CanChange(ITextPara *iface, LONG *ret) +@@ -3634,6 +3652,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3640,6 +3662,10 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG * +@@ -3641,6 +3663,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,7 +74,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3647,6 +3673,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value) +@@ -3648,6 +3674,10 @@ static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -85,7 +85,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3654,6 +3684,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value) +@@ -3655,6 +3685,10 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -96,7 +96,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3661,6 +3695,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) +@@ -3662,6 +3696,10 @@ static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -107,7 +107,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3668,6 +3706,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value) +@@ -3669,6 +3707,10 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -118,7 +118,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3675,6 +3717,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value) +@@ -3676,6 +3718,10 @@ static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -129,7 +129,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3682,6 +3728,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value) +@@ -3683,6 +3729,10 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -140,7 +140,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3689,6 +3739,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value) +@@ -3690,6 +3740,10 @@ static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -151,7 +151,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3696,6 +3750,10 @@ static HRESULT WINAPI TextPara_GetFirstLineIndent(ITextPara *iface, FLOAT *value +@@ -3697,6 +3751,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3703,6 +3761,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value) +@@ -3704,6 +3762,10 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -173,7 +173,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3710,6 +3772,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value) +@@ -3711,6 +3773,10 @@ static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -184,7 +184,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3717,6 +3783,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value) +@@ -3718,6 +3784,10 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -195,7 +195,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3724,6 +3794,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value) +@@ -3725,6 +3795,10 @@ static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -206,7 +206,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3731,6 +3805,10 @@ static HRESULT WINAPI TextPara_GetLeftIndent(ITextPara *iface, FLOAT *value) +@@ -3732,6 +3806,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3738,6 +3816,10 @@ static HRESULT WINAPI TextPara_GetLineSpacing(ITextPara *iface, FLOAT *value) +@@ -3739,6 +3817,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3745,6 +3827,10 @@ static HRESULT WINAPI TextPara_GetLineSpacingRule(ITextPara *iface, LONG *value) +@@ -3746,6 +3828,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3752,6 +3838,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value) +@@ -3753,6 +3839,10 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -250,7 +250,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3759,6 +3849,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value) +@@ -3760,6 +3850,10 @@ static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -261,7 +261,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3766,6 +3860,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value) +@@ -3767,6 +3861,10 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -272,7 +272,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3773,6 +3871,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value) +@@ -3774,6 +3872,10 @@ static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -283,7 +283,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3780,6 +3882,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value) +@@ -3781,6 +3883,10 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -294,7 +294,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3787,6 +3893,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value) +@@ -3788,6 +3894,10 @@ static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -305,7 +305,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3794,6 +3904,10 @@ static HRESULT WINAPI TextPara_GetListTab(ITextPara *iface, FLOAT *value) +@@ -3795,6 +3905,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3801,6 +3915,10 @@ static HRESULT WINAPI TextPara_SetListTab(ITextPara *iface, FLOAT value) +@@ -3802,6 +3916,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3808,6 +3926,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value) +@@ -3809,6 +3927,10 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -338,7 +338,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3815,6 +3937,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value) +@@ -3816,6 +3938,10 @@ static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -349,7 +349,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3822,6 +3948,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value) +@@ -3823,6 +3949,10 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -360,7 +360,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3829,6 +3959,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value) +@@ -3830,6 +3960,10 @@ static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -371,7 +371,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3836,6 +3970,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value) +@@ -3837,6 +3971,10 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -382,7 +382,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3843,6 +3981,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value) +@@ -3844,6 +3982,10 @@ static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -393,7 +393,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3850,6 +3992,10 @@ static HRESULT WINAPI TextPara_GetRightIndent(ITextPara *iface, FLOAT *value) +@@ -3851,6 +3993,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3857,6 +4003,10 @@ static HRESULT WINAPI TextPara_SetRightIndent(ITextPara *iface, FLOAT value) +@@ -3858,6 +4004,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3864,6 +4014,10 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F +@@ -3865,6 +4015,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,7 +426,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3871,6 +4025,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing +@@ -3872,6 +4026,10 @@ static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacing { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld %.2f)\n", This, LineSpacingRule, LineSpacing); @@ -437,7 +437,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3878,6 +4036,10 @@ static HRESULT WINAPI TextPara_GetSpaceAfter(ITextPara *iface, FLOAT *value) +@@ -3879,6 +4037,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3885,6 +4047,10 @@ static HRESULT WINAPI TextPara_SetSpaceAfter(ITextPara *iface, FLOAT value) +@@ -3886,6 +4048,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3892,6 +4058,10 @@ static HRESULT WINAPI TextPara_GetSpaceBefore(ITextPara *iface, FLOAT *value) +@@ -3893,6 +4059,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3899,6 +4069,10 @@ static HRESULT WINAPI TextPara_SetSpaceBefore(ITextPara *iface, FLOAT value) +@@ -3900,6 +4070,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 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3906,6 +4080,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value) +@@ -3907,6 +4081,10 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -492,7 +492,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3913,6 +4091,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value) +@@ -3914,6 +4092,10 @@ static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld)\n", This, value); @@ -503,7 +503,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3920,6 +4102,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value) +@@ -3921,6 +4103,10 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%p)\n", This, value); @@ -514,7 +514,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3927,6 +4113,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig +@@ -3928,6 +4114,10 @@ static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlig { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f %ld %ld)\n", This, tbPos, tbAlign, tbLeader); @@ -525,7 +525,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3934,6 +4124,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface) +@@ -3935,6 +4125,10 @@ static HRESULT WINAPI TextPara_ClearAllTabs(ITextPara *iface) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)\n", This); @@ -536,7 +536,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3941,6 +4135,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos) +@@ -3942,6 +4136,10 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos) { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%.2f)\n", This, pos); @@ -547,7 +547,7 @@ index 74a25a96830..485a1f630d2 100644 return E_NOTIMPL; } -@@ -3948,6 +4146,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos +@@ -3949,6 +4147,10 @@ static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos { ITextParaImpl *This = impl_from_ITextPara(iface); FIXME("(%p)->(%ld %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader); @@ -559,10 +559,10 @@ index 74a25a96830..485a1f630d2 100644 } diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c -index c06be02bd89..dd89cf26183 100644 +index 24284a24484..4ea3828033b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c -@@ -4246,6 +4246,274 @@ static void test_clipboard(void) +@@ -4249,6 +4249,274 @@ static void test_clipboard(void) ITextRange_Release(range); } @@ -589,8 +589,8 @@ index c06be02bd89..dd89cf26183 100644 + ok(hres == S_OK, "ITextRange_SetStart\n"); \ + ITextRange_GetStart(txtRge, &start); \ + ITextRange_GetEnd(txtRge, &end); \ -+ ok(start == expected_start, "got wrong start value: %d\n", start); \ -+ ok(end == expected_end, "got wrong end value: %d\n", end); ++ ok(start == expected_start, "got wrong start value: %ld\n", start); \ ++ ok(end == expected_end, "got wrong end value: %ld\n", end); + + TEST_TXTRGE_SETSTART(2, 2, 8) + TEST_TXTRGE_SETSTART(-1, 0, 8) @@ -622,8 +622,8 @@ index c06be02bd89..dd89cf26183 100644 + ok(hres == S_OK, "ITextRange_SetEnd\n"); \ + ITextRange_GetStart(txtRge, &start); \ + ITextRange_GetEnd(txtRge, &end); \ -+ ok(start == expected_start, "got wrong start value: %d\n", start); \ -+ ok(end == expected_end, "got wrong end value: %d\n", end); ++ ok(start == expected_start, "got wrong start value: %ld\n", start); \ ++ ok(end == expected_end, "got wrong end value: %ld\n", end); + + TEST_TXTRGE_SETEND(6, 4, 6) + TEST_TXTRGE_SETEND(14, 4, 13) @@ -655,8 +655,8 @@ index c06be02bd89..dd89cf26183 100644 + hres = ITextSelection_SetStart(txtSel, cp); \ + ok(hres == S_OK, "ITextSelection_SetStart\n"); \ + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); \ -+ ok(start == expected_start, "got wrong start value: %d\n", start); \ -+ ok(end == expected_end, "got wrong end value: %d\n", end); ++ ok(start == expected_start, "got wrong start value: %ld\n", start); \ ++ ok(end == expected_end, "got wrong end value: %ld\n", end); + + TEST_TXTSEL_SETSTART(2, 2, 8) + TEST_TXTSEL_SETSTART(-1, 0, 8) @@ -687,8 +687,8 @@ index c06be02bd89..dd89cf26183 100644 + hres = ITextSelection_SetEnd(txtSel, cp); \ + ok(hres == S_OK, "ITextSelection_SetEnd\n"); \ + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); \ -+ ok(start == expected_start, "got wrong start value: %d\n", start); \ -+ ok(end == expected_end, "got wrong end value: %d\n", end); ++ ok(start == expected_start, "got wrong start value: %ld\n", start); \ ++ ok(end == expected_end, "got wrong end value: %ld\n", end); + + TEST_TXTSEL_SETEND(6, 4, 6) + TEST_TXTSEL_SETEND(14, 4, 13) @@ -837,15 +837,20 @@ index c06be02bd89..dd89cf26183 100644 START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in -@@ -4266,6 +4534,8 @@ START_TEST(richole) +@@ -4269,6 +4537,13 @@ START_TEST(richole) test_ITextRange_SetRange(); test_ITextRange_GetDuplicate(); test_ITextRange_Collapse(); + test_ITextRange_GetFont(); ++ test_ITextRange_SetEnd(); ++ test_ITextSelection_GetFont(); ++ test_ITextRange_SetStart(); ++ test_ITextSelection_SetStart(); ++ test_ITextSelection_SetEnd(); + test_ITextRange_GetPara(); test_GetClientSite(); test_IOleWindow_GetWindow(); test_IOleInPlaceSite_GetWindow(); -- -2.34.1 +2.35.1