summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-01-27 21:44:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-01-27 21:44:29 (GMT)
commite8a09c1e3781b903a799c0325e0ff53b0c3f96a7 (patch)
tree571f261f1ceea194c5991819a8bf1742a0fb6876
parent1c2328704de32c1516e1d853f4863c6f58d03996 (diff)
downloadtk-e8a09c1e3781b903a799c0325e0ff53b0c3f96a7.zip
tk-e8a09c1e3781b903a799c0325e0ff53b0c3f96a7.tar.gz
tk-e8a09c1e3781b903a799c0325e0ff53b0c3f96a7.tar.bz2
[Bug 3480471]: tk_getOpenFile crashes on Win64
-rw-r--r--ChangeLog4
-rw-r--r--win/tkWinDialog.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a775e7c..dd2bd82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-27 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tkWinDialog.c: [Bug 3480471]: tk_getOpenFile crashes on Win64
+
2012-01-26 Francois Vogel <fvogelnew1@free.fr>
* generic/tkTextDisp.c: [Bug-1754043] and [Bug-2321450]: When
diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c
index 6b50215..64fca8b 100644
--- a/win/tkWinDialog.c
+++ b/win/tkWinDialog.c
@@ -1017,10 +1017,10 @@ OFNHookProcW(
ofnData->dynFileBuffer = (char *) buffer;
}
- SendMessageW(hdlg, CDM_GETFOLDERPATH, dirsize, PTR2INT(buffer));
+ SendMessageW(hdlg, CDM_GETFOLDERPATH, dirsize, (LPARAM) buffer);
buffer += dirsize;
- SendMessageW(hdlg, CDM_GETSPEC, selsize, PTR2INT(buffer));
+ SendMessageW(hdlg, CDM_GETSPEC, selsize, (LPARAM) buffer);
/*
* If there are multiple files, delete the quotes and change
@@ -1565,9 +1565,9 @@ OFNHookProcA(
ofnData->dynFileBuffer = buffer;
}
- SendMessage(hdlg, CDM_GETFOLDERPATH, dirsize, PTR2INT(buffer));
+ SendMessage(hdlg, CDM_GETFOLDERPATH, dirsize, (LPARAM) buffer);
buffer += dirsize;
- SendMessage(hdlg, CDM_GETSPEC, selsize, PTR2INT(buffer));
+ SendMessage(hdlg, CDM_GETSPEC, selsize, (LPARAM) buffer);
/*
* If there are multiple files, delete the quotes and change