[LINT] error 713

joce · joce · commit e84165a69b2a · 2010-12-09T21:29:15.000-07:00
Loss of precision (Context) (Type to Type)

Signed-off-by: Jocelyn Legault &lt;jocelynlegault@gmail.com&gt;
diff --git a/PythonScript/src/ConsoleDialog.cpp b/PythonScript/src/ConsoleDialog.cpp
@@ -240,13 +240,13 @@ void ConsoleDialog::historyPrevious()
         if (m_changes.find(m_currentHistory) == m_changes.end())
         {
             ::SetWindowTextA(m_hInput, m_historyIter->c_str());
-            ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), m_historyIter->size());
+            ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), (LPARAM)m_historyIter->size());
         }
         else
         {
             // Set it as the changed string
             ::SetWindowTextA(m_hInput, m_changes[m_currentHistory].c_str());
-            ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(),  m_changes[m_currentHistory].size());
+            ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(), (LPARAM)m_changes[m_currentHistory].size());
         }
     }
 }
@@ -281,7 +281,7 @@ void ConsoleDialog::historyNext()
             if (m_historyIter != m_history.end())
             {
                 ::SetWindowTextA(m_hInput, m_historyIter->c_str());
-                ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), m_historyIter->size());
+                ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), (LPARAM)m_historyIter->size());
             }
             else
             {
@@ -292,7 +292,7 @@ void ConsoleDialog::historyNext()
         {
             // Set it as the changed string
             ::SetWindowTextA(m_hInput, m_changes[m_currentHistory].c_str());
-            ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(), m_changes[m_currentHistory].size());
+            ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(), (LPARAM)m_changes[m_currentHistory].size());
         }
     }
 }
@@ -483,8 +483,8 @@ void ConsoleDialog::writeText(size_t length, const char *text)
 
 void ConsoleDialog::writeError(size_t length, const char *text)
 {
-    int docLength = callScintilla(SCI_GETLENGTH);
-	int realLength = length;
+    size_t docLength = (size_t)callScintilla(SCI_GETLENGTH);
+	size_t realLength = length;
     callScintilla(SCI_SETREADONLY, 0);
     for (idx_t i = 0; i < length; ++i)
 	{
diff --git a/PythonScript/src/ConsoleDialog.h b/PythonScript/src/ConsoleDialog.h
@@ -74,8 +74,8 @@ class ConsoleDialog : public DockingDlgInterface
 
 	std::list<std::string> m_history;
 	std::list<std::string>::iterator m_historyIter;
-	std::map<int, std::string> m_changes;
-	int m_currentHistory;
+	std::map<idx_t, std::string> m_changes;
+	idx_t m_currentHistory;
 	bool m_runButtonIsRun;
 
 	HMENU m_hContext;
diff --git a/PythonScript/src/ConsoleInterface.h b/PythonScript/src/ConsoleInterface.h
@@ -8,7 +8,7 @@ class ConsoleInterface
 	virtual ~ConsoleInterface() {};
 	virtual void runStatement(const char *) = 0;
 	virtual void stopStatement() = 0;
-	virtual void openFile(const char *filename, int lineNumber) = 0;
+	virtual void openFile(const char *filename, idx_t lineNumber) = 0;
 };
 
 #endif
diff --git a/PythonScript/src/DynamicIDManager.h b/PythonScript/src/DynamicIDManager.h
@@ -36,8 +36,7 @@ class DynamicIDManager
 	// Prefix increment operator
 	DynamicIDManager& operator++();
 
-
-	int capacity()   { return m_capacity; }
+	size_t capacity()   { return m_capacity; }
 
 	bool inRange(idx_t id);
 
diff --git a/PythonScript/src/MenuManager.cpp b/PythonScript/src/MenuManager.cpp
@@ -564,18 +564,18 @@ void MenuManager::subclassNotepadPlusPlus()
 FuncItem* MenuManager::getFuncItemArray(int *nbF, ItemVectorTD items, runScriptIDFunc runScript, idx_t dynamicStartIndex, idx_t scriptsMenuIndex, idx_t stopScriptIndex, idx_t runPreviousIndex) 
 {
 	s_runScript = runScript;
-
+	
 	
 	ConfigFile* configFile = ConfigFile::getInstance();
 	
 	ConfigFile::MenuItemsTD menuItems = configFile->getMenuItems();
-   
+	
 
 
 	
 	// Remove one from the count of menu items if the list is empty
 	// as we'll only have one separator
-	*nbF =  menuItems.size() + items.size() + (menuItems.empty() ? 0 : 1);
+	*nbF =  (int)(menuItems.size() + items.size() + (menuItems.empty() ? 0 : 1));
 	
 	m_funcItemCount = (size_t)*nbF;
 
@@ -791,9 +791,9 @@ void MenuManager::deleteInstance()
 }
 
 
-int MenuManager::findPluginCommand(const TCHAR *pluginName, const TCHAR *menuOption, bool refreshCache)
+idx_t MenuManager::findPluginCommand(const TCHAR *pluginName, const TCHAR *menuOption, bool refreshCache)
 {
-	int retVal = 0;
+	idx_t retVal = 0;
 	bool fromCache = false;
 	if (!refreshCache)
 	{
@@ -873,7 +873,7 @@ int MenuManager::findPluginCommand(const TCHAR *pluginName, const TCHAR *menuOpt
 
 
 
-int MenuManager::findMenuCommand(const TCHAR *menuName, const TCHAR *menuOption, bool refreshCache)
+idx_t MenuManager::findMenuCommand(const TCHAR *menuName, const TCHAR *menuOption, bool refreshCache)
 {
 	if (!refreshCache)
 	{
@@ -885,7 +885,7 @@ int MenuManager::findMenuCommand(const TCHAR *menuName, const TCHAR *menuOption,
 	}
 	
 	HMENU hMenuBar = ::GetMenu(m_hNotepad);
-	int retVal = findMenuCommand(hMenuBar, menuName, menuOption);
+	idx_t retVal = findMenuCommand(hMenuBar, menuName, menuOption);
 	
 	if (retVal != 0)
 	{
@@ -906,10 +906,10 @@ tstring MenuManager::formatMenuName(const TCHAR *name)
 	return nameStr;
 }
 
-int MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, const TCHAR *menuOption)
+idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, const TCHAR *menuOption)
 {
 	size_t iMenuItems = (size_t)GetMenuItemCount(hParentMenu);
-	int retVal = 0;
+	idx_t retVal = 0;
 
 	TCHAR strBuffer[500];
 		
@@ -940,7 +940,7 @@ int MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, const
 						
 						if (0 == _tcsicmp(menuOption, nameStr.c_str()))
 						{
-							return ::GetMenuItemID(mii.hSubMenu, subMenuPos);
+							return ::GetMenuItemID(mii.hSubMenu, (int)subMenuPos);
 						}
 					}
 				}
diff --git a/PythonScript/src/MenuManager.h b/PythonScript/src/MenuManager.h
@@ -49,10 +49,10 @@ class MenuManager
 
 	void configureToolbarIcons();
 
-	int findPluginCommand(const TCHAR *pluginName, const TCHAR *menuOption, bool refreshCache);
-	int findMenuCommand(const TCHAR *menuName, const TCHAR *menuOption, bool refreshCache);
+	idx_t findPluginCommand(const TCHAR *pluginName, const TCHAR *menuOption, bool refreshCache);
+	idx_t findMenuCommand(const TCHAR *menuName, const TCHAR *menuOption, bool refreshCache);
 
-	int findMenuCommand(HMENU parentMenu, const TCHAR *menuName, const TCHAR *menuOption);
+	idx_t findMenuCommand(HMENU parentMenu, const TCHAR *menuName, const TCHAR *menuOption);
 
 	void updatePreviousScript(const char *filename);
 	void updateShortcut(UINT cmdID, ShortcutKey* key);
@@ -90,9 +90,9 @@ class MenuManager
 	runScriptFunc m_runScript;
 
 	typedef std::set<std::string> MachineScriptNamesTD;
-	typedef std::map<int, std::string> ScriptCommandsTD;
+	typedef std::map<idx_t, std::string> ScriptCommandsTD;
 	typedef std::map<std::string, HMENU> SubmenusTD;
-	typedef std::map<std::pair<tstring, tstring>, int> MenuCommandCacheTD;
+	typedef std::map<std::pair<tstring, tstring>, idx_t> MenuCommandCacheTD;
 	MenuCommandCacheTD m_menuCommandCache;
 	MenuCommandCacheTD m_pluginCommandCache;
 
diff --git a/PythonScript/src/NotepadPlusWrapper.cpp b/PythonScript/src/NotepadPlusWrapper.cpp
@@ -334,7 +334,7 @@ void NotepadPlusWrapper::saveSession(const char *sessionFilename, boost::python:
 		si.files[pos] = filesList[pos].get();
 	}
 	
-	si.nbFile = filesCount;
+	si.nbFile = (int)filesCount;
 
 	Py_BEGIN_ALLOW_THREADS
 	callNotepad(NPPM_SAVESESSION, 0, reinterpret_cast<LPARAM>(&si));
@@ -761,7 +761,7 @@ void NotepadPlusWrapper::activateBufferID(int bufferID)
 	UINT view = (index & 0xC0000000) >> 30;
 	index = index & 0x3FFFFFFF;
 	
-	callNotepad(NPPM_ACTIVATEDOC, view, index);
+	callNotepad(NPPM_ACTIVATEDOC, view, (LPARAM)index);
 	Py_END_ALLOW_THREADS
 }
 boost::python::str NotepadPlusWrapper::getBufferFilename(int bufferID)
@@ -792,7 +792,7 @@ bool NotepadPlusWrapper::runPluginCommand(boost::python::str pluginName, boost::
 		std::shared_ptr<TCHAR> tpluginName = WcharMbcsConverter::char2tchar(boost::python::extract<const char *>(pluginName));
 		std::shared_ptr<TCHAR> tmenuOption = WcharMbcsConverter::char2tchar(boost::python::extract<const char *>(menuOption));
 		Py_BEGIN_ALLOW_THREADS
-		int commandID = menuManager->findPluginCommand(tpluginName.get(), tmenuOption.get(), refreshCache);
+		idx_t commandID = menuManager->findPluginCommand(tpluginName.get(), tmenuOption.get(), refreshCache);
 		if (commandID)
 		{
 			::SendMessage(m_nppHandle, WM_COMMAND, commandID, 0);
@@ -813,7 +813,7 @@ bool NotepadPlusWrapper::runMenuCommand(boost::python::str menuName, boost::pyth
 		std::shared_ptr<TCHAR> tmenuName = WcharMbcsConverter::char2tchar(boost::python::extract<const char *>(menuName));
 		std::shared_ptr<TCHAR> tmenuOption = WcharMbcsConverter::char2tchar(boost::python::extract<const char *>(menuOption));
 		Py_BEGIN_ALLOW_THREADS
-		int commandID = menuManager->findMenuCommand(tmenuName.get(), tmenuOption.get(), refreshCache);
+		idx_t commandID = menuManager->findMenuCommand(tmenuName.get(), tmenuOption.get(), refreshCache);
 		if (commandID)
 		{
 			::SendMessage(m_nppHandle, WM_COMMAND, commandID, 0);
diff --git a/PythonScript/src/NotepadPlusWrapper.h b/PythonScript/src/NotepadPlusWrapper.h
@@ -559,7 +559,7 @@ class NotepadPlusWrapper
 
 	static bool isInEvent() { return s_inEvent; };
 
-	typedef std::multimap<int, PyObject*> callbackT;
+	typedef std::multimap<idx_t, PyObject*> callbackT;
 
 protected:
 	LRESULT callNotepad(UINT message, WPARAM wParam = 0, LPARAM lParam = 0)
diff --git a/PythonScript/src/ProcessExecute.cpp b/PythonScript/src/ProcessExecute.cpp
@@ -32,7 +32,7 @@ bool ProcessExecute::isWindowsNT()
 	return (osv.dwPlatformId >= VER_PLATFORM_WIN32_NT);
 }
 
-long ProcessExecute::execute(const TCHAR *commandLine, boost::python::object pyStdout, boost::python::object pyStderr, boost::python::object /*pyStdin*/, bool spoolToFile /* = false */)
+DWORD ProcessExecute::execute(const TCHAR *commandLine, boost::python::object pyStdout, boost::python::object pyStderr, boost::python::object /*pyStdin*/, bool spoolToFile /* = false */)
 {
 	DWORD returnValue = 0;
 
@@ -324,7 +324,7 @@ DWORD WINAPI ProcessExecute::pipeReader(void *args)
 	return 0;
 }
 
-void ProcessExecute::writeToPython(PipeReaderArgs *pipeReaderArgs, int bytesRead, char *buffer)
+void ProcessExecute::writeToPython(PipeReaderArgs *pipeReaderArgs, DWORD bytesRead, char *buffer)
 {
 	buffer[bytesRead] = '\0';
 	PyGILState_STATE gstate = PyGILState_Ensure();
@@ -340,7 +340,7 @@ void ProcessExecute::writeToPython(PipeReaderArgs *pipeReaderArgs, int bytesRead
 }
 
 
-void ProcessExecute::writeToFile(PipeReaderArgs *pipeReaderArgs, int bytesRead, char *buffer)
+void ProcessExecute::writeToFile(PipeReaderArgs *pipeReaderArgs, DWORD bytesRead, char *buffer)
 {
 	WaitForSingleObject(pipeReaderArgs->fileMutex, INFINITE);
 
@@ -351,9 +351,8 @@ void ProcessExecute::writeToFile(PipeReaderArgs *pipeReaderArgs, int bytesRead,
 		throw process_start_exception("Error writing to spool file");
 
 	char byteCount[20];
-	_itoa_s(bytesRead, byteCount, 20, 10);
-	strcat_s(byteCount, 20, "\n");
-	
+	sprintf_s(byteCount, 20, "%ul\n", bytesRead);
+
 	pipeReaderArgs->file->write(byteCount, strlen(byteCount));
 
 	pipeReaderArgs->file->write(buffer, bytesRead);
diff --git a/PythonScript/src/ProcessExecute.h b/PythonScript/src/ProcessExecute.h
@@ -10,7 +10,7 @@ class ProcessExecute
 	ProcessExecute();
 	~ProcessExecute();
 
-	long execute(const TCHAR *commandLine,  boost::python::object pyStdout, boost::python::object pyStderr, boost::python::object pyStdin, bool spoolToFile = false);
+	DWORD execute(const TCHAR *commandLine,  boost::python::object pyStdout, boost::python::object pyStderr, boost::python::object pyStdin, bool spoolToFile = false);
 
 protected:
 	static bool isWindowsNT();
@@ -20,8 +20,8 @@ class ProcessExecute
 
 private:
 	static DWORD WINAPI pipeReader(void *args);
-	void writeToPython(PipeReaderArgs *pipeReaderArgs, int bytesRead, char *buffer);
-	void writeToFile(PipeReaderArgs *pipeReaderArgs, int bytesRead, char *buffer);
+	void writeToPython(PipeReaderArgs *pipeReaderArgs, DWORD bytesRead, char *buffer);
+	void writeToFile(PipeReaderArgs *pipeReaderArgs, DWORD bytesRead, char *buffer);
 	void spoolFile(std::fstream* file, boost::python::object pyStdout, boost::python::object pyStderr);
 
 };
diff --git a/PythonScript/src/PythonConsole.cpp b/PythonScript/src/PythonConsole.cpp
@@ -193,7 +193,7 @@ void PythonConsole::stopStatement()
 	
 }
 
-long PythonConsole::runCommand(boost::python::str text, boost::python::object pyStdout, boost::python::object pyStderr)
+DWORD PythonConsole::runCommand(boost::python::str text, boost::python::object pyStdout, boost::python::object pyStderr)
 {
 	ProcessExecute process;
 	std::shared_ptr<TCHAR> cmdLine = WcharMbcsConverter::char2tchar(boost::python::extract<const char *>(text));
@@ -264,7 +264,7 @@ void PythonConsole::stopStatementWorker(PythonConsole *console)
 {
 	PyGILState_STATE gstate = PyGILState_Ensure();
 	
-	PyThreadState_SetAsyncExc(console->getConsumerThreadID(), PyExc_KeyboardInterrupt);
+	PyThreadState_SetAsyncExc((long)console->getConsumerThreadID(), PyExc_KeyboardInterrupt);
 	
 	PyGILState_Release(gstate);
 }
@@ -286,15 +286,15 @@ void export_console()
 	//lint +e1793
 }
 
-void PythonConsole::openFile(const char *filename, int lineNo)
+void PythonConsole::openFile(const char *filename, idx_t lineNo)
 {
 	std::shared_ptr<TCHAR> tFilename = WcharMbcsConverter::char2tchar(filename);
 	if (!SendMessage(m_hNotepad, NPPM_SWITCHTOFILE, 0, reinterpret_cast<LPARAM>(tFilename.get())))
 	{
 		SendMessage(m_hNotepad, NPPM_DOOPEN, 0, reinterpret_cast<LPARAM>(tFilename.get()));
 	}
 
-	if (lineNo != -1)
+	if (lineNo != IDX_MAX)
 	{
 		int currentView;
 		SendMessage(m_hNotepad, NPPM_GETCURRENTSCINTILLA, 0, reinterpret_cast<LPARAM>(&currentView));
diff --git a/PythonScript/src/PythonConsole.h b/PythonScript/src/PythonConsole.h
@@ -38,21 +38,21 @@ class PythonConsole : public NppPythonScript::PyProducerConsumer<std::string>, p
 	/* Console Interface members */
 	void runStatement(const char *statement);
 	void stopStatement();
-	void openFile(const char *filename, int lineNumber);
+	void openFile(const char *filename, idx_t lineNumber);
 	
 	/* ConsoleInterface end */
 
 
 	static void stopStatementWorker(PythonConsole *console);
 	
-	long runCommand(boost::python::str text, boost::python::object pyStdout, boost::python::object pyStderr);
-	long runCommandNoStderr(boost::python::str text, boost::python::object pyStdout)
+	DWORD runCommand(boost::python::str text, boost::python::object pyStdout, boost::python::object pyStderr);
+	DWORD runCommandNoStderr(boost::python::str text, boost::python::object pyStdout)
 	{ 
 		boost::python::object sys_module( (boost::python::handle<>(PyImport_ImportModule("sys"))) );
 		boost::python::object sys_namespace = sys_module.attr("__dict__");	
 		return runCommand(text, pyStdout, sys_namespace["stderr"]); 
     }
-	long runCommandNoStdout(boost::python::str text)
+	DWORD runCommandNoStdout(boost::python::str text)
 	{ 
 		boost::python::object sys_module( (boost::python::handle<>(PyImport_ImportModule("sys"))) );
 		boost::python::object sys_namespace = sys_module.attr("__dict__");	
diff --git a/PythonScript/src/PythonHandler.cpp b/PythonScript/src/PythonHandler.cpp
@@ -278,7 +278,7 @@ void PythonHandler::stopScriptWorker(PythonHandler *handler)
 {
 	PyGILState_STATE gstate = PyGILState_Ensure();
 	
-	PyThreadState_SetAsyncExc(handler->getExecutingThreadID(), PyExc_KeyboardInterrupt);
+	PyThreadState_SetAsyncExc((long)handler->getExecutingThreadID(), PyExc_KeyboardInterrupt);
 	
 	PyGILState_Release(gstate);
 }
diff --git a/PythonScript/src/ScintillaWrapper.cpp b/PythonScript/src/ScintillaWrapper.cpp
@@ -244,8 +244,8 @@ bool ScintillaWrapper::addCallback(PyObject* callback, boost::python::list event
 {
 	if (PyCallable_Check(callback))
 	{
-		int eventCount = _len(events);
-		for(int i = 0; i < eventCount; ++i)
+		size_t eventCount = _len(events);
+		for(idx_t i = 0; i < eventCount; ++i)
 		{
 			m_callbacks.insert(std::pair<int, PyObject*>(boost::python::extract<int>(events[i]), callback));
 			Py_INCREF(callback);
@@ -473,7 +473,7 @@ void ScintillaWrapper::replace(boost::python::object searchStr, boost::python::o
 
 	const char *replaceChars = boost::python::extract<const char*>(replaceStr.attr("__str__")());
 	
-	int replaceLength = strlen(replaceChars);
+	size_t replaceLength = strlen(replaceChars);
 
 	Sci_TextToFind src;
 
@@ -499,8 +499,8 @@ void ScintillaWrapper::replace(boost::python::object searchStr, boost::python::o
 			SetTargetStart(src.chrgText.cpMin);
 			SetTargetEnd(src.chrgText.cpMax);
 			callScintilla(SCI_REPLACETARGET, replaceLength, reinterpret_cast<LPARAM>(replaceChars));
-			start = src.chrgText.cpMin + replaceLength;
-			end = end + (replaceLength - (src.chrgText.cpMax - src.chrgText.cpMin));
+			start = src.chrgText.cpMin + (int)replaceLength;
+			end = end + ((int)replaceLength - (src.chrgText.cpMax - src.chrgText.cpMin));
 		}
 
 	}
@@ -519,7 +519,7 @@ void ScintillaWrapper::rereplace(boost::python::object searchExp, boost::python:
 
 	const char *replaceChars = boost::python::extract<const char*>(replaceStr.attr("__str__")());
 
-	int replaceLength = strlen(replaceChars);
+	size_t replaceLength = strlen(replaceChars);
 
 	Sci_TextToFind src;
 
@@ -767,7 +767,7 @@ void ScintillaWrapper::pyreplace(boost::python::object searchExp, boost::python:
 					replaceLine(line, result[0]);
 				}
 
-				int newLine = LineFromPosition(currentStartPosition + resultLength);
+				int newLine = LineFromPosition((int)(currentStartPosition + resultLength));
 				
 				// If the line number has moved on more than one
 				// there must have been one or more new lines in the 
diff --git a/PythonScript/src/ScintillaWrapper.h b/PythonScript/src/ScintillaWrapper.h
diff --git a/PythonScript/src/ShortcutDlg.cpp b/PythonScript/src/ShortcutDlg.cpp
diff --git a/PythonScript/src/WcharMbcsConverter.cpp b/PythonScript/src/WcharMbcsConverter.cpp

Original file line number	Diff line number	Diff line change
`@@ -240,13 +240,13 @@ void ConsoleDialog::historyPrevious()`
`240`	`240`	`if (m_changes.find(m_currentHistory) == m_changes.end())`
`241`	`241`	`{`
`242`	`242`	`::SetWindowTextA(m_hInput, m_historyIter->c_str());`
`243`		`- ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), m_historyIter->size());`
	`243`	`+ ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), (LPARAM)m_historyIter->size());`
`244`	`244`	`}`
`245`	`245`	`else`
`246`	`246`	`{`
`247`	`247`	`// Set it as the changed string`
`248`	`248`	`::SetWindowTextA(m_hInput, m_changes[m_currentHistory].c_str());`
`249`		`- ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(), m_changes[m_currentHistory].size());`
	`249`	`+ ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(), (LPARAM)m_changes[m_currentHistory].size());`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`}`
`@@ -281,7 +281,7 @@ void ConsoleDialog::historyNext()`
`281`	`281`	`if (m_historyIter != m_history.end())`
`282`	`282`	`{`
`283`	`283`	`::SetWindowTextA(m_hInput, m_historyIter->c_str());`
`284`		`- ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), m_historyIter->size());`
	`284`	`+ ::SendMessage(m_hInput, EM_SETSEL, m_historyIter->size(), (LPARAM)m_historyIter->size());`
`285`	`285`	`}`
`286`	`286`	`else`
`287`	`287`	`{`
`@@ -292,7 +292,7 @@ void ConsoleDialog::historyNext()`
`292`	`292`	`{`
`293`	`293`	`// Set it as the changed string`
`294`	`294`	`::SetWindowTextA(m_hInput, m_changes[m_currentHistory].c_str());`
`295`		`- ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(), m_changes[m_currentHistory].size());`
	`295`	`+ ::SendMessage(m_hInput, EM_SETSEL, m_changes[m_currentHistory].size(), (LPARAM)m_changes[m_currentHistory].size());`
`296`	`296`	`}`
`297`	`297`	`}`
`298`	`298`	`}`
`@@ -483,8 +483,8 @@ void ConsoleDialog::writeText(size_t length, const char *text)`
`483`	`483`
`484`	`484`	`void ConsoleDialog::writeError(size_t length, const char *text)`
`485`	`485`	`{`
`486`		`- int docLength = callScintilla(SCI_GETLENGTH);`
`487`		`- int realLength = length;`
	`486`	`+ size_t docLength = (size_t)callScintilla(SCI_GETLENGTH);`
	`487`	`+ size_t realLength = length;`
`488`	`488`	`callScintilla(SCI_SETREADONLY, 0);`
`489`	`489`	`for (idx_t i = 0; i < length; ++i)`
`490`	`490`	`{`
Original file line number	Diff line number	Diff line change
`@@ -564,18 +564,18 @@ void MenuManager::subclassNotepadPlusPlus()`
`564`	`564`	`FuncItem* MenuManager::getFuncItemArray(int *nbF, ItemVectorTD items, runScriptIDFunc runScript, idx_t dynamicStartIndex, idx_t scriptsMenuIndex, idx_t stopScriptIndex, idx_t runPreviousIndex)`
`565`	`565`	`{`
`566`	`566`	`s_runScript = runScript;`
`567`		`-`
	`567`	`+`
`568`	`568`
`569`	`569`	`ConfigFile* configFile = ConfigFile::getInstance();`
`570`	`570`
`571`	`571`	`ConfigFile::MenuItemsTD menuItems = configFile->getMenuItems();`
`572`		`-`
	`572`	`+`
`573`	`573`
`574`	`574`
`575`	`575`
`576`	`576`	`// Remove one from the count of menu items if the list is empty`
`577`	`577`	`// as we'll only have one separator`
`578`		`- *nbF = menuItems.size() + items.size() + (menuItems.empty() ? 0 : 1);`
	`578`	`+ *nbF = (int)(menuItems.size() + items.size() + (menuItems.empty() ? 0 : 1));`
`579`	`579`
`580`	`580`	`m_funcItemCount = (size_t)*nbF;`
`581`	`581`
`@@ -791,9 +791,9 @@ void MenuManager::deleteInstance()`
`791`	`791`	`}`
`792`	`792`
`793`	`793`
`794`		`-int MenuManager::findPluginCommand(const TCHAR pluginName, const TCHAR menuOption, bool refreshCache)`
	`794`	`+idx_t MenuManager::findPluginCommand(const TCHAR pluginName, const TCHAR menuOption, bool refreshCache)`
`795`	`795`	`{`
`796`		`- int retVal = 0;`
	`796`	`+ idx_t retVal = 0;`
`797`	`797`	`bool fromCache = false;`
`798`	`798`	`if (!refreshCache)`
`799`	`799`	`{`
`@@ -873,7 +873,7 @@ int MenuManager::findPluginCommand(const TCHAR pluginName, const TCHAR menuOpt`
`873`	`873`
`874`	`874`
`875`	`875`
`876`		`-int MenuManager::findMenuCommand(const TCHAR menuName, const TCHAR menuOption, bool refreshCache)`
	`876`	`+idx_t MenuManager::findMenuCommand(const TCHAR menuName, const TCHAR menuOption, bool refreshCache)`
`877`	`877`	`{`
`878`	`878`	`if (!refreshCache)`
`879`	`879`	`{`
`@@ -885,7 +885,7 @@ int MenuManager::findMenuCommand(const TCHAR menuName, const TCHAR menuOption,`
`885`	`885`	`}`
`886`	`886`
`887`	`887`	`HMENU hMenuBar = ::GetMenu(m_hNotepad);`
`888`		`- int retVal = findMenuCommand(hMenuBar, menuName, menuOption);`
	`888`	`+ idx_t retVal = findMenuCommand(hMenuBar, menuName, menuOption);`
`889`	`889`
`890`	`890`	`if (retVal != 0)`
`891`	`891`	`{`
`@@ -906,10 +906,10 @@ tstring MenuManager::formatMenuName(const TCHAR *name)`
`906`	`906`	`return nameStr;`
`907`	`907`	`}`
`908`	`908`
`909`		`-int MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR menuName, const TCHAR menuOption)`
	`909`	`+idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR menuName, const TCHAR menuOption)`
`910`	`910`	`{`
`911`	`911`	`size_t iMenuItems = (size_t)GetMenuItemCount(hParentMenu);`
`912`		`- int retVal = 0;`
	`912`	`+ idx_t retVal = 0;`
`913`	`913`
`914`	`914`	`TCHAR strBuffer[500];`
`915`	`915`
`@@ -940,7 +940,7 @@ int MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, const`
`940`	`940`
`941`	`941`	`if (0 == _tcsicmp(menuOption, nameStr.c_str()))`
`942`	`942`	`{`
`943`		`- return ::GetMenuItemID(mii.hSubMenu, subMenuPos);`
	`943`	`+ return ::GetMenuItemID(mii.hSubMenu, (int)subMenuPos);`
`944`	`944`	`}`
`945`	`945`	`}`
`946`	`946`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ bool ProcessExecute::isWindowsNT()`
`32`	`32`	`return (osv.dwPlatformId >= VER_PLATFORM_WIN32_NT);`
`33`	`33`	`}`
`34`	`34`
`35`		`-long ProcessExecute::execute(const TCHAR commandLine, boost::python::object pyStdout, boost::python::object pyStderr, boost::python::object /pyStdin/, bool spoolToFile / = false */)`
	`35`	`+DWORD ProcessExecute::execute(const TCHAR commandLine, boost::python::object pyStdout, boost::python::object pyStderr, boost::python::object /pyStdin/, bool spoolToFile / = false */)`
`36`	`36`	`{`
`37`	`37`	`DWORD returnValue = 0;`
`38`	`38`
`@@ -324,7 +324,7 @@ DWORD WINAPI ProcessExecute::pipeReader(void *args)`
`324`	`324`	`return 0;`
`325`	`325`	`}`
`326`	`326`
`327`		`-void ProcessExecute::writeToPython(PipeReaderArgs pipeReaderArgs, int bytesRead, char buffer)`
	`327`	`+void ProcessExecute::writeToPython(PipeReaderArgs pipeReaderArgs, DWORD bytesRead, char buffer)`
`328`	`328`	`{`
`329`	`329`	`buffer[bytesRead] = '\0';`
`330`	`330`	`PyGILState_STATE gstate = PyGILState_Ensure();`
`@@ -340,7 +340,7 @@ void ProcessExecute::writeToPython(PipeReaderArgs *pipeReaderArgs, int bytesRead`
`340`	`340`	`}`
`341`	`341`
`342`	`342`
`343`		`-void ProcessExecute::writeToFile(PipeReaderArgs pipeReaderArgs, int bytesRead, char buffer)`
	`343`	`+void ProcessExecute::writeToFile(PipeReaderArgs pipeReaderArgs, DWORD bytesRead, char buffer)`
`344`	`344`	`{`
`345`	`345`	`WaitForSingleObject(pipeReaderArgs->fileMutex, INFINITE);`
`346`	`346`
`@@ -351,9 +351,8 @@ void ProcessExecute::writeToFile(PipeReaderArgs *pipeReaderArgs, int bytesRead,`
`351`	`351`	`throw process_start_exception("Error writing to spool file");`
`352`	`352`
`353`	`353`	`char byteCount[20];`
`354`		`- _itoa_s(bytesRead, byteCount, 20, 10);`
`355`		`- strcat_s(byteCount, 20, "\n");`
`356`		`-`
	`354`	`+ sprintf_s(byteCount, 20, "%ul\n", bytesRead);`
	`355`	`+`
`357`	`356`	`pipeReaderArgs->file->write(byteCount, strlen(byteCount));`
`358`	`357`
`359`	`358`	`pipeReaderArgs->file->write(buffer, bytesRead);`