diff options
| author | K.Takata <kentkt@csc.jp> | 2022-01-29 15:27:58 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-29 15:27:58 +0000 |
| commit | 135e15251efd96c960e51e8ab31333c2d6887983 (patch) | |
| tree | 580dd95f4442cd1bc356fcac07de2a4ef1e00e37 | |
| parent | d5cec1f1f055316c353cfa15ad8d5eb0952d50a0 (diff) | |
patch 8.2.4256: MS-Windows: compiler warnings when compiled with /W4v8.2.4256
Problem: MS-Windows: compiler warnings when compiled with /W4.
Solution: Small adjustments to the code. (Ken Takata, closes #9659)
| -rw-r--r-- | src/gui_w32.c | 7 | ||||
| -rw-r--r-- | src/os_win32.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 4a8917faec..11ab2346af 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -5780,7 +5780,7 @@ latin9_to_ucs(char_u *text, int len, WCHAR *unicodebuf) * noticeably so. */ static void -RevOut( HDC s_hdc, +RevOut( HDC hdc, int col, int row, UINT foptions, @@ -5792,7 +5792,7 @@ RevOut( HDC s_hdc, int 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); } #endif @@ -5868,7 +5868,6 @@ gui_mch_draw_string( { static int *padding = NULL; static int pad_size = 0; - int i; const RECT *pcliprect = NULL; UINT foptions = 0; static WCHAR *unicodebuf = NULL; @@ -5959,6 +5958,8 @@ gui_mch_draw_string( if (pad_size != Columns || padding == NULL || padding[0] != gui.char_width) { + int i; + vim_free(padding); pad_size = Columns; diff --git a/src/os_win32.c b/src/os_win32.c index 20b93ae6e1..36b2cf1266 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -427,7 +427,7 @@ peek_console_input( DWORD nLength UNUSED, LPDWORD lpEvents) { - return read_console_input(hInput, lpBuffer, -1, lpEvents); + return read_console_input(hInput, lpBuffer, (DWORD)-1, lpEvents); } # ifdef FEAT_CLIENTSERVER @@ -439,7 +439,7 @@ msg_wait_for_multiple_objects( DWORD dwMilliseconds, DWORD dwWakeMask) { - if (read_console_input(NULL, NULL, -2, NULL)) + if (read_console_input(NULL, NULL, (DWORD)-2, NULL)) return WAIT_OBJECT_0; return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll, 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) 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; } @@ -6270,7 +6270,7 @@ write_chars( cchwritten = 1; } - if (cchwritten == length) + if (cchwritten == (DWORD)length) { written = cbToWrite; g_coord.X += (SHORT)cells; diff --git a/src/version.c b/src/version.c index 3e4072d37b..c76a475041 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4256, +/**/ 4255, /**/ 4254, |