[packages/vim.git] / 6.2.495

To: vim-dev@vim.org
Subject: Patch 6.2.495 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.2.495 (extra, after 6.2.456)
Problem:    Win32: The file dialog doesn't work on Windows 95.
Solution:   Put the wide code of gui_mch_browse() in gui_mch_browseW() and use
	    it only on Windows NT/2000/XP.
Files:	    src/gui_w32.c, src/gui_w48.c


*** ../vim-6.2.494/src/gui_w32.c	Fri Apr 16 11:08:02 2004
--- src/gui_w32.c	Fri Apr 23 17:10:40 2004
***************
*** 202,209 ****
  #define VIM_NAME	"vim"
  #define VIM_CLASS	"Vim"
  
- static OSVERSIONINFO os_version;    /* like it says.  Init in gui_mch_init() */
- 
  /* Initial size for the dialog template.  For gui_mch_dialog() it's fixed,
   * thus there should be room for every dialog.  For tearoffs it's made bigger
   * when needed. */
--- 201,206 ----
***************
*** 545,551 ****
  	y = lpwpos->y;
  	cx = lpwpos->cx;
  	cy = lpwpos->cy;
!         netbeans_frame_moved(x, y);
      }
      /* Allow to send WM_SIZE and WM_MOVE */
      FORWARD_WM_WINDOWPOSCHANGED(hwnd, lpwpos, DefWindowProc);
--- 542,548 ----
  	y = lpwpos->y;
  	cx = lpwpos->cx;
  	cy = lpwpos->cy;
! 	netbeans_frame_moved(x, y);
      }
      /* Allow to send WM_SIZE and WM_MOVE */
      FORWARD_WM_WINDOWPOSCHANGED(hwnd, lpwpos, DefWindowProc);
*** ../vim-6.2.494/src/gui_w48.c	Mon Apr 19 20:29:16 2004
--- src/gui_w48.c	Fri Apr 23 17:11:29 2004
***************
*** 286,291 ****
--- 286,295 ----
  static int		s_timed_out = FALSE;
  static int		dead_key = 0;	/* 0 - no dead key, 1 - dead key pressed */
  
+ #ifdef WIN3264
+ static OSVERSIONINFO os_version;    /* like it says.  Init in gui_mch_init() */
+ #endif
+ 
  #ifdef FEAT_BEVAL
  /* balloon-eval WM_NOTIFY_HANDLER */
  static void Handle_WM_Notify __ARGS((HWND hwnd, LPNMHDR pnmh));
***************
*** 2710,2739 ****
  
  #ifdef FEAT_BROWSE
  /*
!  * Convert the string s to the proper format for a filter string by replacing
!  * the \t and \n delimeters with \0.
!  * Returns the converted string in allocated memory.
   */
- # ifdef FEAT_MBYTE
      static WCHAR *
! # else
!     static char_u *
! # endif
! convert_filter(char_u *s)
  {
- # ifdef FEAT_MBYTE
      WCHAR	*res;
- # else
-     char_u	*res;
- # endif
      unsigned	s_len = (unsigned)STRLEN(s);
      unsigned	i;
  
! # ifdef FEAT_MBYTE
!     res = (WCHAR *)alloc((s_len + 3) * 2);
! # else
!     res = alloc(s_len + 3);
! # endif
      if (res != NULL)
      {
  	for (i = 0; i < s_len; ++i)
--- 2714,2736 ----
  
  #ifdef FEAT_BROWSE
  /*
!  * The file browser exists in two versions: with "W" uses wide characters,
!  * without "W" the current codepage.  When FEAT_MBYTE is defined and on
!  * Windows NT/2000/XP the "W" functions are used.
!  */
! 
! # if defined(FEAT_MBYTE) && defined(WIN3264)
! /*
!  * Wide version of convert_filter().  Keep in sync!
   */
      static WCHAR *
! convert_filterW(char_u *s)
  {
      WCHAR	*res;
      unsigned	s_len = (unsigned)STRLEN(s);
      unsigned	i;
  
!     res = (WCHAR *)alloc((s_len + 3) * sizeof(WCHAR));
      if (res != NULL)
      {
  	for (i = 0; i < s_len; ++i)
***************
*** 2750,2766 ****
  }
  
  /*
!  * Pop open a file browser and return the file selected, in allocated memory,
!  * or NULL if Cancel is hit.
!  *  saving  - TRUE if the file will be saved to, FALSE if it will be opened.
!  *  title   - Title message for the file browser dialog.
!  *  dflt    - Default name of file.
!  *  ext     - Default extension to be added to files without extensions.
!  *  initdir - directory in which to open the browser (NULL = current dir)
!  *  filter  - Filter for matched files to choose from.
   */
!     char_u *
! gui_mch_browse(
  	int saving,
  	char_u *title,
  	char_u *dflt,
--- 2747,2756 ----
  }
  
  /*
!  * Wide version of gui_mch_browse().  Keep in sync!
   */
!     static char_u *
! gui_mch_browseW(
  	int saving,
  	char_u *title,
  	char_u *dflt,
***************
*** 2768,2774 ****
  	char_u *initdir,
  	char_u *filter)
  {
- #ifdef FEAT_MBYTE
      /* We always use the wide function.  This means enc_to_ucs2() must work,
       * otherwise it fails miserably! */
      OPENFILENAMEW	fileStruct;
--- 2758,2763 ----
***************
*** 2779,2797 ****
      WCHAR		*extp = NULL;
      WCHAR		*initdirp = NULL;
      WCHAR		*filterp;
- #else
-     OPENFILENAME	fileStruct;
-     char_u		fileBuf[MAXPATHL];
-     char_u		*initdirp = NULL;
-     char_u		*filterp;
- #endif
      char_u		*p;
  
      if (dflt == NULL)
  	fileBuf[0] = NUL;
      else
      {
- #ifdef FEAT_MBYTE
  	wp = enc_to_ucs2(dflt, NULL);
  	if (wp == NULL)
  	    fileBuf[0] = NUL;
--- 2768,2779 ----
***************
*** 2802,2840 ****
  	    fileBuf[i] = NUL;
  	    vim_free(wp);
  	}
- #else
- 	STRNCPY(fileBuf, dflt, MAXPATHL - 1);
- 	fileBuf[MAXPATHL - 1] = NUL;
- #endif
      }
  
      /* Convert the filter to Windows format. */
!     filterp = convert_filter(filter);
  
!     memset(&fileStruct, 0, sizeof(OPENFILENAME));
  #ifdef OPENFILENAME_SIZE_VERSION_400
      /* be compatible with Windows NT 4.0 */
!     /* TODO: what when using OPENFILENAMEW??? */
      fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
  #else
      fileStruct.lStructSize = sizeof(fileStruct);
  #endif
  
- #ifdef FEAT_MBYTE
      if (title != NULL)
  	titlep = enc_to_ucs2(title, NULL);
      fileStruct.lpstrTitle = titlep;
- #else
-     fileStruct.lpstrTitle = title;
- #endif
  
- #ifdef FEAT_MBYTE
      if (ext != NULL)
  	extp = enc_to_ucs2(ext, NULL);
      fileStruct.lpstrDefExt = extp;
- #else
-     fileStruct.lpstrDefExt = ext;
- #endif
  
      fileStruct.lpstrFile = fileBuf;
      fileStruct.nMaxFile = MAXPATHL;
--- 2784,2810 ----
  	    fileBuf[i] = NUL;
  	    vim_free(wp);
  	}
      }
  
      /* Convert the filter to Windows format. */
!     filterp = convert_filterW(filter);
  
!     memset(&fileStruct, 0, sizeof(OPENFILENAMEW));
  #ifdef OPENFILENAME_SIZE_VERSION_400
      /* be compatible with Windows NT 4.0 */
!     /* TODO: what to use for OPENFILENAMEW??? */
      fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
  #else
      fileStruct.lStructSize = sizeof(fileStruct);
  #endif
  
      if (title != NULL)
  	titlep = enc_to_ucs2(title, NULL);
      fileStruct.lpstrTitle = titlep;
  
      if (ext != NULL)
  	extp = enc_to_ucs2(ext, NULL);
      fileStruct.lpstrDefExt = extp;
  
      fileStruct.lpstrFile = fileBuf;
      fileStruct.nMaxFile = MAXPATHL;
***************
*** 2844,2850 ****
      if (initdir != NULL && *initdir != NUL)
      {
  	/* Must have backslashes here, no matter what 'shellslash' says */
- #ifdef FEAT_MBYTE
  	initdirp = enc_to_ucs2(initdir, NULL);
  	if (initdirp != NULL)
  	{
--- 2814,2819 ----
***************
*** 2852,2864 ****
  		if (*wp == '/')
  		    *wp = '\\';
  	}
- #else
- 	initdirp = vim_strsave(initdir);
- 	if (initdirp != NULL)
- 	    for (p = initdirp; *p != NUL; ++p)
- 		if (*p == '/')
- 		    *p = '\\';
- #endif
  	fileStruct.lpstrInitialDir = initdirp;
      }
  
--- 2821,2826 ----
***************
*** 2877,2913 ****
  #endif
      if (saving)
      {
- #ifdef FEAT_MBYTE
  	if (!GetSaveFileNameW(&fileStruct))
- #else
- 	if (!GetSaveFileName(&fileStruct))
- #endif
  	    return NULL;
      }
      else
      {
- #ifdef FEAT_MBYTE
  	if (!GetOpenFileNameW(&fileStruct))
- #else
- 	if (!GetOpenFileName(&fileStruct))
- #endif
  	    return NULL;
      }
  
      vim_free(filterp);
      vim_free(initdirp);
- #ifdef FEAT_MBYTE
      vim_free(titlep);
      vim_free(extp);
- #endif
  
- #ifdef FEAT_MBYTE
      /* Convert from UCS2 to 'encoding'. */
      p = ucs2_to_enc(fileBuf, NULL);
!     if (p != NULL)		/* when out of memory we get garbage... */
  	STRCPY(fileBuf, p);
      vim_free(p);
  #endif
  
      /* Give focus back to main window (when using MDI). */
      SetFocus(s_hwnd);
--- 2839,3004 ----
  #endif
      if (saving)
      {
  	if (!GetSaveFileNameW(&fileStruct))
  	    return NULL;
      }
      else
      {
  	if (!GetOpenFileNameW(&fileStruct))
  	    return NULL;
      }
  
      vim_free(filterp);
      vim_free(initdirp);
      vim_free(titlep);
      vim_free(extp);
  
      /* Convert from UCS2 to 'encoding'. */
      p = ucs2_to_enc(fileBuf, NULL);
!     if (p != NULL)
! 	/* when out of memory we get garbage for non-ASCII chars */
  	STRCPY(fileBuf, p);
      vim_free(p);
+ 
+     /* Give focus back to main window (when using MDI). */
+     SetFocus(s_hwnd);
+ 
+     /* Shorten the file name if possible */
+     mch_dirname(IObuff, IOSIZE);
+     p = shorten_fname((char_u *)fileBuf, IObuff);
+     if (p == NULL)
+ 	p = (char_u *)fileBuf;
+     return vim_strsave(p);
+ }
+ # endif /* FEAT_MBYTE */
+ 
+ 
+ /*
+  * Convert the string s to the proper format for a filter string by replacing
+  * the \t and \n delimeters with \0.
+  * Returns the converted string in allocated memory.
+  *
+  * Keep in sync with convert_filterW() above!
+  */
+     static char_u *
+ convert_filter(char_u *s)
+ {
+     char_u	*res;
+     unsigned	s_len = (unsigned)STRLEN(s);
+     unsigned	i;
+ 
+     res = alloc(s_len + 3);
+     if (res != NULL)
+     {
+ 	for (i = 0; i < s_len; ++i)
+ 	    if (s[i] == '\t' || s[i] == '\n')
+ 		res[i] = '\0';
+ 	    else
+ 		res[i] = s[i];
+ 	res[s_len] = NUL;
+ 	/* Add two extra NULs to make sure it's properly terminated. */
+ 	res[s_len + 1] = NUL;
+ 	res[s_len + 2] = NUL;
+     }
+     return res;
+ }
+ 
+ /*
+  * Pop open a file browser and return the file selected, in allocated memory,
+  * or NULL if Cancel is hit.
+  *  saving  - TRUE if the file will be saved to, FALSE if it will be opened.
+  *  title   - Title message for the file browser dialog.
+  *  dflt    - Default name of file.
+  *  ext     - Default extension to be added to files without extensions.
+  *  initdir - directory in which to open the browser (NULL = current dir)
+  *  filter  - Filter for matched files to choose from.
+  *
+  * Keep in sync with gui_mch_browseW() above!
+  */
+     char_u *
+ gui_mch_browse(
+ 	int saving,
+ 	char_u *title,
+ 	char_u *dflt,
+ 	char_u *ext,
+ 	char_u *initdir,
+ 	char_u *filter)
+ {
+     OPENFILENAME	fileStruct;
+     char_u		fileBuf[MAXPATHL];
+     char_u		*initdirp = NULL;
+     char_u		*filterp;
+     char_u		*p;
+ 
+ # if defined(FEAT_MBYTE) && defined(WIN3264)
+     if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT)
+ 	return gui_mch_browseW(saving, title, dflt, ext, initdir, filter);
+ # endif
+ 
+     if (dflt == NULL)
+ 	fileBuf[0] = NUL;
+     else
+     {
+ 	STRNCPY(fileBuf, dflt, MAXPATHL - 1);
+ 	fileBuf[MAXPATHL - 1] = NUL;
+     }
+ 
+     /* Convert the filter to Windows format. */
+     filterp = convert_filter(filter);
+ 
+     memset(&fileStruct, 0, sizeof(OPENFILENAME));
+ #ifdef OPENFILENAME_SIZE_VERSION_400
+     /* be compatible with Windows NT 4.0 */
+     fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
+ #else
+     fileStruct.lStructSize = sizeof(fileStruct);
  #endif
+ 
+     fileStruct.lpstrTitle = title;
+     fileStruct.lpstrDefExt = ext;
+ 
+     fileStruct.lpstrFile = fileBuf;
+     fileStruct.nMaxFile = MAXPATHL;
+     fileStruct.lpstrFilter = filterp;
+     fileStruct.hwndOwner = s_hwnd;		/* main Vim window is owner*/
+     /* has an initial dir been specified? */
+     if (initdir != NULL && *initdir != NUL)
+     {
+ 	/* Must have backslashes here, no matter what 'shellslash' says */
+ 	initdirp = vim_strsave(initdir);
+ 	if (initdirp != NULL)
+ 	    for (p = initdirp; *p != NUL; ++p)
+ 		if (*p == '/')
+ 		    *p = '\\';
+ 	fileStruct.lpstrInitialDir = initdirp;
+     }
+ 
+     /*
+      * TODO: Allow selection of multiple files.  Needs another arg to this
+      * function to ask for it, and need to use OFN_ALLOWMULTISELECT below.
+      * Also, should we use OFN_FILEMUSTEXIST when opening?  Vim can edit on
+      * files that don't exist yet, so I haven't put it in.  What about
+      * OFN_PATHMUSTEXIST?
+      * Don't use OFN_OVERWRITEPROMPT, Vim has its own ":confirm" dialog.
+      */
+     fileStruct.Flags = (OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY);
+ #ifdef FEAT_SHORTCUT
+     if (curbuf->b_p_bin)
+ 	fileStruct.Flags |= OFN_NODEREFERENCELINKS;
+ #endif
+     if (saving)
+     {
+ 	if (!GetSaveFileName(&fileStruct))
+ 	    return NULL;
+     }
+     else
+     {
+ 	if (!GetOpenFileName(&fileStruct))
+ 	    return NULL;
+     }
+ 
+     vim_free(filterp);
+     vim_free(initdirp);
  
      /* Give focus back to main window (when using MDI). */
      SetFocus(s_hwnd);
*** ../vim-6.2.494/src/version.c	Fri Apr 23 15:40:30 2004
--- src/version.c	Sun Apr 25 13:03:26 2004
***************
*** 639,640 ****
--- 639,642 ----
  {   /* Add new patch number below this line */
+ /**/
+     495,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
28. You have comandeered your teenager's phone line for the net and even his
    friends know not to call on his line anymore.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///
Commit	Line	Data
2bb96920 AG	1	To: vim-dev@vim.org
	2	Subject: Patch 6.2.495 (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 6.2.495 (extra, after 6.2.456)
	11	Problem: Win32: The file dialog doesn't work on Windows 95.
	12	Solution: Put the wide code of gui_mch_browse() in gui_mch_browseW() and use
	13	it only on Windows NT/2000/XP.
	14	Files: src/gui_w32.c, src/gui_w48.c
	15
	16
	17	*** ../vim-6.2.494/src/gui_w32.c Fri Apr 16 11:08:02 2004
	18	--- src/gui_w32.c Fri Apr 23 17:10:40 2004
	19	***************
	20	* 202,209 **
	21	#define VIM_NAME "vim"
	22	#define VIM_CLASS "Vim"
	23
	24	- static OSVERSIONINFO os_version; /* like it says. Init in gui_mch_init() */
	25	-
	26	/* Initial size for the dialog template. For gui_mch_dialog() it's fixed,
	27	* thus there should be room for every dialog. For tearoffs it's made bigger
	28	* when needed. */
	29	--- 201,206 ----
	30	***************
	31	* 545,551 **
	32	y = lpwpos->y;
	33	cx = lpwpos->cx;
	34	cy = lpwpos->cy;
	35	! netbeans_frame_moved(x, y);
	36	}
	37	/* Allow to send WM_SIZE and WM_MOVE */
	38	FORWARD_WM_WINDOWPOSCHANGED(hwnd, lpwpos, DefWindowProc);
	39	--- 542,548 ----
	40	y = lpwpos->y;
	41	cx = lpwpos->cx;
	42	cy = lpwpos->cy;
	43	! netbeans_frame_moved(x, y);
	44	}
	45	/* Allow to send WM_SIZE and WM_MOVE */
	46	FORWARD_WM_WINDOWPOSCHANGED(hwnd, lpwpos, DefWindowProc);
	47	*** ../vim-6.2.494/src/gui_w48.c Mon Apr 19 20:29:16 2004
	48	--- src/gui_w48.c Fri Apr 23 17:11:29 2004
	49	***************
	50	* 286,291 **
	51	--- 286,295 ----
	52	static int s_timed_out = FALSE;
	53	static int dead_key = 0; /* 0 - no dead key, 1 - dead key pressed */
	54
	55	+ #ifdef WIN3264
	56	+ static OSVERSIONINFO os_version; /* like it says. Init in gui_mch_init() */
	57	+ #endif
	58	+
	59	#ifdef FEAT_BEVAL
	60	/* balloon-eval WM_NOTIFY_HANDLER */
	61	static void Handle_WM_Notify __ARGS((HWND hwnd, LPNMHDR pnmh));
	62	***************
	63	* 2710,2739 **
	64
65	#ifdef FEAT_BROWSE
66	/*
67	! * Convert the string s to the proper format for a filter string by replacing
68	! * the \t and \n delimeters with \0.
69	! * Returns the converted string in allocated memory.
70	*/
71	- # ifdef FEAT_MBYTE
72	static WCHAR *
73	! # else
74	! static char_u *
75	! # endif
76	! convert_filter(char_u *s)
77	{
78	- # ifdef FEAT_MBYTE
79	WCHAR *res;
80	- # else
81	- char_u *res;
82	- # endif
83	unsigned s_len = (unsigned)STRLEN(s);
84	unsigned i;
85
86	! # ifdef FEAT_MBYTE
87	! res = (WCHAR )alloc((s_len + 3) 2);
88	! # else
89	! res = alloc(s_len + 3);
90	! # endif
91	if (res != NULL)
92	{
93	for (i = 0; i < s_len; ++i)
94	--- 2714,2736 ----
95
96	#ifdef FEAT_BROWSE
97	/*
98	! * The file browser exists in two versions: with "W" uses wide characters,
99	! * without "W" the current codepage. When FEAT_MBYTE is defined and on
100	! * Windows NT/2000/XP the "W" functions are used.
101	! */
102	!
103	! # if defined(FEAT_MBYTE) && defined(WIN3264)
104	! /*
105	! * Wide version of convert_filter(). Keep in sync!
106	*/
107	static WCHAR *
108	! convert_filterW(char_u *s)
109	{
110	WCHAR *res;
111	unsigned s_len = (unsigned)STRLEN(s);
112	unsigned i;
113
114	! res = (WCHAR )alloc((s_len + 3) sizeof(WCHAR));
115	if (res != NULL)
116	{
117	for (i = 0; i < s_len; ++i)
118	***************
119	* 2750,2766 **
120	}
121
122	/*
123	! * Pop open a file browser and return the file selected, in allocated memory,
124	! * or NULL if Cancel is hit.
125	! * saving - TRUE if the file will be saved to, FALSE if it will be opened.
126	! * title - Title message for the file browser dialog.
127	! * dflt - Default name of file.
128	! * ext - Default extension to be added to files without extensions.
129	! * initdir - directory in which to open the browser (NULL = current dir)
130	! * filter - Filter for matched files to choose from.
131	*/
132	! char_u *
133	! gui_mch_browse(
134	int saving,
135	char_u *title,
136	char_u *dflt,
137	--- 2747,2756 ----
138	}
139
140	/*
141	! * Wide version of gui_mch_browse(). Keep in sync!
142	*/
143	! static char_u *
144	! gui_mch_browseW(
145	int saving,
146	char_u *title,
147	char_u *dflt,
148	***************
149	* 2768,2774 **
150	char_u *initdir,
151	char_u *filter)
152	{
153	- #ifdef FEAT_MBYTE
154	/* We always use the wide function. This means enc_to_ucs2() must work,
155	* otherwise it fails miserably! */
156	OPENFILENAMEW fileStruct;
157	--- 2758,2763 ----
158	***************
159	* 2779,2797 **
160	WCHAR *extp = NULL;
161	WCHAR *initdirp = NULL;
162	WCHAR *filterp;
163	- #else
164	- OPENFILENAME fileStruct;
165	- char_u fileBuf[MAXPATHL];
166	- char_u *initdirp = NULL;
167	- char_u *filterp;
168	- #endif
169	char_u *p;
170
171	if (dflt == NULL)
172	fileBuf[0] = NUL;
173	else
174	{
175	- #ifdef FEAT_MBYTE
176	wp = enc_to_ucs2(dflt, NULL);
177	if (wp == NULL)
178	fileBuf[0] = NUL;
179	--- 2768,2779 ----
180	***************
181	* 2802,2840 **
182	fileBuf[i] = NUL;
183	vim_free(wp);
184	}
185	- #else
186	- STRNCPY(fileBuf, dflt, MAXPATHL - 1);
187	- fileBuf[MAXPATHL - 1] = NUL;
188	- #endif
189	}
190
191	/* Convert the filter to Windows format. */
192	! filterp = convert_filter(filter);
193
194	! memset(&fileStruct, 0, sizeof(OPENFILENAME));
195	#ifdef OPENFILENAME_SIZE_VERSION_400
196	/* be compatible with Windows NT 4.0 */
197	! /* TODO: what when using OPENFILENAMEW??? */
198	fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
199	#else
200	fileStruct.lStructSize = sizeof(fileStruct);
201	#endif
202
203	- #ifdef FEAT_MBYTE
204	if (title != NULL)
205	titlep = enc_to_ucs2(title, NULL);
206	fileStruct.lpstrTitle = titlep;
207	- #else
208	- fileStruct.lpstrTitle = title;
209	- #endif
210
211	- #ifdef FEAT_MBYTE
212	if (ext != NULL)
213	extp = enc_to_ucs2(ext, NULL);
214	fileStruct.lpstrDefExt = extp;
215	- #else
216	- fileStruct.lpstrDefExt = ext;
217	- #endif
218
219	fileStruct.lpstrFile = fileBuf;
220	fileStruct.nMaxFile = MAXPATHL;
221	--- 2784,2810 ----
222	fileBuf[i] = NUL;
223	vim_free(wp);
224	}
225	}
226
227	/* Convert the filter to Windows format. */
228	! filterp = convert_filterW(filter);
229
230	! memset(&fileStruct, 0, sizeof(OPENFILENAMEW));
231	#ifdef OPENFILENAME_SIZE_VERSION_400
232	/* be compatible with Windows NT 4.0 */
233	! /* TODO: what to use for OPENFILENAMEW??? */
234	fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
235	#else
236	fileStruct.lStructSize = sizeof(fileStruct);
237	#endif
238
239	if (title != NULL)
240	titlep = enc_to_ucs2(title, NULL);
241	fileStruct.lpstrTitle = titlep;
242
243	if (ext != NULL)
244	extp = enc_to_ucs2(ext, NULL);
245	fileStruct.lpstrDefExt = extp;
246
247	fileStruct.lpstrFile = fileBuf;
248	fileStruct.nMaxFile = MAXPATHL;
249	***************
250	* 2844,2850 **
251	if (initdir != NULL && *initdir != NUL)
252	{
253	/* Must have backslashes here, no matter what 'shellslash' says */
254	- #ifdef FEAT_MBYTE
255	initdirp = enc_to_ucs2(initdir, NULL);
256	if (initdirp != NULL)
257	{
258	--- 2814,2819 ----
259	***************
260	* 2852,2864 **
261	if (*wp == '/')
262	*wp = '\\';
263	}
264	- #else
265	- initdirp = vim_strsave(initdir);
266	- if (initdirp != NULL)
267	- for (p = initdirp; *p != NUL; ++p)
268	- if (*p == '/')
269	- *p = '\\';
270	- #endif
271	fileStruct.lpstrInitialDir = initdirp;
272	}
273
274	--- 2821,2826 ----
275	***************
276	* 2877,2913 **
277	#endif
278	if (saving)
279	{
280	- #ifdef FEAT_MBYTE
281	if (!GetSaveFileNameW(&fileStruct))
282	- #else
283	- if (!GetSaveFileName(&fileStruct))
284	- #endif
285	return NULL;
286	}
287	else
288	{
289	- #ifdef FEAT_MBYTE
290	if (!GetOpenFileNameW(&fileStruct))
291	- #else
292	- if (!GetOpenFileName(&fileStruct))
293	- #endif
294	return NULL;
295	}
296
297	vim_free(filterp);
298	vim_free(initdirp);
299	- #ifdef FEAT_MBYTE
300	vim_free(titlep);
301	vim_free(extp);
302	- #endif
303
304	- #ifdef FEAT_MBYTE
305	/* Convert from UCS2 to 'encoding'. */
306	p = ucs2_to_enc(fileBuf, NULL);
307	! if (p != NULL) /* when out of memory we get garbage... */
308	STRCPY(fileBuf, p);
309	vim_free(p);
310	#endif
311
312	/* Give focus back to main window (when using MDI). */
313	SetFocus(s_hwnd);
314	--- 2839,3004 ----
315	#endif
316	if (saving)
317	{
318	if (!GetSaveFileNameW(&fileStruct))
319	return NULL;
320	}
321	else
322	{
323	if (!GetOpenFileNameW(&fileStruct))
324	return NULL;
325	}
326
327	vim_free(filterp);
328	vim_free(initdirp);
329	vim_free(titlep);
330	vim_free(extp);
331
332	/* Convert from UCS2 to 'encoding'. */
333	p = ucs2_to_enc(fileBuf, NULL);
334	! if (p != NULL)
335	! /* when out of memory we get garbage for non-ASCII chars */
336	STRCPY(fileBuf, p);
337	vim_free(p);
338	+
339	+ /* Give focus back to main window (when using MDI). */
340	+ SetFocus(s_hwnd);
341	+
342	+ /* Shorten the file name if possible */
343	+ mch_dirname(IObuff, IOSIZE);
344	+ p = shorten_fname((char_u *)fileBuf, IObuff);
345	+ if (p == NULL)
346	+ p = (char_u *)fileBuf;
347	+ return vim_strsave(p);
348	+ }
349	+ # endif /* FEAT_MBYTE */
350	+
351	+
352	+ /*
353	+ * Convert the string s to the proper format for a filter string by replacing
354	+ * the \t and \n delimeters with \0.
355	+ * Returns the converted string in allocated memory.
356	+ *
357	+ * Keep in sync with convert_filterW() above!
358	+ */
359	+ static char_u *
360	+ convert_filter(char_u *s)
361	+ {
362	+ char_u *res;
363	+ unsigned s_len = (unsigned)STRLEN(s);
364	+ unsigned i;
365	+
366	+ res = alloc(s_len + 3);
367	+ if (res != NULL)
368	+ {
369	+ for (i = 0; i < s_len; ++i)
370	+ if (s[i] == '\t' \|\| s[i] == '\n')
371	+ res[i] = '\0';
372	+ else
373	+ res[i] = s[i];
374	+ res[s_len] = NUL;
375	+ /* Add two extra NULs to make sure it's properly terminated. */
376	+ res[s_len + 1] = NUL;
377	+ res[s_len + 2] = NUL;
378	+ }
379	+ return res;
380	+ }
381	+
382	+ /*
383	+ * Pop open a file browser and return the file selected, in allocated memory,
384	+ * or NULL if Cancel is hit.
385	+ * saving - TRUE if the file will be saved to, FALSE if it will be opened.
386	+ * title - Title message for the file browser dialog.
387	+ * dflt - Default name of file.
388	+ * ext - Default extension to be added to files without extensions.
389	+ * initdir - directory in which to open the browser (NULL = current dir)
390	+ * filter - Filter for matched files to choose from.
391	+ *
392	+ * Keep in sync with gui_mch_browseW() above!
393	+ */
394	+ char_u *
395	+ gui_mch_browse(
396	+ int saving,
397	+ char_u *title,
398	+ char_u *dflt,
399	+ char_u *ext,
400	+ char_u *initdir,
401	+ char_u *filter)
402	+ {
403	+ OPENFILENAME fileStruct;
404	+ char_u fileBuf[MAXPATHL];
405	+ char_u *initdirp = NULL;
406	+ char_u *filterp;
407	+ char_u *p;
408	+
409	+ # if defined(FEAT_MBYTE) && defined(WIN3264)
410	+ if (os_version.dwPlatformId == VER_PLATFORM_WIN32_NT)
411	+ return gui_mch_browseW(saving, title, dflt, ext, initdir, filter);
412	+ # endif
413	+
414	+ if (dflt == NULL)
415	+ fileBuf[0] = NUL;
416	+ else
417	+ {
418	+ STRNCPY(fileBuf, dflt, MAXPATHL - 1);
419	+ fileBuf[MAXPATHL - 1] = NUL;
420	+ }
421	+
422	+ /* Convert the filter to Windows format. */
423	+ filterp = convert_filter(filter);
424	+
425	+ memset(&fileStruct, 0, sizeof(OPENFILENAME));
426	+ #ifdef OPENFILENAME_SIZE_VERSION_400
427	+ /* be compatible with Windows NT 4.0 */
428	+ fileStruct.lStructSize = sizeof(OPENFILENAME_SIZE_VERSION_400);
429	+ #else
430	+ fileStruct.lStructSize = sizeof(fileStruct);
431	#endif
432	+
433	+ fileStruct.lpstrTitle = title;
434	+ fileStruct.lpstrDefExt = ext;
435	+
436	+ fileStruct.lpstrFile = fileBuf;
437	+ fileStruct.nMaxFile = MAXPATHL;
438	+ fileStruct.lpstrFilter = filterp;
439	+ fileStruct.hwndOwner = s_hwnd; /* main Vim window is owner*/
440	+ /* has an initial dir been specified? */
441	+ if (initdir != NULL && *initdir != NUL)
442	+ {
443	+ /* Must have backslashes here, no matter what 'shellslash' says */
444	+ initdirp = vim_strsave(initdir);
445	+ if (initdirp != NULL)
446	+ for (p = initdirp; *p != NUL; ++p)
447	+ if (*p == '/')
448	+ *p = '\\';
449	+ fileStruct.lpstrInitialDir = initdirp;
450	+ }
451	+
452	+ /*
453	+ * TODO: Allow selection of multiple files. Needs another arg to this
454	+ * function to ask for it, and need to use OFN_ALLOWMULTISELECT below.
455	+ * Also, should we use OFN_FILEMUSTEXIST when opening? Vim can edit on
456	+ * files that don't exist yet, so I haven't put it in. What about
457	+ * OFN_PATHMUSTEXIST?
458	+ * Don't use OFN_OVERWRITEPROMPT, Vim has its own ":confirm" dialog.
459	+ */
460	+ fileStruct.Flags = (OFN_NOCHANGEDIR \| OFN_PATHMUSTEXIST \| OFN_HIDEREADONLY);
461	+ #ifdef FEAT_SHORTCUT
462	+ if (curbuf->b_p_bin)
463	+ fileStruct.Flags \|= OFN_NODEREFERENCELINKS;
464	+ #endif
465	+ if (saving)
466	+ {
467	+ if (!GetSaveFileName(&fileStruct))
468	+ return NULL;
469	+ }
470	+ else
471	+ {
472	+ if (!GetOpenFileName(&fileStruct))
473	+ return NULL;
474	+ }
475	+
476	+ vim_free(filterp);
477	+ vim_free(initdirp);
478
479	/* Give focus back to main window (when using MDI). */
480	SetFocus(s_hwnd);
481	*** ../vim-6.2.494/src/version.c Fri Apr 23 15:40:30 2004
482	--- src/version.c Sun Apr 25 13:03:26 2004
483	***************
484	* 639,640 **
485	--- 639,642 ----
486	{ /* Add new patch number below this line */
487	+ /**/
488	+ 495,
489	/**/
490
491	--
492	hundred-and-one symptoms of being an internet addict:
493	28. You have comandeered your teenager's phone line for the net and even his
494	friends know not to call on his line anymore.
495
496	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
497	/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
498	\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
499	\\\ Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///