wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Ričardas Barkauskas : ddraw: Separate other conversion to IDirectDrawSurfaceImpl from conversions to ifaces .
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 11bf99c5fd8bb2622ddb244786aeca189ea3599e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bf99c5fd8bb2622ddb24478… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sat Jun 4 19:13:40 2011 +0300 ddraw: Separate other conversion to IDirectDrawSurfaceImpl from conversions to ifaces. --- dlls/ddraw/surface.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8b4cfa7..895f07b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -146,23 +146,26 @@ static HRESULT WINAPI ddraw_surface3_QueryInterface(IDirectDrawSurface3 *iface, static HRESULT WINAPI ddraw_gamma_control_QueryInterface(IDirectDrawGammaControl *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_gamma_control(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } static HRESULT WINAPI d3d_texture2_QueryInterface(IDirect3DTexture2 *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_texture2(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFIID riid, void **object) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)surface_from_texture1(iface), riid, object); + return ddraw_surface7_QueryInterface((IDirectDrawSurface7 *)This, riid, object); } /***************************************************************************** @@ -204,23 +207,26 @@ static ULONG WINAPI ddraw_surface3_AddRef(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_AddRef(IDirectDrawGammaControl *iface) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_gamma_control(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture2_AddRef(IDirect3DTexture2 *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_texture2(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_AddRef((IDirectDrawSurface7 *)surface_from_texture1(iface)); + return ddraw_surface7_AddRef((IDirectDrawSurface7 *)This); } /***************************************************************************** @@ -411,23 +417,26 @@ static ULONG WINAPI ddraw_surface3_Release(IDirectDrawSurface3 *iface) static ULONG WINAPI ddraw_gamma_control_Release(IDirectDrawGammaControl *iface) { + IDirectDrawSurfaceImpl *This = surface_from_gamma_control(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_gamma_control(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture2_Release(IDirect3DTexture2 *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture2(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_texture2(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } static ULONG WINAPI d3d_texture1_Release(IDirect3DTexture *iface) { + IDirectDrawSurfaceImpl *This = surface_from_texture1(iface); TRACE("iface %p.\n", iface); - return ddraw_surface7_Release((IDirectDrawSurface7 *)surface_from_texture1(iface)); + return ddraw_surface7_Release((IDirectDrawSurface7 *)This); } /*****************************************************************************

1 0

Ričardas Barkauskas : ddraw: Separate conversion from IDirectDrawSurface7 iface to object and conversion to other iface .
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 705548a6ef1419a1379a026c6a80f735a2ecf5bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=705548a6ef1419a1379a026c6… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 13:08:56 2011 +0300 ddraw: Separate conversion from IDirectDrawSurface7 iface to object and conversion to other iface. --- dlls/ddraw/ddraw.c | 52 ++++++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/device.c | 9 +++++-- dlls/ddraw/surface.c | 14 +++++++++--- 3 files changed, 60 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8b39147..393f4ce 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2047,12 +2047,19 @@ static HRESULT WINAPI ddraw3_GetGDISurface(IDirectDraw3 *iface, IDirectDrawSurfa { IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + *surface = (IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -2061,12 +2068,19 @@ static HRESULT WINAPI ddraw2_GetGDISurface(IDirectDraw2 *iface, IDirectDrawSurfa { IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + *surface = (IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -2075,12 +2089,19 @@ static HRESULT WINAPI ddraw1_GetGDISurface(IDirectDraw *iface, IDirectDrawSurfac { IDirectDrawImpl *This = impl_from_IDirectDraw(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, surface %p.\n", iface, surface); hr = ddraw7_GetGDISurface(&This->IDirectDraw7_iface, &surface7); - *surface = surface7 ? (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + *surface = (IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -2438,6 +2459,7 @@ static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, { IDirectDrawImpl *This = impl_from_IDirectDraw4(iface); IDirectDrawSurface7 *surface7; + IDirectDrawSurfaceImpl *surface_impl; HRESULT hr; TRACE("iface %p, dc %p, surface %p.\n", iface, dc, surface); @@ -2445,7 +2467,14 @@ static HRESULT WINAPI ddraw4_GetSurfaceFromDC(IDirectDraw4 *iface, HDC dc, if (!surface) return E_INVALIDARG; hr = ddraw7_GetSurfaceFromDC(&This->IDirectDraw7_iface, dc, &surface7); - *surface = surface7 ? (IDirectDrawSurface4 *)&((IDirectDrawSurfaceImpl *)surface7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + surface_impl = (IDirectDrawSurfaceImpl *)surface7; + /* Tests say this is true */ + *surface = (IDirectDrawSurface4 *)&surface_impl->IDirectDrawSurface3_iface; return hr; } @@ -3756,9 +3785,10 @@ struct surfacescallback_context static HRESULT CALLBACK EnumSurfacesCallbackThunk(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *context) { + IDirectDrawSurfaceImpl *surface_impl = (IDirectDrawSurfaceImpl *)surface; struct surfacescallback_context *cbcontext = context; - return cbcontext->func((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_iface, + return cbcontext->func((IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface, (DDSURFACEDESC *)surface_desc, cbcontext->context); } @@ -4199,13 +4229,15 @@ static HRESULT WINAPI ddraw3_DuplicateSurface(IDirectDraw3 *iface, IDirectDrawSu IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); IDirectDrawSurface7 *dst7; + IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; + dst_impl = (IDirectDrawSurfaceImpl *)dst7; + *dst = (IDirectDrawSurface *)&dst_impl->IDirectDrawSurface3_iface; return hr; } @@ -4215,13 +4247,15 @@ static HRESULT WINAPI ddraw2_DuplicateSurface(IDirectDraw2 *iface, IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); IDirectDrawSurface7 *dst7; + IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; + dst_impl = (IDirectDrawSurfaceImpl *)dst7; + *dst = (IDirectDrawSurface *)&dst_impl->IDirectDrawSurface3_iface; return hr; } @@ -4231,13 +4265,15 @@ static HRESULT WINAPI ddraw1_DuplicateSurface(IDirectDraw *iface, IDirectDrawSur IDirectDrawImpl *This = impl_from_IDirectDraw(iface); IDirectDrawSurfaceImpl *src_impl = unsafe_impl_from_IDirectDrawSurface3((IDirectDrawSurface3 *)src); IDirectDrawSurface7 *dst7; + IDirectDrawSurfaceImpl *dst_impl; HRESULT hr; TRACE("iface %p, src %p, dst %p.\n", iface, src, dst); hr = ddraw7_DuplicateSurface(&This->IDirectDraw7_iface, (IDirectDrawSurface7 *)src_impl, &dst7); if (FAILED(hr)) return hr; - *dst = (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)dst7)->IDirectDrawSurface3_iface; + dst_impl = (IDirectDrawSurfaceImpl *)dst7; + *dst = (IDirectDrawSurface *)&dst_impl->IDirectDrawSurface3_iface; return hr; } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7b8f975..a2eefd0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1960,14 +1960,15 @@ static HRESULT WINAPI IDirect3DDeviceImpl_2_GetRenderTarget(IDirect3DDevice2 *if IDirectDrawSurface **RenderTarget) { IDirect3DDeviceImpl *This = device_from_device2(iface); + IDirectDrawSurfaceImpl *RenderTargetImpl; HRESULT hr; TRACE("iface %p, target %p.\n", iface, RenderTarget); hr = IDirect3DDevice7_GetRenderTarget((IDirect3DDevice7 *)This, (IDirectDrawSurface7 **)RenderTarget); if(hr != D3D_OK) return hr; - *RenderTarget = *RenderTarget ? - (IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)*RenderTarget)->IDirectDrawSurface3_iface : NULL; + RenderTargetImpl = (IDirectDrawSurfaceImpl *)RenderTarget; + *RenderTarget = (IDirectDrawSurface *)&RenderTargetImpl->IDirectDrawSurface3_iface; return D3D_OK; } @@ -4483,12 +4484,14 @@ static HRESULT WINAPI IDirect3DDeviceImpl_3_GetTexture(IDirect3DDevice3 *iface, { HRESULT ret; IDirectDrawSurface7 *ret_val; + IDirectDrawSurfaceImpl *ret_val_impl; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture2); ret = IDirect3DDevice7_GetTexture((IDirect3DDevice7 *)device_from_device3(iface), Stage, &ret_val); - *Texture2 = ret_val ? (IDirect3DTexture2 *)&((IDirectDrawSurfaceImpl *)ret_val)->IDirect3DTexture2_vtbl : NULL; + ret_val_impl = unsafe_impl_from_IDirectDrawSurface7(ret_val); + *Texture2 = ret_val_impl ? (IDirect3DTexture2 *)&ret_val_impl->IDirect3DTexture2_vtbl : NULL; TRACE("Returning texture %p.\n", *Texture2); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5874333..8b4cfa7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -553,6 +553,7 @@ static HRESULT WINAPI ddraw_surface3_GetAttachedSurface(IDirectDrawSurface3 *ifa { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); IDirectDrawSurface7 *attachment7; + IDirectDrawSurfaceImpl *attachment_impl; DDSCAPS2 caps2; HRESULT hr; @@ -565,9 +566,13 @@ static HRESULT WINAPI ddraw_surface3_GetAttachedSurface(IDirectDrawSurface3 *ifa hr = ddraw_surface7_GetAttachedSurface((IDirectDrawSurface7 *)This, &caps2, &attachment7); - if (FAILED(hr)) *attachment = NULL; - else *attachment = attachment7 ? - &((IDirectDrawSurfaceImpl *)attachment7)->IDirectDrawSurface3_iface : NULL; + if (FAILED(hr)) + { + *attachment = NULL; + return hr; + } + attachment_impl = (IDirectDrawSurfaceImpl *)attachment7; + *attachment = &attachment_impl->IDirectDrawSurface3_iface; return hr; } @@ -1559,9 +1564,10 @@ struct callback_info static HRESULT CALLBACK EnumCallback(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *context) { + IDirectDrawSurfaceImpl *surface_impl = (IDirectDrawSurfaceImpl *)surface; const struct callback_info *info = context; - return info->callback((IDirectDrawSurface *)&((IDirectDrawSurfaceImpl *)surface)->IDirectDrawSurface3_iface, + return info->callback((IDirectDrawSurface *)&surface_impl->IDirectDrawSurface3_iface, (DDSURFACEDESC *)surface_desc, info->context); }

1 0

Ričardas Barkauskas : ddraw: Pass an object instead of iface to helper function CreateSurface.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 4123c7a38a119318620d669f9acd432ab9b3ae35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4123c7a38a119318620d669f9… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Sat Jun 4 15:33:23 2011 +0300 ddraw: Pass an object instead of iface to helper function CreateSurface. --- dlls/ddraw/ddraw.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9c32723..8b39147 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3045,7 +3045,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur * *****************************************************************************/ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, - IDirectDrawSurface7 **Surf, IUnknown *UnkOuter) + IDirectDrawSurfaceImpl **Surf, IUnknown *UnkOuter) { IDirectDrawSurfaceImpl *object = NULL; HRESULT hr; @@ -3310,7 +3310,7 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, } object->is_complex_root = TRUE; - *Surf = (IDirectDrawSurface7 *)object; + *Surf = object; /* Create Additional surfaces if necessary * This applies to Primary surfaces which have a back buffer count @@ -3434,6 +3434,8 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * IDirectDrawSurface7 **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + IDirectDrawSurfaceImpl *impl; + HRESULT hr; TRACE("iface %p, surface_desc %p, surface %p, outer_unknown %p.\n", iface, surface_desc, surface, outer_unknown); @@ -3456,7 +3458,16 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * return DDERR_INVALIDCAPS; } - return CreateSurface(This, surface_desc, surface, outer_unknown); + hr = CreateSurface(This, surface_desc, &impl, outer_unknown); + if (FAILED(hr)) + { + *surface = NULL; + return hr; + } + + *surface = (IDirectDrawSurface7 *)impl; + + return hr; } static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, @@ -3487,16 +3498,19 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(This, surface_desc, (IDirectDrawSurface7 **)surface, outer_unknown); - impl = (IDirectDrawSurfaceImpl *)*surface; - if (SUCCEEDED(hr) && impl) + hr = CreateSurface(This, surface_desc, &impl, outer_unknown); + if (FAILED(hr)) { - ddraw_set_surface_version(impl, 4); - IDirectDraw7_Release(&This->IDirectDraw7_iface); - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + *surface = NULL; + return hr; } + *surface = (IDirectDrawSurface4 *)impl; + ddraw_set_surface_version(impl, 4); + IDirectDraw7_Release(&This->IDirectDraw7_iface); + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; + return hr; } @@ -3504,7 +3518,6 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s IDirectDrawSurface **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw3(iface); - IDirectDrawSurface7 *surface7; IDirectDrawSurfaceImpl *impl; HRESULT hr; @@ -3529,14 +3542,13 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s return DDERR_INVALIDCAPS; } - hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &impl, outer_unknown); if (FAILED(hr)) { *surface = NULL; return hr; } - impl = (IDirectDrawSurfaceImpl *)surface7; *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 3); IDirectDraw7_Release(&This->IDirectDraw7_iface); @@ -3550,7 +3562,6 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, DDSURFACEDESC *surface_desc, IDirectDrawSurface **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw2(iface); - IDirectDrawSurface7 *surface7; IDirectDrawSurfaceImpl *impl; HRESULT hr; @@ -3575,14 +3586,13 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, return DDERR_INVALIDCAPS; } - hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &impl, outer_unknown); if (FAILED(hr)) { *surface = NULL; return hr; } - impl = (IDirectDrawSurfaceImpl *)surface7; *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 2); IDirectDraw7_Release(&This->IDirectDraw7_iface); @@ -3595,7 +3605,6 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSURFACEDESC *surface_desc, IDirectDrawSurface **surface, IUnknown *outer_unknown) { IDirectDrawImpl *This = impl_from_IDirectDraw(iface); - IDirectDrawSurface7 *surface7; IDirectDrawSurfaceImpl *impl; HRESULT hr; @@ -3611,14 +3620,13 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, /* Remove front buffer flag, this causes failure in v7, and its added to normal * primaries anyway. */ surface_desc->ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; - hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &surface7, outer_unknown); + hr = CreateSurface(This, (DDSURFACEDESC2 *)surface_desc, &impl, outer_unknown); if (FAILED(hr)) { *surface = NULL; return hr; } - impl = (IDirectDrawSurfaceImpl *)surface7; *surface = (IDirectDrawSurface *)&impl->IDirectDrawSurface3_iface; ddraw_set_surface_version(impl, 1); IDirectDraw7_Release(&This->IDirectDraw7_iface);

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirectDrawSurface7() for application provided interfaces.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 28ce1c00a7dd1b453ca97e727090206a11f2d08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ce1c00a7dd1b453ca97e727… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 6 12:30:23 2011 +0300 ddraw: Use unsafe_impl_from_IDirectDrawSurface7() for application provided interfaces. --- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 24 ++++++++++++------------ dlls/ddraw/surface.c | 21 ++++++++++++++------- 4 files changed, 30 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28ce1c00a7dd1b453ca97…

1 0

Alexandre Julliard : widl: Add support for generating new-style interpreted stubs for servers.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 39b15066b052cc098eb8ec52056ee2b49d12b1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b15066b052cc098eb8ec520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 16:28:25 2011 +0200 widl: Add support for generating new-style interpreted stubs for servers. --- tools/widl/server.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 46bb771..1c1bc49 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -270,7 +270,7 @@ static void write_dispatchtable(type_t *iface) { var_t *func = stmt->u.var; if (is_interpreted_func( iface, func )) - print_server("NdrServerCall,\n"); + print_server("%s,\n", stub_mode == MODE_Oif ? "NdrServerCall2" : "NdrServerCall"); else print_server("%s_%s,\n", iface->name, get_name(func)); method_count++; @@ -354,7 +354,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_server("0,\n"); print_server("__MIDL_TypeFormatString.Format,\n"); print_server("1, /* -error bounds_check flag */\n"); - print_server("0x10001, /* Ndr library version */\n"); + print_server("0x%x, /* Ndr library version */\n", stub_mode == MODE_Oif ? 0x50002 : 0x10001); print_server("0,\n"); print_server("0x50100a4, /* MIDL Version 5.1.164 */\n"); print_server("0,\n");

1 0

Alexandre Julliard : widl: Add support for generating new-style interpreted stubs for clients.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: e95d5a8e3cafbe41f4585907cf20384166c53093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95d5a8e3cafbe41f4585907c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 14:54:14 2011 +0200 widl: Add support for generating new-style interpreted stubs for clients. --- tools/widl/client.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 452b883..ea0c2cc 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -107,8 +107,10 @@ static void write_function_stub( const type_t *iface, const var_t *func, fprintf(client, "{\n"); indent++; if (has_ret) print_client( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_client( "%sNdrClientCall( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", - has_ret ? "_RetVal = " : "", iface->name, proc_offset ); + print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + has_ret ? "_RetVal = " : "", + stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", + iface->name, proc_offset ); if (args) fprintf( client, "(unsigned char *)&%s );\n", LIST_ENTRY( list_head(args), const var_t, entry )->name ); @@ -383,7 +385,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_client("0,\n"); print_client("__MIDL_TypeFormatString.Format,\n"); print_client("1, /* -error bounds_check flag */\n"); - print_client("0x10001, /* Ndr library version */\n"); + print_client("0x%x, /* Ndr library version */\n", stub_mode == MODE_Oif ? 0x50002 : 0x10001); print_client("0,\n"); print_client("0x50100a4, /* MIDL Version 5.1.164 */\n"); print_client("0,\n");

1 0

Alexandre Julliard : widl: Add support for new-style interpreted stubs in the proc format strings.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: b724138bd9cad0ecb55186b20406ed7f66bf3d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b724138bd9cad0ecb55186b20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 3 14:54:14 2011 +0200 widl: Add support for new-style interpreted stubs in the proc format strings. --- tools/widl/typegen.c | 384 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 336 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b724138bd9cad0ecb5518…

1 0

Piotr Caban : msvcrt: Fixed buffer overflow in snprintf functions family.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: ab9077d64084b51d2807fe807ea4641ab8d41419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9077d64084b51d2807fe807… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 6 14:02:30 2011 +0200 msvcrt: Fixed buffer overflow in snprintf functions family. Spotted by Andrew Miller. --- dlls/msvcrt/printf.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a69e8f8..eefecd1 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -56,6 +56,7 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) memcpy(out->buf, str, len*sizeof(APICHAR)); out->buf += len; + out->len -= len; return len; }

1 0

Huw Davies : winex11: Move the code that checks for a colortable based dib to a separate function .
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: 129021a0ab10e42cec9c16aa8049d229876de290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129021a0ab10e42cec9c16aa8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 6 12:58:42 2011 +0100 winex11: Move the code that checks for a colortable based dib to a separate function. --- dlls/winex11.drv/xrender.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 52e7f25..48ecd22 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1788,6 +1788,22 @@ static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg) return 1; } +/******************************************************************** + * is_dib_with_colortable + * + * Return TRUE if physdev is backed by a dibsection with <= 8 bits per pixel + */ +static inline BOOL is_dib_with_colortable( X11DRV_PDEVICE *physDev ) +{ + DIBSECTION dib; + + if( physDev->bitmap && GetObjectW( physDev->bitmap->hbitmap, sizeof(dib), &dib ) == sizeof(dib) && + dib.dsBmih.biBitCount <= 8 ) + return TRUE; + + return FALSE; +} + /*********************************************************************** * X11DRV_XRender_ExtTextOut */ @@ -1803,16 +1819,12 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag HRGN saved_region = 0; BOOL disable_antialias = FALSE; AA_Type aa_type = AA_None; - DIBSECTION bmp; unsigned int idx; const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture tile_pict = 0; - /* Do we need to disable antialiasing because of palette mode? */ - if( !physDev->bitmap || GetObjectW( physDev->bitmap->hbitmap, sizeof(bmp), &bmp ) != sizeof(bmp) ) { - TRACE("bitmap is not a DIB\n"); - } - else if (bmp.dsBmih.biBitCount <= 8) { + if(is_dib_with_colortable( physDev )) + { TRACE("Disabling antialiasing\n"); disable_antialias = TRUE; }

1 0

Jörg Höhle : winecoreaudio: mmdevapi' s mixer format is 32bit floating point.
by Alexandre Julliard 06 Jun '11

06 Jun '11

Module: wine Branch: master Commit: fd2d6f39283d021dc89fdda25bb552e9df2b73b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2d6f39283d021dc89fdda25… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jun 6 07:59:44 2011 +0200 winecoreaudio: mmdevapi's mixer format is 32bit floating point. --- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2819ca7..ed97e99 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1207,10 +1207,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, } fmt->Format.nSamplesPerSec = rate; - /* CoreAudio doesn't seem to give a device format preference, so just - * choose a common format... */ - fmt->Format.wBitsPerSample = 16; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * fmt->Format.nChannels) / 8;

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011