Improve winemenubuilder traces
Francois Gouget
fgouget at codeweavers.com
Mon Jan 2 05:21:32 CST 2006
Changelog:
* programs/winemenubuilder/winemenubuilder.c
Francois Gouget <fgouget at codeweavers.com>
Add some traces to make it easier to debug icon generation problems.
--
Francois Gouget
fgouget at codeweavers.com
-------------- next part --------------
Index: programs/winemenubuilder/winemenubuilder.c
===================================================================
RCS file: /var/cvs/wine/programs/winemenubuilder/winemenubuilder.c,v
retrieving revision 1.38
diff -u -p -r1.38 winemenubuilder.c
--- programs/winemenubuilder/winemenubuilder.c 19 Dec 2005 20:27:12 -0000 1.38
+++ programs/winemenubuilder/winemenubuilder.c 20 Dec 2005 05:45:29 -0000
@@ -162,7 +162,10 @@ static BOOL SaveIconResAsXPM(const BITMA
return FALSE;
if (!(fXPMFile = fopen(szXPMFileName, "w")))
+ {
+ WINE_TRACE("unable to open '%s' for writing: %s\n", szXPMFileName, strerror(errno));
return FALSE;
+ }
i = WideCharToMultiByte(CP_UNIXCP, 0, commentW, -1, NULL, 0, NULL, NULL);
comment = malloc(i);
@@ -361,7 +364,10 @@ static int ExtractFromICO(LPCWSTR szFile
filename = wine_get_unix_file_name(szFileName);
if (!(fICOFile = fopen(filename, "r")))
+ {
+ WINE_TRACE("unable to open '%s' for reading: %s\n", filename, strerror(errno));
goto error1;
+ }
if (fread(&iconDir, sizeof (ICONDIR), 1, fICOFile) != 1)
goto error2;
@@ -487,15 +493,18 @@ static char *extract_icon( LPCWSTR path,
if (!iconsdir)
{
WCHAR path[MAX_PATH];
-
- if (GetTempPathW(MAX_PATH, path)) iconsdir = wine_get_unix_file_name(path);
+ if (GetTempPathW(MAX_PATH, path))
+ iconsdir = wine_get_unix_file_name(path);
+ if (!iconsdir)
+ {
+ WINE_TRACE("no IconsDir\n");
+ return NULL; /* No icon created */
+ }
}
-
- if (!iconsdir)
- return NULL; /* No icon created */
if (!*iconsdir)
{
+ WINE_TRACE("icon generation disabled\n");
HeapFree(GetProcessHeap(), 0, iconsdir);
return NULL; /* No icon created */
}
More information about the wine-patches
mailing list