Tera Term

[Ttssh2-commit] [5875] GetParam を ttpcm.dll に移動した

svnno****@sourc***** svnno****@sourc*****
2015年 5月 17日 (日) 01:04:29 JST

• 前の記事 [Ttssh2-commit] [5874] コマンドライン引数の１番目は ttermpro.exe になるのでスキップするようにした
• 次の記事 [Ttssh2-commit] [5876] ttpmacro の NextParam を ttpset の NextParam と同じ動きにした
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 5875
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5875
Author:   maya
Date:     2015-05-17 01:04:29 +0900 (Sun, 17 May 2015)
Log Message:
-----------
GetParam を ttpcm.dll に移動した

Modified Paths:
--------------
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v10.vcxproj
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v9.vcproj
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj
    trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v9.vcproj
    trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
    trunk/TTXSamples/TTXttyrec/TTXttyplay.c
    trunk/TTXSamples/TTXttyrec/TTXttyplay.v10.vcxproj
    trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj
    trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj
    trunk/TTXSamples/TTXttyrec/TTXttyplay.v9.vcproj
    trunk/TTXSamples/TTXttyrec/TTXttyplay.vcproj

-------------- next part --------------
Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2015-05-16 16:04:29 UTC (rev 5875)
@@ -291,33 +291,6 @@
   }
 }
 
-PCHAR GetParam(PCHAR buff, int size, PCHAR param) {
-  int i = 0;
-  BOOL quoted = FALSE;
-
-  while (*param == ' ' || *param == '\t') {
-    param++;
-  }
-
-  if (*param == '\0' || *param == ';') {
-    return NULL;
-  }
-
-  while (*param != '\0' && (quoted || (*param != ';' && *param != ' ' && *param != '\t'))) {
-    if (*param == '"' && (*++param != '"' || !quoted)) {
-      quoted = !quoted;
-      continue;
-    }
-    else if (i < size - 1) {
-      buff[i++] = *param;
-    }
-    param++;
-  }
-
-  buff[i] = '\0';
-  return (param);
-}
-
 static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
   char buff[1024];
   PCHAR next;

Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v10.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v10.vcxproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v10.vcxproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -59,6 +59,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -75,6 +76,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v11.vcxproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -79,6 +80,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v12.vcxproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -79,6 +80,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v9.vcproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v9.vcproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.v9.vcproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -62,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.vcproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v9.vcproj
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v9.vcproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.v9.vcproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -62,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2015-05-16 16:04:29 UTC (rev 5875)
@@ -385,33 +385,6 @@
 //	/F= \x82ɂ\xE6\x82\xE9\x90ݒ\xE8\x83t\x83@\x83C\x83\x8B\x82̐؂\xE8\x91ւ\xA6\x82̂ݑΉ\x9E\x81B
 //
 
-PCHAR GetParam(PCHAR buff, int size, PCHAR param) {
-	int i = 0;
-	BOOL quoted = FALSE;
-
-	while (*param == ' ' || *param == '\t') {
-		param++;
-	}
-
-	if (*param == '\0' || *param == ';') {
-		return NULL;
-	}
-
-	while (*param != '\0' && (quoted || (*param != ';' && *param != ' ' && *param != '\t'))) {
-		if (*param == '"' && (*++param != '"' || !quoted)) {
-			quoted = !quoted;
-			continue;
-		}
-		else if (i < size - 1) {
-			buff[i++] = *param;
-		}
-		param++;
-	}
-
-	buff[i] = '\0';
-	return param;
-}
-
 static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
         char buff[1024];
         PCHAR next;

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.c	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.c	2015-05-16 16:04:29 UTC (rev 5875)
@@ -344,33 +344,6 @@
 	}
 }
 
-PCHAR GetParam(PCHAR buff, int size, PCHAR param) {
-	int i = 0;
-	BOOL quoted = FALSE;
-
-	while (*param == ' ' || *param == '\t') {
-		param++;
-	}
-
-	if (*param == '\0' || *param == ';') {
-		return NULL;
-	}
-
-	while (*param != '\0' && (quoted || (*param != ';' && *param != ' ' && *param != '\t'))) {
-		if (*param == '"' && (*++param != '"' || !quoted)) {
-			quoted = !quoted;
-			continue;
-		}
-		else if (i < size - 1) {
-			buff[i++] = *param;
-		}
-		param++;
-	}
-
-	buff[i] = '\0';
-	return (param);
-}
-
 static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
 	char buff[1024];
 	PCHAR next;

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.v10.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.v10.vcxproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.v10.vcxproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -59,6 +59,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -75,6 +76,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.v11.vcxproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -79,6 +80,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.v12.vcxproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -64,6 +64,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -79,6 +80,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.v9.vcproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.v9.vcproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.v9.vcproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -62,6 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.vcproj
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.vcproj	2015-05-16 14:45:47 UTC (rev 5874)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.vcproj	2015-05-16 16:04:29 UTC (rev 5875)
@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib&quot;"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"

• 前の記事 [Ttssh2-commit] [5874] コマンドライン引数の１番目は ttermpro.exe になるのでスキップするようにした
• 次の記事 [Ttssh2-commit] [5876] ttpmacro の NextParam を ttpset の NextParam と同じ動きにした
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]