[PATCH 1/4] shell32/tests: tmpdir shouldn't end with a backslash

[Damjan Jovanovic]

GetTempPathA() returns backslash-terminated paths,
but all the test code appends its own additional backslash,
making a double backslash that breaks path comparisons
in my later patches. Fix this.

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com>
---
 dlls/shell32/tests/shlexec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=67762

Your paranoid android.


=== w1064v1809 (32 bit report) ===

shell32:
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ddeExec expected '[open(C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde)]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''

=== w1064v1809_2scr (32 bit report) ===

shell32:
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ddeExec expected '[open(C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde)]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''

=== w1064v1809_ar (32 bit report) ===

shell32:
shlexec.c:1110: Test failed: ShellExecute(file=""C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\drawback_file.noassoc foo.shlexec"") WaitForSingleObject returned 258
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" WaitForSingleObject(hProcess) returned 258
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" child returned 259
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ddeExec expected '[open(C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde)]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" WaitForSingleObject(hProcess) returned 258
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" child returned 259

=== w1064v1809_ar (testbot log) ===

The task timed out

=== w1064v1809_he (32 bit report) ===

shell32:
shlexec.c:1924: Test failed: ShellExecute(file="shlproto://foo/bar.lnk") WaitForSingleObject returned 258
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" WaitForSingleObject(hProcess) returned 258
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" child returned 259
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ddeExec expected '[open(C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde)]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" WaitForSingleObject(hProcess) returned 258
shlexec.c:2430: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" child returned 259
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''

=== w1064v1809_he (testbot log) ===

The task timed out

=== w1064v1809_ja (32 bit report) ===

shell32:
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ddeExec expected '[open(C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde)]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''

=== w1064v1809_zh_CN (testbot log) ===

The task timed out

=== w1064v1809 (64 bit report) ===

shell32:
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail=""%1"", ddeexec="[open("%1")]", app="shlexec", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="%1", ddeexec="[open(%1)]", app="shlexec", topic="dde" ddeExec expected '[open(C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde)]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec", topic="dde", ifexec="[ifexec("%1")]" ddeExec expected '[ifexec("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", app="shlexec" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''
shlexec.c:2466: Test failed: ShellExecuteEx(mask="0x8540", file="C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde") Assoc class="shlexec.sde", verb="Open", rawcmd="0", cmdtail="", ddeexec="[open("%1")]", topic="dde" ddeExec expected '[open("C:\Users\winetest\AppData\Local\Temp\wtShlexecDir\test file.sde")]', got ''