wine-commits May 2020

1 participants
743 discussions

Martin Storsjo : ntdll: Fix byte vs register units in unwind_packed_data.

by Alexandre Julliard

Module: wine Branch: master Commit: d6e9795223f0c978132342d77b36f8284ab1aed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e9795223f0c978132342d7… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:39 2020 +0300 ntdll: Fix byte vs register units in unwind_packed_data. restore_regs and restore_fpregs take offsets in units of registers, not bytes. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 7a3625b706..8ccf3da57e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1517,6 +1517,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION int i; unsigned int len, offset, skip = 0; unsigned int int_size = func->u.s.RegI * 8, fp_size = func->u.s.RegF * 8, regsave, local_size; + unsigned int int_regs, fp_regs, saved_regs, local_size_regs; TRACE( "function %lx-%lx: len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", base + func->BeginAddress, base + func->BeginAddress + func->u.s.FunctionLength * 4, @@ -1529,6 +1530,11 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION regsave = ((int_size + fp_size + 8 * 8 * func->u.s.H) + 0xf) & ~0xf; local_size = func->u.s.FrameSize * 16 - regsave; + int_regs = int_size / 8; + fp_regs = fp_size / 8; + saved_regs = regsave / 8; + local_size_regs = local_size / 8; + /* check for prolog/epilog */ if (func->u.s.Flag == 1) { @@ -1568,9 +1574,9 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION context->u.X[30] = fp[1]; } context->Sp += local_size; - if (fp_size) restore_fpregs( 8, fp_size / 8, int_size, context, ptrs ); - if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs ); - restore_regs( 19, func->u.s.RegI, -regsave, context, ptrs ); + if (fp_size) restore_fpregs( 8, fp_regs, int_regs, context, ptrs ); + if (func->u.s.CR == 1) restore_regs( 30, 1, int_regs - 1, context, ptrs ); + restore_regs( 19, func->u.s.RegI, -saved_regs, context, ptrs ); } else { @@ -1582,7 +1588,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (local_size <= 512) { /* stp x29,lr,[sp,-#local_size]! */ - if (pos++ > skip) restore_regs( 29, 2, -local_size, context, ptrs ); + if (pos++ > skip) restore_regs( 29, 2, -local_size_regs, context, ptrs ); break; } /* stp x29,lr,[sp,0] */ @@ -1603,16 +1609,16 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION { if (func->u.s.RegF % 2 == 0 && pos++ > skip) /* str d%u,[sp,#fp_size] */ - restore_fpregs( 8 + func->u.s.RegF, 1, int_size + fp_size - 8, context, ptrs ); + restore_fpregs( 8 + func->u.s.RegF, 1, int_regs + fp_regs - 1, context, ptrs ); for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) { if (pos++ <= skip) continue; if (!i && !int_size) /* stp d8,d9,[sp,-#regsave]! */ - restore_fpregs( 8, 2, -regsave, context, ptrs ); + restore_fpregs( 8, 2, -saved_regs, context, ptrs ); else /* stp dn,dn+1,[sp,#offset] */ - restore_fpregs( 8 + 2 * i, 2, int_size + 16 * i, context, ptrs ); + restore_fpregs( 8 + 2 * i, 2, int_regs + 2 * i, context, ptrs ); } } @@ -1621,15 +1627,15 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (func->u.s.RegI % 2) { /* stp xn,lr,[sp,#offset] */ - if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs ); + if (func->u.s.CR == 1) restore_regs( 30, 1, int_regs - 1, context, ptrs ); /* str xn,[sp,#offset] */ restore_regs( 18 + func->u.s.RegI, 1, - (func->u.s.RegI > 1) ? 8 * func->u.s.RegI - 8 : -regsave, + (func->u.s.RegI > 1) ? func->u.s.RegI - 1 : -saved_regs, context, ptrs ); } else if (func->u.s.CR == 1) /* str lr,[sp,#offset] */ - restore_regs( 30, 1, func->u.s.RegI ? int_size - 8 : -regsave, context, ptrs ); + restore_regs( 30, 1, func->u.s.RegI ? int_regs - 1 : -saved_regs, context, ptrs ); } for (i = func->u.s.RegI / 2 - 1; i >= 0; i--) @@ -1637,10 +1643,10 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (pos++ <= skip) continue; if (i) /* stp xn,xn+1,[sp,#offset] */ - restore_regs( 19 + 2 * i, 2, 16 * i, context, ptrs ); + restore_regs( 19 + 2 * i, 2, 2 * i, context, ptrs ); else /* stp x19,x20,[sp,-#regsave]! */ - restore_regs( 19, 2, -regsave, context, ptrs ); + restore_regs( 19, 2, -saved_regs, context, ptrs ); } } return NULL;

3 years, 11 months

Martin Storsjo : ntdll: Fix handling of the save_lrpair unwind opcode.

by Alexandre Julliard

Module: wine Branch: master Commit: 8477f61b9fc25e99cdf942ba745d08efd41d6c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8477f61b9fc25e99cdf942ba… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:38 2020 +0300 ntdll: Fix handling of the save_lrpair unwind opcode. The register offset should be multiplied by 2, and the second register is always Lr. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4c5944759f..7a3625b706 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1467,7 +1467,10 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, else if (*ptr < 0xd6) /* save_reg_x */ restore_regs( 19 + ((val >> 5) & 0xf), 1, -(val & 0x1f) - 1, context, ptrs ); else if (*ptr < 0xd8) /* save_lrpair */ - restore_regs( 19 + ((val >> 6) & 0x7), 2, val & 0x3f, context, ptrs ); + { + restore_regs( 19 + 2 * ((val >> 6) & 0x7), 1, val & 0x3f, context, ptrs ); + restore_regs( 30, 1, (val & 0x3f) + 1, context, ptrs ); + } else if (*ptr < 0xda) /* save_fregp */ restore_fpregs( 8 + ((val >> 6) & 0x7), save_next, val & 0x3f, context, ptrs ); else if (*ptr < 0xdc) /* save_fregp_x */

3 years, 11 months

Martin Storsjo : configure: Pass -fasynchronous-unwind-tables to the compiler.

by Alexandre Julliard

Module: wine Branch: master Commit: ad7fcd2c40eadb79a10ef64d6a9440b8b53132e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad7fcd2c40eadb79a10ef64d… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:37 2020 +0300 configure: Pass -fasynchronous-unwind-tables to the compiler. On aarch64-linux-gnu, unwind tables aren't emitted by default (contrary to x86_64-linux-gnu), so we must pass the flag (or -funwind-tables) to the compiler to make it generate them. Previously wine just added the flag to the linker options. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index b652ddbf79..f1292fa4ca 100755 --- a/configure +++ b/configure @@ -17909,6 +17909,7 @@ fi $as_echo "$ac_cv_c_cfi_support" >&6; } if test "$ac_cv_c_cfi_support" = "yes" then + DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables" LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else if test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index c0f60fe694..816e368451 100644 --- a/configure.ac +++ b/configure.ac @@ -2141,6 +2141,7 @@ AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_ ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) if test "$ac_cv_c_cfi_support" = "yes" then + DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables" LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else if test "x$enable_win64" = "xyes"

3 years, 11 months

Jacek Caban : d3d9/tests: Use int for indexes in generate_bumpmap_textures.

by Alexandre Julliard

Module: wine Branch: master Commit: f9e9ef36faca6e768d0b597f690b8122170d42ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e9ef36faca6e768d0b597f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:08 2020 +0200 d3d9/tests: Use int for indexes in generate_bumpmap_textures. Fixes -Wabsolute-value warning. 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/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f873f3ae9b..5b0955b4ea 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3160,7 +3160,7 @@ done: } static void generate_bumpmap_textures(IDirect3DDevice9 *device) { - unsigned int i, x, y; + int i, x, y; HRESULT hr; IDirect3DTexture9 *texture[2] = {NULL, NULL}; D3DLOCKED_RECT locked_rect;

3 years, 11 months

Paul Gofman : wined3d: Allow multisample source locations for all colour blits.

by Alexandre Julliard

Module: wine Branch: master Commit: 3aa53f328c5ed9225248dea6f8fe9ebf4273e2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa53f328c5ed9225248dea6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:18 2020 +0430 wined3d: Allow multisample source locations for all colour blits. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 94743c45e3..503f9f45e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1707,7 +1707,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (src_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE && ((scale && !context->d3d_info->scaled_resolve) - || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + || convert || !wined3d_is_colour_blit(blit_op))) src_location = WINED3D_LOCATION_RB_RESOLVED; else src_location = src_texture->resource.draw_binding;

3 years, 11 months

Paul Gofman : wined3d: Allow multisample destination locations for all colour blits.

by Alexandre Julliard

Module: wine Branch: master Commit: 826cee41a7b0d4dcb0d35c1cb33c548ed18a3413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=826cee41a7b0d4dcb0d35c1c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:17 2020 +0430 wined3d: Allow multisample destination locations for all colour blits. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bdcbdf5a2a..94743c45e3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1459,6 +1459,20 @@ struct wined3d_blitter *wined3d_cpu_blitter_create(void) return blitter; } +static bool wined3d_is_colour_blit(enum wined3d_blit_op blit_op) +{ + switch (blit_op) + { + case WINED3D_BLIT_OP_COLOR_BLIT: + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: + case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + return true; + + default: + return false; + } +} + HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *fx, @@ -1701,7 +1715,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) dst_location = dst_texture->resource.map_binding; else if (dst_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE - && (scale || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + && (scale || convert || !wined3d_is_colour_blit(blit_op))) dst_location = WINED3D_LOCATION_RB_RESOLVED; else dst_location = dst_texture->resource.draw_binding;

3 years, 11 months

Paul Gofman : wined3d: Prepare/load the destination resource location in glsl_blitter_blit().

by Alexandre Julliard

Module: wine Branch: master Commit: c0ab55700f681ace7ac13f9fdaa6075185fef35c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ab55700f681ace7ac13f9f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:16 2020 +0430 wined3d: Prepare/load the destination resource location in glsl_blitter_blit(). Like the other blitters. When the GLSL blitter was introduced, the idea was that caller would be responsible for doing this, but we never ended up updating the other blitters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49251 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d16f03a21..ddb76143b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13135,6 +13135,11 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli wined3d_texture_load(src_texture, context, FALSE); } + if (wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + else + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_context_gl_apply_blit_state(context_gl, device); if (dst_location == WINED3D_LOCATION_DRAWABLE)

3 years, 11 months

Paul Gofman : wined3d: Use a single wined3d_texture_is_full_rect() function.

by Alexandre Julliard

Module: wine Branch: master Commit: a389f32967d534eab573cf9b4ae5674bfd15cf87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a389f32967d534eab573cf9b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:15 2020 +0430 wined3d: Use a single wined3d_texture_is_full_rect() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 17 ++--------------- dlls/wined3d/texture.c | 21 ++++----------------- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d8bf9ce04e..bdcbdf5a2a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -44,19 +44,6 @@ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; } -static BOOL texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) -{ - unsigned int t; - - t = wined3d_texture_get_level_width(texture, level); - if ((r->left && r->right) || abs(r->right - r->left) != t) - return FALSE; - t = wined3d_texture_get_level_height(texture, level); - if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) - return FALSE; - return TRUE; -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { @@ -1664,9 +1651,9 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ TRACE("Not doing download because the source format needs conversion.\n"); else if (!(src_texture->flags & WINED3D_TEXTURE_DOWNLOADABLE)) TRACE("Not doing download because texture is not downloadable.\n"); - else if (!texture2d_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) + else if (!wined3d_texture_is_full_rect(src_texture, src_sub_resource_idx % src_texture->level_count, &src_rect)) TRACE("Not doing download because of partial download (src).\n"); - else if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) + else if (!wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_rect)) TRACE("Not doing download because of partial download (dst).\n"); else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e8a92acab9..bef2c4ec30 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -48,19 +48,6 @@ struct wined3d_rect_f float b; }; -static bool texture2d_is_full_rect(const struct wined3d_texture *texture, unsigned int level, const RECT *r) -{ - unsigned int t; - - t = wined3d_texture_get_level_width(texture, level); - if ((r->left && r->right) || abs(r->right - r->left) != t) - return false; - t = wined3d_texture_get_level_height(texture, level); - if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) - return false; - return true; -} - static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] @@ -366,7 +353,7 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + if (!wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -498,7 +485,7 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); - if (!texture2d_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + if (!wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); @@ -6019,7 +6006,7 @@ static DWORD raw_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!location) location = dst_texture->flags & WINED3D_TEXTURE_IS_SRGB ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) + if (wined3d_texture_is_full_rect(dst_texture, dst_level, dst_rect)) { if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, location)) ERR("Failed to prepare the destination sub-resource into %s.\n", wined3d_debug_location(location)); @@ -6491,7 +6478,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) ERR("Failed to load the source sub-resource.\n"); - if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) + if (wined3d_texture_is_full_rect(dst_texture, dst_level, dst_rect)) { if (!wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae78a60f2a..49379b3ca5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4169,6 +4169,20 @@ static inline void wined3d_texture_get_level_box(const struct wined3d_texture *t 0, wined3d_texture_get_level_depth(texture, level)); } +static inline bool wined3d_texture_is_full_rect(const struct wined3d_texture *texture, + unsigned int level, const RECT *r) +{ + unsigned int t; + + t = wined3d_texture_get_level_width(texture, level); + if ((r->left && r->right) || abs(r->right - r->left) != t) + return false; + t = wined3d_texture_get_level_height(texture, level); + if ((r->top && r->bottom) || abs(r->bottom - r->top) != t) + return false; + return true; +} + HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags,

3 years, 11 months

Zhiyi Zhang : ddraw: Get new window size from the primary output after display mode changes.

by Alexandre Julliard

Module: wine Branch: master Commit: 079caeaa8d4421b6842399a7ac0f08c6ab6ea252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=079caeaa8d4421b6842399a7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 29 00:11:35 2020 +0800 ddraw: Get new window size from the primary output after display mode changes. MonitorFromWindow() may return a different monitor if switching to a smaller display mode. Fix Railroad Tycoon II crashes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6f640ef422..e92ac25c40 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4926,8 +4926,7 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - MONITORINFO monitor_info; - HMONITOR monitor; + struct wined3d_output_desc output_desc; RECT *r; TRACE("device_parent %p.\n", device_parent); @@ -4938,15 +4937,13 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic return; } - monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY); - monitor_info.cbSize = sizeof(monitor_info); - if (!GetMonitorInfoW(monitor, &monitor_info)) + if (FAILED(wined3d_output_get_desc(ddraw->wined3d_output, &output_desc))) { - ERR("Failed to get monitor info.\n"); + ERR("Failed to get output description.\n"); return; } - r = &monitor_info.rcMonitor; + r = &output_desc.desktop_rect; TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r)); if (!SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top,

3 years, 11 months

Nikolay Sivov : mfmediaengine: Keep loop flag.

by Alexandre Julliard

Module: wine Branch: master Commit: 8805f0429e598e71c5a4b6519d11415282675ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8805f0429e598e71c5a4b651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 28 18:54:21 2020 +0300 mfmediaengine: Keep loop flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 20 +++++++++++++++++--- dlls/mfmediaengine/tests/mfmediaengine.c | 3 --- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 7053a3afea..eef485e315 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -60,6 +60,7 @@ enum media_engine_flags /* MF_MEDIA_ENGINE_CREATEFLAGS_MASK is 0x1f. */ FLAGS_ENGINE_SHUT_DOWN = 0x20, FLAGS_ENGINE_AUTO_PLAY = 0x40, + FLAGS_ENGINE_LOOP = 0x80, }; struct media_engine @@ -342,16 +343,29 @@ static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autop static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL value; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = !!(engine->flags & FLAGS_ENGINE_LOOP); + LeaveCriticalSection(&engine->cs); + + return value; } static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) { + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + FIXME("(%p, %d): stub.\n", iface, loop); - return E_NOTIMPL; + EnterCriticalSection(&engine->cs); + media_engine_set_flag(engine, FLAGS_ENGINE_LOOP, loop); + LeaveCriticalSection(&engine->cs); + + return S_OK; } static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 8f6c4ca75b..504464b527 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -341,7 +341,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetAutoPlay(media_engine); -todo_wine ok(!!state, "Unexpected state.\n"); /* Loop mode is still accessible. */ @@ -349,11 +348,9 @@ todo_wine ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetLoop(media_engine, TRUE); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_GetLoop(media_engine); -todo_wine ok(!!state, "Unexpected state.\n"); hr = IMFMediaEngine_Play(media_engine);

3 years, 11 months

← Newer
1
...
4
5
6
7
8
9
10
...
75
Older →

Jump to page:

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 May 2020