Imp: MinGW32 コンパイル対応

upatchid:271 Contributed by　minoki git-svn-id: https://svn.code.sf.net/p/sakura-editor/code/sakura/trunk2@2543 f7ce1907-e4c7-47ca-9f76-12c87ed2c91c
sakura-editor · Jan 2, 2013 · a05c879 · a05c879
1 parent 93104b8
commit a05c879
Show file tree

Hide file tree

Showing 132 changed files with 1,032 additions and 330 deletions.
diff --git a/btool/mrc2grc.cpp b/btool/mrc2grc.cpp
@@ -0,0 +1,86 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+bool sjis_1(char* p)
+{
+	unsigned char* x = reinterpret_cast<unsigned char*>(p);
+	return (static_cast<unsigned int>((*x) ^ 0x20) - 0xa1 < 0x3c);
+}
+
+bool sjis_2(char *p)
+{
+	unsigned char* x = reinterpret_cast<unsigned char*>(p);
+	return (0x40 <= (*x) && (*x) <= 0xfc && (*x) != 0x7f);
+}
+
+void convert(const char* infile, const char* outfile)
+{
+	FILE* fin = fopen(infile, "r");
+	FILE* fout = fopen(outfile, "w");
+	if( NULL == fin ){
+		fprintf(stderr, "infile cannot open.\n");
+		return;
+	}
+	if( NULL == fout ){
+		fprintf(stderr, "outfile cannot open.\n");
+		return;
+	}
+	const int nBufferSize = 100;
+	char buffer[nBufferSize];
+	char outbuffer[nBufferSize*2];
+	int carrierlen = 0;
+	while( NULL != fgets(buffer + carrierlen, nBufferSize-carrierlen, fin) ){
+		char* p = buffer;
+		char* o = outbuffer;
+		carrierlen = 0;
+		while( '\0' != *p ){
+			if( sjis_1(p) && sjis_2(p+1) ){
+				*o++ = *p++;
+				// SJISの2バイト目が\だったときだけ\を付加する
+				if( *p == '\\' ){
+					*o++ = '\\';
+				}
+				*o++ = *p++;
+			}else if( sjis_1(p) && *(p+1) == '\0' ){
+				// 1byte次回持越し
+				buffer[0] = *p++;
+				buffer[1] = '\0';
+				carrierlen = 1;
+			}else{
+				*o++ = *p++;
+			}
+		}
+		*o = '\0';
+		fputs(outbuffer, fout);
+	}
+	fclose(fin);
+	fclose(fout);
+	return;
+}
+
+void usage(char* av0)
+{
+	char* fn;
+
+	fn = strrchr( av0, '\\' );
+	if( fn != NULL ){
+		fn++;
+	}else{
+		fn = av0;
+	}
+
+	fprintf(stderr, "%s inputfile outputfile", fn);
+	return ;
+}
+
+int main( int ac, char *av[] )
+{
+	if( ac <= 2 )
+	{
+		usage(av[0]);
+		exit(0);
+	}
+	convert( av[1], av[2] );
+	return 0;
+}
diff --git a/sakura/sakura.vcproj b/sakura/sakura.vcproj
@@ -2087,6 +2087,10 @@
 						RelativePath="..\sakura_core\view\colors\CColorStrategy.h"
 						>
 					</File>
+					<File
+						RelativePath="..\sakura_core\view\colors\EColorIndexType.h"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="figures"
@@ -2905,11 +2909,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\sakura_core\debug\Debug.cpp"
+					RelativePath="..\sakura_core\debug\Debug1.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\sakura_core\debug\Debug.h"
+					RelativePath="..\sakura_core\debug\Debug1.h"
 					>
 				</File>
 				<File

diff --git a/sakura_core/CBackupAgent.cpp b/sakura_core/CBackupAgent.cpp
@@ -276,13 +276,17 @@ class CInvalidParameterHandler{
 	CInvalidParameterHandler()
 	{
 		bInvalid = false;	// エラーの有無
+#if 1400 <= _MSC_VER
 		oldParamFunc = _set_invalid_parameter_handler( newParamFunc );	// Release 用（無効パラメータハンドラ）
 		oldRepoFunc = _CrtSetReportHook( newRepoFunc );					// Debug 用（デバッグレポートフック）
+#endif
 	}
 	~CInvalidParameterHandler()
 	{
+#if 1400 <= _MSC_VER
 		_set_invalid_parameter_handler(oldParamFunc);
 		_CrtSetReportHook(oldRepoFunc);
+#endif
 	}
 	bool IsInvalid(){ return bInvalid; }
 private:
@@ -301,12 +305,16 @@ class CInvalidParameterHandler{
 		return TRUE;
 	}
 	static bool bInvalid;
+#if 1400 <= _MSC_VER
 	static _invalid_parameter_handler oldParamFunc;
 	static _CRT_REPORT_HOOK oldRepoFunc;
+#endif
 };
 bool CInvalidParameterHandler::bInvalid;
+#if 1400 <= _MSC_VER
 _invalid_parameter_handler CInvalidParameterHandler::oldParamFunc;
 _CRT_REPORT_HOOK CInvalidParameterHandler::oldRepoFunc;
+#endif
 
 
 /*! バックアップの作成

diff --git a/sakura_core/CDataProfile.h b/sakura_core/CDataProfile.h
@@ -28,32 +28,34 @@
 #include "CProfile.h"
 
 //文字列バッファの型
-struct StringBufferW{
+struct StringBufferW_{
 	WCHAR*    pData;
 	const int nDataCount;
 
-	StringBufferW() : pData(L""), nDataCount(0) { }
-	StringBufferW(WCHAR* _pData, int _nDataCount) : pData(_pData), nDataCount(_nDataCount) { }
+//	StringBufferW_() : pData(L""), nDataCount(0) { }
+	StringBufferW_(WCHAR* _pData, int _nDataCount) : pData(_pData), nDataCount(_nDataCount) { }
 
-	StringBufferW& operator = (const StringBufferW& rhs)
+	StringBufferW_& operator = (const StringBufferW_& rhs)
 	{
 		auto_strcpy_s(pData,nDataCount,rhs.pData);
 		return *this;
 	}
 };
-struct StringBufferA{
+struct StringBufferA_{
 	ACHAR* pData;
 	int    nDataCount;
 
-	StringBufferA() : pData(""), nDataCount(0) { }
-	StringBufferA(ACHAR* _pData, int _nDataCount) : pData(_pData), nDataCount(_nDataCount) { }
+//	StringBufferA_() : pData(""), nDataCount(0) { }
+	StringBufferA_(ACHAR* _pData, int _nDataCount) : pData(_pData), nDataCount(_nDataCount) { }
 
-	StringBufferA& operator = (const StringBufferA& rhs)
+	StringBufferA_& operator = (const StringBufferA_& rhs)
 	{
 		auto_strcpy_s(pData,nDataCount,rhs.pData);
 		return *this;
 	}
 };
+typedef const StringBufferA_ StringBufferA;
+typedef const StringBufferW_ StringBufferW;
 #ifdef _UNICODE
 	typedef StringBufferW StringBufferT;
 #else
@@ -74,7 +76,9 @@ class CDataProfile : public CProfile{
 private:
 	//専用型
 	typedef std::wstring wstring;
+#ifndef UNICODE
 	typedef std::tstring tstring;
+#endif
 
 protected:
 	static const wchar_t* _work_itow(int n)

diff --git a/sakura_core/CDicMgr.cpp b/sakura_core/CDicMgr.cpp
@@ -58,11 +58,11 @@ BOOL CDicMgr::Search(
 	CRunningTimer cRunningTimer( "CDicMgr::Search" );
 #endif
 	long	i;
-	wchar_t*	pszDelimit = L" /// ";
+	const wchar_t*	pszDelimit = L" /// ";
 	wchar_t*	pszWork;
 	int		nRes;
 	wchar_t*	pszToken;
-	wchar_t*	pszKeySeps = L",\0";
+	const wchar_t*	pszKeySeps = L",\0";
 
 
 	/* 辞書ファイル */

diff --git a/sakura_core/CDllHandler.h b/sakura_core/CDllHandler.h
@@ -59,7 +59,7 @@ template <class DLLIMP> class CDllHandler{
 	DLLIMP* operator->(){ return m_pcDllImp; }
 
 	//! 利用状態のチェック（operator版）
-	bool operator!() const { return IsAvailable(); }
+	bool operator!() const { return m_pcDllImp->IsAvailable(); }
 
 private:
 	DLLIMP*	m_pcDllImp;

diff --git a/sakura_core/CGraphics.cpp b/sakura_core/CGraphics.cpp
@@ -39,7 +39,7 @@ void CGraphics::Init(HDC hdc)
 	//ブラシ
 	m_hbrOrg = NULL;
 	m_hbrCurrent = NULL;
-	m_bDynamicBrush = NULL;
+	m_bDynamicBrush = false;
 }
 
 CGraphics::~CGraphics()

diff --git a/sakura_core/CHokanMgr.cpp b/sakura_core/CHokanMgr.cpp
@@ -294,7 +294,7 @@ int CHokanMgr::Search(
 		nX -= nCX - 8;
 	}else{
 		// サイズを調整して右に表示
-		nCX = __max((int)(rcDesktop.right - nX) , 100);	// 最低サイズを100くらいに
+		nCX = std::max((int)(rcDesktop.right - nX) , 100);	// 最低サイズを100くらいに
 	}
 
 //	2001/06/19 End

diff --git a/sakura_core/CMenuDrawer.cpp b/sakura_core/CMenuDrawer.cpp
@@ -1569,7 +1569,10 @@ TCHAR CMenuDrawer::GetAccelCharFromLabel( const TCHAR* pszLabel )
 
 
 
-
+struct WorkData{
+	int				idx;
+	MENUITEMINFO	mii;
+};
 
 /*! メニューアクセスキー押下時の処理(WM_MENUCHAR処理) */
 LRESULT CMenuDrawer::OnMenuChar( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
@@ -1591,10 +1594,6 @@ LRESULT CMenuDrawer::OnMenuChar( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 		chUser = _totupper( chUser );
 	}
 
-	struct WorkData{
-		int				idx;
-		MENUITEMINFO	mii;
-	};
 	// 2011.11.18 vector化
 	std::vector<WorkData> vecAccel;
 	size_t nAccelSel = 99999;

diff --git a/sakura_core/COpe.cpp b/sakura_core/COpe.cpp
@@ -13,7 +13,6 @@
 
 #include "StdAfx.h"
 #include "COpe.h"
-#include "debug/Debug.h"
 #include "mem/CMemory.h"// 2002/2/10 aroka
 
 

diff --git a/sakura_core/COpeBlk.cpp b/sakura_core/COpeBlk.cpp
@@ -14,7 +14,6 @@
 #include <windows.h>
 #include <stdlib.h>
 #include "COpeBlk.h"
-#include "debug/Debug.h"
 
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //

diff --git a/sakura_core/COpeBuf.cpp b/sakura_core/COpeBuf.cpp
@@ -13,7 +13,6 @@
 #include "StdAfx.h"
 #include "COpeBuf.h"
 #include "COpeBlk.h"// 2002/2/10 aroka
-#include "debug/Debug.h"
 
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //

diff --git a/sakura_core/CPrint.cpp b/sakura_core/CPrint.cpp
@@ -20,7 +20,6 @@
 #include <winspool.h>
 #include "CPrint.h"
 #include "_main/global.h"
-#include "debug/Debug.h" // 2002/2/10 aroka
 
 
 // 2006.08.14 Moca 用紙名一覧の重複削除・情報の統合

diff --git a/sakura_core/CPrintPreview.cpp b/sakura_core/CPrintPreview.cpp
@@ -24,7 +24,6 @@
 //#include "dlg/CDlgPrintPage.h"
 #include "dlg/CDlgCancel.h"/// 2002/2/3 aroka from here
 #include "dlg/CDlgInput1.h" /// 2007.02.11 Moca
-//#include "debug/Debug.h"///
 //#include <stdio.h>/// 2002/2/3 aroka to here
 //#include <vector>
 #include "CEditApp.h"

diff --git a/sakura_core/CProfile.cpp b/sakura_core/CProfile.cpp
@@ -35,7 +35,6 @@
 */
 #include "StdAfx.h"
 #include "CProfile.h"
-#include "debug/Debug.h"
 #include "io/CTextStream.h"
 #include "charset/CUtf8.h"		// Resource読み込みに使用
 #include "util/file.h"

diff --git a/sakura_core/CProfile.h b/sakura_core/CProfile.h
@@ -50,7 +50,7 @@ class CProfile
 {
 	//文字列型
 	typedef std::wstring wstring;
-	typedef std::tstring tstring;
+	typedef std::string string;
 
 	typedef std::pair< wstring, wstring > PAIR_STR_STR;
 	typedef std::map< wstring, wstring > MAP_STR_STR;