Skip to content

W
wine-winehq
Commit 5819b90f authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

winemenubuilder: Expand environment variable references in the shortcut's…

winemenubuilder: Expand environment variable references in the shortcut's WorkDir, Description and IconPath fields.
parent e7e99800
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
programs/winemenubuilder/winemenubuilder.c
View file @ 5819b90f
...@@ -866,6 +866,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) ...@@ -866,6 +866,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait )
'\\','s','t','a','r','t','.','e','x','e',0}; '\\','s','t','a','r','t','.','e','x','e',0};
char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL;
char *escaped_path = NULL, *escaped_args = NULL, *escaped_description = NULL; char *escaped_path = NULL, *escaped_args = NULL, *escaped_description = NULL;
WCHAR szTmp[INFOTIPSIZE];
WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH];
WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH]; WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH];
int iIconId = 0, r = -1; int iIconId = 0, r = -1;
...@@ -890,20 +891,23 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) ...@@ -890,20 +891,23 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait )
} }
WINE_TRACE("Link : %s\n", wine_dbgstr_a(link_name)); WINE_TRACE("Link : %s\n", wine_dbgstr_a(link_name));
szWorkDir[0] = 0; szTmp[0] = 0;
IShellLinkW_GetWorkingDirectory( sl, szWorkDir, MAX_PATH ); IShellLinkW_GetWorkingDirectory( sl, szTmp, MAX_PATH );
ExpandEnvironmentStringsW(szTmp, szWorkDir, MAX_PATH);
WINE_TRACE("workdir : %s\n", wine_dbgstr_w(szWorkDir)); WINE_TRACE("workdir : %s\n", wine_dbgstr_w(szWorkDir));
szDescription[0] = 0; szTmp[0] = 0;
IShellLinkW_GetDescription( sl, szDescription, INFOTIPSIZE ); IShellLinkW_GetDescription( sl, szTmp, INFOTIPSIZE );
ExpandEnvironmentStringsW(szTmp, szDescription, INFOTIPSIZE);
WINE_TRACE("description: %s\n", wine_dbgstr_w(szDescription)); WINE_TRACE("description: %s\n", wine_dbgstr_w(szDescription));
get_cmdline( sl, szPath, MAX_PATH, szArgs, INFOTIPSIZE); get_cmdline( sl, szPath, MAX_PATH, szArgs, INFOTIPSIZE);
WINE_TRACE("path : %s\n", wine_dbgstr_w(szPath)); WINE_TRACE("path : %s\n", wine_dbgstr_w(szPath));
WINE_TRACE("args : %s\n", wine_dbgstr_w(szArgs)); WINE_TRACE("args : %s\n", wine_dbgstr_w(szArgs));
szIconPath[0] = 0; szTmp[0] = 0;
IShellLinkW_GetIconLocation( sl, szIconPath, MAX_PATH, &iIconId ); IShellLinkW_GetIconLocation( sl, szTmp, MAX_PATH, &iIconId );
ExpandEnvironmentStringsW(szTmp, szIconPath, MAX_PATH);
WINE_TRACE("icon file : %s\n", wine_dbgstr_w(szIconPath) ); WINE_TRACE("icon file : %s\n", wine_dbgstr_w(szIconPath) );
if( !szPath[0] ) if( !szPath[0] )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment