system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

gdi.exe16: Wait for and reap print spool child process.

Browse source
This commit is contained in:
Ken Thomases 2011-11-30 16:49:06 -06:00 committed by Alexandre Julliard
parent 5bac5ee26e
commit 6c8929f83f
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
dlls/gdi.exe16/printdrv.c
View file

@ -34,6 +34,9 @@
#ifdef HAVE_IO_H #ifdef HAVE_IO_H
# include <io.h> # include <io.h>
#endif #endif
#ifdef HAVE_SYS_WAIT_H
# include <sys/wait.h>
#endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
# include <unistd.h> # include <unistd.h>
#endif #endif
@ -205,6 +208,7 @@ typedef struct PRINTJOB
HANDLE16 hHandle; HANDLE16 hHandle;
int nIndex; int nIndex;
int fd; int fd;
pid_t pid;
} PRINTJOB, *PPRINTJOB; } PRINTJOB, *PPRINTJOB;
#define MAX_PRINT_JOBS 1 #define MAX_PRINT_JOBS 1
@ -218,7 +222,7 @@ static PPRINTJOB FindPrintJobFromHandle(HANDLE16 hHandle)
return gPrintJobsTable[0]; return gPrintJobsTable[0];
} }
static int CreateSpoolFile(LPCSTR pszOutput) static int CreateSpoolFile(LPCSTR pszOutput, pid_t *out_pid)
{ {
int fd=-1; int fd=-1;
char psCmd[1024]; char psCmd[1024];
@ -227,9 +231,11 @@ static int CreateSpoolFile(LPCSTR pszOutput)
/* TTD convert the 'output device' into a spool file name */ /* TTD convert the 'output device' into a spool file name */
if (pszOutput == NULL || *pszOutput == '\0') if (pszOutput == NULL || *pszOutput == '\0' || out_pid == NULL)
return -1; return -1;
*out_pid = -1;
psCmd[0] = 0; psCmd[0] = 0;
/* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */ /* @@ Wine registry key: HKCU\Software\Wine\Printing\Spooler */
if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\Spooler", &hkey)) if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\Spooler", &hkey))
@ -263,7 +269,7 @@ static int CreateSpoolFile(LPCSTR pszOutput)
ERR("pipe() failed!\n"); ERR("pipe() failed!\n");
return -1; return -1;
} }
if (fork() == 0) if ((*out_pid = fork()) == 0)
{ {
psCmdP++; psCmdP++;
@ -317,12 +323,22 @@ static int FreePrintJob(HANDLE16 hJob)
pPrintJob = FindPrintJobFromHandle(hJob); pPrintJob = FindPrintJobFromHandle(hJob);
if (pPrintJob != NULL) if (pPrintJob != NULL)
{ {
nRet = SP_OK;
gPrintJobsTable[pPrintJob->nIndex] = NULL; gPrintJobsTable[pPrintJob->nIndex] = NULL;
HeapFree(GetProcessHeap(), 0, pPrintJob->pszOutput); HeapFree(GetProcessHeap(), 0, pPrintJob->pszOutput);
HeapFree(GetProcessHeap(), 0, pPrintJob->pszTitle); HeapFree(GetProcessHeap(), 0, pPrintJob->pszTitle);
if (pPrintJob->fd >= 0) close(pPrintJob->fd); if (pPrintJob->fd >= 0) close(pPrintJob->fd);
if (pPrintJob->pid > 0)
{
pid_t wret;
int status;
do {
wret = waitpid(pPrintJob->pid, &status, 0);
} while (wret < 0 && errno == EINTR);
if (wret < 0 || !WIFEXITED(status) || WEXITSTATUS(status))
nRet = SP_ERROR;
}
HeapFree(GetProcessHeap(), 0, pPrintJob); HeapFree(GetProcessHeap(), 0, pPrintJob);
nRet = SP_OK;
} }
return nRet; return nRet;
} }
@ -342,9 +358,10 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC)
if (pPrintJob == NULL) if (pPrintJob == NULL)
{ {
int fd; int fd;
pid_t pid;
/* Try and create a spool file */ /* Try and create a spool file */
fd = CreateSpoolFile(lpOutput); fd = CreateSpoolFile(lpOutput, &pid);
if (fd >= 0) if (fd >= 0)
{ {
pPrintJob = HeapAlloc(GetProcessHeap(), 0, sizeof(PRINTJOB)); pPrintJob = HeapAlloc(GetProcessHeap(), 0, sizeof(PRINTJOB));
@ -364,6 +381,7 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC)
} }
pPrintJob->hDC = hDC; pPrintJob->hDC = hDC;
pPrintJob->fd = fd; pPrintJob->fd = fd;
pPrintJob->pid = pid;
pPrintJob->nIndex = 0; pPrintJob->nIndex = 0;
pPrintJob->hHandle = hHandle; pPrintJob->hHandle = hHandle;
gPrintJobsTable[pPrintJob->nIndex] = pPrintJob; gPrintJobsTable[pPrintJob->nIndex] = pPrintJob;