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

Zebediah Figura : msi: Round costs up to 4096 bytes instead of clamping.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 9725a2286acdb791de316295d9bcb11411a3fd56 URL: https://gitlab.winehq.org/wine/wine/-/commit/9725a2286acdb791de316295d9bcb1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 2 15:06:31 2024 -0600 msi: Round costs up to 4096 bytes instead of clamping. --- dlls/msi/msi.c | 4 ++-- dlls/msi/msipriv.h | 7 +++++++ dlls/msi/tests/package.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2b821d08cf5..611399a8fb0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2037,14 +2037,14 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DW } else if ((file = msi_get_loaded_file( package, comp->KeyPath ))) { - *cost = max( 8, comp->Cost / 512 ); + *cost = cost_from_size( comp->Cost ); *buflen = set_drive( drive, file->TargetPath[0] ); r = ERROR_SUCCESS; } } else if (IStorage_Stat( package->db->storage, &stat, STATFLAG_NONAME ) == S_OK) { - *temp = max( 8, stat.cbSize.QuadPart / 512 ); + *temp = cost_from_size( stat.cbSize.QuadPart ); *buflen = set_drive( drive, path[0] ); r = ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 4c2f2ae2589..588aa9a7487 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1194,4 +1194,11 @@ static inline LPWSTR strdupUtoW( LPCSTR str ) return ret; } +static inline int cost_from_size( int size ) +{ + /* Cost is size rounded up to the nearest 4096 bytes, + * expressed in units of 512 bytes. */ + return ((size + 4095) & ~4095) / 512; +} + #endif /* __WINE_MSI_PRIVATE__ */ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9f15bc37520..9257a835891 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8628,7 +8628,7 @@ static void test_costs(void) ok( len == 2, "expected len == 2, got %lu\n", len ); ok( drive[0], "expected a drive\n" ); ok( !cost, "expected cost == 0, got %d\n", cost ); - ok( temp && temp != 0xdead, "expected temp > 0, got %d\n", temp ); + todo_wine ok( temp && temp != 0xdead, "expected temp > 0, got %d\n", temp ); /* increased index */ len = sizeof(drive);

1 0

Zebediah Figura : msi: Store component cost in 512-byte units.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: d7bbe884ef29215f4db2027f450fb959314f5383 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7bbe884ef29215f4db2027f450fb9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 2 15:23:56 2024 -0600 msi: Store component cost in 512-byte units. This avoids overflow when component costs exceed 4 GB. --- dlls/msi/action.c | 14 +++++++------- dlls/msi/install.c | 3 +-- dlls/msi/msi.c | 4 ++-- dlls/msi/msipriv.h | 3 ++- dlls/msi/tests/package.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 20da818e686..06f399223f4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2070,7 +2070,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) if (msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { - comp->Cost += file->FileSize; + comp->cost += cost_from_size( file->FileSize ); continue; } file_size = msi_get_disk_file_size( package, file->TargetPath ); @@ -2082,7 +2082,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) { if (msi_compare_file_versions( file_version, file->Version ) < 0) { - comp->Cost += file->FileSize - file_size; + comp->cost += cost_from_size( file->FileSize - file_size ); } free( file_version ); continue; @@ -2091,7 +2091,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) { if (msi_compare_font_versions( font_version, file->Version ) < 0) { - comp->Cost += file->FileSize - file_size; + comp->cost += cost_from_size( file->FileSize - file_size ); } free( font_version ); continue; @@ -2099,7 +2099,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) } if (file_size != file->FileSize) { - comp->Cost += file->FileSize - file_size; + comp->cost += cost_from_size( file->FileSize - file_size ); } } @@ -2217,7 +2217,7 @@ static ULONGLONG get_volume_space_required( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - if (comp->Action == INSTALLSTATE_LOCAL) ret += comp->Cost; + if (comp->Action == INSTALLSTATE_LOCAL) ret += comp->cost; } return ret; } @@ -2292,10 +2292,10 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) msi_set_property( package->db, L"PrimaryVolumeSpaceAvailable", buf, -1 ); } required = get_volume_space_required( package ); - swprintf( buf, ARRAY_SIZE(buf), L"%lu", required / 512 ); + swprintf( buf, ARRAY_SIZE(buf), L"%lu", required ); msi_set_property( package->db, L"PrimaryVolumeSpaceRequired", buf, -1 ); - swprintf( buf, ARRAY_SIZE(buf), L"%lu", (free.QuadPart - required) / 512 ); + swprintf( buf, ARRAY_SIZE(buf), L"%lu", (free.QuadPart / 512) - required ); msi_set_property( package->db, L"PrimaryVolumeSpaceRemaining", buf, -1 ); msi_set_property( package->db, L"PrimaryVolumePath", primary_folder, 2 ); } diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 609a3016eaa..f4db3b510f1 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1147,7 +1147,7 @@ static INT feature_cost( MSIFEATURE *feature ) LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { - cost += cl->component->Cost; + cost += cl->component->cost; } return cost; } @@ -1197,7 +1197,6 @@ UINT MSI_GetFeatureCost( MSIPACKAGE *package, MSIFEATURE *feature, MSICOSTTREE t break; } - *cost /= 512; return ERROR_SUCCESS; } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 611399a8fb0..2c0f3aa50f5 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2028,7 +2028,7 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DW GetWindowsDirectoryW( path, MAX_PATH ); if (component && component[0]) { - if (msi_is_global_assembly( comp )) *temp = comp->Cost; + if (msi_is_global_assembly( comp )) *temp = comp->cost; if (!comp->Enabled || !comp->KeyPath) { *cost = 0; @@ -2037,7 +2037,7 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, const WCHAR *component, DW } else if ((file = msi_get_loaded_file( package, comp->KeyPath ))) { - *cost = cost_from_size( comp->Cost ); + *cost = comp->cost; *buflen = set_drive( drive, file->TargetPath[0] ); r = ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 588aa9a7487..b7bc1e7b067 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -532,7 +532,8 @@ typedef struct tagMSICOMPONENT INSTALLSTATE Action; BOOL ForceLocalState; BOOL Enabled; - INT Cost; + /* Cost is in 512-byte units, as returned from MsiEnumComponentCosts() et al. */ + int cost; INT RefCount; LPWSTR FullKeypath; LPWSTR AdvertiseString; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9257a835891..228fd91ef43 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -8607,7 +8607,7 @@ static void test_costs(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r ); ok( len == 2, "expected len == 2, got %lu\n", len ); ok( drive[0], "expected a drive\n" ); - todo_wine ok( cost == 12000024, "got %d\n", cost ); + ok( cost == 12000024, "got %d\n", cost ); ok( !temp, "expected temp == 0, got %d\n", temp ); len = sizeof(drive); @@ -8651,7 +8651,7 @@ static void test_costs(void) cost = 0xdead; r = MsiGetFeatureCostA( hpkg, "one", MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &cost ); ok( !r, "got %u\n", r); - todo_wine ok( cost == 12000024, "got %d\n", cost ); + ok( cost == 12000024, "got %d\n", cost ); MsiCloseHandle( hpkg ); error:

1 0

Zebediah Figura : msi: Multiply by 512 in dialog_vcl_add_drives().
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 4a227c62a59a55aff9bacf1473c7f478f5c83294 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a227c62a59a55aff9bacf1473c7f4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 2 15:27:31 2024 -0600 msi: Multiply by 512 in dialog_vcl_add_drives(). The main motivation here is to avoid overflow, and multiplying in one place seems simpler. --- dlls/msi/dialog.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index f70b127a7a5..57c9cc9bc9e 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3107,14 +3107,12 @@ static LONGLONG vcl_get_cost( msi_dialog *dialog ) if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &each_cost))) { - /* each_cost is in 512-byte units */ - total_cost += each_cost * 512; + total_cost += each_cost; } if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, MSICOSTTREE_SELFONLY, INSTALLSTATE_ABSENT, &each_cost))) { - /* each_cost is in 512-byte units */ - total_cost -= each_cost * 512; + total_cost -= each_cost; } } return total_cost; @@ -3131,7 +3129,7 @@ static void dialog_vcl_add_drives( msi_dialog *dialog, struct control *control ) DWORD size, flags; int i = 0; - cost = vcl_get_cost(dialog); + cost = vcl_get_cost(dialog) * 512; StrFormatByteSizeW(cost, cost_text, MAX_PATH); size = GetLogicalDriveStringsW( 0, NULL );

1 0

Alexandre Julliard : ntdll: Port the RtlRaiseException test to ARM64.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 077252f13b0e1b2869ba517c57aaf5c8b34e35b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/077252f13b0e1b2869ba517c57aaf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 18:42:18 2024 +0100 ntdll: Port the RtlRaiseException test to ARM64. --- dlls/ntdll/signal_arm64.c | 3 + dlls/ntdll/tests/exception.c | 164 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 151 insertions(+), 16 deletions(-)

1 0

Alexandre Julliard : ntdll: Port the RtlRaiseException test to ARM.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 40bda46795ac4b26d7f35489084ef3831739479a URL: https://gitlab.winehq.org/wine/wine/-/commit/40bda46795ac4b26d7f35489084ef3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 22:46:51 2024 +0100 ntdll: Port the RtlRaiseException test to ARM. --- dlls/ntdll/signal_arm.c | 8 ++- dlls/ntdll/tests/exception.c | 167 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 154 insertions(+), 21 deletions(-)

1 0

Alexandre Julliard : ntdll: Always use SEH support on ARM.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: a9671befc1dd1959f9509052f2285bd53fb4abf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9671befc1dd1959f9509052f2285b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 16:05:20 2024 +0100 ntdll: Always use SEH support on ARM. --- dlls/ntdll/signal_arm.c | 152 +++++++----------------------------------------- 1 file changed, 21 insertions(+), 131 deletions(-)

1 0

Alexandre Julliard : ntdll: Use the correct structure for non-volatile registers on ARM64.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 42cebcca3cf8220e5dfffecc99d51ded972c54d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/42cebcca3cf8220e5dfffecc99d51d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 13:18:44 2024 +0100 ntdll: Use the correct structure for non-volatile registers on ARM64. --- dlls/ntdll/signal_arm64.c | 16 +++++++++++----- dlls/ntdll/tests/exception.c | 14 +++++++++++++- include/winnt.h | 16 ++++++++++++++++ 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 192bcdce83d..e6e59712530 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -147,13 +147,19 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, */ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) { + DISPATCHER_CONTEXT_NONVOLREG_ARM64 *nonvol_regs; DWORD64 pc = context->Pc; + int i; dispatch->ScopeIndex = 0; dispatch->ControlPc = pc; dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; if (dispatch->ControlPcIsUnwound) pc -= 4; + nonvol_regs = (DISPATCHER_CONTEXT_NONVOLREG_ARM64 *)dispatch->NonVolatileRegisters; + memcpy( nonvol_regs->GpNvRegs, &context->X19, sizeof(nonvol_regs->GpNvRegs) ); + for (i = 0; i < 8; i++) nonvol_regs->FpNvRegs[i] = context->V[i + 8].D[0]; + dispatch->FunctionEntry = RtlLookupFunctionEntry( pc, &dispatch->ImageBase, dispatch->HistoryTable ); if (RtlVirtualUnwind2( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, @@ -334,17 +340,17 @@ static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCH NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) { EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + DISPATCHER_CONTEXT_NONVOLREG_ARM64 nonvol_regs; UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; - CONTEXT context, prev_context; + CONTEXT context; NTSTATUS status; context = *orig_context; dispatch.TargetPc = 0; dispatch.ContextRecord = &context; dispatch.HistoryTable = &table; - prev_context = context; - dispatch.NonVolatileRegisters = (BYTE *)&prev_context.X19; + dispatch.NonVolatileRegisters = nonvol_regs.Buffer; for (;;) { @@ -424,7 +430,6 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) } if (context.Sp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; - prev_context = context; } return STATUS_UNHANDLED_EXCEPTION; } @@ -628,6 +633,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec PVOID retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) { EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + DISPATCHER_CONTEXT_NONVOLREG_ARM64 nonvol_regs; EXCEPTION_RECORD record; DISPATCHER_CONTEXT dispatch; CONTEXT new_context; @@ -659,7 +665,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.TargetPc = (ULONG64)target_ip; dispatch.ContextRecord = context; dispatch.HistoryTable = table; - dispatch.NonVolatileRegisters = (BYTE *)&context->X19; + dispatch.NonVolatileRegisters = nonvol_regs.Buffer; for (;;) { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0fece1e7243..e6add6dd60e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7127,8 +7127,20 @@ static DWORD WINAPI rtlraiseexception_teb_handler( EXCEPTION_RECORD *rec, } static DWORD WINAPI rtlraiseexception_handler( EXCEPTION_RECORD *rec, void *frame, - CONTEXT *context, void *dispatcher ) + CONTEXT *context, DISPATCHER_CONTEXT *dispatcher ) { + DISPATCHER_CONTEXT_NONVOLREG_ARM64 *nonvol_regs = (void *)dispatcher->NonVolatileRegisters; + int i; + + for (i = 0; i < NONVOL_INT_NUMREG_ARM64; i++) + ok( nonvol_regs->GpNvRegs[i] == ((DWORD64 *)&context->X19)[i], + "wrong non volatile reg x%u %I64x / %I64x\n", i + 19, + nonvol_regs->GpNvRegs[i] , ((DWORD64 *)&context->X19)[i] ); + for (i = 0; i < NONVOL_FP_NUMREG_ARM64; i++) + ok( nonvol_regs->FpNvRegs[i] == context->V[i + 8].D[0], + "wrong non volatile reg d%u %g / %g\n", i + 8, + nonvol_regs->FpNvRegs[i] , context->V[i + 8].D[0] ); + rtlraiseexception_handler_called = 1; rtlraiseexception_handler_(rec, frame, context, dispatcher, FALSE); return ExceptionContinueSearch; diff --git a/include/winnt.h b/include/winnt.h index beac6efebd7..7adbc1d3761 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2013,6 +2013,22 @@ typedef struct _DISPATCHER_CONTEXT_ARM64 PBYTE NonVolatileRegisters; } DISPATCHER_CONTEXT_ARM64, *PDISPATCHER_CONTEXT_ARM64; +#define NONVOL_INT_NUMREG_ARM64 11 +#define NONVOL_FP_NUMREG_ARM64 8 + +#define NONVOL_INT_SIZE_ARM64 (NONVOL_INT_NUMREG_ARM64 * sizeof(DWORD64)) +#define NONVOL_FP_SIZE_ARM64 (NONVOL_FP_NUMREG_ARM64 * sizeof(double)) + +typedef union _DISPATCHER_CONTEXT_NONVOLREG_ARM64 +{ + BYTE Buffer[NONVOL_INT_SIZE_ARM64 + NONVOL_FP_SIZE_ARM64]; + struct + { + DWORD64 GpNvRegs[NONVOL_INT_NUMREG_ARM64]; + double FpNvRegs[NONVOL_FP_NUMREG_ARM64]; + } DUMMYSTRUCTNAME; +} DISPATCHER_CONTEXT_NONVOLREG_ARM64; + #ifdef __x86_64__ typedef struct _DISPATCHER_CONTEXT

1 0

Alexandre Julliard : ntdll: Use the correct structure for non-volatile registers on ARM.
by Alexandre Julliard 04 Mar '24

04 Mar '24

Module: wine Branch: master Commit: 0c35e9adce90562ecc5bf9869161e71a105a4b03 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c35e9adce90562ecc5bf9869161e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 4 13:20:49 2024 +0100 ntdll: Use the correct structure for non-volatile registers on ARM. --- dlls/ntdll/signal_arm.c | 27 ++++++++++++++++++++++----- dlls/ntdll/tests/exception.c | 14 +++++++++++++- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index c7a036cefc0..4ae637fdcc4 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -69,6 +69,18 @@ static void dump_scope_table( ULONG base, const SCOPE_TABLE *table ) base + table->ScopeRecord[i].JumpTarget ); } +/* undocumented, copied from the corresponding ARM64 structure */ +typedef union _DISPATCHER_CONTEXT_NONVOLREG_ARM +{ + BYTE Buffer[8 * sizeof(DWORD) + 8 * sizeof(double)]; + struct + { + DWORD GpNvRegs[8]; + double FpNvRegs[8]; + } DUMMYSTRUCTNAME; +} DISPATCHER_CONTEXT_NONVOLREG_ARM; + + /******************************************************************* * syscalls */ @@ -116,6 +128,7 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, */ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) { + DISPATCHER_CONTEXT_NONVOLREG_ARM *nonvol_regs; DWORD pc = context->Pc; dispatch->ScopeIndex = 0; @@ -123,6 +136,10 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; if (dispatch->ControlPcIsUnwound) pc -= 2; + nonvol_regs = (DISPATCHER_CONTEXT_NONVOLREG_ARM *)dispatch->NonVolatileRegisters; + memcpy( nonvol_regs->GpNvRegs, &context->R4, sizeof(nonvol_regs->GpNvRegs) ); + memcpy( nonvol_regs->FpNvRegs, &context->D[8], sizeof(nonvol_regs->FpNvRegs) ); + dispatch->FunctionEntry = RtlLookupFunctionEntry( pc, (DWORD_PTR *)&dispatch->ImageBase, dispatch->HistoryTable ); if (RtlVirtualUnwind2( type, dispatch->ImageBase, pc, dispatch->FunctionEntry, context, @@ -297,17 +314,17 @@ static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCH NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) { EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + DISPATCHER_CONTEXT_NONVOLREG_ARM nonvol_regs; UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; - CONTEXT context, prev_context; + CONTEXT context; NTSTATUS status; context = *orig_context; dispatch.TargetPc = 0; dispatch.ContextRecord = &context; dispatch.HistoryTable = &table; - prev_context = context; - dispatch.NonVolatileRegisters = (BYTE *)&prev_context.R4; + dispatch.NonVolatileRegisters = nonvol_regs.Buffer; for (;;) { @@ -387,7 +404,6 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) } if (context.Sp == (DWORD)NtCurrentTeb()->Tib.StackBase) break; - prev_context = context; } return STATUS_UNHANDLED_EXCEPTION; } @@ -541,6 +557,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec PVOID retval, CONTEXT *context, UNWIND_HISTORY_TABLE *table ) { EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + DISPATCHER_CONTEXT_NONVOLREG_ARM nonvol_regs; EXCEPTION_RECORD record; DISPATCHER_CONTEXT dispatch; CONTEXT new_context; @@ -572,7 +589,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.TargetPc = (ULONG_PTR)target_ip; dispatch.ContextRecord = context; dispatch.HistoryTable = table; - dispatch.NonVolatileRegisters = (BYTE *)&context->R4; + dispatch.NonVolatileRegisters = nonvol_regs.Buffer; for (;;) { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index e6add6dd60e..d33564e4800 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -6037,8 +6037,20 @@ static DWORD WINAPI rtlraiseexception_teb_handler( EXCEPTION_RECORD *rec, } static DWORD WINAPI rtlraiseexception_handler( EXCEPTION_RECORD *rec, void *frame, - CONTEXT *context, void *dispatcher ) + CONTEXT *context, DISPATCHER_CONTEXT *dispatcher ) { + ULONG *nonvol_regs = (void *)dispatcher->NonVolatileRegisters; + int i; + + for (i = 0; i < 8; i++) + ok( nonvol_regs[i] == ((ULONG *)&context->R4)[i], + "wrong non volatile reg r%u %lx / %lx\n", i + 4, + nonvol_regs[i], ((ULONG *)&context->R4)[i] ); + for (i = 0; i < 8; i++) + ok( ((ULONGLONG *)(nonvol_regs + 8))[i] == context->D[i + 8], + "wrong non volatile reg d%u %I64x / %I64x\n", i + 8, + ((ULONGLONG *)(nonvol_regs + 8))[i], context->D[i + 8] ); + rtlraiseexception_handler_called = 1; rtlraiseexception_handler_(rec, frame, context, dispatcher, FALSE); return ExceptionContinueSearch;

1 0

Rémi Bernon : mfreadwrite/reader: Split source_reader_create_decoder_for_stream helper.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: 7325dd4a5a36c9907897e951d98ccbc3d8dc0467 URL: https://gitlab.winehq.org/wine/wine/-/commit/7325dd4a5a36c9907897e951d98ccb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 22:01:14 2024 +0100 mfreadwrite/reader: Split source_reader_create_decoder_for_stream helper. --- dlls/mfreadwrite/reader.c | 61 ++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 6e895667ef6..0ee6a173832 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1825,56 +1825,53 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO return MF_E_TOPO_CODEC_NOT_FOUND; } -static HRESULT source_reader_create_decoder_for_stream(struct source_reader *reader, DWORD index, IMFMediaType *output_type) +static HRESULT source_reader_create_transform(struct source_reader *reader, DWORD index, + IMFMediaType *input_type, IMFMediaType *output_type) { MFT_REGISTER_TYPE_INFO in_type, out_type; - CLSID *clsids, mft_clsid, category; - unsigned int i = 0, count; - IMFMediaType *input_type; + GUID *classes, category; HRESULT hr; + UINT count; - /* TODO: should we check if the source type is compressed? */ - - if (FAILED(hr = IMFMediaType_GetMajorType(output_type, &out_type.guidMajorType))) + if (FAILED(hr = IMFMediaType_GetMajorType(input_type, &in_type.guidMajorType)) + || FAILED(hr = IMFMediaType_GetGUID(input_type, &MF_MT_SUBTYPE, &in_type.guidSubtype))) + return hr; + if (FAILED(hr = IMFMediaType_GetMajorType(output_type, &out_type.guidMajorType)) + || FAILED(hr = IMFMediaType_GetGUID(output_type, &MF_MT_SUBTYPE, &out_type.guidSubtype))) return hr; if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Video)) - { category = MFT_CATEGORY_VIDEO_DECODER; - } else if (IsEqualGUID(&out_type.guidMajorType, &MFMediaType_Audio)) - { category = MFT_CATEGORY_AUDIO_DECODER; - } else - { - WARN("Unhandled major type %s.\n", debugstr_guid(&out_type.guidMajorType)); return MF_E_TOPO_CODEC_NOT_FOUND; + + count = 0; + if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, &out_type, NULL, &classes, &count))) + { + if (!count) + return MF_E_TOPO_CODEC_NOT_FOUND; + /* TODO: Should we iterate over all of them? */ + hr = source_reader_configure_decoder(reader, index, &classes[0], input_type, output_type); + CoTaskMemFree(classes); } - if (FAILED(hr = IMFMediaType_GetGUID(output_type, &MF_MT_SUBTYPE, &out_type.guidSubtype))) - return hr; + return hr; +} - in_type.guidMajorType = out_type.guidMajorType; +static HRESULT source_reader_create_decoder_for_stream(struct source_reader *reader, DWORD index, IMFMediaType *output_type) +{ + IMFMediaType *input_type; + unsigned int i = 0; + HRESULT hr; - while (source_reader_get_native_media_type(reader, index, i++, &input_type) == S_OK) + while (SUCCEEDED(hr = source_reader_get_native_media_type(reader, index, i++, &input_type))) { - if (SUCCEEDED(IMFMediaType_GetGUID(input_type, &MF_MT_SUBTYPE, &in_type.guidSubtype))) + if (SUCCEEDED(hr = source_reader_create_transform(reader, index, input_type, output_type))) { - count = 0; - if (SUCCEEDED(hr = MFTEnum(category, 0, &in_type, &out_type, NULL, &clsids, &count)) && count) - { - mft_clsid = clsids[0]; - CoTaskMemFree(clsids); - - /* TODO: Should we iterate over all of them? */ - if (SUCCEEDED(source_reader_configure_decoder(reader, index, &mft_clsid, input_type, output_type))) - { - IMFMediaType_Release(input_type); - return S_OK; - } - - } + IMFMediaType_Release(input_type); + return S_OK; } IMFMediaType_Release(input_type);

1 0

Rémi Bernon : mf/topology_loader: Only propagate some media type attributes.
by Alexandre Julliard 01 Mar '24

01 Mar '24

Module: wine Branch: master Commit: ba3799527c64070418bf1500522b80040c9e702c URL: https://gitlab.winehq.org/wine/wine/-/commit/ba3799527c64070418bf1500522b80… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 1 14:57:24 2024 +0100 mf/topology_loader: Only propagate some media type attributes. --- dlls/mf/topology_loader.c | 60 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 50d9d3bd74f..11d0162d94f 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -215,26 +215,50 @@ static HRESULT topology_node_list_branches(IMFTopologyNode *node, struct list *b return hr; } -static HRESULT topology_branch_fill_media_type(IMFMediaType *up_type, IMFMediaType *down_type) +static void media_type_try_copy_attr(IMFMediaType *dst, IMFMediaType *src, const GUID *attr, HRESULT *hr) { - HRESULT hr = S_OK; PROPVARIANT value; - UINT32 count; - GUID key; - if (FAILED(hr = IMFMediaType_GetCount(up_type, &count))) - return hr; + PropVariantInit(&value); + if (SUCCEEDED(*hr) && FAILED(IMFMediaType_GetItem(dst, attr, NULL)) + && SUCCEEDED(IMFMediaType_GetItem(src, attr, &value))) + *hr = IMFMediaType_SetItem(dst, attr, &value); + PropVariantClear(&value); +} - while (count--) - { - PropVariantInit(&value); - hr = IMFMediaType_GetItemByIndex(up_type, count, &key, &value); - if (SUCCEEDED(hr) && FAILED(IMFMediaType_GetItem(down_type, &key, NULL))) - hr = IMFMediaType_SetItem(down_type, &key, &value); - PropVariantClear(&value); - if (FAILED(hr)) - return hr; - } +/* update a media type with additional attributes reported by upstream element */ +/* also present in mfreadwrite/reader.c pipeline */ +static HRESULT update_media_type_from_upstream(IMFMediaType *media_type, IMFMediaType *upstream_type) +{ + HRESULT hr = S_OK; + + /* propagate common video attributes */ + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_FRAME_SIZE, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_FRAME_RATE, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_DEFAULT_STRIDE, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_VIDEO_ROTATION, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_FIXED_SIZE_SAMPLES, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_PIXEL_ASPECT_RATIO, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, &hr); + + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_VIDEO_CHROMA_SITING, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_INTERLACE_MODE, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_TRANSFER_FUNCTION, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_VIDEO_PRIMARIES, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_YUV_MATRIX, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_VIDEO_LIGHTING, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_VIDEO_NOMINAL_RANGE, &hr); + + /* propagate common audio attributes */ + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_NUM_CHANNELS, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_CHANNEL_MASK, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_SAMPLES_PER_BLOCK, &hr); + media_type_try_copy_attr(media_type, upstream_type, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &hr); return hr; } @@ -310,7 +334,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC hr = topology_branch_connect_down(topology, MF_CONNECT_DIRECT, &up_branch, up_type); if (down_type) { - if (SUCCEEDED(topology_branch_fill_media_type(up_type, down_type)) + if (SUCCEEDED(update_media_type_from_upstream(down_type, up_type)) && SUCCEEDED(IMFTransform_SetOutputType(transform, 0, down_type, 0))) method = MF_CONNECT_DIRECT; } @@ -319,7 +343,7 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC if (SUCCEEDED(hr) && method != MF_CONNECT_DIRECT && SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type))) { - if (SUCCEEDED(topology_branch_fill_media_type(up_type, media_type))) + if (SUCCEEDED(update_media_type_from_upstream(media_type, up_type))) IMFTransform_SetOutputType(transform, 0, media_type, 0); IMFMediaType_Release(media_type); }

1 0