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

Removed patches accepted upstream and rebase.

Browse Source
This commit is contained in:
Erich E. Hoover
2015-01-05 18:52:49 -07:00
parent ad5dcc9752
commit 5f3631c6be
33 changed files with 823 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From ef430ec89085a9d089de21871329c7cac5a5eea2 Mon Sep 17 00:00:00 2001
From 8f95372e011674226be25a4456db6dd2952da804 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, 893 insertions(+), 4 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 8b5f2ba..6cc4b09 100644
index 276c795..df43621 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -46,10 +46,12 @@ DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0x
@@ -46,7 +46,24 @@ index 8b5f2ba..6cc4b09 100644
struct ITextRangeImpl {
ITextRange ITextRange_iface;
LONG ref;
@@ -481,6 +494,744 @@ static const IRichEditOleVtbl revt = {
@@ -145,6 +158,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
if (!ref)
{
ITextRangeImpl *txtRge;
+ ITextFontImpl *txtFont;
TRACE("Destroying %p\n", This);
This->txtSel->reOle = NULL;
@@ -153,6 +167,8 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
IOleClientSite_Release(&This->clientSite->IOleClientSite_iface);
LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry)
txtRge->reOle = NULL;
+ LIST_FOR_EACH_ENTRY(txtFont, &This->fontlist, ITextFontImpl, entry)
+ txtFont->reOle = NULL;
heap_free(This);
}
return ref;
@@ -492,6 +508,744 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@@ -791,7 +808,7 @@ index 8b5f2ba..6cc4b09 100644
/* ITextRange interface */
static inline ITextRangeImpl *impl_from_ITextRange(ITextRange *iface)
{
@@ -733,14 +1484,42 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
@@ -744,14 +1498,42 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim)
return range_SetEnd(This->reOle->editor, cpLim, &This->start, &This->end);
}
@@ -836,7 +853,7 @@ index 8b5f2ba..6cc4b09 100644
}
static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1754,11 +2533,24 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
@@ -1765,11 +2547,24 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim)
static HRESULT WINAPI ITextSelection_fnGetFont(ITextSelection *me, ITextFont **pFont)
{
ITextSelectionImpl *This = impl_from_ITextSelection(me);
@@ -863,7 +880,7 @@ index 8b5f2ba..6cc4b09 100644
}
static HRESULT WINAPI ITextSelection_fnSetFont(ITextSelection *me, ITextFont *pFont)
@@ -2392,6 +3184,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
@@ -2403,6 +3198,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
}
TRACE("Created %p\n",reo);
list_init(&reo->rangelist);
@@ -871,23 +888,6 @@ index 8b5f2ba..6cc4b09 100644
if (outer_unk)
reo->outer_unk = outer_unk;
else
@@ -2405,6 +3198,7 @@ void DestroyIRichEditOle(IRichEditOle *iface)
{
IRichEditOleImpl *This = impl_from_IRichEditOle(iface);
ITextRangeImpl *txtRge;
+ ITextFontImpl *txtFont;
TRACE("Destroying %p\n", This);
This->txtSel->reOle = NULL;
@@ -2413,6 +3207,8 @@ void DestroyIRichEditOle(IRichEditOle *iface)
IOleClientSite_Release(&This->clientSite->IOleClientSite_iface);
LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry)
txtRge->reOle = NULL;
+ LIST_FOR_EACH_ENTRY(txtFont, &This->fontlist, ITextFontImpl, entry)
+ txtFont->reOle = NULL;
heap_free(This);
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index 2268211..e9618d8 100644
--- a/dlls/riched20/tests/richole.c
@@ -1005,5 +1005,5 @@ index 2268211..e9618d8 100644
+ test_ITextRange_GetFont();
}
--
2.1.2
1.9.1

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

@@ -1,4 +1,4 @@
From ad5c4b52d44704ff75e0706ce0e2aaa3859f6f29 Mon Sep 17 00:00:00 2001
From 19911f4b2960e524c1701273c9460d281643d03c Mon Sep 17 00:00:00 2001
From: Jactry Zeng <wine@jactry.com>
Date: Sun, 10 Aug 2014 22:17:57 +0800
Subject: riched20: Stub for ITextPara interface and implement
@@ -10,7 +10,7 @@ Subject: riched20: Stub for ITextPara interface and implement
2 files changed, 729 insertions(+), 2 deletions(-)
diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 6cc4b09..76fc51d 100644
index df43621..f98f147 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -47,11 +47,13 @@ DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xa
@@ -47,7 +47,24 @@ index 6cc4b09..76fc51d 100644
struct ITextFontImpl {
ITextFont ITextFont_iface;
LONG ref;
@@ -494,6 +507,641 @@ static const IRichEditOleVtbl revt = {
@@ -159,6 +172,7 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
{
ITextRangeImpl *txtRge;
ITextFontImpl *txtFont;
+ ITextParaImpl *txtPara;
TRACE("Destroying %p\n", This);
This->txtSel->reOle = NULL;
@@ -169,6 +183,8 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface)
txtRge->reOle = NULL;
LIST_FOR_EACH_ENTRY(txtFont, &This->fontlist, ITextFontImpl, entry)
txtFont->reOle = NULL;
+ LIST_FOR_EACH_ENTRY(txtPara, &This->paralist, ITextParaImpl, entry)
+ txtPara->reOle = NULL;
heap_free(This);
}
return ref;
@@ -508,6 +524,641 @@ static const IRichEditOleVtbl revt = {
IRichEditOle_fnImportDataObject
};
@@ -689,7 +706,7 @@ index 6cc4b09..76fc51d 100644
/* ITextFont interface */
static inline ITextFontImpl *impl_from_ITextFont(ITextFont *iface)
{
@@ -1532,14 +2180,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
@@ -1546,14 +2197,42 @@ static HRESULT WINAPI ITextRange_fnSetFont(ITextRange *me, ITextFont *pFont)
return E_NOTIMPL;
}
@@ -734,7 +751,7 @@ index 6cc4b09..76fc51d 100644
}
static HRESULT WINAPI ITextRange_fnSetPara(ITextRange *me, ITextPara *pPara)
@@ -3185,6 +3861,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
@@ -3199,6 +3878,7 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p
TRACE("Created %p\n",reo);
list_init(&reo->rangelist);
list_init(&reo->fontlist);
@@ -742,23 +759,6 @@ index 6cc4b09..76fc51d 100644
if (outer_unk)
reo->outer_unk = outer_unk;
else
@@ -3199,6 +3876,7 @@ void DestroyIRichEditOle(IRichEditOle *iface)
IRichEditOleImpl *This = impl_from_IRichEditOle(iface);
ITextRangeImpl *txtRge;
ITextFontImpl *txtFont;
+ ITextParaImpl *txtPara;
TRACE("Destroying %p\n", This);
This->txtSel->reOle = NULL;
@@ -3209,6 +3887,8 @@ void DestroyIRichEditOle(IRichEditOle *iface)
txtRge->reOle = NULL;
LIST_FOR_EACH_ENTRY(txtFont, &This->fontlist, ITextFontImpl, entry)
txtFont->reOle = NULL;
+ LIST_FOR_EACH_ENTRY(txtPara, &This->paralist, ITextParaImpl, entry)
+ txtPara->reOle = NULL;
heap_free(This);
}
diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
index e9618d8..909d27e 100644
--- a/dlls/riched20/tests/richole.c
@@ -823,5 +823,5 @@ index e9618d8..909d27e 100644
+ test_ITextRange_GetPara();
}
--
2.1.2
1.9.1