Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 152728 (XpuWaitForPrintFileChild() needs to call XFlush() before waiting for the consumer child). Patch by Roland.Mainz@informatik.med.uni-giessen.de, r=calvin.liu@sun.com, sr=bz.

Browse Source
This commit is contained in:
peterv%netscape.com 2002-08-30 12:29:38 +00:00
parent d93f00d5ec
commit 062cec66f5
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/src/xprint/xprintutil_printtofile.c
View File

@ -179,6 +179,7 @@ typedef struct
#endif
char *displayname;
Display *pdpy;
Display *parent_pdpy;
XPContext pcontext;
const char *file_name;
FILE *file;
@ -195,6 +196,7 @@ void *XpuPrintToFile( Display *pdpy, XPContext pcontext, const char *filename )
if( (mpfd = malloc(sizeof(MyPrintFileData))) == NULL )
return(NULL);
mpfd->parent_pdpy = pdpy;
mpfd->displayname = XDisplayString(pdpy);
mpfd->pdpy = NULL;
mpfd->pcontext = pcontext;
@ -237,6 +239,10 @@ XPGetDocStatus XpuWaitForPrintFileChild( void *handle )
MyPrintFileData *mpfd = (MyPrintFileData *)handle;
void *res;
XPGetDocStatus status;
/* Flush data a last time to make sure we send all data to Xprt and that
* the Xlib internal hooks have called a last time */
XFlush(mpfd->parent_pdpy);
#ifdef XPU_USE_NSPR
if( PR_JoinThread(mpfd->prthread) != PR_SUCCESS )
@ -279,6 +285,7 @@ typedef struct
int pipe[2]; /* child-->parent communication pipe */
const char *displayname;
Display *pdpy;
Display *parent_pdpy;
XPContext pcontext;
const char *file_name;
FILE *file;
@ -304,6 +311,7 @@ void *XpuPrintToFile( Display *pdpy, XPContext pcontext, const char *filename )
return(NULL);
}
mpfd->parent_pdpy = pdpy;
mpfd->displayname = XDisplayString(pdpy);
mpfd->pcontext = pcontext;
mpfd->file_name = filename;
@ -357,6 +365,10 @@ XPGetDocStatus XpuWaitForPrintFileChild( void *handle )
MyPrintFileData *mpfd = (MyPrintFileData *)handle;
int res;
XPGetDocStatus status = XPGetDocError; /* used when read() from pipe fails */
/* Flush data a last time to make sure we send all data to Xprt and that
* the Xlib internal hooks have called a last time */
XFlush(mpfd->parent_pdpy);
if( XPU_TRACE(waitpid(mpfd->pid, &res, 0)) == -1 )
perror("XpuWaitForPrintFileChild: waitpid failure");