diff options
author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-04-16 03:18:10 +0000 |
---|---|---|
committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-04-16 03:18:10 +0000 |
commit | 79e8a0f314133d0202ffdf02fb853f25b583b33e (patch) | |
tree | 069d8d384a038e7fd12d35078c5039ebd9ec6b84 /gtk/file_dlg_win32.c | |
parent | 655d6a85e2d1f6e9761ffeebe55a34999c561787 (diff) |
Fix the last of the Win64 problems in the gtk directory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28063 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/file_dlg_win32.c')
-rw-r--r-- | gtk/file_dlg_win32.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gtk/file_dlg_win32.c b/gtk/file_dlg_win32.c index 62ee9d124b..ed54477420 100644 --- a/gtk/file_dlg_win32.c +++ b/gtk/file_dlg_win32.c @@ -99,11 +99,11 @@ typedef enum { #define FILE_DEFAULT_COLOR 2 -static UINT CALLBACK open_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); -static UINT CALLBACK save_as_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); -static UINT CALLBACK merge_file_hook_proc(HWND mf_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); -static UINT CALLBACK export_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); -static UINT CALLBACK export_raw_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); +static UINT_PTR CALLBACK open_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); +static UINT_PTR CALLBACK save_as_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); +static UINT_PTR CALLBACK merge_file_hook_proc(HWND mf_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); +static UINT_PTR CALLBACK export_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); +static UINT_PTR CALLBACK export_raw_file_hook_proc(HWND of_hwnd, UINT ui_msg, WPARAM w_param, LPARAM l_param); static void range_update_dynamics(HWND sf_hwnd, packet_range_t *range); static void range_handle_wm_initdialog(HWND dlg_hwnd, packet_range_t *range); static void range_handle_wm_command(HWND dlg_hwnd, HWND ctrl, WPARAM w_param, packet_range_t *range); @@ -1108,7 +1108,7 @@ filter_tb_syntax_check(HWND hwnd, TCHAR *filter_text) { } -static UINT CALLBACK +static UINT_PTR CALLBACK open_file_hook_proc(HWND of_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { HWND cur_ctrl, parent; OFNOTIFY *notify = (OFNOTIFY *) l_param; @@ -1270,10 +1270,10 @@ build_file_type_list(gboolean save, int *item_to_select) { /* append the "All Files" entry */ if (!save) { str16 = utf_8to16("All Files (*.*)"); - sa = g_array_append_vals(sa, str16, strlen("All Files (*.*)")); + sa = g_array_append_vals(sa, str16, (guint) strlen("All Files (*.*)")); sa = g_array_append_val(sa, zero); str16 = utf_8to16("*.*"); - sa = g_array_append_vals(sa, str16, strlen("*.*")); + sa = g_array_append_vals(sa, str16, (guint) strlen("*.*")); sa = g_array_append_val(sa, zero); } @@ -1293,12 +1293,12 @@ build_file_type_list(gboolean save, int *item_to_select) { continue; } str16 = utf_8to16(str->str); - sa = g_array_append_vals(sa, str16, strlen(str->str)); + sa = g_array_append_vals(sa, str16, (guint) strlen(str->str)); sa = g_array_append_val(sa, zero); g_string_printf(str, "%s", wtap_file_extensions_string(ft)); str16 = utf_8to16(str->str); - sa = g_array_append_vals(sa, str16, strlen(str->str)); + sa = g_array_append_vals(sa, str16, (guint) strlen(str->str)); sa = g_array_append_val(sa, zero); if (ft == cfile.cd_t && item_to_select != NULL) { @@ -1361,7 +1361,7 @@ build_file_format_list(HWND sf_hwnd) { #endif #define RANGE_TEXT_MAX 128 -static UINT CALLBACK +static UINT_PTR CALLBACK save_as_file_hook_proc(HWND sf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { HWND cur_ctrl; OFNOTIFY *notify = (OFNOTIFY *) l_param; @@ -1605,7 +1605,7 @@ range_handle_wm_command(HWND dlg_hwnd, HWND ctrl, WPARAM w_param, packet_range_t } } -static UINT CALLBACK +static UINT_PTR CALLBACK merge_file_hook_proc(HWND mf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { HWND cur_ctrl, parent; OFNOTIFY *notify = (OFNOTIFY *) l_param; @@ -1675,7 +1675,7 @@ merge_file_hook_proc(HWND mf_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { } -static UINT CALLBACK +static UINT_PTR CALLBACK export_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { HWND cur_ctrl; OFNOTIFY *notify = (OFNOTIFY *) l_param; @@ -1733,7 +1733,7 @@ export_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { return 0; } -static UINT CALLBACK +static UINT_PTR CALLBACK export_raw_file_hook_proc(HWND ef_hwnd, UINT msg, WPARAM w_param, LPARAM l_param) { HWND cur_ctrl; OPENFILENAME *ofnp = (OPENFILENAME *) l_param; |