From feae1fa77e03a708bb6e4936f14917bf0f011d89 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Tue, 8 Nov 2005 18:40:34 +0000
Subject: [PATCH] Merge Perry's fix for OpenDlg/SelectFile() to
 Merge.cpp/SelectFile() (PATCH #1348733)

---
 Src/Changes.txt | 4 ++++
 Src/Merge.cpp   | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Src/Changes.txt b/Src/Changes.txt
index e788c8322..82ac378e7 100644
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -1,3 +1,7 @@
+2005-11-08 Kimmo
+ Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
+  Src: Merge.cpp
+
 2005-11-06 Jochen
  PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
  Change CDirView::AreItemsOpenable() to consider archive files as openable
diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index f2761853e..94aad2433 100644
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -626,7 +626,8 @@ BOOL SelectFile(CString& path, LPCTSTR root_path /*=NULL*/,
 	ConvertFilter(filterStr);
 
 	OPENFILENAME ofn;
-	ofn.lStructSize = sizeof(OPENFILENAME);
+	memset(&ofn, 0, sizeof(ofn));
+	ofn.lStructSize = sizeof(ofn);
 	ofn.hwndOwner = AfxGetMainWnd()->GetSafeHwnd();
 	ofn.lpstrFilter = filterStr;
 	ofn.lpstrCustomFilter = NULL;
@@ -640,9 +641,9 @@ BOOL SelectFile(CString& path, LPCTSTR root_path /*=NULL*/,
 
 	BOOL bRetVal = FALSE;
 	if (is_open)
-		bRetVal = GetOpenFileName((LPOPENFILENAME)&ofn);
+		bRetVal = GetOpenFileName(&ofn);
 	else
-		bRetVal = GetSaveFileName((LPOPENFILENAME)&ofn);
+		bRetVal = GetSaveFileName(&ofn);
 
 	sfile.ReleaseBuffer();
 	if (bRetVal)
-- 
2.11.0