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

Alexandre Julliard : mshtml: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 5182813ae00b69d4870e9a85f6bf39285afccdc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5182813ae00b69d4870e9a85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:34:29 2019 +0200 mshtml: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 ++ dlls/mshtml/dispex.c | 16 ++++----- dlls/mshtml/editor.c | 36 +++++++++---------- dlls/mshtml/htmlanchor.c | 6 ++-- dlls/mshtml/htmlbody.c | 22 ++++++------ dlls/mshtml/htmldoc.c | 14 ++++---- dlls/mshtml/htmlelem.c | 18 +++++----- dlls/mshtml/htmlelemcol.c | 8 ++--- dlls/mshtml/htmlevent.c | 10 +++--- dlls/mshtml/htmlform.c | 8 ++--- dlls/mshtml/htmlframe.c | 10 +++--- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 4 +-- dlls/mshtml/htmllocation.c | 4 +-- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlobject.c | 4 +-- dlls/mshtml/htmlselect.c | 2 +- dlls/mshtml/htmlstyle.c | 82 ++++++++++++++++++++++---------------------- dlls/mshtml/htmltable.c | 6 ++-- dlls/mshtml/htmlwindow.c | 6 ++-- dlls/mshtml/ifacewrap.c | 2 -- dlls/mshtml/loadopts.c | 2 -- dlls/mshtml/main.c | 6 ++-- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/mutation.c | 30 ++++++++-------- dlls/mshtml/navigate.c | 34 +++++++++--------- dlls/mshtml/npplugin.c | 2 -- dlls/mshtml/nsembed.c | 28 +++++++-------- dlls/mshtml/nsevents.c | 2 -- dlls/mshtml/nsio.c | 24 ++++++------- dlls/mshtml/nsservice.c | 4 +-- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/oleobj.c | 2 -- dlls/mshtml/persist.c | 2 -- dlls/mshtml/pluginhost.c | 8 ++--- dlls/mshtml/protocol.c | 36 +++++++++---------- dlls/mshtml/script.c | 20 +++++------ dlls/mshtml/secmgr.c | 2 -- dlls/mshtml/service.c | 2 -- dlls/mshtml/svg.c | 6 ++-- dlls/mshtml/task.c | 2 -- dlls/mshtml/txtrange.c | 52 ++++++++++++++-------------- dlls/mshtml/view.c | 2 -- dlls/mshtml/xmlhttprequest.c | 2 +- 44 files changed, 250 insertions(+), 287 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5182813ae00b69d4870e…

1 0

Alexandre Julliard : msi: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 7cd3c9f0734d217e1d08319e72a9df91fe2ef882 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cd3c9f0734d217e1d08319e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:42:35 2019 +0200 msi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/Makefile.in | 2 + dlls/msi/action.c | 306 +++++++++++++++++++++++++------------------------- dlls/msi/appsearch.c | 67 ++++++----- dlls/msi/assembly.c | 19 ++-- dlls/msi/automation.c | 3 +- dlls/msi/classes.c | 92 +++++++-------- dlls/msi/cond.y | 81 +++++++------ dlls/msi/create.c | 3 +- dlls/msi/custom.c | 47 ++++---- dlls/msi/database.c | 51 +++++---- dlls/msi/dialog.c | 151 +++++++++++++------------ dlls/msi/files.c | 45 ++++---- dlls/msi/font.c | 27 +++-- dlls/msi/format.c | 13 +-- dlls/msi/insert.c | 5 +- dlls/msi/install.c | 29 +++-- dlls/msi/media.c | 47 ++++---- dlls/msi/msi.c | 183 +++++++++++++++--------------- dlls/msi/msipriv.h | 4 +- dlls/msi/msiquery.c | 27 +++-- dlls/msi/package.c | 168 ++++++++++++++------------- dlls/msi/patch.c | 33 +++--- dlls/msi/record.c | 3 +- dlls/msi/registry.c | 145 ++++++++++++------------ dlls/msi/script.c | 3 +- dlls/msi/source.c | 57 +++++----- dlls/msi/sql.y | 14 +-- dlls/msi/streams.c | 3 +- dlls/msi/string.c | 5 +- dlls/msi/suminfo.c | 21 ++-- dlls/msi/table.c | 43 ++++--- dlls/msi/tokenize.c | 5 +- dlls/msi/upgrade.c | 17 ++- dlls/msi/where.c | 11 +- 34 files changed, 846 insertions(+), 884 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7cd3c9f0734d217e1d08…

1 0

Józef Kucia : vkd3d: Avoid busy-waiting in fence worker thread.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: vkd3d Branch: master Commit: 206fd23afea6793cce0aba05a680607fc6f2d628 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=206fd23afea6793cce0aba0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:35 2019 +0200 vkd3d: Avoid busy-waiting in fence worker thread. This might delay updating a d3d12_fence when a fence enqueued later than other fences is signaled before them. On the other hand, it significantly reduces CPU usage. I haven't found a program negatively impacted by this change so far. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7634e71..75556f5 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -362,7 +362,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) return; vr = VK_CALL(vkWaitForFences(device->vk_device, - worker->fence_count, worker->vk_fences, VK_FALSE, 0)); + worker->fence_count, worker->vk_fences, VK_FALSE, ~(uint64_t)0)); if (vr == VK_TIMEOUT) return; if (vr != VK_SUCCESS)

1 0

Józef Kucia : vkd3d: Use FIXME_ONCE() for AntialiasedLineEnable.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: vkd3d Branch: master Commit: a8c0fbaa6d4620c21829698d2e2d398806b0cdde URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a8c0fbaa6d4620c21829698… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:36 2019 +0200 vkd3d: Use FIXME_ONCE() for AntialiasedLineEnable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 64be72d..7946680 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1722,7 +1722,7 @@ static void rs_desc_from_d3d12(VkPipelineRasterizationStateCreateInfo *vk_desc, if (d3d12_desc->MultisampleEnable) FIXME_ONCE("Ignoring MultisampleEnable %#x.\n", d3d12_desc->MultisampleEnable); if (d3d12_desc->AntialiasedLineEnable) - FIXME("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); + FIXME_ONCE("Ignoring AntialiasedLineEnable %#x.\n", d3d12_desc->AntialiasedLineEnable); if (d3d12_desc->ForcedSampleCount) FIXME("Ignoring ForcedSampleCount %#x.\n", d3d12_desc->ForcedSampleCount); if (d3d12_desc->ConservativeRaster)

1 0

Józef Kucia : vkd3d: Avoid holding mutex while waiting for fences.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: vkd3d Branch: master Commit: 0baf0302d1b342e73a61f6ec051a6fd700bbc09d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0baf0302d1b342e73a61f6e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:34 2019 +0200 vkd3d: Avoid holding mutex while waiting for fences. We maintain separate arrays for enqueued fences and fences owned by the fence worker thread. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 10 ++- libs/vkd3d/command.c | 164 ++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 15 ++++ 3 files changed, 137 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0baf0302d1b342e73a6…

1 0

Józef Kucia : tests: Add bug_if() for Nvidia tessellation shader bugs.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: vkd3d Branch: master Commit: 18442763f1683ac7c47f17588b0632c3b34ac1f2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=18442763f1683ac7c47f175… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 13 13:47:33 2019 +0200 tests: Add bug_if() for Nvidia tessellation shader bugs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a57a045..81fb26a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27042,6 +27042,7 @@ static void test_line_tessellation(void) data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 1]; + bug_if(is_nvidia_device(context.device)) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i);

1 0

Zebediah Figura : strmbase: Add default implementations of IUnknown methods for IBasicVideo.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 96b6f0e1d685c0c7e38c3e102a3406589d73013f URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b6f0e1d685c0c7e38c3e10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:35 2019 -0500 strmbase: Add default implementations of IUnknown methods for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 18 ++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 21 insertions(+) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 440adc4..8e26aaf 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -70,6 +70,24 @@ static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT return S_OK; } +HRESULT WINAPI BaseControlVideoImpl_QueryInterface(IBasicVideo *iface, REFIID iid, void **out) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_QueryInterface(video->pFilter->outer_unk, iid, out); +} + +ULONG WINAPI BaseControlVideoImpl_AddRef(IBasicVideo *iface) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_AddRef(video->pFilter->outer_unk); +} + +ULONG WINAPI BaseControlVideoImpl_Release(IBasicVideo *iface) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_Release(video->pFilter->outer_unk); +} + HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *count) { TRACE("iface %p, count %p.\n", iface, count); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9f686dc..0b582b9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -517,6 +517,9 @@ typedef struct BaseControlVideoFuncTable { HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBasicVideoVtbl *lpVtbl, BaseFilter *owner, CRITICAL_SECTION *lock, BasePin* pPin, const BaseControlVideoFuncTable* pFuncsTable); HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); +HRESULT WINAPI BaseControlVideoImpl_QueryInterface(IBasicVideo *iface, REFIID iid, void **out); +ULONG WINAPI BaseControlVideoImpl_AddRef(IBasicVideo *iface); +ULONG WINAPI BaseControlVideoImpl_Release(IBasicVideo *iface); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT*pctinfo); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo); HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId);

1 0

Zebediah Figura : quartz: Use strmbase IUnknown methods for IBasicVideo.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: cb0b2d81d2d88b8390a31d5122ca1b67d1d6dbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb0b2d81d2d88b8390a31d51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:36 2019 -0500 quartz: Use strmbase IUnknown methods for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 39 +++------------------------------------ dlls/quartz/vmr9.c | 39 +++------------------------------------ 2 files changed, 6 insertions(+), 72 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 4f279b0..f4d6e54 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -86,11 +86,6 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); } -static inline VideoRendererImpl *impl_from_IBasicVideo(IBasicVideo *iface) -{ - return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo.IBasicVideo_iface); -} - static DWORD WINAPI MessageLoop(LPVOID lpParameter) { VideoRendererImpl* This = lpParameter; @@ -713,39 +708,11 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo }; -/*** IUnknown methods ***/ -static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); -} - -static ULONG WINAPI BasicVideo_AddRef(IBasicVideo *iface) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI BasicVideo_Release(IBasicVideo *iface) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static const IBasicVideoVtbl IBasicVideo_VTable = { - BasicVideo_QueryInterface, - BasicVideo_AddRef, - BasicVideo_Release, + BaseControlVideoImpl_QueryInterface, + BaseControlVideoImpl_AddRef, + BaseControlVideoImpl_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 751eeeb..8f4aa8e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -105,11 +105,6 @@ static inline struct quartz_vmr *impl_from_BaseControlVideo(BaseControlVideo *cv return CONTAINING_RECORD(cvid, struct quartz_vmr, baseControlVideo); } -static inline struct quartz_vmr *impl_from_IBasicVideo(IBasicVideo *iface) -{ - return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlVideo.IBasicVideo_iface); -} - static inline struct quartz_vmr *impl_from_IAMCertifiedOutputProtection(IAMCertifiedOutputProtection *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IAMCertifiedOutputProtection_iface); @@ -892,39 +887,11 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_IsCursorHidden }; -/*** IUnknown methods ***/ -static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID * ppvObj) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); -} - -static ULONG WINAPI Basicvideo_AddRef(IBasicVideo *iface) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI Basicvideo_Release(IBasicVideo *iface) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static const IBasicVideoVtbl IBasicVideo_VTable = { - Basicvideo_QueryInterface, - Basicvideo_AddRef, - Basicvideo_Release, + BaseControlVideoImpl_QueryInterface, + BaseControlVideoImpl_AddRef, + BaseControlVideoImpl_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames,

1 0

Zebediah Figura : strmbase: Get rid of the "lpVtbl" parameter to BaseControlVideo_Init().
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: fbd9133ee5f30ade0696abd3ad35f18a9dec34ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbd9133ee5f30ade0696abd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:37 2019 -0500 strmbase: Get rid of the "lpVtbl" parameter to BaseControlVideo_Init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 46 +------------- dlls/quartz/vmr9.c | 49 +-------------- dlls/strmbase/video.c | 146 ++++++++++++++++++++++++++++---------------- include/wine/strmbase.h | 43 +------------ 4 files changed, 101 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbd9133ee5f30ade0696…

1 0

Zebediah Figura : strmbase: Add default implementations of IUnknown methods for IVideoWindow.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 89cf4cba6e678474e91a3e531b29117d8cef9319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89cf4cba6e678474e91a3e53… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:38 2019 -0500 strmbase: Add default implementations of IUnknown methods for IVideoWindow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 18 ++++++++++++++++++ include/wine/strmbase.h | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index eea45aa..1ca06f7 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -217,6 +217,24 @@ HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow) return S_OK; } +HRESULT WINAPI BaseControlWindowImpl_QueryInterface(IVideoWindow *iface, REFIID iid, void **out) +{ + BaseControlWindow *window = impl_from_IVideoWindow(iface); + return IUnknown_QueryInterface(window->pFilter->outer_unk, iid, out); +} + +ULONG WINAPI BaseControlWindowImpl_AddRef(IVideoWindow *iface) +{ + BaseControlWindow *window = impl_from_IVideoWindow(iface); + return IUnknown_AddRef(window->pFilter->outer_unk); +} + +ULONG WINAPI BaseControlWindowImpl_Release(IVideoWindow *iface) +{ + BaseControlWindow *window = impl_from_IVideoWindow(iface); + return IUnknown_Release(window->pFilter->outer_unk); +} + HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT *count) { TRACE("iface %p, count %p.\n", iface, count); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a7dda2e..2833f5e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -430,6 +430,10 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow); BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam); + +HRESULT WINAPI BaseControlWindowImpl_QueryInterface(IVideoWindow *iface, REFIID iid, void **out); +ULONG WINAPI BaseControlWindowImpl_AddRef(IVideoWindow *iface); +ULONG WINAPI BaseControlWindowImpl_Release(IVideoWindow *iface); HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT*pctinfo); HRESULT WINAPI BaseControlWindowImpl_GetTypeInfo(IVideoWindow *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo); HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId);

1 0