nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-21 22:28:37 -05:00
Code Issues Projects Releases Wiki Activity

windows/controls.c API: add lots of missing 'const'.

Browse Source 
Most of the Windows-specific dialog control construction functions
were passing their string parameters as 'char *' even though they were
string literals. Apparently none of our previous giant constification
patches spotted that.
This commit is contained in:
Simon Tatham 2022-07-30 14:12:32 +01:00
parent 138df73e81
commit 10f47902e5
2 changed files with 83 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
windows/controls.c
View File

@ -71,8 +71,8 @@ void ctlposinit(struct ctlpos *cp, HWND hwnd,
cp->width -= leftborder + rightborder; cp->width -= leftborder + rightborder;
} }
HWND doctl(struct ctlpos *cp, RECT r, HWND doctl(struct ctlpos *cp, RECT r, const char *wclass, int wstyle,
char *wclass, int wstyle, int exstyle, char *wtext, int wid) int exstyle, const char *wtext, int wid)
{ {
HWND ctl; HWND ctl;
/* /*
@ -115,7 +115,7 @@ HWND doctl(struct ctlpos *cp, RECT r,
/* /*
* A title bar across the top of a sub-dialog. * A title bar across the top of a sub-dialog.
*/ */
void bartitle(struct ctlpos *cp, char *name, int id) void bartitle(struct ctlpos *cp, const char *name, int id)
{ {
RECT r; RECT r;
@ -130,7 +130,7 @@ void bartitle(struct ctlpos *cp, char *name, int id)
/* /*
* Begin a grouping box, with or without a group title. * Begin a grouping box, with or without a group title.
*/ */
void beginbox(struct ctlpos *cp, char *name, int idbox) void beginbox(struct ctlpos *cp, const char *name, int idbox)
{ {
cp->boxystart = cp->ypos; cp->boxystart = cp->ypos;
if (!name) if (!name)
@ -165,8 +165,8 @@ void endbox(struct ctlpos *cp)
/* /*
* A static line, followed by a full-width edit box. * A static line, followed by a full-width edit box.
*/ */
void editboxfw(struct ctlpos *cp, bool password, bool readonly, char *text, void editboxfw(struct ctlpos *cp, bool password, bool readonly,
int staticid, int editid) const char *text, int staticid, int editid)
{ {
RECT r; RECT r;
@ -192,7 +192,7 @@ void editboxfw(struct ctlpos *cp, bool password, bool readonly, char *text,
/* /*
* A static line, followed by a full-width combo box. * A static line, followed by a full-width combo box.
*/ */
void combobox(struct ctlpos *cp, char *text, int staticid, int listid) void combobox(struct ctlpos *cp, const char *text, int staticid, int listid)
{ {
RECT r; RECT r;
@ -213,9 +213,9 @@ void combobox(struct ctlpos *cp, char *text, int staticid, int listid)
cp->ypos += COMBOHEIGHT + GAPBETWEEN; cp->ypos += COMBOHEIGHT + GAPBETWEEN;
} }
struct radio { char *text; int id; }; struct radio { const char *text; int id; };
static void radioline_common(struct ctlpos *cp, char *text, int id, static void radioline_common(struct ctlpos *cp, const char *text, int id,
int nacross, struct radio *buttons, int nbuttons) int nacross, struct radio *buttons, int nbuttons)
{ {
RECT r; RECT r;
@ -237,7 +237,7 @@ static void radioline_common(struct ctlpos *cp, char *text, int id,
group = WS_GROUP; group = WS_GROUP;
i = 0; i = 0;
for (j = 0; j < nbuttons; j++) { for (j = 0; j < nbuttons; j++) {
char *btext = buttons[j].text; const char *btext = buttons[j].text;
int bid = buttons[j].id; int bid = buttons[j].id;
if (i == nacross) { if (i == nacross) {
@ -275,7 +275,7 @@ static void radioline_common(struct ctlpos *cp, char *text, int id,
* *
* (*) Button1 (*) Button2 (*) ButtonWithReallyLongTitle * (*) Button1 (*) Button2 (*) ButtonWithReallyLongTitle
*/ */
void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...) void radioline(struct ctlpos *cp, const char *text, int id, int nacross, ...)
{ {
va_list ap; va_list ap;
struct radio *buttons; struct radio *buttons;
@ -284,7 +284,7 @@ void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...)
va_start(ap, nacross); va_start(ap, nacross);
nbuttons = 0; nbuttons = 0;
while (1) { while (1) {
char *btext = va_arg(ap, char *); const char *btext = va_arg(ap, const char *);
if (!btext) if (!btext)
break; break;
(void) va_arg(ap, int); /* id */ (void) va_arg(ap, int); /* id */
@ -294,7 +294,7 @@ void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...)
buttons = snewn(nbuttons, struct radio); buttons = snewn(nbuttons, struct radio);
va_start(ap, nacross); va_start(ap, nacross);
for (i = 0; i < nbuttons; i++) { for (i = 0; i < nbuttons; i++) {
buttons[i].text = va_arg(ap, char *); buttons[i].text = va_arg(ap, const char *);
buttons[i].id = va_arg(ap, int); buttons[i].id = va_arg(ap, int);
} }
va_end(ap); va_end(ap);
@ -315,7 +315,7 @@ void bareradioline(struct ctlpos *cp, int nacross, ...)
va_start(ap, nacross); va_start(ap, nacross);
nbuttons = 0; nbuttons = 0;
while (1) { while (1) {
char *btext = va_arg(ap, char *); const char *btext = va_arg(ap, const char *);
if (!btext) if (!btext)
break; break;
(void) va_arg(ap, int); /* id */ (void) va_arg(ap, int); /* id */
@ -325,7 +325,7 @@ void bareradioline(struct ctlpos *cp, int nacross, ...)
buttons = snewn(nbuttons, struct radio); buttons = snewn(nbuttons, struct radio);
va_start(ap, nacross); va_start(ap, nacross);
for (i = 0; i < nbuttons; i++) { for (i = 0; i < nbuttons; i++) {
buttons[i].text = va_arg(ap, char *); buttons[i].text = va_arg(ap, const char *);
buttons[i].id = va_arg(ap, int); buttons[i].id = va_arg(ap, int);
} }
va_end(ap); va_end(ap);
@ -337,7 +337,7 @@ void bareradioline(struct ctlpos *cp, int nacross, ...)
* A set of radio buttons on multiple lines, with a static above * A set of radio buttons on multiple lines, with a static above
* them. * them.
*/ */
void radiobig(struct ctlpos *cp, char *text, int id, ...) void radiobig(struct ctlpos *cp, const char *text, int id, ...)
{ {
va_list ap; va_list ap;
struct radio *buttons; struct radio *buttons;
@ -346,7 +346,7 @@ void radiobig(struct ctlpos *cp, char *text, int id, ...)
va_start(ap, id); va_start(ap, id);
nbuttons = 0; nbuttons = 0;
while (1) { while (1) {
char *btext = va_arg(ap, char *); const char *btext = va_arg(ap, const char *);
if (!btext) if (!btext)
break; break;
(void) va_arg(ap, int); /* id */ (void) va_arg(ap, int); /* id */
@ -356,7 +356,7 @@ void radiobig(struct ctlpos *cp, char *text, int id, ...)
buttons = snewn(nbuttons, struct radio); buttons = snewn(nbuttons, struct radio);
va_start(ap, id); va_start(ap, id);
for (i = 0; i < nbuttons; i++) { for (i = 0; i < nbuttons; i++) {
buttons[i].text = va_arg(ap, char *); buttons[i].text = va_arg(ap, const char *);
buttons[i].id = va_arg(ap, int); buttons[i].id = va_arg(ap, int);
} }
va_end(ap); va_end(ap);
@ -367,7 +367,7 @@ void radiobig(struct ctlpos *cp, char *text, int id, ...)
/* /*
* A single standalone checkbox. * A single standalone checkbox.
*/ */
void checkbox(struct ctlpos *cp, char *text, int id) void checkbox(struct ctlpos *cp, const char *text, int id)
{ {
RECT r; RECT r;
@ -386,13 +386,14 @@ void checkbox(struct ctlpos *cp, char *text, int id)
* wrapped text (a malloc'ed string containing \ns), and also * wrapped text (a malloc'ed string containing \ns), and also
* returns the number of lines required. * returns the number of lines required.
*/ */
char *staticwrap(struct ctlpos *cp, HWND hwnd, char *text, int *lines) char *staticwrap(struct ctlpos *cp, HWND hwnd, const char *text, int *lines)
{ {
HDC hdc = GetDC(hwnd); HDC hdc = GetDC(hwnd);
int width, nlines, j; int width, nlines, j;
INT *pwidths, nfit; INT *pwidths, nfit;
SIZE size; SIZE size;
char *ret, *p, *q; const char *p;
char *ret, *q;
RECT r; RECT r;
HFONT oldfont, newfont; HFONT oldfont, newfont;
@ -472,7 +473,7 @@ char *staticwrap(struct ctlpos *cp, HWND hwnd, char *text, int *lines)
/* /*
* A single standalone static text control. * A single standalone static text control.
*/ */
void statictext(struct ctlpos *cp, char *text, int lines, int id) void statictext(struct ctlpos *cp, const char *text, int lines, int id)
{ {
RECT r; RECT r;
@ -505,8 +506,8 @@ void paneltitle(struct ctlpos *cp, int id)
/* /*
* A button on the right hand side, with a static to its left. * A button on the right hand side, with a static to its left.
*/ */
void staticbtn(struct ctlpos *cp, char *stext, int sid, void staticbtn(struct ctlpos *cp, const char *stext, int sid,
char *btext, int bid) const char *btext, int bid)
{ {
const int height = (PUSHBTNHEIGHT > STATICHEIGHT ? const int height = (PUSHBTNHEIGHT > STATICHEIGHT ?
PUSHBTNHEIGHT : STATICHEIGHT); PUSHBTNHEIGHT : STATICHEIGHT);
@ -537,7 +538,7 @@ void staticbtn(struct ctlpos *cp, char *stext, int sid,
/* /*
* A simple push button. * A simple push button.
*/ */
void button(struct ctlpos *cp, char *btext, int bid, bool defbtn) void button(struct ctlpos *cp, const char *btext, int bid, bool defbtn)
{ {
RECT r; RECT r;
@ -562,8 +563,8 @@ void button(struct ctlpos *cp, char *btext, int bid, bool defbtn)
/* /*
* Like staticbtn, but two buttons. * Like staticbtn, but two buttons.
*/ */
void static2btn(struct ctlpos *cp, char *stext, int sid, void static2btn(struct ctlpos *cp, const char *stext, int sid,
char *btext1, int bid1, char *btext2, int bid2) const char *btext1, int bid1, const char *btext2, int bid2)
{ {
const int height = (PUSHBTNHEIGHT > STATICHEIGHT ? const int height = (PUSHBTNHEIGHT > STATICHEIGHT ?
PUSHBTNHEIGHT : STATICHEIGHT); PUSHBTNHEIGHT : STATICHEIGHT);
@ -604,7 +605,7 @@ void static2btn(struct ctlpos *cp, char *stext, int sid,
/* /*
* An edit control on the right hand side, with a static to its left. * An edit control on the right hand side, with a static to its left.
*/ */
static void staticedit_internal(struct ctlpos *cp, char *stext, static void staticedit_internal(struct ctlpos *cp, const char *stext,
int sid, int eid, int percentedit, int sid, int eid, int percentedit,
int style) int style)
{ {
@ -635,13 +636,13 @@ static void staticedit_internal(struct ctlpos *cp, char *stext,
cp->ypos += height + GAPBETWEEN; cp->ypos += height + GAPBETWEEN;
} }
void staticedit(struct ctlpos *cp, char *stext, void staticedit(struct ctlpos *cp, const char *stext,
int sid, int eid, int percentedit) int sid, int eid, int percentedit)
{ {
staticedit_internal(cp, stext, sid, eid, percentedit, 0); staticedit_internal(cp, stext, sid, eid, percentedit, 0);
} }
void staticpassedit(struct ctlpos *cp, char *stext, void staticpassedit(struct ctlpos *cp, const char *stext,
int sid, int eid, int percentedit) int sid, int eid, int percentedit)
{ {
staticedit_internal(cp, stext, sid, eid, percentedit, ES_PASSWORD); staticedit_internal(cp, stext, sid, eid, percentedit, ES_PASSWORD);
@ -651,7 +652,7 @@ void staticpassedit(struct ctlpos *cp, char *stext,
* A drop-down list box on the right hand side, with a static to * A drop-down list box on the right hand side, with a static to
* its left. * its left.
*/ */
void staticddl(struct ctlpos *cp, char *stext, void staticddl(struct ctlpos *cp, const char *stext,
int sid, int lid, int percentlist) int sid, int lid, int percentlist)
{ {
const int height = (COMBOHEIGHT > STATICHEIGHT ? const int height = (COMBOHEIGHT > STATICHEIGHT ?
@ -684,7 +685,7 @@ void staticddl(struct ctlpos *cp, char *stext,
/* /*
* A combo box on the right hand side, with a static to its left. * A combo box on the right hand side, with a static to its left.
*/ */
void staticcombo(struct ctlpos *cp, char *stext, void staticcombo(struct ctlpos *cp, const char *stext,
int sid, int lid, int percentlist) int sid, int lid, int percentlist)
{ {
const int height = (COMBOHEIGHT > STATICHEIGHT ? const int height = (COMBOHEIGHT > STATICHEIGHT ?
@ -717,7 +718,7 @@ void staticcombo(struct ctlpos *cp, char *stext,
/* /*
* A static, with a full-width drop-down list box below it. * A static, with a full-width drop-down list box below it.
*/ */
void staticddlbig(struct ctlpos *cp, char *stext, void staticddlbig(struct ctlpos *cp, const char *stext,
int sid, int lid) int sid, int lid)
{ {
RECT r; RECT r;
@ -744,7 +745,7 @@ void staticddlbig(struct ctlpos *cp, char *stext,
/* /*
* A big multiline edit control with a static labelling it. * A big multiline edit control with a static labelling it.
*/ */
void bigeditctrl(struct ctlpos *cp, char *stext, void bigeditctrl(struct ctlpos *cp, const char *stext,
int sid, int eid, int lines) int sid, int eid, int lines)
{ {
RECT r; RECT r;
@ -771,7 +772,7 @@ void bigeditctrl(struct ctlpos *cp, char *stext,
/* /*
* A list box with a static labelling it. * A list box with a static labelling it.
*/ */
void listbox(struct ctlpos *cp, char *stext, void listbox(struct ctlpos *cp, const char *stext,
int sid, int lid, int lines, bool multi) int sid, int lid, int lines, bool multi)
{ {
RECT r; RECT r;
@ -800,7 +801,8 @@ void listbox(struct ctlpos *cp, char *stext,
/* /*
* A tab-control substitute when a real tab control is unavailable. * A tab-control substitute when a real tab control is unavailable.
*/ */
void ersatztab(struct ctlpos *cp, char *stext, int sid, int lid, int s2id) void ersatztab(struct ctlpos *cp, const char *stext, int sid, int lid,
int s2id)
{ {
const int height = (COMBOHEIGHT > STATICHEIGHT ? const int height = (COMBOHEIGHT > STATICHEIGHT ?
COMBOHEIGHT : STATICHEIGHT); COMBOHEIGHT : STATICHEIGHT);
@ -843,8 +845,8 @@ void ersatztab(struct ctlpos *cp, char *stext, int sid, int lid, int s2id)
* A static line, followed by an edit control on the left hand side * A static line, followed by an edit control on the left hand side
* and a button on the right. * and a button on the right.
*/ */
void editbutton(struct ctlpos *cp, char *stext, int sid, void editbutton(struct ctlpos *cp, const char *stext, int sid,
int eid, char *btext, int bid) int eid, const char *btext, int bid)
{ {
const int height = (EDITHEIGHT > PUSHBTNHEIGHT ? const int height = (EDITHEIGHT > PUSHBTNHEIGHT ?
EDITHEIGHT : PUSHBTNHEIGHT); EDITHEIGHT : PUSHBTNHEIGHT);
@ -887,7 +889,7 @@ void editbutton(struct ctlpos *cp, char *stext, int sid,
* XXX: this is a rough hack and could be improved. * XXX: this is a rough hack and could be improved.
*/ */
void prefslist(struct prefslist *hdl, struct ctlpos *cp, int lines, void prefslist(struct prefslist *hdl, struct ctlpos *cp, int lines,
char *stext, int sid, int listid, int upbid, int dnbid) const char *stext, int sid, int listid, int upbid, int dnbid)
{ {
const static int percents[] = { 5, 75, 20 }; const static int percents[] = { 5, 75, 20 };
RECT r; RECT r;
@ -1596,7 +1598,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
buttons, ctrl->radio.nbuttons); buttons, ctrl->radio.nbuttons);
for (i = 0; i < ctrl->radio.nbuttons; i++) { for (i = 0; i < ctrl->radio.nbuttons; i++) {
sfree(buttons[i].text); sfree((char *)buttons[i].text);
} }
sfree(buttons); sfree(buttons);
sfree(escaped); sfree(escaped);

79
windows/platform.h
View File

@ -374,7 +374,7 @@ struct ctlpos {
int ypos, width; int ypos, width;
int xoff; int xoff;
int boxystart, boxid; int boxystart, boxid;
char *boxtext; const char *boxtext;
}; };
void init_common_controls(void); /* also does some DLL-loading */ void init_common_controls(void); /* also does some DLL-loading */
@ -433,56 +433,59 @@ struct dlgparam {
*/ */
void ctlposinit(struct ctlpos *cp, HWND hwnd, void ctlposinit(struct ctlpos *cp, HWND hwnd,
int leftborder, int rightborder, int topborder); int leftborder, int rightborder, int topborder);
HWND doctl(struct ctlpos *cp, RECT r, HWND doctl(struct ctlpos *cp, RECT r, const char *wclass, int wstyle,
char *wclass, int wstyle, int exstyle, char *wtext, int wid); int exstyle, const char *wtext, int wid);
void bartitle(struct ctlpos *cp, char *name, int id); void bartitle(struct ctlpos *cp, const char *name, int id);
void beginbox(struct ctlpos *cp, char *name, int idbox); void beginbox(struct ctlpos *cp, const char *name, int idbox);
void endbox(struct ctlpos *cp); void endbox(struct ctlpos *cp);
void editboxfw(struct ctlpos *cp, bool password, bool readonly, char *text, void editboxfw(struct ctlpos *cp, bool password, bool readonly,
int staticid, int editid); const char *text, int staticid, int editid);
void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...); void radioline(struct ctlpos *cp, const char *text, int id, int nacross, ...);
void bareradioline(struct ctlpos *cp, int nacross, ...); void bareradioline(struct ctlpos *cp, int nacross, ...);
void radiobig(struct ctlpos *cp, char *text, int id, ...); void radiobig(struct ctlpos *cp, const char *text, int id, ...);
void checkbox(struct ctlpos *cp, char *text, int id); void checkbox(struct ctlpos *cp, const char *text, int id);
void statictext(struct ctlpos *cp, char *text, int lines, int id); void statictext(struct ctlpos *cp, const char *text, int lines, int id);
void staticbtn(struct ctlpos *cp, char *stext, int sid, void staticbtn(struct ctlpos *cp, const char *stext, int sid,
char *btext, int bid); const char *btext, int bid);
void static2btn(struct ctlpos *cp, char *stext, int sid, void static2btn(struct ctlpos *cp, const char *stext, int sid,
char *btext1, int bid1, char *btext2, int bid2); const char *btext1, int bid1, const char *btext2, int bid2);
void staticedit(struct ctlpos *cp, char *stext, void staticedit(struct ctlpos *cp, const char *stext,
int sid, int eid, int percentedit); int sid, int eid, int percentedit);
void staticddl(struct ctlpos *cp, char *stext, void staticddl(struct ctlpos *cp, const char *stext,
int sid, int lid, int percentlist); int sid, int lid, int percentlist);
void combobox(struct ctlpos *cp, char *text, int staticid, int listid); void combobox(struct ctlpos *cp, const char *text, int staticid, int listid);
void staticpassedit(struct ctlpos *cp, char *stext, void staticpassedit(struct ctlpos *cp, const char *stext,
int sid, int eid, int percentedit); int sid, int eid, int percentedit);
void bigeditctrl(struct ctlpos *cp, char *stext, void bigeditctrl(struct ctlpos *cp, const char *stext,
int sid, int eid, int lines); int sid, int eid, int lines);
void ersatztab(struct ctlpos *cp, char *stext, int sid, int lid, int s2id); void ersatztab(struct ctlpos *cp, const char *stext, int sid, int lid,
void editbutton(struct ctlpos *cp, char *stext, int sid, int s2id);
int eid, char *btext, int bid); void editbutton(struct ctlpos *cp, const char *stext, int sid,
void sesssaver(struct ctlpos *cp, char *text, int eid, const char *btext, int bid);
void sesssaver(struct ctlpos *cp, const char *text,
int staticid, int editid, int listid, ...); int staticid, int editid, int listid, ...);
void envsetter(struct ctlpos *cp, char *stext, int sid, void envsetter(struct ctlpos *cp, const char *stext, int sid,
char *e1stext, int e1sid, int e1id, const char *e1stext, int e1sid, int e1id,
char *e2stext, int e2sid, int e2id, const char *e2stext, int e2sid, int e2id,
int listid, char *b1text, int b1id, char *b2text, int b2id); int listid, const char *b1text, int b1id,
void charclass(struct ctlpos *cp, char *stext, int sid, int listid, const char *b2text, int b2id);
char *btext, int bid, int eid, char *s2text, int s2id); void charclass(struct ctlpos *cp, const char *stext, int sid, int listid,
void colouredit(struct ctlpos *cp, char *stext, int sid, int listid, const char *btext, int bid, int eid, const char *s2text,
char *btext, int bid, ...); int s2id);
void colouredit(struct ctlpos *cp, const char *stext, int sid, int listid,
const char *btext, int bid, ...);
void prefslist(struct prefslist *hdl, struct ctlpos *cp, int lines, void prefslist(struct prefslist *hdl, struct ctlpos *cp, int lines,
char *stext, int sid, int listid, int upbid, int dnbid); const char *stext, int sid, int listid, int upbid, int dnbid);
int handle_prefslist(struct prefslist *hdl, int handle_prefslist(struct prefslist *hdl,
int *array, int maxmemb, int *array, int maxmemb,
bool is_dlmsg, HWND hwnd, bool is_dlmsg, HWND hwnd,
WPARAM wParam, LPARAM lParam); WPARAM wParam, LPARAM lParam);
void progressbar(struct ctlpos *cp, int id); void progressbar(struct ctlpos *cp, int id);
void fwdsetter(struct ctlpos *cp, int listid, char *stext, int sid, void fwdsetter(struct ctlpos *cp, int listid, const char *stext, int sid,
char *e1stext, int e1sid, int e1id, const char *e1stext, int e1sid, int e1id,
char *e2stext, int e2sid, int e2id, const char *e2stext, int e2sid, int e2id,
char *btext, int bid, const char *btext, int bid,
char *r1text, int r1id, char *r2text, int r2id); const char *r1text, int r1id, const char *r2text, int r2id);
void dlg_auto_set_fixed_pitch_flag(dlgparam *dlg); void dlg_auto_set_fixed_pitch_flag(dlgparam *dlg);
bool dlg_get_fixed_pitch_flag(dlgparam *dlg); bool dlg_get_fixed_pitch_flag(dlgparam *dlg);