ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winspool.drv: If the call to cupsPrintFile fails, print the cups error message. 

Signed-off-by: Jeremy White <jwhite@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jeremy White 2016-01-28 10:30:55 -06:00 committed by Alexandre Julliard
parent a124064ce5
commit 71f018cba5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/winspool.drv/info.c
View File

@ -781,13 +781,15 @@ static void *cupshandle;
DO_FUNC(cupsPrintFile) DO_FUNC(cupsPrintFile)
#define CUPS_OPT_FUNCS \ #define CUPS_OPT_FUNCS \
DO_FUNC(cupsGetNamedDest); \ DO_FUNC(cupsGetNamedDest); \
DO_FUNC(cupsGetPPD3) DO_FUNC(cupsGetPPD3); \
DO_FUNC(cupsLastErrorString)
#define DO_FUNC(f) static typeof(f) *p##f #define DO_FUNC(f) static typeof(f) *p##f
CUPS_FUNCS; CUPS_FUNCS;
#undef DO_FUNC #undef DO_FUNC
static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *); static cups_dest_t * (*pcupsGetNamedDest)(http_t *, const char *, const char *);
static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t); static http_status_t (*pcupsGetPPD3)(http_t *, const char *, time_t *, char *, size_t);
static const char * (*pcupsLastErrorString)(void);
static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name,
time_t *modtime, char *buffer, time_t *modtime, char *buffer,
@ -8237,6 +8239,8 @@ static BOOL schedule_cups(LPCWSTR printer_name, LPCWSTR filename, LPCWSTR docume
TRACE( "\t%d: %s = %s\n", i, options[i].name, options[i].value ); TRACE( "\t%d: %s = %s\n", i, options[i].name, options[i].value );
ret = pcupsPrintFile( queue, unixname, unix_doc_title, num_options, options ); ret = pcupsPrintFile( queue, unixname, unix_doc_title, num_options, options );
if (ret == 0 && pcupsLastErrorString)
WARN("cupsPrintFile failed with error %s\n", debugstr_a(pcupsLastErrorString()));
pcupsFreeOptions( num_options, options ); pcupsFreeOptions( num_options, options );