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

Repaired extraction of icons when config file is missing.

This commit is contained in:
Sven Paschukat 2005-06-30 10:17:57 +00:00 committed by Alexandre Julliard
parent 5cee3988bf
commit b3415b0311
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
programs/winemenubuilder/winemenubuilder.c
View File

@ -457,10 +457,7 @@ static char *extract_icon( LPCWSTR path, int index)
iconsdirW = HeapAlloc(GetProcessHeap(), 0, size); iconsdirW = HeapAlloc(GetProcessHeap(), 0, size);
RegQueryValueExW(hkey, IconsDirW, 0, NULL, (LPBYTE)iconsdirW, &size); RegQueryValueExW(hkey, IconsDirW, 0, NULL, (LPBYTE)iconsdirW, &size);
s = wine_get_unix_file_name(iconsdirW); if (!(iconsdir = wine_get_unix_file_name(iconsdirW)))
if (s)
iconsdir = s;
else
{ {
int n = WideCharToMultiByte(CP_UNIXCP, 0, iconsdirW, -1, NULL, 0, NULL, NULL); int n = WideCharToMultiByte(CP_UNIXCP, 0, iconsdirW, -1, NULL, 0, NULL, NULL);
iconsdir = HeapAlloc(GetProcessHeap(), 0, n); iconsdir = HeapAlloc(GetProcessHeap(), 0, n);
@ -468,19 +465,16 @@ static char *extract_icon( LPCWSTR path, int index)
} }
HeapFree(GetProcessHeap(), 0, iconsdirW); HeapFree(GetProcessHeap(), 0, iconsdirW);
} }
else RegCloseKey( hkey );
}
if (!iconsdir)
{ {
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
if (GetTempPathW(MAX_PATH, path)) if (GetTempPathW(MAX_PATH, path)) iconsdir = wine_get_unix_file_name(path);
{
s = wine_get_unix_file_name(path);
if (s)
iconsdir = s;
}
}
RegCloseKey( hkey );
} }
if (!iconsdir) if (!iconsdir)
return NULL; /* No icon created */ return NULL; /* No icon created */