March 2016 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9: Introduce preshaders in effect.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 8eeeb4d1e192d232a644bc59c03a9f2926d1fa31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eeeb4d1e192d232a644bc59c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 28 10:20:21 2016 +0300 d3dx9: Introduce preshaders in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_private.h | 36 +++++++++++++++++++ dlls/d3dx9_36/effect.c | 84 ++++++++++++++++++++++++++----------------- dlls/d3dx9_36/preshader.c | 41 +++++++++++++++++++++ 4 files changed, 130 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 95e3045..83f7d1c 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ line.c \ math.c \ mesh.c \ + preshader.c \ render.c \ shader.c \ skin.c \ diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index bc9581d..5ba93ac 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -108,4 +108,40 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +struct d3dx_param_eval; + +struct d3dx_parameter +{ + char *name; + char *semantic; + void *data; + D3DXPARAMETER_CLASS class; + D3DXPARAMETER_TYPE type; + UINT rows; + UINT columns; + UINT element_count; + UINT annotation_count; + UINT member_count; + DWORD flags; + UINT bytes; + DWORD object_id; + + D3DXHANDLE handle; + + struct d3dx_parameter *annotations; + struct d3dx_parameter *members; + + struct d3dx_parameter *referenced_param; + struct d3dx_param_eval *param_eval; +}; + +struct d3dx9_base_effect; + +struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, + struct d3dx_parameter *parameter, const char *name) DECLSPEC_HIDDEN; + +HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, + unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval) DECLSPEC_HIDDEN; +void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN; + #endif /* __WINE_D3DX9_PRIVATE_H */ diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a210bb3..76a012d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -94,30 +94,6 @@ enum STATE_TYPE ST_ARRAY_SELECTOR, }; -struct d3dx_parameter -{ - char *name; - char *semantic; - void *data; - D3DXPARAMETER_CLASS class; - D3DXPARAMETER_TYPE type; - UINT rows; - UINT columns; - UINT element_count; - UINT annotation_count; - UINT member_count; - DWORD flags; - UINT bytes; - DWORD object_id; - - D3DXHANDLE handle; - - struct d3dx_parameter *annotations; - struct d3dx_parameter *members; - - struct d3dx_parameter *referenced_param; -}; - struct d3dx_object { UINT size; @@ -206,8 +182,6 @@ struct ID3DXEffectCompilerImpl struct d3dx9_base_effect base_effect; }; -static struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, - struct d3dx_parameter *parameter, const char *name); static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_parameter *parameters, const char *name); static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, @@ -535,6 +509,12 @@ static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL chil TRACE("Free parameter %p, name %s, type %s, child %s\n", param, param->name, debug_d3dxparameter_type(param->type), child ? "yes" : "no"); + if (param->param_eval) + { + d3dx_free_param_eval(param->param_eval); + param->param_eval = NULL; + } + if (param->annotations) { for (i = 0; i < param->annotation_count; ++i) @@ -886,7 +866,7 @@ static struct d3dx_parameter *get_annotation_by_name(UINT count, struct d3dx_par return NULL; } -static struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, +struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base, struct d3dx_parameter *parameter, const char *name) { UINT i, count, length; @@ -5419,6 +5399,7 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct DWORD string_size; struct d3dx_object *object = &base->objects[param->object_id]; char *ptr = object->data; + HRESULT ret; TRACE("Parsing array entry selection state for parameter %p.\n", param); @@ -5435,9 +5416,32 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct } TRACE("Unknown DWORD: 0x%.8x.\n", *(DWORD *)(ptr + string_size)); - FIXME("Parse preshader.\n"); + if (string_size % sizeof(DWORD)) + FIXME("Unaligned string_size %u.\n", string_size); + d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + sizeof(DWORD)), + D3DXPT_INT, &param->param_eval); + ret = D3D_OK; + param = param->referenced_param; + if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER) + { + unsigned int i; - return D3D_OK; + for (i = 0; i < param->element_count; i++) + { + if (param->members[i].type != param->type) + { + FIXME("Unexpected member parameter type %u, expected %u.\n", param->members[i].type, param->type); + return D3DXERR_INVALIDDATA; + } + if (!param->members[i].param_eval) + { + TRACE("Creating preshader for object %u.\n", param->members[i].object_id); + object = &base->objects[param->members[i].object_id]; + d3dx_create_param_eval(base, object->data, object->size, param->type, &param->members[i].param_eval); + } + } + } + return ret; } static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr) @@ -5543,7 +5547,11 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; if (object->data) - hr = d3dx9_create_object(base, object); + { + if (FAILED(hr = d3dx9_create_object(base, object))) + return hr; + d3dx_create_param_eval(base, object->data, object->size, param->type, &param->param_eval); + } break; case D3DXPT_BOOL: @@ -5551,7 +5559,9 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_FLOAT: case D3DXPT_STRING: state->type = ST_FXLC; - hr = d3dx9_copy_data(&base->objects[param->object_id], ptr); + if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + return hr; + d3dx_create_param_eval(base, object->data, object->size, param->type, &param->param_eval); break; default: @@ -5569,7 +5579,17 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * param->referenced_param = get_parameter_by_name(base, NULL, object->data); if (param->referenced_param) { - TRACE("Mapping to parameter %p.\n", param->referenced_param); + struct d3dx_parameter *refpar = param->referenced_param; + + TRACE("Mapping to parameter %p, having object id %u.\n", refpar, refpar->object_id); + if (refpar->type == D3DXPT_VERTEXSHADER || refpar->type == D3DXPT_PIXELSHADER) + { + struct d3dx_object *refobj = &base->objects[refpar->object_id]; + + if (!refpar->param_eval) + d3dx_create_param_eval(base, refobj->data, refobj->size, + refpar->type, &refpar->param_eval); + } } else { diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c new file mode 100644 index 0000000..d865fd0 --- /dev/null +++ b/dlls/d3dx9_36/preshader.c @@ -0,0 +1,41 @@ +/* + * Copyright 2016 Paul Gofman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3dx9_private.h" + +#include <float.h> + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code, unsigned int byte_code_size, + D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval_out) +{ + FIXME("stub, base_effect %p, byte_code %p, byte_code_size %u, type %u, peval_out %p.\n", + base_effect, byte_code, byte_code_size, type, peval_out); + + *peval_out = NULL; + return E_NOTIMPL; +} + +void d3dx_free_param_eval(struct d3dx_param_eval *peval) +{ + FIXME("stub, peval %p.\n", peval); +}

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load_location().
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: d8f2d0c7dd40ac8c96acf6d7265915fe32e38030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f2d0c7dd40ac8c96acf6d72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:56 2016 +0200 wined3d: Get resource info from the texture in surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cab1451..1f83a22 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3239,11 +3239,12 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi /* Context activation is done by the caller. Context may be NULL in ddraw-only mode. */ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { + struct wined3d_texture *texture = surface->container; HRESULT hr; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - if (surface->locations & location && (!(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (surface->locations & location && (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) || (surface->ds_current_size.cx == surface->resource.width && surface->ds_current_size.cy == surface->resource.height))) { @@ -3254,9 +3255,9 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co if (WARN_ON(d3d_surface)) { DWORD required_access = resource_access_from_location(location); - if ((surface->resource.access_flags & required_access) != required_access) + if ((texture->resource.access_flags & required_access) != required_access) WARN("Operation requires %#x access, but surface only has %#x.\n", - required_access, surface->resource.access_flags); + required_access, texture->resource.access_flags); } if (surface->locations & WINED3D_LOCATION_DISCARDED) @@ -3275,7 +3276,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co return surface_load_location(surface, context, location); } - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { if ((location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & WINED3D_LOCATION_DRAWABLE) || (location == WINED3D_LOCATION_DRAWABLE && surface->locations & WINED3D_LOCATION_TEXTURE_RGB)) @@ -3323,7 +3324,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co done: surface_validate_location(surface, location); - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { surface->ds_current_size.cx = surface->resource.width; surface->ds_current_size.cy = surface->resource.height;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in swapchain_blit().
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 491e88efa57cf71e64a32ca2f74c2655693b0473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491e88efa57cf71e64a32ca2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 18:57:57 2016 +0200 wined3d: Get resource info from the texture in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1b6d2e5..67eb2d2 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -295,8 +295,9 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s static void swapchain_blit(const struct wined3d_swapchain *swapchain, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) { - struct wined3d_surface *backbuffer = surface_from_resource( - wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); + struct wined3d_texture *texture = swapchain->back_buffers[0]; + struct wined3d_surface *back_buffer = texture->sub_resources[0].u.surface; + struct wined3d_surface *front_buffer = swapchain->front_buffer->sub_resources[0].u.surface; UINT src_w = src_rect->right - src_rect->left; UINT src_h = src_rect->bottom - src_rect->top; GLenum gl_filter; @@ -315,23 +316,21 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, GetClientRect(swapchain->win_handle, &win_rect); win_h = win_rect.bottom - win_rect.top; - if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format->color_fixup)) + if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(texture->resource.format->color_fixup)) { DWORD location = WINED3D_LOCATION_TEXTURE_RGB; - if (backbuffer->resource.multisample_type) + if (texture->resource.multisample_type) { location = WINED3D_LOCATION_RB_RESOLVED; - surface_load_location(backbuffer, context, location); + surface_load_location(back_buffer, context, location); } - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, backbuffer, NULL, location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, back_buffer, NULL, location); gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, - surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)), - NULL, WINED3D_LOCATION_DRAWABLE); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, front_buffer, NULL, WINED3D_LOCATION_DRAWABLE); context_set_draw_buffer(context, GL_BACK); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -359,30 +358,28 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, float tex_right = src_rect->right; float tex_bottom = src_rect->bottom; - context2 = context_acquire(device, backbuffer); + context2 = context_acquire(device, back_buffer); context_apply_blit_state(context2, device); - if (backbuffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) + if (back_buffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { - tex_left /= backbuffer->pow2Width; - tex_right /= backbuffer->pow2Width; - tex_top /= backbuffer->pow2Height; - tex_bottom /= backbuffer->pow2Height; + tex_left /= back_buffer->pow2Width; + tex_right /= back_buffer->pow2Width; + tex_top /= back_buffer->pow2Height; + tex_bottom /= back_buffer->pow2Height; } - if (is_complex_fixup(backbuffer->resource.format->color_fixup)) + if (is_complex_fixup(texture->resource.format->color_fixup)) gl_filter = GL_NEAREST; - context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, - surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)), - NULL, WINED3D_LOCATION_DRAWABLE); - context_bind_texture(context2, backbuffer->texture_target, backbuffer->container->texture_rgb.name); + context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, front_buffer, NULL, WINED3D_LOCATION_DRAWABLE); + context_bind_texture(context2, back_buffer->texture_target, texture->texture_rgb.name); /* Set up the texture. The surface is not in a wined3d_texture * container, so there are no D3D texture settings to dirtify. */ - device->blitter->set_shader(device->blit_priv, context2, backbuffer, NULL); - gl_info->gl_ops.gl.p_glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); - gl_info->gl_ops.gl.p_glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); + device->blitter->set_shader(device->blit_priv, context2, back_buffer, NULL); + gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); + gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); context_set_draw_buffer(context, GL_BACK);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.6
by Jeremy Newman March 28, 2016

March 28, 2016

Module: website Branch: master Commit: 7126e57a7de01e381b89181ab76700f1ca6f62c2 URL: http://source.winehq.org/git/website.git/?a=commit;h=7126e57a7de01e381b8918… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Mar 25 18:25:36 2016 +0100 Polish translation for release 1.9.6 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016031801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2016031801.xml b/news/pl/2016031801.xml new file mode 100644 index 0000000..d8ae9df --- /dev/null +++ b/news/pl/2016031801.xml @@ -0,0 +1,15 @@ +<news> +<date>Marzec 18, 2016</date> +<title>Wydano Wine 1.9.6</title> +<body> + Wydanie rozwojowe Wine 1.9.6 jest już dostępne. + <a href="{$root}/announce/1.9.6">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsze wykrywanie kart graficznych na sterownikach Mesa.</li> + <li>Obsługa Modelu Cieniującego 5.</li> + <li>Lepsza obsługa wyjątków C++.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nikolay Sivov : dwrite: Use regular QI way to return interface client asked for.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 7c6dcab73f9b34ae6dba662a2eb374298098a4f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6dcab73f9b34ae6dba662a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 13:33:56 2016 +0300 dwrite: Use regular QI way to return interface client asked for. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 22 +++++++--------------- dlls/dwrite/tests/font.c | 9 +++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index e081e11..b82a4b0 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1313,21 +1313,14 @@ static void init_dwritefactory(struct dwritefactory *factory, DWRITE_FACTORY_TYP HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnknown **ret) { struct dwritefactory *factory; + HRESULT hr; TRACE("(%d, %s, %p)\n", type, debugstr_guid(riid), ret); *ret = NULL; - if (!IsEqualIID(riid, &IID_IDWriteFactory) && - !IsEqualIID(riid, &IID_IDWriteFactory1) && - !IsEqualIID(riid, &IID_IDWriteFactory2)) - return E_FAIL; - - if (type == DWRITE_FACTORY_TYPE_SHARED && shared_factory) { - *ret = (IUnknown*)shared_factory; - IDWriteFactory2_AddRef(shared_factory); - return S_OK; - } + if (type == DWRITE_FACTORY_TYPE_SHARED && shared_factory) + return IDWriteFactory2_QueryInterface(shared_factory, riid, (void**)ret); factory = heap_alloc(sizeof(struct dwritefactory)); if (!factory) return E_OUTOFMEMORY; @@ -1337,11 +1330,10 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno if (type == DWRITE_FACTORY_TYPE_SHARED) if (InterlockedCompareExchangePointer((void**)&shared_factory, &factory->IDWriteFactory2_iface, NULL)) { release_shared_factory(&factory->IDWriteFactory2_iface); - *ret = (IUnknown*)shared_factory; - IDWriteFactory2_AddRef(shared_factory); - return S_OK; + return IDWriteFactory2_QueryInterface(shared_factory, riid, (void**)ret); } - *ret = (IUnknown*)&factory->IDWriteFactory2_iface; - return S_OK; + hr = IDWriteFactory2_QueryInterface(&factory->IDWriteFactory2_iface, riid, (void**)ret); + IDWriteFactory2_Release(&factory->IDWriteFactory2_iface); + return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7c19f00..766df39 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2312,6 +2312,11 @@ static void test_shared_isolated(void) hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown**)&shared2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(shared == shared2, "got %p, and %p\n", shared, shared2); + IDWriteFactory_Release(shared2); + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IUnknown, (IUnknown**)&shared2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(shared == shared2, "got %p, and %p\n", shared, shared2); IDWriteFactory_Release(shared); IDWriteFactory_Release(shared2); @@ -2330,6 +2335,10 @@ static void test_shared_isolated(void) ok(isolated != isolated2, "got %p, and %p\n", isolated, isolated2); IDWriteFactory_Release(isolated2); + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IUnknown, (IUnknown**)&isolated2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFactory_Release(isolated2); + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED+1, &IID_IDWriteFactory, (IUnknown**)&isolated2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(shared != isolated2, "got %p, and %p\n", shared, isolated2);

1 0

Sebastian Lackner : jscript: Fix off-by-one error in decode_dword.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 19777292a31ee95a9774d8a675704be871afd467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19777292a31ee95a9774d8a67… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 28 07:21:12 2016 +0200 jscript: Fix off-by-one error in decode_dword. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/decode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/decode.c b/dlls/jscript/decode.c index 2c39453..d402d7c 100644 --- a/dlls/jscript/decode.c +++ b/dlls/jscript/decode.c @@ -91,7 +91,7 @@ static BOOL decode_dword(const WCHAR *p, DWORD *ret) DWORD i; for(i=0; i<6; i++) { - if(p[i] > sizeof(digits)/sizeof(*digits) || digits[p[i]] == 0xff) + if(p[i] >= sizeof(digits)/sizeof(*digits) || digits[p[i]] == 0xff) return FALSE; } if(p[6] != '=' || p[7] != '=')

1 0

Sebastian Lackner : quartz: Fix use of CONTAINING_RECORD in impl_from_TransformFilter.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: f9663af1f442e715d736011fe73f3d5433fda7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9663af1f442e715d736011fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 28 07:27:49 2016 +0200 quartz: Fix use of CONTAINING_RECORD in impl_from_TransformFilter. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index d9a94a9..3c1c7cf 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -55,7 +55,7 @@ static const IBaseFilterVtbl ACMWrapper_Vtbl; static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf.filter); + return CONTAINING_RECORD(iface, ACMWrapperImpl, tf); } static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 1a58844..eb9b223 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -54,7 +54,7 @@ static const IBaseFilterVtbl AVIDec_Vtbl; static inline AVIDecImpl *impl_from_TransformFilter( TransformFilter *iface ) { - return CONTAINING_RECORD(iface, AVIDecImpl, tf.filter); + return CONTAINING_RECORD(iface, AVIDecImpl, tf); } static HRESULT WINAPI AVIDec_StartStreaming(TransformFilter* pTransformFilter)

1 0

Sebastian Lackner : ntdll: Fix off-by-one errors in __wine_set_signal_handler.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: d4ab672cf599e0d04d2c8943f0969f9cd77c1b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ab672cf599e0d04d2c8943f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 28 07:20:08 2016 +0200 ntdll: Fix off-by-one errors in __wine_set_signal_handler. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_powerpc.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 5ee9f45..cb5f67d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -860,7 +860,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 3a41c84..14c5260 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -732,7 +732,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 886da86..507490a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -940,7 +940,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0; diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1e88df3..a79fd6e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2762,7 +2762,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) */ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) { - if (sig > sizeof(handlers) / sizeof(handlers[0])) return -1; + if (sig >= sizeof(handlers) / sizeof(handlers[0])) return -1; if (handlers[sig] != NULL) return -2; handlers[sig] = wsh; return 0;

1 0

Alexandre Julliard : kernel32: Lower the load address to accomodate the dll size.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 8f567028123cd7a3c8180f9ad2c867add34795e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f567028123cd7a3c8180f9ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 15:57:35 2016 +0900 kernel32: Lower the load address to accomodate the dll size. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index c09771d..1399859 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -3,7 +3,7 @@ MODULE = kernel32.dll IMPORTLIB = kernel32 IMPORTS = winecrt0 ntdll EXTRALIBS = $(COREFOUNDATION_LIBS) $(POLL_LIBS) -EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b800000 +EXTRADLLFLAGS = -nodefaultlibs -Wb,-F,KERNEL32.dll -Wl,--image-base,0x7b400000 C_SRCS = \ actctx.c \

1 0

Alexandre Julliard : makefiles: Move the main loader base address to cope with huge page alignment.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 1df3955467edb13c1cf6929ac55f29fd91b0eecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df3955467edb13c1cf6929ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 16:34:28 2016 +0900 makefiles: Move the main loader base address to cope with huge page alignment. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 22 +++++++++++----------- configure.ac | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 5d99f47..764ac45 100755 --- a/configure +++ b/configure @@ -8575,35 +8575,35 @@ $as_echo "$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" >&6; } if test "x$ac_cv_cflags__Wl__Ttext_segment_0x7bc00000" = xyes; then : case $host_os in freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7c000000" ;; esac else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400" >&5 -$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7bf00400... " >&6; } -if ${ac_cv_cflags__Wl___section_start__interp_0x7bf00400+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400" >&5 +$as_echo_n "checking whether the compiler supports -Wl,--section-start,.interp=0x7c000400... " >&6; } +if ${ac_cv_cflags__Wl___section_start__interp_0x7c000400+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7bf00400" +CFLAGS="$CFLAGS -Wl,--section-start,.interp=0x7c000400" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=yes + ac_cv_cflags__Wl___section_start__interp_0x7c000400=yes else - ac_cv_cflags__Wl___section_start__interp_0x7bf00400=no + ac_cv_cflags__Wl___section_start__interp_0x7c000400=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&5 -$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; } -if test "x$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl___section_start__interp_0x7c000400" >&5 +$as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7c000400" >&6; } +if test "x$ac_cv_cflags__Wl___section_start__interp_0x7c000400" = xyes; then : case $host_os in freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7c000400" ;; esac fi # Extract the first word of "prelink", so it can be a program name with args. diff --git a/configure.ac b/configure.ac index dd7571d..f63dd61 100644 --- a/configure.ac +++ b/configure.ac @@ -898,12 +898,12 @@ case $host_os in WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x60000000" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7bf00000" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,-Ttext-segment=0x7c000000" ;; esac], - [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], + [WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7c000400], [case $host_os in freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; - *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; + *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7c000400" ;; esac]) AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) if test "x$PRELINK" = xfalse

1 0