[SHELL32] Fix unneeded error Popup with Git for Windows. (#1854)

* Fix unnecessary error popup when installing Git for Windows.
* Add reasons for return value of 42.
This commit is contained in:
Doug Lyons 2020-02-23 10:47:48 -06:00 committed by GitHub
parent b749501976
commit 4e721f780e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1080,6 +1080,22 @@ static unsigned dde_connect(const WCHAR* key, const WCHAR* start, WCHAR* ddeexec
TRACE("Couldn't launch\n");
goto error;
}
/* if ddeexec is NULL, then we just need to exit here */
if (ddeexec == NULL)
{
TRACE("Exiting because ddeexec is NULL. ret=42.\n");
/* See https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shellexecutew */
/* for reason why we use 42 here and also "Shell32_apitest ShellExecuteW" regression test */
return 42;
}
/* if ddeexec is 'empty string', then we just need to exit here */
if (wcscmp(ddeexec, L"") == 0)
{
TRACE("Exiting because ddeexec is 'empty string'. ret=42.\n");
/* See https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shellexecutew */
/* for reason why we use 42 here and also "Shell32_apitest ShellExecuteW" regression test */
return 42;
}
hConv = DdeConnect(ddeInst, hszApp, hszTopic, NULL);
if (!hConv)
{