winemenubuilder: Generate new menus in the right directory.
This commit is contained in:
parent
7f13b126d5
commit
d3bf447f1b
|
@ -906,10 +906,10 @@ static BOOL write_menu_file(const char *unix_link, const char *filename)
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
tempfilename = tempnam(xdg_config_dir, "_wine");
|
tempfilename = heap_printf("%s/wine-menu-XXXXXX", xdg_config_dir);
|
||||||
if (tempfilename)
|
if (tempfilename)
|
||||||
{
|
{
|
||||||
int tempfd = open(tempfilename, O_EXCL | O_CREAT | O_WRONLY, 0666);
|
int tempfd = mkstemps(tempfilename, 0);
|
||||||
if (tempfd >= 0)
|
if (tempfd >= 0)
|
||||||
{
|
{
|
||||||
tempfile = fdopen(tempfd, "w");
|
tempfile = fdopen(tempfd, "w");
|
||||||
|
@ -920,10 +920,10 @@ static BOOL write_menu_file(const char *unix_link, const char *filename)
|
||||||
}
|
}
|
||||||
else if (errno == EEXIST)
|
else if (errno == EEXIST)
|
||||||
{
|
{
|
||||||
free(tempfilename);
|
HeapFree(GetProcessHeap(), 0, tempfilename);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
free(tempfilename);
|
HeapFree(GetProcessHeap(), 0, tempfilename);
|
||||||
}
|
}
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
@ -981,7 +981,7 @@ end:
|
||||||
ret = (rename(tempfilename, menuPath) == 0);
|
ret = (rename(tempfilename, menuPath) == 0);
|
||||||
if (!ret && tempfilename)
|
if (!ret && tempfilename)
|
||||||
remove(tempfilename);
|
remove(tempfilename);
|
||||||
free(tempfilename);
|
HeapFree(GetProcessHeap(), 0, tempfilename);
|
||||||
if (ret)
|
if (ret)
|
||||||
{
|
{
|
||||||
HKEY hkey = open_menus_reg_key();
|
HKEY hkey = open_menus_reg_key();
|
||||||
|
|
Loading…
Reference in New Issue