wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Iván Matellanes : msvcirt: Add a partial implementation of class strstream.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 4df13fff82a75eb59105e61cafb3a0961379a5a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df13fff82a75eb59105e61ca… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Oct 21 19:34:01 2016 +0200 msvcirt: Add a partial implementation of class strstream. 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 | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 46 +++++++++++++++--------------- dlls/msvcrt20/msvcrt20.spec | 46 +++++++++++++++--------------- dlls/msvcrt40/msvcrt40.spec | 46 +++++++++++++++--------------- 4 files changed, 138 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4df13fff82a75eb59105e…

1 0

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

23 Oct '16

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

Michael Stefaniuc : mshtml/tests: Use EqualRect() to compare RECTs.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: d930b57ded7b80c2a77d546ae2959bd1e918a60a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d930b57ded7b80c2a77d546ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 20 10:19:08 2016 +0200 mshtml/tests: 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/tests/activex.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index bd1a0cd..78602b7 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1149,8 +1149,8 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms ok(ip_frame != NULL, "ip_frame == NULL\n"); ok(ip_uiwindow != NULL, "ip_uiwindow == NULL\n"); ok((IOleInPlaceUIWindow*)ip_frame != ip_uiwindow, "ip_frame == ip_uiwindow\n"); - ok(!memcmp(&pos_rect, lprcPosRect, sizeof(RECT)), "pos_rect != lpecPosRect\n"); - ok(!memcmp(&clip_rect, lprcPosRect, sizeof(RECT)), "clip_rect != lpecPosRect\n"); + ok(EqualRect(&pos_rect, lprcPosRect), "pos_rect != lpecPosRect\n"); + ok(EqualRect(&clip_rect, lprcPosRect), "clip_rect != lpecPosRect\n"); ok(frame_info.cb == sizeof(frame_info), "frame_info.cb = %d\n", frame_info.cb); ok(!frame_info.fMDIApp, "frame_info.fMDIApp = %x\n", frame_info.fMDIApp); ok(frame_info.hwndFrame != NULL, "frame_info.hwnd == NULL\n");

1 0

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

23 Oct '16

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 23 Oct '16

23 Oct '16

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 23 Oct '16

23 Oct '16

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: Prefer current locations to WINED3D_LOCATION_SYSMEM in wined3d_buffer_copy ().
by Alexandre Julliard 23 Oct '16

23 Oct '16

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

Józef Kucia : wined3d: Introduce wined3d_buffer_get_memory().
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 2e15ae85a1f7f0799a296cd8b7627a4ec5e2db3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e15ae85a1f7f0799a296cd8b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:57 2016 +0200 wined3d: Introduce wined3d_buffer_get_memory(). 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 | 26 +++++++++++++++++++++++++- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e559586..86493db 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -611,7 +611,7 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c } /* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, +static void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) { data->buffer_object = buffer->buffer_object; @@ -635,6 +635,30 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co } } +void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, + struct wined3d_bo_address *data, DWORD locations) +{ + TRACE("buffer %p, data %p, locations %s.\n", + buffer, data, wined3d_debug_location(locations)); + + if (locations & WINED3D_LOCATION_BUFFER) + { + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; + } + if (locations & WINED3D_LOCATION_SYSMEM) + { + data->buffer_object = 0; + data->addr = buffer->resource.heap_memory; + return; + } + + ERR("Unexpected locations %s.\n", wined3d_debug_location(locations)); + data->buffer_object = 0; + data->addr = NULL; +} + static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1ca12bc..88d34e6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3201,7 +3201,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { wined3d_buffer_load(buffer, context, state); - buffer_get_memory(buffer, context, &data); + wined3d_buffer_get_memory(buffer, &data, buffer->locations); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8001e5e..4e7bb88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3179,9 +3179,9 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -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_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; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_BUFFER.
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 4e7ef680e3cecaeccb96a0e827f97019efa751cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7ef680e3cecaeccb96a0e82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:54 2016 +0200 wined3d: Implement wined3d_buffer_prepare_location() for WINED3D_LOCATION_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 | 104 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8f356d8..e559586 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -162,20 +162,20 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g } /* Context activation is done by the caller. */ -static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) +static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) { - GLenum gl_usage = GL_STATIC_DRAW_ARB; - GLenum error; const struct wined3d_gl_info *gl_info = context->gl_info; + GLenum gl_usage = GL_STATIC_DRAW; + GLenum error; - TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", - This, debug_d3dusage(This->resource.usage)); + TRACE("Creating an OpenGL buffer object for wined3d_buffer %p with usage %s.\n", + buffer, debug_d3dusage(buffer->resource.usage)); /* Make sure that the gl error is cleared. Do not use checkGLcall - * here because checkGLcall just prints a fixme and continues. However, - * if an error during VBO creation occurs we can fall back to non-vbo operation - * with full functionality(but performance loss) - */ + * here because checkGLcall just prints a fixme and continues. However, + * if an error during VBO creation occurs we can fall back to non-VBO operation + * with full functionality(but performance loss). + */ while (gl_info->gl_ops.gl.p_glGetError() != GL_NO_ERROR); /* Basically the FVF parameter passed to CreateVertexBuffer is no good. @@ -184,72 +184,72 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine * to be verified to check if the rhw and color values are in the correct * format. */ - GL_EXTCALL(glGenBuffers(1, &This->buffer_object)); + GL_EXTCALL(glGenBuffers(1, &buffer->buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); - if (!This->buffer_object || error != GL_NO_ERROR) + if (!buffer->buffer_object || error != GL_NO_ERROR) { - ERR("Failed to create a VBO with error %s (%#x)\n", debug_glerror(error), error); + ERR("Failed to create a BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - buffer_bind(This, context); + buffer_bind(buffer, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { - ERR("Failed to bind the VBO with error %s (%#x)\n", debug_glerror(error), error); + ERR("Failed to bind the BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - if (This->resource.usage & WINED3DUSAGE_DYNAMIC) + if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) { TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); gl_usage = GL_STREAM_DRAW_ARB; - if(gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)"); - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)"); - This->flags |= WINED3D_BUFFER_APPLESYNC; + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + checkGLcall("glBufferParameteriAPPLE"); + buffer->flags |= WINED3D_BUFFER_APPLESYNC; } - /* No setup is needed here for GL_ARB_map_buffer_range */ + /* No setup is needed here for GL_ARB_map_buffer_range. */ } /* Reserve memory for the buffer. The amount of data won't change * so we are safe with calling glBufferData once and * calling glBufferSubData on updates. Upload the actual data in case - * we're not double buffering, so we can release the heap mem afterwards + * we're not double buffering, so we can release the heap mem afterwards. */ - GL_EXTCALL(glBufferData(This->buffer_type_hint, This->resource.size, This->resource.heap_memory, gl_usage)); + GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, buffer->resource.heap_memory, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { - ERR("glBufferData failed with error %s (%#x)\n", debug_glerror(error), error); + ERR("glBufferData failed with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - This->buffer_object_usage = gl_usage; + buffer->buffer_object_usage = gl_usage; - if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) + if (buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER) { - buffer_invalidate_bo_range(This, 0, 0); + buffer_invalidate_bo_range(buffer, 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); + wined3d_resource_free_sysmem(&buffer->resource); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); } - return; + return TRUE; 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"); - This->flags &= ~WINED3D_BUFFER_USE_BO; - delete_gl_buffer(This, gl_info); - buffer_clear_dirty_areas(This); + /* Clean up all BO init, but continue because we can work without a BO :-) */ + ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); + buffer->flags &= ~WINED3D_BUFFER_USE_BO; + delete_gl_buffer(buffer, gl_info); + buffer_clear_dirty_areas(buffer); + return FALSE; } static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, @@ -530,8 +530,15 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, return TRUE; case WINED3D_LOCATION_BUFFER: - FIXME("Not implemented yet.\n"); - return FALSE; + if (buffer->buffer_object) + return TRUE; + + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); + return FALSE; + } + return buffer_create_buffer_object(buffer, context); default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); @@ -612,7 +619,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co { if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !buffer->resource.map_count) { - buffer_create_buffer_object(buffer, context); + wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); if (buffer->buffer_object) { data->buffer_object = buffer->buffer_object; @@ -878,20 +885,15 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * buffer_mark_used(buffer); - if (!buffer->buffer_object) + /* TODO: Make converting independent from VBOs */ + if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) { - /* TODO: Make converting independent from VBOs */ - if (buffer->flags & WINED3D_BUFFER_USE_BO) - { - buffer_create_buffer_object(buffer, context); - } - else - { - /* Not doing any conversion */ - return; - } + /* Not doing any conversion */ + return; } + wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER); + /* Reading the declaration makes only sense if we have valid state information * (i.e., if this function is called during draws). */ if (state)

1 0

Józef Kucia : wined3d: Move buffer_get_memory() under wined3d_buffer_load_sysmem().
by Alexandre Julliard 23 Oct '16

23 Oct '16

Module: wine Branch: master Commit: 8db3b5512e034ee448bbbb7631e4cd79cc362edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db3b5512e034ee448bbbb763… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 20 12:50:53 2016 +0200 wined3d: Move buffer_get_memory() under 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 | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4a4d367..8f356d8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -504,31 +504,6 @@ static inline unsigned int fixup_transformed_pos(float *p) return 4 * sizeof(*p); } -/* Context activation is done by the caller. */ -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) - { - buffer_create_buffer_object(buffer, context); - if (buffer->buffer_object) - { - data->buffer_object = buffer->buffer_object; - data->addr = NULL; - return; - } - } - data->addr = buffer->resource.heap_memory; - } - else - { - data->addr = NULL; - } -} - ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedIncrement(&buffer->resource.ref); @@ -628,6 +603,31 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } +/* Context activation is done by the caller. */ +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) + { + buffer_create_buffer_object(buffer, context); + if (buffer->buffer_object) + { + data->buffer_object = buffer->buffer_object; + data->addr = NULL; + return; + } + } + data->addr = buffer->resource.heap_memory; + } + else + { + data->addr = NULL; + } +} + static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2016