comparison src/os_mswin.c @ 11175:9836b701afd9 v8.0.0474

patch 8.0.0474: the client-server feature is not tested commit https://github.com/vim/vim/commit/15bf76d40be1f1622ff5cc16596c308e76e2ca94 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Mar 18 16:18:37 2017 +0100 patch 8.0.0474: the client-server feature is not tested Problem: The client-server feature is not tested. Solution: Add a test.
author Christian Brabandt <cb@256bit.org>
date Sat, 18 Mar 2017 16:30:04 +0100
parents 506f5d8b7d8b
children 76fb679a310e
comparison
equal deleted inserted replaced
11174:1b3fe8c81a43 11175:9836b701afd9
2103 /* Remember who sent this, for <client> */ 2103 /* Remember who sent this, for <client> */
2104 clientWindow = sender; 2104 clientWindow = sender;
2105 2105
2106 str = serverConvert(client_enc, (char_u *)data->lpData, &tofree); 2106 str = serverConvert(client_enc, (char_u *)data->lpData, &tofree);
2107 res = eval_client_expr_to_string(str); 2107 res = eval_client_expr_to_string(str);
2108 vim_free(tofree);
2109 2108
2110 if (res == NULL) 2109 if (res == NULL)
2111 { 2110 {
2112 res = vim_strsave((char_u *)_(e_invexprmsg)); 2111 char *err = _(e_invexprmsg);
2112 size_t len = STRLEN(str) + STRLEN(err) + 5;
2113
2114 res = alloc(len);
2115 if (res != NULL)
2116 vim_snprintf((char *)res, len, "%s: \"%s\"", err, str);
2113 reply.dwData = COPYDATA_ERROR_RESULT; 2117 reply.dwData = COPYDATA_ERROR_RESULT;
2114 } 2118 }
2115 else 2119 else
2116 reply.dwData = COPYDATA_RESULT; 2120 reply.dwData = COPYDATA_RESULT;
2117 reply.lpData = res; 2121 reply.lpData = res;
2118 reply.cbData = (DWORD)STRLEN(res) + 1; 2122 reply.cbData = (DWORD)STRLEN(res) + 1;
2119 2123
2120 serverSendEnc(sender); 2124 serverSendEnc(sender);
2121 retval = (int)SendMessage(sender, WM_COPYDATA, 2125 retval = (int)SendMessage(sender, WM_COPYDATA,
2122 (WPARAM)message_window, (LPARAM)(&reply)); 2126 (WPARAM)message_window, (LPARAM)(&reply));
2127 vim_free(tofree);
2123 vim_free(res); 2128 vim_free(res);
2124 return retval; 2129 return retval;
2125 2130
2126 case COPYDATA_REPLY: 2131 case COPYDATA_REPLY:
2127 case COPYDATA_RESULT: 2132 case COPYDATA_RESULT: