May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase: Return void from strmbase_filter_cleanup().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 347fdce0ad2f14de9541ab77ddb37f1163d25543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=347fdce0ad2f14de9541ab77… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 00:02:13 2019 -0500 strmbase: Return void from strmbase_filter_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 4 +--- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 325620e..8bec368 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -227,7 +227,7 @@ void BaseFilter_Init(BaseFilter *This, const IBaseFilterVtbl *Vtbl, const CLSID This->pFuncsTable = pBaseFuncsTable; } -HRESULT WINAPI strmbase_filter_cleanup(BaseFilter * This) +void strmbase_filter_cleanup(BaseFilter *This) { if (This->pClock) IReferenceClock_Release(This->pClock); @@ -235,6 +235,4 @@ HRESULT WINAPI strmbase_filter_cleanup(BaseFilter * This) This->IBaseFilter_iface.lpVtbl = NULL; This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); - - return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d51fdb4..2f150e8 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -192,7 +192,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); void BaseFilter_Init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table); -HRESULT WINAPI strmbase_filter_cleanup(BaseFilter *filter); +void strmbase_filter_cleanup(BaseFilter *filter); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);

1 0

Zebediah Figura : evr: Use strmbase_filter_cleanup().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 3e0157613f0d9abbccb45be6975177ca1693002d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0157613f0d9abbccb45be6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 00:02:14 2019 -0500 evr: Use strmbase_filter_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 5ab6572..01e4ee4 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -117,12 +117,15 @@ static ULONG WINAPI inner_AddRef(IUnknown *iface) static ULONG WINAPI inner_Release(IUnknown *iface) { evr_filter *This = impl_from_inner_IUnknown(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p, %p)->(): new ref %d\n", iface, This, ref); if (!ref) + { + strmbase_filter_cleanup(&This->filter); CoTaskMemFree(This); + } return ref; }

1 0

Zebediah Figura : strmbase/transform: Use BaseFilter_Destroy().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: 85516dca9f9f678fece968be1aa83b87698b3f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85516dca9f9f678fece968be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 00:02:15 2019 -0500 strmbase/transform: Use BaseFilter_Destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 8b63d2d..b8eb60c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -352,7 +352,7 @@ static HRESULT strmbase_transform_init(const CLSID *clsid, if (FAILED(hr)) { CoTaskMemFree(filter->ppPins); - BaseFilterImpl_Release(&filter->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&filter->filter); } return hr;

1 0

Zebediah Figura : qcap/avimux: Use BaseFilter_Destroy().
by Alexandre Julliard 22 May '19

22 May '19

Module: wine Branch: master Commit: f96c2bd64feeb615b1e38ba7983705b81cc359a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f96c2bd64feeb615b1e38ba7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 00:02:16 2019 -0500 qcap/avimux: Use BaseFilter_Destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 3a269a3..ff45fb0 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -175,7 +175,7 @@ static HRESULT WINAPI AviMux_QueryInterface(IBaseFilter *iface, REFIID riid, voi static ULONG WINAPI AviMux_Release(IBaseFilter *iface) { AviMux *This = impl_from_IBaseFilter(iface); - ULONG ref = BaseFilterImpl_Release(iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p) new refcount: %u\n", This, ref); @@ -192,6 +192,7 @@ static ULONG WINAPI AviMux_Release(IBaseFilter *iface) } HeapFree(GetProcessHeap(), 0, This->idx1); + strmbase_filter_cleanup(&This->filter); HeapFree(GetProcessHeap(), 0, This); ObjectRefCount(FALSE); } @@ -2364,7 +2365,7 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) hr = BaseOutputPin_Construct(&AviMuxOut_PinVtbl, sizeof(AviMuxOut), &info, &AviMuxOut_BaseOutputFuncTable, &avimux->filter.csFilter, (IPin**)&avimux->out); if(FAILED(hr)) { - BaseFilterImpl_Release(&avimux->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&avimux->filter); HeapFree(GetProcessHeap(), 0, avimux); *phr = hr; return NULL; @@ -2377,7 +2378,7 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) hr = create_input_pin(avimux); if(FAILED(hr)) { BaseOutputPinImpl_Release(&avimux->out->pin.pin.IPin_iface); - BaseFilterImpl_Release(&avimux->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&avimux->filter); HeapFree(GetProcessHeap(), 0, avimux); *phr = hr; return NULL;

1 0

Nikolay Sivov : mferror: Add some more error messages.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: d8ef6db1c0e77cb2bbe7d61723702f6ec682be95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ef6db1c0e77cb2bbe7d617… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 21 15:02:13 2019 +0300 mferror: Add some more error messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mferror/mferror.mc | 91 ++++++++++++++++++++++++++++++++++++++++++++++ po/ar.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/ast.po | 88 ++++++++++++++++++++++++++++++++++++++------- po/bg.po | 84 ++++++++++++++++++++++++++++++++++++------- po/ca.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/cs.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/da.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/de.po | 96 ++++++++++++++++++++++++++++++++++++++++++------- po/el.po | 84 ++++++++++++++++++++++++++++++++++++------- po/en.po | 78 +++++++++++++++++++++++++++++++++------- po/en_US.po | 78 +++++++++++++++++++++++++++++++++------- po/eo.po | 90 +++++++++++++++++++++++++++++++++++++++------- po/es.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/fa.po | 80 ++++++++++++++++++++++++++++++++++------- po/fi.po | 96 ++++++++++++++++++++++++++++++++++++++++++------- po/fr.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/he.po | 85 ++++++++++++++++++++++++++++++++++++------- po/hi.po | 79 +++++++++++++++++++++++++++++++++------- po/hr.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/hu.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/it.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/ja.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/ko.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/lt.po | 96 ++++++++++++++++++++++++++++++++++++++++++------- po/ml.po | 79 +++++++++++++++++++++++++++++++++------- po/nb_NO.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/nl.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/or.po | 79 +++++++++++++++++++++++++++++++++------- po/pa.po | 79 +++++++++++++++++++++++++++++++++------- po/pl.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/pt_BR.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/pt_PT.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/rm.po | 79 +++++++++++++++++++++++++++++++++------- po/ro.po | 92 ++++++++++++++++++++++++++++++++++++++++------- po/ru.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/si.po | 92 ++++++++++++++++++++++++++++++++++++++++------- po/sk.po | 88 ++++++++++++++++++++++++++++++++++++++------- po/sl.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/sr_RS(a)cyrillic.po | 85 ++++++++++++++++++++++++++++++++++++------- po/sr_RS(a)latin.po | 85 ++++++++++++++++++++++++++++++++++++------- po/sv.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/ta.po | 78 +++++++++++++++++++++++++++++++++------- po/te.po | 79 +++++++++++++++++++++++++++++++++------- po/th.po | 84 ++++++++++++++++++++++++++++++++++++------- po/tr.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/uk.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/wa.po | 80 ++++++++++++++++++++++++++++++++++------- po/wine.pot | 78 +++++++++++++++++++++++++++++++++------- po/zh_CN.po | 94 +++++++++++++++++++++++++++++++++++++++++------- po/zh_TW.po | 94 +++++++++++++++++++++++++++++++++++++++++------- 50 files changed, 3807 insertions(+), 637 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d8ef6db1c0e77cb2bbe7…

1 0

Alistair Leslie-Hughes : dinput: Support DIDEVICEINSTANCE_DX3 for keyboard GetDeviceInfo.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: ab5d9e43cb27cc5dc8f9690591751becf06ead91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab5d9e43cb27cc5dc8f96905… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 21 04:25:22 2019 +0000 dinput: Support DIDEVICEINSTANCE_DX3 for keyboard GetDeviceInfo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/keyboard.c | 5 ----- dlls/dinput/tests/keyboard.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 8f1de68..b5e6659 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -526,11 +526,6 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceInfo( SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdidi); - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - fill_keyboard_dideviceinstanceA(pdidi, This->base.dinput->dwVersion, This->subtype); return DI_OK; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index e8dfb4f..9254123 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -453,6 +453,35 @@ fail: IUnknown_Release(device); } +static void test_GetDeviceInfo(IDirectInputA *pDI) +{ + HRESULT hr; + IDirectInputDeviceA *pKey = NULL; + DIDEVICEINSTANCEA instA; + DIDEVICEINSTANCE_DX3A inst3A; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKey, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + instA.dwSize = sizeof(instA); + hr = IDirectInputDevice_GetDeviceInfo(pKey, &instA); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + inst3A.dwSize = sizeof(inst3A); + hr = IDirectInputDevice_GetDeviceInfo(pKey, (DIDEVICEINSTANCEA *)&inst3A); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + ok(instA.dwSize != inst3A.dwSize, "got %d, %d \n", instA.dwSize, inst3A.dwSize); + ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); + ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) ); + ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType); + + if (pKey) IUnknown_Release(pKey); +} + static void keyboard_tests(DWORD version) { HRESULT hr; @@ -483,6 +512,7 @@ static void keyboard_tests(DWORD version) test_set_coop(pDI, hwnd); test_get_prop(pDI, hwnd); test_capabilities(pDI, hwnd); + test_GetDeviceInfo(pDI); test_dik_codes(pDI, hwnd, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT)); test_dik_codes(pDI, hwnd, MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH));

1 0

Jacek Caban : mshtml: Fix window size in IOleDocumentView:: SetRect implementation.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 82bf2556dc561749df83d81ae48047141bedffb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82bf2556dc561749df83d81a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 16:36:03 2019 +0200 mshtml: Fix window size in IOleDocumentView::SetRect implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index f37be03..3b28cfd 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -502,8 +502,8 @@ static HRESULT WINAPI OleDocumentView_SetRect(IOleDocumentView *iface, LPRECT pr GetClientRect(This->hwnd, &rect); if(!EqualRect(prcView, &rect)) { InvalidateRect(This->hwnd, NULL, TRUE); - SetWindowPos(This->hwnd, NULL, prcView->left, prcView->top, prcView->right, - prcView->bottom, SWP_NOZORDER | SWP_NOACTIVATE); + SetWindowPos(This->hwnd, NULL, prcView->left, prcView->top, prcView->right - prcView->left, + prcView->bottom - prcView->top, SWP_NOZORDER | SWP_NOACTIVATE); } }

1 0

Jacek Caban : mshtml: Return rect relative to parent window in IOleDocumentView::GetRect.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: d9693be2a5bc8314a0909725c7041ee2f535657c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9693be2a5bc8314a0909725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 16:36:10 2019 +0200 mshtml: Return rect relative to parent window in IOleDocumentView::GetRect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 3b28cfd..26274c7 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -520,6 +520,7 @@ static HRESULT WINAPI OleDocumentView_GetRect(IOleDocumentView *iface, LPRECT pr return E_INVALIDARG; GetClientRect(This->hwnd, prcView); + MapWindowPoints(This->hwnd, GetParent(This->hwnd), (POINT*)prcView, 2); return S_OK; }

1 0

Jacek Caban : mshtml: Implement IOleInPlaceObjectWindowless:: SetObjectRects.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 11616033845ef795449dbd45f9131a06ef423295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11616033845ef795449dbd45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 21 16:36:18 2019 +0200 mshtml: Implement IOleInPlaceObjectWindowless::SetObjectRects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/oleobj.c | 13 ++++++++--- dlls/mshtml/tests/htmldoc.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9397a60..87147df 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -1171,11 +1171,18 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_UIDeactivate(IOleInPlaceObjectW } static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjectWindowless *iface, - LPCRECT lprcPosRect, LPCRECT lprcClipRect) + const RECT *pos, const RECT *clip) { HTMLDocument *This = impl_from_IOleInPlaceObjectWindowless(iface); - FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); - return E_NOTIMPL; + RECT r; + + TRACE("(%p)->(%p %p)\n", This, wine_dbgstr_rect(pos), wine_dbgstr_rect(clip)); + + if(clip && !EqualRect(clip, pos)) + FIXME("Ignoring clip rect %s\n", wine_dbgstr_rect(clip)); + + r = *pos; + return IOleDocumentView_SetRect(&This->doc_obj->IOleDocumentView_iface, &r); } static HRESULT WINAPI OleInPlaceObjectWindowless_ReactivateAndUndo(IOleInPlaceObjectWindowless *iface) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 52e6fe7..f8ae785 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -7088,6 +7088,61 @@ static void test_OnFrameWindowActivate(IUnknown *unk) IOleInPlaceActiveObject_Release(inplaceact); } +static void test_object_rects(IHTMLDocument2 *doc) +{ + IOleInPlaceObjectWindowless *windowlessobj; + IOleDocumentView *view; + RECT r, doc_rect; + HRESULT hres; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleInPlaceObjectWindowless, + (void**)&windowlessobj); + ok(hres == S_OK, "QueryInterface(IID_IOleInPlaceObjectWindowless) failed: %08x\n", hres); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleDocumentView, + (void**)&view); + ok(hres == S_OK, "QueryInterface(IID_IOleDocumentView) failed: %08x\n", hres); + + r.top = 1; + r.left = 2; + r.bottom = 200; + r.right = 201; + hres = IOleInPlaceObjectWindowless_SetObjectRects(windowlessobj, &r, NULL); + ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); + + GetWindowRect(doc_hwnd, &doc_rect); + MapWindowPoints(HWND_DESKTOP, container_hwnd, (POINT*)&doc_rect, 2); + ok(EqualRect(&r, &doc_rect), "unexpected doc rect %s expected %s\n", + wine_dbgstr_rect(&doc_rect), wine_dbgstr_rect(&r)); + + memset(&doc_rect, 0xc0, sizeof(doc_rect)); + hres = IOleDocumentView_GetRect(view, &doc_rect); + ok(hres == S_OK, "GetRect failed: %08x\n", hres); + ok(EqualRect(&r, &doc_rect), "unexpected doc rect %s expected %s\n", + wine_dbgstr_rect(&doc_rect), wine_dbgstr_rect(&r)); + + r.top = 3; + r.left = 4; + r.bottom = 205; + r.right = 206; + hres = IOleDocumentView_SetRect(view, &r); + ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); + + GetWindowRect(doc_hwnd, &doc_rect); + MapWindowPoints(HWND_DESKTOP, container_hwnd, (POINT*)&doc_rect, 2); + ok(EqualRect(&r, &doc_rect), "unexpected doc rect %s expected %s\n", + wine_dbgstr_rect(&doc_rect), wine_dbgstr_rect(&r)); + + memset(&doc_rect, 0xc0, sizeof(doc_rect)); + hres = IOleDocumentView_GetRect(view, &doc_rect); + ok(hres == S_OK, "GetRect failed: %08x\n", hres); + ok(EqualRect(&r, &doc_rect), "unexpected doc rect %s expected %s\n", + wine_dbgstr_rect(&doc_rect), wine_dbgstr_rect(&r)); + + IOleInPlaceObjectWindowless_Release(windowlessobj); + IOleDocumentView_Release(view); +} + static void test_InPlaceDeactivate(IHTMLDocument2 *doc, BOOL expect_call) { IOleInPlaceObjectWindowless *windowlessobj = NULL; @@ -7609,6 +7664,7 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) test_Window(doc, TRUE); test_external(doc, TRUE); test_target_container(doc); + test_object_rects(doc); test_UIDeactivate(); test_OleCommandTarget(doc);

1 0

Andrew Eikum : hid: Fix usage value mask.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 6a610a325809d47f48bc72f3a757e1a62b193ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a610a325809d47f48bc72f3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 20 10:31:37 2019 -0500 hid: Fix usage value mask. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47223 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8c04670..c780dbe 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -64,7 +64,7 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN if (remaining_bits < copy_bits) copy_bits = remaining_bits; - data |= ((report[byte_index] >> bit_index) & ((2 << copy_bits) - 1)) << shift; + data |= ((report[byte_index] >> bit_index) & ((1 << copy_bits) - 1)) << shift; shift += copy_bits; bit_index = 0;

1 0