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