June 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : msscript: Added IPointerInactive stub.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: e7802289476d5549ecabc0aa010a8f141510aee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7802289476d5549ecabc0aa0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:30 2016 +0300 msscript: Added IPointerInactive stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 66 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 18 +++++++++++ 2 files changed, 84 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c0e2520..db4d901 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -46,6 +46,7 @@ struct ScriptControl { IOleControl IOleControl_iface; IQuickActivate IQuickActivate_iface; IViewObject IViewObject_iface; + IPointerInactive IPointerInactive_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IOleClientSite *site; @@ -168,6 +169,11 @@ static inline ScriptControl *impl_from_IViewObject(IViewObject *iface) return CONTAINING_RECORD(iface, ScriptControl, IViewObject_iface); } +static inline ScriptControl *impl_from_IPointerInactive(IPointerInactive *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IPointerInactive_iface); +} + static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); @@ -209,6 +215,9 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IViewObject, riid)) { TRACE("(%p)->(IID_IViewObject %p)\n", This, ppv); *ppv = &This->IViewObject_iface; + }else if(IsEqualGUID(&IID_IPointerInactive, riid)) { + TRACE("(%p)->(IID_IPointerInactive %p)\n", This, ppv); + *ppv = &This->IPointerInactive_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = &This->IConnectionPointContainer_iface; @@ -1047,6 +1056,62 @@ static const IViewObjectVtbl ViewObjectVtbl = { ViewObject_GetAdvise }; +static HRESULT WINAPI PointerInactive_QueryInterface(IPointerInactive *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI PointerInactive_AddRef(IPointerInactive *iface) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI PointerInactive_Release(IPointerInactive *iface) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI PointerInactive_GetActivationPolicy(IPointerInactive *iface, DWORD *policy) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + + FIXME("(%p)->(%p)\n", This, policy); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PointerInactive_OnInactiveMouseMove(IPointerInactive *iface, const RECT *bounds, + LONG x, LONG y, DWORD key_state) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + + FIXME("(%p)->(%s %d %d %#x)\n", This, wine_dbgstr_rect(bounds), x, y, key_state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI PointerInactive_OnInactiveSetCursor(IPointerInactive *iface, const RECT *bounds, + LONG x, LONG y, DWORD msg, BOOL set_always) +{ + ScriptControl *This = impl_from_IPointerInactive(iface); + + FIXME("(%p)->(%s %d %d %#x %d)\n", This, wine_dbgstr_rect(bounds), x, y, msg, set_always); + + return E_NOTIMPL; +} + +static const IPointerInactiveVtbl PointerInactiveVtbl = { + PointerInactive_QueryInterface, + PointerInactive_AddRef, + PointerInactive_Release, + PointerInactive_GetActivationPolicy, + PointerInactive_OnInactiveMouseMove, + PointerInactive_OnInactiveSetCursor +}; + static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **obj) { ScriptControl *This = impl_from_IConnectionPointContainer(iface); @@ -1227,6 +1292,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; script_control->IQuickActivate_iface.lpVtbl = &QuickActivateVtbl; script_control->IViewObject_iface.lpVtbl = &ViewObjectVtbl; + script_control->IPointerInactive_iface.lpVtbl = &PointerInactiveVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 6e1f64d..287daf9 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -843,6 +843,23 @@ static void test_viewobject(void) IScriptControl_Release(sc); } +static void test_pointerinactive(void) +{ + IPointerInactive *pi; + IScriptControl *sc; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_QueryInterface(sc, &IID_IPointerInactive, (void**)&pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IPointerInactive_Release(pi); + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -865,6 +882,7 @@ START_TEST(msscript) test_connectionpoints(); test_quickactivate(); test_viewobject(); + test_pointerinactive(); CoUninitialize(); }

1 0

Nikolay Sivov : msscript: Added IViewObject stub.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 6bd5794694ca6aa3118aff4106ac5f482f2bbaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd5794694ca6aa3118aff410… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:29 2016 +0300 msscript: Added IViewObject stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 100 +++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 18 +++++++ 2 files changed, 118 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index f072dba..c0e2520 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -45,6 +45,7 @@ struct ScriptControl { IOleObject IOleObject_iface; IOleControl IOleControl_iface; IQuickActivate IQuickActivate_iface; + IViewObject IViewObject_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IOleClientSite *site; @@ -162,6 +163,11 @@ static inline ScriptControl *impl_from_IQuickActivate(IQuickActivate *iface) return CONTAINING_RECORD(iface, ScriptControl, IQuickActivate_iface); } +static inline ScriptControl *impl_from_IViewObject(IViewObject *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IViewObject_iface); +} + static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); @@ -200,6 +206,9 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { TRACE("(%p)->(IID_IQuickActivate %p)\n", This, ppv); *ppv = &This->IQuickActivate_iface; + }else if(IsEqualGUID(&IID_IViewObject, riid)) { + TRACE("(%p)->(IID_IViewObject %p)\n", This, ppv); + *ppv = &This->IViewObject_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = &This->IConnectionPointContainer_iface; @@ -948,6 +957,96 @@ static const IQuickActivateVtbl QuickActivateVtbl = { QuickActivate_GetContentExtent }; +static HRESULT WINAPI ViewObject_QueryInterface(IViewObject *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IViewObject(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI ViewObject_AddRef(IViewObject *iface) +{ + ScriptControl *This = impl_from_IViewObject(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI ViewObject_Release(IViewObject *iface) +{ + ScriptControl *This = impl_from_IViewObject(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI ViewObject_Draw(IViewObject *iface, DWORD drawaspect, LONG index, void *aspect, + DVTARGETDEVICE *device, HDC target_dev, HDC hdc_draw, const RECTL *bounds, const RECTL *win_bounds, + BOOL (STDMETHODCALLTYPE *fn_continue)(ULONG_PTR cont), ULONG_PTR cont) +{ + ScriptControl *This = impl_from_IViewObject(iface); + + FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %lu)\n", This, drawaspect, index, aspect, device, target_dev, + hdc_draw, bounds, win_bounds, fn_continue, cont); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetColorSet(IViewObject *iface, DWORD drawaspect, LONG index, void *aspect, + DVTARGETDEVICE *device, HDC hic_target, LOGPALETTE **colorset) +{ + ScriptControl *This = impl_from_IViewObject(iface); + + FIXME("(%p)->(%d %d %p %p %p %p)\n", This, drawaspect, index, aspect, device, hic_target, + colorset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_Freeze(IViewObject *iface, DWORD drawaspect, LONG index, void *aspect, + DWORD *freeze) +{ + ScriptControl *This = impl_from_IViewObject(iface); + + FIXME("(%p)->(%d %d %p %p)\n", This, drawaspect, index, aspect, freeze); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_Unfreeze(IViewObject *iface, DWORD freeze) +{ + ScriptControl *This = impl_from_IViewObject(iface); + + FIXME("(%p)->(%d)\n", This, freeze); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_SetAdvise(IViewObject *iface, DWORD aspects, DWORD advf, IAdviseSink *sink) +{ + ScriptControl *This = impl_from_IViewObject(iface); + + FIXME("(%p)->(%d %d %p)\n", This, aspects, advf, sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ViewObject_GetAdvise(IViewObject *iface, DWORD *aspects, DWORD *advf, IAdviseSink **sink) +{ + ScriptControl *This = impl_from_IViewObject(iface); + + FIXME("(%p)->(%p %p %p)\n", This, aspects, advf, sink); + + return E_NOTIMPL; +} + +static const IViewObjectVtbl ViewObjectVtbl = { + ViewObject_QueryInterface, + ViewObject_AddRef, + ViewObject_Release, + ViewObject_Draw, + ViewObject_GetColorSet, + ViewObject_Freeze, + ViewObject_Unfreeze, + ViewObject_SetAdvise, + ViewObject_GetAdvise +}; + static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **obj) { ScriptControl *This = impl_from_IConnectionPointContainer(iface); @@ -1127,6 +1226,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; script_control->IQuickActivate_iface.lpVtbl = &QuickActivateVtbl; + script_control->IViewObject_iface.lpVtbl = &ViewObjectVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 5300c93..6e1f64d 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -826,6 +826,23 @@ static void test_quickactivate(void) IScriptControl_Release(sc); } +static void test_viewobject(void) +{ + IScriptControl *sc; + IViewObject *view; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_QueryInterface(sc, &IID_IViewObject, (void**)&view); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IViewObject_Release(view); + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -847,6 +864,7 @@ START_TEST(msscript) test_Language(); test_connectionpoints(); test_quickactivate(); + test_viewobject(); CoUninitialize(); }

1 0

Nikolay Sivov : msscript: Implement FindConnectionPoint().
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: e9fa3f427a1b8160e4bfd7722aee56275f50ccc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fa3f427a1b8160e4bfd7722… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:27 2016 +0300 msscript: Implement FindConnectionPoint(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 145 ++++++++++++++++++++++++++++++++++++- dlls/msscript.ocx/tests/msscript.c | 9 +++ 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 6465104..c307c26 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -29,6 +29,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); +struct ScriptControl; +typedef struct ConnectionPoint ConnectionPoint; + +struct ConnectionPoint { + IConnectionPoint IConnectionPoint_iface; + ScriptControl *control; + const IID *riid; + ConnectionPoint *next; +}; + struct ScriptControl { IScriptControl IScriptControl_iface; IPersistStreamInit IPersistStreamInit_iface; @@ -38,6 +48,11 @@ struct ScriptControl { LONG ref; IOleClientSite *site; SIZEL extent; + + /* connection points */ + ConnectionPoint *cp_list; + ConnectionPoint cp_scsource; + ConnectionPoint cp_propnotif; }; static HINSTANCE msscript_instance; @@ -146,6 +161,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) +{ + return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); +} + static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -895,10 +915,24 @@ static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionP static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, IConnectionPoint **cp) { ScriptControl *This = impl_from_IConnectionPointContainer(iface); + ConnectionPoint *iter; - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), cp); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), cp); - return E_NOTIMPL; + *cp = NULL; + + for (iter = This->cp_list; iter; iter = iter->next) { + if (IsEqualIID(iter->riid, riid)) + *cp = &iter->IConnectionPoint_iface; + } + + if (*cp) { + IConnectionPoint_AddRef(*cp); + return S_OK; + } + + FIXME("unsupported connection point %s\n", debugstr_guid(riid)); + return CONNECT_E_NOCONNECTION; } static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { @@ -909,6 +943,109 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { ConnectionPointContainer_FindConnectionPoint }; +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, + REFIID riid, void **ppv) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IConnectionPoint_iface; + }else if(IsEqualGUID(&IID_IConnectionPoint, riid)) { + TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); + *ppv = &This->IConnectionPoint_iface; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_AddRef(&This->control->IConnectionPointContainer_iface); +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + return IConnectionPointContainer_Release(&This->control->IConnectionPointContainer_iface); +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *iid) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p)\n", This, iid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **container) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p)\n", This, container); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p %p)\n", This, unk_sink, cookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD cookie) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%d)\n", This, cookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, + IEnumConnections **ppEnum) +{ + ConnectionPoint *This = impl_from_IConnectionPoint(iface); + + FIXME("(%p)->(%p): stub\n", This, ppEnum); + + return E_NOTIMPL; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = +{ + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + +static void ConnectionPoint_Init(ConnectionPoint *cp, ScriptControl *sc, REFIID riid) +{ + cp->IConnectionPoint_iface.lpVtbl = &ConnectionPointVtbl; + cp->control = sc; + cp->riid = riid; + + cp->next = sc->cp_list; + sc->cp_list = cp; +} + static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { ScriptControl *script_control; @@ -929,6 +1066,10 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; + script_control->cp_list = NULL; + + ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); + ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); hdc = GetDC(0); dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index be5fee2..89fd197 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -783,6 +783,7 @@ if (hr == S_OK) static void test_connectionpoints(void) { IConnectionPointContainer *container; + IConnectionPoint *cp; IScriptControl *sc; HRESULT hr; @@ -796,6 +797,14 @@ static void test_connectionpoints(void) EXPECT_REF(sc, 2); EXPECT_REF(container, 2); + hr = IConnectionPointContainer_FindConnectionPoint(container, &IID_IPropertyNotifySink, &cp); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPoint_Release(cp); + + hr = IConnectionPointContainer_FindConnectionPoint(container, &DIID_DScriptControlSource, &cp); + ok(hr == S_OK, "got 0x%08x\n", hr); + IConnectionPoint_Release(cp); + IConnectionPointContainer_Release(container); IScriptControl_Release(sc); }

1 0

Michael Stefaniuc : d3d8/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 7fee54f409fca845c9ba165fada80f4a72441a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fee54f409fca845c9ba165fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 11:52:31 2016 +0200 d3d8/tests: Use wine_dbgstr_rect() to print RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 116 +++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fee54f409fca845c9ba1…

1 0

Michael Stefaniuc : user32/tests: Use the stricter !IsRectEmpty() check.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 827cd8f332a23dc6b70a05e5f222818e09059591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=827cd8f332a23dc6b70a05e5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 12:07:20 2016 +0200 user32/tests: Use the stricter !IsRectEmpty() check. The EMPTY macro is much stricter than IsRectEmpty() as it checks for zero heigth AND width aka rect has the size of a point. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 96 ++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=827cd8f332a23dc6b70a0…

1 0

Michael Stefaniuc : user32: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: bca5acb5ca2fd4d5cfa946bcc889e37eb76c2648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca5acb5ca2fd4d5cfa946bcc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 11:58:27 2016 +0200 user32: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 993ec9b..2fa194f 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2095,7 +2095,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, req->client.top = client_rect->top; req->client.right = client_rect->right; req->client.bottom = client_rect->bottom; - if (memcmp( window_rect, &visible_rect, sizeof(RECT) ) || !IsRectEmpty( &valid_rects[0] )) + if (!EqualRect( window_rect, &visible_rect ) || !IsRectEmpty( &valid_rects[0] )) { wine_server_add_data( req, &visible_rect, sizeof(visible_rect) ); if (!IsRectEmpty( &valid_rects[0] ))

1 0

Michael Stefaniuc : user32/tests: Finish the move to use wine_dbgstr_rect( ).
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: c03ccff2ba4e8eb69f2a7492ab4b956e811c8a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03ccff2ba4e8eb69f2a7492a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 12:08:13 2016 +0200 user32/tests: Finish the move to use wine_dbgstr_rect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index e04f1e3..8438f10 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -130,15 +130,12 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL ); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -197,15 +194,14 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE); - ok( !EMPTY(rect) && MODIFIED (rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED (rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -339,16 +335,12 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL ); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -406,16 +398,14 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");

1 0

Nikolay Sivov : msscript: Added IQuickActivate stub.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: fc9ecfe04d68145d694b14a7bc936b3f38d4b2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9ecfe04d68145d694b14a7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:28 2016 +0300 msscript: Added IQuickActivate stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 64 ++++++++++++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/msscript.c | 18 +++++++++++ 2 files changed, 82 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c307c26..f072dba 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -44,6 +44,7 @@ struct ScriptControl { IPersistStreamInit IPersistStreamInit_iface; IOleObject IOleObject_iface; IOleControl IOleControl_iface; + IQuickActivate IQuickActivate_iface; IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; IOleClientSite *site; @@ -156,6 +157,11 @@ static inline ScriptControl *impl_from_IOleControl(IOleControl *iface) return CONTAINING_RECORD(iface, ScriptControl, IOleControl_iface); } +static inline ScriptControl *impl_from_IQuickActivate(IQuickActivate *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IQuickActivate_iface); +} + static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) { return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); @@ -191,6 +197,9 @@ static HRESULT WINAPI ScriptControl_QueryInterface(IScriptControl *iface, REFIID }else if(IsEqualGUID(&IID_IOleControl, riid)) { TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); *ppv = &This->IOleControl_iface; + }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { + TRACE("(%p)->(IID_IQuickActivate %p)\n", This, ppv); + *ppv = &This->IQuickActivate_iface; }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = &This->IConnectionPointContainer_iface; @@ -885,6 +894,60 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +static HRESULT WINAPI QuickActivate_QueryInterface(IQuickActivate *iface, REFIID riid, void **obj) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + return IScriptControl_QueryInterface(&This->IScriptControl_iface, riid, obj); +} + +static ULONG WINAPI QuickActivate_AddRef(IQuickActivate *iface) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI QuickActivate_Release(IQuickActivate *iface) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTAINER *container, QACONTROL *control) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + + FIXME("(%p)->(%p %p)\n", This, container, control); + + return E_NOTIMPL; +} + +static HRESULT WINAPI QuickActivate_SetContentExtent(IQuickActivate *iface, SIZEL *size) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + + FIXME("(%p)->(%p)\n", This, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI QuickActivate_GetContentExtent(IQuickActivate *iface, SIZEL *size) +{ + ScriptControl *This = impl_from_IQuickActivate(iface); + + FIXME("(%p)->(%p)\n", This, size); + + return E_NOTIMPL; +} + +static const IQuickActivateVtbl QuickActivateVtbl = { + QuickActivate_QueryInterface, + QuickActivate_AddRef, + QuickActivate_Release, + QuickActivate_QuickActivate, + QuickActivate_SetContentExtent, + QuickActivate_GetContentExtent +}; + static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, REFIID riid, void **obj) { ScriptControl *This = impl_from_IConnectionPointContainer(iface); @@ -1063,6 +1126,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; script_control->IOleObject_iface.lpVtbl = &OleObjectVtbl; script_control->IOleControl_iface.lpVtbl = &OleControlVtbl; + script_control->IQuickActivate_iface.lpVtbl = &QuickActivateVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; script_control->ref = 1; script_control->site = NULL; diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 89fd197..5300c93 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -809,6 +809,23 @@ static void test_connectionpoints(void) IScriptControl_Release(sc); } +static void test_quickactivate(void) +{ + IScriptControl *sc; + IQuickActivate *qa; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void**)&sc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IScriptControl_QueryInterface(sc, &IID_IQuickActivate, (void**)&qa); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IQuickActivate_Release(qa); + IScriptControl_Release(sc); +} + START_TEST(msscript) { IUnknown *unk; @@ -829,6 +846,7 @@ START_TEST(msscript) test_olecontrol(); test_Language(); test_connectionpoints(); + test_quickactivate(); CoUninitialize(); }

1 0

Michael Stefaniuc : user32/tests: Remove some old broken behavior.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 4730f4fffb5406c1268d13a98a56c5fdb008d10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4730f4fffb5406c1268d13a98… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 12:06:45 2016 +0200 user32/tests: Remove some old broken behavior. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/text.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 7166e69..f0d3c62 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -146,8 +146,7 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); - ok( EMPTY(rect) || !MODIFIED(rect), - "rectangle should be empty or not modified got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); if (!textheight) /* Windows NT 4 */ { if (conform_xp) @@ -159,9 +158,7 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, NULL, -1, &rect, DT_CALCRECT); - ok( EMPTY(rect) || !MODIFIED(rect), - "rectangle should be empty or NOT modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); if (conform_xp) ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -218,16 +215,15 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, NULL, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); - ok( (!EMPTY(rect) && MODIFIED(rect)) || !MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); if (conform_xp) ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, NULL, -1, &rect, DT_CALCRECT|DT_SINGLELINE); - ok( (!EMPTY(rect) && MODIFIED(rect)) || !MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); if (conform_xp) ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");

1 0

Michael Stefaniuc : comct32: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard June 20, 2016

June 20, 2016

Module: wine Branch: master Commit: 085a538dedbf5369c7885f0547ba9e419fa2a1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=085a538dedbf5369c7885f054… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 12:02:37 2016 +0200 comct32: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index de8155a..3089378 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1573,7 +1573,7 @@ REBAR_AutoSize(REBAR_INFO *infoPtr, BOOL needsLayout) GetClientRect(infoPtr->hwndSelf, &rcNew); GetClientRect(infoPtr->hwndSelf, &autosize.rcTarget); - autosize.fChanged = (memcmp(&rc, &rcNew, sizeof(RECT)) == 0); + autosize.fChanged = EqualRect(&rc, &rcNew); autosize.rcTarget = rc; autosize.rcActual = rcNew; REBAR_Notify((NMHDR *)&autosize, infoPtr, RBN_AUTOSIZE);

1 0