projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 8587d00a AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.362 (extra) | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.362 (extra, after 7.2.352) | |
| 11 | Problem: Win64: Vim doesn't work when cross-compiled with MingW libraries. | |
| 12 | Solution: Instead of handling WM_NCCREATE, create wide text area window | |
| 13 | class if the parent window iw side. (Sergey Khorev) | |
| 14 | Files: src/gui_w32.c, src/gui_w48.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.2.361/src/gui_w32.c 2009-12-24 16:11:24.000000000 +0100 | |
| 18 | --- src/gui_w32.c 2010-02-17 16:26:58.000000000 +0100 | |
| 19 | *************** | |
| 20 | *** 1329,1334 **** | |
| 21 | --- 1329,1335 ---- | |
| 22 | WNDCLASS wndclass; | |
| 23 | #ifdef FEAT_MBYTE | |
| 24 | const WCHAR szVimWndClassW[] = VIM_CLASSW; | |
| 25 | + const WCHAR szTextAreaClassW[] = L"VimTextArea"; | |
| 26 | WNDCLASSW wndclassw; | |
| 27 | #endif | |
| 28 | #ifdef GLOBAL_IME | |
| 29 | *************** | |
| 30 | *** 1479,1484 **** | |
| 31 | --- 1480,1507 ---- | |
| 32 | #endif | |
| 33 | ||
| 34 | /* Create the text area window */ | |
| 35 | + #ifdef FEAT_MBYTE | |
| 36 | + if (wide_WindowProc) | |
| 37 | + { | |
| 38 | + if (GetClassInfoW(s_hinst, szTextAreaClassW, &wndclassw) == 0) | |
| 39 | + { | |
| 40 | + wndclassw.style = CS_OWNDC; | |
| 41 | + wndclassw.lpfnWndProc = _TextAreaWndProc; | |
| 42 | + wndclassw.cbClsExtra = 0; | |
| 43 | + wndclassw.cbWndExtra = 0; | |
| 44 | + wndclassw.hInstance = s_hinst; | |
| 45 | + wndclassw.hIcon = NULL; | |
| 46 | + wndclassw.hCursor = LoadCursor(NULL, IDC_ARROW); | |
| 47 | + wndclassw.hbrBackground = NULL; | |
| 48 | + wndclassw.lpszMenuName = NULL; | |
| 49 | + wndclassw.lpszClassName = szTextAreaClassW; | |
| 50 | + | |
| 51 | + if (RegisterClassW(&wndclassw) == 0) | |
| 52 | + return FAIL; | |
| 53 | + } | |
| 54 | + } | |
| 55 | + else | |
| 56 | + #endif | |
| 57 | if (GetClassInfo(s_hinst, szTextAreaClass, &wndclass) == 0) | |
| 58 | { | |
| 59 | wndclass.style = CS_OWNDC; | |
| 60 | *** ../vim-7.2.361/src/gui_w48.c 2010-02-03 12:23:16.000000000 +0100 | |
| 61 | --- src/gui_w48.c 2010-02-17 16:27:21.000000000 +0100 | |
| 62 | *************** | |
| 63 | *** 1084,1096 **** | |
| 64 | case WM_NOTIFY: Handle_WM_Notify(hwnd, (LPNMHDR)lParam); | |
| 65 | return TRUE; | |
| 66 | #endif | |
| 67 | - /* Workaround for the problem that MyWindowProc() returns FALSE on 64 | |
| 68 | - * bit windows when cross-compiled using Mingw libraries. (Andy | |
| 69 | - * Kittner) */ | |
| 70 | - case WM_NCCREATE: | |
| 71 | - MyWindowProc(hwnd, uMsg, wParam, lParam); | |
| 72 | - return TRUE; | |
| 73 | - | |
| 74 | default: | |
| 75 | return MyWindowProc(hwnd, uMsg, wParam, lParam); | |
| 76 | } | |
| 77 | --- 1084,1089 ---- | |
| 78 | *** ../vim-7.2.361/src/version.c 2010-02-17 16:23:03.000000000 +0100 | |
| 79 | --- src/version.c 2010-02-17 16:30:52.000000000 +0100 | |
| 80 | *************** | |
| 81 | *** 683,684 **** | |
| 82 | --- 683,686 ---- | |
| 83 | { /* Add new patch number below this line */ | |
| 84 | + /**/ | |
| 85 | + 362, | |
| 86 | /**/ | |
| 87 | ||
| 88 | -- | |
| 89 | "Marriage is the process of finding out what kind of man your wife | |
| 90 | would have preferred" | |
| 91 | ||
| 92 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 93 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 94 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 95 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |