wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin::GetAllocator.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 151a3eec9ac95fd84599aa2a4e8bddb5788010f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151a3eec9ac95fd84599aa2a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:10:27 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::GetAllocator. --- dlls/qcap/avimux.c | 18 ++++++++++++++++-- dlls/qcap/tests/qcap.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index fdc0e8e..555cc44 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1346,8 +1346,15 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_GetAllocator( { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), ppAllocator); - return E_NOTIMPL; + + TRACE("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), ppAllocator); + + if(!ppAllocator) + return E_POINTER; + + IMemAllocator_AddRef(avimuxin->pin.pAllocator); + *ppAllocator = avimuxin->pin.pAllocator; + return S_OK; } static HRESULT WINAPI AviMuxIn_MemInputPin_NotifyAllocator( @@ -1545,6 +1552,13 @@ static HRESULT create_input_pin(AviMux *avimux) avimux->in[avimux->input_pin_no]->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; avimux->in[avimux->input_pin_no]->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->pin.pAllocator); + if(FAILED(hr)) { + BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + return hr; + } + avimux->input_pin_no++; return S_OK; } diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 162b17e..dff5bb8 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1234,6 +1234,7 @@ static void test_AviMux(void) IEnumMediaTypes *emt; IMemInputPin *memin; ALLOCATOR_PROPERTIES props; + IMemAllocator *memalloc; HRESULT hr; init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); @@ -1351,6 +1352,21 @@ static void test_AviMux(void) ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer); ok(props.cbAlign == 1, "cbAlign = %d\n", props.cbAlign); ok(props.cbPrefix == 8, "cbPrefix = %d\n", props.cbPrefix); + + hr = IMemInputPin_GetAllocator(memin, &memalloc); + ok(hr == S_OK, "GetAllocator returned %x\n", hr); + + props.cBuffers = 0xdeadbee1; + props.cbBuffer = 0xdeadbee2; + props.cbAlign = 0xdeadbee3; + props.cbPrefix = 0xdeadbee4; + hr = IMemAllocator_GetProperties(memalloc, &props); + ok(hr == S_OK, "GetProperties returned %x\n", hr); + ok(props.cBuffers == 0, "cBuffers = %d\n", props.cBuffers); + ok(props.cbBuffer == 0, "cbBuffer = %d\n", props.cbBuffer); + ok(props.cbAlign == 0, "cbAlign = %d\n", props.cbAlign); + ok(props.cbPrefix == 0, "cbPrefix = %d\n", props.cbPrefix); + IMemAllocator_Release(memalloc); IMemInputPin_Release(memin); hr = IPin_Disconnect(avimux_out);

1 0

Piotr Caban : qcap: Don't define IMemInputPin_iface in AviMuxIn structure.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 0ea378e101a8b89b31149d96fd9fc9ff6648b97c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ea378e101a8b89b31149d96f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:09:10 2014 +0100 qcap: Don't define IMemInputPin_iface in AviMuxIn structure. --- dlls/qcap/avimux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index f39e003..fdc0e8e 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -42,7 +42,6 @@ typedef struct { typedef struct { BaseInputPin pin; IAMStreamControl IAMStreamControl_iface; - IMemInputPin IMemInputPin_iface; IPropertyBag IPropertyBag_iface; IQualityControl IQualityControl_iface; } AviMuxIn; @@ -1062,7 +1061,7 @@ static HRESULT WINAPI AviMuxIn_QueryInterface(IPin *iface, REFIID riid, void **p else if(IsEqualIID(riid, &IID_IAMStreamControl)) *ppv = &avimuxin->IAMStreamControl_iface; else if(IsEqualIID(riid, &IID_IMemInputPin)) - *ppv = &avimuxin->IMemInputPin_iface; + *ppv = &avimuxin->pin.IMemInputPin_iface; else if(IsEqualIID(riid, &IID_IPropertyBag)) *ppv = &avimuxin->IPropertyBag_iface; else if(IsEqualIID(riid, &IID_IQualityControl)) @@ -1317,7 +1316,8 @@ static const IAMStreamControlVtbl AviMuxIn_AMStreamControlVtbl = { static inline AviMuxIn* AviMuxIn_from_IMemInputPin(IMemInputPin *iface) { - return CONTAINING_RECORD(iface, AviMuxIn, IMemInputPin_iface); + BaseInputPin *bip = CONTAINING_RECORD(iface, BaseInputPin, IMemInputPin_iface); + return CONTAINING_RECORD(bip, AviMuxIn, pin); } static HRESULT WINAPI AviMuxIn_MemInputPin_QueryInterface( @@ -1540,8 +1540,8 @@ static HRESULT create_input_pin(AviMux *avimux) &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL, (IPin**)&avimux->in[avimux->input_pin_no]); if(FAILED(hr)) return hr; + avimux->in[avimux->input_pin_no]->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; avimux->in[avimux->input_pin_no]->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; - avimux->in[avimux->input_pin_no]->IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; avimux->in[avimux->input_pin_no]->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; avimux->in[avimux->input_pin_no]->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl;

1 0

Piotr Caban : qcap: Add Avi Mux input pin IMemInputPin:: GetAllocatorRequirements implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: d9f6a377be134a553d29132d7db4daa6c917f778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f6a377be134a553d29132d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 24 12:06:34 2014 +0100 qcap: Add Avi Mux input pin IMemInputPin::GetAllocatorRequirements implementation. --- dlls/qcap/avimux.c | 11 +++++++++-- dlls/qcap/tests/qcap.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index c5a16f8..f39e003 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1365,8 +1365,15 @@ static HRESULT WINAPI AviMuxIn_MemInputPin_GetAllocatorRequirements( { AviMuxIn *avimuxin = AviMuxIn_from_IMemInputPin(iface); AviMux *This = impl_from_in_IPin(&avimuxin->pin.pin.IPin_iface); - FIXME("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pProps); - return E_NOTIMPL; + + TRACE("(%p:%s)->(%p)\n", This, debugstr_w(avimuxin->pin.pin.pinInfo.achName), pProps); + + if(!pProps) + return E_POINTER; + + pProps->cbAlign = 1; + pProps->cbPrefix = 8; + return S_OK; } static HRESULT WINAPI AviMuxIn_MemInputPin_Receive( diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 83d38c8..162b17e 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1232,6 +1232,8 @@ static void test_AviMux(void) IBaseFilter *avimux; IEnumPins *ep; IEnumMediaTypes *emt; + IMemInputPin *memin; + ALLOCATOR_PROPERTIES props; HRESULT hr; init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); @@ -1336,6 +1338,21 @@ static void test_AviMux(void) CHECK_CALLED(NotifyAllocator); CHECK_CALLED(Reconnect); + hr = IPin_QueryInterface(avimux_in, &IID_IMemInputPin, (void**)&memin); + ok(hr == S_OK, "QueryInterface returned %x\n", hr); + + props.cBuffers = 0xdeadbee1; + props.cbBuffer = 0xdeadbee2; + props.cbAlign = 0xdeadbee3; + props.cbPrefix = 0xdeadbee4; + hr = IMemInputPin_GetAllocatorRequirements(memin, &props); + ok(hr == S_OK, "GetAllocatorRequirments returned %x\n", hr); + ok(props.cBuffers == 0xdeadbee1, "cBuffers = %d\n", props.cBuffers); + ok(props.cbBuffer == 0xdeadbee2, "cbBuffer = %d\n", props.cbBuffer); + ok(props.cbAlign == 1, "cbAlign = %d\n", props.cbAlign); + ok(props.cbPrefix == 8, "cbPrefix = %d\n", props.cbPrefix); + IMemInputPin_Release(memin); + hr = IPin_Disconnect(avimux_out); ok(hr == S_OK, "Disconnect returned %x\n", hr);

1 0

Jacek Caban : wmp: Added IOleControl stub implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 6cbf44b5e67874618e260dd995e9c43e254921ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbf44b5e67874618e260dd99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:49 2014 +0100 wmp: Added IOleControl stub implementation. --- dlls/wmp/oleobj.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 1 + 2 files changed, 66 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index c081bf8..6f11d95 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -261,6 +261,9 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v }else if(IsEqualGUID(riid, &IID_IWMPPlayer4)) { TRACE("(%p)->(IID_IWMPPlayer4 %p)\n", This, ppv); *ppv = &This->IWMPPlayer4_iface; + }else if(IsEqualGUID(riid, &IID_IOleControl)) { + TRACE("(%p)->(IID_IOleControl %p)\n", This, ppv); + *ppv = &This->IOleControl_iface; }else { FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -645,6 +648,67 @@ static const IOleInPlaceObjectWindowlessVtbl OleInPlaceObjectWindowlessVtbl = { OleInPlaceObjectWindowless_GetDropTarget }; +static inline WindowsMediaPlayer *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, WindowsMediaPlayer, IOleControl_iface); +} + +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID riid, void **ppv) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + return IOleObject_QueryInterface(&This->IOleObject_iface, riid, ppv); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + return IOleObject_AddRef(&This->IOleObject_iface); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, pCI); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + WindowsMediaPlayer *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%x)\n", This, freeze); + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + static inline WindowsMediaPlayer *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) { return CONTAINING_RECORD(iface, WindowsMediaPlayer, IProvideClassInfo2_iface); @@ -851,6 +915,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, wmp->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; wmp->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; wmp->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; + wmp->IOleControl_iface.lpVtbl = &OleControlVtbl; wmp->ref = 1; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 11d4c22..0969dca 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -28,6 +28,7 @@ struct WindowsMediaPlayer { IPersistStreamInit IPersistStreamInit_iface; IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; IConnectionPointContainer IConnectionPointContainer_iface; + IOleControl IOleControl_iface; IWMPPlayer4 IWMPPlayer4_iface; LONG ref;

1 0

Jacek Caban : wmp: Added SetObjectRects implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: ca589fc1e5b97214a98c190c161f6fd051f386ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca589fc1e5b97214a98c190c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:37 2014 +0100 wmp: Added SetObjectRects implementation. --- dlls/wmp/oleobj.c | 12 ++++++++++-- dlls/wmp/tests/oleobj.c | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 3dd2378..c081bf8 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -596,8 +596,16 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_SetObjectRects(IOleInPlaceObjec LPCRECT lprcPosRect, LPCRECT lprcClipRect) { WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); - FIXME("(%p)->(%p %p)\n", This, lprcPosRect, lprcClipRect); - return E_NOTIMPL; + + TRACE("(%p)->(%s %s)\n", This, wine_dbgstr_rect(lprcPosRect), wine_dbgstr_rect(lprcClipRect)); + + if(This->hwnd) { + SetWindowPos(This->hwnd, NULL, lprcPosRect->left, lprcPosRect->top, + lprcPosRect->right-lprcPosRect->left, lprcPosRect->bottom-lprcPosRect->top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + + return S_OK; } static HRESULT WINAPI OleInPlaceObjectWindowless_ReactivateAndUndo(IOleInPlaceObjectWindowless *iface) diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 9e27d3b..e57913d 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -926,6 +926,15 @@ static void test_wmp(void) test_window(hwnd); + pos.left = 1; + pos.top = 2; + pos.right = 301; + pos.bottom = 312; + hres = IOleInPlaceObject_SetObjectRects(ipobj, &pos, &pos); + ok(hres == S_OK, "SetObjectRects failed: %08x\n", hres); + GetClientRect(hwnd, &pos); + test_rect_size(&pos, 300, 310); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, 0, container_hwnd, &pos); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); ok(!IsWindowVisible(hwnd), "Window is visible\n");

1 0

Jacek Caban : wmp: Added DoVerb(OLEIVERB_HIDE) implementation.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: bd95cb54041e9dace1d0fe4b01e56d69ed7f9391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd95cb54041e9dace1d0fe4b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:24 2014 +0100 wmp: Added DoVerb(OLEIVERB_HIDE) implementation. --- dlls/wmp/oleobj.c | 10 ++++++++++ dlls/wmp/tests/oleobj.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 29f39d7..3dd2378 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -396,6 +396,16 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms case OLEIVERB_INPLACEACTIVATE: TRACE("(%p)->(OLEIVERB_INPLACEACTIVATE)\n", This); return activate_inplace(This); + + case OLEIVERB_HIDE: + if(!This->hwnd) { + FIXME("No window to hide\n"); + return E_UNEXPECTED; + } + + ShowWindow(This->hwnd, SW_HIDE); + return S_OK; + default: FIXME("Unsupported iVerb %d\n", iVerb); } diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index 52110c1..9e27d3b 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -926,6 +926,10 @@ static void test_wmp(void) test_window(hwnd); + hres = IOleObject_DoVerb(oleobj, OLEIVERB_HIDE, NULL, &ClientSite, 0, container_hwnd, &pos); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + ok(!IsWindowVisible(hwnd), "Window is visible\n"); + SET_EXPECT(OnShowWindow_FALSE); SET_EXPECT(OnInPlaceDeactivate); hres = IOleObject_Close(oleobj, 0);

1 0

Jacek Caban : wmp: Return success in IPersistStreamInit::InitNew.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: b0f4ed187b6e741d5762cd46f858c647d5f286d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f4ed187b6e741d5762cd46f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 13:03:12 2014 +0100 wmp: Return success in IPersistStreamInit::InitNew. --- dlls/wmp/oleobj.c | 11 +++++++++-- dlls/wmp/tests/oleobj.c | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 1e50a45..29f39d7 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -744,8 +744,15 @@ static HRESULT WINAPI PersistStreamInit_GetSizeMax(IPersistStreamInit *iface, static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) { WindowsMediaPlayer *This = impl_from_IPersistStreamInit(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(!This->client_site) + return E_FAIL; + + /* Nothing to do, yet. */ + get_container_hwnd(This); + return S_OK; } static const IPersistStreamInitVtbl PersistStreamInitVtbl = { diff --git a/dlls/wmp/tests/oleobj.c b/dlls/wmp/tests/oleobj.c index eababdb..52110c1 100644 --- a/dlls/wmp/tests/oleobj.c +++ b/dlls/wmp/tests/oleobj.c @@ -877,6 +877,9 @@ static void test_wmp(void) hres = IOleObject_QueryInterface(oleobj, &IID_IOleInPlaceObject, (void**)&ipobj); ok(hres == S_OK, "Could not get IOleInPlaceObject iface: %08x\n", hres); + hres = IPersistStreamInit_InitNew(psi); + ok(hres == E_FAIL || broken(hres == S_OK /* Old WMP */), "InitNew failed: %08x\n", hres); + SET_EXPECT(GetContainer); SET_EXPECT(GetExtendedControl); SET_EXPECT(GetWindow); @@ -893,6 +896,11 @@ static void test_wmp(void) ok(hres == S_OK, "GetClientSite failed: %08x\n", hres); ok(client_site == &ClientSite, "client_site != ClientSite\n"); + SET_EXPECT(GetWindow); + hres = IPersistStreamInit_InitNew(psi); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + CHECK_CALLED(GetWindow); + hwnd = (HWND)0xdeadbeef; hres = IOleInPlaceObject_GetWindow(ipobj, &hwnd); ok(hres == E_UNEXPECTED, "GetWindow failed: %08x\n", hres);

1 0

Jacek Caban : urlmon: Fixed some tests on IE11.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 2b04a5e3ff5d05032140ae69302ac8551efb70be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b04a5e3ff5d05032140ae693… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 11:09:54 2014 +0100 urlmon: Fixed some tests on IE11. --- dlls/urlmon/tests/protocol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index a8f8d7a..8a19329 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1385,7 +1385,7 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS return S_OK; } default: - ok(0, "unexpected call\n"); + ok(0, "unexpected ulStringType %d\n", ulStringType); } return E_NOTIMPL; @@ -3638,7 +3638,7 @@ static void test_binding(int prot, DWORD grf_pi, DWORD test_flags) CHECK_CALLED(QueryService_InternetProtocol); CHECK_CALLED(CreateInstance); CHECK_CALLED(ReportProgress_PROTOCOLCLASSID); - CHECK_CALLED(SetPriority); + CLEAR_CALLED(SetPriority); /* IE11 does not call it. */ if(impl_protex) CHECK_CALLED(StartEx); else

1 0

Marcus Meissner : include: Added missing FindExInfoBasic enum.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 563486b55559b9fc54339481f0e32df726420f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563486b55559b9fc54339481f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 24 08:26:54 2014 +0100 include: Added missing FindExInfoBasic enum. --- include/winbase.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winbase.h b/include/winbase.h index 889f018..6cc0a24 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -285,6 +285,7 @@ DECL_WINELIB_TYPE_AW(LPWIN32_FIND_DATA) typedef enum _FINDEX_INFO_LEVELS { FindExInfoStandard, + FindExInfoBasic, FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS;

1 0

Nikolay Sivov : shell32/tests: Fix some test failures on Win8.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: d867a49a3dffacc3833c81ce692cab4ba7c82d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d867a49a3dffacc3833c81ce6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 09:59:17 2014 +0400 shell32/tests: Fix some test failures on Win8. --- dlls/shell32/tests/ebrowser.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index fe05e5f..1936cf9 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -67,8 +67,10 @@ DEFINE_GUID(IID_UnknownInterface13, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x5 DEFINE_GUID(IID_UnknownInterface14, 0x16770868, 0x239c, 0x445b, 0xa0,0x1d, 0xf2,0x6c,0x7f,0xbb,0xf2,0x6c); DEFINE_GUID(IID_UnknownInterface15, 0x05a89298, 0x6246, 0x4c63, 0xbb,0x0d, 0x9b,0xda,0xf1,0x40,0xbf,0x3b); DEFINE_GUID(IID_UnknownInterface16, 0x35094a87, 0x8bb1, 0x4237, 0x96,0xc6, 0xc4,0x17,0xee,0xbd,0xb0,0x78); -DEFINE_GUID(IID_UnknownInterface17, 0xa36a3ace, 0x8332, 0x45ce, 0xaa,0x29, 0x50,0x3c,0xb7,0x6b,0x25,0x87); -DEFINE_GUID(IID_UnknownInterface18, 0x3d5d8c60, 0x21e4, 0x4b03, 0x83,0xb8, 0xc7,0x3f,0x8c,0x94,0x00,0x78); +DEFINE_GUID(IID_UnknownInterface17, 0x3d5d8c60, 0x21e4, 0x4b03, 0x83,0xb8, 0xc7,0x3f,0x8c,0x94,0x00,0x78); +DEFINE_GUID(IID_UnknownInterface18, 0x1fc45c07, 0x9e35, 0x4276, 0xad,0x7f, 0x08,0x60,0x3a,0xa0,0xf6,0x0f); +DEFINE_GUID(IID_UnknownInterface19, 0xacd9b67a, 0xceab, 0x4c6c, 0x90,0xa1, 0xe8,0x57,0xc6,0x59,0xe3,0x9d); +DEFINE_GUID(IID_UnknownInterface20, 0xd0fe6f62, 0xdea4, 0x46c9, 0x9d,0xae, 0x36,0xcb,0x13,0x99,0x78,0xfa); static HWND hwnd; @@ -926,12 +928,15 @@ static void test_SetSite(void) /* Win 8 */ { &IID_ICommDlgBrowser, &IID_UnknownInterface11, 0, NULL }, { &IID_ICommDlgBrowser, &IID_UnknownInterface12, 0, NULL }, + { &IID_ICommDlgBrowser, &IID_UnknownInterface20, 0, NULL }, { &IID_UnknownInterface13, &IID_IUnknown, 0, NULL }, + { &IID_UnknownInterface13, &IID_UnknownInterface13, 0, NULL }, + { &IID_UnknownInterface13, &IID_UnknownInterface18, 0, NULL }, { &IID_UnknownInterface14, &IID_UnknownInterface14, 0, NULL }, { &IID_UnknownInterface15, &IID_UnknownInterface15, 0, NULL }, { &IID_UnknownInterface16, &IID_UnknownInterface16, 0, NULL }, { &IID_UnknownInterface17, &IID_UnknownInterface17, 0, NULL }, - { &IID_UnknownInterface18, &IID_UnknownInterface18, 0, NULL }, + { &IID_UnknownInterface17, &IID_UnknownInterface19, 0, NULL }, /* Other services requested in Vista, Windows 2008 but not in Windows 7 */ { &IID_IBrowserSettings_Vista, &IID_IBrowserSettings_Vista, 0, NULL },

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2014