October 2016 - Wine-commits

Roman Pišl : user32: Fix buffer overflow in EDIT_EM_ReplaceSel().
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 9de8ea75645d7092f888ddd7572f35204e672757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de8ea75645d7092f888ddd75… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Tue Oct 18 00:34:55 2016 +0200 user32: Fix buffer overflow in EDIT_EM_ReplaceSel(). After EN_MAXTEXT notification, available space may be larger than length of the string. This must be checked and strl must not be set to a value larger than the actual length of the string. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f5cd3c4..78d78ea 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2598,7 +2598,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac if (es->buffer_limit < (tl - (e-s))) strl = 0; else - strl = es->buffer_limit - (tl - (e-s)); + strl = min(strl, es->buffer_limit - (tl - (e-s))); } if (!EDIT_MakeFit(es, tl - (e - s) + strl))

1 0

Jacek Caban : taskschd: Added ITriggerCollection::Create implementation.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 18427a0ce0581d4023413f901e2458987e287dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18427a0ce0581d4023413f901… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 14:04:19 2016 +0200 taskschd: Added ITriggerCollection::Create implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 263 +++++++++++++++++++++++++++++++++++++++- dlls/taskschd/tests/scheduler.c | 18 +++ 2 files changed, 279 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18427a0ce0581d4023413…

1 0

Jacek Caban : taskschd: Added IDailyTrigger:: DaysInterval property implementation.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 82a590403fbec212c5884d1688c099392652c026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a590403fbec212c5884d168… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 14:04:32 2016 +0200 taskschd: Added IDailyTrigger::DaysInterval property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 19 +++++++++++++++---- dlls/taskschd/tests/scheduler.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 5d7f467..6a1acc8 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(taskschd); typedef struct { IDailyTrigger IDailyTrigger_iface; LONG ref; + short interval; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -217,15 +218,24 @@ static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOO static HRESULT WINAPI DailyTrigger_get_DaysInterval(IDailyTrigger *iface, short *days) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, days); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, days); + + *days = This->interval; + return S_OK; } static HRESULT WINAPI DailyTrigger_put_DaysInterval(IDailyTrigger *iface, short days) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%d)\n", This, days); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, days); + + if(days <= 0) + return E_INVALIDARG; + + This->interval = days; + return S_OK; } static HRESULT WINAPI DailyTrigger_get_RandomDelay(IDailyTrigger *iface, BSTR *pRandomDelay) @@ -279,6 +289,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->IDailyTrigger_iface.lpVtbl = &DailyTrigger_vtbl; daily_trigger->ref = 1; + daily_trigger->interval = 1; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 41c0ea8..efd5f60 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1174,11 +1174,35 @@ todo_wine static void test_daily_trigger(ITrigger *trigger) { IDailyTrigger *daily_trigger; + short interval; HRESULT hr; hr = ITrigger_QueryInterface(trigger, &IID_IDailyTrigger, (void**)&daily_trigger); ok(hr == S_OK, "Could not get IDailyTrigger iface: %08x\n", hr); + interval = -1; + hr = IDailyTrigger_get_DaysInterval(daily_trigger, &interval); + ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); + ok(interval == 1, "interval = %d\n", interval); + + hr = IDailyTrigger_put_DaysInterval(daily_trigger, -2); + ok(hr == E_INVALIDARG, "put_DaysInterval failed: %08x\n", hr); + hr = IDailyTrigger_put_DaysInterval(daily_trigger, 0); + ok(hr == E_INVALIDARG, "put_DaysInterval failed: %08x\n", hr); + + interval = -1; + hr = IDailyTrigger_get_DaysInterval(daily_trigger, &interval); + ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); + ok(interval == 1, "interval = %d\n", interval); + + hr = IDailyTrigger_put_DaysInterval(daily_trigger, 2); + ok(hr == S_OK, "put_DaysInterval failed: %08x\n", hr); + + interval = -1; + hr = IDailyTrigger_get_DaysInterval(daily_trigger, &interval); + ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); + ok(interval == 2, "interval = %d\n", interval); + IDailyTrigger_Release(daily_trigger); }

1 0

Sebastian Lackner : hidclass.sys: Use MmGetSystemAddressForMdlSafe to access MDL data.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 6d8eb8ba0cbdaf58839d83812d4151883d419371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8eb8ba0cbdaf58839d83812… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Oct 16 08:59:23 2016 +0200 hidclass.sys: Use MmGetSystemAddressForMdlSafe to access MDL data. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d2a4710..189cd2e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -419,7 +419,7 @@ static NTSTATUS handle_minidriver_string(DEVICE_OBJECT *device, IRP *irp, SHORT if (status == STATUS_SUCCESS) { - WCHAR *out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + WCHAR *out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); int length = irpsp->Parameters.DeviceIoControl.OutputBufferLength/sizeof(WCHAR); TRACE("got string %s from minidriver\n",debugstr_w(buffer)); lstrcpynW(out_buffer, buffer, length); @@ -440,7 +440,7 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = 0; - out_buffer = (((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -569,7 +569,7 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_GET_INPUT_REPORT: { HID_XFER_PACKET packet; - BYTE* buffer = ((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset; + BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); if (extension->preparseData->InputReports[0].reportID) packet.reportId = buffer[0];

1 0

Jacek Caban : ws2_32: Added FreeAddrInfoExW stub.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 7e7f46f43667eecf794795c7ed9fe7c7b5580663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7f46f43667eecf794795c7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 14:28:59 2016 +0200 ws2_32: Added FreeAddrInfoExW stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 ++++++++ dlls/ws2_32/ws2_32.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e8c5130..3d9a99b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6810,6 +6810,14 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) } } +/*********************************************************************** + * FreeAddrInfoExW (WS2_32.@) + */ +void WINAPI FreeAddrInfoExW(ADDRINFOEXW *ai) +{ + FIXME("%p\n", ai); +} + int WINAPI WS_getnameinfo(const SOCKADDR *sa, WS_socklen_t salen, PCHAR host, DWORD hostlen, PCHAR serv, DWORD servlen, INT flags) { diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 0482b7d..df5e9d3 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr)

1 0

Józef Kucia : wined3d: Let buffer_direct_upload() invalidate STATE_INDEXBUFFER if needed.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: b1cc82a29f50dd7cc6703c33ee11df0f0db84b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1cc82a29f50dd7cc6703c33e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:44 2016 +0200 wined3d: Let buffer_direct_upload() invalidate STATE_INDEXBUFFER if needed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> 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, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b50132a..8943144 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -668,15 +668,13 @@ drop_query: } /* The caller provides a GL context */ -static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info, DWORD flags) +static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_context *context, DWORD flags) { + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int start, len; BYTE *map; - UINT start, len; - /* This potentially invalidates the element array buffer binding, but the - * caller always takes care of this. */ - GL_EXTCALL(glBindBuffer(This->buffer_type_hint, This->buffer_object)); - checkGLcall("glBindBuffer"); + buffer_bind(This, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { GLbitfield mapflags; @@ -686,7 +684,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined else if (!(flags & WINED3D_BUFFER_SYNC)) mapflags |= GL_MAP_UNSYNCHRONIZED_BIT; map = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, - This->resource.size, mapflags)); + This->resource.size, mapflags)); checkGLcall("glMapBufferRange"); } else @@ -867,12 +865,9 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte /* Nothing to do because we locked directly into the vbo */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - { return; - } - - buffer_direct_upload(buffer, gl_info, flags); + buffer_direct_upload(buffer, context, flags); return; }

1 0

Józef Kucia : wined3d: Clean up buffer_internal_preload().
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: e3a8cd20ced9f33db64a35f60bc8487ae8173e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a8cd20ced9f33db64a35f60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:45 2016 +0200 wined3d: Clean up buffer_internal_preload(). The conversion should never be performed for buffers with buffer_type_hint other than GL_ARRAY_BUFFER. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8943144..49bed64 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -422,7 +422,7 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s return ret; } -static inline void fixup_d3dcolor(DWORD *dst_color) +static inline unsigned int fixup_d3dcolor(DWORD *dst_color) { DWORD src_color = *dst_color; @@ -439,9 +439,11 @@ static inline void fixup_d3dcolor(DWORD *dst_color) *dst_color |= (src_color & 0xff00ff00u); /* Alpha Green */ *dst_color |= (src_color & 0x00ff0000u) >> 16; /* Red */ *dst_color |= (src_color & 0x000000ffu) << 16; /* Blue */ + + return sizeof(*dst_color); } -static inline void fixup_transformed_pos(float *p) +static inline unsigned int fixup_transformed_pos(float *p) { /* rhw conversion like in position_float4(). */ if (p[3] != 1.0f && p[3] != 0.0f) @@ -452,6 +454,8 @@ static inline void fixup_transformed_pos(float *p) p[2] *= w; p[3] = w; } + + return 4 * sizeof(*p); } /* Context activation is done by the caller. */ @@ -741,10 +745,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_device *device = buffer->resource.device; - UINT start, end, len, vertices; + unsigned int i, j, start, end, len, vertex_count; BOOL decl_changed = FALSE; - unsigned int i, j; BYTE *data; TRACE("buffer %p.\n", buffer); @@ -851,9 +853,6 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte } } - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(device, STATE_INDEXBUFFER); - if (!buffer->conversion_map) { /* That means that there is nothing to fixup. Just upload from @@ -871,17 +870,23 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte return; } - if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - { + /* This would potentially invalidate the element array buffer binding. */ + if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) + ERR("Converting data in non-vertex buffer.\n"); + + if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) buffer_get_sysmem(buffer, context); - } /* Now for each vertex in the buffer that needs conversion */ - vertices = buffer->resource.size / buffer->stride; + vertex_count = buffer->resource.size / buffer->stride; - data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size); + if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + { + ERR("Out of memory.\n"); + return; + } - while(buffer->modified_areas) + while (buffer->modified_areas) { buffer->modified_areas--; start = buffer->maps[buffer->modified_areas].offset; @@ -889,27 +894,25 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte end = start + len; memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); - for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertices); ++i) + for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) { - for (j = 0; j < buffer->stride; ++j) + for (j = 0; j < buffer->stride;) { switch (buffer->conversion_map[j]) { case CONV_NONE: /* Done already */ - j += 3; + j += sizeof(DWORD); break; case CONV_D3DCOLOR: - fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); - j += 3; + j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); break; - case CONV_POSITIONT: - fixup_transformed_pos((float *) (data + i * buffer->stride + j)); - j += 15; + j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); break; default: - FIXME("Unimplemented conversion %d in shifted conversion\n", buffer->conversion_map[j]); + FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); + ++j; } } }

1 0

Józef Kucia : wined3d: Rename buffer_internal_preload () to wined3d_buffer_load().
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 5f86ef7b1e9614d9794e304a6b9af5ace3cb8d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f86ef7b1e9614d9794e304a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:46 2016 +0200 wined3d: Rename buffer_internal_preload() to wined3d_buffer_load(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 49bed64..ae835be 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -740,7 +740,7 @@ void buffer_mark_used(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, +void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); @@ -1219,7 +1219,7 @@ static void buffer_resource_preload(struct wined3d_resource *resource) struct wined3d_context *context; context = context_acquire(resource->device, NULL); - buffer_internal_preload(buffer_from_resource(resource), context, NULL); + wined3d_buffer_load(buffer_from_resource(resource), context, NULL); context_release(context); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 87d417c..38e081b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3200,7 +3200,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st } else { - buffer_internal_preload(buffer, context, state); + wined3d_buffer_load(buffer, context, state); buffer_get_memory(buffer, context, &data); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; @@ -3304,7 +3304,7 @@ static void context_load_shader_resources(struct wined3d_context *context, const for (j = 0; j < WINED3D_MAX_CBS; ++j) { if (state->cb[i][j]) - buffer_internal_preload(state->cb[i][j], context, state); + wined3d_buffer_load(state->cb[i][j], context, state); } for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) @@ -3318,7 +3318,7 @@ static void context_load_shader_resources(struct wined3d_context *context, const } if (view->resource->type == WINED3D_RTYPE_BUFFER) - buffer_internal_preload(buffer_from_resource(view->resource), context, state); + wined3d_buffer_load(buffer_from_resource(view->resource), context, state); else wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); } @@ -3430,7 +3430,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, if (state->index_buffer) { if (context->stream_info.all_vbo) - buffer_internal_preload(state->index_buffer, context, state); + wined3d_buffer_load(state->index_buffer, context, state); else buffer_get_sysmem(state->index_buffer, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4326bee..5e4b072 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3181,9 +3181,9 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; -void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, - const struct wined3d_state *state) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, + const struct wined3d_state *state) 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,

1 0

Józef Kucia : wined3d: Rename buffer_get_sysmem() to wined3d_buffer_load_sysmem().
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: fc866d88f381c55bd37c7209a024738547e51071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc866d88f381c55bd37c7209a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:47 2016 +0200 wined3d: Rename buffer_get_sysmem() to wined3d_buffer_load_sysmem(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 6 +++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ae835be..b6338d1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -493,7 +493,7 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) +BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -528,7 +528,7 @@ static void buffer_unload(struct wined3d_resource *resource) /* Download the buffer, but don't permanently enable double buffering */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { - buffer_get_sysmem(buffer, context); + wined3d_buffer_load_sysmem(buffer, context); buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } @@ -875,7 +875,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * ERR("Converting data in non-vertex buffer.\n"); if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - buffer_get_sysmem(buffer, context); + wined3d_buffer_load_sysmem(buffer, context); /* Now for each vertex in the buffer that needs conversion */ vertex_count = buffer->resource.size / buffer->stride; @@ -1010,7 +1010,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI else { TRACE("Falling back to doublebuffered operation.\n"); - buffer_get_sysmem(buffer, context); + wined3d_buffer_load_sysmem(buffer, context); } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 38e081b..1ca12bc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3194,7 +3194,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); element->data.buffer_object = 0; - element->data.addr += (ULONG_PTR)buffer_get_sysmem(buffer, context); + element->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); if ((UINT_PTR)element->data.addr < -state->load_base_vertex_index * element->stride) FIXME("System memory vertex data load offset is negative!\n"); } @@ -3432,7 +3432,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, if (context->stream_info.all_vbo) wined3d_buffer_load(state->index_buffer, context, state); else - buffer_get_sysmem(state->index_buffer, context); + wined3d_buffer_load_sysmem(state->index_buffer, context); } for (i = 0; i < context->numDirtyEntries; ++i) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9bf6042..89b781c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3174,7 +3174,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, e = &stream_info.elements[i]; buffer = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr += (ULONG_PTR)buffer_get_sysmem(buffer, context); + e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); if (buffer->buffer_object) { GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e5b30db..4833845 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -135,7 +135,7 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct element = &si->elements[element_idx]; ptr = element->data.addr + element->stride * i; if (element->data.buffer_object) - ptr += (ULONG_PTR)buffer_get_sysmem(state->streams[element->stream_idx].buffer, context); + ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, context); ops->generic[element->format->emit_idx](element_idx, ptr); } @@ -201,7 +201,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const * supported or other reason), or with user pointer drawing idx_data * will be non-NULL. */ if (idx_size && !idx_data) - idx_data = buffer_get_sysmem(state->index_buffer, context); + idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context); ops = &d3d_info->ffp_attrib_ops; @@ -402,7 +402,7 @@ static void remove_vbos(struct wined3d_context *context, { struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)buffer_get_sysmem(vb, context)); + e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context)); } } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d462ea5..9e36bcd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4081,7 +4081,7 @@ static void load_numbered_arrays(struct wined3d_context *context, * figure out the system memory address. */ const BYTE *ptr = element->data.addr; if (element->data.buffer_object) - ptr += (ULONG_PTR)buffer_get_sysmem(stream->buffer, context); + ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context); if (context->numbered_array_mask & (1u << i)) unload_numbered_array(context, i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5e4b072..c3152a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3180,10 +3180,10 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; +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,

1 0

Józef Kucia : wined3d: Explicitly track locations for buffers.
by Alexandre Julliard 20 Oct '16

20 Oct '16

Module: wine Branch: master Commit: 2a385e420a2bafd7ca868ae57428798bb941d0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a385e420a2bafd7ca868ae57… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Oct 16 21:46:48 2016 +0200 wined3d: Explicitly track locations for buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 79 ++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/device.c | 1 + dlls/wined3d/wined3d_private.h | 3 ++ 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b6338d1..c7f0d81 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -93,6 +93,46 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) +{ + TRACE("buffer %p, location %s.\n", buffer, wined3d_debug_location(location)); + + if (location & WINED3D_LOCATION_BUFFER) + buffer_clear_dirty_areas(buffer); + + buffer->locations |= location; + + TRACE("New locations flags are %s.\n", wined3d_debug_location(buffer->locations)); +} + +static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD location, + unsigned int offset, unsigned int size) +{ + TRACE("buffer %p, location %s, offset %u, size %u.\n", + buffer, wined3d_debug_location(location), offset, size); + + if ((offset || size) && (location & ~WINED3D_LOCATION_BUFFER)) + { + ERR("Range can be invalidated only for WINED3D_LOCATION_BUFFER.\n"); + return; + } + + if (location & WINED3D_LOCATION_BUFFER) + buffer_invalidate_bo_range(buffer, offset, size); + + buffer->locations &= ~location; + + TRACE("New locations flags are %s.\n", wined3d_debug_location(buffer->locations)); + + if (!buffer->locations) + ERR("Buffer %p does not have any up to date location.\n", buffer); +} + +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) +{ + wined3d_buffer_invalidate_range(buffer, location, 0, 0); +} + /* Context activation is done by the caller. */ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) { @@ -192,15 +232,21 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine This->buffer_object_usage = gl_usage; if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) + { buffer_invalidate_bo_range(This, 0, 0); + } else + { wined3d_resource_free_sysmem(&This->resource); + wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(This, WINED3D_LOCATION_SYSMEM); + } return; fail: /* Clean up all VBO init, but continue because we can work without a VBO :-) */ - ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur\n"); + ERR("Failed to create a vertex buffer object. Continuing, but performance issues may occur.\n"); This->flags &= ~WINED3D_BUFFER_USE_BO; delete_gl_buffer(This, gl_info); buffer_clear_dirty_areas(This); @@ -509,6 +555,8 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c checkGLcall("buffer download"); buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + return buffer->resource.heap_memory; } @@ -532,6 +580,7 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; } + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); delete_gl_buffer(buffer, context->gl_info); buffer_clear_dirty_areas(buffer); @@ -707,7 +756,7 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con } if (!map) { - ERR("Failed to map opengl buffer\n"); + ERR("Failed to map OpenGL buffer.\n"); return; } @@ -732,6 +781,8 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con } GL_EXTCALL(glUnmapBuffer(This->buffer_type_hint)); checkGLcall("glUnmapBuffer"); + + wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); } void buffer_mark_used(struct wined3d_buffer *buffer) @@ -924,6 +975,8 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * } HeapFree(GetProcessHeap(), 0, data); + + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer) @@ -952,17 +1005,28 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (buffer->buffer_object) { + unsigned int dirty_offset = offset, dirty_size = size; + /* DISCARD invalidates the entire buffer, regardless of the specified * offset and size. Some applications also depend on the entire buffer * being uploaded in that case. Two such applications are Port Royale * and Darkstar One. */ if (flags & WINED3D_MAP_DISCARD) - buffer_invalidate_bo_range(buffer, 0, 0); - else if (!(flags & WINED3D_MAP_READONLY)) - buffer_invalidate_bo_range(buffer, offset, size); + { + dirty_offset = 0; + dirty_size = 0; + } - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) + if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) { + if (!(flags & WINED3D_MAP_READONLY)) + wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + } + else + { + if (!(flags & WINED3D_MAP_READONLY)) + buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + if (count == 1) { struct wined3d_device *device = buffer->resource.device; @@ -1171,7 +1235,7 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ } if (dst_buffer_mem) - buffer_invalidate_bo_range(dst_buffer, dst_offset, size); + wined3d_buffer_invalidate_range(dst_buffer, WINED3D_LOCATION_BUFFER, dst_offset, size); context_release(context); return WINED3D_OK; @@ -1300,6 +1364,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device return hr; } buffer->buffer_type_hint = bind_hint; + buffer->locations = WINED3D_LOCATION_SYSMEM; TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory, buffer); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89b781c..a611531 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3179,6 +3179,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, { GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); buffer->buffer_object = 0; + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); } if (e->data.addr) e->data.addr += e->stride * src_start_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3152a2..45a24f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3163,6 +3163,7 @@ struct wined3d_buffer struct wined3d_map_range *maps; ULONG maps_size, modified_areas; + DWORD locations; struct wined3d_event_query *query; /* conversion stuff */ @@ -3181,6 +3182,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; +void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; @@ -3188,6 +3190,7 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_upload_data(struct wined3d_buffer *buffer, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0