October 2016 - Wine-Commits

Iván Matellanes : msvcirt: Implement strstream constructors.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 95018e68874c7ad67ea08253298b66d70227000f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95018e68874c7ad67ea082532… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:02 2016 +0200 msvcirt: Implement strstream constructors. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 59 ++++++- dlls/msvcirt/tests/msvcirt.c | 356 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 409 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95018e68874c7ad67ea08…

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class stdiostream.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 384e74cd75dbcbb48d552f8dec2dd1a25ebea869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=384e74cd75dbcbb48d552f8de… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:03 2016 +0200 msvcirt: Add a partial implementation of class stdiostream. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 34 +++++++++++++++++----------------- dlls/msvcrt20/msvcrt20.spec | 34 +++++++++++++++++----------------- dlls/msvcrt40/msvcrt40.spec | 34 +++++++++++++++++----------------- 4 files changed, 95 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=384e74cd75dbcbb48d552…

1 0

Michael Stefaniuc : mshtml: Use EqualRect() to compare RECTs.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 41992ae38d1d0371b9ee70066f701a1fdae88d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41992ae38d1d0371b9ee70066… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 20 10:24:06 2016 +0200 mshtml: Use EqualRect() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/pluginhost.c | 2 +- dlls/mshtml/view.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 712f7e0..0fbbf6c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -311,7 +311,7 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) TRACE("%p %s\n", hwnd, wine_dbgstr_rect(rect)); - if(memcmp(rect, &host->rect, sizeof(RECT))) { + if(!EqualRect(rect, &host->rect)) { host->rect = *rect; rect_changed = TRUE; } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 2a55938..15f39f4 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -507,7 +507,7 @@ static HRESULT WINAPI OleDocumentView_SetRect(IOleDocumentView *iface, LPRECT pr if(This->doc_obj->hwnd) { GetClientRect(This->doc_obj->hwnd, &rect); - if(memcmp(prcView, &rect, sizeof(RECT))) { + if(!EqualRect(prcView, &rect)) { InvalidateRect(This->doc_obj->hwnd, NULL, TRUE); SetWindowPos(This->doc_obj->hwnd, NULL, prcView->left, prcView->top, prcView->right, prcView->bottom, SWP_NOZORDER | SWP_NOACTIVATE);

1 0

Ken Thomases : kernel32/tests: Test that ConnectNamedPipe() works immediately after DisconnectNamedPipe() without waiting for the client to close.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: e85f0e0c3b5b542a2f9cc527976d470445c96166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e85f0e0c3b5b542a2f9cc5279… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 20 14:31:51 2016 -0500 kernel32/tests: Test that ConnectNamedPipe() works immediately after DisconnectNamedPipe() without waiting for the client to close. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index cf7e3ba..6c311a4 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2060,6 +2060,20 @@ static DWORD CALLBACK overlapped_server(LPVOID arg) ok(ret == 1, "ret %d\n", ret); DisconnectNamedPipe(pipe); + + ret = ConnectNamedPipe(pipe, &ol); + err = GetLastError(); + ok(ret == 0, "ret %d\n", ret); + ok(err == ERROR_IO_PENDING, "gle %d\n", err); + CancelIo(pipe); + ret = WaitForSingleObjectEx(ol.hEvent, INFINITE, 1); + ok(ret == WAIT_OBJECT_0, "ret %x\n", ret); + + ret = GetOverlappedResult(pipe, &ol, &num, 1); + err = GetLastError(); + ok(ret == 0, "ret %d\n", ret); + ok(err == ERROR_OPERATION_ABORTED, "gle %d\n", err); + CloseHandle(ol.hEvent); CloseHandle(pipe); return 1;

1 0

Ken Thomases : server: Make disconnecting a named pipe immediately close the client' s connection and allow the server to initiate a new connection.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 780ede1cdeb17ac9136dc2ae0fea103884596dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=780ede1cdeb17ac9136dc2ae0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 20 14:31:50 2016 -0500 server: Make disconnecting a named pipe immediately close the client's connection and allow the server to initiate a new connection. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index cfee4d5..b032901 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -60,7 +60,6 @@ enum pipe_state ps_wait_open, ps_connected_server, ps_wait_disconnect, - ps_disconnected_server, ps_wait_connect }; @@ -344,7 +343,6 @@ static void set_server_state( struct pipe_server *server, enum pipe_state state assert( !server->fd ); set_no_fd_status( server->ioctl_fd, STATUS_PIPE_LISTENING ); break; - case ps_disconnected_server: case ps_wait_connect: assert( !server->fd ); set_no_fd_status( server->ioctl_fd, STATUS_PIPE_DISCONNECTED ); @@ -430,9 +428,6 @@ static void pipe_client_destroy( struct object *obj) do a successful flush without it. */ set_server_state( server, ps_wait_disconnect ); break; - case ps_disconnected_server: - set_server_state( server, ps_wait_connect ); - break; case ps_idle_server: case ps_wait_open: case ps_wait_disconnect: @@ -623,9 +618,6 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a case ps_connected_server: set_error( STATUS_PIPE_CONNECTED ); break; - case ps_disconnected_server: - set_error( STATUS_PIPE_BUSY ); - break; case ps_wait_disconnect: set_error( STATUS_NO_DATA_DETECTED ); break; @@ -644,10 +636,11 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a notify_empty( server ); - /* dump the client and server fds, but keep the pointers - around - client loses all waiting data */ + /* dump the client and server fds - client loses all waiting data */ do_disconnect( server ); - set_server_state( server, ps_disconnected_server ); + server->client->server = NULL; + server->client = NULL; + set_server_state( server, ps_wait_connect ); break; case ps_wait_disconnect: assert( !server->client ); @@ -658,7 +651,6 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, const a case ps_wait_open: set_error( STATUS_PIPE_LISTENING ); break; - case ps_disconnected_server: case ps_wait_connect: set_error( STATUS_PIPE_DISCONNECTED ); break;

1 0

Vincent Povirk : gdiplus: Implement GdipIsOutlineVisiblePathPoint.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 88168d4b3d531da2e707efb8b944365ec22fa0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=88168d4b3d531da2e707efb8b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 20 15:21:28 2016 -0500 gdiplus: Implement GdipIsOutlineVisiblePathPoint. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8ba0016..b6ec88d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1581,17 +1581,49 @@ GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath* path, INT x, INT y, GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath* path, REAL x, REAL y, GpPen *pen, GpGraphics *graphics, BOOL *result) { - static int calls; + GpStatus stat; + GpPath *wide_path; + GpMatrix *transform = NULL; TRACE("(%p,%0.2f,%0.2f,%p,%p,%p)\n", path, x, y, pen, graphics, result); if(!path || !pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + stat = GdipClonePath(path, &wide_path); - return NotImplemented; + if (stat != Ok) + return stat; + + if (pen->unit == UnitPixel && graphics != NULL) + { + stat = GdipCreateMatrix(&transform); + + if (stat == Ok) + stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, transform); + } + + if (stat == Ok) + stat = GdipWidenPath(wide_path, pen, transform, 1.0); + + if (pen->unit == UnitPixel && graphics != NULL) + { + if (stat == Ok) + stat = GdipInvertMatrix(transform); + + if (stat == Ok) + stat = GdipTransformPath(wide_path, transform); + } + + if (stat == Ok) + stat = GdipIsVisiblePathPoint(wide_path, x, y, graphics, result); + + GdipDeleteMatrix(transform); + + GdipDeletePath(wide_path); + + return stat; } GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath* path, INT x, INT y, GpGraphics *graphics, BOOL *result)

1 0

Józef Kucia : wined3d: Introduce wined3d_buffer_load_location().
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 645d3cac14b1303d0152ac6463586ce147c25b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=645d3cac14b1303d0152ac646… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:51 2016 +0200 wined3d: Introduce wined3d_buffer_load_location(). 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 | 66 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 56 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 558be1b..94b290f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -564,25 +564,67 @@ static BOOL wined3d_buffer_prepare_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) +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; - /* Heap_memory exists if the buffer is double buffered or has no buffer object at all. */ - if (buffer->resource.heap_memory) - return buffer->resource.heap_memory; + TRACE("buffer %p, context %p, location %s.\n", + buffer, context, wined3d_debug_location(location)); + + if (buffer->locations & location) + { + TRACE("Location (%#x) is already up to date.\n", location); + return WINED3D_OK; + } + + if (!buffer->locations) + { + ERR("Buffer %p does not have any up to date location.\n", buffer); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_DISCARDED); + return wined3d_buffer_load_location(buffer, context, location); + } + + TRACE("Current buffer location %s.\n", wined3d_debug_location(buffer->locations)); + + if (!wined3d_buffer_prepare_location(buffer, context, location)) + return FALSE; + + if (buffer->locations & WINED3D_LOCATION_DISCARDED) + { + TRACE("Buffer previously discarded, nothing to do.\n"); + wined3d_buffer_validate_location(buffer, location); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); + return TRUE; + } + + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + buffer_bind(buffer, context); + GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, + buffer->resource.heap_memory)); + checkGLcall("buffer download"); + buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + break; - if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_SYSMEM)) - return NULL; + case WINED3D_LOCATION_BUFFER: + FIXME("Not implemented yet.\n"); + return FALSE; - buffer_bind(buffer, context); - GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); - checkGLcall("buffer download"); - buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; + default: + ERR("Invalid location %s.\n", wined3d_debug_location(location)); + return FALSE; + } - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_validate_location(buffer, location); + return TRUE; +} +/* 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); return buffer->resource.heap_memory; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 45a24f1..8001e5e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3185,6 +3185,8 @@ 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; +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, + DWORD location) 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;

1 0

Józef Kucia : wined3d: Introduce wined3d_buffer_prepapre_location().
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 171e272f852465e1d015c79f0ebc632e4643f873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171e272f852465e1d015c79f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:50 2016 +0200 wined3d: Introduce wined3d_buffer_prepapre_location(). 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 | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c7f0d81..558be1b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -538,6 +538,32 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) return refcount; } +static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, DWORD location) +{ + switch (location) + { + case WINED3D_LOCATION_SYSMEM: + if (buffer->resource.heap_memory) + return TRUE; + + if (!wined3d_resource_allocate_sysmem(&buffer->resource)) + { + ERR("Failed to allocate system memory.\n"); + return FALSE; + } + return TRUE; + + case WINED3D_LOCATION_BUFFER: + FIXME("Not implemented yet.\n"); + return FALSE; + + default: + ERR("Invalid location %s.\n", wined3d_debug_location(location)); + return FALSE; + } +} + /* Context activation is done by the caller. */ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) { @@ -547,8 +573,8 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c if (buffer->resource.heap_memory) return buffer->resource.heap_memory; - if (!wined3d_resource_allocate_sysmem(&buffer->resource)) - ERR("Failed to allocate system memory.\n"); + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + return NULL; buffer_bind(buffer, context); GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory));

1 0

Józef Kucia : wined3d: Do not assume that WINED3D_LOCATION_SYSMEM is always valid for double buffered buffers.
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 3c847a20c13d8037c5b1c83e1a112d61a1aa2b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c847a20c13d8037c5b1c83e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:52 2016 +0200 wined3d: Do not assume that WINED3D_LOCATION_SYSMEM is always valid for double buffered buffers. We now have API that allows invalidating 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 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 94b290f..4a4d367 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -975,13 +975,13 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (!buffer->conversion_map) { /* That means that there is nothing to fixup. Just upload from - * buffer->resource.heap_memory directly into the vbo. Do not + * buffer->resource.heap_memory directly into the BO. Do not * free the system memory copy because drawPrimitive may need it if * the stride is 0, for instancing emulation, vertex blending * emulation or shader emulation. */ TRACE("No conversion needed.\n"); - /* Nothing to do because we locked directly into the vbo */ + /* Nothing to do because heap memory exists if the buffer is double buffer or has no BO at all. */ if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) return; @@ -1056,6 +1056,8 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { + struct wined3d_device *device = buffer->resource.device; + struct wined3d_context *context; LONG count; BYTE *base; @@ -1087,6 +1089,13 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) { + if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) + { + context = context_acquire(device, NULL); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + context_release(context); + } + if (!(flags & WINED3D_MAP_READONLY)) wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); } @@ -1097,8 +1106,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI if (count == 1) { - struct wined3d_device *device = buffer->resource.device; - struct wined3d_context *context; const struct wined3d_gl_info *gl_info; context = context_acquire(device, NULL); @@ -1254,6 +1261,11 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ dst_buffer_mem = dst_buffer->resource.heap_memory; src_buffer_mem = src_buffer->resource.heap_memory; + if (dst_buffer_mem && (dst_offset || size != dst_buffer->resource.size)) + wined3d_buffer_load_location(dst_buffer, context, WINED3D_LOCATION_SYSMEM); + if (src_buffer_mem) + wined3d_buffer_load_location(src_buffer, context, WINED3D_LOCATION_SYSMEM); + if (!dst_buffer_mem && !src_buffer_mem) { if (gl_info->supported[ARB_COPY_BUFFER])

1 0

Józef Kucia : wined3d: Prefer current locations to WINED3D_LOCATION_SYSMEM in wined3d_buffer_copy ().
by Alexandre Julliard Oct. 23, 2016

Oct. 23, 2016

Module: wine Branch: master Commit: 6ced2a82930f11a80695ff0a3290e6125af52cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ced2a82930f11a80695ff0a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:58 2016 +0200 wined3d: Prefer current locations to WINED3D_LOCATION_SYSMEM in wined3d_buffer_copy(). 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 | 71 ++++++++++++--------------------------------------- 1 file changed, 17 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 86493db..eae55e1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -111,12 +111,6 @@ static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD 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); @@ -610,31 +604,6 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } -/* Context activation is done by the caller. */ -static void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, - struct wined3d_bo_address *data) -{ - data->buffer_object = buffer->buffer_object; - if (!buffer->buffer_object) - { - if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) - { - wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); - if (buffer->buffer_object) - { - data->buffer_object = buffer->buffer_object; - data->addr = NULL; - return; - } - } - data->addr = buffer->resource.heap_memory; - } - else - { - data->addr = NULL; - } -} - void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data, DWORD locations) { @@ -1269,11 +1238,12 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) 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) { - BYTE *dst_buffer_mem, *src_buffer_mem, *dst_ptr, *src_ptr; - struct wined3d_bo_address dst_bo_address, src_bo_address; const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; struct wined3d_context *context; struct wined3d_device *device; + BYTE *dst_ptr, *src_ptr; + DWORD dst_location; HRESULT hr; device = dst_buffer->resource.device; @@ -1281,24 +1251,17 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ context = context_acquire(device, NULL); gl_info = context->gl_info; - buffer_get_memory(dst_buffer, context, &dst_bo_address); - buffer_get_memory(src_buffer, context, &src_bo_address); - - dst_buffer_mem = dst_buffer->resource.heap_memory; - src_buffer_mem = src_buffer->resource.heap_memory; - - if (dst_buffer_mem && (dst_offset || size != dst_buffer->resource.size)) - wined3d_buffer_load_location(dst_buffer, context, WINED3D_LOCATION_SYSMEM); - if (src_buffer_mem) - wined3d_buffer_load_location(src_buffer, context, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); - if (!dst_buffer_mem && !src_buffer_mem) + if (dst.buffer_object && src.buffer_object) { if (gl_info->supported[ARB_COPY_BUFFER]) { - GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src_bo_address.buffer_object)); - GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst_bo_address.buffer_object)); - GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, src_offset, dst_offset, size)); + GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src.buffer_object)); + GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst.buffer_object)); + GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, + src_offset, dst_offset, size)); checkGLcall("direct buffer copy"); } else @@ -1323,25 +1286,25 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ wined3d_buffer_unmap(dst_buffer); } } - else if (dst_buffer_mem && !src_buffer_mem) + else if (!dst.buffer_object && src.buffer_object) { buffer_bind(src_buffer, context); - GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst_buffer_mem + dst_offset)); + GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst.addr + dst_offset)); checkGLcall("buffer download"); } - else if (!dst_buffer_mem && src_buffer_mem) + else if (dst.buffer_object && !src.buffer_object) { buffer_bind(dst_buffer, context); - GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src_buffer_mem + src_offset)); + GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src.addr + src_offset)); checkGLcall("buffer upload"); } else { - memcpy(dst_buffer_mem + dst_offset, src_buffer_mem + src_offset, size); + memcpy(dst.addr + dst_offset, src.addr + src_offset, size); } - if (dst_buffer_mem) - wined3d_buffer_invalidate_range(dst_buffer, WINED3D_LOCATION_BUFFER, dst_offset, size); + dst_location = dst.buffer_object ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM; + wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); context_release(context); return WINED3D_OK;

1 0