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

Eric Pouech : cmd/tests: Test success / failure for more commands.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 310cde555b3c86fa683b888d3a75c504699c0842 URL: https://gitlab.winehq.org/wine/wine/-/commit/310cde555b3c86fa683b888d3a75c5… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri May 10 09:18:33 2024 +0200 cmd/tests: Test success / failure for more commands. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/tests/test_builtins.cmd | 34 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 32 +++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index fed8c20c587..f8bc4a220f6 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -591,6 +591,40 @@ call :setError 666 & rmdir abc & echo ERRORLEVEL !errorlevel! call :setError 666 & rmdir @:\cba\abc & echo ERRORLEVEL !errorlevel! cd .. && rd /q /s foo +echo --- success/failure for SETLOCAL/ENDLOCAL commands +call :setError 666 & (setlocal foobar &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (setlocal &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (endlocal foobar &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (setlocal DisableExtensions &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (setlocal EnableExtensions &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for DATE command +call :setError 666 & (date /t >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (date AAAA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem need evelated priviledges to set the date +echo --- success/failure for TIME command +call :setError 666 & (time /t >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (time AAAA >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem need evelated priviledges to set the time +echo --- success/failure for BREAK command +call :setError 666 & (break &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (break 345 &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for VER command +call :setError 666 & (ver >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (ver foo >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (ver /f >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for VERIFY command +call :setError 666 & (verify >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (verify on >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (verify foobar >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for VOL command +call :setError 666 & (vol >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (vol c: >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (vol foobar >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +call :setError 666 & (vol /Z >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +echo --- success/failure for LABEL command +call :setError 666 & (<NUL label >NUL &&echo SUCCESS !errorlevel!||echo FAILURE !errorlevel!) +rem need evelated priviledges to test + echo --- setlocal DisableDelayedExpansion echo ------------ Testing 'set' ------------ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c7119858d85..75152663850 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -535,7 +535,37 @@ ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 ERRORLEVEL 666 ---- +--- success/failure for SETLOCAL/ENDLOCAL commands +(a)todo_wine@FAILURE 1 +(a)todo_wine@SUCCESS 0 +SUCCESS 666 +(a)todo_wine@SUCCESS(a)space@ +(a)todo_wine@SUCCESS 0 +--- success/failure for DATE command +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +--- success/failure for TIME command +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +--- success/failure for BREAK command +(a)todo_wine@SUCCESS 666 +(a)todo_wine@SUCCESS 666 +--- success/failure for VER command +(a)todo_wine@SUCCESS 0 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +--- success/failure for VERIFY command +(a)todo_wine@SUCCESS 0 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +--- success/failure for VOL command +(a)todo_wine@SUCCESS 0 +(a)todo_wine@SUCCESS 0 +(a)todo_wine@FAILURE 1 +(a)todo_wine@FAILURE 1 +--- success/failure for LABEL command +(a)todo_wine@FAILURE 1 +(a)todo_wine@--- ------------ Testing 'set' ------------ 1 0

1 0

Rémi Bernon : mfreadwrite/reader: Look for a matching output type if setting it failed.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 017317ce6628cd19ce8c148ba9425087d7f07a96 URL: https://gitlab.winehq.org/wine/wine/-/commit/017317ce6628cd19ce8c148ba94250… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 1 10:03:21 2024 +0200 mfreadwrite/reader: Look for a matching output type if setting it failed. The source reader accepts incomplete output types that decoders don't. This is for instance the case with audio types with only a subtype but no MF_MT_AUDIO_BITS_PER_SAMPLE attribute specified. --- dlls/mfreadwrite/reader.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 0e0ba10b076..0defc5a22e2 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -771,8 +771,8 @@ static HRESULT source_reader_push_transform_samples(struct source_reader *reader return hr; } -/* update the transform output type while keeping subtype which matches the old output type */ -static HRESULT transform_entry_update_output_type(struct transform_entry *entry, IMFMediaType *old_output_type) +/* update the transform output type while keeping subtype which matches the desired type */ +static HRESULT set_matching_transform_output_type(IMFTransform *transform, IMFMediaType *old_output_type) { IMFMediaType *new_output_type; GUID subtype, desired; @@ -782,12 +782,11 @@ static HRESULT transform_entry_update_output_type(struct transform_entry *entry, IMFMediaType_GetGUID(old_output_type, &MF_MT_SUBTYPE, &desired); /* find an available output type matching the desired subtype */ - while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(entry->transform, 0, i++, &new_output_type))) + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, i++, &new_output_type))) { IMFMediaType_GetGUID(new_output_type, &MF_MT_SUBTYPE, &subtype); - if (IsEqualGUID(&subtype, &desired) && SUCCEEDED(hr = IMFTransform_SetOutputType(entry->transform, 0, new_output_type, 0))) + if (IsEqualGUID(&subtype, &desired) && SUCCEEDED(hr = IMFTransform_SetOutputType(transform, 0, new_output_type, 0))) { - entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED; IMFMediaType_Release(new_output_type); return S_OK; } @@ -797,6 +796,17 @@ static HRESULT transform_entry_update_output_type(struct transform_entry *entry, return hr; } +/* update the transform output type while keeping subtype which matches the old output type */ +static HRESULT transform_entry_update_output_type(struct transform_entry *entry, IMFMediaType *old_output_type) +{ + HRESULT hr; + + if (SUCCEEDED(hr = set_matching_transform_output_type(entry->transform, old_output_type))) + entry->pending_flags |= MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED; + + return hr; +} + /* update the transform input type while keeping an output type which matches the current output subtype */ static HRESULT transform_entry_update_input_type(struct transform_entry *entry, IMFMediaType *input_type) { @@ -2091,7 +2101,8 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type))) { if (SUCCEEDED(hr = update_media_type_from_upstream(output_type, media_type)) - && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0)) && allow_processor + && FAILED(hr = IMFTransform_SetOutputType(transform, 0, output_type, 0)) + && FAILED(hr = set_matching_transform_output_type(transform, output_type)) && allow_processor && SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type))) { struct transform_entry *converter;

1 0

Ilia Docin : comctl32/rebar: Hide chevron if rebar's band is resized back to full size with gripper.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: b45ad560e45bd5a326252fca5f89209d20344a60 URL: https://gitlab.winehq.org/wine/wine/-/commit/b45ad560e45bd5a326252fca5f8920… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Wed May 22 17:41:30 2024 +0300 comctl32/rebar: Hide chevron if rebar's band is resized back to full size with gripper. --- dlls/comctl32/rebar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 61fd30c445f..7bb8f33ae06 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -799,6 +799,8 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) lpBand->rcChild.top, lpBand->rcChild.right + CHEVRON_WIDTH, lpBand->rcChild.bottom); } + else + SetRectEmpty(&lpBand->rcChevron); } else { SetRect (&lpBand->rcChild,

1 0

Alexandre Julliard : ntdll/tests: Add tests for in-process memory notifications on ARM64.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 888f7b83caa7b2a1c86f725aeee2fe5156b35c76 URL: https://gitlab.winehq.org/wine/wine/-/commit/888f7b83caa7b2a1c86f725aeee2fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 13:22:23 2024 +0200 ntdll/tests: Add tests for in-process memory notifications on ARM64. --- dlls/ntdll/tests/wow64.c | 511 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 500 insertions(+), 11 deletions(-)

1 0

Alexandre Julliard : wow64: Call pre- and post- memory notifications also in the current process case.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 7a6966604ec5db94d382420bec1f1a19bf8e6adf URL: https://gitlab.winehq.org/wine/wine/-/commit/7a6966604ec5db94d382420bec1f1a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 13:20:16 2024 +0200 wow64: Call pre- and post- memory notifications also in the current process case. --- dlls/wow64/syscall.c | 32 ++++++++++++--------------- dlls/wow64/virtual.c | 55 ++++++++++++++++++++++++---------------------- dlls/wow64/wow64_private.h | 8 +++---- 3 files changed, 47 insertions(+), 48 deletions(-)

1 0

Rémi Bernon : win32u: Use a 1bpp bitmap to store the window surface shape bits.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 07b801f2299bc8cba4daed91a244d87893ea5e87 URL: https://gitlab.winehq.org/wine/wine/-/commit/07b801f2299bc8cba4daed91a244d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 31 09:20:51 2024 +0200 win32u: Use a 1bpp bitmap to store the window surface shape bits. --- dlls/win32u/dce.c | 124 ++++++++++++++++++++++++++++++---- dlls/wineandroid.drv/window.c | 3 +- dlls/winemac.drv/surface.c | 3 +- dlls/winewayland.drv/window_surface.c | 3 +- dlls/winex11.drv/bitblt.c | 21 +++--- include/wine/gdi_driver.h | 3 +- 6 files changed, 131 insertions(+), 26 deletions(-)

1 0

Rémi Bernon : win32u: Update the window surface shape with color key and alpha.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 0931c2a4eb737f3205b80e2dd9adb269582182fd URL: https://gitlab.winehq.org/wine/wine/-/commit/0931c2a4eb737f3205b80e2dd9adb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 28 19:21:45 2024 +0200 win32u: Update the window surface shape with color key and alpha. --- dlls/win32u/dce.c | 82 +++++++++++++++++++++++- dlls/winex11.drv/bitblt.c | 159 ---------------------------------------------- 2 files changed, 79 insertions(+), 162 deletions(-)

1 0

Rémi Bernon : win32u: Pass the shape bitmap info and bits to window_surface flush.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: ab7172597281e6f58ab20eb007ad8b239faeea5b URL: https://gitlab.winehq.org/wine/wine/-/commit/ab7172597281e6f58ab20eb007ad8b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 28 19:47:13 2024 +0200 win32u: Pass the shape bitmap info and bits to window_surface flush. --- dlls/win32u/dce.c | 62 +++++++++++++++++------------------ dlls/wineandroid.drv/window.c | 12 ++----- dlls/winemac.drv/surface.c | 13 ++------ dlls/winewayland.drv/window_surface.c | 13 ++------ dlls/winex11.drv/bitblt.c | 49 ++++++++++++--------------- include/wine/gdi_driver.h | 5 ++- 6 files changed, 59 insertions(+), 95 deletions(-)

1 0

Alexandre Julliard : wow64: Add more cross-process notifications.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 3062191bf829bca18f4b6fd204a2ccf37c3e51b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/3062191bf829bca18f4b6fd204a2cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 5 13:22:15 2024 +0200 wow64: Add more cross-process notifications. --- dlls/wow64/syscall.c | 20 +++++++++++++++----- dlls/wow64/virtual.c | 2 +- dlls/wow64/wow64_private.h | 3 ++- include/winternl.h | 2 ++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index d5feb6f17c4..5c2e9012d57 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -104,7 +104,8 @@ static void (WINAPI *pBTCpuThreadInit)(void); static void (WINAPI *pBTCpuSimulate)(void) __attribute__((used)); static void * (WINAPI *p__wine_get_unix_opcode)(void); static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); -void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ) = NULL; +void (WINAPI *pBTCpuFlushInstructionCache2)( const void *, SIZE_T ) = NULL; +void (WINAPI *pBTCpuFlushInstructionCacheHeavy)( const void *, SIZE_T ) = NULL; void (WINAPI *pBTCpuNotifyMapViewOfSection)( void * ) = NULL; void (WINAPI *pBTCpuNotifyMemoryAlloc)( void *, SIZE_T, ULONG, ULONG, BOOL, NTSTATUS ) = NULL; void (WINAPI *pBTCpuNotifyMemoryDirty)( void *, SIZE_T ) = NULL; @@ -804,7 +805,8 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuResetToConsistentState ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); - GET_PTR( BTCpuNotifyFlushInstructionCache2 ); + GET_PTR( BTCpuFlushInstructionCache2 ); + GET_PTR( BTCpuFlushInstructionCacheHeavy ); GET_PTR( BTCpuNotifyMapViewOfSection ); GET_PTR( BTCpuNotifyMemoryAlloc ); GET_PTR( BTCpuNotifyMemoryDirty ); @@ -1343,7 +1345,7 @@ void WINAPI Wow64ProcessPendingCrossProcessItems(void) if (flush) { - if (pBTCpuNotifyFlushInstructionCache2) pBTCpuNotifyFlushInstructionCache2( NULL, ~0ull ); + if (pBTCpuFlushInstructionCacheHeavy) pBTCpuFlushInstructionCacheHeavy( NULL, 0 ); while (entry) { next = entry->next; @@ -1376,8 +1378,16 @@ void WINAPI Wow64ProcessPendingCrossProcessItems(void) entry->id == CrossProcessPostVirtualProtect, entry->args[1] ); break; case CrossProcessFlushCache: - if (!pBTCpuNotifyFlushInstructionCache2) break; - pBTCpuNotifyFlushInstructionCache2( (void *)entry->addr, entry->size ); + if (!pBTCpuFlushInstructionCache2) break; + pBTCpuFlushInstructionCache2( (void *)entry->addr, entry->size ); + break; + case CrossProcessFlushCacheHeavy: + if (!pBTCpuFlushInstructionCacheHeavy) break; + pBTCpuFlushInstructionCacheHeavy( (void *)entry->addr, entry->size ); + break; + case CrossProcessMemoryWrite: + if (!pBTCpuNotifyMemoryDirty) break; + pBTCpuNotifyMemoryDirty( (void *)entry->addr, entry->size ); break; } next = entry->next; diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 410bc627237..7df14c9b23b 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -240,7 +240,7 @@ NTSTATUS WINAPI wow64_NtFlushInstructionCache( UINT *args ) if (RtlIsCurrentProcess( process )) { - if (pBTCpuNotifyFlushInstructionCache2) pBTCpuNotifyFlushInstructionCache2( addr, size ); + if (pBTCpuFlushInstructionCache2) pBTCpuFlushInstructionCache2( addr, size ); } else send_cross_process_notification( process, CrossProcessFlushCache, addr, size, 0 ); diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index 46a0f513c2b..4f38c704174 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -39,7 +39,8 @@ extern ULONG_PTR highest_user_address; extern ULONG_PTR default_zero_bits; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock; -extern void (WINAPI *pBTCpuNotifyFlushInstructionCache2)( const void *, SIZE_T ); +extern void (WINAPI *pBTCpuFlushInstructionCache2)( const void *, SIZE_T ); +extern void (WINAPI *pBTCpuFlushInstructionCacheHeavy)( const void *, SIZE_T ); extern void (WINAPI *pBTCpuNotifyMapViewOfSection)( void * ); extern void (WINAPI *pBTCpuNotifyMemoryAlloc)( void *, SIZE_T, ULONG, ULONG, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuNotifyMemoryDirty)( void *, SIZE_T ); diff --git a/include/winternl.h b/include/winternl.h index 8406d4b8d46..224ad4bff0d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4251,6 +4251,8 @@ typedef enum CrossProcessPreVirtualProtect = 4, CrossProcessPostVirtualProtect = 5, CrossProcessFlushCache = 6, + CrossProcessFlushCacheHeavy = 7, + CrossProcessMemoryWrite = 8, } CROSS_PROCESS_NOTIFICATION; #define CROSS_PROCESS_LIST_FLUSH 0x80000000

1 0

Rémi Bernon : win32u: Introduce a new window surface helper to set window shape.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 03e43434c2bcf6424d60ee9dc1f595aa18714eef URL: https://gitlab.winehq.org/wine/wine/-/commit/03e43434c2bcf6424d60ee9dc1f595… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Mar 17 18:09:39 2024 +0100 win32u: Introduce a new window surface helper to set window shape. --- dlls/user32/tests/win.c | 7 ++----- dlls/win32u/dce.c | 38 +++++++++++++++++++++++++++++++++++ dlls/win32u/window.c | 1 + dlls/wineandroid.drv/window.c | 8 ++++++++ dlls/winemac.drv/surface.c | 9 +++++++++ dlls/winewayland.drv/window_surface.c | 9 +++++++++ dlls/winex11.drv/bitblt.c | 24 ++++++++++++++++++++++ dlls/winex11.drv/window.c | 5 ++++- include/wine/gdi_driver.h | 5 +++++ 9 files changed, 100 insertions(+), 6 deletions(-)

1 0