aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4256: MS-Windows: compiler warnings when compiled with /W4

Browse Source 
Problem:    MS-Windows: compiler warnings when compiled with /W4.
Solution:   Small adjustments to the code. (Ken Takata, closes #9659)
This commit is contained in:
K.Takata 2022-01-29 15:27:58 +00:00 committed by Bram Moolenaar
parent d5cec1f1f0
commit 135e15251e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui_w32.c
View File

@ -5780,7 +5780,7 @@ latin9_to_ucs(char_u *text, int len, WCHAR *unicodebuf)
* noticeably so. * noticeably so.
*/ */
static void static void
RevOut( HDC s_hdc, RevOut( HDC hdc,
int col, int col,
int row, int row,
UINT foptions, UINT foptions,
@ -5792,7 +5792,7 @@ RevOut( HDC s_hdc,
int ix; int ix;
for (ix = 0; ix < (int)len; ++ix) for (ix = 0; ix < (int)len; ++ix)
ExtTextOut(s_hdc, col + TEXT_X(ix), row, foptions, ExtTextOut(hdc, col + TEXT_X(ix), row, foptions,
pcliprect, text + ix, 1, padding); pcliprect, text + ix, 1, padding);
} }
#endif #endif
@ -5868,7 +5868,6 @@ gui_mch_draw_string(
{ {
static int *padding = NULL; static int *padding = NULL;
static int pad_size = 0; static int pad_size = 0;
int i;
const RECT *pcliprect = NULL; const RECT *pcliprect = NULL;
UINT foptions = 0; UINT foptions = 0;
static WCHAR *unicodebuf = NULL; static WCHAR *unicodebuf = NULL;
@ -5959,6 +5958,8 @@ gui_mch_draw_string(
if (pad_size != Columns || padding == NULL || padding[0] != gui.char_width) if (pad_size != Columns || padding == NULL || padding[0] != gui.char_width)
{ {
int i;
vim_free(padding); vim_free(padding);
pad_size = Columns; pad_size = Columns;

8
src/os_win32.c
View File

@ -427,7 +427,7 @@ peek_console_input(
DWORD nLength UNUSED, DWORD nLength UNUSED,
LPDWORD lpEvents) LPDWORD lpEvents)
{ {
return read_console_input(hInput, lpBuffer, -1, lpEvents); return read_console_input(hInput, lpBuffer, (DWORD)-1, lpEvents);
} }
# ifdef FEAT_CLIENTSERVER # ifdef FEAT_CLIENTSERVER
@ -439,7 +439,7 @@ msg_wait_for_multiple_objects(
DWORD dwMilliseconds, DWORD dwMilliseconds,
DWORD dwWakeMask) DWORD dwWakeMask)
{ {
if (read_console_input(NULL, NULL, -2, NULL)) if (read_console_input(NULL, NULL, (DWORD)-2, NULL))
return WAIT_OBJECT_0; return WAIT_OBJECT_0;
return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll, return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll,
dwMilliseconds, dwWakeMask); dwMilliseconds, dwWakeMask);
@ -5537,7 +5537,7 @@ mch_signal_job(job_T *job, char_u *how)
{ {
if (job->jv_channel != NULL && job->jv_channel->ch_anonymous_pipe) if (job->jv_channel != NULL && job->jv_channel->ch_anonymous_pipe)
job->jv_channel->ch_killing = TRUE; job->jv_channel->ch_killing = TRUE;
return TerminateJobObject(job->jv_job_object, -1) ? OK : FAIL; return TerminateJobObject(job->jv_job_object, (UINT)-1) ? OK : FAIL;
} }
return terminate_all(job->jv_proc_info.hProcess, -1) ? OK : FAIL; return terminate_all(job->jv_proc_info.hProcess, -1) ? OK : FAIL;
} }
@ -6270,7 +6270,7 @@ write_chars(
cchwritten = 1; cchwritten = 1;
} }
if (cchwritten == length) if (cchwritten == (DWORD)length)
{ {
written = cbToWrite; written = cbToWrite;
g_coord.X += (SHORT)cells; g_coord.X += (SHORT)cells;

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4256,
/**/ /**/
4255, 4255,
/**/ /**/