August 2014 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Keep a reference to the resource in rendertarget views.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: eb24c9578c83ba1684e65f2e5f2cfd091fdea752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb24c9578c83ba1684e65f2e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:52 2014 +0200 wined3d: Keep a reference to the resource in rendertarget views. --- dlls/wined3d/buffer.c | 12 ++++++++++++ dlls/wined3d/surface.c | 12 ++++++++++++ dlls/wined3d/texture.c | 12 ++++++++++++ dlls/wined3d/view.c | 4 ++++ dlls/wined3d/volume.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++++++++ 6 files changed, 64 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9af0adb..989026f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1113,8 +1113,20 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } +static ULONG buffer_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_buffer_incref(buffer_from_resource(resource)); +} + +static ULONG buffer_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_buffer_decref(buffer_from_resource(resource)); +} + static const struct wined3d_resource_ops buffer_resource_ops = { + buffer_resource_incref, + buffer_resource_decref, buffer_unload, }; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 20b36f2..65517ec 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1158,6 +1158,16 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win surface_invalidate_location(surface, WINED3D_LOCATION_BUFFER); } +static ULONG surface_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_surface_incref(surface_from_resource(resource)); +} + +static ULONG surface_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_surface_decref(surface_from_resource(resource)); +} + static void surface_unload(struct wined3d_resource *resource) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -1236,6 +1246,8 @@ static void surface_unload(struct wined3d_resource *resource) static const struct wined3d_resource_ops surface_resource_ops = { + surface_resource_incref, + surface_resource_decref, surface_unload, }; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 07667f3..f595e16 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -771,6 +771,16 @@ static const struct wined3d_texture_ops texture2d_ops = texture2d_sub_resource_cleanup, }; +static ULONG texture_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_texture_incref(wined3d_texture_from_resource(resource)); +} + +static ULONG texture_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_texture_decref(wined3d_texture_from_resource(resource)); +} + static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); @@ -791,6 +801,8 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) static const struct wined3d_resource_ops texture_resource_ops = { + texture_resource_incref, + texture_resource_decref, wined3d_texture_unload, }; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 54ed9e4..bfec1ef 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -40,7 +40,10 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) + { + wined3d_resource_decref(view->resource); HeapFree(GetProcessHeap(), 0, view); + } return refcount; } @@ -64,6 +67,7 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie { view->refcount = 1; view->resource = resource; + wined3d_resource_incref(resource); view->parent = parent; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f1d09e5..b8dab3e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -772,8 +772,20 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) return WINED3D_OK; } +static ULONG volume_resource_incref(struct wined3d_resource *resource) +{ + return wined3d_volume_incref(volume_from_resource(resource)); +} + +static ULONG volume_resource_decref(struct wined3d_resource *resource) +{ + return wined3d_volume_decref(volume_from_resource(resource)); +} + static const struct wined3d_resource_ops volume_resource_ops = { + volume_resource_incref, + volume_resource_decref, volume_unload, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f4d8815..16ae4c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2020,6 +2020,8 @@ static inline void context_invalidate_active_texture(struct wined3d_context *con struct wined3d_resource_ops { + ULONG (*resource_incref)(struct wined3d_resource *resource); + ULONG (*resource_decref)(struct wined3d_resource *resource); void (*resource_unload)(struct wined3d_resource *resource); }; @@ -2051,6 +2053,16 @@ struct wined3d_resource const struct wined3d_resource_ops *resource_ops; }; +static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) +{ + return resource->resource_ops->resource_incref(resource); +} + +static inline ULONG wined3d_resource_decref(struct wined3d_resource *resource) +{ + return resource->resource_ops->resource_decref(resource); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format,

1 0

Henri Verbeet : wined3d: Introduce struct wined3d_rendertarget_view_desc.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: fb7135efd134cc45d4fff683afece7e1116c713b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb7135efd134cc45d4fff683a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:53 2014 +0200 wined3d: Introduce struct wined3d_rendertarget_view_desc. --- dlls/d3d10core/view.c | 68 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/view.c | 42 ++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 8 +++++ include/wine/wined3d.h | 23 ++++++++++++-- 5 files changed, 129 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index e7aac3b..7394466 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -654,9 +654,73 @@ static const struct ID3D10RenderTargetViewVtbl d3d10_rendertarget_view_vtbl = d3d10_rendertarget_view_GetDesc, }; +static void wined3d_rendertarget_view_desc_from_d3d10core(struct wined3d_rendertarget_view_desc *wined3d_desc, + const D3D10_RENDER_TARGET_VIEW_DESC *desc) +{ + wined3d_desc->format_id = wined3dformat_from_dxgi_format(desc->Format); + + switch (desc->ViewDimension) + { + case D3D10_RTV_DIMENSION_BUFFER: + wined3d_desc->u.buffer.start_idx = desc->u.Buffer.ElementOffset; + wined3d_desc->u.buffer.count = desc->u.Buffer.ElementWidth; + break; + + case D3D10_RTV_DIMENSION_TEXTURE1D: + wined3d_desc->u.texture.level_idx = desc->u.Texture1D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE1DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture1DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture1DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture1DArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2D: + wined3d_desc->u.texture.level_idx = desc->u.Texture2D.MipSlice; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DARRAY: + wined3d_desc->u.texture.level_idx = desc->u.Texture2DArray.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DMS: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + + case D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY: + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; + + case D3D10_RTV_DIMENSION_TEXTURE3D: + wined3d_desc->u.texture.level_idx = desc->u.Texture3D.MipSlice; + wined3d_desc->u.texture.layer_idx = desc->u.Texture3D.FirstWSlice; + wined3d_desc->u.texture.layer_count = desc->u.Texture3D.WSize; + break; + + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + wined3d_desc->u.texture.level_idx = 0; + wined3d_desc->u.texture.layer_idx = 0; + wined3d_desc->u.texture.layer_count = 1; + break; + } +} + HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) { + struct wined3d_rendertarget_view_desc wined3d_desc; struct wined3d_resource *wined3d_resource; HRESULT hr; @@ -680,8 +744,8 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return E_FAIL; } - hr = wined3d_rendertarget_view_create(wined3d_resource, view, &view->wined3d_view); - if (FAILED(hr)) + wined3d_rendertarget_view_desc_from_d3d10core(&wined3d_desc, &view->desc); + if (FAILED(hr = wined3d_rendertarget_view_create(&wined3d_desc, wined3d_resource, view, &view->wined3d_view))) { WARN("Failed to create a wined3d rendertarget view, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index bfec1ef..7d9e742 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -63,30 +63,54 @@ struct wined3d_resource * CDECL wined3d_rendertarget_view_get_resource(const str } static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, - struct wined3d_resource *resource, void *parent) + const struct wined3d_rendertarget_view_desc *desc, struct wined3d_resource *resource, void *parent) { + const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; + view->refcount = 1; view->resource = resource; wined3d_resource_incref(resource); view->parent = parent; + + view->format = wined3d_get_format(gl_info, desc->format_id); + if (resource->type == WINED3D_RTYPE_BUFFER) + { + view->sub_resource_idx = 0; + view->buffer_offset = desc->u.buffer.start_idx; + view->width = desc->u.buffer.count; + view->height = 1; + view->depth = 1; + } + else + { + struct wined3d_texture *texture = wined3d_texture_from_resource(resource); + struct wined3d_resource *sub_resource; + + view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + sub_resource = wined3d_texture_get_sub_resource(texture, view->sub_resource_idx); + + view->buffer_offset = 0; + view->width = sub_resource->width; + view->height = sub_resource->height; + view->depth = desc->u.texture.layer_count; + } } -HRESULT CDECL wined3d_rendertarget_view_create(struct wined3d_resource *resource, - void *parent, struct wined3d_rendertarget_view **rendertarget_view) +HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, + struct wined3d_resource *resource, void *parent, struct wined3d_rendertarget_view **view) { struct wined3d_rendertarget_view *object; - TRACE("resource %p, parent %p, rendertarget_view %p.\n", - resource, parent, rendertarget_view); + TRACE("desc %p, resource %p, parent %p, view %p.\n", + desc, resource, parent, view); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_rendertarget_view_init(object, resource, parent); + wined3d_rendertarget_view_init(object, desc, resource, parent); TRACE("Created render target view %p.\n", object); - *rendertarget_view = object; + *view = object; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e3baac2..722ad18 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -177,7 +177,7 @@ @ cdecl wined3d_resource_set_parent(ptr ptr) @ cdecl wined3d_resource_set_priority(ptr long) -@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr) +@ cdecl wined3d_rendertarget_view_create(ptr ptr ptr ptr) @ cdecl wined3d_rendertarget_view_decref(ptr) @ cdecl wined3d_rendertarget_view_get_parent(ptr) @ cdecl wined3d_rendertarget_view_get_resource(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 16ae4c3..81cbb29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2617,6 +2617,14 @@ struct wined3d_rendertarget_view struct wined3d_resource *resource; void *parent; + + const struct wined3d_format *format; + unsigned int sub_resource_idx; + unsigned int buffer_offset; + + unsigned int width; + unsigned int height; + unsigned int depth; }; struct wined3d_swapchain_ops diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2aacecb..216e8ab 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1934,6 +1934,25 @@ struct wined3d_buffer_desc UINT misc_flags; }; +struct wined3d_rendertarget_view_desc +{ + enum wined3d_format_id format_id; + union + { + struct + { + unsigned int start_idx; + unsigned int count; + } buffer; + struct + { + unsigned int level_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } u; +}; + struct wined3d_shader_signature_element { const char *semantic_name; @@ -2357,8 +2376,8 @@ DWORD __cdecl wined3d_resource_get_priority(const struct wined3d_resource *resou void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); DWORD __cdecl wined3d_resource_set_priority(struct wined3d_resource *resource, DWORD priority); -HRESULT __cdecl wined3d_rendertarget_view_create(struct wined3d_resource *resource, - void *parent, struct wined3d_rendertarget_view **rendertarget_view); +HRESULT __cdecl wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, + struct wined3d_resource *resource, void *parent, struct wined3d_rendertarget_view **view); ULONG __cdecl wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view); void * __cdecl wined3d_rendertarget_view_get_parent(const struct wined3d_rendertarget_view *view); struct wined3d_resource * __cdecl wined3d_rendertarget_view_get_resource(const struct wined3d_rendertarget_view *view);

1 0

Henri Verbeet : wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 7ede9788d4ac6b61514b83cfe0a0908c701905b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ede9788d4ac6b61514b83cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:54 2014 +0200 wined3d: Make wined3d_device_clear_rendertarget_view() work with texture resources. --- dlls/wined3d/device.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f5a46c..962c9c8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3741,22 +3741,32 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, } void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, - struct wined3d_rendertarget_view *rendertarget_view, const struct wined3d_color *color) + struct wined3d_rendertarget_view *view, const struct wined3d_color *color) { struct wined3d_resource *resource; HRESULT hr; RECT rect; - resource = rendertarget_view->resource; - if (resource->type != WINED3D_RTYPE_SURFACE) + TRACE("device %p, view %p, color {%.8e, %.8e, %.8e, %.8e}.\n", + device, view, color->r, color->g, color->b, color->a); + + resource = view->resource; + if (resource->type != WINED3D_RTYPE_TEXTURE && resource->type != WINED3D_RTYPE_CUBE_TEXTURE) + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); + return; + } + + if (view->depth > 1) { - FIXME("Only supported on surface resources\n"); + FIXME("Layered clears not implemented.\n"); return; } - SetRect(&rect, 0, 0, resource->width, resource->height); - hr = surface_color_fill(surface_from_resource(resource), &rect, color); - if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); + SetRect(&rect, 0, 0, view->width, view->height); + resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(resource), view->sub_resource_idx); + if (FAILED(hr = surface_color_fill(surface_from_resource(resource), &rect, color))) + ERR("Color fill failed, hr %#x.\n", hr); } struct wined3d_surface * CDECL wined3d_device_get_render_target(const struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Use rendertarget views for color output instead of surfaces.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: b005ad6f905dc0051b17ea45b3690e0662e48481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b005ad6f905dc0051b17ea45b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 21 09:55:55 2014 +0200 wined3d: Use rendertarget views for color output instead of surfaces. --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/view.c | 3 +- dlls/d3d8/d3d8_private.h | 4 ++ dlls/d3d8/device.c | 26 ++++---- dlls/d3d8/surface.c | 47 ++++++++++++++ dlls/d3d8/texture.c | 25 ++++++++ dlls/d3d9/d3d9_private.h | 4 ++ dlls/d3d9/device.c | 12 ++-- dlls/d3d9/surface.c | 47 ++++++++++++++ dlls/d3d9/texture.c | 25 ++++++++ dlls/ddraw/ddraw.c | 20 +++--- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/device.c | 10 +-- dlls/ddraw/surface.c | 68 +++++++++++++++++--- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/context.c | 47 ++++++++------ dlls/wined3d/cs.c | 28 ++++----- dlls/wined3d/device.c | 123 ++++++++++++++++++++++--------------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 35 +++++------ dlls/wined3d/surface.c | 34 ++++++---- dlls/wined3d/texture.c | 4 +- dlls/wined3d/utils.c | 4 +- dlls/wined3d/view.c | 50 ++++++++++++++- dlls/wined3d/wined3d.spec | 9 ++- dlls/wined3d/wined3d_private.h | 33 ++++++++-- include/wine/wined3d.h | 15 +++-- 29 files changed, 512 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b005ad6f905dc0051b17e…

1 0

Gerald Pfeifer : ws2_32: Define fill_control_message only when it' s really used.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 7432a8588c321145f6b4341aff93d38a38b2851d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7432a8588c321145f6b4341af… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Aug 17 00:28:05 2014 +0200 ws2_32: Define fill_control_message only when it's really used. --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5900c8f..d5e9fd1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -569,6 +569,7 @@ static const int ws_eai_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS +#ifdef IP_PKTINFO static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -586,6 +587,7 @@ static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR * /* Return the pointer to where next entry should go */ return (WSACMSGHDR *) (ptr + WSA_CMSG_ALIGN(len)); } +#endif /* IP_PKTINFO */ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) {

1 0

Zhenbo Li : mshtml: Added IHTMLStyle::listStyle property implementation.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: bde260411c6710c03f6527220b363cd9a467d6e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde260411c6710c03f6527220… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Wed Aug 20 21:35:43 2014 +0800 mshtml: Added IHTMLStyle::listStyle property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9c9c96e..aa19da7 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -128,6 +128,8 @@ static const WCHAR attrLetterSpacing[] = {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR attrLineHeight[] = {'l','i','n','e','-','h','e','i','g','h','t',0}; +static const WCHAR attrListStyle[] = + {'l','i','s','t','-','s','t','y','l','e',0}; static const WCHAR attrListStyleType[] = {'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0}; static const WCHAR attrListStylePosition[] = @@ -252,6 +254,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT}, + {attrListStyle, DISPID_IHTMLSTYLE_LISTSTYLE}, {attrListStylePosition, DISPID_IHTMLSTYLE_LISTSTYLEPOSITION}, {attrListStyleType, DISPID_IHTMLSTYLE_LISTSTYLETYPE}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, @@ -2241,15 +2244,19 @@ static HRESULT WINAPI HTMLStyle_get_listStyleImage(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_listStyle(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_LIST_STYLE, v, 0); } static HRESULT WINAPI HTMLStyle_get_listStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_LIST_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_whiteSpace(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9b44a30..3c6bb6c 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -79,6 +79,7 @@ typedef enum { STYLEID_LEFT, STYLEID_LETTER_SPACING, STYLEID_LINE_HEIGHT, + STYLEID_LIST_STYLE, STYLEID_LISTSTYLEPOSITION, STYLEID_LISTSTYLETYPE, STYLEID_MARGIN, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 94226e1..5297246 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -59,6 +59,22 @@ static BSTR a2bstr(const char *str) return ret; } +static const WCHAR *strstr_wa(const WCHAR *str, const char *suba) +{ + BSTR sub; + const WCHAR *ret = NULL; + sub = a2bstr(suba); + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) {ret = str; break;} + str++; + } + SysFreeString(sub); + return ret; +} + #define test_var_bstr(a,b) _test_var_bstr(__LINE__,a,b) static void _test_var_bstr(unsigned line, const VARIANT *v, const char *expect) { @@ -2194,6 +2210,24 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "inside"), "listStyleType = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = a2bstr("decimal-leading-zero none inside"); + hres = IHTMLStyle_put_listStyle(style, str); + ok(hres == S_OK || broken(hres == E_INVALIDARG), /* win 2000 */ + "put_listStyle(%s) failed: %08x\n", wine_dbgstr_w(str), hres); + SysFreeString(str); + + if (hres != E_INVALIDARG) { + hres = IHTMLStyle_get_listStyle(style, &str); + ok(hres == S_OK, "get_listStyle failed: %08x\n", hres); + ok(strstr_wa(str, "decimal-leading-zero") == str && + strstr_wa(str, "none") != NULL && + strstr_wa(str, "inside") != NULL, + "listStyle = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } else { + win_skip("IHTMLStyle_put_listStyle already failed\n"); + } + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Aric Stewart : dwrite: Implement TryGetFontTable and ReleaseFontTable.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: bc77ee68180e402148f70f75d7a9464324fc7ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc77ee68180e402148f70f75d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Aug 16 20:42:24 2014 -0500 dwrite: Implement TryGetFontTable and ReleaseFontTable. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 65 ++++++++++++++++++++++++++++++-- dlls/dwrite/opentype.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index f56b6f0..a64e632 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -94,3 +94,4 @@ extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE /* Opentype font table functions */ extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; +extern HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8c82d08..0683dd5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -156,6 +156,14 @@ struct dwrite_font { WCHAR *facename; }; +#define DWRITE_FONTTABLE_MAGIC 0xededfafa + +struct dwrite_fonttable { + UINT32 magic; + LPVOID context; + UINT32 file_index; +}; + struct dwrite_fontface { IDWriteFontFace IDWriteFontFace_iface; LONG ref; @@ -384,14 +392,65 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN const void **table_data, UINT32 *table_size, void **context, BOOL *exists) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - FIXME("(%p)->(%u %p %p %p %p): stub\n", This, table_tag, table_data, table_size, context, exists); - return E_NOTIMPL; + if (This->is_system) + { + FIXME("(%p)->(%u %p %p %p %p): stub\n", This, table_tag, table_data, table_size, context, exists); + return E_NOTIMPL; + } + else + { + HRESULT hr = S_OK; + int i; + struct dwrite_fonttable *table; + + TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); + + table = heap_alloc(sizeof(struct dwrite_fonttable)); + table->magic = DWRITE_FONTTABLE_MAGIC; + if (!table) + return E_OUTOFMEMORY; + + *exists = FALSE; + for (i = 0; i < This->file_count && !(*exists); i++) + { + IDWriteFontFileStream *stream; + hr = _dwritefontfile_GetFontFileStream(This->files[i], &stream); + if (FAILED(hr)) + continue; + table->file_index = i; + + hr = find_font_table(stream, This->index, table_tag, table_data, &table->context, table_size, exists); + + IDWriteFontFileStream_Release(stream); + } + if (FAILED(hr) && !*exists) + heap_free(table); + else + *context = (LPVOID)table; + return hr; + } } static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace *iface, void *table_context) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - FIXME("(%p)->(%p): stub\n", This, table_context); + struct dwrite_fonttable *table = (struct dwrite_fonttable *)table_context; + IDWriteFontFileStream *stream; + HRESULT hr; + TRACE("(%p)->(%p)\n", This, table_context); + + if (table->magic != DWRITE_FONTTABLE_MAGIC) + { + TRACE("Invalid table magic\n"); + return; + } + + hr = _dwritefontfile_GetFontFileStream(This->files[table->file_index], &stream); + if (FAILED(hr)) + return; + IDWriteFontFileStream_ReleaseFileFragment(stream, table->context); + IDWriteFontFileStream_Release(stream); + heap_free(table); } static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace *iface, FLOAT emSize, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 538db98..6c90a96 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -47,6 +47,21 @@ typedef struct { DWORD OffsetTable[1]; } TTC_Header_V1; +typedef struct { + DWORD version; + WORD numTables; + WORD searchRange; + WORD entrySelector; + WORD rangeShift; +} TTC_SFNT_V1; + +typedef struct { + CHAR tag[4]; + DWORD checkSum; + DWORD offset; + DWORD length; +} TT_TableRecord; + HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) { /* TODO: Do font validation */ @@ -81,3 +96,76 @@ HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_ } return S_OK; } + +HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) +{ + const CHAR *first_data; + void *first_context; + HRESULT hr; + TTC_SFNT_V1 *font_header = NULL; + void *sfnt_context; + TT_TableRecord *table_record = NULL; + void *table_record_context; + int i; + int table_count; + int table_offset = 0; + + *found = FALSE; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&first_data, 0, 4, &first_context); + if (SUCCEEDED(hr)) + { + if (DWRITE_MAKE_OPENTYPE_TAG(first_data[0], first_data[1], first_data[2], first_data[3]) == MS_TTCF_TAG) + { + const TTC_Header_V1 *ttc_header; + void * ttc_context; + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); + if (SUCCEEDED(hr)) + { + table_offset = GET_BE_DWORD(ttc_header->OffsetTable[0]); + if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) + hr = E_INVALIDARG; + else + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); + } + } + else + { + if (font_index > 0) + hr = E_INVALIDARG; + else + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); + } + IDWriteFontFileStream_ReleaseFileFragment(stream, first_context); + } + if (FAILED(hr)) + return hr; + + table_count = GET_BE_WORD(font_header->numTables); + table_offset += sizeof(*font_header); + for (i = 0; i < table_count; i++) + { + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&table_record, table_offset, sizeof(*table_record), &table_record_context); + if (FAILED(hr)) + break; + if (DWRITE_MAKE_OPENTYPE_TAG(table_record->tag[0], table_record->tag[1], table_record->tag[2], table_record->tag[3]) == tag) + break; + IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); + table_offset += sizeof(*table_record); + } + + IDWriteFontFileStream_ReleaseFileFragment(stream, sfnt_context); + if (SUCCEEDED(hr) && i < table_count) + { + int offset = GET_BE_DWORD(table_record->offset); + int length = GET_BE_DWORD(table_record->length); + IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); + + *found = TRUE; + *table_size = length; + hr = IDWriteFontFileStream_ReadFileFragment(stream, table_data, offset, length, table_context); + } + + return hr; +}

1 0

Ken Thomases : loader: Set LSUIElement to 1 in the embedded Mac Info.plist.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: dbe0d0be34e0a427de85b4dc87a38835e61b747e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe0d0be34e0a427de85b4dc8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Aug 20 13:39:34 2014 -0500 loader: Set LSUIElement to 1 in the embedded Mac Info.plist. --- loader/wine_info.plist.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine_info.plist.in b/loader/wine_info.plist.in index aea99e5..2895aea 100644 --- a/loader/wine_info.plist.in +++ b/loader/wine_info.plist.in @@ -22,5 +22,7 @@ <string>@PACKAGE_VERSION@</string> <key>NSPrincipalClass</key> <string>WineApplication</string> + <key>LSUIElement</key> + <string>1</string> </dict> </plist>

1 0

André Hentschel : wpcap: Implement pcap_open.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: c070c46ed4ff0d6341972c47a420f5121b72a935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c070c46ed4ff0d6341972c47a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 18 23:58:06 2014 +0200 wpcap: Implement pcap_open. --- dlls/wpcap/wpcap.c | 11 +++++++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index fb36326..aedfcc6 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -196,6 +196,17 @@ int CDECL wine_pcap_minor_version(pcap_t *p) return pcap_minor_version(p); } +#define PCAP_OPENFLAG_PROMISCUOUS 1 + +pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, + void *auth, char *errbuf) +{ + int promisc = flags & PCAP_OPENFLAG_PROMISCUOUS; + FIXME("(%s %i %i %i %p %p): partial stub\n", debugstr_a(source), snaplen, flags, read_timeout, + auth, errbuf); + return pcap_open_live(source, snaplen, promisc, read_timeout, errbuf); +} + pcap_t* CDECL wine_pcap_open_live(const char *source, int snaplen, int promisc, int to_ms, char *errbuf) { diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 718d0fe..8b8a37e 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -47,7 +47,7 @@ @ stub pcap_next_ex @ stub pcap_offline_filter @ stub pcap_offline_read -@ stub pcap_open +@ cdecl pcap_open(str long long long ptr ptr) wine_pcap_open @ stub pcap_open_dead @ cdecl pcap_open_live(str long long long ptr) wine_pcap_open_live @ stub pcap_open_offline

1 0

André Hentschel : wpcap: Implement pcap_getnonblock.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 4de7047873c1e78f1aaad349802fcfecb7a89e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de7047873c1e78f1aaad3498… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 19 00:00:00 2014 +0200 wpcap: Implement pcap_getnonblock. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index aedfcc6..9335f2d 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -140,6 +140,12 @@ char* CDECL wine_pcap_geterr(pcap_t *p) return pcap_geterr(p); } +int CDECL wine_pcap_getnonblock(pcap_t *p, char *errbuf) +{ + TRACE("(%p %p)\n", p, errbuf); + return pcap_getnonblock(p, errbuf); +} + const char* CDECL wine_pcap_lib_version(void) { const char* ret = pcap_lib_version(); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 8b8a37e..34eebbe 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -31,7 +31,7 @@ @ cdecl pcap_get_airpcap_handle(ptr) wine_pcap_get_airpcap_handle @ cdecl pcap_geterr(ptr) wine_pcap_geterr @ stub pcap_getevent -@ stub pcap_getnonblock +@ cdecl pcap_getnonblock(ptr ptr) wine_pcap_getnonblock @ stub pcap_is_swapped @ cdecl pcap_lib_version() wine_pcap_lib_version @ cdecl pcap_list_datalinks(ptr ptr) wine_pcap_list_datalinks

1 0