November 2023 - Wine-commits

Rémi Bernon : dmime: Split segment_state_play_chunk helper.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: eada40789d09feb19825e17c7c00dd94ddc901fe URL: https://gitlab.winehq.org/wine/wine/-/commit/eada40789d09feb19825e17c7c00dd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 13 10:46:18 2023 +0100 dmime: Split segment_state_play_chunk helper. --- dlls/dmime/segmentstate.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 544620b0045..0f0851d16c2 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -269,22 +269,15 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time return hr; } -static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusicPerformance8 *performance, - REFERENCE_TIME duration, DWORD track_flags) +static HRESULT segment_state_play_until(struct segment_state *This, IDirectMusicPerformance8 *performance, + MUSIC_TIME end_time, DWORD track_flags) { IDirectMusicSegmentState *iface = (IDirectMusicSegmentState *)&This->IDirectMusicSegmentState8_iface; - MUSIC_TIME next_time, played; struct track_entry *entry; - REFERENCE_TIME time; HRESULT hr = S_OK; + MUSIC_TIME played; - if (FAILED(hr = IDirectMusicPerformance8_MusicToReferenceTime(performance, - This->start_time + This->played, &time))) - return hr; - if (FAILED(hr = IDirectMusicPerformance8_ReferenceToMusicTime(performance, - time + duration, &next_time))) - return hr; - played = min(next_time - This->start_time, This->end_point - This->start_point); + played = min(end_time - This->start_time, This->end_point - This->start_point); LIST_FOR_EACH_ENTRY(entry, &This->tracks, struct track_entry, entry) { @@ -299,7 +292,26 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic } This->played = played; - if (This->start_point + This->played >= This->end_point) + if (This->start_point + This->played >= This->end_point) return S_FALSE; + return S_OK; +} + +static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusicPerformance8 *performance, + REFERENCE_TIME duration, DWORD track_flags) +{ + IDirectMusicSegmentState *iface = (IDirectMusicSegmentState *)&This->IDirectMusicSegmentState8_iface; + MUSIC_TIME next_time; + REFERENCE_TIME time; + HRESULT hr; + + if (FAILED(hr = IDirectMusicPerformance8_MusicToReferenceTime(performance, + This->start_time + This->played, &time))) + return hr; + if (FAILED(hr = IDirectMusicPerformance8_ReferenceToMusicTime(performance, + time + duration, &next_time))) + return hr; + + if ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) { MUSIC_TIME end_time = This->start_time + This->played;

1 0

Rémi Bernon : dmime: Implement segment state repeat and looping.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 99aa613f26cfb047e3ac7e73140387fe0bb912c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/99aa613f26cfb047e3ac7e73140387… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 13 14:32:38 2023 +0100 dmime: Implement segment state repeat and looping. --- dlls/dmime/segmentstate.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 0f0851d16c2..3b939bc95ca 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -53,6 +53,7 @@ struct segment_state MUSIC_TIME end_point; MUSIC_TIME played; BOOL auto_download; + DWORD repeats; struct list tracks; }; @@ -234,6 +235,7 @@ HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time This->start_time = start_time; if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetStartPoint(segment, &This->start_point); if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetLength(segment, &This->end_point); + if (SUCCEEDED(hr)) hr = IDirectMusicSegment_GetRepeats(segment, &This->repeats); for (i = 0; SUCCEEDED(hr); i++) { @@ -311,17 +313,28 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic time + duration, &next_time))) return hr; - if ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) + while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE) { - MUSIC_TIME end_time = This->start_time + This->played; - - if (FAILED(hr = performance_send_segment_end(performance, end_time, iface, FALSE))) + if (!This->repeats) { - ERR("Failed to send segment end, hr %#lx\n", hr); - return hr; + MUSIC_TIME end_time = This->start_time + This->played; + + if (FAILED(hr = performance_send_segment_end(performance, end_time, iface, FALSE))) + { + ERR("Failed to send segment end, hr %#lx\n", hr); + return hr; + } + + return S_FALSE; } - return S_FALSE; + if (FAILED(hr = IDirectMusicSegment_GetLoopPoints(This->segment, &This->played, + &This->end_point))) + break; + This->start_time += This->end_point - This->start_point; + This->repeats--; + + if (next_time <= This->start_time || This->end_point <= This->start_point) break; } return S_OK;

1 0

Matteo Bruni : opengl32: Skip filter_extensions_index() on GL contexts < 3.0.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 6153ced0f9d86f1a55020f352b43bdf0b32e7286 URL: https://gitlab.winehq.org/wine/wine/-/commit/6153ced0f9d86f1a55020f352b43bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 9 21:30:04 2023 +0100 opengl32: Skip filter_extensions_index() on GL contexts < 3.0. glGetStringi() is not available before 3.0. We can't trust its function pointer being NULL since the GL implementation is allowed to return anything in this case (*cough* macOS's GL on Metal *cough*). This probably regressed when fd92954df8cf12c61e08c7ef7acf172efb7c44ad removed the "if (!disabled[0]) return FALSE;" exit from filter_extensions(), although that simply exposed an existing issue. --- dlls/opengl32/unix_wgl.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 5da69196548..e03bbc0a9c0 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -198,13 +198,32 @@ static GLubyte *filter_extensions_list( const char *extensions, const char *disa return (GLubyte *)str; } +static const char *parse_gl_version( const char *gl_version, int *major, int *minor ) +{ + const char *ptr = gl_version; + + *major = atoi( ptr ); + if (*major <= 0) + ERR( "Invalid OpenGL major version %d.\n", *major ); + + while (isdigit( *ptr )) ++ptr; + if (*ptr++ != '.') + ERR( "Invalid OpenGL version string %s.\n", debugstr_a(gl_version) ); + + *minor = atoi( ptr ); + + while (isdigit( *ptr )) ++ptr; + return ptr; +} + static GLuint *filter_extensions_index( TEB *teb, const char *disabled ) { const struct opengl_funcs *funcs = teb->glTable; + const char *ext, *version; GLuint *disabled_index; GLint extensions_count; unsigned int i = 0, j; - const char *ext; + int major, minor; if (!funcs->ext.p_glGetStringi) { @@ -213,6 +232,11 @@ static GLuint *filter_extensions_index( TEB *teb, const char *disabled ) if (!funcs->ext.p_glGetStringi) return NULL; } + version = (const char *)funcs->gl.p_glGetString( GL_VERSION ); + parse_gl_version( version, &major, &minor ); + if (major < 3) + return NULL; + funcs->gl.p_glGetIntegerv( GL_NUM_EXTENSIONS, &extensions_count ); disabled_index = malloc( extensions_count * sizeof(*disabled_index) ); if (!disabled_index) return NULL; @@ -413,24 +437,6 @@ static BOOL check_extension_support( TEB *teb, const char *extension, const char return FALSE; } -static const char *parse_gl_version( const char *gl_version, int *major, int *minor ) -{ - const char *ptr = gl_version; - - *major = atoi( ptr ); - if (*major <= 0) - ERR( "Invalid OpenGL major version %d.\n", *major ); - - while (isdigit( *ptr )) ++ptr; - if (*ptr++ != '.') - ERR( "Invalid OpenGL version string %s.\n", debugstr_a(gl_version) ); - - *minor = atoi( ptr ); - - while (isdigit( *ptr )) ++ptr; - return ptr; -} - static void wrap_glGetIntegerv( TEB *teb, GLenum pname, GLint *data ) { const struct opengl_funcs *funcs = teb->glTable;

1 0

Alistair Leslie-Hughes : dbghelp: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: dd009533b114303e63bbc164eebdac1e25394504 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd009533b114303e63bbc164eebdac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 6 09:55:12 2023 +1100 dbghelp: Remove DECLSPEC_HIDDEN usage. --- dlls/dbghelp/coff.c | 2 +- dlls/dbghelp/cpu_arm.c | 2 +- dlls/dbghelp/cpu_arm64.c | 2 +- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 2 +- dlls/dbghelp/dbghelp_private.h | 246 ++++++++++++++++++++--------------------- dlls/dbghelp/image_private.h | 8 +- 7 files changed, 132 insertions(+), 132 deletions(-)

1 0

Jacek Caban : configure: Add arm64ec PE target support.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: 5004e6bce7c178383dba700ea4fdea426423f617 URL: https://gitlab.winehq.org/wine/wine/-/commit/5004e6bce7c178383dba700ea4fdea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 30 17:38:24 2023 +0200 configure: Add arm64ec PE target support. --- aclocal.m4 | 3 +- configure | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- configure.ac | 9 ++++-- tools/makedep.c | 2 +- 4 files changed, 106 insertions(+), 7 deletions(-)

1 0

Jacek Caban : tools: Initial ARM64EC target support.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: wine Branch: master Commit: a0a2ef5a2b5aae7bf6f80b55589b3328a98b0b13 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0a2ef5a2b5aae7bf6f80b55589b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 1 12:05:53 2023 +0200 tools: Initial ARM64EC target support. --- tools/tools.h | 14 +++++++++----- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 40 ++++++++++++++++++++++++++++++++++++---- tools/winebuild/spec32.c | 7 +++++++ tools/winegcc/winegcc.c | 5 ++++- 5 files changed, 57 insertions(+), 11 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index 7f99205aca8..67b13a0ed55 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -90,7 +90,7 @@ extern char **environ; struct target { - enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64 } cpu; + enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_ARM64EC } cpu; enum { @@ -481,6 +481,7 @@ static inline unsigned int get_target_ptr_size( struct target target ) [CPU_x86_64] = 8, [CPU_ARM] = 4, [CPU_ARM64] = 8, + [CPU_ARM64EC] = 8, }; return sizes[target.cpu]; } @@ -500,6 +501,7 @@ static inline void set_target_ptr_size( struct target *target, unsigned int size if (size == 8) target->cpu = CPU_ARM64; break; case CPU_ARM64: + case CPU_ARM64EC: if (size == 4) target->cpu = CPU_ARM; break; } @@ -522,6 +524,7 @@ static inline int get_cpu_from_name( const char *name ) { "x86_64", CPU_x86_64 }, { "amd64", CPU_x86_64 }, { "aarch64", CPU_ARM64 }, + { "arm64ec", CPU_ARM64EC }, { "arm64", CPU_ARM64 }, { "arm", CPU_ARM }, }; @@ -566,10 +569,11 @@ static inline const char *get_arch_dir( struct target target ) { static const char *cpu_names[] = { - [CPU_i386] = "i386", - [CPU_x86_64] = "x86_64", - [CPU_ARM] = "arm", - [CPU_ARM64] = "aarch64" + [CPU_i386] = "i386", + [CPU_x86_64] = "x86_64", + [CPU_ARM] = "arm", + [CPU_ARM64] = "aarch64", + [CPU_ARM64EC] = "arm64ec", }; if (!cpu_names[target.cpu]) return ""; diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e193dafe759..ef50e0597e9 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -192,7 +192,7 @@ static inline int is_pe(void) #define FLAG_CPU(cpu) (0x10000 << (cpu)) #define FLAG_CPU_MASK (FLAG_CPU_WIN32 | FLAG_CPU_WIN64) -#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64)) +#define FLAG_CPU_WIN64 (FLAG_CPU(CPU_x86_64) | FLAG_CPU(CPU_ARM64) | FLAG_CPU(CPU_ARM64EC)) #define FLAG_CPU_WIN32 (FLAG_CPU(CPU_i386) | FLAG_CPU(CPU_ARM)) #define MAX_ORDINALS 65535 diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 9b013691c39..5ae8de1406c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -802,6 +802,9 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "\tldr x16, [x16, #%u]\n", pos & 0x7fff ); output( "\tbr x16\n" ); break; + case CPU_ARM64EC: + assert( 0 ); + break; } output_function_size( name ); } @@ -1121,6 +1124,9 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldp x29, x30, [sp],#80\n" ); output( "\tbr x16\n" ); break; + case CPU_ARM64EC: + assert( 0 ); + break; } output_cfi( ".cfi_endproc" ); output_function_size( module_func ); @@ -1170,6 +1176,9 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) if (iat_pos) output( "\tadd x16, x16, #%u\n", iat_pos ); output( "\tb %s\n", asm_name(module_func) ); break; + case CPU_ARM64EC: + assert( 0 ); + break; } iat_pos += get_ptr_size(); } @@ -1337,6 +1346,7 @@ void output_stubs( DLLSPEC *spec ) } break; case CPU_ARM64: + case CPU_ARM64EC: output_seh( ".seh_proc %s", asm_name(name) ); output_seh( ".seh_endprologue" ); output( "\tadrp x0, %s\n", arm64_page(".L__wine_spec_file_name") ); @@ -1353,8 +1363,6 @@ void output_stubs( DLLSPEC *spec ) output( "\tb %s\n", asm_name("__wine_spec_unimplemented_stub") ); output_seh( ".seh_endproc" ); break; - default: - assert(0); } output_function_size( name ); } @@ -1467,6 +1475,7 @@ void output_syscalls( DLLSPEC *spec ) output( "\tbx lr\n" ); break; case CPU_ARM64: + case CPU_ARM64EC: output_seh( ".seh_proc %s", asm_name(name) ); output_seh( ".seh_endprologue" ); output( "\tmov x8, #%u\n", id ); @@ -1478,8 +1487,6 @@ void output_syscalls( DLLSPEC *spec ) output( "1:\t.quad %s\n", asm_name("__wine_syscall_dispatcher") ); output_seh( ".seh_endproc" ); break; - default: - assert(0); } output_function_size( name ); } @@ -1561,6 +1568,20 @@ static void assemble_files( const char *prefix ) } } +static const char *get_target_machine(void) +{ + static const char *machine_names[] = + { + [CPU_i386] = "x86", + [CPU_x86_64] = "x64", + [CPU_ARM] = "arm", + [CPU_ARM64] = "arm64", + [CPU_ARM64EC] = "arm64ec", + }; + + return machine_names[target.cpu]; +} + /* build a library from the current asm files and any additional object files in argv */ void output_static_lib( const char *output_name, struct strarray files, int create ) { @@ -1576,6 +1597,7 @@ void output_static_lib( const char *output_name, struct strarray files, int crea { args = find_link_tool(); strarray_add( &args, "/lib" ); + strarray_add( &args, strmake( "-machine:%s", get_target_machine() )); strarray_add( &args, strmake( "-out:%s", output_name )); } strarray_addall( &args, as_files ); @@ -1628,6 +1650,10 @@ static void build_dlltool_import_lib( const char *lib_name, DLLSPEC *spec, struc strarray_add( &args, "-m" ); strarray_add( &args, "arm64" ); break; + case CPU_ARM64EC: + strarray_add( &args, "-m" ); + strarray_add( &args, "arm64ec" ); + break; default: break; } @@ -1735,6 +1761,9 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tbr x16\n" ); output_seh( ".seh_endproc" ); break; + case CPU_ARM64EC: + assert( 0 ); + break; } output_function_size( delay_load ); output_gnu_stack_note(); @@ -1878,6 +1907,9 @@ static void build_windows_import_lib( const char *lib_name, DLLSPEC *spec, struc output( "\tb %s\n", asm_name( delay_load ) ); } break; + case CPU_ARM64EC: + assert( 0 ); + break; } output( "\n\t.section .idata$4\n" ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 391f782309a..f1e2118dd4b 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -98,6 +98,8 @@ static int has_relays( DLLSPEC *spec ) { int i; + if (target.cpu == CPU_ARM64EC) return 0; + for (i = spec->base; i <= spec->limit; i++) { ORDDEF *odp = spec->ordinals[i]; @@ -652,6 +654,9 @@ void output_module( DLLSPEC *spec ) output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tb 1f\n" ); break; + case CPU_ARM64EC: + assert( 0 ); + break; } output( "__wine_spec_pe_header:\n" ); output( "\t.skip %u\n", 65536 + page_size ); @@ -671,6 +676,7 @@ void output_module( DLLSPEC *spec ) switch (target.cpu) { case CPU_i386: machine = IMAGE_FILE_MACHINE_I386; break; + case CPU_ARM64EC: case CPU_x86_64: machine = IMAGE_FILE_MACHINE_AMD64; break; case CPU_ARM: machine = IMAGE_FILE_MACHINE_ARMNT; break; case CPU_ARM64: machine = IMAGE_FILE_MACHINE_ARM64; break; @@ -1089,6 +1095,7 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) switch (target.cpu) { case CPU_i386: put_word( IMAGE_FILE_MACHINE_I386 ); break; + case CPU_ARM64EC: case CPU_x86_64: put_word( IMAGE_FILE_MACHINE_AMD64 ); break; case CPU_ARM: put_word( IMAGE_FILE_MACHINE_ARMNT ); break; case CPU_ARM64: put_word( IMAGE_FILE_MACHINE_ARM64 ); break; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 4924f608720..dc085a2ed0f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -505,8 +505,9 @@ static const char *get_multiarch_dir( struct target target ) case CPU_x86_64: return "/x86_64-linux-gnu"; case CPU_ARM: return "/arm-linux-gnueabi"; case CPU_ARM64: return "/aarch64-linux-gnu"; + default: + assert(0); } - assert(0); return NULL; } @@ -700,6 +701,8 @@ static void compile(struct options* opts, const char* lang) strarray_add(&comp_args, "-D__cdecl=__stdcall"); strarray_add(&comp_args, "-D__fastcall=__stdcall"); break; + case CPU_ARM64EC: + break; } strarray_add(&comp_args, "-D_stdcall=__stdcall"); strarray_add(&comp_args, "-D_cdecl=__cdecl");

1 0

Nikolay Sivov : tests: Fix some spelling mistakes.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: vkd3d Branch: master Commit: 41a72a4eae99003a165c2215afba438a5bfea249 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/41a72a4eae99003a165c2215afba4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 12 02:48:30 2023 +0100 tests: Fix some spelling mistakes. --- tests/d3d12.c | 2 +- tests/driver.c | 2 +- tests/shader_runner.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8f100a5e..649d86ec 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1058,7 +1058,7 @@ static void test_format_support(void) } unsupported_format_features[] = { - /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ + /* A recent version of WARP supports B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, }; diff --git a/tests/driver.c b/tests/driver.c index 553417ad..504f51df 100644 --- a/tests/driver.c +++ b/tests/driver.c @@ -108,7 +108,7 @@ static enum program_result run_program(const char *cmdline, const char *log_file if (!GetExitCodeProcess(info.hProcess, &exit_code)) { - fprintf(stderr, "Cannot retrive the process exit code, last error %ld.\n", GetLastError()); + fprintf(stderr, "Cannot retrieve the process exit code, last error %ld.\n", GetLastError()); ret = PROGRAM_RESULT_FAILURE; goto out; } diff --git a/tests/shader_runner.c b/tests/shader_runner.c index dadfe333..7e595814 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -803,7 +803,7 @@ static HRESULT map_unidentified_hrs(HRESULT hr) { if (hr == 0x80010064) { - trace("Mapping unindentified hr %#x as %#x.\n", hr, E_FAIL); + trace("Mapping unidentified hr %#x as %#x.\n", hr, E_FAIL); return E_FAIL; } return hr;

1 0

Nikolay Sivov : vkd3d-shader: Fix some spelling mistakes.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: vkd3d Branch: master Commit: 3203485a7c346d74b33878f01823bb12cc008f81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3203485a7c346d74b33878f01823b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 12 02:49:38 2023 +0100 vkd3d-shader: Fix some spelling mistakes. --- libs/vkd3d-shader/dxil.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 2174ba52..e21fdca1 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1910,7 +1910,7 @@ static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_ { ERR("Failed to allocate src params.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory allocating instruction src paramaters."); + "Out of memory allocating instruction src parameters."); return NULL; } ins->src = params; @@ -1926,7 +1926,7 @@ static struct vkd3d_shader_dst_param *instruction_dst_params_alloc(struct vkd3d_ { ERR("Failed to allocate dst params.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory allocating instruction dst paramaters."); + "Out of memory allocating instruction dst parameters."); return NULL; } ins->dst = params; @@ -2138,7 +2138,7 @@ static size_t sm6_parser_get_value_index(struct sm6_parser *sm6, uint64_t idx) WARN("Ignoring upper 32 bits of relative index.\n"); i = (uint32_t)sm6->value_count - (uint32_t)idx; - /* This may underflow to produce a forward reference, but it must not exceeed the final value count. */ + /* This may underflow to produce a forward reference, but it must not exceed the final value count. */ if (i >= sm6->cur_max_value) { WARN("Invalid value index %"PRIx64" at %zu.\n", idx, sm6->value_count); @@ -3561,7 +3561,7 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor if (!(flags & FP_ALLOW_UNSAFE_ALGEBRA)) ins->flags |= VKD3DSI_PRECISE_X; flags &= ~FP_ALLOW_UNSAFE_ALGEBRA; - /* SPIR-V FPFastMathMode is only available in the Kernel executon model. */ + /* SPIR-V FPFastMathMode is only available in the Kernel execution model. */ silence_warning = !(flags & ~(FP_NO_NAN | FP_NO_INF | FP_NO_SIGNED_ZEROS | FP_ALLOW_RECIPROCAL)); } if (flags && silence_warning) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index f1eaf6c2..615529c1 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -372,7 +372,7 @@ struct hlsl_attribute /* Reservation of a register and/or an offset for objects inside constant buffers, to be used as a * starting point of their allocation. They are available through the register(·) and the * packoffset(·) syntaxes, respectivelly. - * The costant buffer offset is measured register components. */ + * The constant buffer offset is measured register components. */ struct hlsl_reg_reservation { char reg_type;

1 0

Nikolay Sivov : vkd3d: Fix some spelling mistakes.
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: vkd3d Branch: master Commit: e7422fdefb4f8ec89b4ef5f92ae463c26a7b087d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e7422fdefb4f8ec89b4ef5f92ae46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 12 02:49:49 2023 +0100 vkd3d: Fix some spelling mistakes. --- libs/vkd3d/command.c | 2 +- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 37484e5e..77d0f275 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2536,7 +2536,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Reset(ID3D12GraphicsCommandL static void STDMETHODCALLTYPE d3d12_command_list_ClearState(ID3D12GraphicsCommandList5 *iface, ID3D12PipelineState *pipeline_state) { - FIXME("iface %p, pipline_state %p stub!\n", iface, pipeline_state); + FIXME("iface %p, pipeline_state %p stub!\n", iface, pipeline_state); } static bool d3d12_command_list_has_depth_stencil_view(struct d3d12_command_list *list) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 2545c0f0..2b83cfd8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -836,7 +836,7 @@ static unsigned int vk_heap_binding_count_from_descriptor_range(const struct d3d else { /* Prefer an unsupported binding count vs a zero count, because shader compilation will fail - * to match a declaration to a zero binding, resulting in failure of pipline state creation. */ + * to match a declaration to a zero binding, resulting in failure of pipeline state creation. */ return max_count + !max_count; } } @@ -3236,7 +3236,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE; - /* We defer creating the render pass for pipelines wth DSVFormat equal to + /* We defer creating the render pass for pipelines with DSVFormat equal to * DXGI_FORMAT_UNKNOWN. We take the actual DSV format from the bound DSV. */ if (is_dsv_format_unknown) graphics->render_pass = VK_NULL_HANDLE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 969ea8c4..148ee6c9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1099,7 +1099,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, struct d3d12_query_heap *unsafe_impl_from_ID3D12QueryHeap(ID3D12QueryHeap *iface); /* A Vulkan query has to be issued at least one time before the result is - * available. In D3D12 it is legal to get query reults for not issued queries. + * available. In D3D12 it is legal to get query results for not issued queries. */ static inline bool d3d12_query_heap_is_result_available(const struct d3d12_query_heap *heap, unsigned int query_index)

1 0

Nikolay Sivov : vkd3d-shader/dxil: Fully initialize instruction data in sm6_parser_emit_extractval().
by Alexandre Julliard 13 Nov '23

13 Nov '23

Module: vkd3d Branch: master Commit: d190fdf8c5fc84cb130135748eacdd9a3c3167e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d190fdf8c5fc84cb130135748eacd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 10 21:58:58 2023 +0100 vkd3d-shader/dxil: Fully initialize instruction data in sm6_parser_emit_extractval(). Noticed after test runner started crashing when tracing is enabled. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/dxil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e21fdca1..82308ff6 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -3632,7 +3632,7 @@ static void sm6_parser_emit_extractval(struct sm6_parser *sm6, const struct dxil } dst->type = type; - ins->handler_idx = VKD3DSIH_MOV; + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); src_param = instruction_src_params_alloc(ins, 1, sm6); src_param_init_from_value(src_param, src);

1 0