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

[PATCH 2/3] shell32: Handle file extensions in SHELL_FindExecutableByVerb().

by Paul Gofman

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlexec.c | 12 +++++++ dlls/shell32/tests/shlexec.c | 61 ++++++++++++++++++++++++++++++------ 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index fbf39e99fc6..da2b5fdc2b0 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -473,6 +473,18 @@ static UINT SHELL_FindExecutableByVerb(LPCWSTR lpVerb, LPWSTR key, LPWSTR classn HKEY hkeyClass; WCHAR verb[MAX_PATH]; + if (*classname == '.') + { + /* Extension, default key value holds class name. Extension may also have + * empty class name and shell\verb\command subkey. */ + WCHAR class[MAX_PATH]; + LONG len; + + len = sizeof(class); + if (!RegQueryValueW(HKEY_CLASSES_ROOT, classname, class, &len) && *class) + wcscpy(classname, class); + } + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, classname, 0, 0x02000000, &hkeyClass)) return SE_ERR_NOASSOC; if (!HCR_GetDefaultVerbW(hkeyClass, lpVerb, verb, ARRAY_SIZE(verb))) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 50de1eeb750..4af4d735b68 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -708,23 +708,31 @@ static BOOL create_test_class(const char* class, BOOL protocol) return TRUE; } -static BOOL create_test_association(const char* extension) +static BOOL create_test_association_key(const char* extension, const char *class) { HKEY hkey; - char class[MAX_PATH]; LONG rc; - sprintf(class, "shlexec%s", extension); - rc=RegCreateKeyExA(HKEY_CLASSES_ROOT, extension, 0, NULL, 0, KEY_SET_VALUE, - NULL, &hkey, NULL); + rc = RegCreateKeyExA(HKEY_CLASSES_ROOT, extension, 0, NULL, 0, KEY_SET_VALUE, + NULL, &hkey, NULL); ok(rc == ERROR_SUCCESS || rc == ERROR_ACCESS_DENIED, "could not create association %s (rc=%ld)\n", class, rc); if (rc != ERROR_SUCCESS) return FALSE; - rc=RegSetValueExA(hkey, NULL, 0, REG_SZ, (LPBYTE) class, strlen(class)+1); - ok(rc==ERROR_SUCCESS, "RegSetValueEx '%s' failed, expected ERROR_SUCCESS, got %ld\n", class, rc); + rc = RegSetValueExA(hkey, NULL, 0, REG_SZ, (LPBYTE) class, strlen(class)+1); + ok(rc == ERROR_SUCCESS, "RegSetValueEx '%s' failed, expected ERROR_SUCCESS, got %ld\n", class, rc); CloseHandle(hkey); + return TRUE; +} + +static BOOL create_test_association(const char* extension) +{ + char class[MAX_PATH]; + + sprintf(class, "shlexec%s", extension); + if (!create_test_association_key(extension, class)) + return FALSE; return create_test_class(class, FALSE); } @@ -2216,6 +2224,39 @@ static void test_exes(void) okChildInt("argcA", 4); okChildString("argvA3", "Exec"); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, + NULL, ".exe"); + okShell(rc > 32, "returned %Iu\n", rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + + if (create_test_association_key(".qqqq", "exefile")) + { + rc = shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, + NULL, ".qqqq"); + okShell(rc > 32, "returned %Iu\n", rc); + okChildInt("argcA", 4); + okChildString("argvA3", "Exec"); + delete_test_association(".qqqq"); + } + else + { + skip("Could not create associtation.\n"); + } + + if (create_test_association_key("qqqq", "exefile")) + { + rc = shell_execute_ex(SEE_MASK_NOZONECHECKS | SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, params, + NULL, "qqqq"); + okShell(rc < 32, "returned %Iu\n", rc); + todo_wine okShell(rc == SE_ERR_NOASSOC, "returned %Iu\n", rc); + delete_test_association("qqqq"); + } + else + { + skip("Could not create associtation.\n"); + } + if (! skip_noassoc_tests) { sprintf(filename, "%s\\test file.noassoc", tmpdir); @@ -2252,10 +2293,10 @@ static void test_exes(void) /* FIXME SEE_MASK_FLAG_NO_UI is only needed due to Wine's bug */ rc = shell_execute_ex(SEE_MASK_CLASSNAME | SEE_MASK_FLAG_NO_UI, NULL, argv0, NULL, NULL, ".shlexec"); - todo_wine okShell(rc > 32, "returned %Iu\n", rc); + okShell(rc > 32, "returned %Iu\n", rc); okChildInt("argcA", 5); - todo_wine okChildString("argvA3", "Open"); - todo_wine okChildPath("argvA4", argv0); + okChildString("argvA3", "Open"); + okChildPath("argvA4", argv0); } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/353

June 30, 2022

[PATCH 1/3] shell32: Don't quote args substituted through wildcard in SHELL_ArgifyW().

by Paul Gofman

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlexec.c | 4 ---- dlls/shell32/tests/shlexec.c | 13 +++++++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 8c7e3cf0808..fbf39e99fc6 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -110,8 +110,6 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp if (*fmt == '*') { used++; - if (used < len) - *res++ = '"'; while(*args) { used++; @@ -121,8 +119,6 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp args++; } used++; - if (used < len) - *res++ = '"'; } else { diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 50c2e84578b..50de1eeb750 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1418,11 +1418,11 @@ typedef struct static const argify_tests_t argify_tests[] = { - /* Start with three simple parameters. Notice that one can reorder and - * duplicate the parameters. Also notice how %* take the raw input - * parameters string, including the trailing spaces, no matter what - * arguments have already been used. - */ + {"ParamsS", "p2 p3 \"p4 ", FALSE, " p2 p3 \"p4 "}, + + /* Notice that one can reorder and duplicate the parameters. + * Also notice how %* take the raw input parameters string, including + * the trailing spaces, no matter what arguments have already been used. */ {"Params232S", "p2 p3 p4 ", TRUE, " p2 p3 \"p2\" \"p2 p3 p4 \""}, @@ -1567,6 +1567,7 @@ static void test_argify(void) return; } + create_test_verb("shlexec.shlexec", "ParamsS", 0, "ParamsS %*"); create_test_verb("shlexec.shlexec", "Params232S", 0, "Params232S %2 %3 \"%2\" \"%*\""); create_test_verb("shlexec.shlexec", "Params23456", 0, "Params23456 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\""); create_test_verb("shlexec.shlexec", "Params23456789", 0, "Params23456789 \"%2\" \"%3\" \"%4\" \"%5\" \"%6\" \"%7\" \"%8\" \"%9\""); @@ -1594,7 +1595,7 @@ static void test_argify(void) if (!cmd) cmd = "(null)"; todo_wine_if(test->todo) okShell(!strcmp(cmd, test->cmd) || broken(!strcmp(cmd, bad)), - "expected '%s', got '%s'\n", cmd, test->cmd); + "expected '%s', got '%s'\n", test->cmd, cmd); test++; } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/353

June 30, 2022

[PATCH 0/3] MR353: shell32 improvements (fix $* wrongly quoted, allow file extensions as classname and verb "runas" to work)

by Paul Gofman (＠gofman)

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

June 30, 2022

Re: [PATCH v4 5/7] comctl32/listview: Send LVN_ODSTATECHANGED notification.

by Angelo Haller

On 30/06/2022 04.41, Zhiyi Zhang wrote: > > On 6/29/22 05:16, Angelo Haller wrote: >> From: Angelo Haller <angelo(a)szanni.org> >> >> Send LVN_ODSTATECHANGED notification on selection change for >> listviews when LVS_OWNERDATA is set. >> >> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52534 >> Signed-off-by: Angelo Haller <angelo(a)szanni.org> >> >> --- >> v3: Merge nFirst & nLast definition into a single line. >> Add function call guard due to preceding patch changes. >> --- >> dlls/comctl32/listview.c | 16 +++++++++++----- >> dlls/comctl32/tests/listview.c | 6 +++--- >> 2 files changed, 14 insertions(+), 8 deletions(-) >> >> diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c >> index 5ba1924cbd7..0243d9a84ce 100644 >> --- a/dlls/comctl32/listview.c >> +++ b/dlls/comctl32/listview.c >> @@ -3604,6 +3604,7 @@ static BOOL LISTVIEW_AddGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) >> */ >> static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) >> { >> + INT nFirst = -1, nLast = -1; >> RANGES selection; >> DWORD old_mask; >> LVITEMW item; >> @@ -3655,21 +3656,26 @@ static void LISTVIEW_SetGroupSelection(LISTVIEW_INFO *infoPtr, INT nItem) >> iterator_destroy(&i); >> } >> >> - /* disable per item notifications on LVS_OWNERDATA style >> - FIXME: single LVN_ODSTATECHANGED should be used */ >> + /* Disable per item notifications on LVS_OWNERDATA style */ >> old_mask = infoPtr->notify_mask & NOTIFY_MASK_ITEM_CHANGE; >> if (infoPtr->dwStyle & LVS_OWNERDATA) >> infoPtr->notify_mask &= ~NOTIFY_MASK_ITEM_CHANGE; >> >> LISTVIEW_DeselectAllSkipItems(infoPtr, selection); >> >> - >> iterator_rangesitems(&i, selection); >> - while(iterator_next(&i)) >> - LISTVIEW_SetItemState(infoPtr, i.nItem, &item); >> + while(iterator_next(&i)) { >> + if (nFirst == -1) >> + nFirst = i.nItem; >> + nLast = i.nItem; >> + LISTVIEW_SetItemState(infoPtr, i.nItem, &item); >> + } > Hi Angelo, > > This looks like a separate change than what you describe in the subject. Please put it in a separate patch. Hi Zhiyi, thanks for the review. I believe the patch does exactly what is described in the subject. Maybe I could add another line describing in detail what is being done, as it does not seem entirely clear? Maybe something like: `Compute the range by determining the first and last item of the selection, then send one LVN_ODSTATECHANGED notification.` ? The above code changes are for determining what the first and last items are. These are needed for making the call to `LISTVIEW_SetOwnerDataState()`, which is done in the code below. No other function calls are introduced in the patch. Moving the computation of nFirst and nLast to a different patch would trigger a "set but not used" warning by the compiler. > Other than the above. There are some typos in 1/7 but I took care of it. I made some changes to the patch series overall > and attached them in the mail attachments. Mostly some style fix. You can make your changes on top of them. Thanks, I guess I must have missed those even with my spell checker on. > Then there are still some message sequences in test_ownerdata_multiselect() that don't pass. It looks like one issue for > the rest of the todo_wines and they're probably existing failures. But could you fix them as well? Yes, these are existing failures. I believe these should be addressed in a different patch series though. Windows seems to send some very strange message sequences on ownerdata lists. The current behavior in wine is correct for non ownerdata lists. I believe more rigorous testing for non ownerdata listviews would be needed to not introduce regressions. All the signals are being sent, it is just that the current sequence does not match Windows fully. I am happy to look into that when I have some extra time, but as previously stated, this will most likely be a similarly sized patch series to this one. > Thanks for your work. It's much better than the last revision. Should I resubmit the patches you attached to the mailing list? Leaving your Signed off intact as long as I do not change the patches? Best, Angelo > > Best Regards, > Zhiyi > > >> /* this will also destroy the selection */ >> iterator_destroy(&i); >> >> + if (infoPtr->dwStyle & LVS_OWNERDATA) >> + LISTVIEW_SetOwnerDataState(infoPtr, nFirst, nLast, &item); >> + >> infoPtr->notify_mask |= old_mask; >> LISTVIEW_SetItemFocus(infoPtr, nItem); >> } >> diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c >> index 7243a1858cd..d8a27ea18f4 100644 >> --- a/dlls/comctl32/tests/listview.c >> +++ b/dlls/comctl32/tests/listview.c >> @@ -3605,7 +3605,7 @@ static void test_ownerdata_multiselect(void) >> expect(0, res); >> ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, >> ownerdata_multiselect_select_0_to_1_odstatechanged_seq, >> - "ownerdata multiselect: select multiple via SHIFT+DOWN", TRUE); >> + "ownerdata multiselect: select multiple via SHIFT+DOWN", FALSE); >> res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); >> expect(0, res); >> res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); >> @@ -3633,7 +3633,7 @@ static void test_ownerdata_multiselect(void) >> expect(0, res); >> ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, >> ownerdata_multiselect_select_0_to_1_odstatechanged_seq, >> - "ownerdata multiselect: select multiple via SHIFT+CONTROL+DOWN", TRUE); >> + "ownerdata multiselect: select multiple via SHIFT+CONTROL+DOWN", FALSE); >> res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); >> expect(0, res); >> res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); >> @@ -3676,7 +3676,7 @@ static void test_ownerdata_multiselect(void) >> expect(0, res); >> ok_sequence(sequences, PARENT_ODSTATECHANGED_SEQ_INDEX, >> ownerdata_multiselect_select_0_to_2_odstatechanged_seq, >> - "ownerdata multiselect: select multiple after skip via SHIFT+CONTROL+DOWN", TRUE); >> + "ownerdata multiselect: select multiple after skip via SHIFT+CONTROL+DOWN", FALSE); >> res = SendMessageA(hwnd, WM_KEYUP, VK_DOWN, 0); >> expect(0, res); >> res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0);

June 30, 2022

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

by eric pouech (＠epo)

I tested some more on my side, and it's not what I expected :-( https://testbot.winehq.org/JobDetails.pl?Key=117992 these tests need to be extended (cannot tell which one of the two new tests display nothing) (likely the contents1 displays nothing and for contents2 printf doesn't print the ctrl-z character) anyway, I tried also to run this simple batch on windows: `"echo\necho\0\echo"` and it hangs after printing the first 'echo on' (so \0 isn't a generic EOF marker) so changing WCMD_fgets when running into \0 to return EOF isn't likely the right solution (at least as a generic solution) (and I still don't like in case of "abc\0" not returning the "abc" characters) more tests are needed :-( -- https://gitlab.winehq.org/wine/wine/-/merge_requests/352#note_3065

June 30, 2022

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

by eric pouech (＠epo)

Hi Arek I'm not concerned about droping all characters after the NULL (1) I'm concerned by what's before the NUL character! and basically what should be an marker for end of file if instead of writing "a b c\n\0f .." into your test file, you just write "a b c\0" (removing the CR at the end of "a b c", I believe that "a b c" should be returned by WCMD_fgets and subsequent WCMD_fgets should return NULL to mark EOF. (so from a cursory look in pseudo code ``` if (*p == '\0' && p > bufA) break; /* reposition at '\0' to reread the NULL in next call) */ if (*p == '\0' && p == bufA) return NULL; ``` ) (1): if you have time, it would be interesting to see what happens if instead of \0, ^Z (0x1A) is used (it's the end of text file marker in the old DOS days). I wouldn't be surprised if it stops also reading the file. (and maybe at some point we'd better use read/write from msvcrt which should handle all this DOS stuff directly, but that's likely a too large change for what you're trying to solve) since WCMD_fgets is used by most of the input methods, I want to be sure that this doens't break other things -- https://gitlab.winehq.org/wine/wine/-/merge_requests/352#note_3064

June 30, 2022

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

by Arek Hiler (＠ivyl)

Hi. Thanks for the review. Either I don't fully understand your comment or it doesn't work the way you describe. According to my testing the line containing NUL and every line after it seems to be fully ignored by `FOR /F`. If we would return characters up to NUL that would not be the case. Can you elaborate a bit more? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/352#note_3063

June 30, 2022

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

by eric pouech (＠epo)

the changes to fgets don't look fully right you should return the characters in bufA until the NUL character (as done for \n) if there are some, and NULL in case there are none... (it works in your test case as the string 'a b c' is terminated by the new line) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/352#note_3062

June 30, 2022

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

by Andrew Eikum (＠aeikum)

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

June 30, 2022

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

by Claire Girka

From: Claire Girka <claire(a)sitedethib.com> Some games expect the DualSense audio device (used for haptic feedback and controller speaker) to be called “Wireless Controller”. --- dlls/mmdevapi/devenum.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 053275cac45..bfeb3f3ecd8 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -255,6 +255,30 @@ static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPE return hr; } +struct product_name_overrides +{ + const WCHAR *id; + const WCHAR *product; +}; + +static const struct product_name_overrides product_name_overrides[] = +{ + /* Sony controllers */ + { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, +}; + +static const WCHAR *find_product_name_override(const WCHAR *device_id) +{ + const WCHAR *match_id = wcschr( device_id, '\\' ) + 1; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(product_name_overrides); ++i) + if (!wcsnicmp( product_name_overrides[i].id, match_id, 17 )) + return product_name_overrides[i].product; + + return NULL; +} + /* Creates or updates the state of a device * If GUID is null, a random guid will be assigned * and the device will be created @@ -321,6 +345,21 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.vt = VT_LPWSTR; pv.pwszVal = name; + + if (SUCCEEDED(set_driver_prop_value(id, flow, &devicepath_key))) { + PROPVARIANT pv2; + + PropVariantInit(&pv2); + + if (SUCCEEDED(MMDevice_GetPropValue(id, flow, &devicepath_key, &pv2)) && pv2.vt == VT_LPWSTR) { + const WCHAR *override; + if ((override = find_product_name_override(pv2.pwszVal)) != NULL) + pv.pwszVal = (WCHAR*) override; + } + + PropVariantClear(&pv2); + } + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); @@ -328,8 +367,6 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); - set_driver_prop_value(id, flow, &devicepath_key); - if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) { pv.vt = VT_UI4; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/338

June 30, 2022