wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

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

31 Aug '16

Module: wine Branch: master Commit: 249b494cce4e281628c43b4855c4dd2584af23dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=249b494cce4e281628c43b485… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:31:44 2016 +0200 wined3d: 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/wined3d/arb_program_shader.c | 24 +++--------------------- dlls/wined3d/ati_fragment_shader.c | 8 +------- dlls/wined3d/device.c | 6 +----- dlls/wined3d/glsl_shader.c | 22 +++------------------- 4 files changed, 8 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c206745..e45f1c4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4993,14 +4993,7 @@ static HRESULT shader_arb_alloc(struct wined3d_device *device, const struct wine memset(priv->pshader_const_dirty, 1, sizeof(*priv->pshader_const_dirty) * d3d_info->limits.ps_uniform_count); - if (wine_rb_init(&priv->signature_tree, &sig_tree_functions) == -1) - { - ERR("RB tree init failed\n"); - fragment_pipe->free_private(device); - vertex_pipe->vp_free(device); - HeapFree(GetProcessHeap(), 0, priv); - return E_OUTOFMEMORY; - } + wine_rb_init(&priv->signature_tree, &sig_tree_functions); priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; @@ -5884,13 +5877,7 @@ static void *arbfp_alloc(const struct wined3d_shader_backend_ops *shader_backend else if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) return NULL; - if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - if (priv != shader_priv) - HeapFree(GetProcessHeap(), 0, priv); - return NULL; - } + wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions); priv->use_arbfp_fixed_func = TRUE; return priv; @@ -7080,12 +7067,7 @@ static HRESULT arbfp_blit_alloc(struct wined3d_device *device) if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) return E_OUTOFMEMORY; - if (wine_rb_init(&priv->shaders, &wined3d_arbfp_blit_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, priv); - return E_OUTOFMEMORY; - } + wine_rb_init(&priv->shaders, &wined3d_arbfp_blit_rb_functions); device->blit_priv = priv; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 6a71c24..e5f65c6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1323,13 +1323,7 @@ static void *atifs_alloc(const struct wined3d_shader_backend_ops *shader_backend if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) return NULL; - if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, priv); - return NULL; - } - + wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions); return priv; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3f163a6..5b80814 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5089,11 +5089,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, fragment_pipeline = adapter->fragment_pipe; - if (wine_rb_init(&device->samplers, &wined3d_sampler_rb_functions) == -1) - { - ERR("Failed to initialize sampler rbtree.\n"); - return E_OUTOFMEMORY; - } + wine_rb_init(&device->samplers, &wined3d_sampler_rb_functions); if (vertex_pipeline->vp_states && fragment_pipeline->states && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ccb027..a5ec999 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8483,11 +8483,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win goto fail; } - if (wine_rb_init(&priv->program_lookup, &wined3d_glsl_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - goto fail; - } + wine_rb_init(&priv->program_lookup, &wined3d_glsl_program_rb_functions); priv->next_constant_version = 1; priv->vertex_pipe = vertex_pipe; @@ -8921,13 +8917,7 @@ static void *glsl_vertex_pipe_vp_alloc(const struct wined3d_shader_backend_ops * if (shader_backend == &glsl_shader_backend) { priv = shader_priv; - - if (wine_rb_init(&priv->ffp_vertex_shaders, &wined3d_ffp_vertex_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - return NULL; - } - + wine_rb_init(&priv->ffp_vertex_shaders, &wined3d_ffp_vertex_program_rb_functions); return priv; } @@ -9447,13 +9437,7 @@ static void *glsl_fragment_pipe_alloc(const struct wined3d_shader_backend_ops *s if (shader_backend == &glsl_shader_backend) { priv = shader_priv; - - if (wine_rb_init(&priv->ffp_fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - return NULL; - } - + wine_rb_init(&priv->ffp_fragment_shaders, &wined3d_ffp_frag_program_rb_functions); return priv; }

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

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

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

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 : 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 : 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 : d3d11: Use wined3d_resource_map() in d3d10_buffer_Map().
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: cec2ff4f86025fba405ee1d17cd2042bb08391c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec2ff4f86025fba405ee1d17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 31 11:27:50 2016 +0200 d3d11: Use wined3d_resource_map() in d3d10_buffer_Map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/buffer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 5a5e66e..a43b6be 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -303,6 +303,7 @@ static UINT STDMETHODCALLTYPE d3d10_buffer_GetEvictionPriority(ID3D10Buffer *ifa static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP map_type, UINT map_flags, void **data) { struct d3d_buffer *buffer = impl_from_ID3D10Buffer(iface); + struct wined3d_map_desc wined3d_map_desc; HRESULT hr; TRACE("iface %p, map_type %u, map_flags %#x, data %p.\n", iface, map_type, map_flags, data); @@ -311,8 +312,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP FIXME("Ignoring map_flags %#x.\n", map_flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, - wined3d_map_flags_from_d3d11_map_type(map_type)); + hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer), 0, + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); + *data = wined3d_map_desc.data; wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : rpcss: Make rpcss a proper service.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 8df5add2d7aac41a9299c100cde7977b3549cfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df5add2d7aac41a9299c100c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 31 22:21:17 2016 +0900 rpcss: Make rpcss a proper service. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/moniker.c | 59 +++++++++++++++------- dlls/rpcrt4/rpc_epmap.c | 61 ++++++++++++++-------- loader/wine.inf.in | 12 ++++- programs/rpcss/Makefile.in | 4 +- programs/rpcss/rpcss_main.c | 120 +++++++++++++++++++++++++------------------- 5 files changed, 163 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8df5add2d7aac41a9299c…

1 0

Sebastian Lackner : advapi32: Unify service startup and control handling.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 1c5affa205ffd71df1581d5ae898e2d8649af0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5affa205ffd71df1581d5ae… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 08:46:20 2016 +0200 advapi32: Unify service startup and control handling. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 65 ++++++++++++++++++++++---------------------- include/wine/svcctl.idl | 9 ++---- programs/services/rpc.c | 8 +++--- programs/services/services.c | 27 ++++++++---------- programs/services/services.h | 3 +- 5 files changed, 52 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5affa205ffd71df1581…

1 0

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 August 2016