*** ../vim72.320/src/gui_w32.c	Wed Dec 23 09:36:52 2009
--- src/gui_w32.c	Wed Dec 23 09:53:55 2009
***************
*** 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)