ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemenubuilder: Use the full path name when extracting an icon. 

Signed-off-by: Sven Baars <sbaars@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sven Baars 2022-03-31 12:54:47 +02:00 committed by Alexandre Julliard
parent 8a17ad4b3f
commit 3cac7e1d0c
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
programs/winemenubuilder/winemenubuilder.c
View File

@ -1146,16 +1146,25 @@ static WCHAR *extract_icon(LPCWSTR icoPathW, int index, const WCHAR *destFilenam
int numEntries; int numEntries;
HRESULT hr; HRESULT hr;
WCHAR *nativeIdentifier = NULL; WCHAR *nativeIdentifier = NULL;
WCHAR fullPathW[MAX_PATH];
DWORD len;
WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_w(destFilename)); WINE_TRACE("path=[%s] index=%d destFilename=[%s]\n", wine_dbgstr_w(icoPathW), index, wine_dbgstr_w(destFilename));
hr = open_icon(icoPathW, index, bWait, &stream, &pIconDirEntries, &numEntries); len = GetFullPathNameW(icoPathW, MAX_PATH, fullPathW, NULL);
if (len == 0 || len > MAX_PATH)
{
WINE_WARN("GetFullPathName failed\n");
return NULL;
}
hr = open_icon(fullPathW, index, bWait, &stream, &pIconDirEntries, &numEntries);
if (FAILED(hr)) if (FAILED(hr))
{ {
WINE_WARN("opening icon %s index %d failed, hr=0x%08lX\n", wine_dbgstr_w(icoPathW), index, hr); WINE_WARN("opening icon %s index %d failed, hr=0x%08lX\n", wine_dbgstr_w(fullPathW), index, hr);
goto end; goto end;
} }
hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, icoPathW, destFilename, &nativeIdentifier); hr = platform_write_icon(stream, pIconDirEntries, numEntries, index, fullPathW, destFilename, &nativeIdentifier);
if (FAILED(hr)) if (FAILED(hr))
WINE_WARN("writing icon failed, error 0x%08lX\n", hr); WINE_WARN("writing icon failed, error 0x%08lX\n", hr);