April 2021 - Wine-Commits - list.winehq.org

Akihiro Sagawa : gdi32: Get rid of redundant ntmCellHeight member.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 629ba19200ef6ef53d2ddb2503d198299f1f0921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=629ba19200ef6ef53d2ddb25… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 6 21:34:22 2021 +0900 gdi32: Get rid of redundant ntmCellHeight member. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 1 - dlls/gdi32/gdi_private.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fd03580a754..067d76ba9fd 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2714,10 +2714,12 @@ static BOOL get_face_enum_data( struct gdi_font_face *face, ENUMLOGFONTEXW *elf, if (font_funcs->set_outline_text_metrics( font )) { static const DWORD ntm_ppem = 32; + UINT cell_height; #define TM font->otm.otmTextMetrics #define SCALE_NTM(value) (MulDiv( ntm->ntmTm.tmHeight, (value), TM.tmHeight )) - ntm->ntmTm.tmHeight = MulDiv( ntm_ppem, font->ntmCellHeight, font->otm.otmEMSquare ); + cell_height = TM.tmHeight / ( -lf.lfHeight / font->otm.otmEMSquare ); + ntm->ntmTm.tmHeight = MulDiv( ntm_ppem, cell_height, font->otm.otmEMSquare ); ntm->ntmTm.tmAscent = SCALE_NTM( TM.tmAscent ); ntm->ntmTm.tmDescent = ntm->ntmTm.tmHeight - ntm->ntmTm.tmAscent; ntm->ntmTm.tmInternalLeading = SCALE_NTM( TM.tmInternalLeading ); @@ -2729,7 +2731,7 @@ static BOOL get_face_enum_data( struct gdi_font_face *face, ENUMLOGFONTEXW *elf, (const char *)&TM + offsetof( TEXTMETRICW, tmWeight ), sizeof(TEXTMETRICW) - offsetof( TEXTMETRICW, tmWeight )); ntm->ntmTm.ntmSizeEM = font->otm.otmEMSquare; - ntm->ntmTm.ntmCellHeight = font->ntmCellHeight; + ntm->ntmTm.ntmCellHeight = cell_height; ntm->ntmTm.ntmAvgWidth = font->ntmAvgWidth; #undef SCALE_NTM #undef TM diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c66db289ab1..b29d9fcc88e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3775,7 +3775,6 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font ) descent = windescent; } - font->ntmCellHeight = ascent + descent; font->ntmAvgWidth = pOS2->xAvgCharWidth; #define SCALE_X(x) (pFT_MulFix(x, em_scale)) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bf16e8eaf8..71493c185b6 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -344,7 +344,6 @@ struct gdi_font SHORT yMax; SHORT yMin; UINT ntmFlags; - UINT ntmCellHeight; UINT ntmAvgWidth; UINT aa_flags; ULONG ttc_item_offset; /* 0 if font is not a part of TrueType collection */

1 0

Anton Baskanov : amstream/tests: Refactor test graph to support multiple interfaces.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: ad61b392834d4eba44a7e340b61d54a4d7076e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad61b392834d4eba44a7e340… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 7 01:04:32 2021 +0700 amstream/tests: Refactor test graph to support multiple interfaces. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 96 ++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2c5252d8eed..93600f5941d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2031,15 +2031,25 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static IUnknown *graph_inner_unk; -static IFilterGraph2 *graph_inner; -static LONG graph_refcount = 1; -static unsigned int got_add_filter; -static IBaseFilter *graph_filter; -static WCHAR graph_filter_name[128]; +struct graph +{ + IFilterGraph2 IFilterGraph2_iface; + IUnknown *inner_unk; + IFilterGraph2 *inner; + LONG refcount; + unsigned int got_add_filter; + IBaseFilter *filter; + WCHAR filter_name[128]; +}; + +static struct graph *impl_from_IFilterGraph2(IFilterGraph2 *iface) +{ + return CONTAINING_RECORD(iface, struct graph, IFilterGraph2_iface); +} static HRESULT WINAPI graph_QueryInterface(IFilterGraph2 *iface, REFIID iid, void **out) { + struct graph *graph = impl_from_IFilterGraph2(iface); if (winetest_debug > 1) trace("QueryInterface(%s)\n", wine_dbgstr_guid(iid)); if (IsEqualGUID(iid, &IID_IFilterGraph2) || IsEqualGUID(iid, &IID_IGraphBuilder) @@ -2054,31 +2064,34 @@ static HRESULT WINAPI graph_QueryInterface(IFilterGraph2 *iface, REFIID iid, voi || IsEqualGUID(iid, &IID_IMediaControl) || IsEqualGUID(iid, &IID_IMediaEventEx)) { - return IUnknown_QueryInterface(graph_inner_unk, iid, out); + return IUnknown_QueryInterface(graph->inner_unk, iid, out); } return E_NOINTERFACE; } static ULONG WINAPI graph_AddRef(IFilterGraph2 *iface) { - return InterlockedIncrement(&graph_refcount); + struct graph *graph = impl_from_IFilterGraph2(iface); + return InterlockedIncrement(&graph->refcount); } static ULONG WINAPI graph_Release(IFilterGraph2 *iface) { - return InterlockedDecrement(&graph_refcount); + struct graph *graph = impl_from_IFilterGraph2(iface); + return InterlockedDecrement(&graph->refcount); } static HRESULT WINAPI graph_AddFilter(IFilterGraph2 *iface, IBaseFilter *filter, const WCHAR *name) { + struct graph *graph = impl_from_IFilterGraph2(iface); if (winetest_debug > 1) trace("AddFilter(%p, %s)\n", filter, wine_dbgstr_w(name)); - ++got_add_filter; - graph_filter = filter; + ++graph->got_add_filter; + graph->filter = filter; if (name) - wcscpy(graph_filter_name, name); + wcscpy(graph->filter_name, name); else - graph_filter_name[0] = 0; - return IFilterGraph2_AddFilter(graph_inner, filter, name); + graph->filter_name[0] = 0; + return IFilterGraph2_AddFilter(graph->inner, filter, name); } static HRESULT WINAPI graph_RemoveFilter(IFilterGraph2 *iface, IBaseFilter *filter) @@ -2089,8 +2102,9 @@ static HRESULT WINAPI graph_RemoveFilter(IFilterGraph2 *iface, IBaseFilter *filt static HRESULT WINAPI graph_EnumFilters(IFilterGraph2 *iface, IEnumFilters **enumfilters) { + struct graph *graph = impl_from_IFilterGraph2(iface); if (winetest_debug > 1) trace("EnumFilters()\n"); - return IFilterGraph2_EnumFilters(graph_inner, enumfilters); + return IFilterGraph2_EnumFilters(graph->inner, enumfilters); } static HRESULT WINAPI graph_FindFilterByName(IFilterGraph2 *iface, const WCHAR *name, IBaseFilter **filter) @@ -2210,13 +2224,36 @@ static const IFilterGraph2Vtbl graph_vtbl = graph_RenderEx, }; +static void graph_init(struct graph *graph) +{ + HRESULT hr; + + memset(graph, 0, sizeof(*graph)); + graph->IFilterGraph2_iface.lpVtbl = &graph_vtbl; + graph->refcount = 1; + hr = CoCreateInstance(&CLSID_FilterGraph, (IUnknown *)&graph->IFilterGraph2_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&graph->inner_unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IUnknown_QueryInterface(graph->inner_unk, &IID_IFilterGraph2, (void **)&graph->inner); + ok(hr == S_OK, "Got hr %#x.\n", hr); +} + +static void graph_destroy(struct graph *graph) +{ + ULONG ref; + + IFilterGraph2_Release(graph->inner); + ref = IUnknown_Release(graph->inner_unk); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_initialize(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); - IFilterGraph2 graph = {&graph_vtbl}; IMediaStreamFilter *filter; IGraphBuilder *ret_graph; IMediaStream *stream; + struct graph graph; STREAM_TYPE type; HRESULT hr; ULONG ref; @@ -2351,9 +2388,7 @@ static void test_initialize(void) mmstream = create_ammultimediastream(); - CoCreateInstance(&CLSID_FilterGraph, (IUnknown *)&graph, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void **)&graph_inner_unk); - IUnknown_QueryInterface(graph_inner_unk, &IID_IFilterGraph2, (void **)&graph_inner); + graph_init(&graph); ret_graph = (IGraphBuilder *)0xdeadbeef; hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); @@ -2364,27 +2399,27 @@ static void test_initialize(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!!filter, "Expected a non-NULL filter."); - got_add_filter = 0; - hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph); + graph.got_add_filter = 0; + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph.IFilterGraph2_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(got_add_filter == 1, "Got %d calls to IGraphBuilder::AddFilter().\n", got_add_filter); - ok(graph_filter == (IBaseFilter *)filter, "Got filter %p.\n", filter); - ok(!wcscmp(graph_filter_name, L"MediaStreamFilter"), "Got unexpected name %s.\n", wine_dbgstr_w(graph_filter_name)); + ok(graph.got_add_filter == 1, "Got %d calls to IGraphBuilder::AddFilter().\n", graph.got_add_filter); + ok(graph.filter == (IBaseFilter *)filter, "Got filter %p.\n", filter); + ok(!wcscmp(graph.filter_name, L"MediaStreamFilter"), "Got unexpected name %s.\n", wine_dbgstr_w(graph.filter_name)); hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &ret_graph); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ret_graph == (IGraphBuilder *)&graph, "Got unexpected graph %p.\n", ret_graph); IGraphBuilder_Release(ret_graph); - got_add_filter = 0; + graph.got_add_filter = 0; hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", got_add_filter); + ok(!graph.got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", graph.got_add_filter); - got_add_filter = 0; + graph.got_add_filter = 0; hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", got_add_filter); + ok(!graph.got_add_filter, "Got %d calls to IGraphBuilder::AddFilter().\n", graph.got_add_filter); hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, (IGraphBuilder *)&graph); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); @@ -2398,9 +2433,8 @@ static void test_initialize(void) IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); - IFilterGraph2_Release(graph_inner); - ok(graph_refcount == 1, "Got outstanding refcount %d.\n", graph_refcount); - IUnknown_Release(graph_inner_unk); + + graph_destroy(&graph); } static IAMMultiMediaStream *mmstream_mmstream;

1 0

Anton Baskanov : amstream/tests: Add tests for MediaStreamFilter::EndOfStream.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: ac65e1540960e64ce29e40ec19e4eade8369d520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac65e1540960e64ce29e40ec… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Apr 7 01:04:33 2021 +0700 amstream/tests: Add tests for MediaStreamFilter::EndOfStream. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 285 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 280 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac65e1540960e64ce29e…

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add IPersistStorage stub interface.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 166697189d2e1ec620aa7e8c084f62bf5b53b94f URL: https://source.winehq.org/git/wine.git/?a=commit;h=166697189d2e1ec620aa7e8c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 7 12:11:19 2021 +0200 dhtmled.ocx: Add IPersistStorage stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index e92e96f4050..b96630c73e5 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -30,6 +30,7 @@ typedef struct IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; IProvideClassInfo2 IProvideClassInfo2_iface; + IPersistStorage IPersistStorage_iface; IPersistStreamInit IPersistStreamInit_iface; IOleControl IOleControl_iface; IViewObjectEx IViewObjectEx_iface; @@ -59,6 +60,11 @@ static inline DHTMLEditImpl *impl_from_IProvideClassInfo2(IProvideClassInfo2 *if return CONTAINING_RECORD(iface, DHTMLEditImpl, IProvideClassInfo2_iface); } +static inline DHTMLEditImpl *impl_from_IPersistStorage(IPersistStorage *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStorage_iface); +} + static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *iface) { return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); @@ -133,6 +139,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IProvideClassInfo2_iface; return S_OK; } + else if (IsEqualGUID(iid, &IID_IPersistStorage)) + { + dhtml_edit_addref(This); + *out = &This->IPersistStorage_iface; + return S_OK; + } else if (IsEqualGUID(iid, &IID_IPersistStreamInit)) { dhtml_edit_addref(This); @@ -928,6 +940,76 @@ static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { ProvideClassInfo2_GetGUID }; +static HRESULT WINAPI PersistStorage_QueryInterface(IPersistStorage *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IPersistStorage(iface), iid, out); +} + +static ULONG WINAPI PersistStorage_AddRef(IPersistStorage *iface) +{ + return dhtml_edit_addref(impl_from_IPersistStorage(iface)); +} + +static ULONG WINAPI PersistStorage_Release(IPersistStorage *iface) +{ + return dhtml_edit_release(impl_from_IPersistStorage(iface)); +} + +static HRESULT WINAPI PersistStorage_GetClassID(IPersistStorage *iface, CLSID *clsid) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p) stub\n", This, clsid); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_IsDirty(IPersistStorage *iface) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p) stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_InitNew(IPersistStorage *iface, LPSTORAGE storage) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p) stub\n", This, storage); + return S_OK; +} + +static HRESULT WINAPI PersistStorage_Load(IPersistStorage *iface, LPSTORAGE storage) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p) stub\n", This, storage); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_Save(IPersistStorage *iface, LPSTORAGE storage, BOOL sameasld) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p, %u) stub\n", This, storage, sameasld); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStorage_SaveCompleted(IPersistStorage *iface, LPSTORAGE storage) +{ + DHTMLEditImpl *This = impl_from_IPersistStorage(iface); + FIXME("(%p)->(%p)\n", This, storage); + return E_NOTIMPL; +} + +static const IPersistStorageVtbl PersistStorageVtbl = +{ + PersistStorage_QueryInterface, + PersistStorage_AddRef, + PersistStorage_Release, + PersistStorage_GetClassID, + PersistStorage_IsDirty, + PersistStorage_InitNew, + PersistStorage_Load, + PersistStorage_Save, + PersistStorage_SaveCompleted +}; + static HRESULT WINAPI PersistStreamInit_QueryInterface(IPersistStreamInit *iface, REFIID iid, void **out) { return dhtml_edit_qi(impl_from_IPersistStreamInit(iface), iid, out); @@ -1563,6 +1645,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; + This->IPersistStorage_iface.lpVtbl = &PersistStorageVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->IViewObjectEx_iface.lpVtbl = &ViewObjectExVtbl;

1 0

Akihiro Sagawa : gdi32/tests: Remove unreliable height tests.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 67093e3b4a25a96a600e785b559ec8a24a9ddcd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67093e3b4a25a96a600e785b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 6 21:34:17 2021 +0900 gdi32/tests: Remove unreliable height tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 461eecf8038..d5ae526d536 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2874,7 +2874,6 @@ static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, D const NEWTEXTMETRICA *ntm = (const NEWTEXTMETRICA *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); - ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; @@ -2897,7 +2896,6 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, const NEWTEXTMETRICW *ntm = (const NEWTEXTMETRICW *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); - ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1;

1 0

Jan Sikorski : d3d10core/tests: Don't use all samples for blending in multisample resolve test.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 8118af8f65de4ac658ade9a02342bf7de1544bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8118af8f65de4ac658ade9a0… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 6 17:43:42 2021 +0200 d3d10core/tests: Don't use all samples for blending in multisample resolve test. Shows whether the resolve happens in the right color space. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 48 ++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 2d836d4e7ac..e0cb40de89b 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18044,105 +18044,105 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff0dec4}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffe2cdc0, TRUE}, }; if (!init_test_context(&test_context)) @@ -18158,6 +18158,8 @@ static void test_multisample_resolve(void) return; } + ID3D10Device_OMSetBlendState(device, NULL, NULL, 3); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); @@ -18180,8 +18182,10 @@ static void test_multisample_resolve(void) draw_color_quad(&test_context, tests[i].color); ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)texture, 0, (ID3D10Resource *)ms_texture, 0, tests[i].format); - todo_wine_if(tests[i].todo) - check_texture_color(texture, tests[i].expected_color, 2); + + /* Found broken on AMD Radeon HD 6310 */ + if (!broken(is_amd_device(device) && tests[i].format == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB)) + todo_wine_if(tests[i].todo) check_texture_color(texture, tests[i].expected_color, 2); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(ms_texture);

1 0

Jan Sikorski : d3d11/tests: Don't use all samples for blending in multisample resolve test.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: e9a197450d964b0928895b7274c48a4c3125c3e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a197450d964b0928895b72… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 6 17:43:41 2021 +0200 d3d11/tests: Don't use all samples for blending in multisample resolve test. Shows whether the resolve happens in the right color space. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f6ba0b16748..c499aa5f75b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30309,105 +30309,105 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89, TRUE}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffdfc0a0}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff1e1cf, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &green, 0xff00ff00}, + &green, 0xff80ff80}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, - &color, 0xffe1bc89}, + &color, 0xfff0dec4}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &green, 0xff00ff00}, + &green, 0xffbcffbc, TRUE}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UNORM, - &color, 0xffbf7f40}, + &color, 0xffe2cdc0, TRUE}, }; if (!init_test_context(&test_context, NULL)) @@ -30424,6 +30424,8 @@ static void test_multisample_resolve(void) return; } + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, 3); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); @@ -30446,8 +30448,10 @@ static void test_multisample_resolve(void) draw_color_quad(&test_context, tests[i].color); ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)texture, 0, (ID3D11Resource *)ms_texture, 0, tests[i].format); - todo_wine_if(tests[i].todo) - check_texture_color(texture, tests[i].expected_color, 2); + + /* Found broken on AMD Radeon HD 6310 */ + if (!broken(is_amd_device(device) && tests[i].format == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB)) + todo_wine_if(tests[i].todo) check_texture_color(texture, tests[i].expected_color, 2); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(ms_texture);

1 0

Giovanni Mascellani : advapi32/tests: Use wide character string literals in registry.c.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 9bf5cb3fa52ed87170faca1b69ea45c2c310a68f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf5cb3fa52ed87170faca1b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 7 16:18:24 2021 +0200 advapi32/tests: Use wide character string literals in registry.c. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 120 ++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9bf5cb3fa52ed87170fa…

1 0

Vijay Kiran Kamuju : dhtmled.ocx: Add IDataObject stub interface.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: bdfb7d2bccd40f0df2928f2bbb558ae7bd3fe02b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdfb7d2bccd40f0df2928f2b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Apr 7 12:11:17 2021 +0200 dhtmled.ocx: Add IDataObject stub interface. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhtmled.ocx/edit.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 7a06588d46a..036b21e791e 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -36,6 +36,8 @@ typedef struct IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless_iface; IOleInPlaceActiveObject IOleInPlaceActiveObject_iface; IConnectionPointContainer IConnectionPointContainer_iface; + IDataObject IDataObject_iface; + IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -86,6 +88,11 @@ static inline DHTMLEditImpl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, DHTMLEditImpl, IConnectionPointContainer_iface); } +static inline DHTMLEditImpl *impl_from_IDataObject(IDataObject *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IDataObject_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -160,6 +167,13 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IConnectionPointContainer_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IDataObject)) + { + dhtml_edit_addref(This); + *out = &This->IDataObject_iface; + return S_OK; + } + *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -1390,6 +1404,105 @@ static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = ConnectionPointContainer_FindConnectionPoint }; +static HRESULT WINAPI DataObject_QueryInterface(IDataObject *iface, REFIID iid, LPVOID *out) +{ + return dhtml_edit_qi(impl_from_IDataObject(iface), iid, out); +} + +static ULONG WINAPI DataObject_AddRef(IDataObject *iface) +{ + return dhtml_edit_addref(impl_from_IDataObject(iface)); +} + +static ULONG WINAPI DataObject_Release(IDataObject *iface) +{ + return dhtml_edit_release(impl_from_IDataObject(iface)); +} + +static HRESULT WINAPI DataObject_GetData(IDataObject *iface, LPFORMATETC pformatetcIn, + STGMEDIUM *pmedium) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetDataHere(IDataObject *iface, LPFORMATETC pformatetc, + STGMEDIUM *pmedium) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_QueryGetData(IDataObject *iface, LPFORMATETC pformatetc) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetCanonicalFormatEtc(IDataObject *iface, + LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_SetData(IDataObject *iface, LPFORMATETC pformatetc, + STGMEDIUM *pmedium, BOOL fRelease) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumFormatEtc(IDataObject *iface, DWORD dwDirection, + IEnumFORMATETC **ppenumFormatEtc) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DAdvise(IDataObject *iface, FORMATETC *pformatetc, + DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DUnadvise(IDataObject *iface, DWORD dwConnection) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumDAdvise(IDataObject *iface, IEnumSTATDATA **ppenumAdvise) +{ + DHTMLEditImpl *This = impl_from_IDataObject(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static const IDataObjectVtbl DataObjectVtbl = { + DataObject_QueryInterface, + DataObject_AddRef, + DataObject_Release, + DataObject_GetData, + DataObject_GetDataHere, + DataObject_QueryGetData, + DataObject_GetCanonicalFormatEtc, + DataObject_SetData, + DataObject_EnumFormatEtc, + DataObject_DAdvise, + DataObject_DUnadvise, + DataObject_EnumDAdvise +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -1412,6 +1525,8 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IOleInPlaceObjectWindowless_iface.lpVtbl = &OleInPlaceObjectWindowlessVtbl; This->IOleInPlaceActiveObject_iface.lpVtbl = &OleInPlaceActiveObjectVtbl; This->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; + This->IDataObject_iface.lpVtbl = &DataObjectVtbl; + This->client_site = NULL; This->ref = 1;

1 0

Piotr Caban : msvcrt: Add helpers for creating base class RTTI.
by Alexandre Julliard April 7, 2021

April 7, 2021

Module: wine Branch: master Commit: 16f6a567f4c259bc9b856558f4deebd2f4aeb88c URL: https://source.winehq.org/git/wine.git/?a=commit;h=16f6a567f4c259bc9b856558… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 7 12:08:12 2021 +0200 msvcrt: Add helpers for creating base class RTTI. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index f8fe239b8aa..77778730e25 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -46,7 +46,7 @@ #ifndef __x86_64__ -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &type_info_vtable, \ NULL, \ @@ -58,7 +58,10 @@ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static const rtti_base_array name ## _rtti_base_array = { \ { \ @@ -92,7 +95,7 @@ const rtti_object_locator name ## _rtti = { \ #else -#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ +#define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ &type_info_vtable, \ NULL, \ @@ -104,7 +107,18 @@ static rtti_base_descriptor name ## _rtti_base_descriptor = { \ base_classes_no, \ { 0, -1, 0}, \ 64 \ -}; \ +}; + +#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ + \ + static void init_ ## name ## _rtti(char *base) \ + { \ + name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \ + } + +#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \ + __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ \ static rtti_base_array name ## _rtti_base_array = { \ { \

1 0