To: vim-dev@vim.org

Subject: Patch 7.2.323 (extra)

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.2.323 (extra)

Problem:    Balloon evaluation crashes on Win64.

Solution:   Change pointer types. (Sergey Khorev)

Files:	    src/gui_w32.c

*** ../vim-7.2.322/src/gui_w32.c	2009-01-28 21:22:20.000000000 +0100

--- src/gui_w32.c	2009-12-24 16:06:41.000000000 +0100

***************

*** 212,223 ****

      DWORD dwPlatformID;

  } DLLVERSIONINFO;

  typedef struct tagTOOLINFOA_NEW

  {

  	UINT cbSize;

  	UINT uFlags;

  	HWND hwnd;

! 	UINT uId;

  	RECT rect;

  	HINSTANCE hinst;

  	LPSTR lpszText;

--- 212,225 ----

      DWORD dwPlatformID;

  } DLLVERSIONINFO;

+ #include <poppack.h>

+ 

  typedef struct tagTOOLINFOA_NEW

  {

  	UINT cbSize;

  	UINT uFlags;

  	HWND hwnd;

! 	UINT_PTR uId;

  	RECT rect;

  	HINSTANCE hinst;

  	LPSTR lpszText;

***************

*** 227,241 ****

  typedef struct tagNMTTDISPINFO_NEW

  {

      NMHDR      hdr;

!     LPTSTR     lpszText;

      char       szText[80];

      HINSTANCE  hinst;

      UINT       uFlags;

      LPARAM     lParam;

  } NMTTDISPINFO_NEW;

- #include <poppack.h>

- 

  typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);

  #ifndef TTM_SETMAXTIPWIDTH

  # define TTM_SETMAXTIPWIDTH	(WM_USER+24)

--- 229,241 ----

  typedef struct tagNMTTDISPINFO_NEW

  {

      NMHDR      hdr;

!     LPSTR      lpszText;

      char       szText[80];

      HINSTANCE  hinst;

      UINT       uFlags;

      LPARAM     lParam;

  } NMTTDISPINFO_NEW;

  typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(DLLVERSIONINFO *);

  #ifndef TTM_SETMAXTIPWIDTH

  # define TTM_SETMAXTIPWIDTH	(WM_USER+24)

*** ../vim-7.2.322/src/version.c	2009-12-24 15:45:53.000000000 +0100

--- src/version.c	2009-12-24 16:08:33.000000000 +0100

***************

*** 683,684 ****

--- 683,686 ----

  {   /* Add new patch number below this line */

+ /**/

+     323,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

46. Your wife makes a new rule: "The computer cannot come to bed."

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\        download, build and distribute -- http://www.A-A-P.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///