January 2014 - Wine-Commits

Stefan Dösinger : wined3d: Start to split up surface_prepare_system_memory.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: e2c0bc63cb95b83386b192e6e130abbc9a0c8a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c0bc63cb95b83386b192e6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:02 2014 +0100 wined3d: Start to split up surface_prepare_system_memory. --- dlls/wined3d/surface.c | 35 ++++++++++++++++++++++++++--------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ac2241..a3c3ebf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,7 +589,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win context_release(context); } -void surface_prepare_system_memory(struct wined3d_surface *surface) +static void surface_prepare_system_memory(struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; @@ -597,8 +597,7 @@ void surface_prepare_system_memory(struct wined3d_surface *surface) if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO - || surface->user_memory)) + else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -611,6 +610,24 @@ void surface_prepare_system_memory(struct wined3d_surface *surface) } } +void surface_prepare_map_memory(struct wined3d_surface *surface) +{ + switch (surface->map_binding) + { + case SFLAG_INUSERMEM: + if (!surface->user_memory) + ERR("Map binding is set to SFLAG_INUSERMEM but surface->user_memory is NULL.\n"); + break; + + case SFLAG_INSYSMEM: + surface_prepare_system_memory(surface); + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + } +} + static void surface_evict_sysmem(struct wined3d_surface *surface) { if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) @@ -767,7 +784,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -803,7 +820,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); @@ -1392,7 +1409,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -2323,7 +2340,7 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ @@ -5024,7 +5041,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5034,7 +5051,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 090290f..897af19 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,7 +735,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce1711b..985f86f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,7 +2273,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; -void surface_prepare_system_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Make the callers of load_location responsible for allocating sysmem.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 676a7f2140aaefa50358001dbec89cc9a8d591e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676a7f2140aaefa50358001db… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:01 2014 +0100 wined3d: Make the callers of load_location responsible for allocating sysmem. --- dlls/wined3d/surface.c | 12 ++++++++---- dlls/wined3d/texture.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7023bd7..5ac2241 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,7 +589,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win context_release(context); } -static void surface_prepare_system_memory(struct wined3d_surface *surface) +void surface_prepare_system_memory(struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; @@ -767,6 +767,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -802,10 +803,10 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); + surface_prepare_system_memory(surface); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); - surface_prepare_system_memory(surface); surface_validate_location(surface, surface->map_binding); } else @@ -1391,6 +1392,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -2321,6 +2323,7 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ @@ -4907,8 +4910,6 @@ static DWORD resource_access_from_location(DWORD location) static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - surface_prepare_system_memory(surface); - if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) surface_load_location(surface, SFLAG_INTEXTURE); @@ -5023,6 +5024,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5032,6 +5034,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5040,6 +5043,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); /* Lets hope we get it from somewhere... */ + surface_prepare_system_memory(surface); surface_load_location(surface, SFLAG_INSYSMEM); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f06db6d..090290f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,6 +735,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a57e11b..ce1711b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,6 +2273,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; +void surface_prepare_system_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Akihiro Sagawa : gdi32: Fix sub-pixel shift calculations for vertical writing.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: e9188970a78336358c7f160d78c5705ab230c974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9188970a78336358c7f160d7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:54 2014 +0900 gdi32: Fix sub-pixel shift calculations for vertical writing. --- dlls/gdi32/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1c3e6fc..f8b365b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6790,7 +6790,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vmul = 3; } - x_shift = ft_face->glyph->bitmap_left - gm.gmptGlyphOrigin.x; + x_shift = ft_face->glyph->bitmap_left - (left >> 6); if ( x_shift < 0 ) { src += hmul * -x_shift; @@ -6802,7 +6802,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width -= x_shift; } - y_shift = gm.gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; + y_shift = (top >> 6) - ft_face->glyph->bitmap_top; if ( y_shift < 0 ) { src += src_pitch * vmul * -y_shift;

1 0

Alexandre Julliard : makedep: Expand tool names into the generated rules.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 7d1d9b40f105a4eb26421a254f19302484d7d37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1d9b40f105a4eb26421a254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 15:04:30 2014 +0100 makedep: Expand tool names into the generated rules. --- Make.vars.in | 5 ---- tools/makedep.c | 77 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d1d9b40f105a4eb26421…

1 0

Bruno Jesus : iphlpapi: Return error for IP address with value zero in IcmpSendEcho.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 1470d7b4cc607976b7d379d5ce594f65b3ca3c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1470d7b4cc607976b7d379d5c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 9 20:45:37 2014 -0200 iphlpapi: Return error for IP address with value zero in IcmpSendEcho. --- dlls/iphlpapi/icmp.c | 5 +++++ dlls/iphlpapi/tests/iphlpapi.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 7d84811..abd8ddc 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -239,6 +239,11 @@ DWORD WINAPI IcmpSendEcho( } /* check the request size against SO_MAX_MSG_SIZE using getsockopt */ + if (!DestinationAddress) { + SetLastError(ERROR_INVALID_NETNAME); + return 0; + } + /* Prepare the request */ id=getpid() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 94716d7..13a21c0 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -906,12 +906,10 @@ todo_wine SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_NETNAME || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, "expected 1214, got %d\n", error); - } address = htonl(INADDR_LOOPBACK); if (0) /* crashes in XP */

1 0

Alexandre Julliard : msvcp71: Import the correct msvcrt version.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 0d72182bd80a18799022d75a3cc8a66c4912618e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d72182bd80a18799022d75a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:52:28 2014 +0100 msvcp71: Import the correct msvcrt version. --- dlls/msvcp71/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp71/Makefile.in b/dlls/msvcp71/Makefile.in index 03ce2cb..dfa0a2b 100644 --- a/dlls/msvcp71/Makefile.in +++ b/dlls/msvcp71/Makefile.in @@ -1,5 +1,5 @@ MODULE = msvcp71.dll -IMPORTS = msvcrt +IMPORTS = msvcr71 EXTRADEFS = -D_MSVCP_VER=71 PARENTSRC = ../msvcp90

1 0

Michael Stefaniuc : dmscript: Include the DMUS_OBJECTDESC directly into DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: ae81a130d24f549433903e38ba50f1752a022fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae81a130d24f549433903e38b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:16:23 2014 +0100 dmscript: Include the DMUS_OBJECTDESC directly into DirectMusicScriptTrack. --- dlls/dmscript/scripttrack.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 86e5521..ddae8b5 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -29,7 +29,7 @@ typedef struct DirectMusicScriptTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; IPersistStream IPersistStream_iface; LONG ref; - LPDMUS_OBJECTDESC pDesc; + DMUS_OBJECTDESC desc; } DirectMusicScriptTrack; static inline DirectMusicScriptTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) @@ -318,10 +318,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; - track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(track->pDesc); - track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - track->pDesc->guidClass = CLSID_DirectMusicScriptTrack; + track->desc.dwSize = sizeof(track->desc); + track->desc.dwValidData |= DMUS_OBJ_CLASS; + track->desc.guidClass = CLSID_DirectMusicScriptTrack; track->ref = 1; DMSCRIPT_LockModule();

1 0

Michael Stefaniuc : dmscript: Remove the extraneous IUnknown from DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: a5135bdc59c1dcb5d6ffd57a4dbecc9fd44dc077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5135bdc59c1dcb5d6ffd57a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:14:33 2014 +0100 dmscript: Remove the extraneous IUnknown from DirectMusicScriptTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmscript/scripttrack.c | 118 +++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 72 deletions(-) diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 63ab577..86e5521 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -26,15 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); */ typedef struct DirectMusicScriptTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; IPersistStream IPersistStream_iface; LONG ref; LPDMUS_OBJECTDESC pDesc; } DirectMusicScriptTrack; -typedef struct DirectMusicScriptTrack IDirectMusicScriptTrack; - static inline DirectMusicScriptTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { return CONTAINING_RECORD(iface, DirectMusicScriptTrack, IDirectMusicTrack8_iface); @@ -45,80 +42,53 @@ static inline DirectMusicScriptTrack *impl_from_IPersistStream(IPersistStream *i return CONTAINING_RECORD(iface, DirectMusicScriptTrack, IPersistStream_iface); } -/* IDirectMusicScriptTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, UnknownVtbl, iface); - - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IDirectMusicTrack_AddRef(&This->IDirectMusicTrack8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->IPersistStream_iface; - IPersistStream_AddRef(&This->IPersistStream_iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicScriptTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSCRIPT_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicScriptTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMSCRIPT_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicScriptTrack_Unknown_Vtbl = { - IDirectMusicScriptTrack_IUnknown_QueryInterface, - IDirectMusicScriptTrack_IUnknown_AddRef, - IDirectMusicScriptTrack_IUnknown_Release -}; - -/* IDirectMusicScriptTrack IDirectMusicTrack8 part: */ +/* DirectMusicScriptTrack IDirectMusicTrack8 part: */ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ret_iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->IPersistStream_iface; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { DirectMusicScriptTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicScriptTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMSCRIPT_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -274,22 +244,22 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicScriptTrack IPersistStream part: */ static HRESULT WINAPI IPersistStreamImpl_QueryInterface(IPersistStream *iface, REFIID riid, - void **ppobj) + void **ret_iface) { DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); - return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ret_iface); } static ULONG WINAPI IPersistStreamImpl_AddRef(IPersistStream *iface) { DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); - return IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IPersistStreamImpl_Release(IPersistStream *iface) { DirectMusicScriptTrack *This = impl_from_IPersistStream(iface); - return IDirectMusicScriptTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IPersistStreamImpl_GetClassID(IPersistStream *iface, CLSID *pClassID) @@ -331,12 +301,13 @@ static const IPersistStreamVtbl persist_vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(LPCGUID lpcGUID, void **ppobj, +HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(REFIID riid, void **ret_iface, IUnknown *pUnkOuter) { DirectMusicScriptTrack *track; + HRESULT hr; - *ppobj = NULL; + *ret_iface = NULL; if (pUnkOuter) return CLASS_E_NOAGGREGATION; @@ -345,14 +316,17 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack(LPCGUID lpcGUID, void **ppobj if (!track) return E_OUTOFMEMORY; - track->UnknownVtbl = &DirectMusicScriptTrack_Unknown_Vtbl; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IPersistStream_iface.lpVtbl = &persist_vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicScriptTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMSCRIPT_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, riid, ret_iface); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmscript: Remove the superfluous " IDirectMusicScriptTrack" from method names.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: c56151fa7b1c9a9092129b318c6e4b161009089a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56151fa7b1c9a9092129b318… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:08:13 2014 +0100 dmscript: Remove the superfluous "IDirectMusicScriptTrack" from method names. --- dlls/dmscript/scripttrack.c | 148 ++++++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c56151fa7b1c9a9092129…

1 0

Alexandre Julliard : msvcp90: Don' t build the new-style string iterator functions for old msvcp versions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 581dd68c8a8c7660d1b5b2ce42608a6824507279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581dd68c8a8c7660d1b5b2ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:56:02 2014 +0100 msvcp90: Don't build the new-style string iterator functions for old msvcp versions. --- dlls/msvcp90/string.c | 1288 +++++++++++++++++++++++++------------------------ 1 file changed, 650 insertions(+), 638 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=581dd68c8a8c7660d1b5b…

1 0