replace some functions not working in MinGW

Author: akavel

GOnpp/DockingFeature/CmdDlg.cpp

@@ -31,11 +31,22 @@
 //along with this program; if not, write to the Free Software
 //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+#include <string>
 #include "CmdDlg.h"
 #include "PluginDefinition.h"
 
 extern NppData nppData;
 
+typedef std::basic_string<TCHAR> tstring;
+
+#ifdef max
+#undef max
+#endif
+
+#ifdef min
+#undef min
+#endif
+
 BOOL CALLBACK CmdDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 {
 	switch (message) 
@@ -72,30 +83,33 @@ void CmdDlg::reshape(int width)
 
 LPTSTR CmdDlg::prettyfy(LPTSTR text)
 {
-	size_t size = _tcslen(text) + 50;
-	LPTSTR res = (LPTSTR) calloc(size+1, sizeof(TCHAR));
-	
-	LPTSTR rest = NULL;
-	LPTSTR current = _tcstok_s(text, _T("\n"), &rest);
-	while(current != NULL){
-		if (_tcslen(current) > _maxLine){
-			_maxLine = _tcslen(current);
-		}
-		if( _tcslen(current) > size - _tcslen(res)){
-			size += 500;
-			res = (LPTSTR) realloc(res, size * sizeof(TCHAR));
-			if (res == NULL){
-				return NULL;
+	try {
+		tstring src = tstring(text);
+		tstring dst;
+		tstring::size_type i = 0;
+		for (;;) {
+			const tstring::size_type j = src.find(_T("\n"), i);
+			dst.append(src, i, j-i);
+			dst.append(_T("\r\n"));
+			_maxLine = std::max(_maxLine, std::min(j-i, src.length()-i));
+			if (j == tstring::npos) {
+				break;
 			}
+			i = j+1;
 		}
-		_tcsncat(res, current, __min(size -_tcslen(res), _tcslen(current)));
-		_tcsncat(res, _T("\r\n"), __min(size - _tcslen(res), 2 * sizeof(TCHAR)));
-		current = _tcstok_s(NULL, _T("\n"), &rest);
+
+		LPTSTR res = (LPTSTR) calloc(dst.length()+1, sizeof(TCHAR));
+		if (res == NULL) {
+			return NULL;
+		}
+		dst.copy(res, dst.length());
+		res[dst.length()] = TCHAR(0);
+		return res;
+	} catch (...) {
+		return NULL;
 	}
-	return res;
 }
 
-
 void CmdDlg::setText(LPTSTR text)
 {
 	LPTSTR lines = prettyfy(text);

GOnpp/goCommands/CommandExec.cpp

@@ -14,8 +14,12 @@
 //along with this program; if not, write to the Free Software
 //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+#include <algorithm>
 #include "CommandExec.h"
 
+#ifdef min
+#undef min
+#endif
 
 CommandExec::CommandExec(LPCTSTR cmd, LPCTSTR dir)
 {
@@ -151,7 +155,7 @@ BOOL CommandExec::readOutput(HANDLE handle, LPTSTR* output){
 			}
 		}
 
-		_tcsncat(*output, TBuf, __min(BUFSIZE, outputLen - _tcslen(*output))); 
+		_tcsncat(*output, TBuf, std::min<DWORD>(BUFSIZE, outputLen - _tcslen(*output))); 
 	}
 	return TRUE;
 }
@@ -204,8 +208,8 @@ LPTSTR CommandExec::GetCombined()
 	LPTSTR out = (LPTSTR) calloc(length + 1, sizeof(TCHAR));
 	if (*out == NULL) return NULL;
 
-	_tcsncat(out, stdOut, __min(_tcslen(stdOut), length - _tcslen(out)));
-	_tcsncat(out, stdErr, __min(_tcslen(stdErr), length - _tcslen(out)));
+	_tcsncat(out, stdOut, std::min(_tcslen(stdOut), length - _tcslen(out)));
+	_tcsncat(out, stdErr, std::min(_tcslen(stdErr), length - _tcslen(out)));
 
 	return out;
 }

GOnpp/goCommands/goCommand.cpp

@@ -14,9 +14,14 @@
 //along with this program; if not, write to the Free Software
 //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+#include <algorithm>
 #include "goCommand.h"
 #include <shlwapi.h>
 
+#ifdef min
+#undef min
+#endif
+
 goCommand::goCommand(LPCTSTR cmd, LPCTSTR flags)
 {
 	this->cmd = cmd;
@@ -132,7 +137,7 @@ BOOL goCommand::initializeFileVals(LPTSTR current_file)
 {
 	this->currentFile = (LPTSTR) calloc(MAX_PATH, sizeof(TCHAR));
 	if (this->currentFile == NULL) return FALSE;
-	_tcsncpy(this->currentFile, current_file, __min(MAX_PATH, _tcslen(current_file)));
+	_tcsncpy(this->currentFile, current_file, std::min<size_t>(MAX_PATH, _tcslen(current_file)));
 
 	this->currentDir = (LPTSTR) _tcsdup(this->currentFile);
 	if (this->currentDir == NULL) return FALSE;
@@ -193,11 +198,11 @@ BOOL goCommand::combineCommandLine(LPCTSTR go_cmd, LPTSTR pkg)
 	LPTSTR args = (LPTSTR) calloc(size + 1, sizeof(TCHAR));
 	if (args == NULL) return FALSE;
 
-	_tcsncat(args, go_cmd, __min(_tcslen(go_cmd), size - _tcslen(args)));
-	_tcsncat(args, _T(" "), __min(sizeof(args), size - _tcslen(args)));
-	_tcsncat(args, cmd, __min( _tcslen(cmd), size -_tcslen(args)));
-	_tcsncat(args, _T(" "), __min(sizeof(args), size - _tcslen(args)));
-	_tcsncat(args, pkg, __min( _tcslen(pkg), size -_tcslen(args)));
+	_tcsncat(args, go_cmd, std::min(_tcslen(go_cmd), size - _tcslen(args)));
+	_tcsncat(args, _T(" "), std::min(sizeof(args), size - _tcslen(args)));
+	_tcsncat(args, cmd, std::min( _tcslen(cmd), size -_tcslen(args)));
+	_tcsncat(args, _T(" "), std::min(sizeof(args), size - _tcslen(args)));
+	_tcsncat(args, pkg, std::min( _tcslen(pkg), size -_tcslen(args)));
 
 	this->commandLine = args;
 	return TRUE;

GOnpp/no_ms_shit.props

@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>__STDC_WANT_SECURE_LIB__=0;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__STDC_WANT_SECURE_LIB__=1;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

makefile

@@ -36,7 +36,8 @@ CC      =  $(ARCH)-gcc
 CXX     =  $(ARCH)-g++
 WINDRES =  windres -O coff
 CFLAGS  =  -O2 -mtune=i686 -DBUILD_DLL -W -Wall -gstabs -mwindows \
-           $(foreach dir,$(SRC_DIRS),-I$(dir))
+           $(foreach dir,$(SRC_DIRS),-I$(dir)) \
+           -DUNICODE -D_UNICODE
 LIBS    =  -lws2_32 -lz -lm -Wl,-Map,$@.map,--cref -static-libgcc
 LDFLAGS =  -Wl,--out-implib,$(TARGET) -shared -lshlwapi $(CFLAGS)
 OBJDIR  =  .objs