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

Francois Gouget : tools: Fix spelling of a variable name.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: 74979b0660620cb5425a1b7fddf2d2e4fc943f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74979b0660620cb5425a1b7fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:20:52 2016 +0200 tools: Fix spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winapi/winapi_local.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 9cea587..5a4dcea 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -320,14 +320,14 @@ sub _check_statements($$$) { if($first_debug_message && $called_name =~ /^(?:FIXME|TRACE)$/) { $first_debug_message = 0; if($called_arguments =~ /^\"$(.*?)$(.*?)\"\s*,\s*(.*?)$/) { - my $formating = $1; + my $formatting = $1; my $extra = $2; my $arguments = $3; my $format; my $argument; my $n = 0; - while($formating && ($formating =~ s/^([^,]*),?//, $format = $1, $format =~ s/^\s*(.*?)\s*$/$1/) && + while($formatting && ($formatting =~ s/^([^,]*),?//, $format = $1, $format =~ s/^\s*(.*?)\s*$/$1/) && $arguments && ($arguments =~ s/^([^,]*),?//, $argument = $1, $argument =~ s/^\s*(.*?)\s*$/$1/)) { my $type = @{$function->argument_types}[$n];

1 0

Francois Gouget : mshtml: Fix spelling of an HTMLEmbedElement method implementation name.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: 91c3e75bb58de0e5c5e06393809681abc35e162b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c3e75bb58de0e5c5e063938… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 11:30:10 2016 +0200 mshtml: Fix spelling of an HTMLEmbedElement method implementation name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlembed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index 506b4b5..5b3c1c1 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -110,7 +110,7 @@ static HRESULT WINAPI HTMLEmbedElement_get_hidden(IHTMLEmbedElement *iface, BSTR return E_NOTIMPL; } -static HRESULT WINAPI HTMLEmbedElement_get_palete(IHTMLEmbedElement *iface, BSTR *p) +static HRESULT WINAPI HTMLEmbedElement_get_palette(IHTMLEmbedElement *iface, BSTR *p) { HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); @@ -204,7 +204,7 @@ static const IHTMLEmbedElementVtbl HTMLEmbedElementVtbl = { HTMLEmbedElement_Invoke, HTMLEmbedElement_put_hidden, HTMLEmbedElement_get_hidden, - HTMLEmbedElement_get_palete, + HTMLEmbedElement_get_palette, HTMLEmbedElement_get_pluginspage, HTMLEmbedElement_put_src, HTMLEmbedElement_get_src,

1 0

Stefan Dösinger : wined3d: Explicitly pass a wined3d_state structure to draw_primitive().
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: a3401dfaf24b48bf52cd7c891e171cee99e79097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3401dfaf24b48bf52cd7c891… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 13 19:09:56 2016 +0200 wined3d: Explicitly pass a wined3d_state structure to draw_primitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/drawprim.c | 23 ++++++++++++----------- dlls/wined3d/wined3d_private.h | 5 +++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3692c6b..583f1e2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -311,7 +311,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_draw *op = data; - draw_primitive(cs->device, op->start_idx, op->index_count, + draw_primitive(cs->device, &cs->device->state, op->start_idx, op->index_count, op->start_instance, op->instance_count, op->indexed); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d83b494..6857b0d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -407,10 +407,11 @@ static void remove_vbos(struct wined3d_context *context, } /* Routine common to the draw primitive and draw indexed primitive routines */ -void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed) +void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, + unsigned int instance_count, BOOL indexed) { - const struct wined3d_state *state = &device->state; + const struct wined3d_fb_state *fb = state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_event_query *ib_query = NULL; struct wined3d_stream_info si_emulated; @@ -423,7 +424,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co if (!index_count) return; - context = context_acquire(device, wined3d_rendertarget_view_get_surface(device->fb.render_targets[0])); + context = context_acquire(device, wined3d_rendertarget_view_get_surface(fb->render_targets[0])); if (!context->valid) { context_release(context); @@ -432,9 +433,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co } gl_info = context->gl_info; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < gl_info->limits.buffers; ++i) { - struct wined3d_rendertarget_view *rtv = device->fb.render_targets[i]; + struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(rtv); if (target && rtv->format->id != WINED3DFMT_NULL) @@ -452,16 +453,16 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co } } - if (device->fb.depth_stencil) + if (fb->depth_stencil) { /* Note that this depends on the context_acquire() call above to set * context->render_offscreen properly. We don't currently take the * Z-compare function into account, but we could skip loading the * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note * that we never copy the stencil data.*/ - DWORD location = context->render_offscreen ? device->fb.depth_stencil->resource->draw_binding + DWORD location = context->render_offscreen ? fb->depth_stencil->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(device->fb.depth_stencil); + struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) { @@ -494,9 +495,9 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co return; } - if (device->fb.depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) + if (fb->depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(device->fb.depth_stencil); + struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d74f143..4f0a9f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1181,8 +1181,9 @@ struct wined3d_stream_info WORD use_map; /* MAX_ATTRIBS, 16 */ }; -void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count, - UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; +void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, + unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define eps 1e-8f

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in arbfp_blit_set().
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: c9d82ffa434f7ffca67259c1e1931c9d5bb0afd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d82ffa434f7ffca67259c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:55 2016 +0200 wined3d: Use the texture dimension helpers in arbfp_blit_set(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 06163ab..fac97fe 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7681,8 +7681,6 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key) { - GLuint shader; - float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; const struct wined3d_texture *texture = surface->container; struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; @@ -7691,6 +7689,13 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; struct wined3d_color float_color_key[2]; + struct wined3d_vec4 size; + GLuint shader; + + size.x = wined3d_texture_get_level_pow2_width(texture, surface->texture_level); + size.y = wined3d_texture_get_level_pow2_height(texture, surface->texture_level); + size.z = 1.0f; + size.w = 1.0f; if (is_complex_fixup(texture->resource.format->color_fixup)) fixup = get_complex_fixup(texture->resource.format->color_fixup); @@ -7787,7 +7792,7 @@ err_out: checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_SIZE, size)); + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARBFP_BLIT_PARAM_SIZE, &size.x)); checkGLcall("glProgramLocalParameter4fvARB"); if (type.use_color_key) {

1 0

Józef Kucia : d3d11/tests: Add test for creating SM 4.1 shaders.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: cfd505ad4efd5a8a8f00394d3aada3940de28da4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd505ad4efd5a8a8f00394d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:27 2016 +0200 d3d11/tests: Add test for creating SM 4.1 shaders. 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 | 128 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 112 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfd505ad4efd5a8a8f003…

1 0

Józef Kucia : wined3d: Add shader limits for SM 4.1.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: d276a2858591c42899431a71511e2690864e49e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d276a2858591c42899431a715… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:26 2016 +0200 wined3d: Add shader limits for SM 4.1. 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/wined3d/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 50cafab..8f8b727 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -522,7 +522,7 @@ static void shader_set_limits(struct wined3d_shader *shader) * shaders to 256. */ {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), { 4, 16, 256, 16, 12, 0}}, {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 16, 0}}, - {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 0}}, + {WINED3D_SHADER_VERSION(4, 1), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 0}}, {0} }, hs_limits[] = @@ -539,7 +539,7 @@ static void shader_set_limits(struct wined3d_shader *shader) { /* min_version, max_version, sampler, constant_int, constant_float, constant_bool, packed_output, packed_input */ {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 32, 16}}, - {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 32}}, + {WINED3D_SHADER_VERSION(4, 1), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 32}}, {0} }, ps_limits[] =

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetParent().
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: cbf0a1b59a066005480ee0c7919584532a99c3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf0a1b59a066005480ee0c79… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 14 12:20:25 2016 +0200 dxgi: Implement dxgi_swapchain_GetParent(). 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/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 56 +++++++++++++++++++++++++++++++++--------------- dlls/dxgi/tests/device.c | 12 +++++------ 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index aca17ba..129f6b4 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -156,6 +156,7 @@ struct dxgi_swapchain struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; IWineDXGIDevice *device; + IDXGIFactory *factory; }; HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index da705e4..921fcdf 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -78,6 +78,8 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) if (!refcount) { IWineDXGIDevice *device = swapchain->device; + if (swapchain->factory) + IDXGIFactory_Release(swapchain->factory); wined3d_mutex_lock(); wined3d_swapchain_decref(swapchain->wined3d_swapchain); wined3d_mutex_unlock(); @@ -122,9 +124,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetPrivateData(IDXGISwapChain *i static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetParent(IDXGISwapChain *iface, REFIID riid, void **parent) { - FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); + + if (!swapchain->factory) + { + ERR("Implicit swapchain does not store reference to parent.\n"); + *parent = NULL; + return E_NOINTERFACE; + } + + return IDXGIFactory_QueryInterface(swapchain->factory, riid, parent); } /* IDXGIDeviceSubObject methods */ @@ -373,21 +384,6 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device { HRESULT hr; - swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; - swapchain->refcount = 1; - wined3d_mutex_lock(); - wined3d_private_store_init(&swapchain->private_store); - - if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, - &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) - { - WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); - wined3d_private_store_cleanup(&swapchain->private_store); - wined3d_mutex_unlock(); - return hr; - } - wined3d_mutex_unlock(); - /** * A reference to the implicit swapchain is held by the wined3d device. * In order to avoid circular references we do not keep a reference @@ -395,13 +391,39 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device */ if (!implicit) { + if (FAILED(hr = IDXGIAdapter1_GetParent(device->adapter, &IID_IDXGIFactory, + (void **)&swapchain->factory))) + { + WARN("Failed to get adapter parent, hr %#x.\n", hr); + return hr; + } swapchain->device = &device->IWineDXGIDevice_iface; IWineDXGIDevice_AddRef(swapchain->device); } else { swapchain->device = NULL; + swapchain->factory = NULL; } + swapchain->IDXGISwapChain_iface.lpVtbl = &dxgi_swapchain_vtbl; + swapchain->refcount = 1; + wined3d_mutex_lock(); + wined3d_private_store_init(&swapchain->private_store); + + if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, + &dxgi_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) + { + WARN("Failed to create wined3d swapchain, hr %#x.\n", hr); + wined3d_private_store_cleanup(&swapchain->private_store); + wined3d_mutex_unlock(); + if (swapchain->factory) + IDXGIFactory_Release(swapchain->factory); + if (swapchain->device) + IWineDXGIDevice_Release(swapchain->device); + return hr; + } + wined3d_mutex_unlock(); + return S_OK; } diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ab294f8..5808b64 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -485,15 +485,15 @@ static void test_create_swapchain(void) ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr); hr = IDXGISwapChain_GetParent(swapchain, &IID_IUnknown, (void **)&parent); - todo_wine ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); - todo_wine ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); - if (SUCCEEDED(hr)) refcount = IUnknown_Release(parent); + ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); + refcount = IUnknown_Release(parent); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); hr = IDXGISwapChain_GetParent(swapchain, &IID_IDXGIFactory, (void **)&parent); - todo_wine ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); - todo_wine ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); - if (SUCCEEDED(hr)) refcount = IUnknown_Release(parent); + ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); + refcount = IUnknown_Release(parent); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); IDXGISwapChain_Release(swapchain);

1 0

Huw Davies : gdi32/tests: Allocate the font enum data structures.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: ef3422213162b2e5dc8811377d2be0e41ae22a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef3422213162b2e5dc8811377… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 14 11:12:35 2016 +0100 gdi32/tests: Allocate the font enum data structures. These are in excess of 250kB and may overflow the stack. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 119 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a1917b4..eb6669b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -107,6 +107,22 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } +static void *heap_alloc( size_t len ) +{ + return HeapAlloc( GetProcessHeap(), 0, len ); +} + +static void *heap_realloc( void *p, size_t len ) +{ + if (!p) return heap_alloc( len ); + return HeapReAlloc( GetProcessHeap(), 0, p, len ); +} + +static void heap_free( void *p ) +{ + HeapFree( GetProcessHeap(), 0, p ); +} + static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { if (type != TRUETYPE_FONTTYPE) return 1; @@ -2736,24 +2752,22 @@ static void test_GetFontUnicodeRanges(void) ReleaseDC(NULL, hdc); } -#define MAX_ENUM_FONTS 4096 - struct enum_font_data { - int total; - LOGFONTA lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTA *lf; }; struct enum_fullname_data { - int total; - ENUMLOGFONTA elf[MAX_ENUM_FONTS]; + int total, size; + ENUMLOGFONTA *elf; }; struct enum_font_dataW { - int total; - LOGFONTW lf[MAX_ENUM_FONTS]; + int total, size; + LOGFONTW *lf; }; static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -2771,10 +2785,13 @@ static INT CALLBACK arial_enum_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, D if (0) /* Disabled to limit console spam */ trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2794,10 +2811,13 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, if (0) /* Disabled to limit console spam */ trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -2871,6 +2891,8 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) skip("%s is not installed\n", font_name); return; } + memset( &efd, 0, sizeof(efd) ); + memset( &efdw, 0, sizeof(efdw) ); hdc = GetDC(0); @@ -3064,6 +3086,9 @@ else } ReleaseDC(0, hdc); + + heap_free( efd.lf ); + heap_free( efdw.lf ); } static INT CALLBACK enum_multi_charset_font_proc(const LOGFONTA *lf, const TEXTMETRICA *tm, DWORD type, LPARAM lParam) @@ -3093,10 +3118,13 @@ static INT CALLBACK enum_font_data_proc(const LOGFONTA *lf, const TEXTMETRICA *n if (type != TRUETYPE_FONTTYPE) return 1; - if (efd->total < MAX_ENUM_FONTS) - efd->lf[efd->total++] = *lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efd->total >= efd->size) + { + efd->size = max( (efd->total + 1) * 2, 256 ); + efd->lf = heap_realloc( efd->lf, efd->size * sizeof(*efd->lf) ); + if (!efd->lf) return 0; + } + efd->lf[efd->total++] = *lf; return 1; } @@ -3107,10 +3135,13 @@ static INT CALLBACK enum_fullname_data_proc(const LOGFONTA *lf, const TEXTMETRIC if (type != TRUETYPE_FONTTYPE) return 1; - if (efnd->total < MAX_ENUM_FONTS) - efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; - else - trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } + efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 1; } @@ -3144,7 +3175,7 @@ static void test_EnumFontFamiliesEx_default_charset(void) target.lfCharSet = ANSI_CHARSET; } - efd.total = 0; + memset(&efd, 0, sizeof(efd)); memset(&enum_font, 0, sizeof(enum_font)); strcpy(enum_font.lfFaceName, target.lfFaceName); enum_font.lfCharSet = DEFAULT_CHARSET; @@ -3152,15 +3183,14 @@ static void test_EnumFontFamiliesEx_default_charset(void) ReleaseDC(0, hdc); trace("'%s' has %d charsets.\n", target.lfFaceName, efd.total); - if (efd.total < 2) { + if (efd.total < 2) ok(0, "EnumFontFamilies is broken. Expected >= 2, got %d.\n", efd.total); - return; - } - - ok(efd.lf[0].lfCharSet == target.lfCharSet, - "(%s) got charset %d expected %d\n", - efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); + else + ok(efd.lf[0].lfCharSet == target.lfCharSet, + "(%s) got charset %d expected %d\n", + efd.lf[0].lfFaceName, efd.lf[0].lfCharSet, target.lfCharSet); + heap_free(efd.lf); return; } @@ -5215,6 +5245,12 @@ if (0) /* Disabled to limit console spam */ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5230,6 +5266,12 @@ if (0) /* Disabled to limit console spam */ if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1; + if (efnd->total >= efnd->size) + { + efnd->size = max( (efnd->total + 1) * 2, 256 ); + efnd->elf = heap_realloc( efnd->elf, efnd->size * sizeof(*efnd->elf) ); + if (!efnd->elf) return 0; + } efnd->elf[efnd->total++] = *(ENUMLOGFONTA *)lf; return 0; } @@ -5261,7 +5303,7 @@ static void test_EnumFonts_subst(void) memset(&lf, 0, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg should be enumerated\n"); @@ -5271,12 +5313,12 @@ static void test_EnumFonts_subst(void) ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg"); ok(ret, "did not expect MS Shell Dlg\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; ret = EnumFontFamiliesExA(hdc, NULL, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(ret, "MS Shell Dlg 2 should not be enumerated\n"); ok(!efnd.total, "MS Shell Dlg 2 should not be enumerated\n"); - memset(&efnd, 0, sizeof(efnd)); + efnd.total = 0; strcpy(lf.lfFaceName, "MS Shell Dlg 2"); ret = EnumFontFamiliesExA(hdc, &lf, enum_ms_shell_dlg2_proc, (LPARAM)&efnd, 0); ok(!ret, "MS Shell Dlg 2 should be enumerated\n"); @@ -5286,6 +5328,7 @@ static void test_EnumFonts_subst(void) ret = strcmp((const char *)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); ok(ret, "did not expect MS Shell Dlg 2\n"); + heap_free(efnd.elf); DeleteDC(hdc); } @@ -5396,7 +5439,7 @@ static void test_fullname2_helper(const char *Family) lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; strcpy(lf.lfFaceName, Family); - efnd.total = 0; + memset(&efnd, 0, sizeof(efnd)); EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); if (efnd.total == 0) skip("%s is not installed\n", lf.lfFaceName); @@ -5477,6 +5520,7 @@ static void test_fullname2_helper(const char *Family) HeapFree(GetProcessHeap(), 0, bufW); HeapFree(GetProcessHeap(), 0, bufA); } + heap_free(efnd.elf); DeleteDC(hdc); } @@ -6225,7 +6269,7 @@ static void test_vertical_order(void) lf.lfQuality = DEFAULT_QUALITY; lf.lfItalic = FALSE; lf.lfWeight = FW_DONTCARE; - efd.total = 0; + memset( &efd, 0, sizeof(efd) ); EnumFontFamiliesExA(hdc, &lf, enum_font_data_proc, (LPARAM)&efd, 0); for (i = 0; i < efd.total; i++) { @@ -6239,6 +6283,7 @@ static void test_vertical_order(void) } } } + heap_free( efd.lf ); DeleteDC( hdc ); }

1 0

Francois Gouget : ole32/tests: Fix spelling of a test function name.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: a648b87bff3cd248863bbd1332f5dce905052ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a648b87bff3cd248863bbd133… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:20:38 2016 +0200 ole32/tests: Fix spelling of a test function name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 3eb9901..13e5220 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -455,7 +455,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) return S_OK; } -static void test_get_clipboard_unitialized(void) +static void test_get_clipboard_uninitialized(void) { HRESULT hr; IDataObject *pDObj; @@ -1603,7 +1603,7 @@ static void test_get_clipboard_locked(void) START_TEST(clipboard) { - test_get_clipboard_unitialized(); + test_get_clipboard_uninitialized(); test_set_clipboard(); test_consumer_refs(); test_flushed_getdata();

1 0

Francois Gouget : wineps.drv: Fix spelling of a prototype' s parameter name.
by Alexandre Julliard April 14, 2016

April 14, 2016

Module: wine Branch: master Commit: 7e74c1d29253f9e3118ac3c0c6a8aa9350156c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e74c1d29253f9e3118ac3c0c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:20:16 2016 +0200 wineps.drv: Fix spelling of a prototype's parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/psdrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 75c062a..79f23ea 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -549,7 +549,7 @@ extern BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) DEC extern BOOL PSDRV_SelectDownloadFont(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glpyhs, UINT count) DECLSPEC_HIDDEN; +extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; extern BOOL PSDRV_EmptyDownloadList(PHYSDEV dev, BOOL write_undef) DECLSPEC_HIDDEN; extern DWORD write_spool( PHYSDEV dev, const void *data, DWORD num ) DECLSPEC_HIDDEN;

1 0