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

Henri Verbeet : wined3d: Check for compressed and height scaled formats in texture_init().
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 55b97245707e74196f999240bf06c77236a3c815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b97245707e74196f999240b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 21 17:40:12 2016 +0100 wined3d: Check for compressed and height scaled formats in texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 23 ++--------------------- dlls/wined3d/texture.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5842d52..7878ee0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -518,7 +518,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); } -static HRESULT surface_private_setup(struct wined3d_surface *surface) +static void surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ struct wined3d_texture *texture = surface->container; @@ -546,24 +546,11 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) surface->pow2Width = pow2Width; surface->pow2Height = pow2Height; - if (pow2Width > surface->resource.width || pow2Height > surface->resource.height) - { - /* TODO: Add support for non power two compressed textures. */ - if (texture->resource.format_flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) - { - FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n", - surface, surface->resource.width, surface->resource.height); - return WINED3DERR_NOTAVAILABLE; - } - } - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->locations = WINED3D_LOCATION_DISCARDED; if (wined3d_texture_use_pbo(texture, gl_info)) surface->resource.map_binding = WINED3D_LOCATION_BUFFER; - - return WINED3D_OK; } static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) @@ -4627,13 +4614,7 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex surface->texture_level = level; surface->texture_layer = layer; - /* Call the private setup routine */ - if (FAILED(hr = surface_private_setup(surface))) - { - ERR("Private setup failed, hr %#x.\n", hr); - wined3d_surface_cleanup(surface); - return hr; - } + surface_private_setup(surface); /* Similar to lockable rendertargets above, creating the DIB section * during surface initialization prevents the sysmem pointer from changing diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 588066f..7e28681 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1423,6 +1423,17 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 if (!gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { + const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); + + /* TODO: Add support for non-power-of-two compressed textures. */ + if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] + & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) + { + FIXME("Compressed or height scaled non-power-of-two (%ux%u) textures are not supported.\n", + desc->width, desc->height); + return WINED3DERR_NOTAVAILABLE; + } + /* Find the nearest pow2 match. */ pow2_width = pow2_height = 1; while (pow2_width < desc->width)

1 0

Henri Verbeet : wined3d: Merge surface_private_setup() into wined3d_surface_init().
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 484c9ae45f32d8aef933b8e281025d014ebad008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484c9ae45f32d8aef933b8e28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 21 17:40:13 2016 +0100 wined3d: Merge surface_private_setup() into wined3d_surface_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 60 ++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7878ee0..c11d248 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -518,41 +518,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) surface_invalidate_location(surface, WINED3D_LOCATION_SYSMEM); } -static void surface_private_setup(struct wined3d_surface *surface) -{ - /* TODO: Check against the maximum texture sizes supported by the video card. */ - struct wined3d_texture *texture = surface->container; - const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; - unsigned int pow2Width, pow2Height; - - TRACE("surface %p.\n", surface); - - /* Non-power2 support */ - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] - || gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - pow2Width = surface->resource.width; - pow2Height = surface->resource.height; - } - else - { - /* Find the nearest pow2 match */ - pow2Width = pow2Height = 1; - while (pow2Width < surface->resource.width) - pow2Width <<= 1; - while (pow2Height < surface->resource.height) - pow2Height <<= 1; - } - surface->pow2Width = pow2Width; - surface->pow2Height = pow2Height; - - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - surface->locations = WINED3D_LOCATION_DISCARDED; - - if (wined3d_texture_use_pbo(texture, gl_info)) - surface->resource.map_binding = WINED3D_LOCATION_BUFFER; -} - static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RECT *r) { if ((r->left && r->right) || abs(r->right - r->left) != surface->resource.width) @@ -4556,6 +4521,25 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex unsigned int resource_size; HRESULT hr; + if (container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + { + unsigned int pow2_width = 1, pow2_height = 1; + + /* Find the nearest pow2 match. */ + while (pow2_width < desc->width) + pow2_width <<= 1; + while (pow2_height < desc->height) + pow2_height <<= 1; + + surface->pow2Width = pow2_width; + surface->pow2Height = pow2_height; + } + else + { + surface->pow2Width = desc->width; + surface->pow2Height = desc->height; + } + /* Quick lockable sanity check. * TODO: remove this after surfaces, usage and lockability have been debugged properly * this function is too deep to need to care about things like this. @@ -4614,7 +4598,11 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex surface->texture_level = level; surface->texture_layer = layer; - surface_private_setup(surface); + if (container->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + surface->locations = WINED3D_LOCATION_DISCARDED; + + if (wined3d_texture_use_pbo(container, gl_info)) + surface->resource.map_binding = WINED3D_LOCATION_BUFFER; /* Similar to lockable rendertargets above, creating the DIB section * during surface initialization prevents the sysmem pointer from changing

1 0

Henri Verbeet : d3drm/tests: Properly initialise context.obj in test_Viewport().
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: d868f85ee8fcbf812906e484745df35a54b95eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d868f85ee8fcbf812906e4847… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 21 17:40:14 2016 +0100 d3drm/tests: Properly initialise context.obj in test_Viewport(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 8a125fc..d973d88 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1372,6 +1372,9 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); context.called = 0; + hr = IDirect3DRMViewport_QueryInterface(viewport, &IID_IDirect3DRMObject, (void**)&context.obj); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + IDirect3DRMObject_Release(context.obj); IDirect3DRMViewport_Release(viewport); ok(context.called == 2, "got %d, expected 2\n", context.called); @@ -1436,6 +1439,9 @@ static void test_Viewport(void) ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); context.called = 0; + hr = IDirect3DRMViewport2_QueryInterface(viewport2, &IID_IDirect3DRMObject, (void**)&context.obj); + ok(hr == D3DRM_OK, "expected D3DRM_OK (hr = %x)\n", hr); + IDirect3DRMObject_Release(context.obj); IDirect3DRMViewport2_Release(viewport2); ok(context.called == 2, "got %d, expected 2\n", context.called);

1 0

Stefan Dösinger : wined3d: Avoid storing a transformation matrix pointer in struct wined3d_cs_set_transform.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 1422add1dfca731d7558fa6f9c1a5205952ab07f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1422add1dfca731d7558fa6f9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 21 17:40:15 2016 +0100 wined3d: Avoid storing a transformation matrix pointer in struct wined3d_cs_set_transform. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6809aa2..e36429d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -229,7 +229,7 @@ struct wined3d_cs_set_transform { enum wined3d_cs_op opcode; enum wined3d_transform_state state; - const struct wined3d_matrix *matrix; + struct wined3d_matrix matrix; }; struct wined3d_cs_set_clip_plane @@ -854,7 +854,7 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat { const struct wined3d_cs_set_transform *op = data; - cs->state.transforms[op->state] = *op->matrix; + cs->state.transforms[op->state] = op->matrix; if (op->state < WINED3D_TS_WORLD_MATRIX(cs->device->adapter->d3d_info.limits.ffp_vertex_blend_matrices)) device_invalidate_state(cs->device, STATE_TRANSFORM(op->state)); } @@ -867,7 +867,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_TRANSFORM; op->state = state; - op->matrix = matrix; + op->matrix = *matrix; cs->ops->submit(cs); }

1 0

Piotr Caban : msvcrt: Fix exception parameters number validation in x86_64 __CxxDetectRethrow.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 1a8015cb4d945dbb4495ea114f3a80abe8d32068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a8015cb4d945dbb4495ea114… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 21 18:23:06 2016 +0100 msvcrt: Fix exception parameters number validation in x86_64 __CxxDetectRethrow. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 27d0a15..119680e 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -106,7 +106,7 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) rec = ptrs->ExceptionRecord; if (rec->ExceptionCode == CXX_EXCEPTION && - rec->NumberParameters == 3 && + rec->NumberParameters == 4 && rec->ExceptionInformation[0] == CXX_FRAME_MAGIC_VC6 && rec->ExceptionInformation[2]) {

1 0

Piotr Caban : msvcrt: Dump exception information in x86_64 __CxxFrameHandler.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: 3350364d8b7f44e328c9e8f564a836ad23b4104f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3350364d8b7f44e328c9e8f56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 21 18:23:34 2016 +0100 msvcrt: Dump exception information in x86_64 __CxxFrameHandler. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 157 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 156 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 119680e..d31bc69 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -61,6 +61,160 @@ typedef struct _DISPATCHER_CONTEXT ULONG ScopeIndex; } DISPATCHER_CONTEXT; +typedef struct +{ + int prev; + UINT handler; +} unwind_info; + +typedef struct +{ + UINT flags; + UINT type_info; + int offset; + UINT handler; +} catchblock_info; + +typedef struct +{ + int start_level; + int end_level; + int catch_level; + int catchblock_count; + UINT catchblock; +} tryblock_info; + +typedef struct __cxx_function_descr +{ + UINT magic; + UINT unwind_count; + UINT unwind_table; + UINT tryblock_count; + UINT tryblock; + UINT ipmap_count; + UINT ipmap; + UINT unwind_help; + UINT expect_list; + UINT flags; +} cxx_function_descr; + +static inline void* rva_to_ptr(UINT rva, ULONG64 base) +{ + return rva ? (void*)(base+rva) : NULL; +} + +static inline void dump_type(UINT type_rva, ULONG64 base) +{ + const cxx_type_info *type = rva_to_ptr(type_rva, base); + + TRACE("flags %x type %x %s offsets %d,%d,%d size %d copy ctor %x(%p)\n", + type->flags, type->type_info, dbgstr_type_info(rva_to_ptr(type->type_info, base)), + type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, + type->size, type->copy_ctor, rva_to_ptr(type->copy_ctor, base)); +} + +static void dump_exception_type(const cxx_exception_type *type, ULONG64 base) +{ + const cxx_type_info_table *type_info_table = rva_to_ptr(type->type_info_table, base); + UINT i; + + TRACE("flags %x destr %x(%p) handler %x(%p) type info %x(%p)\n", + type->flags, type->destructor, rva_to_ptr(type->destructor, base), + type->custom_handler, rva_to_ptr(type->custom_handler, base), + type->type_info_table, type_info_table); + for (i = 0; i < type_info_table->count; i++) + { + TRACE(" %d: ", i); + dump_type(type_info_table->info[i], base); + } +} + +static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_base) +{ + unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); + tryblock_info *tryblock = rva_to_ptr(descr->tryblock, image_base); + UINT i, j; + + TRACE("magic %x\n", descr->magic); + TRACE("unwind table: %x(%p) %d\n", descr->unwind_table, unwind_table, descr->unwind_count); + for (i=0; i<descr->unwind_count; i++) + { + TRACE(" %d: prev %d func %x(%p)\n", i, unwind_table[i].prev, + unwind_table[i].handler, rva_to_ptr(unwind_table[i].handler, image_base)); + } + TRACE("try table: %x(%p) %d\n", descr->tryblock, tryblock, descr->tryblock_count); + for (i=0; i<descr->tryblock_count; i++) + { + catchblock_info *catchblock = rva_to_ptr(tryblock[i].catchblock, image_base); + + TRACE(" %d: start %d end %d catchlevel %d catch%x(%p) %d\n", i, + tryblock[i].start_level, tryblock[i].end_level, + tryblock[i].catch_level, tryblock[i].catchblock, + catchblock, tryblock[i].catchblock_count); + for (j=0; j<tryblock[i].catchblock_count; j++) + { + TRACE(" %d: flags %x offset %d handler %x(%p) type %x %s\n", + j, catchblock->flags, catchblock->offset, catchblock->handler, + rva_to_ptr(catchblock->handler, image_base), catchblock->type_info, + dbgstr_type_info(rva_to_ptr(catchblock->type_info, image_base))); + } + } + TRACE("unwind_help %d\n", descr->unwind_help); + TRACE("expect list: %x\n", descr->expect_list); + TRACE("flags: %08x\n", descr->flags); +} + +static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, + CONTEXT *context, DISPATCHER_CONTEXT *dispatch, + const cxx_function_descr *descr) +{ + cxx_exception_type *exc_type; + + if (descr->magic != CXX_FRAME_MAGIC_VC8) + { + FIXME("unhandled frame magic %x\n", descr->magic); + return ExceptionContinueSearch; + } + + if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) + return ExceptionContinueSearch; + if (!descr->tryblock_count) return ExceptionContinueSearch; + + if (rec->ExceptionCode == CXX_EXCEPTION && + rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) + { + *rec = *msvcrt_get_thread_data()->exc_record; + rec->ExceptionFlags &= ~EH_UNWINDING; + if (TRACE_ON(seh)) { + TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + if (rec->ExceptionCode == CXX_EXCEPTION) + TRACE("re-propage: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + } + } + + if (rec->ExceptionCode == CXX_EXCEPTION) + { + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; + + if (TRACE_ON(seh)) + { + TRACE("handling C++ exception rec %p frame %lx unwind_help %d descr %p\n", + rec, frame, *((INT*)(frame+descr->unwind_help)), descr); + dump_exception_type(exc_type, rec->ExceptionInformation[3]); + dump_function_descr(descr, dispatch->ImageBase); + } + } + else + { + exc_type = NULL; + TRACE("handling C exception code %x rec %p frame %lx unwind_help %d descr %p\n", + rec->ExceptionCode, rec, frame, *((INT*)(frame+descr->unwind_help)), descr); + } + + return ExceptionContinueSearch; +} + /********************************************************************* * __CxxExceptionFilter (MSVCRT.@) */ @@ -78,7 +232,8 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { FIXME( "%p %lx %p %p: not implemented\n", rec, frame, context, dispatch ); - return ExceptionContinueSearch; + return cxx_frame_handler( rec, frame, context, dispatch, + rva_to_ptr(*(UINT*)dispatch->HandlerData, dispatch->ImageBase) ); }

1 0

Piotr Caban : msvcrt: Restore exception object stored in thread storage after frames unwinding.
by Alexandre Julliard 22 Mar '16

22 Mar '16

Module: wine Branch: master Commit: fdcdbf306a7339c486c69346bcff0e6d5e0e58a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcdbf306a7339c486c69346b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 21 19:16:02 2016 +0100 msvcrt: Restore exception object stored in thread storage after frames unwinding. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 418c68b..9adda79 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -450,6 +450,7 @@ static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame RtlUnwind( catch_frame ? catch_frame : &frame->frame, 0, rec, 0 ); cxx_local_unwind( frame, descr, tryblock->start_level ); frame->trylevel = tryblock->end_level + 1; + msvcrt_get_thread_data()->exc_record = rec; /* call the catch block */ TRACE( "calling catch block %p addr %p ebp %p\n",

1 0

Józef Kucia : d3d11/tests: Add test for copying buffer resources.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 654337e14d144bbad3774c4c459b8b5d743a8397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654337e14d144bbad3774c4c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:29 2016 +0100 d3d11/tests: Add test for copying buffer resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 89f9c5b..819c547 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4736,12 +4736,15 @@ static void test_copy_subresource_region(void) { ID3D11Texture2D *dst_texture, *src_texture; struct d3d11_test_context test_context; + ID3D11Buffer *dst_buffer, *src_buffer; D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC texture_desc; ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; D3D11_SAMPLER_DESC sampler_desc; + D3D11_BUFFER_DESC buffer_desc; ID3D11DeviceContext *context; + struct vec4 float_colors[16]; struct texture_readback rb; ID3D11PixelShader *ps; ID3D11Device *device; @@ -4776,6 +4779,31 @@ static void test_copy_subresource_region(void) 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; + static const DWORD ps_buffer_code[] = + { +#if 0 + float4 buffer[16]; + + float4 main(float4 position : SV_POSITION) : SV_TARGET + { + float2 p = (float2)4; + p *= float2(position.x / 640.0f, position.y / 480.0f); + return buffer[(int)p.y * 4 + (int)p.x]; + } +#endif + 0x43425844, 0x57e7139f, 0x4f0c9e52, 0x598b77e3, 0x5a239132, 0x00000001, 0x0000016c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x000000d0, 0x00000040, + 0x00000034, 0x04000859, 0x00208e46, 0x00000000, 0x00000010, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, + 0x00000000, 0x00101516, 0x00000000, 0x00004002, 0x3c088889, 0x3bcccccd, 0x00000000, 0x00000000, + 0x0500001b, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x07000029, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x00004001, 0x00000002, 0x0700001e, 0x00100012, 0x00000000, 0x0010000a, + 0x00000000, 0x0010001a, 0x00000000, 0x07000036, 0x001020f2, 0x00000000, 0x04208e46, 0x00000000, + 0x0010000a, 0x00000000, 0x0100003e, + }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; static const DWORD bitmap_data[] = { @@ -4900,10 +4928,91 @@ static void test_copy_subresource_region(void) release_texture_readback(&rb); ID3D11PixelShader_Release(ps); - ID3D11SamplerState_Release(sampler_state); + hr = ID3D11Device_CreatePixelShader(device, ps_buffer_code, sizeof(ps_buffer_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11ShaderResourceView_Release(ps_srv); + ps_srv = NULL; + + ID3D11SamplerState_Release(sampler_state); + sampler_state = NULL; + ID3D11Texture2D_Release(dst_texture); ID3D11Texture2D_Release(src_texture); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &ps_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + buffer_desc.ByteWidth = sizeof(float_colors); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &dst_buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &dst_buffer); + + buffer_desc.ByteWidth = 256 * sizeof(*float_colors); + buffer_desc.BindFlags = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &src_buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + float_colors[j + i * 4].x = ((bitmap_data[j + i * 4] >> 0) & 0xff) / 255.0f; + float_colors[j + i * 4].y = ((bitmap_data[j + i * 4] >> 8) & 0xff) / 255.0f; + float_colors[j + i * 4].z = ((bitmap_data[j + i * 4] >> 16) & 0xff) / 255.0f; + float_colors[j + i * 4].w = ((bitmap_data[j + i * 4] >> 24) & 0xff) / 255.0f; + } + } + set_box(&box, 0, 0, 0, sizeof(float_colors), 1, 1); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)src_buffer, 0, &box, float_colors, 0, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 0, 1); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D11Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 1, 0); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D11Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 0, 0); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D11Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x00000000, 0); + + set_box(&box, 0, 0, 0, sizeof(float_colors), 1, 1); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_buffer, 0, + 0, 0, 0, (ID3D11Resource *)src_buffer, 0, &box); + draw_quad(&test_context); + get_texture_readback(test_context.backbuffer, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_texture_readback(&rb); + + ID3D11Buffer_Release(dst_buffer); + ID3D11Buffer_Release(src_buffer); + ID3D11PixelShader_Release(ps); release_test_context(&test_context); }

1 0

Józef Kucia : wined3d: Prevent possible integer overflow in buffer_invalidate_bo_range().
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 446ee50b904f9caa8556de6cc8607bea6f9a49d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=446ee50b904f9caa8556de6cc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 20 23:15:30 2016 +0100 wined3d: Prevent possible integer overflow in buffer_invalidate_bo_range(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 70a7a20..3d4ab55 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -47,7 +47,7 @@ static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned i if (!offset && (!size || size == buffer->resource.size)) goto invalidate_all; - if (offset > buffer->resource.size || offset + size > buffer->resource.size) + if (offset > buffer->resource.size || size > buffer->resource.size - offset) { WARN("Invalid range specified, invalidating entire buffer.\n"); goto invalidate_all;

1 0

Theodore Dubois : shell32: Fix return value for ASSOCSTR_FRIENDLYDOCNAME and ASSOCSTR_DEFAULTICON when passed a ProgID.
by Alexandre Julliard 21 Mar '16

21 Mar '16

Module: wine Branch: master Commit: 04a339e770e790440042392a2411944bd6b733c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a339e770e790440042392a2… Author: Theodore Dubois <tblodt(a)icloud.com> Date: Wed Mar 16 13:19:50 2016 -0700 shell32: Fix return value for ASSOCSTR_FRIENDLYDOCNAME and ASSOCSTR_DEFAULTICON when passed a ProgID. Signed-off-by: Theodore Dubois <tblodt(a)icloud.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 133 ++++++++++++++++++++++++++++----------------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 90d00a8..a3d21b9 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -88,6 +88,8 @@ static inline struct enumassochandlers *impl_from_IEnumAssocHandlers(IEnumAssocH return CONTAINING_RECORD(iface, struct enumassochandlers, IEnumAssocHandlers_iface); } +static HRESULT ASSOC_GetValue(HKEY hkey, const WCHAR *name, void **data, DWORD *data_size); + /************************************************************************** * IQueryAssociations_QueryInterface * @@ -196,10 +198,16 @@ static HRESULT WINAPI IQueryAssociations_fnInit( FIXME("unsupported flags: %x\n", cfFlags); RegCloseKey(This->hkeySource); - RegCloseKey(This->hkeyProgID); + if (This->hkeySource != This->hkeyProgID) + RegCloseKey(This->hkeyProgID); This->hkeySource = This->hkeyProgID = NULL; + + /* If the process of initializing hkeyProgID fails, just return S_OK. That's what Windows does. */ if (pszAssoc != NULL) { + WCHAR *progId; + HRESULT hr; + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszAssoc, 0, @@ -207,22 +215,51 @@ static HRESULT WINAPI IQueryAssociations_fnInit( &This->hkeySource); if (ret) return S_OK; - /* if this is not a prog id */ - if ((*pszAssoc == '.') || (*pszAssoc == '{')) + /* if this is a progid */ + if (*pszAssoc != '.' && *pszAssoc != '{') { - RegOpenKeyExW(This->hkeySource, - szProgID, - 0, - KEY_READ, - &This->hkeyProgID); - } - else This->hkeyProgID = This->hkeySource; + return S_OK; + } + + /* if it's not a progid, it's a file extension or clsid */ + if (*pszAssoc == '.') + { + /* for a file extension, the progid is the default value */ + hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&progId, NULL); + if (FAILED(hr)) + return S_OK; + } + else /* if (*pszAssoc == '{') */ + { + HKEY progIdKey; + /* for a clsid, the progid is the default value of the ProgID subkey */ + ret = RegOpenKeyExW(This->hkeySource, + szProgID, + 0, + KEY_READ, + &progIdKey); + if (ret != ERROR_SUCCESS) + return S_OK; + hr = ASSOC_GetValue(progIdKey, NULL, (void**)&progId, NULL); + if (FAILED(hr)) + return S_OK; + RegCloseKey(progIdKey); + } + + /* open the actual progid key, the one with the shell subkey */ + ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, + progId, + 0, + KEY_READ, + &This->hkeyProgID); + HeapFree(GetProcessHeap(), 0, progId); + return S_OK; } else if (hkeyProgid != NULL) { - This->hkeyProgID = hkeyProgid; + This->hkeySource = This->hkeyProgID = hkeyProgid; return S_OK; } else @@ -507,33 +544,15 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( case ASSOCSTR_FRIENDLYDOCNAME: { - WCHAR *pszFileType; - DWORD ret; - DWORD size; + WCHAR *docName; - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); - if (FAILED(hr)) - return hr; - size = 0; - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); - if (ret == ERROR_SUCCESS) - { - WCHAR *docName = HeapAlloc(GetProcessHeap(), 0, size); - if (docName) - { - ret = RegGetValueW(HKEY_CLASSES_ROOT, pszFileType, NULL, RRF_RT_REG_SZ, NULL, docName, &size); - if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, docName); - } - else - hr = E_OUTOFMEMORY; + hr = ASSOC_GetValue(This->hkeyProgID, NULL, (void**)&docName, NULL); + if (FAILED(hr)) { + /* hKeyProgID is NULL or there is no default value, so fail */ + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); } - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, pszFileType); + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, docName, strlenW(docName) + 1); + HeapFree(GetProcessHeap(), 0, docName); return hr; } @@ -623,41 +642,33 @@ get_friendly_name_fail: case ASSOCSTR_DEFAULTICON: { static const WCHAR DefaultIconW[] = {'D','e','f','a','u','l','t','I','c','o','n',0}; - WCHAR *pszFileType; + static const WCHAR documentIcon[] = {'s','h','e','l','l','3','2','.','d','l','l',',','0',0}; DWORD ret; DWORD size; - HKEY hkeyFile; - hr = ASSOC_GetValue(This->hkeySource, NULL, (void**)&pszFileType, NULL); - if (FAILED(hr)) - return hr; - ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, pszFileType, 0, KEY_READ, &hkeyFile); + size = 0; + ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); if (ret == ERROR_SUCCESS) { - size = 0; - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, NULL, &size); - if (ret == ERROR_SUCCESS) + WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); + if (icon) { - WCHAR *icon = HeapAlloc(GetProcessHeap(), 0, size); - if (icon) - { - ret = RegGetValueW(hkeyFile, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); - if (ret == ERROR_SUCCESS) - hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, icon); - } + ret = RegGetValueW(This->hkeyProgID, DefaultIconW, NULL, RRF_RT_REG_SZ, NULL, icon, &size); + if (ret == ERROR_SUCCESS) + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, icon, strlenW(icon) + 1); else - hr = E_OUTOFMEMORY; + hr = HRESULT_FROM_WIN32(ret); + HeapFree(GetProcessHeap(), 0, icon); } else - hr = HRESULT_FROM_WIN32(ret); - RegCloseKey(hkeyFile); + hr = E_OUTOFMEMORY; + } else { + /* there is no DefaultIcon subkey or hkeyProgID is NULL, so return the default document icon */ + if (This->hkeyProgID == NULL) + hr = ASSOC_ReturnString(flags, pszOut, pcchOut, documentIcon, strlenW(documentIcon) + 1); + else + return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); } - else - hr = HRESULT_FROM_WIN32(ret); - HeapFree(GetProcessHeap(), 0, pszFileType); return hr; } case ASSOCSTR_SHELLEXTENSION:

1 0