projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 3e524028 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.089 (extra) | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.089 (extra) | |
| 11 | Problem: Win32: crash when using Ultramon buttons. | |
| 12 | Solution: Don't use a WM_OLE message of zero size. (Ray Megal) | |
| 13 | Files: src/if_ole.cpp, src/gui_w48.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.088/src/if_ole.cpp Sun Mar 16 14:53:11 2008 | |
| 17 | --- src/if_ole.cpp Mon Jan 19 21:16:33 2009 | |
| 18 | *************** | |
| 19 | *** 353,361 **** | |
| 20 | } | |
| 21 | ||
| 22 | /* Pass the string to the main input loop. The memory will be freed when | |
| 23 | ! * the message is processed. | |
| 24 | */ | |
| 25 | ! PostMessage(NULL, WM_OLE, 0, (LPARAM)str); | |
| 26 | ||
| 27 | return S_OK; | |
| 28 | } | |
| 29 | --- 353,365 ---- | |
| 30 | } | |
| 31 | ||
| 32 | /* Pass the string to the main input loop. The memory will be freed when | |
| 33 | ! * the message is processed. Except for an empty message, we don't need | |
| 34 | ! * to post it then. | |
| 35 | */ | |
| 36 | ! if (*str == NUL) | |
| 37 | ! vim_free(str); | |
| 38 | ! else | |
| 39 | ! PostMessage(NULL, WM_OLE, 0, (LPARAM)str); | |
| 40 | ||
| 41 | return S_OK; | |
| 42 | } | |
| 43 | *** ../vim-7.2.088/src/gui_w48.c Wed Dec 24 12:20:10 2008 | |
| 44 | --- src/gui_w48.c Mon Jan 19 21:19:30 2009 | |
| 45 | *************** | |
| 46 | *** 1663,1670 **** | |
| 47 | if (msg.message == WM_OLE) | |
| 48 | { | |
| 49 | char_u *str = (char_u *)msg.lParam; | |
| 50 | ! add_to_input_buf(str, (int)STRLEN(str)); | |
| 51 | ! vim_free(str); | |
| 52 | return; | |
| 53 | } | |
| 54 | #endif | |
| 55 | --- 1663,1679 ---- | |
| 56 | if (msg.message == WM_OLE) | |
| 57 | { | |
| 58 | char_u *str = (char_u *)msg.lParam; | |
| 59 | ! if (str == NULL || *str == NUL) | |
| 60 | ! { | |
| 61 | ! /* Message can't be ours, forward it. Fixes problem with Ultramon | |
| 62 | ! * 3.0.4 */ | |
| 63 | ! DispatchMessage(&msg); | |
| 64 | ! } | |
| 65 | ! else | |
| 66 | ! { | |
| 67 | ! add_to_input_buf(str, (int)STRLEN(str)); | |
| 68 | ! vim_free(str); /* was allocated in CVim::SendKeys() */ | |
| 69 | ! } | |
| 70 | return; | |
| 71 | } | |
| 72 | #endif | |
| 73 | *** ../vim-7.2.088/src/version.c Thu Jan 22 21:49:21 2009 | |
| 74 | --- src/version.c Wed Jan 28 14:16:01 2009 | |
| 75 | *************** | |
| 76 | *** 678,679 **** | |
| 77 | --- 678,681 ---- | |
| 78 | { /* Add new patch number below this line */ | |
| 79 | + /**/ | |
| 80 | + 89, | |
| 81 | /**/ | |
| 82 | ||
| 83 | ||
| 84 | -- | |
| 85 | How To Keep A Healthy Level Of Insanity: | |
| 86 | 16. Have your coworkers address you by your wrestling name, Rock Hard Kim. | |
| 87 | ||
| 88 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 89 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 90 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 91 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |