June 2023 - Wine-commits - list.winehq.org

Davide Beatrici : mmdevapi: Handle CreateThread() failure in AudioClient's Start.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: 3b5411941d7762f70a6e08a569463dce1356cc33 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b5411941d7762f70a6e08a569463d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Jun 7 23:08:10 2023 +0200 mmdevapi: Handle CreateThread() failure in AudioClient's Start. --- dlls/mmdevapi/client.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 03bfbabd536..bd861f8b890 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -408,8 +408,12 @@ HRESULT WINAPI client_Start(IAudioClient3 *iface) WINE_UNIX_CALL(start, &params); if (SUCCEEDED(params.result) && !This->timer_thread) { - This->timer_thread = CreateThread(NULL, 0, timer_loop_func, This, 0, NULL); - SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); + if ((This->timer_thread = CreateThread(NULL, 0, timer_loop_func, This, 0, NULL))) + SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); + else { + IAudioClient3_Stop(&This->IAudioClient3_iface); + params.result = E_FAIL; + } } sessions_unlock();

1 0

Alexandre Julliard : ntdll: Use the sysv ABI for __wine_syscall_dispatcher_return().
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: 931292f1a6af1fee99e2e7a0bad787d8436219ef URL: https://gitlab.winehq.org/wine/wine/-/commit/931292f1a6af1fee99e2e7a0bad787… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 16:49:41 2023 +0200 ntdll: Use the sysv ABI for __wine_syscall_dispatcher_return(). Missing from b337c5b1a1757b2abbc90a7c6955d64242861ab9, spotted by Fan WenJie. --- dlls/ntdll/unix/signal_x86_64.c | 10 ++++++---- dlls/ntdll/unix/unix_private.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 48443799ef6..0204139631f 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1861,8 +1861,8 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, else { TRACE_(seh)( "returning to user mode ip=%016lx ret=%08x\n", frame->rip, rec->ExceptionCode ); - RCX_sig(sigcontext) = (ULONG_PTR)frame; - RDX_sig(sigcontext) = rec->ExceptionCode; + RDI_sig(sigcontext) = (ULONG_PTR)frame; + RSI_sig(sigcontext) = rec->ExceptionCode; RIP_sig(sigcontext) = (ULONG_PTR)__wine_syscall_dispatcher_return; } return TRUE; @@ -2824,14 +2824,16 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, __ASM_CFI_REG_IS_AT1(r14, rbp, 0x48) __ASM_CFI_REG_IS_AT1(r15, rbp, 0x50) __ASM_CFI_REG_IS_AT1(rbp, rbp, 0x00) - "5:\tmovl $0xc000000d,%edx\n\t" /* STATUS_INVALID_PARAMETER */ + "5:\tmovl $0xc000000d,%eax\n\t" /* STATUS_INVALID_PARAMETER */ "movq %rsp,%rcx\n\t" /* $rcx is now pointing to "frame" again */ __ASM_CFI(".cfi_restore_state\n\t") + "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") "\n\t" ".globl " __ASM_NAME("__wine_syscall_dispatcher_return") "\n" __ASM_NAME("__wine_syscall_dispatcher_return") ":\n\t" + "movq %rdi,%rcx\n\t" "movl 0xb0(%rcx),%r14d\n\t" /* frame->syscall_flags */ - "movq %rdx,%rax\n\t" + "movq %rsi,%rax\n\t" "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_return") ) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a9a829a1685..4d62c4f6570 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -266,7 +266,7 @@ extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE ent extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4] DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; -extern void WINAPI DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval ) DECLSPEC_HIDDEN; +extern void DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval ) DECLSPEC_HIDDEN; extern void __wine_unix_call_dispatcher(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_set_full_context( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winebuild: Set a 64-bit base address for generated 64-bit dlls.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: 320acdad05b0e3eee0aac16909716b106cf057b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/320acdad05b0e3eee0aac16909716b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 11:04:05 2023 +0200 winebuild: Set a 64-bit base address for generated 64-bit dlls. --- tools/winebuild/spec32.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 0cf8d783633..6e4131bd910 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1113,8 +1113,16 @@ static void output_pe_file( DLLSPEC *spec, const char signature[32] ) put_dword( 0 ); /* SizeOfUninitializedData */ put_dword( code_size ? pe.sec[0].rva : 0 ); /* AddressOfEntryPoint */ put_dword( code_size ? pe.sec[0].rva : 0 ); /* BaseOfCode */ - if (get_ptr_size() == 4) put_dword( 0 ); /* BaseOfData */ - put_pword( 0x10000000 ); /* ImageBase */ + if (get_ptr_size() == 4) + { + put_dword( 0 ); /* BaseOfData */ + put_dword( 0x10000000 ); /* ImageBase */ + } + else + { + put_dword( 0x80000000 ); /* ImageBase */ + put_dword( 0x00000001 ); + } put_dword( pe.section_align ); /* SectionAlignment */ put_dword( pe.file_align ); /* FileAlignment */ put_word( 1 ); /* MajorOperatingSystemVersion */

1 0

Alexandre Julliard : winebuild: Update target-dependent characteristics after option parsing.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: bc2e4ea7e24de5ccd2909b0db6199e8cfd52bbc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc2e4ea7e24de5ccd2909b0db6199e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 11:05:51 2023 +0200 winebuild: Update target-dependent characteristics after option parsing. --- tools/winebuild/main.c | 5 +++++ tools/winebuild/utils.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index f216e4bf35d..c5f5b56c20e 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -640,6 +640,11 @@ int main(int argc, char **argv) spec->characteristics |= IMAGE_FILE_DLL; /* fall through */ case MODE_EXE: + if (get_ptr_size() == 4) + spec->characteristics |= IMAGE_FILE_32BIT_MACHINE; + else + spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; + files = load_resources( files, spec ); if (spec_file_name && !parse_input_file( spec )) break; if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec )); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 523f1af7118..49d2468b236 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -629,10 +629,6 @@ DLLSPEC *alloc_dll_spec(void) spec->subsystem_major = 4; spec->subsystem_minor = 0; spec->syscall_table = 0; - if (get_ptr_size() > 4) - spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; - else - spec->characteristics |= IMAGE_FILE_32BIT_MACHINE; spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; return spec; }

1 0

Alexandre Julliard : winedump: Dump version resources in a more structured way.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: 79f3fa732a8a28c395b634a2b30a8adb83cba4f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/79f3fa732a8a28c395b634a2b30a8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 11:07:16 2023 +0200 winedump: Dump version resources in a more structured way. --- tools/winedump/pe.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 136 insertions(+), 4 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 5c2898b6dbc..82ecf12d910 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" +#include "verrsrc.h" #include "winedump.h" #define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */ @@ -2783,7 +2784,7 @@ static void dump_string_data( const WCHAR *ptr, unsigned int size, unsigned int } /* dump data for a MESSAGETABLE resource */ -static void dump_msgtable_data( const void *ptr, unsigned int size, unsigned int id, const char *prefix ) +static void dump_msgtable_data( const void *ptr, unsigned int size, const char *prefix ) { const MESSAGE_RESOURCE_DATA *data = ptr; const MESSAGE_RESOURCE_BLOCK *block = data->Blocks; @@ -2815,6 +2816,134 @@ static void dump_msgtable_data( const void *ptr, unsigned int size, unsigned int } } +struct version_info +{ + WORD len; + WORD val_len; + WORD type; + WCHAR key[1]; +}; +#define GET_VALUE(info) ((void *)((char *)info + ((offsetof(struct version_info, key[strlenW(info->key) + 1]) + 3) & ~3))) +#define GET_CHILD(info) ((void *)((char *)GET_VALUE(info) + ((info->val_len * (info->type ? 2 : 1) + 3) & ~3))) +#define GET_NEXT(info) ((void *)((char *)info + ((info->len + 3) & ~3))) + +static void dump_version_children( const struct version_info *info, const char *prefix, int indent ) +{ + const struct version_info *child = GET_CHILD( info ); + + while ((char *)child < (char *)info + info->len) + { + printf( "%s%*s", prefix, indent * 2, "" ); + if (child->val_len) + { + printf( "VALUE \"" ); + dump_strW( child->key, strlenW(child->key) ); + if (child->type) + { + printf( "\", \"" ); + dump_strW( GET_VALUE(child), child->val_len ); + printf( "\"\n" ); + } + else + { + const WORD *data = GET_VALUE(child); + unsigned int i; + printf( "\"," ); + for (i = 0; i < child->val_len / sizeof(WORD); i++) printf( " %#x", data[i] ); + printf( "\n" ); + } + } + else + { + printf( "BLOCK \"" ); + dump_strW( child->key, strlenW(child->key) ); + printf( "\"\n" ); + } + dump_version_children( child, prefix, indent + 1 ); + child = GET_NEXT( child ); + } +} + +/* dump data for a VERSION resource */ +static void dump_version_data( const void *ptr, unsigned int size, const char *prefix ) +{ + const struct version_info *info = ptr; + const VS_FIXEDFILEINFO *fileinfo = GET_VALUE( info ); + + printf( "%sSIGNATURE %08x\n", prefix, (UINT)fileinfo->dwSignature ); + printf( "%sVERSION %u.%u\n", prefix, + HIWORD(fileinfo->dwStrucVersion), LOWORD(fileinfo->dwStrucVersion) ); + printf( "%sFILEVERSION %u.%u.%u.%u\n", prefix, + HIWORD(fileinfo->dwFileVersionMS), LOWORD(fileinfo->dwFileVersionMS), + HIWORD(fileinfo->dwFileVersionLS), LOWORD(fileinfo->dwFileVersionLS) ); + printf( "%sPRODUCTVERSION %u.%u.%u.%u\n", prefix, + HIWORD(fileinfo->dwProductVersionMS), LOWORD(fileinfo->dwProductVersionMS), + HIWORD(fileinfo->dwProductVersionLS), LOWORD(fileinfo->dwProductVersionLS) ); + printf( "%sFILEFLAGSMASK %08x\n", prefix, (UINT)fileinfo->dwFileFlagsMask ); + printf( "%sFILEFLAGS %08x\n", prefix, (UINT)fileinfo->dwFileFlags ); + + switch (fileinfo->dwFileOS) + { +#define CASE(x) case x: printf( "%sFILEOS %s\n", prefix, #x ); break + CASE(VOS_UNKNOWN); + CASE(VOS_DOS_WINDOWS16); + CASE(VOS_DOS_WINDOWS32); + CASE(VOS_OS216_PM16); + CASE(VOS_OS232_PM32); + CASE(VOS_NT_WINDOWS32); +#undef CASE + default: + printf( "%sFILEOS %u.%u\n", prefix, + (WORD)(fileinfo->dwFileOS >> 16), (WORD)fileinfo->dwFileOS ); + break; + } + + switch (fileinfo->dwFileType) + { +#define CASE(x) case x: printf( "%sFILETYPE %s\n", prefix, #x ); break + CASE(VFT_UNKNOWN); + CASE(VFT_APP); + CASE(VFT_DLL); + CASE(VFT_DRV); + CASE(VFT_FONT); + CASE(VFT_VXD); + CASE(VFT_STATIC_LIB); +#undef CASE + default: + printf( "%sFILETYPE %08x\n", prefix, (UINT)fileinfo->dwFileType ); + break; + } + + switch (((ULONGLONG)fileinfo->dwFileType << 32) + fileinfo->dwFileSubtype) + { +#define CASE(t,x) case (((ULONGLONG)t << 32) + x): printf( "%sFILESUBTYPE %s\n", prefix, #x ); break + CASE(VFT_DRV, VFT2_UNKNOWN); + CASE(VFT_DRV, VFT2_DRV_PRINTER); + CASE(VFT_DRV, VFT2_DRV_KEYBOARD); + CASE(VFT_DRV, VFT2_DRV_LANGUAGE); + CASE(VFT_DRV, VFT2_DRV_DISPLAY); + CASE(VFT_DRV, VFT2_DRV_MOUSE); + CASE(VFT_DRV, VFT2_DRV_NETWORK); + CASE(VFT_DRV, VFT2_DRV_SYSTEM); + CASE(VFT_DRV, VFT2_DRV_INSTALLABLE); + CASE(VFT_DRV, VFT2_DRV_SOUND); + CASE(VFT_DRV, VFT2_DRV_COMM); + CASE(VFT_DRV, VFT2_DRV_INPUTMETHOD); + CASE(VFT_DRV, VFT2_DRV_VERSIONED_PRINTER); + CASE(VFT_FONT, VFT2_FONT_RASTER); + CASE(VFT_FONT, VFT2_FONT_VECTOR); + CASE(VFT_FONT, VFT2_FONT_TRUETYPE); +#undef CASE + default: + printf( "%sFILESUBTYPE %08x\n", prefix, (UINT)fileinfo->dwFileSubtype ); + break; + } + + printf( "%sFILEDATE %08x.%08x\n", prefix, + (UINT)fileinfo->dwFileDateMS, (UINT)fileinfo->dwFileDateLS ); + dump_version_children( info, prefix, 0 ); +} + static void dump_dir_resource(void) { const IMAGE_RESOURCE_DIRECTORY *root = get_dir(IMAGE_FILE_RESOURCE_DIRECTORY); @@ -2871,11 +3000,14 @@ static void dump_dir_resource(void) } else switch(e1->Id) { - case 6: + case 6: /* RT_STRING */ dump_string_data( RVA( data->OffsetToData, data->Size ), data->Size, e2->Id, " " ); break; - case 11: - dump_msgtable_data( RVA( data->OffsetToData, data->Size ), data->Size, e2->Id, " " ); + case 11: /* RT_MESSAGETABLE */ + dump_msgtable_data( RVA( data->OffsetToData, data->Size ), data->Size, " " ); + break; + case 16: /* RT_VERSION */ + dump_version_data( RVA( data->OffsetToData, data->Size ), data->Size, " | " ); break; default: dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " );

1 0

Alexandre Julliard : winedump: Dump manifest resources in a more structured way.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: f76d8ba6c611188015b169b0d64040155d0ecd06 URL: https://gitlab.winehq.org/wine/wine/-/commit/f76d8ba6c611188015b169b0d64040… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 11:08:02 2023 +0200 winedump: Dump manifest resources in a more structured way. --- tools/winedump/pe.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 82ecf12d910..fbcd9f5c6a5 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -2667,7 +2667,7 @@ static const char *get_resource_type( unsigned int id ) "ANICURSOR", "ANIICON", "HTML", - "RT_MANIFEST" + "MANIFEST" }; if ((size_t)id < ARRAY_SIZE(types)) return types[id]; @@ -2944,6 +2944,20 @@ static void dump_version_data( const void *ptr, unsigned int size, const char *p dump_version_children( info, prefix, 0 ); } +/* dump data for a HTML/MANIFEST resource */ +static void dump_xml_data( const void *ptr, unsigned int size, const char *prefix ) +{ + const char *p = ptr, *end = p + size; + + while (p < end) + { + const char *start = p; + while (p < end && *p != '\r' && *p != '\n') p++; + printf( "%s%.*s\n", prefix, (int)(p - start), start ); + while (p < end && (*p == '\r' || *p == '\n')) p++; + } +} + static void dump_dir_resource(void) { const IMAGE_RESOURCE_DIRECTORY *root = get_dir(IMAGE_FILE_RESOURCE_DIRECTORY); @@ -3009,6 +3023,10 @@ static void dump_dir_resource(void) case 16: /* RT_VERSION */ dump_version_data( RVA( data->OffsetToData, data->Size ), data->Size, " | " ); break; + case 23: /* RT_HTML */ + case 24: /* RT_MANIFEST */ + dump_xml_data( RVA( data->OffsetToData, data->Size ), data->Size, " | " ); + break; default: dump_data( RVA( data->OffsetToData, data->Size ), data->Size, " " ); break;

1 0

Ziqing Hui : mf/tests: Split input type tests from test_wmv_decoder_media_object.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: b2481f6522c710231d4913533b0024a29e4105d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b2481f6522c710231d4913533b0024… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 6 12:50:02 2023 +0800 mf/tests: Split input type tests from test_wmv_decoder_media_object. --- dlls/mf/tests/transform.c | 511 ++++++++++++++++++++++++---------------------- 1 file changed, 272 insertions(+), 239 deletions(-)

1 0

Ziqing Hui : mf/tests: Split output type tests from test_wmv_decoder_media_object.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: 0f71442e9c332183bb0d78a1118bad4e18c62468 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f71442e9c332183bb0d78a1118bad… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 6 16:37:53 2023 +0800 mf/tests: Split output type tests from test_wmv_decoder_media_object. --- dlls/mf/tests/transform.c | 393 ++++++++++++++++++++++++++++------------------ 1 file changed, 237 insertions(+), 156 deletions(-)

1 0

Ziqing Hui : mf/tests: Split size info tests from test_wmv_decoder_media_object.
by Alexandre Julliard 09 Jun '23

09 Jun '23

Module: wine Branch: master Commit: 8310d9cbdeb5124a9abb9ddfd87fb37694d0300a URL: https://gitlab.winehq.org/wine/wine/-/commit/8310d9cbdeb5124a9abb9ddfd87fb3… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 8 10:41:52 2023 +0800 mf/tests: Split size info tests from test_wmv_decoder_media_object. --- dlls/mf/tests/transform.c | 200 +++++++++++++++++++++++++++------------------- 1 file changed, 120 insertions(+), 80 deletions(-)

1 0

Daniel Lehman : msi: Release record instead of free.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 7b3690dd7399cd64123554c8a6fc7e35dcbebbe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b3690dd7399cd64123554c8a6fc7e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jun 7 20:10:18 2023 -0700 msi: Release record instead of free. ../dlls/msi/dialog.c:4476:11: warning: attempt to call free on non-heap object 'hdr' [-Wfree-nonheap-object] free( &rec->hdr ); ^ --- dlls/msi/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 91e7a567f55..1374f3b6274 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4473,7 +4473,7 @@ static UINT event_set_target_path( msi_dialog *dialog, const WCHAR *argument ) r = MSI_SetTargetPathW( dialog->package, argument, path ); free( path ); } - free( &rec->hdr ); + msiobj_release( &rec->hdr ); return r; }

1 0