osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix StringCchPrintf() calls. 

One was missing an argument; supply the necessary string.

The other was assuming that an LPARAM was 32 bits when that's not the
case on 64-bit Windows - the underlying value is 32-bit, so we just cast
to int.

Change-Id: Ie2a38e27f2ea211628d2c751a7807bb9ed396c64
Reviewed-on: https://code.wireshark.org/review/26190
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-02-28 12:23:57 -08:00
parent ea0b580b97
commit 16ac61e2a3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/win32/file_dlg_win32.c
View File

@ -1248,7 +1248,8 @@ preview_set_file_info(HWND of_hwnd, gchar *preview_file) {
first_buff, elapsed_time%86400/3600, elapsed_time%3600/60, elapsed_time%60);
}
} else {
StringCchPrintf(string_buff, PREVIEW_STR_MAX, _T("%s / unknown"));
StringCchPrintf(string_buff, PREVIEW_STR_MAX, _T("%s / unknown"),
first_buff);
}
cur_ctrl = GetDlgItem(of_hwnd, EWFD_PTX_START_ELAPSED);
SetWindowText(cur_ctrl, string_buff);
@ -2326,7 +2327,7 @@ export_raw_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_param
switch(msg) {
case WM_INITDIALOG:
StringCchPrintf(raw_msg, STATIC_LABEL_CHARS, _T("%d byte%s of raw binary data will be written"),
ofnp->lCustData, utf_8to16(plurality(ofnp->lCustData, "", "s")));
(int)ofnp->lCustData, utf_8to16(plurality(ofnp->lCustData, "", "s")));
cur_ctrl = GetDlgItem(ef_hwnd, EWFD_EXPORTRAW_ST);
SetWindowText(cur_ctrl, raw_msg);
break;
@ -2354,7 +2355,7 @@ export_sslkeys_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_p
switch(msg) {
case WM_INITDIALOG:
StringCchPrintf(sslkeys_msg, STATIC_LABEL_CHARS, _T("%d SSL Session Key%s will be written"),
ofnp->lCustData, utf_8to16(plurality(ofnp->lCustData, "", "s")));
(int)ofnp->lCustData, utf_8to16(plurality(ofnp->lCustData, "", "s")));
cur_ctrl = GetDlgItem(ef_hwnd, EWFD_EXPORTSSLKEYS_ST);
SetWindowText(cur_ctrl, sslkeys_msg);
break;