April 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Get rid of the IWineD3DVolume typedefs.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 89a4e696a2be3a01fb3d5165c88edd81e4f0c97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a4e696a2be3a01fb3d5165c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 22:41:48 2011 +0200 wined3d: Get rid of the IWineD3DVolume typedefs. --- dlls/wined3d/device.c | 40 ++++++++++++++++++---------------------- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/volume.c | 8 +++----- dlls/wined3d/wined3d_private.h | 12 +++++------- 4 files changed, 31 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 009e58b..3c1ac76 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1183,10 +1183,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface, UINT Width, UINT Height, UINT Depth, DWORD Usage, enum wined3d_format_id Format, WINED3DPOOL Pool, void *parent, - const struct wined3d_parent_ops *parent_ops, IWineD3DVolume **ppVolume) + const struct wined3d_parent_ops *parent_ops, struct wined3d_volume **volume) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DVolumeImpl *object; + struct wined3d_volume *object; HRESULT hr; TRACE("(%p) : W(%d) H(%d) D(%d), Usage(%d), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, @@ -1196,7 +1196,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface, UIN if (!object) { ERR("Out of memory\n"); - *ppVolume = NULL; + *volume = NULL; return WINED3DERR_OUTOFVIDEOMEMORY; } @@ -1209,7 +1209,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolume(IWineD3DDevice *iface, UIN } TRACE("(%p) : Created volume %p.\n", This, object); - *ppVolume = (IWineD3DVolume *)object; + *volume = object; return WINED3D_OK; } @@ -5088,34 +5088,33 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided(IWineD3DDev /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ static HRESULT IWineD3DDeviceImpl_UpdateVolume(IWineD3DDevice *iface, - IWineD3DVolume *pSourceVolume, IWineD3DVolume *pDestinationVolume) + struct wined3d_volume *src_volume, struct wined3d_volume *dst_volume) { WINED3DLOCKED_BOX src; WINED3DLOCKED_BOX dst; HRESULT hr; TRACE("iface %p, src_volume %p, dst_volume %p.\n", - iface, pSourceVolume, pDestinationVolume); + iface, src_volume, dst_volume); - /* TODO: Implement direct loading into the gl volume instead of using memcpy and - * dirtification to improve loading performance. - */ - hr = wined3d_volume_map(pSourceVolume, &src, NULL, WINED3DLOCK_READONLY); + /* TODO: Implement direct loading into the gl volume instead of using + * memcpy and dirtification to improve loading performance. */ + hr = wined3d_volume_map(src_volume, &src, NULL, WINED3DLOCK_READONLY); if (FAILED(hr)) return hr; - hr = wined3d_volume_map(pDestinationVolume, &dst, NULL, WINED3DLOCK_DISCARD); + hr = wined3d_volume_map(dst_volume, &dst, NULL, WINED3DLOCK_DISCARD); if (FAILED(hr)) { - wined3d_volume_unmap(pSourceVolume); + wined3d_volume_unmap(src_volume); return hr; } - memcpy(dst.pBits, src.pBits, ((IWineD3DVolumeImpl *) pDestinationVolume)->resource.size); + memcpy(dst.pBits, src.pBits, dst_volume->resource.size); - hr = wined3d_volume_unmap(pDestinationVolume); + hr = wined3d_volume_unmap(dst_volume); if (FAILED(hr)) - wined3d_volume_unmap(pSourceVolume); + wined3d_volume_unmap(src_volume); else - hr = wined3d_volume_unmap(pSourceVolume); + hr = wined3d_volume_unmap(src_volume); return hr; } @@ -5208,14 +5207,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture(IWineD3DDevice *iface, case WINED3DRTYPE_VOLUMETEXTURE: { - IWineD3DVolume *src_volume; - IWineD3DVolume *dst_volume; - for (i = 0; i < level_count; ++i) { - src_volume = (IWineD3DVolume *)volume_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); - dst_volume = (IWineD3DVolume *)volume_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); - hr = IWineD3DDeviceImpl_UpdateVolume(iface, src_volume, dst_volume); + hr = IWineD3DDeviceImpl_UpdateVolume(iface, + volume_from_resource(wined3d_texture_get_sub_resource(src_texture, i)), + volume_from_resource(wined3d_texture_get_sub_resource(dst_texture, i))); if (FAILED(hr)) { WARN("IWineD3DDeviceImpl_UpdateVolume failed, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4651a0..fcd341d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1157,7 +1157,7 @@ static void texture3d_preload(struct wined3d_texture *texture, enum WINED3DSRGB { for (i = 0; i < texture->level_count; ++i) { - IWineD3DVolumeImpl *volume = volume_from_resource(texture->sub_resources[i]); + struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i]); volume_add_dirty_box(volume, NULL); volume_load(volume, i, texture->flags & WINED3D_TEXTURE_IS_SRGB); } @@ -1182,7 +1182,7 @@ static void texture3d_sub_resource_add_dirty_region(struct wined3d_resource *sub static void texture3d_sub_resource_cleanup(struct wined3d_resource *sub_resource) { - IWineD3DVolumeImpl *volume = volume_from_resource(sub_resource); + struct wined3d_volume *volume = volume_from_resource(sub_resource); /* Cleanup the container. */ volume_set_container(volume, NULL); @@ -1289,7 +1289,7 @@ HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, UINT hei for (i = 0; i < texture->level_count; ++i) { - IWineD3DVolume *volume; + struct wined3d_volume *volume; /* Create the volume. */ hr = IWineD3DDeviceParent_CreateVolume(device->device_parent, parent, @@ -1302,8 +1302,8 @@ HRESULT volumetexture_init(struct wined3d_texture *texture, UINT width, UINT hei } /* Set its container to this texture. */ - volume_set_container((IWineD3DVolumeImpl *)volume, texture); - texture->sub_resources[i] = &((IWineD3DVolumeImpl *)volume)->resource; + volume_set_container(volume, texture); + texture->sub_resources[i] = &volume->resource; /* Calculate the next mipmap level. */ tmp_w = max(1, tmp_w >> 1); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 2c15dee..251265b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -1,6 +1,4 @@ /* - * IWineD3DVolume implementation - * * Copyright 2002-2005 Jason Edmeades * Copyright 2002-2005 Raphael Junqueira * Copyright 2005 Oliver Stieber @@ -85,7 +83,7 @@ void volume_add_dirty_box(struct wined3d_volume *volume, const WINED3DBOX *dirty } } -void volume_set_container(IWineD3DVolumeImpl *volume, struct wined3d_texture *container) +void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) { TRACE("volume %p, container %p.\n", volume, container); @@ -93,7 +91,7 @@ void volume_set_container(IWineD3DVolumeImpl *volume, struct wined3d_texture *co } /* Context activation is done by the caller. */ -void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) +void volume_load(struct wined3d_volume *volume, UINT level, BOOL srgb_mode) { const struct wined3d_gl_info *gl_info = &volume->resource.device->adapter->gl_info; const struct wined3d_format *format = volume->resource.format; @@ -287,7 +285,7 @@ static const struct wined3d_resource_ops volume_resource_ops = volume_unload, }; -HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, +HRESULT volume_init(struct wined3d_volume *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, UINT depth, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2839305..3722aa9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -54,8 +54,6 @@ typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; -typedef struct wined3d_volume IWineD3DVolumeImpl; -typedef struct wined3d_volume IWineD3DVolume; /* Texture format fixups */ @@ -1955,17 +1953,17 @@ struct wined3d_volume BOOL dirty; }; -static inline IWineD3DVolumeImpl *volume_from_resource(struct wined3d_resource *resource) +static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource) { - return CONTAINING_RECORD(resource, IWineD3DVolumeImpl, resource); + return CONTAINING_RECORD(resource, struct wined3d_volume, resource); } void volume_add_dirty_box(struct wined3d_volume *volume, const WINED3DBOX *dirty_box) DECLSPEC_HIDDEN; -HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, +HRESULT volume_init(struct wined3d_volume *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, UINT depth, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void volume_load(IWineD3DVolumeImpl *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; -void volume_set_container(IWineD3DVolumeImpl *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; +void volume_load(struct wined3d_volume *volume, UINT level, BOOL srgb_mode) DECLSPEC_HIDDEN; +void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN; /***************************************************************************** * Structure for DIB Surfaces (GetDC and GDI surfaces)

1 0

Henri Verbeet : wined3d: Don' t flush just because a swapchain has multiple contexts.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 66875c6dc7717069a742faab9a7ce8c42da3c4f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66875c6dc7717069a742faab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 22:41:49 2011 +0200 wined3d: Don't flush just because a swapchain has multiple contexts. If you really have e.g. multiple draws to the same drawable, this is not enough, and you should use the StrictDrawOrdering registry setting. In the other cases it just slows things down unnecessarily. --- dlls/wined3d/arb_program_shader.c | 9 +++------ dlls/wined3d/surface.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 669cac2..1197aac 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7206,7 +7206,6 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in, enum wined3d_blit_op blit_op, DWORD Filter) { - struct wined3d_swapchain *dst_swapchain; struct wined3d_context *context; RECT dst_rect = *dst_rect_in; @@ -7232,11 +7231,9 @@ HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_ /* Leave the opengl state valid for blitting */ arbfp_blit_unset(context->gl_info); - dst_swapchain = dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN - ? dst_surface->container.u.swapchain : NULL; - if (wined3d_settings.strict_draw_ordering || (dst_swapchain - && (dst_surface == dst_swapchain->front_buffer - || dst_swapchain->num_contexts > 1))) + if (wined3d_settings.strict_draw_ordering + || (dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && (dst_surface->container.u.swapchain->front_buffer == dst_surface))) wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0f6f247..6daf886 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3568,16 +3568,12 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect_in, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in) { - struct wined3d_swapchain *swapchain = NULL; struct wined3d_context *context; RECT src_rect, dst_rect; src_rect = *src_rect_in; dst_rect = *dst_rect_in; - if (dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN) - swapchain = dst_surface->container.u.swapchain; - /* Make sure the surface is up-to-date. This should probably use * surface_load_location() and worry about the destination surface too, * unless we're overwriting it completely. */ @@ -3628,8 +3624,9 @@ static void surface_blt_to_drawable(IWineD3DDeviceImpl *device, /* Leave the opengl state valid for blitting */ device->blitter->unset_shader(context->gl_info); - if (wined3d_settings.strict_draw_ordering || (swapchain - && (dst_surface == swapchain->front_buffer || swapchain->num_contexts > 1))) + if (wined3d_settings.strict_draw_ordering + || (dst_surface->container.type == WINED3D_CONTAINER_SWAPCHAIN + && (dst_surface->container.u.swapchain->front_buffer == dst_surface))) wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context);

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DResource interface.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 7b8bbdcc440010c0965ac85222ba97903064fe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8bbdcc440010c0965ac8522… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 22:41:50 2011 +0200 wined3d: Get rid of the IWineD3DResource interface. --- dlls/wined3d/surface_base.c | 1 - include/wine/wined3d.idl | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 4239f69..d72f9d1 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -94,7 +94,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface, RE if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DResource) || IsEqualGUID(riid, &IID_IWineD3DSurface)) { IUnknown_AddRef((IUnknown*)iface); *ppobj = This; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 79d7afd..5a6a91f 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2178,9 +2178,9 @@ interface IWineD3DBase : IUnknown [ object, local, - uuid(1f3bfb34-6f30-11d9-c687-00046142c14f) + uuid(37cd5526-6f30-11d9-c687-00046142c14f) ] -interface IWineD3DResource : IWineD3DBase +interface IWineD3DSurface : IWineD3DBase { HRESULT SetPrivateData( [in] REFGUID guid, @@ -2205,15 +2205,6 @@ interface IWineD3DResource : IWineD3DBase ); WINED3DRESOURCETYPE GetType( ); -} - -[ - object, - local, - uuid(37cd5526-6f30-11d9-c687-00046142c14f) -] -interface IWineD3DSurface : IWineD3DResource -{ struct wined3d_resource *GetResource( ); HRESULT Map(

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DBase interface.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 6a135a15119f71ab712eed811c55d0dba0b6cd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a135a15119f71ab712eed811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 22:41:51 2011 +0200 wined3d: Get rid of the IWineD3DBase interface. --- dlls/wined3d/surface_base.c | 1 - include/wine/wined3d.idl | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index d72f9d1..906c7ef 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -93,7 +93,6 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_QueryInterface(IWineD3DSurface *iface, RE TRACE("(%p)->(%s,%p)\n", This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) || IsEqualGUID(riid, &IID_IWineD3DSurface)) { IUnknown_AddRef((IUnknown*)iface); *ppobj = This; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 5a6a91f..82f5f76 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2167,21 +2167,12 @@ typedef HRESULT (__stdcall *D3DCB_ENUMRESOURCES)(struct wined3d_resource *resour [ object, local, - uuid(46799311-8e0e-40ce-b2ec-ddb99f18fcb4) + uuid(37cd5526-6f30-11d9-c687-00046142c14f) ] -interface IWineD3DBase : IUnknown +interface IWineD3DSurface : IUnknown { void *GetParent( ); -} - -[ - object, - local, - uuid(37cd5526-6f30-11d9-c687-00046142c14f) -] -interface IWineD3DSurface : IWineD3DBase -{ HRESULT SetPrivateData( [in] REFGUID guid, [in] const void *data,

1 0

Vincent Povirk : windowscodecs: Implement FlipRotator_GetPixelFormat.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: d65f5799128e1cb6ec84736777e276429674ae8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65f5799128e1cb6ec8473677… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:02:21 2011 -0500 windowscodecs: Implement FlipRotator_GetPixelFormat. --- dlls/windowscodecs/fliprotate.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 45ec509..2e834a2 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -117,9 +117,13 @@ static HRESULT WINAPI FlipRotator_GetSize(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_GetPixelFormat(IWICBitmapFlipRotator *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%p): stub\n", iface, pPixelFormat); + FlipRotator *This = impl_from_IWICBitmapFlipRotator(iface); + TRACE("(%p,%p)\n", iface, pPixelFormat); - return E_NOTIMPL; + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + else + return IWICBitmapSource_GetPixelFormat(This->source, pPixelFormat); } static HRESULT WINAPI FlipRotator_GetResolution(IWICBitmapFlipRotator *iface,

1 0

Vincent Povirk : windowscodecs: Log unsupported conversion formats.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 80470260d069d71441478389cd363bbfffcfb3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=80470260d069d71441478389c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:13:15 2011 -0500 windowscodecs: Log unsupported conversion formats. --- dlls/windowscodecs/converter.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 663e3d4..7e91183 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -960,6 +960,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (!srcinfo) { res = WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + FIXME("Unsupported source format %s\n", debugstr_guid(&srcFormat)); goto end; } @@ -967,6 +968,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (!dstinfo) { res = WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + FIXME("Unsupported destination format %s\n", debugstr_guid(dstFormat)); goto end; } @@ -981,7 +983,10 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, This->source = pISource; } else + { + FIXME("Unsupported conversion %s -> %s\n", debugstr_guid(&srcFormat), debugstr_guid(dstFormat)); res = WINCODEC_ERR_UNSUPPORTEDOPERATION; + } end: @@ -1001,16 +1006,27 @@ static HRESULT WINAPI FormatConverter_CanConvert(IWICFormatConverter *iface, debugstr_guid(dstPixelFormat), pfCanConvert); srcinfo = get_formatinfo(srcPixelFormat); - if (!srcinfo) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + if (!srcinfo) + { + FIXME("Unsupported source format %s\n", debugstr_guid(srcPixelFormat)); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } dstinfo = get_formatinfo(dstPixelFormat); - if (!dstinfo) return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + if (!dstinfo) + { + FIXME("Unsupported destination format %s\n", debugstr_guid(dstPixelFormat)); + return WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT; + } if (dstinfo->copy_function && SUCCEEDED(dstinfo->copy_function(This, NULL, 0, 0, NULL, dstinfo->format))) *pfCanConvert = TRUE; else + { + FIXME("Unsupported conversion %s -> %s\n", debugstr_guid(srcPixelFormat), debugstr_guid(dstPixelFormat)); *pfCanConvert = FALSE; + } return S_OK; }

1 0

Vincent Povirk : windowscodecs: Add support for converting from 32bppPBGRA.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: 10dd670056861e652d790a64721e5d7731e7fb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10dd670056861e652d790a647… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:22:12 2011 -0500 windowscodecs: Add support for converting from 32bppPBGRA. --- dlls/windowscodecs/converter.c | 25 +++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 7e91183..bde7eb6 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -51,6 +51,7 @@ enum pixelformat { format_24bppBGR, format_32bppBGR, format_32bppBGRA, + format_32bppPBGRA, format_48bppRGB, format_64bppRGBA, format_32bppCMYK, @@ -639,6 +640,28 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return S_OK; + case format_32bppPBGRA: + if (prc) + { + HRESULT res; + UINT x, y; + + res = IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + if (FAILED(res)) return res; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE alpha = pbBuffer[cbStride*y+4*x+3]; + if (alpha != 0 && alpha != 255) + { + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * 255 / alpha; + pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * 255 / alpha; + pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * 255 / alpha; + } + } + } + return S_OK; case format_48bppRGB: if (prc) { @@ -761,6 +784,7 @@ static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRec { case format_32bppBGR: case format_32bppBGRA: + case format_32bppPBGRA: if (prc) return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); return S_OK; @@ -785,6 +809,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, NULL}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index d25c977..1ea0aa0 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -983,6 +983,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, &GUID_WICPixelFormat32bppBGRA, + &GUID_WICPixelFormat32bppPBGRA, &GUID_WICPixelFormat48bppRGB, &GUID_WICPixelFormat64bppRGBA, &GUID_WICPixelFormat32bppCMYK,

1 0

Vincent Povirk : windowscodecs: Add support for converting to 32bppPBGRA.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: c3dc0cfa3281608580d8fd58876162f3f9db7ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3dc0cfa3281608580d8fd588… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 15 02:31:12 2011 -0500 windowscodecs: Add support for converting to 32bppPBGRA. --- dlls/windowscodecs/converter.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index bde7eb6..a52c7d2 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -793,6 +793,39 @@ static HRESULT copypixels_to_32bppBGR(struct FormatConverter *This, const WICRec } } +static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppPBGRA: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + default: + hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + if (SUCCEEDED(hr) && prc) + { + UINT x, y; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE alpha = pbBuffer[cbStride*y+4*x+3]; + if (alpha != 255) + { + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x] * alpha / 255; + pbBuffer[cbStride*y+4*x+1] = pbBuffer[cbStride*y+4*x+1] * alpha / 255; + pbBuffer[cbStride*y+4*x+2] = pbBuffer[cbStride*y+4*x+2] * alpha / 255; + } + } + } + return hr; + } +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, @@ -809,7 +842,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, - {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, NULL}, + {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, {format_32bppCMYK, &GUID_WICPixelFormat32bppCMYK, NULL},

1 0

Alexandre Julliard : ntdll: Rewrite the SystemProcessorPerformanceInformation handing to avoid code duplication .
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: cc01c46f415821ec458845f678287a2419a11a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc01c46f415821ec458845f67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 15 10:54:28 2011 +0200 ntdll: Rewrite the SystemProcessorPerformanceInformation handing to avoid code duplication. Also include idle time in kernel time. --- dlls/ntdll/nt.c | 95 +++++++++++++----------------------------------------- 1 files changed, 23 insertions(+), 72 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index fb89a42..ef5f703 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1310,25 +1310,6 @@ void fill_cpu_info(void) cached_sci.Architecture, cached_sci.Level, cached_sci.Revision, cached_sci.FeatureSet); } -static void fill_in_sppi(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi, DWORD64 idle, DWORD64 sys, DWORD64 usr) -{ - DWORD64 steal; - sppi->IdleTime.QuadPart = idle * 10000000 / sysconf(_SC_CLK_TCK); - sppi->KernelTime.QuadPart = sys * 10000000 / sysconf(_SC_CLK_TCK); - sppi->UserTime.QuadPart = usr * 10000000 / sysconf(_SC_CLK_TCK); - - /* Add 1% from idle time to kernel time, to make .NET happy */ - steal = sppi->IdleTime.QuadPart / 100; - sppi->IdleTime.QuadPart -= steal; - sppi->KernelTime.QuadPart += steal; - - /* DPC time */ - sppi->Reserved1[0].QuadPart = 0; - /* Interrupt time */ - sppi->Reserved1[1].QuadPart = 0; - sppi->Reserved2 = 0; -} - /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -1605,66 +1586,36 @@ NTSTATUS WINAPI NtQuerySystemInformation( FILE *cpuinfo = fopen("/proc/stat", "r"); if (cpuinfo) { + unsigned long clk_tck = sysconf(_SC_CLK_TCK); unsigned long usr,nice,sys,idle,remainder[8]; - int count; - char name[10]; + int i, count; + char name[32]; char line[255]; /* first line is combined usage */ - if (fgets(line,255,cpuinfo)) - count = sscanf(line, "%s %lu %lu %lu %lu " - "%lu %lu %lu %lu %lu %lu %lu %lu", - name, &usr, &nice, &sys, &idle, - &remainder[0], &remainder[1], &remainder[2], - &remainder[3], &remainder[4], &remainder[5], - &remainder[6], &remainder[7]); - else - count = 0; - /* we set this up in the for older non-smp enabled kernels */ - if (count >= 5 && strcmp(name, "cpu") == 0) + while (fgets(line,255,cpuinfo)) { - int i; - for (i = 0; i + 5 < count; ++i) - sys += remainder[i]; + count = sscanf(line, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", + name, &usr, &nice, &sys, &idle, + &remainder[0], &remainder[1], &remainder[2], &remainder[3], + &remainder[4], &remainder[5], &remainder[6], &remainder[7]); + + if (count < 5 || strncmp( name, "cpu", 3 )) break; + for (i = 0; i + 5 < count; ++i) sys += remainder[i]; + sys += idle; usr += nice; - sppi = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - fill_in_sppi(sppi, idle, sys, usr); - cpus = 1; - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); - } - - do - { - if (fgets(line, 255, cpuinfo)) - count = sscanf(line, "%s %lu %lu %lu %lu " - "%lu %lu %lu %lu %lu %lu %lu %lu", - name, &usr, &nice, &sys, &idle, - &remainder[0], &remainder[1], &remainder[2], - &remainder[3], &remainder[4], &remainder[5], - &remainder[6], &remainder[7]); + cpus = atoi( name + 3 ) + 1; + if (cpus > out_cpus) break; + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; + if (sppi) + sppi = RtlReAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sppi, len ); else - count = 0; - if (count >= 5 && strncmp(name, "cpu", 3)==0) - { - int i; - for (i = 0; i + 5 < count; ++i) - sys += remainder[i]; - usr += nice; - out_cpus --; - if (name[3]=='0') /* first cpu */ - fill_in_sppi(sppi, idle, sys, usr); - else /* new cpu */ - { - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * (cpus+1); - sppi = RtlReAllocateHeap(GetProcessHeap(), 0, sppi, len); - fill_in_sppi(sppi + cpus, idle, sys, usr); - cpus++; - } - } - else - break; - } while (out_cpus > 0); + sppi = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + + sppi[cpus-1].IdleTime.QuadPart = (ULONGLONG)idle * 10000000 / clk_tck; + sppi[cpus-1].KernelTime.QuadPart = (ULONGLONG)sys * 10000000 / clk_tck; + sppi[cpus-1].UserTime.QuadPart = (ULONGLONG)usr * 10000000 / clk_tck; + } fclose(cpuinfo); } }

1 0

Alexandre Julliard : ntdll: Implement the ProcessAffinityMask case in NtQueryInformationProcess.
by Alexandre Julliard 15 Apr '11

15 Apr '11

Module: wine Branch: master Commit: baa04014ebd686d95214beb3cd2183ff9a85b4f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa04014ebd686d95214beb3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 19:57:34 2011 +0200 ntdll: Implement the ProcessAffinityMask case in NtQueryInformationProcess. --- dlls/kernel32/process.c | 22 ++++++++-------------- dlls/ntdll/process.c | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index e039cad..c263092 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3137,24 +3137,18 @@ BOOL WINAPI SetProcessAffinityMask( HANDLE hProcess, DWORD_PTR affmask ) /********************************************************************** * GetProcessAffinityMask (KERNEL32.@) */ -BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess, - PDWORD_PTR lpProcessAffinityMask, - PDWORD_PTR lpSystemAffinityMask ) +BOOL WINAPI GetProcessAffinityMask( HANDLE hProcess, PDWORD_PTR process_mask, PDWORD_PTR system_mask ) { - PROCESS_BASIC_INFORMATION pbi; - NTSTATUS status; + NTSTATUS status = STATUS_SUCCESS; - status = NtQueryInformationProcess(hProcess, - ProcessBasicInformation, - &pbi, sizeof(pbi), NULL); - if (status) + if (system_mask) *system_mask = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + if (process_mask) { - SetLastError( RtlNtStatusToDosError(status) ); - return FALSE; + if ((status = NtQueryInformationProcess( hProcess, ProcessAffinityMask, + process_mask, sizeof(*process_mask), NULL ))) + SetLastError( RtlNtStatusToDosError(status) ); } - if (lpProcessAffinityMask) *lpProcessAffinityMask = pbi.AffinityMask; - if (lpSystemAffinityMask) *lpSystemAffinityMask = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; - return TRUE; + return !status; } diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index eff3f58..a39f5d0 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -134,7 +134,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( UNIMPLEMENTED_INFO_CLASS(ProcessEnableAlignmentFaultFixup); UNIMPLEMENTED_INFO_CLASS(ProcessPriorityClass); UNIMPLEMENTED_INFO_CLASS(ProcessWx86Information); - UNIMPLEMENTED_INFO_CLASS(ProcessAffinityMask); UNIMPLEMENTED_INFO_CLASS(ProcessPriorityBoost); UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap); UNIMPLEMENTED_INFO_CLASS(ProcessSessionInformation); @@ -385,6 +384,24 @@ NTSTATUS WINAPI NtQueryInformationProcess( ret = STATUS_INFO_LENGTH_MISMATCH; } break; + + case ProcessAffinityMask: + len = sizeof(ULONG_PTR); + if (ProcessInformationLength == len) + { + const ULONG_PTR system_mask = ((ULONG_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + + SERVER_START_REQ(get_process_info) + { + req->handle = wine_server_obj_handle( ProcessHandle ); + if (!(ret = wine_server_call( req ))) + *(ULONG_PTR *)ProcessInformation = reply->affinity & system_mask; + } + SERVER_END_REQ; + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + case ProcessWow64Information: len = sizeof(DWORD); if (ProcessInformationLength == len)

1 0