July 2024 - Wine-Commits - list.winehq.org

Eric Pouech : cmd: Get rid for CMD_COMMAND structure.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 2750620826de972e0c00fac4ed4b9d8ae9be5f79 URL: https://gitlab.winehq.org/wine/wine/-/commit/2750620826de972e0c00fac4ed4b9d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 10 15:29:09 2024 +0200 cmd: Get rid for CMD_COMMAND structure. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmd.h | 7 +----- programs/cmd/wcmdmain.c | 57 ++++++++++++++++++++----------------------------- 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 6c25b86f7d1..8e870993b06 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,18 +108,13 @@ typedef struct _CMD_FOR_CONTROL }; } CMD_FOR_CONTROL; -typedef struct _CMD_COMMAND -{ - WCHAR *command; /* Command string to execute */ -} CMD_COMMAND; - typedef struct _CMD_NODE { CMD_OPERATOR op; /* operator */ CMD_REDIRECTION *redirects; /* Redirections */ union { - CMD_COMMAND *command; /* CMD_SINGLE */ + WCHAR *command; /* CMD_SINGLE */ struct /* binary operator (CMD_CONCAT, ONFAILURE, ONSUCCESS, PIPE) */ { struct _CMD_NODE *left; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d44a505dc47..66ae1c145d9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -986,23 +986,12 @@ static const char *debugstr_redirection(const CMD_REDIRECTION *redir) } } -static CMD_COMMAND *command_create(const WCHAR *ptr, size_t len) +static WCHAR *command_create(const WCHAR *ptr, size_t len) { - CMD_COMMAND *ret = xalloc(sizeof(CMD_COMMAND)); - - ret->command = xalloc((len + 1) * sizeof(WCHAR)); - memcpy(ret->command, ptr, len * sizeof(WCHAR)); - ret->command[len] = L'\0'; - return ret; -} - -static void command_dispose(CMD_COMMAND *cmd) -{ - if (cmd) - { - free(cmd->command); - free(cmd); - } + WCHAR *command = xalloc((len + 1) * sizeof(WCHAR)); + memcpy(command, ptr, len * sizeof(WCHAR)); + command[len] = L'\0'; + return command; } static void for_control_dispose(CMD_FOR_CONTROL *for_ctrl) @@ -1263,7 +1252,7 @@ void node_dispose_tree(CMD_NODE *node) switch (node->op) { case CMD_SINGLE: - command_dispose(node->command); + free(node->command); break; case CMD_CONCAT: case CMD_PIPE: @@ -1286,7 +1275,7 @@ void node_dispose_tree(CMD_NODE *node) free(node); } -static CMD_NODE *node_create_single(CMD_COMMAND *c) +static CMD_NODE *node_create_single(WCHAR *c) { CMD_NODE *new = xalloc(sizeof(CMD_NODE)); @@ -2198,7 +2187,7 @@ syntax_error: /* used to store additional information dedicated a given token */ union token_parameter { - CMD_COMMAND *command; + WCHAR *command; CMD_REDIRECTION *redirection; void *none; }; @@ -2228,7 +2217,7 @@ static const char* debugstr_token(enum builder_token tkn, union token_parameter if (tkn >= ARRAY_SIZE(tokens)) return "<<<>>>"; switch (tkn) { - case TKN_COMMAND: return wine_dbg_sprintf("%s {{%ls}}", tokens[tkn], tkn_pmt.command ? tkn_pmt.command->command : L"<<nul>>"); + case TKN_COMMAND: return wine_dbg_sprintf("%s {{%s}}", tokens[tkn], debugstr_w(tkn_pmt.command)); case TKN_REDIRECTION: return wine_dbg_sprintf("%s {{%s}}", tokens[tkn], debugstr_redirection(tkn_pmt.redirection)); default: return wine_dbg_sprintf("%s", tokens[tkn]); } @@ -2446,15 +2435,15 @@ static BOOL node_builder_parse(struct node_builder *builder, unsigned precedence node_builder_consume(builder); tkn = node_builder_peek_next_token(builder, &pmt); ERROR_IF(tkn != TKN_COMMAND); - if (!wcscmp(pmt.command->command, L"/?")) + if (!wcscmp(pmt.command, L"/?")) { node_builder_consume(builder); - command_dispose(pmt.command); + free(pmt.command); left = node_create_single(command_create(L"help if", 7)); break; } - ERROR_IF(!if_condition_parse(pmt.command->command, &end, &cond)); - command_dispose(pmt.command); + ERROR_IF(!if_condition_parse(pmt.command, &end, &cond)); + free(pmt.command); node_builder_consume(builder); if (!node_builder_parse(builder, 0, &then_block)) { @@ -2487,16 +2476,16 @@ static BOOL node_builder_parse(struct node_builder *builder, unsigned precedence node_builder_consume(builder); tkn = node_builder_peek_next_token(builder, &pmt); ERROR_IF(tkn != TKN_COMMAND); - if (!wcscmp(pmt.command->command, L"/?")) + if (!wcscmp(pmt.command, L"/?")) { node_builder_consume(builder); - command_dispose(pmt.command); + free(pmt.command); left = node_create_single(command_create(L"help for", 8)); break; } node_builder_consume(builder); - for_ctrl = for_control_parse(pmt.command->command); - command_dispose(pmt.command); + for_ctrl = for_control_parse(pmt.command); + free(pmt.command); ERROR_IF(for_ctrl == NULL); ERROR_IF(!node_builder_expect_token(builder, TKN_IN)); ERROR_IF(!node_builder_expect_token(builder, TKN_OPENPAR)); @@ -2506,8 +2495,8 @@ static BOOL node_builder_parse(struct node_builder *builder, unsigned precedence switch (tkn) { case TKN_COMMAND: - for_control_append_set(for_ctrl, pmt.command->command); - command_dispose(pmt.command); + for_control_append_set(for_ctrl, pmt.command); + free(pmt.command); break; case TKN_EOL: case TKN_CLOSEPAR: @@ -2569,7 +2558,7 @@ static BOOL node_builder_generate(struct node_builder *builder, CMD_NODE **node) switch (tkn) { case TKN_COMMAND: - tknstr = tkn_pmt.command->command; + tknstr = tkn_pmt.command; break; case TKN_EOF: tknstr = WCMD_LoadMessage(WCMD_ENDOFFILE); @@ -2608,7 +2597,7 @@ static BOOL node_builder_generate(struct node_builder *builder, CMD_NODE **node) { tkn = node_builder_peek_next_token(builder, &tkn_pmt); if (tkn == TKN_EOF) break; - if (tkn == TKN_COMMAND) command_dispose(tkn_pmt.command); + if (tkn == TKN_COMMAND) free(tkn_pmt.command); if (tkn == TKN_REDIRECTION) redirection_dispose_list(tkn_pmt.redirection); node_builder_consume(builder); } @@ -3673,8 +3662,8 @@ RETURN_CODE node_execute(CMD_NODE *node) switch (node->op) { case CMD_SINGLE: - if (node->command->command[0] != ':') - return_code = execute_single_command(node->command->command); + if (node->command[0] != ':') + return_code = execute_single_command(node->command); else return_code = NO_ERROR; break; case CMD_CONCAT:

1 0

Rémi Bernon : mfreadwrite/reader: Send MFT_MESSAGE_NOTIFY_START_OF_STREAM on start or seek.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 936cb55a40214c9ceeeb67316ebc04434484f9b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/936cb55a40214c9ceeeb67316ebc04… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 22 14:34:11 2024 +0200 mfreadwrite/reader: Send MFT_MESSAGE_NOTIFY_START_OF_STREAM on start or seek. --- dlls/mfreadwrite/reader.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 0defc5a22e2..28858339d08 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -967,6 +967,22 @@ static HRESULT source_reader_flush_transform_samples(struct source_reader *reade return next ? source_reader_flush_transform_samples(reader, stream, next) : S_OK; } +static HRESULT source_reader_notify_transform(struct source_reader *reader, struct media_stream *stream, + struct transform_entry *entry, UINT message) +{ + struct transform_entry *next = NULL; + struct list *ptr; + HRESULT hr; + + if ((ptr = list_next(&stream->transforms, &entry->entry))) + next = LIST_ENTRY(ptr, struct transform_entry, entry); + + if (FAILED(hr = IMFTransform_ProcessMessage(entry->transform, message, 0))) + WARN("Failed to notify transform %p message %#x, hr %#lx\n", entry->transform, message, hr); + + return next ? source_reader_notify_transform(reader, stream, next, message) : S_OK; +} + static HRESULT source_reader_process_sample(struct source_reader *reader, struct media_stream *stream, IMFSample *sample) { @@ -1040,6 +1056,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re MediaEventType event_type; LONGLONG timestamp; PROPVARIANT value; + struct list *ptr; unsigned int i; HRESULT hr; DWORD id; @@ -1063,9 +1080,6 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re switch (event_type) { case MEEndOfStream: - { - struct list *ptr; - stream->state = STREAM_STATE_EOS; stream->flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; @@ -1080,10 +1094,16 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re source_reader_queue_response(reader, stream, S_OK, MF_SOURCE_READERF_ENDOFSTREAM, 0, NULL); break; - } case MEStreamSeeked: case MEStreamStarted: stream->state = STREAM_STATE_READY; + + if ((ptr = list_head(&stream->transforms))) + { + struct transform_entry *entry = LIST_ENTRY(ptr, struct transform_entry, entry); + if (FAILED(hr = source_reader_notify_transform(reader, stream, entry, MFT_MESSAGE_NOTIFY_START_OF_STREAM))) + WARN("Failed to notify transforms of stream start, hr %#lx.\n", hr); + } break; case MEStreamStopped: stream->flags |= STREAM_FLAG_STOPPED;

1 0

Rémi Bernon : mf/tests: Reduce the mute threshold for the transform tests.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: d6a5bf185015764909d25154ffcc30e1e9edae01 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6a5bf185015764909d25154ffcc30… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 11 14:45:11 2024 +0200 mf/tests: Reduce the mute threshold for the transform tests. --- dlls/mf/tests/transform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 3e902aa67f3..b02c69b357e 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -9725,6 +9725,8 @@ failed: START_TEST(transform) { + winetest_mute_threshold = 1; + init_functions(); test_sample_copier();

1 0

Rémi Bernon : winegstreamer/video_decoder: Generate timestamps relative to the first input sample.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 0a5c27f9525996de16637970b4ac82aa5b3b7f7c URL: https://gitlab.winehq.org/wine/wine/-/commit/0a5c27f9525996de16637970b4ac82… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 22 19:53:54 2024 +0200 winegstreamer/video_decoder: Generate timestamps relative to the first input sample. --- dlls/winegstreamer/video_decoder.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 3e91e55a779..53d9e00b137 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -796,6 +796,10 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ case MFT_MESSAGE_COMMAND_FLUSH: return wg_transform_flush(decoder->wg_transform); + case MFT_MESSAGE_NOTIFY_START_OF_STREAM: + decoder->sample_time = -1; + return S_OK; + default: FIXME("Ignoring message %#x.\n", message); return S_OK; @@ -811,6 +815,9 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; + if (decoder->sample_time == -1 && FAILED(IMFSample_GetSampleTime(sample, (LONGLONG *)&decoder->sample_time))) + decoder->sample_time = 0; + return wg_transform_push_mf(decoder->wg_transform, sample, decoder->wg_sample_queue); }

1 0

Alexandre Julliard : ntdll: Call the terminate process callback on ARM64EC.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 917e4c97431f4e3390feac3d9447fe55964e0d90 URL: https://gitlab.winehq.org/wine/wine/-/commit/917e4c97431f4e3390feac3d9447fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 15:50:34 2024 +0200 ntdll: Call the terminate process callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 18 +++++++++++++++++- dlls/xtajit64/cpu.c | 9 +++++++++ dlls/xtajit64/xtajit64.spec | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 49d66b517dd..20eb5ff662e 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -51,6 +51,7 @@ static void (WINAPI *pNotifyMemoryFree)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyMemoryProtect)(void*,SIZE_T,ULONG,BOOL,NTSTATUS); static void (WINAPI *pNotifyUnmapViewOfSection)(void*,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pProcessInit)(void); +static void (WINAPI *pProcessTerm)(HANDLE,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pThreadInit)(void); static void (WINAPI *pThreadTerm)(HANDLE,LONG); static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); @@ -163,6 +164,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) GET_PTR( NotifyMemoryProtect ); GET_PTR( NotifyUnmapViewOfSection ); GET_PTR( ProcessInit ); + GET_PTR( ProcessTerm ); GET_PTR( ThreadInit ); GET_PTR( ThreadTerm ); GET_PTR( UpdateProcessorInformation ); @@ -432,7 +434,7 @@ DEFINE_SYSCALL(NtSuspendProcess, (HANDLE handle)) DEFINE_SYSCALL(NtSuspendThread, (HANDLE handle, ULONG *count)) DEFINE_SYSCALL(NtSystemDebugControl, (SYSDBG_COMMAND command, void *in_buff, ULONG in_len, void *out_buff, ULONG out_len, ULONG *retlen)) DEFINE_SYSCALL(NtTerminateJobObject, (HANDLE handle, NTSTATUS status)) -DEFINE_SYSCALL(NtTerminateProcess, (HANDLE handle, LONG exit_code)) +DEFINE_WRAPPED_SYSCALL(NtTerminateProcess, (HANDLE handle, LONG exit_code)) DEFINE_WRAPPED_SYSCALL(NtTerminateThread, (HANDLE handle, LONG exit_code)) DEFINE_SYSCALL(NtTestAlert, (void)) DEFINE_SYSCALL(NtTraceControl, (ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size)) @@ -640,6 +642,20 @@ NTSTATUS SYSCALL_API NtSetContextThread( HANDLE handle, const CONTEXT *context ) return syscall_NtSetContextThread( handle, &arm_ctx ); } +NTSTATUS SYSCALL_API NtTerminateProcess( HANDLE handle, LONG exit_code ) +{ + NTSTATUS status; + + if (!handle && pProcessTerm) + { + pProcessTerm( handle, FALSE, 0 ); + status = syscall_NtTerminateProcess( handle, exit_code ); + pProcessTerm( handle, TRUE, status ); + return status; + } + return syscall_NtTerminateProcess( handle, exit_code ); +} + NTSTATUS SYSCALL_API NtTerminateThread( HANDLE handle, LONG exit_code ) { if (pThreadTerm) pThreadTerm( handle, exit_code ); diff --git a/dlls/xtajit64/cpu.c b/dlls/xtajit64/cpu.c index 91446aa1676..fec5f233eec 100644 --- a/dlls/xtajit64/cpu.c +++ b/dlls/xtajit64/cpu.c @@ -193,6 +193,15 @@ NTSTATUS WINAPI ProcessInit(void) } +/********************************************************************** + * ProcessTerm (xtajit64.@) + */ +void WINAPI ProcessTerm( HANDLE handle, BOOL is_post, NTSTATUS status ) +{ + TRACE( "%p\n", handle ); +} + + /********************************************************************** * ThreadInit (xtajit64.@) */ diff --git a/dlls/xtajit64/xtajit64.spec b/dlls/xtajit64/xtajit64.spec index bfc6c41c4b0..2da5d1dc49b 100644 --- a/dlls/xtajit64/xtajit64.spec +++ b/dlls/xtajit64/xtajit64.spec @@ -13,7 +13,7 @@ @ stdcall NotifyMemoryProtect(ptr long long long long) @ stdcall NotifyUnmapViewOfSection(ptr long long) @ stdcall ProcessInit() -#@ stub ProcessTerm +@ stdcall ProcessTerm(ptr long long) #@ stub ResetToConsistentState @ stdcall ThreadInit() @ stdcall ThreadTerm(ptr long)

1 0

Alexandre Julliard : wow64: Add NtTerminateProcess CPU backend notifications.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: ae0f18544ed574d0b33478098c624f3d947638fb URL: https://gitlab.winehq.org/wine/wine/-/commit/ae0f18544ed574d0b33478098c624f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 15:46:27 2024 +0200 wow64: Add NtTerminateProcess CPU backend notifications. --- dlls/ntdll/tests/wow64.c | 20 ++++++++++++++++++++ dlls/wow64/process.c | 7 ++++++- dlls/wow64/syscall.c | 2 ++ dlls/wow64/wow64_private.h | 1 + 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 94420cdab4a..b8b1c11bb7d 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1841,6 +1841,26 @@ static void test_notifications( HMODULE module, CROSS_PROCESS_WORK_LIST *list ) WriteProcessMemory( GetCurrentProcess(), ptr, old_code, sizeof(old_code), NULL ); } + if ((ptr = hook_notification_function( module, "BTCpuProcessTerm", "ProcessTerm" ))) + { + struct expected_notification expect[2] = + { + { 3, { 0, 0, 0 } }, + { 3, { 0, 1, 0 } } + }; + + reset_results( results ); + status = NtTerminateProcess( (HANDLE)0xdead, 0xbeef ); + ok( status == STATUS_INVALID_HANDLE, "NtTerminateProcess failed %lx\n", status ); + expect_notifications( results, 0, NULL ); + + status = NtTerminateProcess( 0, 0xbeef ); + ok( !status, "NtTerminateProcess failed %lx\n", status ); + expect_notifications( results, 2, expect ); + + WriteProcessMemory( GetCurrentProcess(), ptr, old_code, sizeof(old_code), NULL ); + } + NtClose( mapping ); NtClose( file ); VirtualFree( code, 0, MEM_RELEASE ); diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 9b80d885b6a..d117c158096 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1061,7 +1061,12 @@ NTSTATUS WINAPI wow64_NtTerminateProcess( UINT *args ) HANDLE handle = get_handle( &args ); LONG exit_code = get_ulong( &args ); - return NtTerminateProcess( handle, exit_code ); + NTSTATUS status; + + if (!handle && pBTCpuProcessTerm) pBTCpuProcessTerm( handle, FALSE, 0 ); + status = NtTerminateProcess( handle, exit_code ); + if (!handle && pBTCpuProcessTerm) pBTCpuProcessTerm( handle, TRUE, status ); + return status; } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 5ddd46ba7b9..55433f13569 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -115,6 +115,7 @@ void (WINAPI *pBTCpuNotifyReadFile)( HANDLE, void *, SIZE_T, BOOL, NTSTATUS void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void *, BOOL, NTSTATUS ) = NULL; NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ) = NULL; void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; +void (WINAPI *pBTCpuProcessTerm)( HANDLE, BOOL, NTSTATUS ) = NULL; void (WINAPI *pBTCpuThreadTerm)( HANDLE, LONG ) = NULL; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) @@ -814,6 +815,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuNotifyReadFile ); GET_PTR( BTCpuNotifyUnmapViewOfSection ); GET_PTR( BTCpuUpdateProcessorInformation ); + GET_PTR( BTCpuProcessTerm ); GET_PTR( BTCpuThreadTerm ); GET_PTR( __wine_get_unix_opcode ); diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index d5278443d5d..deca72d445c 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -49,6 +49,7 @@ extern void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG, BOOL extern void (WINAPI *pBTCpuNotifyReadFile)( HANDLE, void *, SIZE_T, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void *, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ); +extern void (WINAPI *pBTCpuProcessTerm)( HANDLE, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuThreadTerm)( HANDLE, LONG ); struct object_attr64

1 0

Biswapriyo Nath : include: Fix typo with X3DAUDIO_EMITTER structure in x3daudio.h.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 2ade43faac40095bd01253600968778441d2f236 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ade43faac40095bd0125360096877… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jul 11 12:53:00 2024 +0000 include: Fix typo with X3DAUDIO_EMITTER structure in x3daudio.h. --- include/x3daudio.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/x3daudio.h b/include/x3daudio.h index 26e2d1df728..e9685127e02 100644 --- a/include/x3daudio.h +++ b/include/x3daudio.h @@ -68,8 +68,8 @@ typedef struct X3DAUDIO_EMITTER { X3DAUDIO_DISTANCE_CURVE *pLPFDirectCurve; X3DAUDIO_DISTANCE_CURVE *pLPFReverbCurve; X3DAUDIO_DISTANCE_CURVE *pReverbCurve; - float CurveDistanceScalar; - float DopplerScalar; + float CurveDistanceScaler; + float DopplerScaler; } X3DAUDIO_EMITTER; typedef struct X3DAUDIO_DSP_SETTINGS {

1 0

Alexandre Julliard : ntdll: Call the terminate thread callback on ARM64EC.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: c1b468ba48abd1219038c073341a414550605a3d URL: https://gitlab.winehq.org/wine/wine/-/commit/c1b468ba48abd1219038c073341a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 14:28:32 2024 +0200 ntdll: Call the terminate thread callback on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 10 +++++++++- dlls/xtajit64/cpu.c | 9 +++++++++ dlls/xtajit64/xtajit64.spec | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index b5ecb643bdb..49d66b517dd 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -52,6 +52,7 @@ static void (WINAPI *pNotifyMemoryProtect)(void*,SIZE_T,ULONG,BOOL,NTSTATUS) static void (WINAPI *pNotifyUnmapViewOfSection)(void*,BOOL,NTSTATUS); static NTSTATUS (WINAPI *pProcessInit)(void); static NTSTATUS (WINAPI *pThreadInit)(void); +static void (WINAPI *pThreadTerm)(HANDLE,LONG); static void (WINAPI *pUpdateProcessorInformation)(SYSTEM_CPU_INFORMATION*); static BOOLEAN emulated_processor_features[PROCESSOR_FEATURE_MAX]; @@ -163,6 +164,7 @@ NTSTATUS arm64ec_process_init( HMODULE module ) GET_PTR( NotifyUnmapViewOfSection ); GET_PTR( ProcessInit ); GET_PTR( ThreadInit ); + GET_PTR( ThreadTerm ); GET_PTR( UpdateProcessorInformation ); #undef GET_PTR @@ -431,7 +433,7 @@ DEFINE_SYSCALL(NtSuspendThread, (HANDLE handle, ULONG *count)) DEFINE_SYSCALL(NtSystemDebugControl, (SYSDBG_COMMAND command, void *in_buff, ULONG in_len, void *out_buff, ULONG out_len, ULONG *retlen)) DEFINE_SYSCALL(NtTerminateJobObject, (HANDLE handle, NTSTATUS status)) DEFINE_SYSCALL(NtTerminateProcess, (HANDLE handle, LONG exit_code)) -DEFINE_SYSCALL(NtTerminateThread, (HANDLE handle, LONG exit_code)) +DEFINE_WRAPPED_SYSCALL(NtTerminateThread, (HANDLE handle, LONG exit_code)) DEFINE_SYSCALL(NtTestAlert, (void)) DEFINE_SYSCALL(NtTraceControl, (ULONG code, void *inbuf, ULONG inbuf_len, void *outbuf, ULONG outbuf_len, ULONG *size)) DEFINE_SYSCALL(NtUnloadDriver, (const UNICODE_STRING *name)) @@ -638,6 +640,12 @@ NTSTATUS SYSCALL_API NtSetContextThread( HANDLE handle, const CONTEXT *context ) return syscall_NtSetContextThread( handle, &arm_ctx ); } +NTSTATUS SYSCALL_API NtTerminateThread( HANDLE handle, LONG exit_code ) +{ + if (pThreadTerm) pThreadTerm( handle, exit_code ); + return syscall_NtTerminateThread( handle, exit_code ); +} + NTSTATUS SYSCALL_API NtUnmapViewOfSection( HANDLE process, void *addr ) { BOOL is_current = RtlIsCurrentProcess( process ); diff --git a/dlls/xtajit64/cpu.c b/dlls/xtajit64/cpu.c index 82d741dde82..91446aa1676 100644 --- a/dlls/xtajit64/cpu.c +++ b/dlls/xtajit64/cpu.c @@ -202,6 +202,15 @@ NTSTATUS WINAPI ThreadInit(void) } +/********************************************************************** + * ThreadTerm (xtajit64.@) + */ +void WINAPI ThreadTerm( HANDLE handle, LONG exit_code ) +{ + TRACE( "%p %lx\n", handle, exit_code ); +} + + /********************************************************************** * UpdateProcessorInformation (xtajit64.@) */ diff --git a/dlls/xtajit64/xtajit64.spec b/dlls/xtajit64/xtajit64.spec index 83d8e56dd2d..bfc6c41c4b0 100644 --- a/dlls/xtajit64/xtajit64.spec +++ b/dlls/xtajit64/xtajit64.spec @@ -16,5 +16,5 @@ #@ stub ProcessTerm #@ stub ResetToConsistentState @ stdcall ThreadInit() -#@ stub ThreadTerm +@ stdcall ThreadTerm(ptr long) @ stdcall UpdateProcessorInformation(ptr)

1 0

Rémi Bernon : winemac: Rely on win32u layered window surface attribute updates.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 61ac1aaa808bd107ab9af94d8d17dfc083d91564 URL: https://gitlab.winehq.org/wine/wine/-/commit/61ac1aaa808bd107ab9af94d8d17df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 15 21:09:37 2024 +0200 winemac: Rely on win32u layered window surface attribute updates. --- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/surface.c | 10 +++------- dlls/winemac.drv/window.c | 2 -- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 8b9e908bc1a..cbb453b2dfa 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -208,7 +208,6 @@ extern void init_win_context(void); extern macdrv_window macdrv_get_cocoa_window(HWND hwnd, BOOL require_on_screen); extern RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp); extern void activate_on_following_focus(void); -extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha); extern void macdrv_handle_event(const macdrv_event *event); diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index fa34a5122ab..b6f0ea2d812 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -127,7 +127,7 @@ static struct macdrv_window_surface *get_mac_surface(struct window_surface *surf * create_surface */ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, const RECT *rect, - struct window_surface *old_surface, BOOL use_alpha) + struct window_surface *old_surface) { struct macdrv_window_surface *surface = NULL; int width = rect->right - rect->left, height = rect->bottom - rect->top; @@ -178,9 +178,6 @@ static struct window_surface *create_surface(HWND hwnd, macdrv_window window, co TRACE("created %p for %p %s\n", surface, window, wine_dbgstr_rect(rect)); - if (use_alpha) window_surface_set_layered( &surface->header, CLR_INVALID, -1, 0xff000000 ); - else window_surface_set_layered( &surface->header, CLR_INVALID, -1, 0 ); - return &surface->header; failed: @@ -216,7 +213,7 @@ BOOL macdrv_CreateWindowSurface(HWND hwnd, const RECT *surface_rect, struct wind } } - *surface = create_surface(data->hwnd, data->cocoa_window, surface_rect, data->surface, FALSE); + *surface = create_surface(data->hwnd, data->cocoa_window, surface_rect, data->surface); done: release_win_data(data); @@ -241,7 +238,7 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *surface_rect, COLORREF co surface = data->surface; if (!surface || !EqualRect(&surface->rect, surface_rect)) { - data->surface = create_surface(data->hwnd, data->cocoa_window, surface_rect, NULL, TRUE); + data->surface = create_surface(data->hwnd, data->cocoa_window, surface_rect, NULL); if (surface) window_surface_release(surface); surface = data->surface; if (data->unminimized_surface) @@ -250,7 +247,6 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *surface_rect, COLORREF co data->unminimized_surface = NULL; } } - else window_surface_set_layered(surface, color_key, -1, 0xff000000); if ((*window_surface = surface)) window_surface_add_ref(surface); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 0784b0e4e39..6ebaccadbb2 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1683,7 +1683,6 @@ void macdrv_SetLayeredWindowAttributes(HWND hwnd, COLORREF key, BYTE alpha, DWOR { data->layered = TRUE; data->ulw_layered = FALSE; - if (data->surface) window_surface_set_layered(data->surface, key, alpha << 24, 0); if (data->cocoa_window) { sync_window_opacity(data, key, alpha, FALSE, flags); @@ -1782,7 +1781,6 @@ void macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) data->layered = FALSE; data->ulw_layered = FALSE; sync_window_opacity(data, 0, 0, FALSE, 0); - if (data->surface) window_surface_set_layered(data->surface, CLR_INVALID, -1, 0); } if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYOUTRTL))

1 0

Rémi Bernon : winex11: Rely on win32u layered window surface attribute updates.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 1ae9fb069985cf3a1c91b83623008dfd97fdc224 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ae9fb069985cf3a1c91b83623008d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 27 14:28:49 2024 +0200 winex11: Rely on win32u layered window surface attribute updates. --- dlls/winex11.drv/bitblt.c | 16 +++------------- dlls/winex11.drv/window.c | 14 +++++--------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 5c08c1a2120..780b565b744 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1882,7 +1882,7 @@ static const struct window_surface_funcs x11drv_surface_funcs = * create_surface */ static struct window_surface *create_surface( HWND hwnd, Window window, const XVisualInfo *vis, const RECT *rect, - COLORREF color_key, BOOL use_alpha ) + BOOL use_alpha ) { const XPixmapFormatValues *format = pixmap_formats[vis->depth]; char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; @@ -1952,9 +1952,6 @@ static struct window_surface *create_surface( HWND hwnd, Window window, const XV TRACE( "created %p for %lx %s image %p\n", surface, window, wine_dbgstr_rect(rect), surface->image->ximage->data ); - if (use_alpha) window_surface_set_layered( &surface->header, color_key, -1, 0xff000000 ); - else window_surface_set_layered( &surface->header, color_key, -1, 0 ); - return &surface->header; failed: @@ -1995,8 +1992,6 @@ HRGN expose_surface( struct window_surface *window_surface, const RECT *rect ) BOOL X11DRV_CreateWindowSurface( HWND hwnd, const RECT *surface_rect, struct window_surface **surface ) { struct x11drv_win_data *data; - DWORD flags; - COLORREF key; BOOL layered = NtUserGetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED; TRACE( "hwnd %p, surface_rect %s, surface %p\n", hwnd, wine_dbgstr_rect( surface_rect ), surface ); @@ -2022,10 +2017,7 @@ BOOL X11DRV_CreateWindowSurface( HWND hwnd, const RECT *surface_rect, struct win } } - if (!layered || !NtUserGetLayeredWindowAttributes( hwnd, &key, NULL, &flags ) || !(flags & LWA_COLORKEY)) - key = CLR_INVALID; - - *surface = create_surface( data->hwnd, data->whole_window, &data->vis, surface_rect, key, FALSE ); + *surface = create_surface( data->hwnd, data->whole_window, &data->vis, surface_rect, FALSE ); done: release_win_data( data ); @@ -2050,12 +2042,10 @@ BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF c surface = data->surface; if (!surface || !EqualRect( &surface->rect, surface_rect )) { - data->surface = create_surface( data->hwnd, data->whole_window, &data->vis, surface_rect, - color_key, data->use_alpha ); + data->surface = create_surface( data->hwnd, data->whole_window, &data->vis, surface_rect, data->use_alpha ); if (surface) window_surface_release( surface ); surface = data->surface; } - else window_surface_set_layered( surface, color_key, -1, 0xff000000 ); if ((*window_surface = surface)) window_surface_add_ref( surface ); release_win_data( data ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9e51d76e5ab..5135355abfe 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -438,8 +438,7 @@ static void sync_window_region( struct x11drv_win_data *data, HRGN win_region ) /*********************************************************************** * sync_window_opacity */ -static void sync_window_opacity( Display *display, Window win, - COLORREF key, BYTE alpha, DWORD flags ) +static void sync_window_opacity( Display *display, Window win, BYTE alpha, DWORD flags ) { unsigned long opacity = 0xffffffff; @@ -1794,7 +1793,7 @@ static void create_whole_window( struct x11drv_win_data *data ) /* set the window opacity */ if (!NtUserGetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; - sync_window_opacity( data->display, data->whole_window, key, alpha, layered_flags ); + sync_window_opacity( data->display, data->whole_window, alpha, layered_flags ); XFlush( data->display ); /* make sure the window exists before we start painting to it */ @@ -1919,8 +1918,7 @@ void X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { data->layered = FALSE; set_window_visual( data, &default_visual, FALSE ); - sync_window_opacity( data->display, data->whole_window, 0, 0, 0 ); - if (data->surface) window_surface_set_layered( data->surface, CLR_INVALID, -1, 0 ); + sync_window_opacity( data->display, data->whole_window, 0, 0 ); } done: release_win_data( data ); @@ -2896,9 +2894,7 @@ void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO set_window_visual( data, &default_visual, FALSE ); if (data->whole_window) - sync_window_opacity( data->display, data->whole_window, key, alpha, flags ); - if (data->surface) - window_surface_set_layered( data->surface, (flags & LWA_COLORKEY) ? key : CLR_INVALID, alpha << 24, 0 ); + sync_window_opacity( data->display, data->whole_window, alpha, flags ); data->layered = TRUE; if (!data->mapped) /* mapping is delayed until attributes are set */ @@ -2920,7 +2916,7 @@ void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWO Window win = X11DRV_get_whole_window( hwnd ); if (win) { - sync_window_opacity( gdi_display, win, key, alpha, flags ); + sync_window_opacity( gdi_display, win, alpha, flags ); if (flags & LWA_COLORKEY) FIXME( "LWA_COLORKEY not supported on foreign process window %p\n", hwnd ); }

1 0