Discord plugin 1.1.2.4

steve02081504 · steve02081504 · commit 039147c8c0ae · 2022-03-26T01:20:10.000+08:00
diff --git a/impl_plugin/discord/discord.cpp b/impl_plugin/discord/discord.cpp
@@ -197,37 +197,58 @@ void CDiscordPlugin::exec(const CSAORIInput& in,CSAORIOutput& out)
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomAppid") == 0)
 	{
-		Discord_ReSetAPPid(SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8).c_str());
+		string_t arg0;
+		if(in.args.size())
+			arg0 = in.args[0];
+		Discord_ReSetAPPid(SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8).c_str());
 		BaseUpdate();
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomState") == 0)
 	{
-		CustomState = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);
+		string_t arg0;
+		if(in.args.size())
+			arg0 = in.args[0];
+		CustomState = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);
 		BaseUpdate();
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomDetail") == 0)
 	{
-		CustomDetail = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);
+		string_t arg0;
+		if(in.args.size())
+			arg0 = in.args[0];
+		CustomDetail = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);
 		BaseUpdate();
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomLargeImageKey") == 0)
 	{
-		LargeImageKey = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);
+		string_t arg0;
+		if(in.args.size())
+			arg0 = in.args[0];
+		LargeImageKey = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);
 		BaseUpdate();
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomLargeImageText") == 0)
 	{
-		LargeImageText = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);
+		string_t arg0;
+		if(in.args.size())
+			arg0 = in.args[0];
+		LargeImageText = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);
 		BaseUpdate();
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomSmallImageKey") == 0)
 	{
-		SmallImageKey = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);
+		string_t arg0;
+		if(in.args.size())
+			arg0 = in.args[0];
+		SmallImageKey = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);
 		BaseUpdate();
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomSmallImageText") == 0)
 	{
-		SmallImageText = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);
+		string_t arg0;
+		if(in.args.size())
+			arg0 = in.args[0];
+		SmallImageText = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);
 		BaseUpdate();
 	}
 	else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomALL") == 0)
diff --git a/impl_plugin/discord/discord.vcxproj b/impl_plugin/discord/discord.vcxproj
@@ -29,14 +29,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLite|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/impl_plugin/discord/discord.vcxproj.user b/impl_plugin/discord/discord.vcxproj.user
@@ -1,7 +1,8 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLite|Win32'">
-    <LocalDebuggerCommand>D:\ssp_src_set\ssp\ssp.exe</LocalDebuggerCommand>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLite|Win32'">
+    <LocalDebuggerCommand>E:\ssp\ssp.exe</LocalDebuggerCommand>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerAttach>true</LocalDebuggerAttach>
+  </PropertyGroup>
 </Project>
diff --git a/impl_plugin/discord/discord1.rc b/impl_plugin/discord/discord1.rc

Original file line number	Diff line number	Diff line change
`@@ -197,37 +197,58 @@ void CDiscordPlugin::exec(const CSAORIInput& in,CSAORIOutput& out)`
`197`	`197`	`}`
`198`	`198`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomAppid") == 0)`
`199`	`199`	`{`
`200`		`- Discord_ReSetAPPid(SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8).c_str());`
	`200`	`+ string_t arg0;`
	`201`	`+ if(in.args.size())`
	`202`	`+ arg0 = in.args[0];`
	`203`	`+ Discord_ReSetAPPid(SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8).c_str());`
`201`	`204`	`BaseUpdate();`
`202`	`205`	`}`
`203`	`206`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomState") == 0)`
`204`	`207`	`{`
`205`		`- CustomState = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);`
	`208`	`+ string_t arg0;`
	`209`	`+ if(in.args.size())`
	`210`	`+ arg0 = in.args[0];`
	`211`	`+ CustomState = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);`
`206`	`212`	`BaseUpdate();`
`207`	`213`	`}`
`208`	`214`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomDetail") == 0)`
`209`	`215`	`{`
`210`		`- CustomDetail = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);`
	`216`	`+ string_t arg0;`
	`217`	`+ if(in.args.size())`
	`218`	`+ arg0 = in.args[0];`
	`219`	`+ CustomDetail = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);`
`211`	`220`	`BaseUpdate();`
`212`	`221`	`}`
`213`	`222`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomLargeImageKey") == 0)`
`214`	`223`	`{`
`215`		`- LargeImageKey = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);`
	`224`	`+ string_t arg0;`
	`225`	`+ if(in.args.size())`
	`226`	`+ arg0 = in.args[0];`
	`227`	`+ LargeImageKey = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);`
`216`	`228`	`BaseUpdate();`
`217`	`229`	`}`
`218`	`230`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomLargeImageText") == 0)`
`219`	`231`	`{`
`220`		`- LargeImageText = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);`
	`232`	`+ string_t arg0;`
	`233`	`+ if(in.args.size())`
	`234`	`+ arg0 = in.args[0];`
	`235`	`+ LargeImageText = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);`
`221`	`236`	`BaseUpdate();`
`222`	`237`	`}`
`223`	`238`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomSmallImageKey") == 0)`
`224`	`239`	`{`
`225`		`- SmallImageKey = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);`
	`240`	`+ string_t arg0;`
	`241`	`+ if(in.args.size())`
	`242`	`+ arg0 = in.args[0];`
	`243`	`+ SmallImageKey = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);`
`226`	`244`	`BaseUpdate();`
`227`	`245`	`}`
`228`	`246`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomSmallImageText") == 0)`
`229`	`247`	`{`
`230`		`- SmallImageText = SAORI_FUNC::UnicodeToMultiByte(in.args[0], CP_UTF8);`
	`248`	`+ string_t arg0;`
	`249`	`+ if(in.args.size())`
	`250`	`+ arg0 = in.args[0];`
	`251`	`+ SmallImageText = SAORI_FUNC::UnicodeToMultiByte(arg0, CP_UTF8);`
`231`	`252`	`BaseUpdate();`
`232`	`253`	`}`
`233`	`254`	`else if (wcsicmp(in.id.c_str(), L"OnDiscordPluginCustomALL") == 0)`