Thread: [Winmerge-svn] SF.net SVN: winmerge: [5577] trunk (Page 10)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5577
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5577&view=rev
Author:   kimmov
Date:     2008-07-08 16:10:58 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
PATCH: [ 2008581 ] Convert paths using system codepage
 Fixed memory handling, problem(s) noticed by Jochen

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/AnsiConvert.cpp
    trunk/Src/DiffFileData.cpp
    trunk/Src/DiffWrapper.cpp
    trunk/Src/DirCmpReport.cpp

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================

--- trunk/Docs/Users/ChangeLog.txt	2008-07-07 16:35:48 UTC (rev 5576)
+++ trunk/Docs/Users/ChangeLog.txt	2008-07-08 23:10:58 UTC (rev 5577)
@@ -6,6 +6,7 @@
 WinMerge 2.11.1.1
   Manual: Introduction update (#2011365)
   Add ShellExtension menu for drive letters (root folders) (#2011602)
+  BugFix: Use system codepage for paths (#1979429, #2008581)
 
 WinMerge 2.10.x (R2_10) branch created (r5561)
 

Modified: trunk/Src/AnsiConvert.cpp
===================================================================
--- trunk/Src/AnsiConvert.cpp	2008-07-07 16:35:48 UTC (rev 5576)
+++ trunk/Src/AnsiConvert.cpp	2008-07-08 23:10:58 UTC (rev 5577)
@@ -7,8 +7,10 @@
 // ID line follows -- this is updated by SVN
 // $Id$
 
-#include "stdafx.h"
+#include <windows.h>
 
+static LPCSTR convert(LPCTSTR str, UINT codepage);
+
 /**
  * @brief Convert from Unicode to Ansi using system codepage.
  * This function converts Unicode string to ansi string using system codepage.
@@ -19,13 +21,7 @@
  */
 LPCSTR ansiconvert_SystemCP(LPCTSTR str)
 {
-	// These lines replace USES_CONVERSION macro
-	int _convert = 0;
-	UINT _acp = GetACP();
-	LPCWSTR _lpw = 0;
-	LPCSTR  _lpa = 0;
-
-	return T2CA(str);
+	return convert(str, CP_ACP);
 }
 
 /**
@@ -37,8 +33,27 @@
  */
 LPCSTR ansiconvert_ThreadCP(LPCTSTR str)
 {
-	USES_CONVERSION;
-	return T2CA(str);
+	return convert(str, CP_THREAD_ACP);
 }
 
-
+/**
+ * @brief Convert from Unicode to Ansi using given codepage.
+ * @param [in] str String to convert.
+ * @param [in] codepage Codepage to use in conversion.
+ * @return Ansi string.
+ */
+LPCSTR convert(LPCTSTR str, UINT codepage)
+{
+#ifndef UNICODE
+	return str;
+#else
+	int len = WideCharToMultiByte(codepage, 0, str, -1, 0, 0, 0, 0);
+	if (len)
+	{
+		char * ansi = (char *)malloc(len);
+		WideCharToMultiByte(codepage, 0, str, -1, ansi, len, NULL, NULL);
+		return ansi;
+	}
+	return NULL;
+#endif
+}

Modified: trunk/Src/DiffFileData.cpp
===================================================================
--- trunk/Src/DiffFileData.cpp	2008-07-07 16:35:48 UTC (rev 5576)
+++ trunk/Src/DiffFileData.cpp	2008-07-08 23:10:58 UTC (rev 5577)
@@ -87,7 +87,7 @@
 		// Actual paths are m_FileLocation[i].filepath
 		// but these are often temporary files
 		// Displayable (original) paths are m_sDisplayFilepath[i]
-		m_inf[i].name = strdup(ansiconvert_SystemCP(m_sDisplayFilepath[i]));
+		m_inf[i].name = ansiconvert_SystemCP(m_sDisplayFilepath[i]);
 		if (m_inf[i].name == NULL)
 			return false;
 

Modified: trunk/Src/DiffWrapper.cpp
===================================================================
--- trunk/Src/DiffWrapper.cpp	2008-07-07 16:35:48 UTC (rev 5576)
+++ trunk/Src/DiffWrapper.cpp	2008-07-08 23:10:58 UTC (rev 5577)
@@ -1202,8 +1202,8 @@
 		path2 = m_s2File;
 	replace_char(&*path1.begin(), '\\', '/');
 	replace_char(&*path2.begin(), '\\', '/');
-	inf_patch[0].name = strdup(ansiconvert_SystemCP(path1.c_str()));
-	inf_patch[1].name = strdup(ansiconvert_SystemCP(path2.c_str()));
+	inf_patch[0].name = ansiconvert_SystemCP(path1.c_str());
+	inf_patch[1].name = ansiconvert_SystemCP(path2.c_str());
 
 	outfile = NULL;
 	if (!m_sPatchFile.IsEmpty())

Modified: trunk/Src/DirCmpReport.cpp
===================================================================
--- trunk/Src/DirCmpReport.cpp	2008-07-07 16:35:48 UTC (rev 5576)
+++ trunk/Src/DirCmpReport.cpp	2008-07-08 23:10:58 UTC (rev 5577)
@@ -236,6 +236,7 @@
 		cchAhead -= cchLine;
 	}
 	m_pFile->Write(pchOctets, cchAhead);
+	free((void*)pchOctets);
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Winmerge-svn] SF.net SVN: winmerge: [5577] trunk (Page 10)

Windows visual diff and merge for files and directories

winmerge-svn