January 2017 - Wine-Commits

Henri Verbeet : wined3d: Do not preload the buffer in wined3d_buffer_unmap ().
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 6fd212818d6ade9d571aba1566b5e56ce594b01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd212818d6ade9d571aba156… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:14 2017 +0100 wined3d: Do not preload the buffer in wined3d_buffer_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 6 +----- dlls/wined3d/context.c | 6 +++++- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1fdf0a3..de5ab17 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -879,7 +879,7 @@ drop_query: This->flags &= ~WINED3D_BUFFER_APPLESYNC; } -void buffer_mark_used(struct wined3d_buffer *buffer) +static void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_DISCARD; } @@ -1188,10 +1188,6 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) buffer_clear_dirty_areas(buffer); buffer->map_ptr = NULL; } - else if (buffer->flags & WINED3D_BUFFER_HASDESC) - { - wined3d_resource_preload(&buffer->resource); - } } HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cd0057e..fdf684e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3505,8 +3505,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) { if (map & 1) - buffer_mark_used(state->streams[context->stream_info.elements[i].stream_idx].buffer); + wined3d_buffer_load(state->streams[context->stream_info.elements[i].stream_idx].buffer, + context, state); } + /* Loading the buffers above may have invalidated the stream info. */ + if (isStateDirty(context, STATE_STREAMSRC)) + context_update_stream_info(context, state); } if (state->index_buffer) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1cae2fe..9c32f2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3239,7 +3239,6 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Implement wined3d_buffer_upload_data() on top of wined3d_buffer_upload_ranges().
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: e2dbbec1af8ae2ea8813148d56e14c8c211ee334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2dbbec1af8ae2ea8813148d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:12 2017 +0100 wined3d: Implement wined3d_buffer_upload_data() on top of wined3d_buffer_upload_ranges(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 30 +++++++++++------------------- dlls/wined3d/device.c | 13 ++++++++++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index add6052..4da1a3b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -532,7 +532,7 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) /* Context activation is done by the caller. */ static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int range_count, const struct wined3d_map_range *ranges) + const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; @@ -543,7 +543,7 @@ static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct w { range = &ranges[range_count]; GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, - range->offset, range->size, (BYTE *)data + range->offset)); + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("glBufferSubData"); } @@ -599,7 +599,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - wined3d_buffer_upload_ranges(buffer, context, data, buffer->modified_areas, buffer->maps); + wined3d_buffer_upload_ranges(buffer, context, data, 0, buffer->modified_areas, buffer->maps); HeapFree(GetProcessHeap(), 0, data); } @@ -683,7 +683,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, case WINED3D_LOCATION_BUFFER: if (!buffer->conversion_map) wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, - buffer->modified_areas, buffer->maps); + 0, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); break; @@ -1266,31 +1266,23 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ return WINED3D_OK; } -HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, +void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) { - UINT offset, size; - HRESULT hr; - BYTE *ptr; + struct wined3d_map_range range; if (box) { - offset = box->left; - size = box->right - box->left; + range.offset = box->left; + range.size = box->right - box->left; } else { - offset = 0; - size = buffer->resource.size; + range.offset = 0; + range.size = buffer->resource.size; } - if (FAILED(hr = wined3d_buffer_map(buffer, offset, size, &ptr, 0))) - return hr; - - memcpy(ptr, data, size); - - wined3d_buffer_unmap(buffer); - return WINED3D_OK; + wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } static ULONG buffer_resource_incref(struct wined3d_resource *resource) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7898527..73b7e69 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4061,7 +4061,6 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - HRESULT hr; if (sub_resource_idx > 0) { @@ -4069,8 +4068,16 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str return; } - if (FAILED(hr = wined3d_buffer_upload_data(buffer, box, data))) - WARN("Failed to update buffer data, hr %#x.\n", hr); + context = context_acquire(resource->device, NULL); + if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) + { + ERR("Failed to load buffer location.\n"); + return; + } + + wined3d_buffer_upload_data(buffer, context, box, data); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); + context_release(context); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e1282a..1cae2fe 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3250,7 +3250,7 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; -HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, +void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view

1 0

Henri Verbeet : wined3d: Support WINED3D_LOCATION_BUFFER in wined3d_buffer_load_location().
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 160ad4570e6b3fa22baff2f5f98e0f16c194e00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=160ad4570e6b3fa22baff2f5f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:11 2017 +0100 wined3d: Support WINED3D_LOCATION_BUFFER in wined3d_buffer_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 178 ++++++++++++++++++++++++-------------------------- 1 file changed, 86 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2f82469..add6052 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -530,6 +530,80 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) return refcount; } +/* Context activation is done by the caller. */ +static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + const void *data, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_map_range *range; + + buffer_bind(buffer, context); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset)); + } + checkGLcall("glBufferSubData"); +} + +static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + unsigned int i, j, range_idx, start, end, vertex_count; + BYTE *data; + + if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + { + ERR("Failed to load system memory.\n"); + return; + } + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + + /* Now for each vertex in the buffer that needs conversion. */ + vertex_count = buffer->resource.size / buffer->stride; + + if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + { + ERR("Out of memory.\n"); + return; + } + + for (range_idx = 0; range_idx < buffer->modified_areas; ++range_idx) + { + start = buffer->maps[range_idx].offset; + end = start + buffer->maps[range_idx].size; + + memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); + for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) + { + for (j = 0; j < buffer->stride;) + { + switch (buffer->conversion_map[j]) + { + case CONV_NONE: + /* Done already */ + j += sizeof(DWORD); + break; + case CONV_D3DCOLOR: + j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); + break; + case CONV_POSITIONT: + j += fixup_transformed_pos((struct wined3d_vec4 *) (data + i * buffer->stride + j)); + break; + default: + FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); + ++j; + } + } + } + } + + wined3d_buffer_upload_ranges(buffer, context, data, buffer->modified_areas, buffer->maps); + + HeapFree(GetProcessHeap(), 0, data); +} + static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { @@ -607,8 +681,12 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, break; case WINED3D_LOCATION_BUFFER: - FIXME("Not implemented yet.\n"); - return FALSE; + if (!buffer->conversion_map) + wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, + buffer->modified_areas, buffer->maps); + else + buffer_conversion_upload(buffer, context); + break; default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); @@ -616,6 +694,10 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, } wined3d_buffer_validate_location(buffer, location); + if (buffer->resource.heap_memory && location == WINED3D_LOCATION_BUFFER + && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) + wined3d_buffer_evict_sysmem(buffer); + return TRUE; } @@ -797,80 +879,6 @@ drop_query: This->flags &= ~WINED3D_BUFFER_APPLESYNC; } -/* Context activation is done by the caller. */ -static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, - const void *data, unsigned int range_count, const struct wined3d_map_range *ranges) -{ - const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_map_range *range; - - buffer_bind(buffer, context); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, - range->offset, range->size, (BYTE *)data + range->offset)); - } - checkGLcall("glBufferSubData"); -} - -static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) -{ - unsigned int i, j, range_idx, start, end, vertex_count; - BYTE *data; - - if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) - { - ERR("Failed to load system memory.\n"); - return; - } - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; - - /* Now for each vertex in the buffer that needs conversion. */ - vertex_count = buffer->resource.size / buffer->stride; - - if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) - { - ERR("Out of memory.\n"); - return; - } - - for (range_idx = 0; range_idx < buffer->modified_areas; ++range_idx) - { - start = buffer->maps[range_idx].offset; - end = start + buffer->maps[range_idx].size; - - memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); - for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) - { - for (j = 0; j < buffer->stride;) - { - switch (buffer->conversion_map[j]) - { - case CONV_NONE: - /* Done already */ - j += sizeof(DWORD); - break; - case CONV_D3DCOLOR: - j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); - break; - case CONV_POSITIONT: - j += fixup_transformed_pos((struct wined3d_vec4 *) (data + i * buffer->stride + j)); - break; - default: - FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); - ++j; - } - } - } - } - - wined3d_buffer_upload_ranges(buffer, context, data, buffer->modified_areas, buffer->maps); - - HeapFree(GetProcessHeap(), 0, data); -} - void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~WINED3D_BUFFER_DISCARD; @@ -981,22 +989,8 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * } } - if (!buffer->conversion_map) - { - TRACE("No conversion needed.\n"); - - wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, - buffer->modified_areas, buffer->maps); - } - else - { - buffer_conversion_upload(buffer, context); - } - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - - if (buffer->resource.heap_memory && !(buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) - wined3d_buffer_evict_sysmem(buffer); - + if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) + ERR("Failed to load buffer location.\n"); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)

1 0

Nikolay Sivov : usp10: Fix LB27 rule that should check for prefix, not suffix.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 7e6a4b2bf54fb37836679eb6426a1c1a9a6b8cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6a4b2bf54fb37836679eb64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:43:48 2017 +0300 usp10: Fix LB27 rule that should check for prefix, not suffix. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/breaking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 9746f5d..b1220c1 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -384,7 +384,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT if (break_class[i+1] == b_IN || break_class[i+1] == b_PO) else_break(&break_before[i+1],b_x); } - if (break_class[i] == b_PO) + if (break_class[i] == b_PR) { switch (break_class[i+1]) {

1 0

Nikolay Sivov : usp10: Fixed LB30 condition, breaking after CP class.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: c4626bba01f7b8b91ffc8c9cdba661bb7d9ab205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4626bba01f7b8b91ffc8c9cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:43:47 2017 +0300 usp10: Fixed LB30 condition, breaking after CP class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/breaking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index eb3fc00..9746f5d 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -414,7 +414,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT break_class[i+1] == b_OP) else_break(&break_before[i+1],b_x); if (break_class[i] == b_CP && - (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) + (break_class[i+1] == b_AL || break_class[i+1] == b_HL || break_class[i+1] == b_NU)) else_break(&break_before[i+1],b_x); /* LB30a */

1 0

Jacek Caban : inetcomm: Properly handle boundary in the beginning of body stream in create_body_offset_list.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 3ccba10a0295f4cac74276826909669d612d250b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccba10a0295f4cac74276826… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:23 2017 +0100 inetcomm: Properly handle boundary in the beginning of body stream in create_body_offset_list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 1471f99..679930d 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1942,18 +1942,16 @@ typedef struct static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struct list *body_offsets) { HRESULT hr; - DWORD read; + DWORD read, boundary_start; int boundary_len = strlen(boundary); - char *buf, *nl_boundary, *ptr, *overlap; + char *buf, *ptr, *overlap; DWORD start = 0, overlap_no; offset_entry_t *cur_body = NULL; + BOOL is_first_line = TRUE; ULARGE_INTEGER cur; LARGE_INTEGER zero; list_init(body_offsets); - nl_boundary = HeapAlloc(GetProcessHeap(), 0, 4 + boundary_len + 1); - memcpy(nl_boundary, "\r\n--", 4); - memcpy(nl_boundary + 4, boundary, boundary_len + 1); overlap_no = boundary_len + 5; @@ -1970,39 +1968,44 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc overlap[read] = '\0'; ptr = buf; - do { - ptr = strstr(ptr, nl_boundary); - if(ptr) - { - DWORD boundary_start = start + ptr - buf; - char *end = ptr + boundary_len + 4; - - if(*end == '\0' || *(end + 1) == '\0') + while(1) { + if(is_first_line) { + is_first_line = FALSE; + }else { + ptr = strstr(ptr, "\r\n"); + if(!ptr) break; + ptr += 2; + } - if(*end == '\r' && *(end + 1) == '\n') + boundary_start = start + ptr - buf; + + if(*ptr == '-' && *(ptr + 1) == '-' && !memcmp(ptr + 2, boundary, boundary_len)) { + ptr += boundary_len + 2; + + if(*ptr == '\r' && *(ptr + 1) == '\n') { + ptr += 2; if(cur_body) { - cur_body->offsets.cbBodyEnd = boundary_start; + cur_body->offsets.cbBodyEnd = boundary_start - 2; list_add_tail(body_offsets, &cur_body->entry); } cur_body = HeapAlloc(GetProcessHeap(), 0, sizeof(*cur_body)); - cur_body->offsets.cbBoundaryStart = boundary_start + 2; /* doesn't including the leading \r\n */ - cur_body->offsets.cbHeaderStart = boundary_start + boundary_len + 6; + cur_body->offsets.cbBoundaryStart = boundary_start; + cur_body->offsets.cbHeaderStart = start + ptr - buf; } - else if(*end == '-' && *(end + 1) == '-') + else if(*ptr == '-' && *(ptr + 1) == '-') { if(cur_body) { - cur_body->offsets.cbBodyEnd = boundary_start; + cur_body->offsets.cbBodyEnd = boundary_start - 2; list_add_tail(body_offsets, &cur_body->entry); goto end; } } - ptr = end + 2; } - } while(ptr); + } if(overlap == buf) /* 1st iteration */ { @@ -2018,7 +2021,6 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc } while(1); end: - HeapFree(GetProcessHeap(), 0, nl_boundary); HeapFree(GetProcessHeap(), 0, buf); return hr; }

1 0

Jacek Caban : inetcomm: Added tests reading MHTML page as MIME message.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 242cbb1673d06714e55bc7910914c62f8e7f4676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242cbb1673d06714e55bc7910… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:56 2017 +0100 inetcomm: Added tests reading MHTML page as MIME message. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 8028ca8..15b267f 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -90,6 +90,22 @@ static const char msg1[] = "More stuff\r\n" "--------------1.5.0.6--\r\n"; +static const char mhtml_page1[] = + "MIME-Version: 1.0\r\n" + "Content-Type: multipart/related; type:=\"text/html\"; boundary=\"----=_NextPart_000_00\"\r\n" + "\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: text/html; charset=\"Windows-1252\"\r\n" + "Content-Transfer-Encoding: quoted-printable\r\n" + "\r\n" + "<HTML></HTML>\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: Image/Jpeg\r\n" + "Content-Transfer-Encoding: base64\r\n" + "Content-Location: http://winehq.org/mhtmltest.html\r\n" + "\r\n\t\t\t\tVGVzdA==\r\n\r\n" + "------=_NextPart_000_00--"; + static void test_CreateVirtualStream(void) { HRESULT hr; @@ -721,6 +737,60 @@ static void test_CreateMessage(void) IStream_Release(stream); } +static void test_mhtml_message(void) +{ + IMimeMessage *mime_message; + IMimeBody *mime_body; + HBODY *body_list; + IStream *stream; + ULONG count; + HRESULT hres; + + hres = MimeOleCreateMessage(NULL, &mime_message); + ok(hres == S_OK, "MimeOleCreateMessage failed: %08x\n", hres); + + stream = create_stream_from_string(mhtml_page1); + hres = IMimeMessage_Load(mime_message, stream); + IStream_Release(stream); + ok(hres == S_OK, "Load failed: %08x\n", hres); + + hres = IMimeMessage_CountBodies(mime_message, HBODY_ROOT, TRUE, &count); + ok(hres == S_OK, "CountBodies failed: %08x\n", hres); + ok(count == 3, "got %d\n", count); + + hres = IMimeMessage_GetAttachments(mime_message, &count, &body_list); + ok(hres == S_OK, "GetAttachments failed: %08x\n", hres); + ok(count == 2, "count = %u\n", count); + + hres = IMimeMessage_BindToObject(mime_message, body_list[0], &IID_IMimeBody, (void**)&mime_body); + ok(hres == S_OK, "BindToObject failed: %08x\n", hres); + + hres = IMimeBody_GetData(mime_body, IET_BINARY, &stream); + ok(hres == S_OK, "GetData failed: %08x\n", hres); + test_stream_read(stream, S_OK, "<HTML></HTML>", -1); + IStream_Release(stream); + + test_current_encoding(mime_body, IET_QP); + + IMimeBody_Release(mime_body); + + hres = IMimeMessage_BindToObject(mime_message, body_list[1], &IID_IMimeBody, (void**)&mime_body); + ok(hres == S_OK, "BindToObject failed: %08x\n", hres); + + test_current_encoding(mime_body, IET_BASE64); + + hres = IMimeBody_GetData(mime_body, IET_BINARY, &stream); + ok(hres == S_OK, "GetData failed: %08x\n", hres); + test_stream_read(stream, S_OK, "Test", -1); + IStream_Release(stream); + + IMimeBody_Release(mime_body); + + CoTaskMemFree(body_list); + + IMimeMessage_Release(mime_message); +} + static void test_MessageSetProp(void) { static const char topic[] = "wine topic"; @@ -1152,6 +1222,7 @@ START_TEST(mimeole) test_BindToObject(); test_BodyDeleteProp(); test_MimeOleGetPropertySchema(); + test_mhtml_message(); test_mhtml_protocol(); OleUninitialize(); }

1 0

Nikolay Sivov : msxml3: Duplicate stylesheet document before passing it to libxslt.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 2191d9776508132a9073e37dabe444a251938c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2191d9776508132a9073e37da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:47:44 2017 +0300 msxml3: Duplicate stylesheet document before passing it to libxslt. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ccecaa8..c5a180b 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1320,6 +1320,7 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; + xmlDocPtr sheet_doc; HRESULT hr = S_OK; xmlnode *sheet; @@ -1331,8 +1332,9 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, sheet = get_node_obj(stylesheet); if(!sheet) return E_FAIL; - xsltSS = pxsltParseStylesheetDoc(sheet->node->doc); - if(xsltSS) + sheet_doc = xmlCopyDoc(sheet->node->doc, 1); + xsltSS = pxsltParseStylesheetDoc(sheet_doc); + if (xsltSS) { const char **xslparams = NULL; xmlDocPtr result; @@ -1377,11 +1379,11 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, hr = node_transform_write_to_bstr(xsltSS, result, p); xmlFreeDoc(result); } - /* libxslt "helpfully" frees the XML document the stylesheet was - generated from, too */ - xsltSS->doc = NULL; + pxsltFreeStylesheet(xsltSS); } + else + xmlFreeDoc(sheet_doc); if(!*p) *p = SysAllocStringLen(NULL, 0);

1 0

Jacek Caban : msctf: Use correct sink for ITfThreadFocusSink.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: 7ebe59b922bf419296563b0ad24adc22a953fdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ebe59b922bf419296563b0ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 14:34:32 2017 +0100 msctf: Use correct sink for ITfThreadFocusSink. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index ed42b54..d5e7fe0 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -30,6 +30,7 @@ #define COOKIE_MAGIC_EDITCOOKIE 0x0050 #define COOKIE_MAGIC_COMPARTMENTSINK 0x0060 #define COOKIE_MAGIC_DMSINK 0x0070 +#define COOKIE_MAGIC_THREADFOCUSSINK 0x0080 extern DWORD tlsIndex DECLSPEC_HIDDEN; extern TfClientId processId DECLSPEC_HIDDEN; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 62ddfd2..2c4100b 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -618,7 +618,7 @@ static HRESULT WINAPI ThreadMgrSource_AdviseSink(ITfSource *iface, if (IsEqualIID(riid, &IID_ITfThreadFocusSink)) { WARN("semi-stub for ITfThreadFocusSink: sink won't be used.\n"); - return advise_sink(&This->ThreadMgrEventSink, &IID_ITfThreadMgrEventSink, COOKIE_MAGIC_TMSINK, punk, pdwCookie); + return advise_sink(&This->ThreadFocusSink, &IID_ITfThreadFocusSink, COOKIE_MAGIC_THREADFOCUSSINK, punk, pdwCookie); } FIXME("(%p) Unhandled Sink: %s\n",This,debugstr_guid(riid));

1 0

Hans Leidekker : wintrust/tests: Disable a test that crashes on 64-bit Windows 10.
by Alexandre Julliard Jan. 31, 2017

Jan. 31, 2017

Module: wine Branch: master Commit: bdc309b9492820b91816ad6b0e1b60424e25df0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc309b9492820b91816ad6b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 31 12:08:25 2017 +0100 wintrust/tests: Disable a test that crashes on 64-bit Windows 10. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/crypt.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 503831e..5a4344b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -203,17 +203,11 @@ static void test_context(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* NULL GUID */ + if (0) { /* crashes on 64-bit win10 */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); - /* All NULL */ - SetLastError(0xdeadbeef); - ret = pCryptCATAdminReleaseContext(NULL, 0); - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Proper release */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); @@ -225,6 +219,14 @@ static void test_context(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(NULL, 0); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* NULL context handle and dummy GUID */ SetLastError(0xdeadbeef);

1 0