wine-commits December 2023

wine-commits@winehq.org

1 participants
418 discussions

Conor McCarthy : vkd3d-shader/spirv: Emit an error if 64-bit integers are used.
by Alexandre Julliard 12 Dec '23

12 Dec '23

Module: vkd3d Branch: master Commit: 061086733442cea0dd9d361276a067b7465a244e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/061086733442cea0dd9d361276a06… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 23 00:10:15 2023 +1000 vkd3d-shader/spirv: Emit an error if 64-bit integers are used. --- libs/vkd3d-shader/spirv.c | 10 +++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 945b9b48..8e970506 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4520,7 +4520,7 @@ static void spirv_compiler_emit_register_execution_mode(struct spirv_compiler *c VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT)) { FIXME("The target environment does not support stencil export.\n"); - spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_STENCIL_EXPORT_UNSUPPORTED, + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, "Cannot export stencil reference value. " "The target environment does not support stencil export."); } @@ -5526,6 +5526,14 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler flags &= ~(VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS | VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS); } + if (flags & VKD3DSGF_ENABLE_INT64) + { + FIXME("Unsupported 64-bit integer ops.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "Support for 64-bit integers is not implemented."); + flags &= ~VKD3DSGF_ENABLE_INT64; + } + if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) FIXME("Unhandled global flags %#"PRIx64".\n", (uint64_t)flags); else diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 66c93f02..a69205f4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -91,7 +91,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING = 2002, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED = 2003, - VKD3D_SHADER_ERROR_SPV_STENCIL_EXPORT_UNSUPPORTED = 2004, + VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE = 2004, VKD3D_SHADER_ERROR_SPV_OUT_OF_MEMORY = 2005, VKD3D_SHADER_ERROR_SPV_INVALID_TYPE = 2006, VKD3D_SHADER_ERROR_SPV_INVALID_HANDLER = 2007,

1 0

Conor McCarthy : vkd3d-shader: Introduce an instruction flag to suppress masking of bitwise shift counts.
by Alexandre Julliard 12 Dec '23

12 Dec '23

Module: vkd3d Branch: master Commit: 192943255937bd0f9d0af50139118d04093b04b2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/192943255937bd0f9d0af50139118… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 22 23:58:44 2023 +1000 vkd3d-shader: Introduce an instruction flag to suppress masking of bitwise shift counts. DXIL does not use implicit masking of shift counts. --- libs/vkd3d-shader/d3d_asm.c | 6 ++++++ libs/vkd3d-shader/dxil.c | 6 ++++++ libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 82d1d71d..d7b406ac 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1577,6 +1577,12 @@ static void shader_dump_instruction_flags(struct vkd3d_d3d_asm_compiler *compile shader_addline(buffer, "p"); break; + case VKD3DSIH_ISHL: + case VKD3DSIH_ISHR: + case VKD3DSIH_USHR: + if (ins->flags & VKD3DSI_SHIFT_UNMASKED) + shader_addline(buffer, "_unmasked"); + /* fall through */ default: shader_dump_precise_flags(compiler, ins->flags); break; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4175a1af..602056e2 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3279,6 +3279,12 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco } else { + if (handler_idx == VKD3DSIH_ISHL || handler_idx == VKD3DSIH_ISHR || handler_idx == VKD3DSIH_USHR) + { + /* DXC emits AND instructions where necessary to mask shift counts. Shift binops + * do not imply masking the shift as the TPF equivalents do. */ + ins->flags |= VKD3DSI_SHIFT_UNMASKED; + } instruction_dst_param_init_ssa_scalar(ins, sm6); } } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a60246fd..945b9b48 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6764,8 +6764,8 @@ static enum vkd3d_result spirv_compiler_emit_alu_instruction(struct spirv_compil * Microsoft fxc will compile immediate constants larger than 5 bits. * Fixing up the constants would be more elegant, but the simplest way is * to let this handle constants too. */ - if (instruction->handler_idx == VKD3DSIH_ISHL || instruction->handler_idx == VKD3DSIH_ISHR - || instruction->handler_idx == VKD3DSIH_USHR) + if (!(instruction->flags & VKD3DSI_SHIFT_UNMASKED) && (instruction->handler_idx == VKD3DSIH_ISHL + || instruction->handler_idx == VKD3DSIH_ISHR || instruction->handler_idx == VKD3DSIH_USHR)) { uint32_t mask_id = spirv_compiler_get_constant_vector(compiler, VKD3D_SHADER_COMPONENT_UINT, vkd3d_write_mask_component_count(dst->write_mask), 0x1f); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 102d49a3..66c93f02 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -741,6 +741,7 @@ enum vkd3d_tessellator_domain #define VKD3DSI_RESINFO_UINT 0x2 #define VKD3DSI_SAMPLE_INFO_UINT 0x1 #define VKD3DSI_SAMPLER_COMPARISON_MODE 0x1 +#define VKD3DSI_SHIFT_UNMASKED 0x1 #define VKD3DSI_PRECISE_X 0x100 #define VKD3DSI_PRECISE_Y 0x200

1 0

Eric Pouech : dbghelp: Skip deleted vector in hash inside PDB header.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: f2d98ea7cf2793930a093d673fe56787418069e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2d98ea7cf2793930a093d673fe567… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:39:31 2023 +0100 dbghelp: Skip deleted vector in hash inside PDB header. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a578cf7cbfa..7f695928e4a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3159,11 +3159,7 @@ static BOOL pdb_load_stream_name_table(struct pdb_file_info* pdb_file, const cha /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - FIXME("unexpected value\n"); - return FALSE; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = j = 0; i < count; i++) {

1 0

Eric Pouech : winedump: Skip deleted vector in hash inside PDB header.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 135b132dc2c3e3e8e1c04d771df4627e4c937902 URL: https://gitlab.winehq.org/wine/wine/-/commit/135b132dc2c3e3e8e1c04d771df462… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:39:00 2023 +0100 winedump: Skip deleted vector in hash inside PDB header. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pdb.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index adc0eadc738..c028f2df2b6 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -200,11 +200,7 @@ static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - printf("unexpected value\n"); - return -1; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = 0; i < count; i++) { @@ -1195,11 +1191,7 @@ static void pdb_jg_dump_header_root(struct pdb_reader* reader) /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - printf("unexpected value\n"); - return; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = 0; i < count; i++) { @@ -1346,11 +1338,7 @@ static void pdb_ds_dump_header_root(struct pdb_reader* reader) /* bitfield: first dword is len (in dword), then data */ ok_bits = pdw; pdw += *ok_bits++ + 1; - if (*pdw++ != 0) - { - printf("unexpected value\n"); - return; - } + pdw += *pdw + 1; /* skip deleted vector */ for (i = 0; i < count; i++) {

1 0

Eric Pouech : dbghelp: Allow an extra stream index entry in PDB files.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 6d7839418ea9589dd7b83f97e9c6aba0b45e18dd URL: https://gitlab.winehq.org/wine/wine/-/commit/6d7839418ea9589dd7b83f97e9c6ab… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:41:11 2023 +0100 dbghelp: Allow an extra stream index entry in PDB files. Latest MSVC version use this. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pdb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 552fa4d8da8..adc0eadc738 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -762,6 +762,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader) sidx.sections_stream); break; case sizeof(PDB_STREAM_INDEXES): + case sizeof(PDB_STREAM_INDEXES) + 2: memcpy(&sidx, (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size +

1 0

Eric Pouech : winedump: Don't fail on extra stream entry in PDB.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 525f990e70a89503a90e6c354e1e5fd2938fa00d URL: https://gitlab.winehq.org/wine/wine/-/commit/525f990e70a89503a90e6c354e1e5f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Dec 11 11:40:04 2023 +0100 winedump: Don't fail on extra stream entry in PDB. Latest versions of MSVC use this. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5e699d54e2c..a578cf7cbfa 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3809,6 +3809,7 @@ static BOOL pdb_process_internal(const struct process* pcs, /* no fpo ext stream in this case */ break; case sizeof(PDB_STREAM_INDEXES): + case sizeof(PDB_STREAM_INDEXES) + 2: psi = (PDB_STREAM_INDEXES*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + symbols.module_size + symbols.sectcontrib_size + symbols.segmap_size + symbols.srcmodule_size +

1 0

Alexandre Julliard : server: Leave some free space between modules in ASLR mode.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: d96864eb4fbdbd384094b2c7754fc45a3a41d708 URL: https://gitlab.winehq.org/wine/wine/-/commit/d96864eb4fbdbd384094b2c7754fc4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 11 17:49:15 2023 +0100 server: Leave some free space between modules in ASLR mode. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55993 --- server/mapping.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index b5684c484d2..a101110c76c 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1165,6 +1165,8 @@ static client_ptr_t assign_map_address( struct mapping *mapping ) if ((ret = get_fd_map_address( mapping->fd ))) return ret; + size += granularity_mask + 1; /* leave some free space between mappings */ + for (i = 0; i < range->count; i++) { if (range->free[i].size < size) continue;

1 0

Fabian Maurer : gdiplus: Prevent uninitializd memory access (Coverity).
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 00692f5bf51dab8661ae06db90a29e312c753c2b URL: https://gitlab.winehq.org/wine/wine/-/commit/00692f5bf51dab8661ae06db90a29e… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 10 19:39:03 2023 +0100 gdiplus: Prevent uninitializd memory access (Coverity). This fixes a regression by 69d815407d99 Originally this used GdipAlloc (calloc) --- dlls/gdiplus/metafile.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index eb8b4197f3f..5c50d0d1d37 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3404,6 +3404,8 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { if (flags & 0x800) /* P */ { + points[0].X = 0; + points[0].Y = 0; for (i = 1; i < fill->Count; i++) { points[i].X = points[i - 1].X + fill->PointData.pointsR[i].X;

1 0

Akihiro Sagawa : winex11: Do window search if IDropTarget::DragOver() returns DROPEFFECT_NONE.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: c03c17277f4a2ffa49f97ea43f201abf09e25a78 URL: https://gitlab.winehq.org/wine/wine/-/commit/c03c17277f4a2ffa49f97ea43f201a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 11 23:09:31 2023 +0900 winex11: Do window search if IDropTarget::DragOver() returns DROPEFFECT_NONE. Fixes a regression from 1d337249f16ed61163315019f5dbbe4db3386390. Prior to the commit, we were solving this case in a different way. If IDropTarget::DragOver() returned DROPEFFECT_NONE, X11DRV_XDND_DROPEFFECTToXdndAction() would convert it to XdndActionCopy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55179 --- dlls/winex11.drv/xdnd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index ce99941c021..0e1a747b604 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -233,7 +233,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size ) } } - if (XDNDAccepted) + if (XDNDAccepted && XDNDDropEffect != DROPEFFECT_NONE) accept = 1; else { @@ -246,7 +246,7 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size ) } } - return accept ? effect : 0; + return accept ? effect : DROPEFFECT_NONE; } NTSTATUS x11drv_dnd_drop_event( UINT arg ) @@ -319,7 +319,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg ) TRACE("effectRequested(0x%lx) accept(%d) performed(0x%lx) at x(%ld),y(%ld)\n", XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y); - return accept ? effect : 0; + return accept ? effect : DROPEFFECT_NONE; } /**************************************************************************

1 0

Jacek Caban : ntdll: Declare seh debug channel in signal_arm64ec.c.
by Alexandre Julliard 11 Dec '23

11 Dec '23

Module: wine Branch: master Commit: 6ea417d33930e495679ad799d7ddb1b26b4452cb URL: https://gitlab.winehq.org/wine/wine/-/commit/6ea417d33930e495679ad799d7ddb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 10 20:40:36 2023 +0100 ntdll: Declare seh debug channel in signal_arm64ec.c. --- dlls/ntdll/signal_arm64ec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 9422bdefc0f..3d6bc39468d 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -34,6 +34,7 @@ #include "ntsyscalls.h" WINE_DEFAULT_DEBUG_CHANNEL(unwind); +WINE_DECLARE_DEBUG_CHANNEL(seh); WINE_DECLARE_DEBUG_CHANNEL(relay);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2023