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

Matteo Bruni : wined3d: Get rid of WINED3D_GLSL_SAMPLE_NPOT.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 50dc7b95d188e87a40d00021813c00f4f4f61e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50dc7b95d188e87a40d000218… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:23 2016 +0100 wined3d: Get rid of WINED3D_GLSL_SAMPLE_NPOT. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 53a9191..717b9f8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -45,11 +45,10 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_PROJECTED 0x01 -#define WINED3D_GLSL_SAMPLE_NPOT 0x02 -#define WINED3D_GLSL_SAMPLE_LOD 0x04 -#define WINED3D_GLSL_SAMPLE_GRAD 0x08 -#define WINED3D_GLSL_SAMPLE_LOAD 0x10 -#define WINED3D_GLSL_SAMPLE_OFFSET 0x20 +#define WINED3D_GLSL_SAMPLE_LOD 0x02 +#define WINED3D_GLSL_SAMPLE_GRAD 0x04 +#define WINED3D_GLSL_SAMPLE_LOAD 0x08 +#define WINED3D_GLSL_SAMPLE_OFFSET 0x10 struct glsl_dst_param { @@ -2689,7 +2688,9 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context const struct wined3d_gl_info *gl_info = ctx->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; - BOOL texrect = flags & WINED3D_GLSL_SAMPLE_NPOT && gl_info->supported[ARB_TEXTURE_RECTANGLE]; + BOOL texrect = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL + && priv->cur_ps_args->np2_fixup & (1u << resource_idx) + && gl_info->supported[ARB_TEXTURE_RECTANGLE]; BOOL lod = flags & WINED3D_GLSL_SAMPLE_LOD; BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; BOOL offset = flags & WINED3D_GLSL_SAMPLE_OFFSET; @@ -4222,9 +4223,6 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) } } - if (priv->cur_ps_args->np2_fixup & (1u << resource_idx)) - sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; - shader_glsl_get_sample_function(ins->ctx, resource_idx, resource_idx, sample_flags, &sample_function); mask |= sample_function.coord_mask; sample_function.coord_mask = mask; @@ -4263,11 +4261,9 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, dx_param, dy_param; - DWORD sample_flags = WINED3D_GLSL_SAMPLE_GRAD; struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4]) { @@ -4277,10 +4273,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) } sampler_idx = ins->src[1].reg.idx[0].offset; - if (priv->cur_ps_args->np2_fixup & (1u << sampler_idx)) - sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; - shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, sample_flags, &sample_function); + shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, WINED3D_GLSL_SAMPLE_GRAD, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[2], sample_function.coord_mask, &dx_param); shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dy_param); @@ -4294,18 +4288,13 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, lod_param; - DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; sampler_idx = ins->src[1].reg.idx[0].offset; - if (ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && priv->cur_ps_args->np2_fixup & (1u << sampler_idx)) - sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; - shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, sample_flags, &sample_function); + shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, WINED3D_GLSL_SAMPLE_LOD, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param);

1 0

Matteo Bruni : wined3d: Clamp diffuse and specular color in GLSL vertex ffp replacement for core profile.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 5e7a015b52fc3b1d635e4b5975a1ecaddfa8ec32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7a015b52fc3b1d635e4b597… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:24 2016 +0100 wined3d: Clamp diffuse and specular color in GLSL vertex ffp replacement for core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 717b9f8..9e6a631 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6180,6 +6180,11 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr shader_addline(buffer, "gl_FrontColor = ffp_varying_diffuse;\n"); shader_addline(buffer, "gl_FrontSecondaryColor = ffp_varying_specular;\n"); } + else + { + shader_addline(buffer, "ffp_varying_diffuse = clamp(ffp_varying_diffuse, 0.0, 1.0);\n"); + shader_addline(buffer, "ffp_varying_specular = clamp(ffp_varying_specular, 0.0, 1.0);\n"); + } for (i = 0; i < MAX_TEXTURES; ++i) {

1 0

Matteo Bruni : wined3d: Don' t flag vertex color clamping for changes on core profile.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 618e825e57d65e149fa9822dc644122268e2dbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=618e825e57d65e149fa9822dc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:25 2016 +0100 wined3d: Don't flag vertex color clamping for changes on core profile. glClampColorARB(GL_CLAMP_VERTEX_COLOR) is not supported on core profile and we can't use builtin color varyings there anyway. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e6a631..7c367e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7345,14 +7345,24 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const pshader ? min(pshader->limits->constant_float, gl_info->limits.glsl_ps_float_constants) : 0); checkGLcall("Find glsl program uniform locations"); - if (pshader && pshader->reg_maps.shader_version.major >= 3 - && pshader->u.ps.declared_in_count > vec4_varyings(3, gl_info)) + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { - TRACE("Shader %d needs vertex color clamping disabled.\n", program_id); - entry->vs.vertex_color_clamp = GL_FALSE; + if (pshader && pshader->reg_maps.shader_version.major >= 3 + && pshader->u.ps.declared_in_count > vec4_varyings(3, gl_info)) + { + TRACE("Shader %d needs vertex color clamping disabled.\n", program_id); + entry->vs.vertex_color_clamp = GL_FALSE; + } + else + { + entry->vs.vertex_color_clamp = GL_FIXED_ONLY_ARB; + } } else { + /* With core profile we never change vertex_color_clamp from + * GL_FIXED_ONLY_MODE (which is also the initial value) so we never call + * glClampColorARB(). */ entry->vs.vertex_color_clamp = GL_FIXED_ONLY_ARB; }

1 0

Matteo Bruni : wined3d: Don't call glClampColorARB() on core profile.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 9ba6784d22ee054b5cc692af84ee37b7b0e494f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba6784d22ee054b5cc692af8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:26 2016 +0100 wined3d: Don't call glClampColorARB() on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7c367e4..2dd7b29 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7668,7 +7668,7 @@ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *conte priv->vertex_pipe->vp_enable(gl_info, FALSE); priv->fragment_pipe->enable_extension(gl_info, FALSE); - if (gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) { GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, GL_FIXED_ONLY_ARB)); checkGLcall("glClampColorARB");

1 0

Matteo Bruni : d3d9/tests: Add a test for color varyings clamping.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 05f57dae24c201bf3ed98a76a5aa79cd704f65ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f57dae24c201bf3ed98a76a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Mar 27 23:14:17 2016 +0200 d3d9/tests: Add a test for color varyings clamping. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 225 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05f57dae24c201bf3ed98…

1 0

Aaryaman Vasishta : d3drm: Fix signature macro of IDirect3DRM*:: CreateObject.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: f3dcf19bd3220d3f7ad8fdaa12e5abd3b6b9ca85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3dcf19bd3220d3f7ad8fdaa1… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Mar 27 01:52:16 2016 +0530 d3drm: Fix signature macro of IDirect3DRM*::CreateObject. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3drm.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index e1e0d23..126695c 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -110,7 +110,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) #define IDirect3DRM_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM methods ***/ -#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -148,7 +148,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) #define IDirect3DRM_AddRef(p) (p)->AddRef() #define IDirect3DRM_Release(p) (p)->Release() /*** IDirect3DRM methods ***/ -#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a) @@ -251,7 +251,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM2_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM2 methods ***/ -#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM2_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM2_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM2_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -290,7 +290,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_AddRef(p) (p)->AddRef() #define IDirect3DRM2_Release(p) (p)->Release() /*** IDirect3DRM2 methods ***/ -#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM2_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM2_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM2_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a) @@ -399,7 +399,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM3_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM3 methods ***/ -#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM3_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM3_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM3_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -443,7 +443,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_AddRef(p) (p)->AddRef() #define IDirect3DRM3_Release(p) (p)->Release() /*** IDirect3DRM3 methods ***/ -#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM3_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM3_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM3_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a)

1 0

Nikolay Sivov : include: Added IDXGISurface1 definition.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 912cd6c4b6aa7c03d578d08e074d8475abb7fb7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=912cd6c4b6aa7c03d578d08e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 11:40:11 2016 +0300 include: Added IDXGISurface1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index cc98970..c7ba584 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -227,6 +227,22 @@ interface IDXGISurface : IDXGIDeviceSubObject [ object, local, + uuid(4ae63092-6327-4c1b-80ae-bfe12ea32b86) +] +interface IDXGISurface1 : IDXGISurface +{ + HRESULT GetDC( + [in] BOOL discard, + [out] HDC *hdc + ); + HRESULT ReleaseDC( + [in] RECT *dirty_rect + ); +} + +[ + object, + local, uuid(ae02eedb-c735-4690-8d52-5a8dc20213aa) ] interface IDXGIOutput : IDXGIObject

1 0

Nikolay Sivov : msxml3/mxwriter: No need to use contiguous allocation in case of BSTR output.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 8147f9001d03258deb9929dd838b98fdff03ad94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8147f9001d03258deb9929dd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 17:23:00 2016 +0300 msxml3/mxwriter: No need to use contiguous allocation in case of BSTR output. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 114 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 106 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index cc6c0b5..d6f23e2 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -34,6 +34,7 @@ #include "msxml6.h" #include "wine/debug.h" +#include "wine/list.h" #include "msxml_private.h" @@ -121,6 +122,7 @@ typedef enum typedef struct { + struct list entry; char *data; unsigned int allocated; unsigned int written; @@ -131,6 +133,8 @@ typedef struct encoded_buffer utf16; encoded_buffer encoded; UINT code_page; + UINT utf16_total; /* total number of bytes written since last buffer reinitialization */ + struct list blocks; /* only used when output was not set, for BSTR case */ } output_buffer; typedef struct @@ -304,14 +308,25 @@ static HRESULT init_output_buffer(xml_encoding encoding, output_buffer *buffer) } else memset(&buffer->encoded, 0, sizeof(buffer->encoded)); + list_init(&buffer->blocks); + buffer->utf16_total = 0; return S_OK; } static void free_output_buffer(output_buffer *buffer) { + encoded_buffer *cur, *cur2; + free_encoded_buffer(&buffer->encoded); free_encoded_buffer(&buffer->utf16); + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &buffer->blocks, encoded_buffer, entry) + { + list_remove(&cur->entry); + free_encoded_buffer(cur); + heap_free(cur); + } } static void grow_buffer(encoded_buffer *buffer, int length) @@ -331,6 +346,58 @@ static HRESULT write_output_buffer_mode(mxwriter *writer, output_mode mode, cons int length; char *ptr; + /* When writer has no output set we have to accumulate everything to return it later in a form of BSTR. + To achieve that: + + - fill a buffer already allocated as part of output buffer; + - when current buffer is full, allocate another one and switch to it; buffers themselves never grow, + but are linked together, with head pointing to first allocated buffer after initial one got filled; + - later during get_output() contents are concatenated by copying one after another to destination BSTR buffer, + that's returned to the client. */ + if (!writer->dest && (mode & (OutputBuffer_Native | OutputBuffer_Both))) + { + encoded_buffer *buff; + + /* select last used block */ + if (list_empty(&buffer->blocks)) + buff = &buffer->utf16; + else + buff = LIST_ENTRY(list_tail(&buffer->blocks), encoded_buffer, entry); + + length = (len == -1 ? strlenW(data) : len) * sizeof(WCHAR); + + while (length) + { + unsigned int avail = buff->allocated - buff->written; + unsigned int written = min(avail, length); + + if (avail) + { + memcpy(buff->data + buff->written, data, written); + buff->written += written; + buffer->utf16_total += written; + length -= written; + } + + /* alloc new block if needed and retry */ + if (length) + { + encoded_buffer *next = heap_alloc(sizeof(*next)); + HRESULT hr; + + if (FAILED(hr = init_encoded_buffer(next))) { + heap_free(next); + return hr; + } + + list_add_tail(&buffer->blocks, &next->entry); + buff = next; + } + } + + return S_OK; + } + if (mode & (OutputBuffer_Encoded | OutputBuffer_Both)) { if (buffer->code_page != ~0) { @@ -378,13 +445,25 @@ static HRESULT write_output_buffer_quoted(mxwriter *writer, const WCHAR *data, i } /* frees buffer data, reallocates with a default lengths */ -static void close_output_buffer(mxwriter *This) +static void close_output_buffer(mxwriter *writer) { - heap_free(This->buffer.utf16.data); - heap_free(This->buffer.encoded.data); - init_encoded_buffer(&This->buffer.utf16); - init_encoded_buffer(&This->buffer.encoded); - get_code_page(This->xml_enc, &This->buffer.code_page); + encoded_buffer *cur, *cur2; + + heap_free(writer->buffer.utf16.data); + heap_free(writer->buffer.encoded.data); + + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &writer->buffer.blocks, encoded_buffer, entry) + { + list_remove(&cur->entry); + free_encoded_buffer(cur); + heap_free(cur); + } + + init_encoded_buffer(&writer->buffer.utf16); + init_encoded_buffer(&writer->buffer.encoded); + get_code_page(writer->xml_enc, &writer->buffer.code_page); + writer->buffer.utf16_total = 0; + list_init(&writer->buffer.blocks); } /* Escapes special characters like: @@ -867,12 +946,31 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) if (!This->dest) { - HRESULT hr = flush_output_buffer(This); + encoded_buffer *buff; + char *dest_ptr; + HRESULT hr; + + hr = flush_output_buffer(This); if (FAILED(hr)) return hr; V_VT(dest) = VT_BSTR; - V_BSTR(dest) = SysAllocString((WCHAR*)This->buffer.utf16.data); + V_BSTR(dest) = SysAllocStringLen(NULL, This->buffer.utf16_total / sizeof(WCHAR)); + + dest_ptr = (char*)V_BSTR(dest); + buff = &This->buffer.utf16; + + if (buff->written) + { + memcpy(dest_ptr, buff->data, buff->written); + dest_ptr += buff->written; + } + + LIST_FOR_EACH_ENTRY(buff, &This->buffer.blocks, encoded_buffer, entry) + { + memcpy(dest_ptr, buff->data, buff->written); + dest_ptr += buff->written; + } return S_OK; }

1 0

Nikolay Sivov : msxml3/mxwriter: Handle allocation failure in get_output() .
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 67efaac30f228aa924bff1642d9b32d83ecd734d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67efaac30f228aa924bff1642… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 17:23:01 2016 +0300 msxml3/mxwriter: Handle allocation failure in get_output(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index d6f23e2..23a8fd1 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -944,7 +944,14 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) if (!dest) return E_POINTER; - if (!This->dest) + if (This->dest) + { + /* we only support IStream output so far */ + V_VT(dest) = VT_UNKNOWN; + V_UNKNOWN(dest) = (IUnknown*)This->dest; + IStream_AddRef(This->dest); + } + else { encoded_buffer *buff; char *dest_ptr; @@ -956,6 +963,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) V_VT(dest) = VT_BSTR; V_BSTR(dest) = SysAllocStringLen(NULL, This->buffer.utf16_total / sizeof(WCHAR)); + if (!V_BSTR(dest)) + return E_OUTOFMEMORY; dest_ptr = (char*)V_BSTR(dest); buff = &This->buffer.utf16; @@ -971,15 +980,8 @@ static HRESULT WINAPI mxwriter_get_output(IMXWriter *iface, VARIANT *dest) memcpy(dest_ptr, buff->data, buff->written); dest_ptr += buff->written; } - - return S_OK; } - /* we only support IStream output so far */ - V_VT(dest) = VT_UNKNOWN; - V_UNKNOWN(dest) = (IUnknown*)This->dest; - IStream_AddRef(This->dest); - return S_OK; }

1 0

Nikolay Sivov : msxml3/mxwriter: Flush internal buffer as soon as it' s filled.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 737d90c21c8de535642dc6969c16662cb9c48202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737d90c21c8de535642dc6969… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 27 17:23:02 2016 +0300 msxml3/mxwriter: Flush internal buffer as soon as it's filled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 226 +++++++++++++++++++++++-------------------------- 1 file changed, 108 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=737d90c21c8de535642dc…

1 0