June 2022 - Wine-Devel - list.winehq.org

[PATCH v3 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Claire (＠ClearlyClaire)

Some games expect the DualSense audio device (used for haptic feedback and controller speaker) to be called “Wireless Controller”. This is the case of Final Fantasy XIV Online and Final Fantasy VII Remake Intergrade, and possibly other games as well. Together with !337, this is enough for all DualSense features to properly work with those games (provided the controller is plugged in before the game is started). Note that this is not sufficient for many other games which have more elaborate logic for finding the DualSense audio output. -- v3: mmdevapi: Override product strings for DualSense controller audio devices https://gitlab.winehq.org/wine/wine/-/merge_requests/338

June 30, 2022

Re: [PATCH v3 0/2] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod - approved

by Andrew Eikum (＠aeikum)

This merge request was approved by Andrew Eikum. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337

June 30, 2022

Re: [PATCH v3 0/2] MR337: winepulse: Return device-specific values for GetMixFormat and GetDevicePeriod

by Andrew Eikum (＠aeikum)

This series looks fine to me. @huw should review it, too. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/337#note_3056

June 30, 2022

[PATCH 1/1] cmd: Don't loop infinitely on NUL.

by Arkadiusz Hiler

From: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- programs/cmd/batch.c | 4 ++++ programs/cmd/tests/batch.c | 22 ++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 4 files changed, 31 insertions(+) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 9a262c5fec5..5665eb8be53 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -272,6 +272,10 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) for (p = bufA; p < (bufA + charsRead); p = CharNextExA(cp, p, 0)) { if (*p == '\n' || *p == '\r') break; + if (*p == '\0') { + heap_free(bufA); + return NULL; + } } /* Sets file pointer to the start of the next line, if any */ diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 3846693ef2e..ade6587be81 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -455,6 +455,24 @@ static int cmd_available(void) return FALSE; } +void create_nul_test_file(void) +{ + HANDLE file; + DWORD size; + BOOL bres; + char contents[] = "a b c\nd e\0f\ng h i"; + + file = CreateFileA("nul_test_file", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + if(file == INVALID_HANDLE_VALUE) + return; + + bres = WriteFile(file, contents, ARRAYSIZE(contents), &size, NULL); + ok(bres, "Could not write to file: %lu\n", GetLastError()); + CloseHandle(file); +} + START_TEST(batch) { int argc; @@ -479,9 +497,13 @@ START_TEST(batch) } shortpath_len = GetShortPathNameA(path, shortpath, ARRAY_SIZE(shortpath)); + create_nul_test_file(); + argc = winetest_get_mainargs(&argv); if(argc > 2) run_from_file(argv[2]); else EnumResourceNamesA(NULL, "TESTCMD", test_enum_proc, 0); + + DeleteFileA("nul_test_file"); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3f410e55166..3829be50f1a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1957,6 +1957,9 @@ FOR /F "delims=. tokens=1*" %%A IN (testfile) DO @echo 5:%%A,%%B FOR /F "delims=. tokens=2*" %%A IN (testfile) DO @echo 6:%%A,%%B FOR /F "delims=. tokens=3*" %%A IN (testfile) DO @echo 7:%%A,%%B del testfile +rem file contains NUL, created by the .exe +for /f %%A in (nul_test_file) DO echo %%A +for /f "tokens=*" %%A in (nul_test_file) DO echo %%A echo ------------ Testing del ------------ echo abc > file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8b6e0914112..437ded18000 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1315,6 +1315,8 @@ h=%h i=b j=c k= l= m=%m n=%n o=%o(a)or_broken@h=%h i=b j=c k= l= m= n=%n o=%o 4:3.14,%B 5:3,14 6:14, +a +a b c ------------ Testing del ------------ deleting 'file' errorlevel is 0, good -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/352

June 30, 2022

[PATCH 0/1] MR352: cmd: Don't loop infinitely on NUL.

by Arek Hiler (＠ivyl)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/352

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

On Thu Jun 30 13:59:16 2022 +0000, Claire wrote: > That moves the warning to the next line. Would an explicit cast be ok? Oh, because `pwszVal` is non-const. Sure, I think a cast is fine. We never write to it or try to free it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3052

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Claire (＠ClearlyClaire)

On Thu Jun 30 13:56:10 2022 +0000, Andrew Eikum wrote: > Just change the type of `override` to `const WCHAR *`, I think. That moves the warning to the next line. Would an explicit cast be ok? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3051

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Andrew Eikum (＠aeikum)

On Thu Jun 30 13:56:10 2022 +0000, Claire wrote: > My C is a bit rusty, so I'm unsure what the best way to fix that is. > Should the string be cloned into a mutable one? Functionally, this > shouldn't be necessary. Just change the type of `override` to `const WCHAR *`, I think. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3050

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Claire (＠ClearlyClaire)

My C is a bit rusty, so I'm unsure what the best way to fix that is. Should the string be cloned into a mutable one? Functionally, this shouldn't be necessary. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3049

June 30, 2022

Re: [PATCH v2 0/1] MR338: mmdevapi: Override product strings for DualSense controller audio devices

by Claire (＠ClearlyClaire)

On Thu Jun 30 13:27:07 2022 +0000, Andrew Eikum wrote: > This isn't a blocker, but it feels a little silly to get the value in > `set_driver_prop_value` and then get it again here. You could change the > `set_driver_prop_value` API to (optionally?) pass back the value it gets > to the caller, who would then free it. Hm no matter what I try it feels a bit awkward. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/338#note_3048

June 30, 2022