February 2024 - Wine-commits

Alexandre Julliard : faudio: Import upstream release 24.02.
by Alexandre Julliard 19 Feb '24

19 Feb '24

Module: wine Branch: master Commit: fa42210c49163d080ad766b41e7a832755de6846 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa42210c49163d080ad766b41e7a83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 17:52:10 2024 +0100 faudio: Import upstream release 24.02. --- libs/faudio/LICENSE | 2 +- libs/faudio/include/F3DAudio.h | 2 +- libs/faudio/include/FACT.h | 2 +- libs/faudio/include/FACT3D.h | 2 +- libs/faudio/include/FAPO.h | 2 +- libs/faudio/include/FAPOBase.h | 2 +- libs/faudio/include/FAPOFX.h | 2 +- libs/faudio/include/FAudio.h | 6 +++--- libs/faudio/include/FAudioFX.h | 2 +- libs/faudio/src/F3DAudio.c | 2 +- libs/faudio/src/FACT.c | 2 +- libs/faudio/src/FACT3D.c | 2 +- libs/faudio/src/FACT_internal.c | 2 +- libs/faudio/src/FACT_internal.h | 2 +- libs/faudio/src/FAPOBase.c | 2 +- libs/faudio/src/FAPOFX.c | 2 +- libs/faudio/src/FAPOFX_echo.c | 2 +- libs/faudio/src/FAPOFX_eq.c | 2 +- libs/faudio/src/FAPOFX_masteringlimiter.c | 2 +- libs/faudio/src/FAPOFX_reverb.c | 2 +- libs/faudio/src/FAudio.c | 2 +- libs/faudio/src/FAudioFX_reverb.c | 2 +- libs/faudio/src/FAudioFX_volumemeter.c | 2 +- libs/faudio/src/FAudio_internal.c | 2 +- libs/faudio/src/FAudio_internal.h | 2 +- libs/faudio/src/FAudio_internal_simd.c | 2 +- libs/faudio/src/FAudio_operationset.c | 2 +- libs/faudio/src/FAudio_platform_win32.c | 11 +++++++++-- 28 files changed, 38 insertions(+), 31 deletions(-)

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: 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

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

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

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

Zebediah Figura : wined3d: Introduce a separate fp_disable() method.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: b64cc15d615659200643f0094f07133ec8b028b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b64cc15d615659200643f0094f0713… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 21:32:17 2023 -0600 wined3d: Introduce a separate fp_disable() method. Analogous to shader_disable(). We'd like to pass a wined3d_state pointer to fp_enable() to let it handle actually compiling the fragment pipeline, which doesn't mesh well conceptually with its use in shader_disable(). --- dlls/wined3d/arb_program_shader.c | 29 ++++++++++++------- dlls/wined3d/ati_fragment_shader.c | 27 ++++++++++++------ dlls/wined3d/ffp_gl.c | 37 ++++++++++++------------ dlls/wined3d/glsl_shader.c | 25 +++++++++------- dlls/wined3d/nvidia_texture_shader.c | 55 ++++++++++++++++++++++++------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_spirv.c | 8 +++++- dlls/wined3d/wined3d_private.h | 1 + 8 files changed, 117 insertions(+), 67 deletions(-)

1 0

Zebediah Figura : wined3d: Pass a wined3d_state pointer to the vp_enable() and fp_enable() methods.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: dfb1665b5f5f7da01f70bbcfeebf086bbbb9eab6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfb1665b5f5f7da01f70bbcfeebf08… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 21:53:59 2023 -0600 wined3d: Pass a wined3d_state pointer to the vp_enable() and fp_enable() methods. Rename to *_apply_draw_state() per Henri's suggestion. --- dlls/wined3d/arb_program_shader.c | 14 +++++++------- dlls/wined3d/ati_fragment_shader.c | 6 +++--- dlls/wined3d/ffp_gl.c | 12 ++++++------ dlls/wined3d/glsl_shader.c | 13 +++++++------ dlls/wined3d/nvidia_texture_shader.c | 14 +++++++------- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/shader_spirv.c | 13 +++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 8 files changed, 41 insertions(+), 39 deletions(-)

1 0

Zebediah Figura : wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 17b9c453117ca8e4b180934262f0aed221a0c7da URL: https://gitlab.winehq.org/wine/wine/-/commit/17b9c453117ca8e4b180934262f0ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 13:14:30 2023 -0600 wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/ffp_gl.c | 4 ++-- dlls/wined3d/glsl_shader.c | 5 ++--- dlls/wined3d/nvidia_texture_shader.c | 4 ++-- dlls/wined3d/shader_spirv.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8a31d67662d..9ca6dd8ff46 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5740,7 +5740,7 @@ struct arbfp_ffp_desc }; /* Context activation is done by the caller. */ -static void arbfp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void arbfp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 45e6c081ba0..925b712f372 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1251,7 +1251,7 @@ static const struct wined3d_state_entry_template atifs_fragmentstate_template[] }; /* Context activation is done by the caller. */ -static void atifs_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void atifs_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index 0b5f1fab653..dbc82a1ba4d 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -4840,7 +4840,7 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = }; /* Context activation is done by the caller. */ -static void ffp_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void ffp_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void ffp_pipe_disable(const struct wined3d_context *context) {} @@ -4967,7 +4967,7 @@ const struct wined3d_fragment_pipe_ops ffp_fragment_pipeline = .states = ffp_fragmentstate_template, }; -static void none_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void none_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void none_pipe_disable(const struct wined3d_context *context) {} diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4cff60b1775..5a2133bf5a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11563,7 +11563,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = shader_glsl_shader_compile, }; -static void glsl_vertex_pipe_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void glsl_vertex_pipe_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void glsl_vertex_pipe_vp_disable(const struct wined3d_context *context) {} @@ -12060,8 +12060,7 @@ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe = .vp_states = glsl_vertex_pipe_vp_states, }; -static void glsl_fragment_pipe_apply_draw_state( - const struct wined3d_context *context, const struct wined3d_state *state) +static void glsl_fragment_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index c68dc42b690..0575e72ef43 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -660,7 +660,7 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d } /* Context activation is done by the caller. */ -static void nvrc_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void nvrc_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; @@ -685,7 +685,7 @@ static void nvrc_disable(const struct wined3d_context *context) } /* Context activation is done by the caller. */ -static void nvts_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void nvts_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 70affa1558e..5be17815d3a 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1136,7 +1136,7 @@ const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(vo return &spirv_shader_backend_vk; } -static void spirv_vertex_pipe_vk_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void spirv_vertex_pipe_vk_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } @@ -1219,7 +1219,7 @@ const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void) } static void spirv_fragment_pipe_vk_fp_apply_draw_state( - const struct wined3d_context *context, const struct wined3d_state *state) + struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74c0ea52f3a..ae9e049a054 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2001,7 +2001,7 @@ struct wined3d_state_entry_template struct wined3d_fragment_pipe_ops { - void (*fp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state); + void (*fp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state); void (*fp_disable)(const struct wined3d_context *context); void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps); unsigned int (*get_emul_mask)(const struct wined3d_adapter *adapter); @@ -2029,7 +2029,7 @@ struct wined3d_vertex_caps struct wined3d_vertex_pipe_ops { - void (*vp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state); + void (*vp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state); void (*vp_disable)(const struct wined3d_context *context); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter);

1 0

Zebediah Figura : wined3d/arb: Move fragment program compilation from fragment_prog_arbfp() to arbfp_apply_draw_state().
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: fabf45a9d87a24090b11b158ab06218c562ea814 URL: https://gitlab.winehq.org/wine/wine/-/commit/fabf45a9d87a24090b11b158ab0621… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 22:22:57 2023 -0600 wined3d/arb: Move fragment program compilation from fragment_prog_arbfp() to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 123 +++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9ca6dd8ff46..5025102f15f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4665,6 +4665,8 @@ static void shader_arb_update_graphics_shaders(struct shader_arb_priv *priv, if (ps->load_local_constsF) context->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; + + context->last_was_pshader = TRUE; } else { @@ -5739,23 +5741,6 @@ struct arbfp_ffp_desc GLuint shader; }; -/* Context activation is done by the caller. */ -static void arbfp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) -{ - const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; - - if (!use_ps(state)) - { - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); - } - else - { - gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - } -} - static void arbfp_disable(const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; @@ -6615,67 +6600,65 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } static void fragment_prog_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + if (use_ps(state) && !context->last_was_pshader && context->device->shader_backend == &arb_program_shader_backend) + { + /* Reload pixel shader constants since they collide with the + * fixed function constants. */ + context->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; + } + + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; +} + +static void arbfp_update_shader(struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_device *device = context->device; struct shader_arb_priv *priv = device->fragment_priv; - BOOL use_pshader = use_ps(state); struct ffp_frag_settings settings; const struct arbfp_ffp_desc *desc; unsigned int i; - TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); - - if (!use_pshader) + /* Find or create a shader implementing the fixed function pipeline + * settings, then activate it. */ + wined3d_ffp_get_fs_settings(context, state, &settings, FALSE); + desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); + if (!desc) { - /* Find or create a shader implementing the fixed function pipeline - * settings, then activate it. */ - wined3d_ffp_get_fs_settings(context, state, &settings, FALSE); - desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); - if (!desc) - { - struct arbfp_ffp_desc *new_desc; - - if (!(new_desc = heap_alloc(sizeof(*new_desc)))) - { - ERR("Out of memory\n"); - return; - } + struct arbfp_ffp_desc *new_desc; - new_desc->parent.settings = settings; - new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); - add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); - TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); - desc = new_desc; + if (!(new_desc = heap_alloc(sizeof(*new_desc)))) + { + ERR("Out of memory\n"); + return; } - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)); - checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)"); + new_desc->parent.settings = settings; + new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); + add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); + TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); + desc = new_desc; + } + + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)); + checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)"); - if (device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) + if (device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) + { + /* Reload fixed function constants since they collide with the + * pixel shader constants. */ + for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) { - /* Reload fixed function constants since they collide with the - * pixel shader constants. */ - for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) - { - set_bumpmat_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_BUMPENV_MAT00)); - state_tss_constant_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); - } - state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); - state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); - color_key_arbfp(context, state, STATE_COLOR_KEY); + set_bumpmat_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_BUMPENV_MAT00)); + state_tss_constant_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); } - context->last_was_pshader = FALSE; + state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); + state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); + color_key_arbfp(context, state, STATE_COLOR_KEY); } - else if (!context->last_was_pshader) - { - if (device->shader_backend == &arb_program_shader_backend) - context->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - context->last_was_pshader = TRUE; - } - - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_pshader = FALSE; } /* We can't link the fog states to the fragment state directly since the @@ -6900,6 +6883,24 @@ static void arbfp_free_context_data(struct wined3d_context *context) { } +static void arbfp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) +{ + const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; + + if (use_ps(state)) + { + gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); + return; + } + + gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); + + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) + arbfp_update_shader(context, state); +} + const struct wined3d_fragment_pipe_ops arbfp_fragment_pipeline = { .fp_apply_draw_state = arbfp_apply_draw_state,

1 0