[Ttssh2-commit] [4744] svnrev, puttyrev で MFC を使わないように書き換え

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2011年 11月 26日 (土) 14:26:43 JST


Revision: 4744
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4744
Author:   maya
Date:     2011-11-26 14:26:42 +0900 (Sat, 26 Nov 2011)
Log Message:
-----------
svnrev,puttyrev で MFC を使わないように書き換え

Modified Paths:
--------------
    trunk/teraterm/svnrev/svnrev.cpp
    trunk/teraterm/svnrev/svnrev.vcproj
    trunk/ttssh2/puttyrev/puttyrev.cpp
    trunk/ttssh2/puttyrev/puttyrev.h
    trunk/ttssh2/puttyrev/puttyrev.vcproj

Removed Paths:
-------------
    trunk/teraterm/svnrev/stdafx.cpp
    trunk/teraterm/svnrev/stdafx.h
    trunk/ttssh2/puttyrev/ReadMe.txt
    trunk/ttssh2/puttyrev/Resource.h
    trunk/ttssh2/puttyrev/puttyrev.rc
    trunk/ttssh2/puttyrev/stdafx.cpp
    trunk/ttssh2/puttyrev/stdafx.h

Property Changed:
----------------
    trunk/ttssh2/puttyrev/

-------------- next part --------------
Deleted: trunk/teraterm/svnrev/stdafx.cpp
===================================================================
--- trunk/teraterm/svnrev/stdafx.cpp	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/teraterm/svnrev/stdafx.cpp	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1 +0,0 @@
-#include "stdafx.h"

Deleted: trunk/teraterm/svnrev/stdafx.h
===================================================================
--- trunk/teraterm/svnrev/stdafx.h	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/teraterm/svnrev/stdafx.h	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,11 +0,0 @@
-#pragma once
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN
-#endif
-
-#include <afx.h>
-#include <afxwin.h>

Modified: trunk/teraterm/svnrev/svnrev.cpp
===================================================================
--- trunk/teraterm/svnrev/svnrev.cpp	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/teraterm/svnrev/svnrev.cpp	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,18 +1,11 @@
-#include "stdafx.h"
+#include <windows.h>
+#include <stdio.h>
 #include "svnrev.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-CWinApp theApp;
-
-using namespace std;
-
 int get_svn_revision(char *svnversion, char *path) {
 	FILE *fp;
 	char command[MAX_PATH*2];
-	char result[32];
+	char result[32]= "";
 	int revision = -1;
 
 	// subversion 1.7 \x82\xA9\x82\xE7 .svn\entries \x82̃t\x83H\x81[\x83}\x83b\x83g\x82\xAA\x95ς\xED\x82\xC1\x82\xBD\x82\xBD\x82߁A
@@ -23,38 +16,34 @@
 		return -1;
 	}
 
-	while(!feof(fp)){
-		fgets(result, sizeof(result), fp);
-		revision = atoi(result);
-		break;
-	}
+	fread(result, sizeof(result), sizeof(result)-1, fp);
+	revision = atoi(result);
 	_pclose(fp);
 
+	if (revision == 0) {
+		revision = -1;
+	}
+
 	return revision;
 }
 
 BOOL write_svn_revesion(char *filename, int revision) {
-	BOOL ret;
-	CStdioFile csf;
-	CString cs;
+	FILE *fp;
+	char buf[64] = "";
 	int file_revision = -1;
-	
+
 	// print to stdout
 	if (strcmp(filename, "-") == 0) {
-		CStdioFile csf (stdout);
-		cs.Format("#define SVNVERSION %d\n", revision);
-		csf.WriteString(cs);
+		fprintf(stdout, "#define SVNVERSION %d\n", revision);
 		return TRUE;
 	}
 
 	// read current file
-	ret = csf.Open(filename, CFile::modeRead);
-	if (ret == TRUE) {
-		csf.SeekToBegin();
-		csf.ReadString(cs);
-		csf.Close();
+	if (fopen_s(&fp, filename, "r") == 0) {
+		fread(buf, sizeof(char), sizeof(buf)-1, fp);
+		fclose(fp);
 
-		ret = sscanf_s(cs, "#define SVNVERSION %d", &file_revision);
+		sscanf_s(buf, "#define SVNVERSION %d", &file_revision);
 	}
 
 	// compare revisions
@@ -67,26 +56,23 @@
 		return TRUE;
 	}
 
-	ret = csf.Open(filename, CFile::modeWrite | CFile::modeCreate);
-	if (ret == FALSE) {
+	if (fopen_s(&fp, filename, "w+") != 0) {
 		return FALSE;
 	}
 
 	if (revision >= 1) {
-		cs.Format("#define SVNVERSION %d\n", revision);
-		csf.WriteString(cs);
+		fprintf(fp, "#define SVNVERSION %d\n", revision);
 	}
 	else {
-		cs.Format("#undef SVNVERSION\n");
-		csf.WriteString(cs);
+		fprintf(fp, "#undef SVNVERSION\n");
 	}
 
-	csf.Close();
+	fclose(fp);
 
 	return TRUE;
 }
 
-int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
+int main(int argc, char* argv[])
 {
 	int revision = -1;
 	char *svnversion, *input, *output;

Modified: trunk/teraterm/svnrev/svnrev.vcproj
===================================================================
--- trunk/teraterm/svnrev/svnrev.vcproj	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/teraterm/svnrev/svnrev.vcproj	2011-11-26 05:26:42 UTC (rev 4744)
@@ -20,7 +20,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="2"
+			UseOfMFC="0"
 			CharacterSet="0"
 			>
 			<Tool
@@ -96,7 +96,7 @@
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="2"
+			UseOfMFC="0"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -177,26 +177,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath=".\svnrev.cpp"
 				>
 			</File>
@@ -207,10 +187,6 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-			<File
 				RelativePath=".\svnrev.h"
 				>
 			</File>


Property changes on: trunk/ttssh2/puttyrev
___________________________________________________________________
Modified: svn:ignore
   - [Dd]ebug
[Rr]elease
*.vcproj.*.user

   + [Rr]elease
[Dd]ebug
*.ncb
*.suo
*.aps
*.vcproj.*.user


Deleted: trunk/ttssh2/puttyrev/ReadMe.txt
===================================================================
--- trunk/ttssh2/puttyrev/ReadMe.txt	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/ReadMe.txt	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,51 +0,0 @@
-========================================================================
-    \x83R\x83\x93\x83\\x81[\x83\x8B \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93 : puttyrev \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82̊T\x97v
-========================================================================
-
-\x82\xB1\x82\xCC puttyrev \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82́AAppWizard \x82ɂ\xE6\x82\xC1\x82č쐬\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B  
-
-\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82ɂ́Aputtyrev \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82\xF0\x8D\\x90\xAC\x82\xB7\x82\xE9\x8Ae\x83t\x83@\x83C\x83\x8B\x82\xCC
-\x93\xE0\x97e\x82̊T\x97\xAA\x82\xAA\x8BL\x8Fq\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
-
-
-puttyrev.vcproj
-    \x82\xB1\x82\xEA\x82́A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93 \x83E\x83B\x83U\x81[\x83h\x82Ő\xB6\x90\xAC\x82\xB3\x82\xEA\x82\xE9 VC++ \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82̃\x81\x83C\x83\x93\x82\xCC
-    \x83v\x83\x8D\x83W\x83F\x83N\x83g \x83t\x83@\x83C\x83\x8B\x82ł\xB7\x81B 
-    \x83t\x83@\x83C\x83\x8B\x82𐶐\xAC\x82\xB5\x82\xBD Visual C++ \x82̃o\x81[\x83W\x83\x87\x83\x93\x8F\xEE\x95\xF1\x82ƁA\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93 
-    \x83E\x83B\x83U\x81[\x83h\x82őI\x91\xF0\x82\xB5\x82\xBD\x83v\x83\x89\x83b\x83g\x83t\x83H\x81[\x83\x80\x81A\x8D\\x90\xAC\x81A\x82\xA8\x82\xE6\x82уv\x83\x8D\x83W\x83F\x83N\x83g\x82̋@\x94\\x82Ɋւ\xB7\x82\xE9
-    \x8F\xEE\x95񂪋L\x8Fq\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
-
-puttyrev.cpp
-    \x82\xB1\x82\xEA\x82́A\x83\x81\x83C\x83\x93\x82̃A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93 \x83\\x81[\x83X \x83t\x83@\x83C\x83\x8B\x82ł\xB7\x81B
-
-/////////////////////////////////////////////////////////////////////////////
-AppWizard \x82ɂ\xE6\x82\xC1\x82āA\x8E\x9F\x82̃\x8A\x83\\x81[\x83X\x82\xAA\x8D쐬\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B
-
-puttyrev.rc
-    \x82\xB1\x82\xEA\x82́A\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82Ŏg\x97p\x82\xB7\x82\xE9 Microsoft Windows \x82̑S\x83\x8A\x83\\x81[\x83X\x82̈ꗗ\x82ł\xB7\x81B
-    RES \x83T\x83u\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ɕۑ\xB6\x82\xB3\x82\xEA\x82\xE9\x83A\x83C\x83R\x83\x93\x81A\x83r\x83b\x83g\x83}\x83b\x83v\x81A\x83J\x81[\x83\\x83\x8B\x82Ȃǂ\xAA
-    \x8A܂܂\xEA\x82܂\xB7\x81B\x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82́AMicrosoft Visual C++ \x82Œ\xBC\x90ڕҏW\x82ł\xAB\x82܂\xB7\x81B
-
-Resource.h
-    \x82\xB1\x82\xEA\x82́A\x90V\x82\xB5\x82\xA2\x83\x8A\x83\\x81[\x83X ID \x82\xF0\x92\xE8\x8B`\x82\xB7\x82\xE9\x95W\x8F\x80\x82̃w\x83b\x83_\x81[ \x83t\x83@\x83C\x83\x8B\x82ł\xB7\x81B
-    \x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82̓ǂݍ\x9E\x82݂\xA8\x82\xE6\x82эX\x90V\x82́AMicrosoft Visual C++ \x82ōs\x82\xA2\x82܂\xB7\x81B
-
-/////////////////////////////////////////////////////////////////////////////
-\x82\xBB\x82̑\xBC\x82̕W\x8F\x80\x83t\x83@\x83C\x83\x8B :
-
-StdAfx.h, StdAfx.cpp
-    \x82\xB1\x82\xEA\x82\xE7\x82̃t\x83@\x83C\x83\x8B\x82́A\x83R\x83\x93\x83p\x83C\x83\x8B\x8Dς݃w\x83b\x83_\x81[ (PCH) \x83t\x83@\x83C\x83\x8B 
-    puttyrev.pch \x82ƃv\x83\x8A\x83R\x83\x93\x83p\x83C\x83\x8B\x8Dς݌^\x83t\x83@\x83C\x83\x8B StdAfx.obj \x82\xF0
-    \x83r\x83\x8B\x83h\x82\xB7\x82邽\x82߂Ɏg\x97p\x82\xB5\x82܂\xB7\x81B
-
-/////////////////////////////////////////////////////////////////////////////
-\x82\xBB\x82̑\xBC\x82̃\x81\x83\x82 :
-
-AppWizard \x82ł\xCD "TODO:" \x83R\x83\x81\x83\x93\x83g\x82\xF0\x8Eg\x97p\x82\xB5\x82āA\x83\x86\x81[\x83U\x81[\x82\xAA\x92lj\xC1\x82܂\xBD\x82̓J\x83X\x83^\x83}\x83C\x83Y\x82\xB7\x82\xE9
-\x83\\x81[\x83X\x95\x94\x95\xAA\x82\xF0\x8E\xA6\x82\xB5\x82܂\xB7\x81B
-
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-

Deleted: trunk/ttssh2/puttyrev/Resource.h
===================================================================
--- trunk/ttssh2/puttyrev/Resource.h	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/Resource.h	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,17 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by puttyrev.rc
-//
-
-#define IDS_APP_TITLE			103
-
-// \x90V\x82\xB5\x82\xA2\x83I\x83u\x83W\x83F\x83N\x83g\x82̎\x9F\x82̊\xF9\x92\xE8\x92l
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE	101
-#define _APS_NEXT_COMMAND_VALUE		40001
-#define _APS_NEXT_CONTROL_VALUE		1000
-#define _APS_NEXT_SYMED_VALUE		101
-#endif
-#endif

Modified: trunk/ttssh2/puttyrev/puttyrev.cpp
===================================================================
--- trunk/ttssh2/puttyrev/puttyrev.cpp	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/puttyrev.cpp	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,24 +1,11 @@
-// puttyrev.cpp : \x83R\x83\x93\x83\\x81[\x83\x8B \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82̃G\x83\x93\x83g\x83\x8A \x83|\x83C\x83\x93\x83g\x82\xF0\x92\xE8\x8B`\x82\xB5\x82܂\xB7\x81B
-//
-
-#include "stdafx.h"
+#include <windows.h>
+#include <stdio.h>
 #include "puttyrev.h"
 
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#endif
-
-
-// \x97B\x88\xEA\x82̃A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93 \x83I\x83u\x83W\x83F\x83N\x83g\x82ł\xB7\x81B
-
-CWinApp theApp;
-
-using namespace std;
-
 void write_putty_version(char *path)
 {
 	BOOL ret;
-	CStdioFile csf;
+	FILE *fp;
 	char *keywords[] = {
 		//"AppVerName",
 		"AppVersion",
@@ -26,25 +13,25 @@
 		NULL,
 	};
 	int i;
-	CString filename, buf, cs;
+	char filename[MAX_PATH * 2], buf[64];
 	char revision[64] = {0};
-	char header_line[64], *p;
+	char header_line[64]= {0}, *p;
 
 	// PuTTY\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
-	filename = path;
-	filename += "\\libs\\putty\\windows\\putty.iss";
+	_snprintf_s(filename, sizeof(filename), _TRUNCATE,
+	            "%s%s", path, "\\libs\\putty\\windows\\putty.iss");
 
-	ret = csf.Open(filename, CFile::modeRead);
-	if (ret == FALSE) {
+	if (fopen_s(&fp, filename, "r") != 0) {
 		goto write;
 	}
 
-	while (csf.ReadString(cs) != NULL) {
-		CString tmp;
+	while(!feof(fp)){
+		char tmp[64];
+		fgets(buf, sizeof(buf), fp);
 		for (i = 0 ; keywords[i] ; i++) {
-			tmp = keywords[i];
-			tmp += "=%[^\n]s";
-			ret = sscanf_s(cs, tmp, revision, sizeof(revision));
+			_snprintf_s(tmp, sizeof(tmp), _TRUNCATE,
+			            "%s%s", keywords[i], "=%[^\n]s");
+			ret = sscanf_s(buf, tmp, revision, sizeof(revision));
 			if (ret != 1) 
 				continue;
 			printf("%s\n", revision);
@@ -53,86 +40,75 @@
 	}
 
 close:
-	csf.Close();
+	fclose(fp);
 
-	filename = path;
-	filename += "\\ttssh2\\ttxssh\\puttyversion.h";
+	_snprintf_s(filename, sizeof(filename), _TRUNCATE,
+	            "%s%s", path, "\\ttssh2\\ttxssh\\puttyversion.h");
 
 	// \x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x83`\x83F\x83b\x83N\x82\xB5\x81A\x95ύX\x82\xAA\x82Ȃ\xAF\x82\xEA\x82Δ\xB2\x82\xAF\x82\xE9
-	ret = csf.Open(filename, CFile::modeRead);
-	if (ret == FALSE) {
+	if (fopen_s(&fp, filename, "r") != 0) {
 		goto write;
 	}
 
-	if (csf.ReadString(header_line, sizeof(header_line)) == NULL) {
-		csf.Close();
+	memset(header_line, 0, sizeof(header_line));
+	if (fread(header_line, sizeof(char), sizeof(header_line)-1, fp) == 0) {
+		fclose(fp);
 		goto write;
 	}
 
 	if ( (p = strchr(header_line, '"')) == NULL ) {
-		csf.Close();
+		fclose(fp);
 		goto write;
 	}
 
 	p++;
 	if (strncmp(p, revision, strlen(p)-2) == 0) {
-		csf.Close();
+		fclose(fp);
 		goto end;
 	}
 
-	csf.Close();
+	fclose(fp);
 
 write:
+	_snprintf_s(filename, sizeof(filename), _TRUNCATE,
+	            "%s%s", path, "\\ttssh2\\ttxssh\\puttyversion.h");
+
 	// \x83o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x83w\x83b\x83_\x82ɏ\x91\x82\xAB\x8D\x9E\x82ށB
-	ret = csf.Open(filename, CFile::modeWrite | CFile::modeCreate);
-	if (ret == FALSE) {
+	if (fopen_s(&fp, filename, "w+") != 0) {
 		goto end;
 	}
 
 	if (revision[0] != '\0') {
-		cs.Format("#define PUTTYVERSION \"%s\"\n", revision);
-		csf.WriteString(cs);
+		fprintf(fp, "#define PUTTYVERSION \"%s\"\n", revision);
 	}
 	else {
-		cs.Format("#undef PUTTYVERSION\n");
-		csf.WriteString(cs);
+		fprintf(fp, "#undef PUTTYVERSION\n");
 	}
 
-	csf.Close();
+	fclose(fp);
 
 end:;
 }
 
-int _tmain(int argc, TCHAR* argv[], TCHAR* envp[])
+int main(int argc, char* argv[])
 {
 	int nRetCode = 0;
 	char path[MAX_PATH * 2];
 	int i, len;
 
-	// MFC \x82\xF0\x8F\x89\x8A\x{227B0B5}\x82āA\x83G\x83\x89\x81[\x82̏ꍇ\x82͌\x8B\x89ʂ\xF0\x88\xF3\x8D\xFC\x82\xB5\x82܂\xB7\x81B
-	if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
-	{
-		// TODO: \x95K\x97v\x82ɉ\x9E\x82\xB6\x82ăG\x83\x89\x81[ \x83R\x81[\x83h\x82\xF0\x95ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-		_tprintf(_T("\x92v\x96\xBD\x93I\x82ȃG\x83\x89\x81[: MFC \x82̏\x89\x8A\x{227B0AA}\x82ł\xAB\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD\x81B\n"));
-		nRetCode = 1;
-	}
-	else
-	{
-		// TODO: \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82̓\xAE\x8D\xEC\x82\xF0\x8BL\x8Fq\x82\xB7\x82\xE9\x83R\x81[\x83h\x82\xF0\x82\xB1\x82\xB1\x82ɑ}\x93\xFC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-		GetModuleFileName(::GetModuleHandle(NULL), path, sizeof(path));
-		len = (int)strlen(path);
-		for (i=len; i>=0; i--) {
-			if (path[i] == '\\') {
-				break;
-			}
-			path[i] = '\0';
+	GetModuleFileName(::GetModuleHandle(NULL), path, sizeof(path));
+	len = (int)strlen(path);
+	for (i=len; i>=0; i--) {
+		if (path[i] == '\\') {
+			break;
 		}
-		SetCurrentDirectory(path); // teraterm\debug or teraterm\release
-		SetCurrentDirectory("..\\..\\..\\"); // top of source tree
-		GetCurrentDirectory(sizeof(path), path);
-
-		write_putty_version(path);
+		path[i] = '\0';
 	}
+	SetCurrentDirectory(path); // teraterm\debug or teraterm\release
+	SetCurrentDirectory("..\\..\\..\\"); // top of source tree
+	GetCurrentDirectory(sizeof(path), path);
 
+	write_putty_version(path);
+
 	return nRetCode;
 }

Modified: trunk/ttssh2/puttyrev/puttyrev.h
===================================================================
--- trunk/ttssh2/puttyrev/puttyrev.h	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/puttyrev.h	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,3 +1 @@
 #pragma once
-
-#include "resource.h"

Deleted: trunk/ttssh2/puttyrev/puttyrev.rc
===================================================================
--- trunk/ttssh2/puttyrev/puttyrev.rc	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/puttyrev.rc	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,69 +0,0 @@
-//Microsoft Visual C++ \x82Ő\xB6\x90\xAC\x82\xB3\x82ꂽ\x83\x8A\x83\\x81[\x83X \x83X\x83N\x83\x8A\x83v\x83g\x82ł\xB7\x81B
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE 2 \x83\x8A\x83\\x81[\x83X\x82\xA9\x82琶\x90\xAC\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B
-//
-#include "afxres.h"
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-LANGUAGE 17, 1
-#pragma code_page(932)
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE  
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE  
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE  
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// \x83X\x83g\x83\x8A\x83\x93\x83O \x83e\x81[\x83u\x83\x8B
-//
-
-STRINGTABLE  
-BEGIN
-   IDS_APP_TITLE       "puttyrev"
-END
-
-#endif
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE 3 \x83\x8A\x83\\x81[\x83X\x82\xA9\x82琶\x90\xAC\x82\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B
-//
-#ifndef _AFXDLL
-#include "afxres.rc"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // APSTUDIO_INVOKED \x82łȂ\xA2\x8Fꍇ

Modified: trunk/ttssh2/puttyrev/puttyrev.vcproj
===================================================================
--- trunk/ttssh2/puttyrev/puttyrev.vcproj	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/puttyrev.vcproj	2011-11-26 05:26:42 UTC (rev 4744)
@@ -20,7 +20,7 @@
 			OutputDirectory="$(SolutionDir)ttxssh\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="2"
+			UseOfMFC="0"
 			CharacterSet="0"
 			>
 			<Tool
@@ -45,7 +45,7 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
@@ -96,7 +96,7 @@
 			OutputDirectory="$(SolutionDir)ttxssh\$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			UseOfMFC="2"
+			UseOfMFC="0"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -119,7 +119,7 @@
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -180,26 +180,6 @@
 				RelativePath=".\puttyrev.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -210,29 +190,7 @@
 				RelativePath=".\puttyrev.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
 		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\puttyrev.rc"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

Deleted: trunk/ttssh2/puttyrev/stdafx.cpp
===================================================================
--- trunk/ttssh2/puttyrev/stdafx.cpp	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/stdafx.cpp	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,8 +0,0 @@
-// stdafx.cpp : \x95W\x8F\x80\x83C\x83\x93\x83N\x83\x8B\x81[\x83h puttyrev.pch \x82݂̂\xF0
-// \x8A܂ރ\\x81[\x83X \x83t\x83@\x83C\x83\x8B\x82́A\x83v\x83\x8A\x83R\x83\x93\x83p\x83C\x83\x8B\x8Dς݃w\x83b\x83_\x81[\x82ɂȂ\xE8\x82܂\xB7\x81B
-// stdafx.obj \x82ɂ̓v\x83\x8A\x83R\x83\x93\x83p\x83C\x83\x8B\x8Dς݌^\x8F\xEE\x95񂪊܂܂\xEA\x82܂\xB7\x81B
-
-#include "stdafx.h"
-
-// TODO: \x82\xB1\x82̃t\x83@\x83C\x83\x8B\x82ł͂Ȃ\xAD\x81ASTDAFX.H \x82ŕK\x97v\x82\xC8
-// \x92lj\xC1\x83w\x83b\x83_\x81[\x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B

Deleted: trunk/ttssh2/puttyrev/stdafx.h
===================================================================
--- trunk/ttssh2/puttyrev/stdafx.h	2011-11-24 10:03:48 UTC (rev 4743)
+++ trunk/ttssh2/puttyrev/stdafx.h	2011-11-26 05:26:42 UTC (rev 4744)
@@ -1,48 +0,0 @@
-// stdafx.h : \x95W\x8F\x80\x82̃V\x83X\x83e\x83\x80 \x83C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B\x82̃C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B\x81A\x82܂\xBD\x82\xCD
-// \x8EQ\x8FƉ񐔂\xAA\x91\xBD\x82\xAD\x81A\x82\xA9\x82‚\xA0\x82܂\xE8\x95ύX\x82\xB3\x82\xEA\x82Ȃ\xA2\x81A\x83v\x83\x8D\x83W\x83F\x83N\x83g\x90\xEA\x97p\x82̃C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B
-// \x82\xF0\x8BL\x8Fq\x82\xB5\x82܂\xB7\x81B
-//
-
-#pragma once
-
-// \x89\xBA\x82Ŏw\x92肳\x82ꂽ\x92\xE8\x8B`\x82̑O\x82ɑΏۃv\x83\x89\x83b\x83g\x83t\x83H\x81[\x83\x80\x82\xF0\x8Ew\x92肵\x82Ȃ\xAF\x82\xEA\x82΂Ȃ\xE7\x82Ȃ\xA2\x8Fꍇ\x81A\x88ȉ\xBA\x82̒\xE8\x8B`\x82\xF0\x95ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-// \x88قȂ\xE9\x83v\x83\x89\x83b\x83g\x83t\x83H\x81[\x83\x80\x82ɑΉ\x9E\x82\xB7\x82\xE9\x92l\x82Ɋւ\xB7\x82\xE9\x8DŐV\x8F\xEE\x95\xF1\x82ɂ‚\xA2\x82ẮAMSDN \x82\xF0\x8EQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-#ifndef WINVER				// Windows XP \x88ȍ~\x82̃o\x81[\x83W\x83\x87\x83\x93\x82ɌŗL\x82̋@\x94\\x82̎g\x97p\x82\xF0\x8B\x96\x89‚\xB5\x82܂\xB7\x81B
-#define WINVER 0x0501		// \x82\xB1\x82\xEA\x82\xF0 Windows \x82̑\xBC\x82̃o\x81[\x83W\x83\x87\x83\x93\x8C\xFC\x82\xAF\x82ɓK\x90؂Ȓl\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-#endif
-
-#ifndef _WIN32_WINNT		// Windows XP \x88ȍ~\x82̃o\x81[\x83W\x83\x87\x83\x93\x82ɌŗL\x82̋@\x94\\x82̎g\x97p\x82\xF0\x8B\x96\x89‚\xB5\x82܂\xB7\x81B                   
-#define _WIN32_WINNT 0x0501	// \x82\xB1\x82\xEA\x82\xF0 Windows \x82̑\xBC\x82̃o\x81[\x83W\x83\x87\x83\x93\x8C\xFC\x82\xAF\x82ɓK\x90؂Ȓl\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-#endif						
-
-#ifndef _WIN32_WINDOWS		// Windows 98 \x88ȍ~\x82̃o\x81[\x83W\x83\x87\x83\x93\x82ɌŗL\x82̋@\x94\\x82̎g\x97p\x82\xF0\x8B\x96\x89‚\xB5\x82܂\xB7\x81B
-#define _WIN32_WINDOWS 0x0410 // \x82\xB1\x82\xEA\x82\xF0 Windows Me \x82܂\xBD\x82͂\xBB\x82\xEA\x88ȍ~\x82̃o\x81[\x83W\x83\x87\x83\x93\x8C\xFC\x82\xAF\x82ɓK\x90؂Ȓl\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-#endif
-
-#ifndef _WIN32_IE			// IE 6.0 \x88ȍ~\x82̃o\x81[\x83W\x83\x87\x83\x93\x82ɌŗL\x82̋@\x94\\x82̎g\x97p\x82\xF0\x8B\x96\x89‚\xB5\x82܂\xB7\x81B
-#define _WIN32_IE 0x0600	// \x82\xB1\x82\xEA\x82\xF0 IE. \x82̑\xBC\x82̃o\x81[\x83W\x83\x87\x83\x93\x8C\xFC\x82\xAF\x82ɓK\x90؂Ȓl\x82ɕύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-#endif
-
-#include <stdio.h>
-#include <tchar.h>
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// \x88ꕔ\x82\xCC CString \x83R\x83\x93\x83X\x83g\x83\x89\x83N\x83^\x82͖\xBE\x8E\xA6\x93I\x82ł\xB7\x81B
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN		// Windows \x83w\x83b\x83_\x81[\x82\xA9\x82\xE7\x8Eg\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x95\x94\x95\xAA\x82\xF0\x8F\x9C\x8AO\x82\xB5\x82܂\xB7\x81B
-#endif
-
-#include <afx.h>
-#include <afxwin.h>         // MFC \x82̃R\x83A\x82\xA8\x82\xE6\x82ѕW\x8F\x80\x83R\x83\x93\x83|\x81[\x83l\x83\x93\x83g
-#include <afxext.h>         // MFC \x82̊g\x92\xA3\x95\x94\x95\xAA
-#ifndef _AFX_NO_OLE_SUPPORT
-#include <afxdtctl.h>		// MFC \x82\xCC Internet Explorer 4 \x83R\x83\x82\x83\x93 \x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B \x83T\x83|\x81[\x83g
-#endif
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h>			// MFC \x82\xCC Windows \x83R\x83\x82\x83\x93 \x83R\x83\x93\x83g\x83\x8D\x81[\x83\x8B \x83T\x83|\x81[\x83g
-#endif // _AFX_NO_AFXCMN_SUPPORT
-
-#include <iostream>
-
-
-
-// TODO: \x83v\x83\x8D\x83O\x83\x89\x83\x80\x82ɕK\x97v\x82Ȓlj\xC1\x83w\x83b\x83_\x81[\x82\xF0\x82\xB1\x82\xB1\x82ŎQ\x8FƂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B



Ttssh2-commit メーリングリストの案内
Back to archive index