October 2015 - Wine-Commits

Matteo Bruni : d3d9/tests: Fix color_match().
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 7ee0578019e0d8ae10d48163f49c28996a4e4b6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee0578019e0d8ae10d48163f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 8 01:26:41 2015 +0200 d3d9/tests: Fix color_match(). Clang on OS X complains about calling abs() on an unsigned value. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a9b1ade..49f3ad4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -65,13 +65,13 @@ static HWND create_window(void) static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (abs((int)(c1 & 0xff) - (int)(c2 & 0xff)) > max_diff) return FALSE; return TRUE; }

1 0

Józef Kucia : d3d11/tests: Port test_create_blend_state() from d3d10core.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: bd8a7f9e5dbd69a1de4c545042118eef6e1f3f2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd8a7f9e5dbd69a1de4c54504… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:57 2015 +0200 d3d11/tests: Port test_create_blend_state() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd8a7f9e5dbd69a1de4c5…

1 0

Józef Kucia : d3d10core/tests: Test conversion from D3D10_BLEND_DESC to D3D11_BLEND_DESC.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: a80902084f34345dc1e7abbd75e9f383f0211fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80902084f34345dc1e7abbd7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:56 2015 +0200 d3d10core/tests: Test conversion from D3D10_BLEND_DESC to D3D11_BLEND_DESC. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 151 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 134 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a80902084f34345dc1e7a…

1 0

Riccardo Bortolato : d3d9: Don' t use a wined3d_volume in d3d9_volume_GetDesc.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: fca636a01cfd1ef213326125582139bdd72a287a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca636a01cfd1ef2133261255… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:33 2015 +0200 d3d9: Don't use a wined3d_volume in d3d9_volume_GetDesc. finally removed the wind3d_volume pointer from d3d9_volume. Also removed wined3d_volume_get_resource. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 3 +-- dlls/d3d9/device.c | 2 +- dlls/d3d9/volume.c | 9 ++++----- dlls/wined3d/volume.c | 7 ------- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 6 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 28db978..ea0d3e6 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -193,12 +193,11 @@ struct d3d9_volume struct d3d9_resource resource; struct wined3d_texture *wined3d_texture; unsigned int sub_resource_idx; - struct wined3d_volume *wined3d_volume; struct d3d9_texture *texture; }; void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_swapchain { diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5568cc8..35abb13 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3564,7 +3564,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; - volume_init(d3d_volume, wined3d_texture, sub_resource_idx, volume, parent_ops); + volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops); *parent = d3d_volume; TRACE("Created volume %p.\n", d3d_volume); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index dde8980..ca72f99 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -117,13 +117,13 @@ static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DES { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; + struct wined3d_resource *sub_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); + sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); @@ -203,12 +203,11 @@ static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops = }; void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_texture, - unsigned int sub_resource_idx, struct wined3d_volume *wined3d_volume, const struct wined3d_parent_ops **parent_ops) + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) { volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl; d3d9_resource_init(&volume->resource); volume->resource.refcount = 0; - volume->wined3d_volume = wined3d_volume; volume->texture = wined3d_texture_get_parent(wined3d_texture); volume->wined3d_texture = wined3d_texture; volume->sub_resource_idx = sub_resource_idx; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 608f0c0..ef5a999 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -474,13 +474,6 @@ static ULONG CDECL wined3d_volume_decref(struct wined3d_volume *volume) return wined3d_texture_decref(volume->container); } -struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volume *volume) -{ - TRACE("volume %p.\n", volume); - - return &volume->resource; -} - static BOOL volume_check_block_align(const struct wined3d_volume *volume, const struct wined3d_box *box) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0efa91c..c4ebd35 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -282,5 +282,3 @@ @ cdecl wined3d_vertex_declaration_decref(ptr) @ cdecl wined3d_vertex_declaration_get_parent(ptr) @ cdecl wined3d_vertex_declaration_incref(ptr) - -@ cdecl wined3d_volume_get_resource(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7422545..a354308 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2568,8 +2568,6 @@ ULONG __cdecl wined3d_vertex_declaration_decref(struct wined3d_vertex_declaratio void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex_declaration *declaration); ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); -struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); - /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) {

1 0

Joachim Priesner : mshtml: Treat "data:" as Gecko special URI scheme.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: e7fc477921543d58dfa31acf92c71179d24042d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7fc477921543d58dfa31acf9… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Mon Sep 28 15:45:20 2015 +0200 mshtml: Treat "data:" as Gecko special URI scheme. This enables loading of inline content specified as data: URI, such as background images. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 45ad55f..c4efc5c 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3545,7 +3545,7 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; unsigned int i; for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) {

1 0

Riccardo Bortolato : wined3d: Don' t pass a wined3d_volume to device_volume_created callback anymore.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 33bb9e96109cda4709a55603f1244d011e3c2b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33bb9e96109cda4709a55603f… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:34 2015 +0200 wined3d: Don't pass a wined3d_volume to device_volume_created callback anymore. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- dlls/d3d8/device.c | 6 +++--- dlls/d3d9/device.c | 8 ++++---- dlls/ddraw/ddraw.c | 6 +++--- dlls/wined3d/volume.c | 2 +- include/wine/wined3d.h | 3 +-- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5384387..4939883 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2966,11 +2966,11 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent } static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, void **parent, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); *parent = NULL; *parent_ops = &d3d10_null_wined3d_parent_ops; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 818f601..e9583fc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3019,12 +3019,12 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_volume *volume, void **parent, const struct wined3d_parent_ops **parent_ops) + void **parent, const struct wined3d_parent_ops **parent_ops) { struct d3d8_volume *d3d_volume; - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 35abb13..656bf4b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3553,13 +3553,13 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent } static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, void **parent, - const struct wined3d_parent_ops **parent_ops) + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, + void **parent, const struct wined3d_parent_ops **parent_ops) { struct d3d9_volume *d3d_volume; - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) return E_OUTOFMEMORY; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aef9963..21f8038 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4746,11 +4746,11 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent } static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent, - struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, struct wined3d_volume *volume, + struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, void **parent, const struct wined3d_parent_ops **parent_ops) { - TRACE("device_parent %p, texture %p, sub_resource_idx %u, volume %p, parent %p, parent_ops %p.\n", - device_parent, wined3d_texture, sub_resource_idx, volume, parent, parent_ops); + TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n", + device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops); *parent = NULL; *parent_ops = &ddraw_null_wined3d_parent_ops; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ef5a999..6a7cc5c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -784,7 +784,7 @@ HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wi } if (FAILED(hr = device_parent->ops->volume_created(device_parent, - container, level, object, &parent, &parent_ops))) + container, level, &parent, &parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); wined3d_volume_destroy(object); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a354308..4579e02 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2018,7 +2018,6 @@ struct wined3d_surface; struct wined3d_swapchain; struct wined3d_texture; struct wined3d_vertex_declaration; -struct wined3d_volume; struct wined3d_device_parent { @@ -2034,7 +2033,7 @@ struct wined3d_device_parent_ops struct wined3d_surface *surface, void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *volume_created)(struct wined3d_device_parent *device_parent, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, - struct wined3d_volume *volume, void **parent, const struct wined3d_parent_ops **parent_ops); + void **parent, const struct wined3d_parent_ops **parent_ops); HRESULT (__cdecl *create_swapchain_texture)(struct wined3d_device_parent *device_parent, void *parent, const struct wined3d_resource_desc *desc, struct wined3d_texture **texture); HRESULT (__cdecl *create_swapchain)(struct wined3d_device_parent *device_parent,

1 0

Józef Kucia : d3d11: Rename d3d10_blend_state to d3d_blend_state.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: c2a171850fd1d2e22c2f4c9aed290cce25fadf1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a171850fd1d2e22c2f4c9ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:53 2015 +0200 d3d11: Rename d3d10_blend_state to d3d_blend_state. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 8 ++++---- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d11/state.c | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 313867e..b2de1a7 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -276,7 +276,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; /* ID3D10BlendState */ -struct d3d10_blend_state +struct d3d_blend_state { ID3D10BlendState ID3D10BlendState_iface; LONG refcount; @@ -287,9 +287,9 @@ struct d3d10_blend_state ID3D10Device1 *device; }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_device *device, +HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN; -struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; +struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D11DepthStencilState, ID3D10DepthStencilState */ struct d3d_depthstencil_state @@ -378,7 +378,7 @@ struct d3d_device struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - struct d3d10_blend_state *blend_state; + struct d3d_blend_state *blend_state; float blend_factor[4]; struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4939883..059be51 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2422,7 +2422,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *if const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_blend_state *object; + struct d3d_blend_state *object; struct wine_rb_entry *entry; HRESULT hr; @@ -2434,7 +2434,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *if wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->blend_states, desc))) { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_blend_state, entry); + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_blend_state, entry); TRACE("Returning existing blend state %p.\n", object); *blend_state = &object->ID3D10BlendState_iface; @@ -2449,7 +2449,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *if if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_blend_state_init(object, device, desc))) + if (FAILED(hr = d3d_blend_state_init(object, device, desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3090,20 +3090,20 @@ static const struct wine_rb_functions d3d10_sampler_state_rb_ops = d3d10_sampler_state_compare, }; -static int d3d10_blend_state_compare(const void *key, const struct wine_rb_entry *entry) +static int d3d_blend_state_compare(const void *key, const struct wine_rb_entry *entry) { const D3D10_BLEND_DESC *ka = key; - const D3D10_BLEND_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_blend_state, entry)->desc; + const D3D10_BLEND_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_blend_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } -static const struct wine_rb_functions d3d10_blend_state_rb_ops = +static const struct wine_rb_functions d3d_blend_state_rb_ops = { d3d_rb_alloc, d3d_rb_realloc, d3d_rb_free, - d3d10_blend_state_compare, + d3d_blend_state_compare, }; static int d3d_depthstencil_state_compare(const void *key, const struct wine_rb_entry *entry) @@ -3151,7 +3151,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) /* COM aggregation always takes place */ device->outer_unk = outer_unknown; - if (wine_rb_init(&device->blend_states, &d3d10_blend_state_rb_ops) == -1) + if (wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops) == -1) { WARN("Failed to initialize blend state rbtree.\n"); return E_FAIL; diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 1586067..2130399 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -30,9 +30,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); #define D3D10_FILTER_ANISO_MASK 0x40 #define D3D10_FILTER_COMPARE_MASK 0x80 -static inline struct d3d10_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) { - return CONTAINING_RECORD(iface, struct d3d10_blend_state, ID3D10BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); } /* IUnknown methods */ @@ -59,7 +59,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) { - struct d3d10_blend_state *This = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *This = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -92,7 +92,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -103,7 +103,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *ifac static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -114,7 +114,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendSta static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -125,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendSta static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -137,7 +137,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, D3D10_BLEND_DESC *desc) { - struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -159,7 +159,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc, }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_device *device, +HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D10_BLEND_DESC *desc) { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; @@ -183,7 +183,7 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d_devic return S_OK; } -struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) +struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) { if (!iface) return NULL;

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: seekoff.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 6aa589e85444a9a4d5c3141516e03222ef97c9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aa589e85444a9a4d5c314151… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:31 2015 +0100 msvcirt: Implement stdiobuf::seekoff. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 7 ++++-- dlls/msvcirt/tests/msvcirt.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1eefe73..bfef1a3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1571,8 +1571,11 @@ int __thiscall stdiobuf_pbackfail(stdiobuf *this, int c) DEFINE_THISCALL_WRAPPER(stdiobuf_seekoff, 16) streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek_dir dir, int mode) { - FIXME("(%p %d %d %d) stub\n", this, offset, dir, mode); - return EOF; + TRACE("(%p %d %d %d)\n", this, offset, dir, mode); + call_streambuf_overflow(&this->base, EOF); + if (fseek(this->file, offset, dir)) + return EOF; + return ftell(this->file); } /* ?setrwbuf(a)stdiobuf@@QAEHHH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 758062c..704a6c2 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static streampos (*__thiscall p_stdiobuf_seekoff)(stdiobuf*, streamoff, ios_seek_dir, int); static int (*__thiscall p_stdiobuf_setrwbuf)(stdiobuf*, int, int); static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); @@ -375,6 +376,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA(a)PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UEAAHH(a)Z"); + SET(p_stdiobuf_seekoff, "?seekoff(a)stdiobuf@@UEAAJJW4seek_dir(a)ios@@H(a)Z"); SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UEAAHXZ"); @@ -460,6 +462,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE(a)PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UAEHH(a)Z"); + SET(p_stdiobuf_seekoff, "?seekoff(a)stdiobuf@@UAEJJW4seek_dir(a)ios@@H(a)Z"); SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QAEHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UAEHXZ"); @@ -2048,6 +2051,63 @@ static void test_stdiobuf(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(stb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb1.base.unbuffered); + /* seekoff */ + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 0, SEEKDIR_beg, OPENMODE_in); + ok(ret == 0, "expected 0 got %d\n", ret); + stb1.base.unbuffered = 0; + ret = (int) call_func3(p_streambuf_xsputn, &stb1.base, "Never gonna say goodbye", 22); + ok(ret == 22, "expected 22 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 5, SEEKDIR_beg, OPENMODE_in); + ok(ret == 5, "expected 5 got %d\n", ret); + ok(stb1.base.pptr == stb1.base.pbase + 22, "wrong put pointer, expected %p got %p\n", stb1.base.pbase + 22, stb1.base.pptr); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 300, SEEKDIR_beg, OPENMODE_in); + ok(ret == 300, "expected 300 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -310, SEEKDIR_cur, OPENMODE_in); + ok(ret == EOF, "expected EOF got %d\n", ret); + stb1.base.eback = stb1.base.base; + stb1.base.gptr = stb1.base.egptr = stb1.base.pbase = stb1.base.base + 10; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -280, SEEKDIR_cur, OPENMODE_in); + ok(ret == 20, "expected 20 got %d\n", ret); + stb1.base.gptr = stb1.base.eback; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 80, SEEKDIR_cur, OPENMODE_in); + ok(ret == 100, "expected 100 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 0, SEEKDIR_end, OPENMODE_in); + ok(ret == 49, "expected 49 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, 1, SEEKDIR_end, OPENMODE_in); + ok(ret == 50, "expected 50 got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -60, SEEKDIR_end, OPENMODE_in); + ok(ret == EOF, "expected EOF got %d\n", ret); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb1, -20, SEEKDIR_end, OPENMODE_out); + ok(ret == 29, "expected 29 got %d\n", ret); + stb1.base.eback = stb1.base.gptr = stb1.base.egptr = NULL; + stb1.base.pptr = stb1.base.pbase; + stb1.base.unbuffered = 1; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 0, SEEKDIR_beg, OPENMODE_in); + ok(ret == 0, "expected 0 got %d\n", ret); + stb2.base.pptr += 10; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 20, SEEKDIR_beg, OPENMODE_in); + ok(ret == 20, "expected 20 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase + 10, "wrong put pointer, expected %p got %p\n", stb2.base.pbase + 10, stb2.base.pptr); + stb2.base.unbuffered = 0; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 10, SEEKDIR_cur, OPENMODE_in); + ok(ret == 40, "expected 40 got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase, "wrong put pointer, expected %p got %p\n", stb2.base.pbase, stb2.base.pptr); + stb2.base.gptr = stb2.base.eback; + stb2.base.pptr += 5; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, -50, SEEKDIR_cur, OPENMODE_in|OPENMODE_out); + ok(ret == EOF, "expected EOF got %d\n", ret); + ok(stb2.base.pptr == stb2.base.pbase, "wrong put pointer, expected %p got %p\n", stb2.base.pbase, stb2.base.pptr); + stb2.base.pbase = stb2.base.pptr = stb2.base.epptr = NULL; + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, 0, SEEKDIR_end, OPENMODE_in|OPENMODE_out); + ok(ret == 48, "expected 48 got %d\n", ret); + ok(stb2.base.pbase == stb2.base.base + 32, "wrong put pointer, expected %p got %p\n", stb2.base.base + 32, stb2.base.pbase); + ok(stb2.base.pptr == stb2.base.base + 32, "wrong put pointer, expected %p got %p\n", stb2.base.base + 32, stb2.base.pptr); + ok(stb2.base.epptr == stb2.base.ebuf, "wrong put pointer, expected %p got %p\n", stb2.base.ebuf, stb2.base.epptr); + ret = (int) call_func4(p_stdiobuf_seekoff, &stb2, -28, SEEKDIR_end, -1); + ok(ret == 20, "expected 20 got %d\n", ret); + stb2.base.gptr = stb2.base.egptr; + stb2.base.unbuffered = 1; + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Henri Verbeet : d2d1: Only test figures that overlap the probe in d2d_path_geometry_point_inside ().
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: e6da1a780e0ae88588a917545caa44165a7cf66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6da1a780e0ae88588a917545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 17:56:01 2015 +0200 d2d1: Only test figures that overlap the probe in d2d_path_geometry_point_inside(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 4c66239..b6a11f7 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1170,6 +1170,10 @@ static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry, { const struct d2d_figure *figure = &geometry->u.path.figures[i]; + if (probe->x < figure->bounds.left || probe->x > figure->bounds.right + || probe->y < figure->bounds.top || probe->y > figure->bounds.bottom) + continue; + p0 = &figure->vertices[figure->vertex_count - 1]; for (j = 0; j < figure->vertex_count; p0 = p1, ++j) {

1 0

Henri Verbeet : d2d1: Only test overlapping figures in d2d_geometry_intersect_self().
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: c98d34d7457f8d6f34463c3736877042d2c1cfce URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98d34d7457f8d6f34463c373… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 17:56:00 2015 +0200 d2d1: Only test overlapping figures in d2d_geometry_intersect_self(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 3ed9c86..4c66239 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -55,6 +55,8 @@ struct d2d_figure struct d2d_bezier *beziers; size_t beziers_size; size_t bezier_count; + + D2D1_RECT_F bounds; }; struct d2d_cdt_edge_ref @@ -422,6 +424,18 @@ static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_ return TRUE; } +static void d2d_figure_update_bounds(struct d2d_figure *figure, D2D1_POINT_2F vertex) +{ + if (vertex.x < figure->bounds.left) + figure->bounds.left = vertex.x; + if (vertex.x > figure->bounds.right) + figure->bounds.right = vertex.x; + if (vertex.y < figure->bounds.top) + figure->bounds.top = vertex.y; + if (vertex.y > figure->bounds.bottom) + figure->bounds.bottom = vertex.y; +} + static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1_POINT_2F vertex) { if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, @@ -434,6 +448,7 @@ static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1 memmove(&figure->vertices[idx + 1], &figure->vertices[idx], (figure->vertex_count - idx) * sizeof(*figure->vertices)); figure->vertices[idx] = vertex; + d2d_figure_update_bounds(figure, vertex); ++figure->vertex_count; return TRUE; } @@ -448,6 +463,7 @@ static BOOL d2d_figure_add_vertex(struct d2d_figure *figure, D2D1_POINT_2F verte } figure->vertices[figure->vertex_count] = vertex; + d2d_figure_update_bounds(figure, vertex); ++figure->vertex_count; return TRUE; } @@ -1426,6 +1442,13 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) for (j = min_j, min_j = 0, l = min_l, min_l = 0; j < i || (j == i && k); ++j, l = 0) { figure_q = &geometry->u.path.figures[j]; + + if (figure_p->bounds.left > figure_q->bounds.right + || figure_q->bounds.left > figure_p->bounds.right + || figure_p->bounds.top > figure_q->bounds.bottom + || figure_q->bounds.top > figure_p->bounds.bottom) + continue; + max_l = j == i ? k - 1 : figure_q->vertex_count; q0 = figure_q->vertices[l == 0 ? figure_q->vertex_count - 1 : l - 1]; for (; l < max_l; q0 = q1, ++l) @@ -1550,6 +1573,10 @@ static BOOL d2d_path_geometry_add_figure(struct d2d_geometry *geometry) figure = &geometry->u.path.figures[geometry->u.path.figure_count]; memset(figure, 0, sizeof(*figure)); + figure->bounds.left = FLT_MAX; + figure->bounds.top = FLT_MAX; + figure->bounds.right = -FLT_MAX; + figure->bounds.bottom = -FLT_MAX; ++geometry->u.path.figure_count; return TRUE;

1 0