[commit] r2710 - in trunk: Doc GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Nov  1 16:19:49 2017
New Revision: 2710

Log:
Fix unnecessary narrowing conversion

Modified:
   trunk/Doc/README_in.txt
   trunk/GME/MgaUtil/MetaPurgeDialog.cpp

Modified: trunk/Doc/README_in.txt
==============================================================================
--- trunk/Doc/README_in.txt	Mon Oct 30 15:58:27 2017	(r2709)
+++ trunk/Doc/README_in.txt	Wed Nov  1 16:19:49 2017	(r2710)
@@ -25,10 +25,15 @@
 1. Release Notes
 ************************************************
 
+Release Notes
+----------------------------------
+  - Binary compatibility with 11.12.2
+  - Fix crash under GME x64 and high memory usage
+
 Release Notes of Release 17.10.13
 ----------------------------------
   - Binary compatibility with 11.12.2
-  - Fix bug where deleting mutliple objects in the tree browser didn't work
+  - Fix bug where deleting multiple objects in the tree browser didn't work
   - Some fixes for high-DPI displays
 
 Release Notes of Release 17.9.28

Modified: trunk/GME/MgaUtil/MetaPurgeDialog.cpp
==============================================================================
--- trunk/GME/MgaUtil/MetaPurgeDialog.cpp	Mon Oct 30 15:58:27 2017	(r2709)
+++ trunk/GME/MgaUtil/MetaPurgeDialog.cpp	Wed Nov  1 16:19:49 2017	(r2710)
@@ -160,8 +160,8 @@
 int CALLBACK CMetaPurgeDialog::SortFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) {
 	SortParam& param = *(SortParam*)lParamSort;
 	
-	CString a = param.list.GetItemText(lParam1, param.columnIndex);
-	CString b = param.list.GetItemText(lParam2, param.columnIndex);
+	CString a = param.list.GetItemText(static_cast<int>(lParam1), param.columnIndex);
+	CString b = param.list.GetItemText(static_cast<int>(lParam2), param.columnIndex);
 
 	return _tcsicmp(a, b);
 }
@@ -171,8 +171,7 @@
 {
 	NMLISTVIEW *pLV = (NMLISTVIEW *) pNMHDR;
 	SortParam s = { this->m_list, pLV->iSubItem };
-	// FIXME x64: pointer may be truncated (but it is on the stack so we are probably ok)
-	m_list.SortItemsEx(SortFunc, (DWORD)(void*)&s);
+	m_list.SortItemsEx(SortFunc, (DWORD_PTR)(void*)&s);
 	
 	*pResult = 0;
 }