[PATCH 0/1] MR5304: shell32: Try appending .exe when looking up an App Paths key.

[Zebediah Figura (＠zfigura)]

The standalone test attached to 51957 proves this change correct. Trying to
integrate a test into Wine's test suite is not particularly helpful since
ShellExecute() is asynchronous. We cannot test FindExecutable() either, since
that's not actually supposed to check the App Paths key (Wine is currently
incorrect in this respect).

[PATCH 1/1] shell32: Try appending .exe when looking up an App Paths key.

[Louis Lenders]

From: Louis Lenders

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51957
---
 dlls/shell32/shlexec.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index f0dbb984103..abb519e260d 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -464,7 +464,13 @@ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env)

wcscat(buffer, szName);
     res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buffer, 0, KEY_READ, &hkApp);
-    if (res) goto end;
+    if (res)
+    {
+        wcscat(buffer, L".exe");
+        res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buffer, 0, KEY_READ, &hkApp);
+    }
+    if (res)
+        goto end;

len = MAX_PATH*sizeof(WCHAR);
     res = RegQueryValueW(hkApp, NULL, lpResult, &len);

[PATCH 1/1] shell32: Try appending .exe when looking up an App Paths key.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144049

Your paranoid android.

=== debian11b (64 bit WoW report) ===

d3dx10_34:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C37D0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C3580.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D4920.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3580.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011E3D30.

d3dx10_35:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D1B30.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BD790.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D1820.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011BD790.

d3dx10_36:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001195A50.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A49E0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B6010.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D5680.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001195A50.

d3dx10_37:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011E3A90.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BC970.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E37B0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C3380.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011C3550.

d3dx10_38:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239EA0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A4A80.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E3560.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195800.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011959D0.

d3dx10_39:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239DE0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A4A60.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D5720.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011BB560.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B6050.

d3dx10_40:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011BB900.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B5D20.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011BB6A0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B5D20.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D18E0.

d3dx10_41:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239E40.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011E3500.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E36D0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E36D0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B5D90.

d3dx10_42:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239C00.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 0000000001239DD0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001239DD0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 0000000001195B50.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D3B60.

d3dx10_43:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D5810.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C3AB0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011E35F0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011E35F0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D58D0.

[PATCH 0/1] MR5304: shell32: Try appending .exe when looking up an App Paths key. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.