aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

updated for version 7.3.1284

Browse Source 
Problem:    Compiler warnings in MS-Windows clipboard handling.
Solution:   Add type casts. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2013-07-01 21:08:48 +02:00
parent 72fe56f298
commit 2982e70243
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -728,6 +728,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 */
/**/
1284,
/**/ /**/
1283, 1283,
/**/ /**/

12
src/winclip.c
View File

@@ -180,7 +180,7 @@ WideCharToMultiByte_alloc(UINT cp, DWORD flags,
{ {
*outlen = WideCharToMultiByte(cp, flags, in, inlen, NULL, 0, def, useddef); *outlen = WideCharToMultiByte(cp, flags, in, inlen, NULL, 0, def, useddef);
/* Add one one byte to avoid a zero-length alloc(). */ /* Add one one byte to avoid a zero-length alloc(). */
*out = alloc((unsigned)*outlen + 1); *out = (LPSTR)alloc((unsigned)*outlen + 1);
if (*out != NULL) if (*out != NULL)
{ {
WideCharToMultiByte(cp, flags, in, inlen, *out, *outlen, def, useddef); WideCharToMultiByte(cp, flags, in, inlen, *out, *outlen, def, useddef);
@@ -557,7 +557,7 @@ clip_mch_set_selection(VimClipboard *cbd)
return; /* out of memory */ return; /* out of memory */
} }
WideCharToMultiByte(GetACP(), 0, out, len, WideCharToMultiByte(GetACP(), 0, out, len,
str, metadata.txtlen, 0, 0); (LPSTR)str, metadata.txtlen, 0, 0);
/* Allocate memory for the UTF-16 text, add one NUL word to /* Allocate memory for the UTF-16 text, add one NUL word to
* terminate the string. */ * terminate the string. */
@@ -584,7 +584,7 @@ clip_mch_set_selection(VimClipboard *cbd)
if (lpszMem) if (lpszMem)
{ {
vim_strncpy(lpszMem, str, metadata.txtlen); vim_strncpy((char_u *)lpszMem, str, metadata.txtlen);
GlobalUnlock(hMem); GlobalUnlock(hMem);
} }
} }
@@ -677,7 +677,8 @@ enc_to_utf16(char_u *str, int *lenp)
{ {
/* We can do any CP### -> UTF-16 in one pass, and we can do it /* We can do any CP### -> UTF-16 in one pass, and we can do it
* without iconv() (convert_* may need iconv). */ * without iconv() (convert_* may need iconv). */
MultiByteToWideChar_alloc(enc_codepage, 0, str, *lenp, &ret, &length); MultiByteToWideChar_alloc(enc_codepage, 0, (LPCSTR)str, *lenp,
&ret, &length);
} }
else else
{ {
@@ -787,7 +788,8 @@ acp_to_enc(str, str_size, out, outlen)
{ {
LPWSTR widestr; LPWSTR widestr;
MultiByteToWideChar_alloc(GetACP(), 0, str, str_size, &widestr, outlen); MultiByteToWideChar_alloc(GetACP(), 0, (LPCSTR)str, str_size,
&widestr, outlen);
if (widestr != NULL) if (widestr != NULL)
{ {
++*outlen; /* Include the 0 after the string */ ++*outlen; /* Include the 0 after the string */