diff options
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/w32term.c b/src/w32term.c index 281ce3c663a..7afd1303b4d 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -950,7 +950,7 @@ w32_define_fringe_bitmap (int which, unsigned short *bits, int h, int wd) { int i = max_fringe_bmp; max_fringe_bmp = which + 20; - fringe_bmp = (HBITMAP *) xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP)); + fringe_bmp = xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP)); while (i < max_fringe_bmp) fringe_bmp[i++] = 0; } @@ -3377,7 +3377,7 @@ w32_construct_mouse_wheel (struct input_event *result, W32Msg *msg, if (w32_wheel_scroll_lines == UINT_MAX) { Lisp_Object window = window_from_coordinates (f, p.x, p.y, NULL, - false, false); + false, false, false); if (!WINDOWP (window)) { result->kind = NO_EVENT; @@ -5336,7 +5336,7 @@ w32_read_socket (struct terminal *terminal, { static Lisp_Object last_mouse_window; Lisp_Object window = window_from_coordinates - (f, LOWORD (msg.msg.lParam), HIWORD (msg.msg.lParam), 0, 0, 0); + (f, LOWORD (msg.msg.lParam), HIWORD (msg.msg.lParam), 0, 0, 0, 0); /* Window will be selected only when it is not selected now and last mouse movement event was @@ -5408,7 +5408,7 @@ w32_read_socket (struct terminal *terminal, int x = XFIXNAT (inev.x); int y = XFIXNAT (inev.y); - window = window_from_coordinates (f, x, y, 0, 1, 1); + window = window_from_coordinates (f, x, y, 0, 1, 1, 1); if (EQ (window, f->tab_bar_window)) { @@ -5436,7 +5436,7 @@ w32_read_socket (struct terminal *terminal, int x = XFIXNAT (inev.x); int y = XFIXNAT (inev.y); - window = window_from_coordinates (f, x, y, 0, 1, 1); + window = window_from_coordinates (f, x, y, 0, 1, 1, 1); if (EQ (window, f->tool_bar_window) /* Make sure the tool bar was previously @@ -7379,7 +7379,7 @@ w32_initialize_display_info (Lisp_Object display_name) { static char const at[] = " at "; ptrdiff_t nbytes = sizeof (title) + sizeof (at); - if (INT_ADD_WRAPV (nbytes, SCHARS (Vsystem_name), &nbytes)) + if (ckd_add (&nbytes, nbytes, SCHARS (Vsystem_name))) memory_full (SIZE_MAX); dpyinfo->w32_id_name = xmalloc (nbytes); sprintf (dpyinfo->w32_id_name, "%s%s%s", title, at, SDATA (Vsystem_name)); |