January 2017 - Wine-commits

Nikolay Sivov : msxml3: Accept AllowXsltScript and AllowDocumentFunction properties.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 45dd9d17962d438837e209e2a373060508abe183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dd9d17962d438837e209e2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 16:22:55 2017 +0300 msxml3: Accept AllowXsltScript and AllowDocumentFunction properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3643219..62b48fc 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -71,6 +71,8 @@ static const WCHAR PropertyNewParserW[] = {'N','e','w','P','a','r','s','e','r',0 static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; +static const WCHAR PropertyAllowXsltScriptW[] = {'A','l','l','o','w','X','s','l','t','S','c','r','i','p','t',0}; +static const WCHAR PropertyAllowDocumentFunctionW[] = {'A','l','l','o','w','D','o','c','u','m','e','n','t','F','u','n','c','t','i','o','n',0}; /* Anything that passes the test_get_ownerDocument() * tests can go here (data shared between all instances). @@ -3072,7 +3074,9 @@ static HRESULT WINAPI domdoc_setProperty( } else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0 || lstrcmpiW(p, PropertyNewParserW) == 0 || - lstrcmpiW(p, PropertyResolveExternalsW) == 0) + lstrcmpiW(p, PropertyResolveExternalsW) == 0 || + lstrcmpiW(p, PropertyAllowXsltScriptW) == 0 || + lstrcmpiW(p, PropertyAllowDocumentFunctionW) == 0) { /* Ignore */ FIXME("Ignoring property %s, value %s\n", debugstr_w(p), debugstr_variant(&value));

1 0

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

31 Jan '17

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

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

31 Jan '17

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

Jacek Caban : msctf: Use correct sink for ITfThreadFocusSink.
by Alexandre Julliard 31 Jan '17

31 Jan '17

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

Henri Verbeet : wined3d: Do not pin system memory in wined3d_buffer_load_location().
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 15d53761a5fbfc12fc5f9974c029dace00eab33d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d53761a5fbfc12fc5f9974c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:10 2017 +0100 wined3d: Do not pin system memory 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 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6b48d98..2f82469 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -604,7 +604,6 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; break; case WINED3D_LOCATION_BUFFER: @@ -623,7 +622,8 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, /* Context activation is done by the caller. */ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + if (wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; return buffer->resource.heap_memory; } @@ -655,7 +655,6 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - DWORD flags = buffer->flags; TRACE("buffer %p.\n", buffer); @@ -665,11 +664,7 @@ static void buffer_unload(struct wined3d_resource *resource) context = context_acquire(resource->device, NULL); - /* Download the buffer, but don't permanently enable double buffering. */ wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - if (!(flags & WINED3D_BUFFER_PIN_SYSMEM)) - buffer->flags &= ~WINED3D_BUFFER_PIN_SYSMEM; - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); buffer_destroy_buffer_object(buffer, context); buffer_clear_dirty_areas(buffer); @@ -825,7 +820,12 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined unsigned int i, j, range_idx, start, end, vertex_count; BYTE *data; - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + 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; @@ -1106,6 +1106,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI { TRACE("Falling back to doublebuffered operation.\n"); wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL;

1 0

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

31 Jan '17

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

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

31 Jan '17

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: Load WINED3D_LOCATION_BUFFER if needed in wined3d_buffer_map().
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 413ccc82db6cbfa93ef89295de0f70fb567ff9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=413ccc82db6cbfa93ef89295d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 31 15:47:13 2017 +0100 wined3d: Load WINED3D_LOCATION_BUFFER if needed in wined3d_buffer_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4da1a3b..1fdf0a3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1034,6 +1034,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } if (!(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD | WINED3D_MAP_READONLY)) + || ((flags & WINED3D_MAP_READONLY) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) { if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) @@ -1048,6 +1049,14 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } else { + const struct wined3d_gl_info *gl_info; + + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + if (!(flags & WINED3D_MAP_DISCARD)) + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (!(flags & WINED3D_MAP_READONLY)) buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); @@ -1056,11 +1065,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (count == 1) { - const struct wined3d_gl_info *gl_info; - - context = context_acquire(device, NULL); - gl_info = context->gl_info; - buffer_bind(buffer, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) @@ -1105,8 +1109,9 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL; } - context_release(context); } + + context_release(context); } if (flags & WINED3D_MAP_DISCARD)

1 0

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

31 Jan '17

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

Nikolay Sivov : include: Added GetThreadUILanguage() prototype.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 532926b5f70e1b772816e65994d0dd4d38b87748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532926b5f70e1b772816e6599… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 16:53:18 2017 +0300 include: Added GetThreadUILanguage() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 96f60de..d6fcf6e 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -921,6 +921,7 @@ WINBASEAPI LANGID WINAPI GetSystemDefaultUILanguage(void); WINBASEAPI BOOL WINAPI GetSystemPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); WINBASEAPI LCID WINAPI GetThreadLocale(void); WINBASEAPI BOOL WINAPI GetThreadPreferredUILanguages(DWORD,ULONG*,WCHAR*,ULONG*); +WINBASEAPI LANGID WINAPI GetThreadUILanguage(void); WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT);

1 0