K.Takata's patch queue for Vim
| リビジョン | 7e817eac1f6322a627a4093160f79ad68d5922da (tree) |
|---|---|
| 日時 | 2022-01-27 21:04:45 |
| 作者 | K.Takata <kentkt@csc....> |
| コミッター | K.Takata |
Add a new patch
series (diff) suppress-warnings.patch (diff)| @@ -30,4 +30,5 @@ | ||
| 30 | 30 | wip-win32-vimdir-encoding.patch #+wip |
| 31 | 31 | win32-directwrite-ambiwidth-auto.patch |
| 32 | 32 | dont-use-set_guifontwide-on-windows.patch |
| 33 | +suppress-warnings.patch | |
| 33 | 34 | fix-config_cache-removal.patch #+rejected |
| @@ -0,0 +1,80 @@ | ||
| 1 | +# HG changeset patch | |
| 2 | +# Parent 5bf0dff700532f48b95a277278f707b7038523c5 | |
| 3 | + | |
| 4 | +diff --git a/src/gui_w32.c b/src/gui_w32.c | |
| 5 | +--- a/src/gui_w32.c | |
| 6 | ++++ b/src/gui_w32.c | |
| 7 | +@@ -5852,7 +5852,7 @@ latin9_to_ucs(char_u *text, int len, WCH | |
| 8 | + * noticeably so. | |
| 9 | + */ | |
| 10 | + static void | |
| 11 | +-RevOut( HDC s_hdc, | |
| 12 | ++RevOut( HDC hdc, | |
| 13 | + int col, | |
| 14 | + int row, | |
| 15 | + UINT foptions, | |
| 16 | +@@ -5864,7 +5864,7 @@ RevOut( HDC s_hdc, | |
| 17 | + int ix; | |
| 18 | + | |
| 19 | + for (ix = 0; ix < (int)len; ++ix) | |
| 20 | +- ExtTextOut(s_hdc, col + TEXT_X(ix), row, foptions, | |
| 21 | ++ ExtTextOut(hdc, col + TEXT_X(ix), row, foptions, | |
| 22 | + pcliprect, text + ix, 1, padding); | |
| 23 | + } | |
| 24 | + #endif | |
| 25 | +@@ -5940,7 +5940,6 @@ gui_mch_draw_string( | |
| 26 | + { | |
| 27 | + static int *padding = NULL; | |
| 28 | + static int pad_size = 0; | |
| 29 | +- int i; | |
| 30 | + const RECT *pcliprect = NULL; | |
| 31 | + UINT foptions = 0; | |
| 32 | + static WCHAR *unicodebuf = NULL; | |
| 33 | +@@ -6031,6 +6030,8 @@ gui_mch_draw_string( | |
| 34 | + | |
| 35 | + if (pad_size != Columns || padding == NULL || padding[0] != gui.char_width) | |
| 36 | + { | |
| 37 | ++ int i; | |
| 38 | ++ | |
| 39 | + vim_free(padding); | |
| 40 | + pad_size = Columns; | |
| 41 | + | |
| 42 | +diff --git a/src/os_win32.c b/src/os_win32.c | |
| 43 | +--- a/src/os_win32.c | |
| 44 | ++++ b/src/os_win32.c | |
| 45 | +@@ -406,7 +406,7 @@ peek_console_input( | |
| 46 | + DWORD nLength UNUSED, | |
| 47 | + LPDWORD lpEvents) | |
| 48 | + { | |
| 49 | +- return read_console_input(hInput, lpBuffer, -1, lpEvents); | |
| 50 | ++ return read_console_input(hInput, lpBuffer, (DWORD)-1, lpEvents); | |
| 51 | + } | |
| 52 | + | |
| 53 | + # ifdef FEAT_CLIENTSERVER | |
| 54 | +@@ -418,7 +418,7 @@ msg_wait_for_multiple_objects( | |
| 55 | + DWORD dwMilliseconds, | |
| 56 | + DWORD dwWakeMask) | |
| 57 | + { | |
| 58 | +- if (read_console_input(NULL, NULL, -2, NULL)) | |
| 59 | ++ if (read_console_input(NULL, NULL, (DWORD)-2, NULL)) | |
| 60 | + return WAIT_OBJECT_0; | |
| 61 | + return MsgWaitForMultipleObjects(nCount, pHandles, fWaitAll, | |
| 62 | + dwMilliseconds, dwWakeMask); | |
| 63 | +@@ -5538,7 +5538,7 @@ mch_signal_job(job_T *job, char_u *how) | |
| 64 | + { | |
| 65 | + if (job->jv_channel != NULL && job->jv_channel->ch_anonymous_pipe) | |
| 66 | + job->jv_channel->ch_killing = TRUE; | |
| 67 | +- return TerminateJobObject(job->jv_job_object, -1) ? OK : FAIL; | |
| 68 | ++ return TerminateJobObject(job->jv_job_object, (UINT)-1) ? OK : FAIL; | |
| 69 | + } | |
| 70 | + return terminate_all(job->jv_proc_info.hProcess, -1) ? OK : FAIL; | |
| 71 | + } | |
| 72 | +@@ -6271,7 +6271,7 @@ write_chars( | |
| 73 | + cchwritten = 1; | |
| 74 | + } | |
| 75 | + | |
| 76 | +- if (cchwritten == length) | |
| 77 | ++ if (cchwritten == (DWORD)length) | |
| 78 | + { | |
| 79 | + written = cbToWrite; | |
| 80 | + g_coord.X += (SHORT)cells; |
Fork