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

Nikolay Sivov : msscript: Added IViewObject stub.
by Alexandre Julliard 20 Jun '16

20 Jun '16

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: Added IPointerInactive stub.
by Alexandre Julliard 20 Jun '16

20 Jun '16

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: Implement GetActivationPolicy().
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: d62974a508d7427d3189cf2c3fba4ae41d4c1d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62974a508d7427d3189cf2c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 20 14:00:31 2016 +0300 msscript: Implement GetActivationPolicy(). 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 | 8 ++++++-- dlls/msscript.ocx/tests/msscript.c | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index db4d901..66018d3 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -1078,9 +1078,13 @@ static HRESULT WINAPI PointerInactive_GetActivationPolicy(IPointerInactive *ifac { ScriptControl *This = impl_from_IPointerInactive(iface); - FIXME("(%p)->(%p)\n", This, policy); + TRACE("(%p)->(%p)\n", This, policy); - return E_NOTIMPL; + if (!policy) + return E_POINTER; + + *policy = 0; + return S_OK; } static HRESULT WINAPI PointerInactive_OnInactiveMouseMove(IPointerInactive *iface, const RECT *bounds, diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 287daf9..9043361 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -847,6 +847,7 @@ static void test_pointerinactive(void) { IPointerInactive *pi; IScriptControl *sc; + DWORD policy; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -856,6 +857,14 @@ static void test_pointerinactive(void) hr = IScriptControl_QueryInterface(sc, &IID_IPointerInactive, (void**)&pi); ok(hr == S_OK, "got 0x%08x\n", hr); + if (0) /* crashes w2k3 */ + hr = IPointerInactive_GetActivationPolicy(pi, NULL); + + policy = 123; + hr = IPointerInactive_GetActivationPolicy(pi, &policy); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(policy == 0, "got %#x\n", policy); + IPointerInactive_Release(pi); IScriptControl_Release(sc); }

1 0

Alistair Leslie-Hughes : vcruntime140: Forward _set_se_translator.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: eeec1b1a64b81dc3c771bf7f83123109f290b616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeec1b1a64b81dc3c771bf7f8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 19 05:57:25 2016 +0000 vcruntime140: Forward _set_se_translator. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index c85a998..06ef550 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1149,7 +1149,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ cdecl _set_purecall_handler(ptr) ucrtbase._set_purecall_handler -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) ucrtbase._set_se_translator @ cdecl -arch=i386 -norelay _setjmp3(ptr long) ucrtbase._setjmp3 @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) ucrtbase.longjmp @ cdecl memchr(ptr long long) ucrtbase.memchr diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 64f6276..da03fd1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1892,7 +1892,7 @@ @ cdecl _set_new_mode(long) MSVCRT__set_new_mode @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) MSVCRT__set_se_translator @ cdecl _set_thread_local_invalid_parameter_handler(ptr) @ cdecl _seterrormode(long) @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index ea8c93b..a49e7b9 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -69,7 +69,7 @@ @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) ucrtbase._seh_longjmp_unwind4 @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) ucrtbase._seh_longjmp_unwind @ cdecl _set_purecall_handler(ptr) ucrtbase._set_purecall_handler -@ stub _set_se_translator +@ cdecl _set_se_translator(ptr) ucrtbase._set_se_translator @ cdecl -arch=i386 -norelay _setjmp3(ptr long) ucrtbase._setjmp3 @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) ucrtbase.longjmp @ cdecl memchr(ptr long long) ucrtbase.memchr

1 0

Iván Matellanes : msvcirt: Fix implementation of strstreambuf::underflow.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 025c54344230ca8b32e80f08b9af13a16dfd2445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025c54344230ca8b32e80f08b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 20 13:32:09 2016 +0100 msvcirt: Fix implementation of strstreambuf::underflow. Spotted while testing for ostream printing. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 5 ++++- dlls/msvcirt/tests/msvcirt.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index fe5901a..e4fb3fb 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1469,8 +1469,11 @@ int __thiscall strstreambuf_underflow(strstreambuf *this) if (this->base.gptr < this->base.egptr) return *this->base.gptr; /* extend the get area to include the characters written */ - if (this->base.egptr < this->base.pptr) + if (this->base.egptr < this->base.pptr) { + this->base.gptr = this->base.base + (this->base.gptr - this->base.eback); + this->base.eback = this->base.base; this->base.egptr = this->base.pptr; + } return (this->base.gptr < this->base.egptr) ? *this->base.gptr : EOF; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index a6916c1..428ddf3 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -1745,8 +1745,36 @@ static void test_strstreambuf(void) ssb2.base.pbase = ssb2.base.pptr = ssb2.base.epptr = NULL; ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); ok(ret == EOF, "expected EOF got %d\n", ret); + ssb2.base.pbase = ssb2.base.pptr = ssb2.base.base; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base, "wrong get end, expected %p got %p\n", ssb2.base.base, ssb2.base.egptr); + ssb2.base.pptr = ssb2.base.base + 3; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'C', "expected 'C' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 3, "wrong get end, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.egptr); + ssb2.base.gptr = ssb2.base.base + 2; + ssb2.base.egptr = NULL; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 3, "wrong get end, expected %p got %p\n", ssb2.base.base + 3, ssb2.base.egptr); + ssb2.base.eback = ssb2.base.egptr = ssb2.base.base + 1; + ssb2.base.gptr = ssb2.base.base + 3; + ssb2.base.pptr = ssb2.base.base + 5; + ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); + ok(ret == 'e', "expected 'e' got %d\n", ret); + ok(ssb2.base.eback == ssb2.base.base, "wrong get base, expected %p got %p\n", ssb2.base.base, ssb2.base.eback); + ok(ssb2.base.gptr == ssb2.base.base + 2, "wrong get pointer, expected %p got %p\n", ssb2.base.base, ssb2.base.gptr); + ok(ssb2.base.egptr == ssb2.base.base + 5, "wrong get end, expected %p got %p\n", ssb2.base.base + 5, ssb2.base.egptr); ssb2.base.eback = ssb2.base.base; ssb2.base.gptr = ssb2.base.egptr = ssb2.base.ebuf; + ssb2.base.pbase = ssb2.base.pptr = NULL; ret = (int) call_func1(p_strstreambuf_underflow, &ssb2); ok(ret == EOF, "expected EOF got %d\n", ret);

1 0

Michael Stefaniuc : d3d8/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 20 Jun '16

20 Jun '16

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: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard 20 Jun '16

20 Jun '16

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 : comct32: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard 20 Jun '16

20 Jun '16

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

Michael Stefaniuc : gdi32/tests: Use wine_dbgstr_rect() to print RECTs.
by Alexandre Julliard 20 Jun '16

20 Jun '16

Module: wine Branch: master Commit: 75426bb92645168b921235c7a1ec12a4f6a5a6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=75426bb92645168b921235c7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 11:56:26 2016 +0200 gdi32/tests: Use wine_dbgstr_rect() to print RECTs. Two old (win95 and winnt) broken() removed en passant. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/clipping.c | 60 +++++++++-------------- dlls/gdi32/tests/dc.c | 114 ++++++++++++++++++-------------------------- dlls/gdi32/tests/dib.c | 2 +- dlls/gdi32/tests/mapping.c | 27 ++++------- dlls/gdi32/tests/metafile.c | 47 +++++++----------- 5 files changed, 96 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75426bb92645168b92123…

1 0

Michael Stefaniuc : user32/tests: Remove some old broken behavior.
by Alexandre Julliard 20 Jun '16

20 Jun '16

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