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

Eduardo García : Spanish translation for release 1.5.3
by Jeremy Newman April 30, 2012

April 30, 2012

Module: website Branch: master Commit: 7a25ef63205d4b33649759a0714d6ab23d6a209c URL: http://source.winehq.org/git/website.git/?a=commit;h=7a25ef63205d4b33649759… Author: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat Apr 28 14:03:51 2012 +0200 Spanish translation for release 1.5.3 With regards. Eduardo >From 2843bc385ee522809235ddc969961153578f434a Mon Sep 17 00:00:00 2001 From: Eduardo García <eduardo.garcia(a)gmx.com> Date: Sat, 28 Apr 2012 13:55:34 +0200 Subject: Spanish translation for release 1.5.3 --- news/es/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/es/2012042701.xml b/news/es/2012042701.xml new file mode 100644 index 0000000..8ac0cc9 --- /dev/null +++ b/news/es/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>Abril 27, 2012</date> +<title>Wine 1.5.3 Liberado</title> +<body> + La versión de desarrollo Wine 1.5.3 se encuentra ahora disponible. + <a href="{$root}/announce/1.5.3">Novedades</a> en esta versión: +<ul> + <li>Soporte para la monitorización de límites de gráficos.</li> + <li>Varias correcciones en el Internet Explorer integrado.</li> + <li>Soporte para visualizar código ARM en el depurador de código de Wine.</li> + <li>Varias mejoras para DirectMusic.</li> + <li>Soporte mejorado para espacios de nombres en MSXML.</li> + <li>Corrección de errores varios.</li> +</ul> +El <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">código fuente</a> ya está disponible. +Los paquetes binarios están en proceso de construcción, y pronto aparecerán en sus respectivos <a href="{$root}/download">lugares de descarga</a>. +</body></news>

1 0

Lucas Fialho Zawacki : Add Portuguese translation for release 1.5.3
by Jeremy Newman April 30, 2012

April 30, 2012

Module: website Branch: master Commit: 1113c8d75abbacf26ac7275fe2c5e092a79d59e2 URL: http://source.winehq.org/git/website.git/?a=commit;h=1113c8d75abbacf26ac727… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Fri Apr 27 17:25:59 2012 -0300 Add Portuguese translation for release 1.5.3 --- news/pt/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pt/2012042701.xml b/news/pt/2012042701.xml new file mode 100644 index 0000000..d9a2e4f --- /dev/null +++ b/news/pt/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>27 de Abril de 2012</date> +<title>Wine 1.5.3 Lançado</title> +<body> + A versão de desenvolvimento 1.5.3 já está disponível. + <a href="{$root}/announce/1.5.3">Novidades</a> desta versão: +<ul> + <li>Suporte a rastreamento de limites gráficos.</li> + <li>Diversas correções ao Internet Explorer padrão do Wine.</li> + <li>Suporte a visualização de código ARM no debugger do Wine.</li> + <li>Diversas melhorias no DirectMusic.</li> + <li>Maior suporte a namespaces no MSXML.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2"> disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news> \ No newline at end of file

1 0

Frédéric Delanoy : French translation for release 1.5.3
by Jeremy Newman April 30, 2012

April 30, 2012

Module: website Branch: master Commit: adb29ed412d6fdfb8646595246af4539c8728caf URL: http://source.winehq.org/git/website.git/?a=commit;h=adb29ed412d6fdfb864659… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Apr 27 20:13:45 2012 +0200 French translation for release 1.5.3 --- news/fr/2012042701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2012042701.xml b/news/fr/2012042701.xml new file mode 100644 index 0000000..50063dd --- /dev/null +++ b/news/fr/2012042701.xml @@ -0,0 +1,16 @@ +<news> +<date>27 avril 2012</date> +<title>Sortie de Wine 1.5.3</title> +<body> + La version de développement 1.5.3 de Wine est disponible. + <a href="{$root}/announce/1.5.3">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du suivi des limites graphiques.</li> + <li>Plusieurs correctifs à l'Internet Explorer intégré.</li> + <li>Prise en charge de l'affichage de code ARM dans le débogueur Wine.</li> + <li>Diverses améliorations à DirectMusic.</li> + <li>Meilleure gestion des espaces de nom dans MSXML.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.3
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: website Branch: master Commit: cb468fbe118af6913881c09770417cbe07b93f71 URL: http://source.winehq.org/git/website.git/?a=commit;h=cb468fbe118af6913881c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 19:58:52 2012 +0200 Wine release 1.5.3 --- news/en/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012042701.xml b/news/en/2012042701.xml new file mode 100644 index 0000000..7d759a1 --- /dev/null +++ b/news/en/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>April 27, 2012</date> +<title>Wine 1.5.3 Released</title> +<body> + The Wine development release 1.5.3 is now available. + <a href="{$root}/announce/1.5.3">What's new</a> in this release: +<ul> + <li>Support for graphics bounds tracking.</li> + <li>A number of fixes to the builtin Internet Explorer.</li> + <li>Support for displaying ARM code in the Wine debugger.</li> + <li>Various DirectMusic improvements.</li> + <li>Better namespace support in MSXML.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.3 : Alexandre Julliard : Release 1.5.3
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: refs/tags/wine-1.5.3 Tag: 66bd8933e1f12d3f97871b04eadbd99e2f872f5a URL: http://source.winehq.org/git/wine.git/?a=tag;h=66bd8933e1f12d3f97871b04eadb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 19:48:58 2012 +0200 Release 1.5.3

1 0

Alexandre Julliard : Release 1.5.3.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 016afa041b86b48c5f6c65f78498b56dd946db33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=016afa041b86b48c5f6c65f78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 27 19:48:58 2012 +0200 Release 1.5.3. --- ANNOUNCE | 898 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 448 insertions(+), 470 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=016afa041b86b48c5f6c6…

1 0

Alexandre Julliard : gdi32: Store the bounds rectangle as a pointer in the DIB driver.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 3ea711dd7ce7c56b5d6294241d2c41be16c3a9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea711dd7ce7c56b5d6294241… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 25 13:15:24 2012 +0200 gdi32: Store the bounds rectangle as a pointer in the DIB driver. --- dlls/gdi32/dibdrv/bitblt.c | 10 +++++----- dlls/gdi32/dibdrv/dc.c | 33 +++++++++++---------------------- dlls/gdi32/dibdrv/dibdrv.h | 4 ++-- dlls/gdi32/dibdrv/graphics.c | 15 ++++++++------- 4 files changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 2d088c3..e35c4cb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -964,7 +964,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info clip = tmp_rgn; } else if (!clip) clip = pdev->clip; - add_clipped_bounds( &pdev->bounds, &dst->visrect, clip ); + add_clipped_bounds( pdev, &dst->visrect, clip ); } if (!get_clipped_rects( dib, &dst->visrect, clip, &clipped_rects )) @@ -1021,7 +1021,7 @@ DWORD dibdrv_BlendImage( PHYSDEV dev, BITMAPINFO *info, const struct gdi_image_b init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); src_dib.bits.is_copy = bits->is_copy; - add_clipped_bounds( &pdev->bounds, &dst->visrect, pdev->clip ); + add_clipped_bounds( pdev, &dst->visrect, pdev->clip ); return blend_rect( &pdev->dib, &dst->visrect, &src_dib, &src->visrect, pdev->clip, blend ); update_format: @@ -1407,7 +1407,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; @@ -1419,7 +1419,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds ); } break; @@ -1431,7 +1431,7 @@ BOOL dibdrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, /* Windows bug: no alpha on a8r8g8b8 created with bitfields */ if (pdev->dib.funcs == &funcs_8888 && pdev->dib.compression == BI_BITFIELDS) vert[0].Alpha = vert[1].Alpha = vert[2].Alpha = 0; - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); if (!gradient_rect( &pdev->dib, vert, mode, pdev->clip, &bounds )) ret = FALSE; } break; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b861f79..00d6c01 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -298,19 +298,22 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl return clip_rects->count; } -void add_clipped_bounds( RECT *bounds, const RECT *rect, HRGN clip ) +void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) { const WINEREGION *region; RECT rc; + if (!dev->bounds) return; if (clip) { if (!(region = get_wine_region( clip ))) return; - if (!rect) add_bounds_rect( bounds, &region->extents ); - else if (intersect_rect( &rc, rect, &region->extents )) add_bounds_rect( bounds, &rc ); + if (!rect) rc = region->extents; + else intersect_rect( &rc, rect, &region->extents ); release_wine_region( clip ); } - else if (rect) add_bounds_rect( bounds, rect ); + else rc = *rect; + + add_bounds_rect( dev->bounds, &rc ); } /********************************************************************** @@ -325,7 +328,6 @@ static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, clear_dib_info(&pdev->dib); clear_dib_info(&pdev->brush.dib); clear_dib_info(&pdev->pen_brush.dib); - reset_bounds( &pdev->bounds ); push_dc_driver( dev, &pdev->dev, &dib_driver ); return TRUE; } @@ -395,28 +397,15 @@ static void dibdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) } /*********************************************************************** - * dibdrv_GetBoundsRect - */ -static UINT dibdrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) -{ - dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - - if (is_rect_empty( &pdev->bounds )) return DCB_RESET; - if (rect) *rect = pdev->bounds; - if (flags & DCB_RESET) reset_bounds( &pdev->bounds ); - return DCB_SET; -} - -/*********************************************************************** * dibdrv_SetBoundsRect */ static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) { dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); - if (is_rect_empty( &pdev->bounds )) return DCB_RESET; - if (flags & DCB_RESET) reset_bounds( &pdev->bounds ); - return DCB_SET; + if (flags & DCB_DISABLE) pdev->bounds = NULL; + else if (flags & DCB_ENABLE) pdev->bounds = rect; + return DCB_RESET; /* we don't have device-specific bounds */ } /*********************************************************************** @@ -640,7 +629,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ - dibdrv_GetBoundsRect, /* pGetBoundsRect */ + NULL, /* pGetBoundsRect */ NULL, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 7efb882..9431ff0 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -96,7 +96,7 @@ typedef struct dibdrv_physdev dib_brush brush; HRGN clip; - RECT bounds; + RECT *bounds; /* pen */ DWORD pen_style, pen_endcap, pen_join; @@ -247,7 +247,7 @@ extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; extern BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip, INT rop ) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; -extern void add_clipped_bounds( RECT *bounds, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; +extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index e904efd..ddf6205 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -92,6 +92,7 @@ static void add_pen_lines_bounds( dibdrv_physdev *dev, int count, const POINT *p RECT bounds, rect; int width = 0; + if (!dev->bounds) return; reset_bounds( &bounds ); if (dev->pen_uses_region) @@ -127,7 +128,7 @@ static void add_pen_lines_bounds( dibdrv_physdev *dev, int count, const POINT *p points++; } - add_clipped_bounds( &dev->bounds, &bounds, dev->clip ); + add_clipped_bounds( dev, &bounds, dev->clip ); } /* compute the points for the first quadrant of an ellipse, counterclockwise from the x axis */ @@ -703,7 +704,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, origin.y += metrics.gmCellIncY; } } - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); done: free_clipped_rects( &clipped_rects ); @@ -805,7 +806,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) if (!is_interior( &pdev->dib, pdev->clip, x, y, pixel, type )) return FALSE; - rgn = CreateRectRgn( 0, 0, 0, 0 ); + if (!(rgn = CreateRectRgn( 0, 0, 0, 0 ))) return FALSE; row.left = x; row.right = x + 1; row.top = y; @@ -813,7 +814,7 @@ BOOL dibdrv_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT type ) fill_row( &pdev->dib, pdev->clip, &row, pixel, type, rgn ); - add_clipped_bounds( &pdev->bounds, NULL, rgn ); + add_clipped_bounds( pdev, NULL, rgn ); brush_region( pdev, rgn ); DeleteObject( rgn ); @@ -908,7 +909,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); - add_bounds_rect( &pdev->bounds, &dst->visrect ); + add_clipped_bounds( pdev, &dst->visrect, 0 ); return brush_rect( pdev, &pdev->brush, &dst->visrect, pdev->clip, get_rop2_from_rop(rop) ); } @@ -938,7 +939,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) } release_wine_region( rgn ); - add_clipped_bounds( &pdev->bounds, &bounds, pdev->clip ); + add_clipped_bounds( pdev, &bounds, pdev->clip ); return TRUE; } @@ -1277,7 +1278,7 @@ COLORREF dibdrv_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) rect.top = pt.y; rect.right = rect.left + 1; rect.bottom = rect.top + 1; - add_clipped_bounds( &pdev->bounds, &rect, pdev->clip ); + add_clipped_bounds( pdev, &rect, pdev->clip ); /* SetPixel doesn't do the 1bpp massaging like other fg colors */ pixel = get_pixel_color( pdev, color, FALSE );

1 0

Christian Costa : dmusic: Handle GUID_NULL when creating IDirectMusicBuffer .
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 51942db8116dabd670854211e2bf4677b15eccc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51942db8116dabd670854211e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:26 2012 +0200 dmusic: Handle GUID_NULL when creating IDirectMusicBuffer. --- dlls/dmusic/buffer.c | 7 ++++++- dlls/dmusic/tests/dmusic.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 838ceee..0626276 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -18,6 +18,8 @@ */ #include "dmusic_private.h" +#include "initguid.h" +#include "dmksctrl.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); @@ -242,7 +244,10 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; dmbuffer->ref = 0; /* Will be inited by QueryInterface */ - memcpy(&dmbuffer->format, &desc->guidBufferFormat, sizeof(GUID)); + if (IsEqualGUID(&desc->guidBufferFormat, &GUID_NULL)) + dmbuffer->format = KSDATAFORMAT_SUBTYPE_MIDI; + else + dmbuffer->format = desc->guidBufferFormat; dmbuffer->size = (desc->cbBuffer + 3) & ~3; /* Buffer size must be multiple of 4 bytes */ dmbuffer->data = HeapAlloc(GetProcessHeap(), 0, dmbuffer->size); diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 1e55961..21607cb 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -130,7 +130,7 @@ static void test_dmbuffer(void) hr = IDirectMusicBuffer_GetBufferFormat(dmbuffer, &format); ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %x\n", hr); - todo_wine ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); + ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); hr = IDirectMusicBuffer_GetMaxBytes(dmbuffer, &size); ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); ok(size == 1024, "Buffer size is %u instead of 1024\n", size);

1 0

Christian Costa : dmusic: Implement IDirectMusicBufferImpl_PackStructured.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: fbd0aba73975d850c6677bd2ca55e7e9575ee064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbd0aba73975d850c6677bd2c… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:34 2012 +0200 dmusic: Implement IDirectMusicBufferImpl_PackStructured. --- dlls/dmusic/buffer.c | 26 ++++++++++++++++++++++++-- dlls/dmusic/dmusic_private.h | 1 + dlls/dmusic/tests/dmusic.c | 5 +++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 0626276..fd1d217 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -96,11 +96,33 @@ static HRESULT WINAPI IDirectMusicBufferImpl_TotalTime(LPDIRECTMUSICBUFFER iface return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) +static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME ref_time, DWORD channel_group, DWORD channel_message) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + DWORD new_write_pos = This->write_pos + sizeof(DMUS_EVENTHEADER) + sizeof(DWORD); + DMUS_EVENTHEADER header; - FIXME("(%p, 0x%s, %d, %d): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, dwChannelMessage); + TRACE("(%p)->(0x%s, %u, 0x%x)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message); + + if (new_write_pos > This->size) + return DMUS_E_BUFFER_FULL; + + /* Channel_message 0xZZYYXX is a midi message where XX = status byte, YY = byte 1 and ZZ = byte 2 */ + + if (!(channel_message & 0x80)) + { + /* Status byte MSB is always set */ + return DMUS_E_INVALID_EVENT; + } + + header.cbEvent = sizeof(channel_message); + header.dwChannelGroup = channel_group; + header.rtDelta = ref_time; + header.dwFlags = DMUS_EVENT_STRUCTURED; + + memcpy(This->data + This->write_pos, &header, sizeof(header)); + *(DWORD*)(This->data + This->write_pos + sizeof(header)) = channel_message; + This->write_pos = new_write_pos; return S_OK; } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1001bf5..f4897ac 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -113,6 +113,7 @@ struct IDirectMusicBufferImpl { GUID format; DWORD size; LPBYTE data; + DWORD write_pos; }; /***************************************************************************** diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 21607cb..c6d4ad3 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -135,6 +135,11 @@ static void test_dmbuffer(void) ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); ok(size == 1024, "Buffer size is %u instead of 1024\n", size); + hr = IDirectMusicBuffer_PackStructured(dmbuffer, 10, 0, 0); + ok(hr == DMUS_E_INVALID_EVENT, "IDirectMusicBuffer_PackStructured returned %x\n", hr); + hr = IDirectMusicBuffer_PackStructured(dmbuffer, 10, 0, 0x000090); /* note on : chan 0, note 0 & vel 0 */ + ok(hr == S_OK, "IDirectMusicBuffer_PackStructured returned %x\n", hr); + if (dmbuffer) IDirectMusicBuffer_Release(dmbuffer); IDirectMusic_Release(dmusic);

1 0

Christian Costa : dmusic: Add tests for IDirectMusicBuffer.
by Alexandre Julliard April 27, 2012

April 27, 2012

Module: wine Branch: master Commit: 0a588385fb0651fc646f5d7a4f49e7a93ee28011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a588385fb0651fc646f5d7a4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 26 08:08:18 2012 +0200 dmusic: Add tests for IDirectMusicBuffer. --- dlls/dmusic/tests/dmusic.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index c537afa..1e55961 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "initguid.h" #include "dmusici.h" +#include "dmksctrl.h" static inline char* debugstr_guid(CONST GUID *id) { @@ -103,11 +104,48 @@ static void test_dmusic(void) IDirectMusic_Release(dmusic); } +static void test_dmbuffer(void) +{ + IDirectMusic *dmusic; + IDirectMusicBuffer *dmbuffer = NULL; + HRESULT hr; + DMUS_BUFFERDESC desc; + GUID format; + DWORD size; + + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic, (LPVOID*)&dmusic); + if (hr != S_OK) + { + skip("Cannot create DirectMusic object (%x)\n", hr); + return; + } + + desc.dwSize = sizeof(DMUS_BUFFERDESC); + desc.dwFlags = 0; + desc.cbBuffer = 1023; + memcpy(&desc.guidBufferFormat, &GUID_NULL, sizeof(GUID)); + + hr = IDirectMusic_CreateMusicBuffer(dmusic, &desc, &dmbuffer, NULL); + ok(hr == S_OK, "IDirectMusic_CreateMusicBuffer return %x\n", hr); + + hr = IDirectMusicBuffer_GetBufferFormat(dmbuffer, &format); + ok(hr == S_OK, "IDirectMusicBuffer_GetBufferFormat returned %x\n", hr); + todo_wine ok(IsEqualGUID(&format, &KSDATAFORMAT_SUBTYPE_MIDI), "Wrong format returned %s\n", debugstr_guid(&format)); + hr = IDirectMusicBuffer_GetMaxBytes(dmbuffer, &size); + ok(hr == S_OK, "IDirectMusicBuffer_GetMaxBytes returned %x\n", hr); + ok(size == 1024, "Buffer size is %u instead of 1024\n", size); + + if (dmbuffer) + IDirectMusicBuffer_Release(dmbuffer); + IDirectMusic_Release(dmusic); +} + START_TEST(dmusic) { CoInitializeEx(NULL, COINIT_MULTITHREADED); test_dmusic(); + test_dmbuffer(); CoUninitialize(); }

1 0