diff options
| author | nijtmans <nijtmans> | 2010-04-19 13:58:33 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-04-19 13:58:33 (GMT) |
| commit | dc1a97a60a5eb33bbfc2c54824ce9d4cb50078db (patch) | |
| tree | a18d7fd720154463174462df1ac111551ddfb3c7 | |
| parent | a5ed7d475dcd06468b76467b67acf9eb2f1e6f9b (diff) | |
| download | tk-dc1a97a60a5eb33bbfc2c54824ce9d4cb50078db.zip tk-dc1a97a60a5eb33bbfc2c54824ce9d4cb50078db.tar.gz tk-dc1a97a60a5eb33bbfc2c54824ce9d4cb50078db.tar.bz2 | |
[Patch 2898255]: Filenames limit with Tk_GetFileName()
Assure modern style dialogs where available
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | win/tkWinDialog.c | 16 |
2 files changed, 15 insertions, 3 deletions
@@ -4,6 +4,8 @@ strcasecmp/strncasecmp * win/tkWinDialog.c Fix [Bug 2987995]: Tk_GetOpenFile returns garbage under described circumstances, minor formatting. + * win/tkWinDialog.c [Patch 2898255]: Filenames limit with Tk_GetFileName() + Assure modern style dialogs where available 2010-03-12 Jan Nijtmans <nijtmans@users.sf.net> diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 071234f..2215407 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -8,10 +8,12 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinDialog.c,v 1.50.2.6 2010/04/19 11:22:32 nijtmans Exp $ + * RCS: @(#) $Id: tkWinDialog.c,v 1.50.2.7 2010/04/19 13:58:33 nijtmans Exp $ * */ +#define WINVER 0x0500 /* Requires Windows 2K definitions */ +#define _WIN32_WINNT 0x0500 #include "tkWinInt.h" #include "tkFileFilter.h" @@ -733,7 +735,11 @@ GetFileNameW( hWnd = Tk_GetHWND(Tk_WindowId(tkwin)); ZeroMemory(&ofn, sizeof(OPENFILENAMEW)); - ofn.lStructSize = sizeof(OPENFILENAMEW); + if (LOBYTE(LOWORD(GetVersion())) < 5) { + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; + } else { + ofn.lStructSize = sizeof(OPENFILENAMEW); + } ofn.hwndOwner = hWnd; ofn.hInstance = TkWinGetHInstance(ofn.hwndOwner); ofn.lpstrFile = (WCHAR *) file; @@ -1264,7 +1270,11 @@ GetFileNameA( hWnd = Tk_GetHWND(Tk_WindowId(tkwin)); ZeroMemory(&ofn, sizeof(OPENFILENAMEA)); - ofn.lStructSize = sizeof(ofn); + if (LOBYTE(LOWORD(GetVersion())) < 5) { + ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; + } else { + ofn.lStructSize = sizeof(ofn); + } ofn.hwndOwner = hWnd; ofn.hInstance = TkWinGetHInstance(ofn.hwndOwner); ofn.lpstrFilter = NULL; |