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

Brendan Shanks : server: Replace sprintf with snprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 9b4e3718ed2ede744fb34b90b3f7b86ff2e01b15 URL: https://gitlab.winehq.org/wine/wine/-/commit/9b4e3718ed2ede744fb34b90b3f7b8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 19 15:15:58 2024 -0700 server: Replace sprintf with snprintf to avoid deprecation warnings on macOS. --- server/change.c | 2 +- server/directory.c | 2 +- server/fd.c | 12 ++++++------ server/mapping.c | 2 +- server/process.c | 2 +- server/procfs.c | 4 ++-- server/ptrace.c | 4 ++-- server/registry.c | 17 +++++++++-------- server/trace.c | 2 +- server/unicode.c | 10 +++++----- 10 files changed, 29 insertions(+), 28 deletions(-) diff --git a/server/change.c b/server/change.c index 843e495411c..f773ccf8831 100644 --- a/server/change.c +++ b/server/change.c @@ -726,7 +726,7 @@ static char *get_path_from_fd( int fd, int sz ) #ifdef linux char *ret = malloc( 32 + sz ); - if (ret) sprintf( ret, "/proc/self/fd/%u", fd ); + if (ret) snprintf( ret, 32 + sz, "/proc/self/fd/%u", fd ); return ret; #elif defined(F_GETPATH) char *ret = malloc( PATH_MAX + sz ); diff --git a/server/directory.c b/server/directory.c index 23d7eb0a2b7..e521a7b38c9 100644 --- a/server/directory.c +++ b/server/directory.c @@ -320,7 +320,7 @@ static void create_session( unsigned int id ) release_object( dir_sessions ); } - sprintf( id_strA, "%u", id ); + snprintf( id_strA, sizeof(id_strA), "%u", id ); id_strW = ascii_to_unicode_str( id_strA, &id_str ); dir_id = create_directory( &dir_sessions->obj, &id_str, 0, HASH_SIZE, NULL ); dir_dosdevices = create_directory( &dir_id->obj, &dir_dosdevices_str, OBJ_PERMANENT, HASH_SIZE, NULL ); diff --git a/server/fd.c b/server/fd.c index 8576882aaa9..fc7f7be92b9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -465,7 +465,7 @@ const char *get_timeout_str( timeout_t timeout ) { secs = -timeout / TICKS_PER_SEC; nsecs = -timeout % TICKS_PER_SEC; - sprintf( buffer, "+%ld.%07ld", secs, nsecs ); + snprintf( buffer, sizeof(buffer), "+%ld.%07ld", secs, nsecs ); } else /* absolute */ { @@ -477,12 +477,12 @@ const char *get_timeout_str( timeout_t timeout ) secs--; } if (secs >= 0) - sprintf( buffer, "%x%08x (+%ld.%07ld)", - (unsigned int)(timeout >> 32), (unsigned int)timeout, secs, nsecs ); + snprintf( buffer, sizeof(buffer), "%x%08x (+%ld.%07ld)", + (unsigned int)(timeout >> 32), (unsigned int)timeout, secs, nsecs ); else - sprintf( buffer, "%x%08x (-%ld.%07ld)", - (unsigned int)(timeout >> 32), (unsigned int)timeout, - -(secs + 1), TICKS_PER_SEC - nsecs ); + snprintf( buffer, sizeof(buffer), "%x%08x (-%ld.%07ld)", + (unsigned int)(timeout >> 32), (unsigned int)timeout, + -(secs + 1), TICKS_PER_SEC - nsecs ); } return buffer; } diff --git a/server/mapping.c b/server/mapping.c index 6b0de1b8b94..ff99b45ce51 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -292,7 +292,7 @@ static int make_temp_file( char name[16] ) value += (current_time >> 16) + current_time; for (i = 0; i < 0x8000 && fd < 0; i++, value += 7777) { - sprintf( name, "tmpmap-%08x", value ); + snprintf( name, 16, "tmpmap-%08x", value ); fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0600 ); } return fd; diff --git a/server/process.c b/server/process.c index abd6edb58a9..b7c7df38e44 100644 --- a/server/process.c +++ b/server/process.c @@ -1552,7 +1552,7 @@ DECL_HANDLER(get_process_vm_counters) char proc_path[32], line[256]; unsigned long value; - sprintf( proc_path, "/proc/%u/status", process->unix_pid ); + snprintf( proc_path, sizeof(proc_path), "/proc/%u/status", process->unix_pid ); if ((f = fopen( proc_path, "r" ))) { while (fgets( line, sizeof(line), f )) diff --git a/server/procfs.c b/server/procfs.c index 7b61b2abb46..0492a69c94e 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -55,7 +55,7 @@ static int open_proc_as( struct process *process, int flags ) return -1; } - sprintf( buffer, "/proc/%u/as", process->unix_pid ); + snprintf( buffer, sizeof(buffer), "/proc/%u/as", process->unix_pid ); if ((fd = open( buffer, flags )) == -1) { if (errno == ENOENT) /* probably got killed */ @@ -75,7 +75,7 @@ static int open_proc_lwpctl( struct thread *thread ) if (thread->unix_pid == -1) return -1; - sprintf( buffer, "/proc/%u/lwp/%u/lwpctl", thread->unix_pid, thread->unix_tid ); + snprintf( buffer, sizeof(buffer), "/proc/%u/lwp/%u/lwpctl", thread->unix_pid, thread->unix_tid ); if ((fd = open( buffer, O_WRONLY )) == -1) { if (errno == ENOENT) /* probably got killed */ diff --git a/server/ptrace.c b/server/ptrace.c index 976d3a3778e..bd86f0bf2ec 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -366,7 +366,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t char procmem[24]; int fd; - sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + snprintf( procmem, sizeof(procmem), "/proc/%u/mem", process->unix_pid ); if ((fd = open( procmem, O_RDONLY )) != -1) { ssize_t ret = pread( fd, dest, size, ptr ); @@ -467,7 +467,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t char procmem[24]; int fd; - sprintf( procmem, "/proc/%u/mem", process->unix_pid ); + snprintf( procmem, sizeof(procmem), "/proc/%u/mem", process->unix_pid ); if ((fd = open( procmem, O_WRONLY )) != -1) { ssize_t r = pwrite( fd, src, size, ptr ); diff --git a/server/registry.c b/server/registry.c index e88bed1e72e..5e2c748fa32 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1831,15 +1831,16 @@ static int load_init_registry_from_file( const char *filename, struct key *key ) static WCHAR *format_user_registry_path( const struct sid *sid, struct unicode_str *path ) { - char buffer[7 + 11 + 11 + 11 * ARRAY_SIZE(sid->sub_auth)], *p = buffer; + char buffer[7 + 11 + 11 + 11 * ARRAY_SIZE(sid->sub_auth)]; unsigned int i; - - p += sprintf( p, "User\\S-%u-%u", sid->revision, - ((unsigned int)sid->id_auth[2] << 24) | - ((unsigned int)sid->id_auth[3] << 16) | - ((unsigned int)sid->id_auth[4] << 8) | - ((unsigned int)sid->id_auth[5]) ); - for (i = 0; i < sid->sub_count; i++) p += sprintf( p, "-%u", sid->sub_auth[i] ); + int len; + + len = snprintf( buffer, sizeof(buffer), "User\\S-%u-%u", sid->revision, + ((unsigned int)sid->id_auth[2] << 24) | + ((unsigned int)sid->id_auth[3] << 16) | + ((unsigned int)sid->id_auth[4] << 8) | + ((unsigned int)sid->id_auth[5]) ); + for (i = 0; i < sid->sub_count; i++) len += snprintf( buffer + len, sizeof(buffer) - len, "-%u", sid->sub_auth[i] ); return ascii_to_unicode_str( buffer, path ); } diff --git a/server/trace.c b/server/trace.c index a94b535bd5d..efb4bb03c4a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5645,7 +5645,7 @@ static const char *get_status_name( unsigned int status ) for (i = 0; status_names[i].name; i++) if (status_names[i].value == status) return status_names[i].name; } - sprintf( buffer, "%x", status ); + snprintf( buffer, sizeof(buffer), "%x", status ); return buffer; } diff --git a/server/unicode.c b/server/unicode.c index abc3367be75..cae9df7da65 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -212,19 +212,19 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] if (*str > 127) /* hex escape */ { if (len > 1 && str[1] < 128 && isxdigit((char)str[1])) - pos += sprintf( pos, "\\x%04x", *str ); + pos += snprintf( pos, sizeof(buffer) - (pos - buffer), "\\x%04x", *str ); else - pos += sprintf( pos, "\\x%x", *str ); + pos += snprintf( pos, sizeof(buffer) - (pos - buffer), "\\x%x", *str ); continue; } if (*str < 32) /* octal or C escape */ { if (escapes[*str] != '.') - pos += sprintf( pos, "\\%c", escapes[*str] ); + pos += snprintf( pos, sizeof(buffer) - (pos - buffer), "\\%c", escapes[*str] ); else if (len > 1 && str[1] >= '0' && str[1] <= '7') - pos += sprintf( pos, "\\%03o", *str ); + pos += snprintf( pos, sizeof(buffer) - (pos - buffer), "\\%03o", *str ); else - pos += sprintf( pos, "\\%o", *str ); + pos += snprintf( pos, sizeof(buffer) - (pos - buffer), "\\%o", *str ); continue; } if (*str == '\\' || *str == escape[0] || *str == escape[1]) *pos++ = '\\';

1 0

Brendan Shanks : server: Clarify that registry files are always in the current directory, and simplify save_branch().
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 6ea3bc56ec46b043c7a7f225ac7218bdee73f061 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ea3bc56ec46b043c7a7f225ac7218… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 19 15:16:33 2024 -0700 server: Clarify that registry files are always in the current directory, and simplify save_branch(). --- server/registry.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/server/registry.c b/server/registry.c index 5e2c748fa32..804cfcc638b 100644 --- a/server/registry.c +++ b/server/registry.c @@ -137,7 +137,7 @@ static struct key_value *find_value( const struct key *key, const struct unicode struct save_branch_info { struct key *key; - const char *path; + const char *filename; }; #define MAX_SAVE_BRANCH_INFO 3 @@ -1823,7 +1823,7 @@ static int load_init_registry_from_file( const char *filename, struct key *key ) assert( save_branch_count < MAX_SAVE_BRANCH_INFO ); - save_branch_info[save_branch_count].path = filename; + save_branch_info[save_branch_count].filename = filename; save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); make_object_permanent( &key->obj ); return (f != NULL); @@ -2038,10 +2038,10 @@ static void save_registry( struct key *key, obj_handle_t handle ) } /* save a registry branch to a file */ -static int save_branch( struct key *key, const char *path ) +static int save_branch( struct key *key, const char *filename ) { struct stat st; - char *p, *tmp = NULL; + char tmp[32]; int fd, count = 0, ret = 0; FILE *f; @@ -2050,14 +2050,15 @@ static int save_branch( struct key *key, const char *path ) if (debug_level > 1) dump_operation( key, NULL, "Not saving clean" ); return 1; } + tmp[0] = 0; /* test the file type */ - if ((fd = open( path, O_WRONLY )) != -1) + if ((fd = open( filename, O_WRONLY )) != -1) { /* if file is not a regular file or has multiple links or is accessed * via symbolic links, write directly into it; otherwise use a temp file */ - if (!lstat( path, &st ) && (!S_ISREG(st.st_mode) || st.st_nlink > 1)) + if (!lstat( filename, &st ) && (!S_ISREG(st.st_mode) || st.st_nlink > 1)) { ftruncate( fd, 0 ); goto save; @@ -2065,15 +2066,11 @@ static int save_branch( struct key *key, const char *path ) close( fd ); } - /* create a temp file in the same directory */ + /* create a temp file */ - if (!(tmp = malloc( strlen(path) + 20 ))) goto done; - strcpy( tmp, path ); - if ((p = strrchr( tmp, '/' ))) p++; - else p = tmp; for (;;) { - sprintf( p, "reg%lx%04x.tmp", (long) getpid(), count++ ); + snprintf( tmp, sizeof(tmp), "reg%lx%04x.tmp", (long) getpid(), count++ ); if ((fd = open( tmp, O_CREAT | O_EXCL | O_WRONLY, 0666 )) != -1) break; if (errno != EEXIST) goto done; close( fd ); @@ -2084,29 +2081,28 @@ static int save_branch( struct key *key, const char *path ) save: if (!(f = fdopen( fd, "w" ))) { - if (tmp) unlink( tmp ); + if (tmp[0]) unlink( tmp ); close( fd ); goto done; } if (debug_level > 1) { - fprintf( stderr, "%s: ", path ); + fprintf( stderr, "%s: ", filename ); dump_operation( key, NULL, "saving" ); } save_all_subkeys( key, f ); ret = !fclose(f); - if (tmp) + if (tmp[0]) { /* if successfully written, rename to final name */ - if (ret) ret = !rename( tmp, path ); + if (ret) ret = !rename( tmp, filename ); if (!ret) unlink( tmp ); } done: - free( tmp ); if (ret) make_clean( key ); return ret; } @@ -2119,7 +2115,7 @@ static void periodic_save( void *arg ) if (fchdir( config_dir_fd ) == -1) return; save_timeout_user = NULL; for (i = 0; i < save_branch_count; i++) - save_branch( save_branch_info[i].key, save_branch_info[i].path ); + save_branch( save_branch_info[i].key, save_branch_info[i].filename ); if (fchdir( server_dir_fd ) == -1) fatal_error( "chdir to server dir: %s\n", strerror( errno )); set_periodic_save_timer(); } @@ -2139,10 +2135,10 @@ void flush_registry(void) if (fchdir( config_dir_fd ) == -1) return; for (i = 0; i < save_branch_count; i++) { - if (!save_branch( save_branch_info[i].key, save_branch_info[i].path )) + if (!save_branch( save_branch_info[i].key, save_branch_info[i].filename )) { fprintf( stderr, "wineserver: could not save registry branch to %s", - save_branch_info[i].path ); + save_branch_info[i].filename ); perror( " " ); } }

1 0

Paul Gofman : avifil32: Update lCurrentFrame in IGetFrame_fnGetFrame().
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: a2c20d0e93290b3f998ad78c7aeaed8028aee2da URL: https://gitlab.winehq.org/wine/wine/-/commit/a2c20d0e93290b3f998ad78c7aeaed… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 28 12:40:37 2024 -0600 avifil32: Update lCurrentFrame in IGetFrame_fnGetFrame(). --- dlls/avifil32/getframe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index c6df7339256..0b58c3f064f 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -254,6 +254,8 @@ static LPVOID WINAPI IGetFrame_fnGetFrame(IGetFrame *iface, LONG lPos) } /* for (lNext < lPos) */ } /* if (This->lCurrentFrame != lPos) */ + This->lCurrentFrame = lPos; + return (This->hic == NULL ? This->lpInFormat : This->lpOutFormat); }

1 0

Nikolay Sivov : d3d10: Use older compiler for D3D10CompileEffectFromMemory().
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 36a4e5c9bbce538fbbfd09277d14fb4816b0dc1d URL: https://gitlab.winehq.org/wine/wine/-/commit/36a4e5c9bbce538fbbfd09277d14fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 28 10:59:35 2024 +0100 d3d10: Use older compiler for D3D10CompileEffectFromMemory(). Compilation output from D3D10CompileEffectFromMemory() always contains $Globals buffer, even if it's empty. That matches behaviour of 33-39 compilers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/Makefile.in | 3 ++- dlls/d3d10/d3d10_main.c | 2 +- dlls/d3d10/d3d10_private.h | 8 ++++++++ dlls/d3d10/shader.c | 5 ++--- dlls/d3dcompiler_39/Makefile.in | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index b942e27f991..573b0791e21 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -1,11 +1,12 @@ MODULE = d3d10.dll IMPORTLIB = d3d10 -IMPORTS = uuid d3d10core d3dcompiler dxgi wined3d +IMPORTS = uuid d3d10core d3dcompiler_39 dxgi wined3d EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) SOURCES = \ + blob.c \ d3d10_main.c \ effect.c \ reflection.c \ diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 82c2ecc2ec9..565b5f4a0c1 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -239,7 +239,7 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); - return D3DCompile(data, data_size, filename, defines, include, + return D3DCompileFromMemory(data, data_size, filename, defines, include, NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index c174792e14b..040976ffaa5 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -315,4 +315,12 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device); +/* d3dcompiler_39 function prototypes */ +HRESULT WINAPI D3DCompileFromMemory(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages); + +HRESULT WINAPI D3DDisassembleCode(const void *data, SIZE_T data_size, + UINT flags, const char *comments, ID3DBlob **disassembly); + #endif /* __WINE_D3D10_PRIVATE_H */ diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 761b2b3211f..ef8221a2737 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -26,8 +26,7 @@ HRESULT WINAPI D3D10CompileShader(const char *data, SIZE_T data_size, const char const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *entrypoint, const char *profile, UINT flags, ID3D10Blob **shader, ID3D10Blob **error_messages) { - /* Forward to d3dcompiler */ - return D3DCompile(data, data_size, filename, defines, include, + return D3DCompileFromMemory(data, data_size, filename, defines, include, entrypoint, profile, flags, 0, shader, error_messages); } @@ -37,5 +36,5 @@ HRESULT WINAPI D3D10DisassembleShader(const void *data, SIZE_T data_size, TRACE("data %p, data_size %#Ix, color_code %#x, comments %p, disassembly %p.\n", data, data_size, color_code, comments, disassembly); - return D3DDisassemble(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); + return D3DDisassembleCode(data, data_size, color_code ? D3D_DISASM_ENABLE_COLOR_CODE : 0, comments, disassembly); } diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 2f9231871f1..4735aa18411 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dcompiler_39.dll +IMPORTLIB = d3dcompiler_39 IMPORTS = wined3d EXTRADEFS = -DD3D_COMPILER_VERSION=39 PARENTSRC = ../d3dcompiler_43

1 0

Nikolay Sivov : d3d10/tests: Add a test for effect compilation containing empty buffers.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 850660ada05c3f217d082df232d9b7db309e30f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/850660ada05c3f217d082df232d9b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 28 16:53:53 2024 +0100 d3d10/tests: Add a test for effect compilation containing empty buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 58 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 0935541ced0..94f046ea479 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -9877,7 +9877,15 @@ static void test_effect_fx_4_1_blend_state(void) static void test_effect_compiler(void) { - static char empty_effect[] = "technique10 {};"; + static char empty_effect[] = + "technique10 {};"; + static char empty_buffer[] = + "cbuffer cb1 { float4 m1; }\n" + "cbuffer cb2 { }\n" + "technique10 {};"; + + D3D10_EFFECT_VARIABLE_DESC var_desc; + ID3D10EffectConstantBuffer *cb; D3D10_EFFECT_DESC desc; ID3D10Device *device; ID3D10Effect *effect; @@ -9899,10 +9907,56 @@ static void test_effect_compiler(void) hr = ID3D10Effect_GetDesc(effect, &desc); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(desc.Techniques == 1, "Unexpected technique count %u.\n", desc.Techniques); + todo_wine + ok(desc.ConstantBuffers == 1, "Unexpected buffer count %u.\n", desc.ConstantBuffers); + + cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); + ID3D10Effect_Release(effect); + ID3D10Blob_Release(blob); - ID3D10Device_Release(device); + /* Empty user buffers. */ + hr = D3D10CompileEffectFromMemory(empty_buffer, sizeof(empty_buffer), NULL, NULL, NULL, 0, 0, + &blob, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = create_effect(ID3D10Blob_GetBufferPointer(blob), 0, device, NULL, &effect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = ID3D10Effect_GetDesc(effect, &desc); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(desc.Techniques == 1, "Unexpected technique count %u.\n", desc.Techniques); + todo_wine + ok(desc.ConstantBuffers == 3, "Unexpected buffer count %u.\n", desc.ConstantBuffers); + + cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(!strcmp(var_desc.Name, "$Globals"), "Unexpected variable name %s.\n", var_desc.Name); + + cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 1); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ok(!strcmp(var_desc.Name, "cb1"), "Unexpected variable name %s.\n", var_desc.Name); + + cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 2); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr == S_OK) + ok(!strcmp(var_desc.Name, "cb2"), "Unexpected variable name %s.\n", var_desc.Name); + + ID3D10Effect_Release(effect); ID3D10Blob_Release(blob); + + ID3D10Device_Release(device); } START_TEST(effect)

1 0

Rémi Bernon : winegstreamer: Create the transform parsed caps from wg_format.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 3668a466758d21220a26a7afcebffa64c7fccd4a URL: https://gitlab.winehq.org/wine/wine/-/commit/3668a466758d21220a26a7afcebffa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 26 14:15:34 2024 +0100 winegstreamer: Create the transform parsed caps from wg_format. --- dlls/winegstreamer/wg_transform.c | 55 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 71ea8cd263c..3ddf7c19e25 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -332,6 +332,59 @@ static bool wg_format_video_is_flipped(const struct wg_format *format) return format->major_type == WG_MAJOR_TYPE_VIDEO && (format->u.video.height < 0); } +static GstCaps *transform_get_parsed_caps(struct wg_format *format, const char *media_type) +{ + GstCaps *parsed_caps; + + if (!(parsed_caps = gst_caps_new_empty_simple(media_type))) + return NULL; + + switch (format->major_type) + { + case WG_MAJOR_TYPE_AUDIO_MPEG1: + gst_caps_set_simple(parsed_caps, "parsed", G_TYPE_BOOLEAN, true, "mpegversion", G_TYPE_INT, 1, + "layer", G_TYPE_INT, format->u.audio_mpeg1.layer, NULL); + break; + case WG_MAJOR_TYPE_AUDIO_MPEG4: + gst_caps_set_simple(parsed_caps, "framed", G_TYPE_BOOLEAN, true, "mpegversion", G_TYPE_INT, 4, NULL); + break; + case WG_MAJOR_TYPE_AUDIO_WMA: + gst_caps_set_simple(parsed_caps, "wmaversion", G_TYPE_INT, format->u.audio_wma.version, NULL); + break; + case WG_MAJOR_TYPE_VIDEO_H264: + gst_caps_set_simple(parsed_caps, "parsed", G_TYPE_BOOLEAN, true, NULL); + break; + case WG_MAJOR_TYPE_VIDEO_MPEG1: + gst_caps_set_simple(parsed_caps, "parsed", G_TYPE_BOOLEAN, true, "mpegversion", G_TYPE_INT, 1, NULL); + break; + case WG_MAJOR_TYPE_VIDEO_WMV: + switch (format->u.video_wmv.format) + { + case WG_WMV_VIDEO_FORMAT_WMV1: + gst_caps_set_simple(parsed_caps, "wmvversion", G_TYPE_INT, 1, NULL); + break; + case WG_WMV_VIDEO_FORMAT_WMV2: + gst_caps_set_simple(parsed_caps, "wmvversion", G_TYPE_INT, 2, NULL); + break; + case WG_WMV_VIDEO_FORMAT_WMV3: + case WG_WMV_VIDEO_FORMAT_WMVA: + case WG_WMV_VIDEO_FORMAT_WVC1: + gst_caps_set_simple(parsed_caps, "wmvversion", G_TYPE_INT, 3, NULL); + break; + default: + GST_WARNING("Unknown WMV format %u.", format->u.video_wmv.format); + break; + } + break; + case WG_MAJOR_TYPE_AUDIO: + case WG_MAJOR_TYPE_VIDEO: + case WG_MAJOR_TYPE_UNKNOWN: + break; + } + + return parsed_caps; +} + NTSTATUS wg_transform_create(void *args) { struct wg_transform_create_params *params = args; @@ -391,7 +444,7 @@ NTSTATUS wg_transform_create(void *args) gst_pad_set_chain_function(transform->my_sink, transform_sink_chain_cb); media_type = gst_structure_get_name(gst_caps_get_structure(src_caps, 0)); - if (!(parsed_caps = gst_caps_new_empty_simple(media_type))) + if (!(parsed_caps = transform_get_parsed_caps(&input_format, media_type))) goto out; /* Since we append conversion elements, we don't want to filter decoders

1 0

Rémi Bernon : winegstreamer: Fallback to input caps only when no parser was found.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: d7cf25dcd49c44e066658bf5752f4c429906323b URL: https://gitlab.winehq.org/wine/wine/-/commit/d7cf25dcd49c44e066658bf5752f4c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 26 11:22:13 2024 +0100 winegstreamer: Fallback to input caps only when no parser was found. --- dlls/winegstreamer/wg_transform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 3ddf7c19e25..aabe618972d 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -468,7 +468,7 @@ NTSTATUS wg_transform_create(void *args) if ((element = find_element(GST_ELEMENT_FACTORY_TYPE_PARSER, src_caps, parsed_caps)) && !append_element(transform->container, element, &first, &last)) goto out; - else + else if (!element) { gst_caps_unref(parsed_caps); parsed_caps = gst_caps_ref(src_caps);

1 0

Brendan Shanks : server: Replace some malloc/sprintf/strcpy calls with asprintf.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 4e04b2d5282e4ef769176c94b4b38b5fba006a06 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e04b2d5282e4ef769176c94b4b38b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 19 15:15:29 2024 -0700 server: Replace some malloc/sprintf/strcpy calls with asprintf. --- server/request.c | 24 ++++++++++-------------- server/unicode.c | 10 ++-------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/server/request.c b/server/request.c index 8fe3a09cb7e..2691e0c7cff 100644 --- a/server/request.c +++ b/server/request.c @@ -601,9 +601,8 @@ static void create_dir( const char *name, struct stat *st ) static char *create_server_dir( int force ) { const char *prefix = getenv( "WINEPREFIX" ); - char *p, *config_dir; + char *p, *config_dir, *base_dir; struct stat st, st2; - size_t len = sizeof("/server-") + 2 * sizeof(st.st_dev) + 2 * sizeof(st.st_ino) + 2; /* open the configuration directory */ @@ -646,23 +645,19 @@ static char *create_server_dir( int force ) /* create the base directory if needed */ #ifdef __ANDROID__ /* there's no /tmp dir on Android */ - len += strlen( config_dir ) + sizeof("/.wineserver"); - if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" ); - strcpy( server_dir, config_dir ); - strcat( server_dir, "/.wineserver" ); + if (asprintf( &base_dir, "%s/.wineserver", config_dir ) == -1) + fatal_error( "out of memory\n" ); #else - len += sizeof("/tmp/.wine-") + 12; - if (!(server_dir = malloc( len ))) fatal_error( "out of memory\n" ); - sprintf( server_dir, "/tmp/.wine-%u", getuid() ); + if (asprintf( &base_dir, "/tmp/.wine-%u", getuid() ) == -1) + fatal_error( "out of memory\n" ); #endif - create_dir( server_dir, &st2 ); + create_dir( base_dir, &st2 ); /* now create the server directory */ - strcat( server_dir, "/server-" ); - p = server_dir + strlen(server_dir); - - sprintf( p, "%llx-%llx", (unsigned long long)st.st_dev, (unsigned long long)st.st_ino ); + if (asprintf( &server_dir, "%s/server-%llx-%llx", base_dir, + (unsigned long long)st.st_dev, (unsigned long long)st.st_ino ) == -1) + fatal_error( "out of memory\n" ); create_dir( server_dir, &st ); @@ -675,6 +670,7 @@ static char *create_server_dir( int force ) if (st.st_dev != st2.st_dev || st.st_ino != st2.st_ino) fatal_error( "chdir did not end up in %s\n", server_dir ); + free( base_dir ); free( config_dir ); return server_dir; } diff --git a/server/unicode.c b/server/unicode.c index f84520580d7..abc3367be75 100644 --- a/server/unicode.c +++ b/server/unicode.c @@ -265,11 +265,7 @@ static char *get_nls_dir(void) } *(++p) = 0; if (p > dir + 8 && !strcmp( p - 8, "/server/" )) nlsdir = "../nls"; /* inside build tree */ - if ((ret = malloc( strlen(dir) + strlen( nlsdir ) + 1 ))) - { - strcpy( ret, dir ); - strcat( ret, nlsdir ); - } + asprintf( &ret, "%s%s", dir, nlsdir ); free( dir ); return ret; } @@ -292,9 +288,7 @@ struct fd *load_intl_file(void) for (i = 0; i < ARRAY_SIZE( nls_dirs ); i++) { if (!nls_dirs[i]) continue; - if (!(path = malloc( strlen(nls_dirs[i]) + sizeof("/l_intl.nls" )))) continue; - strcpy( path, nls_dirs[i] ); - strcat( path, "/l_intl.nls" ); + if (asprintf( &path, "%s/l_intl.nls", nls_dirs[i] ) == -1) continue; if ((fd = open_fd( NULL, path, nt_name, O_RDONLY, &mode, FILE_READ_DATA, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ))) break;

1 0

Rémi Bernon : winevulkan: Strip surface extensions in vkEnumerateInstanceExtensionProperties.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: e4e0ce2bc69f49dd9d08f6a412ae941f0e3fd35d URL: https://gitlab.winehq.org/wine/wine/-/commit/e4e0ce2bc69f49dd9d08f6a412ae94… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 08:11:38 2024 +0100 winevulkan: Strip surface extensions in vkEnumerateInstanceExtensionProperties. --- dlls/winevulkan/make_vulkan | 28 ++++++++++++++++++++++++++++ dlls/winevulkan/vulkan.c | 15 +++++++++++---- dlls/winevulkan/vulkan_private.h | 1 + dlls/winevulkan/vulkan_thunks.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 809591b3c97..1455247870f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -144,6 +144,12 @@ CORE_EXTENSIONS = [ "VK_KHR_win32_surface", ] +# List of surface extensions that can be exposed directly to the PE side +WIN_SURFACE_EXTENSIONS = [ + "VK_KHR_win32_surface", + "VK_EXT_headless_surface", +] + # Some experimental extensions are used by shipping applications so their API is extremely unlikely # to change in a backwards-incompatible way. Allow translation of those extensions with WineVulkan. ALLOWED_X_EXTENSIONS = [ @@ -2771,6 +2777,13 @@ class VkGenerator(object): f.write(" \"{0}\",\n".format(ext["name"])) f.write("};\n\n") + # Create array of surface extensions. + f.write("static const char * const vk_host_surface_extensions[] =\n{\n") + for ext in self.registry.surface_extensions: + if ext["name"] not in WIN_SURFACE_EXTENSIONS: + f.write(" \"{0}\",\n".format(ext["name"])) + f.write("};\n\n") + f.write("BOOL wine_vk_device_extension_supported(const char *name)\n") f.write("{\n") f.write(" unsigned int i;\n") @@ -2793,6 +2806,17 @@ class VkGenerator(object): f.write(" return FALSE;\n") f.write("}\n\n") + f.write("BOOL wine_vk_is_host_surface_extension(const char *name)\n") + f.write("{\n") + f.write(" unsigned int i;\n") + f.write(" for (i = 0; i < ARRAY_SIZE(vk_host_surface_extensions); i++)\n") + f.write(" {\n") + f.write(" if (strcmp(vk_host_surface_extensions[i], name) == 0)\n") + f.write(" return TRUE;\n") + f.write(" }\n") + f.write(" return FALSE;\n") + f.write("}\n\n") + f.write("BOOL wine_vk_is_type_wrapped(VkObjectType type)\n") f.write("{\n") f.write(" return FALSE") @@ -3194,6 +3218,7 @@ class VkRegistry(object): # We aggregate all types in here for cross-referencing. self.funcs = {} self.types = {} + self.surface_extensions = [] self.version_regex = re.compile( r'^' @@ -3471,6 +3496,9 @@ class VkRegistry(object): def process_ext(ext, deferred=False): ext_name = ext.attrib["name"] + if ext_name.endswith('_surface') and ext.attrib.get('depends', None) == 'VK_KHR_surface': + self.surface_extensions.append({"name" : ext_name}) + # Set extension name on any functions calls part of this extension as we # were not aware of the name during initial parsing. commands = ext.findall("require/command") diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 0846f2dfc73..7b91202b961 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1003,7 +1003,7 @@ VkResult wine_vkEnumerateInstanceExtensionProperties(const char *name, uint32_t { uint32_t num_properties = 0, num_host_properties; VkExtensionProperties *host_properties; - unsigned int i, j; + unsigned int i, j, surface; VkResult res; res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); @@ -1025,9 +1025,10 @@ VkResult wine_vkEnumerateInstanceExtensionProperties(const char *name, uint32_t * including extension fixup (e.g. VK_KHR_xlib_surface -> VK_KHR_win32_surface). It is * up to us here to filter the list down to extensions for which we have thunks. */ - for (i = 0; i < num_host_properties; i++) + for (i = 0, surface = 0; i < num_host_properties; i++) { - if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) + if (wine_vk_instance_extension_supported(host_properties[i].extensionName) + || (wine_vk_is_host_surface_extension(host_properties[i].extensionName) && !surface++)) num_properties++; else TRACE("Instance extension '%s' is not supported.\n", host_properties[i].extensionName); @@ -1041,13 +1042,19 @@ VkResult wine_vkEnumerateInstanceExtensionProperties(const char *name, uint32_t return VK_SUCCESS; } - for (i = 0, j = 0; i < num_host_properties && j < *count; i++) + for (i = 0, j = 0, surface = 0; i < num_host_properties && j < *count; i++) { if (wine_vk_instance_extension_supported(host_properties[i].extensionName)) { TRACE("Enabling extension '%s'.\n", host_properties[i].extensionName); properties[j++] = host_properties[i]; } + else if (wine_vk_is_host_surface_extension(host_properties[i].extensionName) && !surface++) + { + VkExtensionProperties win32_surface = {VK_KHR_WIN32_SURFACE_EXTENSION_NAME, VK_KHR_WIN32_SURFACE_SPEC_VERSION}; + TRACE("Enabling VK_KHR_win32_surface.\n"); + properties[j++] = win32_surface; + } } *count = min(*count, num_properties); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index b44285722a7..f5109aa6377 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -270,6 +270,7 @@ static inline VkSwapchainKHR wine_swapchain_to_handle(struct wine_swapchain *sur BOOL wine_vk_device_extension_supported(const char *name); BOOL wine_vk_instance_extension_supported(const char *name); +BOOL wine_vk_is_host_surface_extension(const char *name); BOOL wine_vk_is_type_wrapped(VkObjectType type); diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 93e52b46a9d..9075b5ff11f 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -46749,6 +46749,23 @@ static const char * const vk_instance_extensions[] = "VK_KHR_win32_surface", }; +static const char * const vk_host_surface_extensions[] = +{ + "VK_KHR_xlib_surface", + "VK_KHR_xcb_surface", + "VK_KHR_wayland_surface", + "VK_KHR_mir_surface", + "VK_KHR_android_surface", + "VK_GGP_stream_descriptor_surface", + "VK_NN_vi_surface", + "VK_MVK_ios_surface", + "VK_MVK_macos_surface", + "VK_FUCHSIA_imagepipe_surface", + "VK_EXT_metal_surface", + "VK_EXT_directfb_surface", + "VK_QNX_screen_surface", +}; + BOOL wine_vk_device_extension_supported(const char *name) { unsigned int i; @@ -46771,6 +46788,17 @@ BOOL wine_vk_instance_extension_supported(const char *name) return FALSE; } +BOOL wine_vk_is_host_surface_extension(const char *name) +{ + unsigned int i; + for (i = 0; i < ARRAY_SIZE(vk_host_surface_extensions); i++) + { + if (strcmp(vk_host_surface_extensions[i], name) == 0) + return TRUE; + } + return FALSE; +} + BOOL wine_vk_is_type_wrapped(VkObjectType type) { return FALSE ||

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkEnumerateInstanceExtensionProperties driver entry.
by Alexandre Julliard 28 Mar '24

28 Mar '24

Module: wine Branch: master Commit: 5db24dbb326cf77aed3c42aff87c1a123447050a URL: https://gitlab.winehq.org/wine/wine/-/commit/5db24dbb326cf77aed3c42aff87c1a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Feb 24 12:37:32 2024 +0100 winevulkan: Remove now unnecessary vkEnumerateInstanceExtensionProperties driver entry. --- dlls/win32u/vulkan.c | 1 - dlls/winemac.drv/vulkan.c | 56 ------------------------------------------- dlls/winevulkan/make_vulkan | 6 ----- dlls/winevulkan/vulkan.c | 14 ++++++----- dlls/winewayland.drv/vulkan.c | 45 ---------------------------------- dlls/winex11.drv/vulkan.c | 44 ---------------------------------- include/wine/vulkan_driver.h | 3 +-- 7 files changed, 9 insertions(+), 160 deletions(-)

1 0