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

Henri Verbeet : wined3d: Use the texture dimension helpers in arbfp_blit_set().
by Alexandre Julliard 14 Apr '16

14 Apr '16

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

Stefan Dösinger : wined3d: Explicitly pass a wined3d_state structure to draw_primitive().
by Alexandre Julliard 14 Apr '16

14 Apr '16

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

Paul Gofman : d3dx9: D3DXVec3Transform should support input and output parameter overlap.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 1ba9cfb5c33f71cd1e1a2ba832b843ca4219a38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ba9cfb5c33f71cd1e1a2ba83… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Apr 12 13:09:17 2016 +0300 d3dx9: D3DXVec3Transform should support input and output parameter overlap. 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/math.c | 11 +++++++---- dlls/d3dx9_36/tests/math.c | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index da33074..394ff05 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1898,12 +1898,15 @@ D3DXVECTOR3* WINAPI D3DXVec3ProjectArray(D3DXVECTOR3* out, UINT outstride, const D3DXVECTOR4* WINAPI D3DXVec3Transform(D3DXVECTOR4 *pout, const D3DXVECTOR3 *pv, const D3DXMATRIX *pm) { + D3DXVECTOR4 out; + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[2][0] * pv->z + pm->u.m[3][0]; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[2][1] * pv->z + pm->u.m[3][1]; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[2][2] * pv->z + pm->u.m[3][2]; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[2][3] * pv->z + pm->u.m[3][3]; + *pout = out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index cbe94b5..0fe6796 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1361,8 +1361,12 @@ static void D3DXVector3Test(void) /*_______________D3DXVec3Transform_______________________*/ expectedtrans.x = 70.0f; expectedtrans.y = 88.0f; expectedtrans.z = 106.0f; expectedtrans.w = 124.0f; - D3DXVec3Transform(&gottrans,&u,&mat); - expect_vec4(expectedtrans,gottrans); + D3DXVec3Transform(&gottrans, &u, &mat); + expect_vec4(expectedtrans, gottrans); + + gottrans.x = u.x; gottrans.y = u.y; gottrans.z = u.z; + D3DXVec3Transform(&gottrans, (D3DXVECTOR3 *)&gottrans, &mat); + expect_vec4(expectedtrans, gottrans); /*_______________D3DXVec3TransformCoord_______________________*/ expectedvec.x = 70.0f/124.0f; expectedvec.y = 88.0f/124.0f; expectedvec.z = 106.0f/124.0f;

1 0

Francois Gouget : mshtml: Fix spelling of an HTMLEmbedElement method implementation name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

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

Nikolay Sivov : wordpad: Use correct buffer size when calling SHGetFolderPathW() (Coverity).
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: fde563b0d49b00d277b67605d3e99436dd68327f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde563b0d49b00d277b67605d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 22:28:23 2016 +0300 wordpad: Use correct buffer size when calling SHGetFolderPathW() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index 22b5c06..bf2af5b 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -154,9 +154,9 @@ static void format_filelist_filename(LPWSTR file, LPWSTR out) { LPWSTR pos_basename; LPWSTR truncpos1, truncpos2; - WCHAR myDocs[MAX_STRING_LEN]; + WCHAR myDocs[MAX_PATH]; - SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, (LPWSTR)&myDocs); + SHGetFolderPathW(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, myDocs); pos_basename = file_basename(file); truncpos1 = NULL; truncpos2 = NULL;

1 0

Francois Gouget : tools: Fix spelling of a variable name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

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 : include: Fix spelling of a method's parameter name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 5f522029e1c2f735b65c366eae830960679930ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f522029e1c2f735b65c366ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 19:21:07 2016 +0200 include: Fix spelling of a method's parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/axextend.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/axextend.idl b/include/axextend.idl index bde2229..63eb542 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -178,7 +178,7 @@ interface IFilterMapper : IUnknown [in] CLSID clsInMaj, [in] CLSID clsInSub, [in] BOOL bRender, - [in] BOOL bOututNeeded, + [in] BOOL bOutputNeeded, [in] CLSID clsOutMaj, [in] CLSID clsOutSub );

1 0

Jacek Caban : winex11.drv: Use InitOnceExecuteOnce in has_opengl.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: ef6890835d4148dfce9cc7500f3848ba6306ec22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6890835d4148dfce9cc7500… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 16:31:07 2016 +0200 winex11.drv: Use InitOnceExecuteOnce in has_opengl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ab29ce4..0f7534e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -573,18 +573,14 @@ done: return ret; } -static BOOL has_opengl(void) -{ - static BOOL init_done = FALSE; - static void *opengl_handle; +static void *opengl_handle; +static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) +{ char buffer[200]; int error_base, event_base; unsigned int i; - if (init_done) return (opengl_handle != NULL); - init_done = TRUE; - /* No need to load any other libraries as according to the ABI, libGL should be self-sufficient and include all dependencies */ opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, buffer, sizeof(buffer)); @@ -592,7 +588,7 @@ static BOOL has_opengl(void) { ERR( "Failed to load libGL: %s\n", buffer ); ERR( "OpenGL support is disabled.\n"); - return FALSE; + return TRUE; } for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) @@ -757,7 +753,14 @@ static BOOL has_opengl(void) failed: wine_dlclose(opengl_handle, NULL, 0); opengl_handle = NULL; - return FALSE; + return TRUE; +} + +static BOOL has_opengl(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, init_opengl, NULL, NULL); + return opengl_handle != NULL; } static const char *debugstr_fbconfig( GLXFBConfig fbconfig )

1 0

Francois Gouget : wineps.drv: Fix spelling of a prototype' s parameter name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

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

Francois Gouget : ole32/tests: Fix spelling of a test function name.
by Alexandre Julliard 14 Apr '16

14 Apr '16

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