January 2014 - Wine-commits

Stefan Dösinger : wined3d: Don' t set SFLAG_DYNLOCK at surface creation.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 5630cb5dc8ef7e9a8195262726f73d6828f59a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5630cb5dc8ef7e9a819526272… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:17 2014 +0100 wined3d: Don't set SFLAG_DYNLOCK at surface creation. We no longer depend on SFLAG_DYNLOCK to create buffers and PIN_SYSMEM makes sure the address remains constant. --- dlls/wined3d/surface.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index def47d3..87de9e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6385,16 +6385,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; - /* I'm not sure if this qualifies as a hack or as an optimization. It - * seems reasonable to assume that lockable render targets will get - * locked, so we might as well set SFLAG_DYNLOCK right at surface - * creation. However, the other reason we want to do this is that several - * ddraw applications access surface memory while the surface isn't - * mapped. The SFLAG_DYNLOCK behaviour of keeping SYSMEM around for - * future locks prevents these from crashing. */ - if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) - surface->flags |= SFLAG_DYNLOCK; - surface->map_binding = WINED3D_LOCATION_SYSMEM; /* Call the private setup routine */

1 0

Stefan Dösinger : wined3d: Only set SFLAG_DYNLOCK when map_binding = sysmem.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: d640018a3c1d5b6bc109891cc4acf894a6c4413a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d640018a3c1d5b6bc109891cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:18 2014 +0100 wined3d: Only set SFLAG_DYNLOCK when map_binding = sysmem. All other map bindings are never freed. Setting SFLAG_DYNLOCK if map_binding != sysmem might only keep a heap memory allocation around (e.g. after device_reset) that is never used. --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 87de9e1..628a4a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3068,7 +3068,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, * mapped regularly do not throw away the system memory copy. This avoids * the need to download the surface from OpenGL all the time. The surface * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK)) + if (!(surface->flags & SFLAG_DYNLOCK) && surface->map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) {

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: dd5459cff45b3cec73fd5c617b73b20d694684d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5459cff45b3cec73fd5c617… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 16 23:01:42 2014 +0100 po: Update French translation. --- po/fr.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7412a66..9dc5d8c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-03 23:12+0100\n" +"PO-Revision-Date: 2014-01-16 23:01+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -10190,7 +10190,7 @@ msgstr "Invite de commande Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10260,10 +10260,8 @@ msgid "Wine Explorer" msgstr "Explorateur de Wine" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Démarrage" +msgstr "Démarrer" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Vincent Povirk : include: Fix off-by-one error in EmfPlusRecordType enumeration.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: ea41f29c3231c78b8cfa15833e0225c7b066978a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea41f29c3231c78b8cfa15833… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 14:58:09 2014 -0600 include: Fix off-by-one error in EmfPlusRecordType enumeration. Apparently MSDN made up EmfPlusRecordTypeSetGammaValue, it's not in the SDK headers or EMF+ spec. --- include/gdiplusenums.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index c730a0c..3223d2b 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -672,7 +672,6 @@ enum EmfPlusRecordType { EmfPlusRecordTypeSetAntiAliasMode, EmfPlusRecordTypeSetTextRenderingHint, EmfPlusRecordTypeSetTextContrast, - EmfPlusRecordTypeSetGammaValue, EmfPlusRecordTypeSetInterpolationMode, EmfPlusRecordTypeSetPixelOffsetMode, EmfPlusRecordTypeSetCompositingMode,

1 0

Vincent Povirk : gdiplus: Fix recording metafile bounds/dpi reporting.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 55ad8315987d167dd657138c2d7dedd221916c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ad8315987d167dd657138c2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 15:27:53 2014 -0600 gdiplus: Fix recording metafile bounds/dpi reporting. --- dlls/gdiplus/metafile.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index a79bfc3..4df7f6f 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -248,6 +248,8 @@ GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF (*metafile)->image.picture = NULL; (*metafile)->image.flags = ImageFlagsNone; (*metafile)->image.palette = NULL; + (*metafile)->image.xres = 72.0; + (*metafile)->image.yres = 72.0; (*metafile)->bounds = *frameRect; (*metafile)->unit = frameUnit; (*metafile)->metafile_type = type; @@ -304,7 +306,11 @@ GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **result) stat = graphics_from_image((GpImage*)metafile, &metafile->record_graphics); if (stat == Ok) + { *result = metafile->record_graphics; + metafile->record_graphics->xres = 96.0; + metafile->record_graphics->yres = 96.0; + } return stat; }

1 0

Vincent Povirk : gdiplus: Implement writing SetPageTransform records.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 6518edfa5f67a0a7cdda5b31ee9ac52c3a6a2c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6518edfa5f67a0a7cdda5b31e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 15:43:45 2014 -0600 gdiplus: Implement writing SetPageTransform records. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 18 ++++++++++++++++++ dlls/gdiplus/metafile.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5e8f78a..e4e6b92 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -59,6 +59,7 @@ extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7f892f6..21ee84d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5274,6 +5274,8 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics *graphics, GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) { + GpStatus stat; + TRACE("(%p, %.2f)\n", graphics, scale); if(!graphics || (scale <= 0.0)) @@ -5282,6 +5284,13 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, graphics->unit, scale); + if (stat != Ok) + return stat; + } + graphics->scale = scale; return Ok; @@ -5289,6 +5298,8 @@ GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics *graphics, REAL scale) GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) { + GpStatus stat; + TRACE("(%p, %d)\n", graphics, unit); if(!graphics) @@ -5300,6 +5311,13 @@ GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics *graphics, GpUnit unit) if(unit == UnitWorld) return InvalidParameter; + if (graphics->image && graphics->image->type == ImageTypeMetafile) + { + stat = METAFILE_SetPageTransform((GpMetafile*)graphics->image, unit, graphics->scale); + if (stat != Ok) + return stat; + } + graphics->unit = unit; return Ok; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4df7f6f..1218800 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -64,6 +64,12 @@ typedef struct EmfPlusFillRects DWORD Count; } EmfPlusFillRects; +typedef struct EmfPlusSetPageTransform +{ + EmfPlusRecordHeader Header; + REAL PageScale; +} EmfPlusSetPageTransform; + typedef struct EmfPlusRect { SHORT X; @@ -416,6 +422,29 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, return Ok; } +GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusSetPageTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusSetPageTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeSetPageTransform; + record->Header.Flags = unit; + record->PageScale = scale; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) { if (hdc != metafile->record_dc)

1 0

Vincent Povirk : gdiplus: Implement SetPageTransform playback.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 7c12d889d4000fd2b90fc9504a3d71e20b1a845b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c12d889d4000fd2b90fc9504… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 16 16:15:50 2014 -0600 gdiplus: Implement SetPageTransform playback. --- dlls/gdiplus/metafile.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1218800..af7ec27 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -528,9 +528,15 @@ static GpStatus METAFILE_PlaybackUpdateWorldTransform(GpMetafile *metafile) if (stat == Ok) { - /* FIXME: Prepend page transform. */ + REAL scale = units_to_pixels(1.0, metafile->page_unit, 96.0); - stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); + if (metafile->page_unit != UnitDisplay) + scale *= metafile->page_scale; + + stat = GdipScaleMatrix(real_transform, scale, scale, MatrixOrderPrepend); + + if (stat == Ok) + stat = GdipMultiplyMatrix(real_transform, metafile->world_transform, MatrixOrderPrepend); if (stat == Ok) stat = GdipSetWorldTransform(metafile->playback_graphics, real_transform); @@ -545,6 +551,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) { GpStatus stat; + GpMetafile *real_metafile = (GpMetafile*)metafile; TRACE("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); @@ -655,6 +662,19 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return stat; } + case EmfPlusRecordTypeSetPageTransform: + { + EmfPlusSetPageTransform *record = (EmfPlusSetPageTransform*)header; + GpUnit unit = (GpUnit)flags; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusSetPageTransform)) + return InvalidParameter; + + real_metafile->page_unit = unit; + real_metafile->page_scale = record->PageScale; + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented; @@ -774,7 +794,7 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, if (stat == Ok) { - real_metafile->page_unit = UnitPixel; /* FIXME: Use frame unit here? */ + real_metafile->page_unit = UnitDisplay; real_metafile->page_scale = 1.0; stat = METAFILE_PlaybackUpdateWorldTransform(real_metafile); }

1 0

Henri Verbeet : ddraw/tests: Verify dwBackBufferCount on back buffer surfaces in test_flip().
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 1318d5786f15cb491610eb4c08abf27d13852830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1318d5786f15cb491610eb4c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 16 23:44:49 2014 +0100 ddraw/tests: Verify dwBackBufferCount on back buffer surfaces in test_flip(). --- dlls/ddraw/tests/ddraw1.c | 3 +++ dlls/ddraw/tests/ddraw2.c | 3 +++ dlls/ddraw/tests/ddraw4.c | 3 +++ dlls/ddraw/tests/ddraw7.c | 3 +++ dlls/ddraw/tests/dsurface.c | 23 +---------------------- 5 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c7c227b..7ab339f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3879,6 +3879,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -3888,6 +3889,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -3897,6 +3899,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2a7b64f..e4e8ff3 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4560,6 +4560,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -4569,6 +4570,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -4578,6 +4580,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 589ff55..a639834 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5163,6 +5163,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5172,6 +5173,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5181,6 +5183,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bcec1fd..9520842 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5041,6 +5041,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5050,6 +5051,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); @@ -5059,6 +5061,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(!surface_desc.dwBackBufferCount, "Got unexpected back buffer count %u.\n", surface_desc.dwBackBufferCount); ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ffc9358..b07eddb 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1125,10 +1125,10 @@ static void AttachmentTest7(void) IDirectDraw7 *dd7; IDirectDrawSurface7 *surface1, *surface2, *surface3, *surface4; IDirectDrawSurface *surface1v1, *surface2v1; + DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}; DDSURFACEDESC2 ddsd, ddsd2; DWORD ref; UINT num; - DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}, caps2 = {DDSCAPS_BACKBUFFER,0,0,0}; HWND window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); @@ -1218,27 +1218,6 @@ static void AttachmentTest7(void) hr = IDirectDraw7_SetCooperativeLevel(dd7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); - memset(&ddsd, 0, sizeof(ddsd)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_BACKBUFFERCOUNT | DDSD_CAPS; - ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; - ddsd.dwBackBufferCount = 2; - hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - - /* backbuffer surfaces must not have dwBackBufferCount set */ - ddsd2.dwSize = sizeof(ddsd2); - hr = IDirectDrawSurface7_GetAttachedSurface(surface1, &caps2, &surface2); - ok(hr==DD_OK,"GetAttachedSurface returned: %x\n", hr); - hr = IDirectDrawSurface7_GetSurfaceDesc(surface2, &ddsd2); - ok(hr==DD_OK,"GetSurfaceDesc returned: %x\n", hr); - ok(ddsd2.dwBackBufferCount==0,"backbuffer surface has dwBackBufferCount==%u\n", ddsd2.dwBackBufferCount); - - num = 0; - IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); - ok(num == 1, "Primary surface has %d surfaces attached, expected 1\n", num); - IDirectDrawSurface7_Release(surface1); - /* Those are some invalid descriptions, no need to test attachments with them */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd);

1 0

Michael Stefaniuc : dmstyle/tests: Fix a crash on old dmusic versions.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 29fe708970653ffdc4f5da874cb8b96f49de8818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fe708970653ffdc4f5da874… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 17 01:13:58 2014 +0100 dmstyle/tests: Fix a crash on old dmusic versions. --- dlls/dmstyle/tests/dmstyle.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index a1565c0..58c15eb 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -64,6 +64,10 @@ static void test_COM(void) /* Same refcount for all DirectMusicStyle8 interfaces */ hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicStyle8, (void**)&dms8); + if (hr == E_NOINTERFACE) { + win_skip("Old version without IDirectMusicStyle8\n"); + return; + } ok(hr == S_OK, "DirectMusicStyle8 create failed: %08x, expected S_OK\n", hr); refcount = IDirectMusicStyle8_AddRef(dms8); ok(refcount == 2, "refcount == %u, expected 2\n", refcount);

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicComposer.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 604e395184c6584eb4d86ac11e49dd3672dfb2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604e395184c6584eb4d86ac11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 17 01:14:48 2014 +0100 dmcompos: COM cleanup for IDirectMusicComposer. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/composer.c | 154 +++++++++++++++++++++++--------------- dlls/dmcompos/dmcompos_private.h | 12 --- 2 files changed, 95 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=604e395184c6584eb4d86…

1 0