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

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DTexture interface.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 91a1ed8be9be70fc8d4256cc713dfb77fabc551e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a1ed8be9be70fc8d4256cc7… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Wed Jul 27 17:45:13 2011 +0300 ddraw: COM cleanup for IDirect3DTexture interface. --- dlls/ddraw/ddraw_private.h | 6 +++--- dlls/ddraw/surface.c | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6f17912..0c9c41b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -159,7 +159,7 @@ struct IDirectDrawSurfaceImpl IDirectDrawSurface IDirectDrawSurface_iface; IDirectDrawGammaControl IDirectDrawGammaControl_iface; const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; - const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; + IDirect3DTexture IDirect3DTexture_iface; LONG ref7, ref4, ref3, ref2, ref1, iface_count, gamma_count; IUnknown *ifaceToRelease; @@ -214,9 +214,9 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; -static inline IDirectDrawSurfaceImpl *surface_from_texture1(IDirect3DTexture *iface) +static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture(IDirect3DTexture *iface) { - return (IDirectDrawSurfaceImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirect3DTexture_vtbl)); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture_iface); } static inline IDirectDrawSurfaceImpl *surface_from_texture2(IDirect3DTexture2 *iface) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d0e0ab2..e4c7436 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -141,7 +141,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { if (IsEqualGUID( &IID_IDirect3DTexture, riid )) { - *obj = &This->IDirect3DTexture_vtbl; + *obj = &This->IDirect3DTexture_iface; TRACE(" returning Direct3DTexture interface at %p.\n", *obj); } else @@ -209,7 +209,7 @@ static HRESULT WINAPI d3d_texture2_QueryInterface(IDirect3DTexture2 *iface, REFI static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFIID riid, void **object) { - IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); @@ -340,7 +340,7 @@ static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) { - IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture(iface); TRACE("iface %p.\n", iface); return ddraw_surface1_AddRef(&This->IDirectDrawSurface_iface); @@ -623,7 +623,7 @@ static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) { - IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture(iface); TRACE("iface %p.\n", iface); return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); @@ -4450,7 +4450,7 @@ static HRESULT WINAPI d3d_texture2_PaletteChanged(IDirect3DTexture2 *iface, DWOR static HRESULT WINAPI d3d_texture1_PaletteChanged(IDirect3DTexture *iface, DWORD start, DWORD count) { - IDirectDrawSurfaceImpl *surface = surface_from_texture1(iface); + IDirectDrawSurfaceImpl *surface = impl_from_IDirect3DTexture(iface); TRACE("iface %p, start %u, count %u.\n", iface, start, count); @@ -4521,12 +4521,12 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, static HRESULT WINAPI d3d_texture1_GetHandle(IDirect3DTexture *iface, IDirect3DDevice *device, D3DTEXTUREHANDLE *handle) { - IDirect3DTexture2 *texture2 = (IDirect3DTexture2 *)&surface_from_texture1(iface)->IDirect3DTexture2_vtbl; + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture(iface); IDirect3DDevice2 *device2 = (IDirect3DDevice2 *)&device_from_device1(device)->IDirect3DDevice2_vtbl; TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return d3d_texture2_GetHandle(texture2, device2, handle); + return d3d_texture2_GetHandle((IDirect3DTexture2 *)&This->IDirect3DTexture2_vtbl, device2, handle); } /***************************************************************************** @@ -4703,10 +4703,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu static HRESULT WINAPI d3d_texture1_Load(IDirect3DTexture *iface, IDirect3DTexture *src_texture) { + IDirectDrawSurfaceImpl* This = impl_from_IDirect3DTexture(iface); IDirectDrawSurfaceImpl* src_surface = unsafe_impl_from_IDirect3DTexture(src_texture); TRACE("iface %p, src_texture %p.\n", iface, src_texture); - return d3d_texture2_Load((IDirect3DTexture2 *)&surface_from_texture1(iface)->IDirect3DTexture2_vtbl, + return d3d_texture2_Load((IDirect3DTexture2 *)&This->IDirect3DTexture2_vtbl, src_surface ? (IDirect3DTexture2 *)&src_surface->IDirect3DTexture2_vtbl : NULL); } @@ -5033,7 +5034,7 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *ifac { if (!iface) return NULL; assert(iface->lpVtbl == &d3d_texture1_vtbl); - return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture_iface); } static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *parent) @@ -5200,7 +5201,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->IDirectDrawSurface_iface.lpVtbl = &ddraw_surface1_vtbl; surface->IDirectDrawGammaControl_iface.lpVtbl = &ddraw_gamma_control_vtbl; surface->IDirect3DTexture2_vtbl = &d3d_texture2_vtbl; - surface->IDirect3DTexture_vtbl = &d3d_texture1_vtbl; + surface->IDirect3DTexture_iface.lpVtbl = &d3d_texture1_vtbl; surface->iface_count = 1; surface->version = version; surface->ddraw = ddraw;

1 0

Ričardas Barkauskas : ddraw: Rename surface_from_texture2 to impl_from_IDirect3DTexture2.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 8000fc4e35697d3ae5bee5a3fc127a00d32f1327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8000fc4e35697d3ae5bee5a3f… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Jul 29 18:52:33 2011 +0300 ddraw: Rename surface_from_texture2 to impl_from_IDirect3DTexture2. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/surface.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b7ab198..7fcefc9 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -219,9 +219,9 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture(IDirect3DTextur return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture_iface); } -static inline IDirectDrawSurfaceImpl *surface_from_texture2(IDirect3DTexture2 *iface) +static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) { - return (IDirectDrawSurfaceImpl *)((char*)iface - FIELD_OFFSET(IDirectDrawSurfaceImpl, IDirect3DTexture2_vtbl)); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture2_vtbl); } static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a7722d7..0b793ab 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -201,7 +201,7 @@ static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl static HRESULT WINAPI d3d_texture2_QueryInterface(IDirect3DTexture2 *iface, REFIID riid, void **object) { - IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture2(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); return ddraw_surface7_QueryInterface(&This->IDirectDrawSurface7_iface, riid, object); @@ -332,7 +332,7 @@ static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) { - IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture2(iface); TRACE("iface %p.\n", iface); return ddraw_surface1_AddRef(&This->IDirectDrawSurface_iface); @@ -615,7 +615,7 @@ static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) { - IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *This = impl_from_IDirect3DTexture2(iface); TRACE("iface %p.\n", iface); return ddraw_surface1_Release(&This->IDirectDrawSurface_iface); @@ -4491,7 +4491,7 @@ static HRESULT WINAPI d3d_texture1_Unload(IDirect3DTexture *iface) static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) { - IDirectDrawSurfaceImpl *surface = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *surface = impl_from_IDirect3DTexture2(iface); TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); @@ -4571,7 +4571,7 @@ static IDirectDrawSurfaceImpl *get_sub_mimaplevel(IDirectDrawSurfaceImpl *surfac *****************************************************************************/ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTexture2 *src_texture) { - IDirectDrawSurfaceImpl *dst_surface = surface_from_texture2(iface); + IDirectDrawSurfaceImpl *dst_surface = impl_from_IDirect3DTexture2(iface); IDirectDrawSurfaceImpl *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture); HRESULT hr;

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DTexture2 for application provided interfaces .
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 15f16e8f5eaf71fa274f2e88eabf45569bd64ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f16e8f5eaf71fa274f2e88e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Jul 29 16:30:32 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DTexture2 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 6 +++--- dlls/ddraw/surface.c | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0c9c41b..b7ab198 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -254,6 +254,7 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) DECLSPEC_HIDDEN; +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) DECLSPEC_HIDDEN; /* Get the number of bytes per pixel for a given surface */ #define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index eb45099..3cd0a60 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -544,8 +544,8 @@ IDirect3DDeviceImpl_2_SwapTextureHandles(IDirect3DDevice2 *iface, IDirect3DTexture2 *Tex2) { IDirect3DDeviceImpl *This = device_from_device2(iface); - IDirectDrawSurfaceImpl *surf1 = surface_from_texture2(Tex1); - IDirectDrawSurfaceImpl *surf2 = surface_from_texture2(Tex2); + IDirectDrawSurfaceImpl *surf1 = unsafe_impl_from_IDirect3DTexture2(Tex1); + IDirectDrawSurfaceImpl *surf2 = unsafe_impl_from_IDirect3DTexture2(Tex2); DWORD h1, h2; TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, Tex1, Tex2); @@ -4564,7 +4564,7 @@ IDirect3DDeviceImpl_3_SetTexture(IDirect3DDevice3 *iface, IDirect3DTexture2 *Texture2) { IDirect3DDeviceImpl *This = device_from_device3(iface); - IDirectDrawSurfaceImpl *tex = Texture2 ? surface_from_texture2(Texture2) : NULL; + IDirectDrawSurfaceImpl *tex = unsafe_impl_from_IDirect3DTexture2(Texture2); DWORD texmapblend; HRESULT hr; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e4c7436..a7722d7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4572,7 +4572,7 @@ static IDirectDrawSurfaceImpl *get_sub_mimaplevel(IDirectDrawSurfaceImpl *surfac static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTexture2 *src_texture) { IDirectDrawSurfaceImpl *dst_surface = surface_from_texture2(iface); - IDirectDrawSurfaceImpl *src_surface = surface_from_texture2(src_texture); + IDirectDrawSurfaceImpl *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture); HRESULT hr; TRACE("iface %p, src_texture %p.\n", iface, src_texture); @@ -5030,6 +5030,13 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface * return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawSurface_iface); } +IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_texture2_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture2_vtbl); +} + IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) { if (!iface) return NULL;

1 0

Ričardas Barkauskas : ddraw: Change IDirect3DTexture2_vtbl to IDirect3DTexture2_iface.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: c1aaacd58c505548351defcb1077c65e8bd59fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1aaacd58c505548351defcb1… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Fri Jul 29 18:55:50 2011 +0300 ddraw: Change IDirect3DTexture2_vtbl to IDirect3DTexture2_iface. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/surface.c | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7fcefc9..d8a8eb8 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -158,7 +158,7 @@ struct IDirectDrawSurfaceImpl IDirectDrawSurface2 IDirectDrawSurface2_iface; IDirectDrawSurface IDirectDrawSurface_iface; IDirectDrawGammaControl IDirectDrawGammaControl_iface; - const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; + IDirect3DTexture2 IDirect3DTexture2_iface; IDirect3DTexture IDirect3DTexture_iface; LONG ref7, ref4, ref3, ref2, ref1, iface_count, gamma_count; @@ -221,7 +221,7 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture(IDirect3DTextur static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) { - return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture2_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture2_iface); } static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawSurface(IDirectDrawSurface *iface) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3cd0a60..28e1eaf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -570,8 +570,8 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice * IDirect3DDeviceImpl *This = device_from_device1(iface); IDirectDrawSurfaceImpl *surf1 = unsafe_impl_from_IDirect3DTexture(D3DTex1); IDirectDrawSurfaceImpl *surf2 = unsafe_impl_from_IDirect3DTexture(D3DTex2); - IDirect3DTexture2 *t1 = surf1 ? (IDirect3DTexture2 *)&surf1->IDirect3DTexture2_vtbl : NULL; - IDirect3DTexture2 *t2 = surf2 ? (IDirect3DTexture2 *)&surf2->IDirect3DTexture2_vtbl : NULL; + IDirect3DTexture2 *t1 = surf1 ? &surf1->IDirect3DTexture2_iface : NULL; + IDirect3DTexture2 *t2 = surf2 ? &surf2->IDirect3DTexture2_iface : NULL; TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, D3DTex1, D3DTex2); @@ -2780,7 +2780,7 @@ IDirect3DDeviceImpl_3_SetRenderState(IDirect3DDevice3 *iface, break; } - hr = IDirect3DDevice3_SetTexture(iface, 0, (IDirect3DTexture2 *)&surf->IDirect3DTexture2_vtbl); + hr = IDirect3DDevice3_SetTexture(iface, 0, &surf->IDirect3DTexture2_iface); break; } @@ -4493,7 +4493,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTexture(IDirect3DDevice3 *iface, ret = IDirect3DDevice7_GetTexture((IDirect3DDevice7 *)device_from_device3(iface), Stage, &ret_val); ret_val_impl = unsafe_impl_from_IDirectDrawSurface7(ret_val); - *Texture2 = ret_val_impl ? (IDirect3DTexture2 *)&ret_val_impl->IDirect3DTexture2_vtbl : NULL; + *Texture2 = ret_val_impl ? &ret_val_impl->IDirect3DTexture2_iface : NULL; TRACE("Returning texture %p.\n", *Texture2); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0b793ab..7aec492 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -146,7 +146,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, } else { - *obj = &This->IDirect3DTexture2_vtbl; + *obj = &This->IDirect3DTexture2_iface; TRACE(" returning Direct3DTexture2 interface at %p.\n", *obj); } IUnknown_AddRef( (IUnknown *) *obj); @@ -4454,7 +4454,7 @@ static HRESULT WINAPI d3d_texture1_PaletteChanged(IDirect3DTexture *iface, DWORD TRACE("iface %p, start %u, count %u.\n", iface, start, count); - return d3d_texture2_PaletteChanged((IDirect3DTexture2 *)&surface->IDirect3DTexture2_vtbl, start, count); + return d3d_texture2_PaletteChanged(&surface->IDirect3DTexture2_iface, start, count); } /***************************************************************************** @@ -4526,7 +4526,7 @@ static HRESULT WINAPI d3d_texture1_GetHandle(IDirect3DTexture *iface, TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return d3d_texture2_GetHandle((IDirect3DTexture2 *)&This->IDirect3DTexture2_vtbl, device2, handle); + return d3d_texture2_GetHandle(&This->IDirect3DTexture2_iface, device2, handle); } /***************************************************************************** @@ -4707,8 +4707,8 @@ static HRESULT WINAPI d3d_texture1_Load(IDirect3DTexture *iface, IDirect3DTextur IDirectDrawSurfaceImpl* src_surface = unsafe_impl_from_IDirect3DTexture(src_texture); TRACE("iface %p, src_texture %p.\n", iface, src_texture); - return d3d_texture2_Load((IDirect3DTexture2 *)&This->IDirect3DTexture2_vtbl, - src_surface ? (IDirect3DTexture2 *)&src_surface->IDirect3DTexture2_vtbl : NULL); + return d3d_texture2_Load(&This->IDirect3DTexture2_iface, + src_surface ? &src_surface->IDirect3DTexture2_iface : NULL); } /***************************************************************************** @@ -5034,7 +5034,7 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *if { if (!iface) return NULL; assert(iface->lpVtbl == &d3d_texture2_vtbl); - return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture2_vtbl); + return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirect3DTexture2_iface); } IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) @@ -5207,7 +5207,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->IDirectDrawSurface2_iface.lpVtbl = &ddraw_surface2_vtbl; surface->IDirectDrawSurface_iface.lpVtbl = &ddraw_surface1_vtbl; surface->IDirectDrawGammaControl_iface.lpVtbl = &ddraw_gamma_control_vtbl; - surface->IDirect3DTexture2_vtbl = &d3d_texture2_vtbl; + surface->IDirect3DTexture2_iface.lpVtbl = &d3d_texture2_vtbl; surface->IDirect3DTexture_iface.lpVtbl = &d3d_texture1_vtbl; surface->iface_count = 1; surface->version = version;

1 0

Ričardas Barkauskas : ddraw: Do not increase wined3d texture refcount in IDirect3DDevice7_GetTexture.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: f5c46b01f42825156d01e8636909bc2dedbf51ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c46b01f42825156d01e8636… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sun Jul 10 11:56:41 2011 +0300 ddraw: Do not increase wined3d texture refcount in IDirect3DDevice7_GetTexture. --- dlls/ddraw/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index dbe1af6..af6ac27 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4453,6 +4453,7 @@ IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface, *Texture = wined3d_texture_get_parent(wined3d_texture); IDirectDrawSurface7_AddRef(*Texture); + wined3d_texture_decref(wined3d_texture); LeaveCriticalSection(&ddraw_cs); return hr; }

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: db35da733530c173efc7e68b9e25d27c66aef3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db35da733530c173efc7e68b9… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 28 16:10:04 2011 +0900 po: Updated Korean translation. --- po/ko.po | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index dadec4f..6c6be76 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8157,6 +8157,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL은 배치파일에서 바꾼 지역 환경변수를 끝냅니다\n" +"이것은 이전의 SETLOCAL로 시작되었습니다.\n" #: cmd.rc:218 msgid "" @@ -8167,6 +8169,11 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"ENDLOCAL은 배치파일에서 바꾼 지역 환경변수를 끝냅니다\n" +"\n" +"SETLOCAL이후의 바뀐 환경 변수는 패치 파일안에서만 적용됩니다. 그리고\n" +"다음 ENDLOCAL이 나올 때까지만 보존되고(아니면 파일의 끝이든지,\n" +"어느 똑이든 먼저 오는 지점이),이전의 환경 설정이 복원되는 지정입니다.\n" #: cmd.rc:221 msgid "" @@ -8206,7 +8213,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:267 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ATTRIB\t\tShow or change DOS file attributes\n" @@ -8243,9 +8249,9 @@ msgid "" "Enter HELP <command> for further information on any of the above commands\n" msgstr "" "CMD 내부 명령들:\n" -"ATTRIB\t\t도스 파일 속 보여주거나 바꾸기\n" +"ATTRIB\t\t도스 파일 속성 보여주거나 바꾸기\n" "CALL\t\tI배치 파일 안에서 다른 파일 불러오기\n" -"CD (CHDIR)\t현제 기본 디렉토리 바꾸기\n" +"CD (CHDIR)\t현재 기본 디렉토리 바꾸기\n" "CHOICE\t\t목록에서 키를 선택할 때까지 기다림\n" "CLS\t\t콘솔 화면 깨끗하게\n" "COPY\t\t파일 복사\n"

1 0

Austin English : kernel32/tests: Remove win9x hacks.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 187f50aad32f28b21700059908c8087660798fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=187f50aad32f28b2170005990… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 26 18:07:18 2011 -0700 kernel32/tests: Remove win9x hacks. --- dlls/kernel32/tests/codepage.c | 12 +----- dlls/kernel32/tests/drive.c | 5 -- dlls/kernel32/tests/format_msg.c | 88 +++++++++---------------------------- dlls/kernel32/tests/loader.c | 7 --- dlls/kernel32/tests/mailslot.c | 35 +++++---------- 5 files changed, 35 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=187f50aad32f28b217000…

1 0

Octavian Voicu : shell32: Disable WOW64 redirection when converting pidls to UNIX paths.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 907f94e144ec9a36f789a2ae7298a434268102e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=907f94e144ec9a36f789a2ae7… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Fri Jul 29 02:29:39 2011 +0300 shell32: Disable WOW64 redirection when converting pidls to UNIX paths. --- dlls/shell32/shfldr_unixfs.c | 5 ++++- dlls/shell32/tests/shlfolder.c | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 8f52a80..9649df8 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -371,7 +371,8 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) char *pPathTail, *pElement, *pCanonicalTail, szPath[FILENAME_MAX], *pszUnixPath, has_failed = 0, mb_path[FILENAME_MAX]; WCHAR wszDrive[] = { '?', ':', '\\', 0 }, dospath[PATH_MAX], *dospath_end; int cDriveSymlinkLen; - + void *redir; + TRACE("(pszDosPath=%s, pszCanonicalPath=%p)\n", debugstr_w(pszDosPath), pszCanonicalPath); if (!pszDosPath || pszDosPath[1] != ':') @@ -392,6 +393,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) dospath_end = dospath + lstrlenW(dospath); /* search for the most valid UNIX path possible, then append missing * path parts */ + Wow64DisableWow64FsRedirection(&redir); while(!(pszUnixPath = wine_get_unix_file_name(dospath))){ if(has_failed){ *dospath_end = '/'; @@ -405,6 +407,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) } *dospath_end = '\0'; } + Wow64RevertWow64FsRedirection(redir); if(dospath_end < dospath) return FALSE; strcat(szPath, pszUnixPath + cDriveSymlinkLen); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 681a28f..0006155 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -70,6 +70,7 @@ static HRESULT (WINAPI *pSHGetItemFromDataObject)(IDataObject*,DATAOBJ_GET_ITEM_ static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static UINT (WINAPI *pGetSystemWow64DirectoryW)(LPWSTR, UINT); static WCHAR *make_wstr(const char *str) { @@ -165,7 +166,9 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shlwapi.dll"); pStrRetToBufW = (void*)GetProcAddress(hmod, "StrRetToBufW"); - pIsWow64Process = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + hmod = GetModuleHandleA("kernel32.dll"); + pIsWow64Process = (void*)GetProcAddress(hmod, "IsWow64Process"); + pGetSystemWow64DirectoryW = (void*)GetProcAddress(hmod, "GetSystemWow64DirectoryW"); hr = SHGetMalloc(&ppM); ok(hr == S_OK, "SHGetMalloc failed %08x\n", hr); @@ -3727,7 +3730,7 @@ static void test_SHParseDisplayName(void) WCHAR dirW[MAX_PATH]; WCHAR nameW[10]; HRESULT hr; - BOOL ret; + BOOL ret, is_wow64; if (!pSHParseDisplayName) { @@ -3775,6 +3778,24 @@ if (0) pILFree(pidl1); pILFree(pidl2); + /* system32 is not redirected to syswow64 on WOW64 */ + if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + if (is_wow64 && pGetSystemWow64DirectoryW) + { + *dirW = 0; + ok(GetSystemDirectoryW(dirW, MAX_PATH) > 0, "GetSystemDirectoryW failed: %u\n", GetLastError()); + hr = pSHParseDisplayName(dirW, NULL, &pidl1, 0, NULL); + ok(hr == S_OK, "failed %08x\n", hr); + *dirW = 0; + ok(pGetSystemWow64DirectoryW(dirW, MAX_PATH) > 0, "GetSystemWow64DirectoryW failed: %u\n", GetLastError()); + hr = pSHParseDisplayName(dirW, NULL, &pidl2, 0, NULL); + ok(hr == S_OK, "failed %08x\n", hr); + ret = pILIsEqual(pidl1, pidl2); + ok(ret == FALSE, "expected different idls\n"); + pILFree(pidl1); + pILFree(pidl2); + } + IShellFolder_Release(desktop); }

1 0

Vincent Povirk : windowscodecs: Fix typo.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: c1aef636df6fe5534e37fb28adb77c1688bff898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1aef636df6fe5534e37fb28a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 29 11:07:37 2011 -0500 windowscodecs: Fix typo. --- dlls/windowscodecs/icoformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index b9e7c61..48a5c95 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -284,7 +284,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) } if (SUCCEEDED(hr)) - hr = IWICBitmapFrameDecode_GetResolution(source, &result->dpiX, &result->dpiY); + hr = IWICBitmapFrameDecode_GetResolution(framedecode, &result->dpiX, &result->dpiY); IWICBitmapFrameDecode_Release(framedecode); }

1 0

Alexandre Julliard : ntdll: Remove divl second argument for compatibility with clang.
by Alexandre Julliard July 29, 2011

July 29, 2011

Module: wine Branch: master Commit: 06722210a8edd2dcc8039db81b779872ad7036c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06722210a8edd2dcc8039db81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 29 19:18:41 2011 +0200 ntdll: Remove divl second argument for compatibility with clang. --- dlls/ntdll/large_int.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 54ce6b0..fc01f83 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -259,14 +259,11 @@ ULONGLONG WINAPI RtlEnlargedUnsignedMultiply( UINT a, UINT b ) UINT WINAPI RtlEnlargedUnsignedDivide( ULONGLONG a, UINT b, UINT *remptr ) { #if defined(__i386__) && defined(__GNUC__) - UINT ret, rem, p1, p2; + UINT ret, rem; - p1 = a >> 32; - p2 = a & 0xffffffffLL; - - __asm__("divl %4,%%eax" + __asm__("divl %4" : "=a" (ret), "=d" (rem) - : "0" (p2), "1" (p1), "g" (b) ); + : "0" ((UINT)a), "1" ((UINT)(a >> 32)), "g" (b) ); if (remptr) *remptr = rem; return ret; #else

1 0