Add files via upload

MantisMountainMobile · May 6, 2022 · e804ec4 · e804ec4
1 parent 7b4ea2b
commit e804ec4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/source/tc2ch/dll/tcdll.rc b/source/tc2ch/dll/tcdll.rc
@@ -27,8 +27,8 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,2,1,1
- PRODUCTVERSION 5,2,1,1
+ FILEVERSION 5,2,2,1
+ PRODUCTVERSION 5,2,2,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,11 +45,11 @@ BEGIN
         BEGIN
             VALUE "Comments", "TClock DLL for Windows10 and Windows11"
             VALUE "FileDescription", "DLL for TClock-Win10"
-            VALUE "FileVersion", "5.2.1.1"
+            VALUE "FileVersion", "5.2.2.1"
             VALUE "InternalName", "TCDLL"
             VALUE "OriginalFilename", "tcdll-win10.dll"
             VALUE "ProductName", "TClock-Win10"
-            VALUE "ProductVersion", "5.2.1.1"
+            VALUE "ProductVersion", "5.2.2.1"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/source/tc2ch/dll/tclock.c b/source/tc2ch/dll/tclock.c
@@ -1273,12 +1273,14 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 			if (message == WM_RBUTTONUP && (wParam & MK_LBUTTON || ((wParam&MK_CONTROL)&&(wParam&MK_SHIFT)) || bRClickMenu))
 			{
 
-				//{
-				//	//test code
-				//	char tempString[1024];
-				//	strcpy(tempString, "test45678901234567890123456789");
-				//	PostMessage(tempHwnd, CLOCKM_UPDATE_EXTTEXT, NULL, (LPARAM)tempString);
-				//}
+//				{
+//					//test code
+//					char tempString[1024];
+//					strcpy(tempString, "test45678901234567890123456789");
+//					PostMessage(tempHwnd, CLOCKM_UPDATE_EXTTEXT, NULL, (LPARAM)tempString);		//read from lParam
+//					PostMessage(tempHwnd, CLOCKM_UPDATE_EXTTEXT, NULL, NULL);					//read from tclock-win10.ini ([ETC]ExtTXT_String)
+//					PostMessage(tempHwnd, CLOCKM_UPDATE_EXTTEXT, 1, (LPARAM)tempString);		//read from tclock-win10.ini ([ETC]ExtTXT_String)
+//				}
 
 				DWORD mp;
 				mp = GetMessagePos();
@@ -1415,21 +1417,21 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		{
 			// To Update "ExtTXT" in format
 			// PostMessage(****TCLOCK_MAIN_HWND****, 0x0404, NULL, (LPARAM)char* string);
+			// if wParam == 1 or lParam == NULL, text is read from tclock-win10.ini
 
 			if (b_DebugLog) writeDebugLog_Win10("[tclock.c][WndProc()] CLOCKM_UPDATE_EXTTEXT received", 999);
 
-			if (lParam != NULL) {
+			if ((lParam == NULL) || (wParam == 1)){
+				GetMyRegStr("ETC", "ExtTXT_String", ExtTXT_String, 255, "");
+			}
+			else {
 				if (strlen((char*)lParam) < 256) {
 					strcpy_s(ExtTXT_String, 256, (char*)lParam);
 				}
 				else {
-					strcpy_s(ExtTXT_String, 255, (char*)lParam);
-					ExtTXT_String[127] = '\0';
+					strcpy(ExtTXT_String, "Too Long");
 				}
 			}
-			else {
-				ExtTXT_String[0] = '\0';
-			}
 
 			return 0;
 		}
@@ -2173,6 +2175,8 @@ void ReadData()
 	if (ExtTXT_Length > 128) ExtTXT_Length = 128;
 	SetMyRegLong("ETC", "ExtTXT_Length", ExtTXT_Length);
 
+	SetMyRegStr("ETC", "ExtTXT_String", "");
+
 	strAdditionalMountPath[10][64];
 
 	for (int i = 0; i < 10; i++) {

diff --git a/source/tc2ch/exe/tclock.rc b/source/tc2ch/exe/tclock.rc
@@ -14,8 +14,8 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,2,1,1
- PRODUCTVERSION 5,2,1,1
+ FILEVERSION 5,2,2,1
+ PRODUCTVERSION 5,2,2,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -32,11 +32,11 @@ BEGIN
         BEGIN
             VALUE "Comments", "TClock Main for Windows10 and Windows11"
             VALUE "FileDescription", "TClock-Win10"
-            VALUE "FileVersion", "5.2.1.1"
+            VALUE "FileVersion", "5.2.2.1"
             VALUE "InternalName", "TClock"
             VALUE "OriginalFilename", "TClock-Win10.exe"
             VALUE "ProductName", "TClock-Win10"
-            VALUE "ProductVersion", "5.2.1.1"
+            VALUE "ProductVersion", "5.2.2.1"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/source/tc2ch/language/langja.rc b/source/tc2ch/language/langja.rc
@@ -1031,8 +1031,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,2,1,1
- PRODUCTVERSION 5,2,1,1
+ FILEVERSION 5,2,2,1
+ PRODUCTVERSION 5,2,2,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1049,11 +1049,11 @@ BEGIN
         BEGIN
             VALUE "Comments", "TClock-Win10 Language DLL�i���{��/English�j"
             VALUE "FileDescription", "TClock-Win10 Language DLL�i���{��/English�j"
-            VALUE "FileVersion", "5.2.1.1"
+            VALUE "FileVersion", "5.2.2.1"
             VALUE "InternalName", "LANGJA"
             VALUE "OriginalFilename", "tclang-win10.dll"
             VALUE "ProductName", "TClock-Win10"
-            VALUE "ProductVersion", "5.2.1.1"
+            VALUE "ProductVersion", "5.2.2.1"
         END
     END
     BLOCK "VarFileInfo"