2002-03-09 22:06:58 +03:00
|
|
|
/*
|
|
|
|
* Printing interface for PuTTY.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "putty.h"
|
2004-01-20 23:35:27 +03:00
|
|
|
#include <winspool.h>
|
2002-03-12 21:27:10 +03:00
|
|
|
|
2002-03-09 22:06:58 +03:00
|
|
|
struct printer_enum_tag {
|
|
|
|
int nprinters;
|
2003-08-21 23:48:45 +04:00
|
|
|
DWORD enum_level;
|
|
|
|
union {
|
|
|
|
LPPRINTER_INFO_4 i4;
|
|
|
|
LPPRINTER_INFO_5 i5;
|
|
|
|
} info;
|
2002-03-09 22:06:58 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
struct printer_job_tag {
|
|
|
|
HANDLE hprinter;
|
|
|
|
};
|
|
|
|
|
2017-03-14 00:28:36 +03:00
|
|
|
DECL_WINDOWS_FUNCTION(static, BOOL, EnumPrinters,
|
|
|
|
(DWORD, LPTSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD));
|
|
|
|
DECL_WINDOWS_FUNCTION(static, BOOL, OpenPrinter,
|
|
|
|
(LPTSTR, LPHANDLE, LPPRINTER_DEFAULTS));
|
|
|
|
DECL_WINDOWS_FUNCTION(static, BOOL, ClosePrinter, (HANDLE));
|
2017-06-08 00:02:28 +03:00
|
|
|
DECL_WINDOWS_FUNCTION(static, DWORD, StartDocPrinter, (HANDLE, DWORD, LPBYTE));
|
2017-03-14 00:28:36 +03:00
|
|
|
DECL_WINDOWS_FUNCTION(static, BOOL, EndDocPrinter, (HANDLE));
|
|
|
|
DECL_WINDOWS_FUNCTION(static, BOOL, StartPagePrinter, (HANDLE));
|
|
|
|
DECL_WINDOWS_FUNCTION(static, BOOL, EndPagePrinter, (HANDLE));
|
|
|
|
DECL_WINDOWS_FUNCTION(static, BOOL, WritePrinter,
|
|
|
|
(HANDLE, LPVOID, DWORD, LPDWORD));
|
|
|
|
|
|
|
|
static void init_winfuncs(void)
|
|
|
|
{
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
static bool initialised = false;
|
2017-03-14 00:28:36 +03:00
|
|
|
if (initialised)
|
|
|
|
return;
|
|
|
|
{
|
|
|
|
HMODULE winspool_module = load_system32_dll("winspool.drv");
|
2017-06-16 01:33:57 +03:00
|
|
|
/* Some MSDN documentation claims that some of the below functions
|
|
|
|
* should be loaded from spoolss.dll, but this doesn't seem to
|
|
|
|
* be reliable in practice.
|
|
|
|
* Nevertheless, we load spoolss.dll ourselves using our safe
|
|
|
|
* loading method, against the possibility that winspool.drv
|
|
|
|
* later loads it unsafely. */
|
|
|
|
(void) load_system32_dll("spoolss.dll");
|
2017-03-14 00:28:36 +03:00
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, EnumPrinters);
|
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, OpenPrinter);
|
2017-06-16 01:33:57 +03:00
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, ClosePrinter);
|
2017-03-14 00:28:36 +03:00
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, StartDocPrinter);
|
2017-06-16 01:33:57 +03:00
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, EndDocPrinter);
|
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, StartPagePrinter);
|
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, EndPagePrinter);
|
|
|
|
GET_WINDOWS_FUNCTION_PP(winspool_module, WritePrinter);
|
2017-03-14 00:28:36 +03:00
|
|
|
}
|
2018-10-29 22:50:29 +03:00
|
|
|
initialised = true;
|
2017-03-14 00:28:36 +03:00
|
|
|
}
|
|
|
|
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
static bool printer_add_enum(int param, DWORD level, char **buffer,
|
|
|
|
int offset, int *nprinters_ptr)
|
2002-03-12 21:27:10 +03:00
|
|
|
{
|
2007-09-21 22:04:08 +04:00
|
|
|
DWORD needed = 0, nprinters = 0;
|
2002-03-12 21:27:10 +03:00
|
|
|
|
2017-03-14 00:28:36 +03:00
|
|
|
init_winfuncs();
|
|
|
|
|
2013-07-22 11:11:54 +04:00
|
|
|
*buffer = sresize(*buffer, offset+512, char);
|
2002-03-12 21:27:10 +03:00
|
|
|
|
2002-09-02 17:47:50 +04:00
|
|
|
/*
|
|
|
|
* Exploratory call to EnumPrinters to determine how much space
|
|
|
|
* we'll need for the output. Discard the return value since it
|
|
|
|
* will almost certainly be a failure due to lack of space.
|
|
|
|
*/
|
2017-03-14 00:28:36 +03:00
|
|
|
p_EnumPrinters(param, NULL, level, (LPBYTE)((*buffer)+offset), 512,
|
|
|
|
&needed, &nprinters);
|
2002-03-12 21:27:10 +03:00
|
|
|
|
|
|
|
if (needed < 512)
|
|
|
|
needed = 512;
|
|
|
|
|
2013-07-22 11:11:54 +04:00
|
|
|
*buffer = sresize(*buffer, offset+needed, char);
|
2002-03-12 21:27:10 +03:00
|
|
|
|
2017-03-14 00:28:36 +03:00
|
|
|
if (p_EnumPrinters(param, NULL, level, (LPBYTE)((*buffer)+offset),
|
|
|
|
needed, &needed, &nprinters) == 0)
|
2018-10-29 22:50:29 +03:00
|
|
|
return false;
|
2002-03-12 21:27:10 +03:00
|
|
|
|
|
|
|
*nprinters_ptr += nprinters;
|
|
|
|
|
2018-10-29 22:50:29 +03:00
|
|
|
return true;
|
2002-03-12 21:27:10 +03:00
|
|
|
}
|
|
|
|
|
2002-03-09 22:06:58 +03:00
|
|
|
printer_enum *printer_start_enum(int *nprinters_ptr)
|
|
|
|
{
|
2003-03-29 19:14:26 +03:00
|
|
|
printer_enum *ret = snew(printer_enum);
|
2013-07-22 11:11:54 +04:00
|
|
|
char *buffer = NULL;
|
2002-03-09 22:06:58 +03:00
|
|
|
|
|
|
|
*nprinters_ptr = 0; /* default return value */
|
2003-03-29 19:14:26 +03:00
|
|
|
buffer = snewn(512, char);
|
2002-03-12 21:27:10 +03:00
|
|
|
|
2003-08-21 23:48:45 +04:00
|
|
|
/*
|
|
|
|
* Determine what enumeration level to use.
|
|
|
|
* When enumerating printers, we need to use PRINTER_INFO_4 on
|
|
|
|
* NT-class systems to avoid Windows looking too hard for them and
|
|
|
|
* slowing things down; and we need to avoid PRINTER_INFO_5 as
|
|
|
|
* we've seen network printers not show up.
|
|
|
|
* On 9x-class systems, PRINTER_INFO_4 isn't available and
|
|
|
|
* PRINTER_INFO_5 is recommended.
|
|
|
|
* Bletch.
|
|
|
|
*/
|
2018-06-03 17:05:44 +03:00
|
|
|
if (osPlatformId != VER_PLATFORM_WIN32_NT) {
|
2003-08-21 23:48:45 +04:00
|
|
|
ret->enum_level = 5;
|
|
|
|
} else {
|
|
|
|
ret->enum_level = 4;
|
|
|
|
}
|
|
|
|
|
2013-07-22 11:11:54 +04:00
|
|
|
if (!printer_add_enum(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS,
|
|
|
|
ret->enum_level, &buffer, 0, nprinters_ptr))
|
2002-03-12 21:27:10 +03:00
|
|
|
goto error;
|
|
|
|
|
2003-08-21 23:48:45 +04:00
|
|
|
switch (ret->enum_level) {
|
|
|
|
case 4:
|
|
|
|
ret->info.i4 = (LPPRINTER_INFO_4)buffer;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
ret->info.i5 = (LPPRINTER_INFO_5)buffer;
|
|
|
|
break;
|
|
|
|
}
|
2002-03-12 21:27:10 +03:00
|
|
|
ret->nprinters = *nprinters_ptr;
|
2002-03-09 22:06:58 +03:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
error:
|
|
|
|
sfree(buffer);
|
|
|
|
sfree(ret);
|
2002-03-12 21:27:10 +03:00
|
|
|
*nprinters_ptr = 0;
|
2002-03-09 22:06:58 +03:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *printer_get_name(printer_enum *pe, int i)
|
|
|
|
{
|
|
|
|
if (!pe)
|
|
|
|
return NULL;
|
|
|
|
if (i < 0 || i >= pe->nprinters)
|
|
|
|
return NULL;
|
2003-08-21 23:48:45 +04:00
|
|
|
switch (pe->enum_level) {
|
|
|
|
case 4:
|
|
|
|
return pe->info.i4[i].pPrinterName;
|
|
|
|
case 5:
|
|
|
|
return pe->info.i5[i].pPrinterName;
|
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-03-09 22:06:58 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void printer_finish_enum(printer_enum *pe)
|
|
|
|
{
|
|
|
|
if (!pe)
|
|
|
|
return;
|
2003-08-21 23:48:45 +04:00
|
|
|
switch (pe->enum_level) {
|
|
|
|
case 4:
|
|
|
|
sfree(pe->info.i4);
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
sfree(pe->info.i5);
|
|
|
|
break;
|
|
|
|
}
|
2002-03-09 22:06:58 +03:00
|
|
|
sfree(pe);
|
|
|
|
}
|
|
|
|
|
|
|
|
printer_job *printer_start_job(char *printer)
|
|
|
|
{
|
2003-03-29 19:14:26 +03:00
|
|
|
printer_job *ret = snew(printer_job);
|
2002-03-09 22:06:58 +03:00
|
|
|
DOC_INFO_1 docinfo;
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
bool jobstarted = false, pagestarted = false;
|
2002-03-09 22:06:58 +03:00
|
|
|
|
2017-03-14 00:28:36 +03:00
|
|
|
init_winfuncs();
|
|
|
|
|
2002-03-09 22:06:58 +03:00
|
|
|
ret->hprinter = NULL;
|
2017-03-14 00:28:36 +03:00
|
|
|
if (!p_OpenPrinter(printer, &ret->hprinter, NULL))
|
2002-03-09 22:06:58 +03:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
docinfo.pDocName = "PuTTY remote printer output";
|
|
|
|
docinfo.pOutputFile = NULL;
|
|
|
|
docinfo.pDatatype = "RAW";
|
|
|
|
|
2017-03-14 00:28:36 +03:00
|
|
|
if (!p_StartDocPrinter(ret->hprinter, 1, (LPBYTE)&docinfo))
|
2002-03-09 22:06:58 +03:00
|
|
|
goto error;
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
jobstarted = true;
|
2002-03-09 22:06:58 +03:00
|
|
|
|
2017-03-14 00:28:36 +03:00
|
|
|
if (!p_StartPagePrinter(ret->hprinter))
|
2002-03-09 22:06:58 +03:00
|
|
|
goto error;
|
Convert a lot of 'int' variables to 'bool'.
My normal habit these days, in new code, is to treat int and bool as
_almost_ completely separate types. I'm still willing to use C's
implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine,
no need to spell it out as blob.len != 0), but generally, if a
variable is going to be conceptually a boolean, I like to declare it
bool and assign to it using 'true' or 'false' rather than 0 or 1.
PuTTY is an exception, because it predates the C99 bool, and I've
stuck to its existing coding style even when adding new code to it.
But it's been annoying me more and more, so now that I've decided C99
bool is an acceptable thing to require from our toolchain in the first
place, here's a quite thorough trawl through the source doing
'boolification'. Many variables and function parameters are now typed
as bool rather than int; many assignments of 0 or 1 to those variables
are now spelled 'true' or 'false'.
I managed this thorough conversion with the help of a custom clang
plugin that I wrote to trawl the AST and apply heuristics to point out
where things might want changing. So I've even managed to do a decent
job on parts of the code I haven't looked at in years!
To make the plugin's work easier, I pushed platform front ends
generally in the direction of using standard 'bool' in preference to
platform-specific boolean types like Windows BOOL or GTK's gboolean;
I've left the platform booleans in places they _have_ to be for the
platform APIs to work right, but variables only used by my own code
have been converted wherever I found them.
In a few places there are int values that look very like booleans in
_most_ of the places they're used, but have a rarely-used third value,
or a distinction between different nonzero values that most users
don't care about. In these cases, I've _removed_ uses of 'true' and
'false' for the return values, to emphasise that there's something
more subtle going on than a simple boolean answer:
- the 'multisel' field in dialog.h's list box structure, for which
the GTK front end in particular recognises a difference between 1
and 2 but nearly everything else treats as boolean
- the 'urgent' parameter to plug_receive, where 1 vs 2 tells you
something about the specific location of the urgent pointer, but
most clients only care about 0 vs 'something nonzero'
- the return value of wc_match, where -1 indicates a syntax error in
the wildcard.
- the return values from SSH-1 RSA-key loading functions, which use
-1 for 'wrong passphrase' and 0 for all other failures (so any
caller which already knows it's not loading an _encrypted private_
key can treat them as boolean)
- term->esc_query, and the 'query' parameter in toggle_mode in
terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h,
but can also hold -1 for some other intervening character that we
don't support.
In a few places there's an integer that I haven't turned into a bool
even though it really _can_ only take values 0 or 1 (and, as above,
tried to make the call sites consistent in not calling those values
true and false), on the grounds that I thought it would make it more
confusing to imply that the 0 value was in some sense 'negative' or
bad and the 1 positive or good:
- the return value of plug_accepting uses the POSIXish convention of
0=success and nonzero=error; I think if I made it bool then I'd
also want to reverse its sense, and that's a job for a separate
piece of work.
- the 'screen' parameter to lineptr() in terminal.c, where 0 and 1
represent the default and alternate screens. There's no obvious
reason why one of those should be considered 'true' or 'positive'
or 'success' - they're just indices - so I've left it as int.
ssh_scp_recv had particularly confusing semantics for its previous int
return value: its call sites used '<= 0' to check for error, but it
never actually returned a negative number, just 0 or 1. Now the
function and its call sites agree that it's a bool.
In a couple of places I've renamed variables called 'ret', because I
don't like that name any more - it's unclear whether it means the
return value (in preparation) for the _containing_ function or the
return value received from a subroutine call, and occasionally I've
accidentally used the same variable for both and introduced a bug. So
where one of those got in my way, I've renamed it to 'toret' or 'retd'
(the latter short for 'returned') in line with my usual modern
practice, but I haven't done a thorough job of finding all of them.
Finally, one amusing side effect of doing this is that I've had to
separate quite a few chained assignments. It used to be perfectly fine
to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a
the 'true' defined by stdbool.h, that idiom provokes a warning from
gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
|
|
|
pagestarted = true;
|
2002-03-09 22:06:58 +03:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (pagestarted)
|
2017-03-14 00:28:36 +03:00
|
|
|
p_EndPagePrinter(ret->hprinter);
|
2002-03-09 22:06:58 +03:00
|
|
|
if (jobstarted)
|
2017-03-14 00:28:36 +03:00
|
|
|
p_EndDocPrinter(ret->hprinter);
|
2002-03-09 22:06:58 +03:00
|
|
|
if (ret->hprinter)
|
2017-03-14 00:28:36 +03:00
|
|
|
p_ClosePrinter(ret->hprinter);
|
2002-03-09 22:06:58 +03:00
|
|
|
sfree(ret);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2019-02-06 23:46:45 +03:00
|
|
|
void printer_job_data(printer_job *pj, const void *data, size_t len)
|
2002-03-09 22:06:58 +03:00
|
|
|
{
|
|
|
|
DWORD written;
|
|
|
|
|
|
|
|
if (!pj)
|
|
|
|
return;
|
|
|
|
|
2019-02-06 23:46:45 +03:00
|
|
|
p_WritePrinter(pj->hprinter, (void *)data, len, &written);
|
2002-03-09 22:06:58 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void printer_finish_job(printer_job *pj)
|
|
|
|
{
|
|
|
|
if (!pj)
|
|
|
|
return;
|
|
|
|
|
2017-03-14 00:28:36 +03:00
|
|
|
p_EndPagePrinter(pj->hprinter);
|
|
|
|
p_EndDocPrinter(pj->hprinter);
|
|
|
|
p_ClosePrinter(pj->hprinter);
|
2002-03-09 22:06:58 +03:00
|
|
|
sfree(pj);
|
|
|
|
}
|