zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Memory leak in the new printing stuff, plus a couple of comment

Browse Source 
corrections.

[originally from svn r6199]
This commit is contained in:
Simon Tatham
2005-08-22 18:46:38 +00:00
parent b0614e6da8
commit fb6e7f1a8b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
windows.c
View File

@ -367,7 +367,6 @@ static void win_set_pen(frontend *fe, int colour, int thin)
int width = thin ? 0 : fe->linewidth; int width = thin ? 0 : fe->linewidth;
print_get_colour(fe->dr, colour, &hatch, &r, &g, &b); print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
/* FIXME: line thickness here */
if (fe->printcolour) if (fe->printcolour)
pen = CreatePen(PS_SOLID, width, pen = CreatePen(PS_SOLID, width,
RGB(r * 255, g * 255, b * 255)); RGB(r * 255, g * 255, b * 255));
@ -757,12 +756,7 @@ static void win_end_page(void *handle, int number)
frontend *fe = (frontend *)handle; frontend *fe = (frontend *)handle;
assert(fe->drawstatus != DRAWING); assert(fe->drawstatus != DRAWING);
/*
* The MSDN web site sample code doesn't bother to call EndDoc
* if an error occurs half way through printing. I expect doing
* so would cause the erroneous document to actually be
* printed, or something equally undesirable.
*/
if (fe->drawstatus == NOTHING) if (fe->drawstatus == NOTHING)
return; return;
@ -790,6 +784,12 @@ static void win_end_doc(void *handle)
} }
fe->fontstart = 0; fe->fontstart = 0;
/*
* The MSDN web site sample code doesn't bother to call EndDoc
* if an error occurs half way through printing. I expect doing
* so would cause the erroneous document to actually be
* printed, or something equally undesirable.
*/
if (fe->drawstatus == NOTHING) if (fe->drawstatus == NOTHING)
return; return;
@ -885,8 +885,10 @@ void print(frontend *fe)
pd.nFromPage = pd.nToPage = 0xFFFF; pd.nFromPage = pd.nToPage = 0xFFFF;
pd.nMinPage = pd.nMaxPage = 1; pd.nMinPage = pd.nMaxPage = 1;
if (!PrintDlg(&pd)) if (!PrintDlg(&pd)) {
document_free(doc);
return; return;
}
/* /*
* Now pd.hDC is a device context for the printer. * Now pd.hDC is a device context for the printer.
@ -916,6 +918,7 @@ void print(frontend *fe)
fe->drawstatus = NOTHING; fe->drawstatus = NOTHING;
DeleteDC(pd.hDC); DeleteDC(pd.hDC);
document_free(doc);
} }
void deactivate_timer(frontend *fe) void deactivate_timer(frontend *fe)