From 46cbc2bb40339b5da6b413fdd1373f316b6c6913 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 27 Jan 2012 21:44:29 +0000 Subject: [Bug 3480471]: tk_getOpenFile crashes on Win64 FossilOrigin-Name: 826e4a66d7ac39283af58f264ae8244d87080f0b --- ChangeLog | 4 ++++ win/tkWinDialog.c | 8 ++++---- 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 + + * win/tkWinDialog.c: [Bug 3480471]: tk_getOpenFile crashes on Win64 + 2012-01-26 Francois Vogel * 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 -- cgit v0.12