August 2016 - Wine-commits - list.winehq.org

Henri Verbeet : d3d11: Use wined3d_resource_unmap() in d3d10_buffer_Unmap( ).
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: d039ee73f8bca621d50a0f8fa5fdea1e6b9c7870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d039ee73f8bca621d50a0f8fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 31 11:27:51 2016 +0200 d3d11: Use wined3d_resource_unmap() in d3d10_buffer_Unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index a43b6be..1e0469e 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -327,7 +327,7 @@ static void STDMETHODCALLTYPE d3d10_buffer_Unmap(ID3D10Buffer *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(buffer->wined3d_buffer); + wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0); wined3d_mutex_unlock(); }

1 0

Henri Verbeet : wined3d: Use resource mapping functions in process_vertices_strided().
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 7d971714259b5bb89113e4eb4e1325cc4c89213a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d971714259b5bb89113e4eb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 31 11:27:52 2016 +0200 wined3d: Use resource mapping functions in process_vertices_strided(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c2a8c55..3f163a6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2885,6 +2885,8 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO DWORD DestFVF) { struct wined3d_matrix mat, proj_mat, view_mat, world_mat; + struct wined3d_map_desc map_desc; + struct wined3d_box box = {0}; struct wined3d_viewport vp; UINT vertex_size; unsigned int i; @@ -2925,11 +2927,14 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO doClip = FALSE; vertex_size = get_flexible_vertex_size(DestFVF); - if (FAILED(hr = wined3d_buffer_map(dest, dwDestIndex * vertex_size, dwCount * vertex_size, &dest_ptr, 0))) + box.left = dwDestIndex * vertex_size; + box.right = box.left + dwCount * vertex_size; + if (FAILED(hr = wined3d_resource_map(&dest->resource, 0, &map_desc, &box, 0))) { WARN("Failed to map buffer, hr %#x.\n", hr); return hr; } + dest_ptr = map_desc.data; wined3d_device_get_transform(device, WINED3D_TS_VIEW, &view_mat); wined3d_device_get_transform(device, WINED3D_TS_PROJECTION, &proj_mat); @@ -3139,7 +3144,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO } } - wined3d_buffer_unmap(dest); + wined3d_resource_unmap(&dest->resource, 0); return WINED3D_OK; }

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawPrimitive().
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 215e34819d47b4a8f5d14bc62158ccaaee946e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215e34819d47b4a8f5d14bc62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 31 11:27:53 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawPrimitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 09cc5f1..fa194ec 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3501,9 +3501,11 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, DWORD vertex_count, DWORD flags) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; UINT stride, vb_pos, size, align; + struct wined3d_resource *vb; HRESULT hr; - BYTE *data; TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.\n", iface, primitive_type, fvf, vertices, vertex_count, flags); @@ -3531,12 +3533,14 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(data, vertices, size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, vertices, size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);

1 0

Henri Verbeet : ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitive().
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 59de77eaaad628dbade85334a62ad04ce96a974a URL: http://source.winehq.org/git/wine.git/?a=commit;h=59de77eaaad628dbade85334a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 31 11:27:54 2016 +0200 ddraw: Use resource mapping functions in d3d_device7_DrawIndexedPrimitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index fa194ec..55eb981 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3689,8 +3689,10 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, HRESULT hr; UINT stride = get_flexible_vertex_size(fvf); UINT vtx_size = stride * vertex_count, idx_size = index_count * sizeof(*indices); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib, *vb; UINT vb_pos, ib_pos, align; - BYTE *data; TRACE("iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, " "indices %p, index_count %u, flags %#x.\n", @@ -3717,12 +3719,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_size, &data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + vtx_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(data, vertices, vtx_size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, vertices, vtx_size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; hr = d3d_device_prepare_index_buffer(device, idx_size); @@ -3732,12 +3736,14 @@ static HRESULT d3d_device7_DrawIndexedPrimitive(IDirect3DDevice7 *iface, if (device->index_buffer_size - idx_size < ib_pos) ib_pos = 0; - hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &data, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + idx_size; + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(data, indices, idx_size); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, indices, idx_size); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);

1 0

Jacek Caban : d3d10: Removed no loner needed wine_rb_init error handling.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 0f418a698c49d330818cfbf9ea3e714c36c3c3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f418a698c49d330818cfbf9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:31:00 2016 +0200 d3d10: Removed no loner needed wine_rb_init error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 6ca75b6..0cbe667 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -231,13 +231,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return E_OUTOFMEMORY; } - if (wine_rb_init(&object->types, &d3d10_effect_type_rb_functions) == -1) - { - ERR("Failed to initialize type rbtree.\n"); - HeapFree(GetProcessHeap(), 0, object); - return E_FAIL; - } - + wine_rb_init(&object->types, &d3d10_effect_type_rb_functions); object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; object->refcount = 1; ID3D10Device_AddRef(device);

1 0

Jacek Caban : d3d11: Removed no longer needed wine_rb_init error handling.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: c0fa655d9ed276f2a85ceded668b74f459ffac4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0fa655d9ed276f2a85ceded6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:31:23 2016 +0200 d3d11: Removed no longer needed wine_rb_init error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_main.c | 8 +------- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 36 +++++------------------------------- 3 files changed, 7 insertions(+), 39 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index b4a00c8..ef2c40c 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -75,7 +75,6 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba void *device_object, REFIID riid, void **device_layer) { struct d3d_device *object; - HRESULT hr; TRACE("id %#x, layer_base %p, unknown0 %#x, device_object %p, riid %s, device_layer %p\n", id, layer_base, unknown0, device_object, debugstr_guid(riid), device_layer); @@ -88,12 +87,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba } object = *layer_base; - if (FAILED(hr = d3d_device_init(object, device_object))) - { - WARN("Failed to initialize device, hr %#x.\n", hr); - *device_layer = NULL; - return hr; - } + d3d_device_init(object, device_object); *device_layer = &object->IUnknown_inner; TRACE("Created d3d10 device at %p\n", object); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 4af0faa..78cd265 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -518,7 +518,7 @@ static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) return CONTAINING_RECORD(iface, struct d3d_device, ID3D10Device1_iface); } -HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; +void d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ enum dxgi_device_layer_id diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9a42c8b..66f823d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5351,7 +5351,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = d3d_rasterizer_state_compare, }; -HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) +void d3d_device_init(struct d3d_device *device, void *outer_unknown) { device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl; device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl; @@ -5366,39 +5366,13 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext_Release(&device->immediate_context.ID3D11DeviceContext_iface); - if (wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops) == -1) - { - WARN("Failed to initialize blend state rbtree.\n"); - return E_FAIL; - } device->blend_factor[0] = 1.0f; device->blend_factor[1] = 1.0f; device->blend_factor[2] = 1.0f; device->blend_factor[3] = 1.0f; - if (wine_rb_init(&device->depthstencil_states, &d3d_depthstencil_state_rb_ops) == -1) - { - WARN("Failed to initialize depthstencil state rbtree.\n"); - wine_rb_destroy(&device->blend_states, NULL, NULL); - return E_FAIL; - } - - if (wine_rb_init(&device->rasterizer_states, &d3d_rasterizer_state_rb_ops) == -1) - { - WARN("Failed to initialize rasterizer state rbtree.\n"); - wine_rb_destroy(&device->depthstencil_states, NULL, NULL); - wine_rb_destroy(&device->blend_states, NULL, NULL); - return E_FAIL; - } - - if (wine_rb_init(&device->sampler_states, &d3d_sampler_state_rb_ops) == -1) - { - WARN("Failed to initialize sampler state rbtree.\n"); - wine_rb_destroy(&device->rasterizer_states, NULL, NULL); - wine_rb_destroy(&device->depthstencil_states, NULL, NULL); - wine_rb_destroy(&device->blend_states, NULL, NULL); - return E_FAIL; - } - - return S_OK; + wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops); + wine_rb_init(&device->depthstencil_states, &d3d_depthstencil_state_rb_ops); + wine_rb_init(&device->rasterizer_states, &d3d_rasterizer_state_rb_ops); + wine_rb_init(&device->sampler_states, &d3d_sampler_state_rb_ops); }

1 0

Alexandre Julliard : server: Notify all listeners when the contents of the clipboard have changed.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: c6f12bd9ccd048e27d145371537111935b230242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f12bd9ccd048e27d1453715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 16:33:04 2016 +0900 server: Notify all listeners when the contents of the clipboard have changed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 2 +- dlls/user32/tests/clipboard.c | 207 +++++++++++++++++++++++++++++++++++++----- server/clipboard.c | 46 +++++++--- server/queue.c | 27 ++++++ server/user.h | 2 + 5 files changed, 245 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6f12bd9ccd048e27d145…

1 0

Alexandre Julliard : server: Add a helper function to validate a window handle.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 70dd64cf9799c0dd5cae867250c8f7fb7a360ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=70dd64cf9799c0dd5cae86725… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 18:08:36 2016 +0900 server: Add a helper function to validate a window handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/clipboard.c | 42 +++++++++--------------------------------- server/queue.c | 6 ++---- server/user.h | 8 ++++++++ 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index f640b50..a9bbaec 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -258,15 +258,11 @@ static int get_seqno( struct clipboard *clipboard ) DECL_HANDLER(open_clipboard) { struct clipboard *clipboard = get_process_clipboard(); - user_handle_t win = req->window; + user_handle_t win = 0; if (!clipboard) return; + if (req->window && !(win = get_valid_window_handle( req->window ))) return; - if (win && !get_user_object_handle( &win, USER_WINDOW )) - { - set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); - return; - } if (clipboard->open_thread && clipboard->open_win != win) { set_error( STATUS_INVALID_LOCK_SEQUENCE ); @@ -363,21 +359,11 @@ DECL_HANDLER(get_clipboard_info) DECL_HANDLER(set_clipboard_viewer) { struct clipboard *clipboard = get_process_clipboard(); - user_handle_t viewer = req->viewer; - user_handle_t previous = req->previous; + user_handle_t viewer = 0, previous = 0; if (!clipboard) return; - - if (viewer && !get_user_object_handle( &viewer, USER_WINDOW )) - { - set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); - return; - } - if (previous && !get_user_object_handle( &previous, USER_WINDOW )) - { - set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); - return; - } + if (req->viewer && !(viewer = get_valid_window_handle( req->viewer ))) return; + if (req->previous && !(previous = get_valid_window_handle( req->previous ))) return; reply->old_viewer = clipboard->viewer; reply->owner = clipboard->owner_win; @@ -393,15 +379,10 @@ DECL_HANDLER(set_clipboard_viewer) DECL_HANDLER(add_clipboard_listener) { struct clipboard *clipboard = get_process_clipboard(); - user_handle_t win = req->window; + user_handle_t win; if (!clipboard) return; - - if (!get_user_object_handle( &win, USER_WINDOW )) - { - set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); - return; - } + if (!(win = get_valid_window_handle( req->window ))) return; add_listener( clipboard, win ); } @@ -411,15 +392,10 @@ DECL_HANDLER(add_clipboard_listener) DECL_HANDLER(remove_clipboard_listener) { struct clipboard *clipboard = get_process_clipboard(); - user_handle_t win = req->window; + user_handle_t win; if (!clipboard) return; - - if (!get_user_object_handle( &win, USER_WINDOW )) - { - set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); - return; - } + if (!(win = get_valid_window_handle( req->window ))) return; if (!remove_listener( clipboard, win )) set_error( STATUS_INVALID_PARAMETER ); } diff --git a/server/queue.c b/server/queue.c index 387c652..c479b38 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2685,10 +2685,9 @@ DECL_HANDLER(register_hotkey) if (win_handle) { - if (!get_user_object_handle( &win_handle, USER_WINDOW )) + if (!(win_handle = get_valid_window_handle( win_handle ))) { release_object( desktop ); - set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); return; } @@ -2754,10 +2753,9 @@ DECL_HANDLER(unregister_hotkey) if (win_handle) { - if (!get_user_object_handle( &win_handle, USER_WINDOW )) + if (!(win_handle = get_valid_window_handle( win_handle ))) { release_object( desktop ); - set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); return; } diff --git a/server/user.h b/server/user.h index ad62b7d..e7eecd4 100644 --- a/server/user.h +++ b/server/user.h @@ -207,4 +207,12 @@ static inline int intersect_rect( rectangle_t *dst, const rectangle_t *src1, con return (dst->left < dst->right && dst->top < dst->bottom); } +/* validate a window handle and return the full handle */ +static inline user_handle_t get_valid_window_handle( user_handle_t win ) +{ + if (get_user_object_handle( &win, USER_WINDOW )) return win; + set_win32_error( ERROR_INVALID_WINDOW_HANDLE ); + return 0; +} + #endif /* __WINE_SERVER_USER_H */

1 0

Alexandre Julliard : server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN.
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: 438dae524d9410f571f7fe5cc335fb74fec8d2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=438dae524d9410f571f7fe5cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 19:08:23 2016 +0900 server: Avoid some compiler warnings when EWOULDBLOCK == EAGAIN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/request.c | 6 +++--- server/sock.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/request.c b/server/request.c index 597bf88..b937e6f 100644 --- a/server/request.c +++ b/server/request.c @@ -241,7 +241,7 @@ void write_reply( struct thread *thread ) } if (errno == EPIPE) kill_thread( thread, 0 ); /* normal death */ - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "reply write: %s\n", strerror( errno )); } @@ -368,7 +368,7 @@ error: kill_thread( thread, 0 ); else if (ret > 0) fatal_protocol_error( thread, "partial read %d\n", ret ); - else if (errno != EWOULDBLOCK && errno != EAGAIN) + else if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) fatal_protocol_error( thread, "read: %s\n", strerror( errno )); } @@ -449,7 +449,7 @@ int receive_fd( struct process *process ) } else { - if (errno != EWOULDBLOCK && errno != EAGAIN) + if (errno != EWOULDBLOCK && (EWOULDBLOCK == EAGAIN || errno != EAGAIN)) { fprintf( stderr, "Protocol error: process %04x: ", process->id ); perror( "recvmsg" ); diff --git a/server/sock.c b/server/sock.c index dc10d2a..89049e0 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1075,8 +1075,8 @@ static void ifchange_poll_event( struct fd *fd, int event ) r = recv( get_unix_fd(fd), buffer, sizeof(buffer), MSG_DONTWAIT ); if (r < 0) { - if (errno == EWOULDBLOCK || errno == EAGAIN) - return; /* retry when poll() says the socket is ready */ + if (errno == EWOULDBLOCK || (EWOULDBLOCK != EAGAIN && errno == EAGAIN)) + return; /* retry when poll() says the socket is ready */ status = sock_get_ntstatus( errno ); } else if (r > 0)

1 0

Henri Verbeet : d3d9: Use wined3d_resource_map() in d3d9_vertexbuffer_Lock ().
by Alexandre Julliard 30 Aug '16

30 Aug '16

Module: wine Branch: master Commit: a0400a686c148a92dd2191cd619a05686c0cfceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0400a686c148a92dd2191cd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 11:48:19 2016 +0200 d3d9: Use wined3d_resource_map() in d3d9_vertexbuffer_Lock(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 469b345..53f2272 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -183,14 +183,20 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT void **data, DWORD flags) { struct d3d9_vertexbuffer *buffer = impl_from_IDirect3DVertexBuffer9(iface); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); + wined3d_box.left = offset; + wined3d_box.right = offset + size; wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, offset, size, (BYTE **)data, flags); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), + 0, &wined3d_map_desc, &wined3d_box, flags); wined3d_mutex_unlock(); + *data = wined3d_map_desc.data; return hr; }

1 0