December 2019 - Wine-commits

Andrey Gusev : ieframe/tests: Fix a typo in ok() message.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 33396865177906a8d38f832392ffe76683773a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=33396865177906a8d38f8323… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:05:27 2019 +0200 ieframe/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index db47fdf616..a99c68ac5e 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -283,7 +283,7 @@ static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL ex hres = IWebBrowser2_get_Busy(wb, &busy); if(expect_busy != BUSY_FAIL) { ok_(__FILE__,line)(hres == S_OK, "get_ReadyState failed: %08x\n", hres); - ok_(__FILE__,line)(busy == expect_busy, "Busy = %x, exoected %x for ready state %d\n", + ok_(__FILE__,line)(busy == expect_busy, "Busy = %x, expected %x for ready state %d\n", busy, expect_busy, state); }else { todo_wine

1 0

Andrey Gusev : kernelbase/tests: Fix a typo in ok() message.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 2a64dd44bc87f8a1c9d93b633270623e290e3a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64dd44bc87f8a1c9d93b63… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:11:07 2019 +0200 kernelbase/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index abe586b0a2..93303bafc3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -797,7 +797,7 @@ static void test_PathCchAddBackslashEx(void) } else { - ok(ptrW == NULL, "%u: unexpecred end pointer.\n", i); + ok(ptrW == NULL, "%u: unexpected end pointer.\n", i); ok(remaining == 0, "%u: unexpected remaining buffer length.\n", i); } }

1 0

Akihiro Sagawa : d3d9/tests: Add out-of-bounds region tests.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 3329f50612848e611c4ecd8f524f42f7537ea22b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3329f50612848e611c4ecd8f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 2 17:57:33 2019 +0330 d3d9/tests: Add out-of-bounds region tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cbfb98bec6..f19bd11607 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19249,6 +19249,15 @@ static void add_dirty_rect_test(void) HWND window; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; + static const RECT oob_rect[] = + { + { 0, 0, 200, 300}, + { 0, 0, 300, 200}, + {100, 100, 10, 10}, + {200, 300, 10, 10}, + {300, 200, 310, 210}, + { 0, 0, 0, 0}, + }; DWORD color; window = create_window(); @@ -19595,6 +19604,17 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); + /* Test out-of-bounds regions. */ + for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) + { + hr = IDirect3DTexture9_AddDirtyRect(tex_src_red, &oob_rect[i]); + todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture9_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture9_UnlockRect(tex_src_red, 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + } + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTexture(device, 0, NULL);

1 0

Akihiro Sagawa : d3d8/tests: Add out-of-bounds region tests.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 3499694f1350a0f8058bf1928ace9c697d505b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3499694f1350a0f8058bf192… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 2 17:57:34 2019 +0330 d3d8/tests: Add out-of-bounds region tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 310ffc59e4..96ab4596a7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5441,6 +5441,15 @@ static void add_dirty_rect_test(void) HRESULT hr; static const RECT part_rect = {96, 96, 160, 160}; + static const RECT oob_rect[] = + { + { 0, 0, 200, 300}, + { 0, 0, 300, 200}, + {100, 100, 10, 10}, + {200, 300, 10, 10}, + {300, 200, 310, 210}, + { 0, 0, 0, 0}, + }; window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); @@ -5784,6 +5793,17 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); + /* Test out-of-bounds regions. */ + for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) + { + hr = IDirect3DTexture8_AddDirtyRect(tex_src_red, &oob_rect[i]); + todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture8_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture8_UnlockRect(tex_src_red, 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + } + IDirect3DSurface8_Release(surface_dst2); IDirect3DSurface8_Release(surface_managed1); IDirect3DSurface8_Release(surface_managed0);

1 0

Akihiro Sagawa : wined3d: Validate dirty regions in wined3d_texture_add_dirty_region().
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 0a61ddbdf1c63a6d3c0cdf8918416065c41f4d10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a61ddbdf1c63a6d3c0cdf89… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 2 17:57:35 2019 +0330 wined3d: Validate dirty regions in wined3d_texture_add_dirty_region(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 96ab4596a7..4477184b57 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5797,7 +5797,7 @@ static void add_dirty_rect_test(void) for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) { hr = IDirect3DTexture8_AddDirtyRect(tex_src_red, &oob_rect[i]); - todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); hr = IDirect3DTexture8_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); hr = IDirect3DTexture8_UnlockRect(tex_src_red, 0); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f19bd11607..0a9fb0acc2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19608,7 +19608,7 @@ static void add_dirty_rect_test(void) for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) { hr = IDirect3DTexture9_AddDirtyRect(tex_src_red, &oob_rect[i]); - todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); hr = IDirect3DTexture9_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); hr = IDirect3DTexture9_UnlockRect(tex_src_red, 0); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4d90c280a..976235bf60 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1838,7 +1838,14 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } if (dirty_region) + { + if (FAILED(wined3d_texture_check_box_dimensions(texture, 0, dirty_region))) + { + WARN("Invalid dirty_region %s specified.\n", debug_box(dirty_region)); + return WINED3DERR_INVALIDCALL; + } FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); + } wined3d_cs_emit_add_dirty_texture_region(texture->resource.device->cs, texture, layer);

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFace5.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 9808b91df759e325384b93ec7fefb84ca61230dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9808b91df759e325384b93ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 15:53:53 2019 +0300 dwrite: Update to IDWriteFontFace5. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 40 +-- dlls/dwrite/font.c | 732 ++++++++++++++++++++++++------------------- dlls/dwrite/freetype.c | 40 +-- dlls/dwrite/main.c | 15 +- dlls/dwrite/opentype.c | 24 +- 5 files changed, 470 insertions(+), 381 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9808b91df759e325384b…

1 0

Nikolay Sivov : dwrite/tests: Add some tests for IDWriteFontResource.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 85691e732aeb743a1bea280249c07d08db8744f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85691e732aeb743a1bea2802… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 15:53:54 2019 +0300 dwrite/tests: Add some tests for IDWriteFontResource. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3cd41efc91..d565eee331 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9234,6 +9234,81 @@ todo_wine ok(ref == 0, "factory not released, %u\n", ref); } +static void test_font_resource(void) +{ + IDWriteFontFaceReference1 *reference, *reference2; + IDWriteFontResource *resource, *resource2; + IDWriteFontFile *fontfile, *fontfile2; + IDWriteFontFace5 *fontface5; + IDWriteFontFace *fontface; + IDWriteFactory6 *factory; + UINT32 count, index; + HRESULT hr; + ULONG ref; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory6))) + { + skip("IDWriteFactory6 is not supported.\n"); + return; + } + + fontface = create_fontface((IDWriteFactory *)factory); + + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &fontfile); + ok(hr == S_OK, "Failed to get file object, hr %#x.\n", hr); + + hr = IDWriteFactory6_CreateFontResource(factory, fontfile, 0, &resource); + ok(hr == S_OK, "Failed to create font resource, hr %#x.\n", hr); + + hr = IDWriteFactory6_CreateFontResource(factory, fontfile, 0, &resource2); + ok(hr == S_OK, "Failed to create font resource, hr %#x.\n", hr); + ok(resource != resource2, "Unexpected instance.\n"); + IDWriteFontResource_Release(resource2); + + hr = IDWriteFontResource_GetFontFile(resource, &fontfile2); + ok(hr == S_OK, "Failed to get font file, hr %#x.\n", hr); + ok(fontfile2 == fontfile, "Unexpected file instance.\n"); + IDWriteFontFile_Release(fontfile2); + + index = IDWriteFontResource_GetFontFaceIndex(resource); + ok(!index, "Unexpected index %u.\n", index); + + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, &reference); + ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); + + hr = IDWriteFontResource_CreateFontFaceReference(resource, DWRITE_FONT_SIMULATIONS_NONE, NULL, 0, &reference2); + ok(hr == S_OK, "Failed to create reference object, hr %#x.\n", hr); + ok(reference != reference2, "Unexpected reference instance.\n"); + IDWriteFontFaceReference1_Release(reference2); + IDWriteFontFaceReference1_Release(reference); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace5, (void **)&fontface5); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + + hr = IDWriteFontFace5_GetFontResource(fontface5, &resource2); + ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + ok(resource != resource2, "Unexpected resource instance.\n"); + IDWriteFontResource_Release(resource); + + hr = IDWriteFontFace5_GetFontResource(fontface5, &resource); + ok(hr == S_OK, "Failed to get font resource, hr %#x.\n", hr); + ok(resource != resource2, "Unexpected resource instance.\n"); + EXPECT_REF(resource, 1); + + IDWriteFontResource_Release(resource); + IDWriteFontResource_Release(resource2); + + IDWriteFontFace5_Release(fontface5); + + IDWriteFontResource_Release(resource); + IDWriteFontFile_Release(fontfile); + + IDWriteFontFace_Release(fontface); + ref = IDWriteFactory6_Release(factory); + ok(ref == 0, "Factory wasn't released, %u.\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -9301,6 +9376,7 @@ START_TEST(font) test_localfontfileloader(); test_AnalyzeContainerType(); test_fontsetbuilder(); + test_font_resource(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Update to IDWriteFactory7 stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 5536df1ee1042c6cf20a7d96c43520003a547092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5536df1ee1042c6cf20a7d96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 15:53:55 2019 +0300 dwrite: Update to IDWriteFactory7 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 528 ++++++++++++++++++++++++++--------------------- dlls/dwrite/tests/font.c | 11 +- 2 files changed, 301 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5536df1ee1042c6cf20a…

1 0

Jactry Zeng : sapi: Add IConnectionPointContainer stub for ISpVoice.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: e31b56b578abbc0657a80731d03aedd7b4fa65b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e31b56b578abbc0657a80731… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:18:21 2019 +0800 sapi: Add IConnectionPointContainer stub for ISpVoice. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/tts.c | 8 +++++++ dlls/sapi/tts.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index e4b4e79943..26d13ec96a 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -37,6 +37,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static void test_interfaces(void) { ISpeechVoice *speech_voice, *speech_voice2; + IConnectionPointContainer *container; ISpVoice *spvoice, *spvoice2; IDispatch *dispatch; IUnknown *unk; @@ -82,6 +83,13 @@ static void test_interfaces(void) ISpVoice_Release(spvoice2); ISpVoice_Release(spvoice); + hr = ISpeechVoice_QueryInterface(speech_voice, &IID_IConnectionPointContainer, + (void **)&container); + ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice, 2); + EXPECT_REF(container, 2); + IConnectionPointContainer_Release(container); + ISpeechVoice_Release(speech_voice); } diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 8f1ecd1894..584c3d56b7 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -38,6 +38,7 @@ struct speech_voice { ISpeechVoice ISpeechVoice_iface; ISpVoice ISpVoice_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; }; @@ -51,6 +52,11 @@ static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface) return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface); } +static inline struct speech_voice *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, struct speech_voice, IConnectionPointContainer_iface); +} + /* ISpeechVoice interface */ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj) { @@ -64,6 +70,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii *obj = &This->ISpeechVoice_iface; else if (IsEqualIID(iid, &IID_ISpVoice)) *obj = &This->ISpVoice_iface; + else if (IsEqualIID(iid, &IID_IConnectionPointContainer)) + *obj = &This->IConnectionPointContainer_iface; else { *obj = NULL; @@ -726,6 +734,59 @@ static const ISpVoiceVtbl spvoice_vtbl = spvoice_DisplayUI }; +/* IConnectionPointContainer interface */ +static HRESULT WINAPI container_QueryInterface(IConnectionPointContainer *iface, REFIID iid, void **obj) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); +} + +static ULONG WINAPI container_AddRef(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_AddRef(&This->ISpeechVoice_iface); +} + +static ULONG WINAPI container_Release(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_Release(&This->ISpeechVoice_iface); +} + +static HRESULT WINAPI container_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **enum_cp) +{ + FIXME("(%p, %p): stub.\n", iface, enum_cp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI container_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, + IConnectionPoint **cp) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_guid(riid), cp); + + return E_NOTIMPL; +} + +const static IConnectionPointContainerVtbl container_vtbl = +{ + container_QueryInterface, + container_AddRef, + container_Release, + container_EnumConnectionPoints, + container_FindConnectionPoint +}; + HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) { struct speech_voice *This = heap_alloc(sizeof(*This)); @@ -734,6 +795,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl; This->ISpVoice_iface.lpVtbl = &spvoice_vtbl; + This->IConnectionPointContainer_iface.lpVtbl = &container_vtbl; This->ref = 1; hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);

1 0

Jactry Zeng : sapi: Implement ISpeechFileStream stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 28121b494b633c36105da2b75350c40de6b197c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28121b494b633c36105da2b7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:18:40 2019 +0800 sapi: Implement ISpeechFileStream stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/Makefile.in | 1 + dlls/sapi/automation.c | 210 +++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/main.c | 3 + dlls/sapi/sapi_classes.idl | 13 +++ dlls/sapi/sapi_private.h | 1 + dlls/sapi/tests/Makefile.in | 1 + dlls/sapi/tests/automation.c | 63 +++++++++++++ include/sapi.idl | 34 +++++++ include/sapiaut.idl | 29 ++++++ 9 files changed, 355 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=28121b494b633c36105d…

1 0