June 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw: Implement surface private data handling on top of wined3d_resource.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: acd8c5872566d7c639c9052aefed5f8b10a3875b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd8c5872566d7c639c9052ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:08 2011 +0200 ddraw: Implement surface private data handling on top of wined3d_resource. --- dlls/ddraw/surface.c | 12 +++++++++--- dlls/wined3d/surface.c | 17 ----------------- dlls/wined3d/wined3d.spec | 3 --- include/wine/wined3d.h | 5 ----- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 412bc29..1b70d7e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1957,13 +1957,15 @@ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *Data, DWORD Size, DWORD Flags) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(tag), Data, Size, Flags); EnterCriticalSection(&ddraw_cs); - hr = wined3d_surface_set_private_data(This->wined3d_surface, tag, Data, Size, Flags); + resource = wined3d_surface_get_resource(This->wined3d_surface); + hr = wined3d_resource_set_private_data(resource, tag, Data, Size, Flags); LeaveCriticalSection(&ddraw_cs); switch(hr) { @@ -2001,6 +2003,7 @@ static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface, static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *Data, DWORD *Size) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, tag %s, data %p, data_size %p.\n", @@ -2010,7 +2013,8 @@ static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - hr = wined3d_surface_get_private_data(This->wined3d_surface, tag, Data, Size); + resource = wined3d_surface_get_resource(This->wined3d_surface); + hr = wined3d_resource_get_private_data(resource, tag, Data, Size); LeaveCriticalSection(&ddraw_cs); return hr; } @@ -2040,12 +2044,14 @@ static HRESULT WINAPI ddraw_surface4_GetPrivateData(IDirectDrawSurface4 *iface, static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface, REFGUID tag) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, tag %s.\n", iface, debugstr_guid(tag)); EnterCriticalSection(&ddraw_cs); - hr = wined3d_surface_free_private_data(This->wined3d_surface, tag); + resource = wined3d_surface_get_resource(This->wined3d_surface); + hr = wined3d_resource_free_private_data(resource, tag); LeaveCriticalSection(&ddraw_cs); return hr; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d3b54c0..945640f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2704,23 +2704,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) return refcount; } -HRESULT CDECL wined3d_surface_set_private_data(struct wined3d_surface *surface, - REFGUID riid, const void *data, DWORD data_size, DWORD flags) -{ - return wined3d_resource_set_private_data(&surface->resource, riid, data, data_size, flags); -} - -HRESULT CDECL wined3d_surface_get_private_data(const struct wined3d_surface *surface, - REFGUID guid, void *data, DWORD *data_size) -{ - return wined3d_resource_get_private_data(&surface->resource, guid, data, data_size); -} - -HRESULT CDECL wined3d_surface_free_private_data(struct wined3d_surface *surface, REFGUID refguid) -{ - return wined3d_resource_free_private_data(&surface->resource, refguid); -} - DWORD CDECL wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD priority) { return resource_set_priority(&surface->resource, priority); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6bb4df8..7131b03 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -209,7 +209,6 @@ @ cdecl wined3d_surface_create(ptr long long long long long long long long long long long ptr ptr ptr) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_flip(ptr ptr long) -@ cdecl wined3d_surface_free_private_data(ptr ptr) @ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_clipper(ptr) @ cdecl wined3d_surface_get_flip_status(ptr long) @@ -218,7 +217,6 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_priority(ptr) -@ cdecl wined3d_surface_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_incref(ptr) @@ -234,7 +232,6 @@ @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_set_palette(ptr ptr) @ cdecl wined3d_surface_set_priority(ptr long) -@ cdecl wined3d_surface_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_surface_unmap(ptr) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 588a7fa..40879ff 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2421,7 +2421,6 @@ HRESULT __cdecl wined3d_surface_create(struct wined3d_device *device, UINT width void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_surface **surface); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_flip(struct wined3d_surface *surface, struct wined3d_surface *override, DWORD flags); -HRESULT __cdecl wined3d_surface_free_private_data(struct wined3d_surface *surface, REFGUID guid); HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); struct wined3d_clipper * __cdecl wined3d_surface_get_clipper(const struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); @@ -2430,8 +2429,6 @@ struct wined3d_palette * __cdecl wined3d_surface_get_palette(const struct wined3 void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_priority(const struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_get_private_data(const struct wined3d_surface *surface, - REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface); @@ -2449,8 +2446,6 @@ HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *m HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority); -HRESULT __cdecl wined3d_surface_set_private_data(struct wined3d_surface *surface, - REFGUID guid, const void *data, DWORD data_size, DWORD flags); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx);

1 0

Henri Verbeet : d3d8: Implement IDirect3DSurface8 private data handling on top of wined3d_resource .
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: f6bfdd47c9b7aaf51d11d18ef8a6a8743eaa0df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bfdd47c9b7aaf51d11d18ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:07 2011 +0200 d3d8: Implement IDirect3DSurface8 private data handling on top of wined3d_resource. --- dlls/d3d8/surface.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 8a07244..dfda50f 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static inline IDirect3DSurface8Impl *impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DSurface8Impl, lpVtbl); +} + /* IDirect3DSurface8 IUnknown parts follow: */ static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; @@ -131,42 +136,53 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, return D3D_OK; } -static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(IDirect3DSurface8 *iface, REFGUID guid, + const void *data, DWORD data_size, DWORD flags) +{ + IDirect3DSurface8Impl *surface = impl_from_IDirect3DSurface8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", - iface, debugstr_guid(refguid), pData, SizeOfData, Flags); + iface, debugstr_guid(guid), data, data_size, flags); wined3d_mutex_lock(); - hr = wined3d_surface_set_private_data(This->wined3d_surface, refguid, pData, SizeOfData, Flags); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(IDirect3DSurface8 *iface, REFGUID guid, + void *data, DWORD *data_size) +{ + IDirect3DSurface8Impl *surface = impl_from_IDirect3DSurface8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", - iface, debugstr_guid(refguid), pData, pSizeOfData); + iface, debugstr_guid(guid), data, data_size); wined3d_mutex_lock(); - hr = wined3d_surface_get_private_data(This->wined3d_surface, refguid, pData, pSizeOfData); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_get_private_data(resource, guid, data, data_size); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(IDirect3DSurface8 *iface, REFGUID guid) +{ + IDirect3DSurface8Impl *surface = impl_from_IDirect3DSurface8(iface); + struct wined3d_resource *resource; HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); wined3d_mutex_lock(); - hr = wined3d_surface_free_private_data(This->wined3d_surface, refguid); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_free_private_data(resource, guid); wined3d_mutex_unlock(); return hr;

1 0

Vincent Povirk : gdiplus: Properly clean up the new metafile data.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 698fddf99b01560ebfdc1f4a827398778dccaa64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698fddf99b01560ebfdc1f4a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 21 12:48:11 2011 -0500 gdiplus: Properly clean up the new metafile data. --- dlls/gdiplus/image.c | 16 +++++++++++++++- dlls/gdiplus/metafile.c | 4 ++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 10376f5..161a5b3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2027,7 +2027,21 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) DeleteDC(((GpBitmap*)image)->hdc); DeleteObject(((GpBitmap*)image)->hbitmap); } - else if (image->type != ImageTypeMetafile) + else if (image->type == ImageTypeMetafile) + { + GpMetafile *metafile = (GpMetafile*)image; + GdipFree(metafile->comment_data); + DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); + DeleteEnhMetaFile(metafile->hemf); + if (metafile->record_graphics) + { + WARN("metafile closed while recording\n"); + /* not sure what to do here; for now just prevent the graphics from functioning or using this object */ + metafile->record_graphics->image = NULL; + metafile->record_graphics->busy = TRUE; + } + } + else { WARN("invalid image: %p\n", image); return ObjectBusy; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 26dba93..322aecf 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -307,6 +307,10 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) metafile->hemf = CloseEnhMetaFile(metafile->record_dc); metafile->record_dc = NULL; + GdipFree(metafile->comment_data); + metafile->comment_data = NULL; + metafile->comment_data_size = 0; + return stat; }

1 0

Matteo Bruni : wined3d: Fix context_apply_blit_state().
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 5b67bd4fb266856a54a152036b87f6c674f665f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b67bd4fb266856a54a152036… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 21 18:08:27 2011 +0200 wined3d: Fix context_apply_blit_state(). --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 40b9cee..872ba03 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2129,7 +2129,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, 1, &context->current_rt); + context_apply_draw_buffers(context, rt_mask, &context->current_rt); context->draw_buffers_mask = rt_mask; }

1 0

Michael Stefaniuc : mscoree: COM cleanup in corruntimehost.c.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: e79e6e30f46c1a719fb47b443abfc844a6ee911b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79e6e30f46c1a719fb47b443… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:54:50 2011 +0200 mscoree: COM cleanup in corruntimehost.c. --- dlls/mscoree/corruntimehost.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 607537c..146dd23 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -45,8 +45,8 @@ DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0x struct RuntimeHost { - const struct ICorRuntimeHostVtbl *lpVtbl; - const struct ICLRRuntimeHostVtbl *lpCLRHostVtbl; + ICorRuntimeHost ICorRuntimeHost_iface; + ICLRRuntimeHost ICLRRuntimeHost_iface; const CLRRuntimeInfo *version; loaded_mono *mono; struct list domains; @@ -207,12 +207,12 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d static inline RuntimeHost *impl_from_ICLRRuntimeHost( ICLRRuntimeHost *iface ) { - return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpCLRHostVtbl)); + return CONTAINING_RECORD(iface, RuntimeHost, ICLRRuntimeHost_iface); } static inline RuntimeHost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) { - return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpVtbl)); + return CONTAINING_RECORD(iface, RuntimeHost, ICorRuntimeHost_iface); } /*** IUnknown methods ***/ @@ -476,13 +476,13 @@ static HRESULT WINAPI CLRRuntimeHost_QueryInterface(ICLRRuntimeHost* iface, static ULONG WINAPI CLRRuntimeHost_AddRef(ICLRRuntimeHost* iface) { RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); - return IUnknown_AddRef((IUnknown*)&This->lpVtbl); + return ICorRuntimeHost_AddRef(&This->ICorRuntimeHost_iface); } static ULONG WINAPI CLRRuntimeHost_Release(ICLRRuntimeHost* iface) { RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); - return IUnknown_Release((IUnknown*)&This->lpVtbl); + return ICorRuntimeHost_Release(&This->ICorRuntimeHost_iface); } static HRESULT WINAPI CLRRuntimeHost_Start(ICLRRuntimeHost* iface) @@ -794,8 +794,8 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, if ( !This ) return E_OUTOFMEMORY; - This->lpVtbl = &corruntimehost_vtbl; - This->lpCLRHostVtbl = &CLRHostVtbl; + This->ICorRuntimeHost_iface.lpVtbl = &corruntimehost_vtbl; + This->ICLRRuntimeHost_iface.lpVtbl = &CLRHostVtbl; This->ref = 1; This->version = runtime_version; This->mono = loaded_mono; @@ -816,12 +816,12 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) { - unk = (IUnknown*)&This->lpVtbl; + unk = (IUnknown*)&This->ICorRuntimeHost_iface; IUnknown_AddRef(unk); } else if (IsEqualGUID(clsid, &CLSID_CLRRuntimeHost)) { - unk = (IUnknown*)&This->lpCLRHostVtbl; + unk = (IUnknown*)&This->ICLRRuntimeHost_iface; IUnknown_AddRef(unk); } else if (IsEqualGUID(clsid, &CLSID_CorMetaDataDispenser) ||

1 0

Michael Mc Donnell : d3dx9/tests: Add UpdateSemantics test.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 4df270a8bd3c4f7302230952a2abbfc232183a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df270a8bd3c4f7302230952a… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Tue May 24 19:43:47 2011 +0200 d3dx9/tests: Add UpdateSemantics test. --- dlls/d3dx9_36/tests/mesh.c | 418 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 418 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4df270a8bd3c4f7302230…

1 0

Henri Verbeet : d3d9: Implement IDirect3DSurface9 private data handling on top of wined3d_resource .
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 0dd6b20af625f23f2d743e0d80d6f7e44fa36b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd6b20af625f23f2d743e0d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:06 2011 +0200 d3d9: Implement IDirect3DSurface9 private data handling on top of wined3d_resource. --- dlls/d3d9/surface.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 1d66bde..a4111ff 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static inline IDirect3DSurface9Impl *impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DSurface9Impl, lpVtbl); +} + /* IDirect3DSurface9 IUnknown parts follow: */ static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; @@ -133,42 +138,53 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(IDirect3DSurface9 *iface, return D3D_OK; } -static HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(IDirect3DSurface9 *iface, REFGUID guid, + const void *data, DWORD data_size, DWORD flags) +{ + IDirect3DSurface9Impl *surface = impl_from_IDirect3DSurface9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", - iface, debugstr_guid(refguid), pData, SizeOfData, Flags); + iface, debugstr_guid(guid), data, data_size, flags); wined3d_mutex_lock(); - hr = wined3d_surface_set_private_data(This->wined3d_surface, refguid, pData, SizeOfData, Flags); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(IDirect3DSurface9 *iface, REFGUID guid, + void *data, DWORD *data_size) +{ + IDirect3DSurface9Impl *surface = impl_from_IDirect3DSurface9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", - iface, debugstr_guid(refguid), pData, pSizeOfData); + iface, debugstr_guid(guid), data, data_size); wined3d_mutex_lock(); - hr = wined3d_surface_get_private_data(This->wined3d_surface, refguid, pData, pSizeOfData); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_get_private_data(resource, guid, data, data_size); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(IDirect3DSurface9 *iface, REFGUID guid) +{ + IDirect3DSurface9Impl *surface = impl_from_IDirect3DSurface9(iface); + struct wined3d_resource *resource; HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); wined3d_mutex_lock(); - hr = wined3d_surface_free_private_data(This->wined3d_surface, refguid); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_free_private_data(resource, guid); wined3d_mutex_unlock(); return hr;

1 0

André Hentschel : Fix a typo
by Jeremy Newman June 21, 2011

June 21, 2011

Module: website Branch: master Commit: 0ba3771e41ed53406245ab09a1608be73ca69494 URL: http://source.winehq.org/git/website.git/?a=commit;h=0ba3771e41ed53406245ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 21 00:30:26 2011 +0200 Fix a typo --- templates/de/documentation.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/documentation.template b/templates/de/documentation.template index 825aa2b..e66c6f2 100644 --- a/templates/de/documentation.template +++ b/templates/de/documentation.template @@ -18,7 +18,7 @@ <li> <a href="{$root}/docs/winelib-guide/index">Winelib Benutzerhandbuch (en)</a> - Wine man Wine benutzt um Windows Anwendungen nach Linux zu portieren. + Wie man Wine benutzt um Windows Anwendungen nach Linux zu portieren.    Formate: <a href="{$root}/docs/winelib-guide/index">Online</a> | <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.html">HTML</a> |

1 0

Jacek Caban : jscript: Correctly handle forin statement on pure IDispatch object.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 42c2bd7bd99d4e49e5b6b2c45aef303604f3c0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c2bd7bd99d4e49e5b6b2c45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 17:45:50 2011 +0200 jscript: Correctly handle forin statement on pure IDispatch object. --- dlls/jscript/engine.c | 5 ++- dlls/jscript/tests/lang.js | 3 ++ dlls/jscript/tests/run.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1b56e63..89523bb 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -884,8 +884,9 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ hres = IDispatch_QueryInterface(V_DISPATCH(&val), &IID_IDispatchEx, (void**)&in_obj); IDispatch_Release(V_DISPATCH(&val)); if(FAILED(hres)) { - FIXME("Object doesn't support IDispatchEx\n"); - return E_NOTIMPL; + TRACE("Object doesn't support IDispatchEx\n"); + V_VT(ret) = VT_EMPTY; + return S_OK; } V_VT(&retv) = VT_EMPTY; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bf74ed7..b71d80d 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -205,6 +205,9 @@ for(var iter in null) for(var iter in false) ok(false, "unexpected forin call, test = " + iter); +for(var iter in pureDisp) + ok(false, "unexpected forin call in pureDisp object"); + tmp = 0; if(true) tmp = 1; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 18252be..88c69ef 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -90,6 +90,7 @@ DEFINE_EXPECT(invoke_func); #define DISPID_GLOBAL_PROPGETFUNC 0x100d #define DISPID_GLOBAL_OBJECT_FLAG 0x100e #define DISPID_GLOBAL_ISWIN64 0x100f +#define DISPID_GLOBAL_PUREDISP 0x1010 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -324,6 +325,29 @@ static IDispatchExVtbl testObjVtbl = { static IDispatchEx testObj = { &testObjVtbl }; +static HRESULT WINAPI pureDisp_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDispatch)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static IDispatchExVtbl pureDispVtbl = { + pureDisp_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke +}; + +static IDispatchEx pureDisp = { &pureDispVtbl }; + static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { if(!strcmp_wa(bstrName, "ok")) { @@ -417,6 +441,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "pureDisp")) { + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_PUREDISP; + return S_OK; + } + if(strict_dispid_check) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -566,6 +596,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + case DISPID_GLOBAL_PUREDISP: + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&pureDisp; + return S_OK; + case DISPID_GLOBAL_NULL_BSTR: if(pvarRes) { V_VT(pvarRes) = VT_BSTR;

1 0

Aric Stewart : usp10: Correct Post Base glyph index shifting.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 648b7f2afa2afe114a381f0c9a2e18319cc218ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=648b7f2afa2afe114a381f0c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 21 10:07:49 2011 -0500 usp10: Correct Post Base glyph index shifting. --- dlls/usp10/shape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index cbe186a..104757c 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2097,7 +2097,6 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa { INT index, nextIndex; INT count, g_offset; - INT prevCount = *pcGlyphs; count = syllable->end - syllable->base; @@ -2109,12 +2108,13 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa while (index >= 0) { + INT prevCount = *pcGlyphs; nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->base+g_offset, 1, pcGlyphs, feat); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); + shift_syllable_glyph_indexs(glyph_index,index+glyph_index->start+g_offset, (*pcGlyphs - prevCount)); g_offset += (*pcGlyphs - prevCount); - shift_syllable_glyph_indexs(glyph_index,index+glyph_index->start, g_offset); } index+=2;

1 0