August 2019 - Wine-devel - list.winehq.org

[PATCH 1/6] wined3d: Fix color mask 1-3 state setting.
by Matteo Bruni 14 Aug '19

14 Aug '19

Fixes a regression from commit 74b9ef2c1d7bc37c79b02b7c541d4b440de0b43d. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d860d13bdb0..6df5a6d0190 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1584,17 +1584,17 @@ static void state_colorwrite0(struct wined3d_context *context, const struct wine static void state_colorwrite1(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - set_color_mask(wined3d_context_gl(context)->gl_info, 1, state->render_states[WINED3D_RS_COLORWRITEENABLE]); + set_color_mask(wined3d_context_gl(context)->gl_info, 1, state->render_states[WINED3D_RS_COLORWRITEENABLE1]); } static void state_colorwrite2(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - set_color_mask(wined3d_context_gl(context)->gl_info, 2, state->render_states[WINED3D_RS_COLORWRITEENABLE]); + set_color_mask(wined3d_context_gl(context)->gl_info, 2, state->render_states[WINED3D_RS_COLORWRITEENABLE2]); } static void state_colorwrite3(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - set_color_mask(wined3d_context_gl(context)->gl_info, 3, state->render_states[WINED3D_RS_COLORWRITEENABLE]); + set_color_mask(wined3d_context_gl(context)->gl_info, 3, state->render_states[WINED3D_RS_COLORWRITEENABLE3]); } static void state_localviewer(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -- 2.21.0

4 12

[PATCH 7/8] jscript: Implement Function.prototype.bind.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 133 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+)

1 0

[PATCH 6/8] jscript: Move function name to NativeFunction.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH 5/8] jscript: Introduce InterpretedFunction struct.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 53 +++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 21 deletions(-)

1 0

[PATCH 4/8] jscript: Move value_proc to BuiltinFunction struct.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)

1 0

[PATCH 3/8] jscript: Move function call implementation into vtbl.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 148 +++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 85 deletions(-)

1 0

[PATCH 2/8] jscript: Move function destructor implementation into vtbl.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)

1 0

[PATCH 1/8] jscript: Introduce function vtbl and use it for toString implementation.
by Jacek Caban 14 Aug '19

14 Aug '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/function.c | 123 ++++++++++++++++++++++++---------------- 1 file changed, 74 insertions(+), 49 deletions(-)

1 0

[PATCH] msctf: Add ITfContextOwnerCompositionServices stub.
by Zhiyi Zhang 14 Aug '19

14 Aug '19

Fix crash at launch for games that use Unreal Engine 4. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msctf/context.c | 92 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 85e3c5b5b0..63f2bf5455 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -41,7 +41,7 @@ typedef struct tagContext { ITfContext ITfContext_iface; ITfSource ITfSource_iface; /* const ITfContextCompositionVtbl *ContextCompositionVtbl; */ - /* const ITfContextOwnerCompositionServicesVtbl *ContextOwnerCompositionServicesVtbl; */ + ITfContextOwnerCompositionServices ITfContextOwnerCompositionServices_iface; /* const ITfContextOwnerServicesVtbl *ContextOwnerServicesVtbl; */ ITfInsertAtSelection ITfInsertAtSelection_iface; /* const ITfMouseTrackerVtbl *MouseTrackerVtbl; */ @@ -89,6 +89,11 @@ static inline Context *impl_from_ITfSource(ITfSource *iface) return CONTAINING_RECORD(iface, Context, ITfSource_iface); } +static inline Context *impl_from_ITfContextOwnerCompositionServices(ITfContextOwnerCompositionServices *iface) +{ + return CONTAINING_RECORD(iface, Context, ITfContextOwnerCompositionServices_iface); +} + static inline Context *impl_from_ITfInsertAtSelection(ITfInsertAtSelection *iface) { return CONTAINING_RECORD(iface, Context, ITfInsertAtSelection_iface); @@ -150,6 +155,10 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO { *ppvOut = &This->ITfSource_iface; } + else if (IsEqualIID(iid, &IID_ITfContextOwnerCompositionServices)) + { + *ppvOut = &This->ITfContextOwnerCompositionServices_iface; + } else if (IsEqualIID(iid, &IID_ITfInsertAtSelection)) { *ppvOut = &This->ITfInsertAtSelection_iface; @@ -526,6 +535,9 @@ static const ITfContextVtbl ContextVtbl = Context_CreateRangeBackup }; +/***************************************************** + * ITfSource functions + *****************************************************/ static HRESULT WINAPI ContextSource_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { Context *This = impl_from_ITfSource(iface); @@ -544,9 +556,6 @@ static ULONG WINAPI ContextSource_Release(ITfSource *iface) return ITfContext_Release(&This->ITfContext_iface); } -/***************************************************** - * ITfSource functions - *****************************************************/ static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { @@ -585,6 +594,80 @@ static const ITfSourceVtbl ContextSourceVtbl = ContextSource_UnadviseSink }; +/***************************************************** + * ITfContextOwnerCompositionServices functions + *****************************************************/ +static HRESULT WINAPI ContextOwnerCompositionServices_QueryInterface(ITfContextOwnerCompositionServices *iface, + REFIID iid, LPVOID *ppvOut) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_QueryInterface(&This->ITfContext_iface, iid, ppvOut); +} + +static ULONG WINAPI ContextOwnerCompositionServices_AddRef(ITfContextOwnerCompositionServices *iface) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_AddRef(&This->ITfContext_iface); +} + +static ULONG WINAPI ContextOwnerCompositionServices_Release(ITfContextOwnerCompositionServices *iface) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_Release(&This->ITfContext_iface); +} + +static HRESULT WINAPI ContextOwnerCompositionServices_StartComposition(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecWrite, ITfRange *pCompositionRange, ITfCompositionSink *pSink, ITfComposition **ppComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pCompositionRange, pSink, ppComposition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_EnumCompositions(ITfContextOwnerCompositionServices *iface, + IEnumITfCompositionView **ppEnum) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %p\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_FindComposition(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecRead, ITfRange *pTestRange, IEnumITfCompositionView **ppEnum) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p\n", This, ecRead, pTestRange, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_TakeOwnership(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecWrite, ITfCompositionView *pComposition, ITfCompositionSink *pSink, ITfComposition **ppComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pComposition, pSink, ppComposition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_TerminateComposition(ITfContextOwnerCompositionServices *iface, + ITfCompositionView *pComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %p\n", This, pComposition); + return E_NOTIMPL; +} + +static const ITfContextOwnerCompositionServicesVtbl ContextOwnerCompositionServicesVtbl = +{ + ContextOwnerCompositionServices_QueryInterface, + ContextOwnerCompositionServices_AddRef, + ContextOwnerCompositionServices_Release, + ContextOwnerCompositionServices_StartComposition, + ContextOwnerCompositionServices_EnumCompositions, + ContextOwnerCompositionServices_FindComposition, + ContextOwnerCompositionServices_TakeOwnership, + ContextOwnerCompositionServices_TerminateComposition +}; + /***************************************************** * ITfInsertAtSelection functions *****************************************************/ @@ -981,6 +1064,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr This->ITfContext_iface.lpVtbl= &ContextVtbl; This->ITfSource_iface.lpVtbl = &ContextSourceVtbl; + This->ITfContextOwnerCompositionServices_iface.lpVtbl = &ContextOwnerCompositionServicesVtbl; This->ITfInsertAtSelection_iface.lpVtbl = &InsertAtSelectionVtbl; This->ITfSourceSingle_iface.lpVtbl = &ContextSourceSingleVtbl; This->ITextStoreACPSink_iface.lpVtbl = &TextStoreACPSinkVtbl; -- 2.20.1

1 0

[PATCH] comctl32: Dont Recalculate Visible Order after removing all children.
by Alistair Leslie-Hughes 14 Aug '19

14 Aug '19

Calling Expand with TVE_COLLAPSE | TVE_COLLAPSERESET which removes all child items and results in infoPtr->firstVisible being NULL. However TREEVIEW_ComputeItemRect requires that firstVisible to be valid. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comctl32/treeview.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3c73964304..8babdf8d69 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3391,7 +3391,8 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, } } - TREEVIEW_RecalculateVisibleOrder(infoPtr, item); + if(!bRemoveChildren) + TREEVIEW_RecalculateVisibleOrder(infoPtr, item); if (nextItem) scrollDist = -(scrollDist - nextItem->rect.top); -- 2.17.1

2 1