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

Hans Leidekker : winhttp: Keep the session open in the request object.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: b22ace7f7bceed769a7206755882cd3620f14200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ace7f7bceed769a7206755… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 15 17:33:41 2015 +0200 winhttp: Keep the session open in the request object. Cookies have session scope in winhttp and they are not saved, so we need to keep the session open to ensure that cookies are passed along with subsequent requests. --- dlls/winhttp/request.c | 194 ++++++++++++++++++++++++++++--------------------- 1 file changed, 110 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b22ace7f7bceed769a720…

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddLine().
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 95a12f246a6567a82852ff7f383266badfba7426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a12f246a6567a82852ff7f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:06 2015 +0200 d2d1: Implement d2d_geometry_sink_AddLine(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 818a5d0..4ba851d 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -108,7 +108,9 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface, D2D1_POINT_2F point) { - FIXME("iface %p, point {%.8e, %.8e} stub!\n", iface, point.x, point.y); + TRACE("iface %p, point {%.8e, %.8e}.\n", iface, point.x, point.y); + + d2d_geometry_sink_AddLines(iface, &point, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *bezier)

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddQuadraticBezier().
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 5d5fdbc63ba5d7fb913fe0d91b984f160824624d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5fdbc63ba5d7fb913fe0d91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:07 2015 +0200 d2d1: Implement d2d_geometry_sink_AddQuadraticBezier(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4ba851d..0054a47 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -121,7 +121,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *ifa static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1GeometrySink *iface, const D2D1_QUADRATIC_BEZIER_SEGMENT *bezier) { - FIXME("iface %p, bezier %p stub!\n", iface, bezier); + TRACE("iface %p, bezier %p.\n", iface, bezier); + + ID2D1GeometrySink_AddQuadraticBeziers(iface, bezier, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1GeometrySink *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddBezier().
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 8b170f0f59aab3dd0e775217a95227b1bfc4cf2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b170f0f59aab3dd0e775217a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:08 2015 +0200 d2d1: Implement d2d_geometry_sink_AddBezier(). --- dlls/d2d1/geometry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 0054a47..2f3a6cc 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -115,7 +115,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddLine(ID2D1GeometrySink *iface static void STDMETHODCALLTYPE d2d_geometry_sink_AddBezier(ID2D1GeometrySink *iface, const D2D1_BEZIER_SEGMENT *bezier) { - FIXME("iface %p, bezier %p stub!\n", iface, bezier); + TRACE("iface %p, bezier %p.\n", iface, bezier); + + d2d_geometry_sink_AddBeziers(iface, bezier, 1); } static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBezier(ID2D1GeometrySink *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_text_renderer_DrawGlyphRun().
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 1fd0cf680f701b53873048a8ed7da5a6df2e1f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd0cf680f701b53873048a8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:09 2015 +0200 d2d1: Implement d2d_text_renderer_DrawGlyphRun(). --- dlls/d2d1/render_target.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3870295..9e99156 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1293,12 +1293,27 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) { - FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " - "measuring_mode %#x, glyph_run %p, desc %p, effect %p stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + D2D1_POINT_2F baseline_origin = {baseline_origin_x, baseline_origin_y}; + struct d2d_draw_text_layout_ctx *context = ctx; + + TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " + "measuring_mode %#x, glyph_run %p, desc %p, effect %p.\n", iface, ctx, baseline_origin_x, baseline_origin_y, measuring_mode, glyph_run, desc, effect); - return E_NOTIMPL; + if (desc) + FIXME("Ignoring glyph run description %p.\n", desc); + if (effect) + FIXME("Ignoring effect %p.\n", effect); + if (context->options) + FIXME("Ignoring options %#x.\n", context->options); + + TRACE("%s\n", debugstr_wn(desc->string, desc->stringLength)); + ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + baseline_origin, glyph_run, context->brush, measuring_mode); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx,

1 0

Henri Verbeet : d3d10core: Translate d3d10 usage to wined3d usage for buffers.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 8dd93c7e333d6734ef436372feeab4742afd4591 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd93c7e333d6734ef436372f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 22:30:10 2015 +0200 d3d10core: Translate d3d10 usage to wined3d usage for buffers. --- dlls/d3d10core/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d10core/buffer.c b/dlls/d3d10core/buffer.c index dcf323c..84882a7 100644 --- a/dlls/d3d10core/buffer.c +++ b/dlls/d3d10core/buffer.c @@ -233,10 +233,8 @@ HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *devi buffer->refcount = 1; wined3d_private_store_init(&buffer->private_store); - FIXME("Implement DXGI<->wined3d usage conversion\n"); - wined3d_desc.byte_width = desc->ByteWidth; - wined3d_desc.usage = desc->Usage; + wined3d_desc.usage = wined3d_usage_from_d3d10core(0, desc->Usage); wined3d_desc.bind_flags = desc->BindFlags; wined3d_desc.cpu_access_flags = desc->CPUAccessFlags; wined3d_desc.misc_flags = desc->MiscFlags;

1 0

Nikolay Sivov : dwrite: Validate format property values.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 0ec13316a77a3de780b07097a0ffb0a7473d05f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec13316a77a3de780b07097a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 15 16:30:23 2015 +0300 dwrite: Validate format property values. --- dlls/dwrite/layout.c | 20 ++++++++++++++++++++ dlls/dwrite/tests/layout.c | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4b91f6e..72f0885 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3615,7 +3615,12 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat1 *iface) static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat1 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, alignment); + + if ((UINT32)alignment > DWRITE_TEXT_ALIGNMENT_JUSTIFIED) + return E_INVALIDARG; + This->format.textalignment = alignment; return S_OK; } @@ -3623,7 +3628,12 @@ static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat1 *ifac static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, alignment); + + if ((UINT32)alignment > DWRITE_PARAGRAPH_ALIGNMENT_CENTER) + return E_INVALIDARG; + This->format.paralign = alignment; return S_OK; } @@ -3631,7 +3641,12 @@ static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 static HRESULT WINAPI dwritetextformat_SetWordWrapping(IDWriteTextFormat1 *iface, DWRITE_WORD_WRAPPING wrapping) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d)\n", This, wrapping); + + if ((UINT32)wrapping > DWRITE_WORD_WRAPPING_CHARACTER) + return E_INVALIDARG; + This->format.wrapping = wrapping; return S_OK; } @@ -3688,7 +3703,12 @@ static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat1 *iface, FLOAT spacing, FLOAT baseline) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); + TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline); + + if (spacing < 0.0 || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM) + return E_INVALIDARG; + This->format.spacingmethod = method; This->format.spacing = spacing; This->format.baseline = baseline; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 86f4f63..ee7cfcb 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -849,12 +849,21 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_LEADING); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetTextAlignment(format, DWRITE_TEXT_ALIGNMENT_JUSTIFIED+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetParagraphAlignment(format, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetParagraphAlignment(format, DWRITE_PARAGRAPH_ALIGNMENT_CENTER+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_WRAP); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetWordWrapping(format, DWRITE_WORD_WRAPPING_CHARACTER+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetReadingDirection(format, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -864,6 +873,15 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, 0.0, -10.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, -10.0, 0.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_UNIFORM+1, 0.0, 0.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : ole32: Marshal HBRUSH as remotable handle.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 61368e76e4b7a31940310a87b47816acb1eea48f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61368e76e4b7a31940310a87b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 08:57:30 2015 +0300 ole32: Marshal HBRUSH as remotable handle. --- dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/tests/usrmarshal.c | 45 +++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/usrmarshal.c | 1 + 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7019450..b36e683 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -124,10 +124,10 @@ @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) @ stdcall HBITMAP_UserSize(ptr long ptr) @ stdcall HBITMAP_UserUnmarshal(ptr ptr ptr) -@ stub HBRUSH_UserFree -@ stub HBRUSH_UserMarshal -@ stub HBRUSH_UserSize -@ stub HBRUSH_UserUnmarshal +@ stdcall HBRUSH_UserFree(ptr ptr) +@ stdcall HBRUSH_UserMarshal(ptr ptr ptr) +@ stdcall HBRUSH_UserSize(ptr long ptr) +@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) @ stdcall HDC_UserFree(ptr ptr) @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 6f90c53..b1803df 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -44,6 +44,11 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal (ULONG *, unsigned char *, unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *); void __RPC_USER HMETAFILEPICT_UserFree(ULONG *, HMETAFILEPICT *); +ULONG __RPC_USER HBRUSH_UserSize(ULONG *, ULONG, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserMarshal(ULONG *, unsigned char *, HBRUSH *); +unsigned char * __RPC_USER HBRUSH_UserUnmarshal(ULONG *, unsigned char *, HBRUSH *); +void __RPC_USER HBRUSH_UserFree(ULONG *, HBRUSH *); + static BOOL g_expect_user_alloc; static void * WINAPI user_allocate(SIZE_T size) { @@ -932,6 +937,45 @@ static void test_marshal_HICON(void) DestroyIcon(hIcon); } +static void test_marshal_HBRUSH(void) +{ + MIDL_STUB_MESSAGE stub_msg; + HBRUSH hBrush, hBrush2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + LOGBRUSH logbrush; + wireHBRUSH wirehbrush; + ULONG size; + + logbrush.lbStyle = BS_SOLID; + logbrush.lbColor = RGB(0, 0, 0); + logbrush.lbHatch = 0; + + hBrush = CreateBrushIndirect(&logbrush); + ok(hBrush != 0, "CreateBrushIndirect failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HBRUSH_UserSize(&umcb.Flags, 0, &hBrush); + ok(size == sizeof(*wirehbrush), "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserMarshal(&umcb.Flags, buffer, &hBrush); + wirehbrush = (wireHBRUSH)buffer; + ok(wirehbrush->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehbrush->fContext); + ok(wirehbrush->u.hInproc == (LONG_PTR)hBrush, "Marshaled value should be %p instead of %x\n", hBrush, wirehbrush->u.hRemote); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBRUSH_UserUnmarshal(&umcb.Flags, buffer, &hBrush2); + ok(hBrush == hBrush2, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HBRUSH_UserFree(&umcb.Flags, &hBrush2); + DeleteObject(hBrush); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -947,6 +991,7 @@ START_TEST(usrmarshal) test_marshal_SNB(); test_marshal_HDC(); test_marshal_HICON(); + test_marshal_HBRUSH(); CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 89f4f4a..957338a 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -343,6 +343,7 @@ IMPL_WIREM_HANDLE(HMENU) IMPL_WIREM_HANDLE(HWND) IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) +IMPL_WIREM_HANDLE(HBRUSH) /****************************************************************************** * HGLOBAL_UserSize [OLE32.@]

1 0

Nikolay Sivov : oleaut32/tests: Test that user memory functions are not called.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 0533b38f70dcb30bc865941a99caa665cb6ba239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0533b38f70dcb30bc865941a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 09:29:00 2015 +0300 oleaut32/tests: Test that user memory functions are not called. --- dlls/oleaut32/tests/usrmarshal.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index b1fe49e..88a0731 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -190,11 +190,13 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) static void * WINAPI user_allocate(SIZE_T size) { + ok(0, "unexpected user_allocate call\n"); return CoTaskMemAlloc(size); } static void WINAPI user_free(void *p) { + ok(0, "unexpected user_free call\n"); CoTaskMemFree(p); }

1 0

Michael Stefaniuc : dmime/tests: Add IPersistStream tests for DM*Track.
by Alexandre Julliard 16 Jun '15

16 Jun '15

Module: wine Branch: master Commit: 39cc9da12a2ce3112c508017e88dbb86879eb8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=39cc9da12a2ce3112c508017e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 16 09:26:41 2015 +0200 dmime/tests: Add IPersistStream tests for DM*Track. --- dlls/dmime/tests/dmime.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index a6e8c73..7738332 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -470,6 +470,72 @@ static void test_segment(void) while (IDirectMusicSegment_Release(dms)); } +static void test_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + CLSID classid; + ULARGE_INTEGER size; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + BOOL todo; + } class[] = { + { X(DirectMusicLyricsTrack), TRUE }, + { X(DirectMusicMarkerTrack), TRUE }, + { X(DirectMusicParamControlTrack), TRUE }, + { X(DirectMusicSegmentTriggerTrack), FALSE }, + { X(DirectMusicSeqTrack), TRUE }, + { X(DirectMusicSysExTrack), TRUE }, + { X(DirectMusicTempoTrack), FALSE }, + { X(DirectMusicTimeSigTrack), TRUE }, + { X(DirectMusicWaveTrack), TRUE } + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + trace("Testing %s\n", class[i].name); + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + + /* IPersistStream */ + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &classid); + if (class[i].todo) { + todo_wine { + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + } + } else { + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + } + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmime) { CoInitialize(NULL); @@ -489,6 +555,7 @@ START_TEST(dmime) test_audiopathconfig(); test_graph(); test_segment(); + test_track(); CoUninitialize(); }

1 0