January 2014 - Wine-Commits

Frédéric Delanoy : mmdevapi/tests: Remove unused dbgstr_guid function.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: b0071852e8821cf04bab5011e81f40fd3d6c66a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0071852e8821cf04bab5011e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 12:42:10 2014 +0100 mmdevapi/tests: Remove unused dbgstr_guid function. --- dlls/mmdevapi/tests/render.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 4117cb3..078eab7 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -60,16 +60,6 @@ static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ static const LARGE_INTEGER ullZero; -static inline const char *dbgstr_guid( const GUID *id ) -{ - static char ret[256]; - sprintf(ret, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return ret; -} - #define PI 3.14159265358979323846L static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) {

1 0

Stefan Dösinger : wined3d: Remove surface_ops->map.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 00923cb50ce39c5917d0bb15c545ff7fd12d7d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00923cb50ce39c5917d0bb15c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:14 2014 +0100 wined3d: Remove surface_ops->map. --- dlls/wined3d/surface.c | 97 ++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 33 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b61cb5..2317ce6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -810,45 +810,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) surface_load_location(surface, surface->draw_binding); } -static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - struct wined3d_device *device = surface->resource.device; - BYTE *ret; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - switch (surface->map_binding) - { - case SFLAG_INUSERMEM: - return surface->user_memory; - - case SFLAG_INDIB: - return surface->dib.bitmap_data; - - case SFLAG_INBUFFER: - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("map PBO"); - - context_release(context); - return ret; - - case SFLAG_INSYSMEM: - return surface->resource.heap_memory; - - default: - ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); - return NULL; - } -} - static void surface_unmap(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; @@ -1381,7 +1342,6 @@ static const struct wined3d_surface_ops surface_ops = { surface_private_setup, surface_realize_palette, - surface_map, surface_unmap, }; @@ -1458,28 +1418,6 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) x11_copy_to_screen(surface->swapchain, NULL); } -static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - switch (surface->map_binding) - { - case SFLAG_INUSERMEM: - return surface->user_memory; - - case SFLAG_INDIB: - return surface->dib.bitmap_data; - - case SFLAG_INSYSMEM: - return surface->resource.heap_memory; - - default: - ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); - return NULL; - } -} - static void gdi_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); @@ -1495,7 +1433,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, gdi_surface_realize_palette, - gdi_surface_map, gdi_surface_unmap, }; @@ -3099,6 +3036,9 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; + struct wined3d_device *device = surface->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; BYTE *base_memory; TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", @@ -3156,7 +3096,36 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) surface_invalidate_location(surface, ~surface->map_binding); - base_memory = surface->surface_ops->surface_map(surface, rect, flags); + switch (surface->map_binding) + { + case SFLAG_INUSERMEM: + base_memory = surface->user_memory; + break; + + case SFLAG_INDIB: + base_memory = surface->dib.bitmap_data; + break; + + case SFLAG_INBUFFER: + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("map PBO"); + + context_release(context); + break; + + case SFLAG_INSYSMEM: + base_memory = surface->resource.heap_memory; + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + base_memory = NULL; + } if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) map_desc->row_pitch = surface->resource.width * format->byte_count; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e23d284..dc7ba65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2180,7 +2180,6 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); - BYTE *(*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

Stefan Dösinger : wined3d: Separate surface locations and flags.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: beb64c9998261976e799b969dcfc78abf1da3a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb64c9998261976e799b969d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:15 2014 +0100 wined3d: Separate surface locations and flags. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 5 +- dlls/wined3d/surface.c | 116 ++++++++++++++++++------------------- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 11 +--- 6 files changed, 67 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beb64c9998261976e799b…

1 0

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Peer COM interface.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 1fd704b3af6de6a3c2ac0a5576689290e3832a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd704b3af6de6a3c2ac0a557… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 10 10:27:59 2014 +1100 dpnet: Cleanup IDirectPlay8Peer COM interface. --- dlls/dpnet/dpnet_private.h | 10 ---------- dlls/dpnet/peer.c | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 72012cd..4a42eae 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -35,7 +35,6 @@ typedef struct IDirectPlay8ClientImpl IDirectPlay8ClientImpl; typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; typedef struct IDirectPlay8LobbiedApplicationImpl IDirectPlay8LobbiedApplicationImpl; -typedef struct IDirectPlay8PeerImpl IDirectPlay8PeerImpl; typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; /* ------------------ */ @@ -78,15 +77,6 @@ struct IDirectPlay8LobbiedApplicationImpl }; /***************************************************************************** - * IDirectPlay8Peer implementation structure - */ -struct IDirectPlay8PeerImpl -{ - IDirectPlay8Peer IDirectPlay8Peer_iface; - LONG ref; -}; - -/***************************************************************************** * IDirectPlay8ThreadPool implementation structure */ struct IDirectPlay8ThreadPoolImpl diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index ef100a3..1b287dd 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); + +typedef struct IDirectPlay8PeerImpl +{ + IDirectPlay8Peer IDirectPlay8Peer_iface; + LONG ref; +} IDirectPlay8PeerImpl; + static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) { return CONTAINING_RECORD(iface, IDirectPlay8PeerImpl, IDirectPlay8Peer_iface); @@ -66,6 +73,8 @@ static ULONG WINAPI IDirectPlay8PeerImpl_AddRef(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, RefCount); + return RefCount; } @@ -74,6 +83,8 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedDecrement(&This->ref); + TRACE("(%p) ref=%d\n", This, RefCount); + if(!RefCount) HeapFree(GetProcessHeap(), 0, This); @@ -474,23 +485,26 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = IDirectPlay8PeerImpl_TerminateSession }; -HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { +HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) +{ IDirectPlay8PeerImpl* Client; HRESULT ret; Client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8PeerImpl)); + *ppobj = NULL; + if(Client == NULL) { - *ppobj = NULL; WARN("Not enough memory\n"); return E_OUTOFMEMORY; } Client->IDirectPlay8Peer_iface.lpVtbl = &DirectPlay8Peer_Vtbl; - ret = IDirectPlay8PeerImpl_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); - if(ret != DPN_OK) - HeapFree(GetProcessHeap(), 0, Client); + Client->ref = 1; + + ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); + IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); return ret; }

1 0

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

Jan. 17, 2014

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 Jan. 17, 2014

Jan. 17, 2014

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

Stefan Dösinger : wined3d: Add a missing break.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: f1ac04f2a6aea5056d9e5a3a3f429d63f1ec9c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ac04f2a6aea5056d9e5a3a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:13 2014 +0100 wined3d: Add a missing break. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 015478f..1b61cb5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -598,6 +598,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) case SFLAG_INDIB: if (!surface->dib.bitmap_data) ERR("Map binding is set to SFLAG_INDIB but surface->dib.bitmap_data is NULL.\n"); + break; case SFLAG_INSYSMEM: surface_prepare_system_memory(surface);

1 0

Ken Thomases : wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: a05b53894a55b8de1ecfde3815dd10628b8b05f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05b53894a55b8de1ecfde381… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 21:11:10 2014 -0600 wineboot: Ignore 0 result from WM_QUERYENDSESSION if target window was destroyed. --- programs/wineboot/shutdown.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index a5f5f5a..52d37e7 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -100,6 +100,14 @@ static void CALLBACK end_session_message_callback( HWND hwnd, UINT msg, ULONG_PT msg == WM_QUERYENDSESSION ? "WM_QUERYENDSESSION" : (msg == WM_ENDSESSION ? "WM_ENDSESSION" : "Unknown"), hwnd, lresult ); + /* If the window was destroyed while the message was in its queue, SendMessageCallback() + calls us with a default 0 result. Ignore it. */ + if (!lresult && !IsWindow( hwnd )) + { + WINE_TRACE( "window was destroyed; ignoring FALSE lresult\n" ); + lresult = TRUE; + } + /* we only care if a WM_QUERYENDSESSION response is FALSE */ cb_data->result = cb_data->result && lresult;

1 0

Vincent Povirk : gdiplus: Implement SetPageTransform playback.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

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

Vincent Povirk : gdiplus: Implement writing SetPageTransform records.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

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

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

Jan. 17, 2014

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

Ken Thomases : winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: ed3ed035197347fd36f6c89fa94ab23aec22bf9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3ed035197347fd36f6c89fa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 16 20:38:14 2014 -0600 winemac: Ignore failure to send or 0 result from WM_QUERYENDSESSION if target window was destroyed. --- dlls/winemac.drv/window.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 5a1d5a7..d63e83f 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2260,6 +2260,12 @@ static void CALLBACK quit_callback(HWND hwnd, UINT msg, ULONG_PTR data, LRESULT TRACE("got WM_QUERYENDSESSION result %ld from win %p (%u of %u done)\n", result, hwnd, qi->done, qi->count); + if (!result && !IsWindow(hwnd)) + { + TRACE("win %p no longer exists; ignoring apparent refusal\n", hwnd); + result = TRUE; + } + if (!result && qi->result) { qi->result = FALSE; @@ -2360,9 +2366,15 @@ void macdrv_app_quit_requested(const macdrv_event *event) if (!SendMessageCallbackW(qi->wins[i], WM_QUERYENDSESSION, 0, qi->flags, quit_callback, (ULONG_PTR)qi)) { - WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", - qi->wins[i], GetLastError()); - quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, FALSE); + DWORD error = GetLastError(); + BOOL invalid = (error == ERROR_INVALID_WINDOW_HANDLE); + if (invalid) + TRACE("failed to send WM_QUERYENDSESSION to win %p because it's invalid; assuming success\n", + qi->wins[i]); + else + WARN("failed to send WM_QUERYENDSESSION to win %p; error 0x%08x; assuming refusal\n", + qi->wins[i], error); + quit_callback(qi->wins[i], WM_QUERYENDSESSION, (ULONG_PTR)qi, invalid); } }

1 0

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

Jan. 17, 2014

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

Frédéric Delanoy : ntdll: Fix a typo in comment.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: 841aabfd8271f6668a9b72eec248b98bf5f3563e URL: http://source.winehq.org/git/wine.git/?a=commit;h=841aabfd8271f6668a9b72eec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:37 2014 +0100 ntdll: Fix a typo in comment. --- dlls/ntdll/debugtools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c index dfb44af..cbbf744 100644 --- a/dlls/ntdll/debugtools.c +++ b/dlls/ntdll/debugtools.c @@ -62,7 +62,7 @@ static char *get_temp_buffer( size_t n ) return res; } -/* release extra space that we requested in gimme1() */ +/* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { struct debug_info *info = get_info();

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicComposer.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

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

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

Jan. 17, 2014

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

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

Jan. 17, 2014

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

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

Jan. 17, 2014

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

Frédéric Delanoy : wine/test.h: Fix a typo in comment.
by Alexandre Julliard Jan. 17, 2014

Jan. 17, 2014

Module: wine Branch: master Commit: e46796e7a4e6d5edf359d8f8e3ffd63ec7d3c014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e46796e7a4e6d5edf359d8f8e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 02:05:36 2014 +0100 wine/test.h: Fix a typo in comment. --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 373fe76..ab10399 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -259,7 +259,7 @@ static char *get_temp_buffer( size_t n ) return res; } -/* release extra space that we requested in gimme1() */ +/* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { tls_data *data = get_tls_data();

1 0

刘涛 : website: Simplified Chinese translation for 1.6.2 release
by Jeremy Newman Jan. 17, 2014

Jan. 17, 2014

Module: website Branch: master Commit: d153292842c3264dfb3ab00ab7ca110460dc0c30 URL: http://source.winehq.org/git/website.git/?a=commit;h=d153292842c3264dfb3ab0… Author: 刘涛 <wendaotao(a)163.com> Date: Thu Jan 16 14:38:16 2014 +0800 website: Simplified Chinese translation for 1.6.2 release --- news/zh-cn/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/zh-cn/2014011001.xml b/news/zh-cn/2014011001.xml new file mode 100644 index 0000000..edd1c8e --- /dev/null +++ b/news/zh-cn/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>一月 10, 2014</date> +<title>Wine 1.6.2 发布</title> +<body> + Wine 维护版 1.6.2 现在可以使用了。 + 本次<a href="{$root}/announce/1.6.2">更新</a> : +<ul> + <li>升级 liblcms 到版本 2 来支持色彩管理。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Stefan Dösinger : wined3d: Prevent blits to surfaces that will be converted.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 65bc678fcc9974b79921d6706a44ff10d0aa5f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bc678fcc9974b79921d6706… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:17 2014 +0100 wined3d: Prevent blits to surfaces that will be converted. --- dlls/wined3d/surface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ec9f586..015478f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6032,6 +6032,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC DWORD src_ds_flags, dst_ds_flags; RECT src_rect, dst_rect; BOOL scale, convert; + enum wined3d_conversion_type dst_convert_type; + struct wined3d_format dst_conv_fmt; static const DWORD simple_blit = WINEDDBLT_ASYNC | WINEDDBLT_COLORFILL @@ -6146,7 +6148,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - if (dst_surface->flags & SFLAG_CONVERTED) + d3dfmt_get_conv(dst_surface, TRUE, TRUE, &dst_conv_fmt, &dst_convert_type); + if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); goto cpu;

1 0

Stefan Dösinger : d3dx9_36/tests: Use a window with a non-zero size.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: f85f733c7924503f5880e525d4a2698e81726da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85f733c7924503f5880e525d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:18 2014 +0100 d3dx9_36/tests: Use a window with a non-zero size. --- dlls/d3dx9_36/tests/core.c | 3 ++- dlls/d3dx9_36/tests/effect.c | 3 ++- dlls/d3dx9_36/tests/line.c | 3 ++- dlls/d3dx9_36/tests/mesh.c | 20 +++++++++++++------- dlls/d3dx9_36/tests/shader.c | 12 ++++++------ dlls/d3dx9_36/tests/surface.c | 3 ++- dlls/d3dx9_36/tests/texture.c | 3 ++- dlls/d3dx9_36/tests/volume.c | 3 ++- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index d2e2d5e..2990893 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1225,7 +1225,8 @@ START_TEST(core) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 2306f1e..bc1ddbe 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2691,7 +2691,8 @@ START_TEST(effect) HRESULT hr; ULONG count; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index 25d1f32..ae8d07e 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -123,7 +123,8 @@ START_TEST(line) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 47a1b1f..2eb2146 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -121,7 +121,8 @@ static struct test_context *new_test_context(void) D3DPRESENT_PARAMETERS d3dpp = {0}; struct test_context *test_context; - if (!(hwnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(hwnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); goto error; @@ -1175,7 +1176,8 @@ static void D3DXCreateMeshTest(void) hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl1, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -1381,7 +1383,8 @@ static void D3DXCreateMeshFVFTest(void) hr = D3DXCreateMeshFVF(1, 3, D3DXMESH_MANAGED, D3DFVF_XYZ | D3DFVF_NORMAL, NULL, &d3dxmesh); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2449,7 +2452,7 @@ static void D3DXCreateBoxTest(void) return; } - wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_SYSMENU | WS_POPUP, + wnd = CreateWindowA("d3dx9_test_wc", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); ok(wnd != NULL, "Expected to have a window, received NULL\n"); if (!wnd) @@ -2750,7 +2753,8 @@ static void D3DXCreateSphereTest(void) hr = D3DXCreateSphere(NULL, 0.0f, 0, 1, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -2992,7 +2996,8 @@ static void D3DXCreateCylinderTest(void) hr = D3DXCreateCylinder(NULL, 1.0f, 1.0f, 1.0f, 2, 1, &cylinder, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n",hr,D3DERR_INVALIDCALL); - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -4282,7 +4287,8 @@ static void D3DXGenerateAdjacencyTest(void) }, }; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 4fcf3d3..c0d5f00 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1423,8 +1423,8 @@ static void test_setting_constants(void) HRESULT hr; ULONG refcnt; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6067,8 +6067,8 @@ static void test_registerset(void) ULONG count; D3DCAPS9 caps; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; @@ -6371,8 +6371,8 @@ static void test_registerset_defaults(void) ULONG count; D3DCAPS9 caps; - /* Create the device to use for our tests */ - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 3af34d4..283fc96 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1281,7 +1281,8 @@ START_TEST(surface) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 18ac720..afc7144 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1786,7 +1786,8 @@ START_TEST(texture) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return; diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 8f1dc29..ee83bca 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -267,7 +267,8 @@ START_TEST(volume) D3DPRESENT_PARAMETERS d3dpp; HRESULT hr; - if (!(wnd = CreateWindowA("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL))) + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) { skip("Couldn't create application window\n"); return;

1 0

André Hentschel : oleaut32/tests: Fix a test output.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: dc27a38536e89e851e798282468198bf109c5463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc27a38536e89e851e7982824… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 16 20:49:53 2014 +0100 oleaut32/tests: Fix a test output. --- dlls/oleaut32/tests/safearray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index bb346f6..8a98782 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1778,8 +1778,8 @@ static void test_SafeArrayCopy(void) /* copy from a vector */ sa = SafeArrayCreateVector(VT_UI1, 0, 2); ok(sa->fFeatures == (FADF_HAVEVARTYPE|FADF_CREATEVECTOR) || - broken(!sa->fFeatures /* W2k */), - "got 0x%08x\n", hres); + broken(sa->fFeatures == FADF_CREATEVECTOR /* W2k */), + "got 0x%08x\n", sa->fFeatures); hres = SafeArrayCopy(sa, &sa2); ok(hres == S_OK, "got 0x%08x\n", hres); ok(sa2->fFeatures == FADF_HAVEVARTYPE ||

1 0

Stefan Dösinger : wined3d: Remove surface_init_sysmem.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 09dbba00d0042dfda38143aee7630f0fe2c31c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09dbba00d0042dfda38143aee… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:16 2014 +0100 wined3d: Remove surface_init_sysmem. --- dlls/wined3d/surface.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 586358a..ec9f586 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1295,24 +1295,6 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win surface_invalidate_location(surface, SFLAG_INBUFFER); } -static BOOL surface_init_sysmem(struct wined3d_surface *surface) -{ - if (surface->user_memory) - return TRUE; - - if (surface->resource.heap_memory) - { - memset(surface->resource.heap_memory, 0, surface->resource.size); - } - else if (!wined3d_resource_allocate_sysmem(&surface->resource)) - { - ERR("Failed to allocate system memory.\n"); - return FALSE; - } - - return TRUE; -} - static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1334,7 +1316,8 @@ static void surface_unload(struct wined3d_resource *resource) * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - surface_init_sysmem(surface); + surface_prepare_system_memory(surface); + memset(surface->resource.heap_memory, 0, surface->resource.size); surface_validate_location(surface, SFLAG_INSYSMEM); surface_invalidate_location(surface, ~SFLAG_INSYSMEM); @@ -2682,6 +2665,7 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, UINT resource_size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, 1); BOOL create_dib = FALSE; HRESULT hr; + DWORD valid_location = 0; TRACE("surface %p, width %u, height %u, format %s, multisample_type %#x, multisample_quality %u.\n", surface, width, height, debug_d3dformat(format_id), multisample_type, multisample_type); @@ -2734,7 +2718,10 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->user_memory = mem; if (surface->user_memory) + { surface->map_binding = SFLAG_INUSERMEM; + valid_location = SFLAG_INUSERMEM; + } surface->pitch = pitch; surface->resource.format = format; surface->resource.multisample_type = multisample_type; @@ -2758,14 +2745,17 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, ERR("Failed to create dib section, hr %#x.\n", hr); return hr; } + if (!valid_location) + valid_location = SFLAG_INDIB; } - if (!surface_init_sysmem(surface)) - return E_OUTOFMEMORY; - if (surface->map_binding == SFLAG_INBUFFER) - surface_validate_location(surface, SFLAG_INSYSMEM); - else - surface_validate_location(surface, surface->map_binding); + if (!valid_location) + { + surface_prepare_system_memory(surface); + valid_location = SFLAG_INSYSMEM; + } + + surface_validate_location(surface, valid_location); return WINED3D_OK; }

1 0

Michael Stefaniuc : dmcompos/tests: Add COM tests for DirectMusicTemplate.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: d3a3deb6605164f29e5ddd4a568c3f5c707a4485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a3deb6605164f29e5ddd4a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:54:08 2014 +0100 dmcompos/tests: Add COM tests for DirectMusicTemplate. --- dlls/dmcompos/tests/dmcompos.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ba07305..ecb7745 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -126,6 +126,46 @@ static void test_COM_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_COM_template(void) +{ + IPersistStream *ps = (IPersistStream*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, (IUnknown*)&ps, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&ps); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicTemplate create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!ps, "ps = %p\n", ps); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&ps); + todo_wine ok(hr == E_NOINTERFACE, + "DirectMusicTemplate create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicTemplate interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicTemplate, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistStream, (void**)&ps); + todo_wine ok(hr == S_OK, "DirectMusicTemplate create failed: %08x, expected S_OK\n", hr); + if (hr != S_OK) { + skip("DirectMusicTemplate not implemented\n"); + return; + } + refcount = IPersistStream_AddRef(ps); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IPersistStream_QueryInterface(ps, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IPersistStream_Release(ps)); +} + static void test_COM_track(void) { IDirectMusicTrack8 *dmt8; @@ -202,6 +242,7 @@ START_TEST(dmcompos) } test_COM(); test_COM_chordmap(); + test_COM_template(); test_COM_track(); CoUninitialize();

1 0