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

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

Aug. 31, 2016

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

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

Aug. 31, 2016

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 Aug. 31, 2016

Aug. 31, 2016

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 Aug. 31, 2016

Aug. 31, 2016

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

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

Aug. 31, 2016

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

Sebastian Lackner : services/tests: Add test for passing arguments to a service.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: 328fbb68803c061d62a882fa7d37105dc3663085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=328fbb68803c061d62a882fa7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 08:45:26 2016 +0200 services/tests: Add test for passing arguments to a service. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/tests/service.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index b184bda..66b273c 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -98,9 +98,10 @@ static void WINAPI service_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d\n", argc); - if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); + service_ok(argc == 3, "argc = %u, expected 3\n", argc); + service_ok(!strcmp(argv[0], service_name), "argv[0] = '%s', expected '%s'\n", argv[0], service_name); + service_ok(!strcmp(argv[1], "param1"), "argv[1] = '%s', expected 'param1'\n", argv[1]); + service_ok(!strcmp(argv[2], "param2"), "argv[2] = '%s', expected 'param2'\n", argv[2]); service_handle = pRegisterServiceCtrlHandlerExA(service_name, service_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -194,9 +195,8 @@ static void WINAPI no_stop_main(DWORD argc, char **argv) SERVICE_STATUS status; BOOL res; - service_ok(argc == 1, "argc = %d\n", argc); - if(argc) - service_ok(!strcmp(argv[0], service_name), "argv[0] = %s, expected %s\n", argv[0], service_name); + service_ok(argc == 1, "argc = %u, expected 1\n", argc); + service_ok(!strcmp(argv[0], service_name), "argv[0] = '%s', expected '%s'\n", argv[0], service_name); service_handle = pRegisterServiceCtrlHandlerExA(service_name, no_stop_handler, NULL); service_ok(service_handle != NULL, "RegisterServiceCtrlHandlerEx failed: %u\n", GetLastError()); @@ -278,7 +278,7 @@ static void expect_event(const char *event_name) static DWORD WINAPI pipe_thread(void *arg) { - char buf[257], *ptr; + char buf[512], *ptr; DWORD read; BOOL res; @@ -320,6 +320,7 @@ static DWORD WINAPI pipe_thread(void *arg) static void test_service(void) { + static const char *argv[2] = {"param1", "param2"}; SC_HANDLE service_handle = register_service("simple_service"); SERVICE_STATUS_PROCESS status2; SERVICE_STATUS status; @@ -330,7 +331,7 @@ static void test_service(void) return; trace("starting...\n"); - res = StartServiceA(service_handle, 0, NULL); + res = StartServiceA(service_handle, 2, argv); ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle);

1 0

Jacek Caban : winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: fe6a1d89919a86f2c1fcc1088f75d8486ffbdba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6a1d89919a86f2c1fcc1088… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:41 2016 +0200 winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 34 ++---------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e0c6ba2..154b575 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -262,21 +262,6 @@ static int winemenubuilder_rb_string_compare(const void *key, const struct wine_ return strcmp((char*)key, t->string); } -static void *winemenubuilder_rb_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static void *winemenubuilder_rb_realloc(void *ptr, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); -} - -static void winemenubuilder_rb_free(void *ptr) -{ - HeapFree(GetProcessHeap(), 0, ptr); -} - static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context) { struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry); @@ -284,14 +269,6 @@ static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *contex HeapFree(GetProcessHeap(), 0, t); } -static const struct wine_rb_functions winemenubuilder_rb_functions = -{ - winemenubuilder_rb_alloc, - winemenubuilder_rb_realloc, - winemenubuilder_rb_free, - winemenubuilder_rb_string_compare, -}; - static void write_xml_text(FILE *file, const char *text) { int i; @@ -2538,19 +2515,12 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { static const WCHAR openW[] = {'o','p','e','n',0}; - struct wine_rb_tree mimeProgidTree; - struct list nativeMimeTypes; + struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare }; + struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes); LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; - if (wine_rb_init(&mimeProgidTree, &winemenubuilder_rb_functions)) - { - WINE_ERR("wine_rb_init failed\n"); - return FALSE; - } - - list_init(&nativeMimeTypes); if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n");

1 0

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

Aug. 31, 2016

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 : winhttp: Don' t perform buffer size tests for components that don' t pass buffer in WinHttpCrackUrl.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: 985443ed87a2dcb0bfbe8ba87ea85165391ad3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=985443ed87a2dcb0bfbe8ba87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 20:52:21 2016 +0200 winhttp: Don't perform buffer size tests for components that don't pass buffer in WinHttpCrackUrl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 4 ++- dlls/winhttp/url.c | 93 ++++++++++++++---------------------------------- 2 files changed, 30 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=985443ed87a2dcb0bfbe8…

1 0

Jacek Caban : winedevice: Use static initializer for wine_drivers.
by Alexandre Julliard Aug. 31, 2016

Aug. 31, 2016

Module: wine Branch: master Commit: f40a9d61727914504bdfbc387e997614d35bda43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40a9d61727914504bdfbc387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:30:48 2016 +0200 winedevice: Use static initializer for wine_drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 5011e4f..79d56ec 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -58,7 +58,13 @@ struct wine_driver WCHAR name[1]; }; -static struct wine_rb_tree wine_drivers; +static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); + return strcmpW( (const WCHAR *)key, driver->name ); +} + +static struct wine_rb_tree wine_drivers = { wine_drivers_rb_compare }; static CRITICAL_SECTION drivers_cs; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -69,35 +75,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION drivers_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; -static void *wine_drivers_rb_alloc( size_t size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static void *wine_drivers_rb_realloc( void *ptr, size_t size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); -} - -static void wine_drivers_rb_free( void *ptr ) -{ - HeapFree( GetProcessHeap(), 0, ptr ); -} - -static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) -{ - const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); - return strcmpW( (const WCHAR *)key, driver->name ); -} - -static const struct wine_rb_functions wine_drivers_rb_functions = -{ - wine_drivers_rb_alloc, - wine_drivers_rb_realloc, - wine_drivers_rb_free, - wine_drivers_rb_compare, -}; - /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) { @@ -534,8 +511,6 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) const WCHAR *driver_name = argv[0]; NTSTATUS status; - if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) - return; if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return; if (!(cleanup_group = CreateThreadpoolCleanupGroup()))

1 0