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

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for the material.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 978fe23218c98ef695e6d9999797dd959e56a9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=978fe23218c98ef695e6d9999… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:45 2015 +0200 wined3d: Don't use the builtin FFP uniforms for the material. --- dlls/wined3d/glsl_shader.c | 67 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 5 ++-- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d04956..851fc28 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,11 @@ struct glsl_vs_program GLint projection_matrix_location; GLint normal_matrix_location; GLint texture_matrix_location[MAX_TEXTURES]; + GLint material_ambient_location; + GLint material_diffuse_location; + GLint material_specular_location; + GLint material_emission_location; + GLint material_shininess_location; }; struct glsl_gs_program @@ -1071,6 +1076,28 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex checkGLcall("glUniformMatrix4fv"); } +static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context *context, + const struct wined3d_state *state, struct glsl_shader_prog_link *prog) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (state->render_states[WINED3D_RS_SPECULARENABLE]) + { + GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, &state->material.specular.r)); + GL_EXTCALL(glUniform1f(prog->vs.material_shininess_location, state->material.power)); + } + else + { + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + + GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, black)); + } + GL_EXTCALL(glUniform4fv(prog->vs.material_ambient_location, 1, &state->material.ambient.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_diffuse_location, 1, &state->material.diffuse.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_emission_location, 1, &state->material.emissive.r)); + checkGLcall("setting FFP material uniforms"); +} + /* Context activation is done by the caller (state handler). */ static void shader_glsl_load_color_key_constant(const struct glsl_ps_program *ps, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) @@ -1151,6 +1178,9 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context shader_glsl_ffp_vertex_texmatrix_uniform(context, state, i, prog); } + if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) + shader_glsl_ffp_vertex_material_uniform(context, state, prog); + if (update_mask & WINED3D_SHADER_CONST_PS_F) shader_glsl_load_constantsF(pshader, gl_info, state->ps_consts_f, prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); @@ -5279,10 +5309,10 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "vec3 dir, dst;\n"); shader_addline(buffer, "float att, t;\n"); - ambient = shader_glsl_ffp_mcs(settings->ambient_source, "gl_FrontMaterial.ambient"); - diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "gl_FrontMaterial.diffuse"); - specular = shader_glsl_ffp_mcs(settings->specular_source, "gl_FrontMaterial.specular"); - emission = shader_glsl_ffp_mcs(settings->emission_source, "gl_FrontMaterial.emission"); + ambient = shader_glsl_ffp_mcs(settings->ambient_source, "ffp_material.ambient"); + diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "ffp_material.diffuse"); + specular = shader_glsl_ffp_mcs(settings->specular_source, "ffp_material.specular"); + emission = shader_glsl_ffp_mcs(settings->emission_source, "ffp_material.emission"); for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) { @@ -5306,7 +5336,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular) / att;\n", i); break; @@ -5331,7 +5361,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular) * att;\n", i); break; @@ -5348,7 +5378,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular;\n", i); break; @@ -5382,6 +5412,14 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe shader_addline(buffer, "uniform mat3 ffp_normal_matrix;\n"); shader_addline(buffer, "uniform mat4 ffp_texture_matrix[%u];\n", MAX_TEXTURES); + shader_addline(buffer, "uniform struct\n{\n"); + shader_addline(buffer, " vec4 emission;\n"); + shader_addline(buffer, " vec4 ambient;\n"); + shader_addline(buffer, " vec4 diffuse;\n"); + shader_addline(buffer, " vec4 specular;\n"); + shader_addline(buffer, " float shininess;\n"); + shader_addline(buffer, "} ffp_material;\n"); + shader_addline(buffer, "\nvoid main()\n{\n"); shader_addline(buffer, "float m;\n"); shader_addline(buffer, "vec3 r;\n"); @@ -6176,6 +6214,11 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * string_buffer_sprintf(name, "ffp_texture_matrix[%u]", i); vs->texture_matrix_location[i] = GL_EXTCALL(glGetUniformLocation(program_id, name->buffer)); } + vs->material_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.ambient")); + vs->material_diffuse_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.diffuse")); + vs->material_specular_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.specular")); + vs->material_emission_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emission")); + vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); string_buffer_release(&priv->string_buffers, name); } @@ -6497,6 +6540,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const break; } } + if (entry->vs.material_ambient_location != -1) + entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; } if (gshader) @@ -7534,12 +7579,18 @@ static void glsl_vertex_pipe_texmatrix(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; } +static void glsl_vertex_pipe_material(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; +} + static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, glsl_vertex_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_vertex_pipe_vs }, WINED3D_GL_EXT_NONE }, {STATE_MATERIAL, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_specularenable }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), glsl_vertex_pipe_material}, WINED3D_GL_EXT_NONE }, /* Clip planes */ {STATE_CLIPPLANE(0), {STATE_CLIPPLANE(0), clipplane }, WINED3D_GL_EXT_NONE }, {STATE_CLIPPLANE(1), {STATE_CLIPPLANE(1), clipplane }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fcba39b..eeb752a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -309,8 +309,9 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_FFP_MODELVIEW 0x00000400 #define WINED3D_SHADER_CONST_FFP_PROJ 0x00000800 #define WINED3D_SHADER_CONST_FFP_TEXMATRIX 0x00001000 -#define WINED3D_SHADER_CONST_FFP_PS 0x00002000 -#define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00004000 +#define WINED3D_SHADER_CONST_FFP_MATERIAL 0x00002000 +#define WINED3D_SHADER_CONST_FFP_PS 0x00004000 +#define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00008000 enum wined3d_shader_register_type {

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for texture transformation matrices.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 6984ca7f46a379e3adc8f18c50bd5bab169604ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6984ca7f46a379e3adc8f18c5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:44 2015 +0200 wined3d: Don't use the builtin FFP uniforms for texture transformation matrices. --- dlls/wined3d/glsl_shader.c | 101 ++++++++++++++++++++++++++++------------- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 9 ++-- 3 files changed, 75 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6984ca7f46a379e3adc8f…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetInterpolationMode().
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 1014d9a105609c9c3c6cdf4b5bee76e69b24efae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1014d9a105609c9c3c6cdf4b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:35 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetInterpolationMode(). --- dlls/d2d1/brush.c | 68 ++++++++++++++++++++++++++++++------------------ dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9e45e1a..c15945a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -499,7 +499,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) if (!refcount) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + if (brush->u.bitmap.sampler_state) + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); HeapFree(GetProcessHeap(), 0, brush); } @@ -565,7 +566,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush * static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, D2D1_BITMAP_INTERPOLATION_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.interpolation_mode = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap *bitmap) @@ -627,35 +637,16 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { - D3D10_SAMPLER_DESC sampler_desc; - HRESULT hr; FIXME("Ignoring brush properties.\n"); d2d_brush_init(brush, &render_target->ID2D1RenderTarget_iface, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); - - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; - sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.MipLODBias = 0.0f; - sampler_desc.MaxAnisotropy = 0; - sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; - sampler_desc.BorderColor[0] = 0.0f; - sampler_desc.BorderColor[1] = 0.0f; - sampler_desc.BorderColor[2] = 0.0f; - sampler_desc.BorderColor[3] = 0.0f; - sampler_desc.MinLOD = 0.0f; - sampler_desc.MaxLOD = 0.0f; - - if (FAILED(hr = ID3D10Device_CreateSamplerState(render_target->device, - &sampler_desc, &brush->u.bitmap.sampler_state))) - { - ERR("Failed to create sampler state, hr %#x.\n", hr); - return hr; - } + if (bitmap_brush_desc) + brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; + else + brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; return S_OK; } @@ -672,9 +663,36 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) { + HRESULT hr; + if (brush->type == D2D_BRUSH_TYPE_BITMAP) { ID3D10Device_PSSetShaderResources(device, 0, 1, &brush->u.bitmap.bitmap->view); + if (!brush->u.bitmap.sampler_state) + { + D3D10_SAMPLER_DESC sampler_desc; + + if (brush->u.bitmap.interpolation_mode == D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + else + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + &sampler_desc, &brush->u.bitmap.sampler_state))) + ERR("Failed to create sampler state, hr %#x.\n", hr); + } ID3D10Device_PSSetSamplers(device, 0, 1, &brush->u.bitmap.sampler_state); } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 48465f2..285c422 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -125,6 +125,7 @@ struct d2d_brush struct { struct d2d_bitmap *bitmap; + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap; } u;

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetInterpolationMode().
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 719dfff5bd87577ebcefe2b35aff8313e84fc00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=719dfff5bd87577ebcefe2b35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:36 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetInterpolationMode(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index c15945a..f2cb99e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -599,9 +599,11 @@ static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1B static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p.\n", iface); - return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; + return brush->u.bitmap.interpolation_mode; } static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap **bitmap)

1 0

Nikolay Sivov : dmime: Fix a couple of trace messages.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 2d77891fab46d44fd694053012ca304cb9f89c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d77891fab46d44fd69405301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:38:53 2015 +0300 dmime: Fix a couple of trace messages. --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 76d4706..7975a4f 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -600,14 +600,14 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *stream, BOOL clear_dirty) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p %d\n", This, stream, clear_dirty); + TRACE("(%p) %p %d\n", This, stream, clear_dirty); return E_NOTIMPL; } static HRESULT WINAPI PersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p\n", This, size); + TRACE("(%p) %p\n", This, size); return E_NOTIMPL; }

1 0

Mark Harmstone : include: Add buffered animation functions to uxtheme.h.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 4a1ebd7369ee8d7044a62887d9813c7aa3a5eeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1ebd7369ee8d7044a62887d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:54 2015 +0100 include: Add buffered animation functions to uxtheme.h. --- include/uxtheme.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index fa0d3cb..e6994a1 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -213,4 +213,32 @@ HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); +/* double-buffered animation functions */ + +typedef HANDLE HANIMATIONBUFFER; + +typedef enum _BP_ANIMATIONSTYLE +{ + BPAS_NONE, + BPAS_LINEAR, + BPAS_CUBIC, + BPAS_SINE +} BP_ANIMATIONSTYLE; + +typedef struct _BP_ANIMATIONPARAMS +{ + DWORD cbSize; + DWORD dwFlags; + BP_ANIMATIONSTYLE style; + DWORD dwDuration; +} BP_ANIMATIONPARAMS, *PBP_ANIMATIONPARAMS; + +HANIMATIONBUFFER WINAPI BeginBufferedAnimation(HWND, HDC, const RECT *, + BP_BUFFERFORMAT, BP_PAINTPARAMS *, + BP_ANIMATIONPARAMS *, HDC *, HDC *); + +BOOL WINAPI BufferedPaintRenderAnimation(HWND, HDC); +HRESULT WINAPI BufferedPaintStopAllAnimations(HWND); +HRESULT WINAPI EndBufferedAnimation(HANIMATIONBUFFER, BOOL); + #endif

1 0

Francois Gouget : kernel32/tests: Make test_StartupNoConsole() static.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: ad2c07888eb4bf433d7e8da19a974549f1ba4d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2c07888eb4bf433d7e8da19… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 10:03:36 2015 +0200 kernel32/tests: Make test_StartupNoConsole() static. --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4f7c58d..6660af4 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2656,7 +2656,7 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "SetInformationJobObject error %u\n", GetLastError()); } -void test_StartupNoConsole(void) +static void test_StartupNoConsole(void) { #ifndef _WIN64 char buffer[MAX_PATH];

1 0

Stefan Dösinger : wined3d: Move the ARB_texture_cube_map check to init_format_texture_info.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 0d6d64b35897eb384ddacaaf8f54067088a247ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6d64b35897eb384ddacaaf8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:11 2015 +0200 wined3d: Move the ARB_texture_cube_map check to init_format_texture_info. --- dlls/wined3d/directx.c | 6 ------ dlls/wined3d/texture.c | 6 ------ dlls/wined3d/utils.c | 3 ++- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index faa1a7f..36be539 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4430,12 +4430,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad switch (resource_type) { case WINED3D_RTYPE_CUBE_TEXTURE: - if (!gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - TRACE("[FAILED] - No cube texture support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - format_flags |= WINED3DFMT_FLAG_TEXTURE; allowed_usage = WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_DYNAMIC diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c62dea4..589f8bf 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -979,12 +979,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi return WINED3DERR_INVALIDCALL; } - if (!gl_info->supported[ARB_TEXTURE_CUBE_MAP] && desc->pool != WINED3D_POOL_SCRATCH) - { - WARN("(%p) : Tried to create not supported cube texture.\n", texture); - return WINED3DERR_INVALIDCALL; - } - /* Calculate levels for mip mapping */ if (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b45e0bf..405a79c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1859,7 +1859,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; if (gl_info->supported[EXT_TEXTURE3D]) format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags;

1 0

Matteo Bruni : wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 64463b81dfb2a2c8fcfd3388d588983c77513294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64463b81dfb2a2c8fcfd3388d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:41 2015 +0200 wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer. Also rename the shader_buffer_(clear|init|free) functions. --- dlls/wined3d/arb_program_shader.c | 168 +++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 102 +++++++++++------------ dlls/wined3d/shader.c | 14 ++-- dlls/wined3d/wined3d_private.h | 17 ++-- 4 files changed, 150 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64463b81dfb2a2c8fcfd3…

1 0

Matteo Bruni : wined3d: Introduce a scratch string buffers framework.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 84ca0203bfc9c35aa651e242f297bae5ef926f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ca0203bfc9c35aa651e242f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:43 2015 +0200 wined3d: Introduce a scratch string buffers framework. --- dlls/wined3d/glsl_shader.c | 98 ++++++++++++++++++++++++------------------ dlls/wined3d/shader.c | 65 ++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++ 3 files changed, 132 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84ca0203bfc9c35aa651e…

1 0

Matteo Bruni : wined3d: Reduce initial wined3d_string_buffer buffer size to 32.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 54b4df6731cd7b9660ac3b9e1c16deef5bc92fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b4df6731cd7b9660ac3b9e1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:42 2015 +0200 wined3d: Reduce initial wined3d_string_buffer buffer size to 32. Also try to avoid unnecessary HeapReAlloc() + vsnprintf() loops when we know the required size of the buffer. --- dlls/wined3d/shader.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 612b055..2d50ced 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -253,7 +253,7 @@ void string_buffer_clear(struct wined3d_string_buffer *buffer) BOOL string_buffer_init(struct wined3d_string_buffer *buffer) { - buffer->buffer_size = 16384; + buffer->buffer_size = 32; if (!(buffer->buffer = HeapAlloc(GetProcessHeap(), 0, buffer->buffer_size))) { ERR("Failed to allocate shader buffer memory.\n"); @@ -274,6 +274,7 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va unsigned int rem; int rc; char *new_buffer; + unsigned int new_buffer_size; for (;;) { @@ -283,14 +284,17 @@ int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) break; - if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) + new_buffer_size = buffer->buffer_size * 2; + while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) + new_buffer_size *= 2; + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size))) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return -1; } buffer->buffer = new_buffer; - buffer->buffer_size = buffer->buffer_size * 2; + buffer->buffer_size = new_buffer_size; } buffer->content_size += rc;

1 0

Jacek Caban : wininet: Initialize send and receive timeouts to 0.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 07520fbf12dff4b400892aabd30ef65c4bb59997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07520fbf12dff4b400892aabd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 24 14:39:29 2015 +0200 wininet: Initialize send and receive timeouts to 0. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 04cd281..8a872e8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5827,8 +5827,8 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; - session->send_timeout = INFINITE; - session->receive_timeout = INFINITE; + session->send_timeout = 0; + session->receive_timeout = 0; /* Don't send a handle created callback if this handle was created with InternetOpenUrl */ if (!(session->hdr.dwInternalFlags & INET_OPENURL))

1 0

Hans Leidekker : msvcrt: Handle NULL arguments in _mbscmp.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: bbd0e56a5832b8b6135d9300005747d07ec33cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd0e56a5832b8b6135d93000… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:04 2015 +0200 msvcrt: Handle NULL arguments in _mbscmp. --- dlls/msvcrt/mbcs.c | 3 +++ dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 044c2bd..4c85b90 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -24,6 +24,7 @@ */ #include <stdio.h> +#include <limits.h> #include "msvcrt.h" #include "wine/unicode.h" @@ -769,6 +770,8 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV */ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) { + if (!str || !cmp) return INT_MAX; + if(get_mbcinfo()->ismbcodepage) { unsigned int strc, cmpc; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index cf609f7..3893ba7 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2874,6 +2874,36 @@ static void test__wcsset_s(void) ok(str[2] == 'b', "str[2] = %d\n", str[2]); } +static void test__mbscmp(void) +{ + static const unsigned char a[] = {'a',0}, b[] = {'b',0}; + int ret; + + if (!p_mbrlen) + { + win_skip("_mbscmp tests\n"); + return; + } + + ret = _mbscmp(NULL, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, NULL); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(NULL, a); + ok(ret == INT_MAX, "got %d\n", ret); + + ret = _mbscmp(a, a); + ok(!ret, "got %d\n", ret); + + ret = _mbscmp(a, b); + ok(ret == -1, "got %d\n", ret); + + ret = _mbscmp(b, a); + ok(ret == 1, "got %d\n", ret); +} + START_TEST(string) { char mem[100]; @@ -2981,4 +3011,5 @@ START_TEST(string) test_strxfrm(); test__strnset_s(); test__wcsset_s(); + test__mbscmp(); }

1 0

Hans Leidekker : msvcr120: Add _ismbcprint export.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: da7f6c8b644caf45006520cd0e59cff17126a132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7f6c8b644caf45006520cd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:26 2015 +0200 msvcr120: Add _ismbcprint export. --- dlls/msvcr120/msvcr120.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c14ac45..811dcee 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1345,7 +1345,7 @@ @ stub _ismbclegal_l @ stub _ismbclower(long) @ stub _ismbclower_l -@ stub _ismbcprint(long) +@ cdecl _ismbcprint(long) @ stub _ismbcprint_l @ cdecl _ismbcpunct(long) @ stub _ismbcpunct_l

1 0

Hans Leidekker : advapi32: Return fake handles from RegisterTraceGuidsW.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 191b1bfbba1863c8970bee0fa026c14f91d8e93c URL: http://source.winehq.org/git/wine.git/?a=commit;h=191b1bfbba1863c8970bee0fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 24 14:48:49 2015 +0200 advapi32: Return fake handles from RegisterTraceGuidsW. --- dlls/advapi32/eventlog.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index bebb08b..191d817 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -772,6 +772,17 @@ ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), debugstr_w(MofResourceName), RegistrationHandle); + + if (TraceGuidReg) + { + ULONG i; + for (i = 0; i < GuidCount; i++) + { + FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); + TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; + } + } + *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; return ERROR_SUCCESS; }

1 0

Huw Davies : rpcrt4/tests: Fix some tests on Win 8.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 9f2c668c99cba9f4dc905810f4c290a587162c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2c668c99cba9f4dc905810f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 23 13:17:32 2015 +0100 rpcrt4/tests: Fix some tests on Win 8. --- dlls/rpcrt4/tests/cstub.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index de0c224..d098d60 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -397,6 +397,8 @@ static BOOL check_address(void *actual, void *expected) { static void *ole32_start = NULL; static void *ole32_end = NULL; + static void *combase_start = NULL; + static void *combase_end = NULL; if (actual == expected) return TRUE; @@ -412,7 +414,21 @@ static BOOL check_address(void *actual, void *expected) ole32_end = (void *)((char *) ole32_start + nt_headers->OptionalHeader.SizeOfImage); } - return ole32_start <= actual && actual < ole32_end; + if (ole32_start <= actual && actual < ole32_end) + return TRUE; + + /* On Win8, actual can be located inside combase.dll */ + if (combase_start == NULL || combase_end == NULL) + { + PIMAGE_NT_HEADERS nt_headers; + combase_start = (void *) GetModuleHandleA("combase.dll"); + if (combase_start == NULL) + return FALSE; + nt_headers = (PIMAGE_NT_HEADERS)((char *) combase_start + ((PIMAGE_DOS_HEADER) combase_start)->e_lfanew); + combase_end = (void *)((char *) combase_start + nt_headers->OptionalHeader.SizeOfImage); + } + + return (combase_start <= actual && actual < combase_end); } static const ExtendedProxyFileInfo my_proxy_file_info =

1 0

Nikolay Sivov : msdmo: Add more tracing.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 70297c424ad717b270e7aaf5c48b32b0e22ccd95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70297c424ad717b270e7aaf5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 11:13:10 2015 +0300 msdmo: Add more tracing. --- dlls/msdmo/dmoreg.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7ae01a1..dea079a 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -506,7 +506,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( WCHAR ** Names, DWORD * pcItemsFetched) { - FILETIME ft; HKEY hkey; WCHAR szNextKey[MAX_PATH]; WCHAR szGuidKey[64]; @@ -529,7 +528,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( This->index++; len = MAX_PATH; - ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, &ft); + ret = RegEnumKeyExW(This->hkey, This->index, szNextKey, &len, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) { hres = HRESULT_FROM_WIN32(ret); @@ -552,6 +551,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( wsprintfW(szKey, szCat2Fmt, szDMORootKey, szNextKey); ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hkey); + TRACE("testing %s\n", debugstr_w(szKey)); if (This->pInTypes) { @@ -571,6 +571,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pInTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d intypes for %s:\n", cInTypes, debugstr_w(szKey)); + for (i = 0; i < cInTypes; i++) { + TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + debugstr_guid(&pInTypes[i].subtype)); + } + for (i = 0; i < This->cInTypes; i++) { for (j = 0; j < cInTypes; j++) @@ -608,6 +614,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( pOutTypes = (DMO_PARTIAL_MEDIATYPE*) szValue; + TRACE("read %d outtypes for %s:\n", cOutTypes, debugstr_w(szKey)); + for (i = 0; i < cOutTypes; i++) { + TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + debugstr_guid(&pOutTypes[i].subtype)); + } + for (i = 0; i < This->cOutTypes; i++) { for (j = 0; j < cOutTypes; j++)

1 0

Stefan Dösinger : wined3d: Move the EXT_texture3D check to init_format_texture_info.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 072e1a3fb26336ee9f363529695dcbae84da64d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072e1a3fb26336ee9f3635296… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:50 2015 +0200 wined3d: Move the EXT_texture3D check to init_format_texture_info. --- dlls/wined3d/directx.c | 9 --------- dlls/wined3d/utils.c | 9 ++++++++- dlls/wined3d/volume.c | 5 ----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7e0d530..84c3aa2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4490,15 +4490,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad case WINED3D_RTYPE_VOLUME_TEXTURE: case WINED3D_RTYPE_VOLUME: - /* Volume is to VolumeTexture what Surface is to Texture, but its - * usage caps are not documented. Most driver seem to offer - * (nearly) the same on Volume and VolumeTexture, so do that too. */ - if (!gl_info->supported[EXT_TEXTURE3D]) - { - TRACE("[FAILED] - No volume texture support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* The GL_EXT_texture_compression_s3tc spec requires that loading * an s3tc compressed texture results in an error. While the D3D * refrast does support s3tc volumes, at least the nvidia Windows diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fadd0c9..1d34440 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1852,10 +1852,17 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->glFormat = format_texture_info[i].gl_format; format->glType = format_texture_info[i].gl_type; format->color_fixup = COLOR_FIXUP_IDENTITY; - format_set_flag(format, format_texture_info[i].flags); format->height_scale.numerator = 1; format->height_scale.denominator = 1; + format->flags[WINED3D_GL_RES_TYPE_TEX_1D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; + if (gl_info->supported[EXT_TEXTURE3D]) + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; + format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { query_format_flag(gl_info, format, format->glInternal, GL_VERTEX_TEXTURE, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index a231081..5241286 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -748,11 +748,6 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture HRESULT hr; UINT size; - if (!gl_info->supported[EXT_TEXTURE3D]) - { - WARN("Volume cannot be created - no volume texture support.\n"); - return WINED3DERR_INVALIDCALL; - } /* TODO: Write tests for other resources and move this check * to resource_init, if applicable. */ if (desc->usage & WINED3DUSAGE_DYNAMIC

1 0

Stefan Dösinger : wined3d: Query info for each resource type from ARB_internalformat_query2.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 9def5ff4098db8be848ef101c8dd7a85d7781fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9def5ff4098db8be848ef101c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:49 2015 +0200 wined3d: Query info for each resource type from ARB_internalformat_query2. --- dlls/wined3d/utils.c | 159 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 109 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9def5ff4098db8be848ef…

1 0

Stefan Dösinger : wined3d: Read flags of the right resource type in check_device_format.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: e4e1e7d8d3995309c7d97f575389ab7174e328a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e1e7d8d3995309c7d97f575… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:48 2015 +0200 wined3d: Read flags of the right resource type in check_device_format. --- dlls/wined3d/directx.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 230a224..7e0d530 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4250,7 +4250,8 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *display_format, const struct wined3d_format *ds_format) + const struct wined3d_format *display_format, const struct wined3d_format *ds_format, + enum wined3d_gl_resource_type gl_type) { /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; @@ -4270,7 +4271,7 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ - if (ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) return TRUE; } else @@ -4292,10 +4293,11 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, /* Check the render target capabilities of a format */ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, const struct wined3d_format *check_format) + const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, + enum wined3d_gl_resource_type gl_type) { /* Filter out non-RT formats */ - if (!(check_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET)) + if (!(check_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { @@ -4378,7 +4380,8 @@ static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, if (check_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) return TRUE; /* All depth stencil formats are supported on surfaces */ - if (CheckDepthStencilCapability(adapter, adapter_format, check_format)) return TRUE; + if (CheckDepthStencilCapability(adapter, adapter_format, check_format, WINED3D_GL_RES_TYPE_TEX_2D)) + return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ if (adapter->blitter->blit_supported(&adapter->gl_info, &adapter->d3d_info, @@ -4413,6 +4416,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad const struct wined3d_format *format = wined3d_get_format(gl_info, check_format_id); DWORD format_flags = 0; DWORD allowed_usage; + enum wined3d_gl_resource_type gl_type; TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s,\n" "resource_type %s, check_format %s.\n", @@ -4443,6 +4447,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = WINED3D_GL_RES_TYPE_TEX_CUBE; break; case WINED3D_RTYPE_SURFACE: @@ -4455,6 +4460,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; break; case WINED3D_RTYPE_TEXTURE: @@ -4479,6 +4485,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; break; case WINED3D_RTYPE_VOLUME_TEXTURE: @@ -4520,6 +4527,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; + gl_type = WINED3D_GL_RES_TYPE_TEX_3D; break; default: @@ -4547,10 +4555,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) format_flags |= WINED3DFMT_FLAG_BUMPMAP; - if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & format_flags) != format_flags) + if ((format->flags[gl_type] & format_flags) != format_flags) { TRACE("Requested format flags %#x, but format %s only has %#x.\n", - format_flags, debug_d3dformat(check_format_id), format->flags[WINED3D_GL_RES_TYPE_TEX_2D]); + format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); return WINED3DERR_NOTAVAILABLE; } @@ -4561,7 +4569,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if ((usage & WINED3DUSAGE_DEPTHSTENCIL) - && !CheckDepthStencilCapability(adapter, adapter_format, format)) + && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3DUSAGE_DEPTHSTENCIL, but format %s is not supported for depth / stencil buffers.\n", debug_d3dformat(check_format_id)); @@ -4569,7 +4577,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } if ((usage & WINED3DUSAGE_RENDERTARGET) - && !CheckRenderTargetCapability(adapter, adapter_format, format)) + && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) { TRACE("Requested WINED3DUSAGE_RENDERTARGET, but format %s is not supported for render targets.\n", debug_d3dformat(check_format_id));

1 0

Matteo Bruni : d3d9/tests: Add a specular lighting test.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 1e494a69c1a368badf03f844d5911b107e79d774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e494a69c1a368badf03f844d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:14 2015 +0200 d3d9/tests: Add a specular lighting test. --- dlls/d3d9/tests/visual.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1a040df..08362e1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -537,6 +537,233 @@ done: DestroyWindow(window); } +static void test_specular_lighting(void) +{ + static const unsigned int vertices_side = 5; + static const unsigned int indices_count = (vertices_side - 1) * (vertices_side - 1) * 2 * 3; + static const DWORD fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const D3DLIGHT9 directional = + { + D3DLIGHT_DIRECTIONAL, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f}, + }, + point = + { + D3DLIGHT_POINT, + {0.0f, 0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + 100.0f, + 0.0f, + 0.0f, 0.0f, 1.0f, + }; + static const struct expected_color + { + unsigned int x, y; + D3DCOLOR color; + } + expected_directional[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_directional_local[] = + { + {160, 120, 0x003c3c3c}, + {320, 120, 0x00717171}, + {480, 120, 0x003c3c3c}, + {160, 240, 0x00717171}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00717171}, + {160, 360, 0x003c3c3c}, + {320, 360, 0x00717171}, + {480, 360, 0x003c3c3c}, + }, + expected_point[] = + { + {160, 120, 0x00282828}, + {320, 120, 0x005a5a5a}, + {480, 120, 0x00282828}, + {160, 240, 0x005a5a5a}, + {320, 240, 0x00ffffff}, + {480, 240, 0x005a5a5a}, + {160, 360, 0x00282828}, + {320, 360, 0x005a5a5a}, + {480, 360, 0x00282828}, + }, + expected_point_local[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00070707}, + {480, 120, 0x00000000}, + {160, 240, 0x00070707}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00070707}, + {160, 360, 0x00000000}, + {320, 360, 0x00070707}, + {480, 360, 0x00000000}, + }; + static const struct + { + const D3DLIGHT9 *light; + BOOL local_viewer; + const struct expected_color *expected; + unsigned int expected_count; + } + tests[] = + { + {&directional, FALSE, expected_directional, + sizeof(expected_directional) / sizeof(expected_directional[0])}, + {&directional, TRUE, expected_directional_local, + sizeof(expected_directional_local) / sizeof(expected_directional_local[0])}, + {&point, FALSE, expected_point, + sizeof(expected_point) / sizeof(expected_point[0])}, + {&point, TRUE, expected_point_local, + sizeof(expected_point_local) / sizeof(expected_point_local[0])}, + }; + IDirect3DDevice9 *device; + D3DMATERIAL9 material; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + unsigned int i, j, x, y; + struct + { + struct vec3 position; + struct vec3 normal; + } *quad; + WORD *indices; + + quad = HeapAlloc(GetProcessHeap(), 0, vertices_side * vertices_side * sizeof(*quad)); + indices = HeapAlloc(GetProcessHeap(), 0, indices_count * sizeof(*indices)); + for (i = 0, y = 0; y < vertices_side; ++y) + { + for (x = 0; x < vertices_side; ++x) + { + quad[i].position.x = x * 2.0f / (vertices_side - 1) - 1.0f; + quad[i].position.y = y * 2.0f / (vertices_side - 1) - 1.0f; + quad[i].position.z = 1.0f; + quad[i].normal.x = 0.0f; + quad[i].normal.y = 0.0f; + quad[i++].normal.z = -1.0f; + } + } + for (i = 0, y = 0; y < (vertices_side - 1); ++y) + { + for (x = 0; x < (vertices_side - 1); ++x) + { + indices[i++] = y * vertices_side + x + 1; + indices[i++] = y * vertices_side + x; + indices[i++] = (y + 1) * vertices_side + x; + indices[i++] = y * vertices_side + x + 1; + indices[i++] = (y + 1) * vertices_side + x; + indices[i++] = (y + 1) * vertices_side + x + 1; + } + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, fvf); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + material.Specular.r = 1.0f; + material.Specular.g = 1.0f; + material.Specular.b = 1.0f; + material.Specular.a = 1.0f; + material.Power = 30.0f; + hr = IDirect3DDevice9_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x.\n", hr); + + hr = IDirect3DDevice9_LightEnable(device, 0, TRUE); + ok(SUCCEEDED(hr), "Failed to enable light 0, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + hr = IDirect3DDevice9_SetLight(device, 0, tests[i].light); + ok(SUCCEEDED(hr), "Failed to set light parameters, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LOCALVIEWER, tests[i].local_viewer); + ok(SUCCEEDED(hr), "Failed to set local viewer state, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, vertices_side * vertices_side, indices_count / 3, indices, + D3DFMT_INDEX16, quad, sizeof(quad[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + for (j = 0; j < tests[i].expected_count; ++j) + { + color = getPixelColor(device, tests[i].expected[j].x, tests[i].expected[j].y); + ok(color_match(color, tests[i].expected[j].color, 1), + "Expected color 0x%08x at location (%u, %u), got 0x%08x, case %u.\n", + tests[i].expected[j].color, tests[i].expected[j].x, + tests[i].expected[j].y, color, i); + } + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); + HeapFree(GetProcessHeap(), 0, indices); + HeapFree(GetProcessHeap(), 0, quad); +} + static void clear_test(void) { /* Tests the correctness of clearing parameters */ @@ -17994,6 +18221,7 @@ START_TEST(visual) depth_clamp_test(); stretchrect_test(); lighting_test(); + test_specular_lighting(); clear_test(); color_fill_test(); fog_test();

1 0

Matteo Bruni : wined3d: Introduce D3D7+ normal matrix computation.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: b963c73abb0f0ac9e857b3f2ebf229fb6b086107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b963c73abb0f0ac9e857b3f2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:12 2015 +0200 wined3d: Introduce D3D7+ normal matrix computation. --- dlls/d3d8/tests/visual.c | 18 ++-- dlls/d3d9/tests/visual.c | 18 ++-- dlls/ddraw/ddraw.c | 8 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/main.c | 9 +- dlls/ddraw/tests/ddraw7.c | 14 ++- dlls/wined3d/glsl_shader.c | 220 ++++++++++++++++++++++++++++++++++++++++++++- include/wine/wined3d.h | 1 + 8 files changed, 243 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b963c73abb0f0ac9e857b…

1 0

Erich E. Hoover : krnl386: Invalid console handles should translate into real handles when creating a new process.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: bc68b30d208209d749522eaba79b0e124956bdde URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc68b30d208209d749522eaba… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sun Mar 15 15:30:51 2015 -0600 krnl386: Invalid console handles should translate into real handles when creating a new process. --- dlls/krnl386.exe16/file.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 1584340..6c3cef3 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -53,21 +53,26 @@ static HANDLE dos_handles[DOS_TABLE_SIZE]; */ static void FILE_InitProcessDosHandles( void ) { + HANDLE hStdInput, hStdOutput, hStdError, hNull; static BOOL init_done /* = FALSE */; HANDLE cp = GetCurrentProcess(); if (init_done) return; init_done = TRUE; - DuplicateHandle(cp, GetStdHandle(STD_INPUT_HANDLE), cp, &dos_handles[0], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_OUTPUT_HANDLE), cp, &dos_handles[1], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[2], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[3], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[4], - 0, TRUE, DUPLICATE_SAME_ACCESS); + hStdInput = GetStdHandle(STD_INPUT_HANDLE); + hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + hStdError = GetStdHandle(STD_ERROR_HANDLE); + hNull = CreateFileA("NUL", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + /* Invalid console handles need to translate to real DOS handles in a new process */ + if (!hStdInput) hStdInput = hNull; + if (!hStdOutput) hStdOutput = hNull; + if (!hStdError) hStdError = hNull; + DuplicateHandle(cp, hStdInput, cp, &dos_handles[0], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdOutput, cp, &dos_handles[1], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdError, cp, &dos_handles[2], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdError, cp, &dos_handles[3], 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, hStdError, cp, &dos_handles[4], 0, TRUE, DUPLICATE_SAME_ACCESS); + CloseHandle(hNull); } /***********************************************************************

1 0

Henri Verbeet : wined3d: Get rid of the tracing code in shader_vaddline().
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: cfd280fd66b3824d6a9cec4c214e91c900d167ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd280fd66b3824d6a9cec4c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:23 2015 +0200 wined3d: Get rid of the tracing code in shader_vaddline(). --- dlls/wined3d/arb_program_shader.c | 6 +++++ dlls/wined3d/glsl_shader.c | 9 +++++++ dlls/wined3d/shader.c | 50 +++++++++++---------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 39800f2..7a497d2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3262,6 +3262,12 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar const char *ptr, *line; GLint native, pos; + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); checkGLcall("glProgramStringARB()"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f1bf0a3..0f18019 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -344,7 +344,16 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id /* Context activation is done by the caller. */ static void shader_glsl_compile(const struct wined3d_gl_info *gl_info, GLuint shader, const char *src) { + const char *ptr, *line; + TRACE("Compiling shader object %u.\n", shader); + + if (TRACE_ON(d3d_shader)) + { + ptr = src; + while ((line = get_info_log_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } + GL_EXTCALL(glShaderSource(shader, 1, &src, NULL)); checkGLcall("glShaderSource"); GL_EXTCALL(glCompileShader(shader)); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c249c9a..7d0c47b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -249,8 +249,6 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) { buffer->buffer[0] = '\0'; buffer->content_size = 0; - buffer->lineNo = 0; - buffer->newline = TRUE; } BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) @@ -273,48 +271,28 @@ void shader_buffer_free(struct wined3d_shader_buffer *buffer) int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va_list args) { - char *base = buffer->buffer + buffer->content_size; + unsigned int rem; int rc; char *new_buffer; - while(1) + for (;;) { - rc = vsnprintf(base, buffer->buffer_size - buffer->content_size, format, args); - if (rc < 0 /* C89 */ || (unsigned int)rc >= buffer->buffer_size - buffer->content_size /* C99 */) - { - new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2); - if (!new_buffer) - { - ERR("The buffer allocated for the shader program string is too small at %d bytes.\n", buffer->buffer_size); - buffer->content_size = buffer->buffer_size - 1; - return -1; - } - buffer->buffer = new_buffer; - buffer->buffer_size = buffer->buffer_size * 2; - base = buffer->buffer + buffer->content_size; - } - else - { + rem = buffer->buffer_size - buffer->content_size; + rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + + if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) break; - } - } - if (buffer->newline) - { - TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->content_size, base); - buffer->newline = FALSE; - } - else - { - TRACE("%s", base); + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, buffer->buffer_size * 2))) + { + ERR("Failed to grow buffer.\n"); + buffer->buffer[buffer->content_size] = '\0'; + return -1; + } + buffer->buffer = new_buffer; + buffer->buffer_size = buffer->buffer_size * 2; } - buffer->content_size += rc; - if (buffer->buffer[buffer->content_size-1] == '\n') - { - ++buffer->lineNo; - buffer->newline = TRUE; - } return 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd2a85a..ecbec5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -440,8 +440,6 @@ struct wined3d_shader_buffer char *buffer; unsigned int buffer_size; unsigned int content_size; - unsigned int lineNo; - BOOL newline; }; enum WINED3D_SHADER_INSTRUCTION_HANDLER

1 0

Stefan Dösinger : wined3d: Introduce resource-type specific format flags.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 3c0ed9ce0af5370f89605d8bc4ceaec578562ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0ed9ce0af5370f89605d8bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 24 10:33:47 2015 +0200 wined3d: Introduce resource-type specific format flags. --- dlls/wined3d/buffer.c | 5 +- dlls/wined3d/context.c | 7 ++- dlls/wined3d/directx.c | 25 +++++---- dlls/wined3d/resource.c | 5 +- dlls/wined3d/surface.c | 23 ++++---- dlls/wined3d/texture.c | 19 ++++--- dlls/wined3d/utils.c | 119 +++++++++++++++++++++++------------------ dlls/wined3d/view.c | 2 +- dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 8 +-- 10 files changed, 125 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c0ed9ce0af5370f89605…

1 0

Matteo Bruni : wined3d: Drop glPrioritizeTextures() call.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 7928ffaca5288b56fcc0b4b95cd4a54fcede707a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7928ffaca5288b56fcc0b4b95… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:15 2015 +0200 wined3d: Drop glPrioritizeTextures() call. It's not supported on core profiles and I doubt it matters anyway. For the records, the default value is 1 so this was actually lowering the priority for DEFAULT pool textures. --- dlls/wined3d/texture.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index de92e0e..1a87386 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -187,13 +187,6 @@ void wined3d_texture_bind(struct wined3d_texture *texture, return; } - if (texture->resource.pool == WINED3D_POOL_DEFAULT) - { - /* Tell OpenGL to try and keep this texture in video ram (well mostly). */ - GLclampf tmp = 0.9f; - gl_info->gl_ops.gl.p_glPrioritizeTextures(1, &gl_tex->name, &tmp); - } - /* Initialise the state of the texture object to the OpenGL defaults, not * the wined3d defaults. */ gl_tex->sampler_desc.address_u = WINED3D_TADDRESS_WRAP;

1 0

Matteo Bruni : wined3d: Fix specular lighting for non-local viewer.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: d6db6c729532f5f9320db1d376ef034342450a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6db6c729532f5f9320db1d37… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:13 2015 +0200 wined3d: Fix specular lighting for non-local viewer. The viewer is in the (0.0, 0.0, -1.0) direction in the D3D coordinate system. --- dlls/wined3d/glsl_shader.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7874a69..4c0266f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5280,7 +5280,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else - shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, 1.0)));\n"); + shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular) / att;\n", i); break; @@ -5305,7 +5305,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer if (settings->localviewer) shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else - shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, 1.0)));\n"); + shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular) * att;\n", i); break; @@ -5317,7 +5317,12 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_shader_buffer *buffer shader_addline(buffer, "dir = normalize(gl_LightSource[%u].position.xyz);\n", i); shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" " * gl_LightSource[%u].diffuse.xyz;\n", i); - shader_addline(buffer, "t = dot(normal, gl_LightSource[%u].halfVector.xyz);\n", i); + /* TODO: In the non-local viewer case the halfvector is constant + * and could be precomputed and stored in a uniform. */ + if (settings->localviewer) + shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); + else + shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" " * gl_LightSource[%u].specular;\n", i); break;

1 0

Thomas Faber : ntdll/tests: Avoid printing an unterminated string (DPH).
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 3d9693fa617034c7f11c2408f0191c6ee4b88834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9693fa617034c7f11c2408f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Apr 23 20:42:50 2015 +0200 ntdll/tests: Avoid printing an unterminated string (DPH). --- dlls/ntdll/tests/reg.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0af009f..6d04668 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -204,22 +204,9 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN IN ULONG ValueLength, IN PVOID Context, IN PVOID EntryContext) { NTSTATUS ret = STATUS_SUCCESS; - int ValueNameLength = 0; - LPSTR ValName = 0; - trace("**Test %d**\n", CurrentTest); - - if(ValueName) - { - ValueNameLength = lstrlenW(ValueName); - - ValName = pRtlAllocateHeap(GetProcessHeap(), 0, ValueNameLength); - - WideCharToMultiByte(CP_ACP, 0, ValueName, ValueNameLength+1, ValName, ValueNameLength, NULL, NULL); - trace("ValueName: %s\n", ValName); - } - else - trace("ValueName: (null)\n"); + trace("**Test %d**\n", CurrentTest); + trace("ValueName: %s\n", wine_dbgstr_w(ValueName)); switch(ValueType) { @@ -262,9 +249,6 @@ static NTSTATUS WINAPI QueryRoutine (IN PCWSTR ValueName, IN ULONG ValueType, IN CurrentTest++; - if(ValName) - pRtlFreeHeap(GetProcessHeap(), 0, ValName); - return ret; }

1 0

Henri Verbeet : d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap ().
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: b313680ab4d723fb6fc45581e3dfca9958bfe526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b313680ab4d723fb6fc45581e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:25 2015 +0200 d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f8bdf95..757cdac 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -779,10 +779,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.opacity = opacity; brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left)); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right); + brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right) * brush_desc.transform._11; brush_desc.transform._12 = 0.0f; brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); - brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom); + brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22; if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Nikolay Sivov : msdmo: Added a helper to duplicate partial media type arrays.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 55620f097cdbee98f4c4113c3441a50539eb63bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=55620f097cdbee98f4c4113c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 10:08:18 2015 +0300 msdmo: Added a helper to duplicate partial media type arrays. --- dlls/msdmo/dmoreg.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7a81398..7ae01a1 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -360,6 +360,21 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) return S_FALSE; } +static HRESULT dup_partial_mediatype(const DMO_PARTIAL_MEDIATYPE *types, DWORD count, DMO_PARTIAL_MEDIATYPE **ret) +{ + *ret = NULL; + + if (count == 0) + return S_OK; + + *ret = HeapAlloc(GetProcessHeap(), 0, count*sizeof(*types)); + if (!*ret) + return E_OUTOFMEMORY; + + memcpy(*ret, types, count*sizeof(*types)); + return S_OK; +} + /************************************************************************** * IEnumDMO_Constructor */ @@ -373,8 +388,7 @@ static HRESULT IEnumDMO_Constructor( IEnumDMO **obj) { IEnumDMOImpl* lpedmo; - HRESULT hr = S_OK; - UINT size; + HRESULT hr; LONG ret; *obj = NULL; @@ -388,32 +402,16 @@ static HRESULT IEnumDMO_Constructor( lpedmo->index = -1; lpedmo->category = *guidCategory; lpedmo->dwFlags = dwFlags; + lpedmo->cInTypes = cInTypes; + lpedmo->cOutTypes = cOutTypes; - if (cInTypes > 0) - { - size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pInTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pInTypes, pInTypes, size); - lpedmo->cInTypes = cInTypes; - } + hr = dup_partial_mediatype(pInTypes, cInTypes, &lpedmo->pInTypes); + if (FAILED(hr)) + goto lerr; - if (cOutTypes > 0) - { - size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pOutTypes) - { - hr = E_OUTOFMEMORY; - goto lerr; - } - memcpy(lpedmo->pOutTypes, pOutTypes, size); - lpedmo->cOutTypes = cOutTypes; - } + hr = dup_partial_mediatype(pOutTypes, cOutTypes, &lpedmo->pOutTypes); + if (FAILED(hr)) + goto lerr; /* If not filtering by category enum from media objects root */ if (IsEqualGUID(guidCategory, &GUID_NULL)) @@ -426,8 +424,7 @@ static HRESULT IEnumDMO_Constructor( WCHAR szguid[64]; WCHAR szKey[MAX_PATH]; - wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, - GUIDToString(szguid, guidCategory)); + wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, GUIDToString(szguid, guidCategory)); if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey))) hr = HRESULT_FROM_WIN32(ret); }

1 0

Nikolay Sivov : msdmo: Store requested category GUID instead of a pointer to it.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 0b7b8e3dc34a2bc1156e1a2c7c0d42cc989cc22e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7b8e3dc34a2bc1156e1a2c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 09:58:50 2015 +0300 msdmo: Store requested category GUID instead of a pointer to it. --- dlls/msdmo/dmoreg.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f9bf9b3..7a81398 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -90,7 +90,7 @@ typedef struct IEnumDMO IEnumDMO_iface; LONG ref; DWORD index; - const GUID* guidCategory; + GUID category; DWORD dwFlags; DWORD cInTypes; DMO_PARTIAL_MEDIATYPE *pInTypes; @@ -386,7 +386,7 @@ static HRESULT IEnumDMO_Constructor( lpedmo->IEnumDMO_iface.lpVtbl = &edmovt; lpedmo->ref = 1; lpedmo->index = -1; - lpedmo->guidCategory = guidCategory; + lpedmo->category = *guidCategory; lpedmo->dwFlags = dwFlags; if (cInTypes > 0) @@ -692,7 +692,7 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); TRACE("(%p)->(%p)\n", This, ppEnum); - return IEnumDMO_Constructor(This->guidCategory, This->dwFlags, This->cInTypes, This->pInTypes, + return IEnumDMO_Constructor(&This->category, This->dwFlags, This->cInTypes, This->pInTypes, This->cOutTypes, This->pOutTypes, ppEnum); } @@ -703,18 +703,35 @@ static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum) * Enumerate DirectX Media Objects in the registry. */ HRESULT WINAPI DMOEnum( - REFGUID guidCategory, - DWORD dwFlags, + REFGUID category, + DWORD flags, DWORD cInTypes, const DMO_PARTIAL_MEDIATYPE *pInTypes, DWORD cOutTypes, const DMO_PARTIAL_MEDIATYPE *pOutTypes, IEnumDMO **ppEnum) { - TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n", - guidCategory, dwFlags, cInTypes, cOutTypes); + TRACE("%s 0x%08x %d %p %d %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes, + cOutTypes, pOutTypes, ppEnum); + + if (TRACE_ON(msdmo)) + { + DWORD i; + if (cInTypes) + { + for (i = 0; i < cInTypes; i++) + TRACE("intype %d - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type), + debugstr_guid(&pInTypes[i].subtype)); + } + + if (cOutTypes) { + for (i = 0; i < cOutTypes; i++) + TRACE("outtype %d - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type), + debugstr_guid(&pOutTypes[i].subtype)); + } + } - return IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, + return IEnumDMO_Constructor(category, flags, cInTypes, pInTypes, cOutTypes, pOutTypes, ppEnum); }

1 0

Matteo Bruni : wined3d: Drop the ARB_SHADER_OBJECTS extension flag.
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 53ff2a9d220553b0d15fc0152f1772de211b3f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ff2a9d220553b0d15fc0152… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 23 22:41:16 2015 +0200 wined3d: Drop the ARB_SHADER_OBJECTS extension flag. The flag is currently unused and also unnecessary since both ARB_vertex_shader and ARB_fragment_shader specs require ARB_shader_objects support. --- dlls/wined3d/directx.c | 1 - dlls/wined3d/wined3d_gl.h | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 01048fd..a0405b3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -136,7 +136,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, - {"GL_ARB_shader_objects", ARB_SHADER_OBJECTS }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, {"GL_ARB_shadow", ARB_SHADOW }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4919cf6..009dca6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -72,7 +72,6 @@ enum wined3d_gl_extension ARB_PROVOKING_VERTEX, ARB_SAMPLER_OBJECTS, ARB_SHADER_BIT_ENCODING, - ARB_SHADER_OBJECTS, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADOW,

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetBitmap().
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 168dd496cbb370e8e58936e279e4d7837d6580a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=168dd496cbb370e8e58936e27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:26 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetBitmap(). --- dlls/d2d1/brush.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index f2451e6..9e45e1a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -596,7 +596,12 @@ static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInte static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap **bitmap) { - FIXME("iface %p, bitmap %p stub!\n", iface, bitmap); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, bitmap %p.\n", iface, bitmap); + + if ((*bitmap = &brush->u.bitmap.bitmap->ID2D1Bitmap_iface)) + ID2D1Bitmap_AddRef(*bitmap); } static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl =

1 0

Henri Verbeet : d2d1: Do not flip/ mirror the bitmap in d2d_d3d_render_target_DrawBitmap().
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: 4b3ca58fe969bd8b20358ed90dfe438e9bc03013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b3ca58fe969bd8b20358ed90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:24 2015 +0200 d2d1: Do not flip/mirror the bitmap in d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cdf82bf..f8bdf95 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -777,12 +777,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget bitmap_brush_desc.interpolationMode = interpolation_mode; brush_desc.opacity = opacity; - brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); + brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left)); brush_desc.transform._21 = 0.0f; - brush_desc.transform._31 = d.left - s.left; + brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right); brush_desc.transform._12 = 0.0f; - brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); - brush_desc.transform._32 = d.top - s.top; + brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); + brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom); if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) {

1 0

Henri Verbeet : wined3d: Simplify shader_arb_dump_program_source().
by Alexandre Julliard April 24, 2015

April 24, 2015

Module: wine Branch: master Commit: dd2398297c17acb2ee9fcb026e70b313ea433edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2398297c17acb2ee9fcb026… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 23 20:23:22 2015 +0200 wined3d: Simplify shader_arb_dump_program_source(). --- dlls/wined3d/arb_program_shader.c | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 96d2f74..39800f2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -50,10 +50,9 @@ static BOOL shader_is_vshader_version(enum wined3d_shader_type type) return type == WINED3D_SHADER_TYPE_VERTEX; } -/* Extract a line. Note that this modifies the source string. */ -static char *get_line(char **ptr) +static const char *get_line(const char **ptr) { - char *p, *q; + const char *p, *q; p = *ptr; if (!(q = strstr(p, "\n"))) @@ -62,33 +61,11 @@ static char *get_line(char **ptr) *ptr += strlen(p); return p; } - *q = '\0'; *ptr = q + 1; return p; } -static void shader_arb_dump_program_source(const char *source) -{ - ULONG source_size; - char *ptr, *line, *tmp; - - source_size = strlen(source) + 1; - tmp = HeapAlloc(GetProcessHeap(), 0, source_size); - if (!tmp) - { - ERR("Failed to allocate %u bytes for shader source.\n", source_size); - return; - } - memcpy(tmp, source, source_size); - - ptr = tmp; - while ((line = get_line(&ptr))) FIXME(" %s\n", line); - FIXME("\n"); - - HeapFree(GetProcessHeap(), 0, tmp); -} - enum arb_helper_value { ARB_ZERO, @@ -3282,6 +3259,7 @@ static void shader_hw_call(const struct wined3d_shader_instruction *ins) static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum target, const char *src) { + const char *ptr, *line; GLint native, pos; GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); @@ -3294,7 +3272,10 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar { FIXME_(d3d_shader)("Program error at position %d: %s\n\n", pos, debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - shader_arb_dump_program_source(src); + ptr = src; + while ((line = get_line(&ptr))) FIXME_(d3d_shader)(" %.*s", (int)(ptr - line), line); + FIXME_(d3d_shader)("\n"); + return FALSE; } }

1 0

Nikolay Sivov : dwrite: Track a run this cluster came from.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: d7a40fd2984ed55f5c618827aa5e22fe8c02ed47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a40fd2984ed55f5c618827a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:02:43 2015 +0300 dwrite: Track a run this cluster came from. --- dlls/dwrite/layout.c | 55 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f4aa1b6..22fbbd3 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -139,6 +139,11 @@ struct layout_run { } u; }; +struct layout_cluster { + const struct layout_run *run; /* link to run this cluster belongs to */ + UINT32 position; /* relative to run, first cluster has 0 position */ +}; + enum layout_recompute_mask { RECOMPUTE_NOMINAL_RUNS = 1 << 0, RECOMPUTE_MINIMAL_WIDTH = 1 << 1, @@ -164,7 +169,8 @@ struct dwrite_textlayout { DWRITE_LINE_BREAKPOINT *nominal_breakpoints; DWRITE_LINE_BREAKPOINT *actual_breakpoints; - DWRITE_CLUSTER_METRICS *clusters; + struct layout_cluster *clusters; + DWRITE_CLUSTER_METRICS *clustermetrics; UINT32 clusters_count; FLOAT minwidth; @@ -420,9 +426,11 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, codepoint initially. */ -static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct regular_layout_run *run, UINT32 *cluster) +static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 *cluster) { - DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[*cluster]; + DWRITE_CLUSTER_METRICS *metrics = &layout->clustermetrics[*cluster]; + struct layout_cluster *c = &layout->clusters[*cluster]; + const struct regular_layout_run *run = &r->u.regular; UINT32 i, start = 0; for (i = 0; i < run->descr.stringLength; i++) { @@ -431,15 +439,20 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s if (run->descr.clusterMap[start] != run->descr.clusterMap[i]) { init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->descr.clusterMap[i], i, metrics); metrics->length = i - start; + c->position = start; + c->run = r; *cluster += 1; metrics++; + c++; start = i; } if (end) { init_cluster_metrics(layout, run, run->descr.clusterMap[start], run->run.glyphCount, i, metrics); metrics->length = i - start + 1; + c->position = start; + c->run = r; *cluster += 1; return; @@ -456,11 +469,18 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) HRESULT hr; free_layout_runs(layout); - heap_free(layout->clusters); + + /* Cluster data arrays are allocated once, assuming one text position per cluster. */ + if (!layout->clustermetrics) { + layout->clustermetrics = heap_alloc(layout->len*sizeof(*layout->clustermetrics)); + layout->clusters = heap_alloc(layout->len*sizeof(*layout->clusters)); + if (!layout->clustermetrics || !layout->clusters) { + heap_free(layout->clustermetrics); + heap_free(layout->clusters); + return E_OUTOFMEMORY; + } + } layout->clusters_count = 0; - layout->clusters = heap_alloc(layout->len*sizeof(DWRITE_CLUSTER_METRICS)); - if (!layout->clusters) - return E_OUTOFMEMORY; hr = get_textanalyzer(&analyzer); if (FAILED(hr)) @@ -508,7 +528,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* we need to do very little in case of inline objects */ if (r->kind == LAYOUT_RUN_INLINE) { - DWRITE_CLUSTER_METRICS *metrics = &layout->clusters[cluster]; + DWRITE_CLUSTER_METRICS *metrics = &layout->clustermetrics[cluster]; + struct layout_cluster *c = &layout->clusters[cluster]; DWRITE_INLINE_OBJECT_METRICS inlinemetrics; metrics->width = 0.0; @@ -519,6 +540,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) metrics->isSoftHyphen = FALSE; metrics->isRightToLeft = FALSE; metrics->padding = 0; + c->run = r; + c->position = 0; /* there's always one cluster per inline object, so 0 is valid value */ cluster++; /* TODO: is it fatal if GetMetrics() fails? */ @@ -630,7 +653,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; - layout_set_cluster_metrics(layout, run, &cluster); + layout_set_cluster_metrics(layout, r, &cluster); continue; @@ -1203,6 +1226,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) release_format_data(&This->format); heap_free(This->nominal_breakpoints); heap_free(This->actual_breakpoints); + heap_free(This->clustermetrics); heap_free(This->clusters); heap_free(This->str); heap_free(This); @@ -1817,7 +1841,7 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa return hr; if (metrics) - memcpy(metrics, This->clusters, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); + memcpy(metrics, This->clustermetrics, sizeof(DWRITE_CLUSTER_METRICS)*min(max_count, This->clusters_count)); *count = This->clusters_count; return max_count >= This->clusters_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; @@ -1827,11 +1851,11 @@ static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout2 *ifa too hard to break. */ static inline BOOL is_terminal_cluster(struct dwrite_textlayout *layout, UINT32 index) { - if (layout->clusters[index].isWhitespace || layout->clusters[index].isNewline || + if (layout->clustermetrics[index].isWhitespace || layout->clustermetrics[index].isNewline || (index == layout->clusters_count - 1)) return TRUE; /* check next one */ - return (index < layout->clusters_count - 1) && layout->clusters[index+1].isWhitespace; + return (index < layout->clusters_count - 1) && layout->clustermetrics[index+1].isWhitespace; } static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *iface, FLOAT* min_width) @@ -1856,17 +1880,17 @@ static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *ifa for (i = 0; i < This->clusters_count;) { if (is_terminal_cluster(This, i)) { - width = This->clusters[i].width; + width = This->clustermetrics[i].width; i++; } else { width = 0.0; while (!is_terminal_cluster(This, i)) { - width += This->clusters[i].width; + width += This->clustermetrics[i].width; i++; } /* count last one too */ - width += This->clusters[i].width; + width += This->clustermetrics[i].width; } if (width > This->minwidth) @@ -2716,6 +2740,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; layout->clusters_count = 0; + layout->clustermetrics = NULL; layout->clusters = NULL; layout->minwidth = 0.0; list_init(&layout->runs);

1 0

Nikolay Sivov : dwrite: Set some more cluster properties.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 68edc995c541666cfeb6dc900275436a718a8004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68edc995c541666cfeb6dc900… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:01:18 2015 +0300 dwrite: Set some more cluster properties. --- dlls/dwrite/layout.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9999e6e..f4aa1b6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -377,6 +377,7 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, UINT16 start_glyph, UINT16 stop_glyph, UINT32 stop_position, DWRITE_CLUSTER_METRICS *metrics) { UINT8 breakcondition; + UINT32 position; UINT16 j; metrics->width = 0.0; @@ -384,16 +385,29 @@ static inline void init_cluster_metrics(const struct dwrite_textlayout *layout, metrics->width += run->run.glyphAdvances[j]; metrics->length = 0; + position = stop_position; if (stop_glyph == run->run.glyphCount) breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionAfter; - else + else { breakcondition = get_effective_breakpoint(layout, stop_position).breakConditionBefore; + if (stop_position) position = stop_position - 1; + } metrics->canWrapLineAfter = breakcondition == DWRITE_BREAK_CONDITION_CAN_BREAK || breakcondition == DWRITE_BREAK_CONDITION_MUST_BREAK; - metrics->isWhitespace = FALSE; /* FIXME */ - metrics->isNewline = FALSE; /* FIXME */ - metrics->isSoftHyphen = FALSE; /* FIXME */ + if (metrics->length == 1) { + WORD type; + + GetStringTypeW(CT_CTYPE1, &layout->str[position], 1, &type); + metrics->isWhitespace = type == C1_SPACE; + metrics->isNewline = FALSE /* FIXME */; + metrics->isSoftHyphen = layout->str[position] == 0x00ad /* Unicode Soft Hyphen */; + } + else { + metrics->isWhitespace = FALSE; + metrics->isNewline = FALSE; + metrics->isSoftHyphen = FALSE; + } metrics->isRightToLeft = run->run.bidiLevel & 1; metrics->padding = 0; }

1 0

Nikolay Sivov : dwrite: Trace text strings up to specified length.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: a457b5e069021911972352be19761ef5e2f37c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a457b5e069021911972352be1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 13:13:51 2015 +0300 dwrite: Trace text strings up to specified length. --- dlls/dwrite/analyzer.c | 7 +++---- dlls/dwrite/main.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 85681b2..b8bd5a8 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -663,7 +663,6 @@ static HRESULT WINAPI dwritetextanalyzer_QueryInterface(IDWriteTextAnalyzer2 *if *obj = NULL; return E_NOINTERFACE; - } static ULONG WINAPI dwritetextanalyzer_AddRef(IDWriteTextAnalyzer2 *iface) @@ -1032,7 +1031,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphPlacements(IDWriteTextAnalyzer2 HRESULT hr; UINT32 i; - TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_w(text), + TRACE("(%s %p %p %u %p %p %u %p %.2f %d %d %p %s %p %p %u %p %p)\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyphs, glyph_props, glyph_count, fontface, emSize, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_len, feature_ranges, advances, offsets); @@ -1070,7 +1069,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite DWRITE_SCRIPT_ANALYSIS const* analysis, WCHAR const* locale, DWRITE_TYPOGRAPHIC_FEATURES const** features, UINT32 const* feature_range_lengths, UINT32 feature_ranges, FLOAT* glyph_advances, DWRITE_GLYPH_OFFSET* glyph_offsets) { - FIXME("(%s %p %p %u %p %p %u %p %f %f %p %d %d %d %p %s %p %p %u %p %p): stub\n", debugstr_w(text), + FIXME("(%s %p %p %u %p %p %u %p %f %f %p %d %d %d %p %s %p %p %u %p %p): stub\n", debugstr_wn(text, text_len), clustermap, props, text_len, glyph_indices, glyph_props, glyph_count, font_face, fontEmSize, pixels_per_dip, transform, use_gdi_natural, is_sideways, is_rtl, analysis, debugstr_w(locale), features, feature_range_lengths, feature_ranges, glyph_advances, glyph_offsets); @@ -1184,7 +1183,7 @@ static HRESULT WINAPI dwritetextanalyzer1_GetJustificationOpportunities(IDWriteT const WCHAR *text, const UINT16 *clustermap, const DWRITE_SHAPING_GLYPH_PROPERTIES *prop, DWRITE_JUSTIFICATION_OPPORTUNITY *jo) { FIXME("(%p %.2f %u %u %u %s %p %p %p): stub\n", face, font_em_size, sa.script, length, glyph_count, - debugstr_w(text), clustermap, prop, jo); + debugstr_wn(text, length), clustermap, prop, jo); return E_NOTIMPL; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 6a4ed91..3285f2d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1027,7 +1027,7 @@ static HRESULT WINAPI dwritefactory_CreateTextLayout(IDWriteFactory2 *iface, WCH UINT32 len, IDWriteTextFormat *format, FLOAT max_width, FLOAT max_height, IDWriteTextLayout **layout) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - TRACE("(%p)->(%s %u %p %f %f %p)\n", This, debugstr_w(string), len, format, max_width, max_height, layout); + TRACE("(%p)->(%s:%u %p %f %f %p)\n", This, debugstr_wn(string, len), len, format, max_width, max_height, layout); if (!format) return E_INVALIDARG; return create_textlayout(string, len, format, max_width, max_height, layout);

1 0

Stefan Dösinger : wined3d: Shadow format flags in wined3d_rendertarget_view.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 4fbaab20201b73b074abefd36b808a63571579ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbaab20201b73b074abefd36… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 23 11:28:15 2015 +0200 wined3d: Shadow format flags in wined3d_rendertarget_view. --- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/view.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d5a90c0..c249c9a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2344,8 +2344,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set. */ if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE]) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; - if (rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; + if (rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) { static unsigned int warned = 0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91f3485..b025dff 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -368,6 +368,7 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo static void state_blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; GLenum srcBlend, dstBlend; enum wined3d_blend d3d_blend; @@ -381,7 +382,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st /* Disable blending in all cases even without pixelshaders. * With blending on we could face a big performance penalty. * The d3d9 visual test confirms the behavior. */ - if (context->render_offscreen && !(rt_format->flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + if (context->render_offscreen && !(rt_fmt_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) { gl_info->gl_ops.gl.p_glDisable(GL_BLEND); checkGLcall("glDisable GL_BLEND"); @@ -4899,13 +4900,12 @@ static void psorigin(struct wined3d_context *context, const struct wined3d_state void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); - if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] - && rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + if (state->render_states[WINED3D_RS_SRGBWRITEENABLE] && rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1686e30..5596375 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3686,7 +3686,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d unsigned int i; DWORD ttff; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; - const struct wined3d_format *rt_format = state->fb->render_targets[0]->format; + unsigned int rt_fmt_flags = state->fb->render_targets[0]->format_flags; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; @@ -3902,7 +3902,7 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d } if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && state->render_states[WINED3D_RS_SRGBWRITEENABLE] - && rt_format->flags & WINED3DFMT_FLAG_SRGB_WRITE) + && rt_fmt_flags & WINED3DFMT_FLAG_SRGB_WRITE) { settings->sRGB_write = 1; } else { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 9cda64d..83cd772 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -101,6 +101,7 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie view->parent_ops = parent_ops; view->format = wined3d_get_format(gl_info, desc->format_id); + view->format_flags = view->format->flags; if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 782f54f..dd2a85a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2692,6 +2692,7 @@ struct wined3d_rendertarget_view const struct wined3d_parent_ops *parent_ops; const struct wined3d_format *format; + unsigned int format_flags; unsigned int sub_resource_idx; unsigned int buffer_offset;

1 0

Jianqiu Zhang : ntdll/tests: Add test for FileFsFullSizeInformation.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 4c41f2bb52b848135ceee6631702d721a082f19e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c41f2bb52b848135ceee6631… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Tue Apr 7 18:35:56 2015 +0800 ntdll/tests: Add test for FileFsFullSizeInformation. --- dlls/ntdll/tests/file.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d70ed6b..c02c926 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -84,6 +84,16 @@ static inline BOOL is_signaled( HANDLE obj ) return WaitForSingleObject( obj, 0 ) == WAIT_OBJECT_0; } +static const char* debugstr_longlong(ULONGLONG ll) +{ + static char str[17]; + if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) + sprintf(str, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); + else + sprintf(str, "%lx", (unsigned long)ll); + return str; +} + #define PIPENAME "\\\\.\\pipe\\ntdll_tests_file.c" #define TEST_BUF_LEN 3 @@ -1205,6 +1215,68 @@ static void test_iocp_fileio(HANDLE h) CloseHandle( hPipeClt ); } +static void test_file_full_size_information(void) +{ + IO_STATUS_BLOCK io; + FILE_FS_FULL_SIZE_INFORMATION ffsi; + FILE_FS_SIZE_INFORMATION fsi; + HANDLE h; + NTSTATUS res; + + if(!(h = create_temp_file(0))) return ; + + memset(&ffsi,0,sizeof(ffsi)); + memset(&fsi,0,sizeof(fsi)); + + /* Assume No Quota Settings configured on Wine Testbot */ + res = pNtQueryVolumeInformationFile(h, &io, &ffsi, sizeof ffsi, FileFsFullSizeInformation); + todo_wine ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + res = pNtQueryVolumeInformationFile(h, &io, &fsi, sizeof fsi, FileFsSizeInformation); + ok(res == STATUS_SUCCESS, "cannot get attributes, res %x\n", res); + + /* Test for FileFsSizeInformation */ + ok(fsi.TotalAllocationUnits.QuadPart > 0, + "[fsi] TotalAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart)); + ok(fsi.AvailableAllocationUnits.QuadPart > 0, + "[fsi] AvailableAllocationUnits expected positive, got 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart)); + + /* Assume file system is NTFS */ + ok(fsi.BytesPerSector == 512, "[fsi] BytesPerSector expected 512, got %d\n",fsi.BytesPerSector); + ok(fsi.SectorsPerAllocationUnit == 8, "[fsi] SectorsPerAllocationUnit expected 8, got %d\n",fsi.SectorsPerAllocationUnit); + + todo_wine + { + ok(ffsi.TotalAllocationUnits.QuadPart > 0, + "[ffsi] TotalAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart > 0, + "[ffsi] CallerAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + ok(ffsi.ActualAvailableAllocationUnits.QuadPart > 0, + "[ffsi] ActualAvailableAllocationUnits expected positive, got negative value 0x%s\n", + debugstr_longlong(ffsi.ActualAvailableAllocationUnits.QuadPart)); + ok(ffsi.TotalAllocationUnits.QuadPart == fsi.TotalAllocationUnits.QuadPart, + "[ffsi] TotalAllocationUnits error fsi:0x%s, ffsi:0x%s\n", + debugstr_longlong(fsi.TotalAllocationUnits.QuadPart), + debugstr_longlong(ffsi.TotalAllocationUnits.QuadPart)); + ok(ffsi.CallerAvailableAllocationUnits.QuadPart == fsi.AvailableAllocationUnits.QuadPart, + "[ffsi] CallerAvailableAllocationUnits error fsi:0x%s, ffsi: 0x%s\n", + debugstr_longlong(fsi.AvailableAllocationUnits.QuadPart), + debugstr_longlong(ffsi.CallerAvailableAllocationUnits.QuadPart)); + } + + /* Assume file system is NTFS */ + todo_wine + { + ok(ffsi.BytesPerSector == 512, "[ffsi] BytesPerSector expected 512, got %d\n",ffsi.BytesPerSector); + ok(ffsi.SectorsPerAllocationUnit == 8, "[ffsi] SectorsPerAllocationUnit expected 8, got %d\n",ffsi.SectorsPerAllocationUnit); + } + + CloseHandle( h ); +} + static void test_file_basic_information(void) { IO_STATUS_BLOCK io; @@ -2732,6 +2804,7 @@ START_TEST(file) test_file_all_information(); test_file_both_information(); test_file_name_information(); + test_file_full_size_information(); test_file_all_name_information(); test_file_disposition_information(); test_query_volume_information_file();

1 0

Erich E. Hoover : kernel32: Invalid console handles for new processes are 0, not INVALID_HANDLE_VALUE.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 4b559f02dd6ad61287fb79547c93105aaa2f7525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b559f02dd6ad61287fb79547… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Sat Jan 3 23:37:42 2015 -0700 kernel32: Invalid console handles for new processes are 0, not INVALID_HANDLE_VALUE. --- dlls/kernel32/console.c | 15 ++++++------ dlls/kernel32/environ.c | 12 +++++----- dlls/kernel32/tests/process.c | 53 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 303b638..14f1189 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3119,24 +3119,25 @@ BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) } /* convert value from server: - * + 0 => INVALID_HANDLE_VALUE + * + INVALID_HANDLE_VALUE => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE + * + 0 => TEB: 0, STARTUPINFO: INVALID_HANDLE_VALUE * + console handle needs to be mapped */ - if (!params->hStdInput) - params->hStdInput = INVALID_HANDLE_VALUE; + if (!params->hStdInput || params->hStdInput == INVALID_HANDLE_VALUE) + params->hStdInput = 0; else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) { params->hStdInput = console_handle_map(params->hStdInput); save_console_mode(params->hStdInput); } - if (!params->hStdOutput) - params->hStdOutput = INVALID_HANDLE_VALUE; + if (!params->hStdOutput || params->hStdOutput == INVALID_HANDLE_VALUE) + params->hStdOutput = 0; else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) params->hStdOutput = console_handle_map(params->hStdOutput); - if (!params->hStdError) - params->hStdError = INVALID_HANDLE_VALUE; + if (!params->hStdError || params->hStdError == INVALID_HANDLE_VALUE) + params->hStdError = 0; else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) params->hStdError = console_handle_map(params->hStdError); diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 57b6a1f..99bf706 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -464,9 +464,9 @@ void ENV_CopyStartupInformation(void) startup_infoW.wShowWindow = rupp->wShowWindow; startup_infoW.cbReserved2 = rupp->RuntimeInfo.MaximumLength; startup_infoW.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; - startup_infoW.hStdInput = rupp->hStdInput; - startup_infoW.hStdOutput = rupp->hStdOutput; - startup_infoW.hStdError = rupp->hStdError; + startup_infoW.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; + startup_infoW.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; + startup_infoW.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; startup_infoA.cb = sizeof(startup_infoA); startup_infoA.lpReserved = NULL; @@ -485,9 +485,9 @@ void ENV_CopyStartupInformation(void) startup_infoA.wShowWindow = rupp->wShowWindow; startup_infoA.cbReserved2 = rupp->RuntimeInfo.MaximumLength; startup_infoA.lpReserved2 = rupp->RuntimeInfo.MaximumLength ? (void*)rupp->RuntimeInfo.Buffer : NULL; - startup_infoA.hStdInput = rupp->hStdInput; - startup_infoA.hStdOutput = rupp->hStdOutput; - startup_infoA.hStdError = rupp->hStdError; + startup_infoA.hStdInput = rupp->hStdInput ? rupp->hStdInput : INVALID_HANDLE_VALUE; + startup_infoA.hStdOutput = rupp->hStdOutput ? rupp->hStdOutput : INVALID_HANDLE_VALUE; + startup_infoA.hStdError = rupp->hStdError ? rupp->hStdError : INVALID_HANDLE_VALUE; RtlReleasePebLock(); } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c63d6b1..4f7c58d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -57,7 +57,7 @@ wine_dbgstr_w(expected), wine_dbgstr_w(value)); \ } while (0) -static HINSTANCE hkernel32; +static HINSTANCE hkernel32, hntdll; static void (WINAPI *pGetNativeSystemInfo)(LPSYSTEM_INFO); static BOOL (WINAPI *pGetSystemRegistryQuota)(PDWORD, PDWORD); static BOOL (WINAPI *pIsWow64Process)(HANDLE,PBOOL); @@ -66,6 +66,7 @@ static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); static DWORD (WINAPI *pK32GetProcessImageFileNameA)(HANDLE,LPSTR,DWORD); +static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static HANDLE (WINAPI *pCreateJobObjectW)(LPSECURITY_ATTRIBUTES sa, LPCWSTR name); static BOOL (WINAPI *pAssignProcessToJobObject)(HANDLE job, HANDLE process); static BOOL (WINAPI *pIsProcessInJob)(HANDLE process, HANDLE job, PBOOL result); @@ -208,6 +209,8 @@ static BOOL init(void) if ((p = strrchr(exename, '/')) != NULL) exename = p + 1; hkernel32 = GetModuleHandleA("kernel32"); + hntdll = GetModuleHandleA("ntdll.dll"); + pGetNativeSystemInfo = (void *) GetProcAddress(hkernel32, "GetNativeSystemInfo"); pGetSystemRegistryQuota = (void *) GetProcAddress(hkernel32, "GetSystemRegistryQuota"); pIsWow64Process = (void *) GetProcAddress(hkernel32, "IsWow64Process"); @@ -216,6 +219,7 @@ static BOOL init(void) pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); pK32GetProcessImageFileNameA = (void *) GetProcAddress(hkernel32, "K32GetProcessImageFileNameA"); + pNtCurrentTeb = (void *)GetProcAddress(hntdll, "NtCurrentTeb"); pCreateJobObjectW = (void *)GetProcAddress(hkernel32, "CreateJobObjectW"); pAssignProcessToJobObject = (void *)GetProcAddress(hkernel32, "AssignProcessToJobObject"); pIsProcessInJob = (void *)GetProcAddress(hkernel32, "IsProcessInJob"); @@ -291,6 +295,16 @@ static void doChild(const char* file, const char* option) siA.dwFlags, siA.wShowWindow, (DWORD_PTR)siA.hStdInput, (DWORD_PTR)siA.hStdOutput, (DWORD_PTR)siA.hStdError); + if (pNtCurrentTeb) + { + RTL_USER_PROCESS_PARAMETERS *params = pNtCurrentTeb()->Peb->ProcessParameters; + + /* check the console handles in the TEB */ + childPrintf(hFile, "[TEB]\nhStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", + (DWORD_PTR)params->hStdInput, (DWORD_PTR)params->hStdOutput, + (DWORD_PTR)params->hStdError); + } + /* since GetStartupInfoW is only implemented in win2k, * zero out before calling so we can notice the difference */ @@ -2642,6 +2656,42 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "SetInformationJobObject error %u\n", GetLastError()); } +void test_StartupNoConsole(void) +{ +#ifndef _WIN64 + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + DWORD code; + + if (!pNtCurrentTeb) + { + win_skip( "NtCurrentTeb not supported\n" ); + return; + } + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, &startup, + &info), "CreateProcess\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + ok(GetExitCodeProcess(info.hProcess, &code), "Getting exit code\n"); + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("StartupInfoA", "hStdInput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdOutput", (UINT)INVALID_HANDLE_VALUE); + okChildInt("StartupInfoA", "hStdError", (UINT)INVALID_HANDLE_VALUE); + okChildInt("TEB", "hStdInput", 0); + okChildInt("TEB", "hStdOutput", 0); + okChildInt("TEB", "hStdError", 0); + release_memory(); + DeleteFileA(resfile); +#endif +} + START_TEST(process) { HANDLE job; @@ -2690,6 +2740,7 @@ START_TEST(process) test_SystemInfo(); test_RegistryQuota(); test_DuplicateHandle(); + test_StartupNoConsole(); /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Stefan Leichter : wtsapi32: Add stub for WTSEnableChildSessions.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 0c525e79c45620cce8329df7633c275564efa12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c525e79c45620cce8329df76… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Apr 22 20:48:48 2015 +0200 wtsapi32: Add stub for WTSEnableChildSessions. --- dlls/wtsapi32/wtsapi32.c | 9 +++++++++ dlls/wtsapi32/wtsapi32.spec | 1 + include/wtsapi32.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 79d5a7f..c668604 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -62,6 +62,15 @@ BOOL WINAPI WTSDisconnectSession(HANDLE hServer, DWORD SessionId, BOOL bWait) } /************************************************************ + * WTSEnableChildSessions (WTSAPI32.@) + */ +BOOL WINAPI WTSEnableChildSessions(BOOL enable) +{ + FIXME("Stub %d\n", enable); + return TRUE; +} + +/************************************************************ * WTSEnumerateProcessesA (WTSAPI32.@) */ BOOL WINAPI WTSEnumerateProcessesA(HANDLE hServer, DWORD Reserved, DWORD Version, diff --git a/dlls/wtsapi32/wtsapi32.spec b/dlls/wtsapi32/wtsapi32.spec index d94ef88..2b01741 100644 --- a/dlls/wtsapi32/wtsapi32.spec +++ b/dlls/wtsapi32/wtsapi32.spec @@ -2,6 +2,7 @@ @ stdcall WTSConnectSessionA(long long ptr long) @ stdcall WTSConnectSessionW(long long ptr long) @ stdcall WTSDisconnectSession(long long long) +@ stdcall WTSEnableChildSessions(long) @ stdcall WTSEnumerateProcessesA(long long long ptr ptr) @ stdcall WTSEnumerateProcessesW(long long long ptr ptr) @ stdcall WTSEnumerateServersA(ptr long long ptr ptr) diff --git a/include/wtsapi32.h b/include/wtsapi32.h index d00a699..304a418 100644 --- a/include/wtsapi32.h +++ b/include/wtsapi32.h @@ -142,6 +142,7 @@ BOOL WINAPI WTSConnectSessionA(ULONG, ULONG, PSTR, BOOL); BOOL WINAPI WTSConnectSessionW(ULONG, ULONG, PWSTR, BOOL); #define WTSConnectSession WINELIB_NAME_AW(WTSConnectSession) BOOL WINAPI WTSDisconnectSession(HANDLE, DWORD, BOOL); +BOOL WINAPI WTSEnableChildSessions(BOOL); BOOL WINAPI WTSEnumerateProcessesA(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOA *, DWORD *); BOOL WINAPI WTSEnumerateProcessesW(HANDLE, DWORD, DWORD, PWTS_PROCESS_INFOW *, DWORD *); #define WTSEnumerateProcesses WINELIB_NAME_AW(WTSEnumerateProcesses)

1 0

Nikolay Sivov : msdmo: Next() method should use CoTaskMemAlloc() for returned names.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 3f7c47118a9f3adc14c28fe728de576e51a76d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7c47118a9f3adc14c28fe72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 23 09:40:15 2015 +0300 msdmo: Next() method should use CoTaskMemAlloc() for returned names. --- dlls/msdmo/dmoreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f42bc56..f9bf9b3 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -636,7 +636,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); if (ERROR_SUCCESS == ret) { - Names[count] = HeapAlloc(GetProcessHeap(), 0, (strlenW(szValue) + 1) * sizeof(WCHAR)); + Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); if (Names[count]) strcpyW(Names[count], szValue); }

1 0

Matteo Bruni : ddraw/tests: Fix ddraw2 test_lighting() cleanup code.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 969e72396dfe5217c8a984b8dfa22a027f90aad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969e72396dfe5217c8a984b8d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 22 19:30:32 2015 +0200 ddraw/tests: Fix ddraw2 test_lighting() cleanup code. --- dlls/ddraw/tests/ddraw2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6ed3b0e..11248f5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6639,6 +6639,8 @@ static void test_lighting(void) ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); } + hr = IDirect3DViewport2_DeleteLight(viewport, light); + ok(SUCCEEDED(hr), "Failed to remove a light from the viewport, hr %#x.\n", hr); IDirect3DLight_Release(light); destroy_material(material); destroy_viewport(device, viewport); @@ -6646,7 +6648,7 @@ static void test_lighting(void) refcount = IDirect3DDevice2_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D2_Release(d3d); - IDirectDraw2_Release(ddraw); + refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Ddraw object has %u references left.\n", refcount); DestroyWindow(window); }

1 0

Francois Gouget : wined3d: Make glsl_vertex_pipe_view() static.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 6f6dfe91d6d04e9a0ba11070b1def3e583ff84c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6dfe91d6d04e9a0ba11070b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 23 10:35:04 2015 +0200 wined3d: Make glsl_vertex_pipe_view() static. --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 655bb33..f1bf0a3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7195,7 +7195,7 @@ static void glsl_vertex_pipe_world(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MODELVIEW; } -void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void glsl_vertex_pipe_view(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_light_info *light = NULL;

1 0

Francois Gouget : ws2_32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 9561037fe0065f6f7878681ca1d925dd81a373c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9561037fe0065f6f7878681ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 23 10:34:59 2015 +0200 ws2_32/tests: Add a trailing '\n' to an ok() call. --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index aa06a08..f31539f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4300,7 +4300,7 @@ static void test_getsockname(void) strcpy(ipstr, inet_ntoa(sa_get.sin_addr)); trace("testing bind on interface %s\n", ipstr); ok(sa_get.sin_addr.s_addr == sa_set.sin_addr.s_addr, - "address does not match: %s != %s", ipstr, inet_ntoa(sa_set.sin_addr)); + "address does not match: %s != %s\n", ipstr, inet_ntoa(sa_set.sin_addr)); closesocket(sock); }

1 0

Aric Stewart : server: Do not replace focus and active windows with NULL on thread_attach_input.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: bed7e69a14489998ef943b76022fd9520018cdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bed7e69a14489998ef943b760… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Apr 20 13:40:26 2015 -0500 server: Do not replace focus and active windows with NULL on thread_attach_input. --- dlls/user32/tests/input.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/msg.c | 3 +- server/queue.c | 6 +++ 3 files changed, 140 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index faf9c8c..78f4d8b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2025,6 +2025,138 @@ static void test_Input_mouse(void) DestroyWindow(button_win); } + +static LRESULT WINAPI MsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +struct wnd_event +{ + HWND hwnd; + HANDLE start_event; + BOOL setWindows; +}; + +static DWORD WINAPI thread_proc(void *param) +{ + MSG msg; + struct wnd_event *wnd_event = param; + + wnd_event->hwnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event->hwnd != 0, "Failed to create overlapped window\n"); + + if (wnd_event->setWindows) + { + SetFocus(wnd_event->hwnd); + SetActiveWindow(wnd_event->hwnd); + } + + SetEvent(wnd_event->start_event); + + while (GetMessageA(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + + return 0; +} + +static void test_attach_input(void) +{ + HANDLE hThread; + HWND ourWnd; + DWORD ret, tid; + struct wnd_event wnd_event; + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = MsgCheckProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorW( NULL, (LPCWSTR)IDC_ARROW); + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.lpszMenuName = NULL; + cls.lpszClassName = "TestWindowClass"; + if(!RegisterClassA(&cls)) return; + + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.setWindows = FALSE; + if (!wnd_event.start_event) + { + win_skip("skipping interthread message test under win9x\n"); + return; + } + + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + ourWnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, 0, 0, 0, NULL); + ok(ourWnd!= 0, "failed to create ourWnd window\n"); + + SetFocus(ourWnd); + SetActiveWindow(ourWnd); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == ourWnd, "expected active %p, got %p\n", ourWnd, GetActiveWindow()); + ok(GetFocus() == ourWnd, "expected focus %p, got %p\n", ourWnd, GetFocus()); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); + + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + wnd_event.setWindows = TRUE; + if (!wnd_event.start_event) + { + win_skip("skipping interthread message test under win9x\n"); + return; + } + + hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); + ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); + + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(wnd_event.start_event); + + ourWnd = CreateWindowExA(0, "TestWindowClass", "window caption text", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(ourWnd!= 0, "failed to create ourWnd window\n"); + + SetFocus(ourWnd); + SetActiveWindow(ourWnd); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ok(GetActiveWindow() == wnd_event.hwnd, "expected active %p, got %p\n", wnd_event.hwnd, GetActiveWindow()); + ok(GetFocus() == wnd_event.hwnd, "expected focus %p, got %p\n", wnd_event.hwnd, GetFocus()); + + ret = AttachThreadInput(GetCurrentThreadId(), tid, FALSE); + ok(ret, "AttachThreadInput error %d\n", GetLastError()); + + ret = PostMessageA(wnd_event.hwnd, WM_QUIT, 0, 0); + ok(ret, "PostMessageA(WM_QUIT) error %d\n", GetLastError()); + + ok(WaitForSingleObject(hThread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hThread); +} + START_TEST(input) { init_function_pointers(); @@ -2046,6 +2178,7 @@ START_TEST(input) test_get_async_key_state(); test_keyboard_layout_name(); test_key_names(); + test_attach_input(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 50e1e2b..5ef3840 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14238,10 +14238,9 @@ todo_wine ret = AttachThreadInput(GetCurrentThreadId(), tid, TRUE); ok(ret, "AttachThreadInput error %d\n", GetLastError()); -todo_wine { ok(GetActiveWindow() == parent, "expected active %p, got %p\n", parent, GetActiveWindow()); ok(GetFocus() == parent, "expected focus %p, got %p\n", parent, GetFocus()); -} + flush_events(); flush_sequence(); diff --git a/server/queue.c b/server/queue.c index 912df3a..3c1368a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1063,6 +1063,12 @@ int attach_thread_input( struct thread *thread_from, struct thread *thread_to ) } release_object( desktop ); + if (thread_from->queue) + { + if (!input->focus) input->focus = thread_from->queue->input->focus; + if (!input->active) input->active = thread_from->queue->input->active; + } + ret = assign_thread_input( thread_from, input ); if (ret) memset( input->keystate, 0, sizeof(input->keystate) ); release_object( input );

1 0

Matteo Bruni : ddraw: Cleanup d3d_light_SetLight() a bit.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: e7548fc4215214693027c8d817e6915d0230cd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7548fc4215214693027c8d81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 22 19:30:33 2015 +0200 ddraw: Cleanup d3d_light_SetLight() a bit. --- dlls/ddraw/light.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index c632c32..a3660a3 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -163,12 +163,9 @@ static HRESULT WINAPI d3d_light_Initialize(IDirect3DLight *iface, IDirect3D *d3d return D3D_OK; } -static const float zero_value[] = { - 0.0, 0.0, 0.0, 0.0 -}; - static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) { + static const D3DCOLORVALUE zero_value = {{0.0f}, {0.0f}, {0.0f}, {0.0f}}; struct d3d_light *light = impl_from_IDirect3DLight(iface); DWORD flags = data->dwSize >= sizeof(D3DLIGHT2) ? ((D3DLIGHT2 *)data)->dwFlags : D3DLIGHT_ACTIVE; D3DLIGHT7 *light7 = &light->light7; @@ -184,10 +181,10 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (!(flags & D3DLIGHT_NO_SPECULAR)) - light7->dcvSpecular = data->dcvColor; + if (flags & D3DLIGHT_NO_SPECULAR) + light7->dcvSpecular = zero_value; else - light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; + light7->dcvSpecular = data->dcvColor; light7->dcvAmbient = data->dcvColor; light7->dvPosition = data->dvPosition; light7->dvDirection = data->dvDirection; @@ -200,7 +197,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) light7->dvPhi = data->dvPhi; wined3d_mutex_lock(); - memcpy(&light->light, data, sizeof(D3DLIGHT)); + memcpy(&light->light, data, sizeof(*data)); if (!(light->light.dwFlags & D3DLIGHT_ACTIVE) && flags & D3DLIGHT_ACTIVE) light_activate(light); else if (light->light.dwFlags & D3DLIGHT_ACTIVE && !(flags & D3DLIGHT_ACTIVE))

1 0

Nikolay Sivov : msdmo: Remove a helper only used once.
by Alexandre Julliard April 23, 2015

April 23, 2015

Module: wine Branch: master Commit: 65bf359d6faed5e75a0806223780bd50a6094789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bf359d6faed5e75a0806223… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 22 23:06:35 2015 +0300 msdmo: Remove a helper only used once. --- dlls/msdmo/dmoreg.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 4bd7ab4..f42bc56 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -19,6 +19,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -359,23 +361,6 @@ HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) } /************************************************************************** -* IEnumDMOImpl_Destructor -*/ -static BOOL IEnumDMOImpl_Destructor(IEnumDMOImpl* This) -{ - TRACE("%p\n", This); - - if (This->hkey) - RegCloseKey(This->hkey); - - HeapFree(GetProcessHeap(), 0, This->pInTypes); - HeapFree(GetProcessHeap(), 0, This->pOutTypes); - - return TRUE; -} - - -/************************************************************************** * IEnumDMO_Constructor */ static HRESULT IEnumDMO_Constructor( @@ -450,10 +435,7 @@ static HRESULT IEnumDMO_Constructor( lerr: if (FAILED(hr)) - { - IEnumDMOImpl_Destructor(lpedmo); - HeapFree(GetProcessHeap(), 0, lpedmo); - } + IEnumDMO_Release(&lpedmo->IEnumDMO_iface); else { TRACE("returning %p\n", lpedmo); @@ -489,7 +471,7 @@ static HRESULT WINAPI IEnumDMO_fnQueryInterface(IEnumDMO* iface, REFIID riid, vo IsEqualIID(riid, &IID_IUnknown)) { *ppvObj = iface; - IEnumDMO_fnAddRef(iface); + IEnumDMO_AddRef(iface); } return *ppvObj ? S_OK : E_NOINTERFACE; @@ -507,8 +489,11 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) if (!refCount) { - IEnumDMOImpl_Destructor(This); - HeapFree(GetProcessHeap(),0,This); + if (This->hkey) + RegCloseKey(This->hkey); + HeapFree(GetProcessHeap(), 0, This->pInTypes); + HeapFree(GetProcessHeap(), 0, This->pOutTypes); + HeapFree(GetProcessHeap(), 0, This); } return refCount; }

1 0

Jacek Caban : inseng: Added IInstallEngine2 stub.
by Alexandre Julliard April 22, 2015

April 22, 2015

Module: wine Branch: master Commit: bdf8c7a148fc78896c798d0ef2f99db87cd3c3f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf8c7a148fc78896c798d0ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 22 15:48:46 2015 +0200 inseng: Added IInstallEngine2 stub. --- dlls/inseng/inseng_main.c | 291 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 284 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bdf8c7a148fc78896c798…

1 0