Patch 8.2.4256

[Bram Moolenaar]

Patch 8.2.4256
Problem: MS-Windows: compiler warnings when compiled with /W4.
Solution: Small adjustments to the code. (Ken Takata, closes #9659)
Files: src/gui_w32.c, src/os_win32.c


*** ../vim-8.2.4255/src/gui_w32.c 2022-01-25 10:30:52.473915958 +0000
--- src/gui_w32.c 2022-01-29 15:26:54.275472383 +0000
***************
*** 5780,5786 ****
* noticeably so.
*/
static void
! RevOut( HDC s_hdc,
int col,
int row,
UINT foptions,
--- 5780,5786 ----
* noticeably so.
*/
static void
! RevOut( HDC hdc,
int col,
int row,
UINT foptions,
***************
*** 5792,5798 ****
int ix;

for (ix = 0; ix < (int)len; ++ix)
! ExtTextOut(s_hdc, col + TEXT_X(ix), row, foptions,
pcliprect, text + ix, 1, padding);
}
#endif
--- 5792,5798 ----
int ix;

for (ix = 0; ix < (int)len; ++ix)
! ExtTextOut(hdc, col + TEXT_X(ix), row, foptions,
pcliprect, text + ix, 1, padding);
}
#endif
***************
*** 5868,5874 ****
{
static int *padding = NULL;
static int pad_size = 0;
- int i;
const RECT *pcliprect = NULL;
UINT foptions = 0;
static WCHAR *unicodebuf = NULL;
--- 5868,5873 ----
***************
*** 5959,5964 ****
--- 5958,5965 ----

if (pad_size != Columns || padding == NULL || padding[0] != gui.char_width)
{
+ int i;
+
vim_free(padding);
pad_size = Columns;

*** ../vim-8.2.4255/src/os_win32.c 2022-01-25 10:30:52.477915877 +0000
--- src/os_win32.c 2022-01-29 15:26:54.279472325 +0000
***************
*** 427,433 ****
DWORD nLength UNUSED,
LPDWORD lpEvents)
{
! return read_console_input(hInput, lpBuffer, -1, lpEvents);
}

# ifdef FEAT_CLIENTSERVER
--- 427,433 ----
DWORD nLength UNUSED,
LPDWORD lpEvents)
{
! return read_console_input(hInput, lpBuffer, (DWORD)-1, lpEvents);
}

# ifdef FEAT_CLIENTSERVER
***************
*** 439,445 ****
DWORD dwMilliseconds,
DWORD dwWakeMask)
{
! if (read_console_input(NULL, NULL, -2, NULL))
return WAIT_OBJECT_0;
return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll,
dwMilliseconds, dwWakeMask);
--- 439,445 ----
DWORD dwMilliseconds,
DWORD dwWakeMask)
{
! if (read_console_input(NULL, NULL, (DWORD)-2, NULL))
return WAIT_OBJECT_0;
return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll,
dwMilliseconds, dwWakeMask);
***************
*** 5537,5543 ****
{
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 terminate_all(job->jv_proc_info.hProcess, -1) ? OK : FAIL;
}
--- 5537,5543 ----
{
if (job->jv_channel != NULL && job->jv_channel->ch_anonymous_pipe)
job->jv_channel->ch_killing = TRUE;
! return TerminateJobObject(job->jv_job_object, (UINT)-1) ? OK : FAIL;
}
return terminate_all(job->jv_proc_info.hProcess, -1) ? OK : FAIL;
}
***************
*** 6270,6276 ****
cchwritten = 1;
}

! if (cchwritten == length)
{
written = cbToWrite;
g_coord.X += (SHORT)cells;
--- 6270,6276 ----
cchwritten = 1;
}

! if (cchwritten == (DWORD)length)
{
written = cbToWrite;
g_coord.X += (SHORT)cells;
*** ../vim-8.2.4255/src/version.c 2022-01-29 15:19:19.550172372 +0000
--- src/version.c 2022-01-29 15:27:41.314780090 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4256,
/**/

--
ARTHUR: Old woman!
DENNIS: Man!
ARTHUR: Man. I'm sorry. Old man, What knight live in that castle over there?
DENNIS: I'm thirty-seven.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///