完善版本检测代码，修复未连接CoolQ时无法输入指令的bug

Author: kernelbin

BOIT Server/RegisterRW.c

@@ -47,7 +47,7 @@ int RegisterRead(WCHAR * BaseDir)
 		if (VersionMajor < VERSION_MAJOR)
 		{
 			//老版本配置
-			iSuccess = SETTINGS_OUT_OF_DATE;
+			iSuccess = SETTINGS_ERR_OUT_OF_DATE;
 			__leave;
 		}
 		if (VersionMajor > VERSION_MAJOR)
@@ -60,13 +60,13 @@ int RegisterRead(WCHAR * BaseDir)
 		if (VersionMinor < VERSION_MINOR)
 		{
 			//老版本配置
-			iSuccess = SETTINGS_OUT_OF_DATE;
+			iSuccess = SETTINGS_ERR_OUT_OF_DATE;
 			__leave;
 		}
 		if (VersionMinor > VERSION_MINOR)
 		{
 			//老版本软件
-			iSuccess = SETTINGS_ERROR;
+			iSuccess = SETTINGS_ERR_OLD_SOFTWARE;
 			__leave;
 		}
 

BOIT Server/SendEventDispatch.c

@@ -33,7 +33,7 @@ int SendEventPrivateMsg(long long QQID, WCHAR * Msg)
 			__leave;
 		}
 		//读取返回值
-		printf("测试消息ID是%d\n", pSharedMemSend->u.PrivateMsg.iRet);
+		//printf("测试消息ID是%d\n", pSharedMemSend->u.PrivateMsg.iRet);
 
 		SetEvent(hEventSendRet);
 
@@ -66,7 +66,7 @@ int SendEventGroupMsg(long long GroupID, WCHAR* Msg)
 			__leave;
 		}
 		//成功
-		printf("测试消息ID是%d\n", pSharedMemSend->u.GroupMsg.iRet);
+		//printf("测试消息ID是%d\n", pSharedMemSend->u.GroupMsg.iRet);
 
 		SetEvent(hEventSendRet);
 	}

BOIT Server/ServerMain.c

@@ -42,6 +42,16 @@ int main()
 		puts("注册表加载成功\n");
 		InitBOITDirVar();
 		break;
+	case SETTINGS_ERR_OLD_SOFTWARE:
+		puts("检测到您正在使用的软件比之前使用过的版本更低。请使用高版本的软件\n如果需要使用低版本的软件请先在高版本软件中卸载之前的安装。\n");
+		puts("按任意键退出程序");
+		ch_ret = _getch();
+		return 0;
+	case SETTINGS_ERR_OUT_OF_DATE:
+		puts("检测到您正在使用新版本的软件。请先用旧版本软件移除之前的安装！");
+		puts("按任意键退出程序");
+		ch_ret = _getch();
+		return 0;
 	case SETTINGS_ERROR:
 		if (ConsoleQueryYesNo("注册表加载失败，是否清空设置并初始化 ?") == FALSE)
 		{
@@ -78,9 +88,9 @@ int main()
 		printf("将在目录 %s 初始化BOIT\n", InBaseDir);
 		PathAppendA(InBaseDir, "BOIT\\");
 
-		
+
 		MultiByteToWideChar(CP_ACP, 0, InBaseDir, -1, GetBOITBaseDir(), MAX_PATH);
-		
+
 		if (InitializeSettings(GetBOITBaseDir()) != SETTINGS_INITIALIZED)
 		{
 			//Oops
@@ -98,7 +108,7 @@ int main()
 		}
 		break;
 	}
-		
+
 	}
 
 	bBOITRemove = 0;//是否卸载程序标识
@@ -108,15 +118,19 @@ int main()
 	InitServerState();
 	InitSendEventDispatch();;
 	InitEstablishConn();
-	TryEstablishConn();
 
-	puts("连接成功！\n");
-	
 	StartInputThread(); // 启动控制台输入线程
-	
-	StartRecvEventHandler();
 
-	WaitForSingleObject(hEventServerStop, INFINITE);
+	if (TryEstablishConn(hEventServerStop) != -1)
+	{
+		puts("连接成功！\n");
+
+		StartRecvEventHandler();
+
+		WaitForSingleObject(hEventServerStop, INFINITE);
+	}
+
+	
 
 	//清理工作
 
@@ -157,7 +171,7 @@ int main()
 	return 0;
 }
 
-BOOL ConsoleQueryYesNo(char * QueryText)
+BOOL ConsoleQueryYesNo(char* QueryText)
 {
 	int ch_ret;
 	while (1)

BOIT Server/WaitForConnThread.c

@@ -8,7 +8,7 @@
 unsigned __stdcall WaitForConnThread(void* Args)
 {
 	InitEstablishConn();
-	TryEstablishConn();
+	TryEstablishConn(NULL);
 	StartSendEventHandler();
 	return 0;
 }

BOIT Shared/EstablishConn.c

@@ -34,7 +34,7 @@ int InitEstablishConn()
 	return 0;
 }
 
-int TryEstablishConn()//return -1代表失败 0代表成功创建对象并等待到连接 1代表成功连接
+int TryEstablishConn(HANDLE hEventAbort)//return -1代表失败 0代表成功创建对象并等待到连接 1代表成功连接
 {
 	int iRet = -2;
 	InitConnVar();
@@ -86,7 +86,18 @@ int InitEstablishConn()
 			break;
 		case 0:
 			pSharedMemProcess->pid[0] = GetCurrentProcessId();
-			WaitForSingleObject(hEventConnect, INFINITE);
+			HANDLE hObjWait[2] = { hEventConnect ,hEventAbort };
+			switch (WaitForMultipleObjects(hEventAbort ? 2 : 1, hObjWait, 0, INFINITE))
+			{
+			case WAIT_OBJECT_0:
+				break;
+			case WAIT_OBJECT_0 + 1:
+				iRet = -1;//Abandon
+				break;
+
+			}
+
+			//WaitForSingleObject(hEventConnect, INFINITE);
 			break;
 		case 1:
 			//把自己的进程句柄写入

BOIT Shared/EstablishConn.h

@@ -29,7 +29,7 @@ SRWLOCK ConnStateLock;
 
 
 int InitEstablishConn();
-int TryEstablishConn();
+int TryEstablishConn(HANDLE hEventAbort);
 int GetConnState();
 BOOL CleanConn();
 BOOL InitConnVar();

BOIT Version/Settings.h

@@ -9,6 +9,7 @@
 #define SETTINGS_INITIALIZED 3
 
 #define SETTINGS_NOT_FOUND 4			//设置注册表项（根）没找到 应该是第一次使用这个软件
-#define SETTINGS_OUT_OF_DATE 5				//设置是老版本的
-#define SETTINGS_ERROR 6			//出现错误
-#define SETTINGS_NULL_BUFFER 7       //缓冲区是NULL
+#define SETTINGS_ERR_OUT_OF_DATE 5		//设置是老版本的
+#define SETTINGS_ERR_OLD_SOFTWARE 6		//软件是老版本的
+#define SETTINGS_ERROR 7				//出现错误
+#define SETTINGS_NULL_BUFFER 8			//缓冲区是NULL