wine-commits February 2024

wine-commits@winehq.org

1 participants
716 discussions

Alexandre Julliard : kernelbase: Update timezone data to version 2024a.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: 6e9d21409655207d5f83e7b31e48c07034385e2d URL: https://gitlab.winehq.org/wine/wine/-/commit/6e9d21409655207d5f83e7b31e48c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 17:53:41 2024 +0100 kernelbase: Update timezone data to version 2024a. --- dlls/kernelbase/kernelbase.rgs | 34 +++++++++++++++++++++++++++------- tools/make_unicode | 4 ++-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/kernelbase.rgs b/dlls/kernelbase/kernelbase.rgs index 5ae452de1e7..382cb23bfc5 100644 --- a/dlls/kernelbase/kernelbase.rgs +++ b/dlls/kernelbase/kernelbase.rgs @@ -523,7 +523,7 @@ HKLM val 'MUI_Dlt' = s '@tzres.dll,-8177' val 'MUI_Std' = s '@tzres.dll,-8176' val 'Std' = s 'Central Asia Standard Time' - val 'TZI' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val 'TZI' = b d4feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 'Dynamic DST' { val '2000' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 @@ -532,8 +532,28 @@ HKLM val '2003' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 val '2004' = b 98feffff00000000c4ffffff00000a0000000500030000000000000000000300000005000200000000000000 val '2005' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2006' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2007' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2008' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2009' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2010' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2011' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2012' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2013' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2014' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2015' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2016' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2017' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2018' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2019' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2020' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2021' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2022' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2023' = b 98feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 + val '2024' = b d4feffff00000000c4ffffff0000030005000100000000000000000000000100010001000000000000000000 + val '2025' = b d4feffff00000000c4ffffff0000000000000000000000000000000000000000000000000000000000000000 val 'FirstEntry' = d 2000 - val 'LastEntry' = d 2005 + val 'LastEntry' = d 2025 } } 'Central Brazilian Standard Time' @@ -1055,7 +1075,7 @@ HKLM val 'MUI_Dlt' = s '@tzres.dll,-58097' val 'MUI_Std' = s '@tzres.dll,-58096' val 'Std' = s 'Greenland Standard Time' - val 'TZI' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 + val 'TZI' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000100020001000000000000000000 'Dynamic DST' { val '2000' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 @@ -1081,14 +1101,14 @@ HKLM val '2020' = b b400000000000000c4ffffff00000a0006000400170000000000000000000300060005001600000000000000 val '2021' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 val '2022' = b b400000000000000c4ffffff00000a0006000500170000000000000000000300060005001600000000000000 - val '2023' = b b400000000000000c4ffffff0000010000000100000000000000000000000300060005001600000000000000 + val '2023' = b b400000000000000c4ffffff00000a0000000500000000000000000000000300060005001600000000000000 val '2024' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2025' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2026' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2027' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2028' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 val '2029' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060004001700000000000000 - val '2030' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000300060005001700000000000000 + val '2030' = b 7800000000000000c4ffffff00000a0000000500000000000000000000000100020001000000000000000000 val 'FirstEntry' = d 2000 val 'LastEntry' = d 2030 } @@ -3149,8 +3169,8 @@ HKLM val '2021' = b 88ffffff00000000c4ffffff00000a0005000500010000000000000000000300060004000000000000000000 val '2022' = b 88ffffff00000000c4ffffff00000a0006000500020000000000000000000300000005000000000000000000 val '2023' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060005000200000000000000 - val '2024' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060002000200000000000000 - val '2025' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060001000200000000000000 + val '2024' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060003000200000000000000 + val '2025' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000400060002000200000000000000 val '2026' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000300060004000200000000000000 val '2027' = b 88ffffff00000000c4ffffff00000a0006000500020000000000000000000300060004000200000000000000 val '2028' = b 88ffffff00000000c4ffffff00000a0006000400020000000000000000000300060004000200000000000000 diff --git a/tools/make_unicode b/tools/make_unicode index 2dfef084268..5ad8251bea0 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -28,7 +28,7 @@ use Time::Local qw(timegm_modern); my $UNIVERSION = "15.1.0"; my $CLDRVERSION = "44"; my $ISO639VERSION = "20230123"; -my $TZVERSION = "2023c"; +my $TZVERSION = "2024a"; my %data_files = ( @@ -55,7 +55,7 @@ my %data_files = jis0212 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0212.TXT", sha => "477820bb3055bbcc90880d788cd95607d221dc94457bae249231adecf13c12e6" }, tzdata => { url => "https://data.iana.org/time-zones/releases/tzdata$TZVERSION.tar.gz", - sha => "3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c" }, + sha => "0d0434459acbd2059a7a8da1f3304a84a86591f6ed69c6248fffa502b6edffe3" }, );

1 0

Alex Henrie : where: Implement search with default options.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 90103fa07e5c23c7500c7d33e538b0610bf3c27d URL: https://gitlab.winehq.org/wine/wine/-/commit/90103fa07e5c23c7500c7d33e538b0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 13 23:34:17 2024 -0700 where: Implement search with default options. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55282 --- programs/where/Makefile.in | 1 + programs/where/main.c | 95 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in index bca42590176..125c550fa37 100644 --- a/programs/where/Makefile.in +++ b/programs/where/Makefile.in @@ -1,4 +1,5 @@ MODULE = where.exe +IMPORTS = shlwapi EXTRADLLFLAGS = -mconsole -municode diff --git a/programs/where/main.c b/programs/where/main.c index 6f90a222dce..3307ace1f45 100644 --- a/programs/where/main.c +++ b/programs/where/main.c @@ -1,5 +1,6 @@ /* * Copyright 2020 Louis Lenders + * Copyright 2024 Alex Henrie * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,18 +17,106 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <windows.h> +#include <fileapi.h> +#include <shlwapi.h> + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(where); +static BOOL found; + +static void search(const WCHAR *search_path, const WCHAR *pattern) +{ + static const WCHAR *extensions[] = {L"", L".bat", L".cmd", L".com", L".exe"}; + WCHAR glob[MAX_PATH]; + WCHAR match_path[MAX_PATH]; + WIN32_FIND_DATAW match; + HANDLE handle; + int i; + + for (i = 0; i < ARRAY_SIZE(extensions); i++) + { + if (wcslen(search_path) + 1 + wcslen(pattern) + wcslen(extensions[i]) + 1 > ARRAY_SIZE(glob)) + { + ERR("Path too long\n"); + return; + } + /* Treat the extension as part of the pattern */ + wcscpy(glob, search_path); + wcscat(glob, L"\\"); + wcscat(glob, pattern); + wcscat(glob, extensions[i]); + + handle = FindFirstFileExW(glob, FindExInfoBasic, &match, 0, NULL, 0); + if (handle != INVALID_HANDLE_VALUE) + { + do + { + if (PathCombineW(match_path, search_path, match.cFileName)) + { + printf("%ls\n", match_path); + found = TRUE; + } + } + while (FindNextFileW(handle, &match)); + FindClose(handle); + } + } +} + int __cdecl wmain(int argc, WCHAR *argv[]) { + WCHAR *pattern, *colon, *search_paths, *search_path, *next_search_path; int i; - WINE_FIXME("stub:"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + if (argv[i][0] == '/') + { + FIXME("Unsupported option %ls\n", argv[i]); + return 1; + } + } + + for (i = 1; i < argc; i++) + { + pattern = argv[i]; + colon = wcsrchr(pattern, ':'); + + /* Check for a set of search paths prepended to the pattern */ + if (colon) + { + *colon = 0; + search_paths = pattern; + pattern = colon + 1; + } + else + { + search_paths = _wgetenv(L"PATH"); + } + + if (wcspbrk(pattern, L"\\/\r\n")) continue; /* Silently ignore invalid patterns */ + + if (!colon) + { + /* If the search paths were not explicitly specified, search the current directory first */ + WCHAR current_dir[MAX_PATH]; + if (GetCurrentDirectoryW(ARRAY_SIZE(current_dir), current_dir)) + search(current_dir, pattern); + } + + next_search_path = wcsdup(search_paths); + while ((search_path = wcstok(NULL, L";", &next_search_path))) + search(search_path, pattern); + } + + if (!found) + { + fputs("File not found\n", stderr); + return 1; + } return 0; }

1 0

Daniel Lehman : include: Add some msvcrt declarations.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 7c6a50cc46893757d398a867421eaa7196eec1bf URL: https://gitlab.winehq.org/wine/wine/-/commit/7c6a50cc46893757d398a867421eaa… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 17 21:29:59 2024 -0800 include: Add some msvcrt declarations. --- include/msvcrt/corecrt_wctype.h | 2 ++ include/msvcrt/corecrt_wstdlib.h | 6 ++++++ include/msvcrt/corecrt_wtime.h | 1 + include/msvcrt/stdlib.h | 1 + include/msvcrt/time.h | 1 + include/msvcrt/wchar.h | 1 + include/tchar.h | 5 +++++ 7 files changed, 17 insertions(+) diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h index 9661ab5e596..26130aa4839 100644 --- a/include/msvcrt/corecrt_wctype.h +++ b/include/msvcrt/corecrt_wctype.h @@ -28,6 +28,7 @@ _ACRTIMP int __cdecl _isleadbyte_l(int,_locale_t); _ACRTIMP int __cdecl _iswalnum_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswalpha_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswblank_l(wint_t,_locale_t); +_ACRTIMP int __cdecl _iswcntrl_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswctype_l(wint_t,wctype_t,_locale_t); _ACRTIMP int __cdecl _iswdigit_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswgraph_l(wint_t,_locale_t); @@ -36,6 +37,7 @@ _ACRTIMP int __cdecl _iswprint_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswpunct_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswspace_l(wint_t,_locale_t); _ACRTIMP int __cdecl _iswupper_l(wint_t,_locale_t); +_ACRTIMP int __cdecl _iswxdigit_l(wint_t,_locale_t); _ACRTIMP wint_t __cdecl _towlower_l(wint_t,_locale_t); _ACRTIMP wint_t __cdecl _towupper_l(wint_t,_locale_t); _ACRTIMP int __cdecl is_wctype(wint_t,wctype_t); diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h index e37da1848ac..f6c68bb937a 100644 --- a/include/msvcrt/corecrt_wstdlib.h +++ b/include/msvcrt/corecrt_wstdlib.h @@ -46,6 +46,7 @@ _ACRTIMP errno_t __cdecl _mbstowcs_s_l(size_t*,wchar_t*,size_t,const char* _ACRTIMP int __cdecl mbtowc(wchar_t*,const char*,size_t); _ACRTIMP int __cdecl _mbtowc_l(wchar_t*,const char*,size_t,_locale_t); _ACRTIMP float __cdecl wcstof(const wchar_t*,wchar_t**); +_ACRTIMP float __cdecl _wcstof_l(const wchar_t*,wchar_t**,_locale_t); _ACRTIMP double __cdecl wcstod(const wchar_t*,wchar_t**); _ACRTIMP __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int); _ACRTIMP size_t __cdecl wcstombs(char*,const wchar_t*,size_t); @@ -63,6 +64,11 @@ _ACRTIMP __int64 __cdecl _wcstoll_l(const wchar_t*,wchar_t**,int,_locale_t _ACRTIMP unsigned __int64 __cdecl wcstoull(const wchar_t*,wchar_t**,int); _ACRTIMP unsigned __int64 __cdecl _wcstoull_l(const wchar_t*,wchar_t**,int,_locale_t); +#ifdef _UCRT +_ACRTIMP double __cdecl _wcstold_l(const wchar_t*,wchar_t**,_locale_t); +static inline long double wcstold(const wchar_t *string, wchar_t **endptr) { return _wcstold_l(string, endptr, NULL); } +#endif /* _UCRT */ + #ifdef __cplusplus extern "C++" { diff --git a/include/msvcrt/corecrt_wtime.h b/include/msvcrt/corecrt_wtime.h index 9d96f1a171c..c05602d2156 100644 --- a/include/msvcrt/corecrt_wtime.h +++ b/include/msvcrt/corecrt_wtime.h @@ -30,6 +30,7 @@ extern "C" { _ACRTIMP wchar_t* __cdecl _wasctime(const struct tm*); _ACRTIMP size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); +_ACRTIMP size_t __cdecl _wcsftime_l(wchar_t*,size_t,const wchar_t*,const struct tm*,_locale_t); _ACRTIMP wchar_t* __cdecl _wctime32(const __time32_t*); _ACRTIMP wchar_t* __cdecl _wctime64(const __time64_t*); _ACRTIMP wchar_t* __cdecl _wstrdate(wchar_t*); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index b7ced413440..f1ffcd8c035 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -225,6 +225,7 @@ _ACRTIMP int __cdecl rand(void); _ACRTIMP errno_t __cdecl rand_s(unsigned int*); _ACRTIMP void __cdecl srand(unsigned int); _ACRTIMP float __cdecl strtof(const char*,char**); +_ACRTIMP float __cdecl _strtof_l(const char*,char**,_locale_t); _ACRTIMP double __cdecl strtod(const char*,char**); _ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int); _ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int); diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 4d79d066184..42e2fc4b1e2 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -91,6 +91,7 @@ _ACRTIMP errno_t __cdecl _localtime64_s(struct tm*, const __time64_t*); _ACRTIMP __time32_t __cdecl _mktime32(struct tm*); _ACRTIMP __time64_t __cdecl _mktime64(struct tm*); _ACRTIMP size_t __cdecl strftime(char*,size_t,const char*,const struct tm*); +_ACRTIMP size_t __cdecl _strftime_l(char*,size_t,const char*,const struct tm*,_locale_t); _ACRTIMP __time32_t __cdecl _time32(__time32_t*); _ACRTIMP __time64_t __cdecl _time64(__time64_t*); diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index cb82a08692a..4ca189bd2c7 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -39,6 +39,7 @@ size_t __cdecl mbrlen(const char *,size_t,mbstate_t*); size_t __cdecl mbrtowc(wchar_t*,const char*,size_t,mbstate_t*); size_t __cdecl mbsrtowcs(wchar_t*,const char**,size_t,mbstate_t*); size_t __cdecl wcrtomb(char*,wchar_t,mbstate_t*); +int __cdecl wcrtomb_s(size_t*,char*,size_t,wchar_t,mbstate_t*); size_t __cdecl wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); int __cdecl wctob(wint_t); diff --git a/include/tchar.h b/include/tchar.h index a51bd5b359f..bbf85973b41 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -115,6 +115,7 @@ extern "C" { #define _tcsdec WINE_tchar_routine(_strdec, _mbsdec, _wcsdec) #define _tcsdup WINE_tchar_routine(strdup, _mbsdup, _wcsdup) #define _tcsftime WINE_tchar_routine(strftime, strftime, wcsftime) +#define _tcsftime_l WINE_tchar_routine(_strftime_l, _strftime_l, _wcsftime_l) #define _tcsicmp WINE_tchar_routine(strcasecmp, _mbsicmp, _wcsicmp) #define _tcsicoll WINE_tchar_routine(_stricoll, _stricoll, _wcsicoll) #define _tcsinc WINE_tchar_routine(_strinc, _mbsinc, _wcsinc) @@ -148,8 +149,12 @@ extern "C" { #define _tcsspn WINE_tchar_routine(strspn, _mbsspn, wcsspn) #define _tcsstr WINE_tchar_routine(strstr, _mbsstr, wcsstr) #define _tcstod WINE_tchar_routine(strtod, strtod, wcstod) +#define _tcstof WINE_tchar_routine(strtof, strtof, wcstof) +#define _tcstof_l WINE_tchar_routine(_strtof_l, _strtof_l, _wcstof_l) #define _tcstok WINE_tchar_routine(strtok, _mbstok, _wcstok) #define _tcstol WINE_tchar_routine(strtol, strtol, wcstol) +#define _tcstold WINE_tchar_routine(strtold, strtold, wcstold) +#define _tcstold_l WINE_tchar_routine(_strtold_l, _strtold_l, _wcstold_l) #define _tcstoll WINE_tchar_routine(strtoll, strtoll, wcstoll) #define _tcstoll_l WINE_tchar_routine(_strtoll_l, _strtoll_l, _wcstoll_l) #define _tcstoul WINE_tchar_routine(strtoul, strtoul, wcstoul)

1 0

Paul Gofman : powershell: Read input command from stdin.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 1a4163b686ae10a5a587e1684600707a640dee33 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a4163b686ae10a5a587e168460070… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 12:41:28 2024 -0600 powershell: Read input command from stdin. --- programs/powershell/main.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/programs/powershell/main.c b/programs/powershell/main.c index eb9a64ff0ec..25a4d13d340 100644 --- a/programs/powershell/main.c +++ b/programs/powershell/main.c @@ -24,10 +24,25 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { int i; - WINE_FIXME("stub:"); + WINE_FIXME("stub.\n"); for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + { + WINE_FIXME("argv[%d] %s\n", i, wine_dbgstr_w(argv[i])); + if (!wcsicmp(argv[i], L"-command") && i < argc - 1 && !wcscmp(argv[i + 1], L"-")) + { + char command[4096], *p; + ++i; + while (fgets(command, sizeof(command), stdin)) + { + WINE_FIXME("command %s.\n", debugstr_a(command)); + p = command; + while (*p && !isspace(*p)) ++p; + *p = 0; + if (!stricmp(command, "exit")) + break; + } + } + } return 0; }

1 0

Rémi Bernon : mfreadwrite/reader: Repeat pushing / pulling samples while it succeeds.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 75fa35ad7fa2e1acaff0f2724bfe08a6242ecc60 URL: https://gitlab.winehq.org/wine/wine/-/commit/75fa35ad7fa2e1acaff0f2724bfe08… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 22:16:29 2024 +0100 mfreadwrite/reader: Repeat pushing / pulling samples while it succeeds. --- dlls/mfreadwrite/reader.c | 51 ++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index c47cd499985..6e895667ef6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -678,6 +678,26 @@ static HRESULT source_reader_allocate_stream_sample(MFT_OUTPUT_STREAM_INFO *info return hr; } +static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, + struct transform_entry *entry); +static HRESULT source_reader_push_transform_samples(struct source_reader *reader, struct media_stream *stream, + struct transform_entry *entry, IMFSample *sample) +{ + HRESULT hr; + + do + { + if (FAILED(hr = source_reader_pull_transform_samples(reader, stream, entry)) + && hr != MF_E_TRANSFORM_NEED_MORE_INPUT) + return hr; + if (SUCCEEDED(hr = IMFTransform_ProcessInput(entry->transform, 0, sample, 0))) + return source_reader_pull_transform_samples(reader, stream, entry); + } + while (hr == MF_E_NOTACCEPTING); + + return hr; +} + static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, struct transform_entry *entry) { @@ -689,7 +709,7 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader return hr; stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size); - for (;;) + while (SUCCEEDED(hr)) { MFT_OUTPUT_DATA_BUFFER out_buffer = {0}; @@ -697,14 +717,9 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader && FAILED(hr = source_reader_allocate_stream_sample(&stream_info, &out_buffer.pSample))) break; - if (FAILED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status))) - { - if (out_buffer.pSample) - IMFSample_Release(out_buffer.pSample); - break; - } + if (SUCCEEDED(hr = IMFTransform_ProcessOutput(stream->decoder.transform, 0, 1, &out_buffer, &status))) + hr = source_reader_queue_sample(reader, stream, out_buffer.pSample); - source_reader_queue_sample(reader, stream, out_buffer.pSample); if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); if (out_buffer.pEvents) @@ -748,19 +763,9 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct return source_reader_queue_sample(reader, stream, sample); /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */ - - hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder); - if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) - { - if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder.transform, 0, sample, 0))) - { - WARN("Transform failed to process input, hr %#lx.\n", hr); - return hr; - } - - if ((hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder)) == MF_E_TRANSFORM_NEED_MORE_INPUT) - return S_OK; - } + if (SUCCEEDED(hr = source_reader_push_transform_samples(reader, stream, &stream->decoder, sample)) + || hr == MF_E_TRANSFORM_NEED_MORE_INPUT) + hr = stream->requests ? source_reader_request_sample(reader, stream) : S_OK; else WARN("Transform failed to process output, hr %#lx.\n", hr); @@ -797,12 +802,8 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, if (id == reader->streams[i].id) { /* FIXME: propagate processing errors? */ - reader->streams[i].flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; hr = source_reader_process_sample(reader, &reader->streams[i], sample); - if (reader->streams[i].requests) - source_reader_request_sample(reader, &reader->streams[i]); - break; } }

1 0

Rémi Bernon : mfreadwrite/reader: Introduce new source_reader_(drain|flush)_transform_samples helpers.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: c20fc715e219dbf09ea971d577456d516367c8a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/c20fc715e219dbf09ea971d577456d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 22:04:55 2024 +0100 mfreadwrite/reader: Introduce new source_reader_(drain|flush)_transform_samples helpers. --- dlls/mfreadwrite/reader.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ed5ffa3b759..c47cd499985 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -714,6 +714,31 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader return hr; } +static HRESULT source_reader_drain_transform_samples(struct source_reader *reader, struct media_stream *stream, + struct transform_entry *entry) +{ + HRESULT hr; + + if (FAILED(hr = IMFTransform_ProcessMessage(entry->transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) + WARN("Failed to drain transform %p, hr %#lx\n", entry->transform, hr); + if (FAILED(hr = source_reader_pull_transform_samples(reader, stream, entry)) + && hr != MF_E_TRANSFORM_NEED_MORE_INPUT) + WARN("Failed to pull pending samples, hr %#lx.\n", hr); + + return S_OK; +} + +static HRESULT source_reader_flush_transform_samples(struct source_reader *reader, struct media_stream *stream, + struct transform_entry *entry) +{ + HRESULT hr; + + if (FAILED(hr = IMFTransform_ProcessMessage(entry->transform, MFT_MESSAGE_COMMAND_FLUSH, 0))) + WARN("Failed to flush transform %p, hr %#lx\n", entry->transform, hr); + + return S_OK; +} + static HRESULT source_reader_process_sample(struct source_reader *reader, struct media_stream *stream, IMFSample *sample) { @@ -824,11 +849,10 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re stream->state = STREAM_STATE_EOS; stream->flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; - if (stream->decoder.transform && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder.transform, - MFT_MESSAGE_COMMAND_DRAIN, 0))) + if (stream->decoder.transform) { - if ((hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder)) != MF_E_TRANSFORM_NEED_MORE_INPUT) - WARN("Failed to pull pending samples, hr %#lx.\n", hr); + if (FAILED(hr = source_reader_drain_transform_samples(reader, stream, &stream->decoder))) + WARN("Failed to drain pending samples, hr %#lx.\n", hr); } while (stream->requests) @@ -1187,10 +1211,16 @@ static void source_reader_release_responses(struct source_reader *reader, struct static void source_reader_flush_stream(struct source_reader *reader, DWORD stream_index) { struct media_stream *stream = &reader->streams[stream_index]; + HRESULT hr; source_reader_release_responses(reader, stream); + if (stream->decoder.transform) - IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_FLUSH, 0); + { + if (FAILED(hr = source_reader_flush_transform_samples(reader, stream, &stream->decoder))) + WARN("Failed to drain pending samples, hr %#lx.\n", hr); + } + stream->requests = 0; }

1 0

Rémi Bernon : mfreadwrite/reader: Introduce a new source_reader_allocate_stream_sample helper.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 8946e6df7edbcc8b6e2adfb9cce8c337a1daa697 URL: https://gitlab.winehq.org/wine/wine/-/commit/8946e6df7edbcc8b6e2adfb9cce8c3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 22:16:10 2024 +0100 mfreadwrite/reader: Introduce a new source_reader_allocate_stream_sample helper. --- dlls/mfreadwrite/reader.c | 51 ++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 3d3d8a2c31f..ed5ffa3b759 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -655,42 +655,47 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return source_reader_release(reader); } +static HRESULT source_reader_allocate_stream_sample(MFT_OUTPUT_STREAM_INFO *info, IMFSample **out) +{ + IMFMediaBuffer *buffer; + IMFSample *sample; + HRESULT hr; + + *out = NULL; + if (FAILED(hr = MFCreateSample(&sample))) + return hr; + if (SUCCEEDED(hr = MFCreateAlignedMemoryBuffer(info->cbSize, info->cbAlignment, &buffer))) + { + if (SUCCEEDED(hr = IMFSample_AddBuffer(sample, buffer))) + { + *out = sample; + IMFSample_AddRef(sample); + } + IMFMediaBuffer_Release(buffer); + } + + IMFSample_Release(sample); + return hr; +} + static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, struct transform_entry *entry) { MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; - MFT_OUTPUT_DATA_BUFFER out_buffer; - unsigned int buffer_size; - IMFMediaBuffer *buffer; DWORD status; HRESULT hr; if (FAILED(hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info))) - { - WARN("Failed to get output stream info, hr %#lx.\n", hr); return hr; - } + stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size); for (;;) { - memset(&out_buffer, 0, sizeof(out_buffer)); - - if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES))) - { - if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) - break; + MFT_OUTPUT_DATA_BUFFER out_buffer = {0}; - buffer_size = max(stream_info.cbSize, entry->min_buffer_size); - - if (FAILED(hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info.cbAlignment, &buffer))) - { - IMFSample_Release(out_buffer.pSample); - break; - } - - IMFSample_AddBuffer(out_buffer.pSample, buffer); - IMFMediaBuffer_Release(buffer); - } + if (!(stream_info.dwFlags & (MFT_OUTPUT_STREAM_PROVIDES_SAMPLES | MFT_OUTPUT_STREAM_CAN_PROVIDE_SAMPLES)) + && FAILED(hr = source_reader_allocate_stream_sample(&stream_info, &out_buffer.pSample))) + break; if (FAILED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status))) {

1 0

Rémi Bernon : mfreadwrite/reader: Pass the transform to source_reader_pull_stream_samples.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: dd6e8198e0af73449e5ed9550e4f9053cf40c985 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd6e8198e0af73449e5ed9550e4f90… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 22:07:59 2024 +0100 mfreadwrite/reader: Pass the transform to source_reader_pull_stream_samples. --- dlls/mfreadwrite/reader.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 2ef8ade360d..3d3d8a2c31f 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -71,7 +71,7 @@ enum media_stream_flags STREAM_FLAG_STOPPED = 0x8, /* Received MEStreamStopped */ }; -struct stream_transform +struct transform_entry { IMFTransform *transform; unsigned int min_buffer_size; @@ -81,7 +81,7 @@ struct media_stream { IMFMediaStream *stream; IMFMediaType *current; - struct stream_transform decoder; + struct transform_entry decoder; IMFVideoSampleAllocatorEx *allocator; DWORD id; unsigned int index; @@ -655,7 +655,8 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return source_reader_release(reader); } -static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, struct media_stream *stream) +static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, + struct transform_entry *entry) { MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; MFT_OUTPUT_DATA_BUFFER out_buffer; @@ -664,7 +665,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s DWORD status; HRESULT hr; - if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder.transform, 0, &stream_info))) + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info))) { WARN("Failed to get output stream info, hr %#lx.\n", hr); return hr; @@ -679,7 +680,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) break; - buffer_size = max(stream_info.cbSize, stream->decoder.min_buffer_size); + buffer_size = max(stream_info.cbSize, entry->min_buffer_size); if (FAILED(hr = MFCreateAlignedMemoryBuffer(buffer_size, stream_info.cbAlignment, &buffer))) { @@ -691,7 +692,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s IMFMediaBuffer_Release(buffer); } - if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder.transform, 0, 1, &out_buffer, &status))) + if (FAILED(hr = IMFTransform_ProcessOutput(entry->transform, 0, 1, &out_buffer, &status))) { if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); @@ -718,7 +719,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */ - hr = source_reader_pull_stream_samples(reader, stream); + hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder); if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) { if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder.transform, 0, sample, 0))) @@ -727,7 +728,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct return hr; } - if ((hr = source_reader_pull_stream_samples(reader, stream)) == MF_E_TRANSFORM_NEED_MORE_INPUT) + if ((hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder)) == MF_E_TRANSFORM_NEED_MORE_INPUT) return S_OK; } else @@ -821,7 +822,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re if (stream->decoder.transform && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder.transform, MFT_MESSAGE_COMMAND_DRAIN, 0))) { - if ((hr = source_reader_pull_stream_samples(reader, stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) + if ((hr = source_reader_pull_transform_samples(reader, stream, &stream->decoder)) != MF_E_TRANSFORM_NEED_MORE_INPUT) WARN("Failed to pull pending samples, hr %#lx.\n", hr); }

1 0

Rémi Bernon : mfreadwrite/reader: Introduce source_reader_queue_sample helper.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: cbb343567ac155d581bf484e66238ec1e411c79d URL: https://gitlab.winehq.org/wine/wine/-/commit/cbb343567ac155d581bf484e66238e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 23 21:16:06 2024 +0100 mfreadwrite/reader: Introduce source_reader_queue_sample helper. --- dlls/mfreadwrite/reader.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 057e771ca99..2ef8ade360d 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -463,6 +463,17 @@ static HRESULT source_reader_queue_response(struct source_reader *reader, struct return S_OK; } +static HRESULT source_reader_queue_sample(struct source_reader *reader, struct media_stream *stream, + IMFSample *sample) +{ + LONGLONG timestamp = 0; + + if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) + WARN("Sample time wasn't set.\n"); + + return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); +} + static HRESULT source_reader_request_sample(struct source_reader *reader, struct media_stream *stream) { HRESULT hr = S_OK; @@ -650,7 +661,6 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s MFT_OUTPUT_DATA_BUFFER out_buffer; unsigned int buffer_size; IMFMediaBuffer *buffer; - LONGLONG timestamp; DWORD status; HRESULT hr; @@ -688,11 +698,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s break; } - timestamp = 0; - if (FAILED(IMFSample_GetSampleTime(out_buffer.pSample, &timestamp))) - WARN("Sample time wasn't set.\n"); - - source_reader_queue_response(reader, stream, S_OK /* FIXME */, 0, timestamp, out_buffer.pSample); + source_reader_queue_sample(reader, stream, out_buffer.pSample); if (out_buffer.pSample) IMFSample_Release(out_buffer.pSample); if (out_buffer.pEvents) @@ -705,17 +711,10 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s static HRESULT source_reader_process_sample(struct source_reader *reader, struct media_stream *stream, IMFSample *sample) { - LONGLONG timestamp; HRESULT hr; if (!stream->decoder.transform) - { - timestamp = 0; - if (FAILED(IMFSample_GetSampleTime(sample, &timestamp))) - WARN("Sample time wasn't set.\n"); - - return source_reader_queue_response(reader, stream, S_OK, 0, timestamp, sample); - } + return source_reader_queue_sample(reader, stream, sample); /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */

1 0

Paul Gofman : ntdll: Don't hardcode xstate size in exception stack layout.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: dfe2b717a622fd551053d880d2185281fb237a65 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfe2b717a622fd551053d880d21852… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 31 16:26:16 2024 -0600 ntdll: Don't hardcode xstate size in exception stack layout. --- dlls/ntdll/unix/signal_i386.c | 63 +++++++++++++++++++---------------------- dlls/ntdll/unix/signal_x86_64.c | 47 +++++++++++++++--------------- 2 files changed, 53 insertions(+), 57 deletions(-)

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2024