April 2017 - Wine-Commits - list.winehq.org

Christian Inci : ntdll/tests: Check debug registers of a newly created thread.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 8335d9152f64a51ffc3ba810d6ea0286883e3e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8335d9152f64a51ffc3ba810d… Author: Christian Inci <chris.wine(a)broke-the-inter.net> Date: Sun Apr 9 20:22:34 2017 +0200 ntdll/tests: Check debug registers of a newly created thread. Signed-off-by: Christian Inci <chris.wine(a)broke-the-inter.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3abec1b..27eac27 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1991,6 +1991,11 @@ static void test___C_specific_handler(void) #if defined(__i386__) || defined(__x86_64__) +static DWORD WINAPI dummy_thread(void *arg) +{ + return 0; +} + static void test_debug_registers(void) { static const struct @@ -2004,6 +2009,7 @@ static void test_debug_registers(void) }; NTSTATUS status; CONTEXT ctx; + HANDLE thread; int i; for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) @@ -2032,6 +2038,30 @@ static void test_debug_registers(void) ok((ctx.Dr6 & 0xf00f) == tests[i].dr6, "test %d: expected %lx, got %lx\n", i, tests[i].dr6, (DWORD_PTR)ctx.Dr6); ok((ctx.Dr7 & ~0xdc00) == tests[i].dr7, "test %d: expected %lx, got %lx\n", i, tests[i].dr7, (DWORD_PTR)ctx.Dr7); } + + memset(&ctx, 0, sizeof(ctx)); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + ctx.Dr0 = 0xffffffff; + ctx.Dr1 = 0xffffffff; + ctx.Dr2 = 0xffffffff; + ctx.Dr3 = 0xffffffff; + ctx.Dr6 = 0xffffffff; + ctx.Dr7 = 0x00000400; + status = pNtSetContextThread(GetCurrentThread(), &ctx); + ok(status == STATUS_SUCCESS, "NtSetContextThread failed with %x\n", status); + thread = CreateThread(NULL, 0, dummy_thread, NULL, CREATE_SUSPENDED, NULL); + ok(thread != INVALID_HANDLE_VALUE, "CreateThread failed with %d\n", GetLastError()); + ctx.ContextFlags = CONTEXT_DEBUG_REGISTERS; + status = pNtGetContextThread(thread, &ctx); + ok(status == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", status); + ok(!ctx.Dr0, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr0); + ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); + ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); + ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); + todo_wine ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); + todo_wine ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + TerminateThread(thread, 0); + CloseHandle(thread); } static DWORD outputdebugstring_exceptions;

1 0

Zebediah Figura : winedump: Correctly process options for default mode.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 027ccc6c4c2c44418aab6aa981e481a9992590d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027ccc6c4c2c44418aab6aa98… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 7 15:25:31 2017 -0500 winedump: Correctly process options for default mode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index a4ebb43..a5ab2bb 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -210,6 +210,13 @@ static const struct my_option option_table[] = { {"--help",NONE, 0, do_usage, "--help Display this help message"}, {"-h", NONE, 0, do_usage, "-h Synonym for --help"}, {"-?", NONE, 0, do_usage, "-? Synonym for --help"}, + {"dump", DUMP, 0, do_dump, "dump <file> Dump the contents of 'file' (dll, exe, lib...)"}, + {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, + {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, + {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, + {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, loadcfg, clr, reloc, except)"}, + {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, + {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {"sym", DMGL, 0, do_demangle, "sym <sym> Demangle C++ symbol <sym> and exit"}, {"spec", SPEC, 0, do_spec, "spec <dll> Use 'dll' for input file and generate implementation code"}, {"-I", SPEC, 1, do_include, "-I <dir> Look for prototypes in 'dir' (implies -c)"}, @@ -224,13 +231,6 @@ static const struct my_option option_table[] = { {"-S", SPEC, 1, do_symfile, "-S <symfile> Search only prototype names found in 'symfile'"}, {"-q", SPEC, 0, do_quiet, "-q Don't show progress (quiet)."}, {"-v", SPEC, 0, do_verbose, "-v Show lots of detail while working (verbose)."}, - {"dump", DUMP, 0, do_dump, "dump <file> Dump the contents of 'file' (dll, exe, lib...)"}, - {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, - {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, - {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name' (import, export, debug, resource, tls, loadcfg, clr, reloc, except)"}, - {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, - {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {NULL, NONE, 0, NULL, NULL} };

1 0

Bruno Jesus : dinput: Assume a 1-to-1 axes map when no axes match.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: e87ccb8b055dc846211967e46ee2f17fbabef7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87ccb8b055dc846211967e46… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Sun Apr 9 22:25:35 2017 -0300 dinput: Assume a 1-to-1 axes map when no axes match. The wiimote is a well known problematic device, mainly because it is not a joystick. It is a USB device. But the classic controller is at least advertised as a joystick with 6 axes and 11 buttons (js driver only, NO event). Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1f8f94d..1032659 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -228,19 +228,36 @@ static INT find_joystick_devices(void) else if ((joydev.dev_axes_map = HeapAlloc(GetProcessHeap(), 0, joydev.axis_count * sizeof(int)))) { - INT j; + INT j, found_axes = 0; /* Remap to DI numbers */ for (j = 0; j < joydev.axis_count; j++) + { if (axes_map[j] < 8) + { /* Axis match 1-to-1 */ joydev.dev_axes_map[j] = j; + found_axes++; + } else if (axes_map[j] == 16 || axes_map[j] == 17) + { /* POV axis */ joydev.dev_axes_map[j] = 8; + found_axes++; + } else joydev.dev_axes_map[j] = -1; + } + + /* If no axes were configured but there are axes assume a 1-to-1 (wii controller) */ + if (joydev.axis_count && !found_axes) + { + ERR("Incoherent joystick data, advertised %d axes, detected 0. Assuming 1-to-1.\n", + joydev.axis_count); + for (j = 0; j < joydev.axis_count; j++) + joydev.dev_axes_map[j] = j; + } } /* Find vendor_id and product_id in sysfs */

1 0

Nikolay Sivov : ole32/tests: Test pointer returned by ProgIDFromCLSID() on failure.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 3237c5ed84764c8a196bd04e61e37d53ca940b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3237c5ed84764c8a196bd04e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 07:37:28 2017 +0300 ole32/tests: Test pointer returned by ProgIDFromCLSID() on failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 20d2962..e585a46 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -356,11 +356,13 @@ static void test_ProgIDFromCLSID(void) CoTaskMemFree(progid); /* classes without default progid, progid list is not used */ + progid = (void *)0xdeadbeef; hr = ProgIDFromCLSID(&IID_Testiface5, &progid); - ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG && progid == NULL, "got 0x%08x, progid %p\n", hr, progid); + progid = (void *)0xdeadbeef; hr = ProgIDFromCLSID(&IID_Testiface6, &progid); - ok(hr == REGDB_E_CLASSNOTREG, "got 0x%08x\n", hr); + ok(hr == REGDB_E_CLASSNOTREG && progid == NULL, "got 0x%08x, progid %p\n", hr, progid); pDeactivateActCtx(0, cookie); pReleaseActCtx(handle);

1 0

Nikolay Sivov : msxml3: Improve error handling (Coverity).
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: d7d5d93e8601bdedcffde0ad04af178d8890bfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d5d93e8601bdedcffde0ad0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 10 07:37:25 2017 +0300 msxml3: Improve error handling (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/stylesheet.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 4c4f60e..9863ed7 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -570,9 +570,8 @@ static HRESULT WINAPI xslprocessor_transform( TRACE("(%p)->(%p)\n", This, ret); - if (!ret) return E_INVALIDARG; - - SysFreeString(This->outstr); + if (!ret) + return E_INVALIDARG; if (This->output_type == PROCESSOR_OUTPUT_STREAM) { @@ -582,9 +581,12 @@ static HRESULT WINAPI xslprocessor_transform( else if (This->output_type == PROCESSOR_OUTPUT_PERSISTSTREAM || This->output_type == PROCESSOR_OUTPUT_RESPONSE) { - CreateStreamOnHGlobal(NULL, TRUE, (IStream **)&stream); + if (FAILED(hr = CreateStreamOnHGlobal(NULL, TRUE, (IStream **)&stream))) + return hr; } + SysFreeString(This->outstr); + hr = node_transform_node_params(get_node_obj(This->input), This->stylesheet->node, &This->outstr, stream, &This->params); if (SUCCEEDED(hr)) @@ -612,7 +614,8 @@ static HRESULT WINAPI xslprocessor_transform( DWORD size; void *dest; - GetHGlobalFromStream(src, &hglobal); + if (FAILED(hr = GetHGlobalFromStream(src, &hglobal))) + break; size = GlobalSize(hglobal); bound.lLbound = 0;

1 0

Henri Verbeet : wined3d: Merge wined3d_device_update_texture_3d() into wined3d_device_update_texture().
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 97fee99cb44680a29eb616050a7f6b8a91f2ffa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fee99cb44680a29eb616050… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 9 22:36:41 2017 +0200 wined3d: Merge wined3d_device_update_texture_3d() into wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 73 +++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6269590..ce02af4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3538,52 +3538,16 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device start_idx, index_count, start_instance, instance_count, TRUE); } -static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, - struct wined3d_texture *src_texture, unsigned int src_level, - struct wined3d_texture *dst_texture, unsigned int level_count) -{ - unsigned int row_pitch, slice_pitch, i; - HRESULT hr = WINED3DERR_INVALIDCALL; - struct wined3d_context *context; - struct wined3d_bo_address data; - - TRACE("device %p, src_texture %p, src_level %u, dst_texture %p, level_count %u.\n", - device, src_texture, src_level, dst_texture, level_count); - - context = context_acquire(device, NULL, 0); - - /* Only a prepare, since we're uploading entire volumes. */ - wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - - for (i = 0; i < level_count; ++i) - { - if (!wined3d_texture_load_location(src_texture, src_level + i, - context, src_texture->resource.map_binding)) - goto done; - - wined3d_texture_get_memory(src_texture, src_level + i, &data, src_texture->resource.map_binding); - wined3d_texture_get_pitch(src_texture, src_level + i, &row_pitch, &slice_pitch); - - wined3d_texture_upload_data(dst_texture, i, context, NULL, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); - wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - hr = WINED3D_OK; -done: - context_release(context); - return hr; -} - HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture) { unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int layer_count, level_count, i, j; + unsigned int row_pitch, slice_pitch; enum wined3d_resource_type type; - HRESULT hr; struct wined3d_context *context; + struct wined3d_bo_address data; + HRESULT hr; RECT r; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -3701,10 +3665,33 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } case WINED3D_RTYPE_TEXTURE_3D: - if (FAILED(hr = wined3d_device_update_texture_3d(device, - src_texture, src_skip_levels, dst_texture, level_count))) - WARN("Failed to update 3D texture, hr %#x.\n", hr); - return hr; + context = context_acquire(device, NULL, 0); + + /* Only a prepare, since we're uploading entire volumes. */ + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + + for (j = 0; j < level_count; ++j) + { + if (!wined3d_texture_load_location(src_texture, src_skip_levels + j, + context, src_texture->resource.map_binding)) + { + WARN("Failed to load source sub-resource %u into %s.\n", src_skip_levels + j, + wined3d_debug_location(src_texture->resource.map_binding)); + context_release(context); + return WINED3DERR_INVALIDCALL; + } + + wined3d_texture_get_memory(src_texture, src_skip_levels + j, &data, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, src_skip_levels + j, &row_pitch, &slice_pitch); + + wined3d_texture_upload_data(dst_texture, j, context, NULL, + wined3d_const_bo_address(&data), row_pitch, slice_pitch); + wined3d_texture_invalidate_location(dst_texture, j, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + context_release(context); + return WINED3D_OK; default: FIXME("Unsupported texture type %#x.\n", type);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_memory() in wined3d_device_update_texture_3d().
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: d59a64d55f53ca8a46024cd674a484711ef513f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59a64d55f53ca8a46024cd67… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 9 22:36:40 2017 +0200 wined3d: Use wined3d_texture_get_memory() in wined3d_device_update_texture_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c94e88b..6269590 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3542,11 +3542,10 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, struct wined3d_texture *src_texture, unsigned int src_level, struct wined3d_texture *dst_texture, unsigned int level_count) { - struct wined3d_const_bo_address data; + unsigned int row_pitch, slice_pitch, i; + HRESULT hr = WINED3DERR_INVALIDCALL; struct wined3d_context *context; - struct wined3d_map_desc src; - HRESULT hr = WINED3D_OK; - unsigned int i; + struct wined3d_bo_address data; TRACE("device %p, src_texture %p, src_level %u, dst_texture %p, level_count %u.\n", device, src_texture, src_level, dst_texture, level_count); @@ -3559,19 +3558,19 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, for (i = 0; i < level_count; ++i) { - if (FAILED(hr = wined3d_resource_map(&src_texture->resource, - src_level + i, &src, NULL, WINED3D_MAP_READONLY))) + if (!wined3d_texture_load_location(src_texture, src_level + i, + context, src_texture->resource.map_binding)) goto done; - data.buffer_object = 0; - data.addr = src.data; - wined3d_texture_upload_data(dst_texture, i, context, NULL, &data, src.row_pitch, src.slice_pitch); - wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_get_memory(src_texture, src_level + i, &data, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, src_level + i, &row_pitch, &slice_pitch); - if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i))) - goto done; + wined3d_texture_upload_data(dst_texture, i, context, NULL, + wined3d_const_bo_address(&data), row_pitch, slice_pitch); + wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); } + hr = WINED3D_OK; done: context_release(context); return hr;

1 0

Matteo Bruni : include: Add comments for render states added with newer D3D versions.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 1bde74854991cbc5975aef147be87b7df79a637d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bde74854991cbc5975aef147… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 9 21:03:35 2017 +0200 include: Add comments for render states added with newer D3D versions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dtypes.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3dtypes.h b/include/d3dtypes.h index 75aee55..fe7f3b2 100644 --- a/include/d3dtypes.h +++ b/include/d3dtypes.h @@ -867,6 +867,7 @@ typedef enum { D3DRENDERSTATE_FOGEND = 37, D3DRENDERSTATE_FOGDENSITY = 38, D3DRENDERSTATE_STIPPLEENABLE = 39, + /* d3d5 */ D3DRENDERSTATE_EDGEANTIALIAS = 40, D3DRENDERSTATE_COLORKEYENABLE = 41, D3DRENDERSTATE_BORDERCOLOR = 43, @@ -877,6 +878,7 @@ typedef enum { D3DRENDERSTATE_RANGEFOGENABLE = 48, D3DRENDERSTATE_ANISOTROPY = 49, D3DRENDERSTATE_FLUSHBATCH = 50, + /* d3d6 */ D3DRENDERSTATE_TRANSLUCENTSORTINDEPENDENT = 51, D3DRENDERSTATE_STENCILENABLE = 52, @@ -930,6 +932,7 @@ typedef enum { D3DRENDERSTATE_WRAP5 = 133, D3DRENDERSTATE_WRAP6 = 134, D3DRENDERSTATE_WRAP7 = 135, + /* d3d7 */ D3DRENDERSTATE_CLIPPING = 136, D3DRENDERSTATE_LIGHTING = 137, D3DRENDERSTATE_EXTENTS = 138,

1 0

Henri Verbeet : wined3d: Validate that the source and destination dimensions match in wined3d_device_update_texture ().
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 114114f137530d9c8daaec54a10ff04e53878b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=114114f137530d9c8daaec54a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 9 22:36:39 2017 +0200 wined3d: Validate that the source and destination dimensions match in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bd07053..c94e88b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3551,14 +3551,6 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, TRACE("device %p, src_texture %p, src_level %u, dst_texture %p, level_count %u.\n", device, src_texture, src_level, dst_texture, level_count); - if (wined3d_texture_get_level_width(src_texture, src_level) != dst_texture->resource.width - || wined3d_texture_get_level_height(src_texture, src_level) != dst_texture->resource.height - || wined3d_texture_get_level_depth(src_texture, src_level) != dst_texture->resource.depth) - { - WARN("Source and destination dimensions do not match.\n"); - return WINED3DERR_INVALIDCALL; - } - context = context_acquire(device, NULL, 0); /* Only a prepare, since we're uploading entire volumes. */ @@ -3652,6 +3644,14 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, ++src_skip_levels; } + if (wined3d_texture_get_level_width(src_texture, src_skip_levels) != dst_texture->resource.width + || wined3d_texture_get_level_height(src_texture, src_skip_levels) != dst_texture->resource.height + || wined3d_texture_get_level_depth(src_texture, src_skip_levels) != dst_texture->resource.depth) + { + WARN("Source and destination dimensions do not match.\n"); + return WINED3DERR_INVALIDCALL; + } + /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL, 0); wined3d_texture_load(dst_texture, context, FALSE);

1 0

André Hentschel : ntdll: Bump Win 10 version to 15063.
by Alexandre Julliard April 10, 2017

April 10, 2017

Module: wine Branch: master Commit: 72aecacf94d93fa640de761d2866490276fe07d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72aecacf94d93fa640de761d2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 8 16:15:43 2017 +0200 ntdll: Bump Win 10 version to 15063. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 1fa40e0..58ccb95 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index d272d1c..a08542a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0