Commit: 1c66eb5611cfe0907ecf845b7af608d48fc91fc7 - FlushMouse (git)

マウスカーソルへIMEモードの表示

Commit MetaInfo

• Révision: 1c66eb5611cfe0907ecf845b7af608d48fc91fc7 (tree)
• l'heure: 2023-06-13 14:15:26
• Auteur: JeffyTS <jeffyts@outl...>
• Commiter: JeffyTS

Message de Log

1.0.0.1

Change Summary

• modified: FlushMouse.sln
• modified: FlushMouse/CommonDef.h
• modified: FlushMouse/Cursor.cpp
• modified: FlushMouse/Cursor.h
• modified: FlushMouse/FlushMouse.cpp
• add: FlushMouse/FlushMouse.exe.manifest
• modified: FlushMouse/FlushMouse.vcxproj
• modified: FlushMouse/FlushMouse.vcxproj.filters
• modified: FlushMouse/FlushMouseLIB.cpp
• modified: FlushMouse/FlushMouseLIB.h
• modified: FlushMouse/FlushMouseSub.cpp
• modified: FlushMouse32/FlushMouse32.cpp
• add: FlushMouse32/FlushMouse32.exe.manifest
• modified: FlushMouse32/FlushMouse32.vcxproj
• modified: FlushMouse32/FlushMouse32.vcxproj.filters
• modified: FlushMouseDLL/EventlogData.h
• modified: FlushMouseDLL/EventlogData.mc
• modified: FlushMouseDLL/EventlogDll.h
• modified: FlushMouseDLL/GlobalHookDll.cpp
• modified: FlushMouseDLL/MSG00409.bin
• modified: FlushMouseDLL/MSG00411.bin
• modified: FlushMouseDLL32/KeyboardHookDll32.cpp
• modified: FlushMouseDLL32/MouseHookDll32.cpp
• add: FlushMouse_x64.msi
• modified: MiscLIB/CRegistry.cpp
• modified: MiscLIB/CRegistry.h
• modified: MiscLIB/CSharedMemory.cpp
• modified: MiscLIB/CThread.cpp
• modified: OSDN Wiki/osdn.txt
• modified: SetupProject/Product.wxs
• modified: SetupProject/Readme.txt
• modified: SetupProject/Register_TaskScheduler.xml
• add: SetupProject/Register_TaskScheduler2.xml
• modified: SetupProject/SetupProject.wixproj
• modified: SetupProject/_ExitDialog.wxs
• modified: SetupProject/_VerifyReadyDlg.wxs
• modified: version.h
• modified: version.wxi

Modification

--- a/FlushMouse.sln
+++ b/FlushMouse.sln
@@ -20,17 +20,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlushMouseDLL32", "FlushMou
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupProject", "SetupProject\SetupProject.wixproj", "{40614F11-A07B-42AB-822E-FAC73CC85CB0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{352B420D-E55A-4196-9597-D394D0DA2519}"
-	ProjectSection(SolutionItems) = preProject
-		Solution.props = Solution.props
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiscLIB", "MiscLIB\MiscLIB.vcxproj", "{CCAF431F-CE8E-4879-9B1F-3F1DF4AC2269}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MiscLIB32", "MiscLIB32\MiscLIB32.vcxproj", "{3D3F632C-75BB-4830-AA8E-0871C6AA1A72}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ソリューション項目", "ソリューション項目", "{4DA8FAF2-6A3D-41B4-B811-0F39BFA7CAA5}"
 	ProjectSection(SolutionItems) = preProject
+		FlushMouse_x64.msi = FlushMouse_x64.msi
 		version.h = version.h
 		version.wxi = version.wxi
 	EndProjectSection

--- a/FlushMouse/CommonDef.h
+++ b/FlushMouse/CommonDef.h
@@ -11,7 +11,6 @@
 //
 #pragma once
 #include "pch.h"
-#include "..\..\DEFS\types.h"
 
 //
 // Define
@@ -20,7 +19,7 @@
 
 // Window Class
 #define	CLASS_FLUSHMOUSE		L"FlushMouse-{E598B54C-A36A-4CDF-BC77-7082CEEDAA46}"
-#define CLASS_FLUSHMOUSE32		L"FlushMouse32-{07C82AC3-DF75-469D-8443-91E6274A2422}"
+#define CLASS_FLUSHMOUSE32		L"FlushMouse32-{E598B54C-A36A-4CDF-BC77-7082CEEDAA46}"
 
 // for IME
 #define IMC_GETCONVERSIONMODE   0x0001
@@ -30,6 +29,18 @@
 #define IMC_GETOPENSTATUS		0x0005
 #define IMC_SETOPENSTATUS		0x0006
 
+// for KB
+#define	KB_MASK		0xffff0000
+#define	KB_JP		0x04110000
+#define	KB_US		0x04090000
+#define	LANG_MASK	0x0000ffff
+#define LANG_IME	0x00000411
+#define	LANG_ENG	0x00000409
+#define JP_IME		(HKL)(KB_JP | LANG_IME)
+#define JP_ENG		(HKL)(KB_JP | LANG_ENG)
+#define US_IME		(HKL)(KB_US | LANG_IME)
+#define US_ENG		(HKL)(KB_US | LANG_ENG)
+
 // for Shell_NotifyIcon
 #define	NOTIFYICONDATA_ID		0x684B9604
 

--- a/FlushMouse/Cursor.cpp
+++ b/FlushMouse/Cursor.cpp
@@ -190,23 +190,21 @@ BOOL CALLBACK CIME::bEnumChildProcActivateIME(HWND hWnd, LPARAM lParam)
 {
 	UNREFERENCED_PARAMETER(lParam);
 
-	BOOL	bRet = FALSE;
 	HWND	hIMWnd = ImmGetDefaultIMEWnd(hWnd);
 	if (hIMWnd != NULL) {
 		SendMessage(hIMWnd, WM_ACTIVATE, (WPARAM)WA_ACTIVE, (LPARAM)NULL);
 		LPTSTR	lpszBuffer = new TCHAR[_MAX_PATH];
-		ZeroMemory(lpszBuffer, _MAX_PATH);
+		ZeroMemory(lpszBuffer, (sizeof(TCHAR) * _MAX_PATH));
 		if (GetClassName(hIMWnd, lpszBuffer, _MAX_PATH) != 0) {
 			HWND	hIMEWnd = FindWindow(lpszBuffer, NULL);
 			if (hIMEWnd != NULL) {
 				SendMessage(hIMEWnd, WM_ACTIVATE, (WPARAM)WA_ACTIVE, (LPARAM)NULL);
-
-				bRet = TRUE;
+				if (lpszBuffer != NULL)	delete[] lpszBuffer;
+				return TRUE;
 			}
 		}
 		if (lpszBuffer != NULL)	delete[] lpszBuffer;
 	}
-	//return bRet;
 	return TRUE;
 }
 
@@ -335,7 +333,6 @@ BOOL			CIME::bGetVirtualDesktopSize()
 	return bRet;
 }
 
-
 //
 // bGetVirtualDesktopSizeEnumProc()
 //
@@ -395,6 +392,48 @@ BOOL		CIME::bIsNewIME()
 }
 
 //
+// dGetInputLocale()
+//
+DWORD		CIME::dwGetInputLocale()
+{
+#define SUBKEY	_T("SOFTWARE\\Microsoft\\Input\\Locales")
+#define VALUE	_T("InputLocale")
+	DWORD	dwInputLocale = 0;
+	CRegistry* CReg = new CRegistry;
+	if (CReg) {
+		if (!CReg->bReadSystemRegValueDWORD(HKEY_LOCAL_MACHINE, SUBKEY, VALUE, &dwInputLocale)) {
+		}
+		delete	CReg;
+	}
+	return (dwInputLocale & 0x0000ffff);
+#undef SUBKEY
+#undef VALUE
+}
+
+//
+// hklGetInputLocale()
+//
+HKL		CIME::hklGetInputLocale(HWND hWndObserved)
+{
+
+	DWORD	dwProcessID = 0;
+	DWORD	dwThreadID = 0;
+	HKL		hkl = NULL;
+	DWORD	dwInputLocale = 0;
+	if ((dwThreadID = GetWindowThreadProcessId(hWndObserved, &dwProcessID)) != 0) {
+		if ((hkl = GetKeyboardLayout(dwThreadID)) != NULL) {
+			int	iKeyboardType = GetKeyboardType(1);
+			if ((iKeyboardType != 2) || (hkl != JP_IME))	hkl = US_ENG;
+			hkl = (HKL)(((UINT64)hkl & KB_MASK) | (dwInputLocale & LANG_MASK));
+			return hkl;
+		}
+	}
+	return (HKL)0;
+#undef SUBKEY
+#undef VALUE
+}
+
+//S
 // class CCursor
 //
 CCursor::CCursor()
@@ -939,23 +978,27 @@ BOOL		CCursor::bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData)
 	int		iCursorSizeX = 0, iCursorSizeY = 0, iCaretSizeX = 0, iCaretSizeY = 0;
 	DWORD	dwIMEMode = Cime->dwIMEMode(lpstCursorData->hWndObserved, lpstCursorData->bForceHiragana);
 	int		iCursor = 0;
-	if (dwIMEMode != IMEOFF) {
-		while (dwIMEMode != lpstCursorData->lpstFlushMouseCursor[iCursor].dwIMEMode) {
-			++iCursor;
+	while (dwIMEMode != lpstCursorData->lpstFlushMouseCursor[iCursor].dwIMEMode) {
+		++iCursor;
+		if (lpstCursorData->lpstFlushMouseCursor[iCursor].dwIMEMode == (DWORD)(-1)) {
+			iCursor = 0;	dwIMEMode = IMEOFF;
+			break;
 		}
-		CursorWindow->vSetModeString(stIMECursorData.lpstFlushMouseCursor[iCursor].szMode);
 	}
+	CursorWindow->vSetModeString(stIMECursorData.lpstFlushMouseCursor[iCursor].szMode);
 	if (lpstCursorData->bDrawNearCaret != FALSE) {
 		POINT	pt{};
 		HWND	hWnd = GetForegroundWindow();
 		if (bCalcDispModeCaretRect(hWnd, lpstCursorData->iModeSize, lpstCursorData->iModeSize, &rcCaret, &pt)) {
 			hWnd = WindowFromPoint(pt);
 			DWORD	dwIMEModeCaret = dwIMEMode;
-			int		iCaret = iCursor;
-			if (hWnd != lpstCursorData->hWndObserved) {
-				dwIMEModeCaret = Cime->dwIMEMode(hWnd, lpstCursorData->bForceHiragana);
-				while (dwIMEModeCaret != lpstCursorData->lpstFlushMouseCursor[iCaret].dwIMEMode) {
-					++iCaret;
+			int		iCaret = 0;
+			dwIMEModeCaret = Cime->dwIMEMode(hWnd, lpstCursorData->bForceHiragana);
+			while (dwIMEModeCaret != lpstCursorData->lpstFlushMouseCursor[iCaret].dwIMEMode) {
+				++iCaret;
+				if (lpstCursorData->lpstFlushMouseCursor[iCaret].dwIMEMode == (DWORD)(-1)) {
+					iCaret = 0;	dwIMEModeCaret = IMEOFF;
+					break;
 				}
 			}
 			if ((rcCaret.left != 0) || (rcCaret.top != 0) || (rcCaret.right != 0) || (rcCaret.bottom != 0)) {

--- a/FlushMouse/Cursor.h
+++ b/FlushMouse/Cursor.h
@@ -169,6 +169,8 @@ public:
 	BOOL			bMoveIMEToolbar();
 	BOOL			bGetVirtualDesktopSize();
 	BOOL			bIsNewIME();
+	DWORD			dwGetInputLocale();
+	HKL				hklGetInputLocale(HWND hWndObserved);
 
 private:
 	BOOL			bExistIMEToolbar();
@@ -282,7 +284,7 @@ private:
 		{ IMEHIDE,			_T(""),		{OCR_NORMAL, IDC_HIDE_ARROW,          FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHideOnArrow.cur")},
 										{OCR_HAND,   IDC_HIDE_HAND,           FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHideOnHand.cur")},
 										{OCR_IBEAM,  IDC_HIDE_IBEAM,          FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHideOnIBeam.cur")}},
-		{ (UINT)(-1),		_T(""),		{0,			 0,						  FALSE, _T(""), _T("")},		// Terminater
+		{ (DWORD)(-1),		_T(""),		{0,			 0,						  FALSE, _T(""), _T("")},		// Terminater
 										{0,			 0,						  FALSE, _T(""), _T("")},		// Terminater
 										{0,			 0,						  FALSE, _T(""), _T("")} }		// Terminater
 	};

--- a/FlushMouse/FlushMouse.cpp
+++ b/FlushMouse/FlushMouse.cpp
@@ -21,6 +21,7 @@
 #include "..\version.h"
 #include "FlushMouseLIB.h"
 #include "Resource.h"
+#include "..\FlushMouseDLL\EventlogDll.h"
 
 #if defined _DEBUG
 #define DEBUG_CLIENTBLOCK   new( _CLIENT_BLOCK, __FILE__, __LINE__)
@@ -55,7 +56,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
 //
 // Local Prototype Define
 //
-static INT_PTR CALLBACK AboutDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+static BOOL		bSetHeapInformation();
+static INT_PTR CALLBACK	AboutDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 //
 //  関数: wWinMain()
@@ -68,6 +70,43 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
 #if defined _DEBUG
 	_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
+	
+	HANDLE	hHandle = GetCurrentProcess();
+	if (!SetPriorityClass(hHandle, NORMAL_PRIORITY_CLASS)) {
+		return (-1);
+	}
+
+	if (!bSetHeapInformation())	return (-1);
+
+	if (*lpCmdLine == _T('\0')) {
+		// NOP
+	}
+	else {
+		int	iRet = 0;
+		if ((iRet = CompareStringOrdinal(lpCmdLine, -1, L"/quit", -1, TRUE)) != 0) {
+			if (iRet == CSTR_EQUAL) {
+				bReportEvent(MSG_DONE_FLUSHMOUSE, APPLICATION_CATEGORY);	// Eventlog
+				HWND	hWnd = NULL;
+				if ((hWnd = FindWindow(CLASS_FLUSHMOUSE, NULL)) != NULL) {	// 先に起動されているウィンドウハンドルを探す
+					SetFocus(GetLastActivePopup(hWnd));					    // 先に起動されているウィンドウへフォーカスを与える
+					PostMessage(hWnd, WM_DESTROY, NULL, NULL);				// 先に起動されているウィンドウを終了させる
+					for (int i = 3; i > 0; i--) {
+						Sleep(500);											// 終了を3回待つ
+						if ((hWnd = FindWindow(CLASS_FLUSHMOUSE, NULL)) != NULL) {
+							SetFocus(GetLastActivePopup(hWnd));				// 先に起動されているウィンドウへフォーカスを与える
+							PostMessage(hWnd, WM_DESTROY, NULL, NULL);		// 先に起動されているウィンドウを終了させる
+							if (i == 1) {
+								return (-1);								// 終了していない場合はエラー終了
+							}
+						}
+						else return 0;
+					}
+				}
+			}
+		}
+		if (hHandle != NULL)	CloseHandle(hHandle);
+		return 0;
+	}
 
 #define	RESOURCEFILE		_T("FlushMouse.exe")
 	// Load Resource
@@ -86,17 +125,53 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
 			DispatchMessage(&msg);
 		}
 	}
+	if (Resource)	delete	Resource;
 	return (int)msg.wParam;
 }
 
+//
+// bSetHeapInformation()
+//
+BOOL	bSetHeapInformation()
+{
+	HANDLE	hHeap = NULL;
+	if ((hHeap = GetProcessHeap()) != NULL) {
+		ULONG	HeapInformation = 2;
+		if (!HeapSetInformation(hHeap, HeapCompatibilityInformation, &HeapInformation, sizeof(ULONG))) {
+			_Post_equals_last_error_ DWORD err = GetLastError();
+			if (err != ERROR_INVALID_PARAMETER) {	// 87 (0x57)
+				return FALSE;
+			}
+		}
+		return TRUE;
+	}
+	return FALSE;
+}
+
 // 
 // vMessageBox()
 //
 void vMessageBox(HWND hWnd, UINT uID, UINT uType)
 {
 	TCHAR       lpText[MAX_LOADSTRING];
-	if (LoadString(Resource->hLoad(), uID, lpText, MAX_LOADSTRING) != 0) {
-		MessageBox(hWnd, lpText, szTitle, uType);
+	try {
+		throw LoadString(Resource->hLoad(), uID, lpText, MAX_LOADSTRING);
+	}
+	catch (int i) {
+		if (i != 0) {
+			try {
+				throw MessageBox(hWnd, lpText, szTitle, uType);
+			}
+			catch (int) {
+				return;
+			}
+			catch (...) {
+				return;					// error
+			}
+		}
+	}
+	catch (...) {
+		return;							// error
 	}
 }
 
@@ -135,11 +210,15 @@ static INT_PTR CALLBACK AboutDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM
 				HICON	hIcon = NULL;
 				hIcon = (HICON)LoadImage(Resource->hLoad(), MAKEINTRESOURCE(IDI_SMALL), IMAGE_ICON, 16, 16, 0);
 				SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);		// Iconの設定
-				LPTSTR	lpszVersion = new TCHAR[128];
-				ZeroMemory(lpszVersion, (sizeof(TCHAR) * 128));
-				_sntprintf_s(lpszVersion, 128, _TRUNCATE, _T("%d.%d.%d.%d"), MAJOR_VERSION, MINOR_VERSION, BUILD_VERSION, REVISON_VERSION);
-				SetDlgItemText(hDlg, IDC_VERSION, lpszVersion);					// Versionの設定
-				delete[]	lpszVersion;
+				LPTSTR	lpszVersion = new TCHAR[MAX_LOADSTRING];
+				ZeroMemory(lpszVersion, (sizeof(TCHAR) * MAX_LOADSTRING));
+				if (lpszVersion) {
+					ZeroMemory(lpszVersion, (sizeof(TCHAR) * MAX_LOADSTRING));
+					_sntprintf_s(lpszVersion, MAX_LOADSTRING, _TRUNCATE, _T("%d.%d.%d.%d"), MAJOR_VERSION, MINOR_VERSION, BUILD_VERSION, REVISON_VERSION);
+					SetDlgItemText(hDlg, IDC_VERSION, lpszVersion);					// Versionの設定
+					delete[]	lpszVersion;
+				}
+				else return (INT_PTR)FALSE;
 			}
 			return (INT_PTR)TRUE;
 		case WM_CTLCOLORDLG:

--- /dev/null
+++ b/FlushMouse/FlushMouse.exe.manifest
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity
+        type="win32"
+        name="FlushMouse.exe"
+        version="0.9.4.8"
+        processorArchitecture="amd64"
+    />
+    <description>FlushMouse Application</description>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 and Windows 11 -->
+			<maxversiontested Id="10.0.19041.0"/>
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+			<!-- DPI Awareness -->
+			<!-- Per Monitor V2 [OS >= Windows 10 Creators Update (1703, 10.0.15063, Redstone 2)] Value: PerMonitorV2 -->
+			<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+				PerMonitorV2, PerMonitor
+			</dpiAwareness>
+      		<!-- GDI Scaling -->
+			<gdiScaling>true</gdiScaling>
+		</application>
+    </compatibility>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+			<requestedPrivileges>
+				<!-- UAC settings -->
+				<!--requestedExecutionLevel level="requireAdministrator" uiAccess="false"/-->
+				<!--requestedExecutionLevel level="highestAvailable" uiAccess="false"/-->
+				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+			</requestedPrivileges>
+        </security>
+    </trustInfo>
+	<!--file name="FlushMouseUI3.dll">
+		<activatableClass
+			name="FlushMouseUI3.Class"
+			threadingModel="both"
+			xmlns="urn:schemas-microsoft-com:winrt.v1" />
+	</file-->
+
+</assembly>
\ No newline at end of file

--- a/FlushMouse/FlushMouse.vcxproj
+++ b/FlushMouse/FlushMouse.vcxproj
@@ -246,6 +246,9 @@
       <Project>{ccaf431f-ce8e-4879-9b1f-3f1df4ac2269}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="FlushMouse.exe.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>
\ No newline at end of file

--- a/FlushMouse/FlushMouse.vcxproj.filters
+++ b/FlushMouse/FlushMouse.vcxproj.filters
@@ -79,4 +79,7 @@
       <Filter>リソース ファイル</Filter>
     </Image>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="FlushMouse.exe.manifest" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

--- a/FlushMouse/FlushMouseLIB.cpp
+++ b/FlushMouse/FlushMouseLIB.cpp
@@ -18,7 +18,6 @@
 #include "Resource.h"
 #include "CommonDef.h"
 #include "..\FlushMouseDLL\EventlogDll.h"
-#include "..\FlushMouseDLL\EventlogData.h"
 #include "..\FlushMouseDLL\GlobalHookDll.h"
 #include "..\FlushMouseDLL32\KeyboardHookDll32.h"
 #include "..\FlushMouseDLL32\MouseHookDll32.h"
@@ -28,16 +27,6 @@
 //
 // Define
 //
-#define	KB_MASK		0xffff0000
-#define	KB_JP		0x04110000
-#define	KB_US		0x04090000
-#define	LANG_MASK	0x0000ffff
-#define LANG_IME	0x00000411
-#define	LANG_ENG	0x00000409
-#define JP_IME		(HKL)(KB_JP | LANG_IME)
-#define JP_ENG		(HKL)(KB_JP | LANG_ENG)
-#define US_IME		(HKL)(KB_US | LANG_IME)
-#define US_ENG		(HKL)(KB_US | LANG_ENG)
 
 //
 // Struct Define
@@ -77,7 +66,7 @@ static UINT     nCheckFocusTimerTickValue = FOCUSINITTIMERVALUE;	// Timer tick
 static UINT_PTR nCheckFocusTimerID = CHECKFOCUSTIMERID;				// Timer ID
 static UINT_PTR	uCheckFocusTimer = NULL;
 // Timer for Poc
-#define PROCINITTIMERVALUE		3000
+#define PROCINITTIMERVALUE		1000
 #define CHECKPROCTIMERID		2
 static UINT     nCheckProcTimerTickValue = PROCINITTIMERVALUE;		// Timer tick
 static UINT_PTR nCheckProcTimerID = CHECKPROCTIMERID;				// Timer ID
@@ -124,9 +113,9 @@ static void		Cls_OnCheckIMEStartConvertingEx(HWND hWnd, BOOL bStartConversioning
 // Sub
 static BOOL		bSendInputSub(UINT cInputs, LPINPUT pInputs);
 static BOOL		bKBisEP();
+static BOOL		bChangeHKLbySendInput(HKL hNewHKL, HKL hPreviousHKL);
 static VOID CALLBACK	vCheckFocusTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DWORD dwTime);
 static VOID CALLBACK	vCheckProcTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DWORD dwTime);
-static LONG WINAPI		lExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo);
 static BOOL CALLBACK	bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam);
 
 //
@@ -134,11 +123,8 @@ static BOOL CALLBACK	bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam);
 //
 BOOL		bWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance)
 {
-	SetUnhandledExceptionFilter(&lExceptionFilter);
-
 	if (LoadString(Resource->hLoad(), IDS_APP_TITLE, szTitle, MAX_LOADSTRING) == 0) return FALSE;
 
-	// Set Thread DPI Awareness V2 for High DPI
 	SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
 	SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
 
@@ -155,7 +141,9 @@ BOOL		bWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance)
 		PostMessage(hWnd, WM_DESTROY, NULL, NULL);
 		for (int i = 3; i > 0; i--) {
 			Sleep(500);	
-			if (FindWindow(CLASS_FLUSHMOUSE, NULL) != NULL) {
+			if ((hWnd = FindWindow(CLASS_FLUSHMOUSE, NULL)) != NULL) {
+				SetFocus(GetLastActivePopup(hWnd));
+				PostMessage(hWnd, WM_DESTROY, NULL, NULL);
 				if (i == 1) {
 					vMessageBox(NULL, IDS_ALREADYRUN, MessageBoxTYPE);
 					if (Resource != NULL) {
@@ -207,7 +195,7 @@ static ATOM MyRegisterClass(HINSTANCE hInstance)
 static HWND InitInstance(HINSTANCE hInstance, int nCmdShow)
 {
 	UNREFERENCED_PARAMETER(nCmdShow);
-#define		WINDOWSTYLE		(WS_OVERLAPPEDWINDOW  | WS_HSCROLL | WS_VSCROLL)
+#define		WINDOWSTYLE		WS_DISABLED
 	// for TaskTray
 	HWND		hWnd = NULL;						// メインウィンドウのハンドル
 	hWnd = CreateWindowEx(
@@ -252,6 +240,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 		HANDLE_MSG(hWnd, WM_POWERBROADCAST, Cls_OnPowerBroadcast);
 		HANDLE_MSG(hWnd, WM_EVENT_SYSTEM_FOREGROUNDEX, Cls_OnEventForegroundEx);
 		HANDLE_MSG(hWnd, WM_CHECKIMESTARTCONVEX, Cls_OnCheckIMEStartConvertingEx);
+		break;
 
 	default:
 		if (!bReCreateTaskTrayWindow(hWnd, message)) {
@@ -287,7 +276,11 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 	HICON	hIcon = NULL;
 	if ((hIcon = LoadIcon(Resource->hLoad(), MAKEINTRESOURCE(IDI_FLUSHMOUSE))) != NULL) {
 		if (bCreateTaskTrayWindow(hWnd, hIcon, szTitle) == FALSE) {
-			vMessageBox(hWnd, IDS_NOTREGISTERTT, MessageBoxTYPE);
+			try {
+				vMessageBox(hWnd, IDS_NOTREGISTERTT, MessageBoxTYPE);
+			}
+			catch (...) {
+			}
 			PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
 			return FALSE;
 		}
@@ -311,8 +304,8 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 		return FALSE;
 	}
 
-	if (bCheckExistingJPIME() && bEnableEPHelper)	bForExplorerPatcherSWS(GetForegroundWindow(), FALSE, NULL, NULL);
-
+	if (bCheckExistingJPIME() && bEnableEPHelper)	bForExplorerPatcherSWS(GetForegroundWindow(), FALSE, FALSE, NULL, NULL);
+	
 	return TRUE;
 }
 
@@ -325,8 +318,7 @@ static void Cls_OnDestroy(HWND hWnd)
 
 	vStopThreadHookTimer(hWnd);
 
-	EXCEPTION_POINTERS ExceptionInfo{};
-	lExceptionFilter(&ExceptionInfo);
+	SystemParametersInfo(SPI_SETCURSORS, 0, NULL, 0);
 
 	if (Profile != NULL) {
 		Profile->bSetProfileData();
@@ -398,7 +390,7 @@ static void Cls_OnCommand(HWND hWnd, int id, HWND hWndCtl, UINT codeNotify)
 		break;
 	case IDM_EXIT:
 	case IDR_TT_QUIT:
-		DestroyWindow(hWnd);
+		PostMessage(hWnd, WM_DESTROY, (WPARAM)0, (LPARAM)0);
 		break;
 	}
 }
@@ -428,13 +420,7 @@ static void Cls_OnLButtonDownEx(HWND hWnd, int x, int y, HWND hForeground)
 	UNREFERENCED_PARAMETER(y);
 	UNREFERENCED_PARAMETER(hForeground);
 	if (bEnableEPHelper) {
-		POINT	pt{};
-		if (GetCursorPos(&pt)) {
-			RECT	rc{};
-			if (bGetTaskTrayWindowRect(hWnd, &rc) == FALSE)	return;
-			if (((pt.x >= rc.left) && (pt.x <= rc.right)) || ((pt.y <= rc.top) && (pt.y >= rc.bottom)))	return;
-		}
-		bForExplorerPatcherSWS(hForeground, FALSE, NULL, NULL);
+		bForExplorerPatcherSWS(hForeground, FALSE, FALSE, NULL, NULL);
 	}
 	return;
 }
@@ -458,9 +444,11 @@ static void Cls_OnLButtonUpEx(HWND hWnd, int x, int y, HWND hForeground)
 		POINT	pt{};
 		if (GetCursorPos(&pt)) {
 			RECT	rc{};
-			if (bGetTaskTrayWindowRect(hWnd, &rc) == FALSE)	return;
-			if (((pt.x >= rc.left) && (pt.x <= rc.right)) || ((pt.y <= rc.top) && (pt.y >= rc.bottom)))	return;
-			if ((hWndObserved = WindowFromPoint(pt)) == NULL)	return;
+			if ((hWndObserved = WindowFromPoint(pt)) == NULL)	return;	
+			if (FindWindow(L"Shell_TrayWnd", NULL) == GetForegroundWindow()) {
+				if (bGetTaskTrayWindowRect(hWnd, &rc) == FALSE)	return;
+				if (((pt.x >= rc.left) && (pt.x <= rc.right)) || ((pt.y <= rc.top) && (pt.y >= rc.bottom)))	return;
+			}
 			if (!Cursor->bStartDrawIMEModeThread(hWndObserved))	return;
 		}
 	}
@@ -493,23 +481,26 @@ static void		Cls_OnEventForegroundEx(HWND hWnd, DWORD dwEvent, HWND hForeWnd)
 			else {
 				POINT	pt{};
 				if (GetCursorPos(&pt)) {
-					RECT	rc{};
-					if (bGetTaskTrayWindowRect(hWnd, &rc) == FALSE)	return;	
-					if (((pt.x >= rc.left) && (pt.x <= rc.right)) || ((pt.y <= rc.top) && (pt.y >= rc.bottom)))	return;
 					if ((hWndObserved = WindowFromPoint(pt)) == NULL)	return;
 				}
 				else {
-					_Post_equals_last_error_ DWORD err = GetLastError();
-					if (err == ERROR_ACCESS_DENIED)	return;	
 					return;
 				}
 			}
-			if (bCheckExistingJPIME() && bEnableEPHelper)	bForExplorerPatcherSWS(hWnd, FALSE, NULL, NULL);
+			if (bCheckExistingJPIME() && bEnableEPHelper)	bForExplorerPatcherSWS(hWnd, FALSE, FALSE, NULL, NULL);	// @@@ for Explorer Patcher Simple Window Switcher
 			if (bOffChangedFocus) {
 				Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
 			}
-			if (!Cursor->bStartIMECursorChangeThread(hWndObserved))	return;
-			if (!Cursor->bStartDrawIMEModeThread(hWndObserved))		return;
+			if (!Cursor->bStartIMECursorChangeThread(hWndObserved))	return;		// error
+			POINT	pt{};
+			if (GetCursorPos(&pt)) {
+				RECT	rc{};
+				if (FindWindow(L"Shell_TrayWnd", NULL) == GetForegroundWindow()) {
+					if (bGetTaskTrayWindowRect(hWnd, &rc) == FALSE)	return;	// error
+					if (((pt.x >= rc.left) && (pt.x <= rc.right)) || ((pt.y <= rc.top) && (pt.y >= rc.bottom)))	return;	// Clicked on Notify Icon
+				}
+				if (!Cursor->bStartDrawIMEModeThread(hForeWnd))	return;		// error
+			}
 		}
 	}
 }
@@ -552,11 +543,11 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 	if ((fDown == FALSE)) {											// Key up
 		switch (vk) {
 		case KEY_ONLY_CTRLUP:
-			if (bEnableEPHelper)	bForExplorerPatcherSWS(hForeWnd, FALSE, NULL, NULL);
+			if (bEnableEPHelper)	bForExplorerPatcherSWS(hForeWnd, FALSE, FALSE, NULL, NULL);
 			if (bDoModeDispByCtrlUp) {
 				POINT	pt{};
 				if (GetCursorPos(&pt)) {
-					if (!Cursor->bStartDrawIMEModeThreadWait(WindowFromPoint(pt)))	return;	// error
+					if (!Cursor->bStartDrawIMEModeThreadWait(WindowFromPoint(pt)))	return;
 				}
 			}
 			return;
@@ -574,34 +565,40 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 		case KEY_F10:				// F10				(0x79)
 			break;
 		case KEY_IME_ON:			// IME ON					(0x16)
-			if (bEnableEPHelper) {
+			bIMEInConverting = FALSE;
+			if (bEnableEPHelper || bIMEModeForced) {
 				Cime->vIMEConvertModeChangeForced(hForeWnd, ZENHIRA_IMEON);
 			}
 			break;
 		case KEY_KANJI:				// JP(IME/ENG) Alt + 漢字	(0x19)
-			if (bEnableEPHelper) {
-				while (GetAsyncKeyState(VK_MENU) & 0x8000)
-				{
-					Sleep(50);
-				}
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
-					if (bIMEModeForced != FALSE) {
-						Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
+			bIMEInConverting = FALSE;
+			if (bEnableEPHelper || bIMEModeForced) {
+				DWORD	dwBeforeIMEMode = Cime->dwIMEMode(hForeWnd, FALSE);
+				if (bForExplorerPatcherSWS(hForeWnd, TRUE, bIMEModeForced, &hNewHKL, &hPreviousHKL)) {
+					if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
+						if (dwBeforeIMEMode != IMEOFF) {
+							Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
+						}
+						else {
+							Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
+						}
 					}
 				}
 			}
 			break;
 		case KEY_IME_OFF:			// IME OFF					(0x1a)
-			if (bEnableEPHelper) {
-				if (bIMEModeForced != FALSE) {
+			bIMEInConverting = FALSE;
+			if (bEnableEPHelper || bIMEModeForced) {
+				if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
 					Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
 				}
 			}
 			break;
 		case KEY_CONVERT:			// JP(IME/ENG) 変換			(0x1c)
-			if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
+			bIMEInConverting = FALSE;
+			if (bEnableEPHelper || bIMEModeForced) {
 				SetFocus(hForeWnd);
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+				if (bForExplorerPatcherSWS(hForeWnd, TRUE, bIMEModeForced, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
 						Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
 					}
@@ -615,8 +612,8 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 			break;
 		case KEY_NONCONVERT:		// JP(IME/ENG) 無変換		(0x1d)
 			bIMEInConverting = FALSE;
-			if (bEnableEPHelper) {
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+			if (bEnableEPHelper || bIMEModeForced) {
+				if (bForExplorerPatcherSWS(hForeWnd, TRUE, bIMEModeForced, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
 						if (((UINT64)hPreviousHKL & LANG_MASK) != LANG_IME) {
 							PostMessage(hWnd, WM_SYSKEYDOWNUPEX, KEY_OEM_PA1, (0x80000000));
@@ -625,51 +622,55 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 							Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
 						}
 					}
+					else {
+						if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
+							Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
+						}
+					}
 				}
 			}
 			break;
 		case KEY_OEM_3:				// JP(IME/ENG) [@] / US(ENG) IME ON (0xc0) = ['] ALT + 半角/全角 or 漢字
 		case KEY_OEM_8:				// JP(IME/ENG) [`] / UK(ENG) IME ON (0xdf) = ['] ALT + 半角/全角 or 漢字
-			if (bEnableEPHelper) {
-				while (GetAsyncKeyState(VK_MENU) & 0x8000)
-				{
-					Sleep(50);
+			if (bEnableEPHelper || bIMEModeForced) {
+				if (bForExplorerPatcherSWS(hForeWnd, TRUE, bIMEModeForced, &hNewHKL, &hPreviousHKL)) {
+					Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
 				}
-				PostMessage(hWnd, WM_SYSKEYDOWNUPEX, KEY_OEM_IME_ON, (0x80000000));
-				Sleep(10);
 			}
+			break;
 			return;
 		case KEY_OEM_PA1:			// US(ENG) 無変換			(0xeb)
 			bIMEInConverting = FALSE;
-			if (bEnableEPHelper) {
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
-					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
-						Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
-					}
-					else {		// KEY_OEM_PA1 is from US KB
-						Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
-					}
+			if (bEnableEPHelper || bIMEModeForced) {
+				if (bForExplorerPatcherSWS(hForeWnd, TRUE, bIMEModeForced, &hNewHKL, &hPreviousHKL)) {
+					Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
 				}
 			}
 			break;
 		case KEY_OEM_ATTN:			// JP(IME/ENG) 英数/CapsLock(0xf0)
 			bIMEInConverting = FALSE;
-			if (bEnableEPHelper) {
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+			if (bEnableEPHelper || bIMEModeForced) {
+				if (bForExplorerPatcherSWS(hForeWnd, TRUE, bIMEModeForced, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
 						Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
 					}
+					else {
+						if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
+							Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
+						}
+					}
 				}
 			}
 			break;
 		case KEY_OEM_FINISH:		// JP(IME/ENG) OEM カタカナ	(0xf1)
-			if (bEnableEPHelper) {
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+			bIMEInConverting = FALSE;
+			if (bEnableEPHelper || bIMEModeForced) {
+				if (bForExplorerPatcherSWS(hForeWnd, bIMEModeForced, TRUE, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
 						Cime->vIMEConvertModeChangeForced(hForeWnd, ZENKANA_IMEON);
 					}
 					else {
-						if (bIMEModeForced != FALSE) {
+						if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
 							Cime->vIMEConvertModeChangeForced(hForeWnd, ZENKANA_IMEON);
 						}
 					}
@@ -677,28 +678,35 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 			}
 			break;
 		case KEY_OEM_COPY:			// JP(IME/ENG) OEM ひらがな	(0xf2)
-			if (bEnableEPHelper) {
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+			bIMEInConverting = FALSE;
+			if (bEnableEPHelper || bIMEModeForced) {
+				if (bForExplorerPatcherSWS(hForeWnd, bIMEModeForced, TRUE, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
 						Cime->vIMEConvertModeChangeForced(hForeWnd, ZENHIRA_IMEON);
 					}
 					else {
-						if (bIMEModeForced != FALSE) {
+						if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
 							Cime->vIMEConvertModeChangeForced(hForeWnd, ZENHIRA_IMEON);
 						}
 					}
 				}
 			}
 			break;
-		case KEY_OEM_IME_OFF:		// JP(IME/ENG) IME OFF		(0xf3) But It's IME ON when key up
-			if (bEnableEPHelper) {
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+		case KEY_OEM_IME_OFF:		// JP(IME/ENG) IME OFF
+			bIMEInConverting = FALSE;
+			if (bEnableEPHelper || bIMEModeForced) {
+				DWORD	dwBeforeIMEMode = Cime->dwIMEMode(hForeWnd, FALSE);
+				if (bForExplorerPatcherSWS(hForeWnd, bIMEModeForced, TRUE, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
-						Cime->vIMEConvertModeChangeForced(hForeWnd, ZENHIRA_IMEON);
+						if (dwBeforeIMEMode == IMEOFF) {
+							Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
+						}
 					}
 					else {
 						if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
-							Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
+							if (dwBeforeIMEMode != IMEOFF) {
+								Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
+							}
 						}
 					}
 				}
@@ -706,14 +714,21 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 			break;
 		case KEY_OEM_IME_ON:		// JP(IME/ENG) IME ON
 			bIMEInConverting = FALSE;
-			if (bEnableEPHelper) {
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+			if (bEnableEPHelper || bIMEModeForced) {
+				DWORD	dwBeforeIMEMode = Cime->dwIMEMode(hForeWnd, FALSE);
+				if (bForExplorerPatcherSWS(GetForegroundWindow(), bIMEModeForced, TRUE, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
-						Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
+						if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
+							if (dwBeforeIMEMode == IMEOFF) {
+								Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
+							}
+						}
 					}
 					else {
 						if ((bIMEModeForced != FALSE) && (!Cime->bIsNewIME())) {
-							Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
+							if (dwBeforeIMEMode != IMEOFF) {
+								Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
+							}
 						}
 					}
 				}
@@ -722,9 +737,9 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 		case KEY_OEM_BACKTAB:		// OEM Alt+カタカナ/ひらがな	(0xf5)
 		case KEY_FF:				// US(ENG) 変換/ひら/カタ	(0xff)
 			bIMEInConverting = FALSE;
-			if (bEnableEPHelper) {
+			if (bEnableEPHelper || bIMEModeForced) {
 				SetFocus(hForeWnd);
-				if (bForExplorerPatcherSWS(hForeWnd, TRUE, &hNewHKL, &hPreviousHKL)) {
+				if (bForExplorerPatcherSWS(hForeWnd, TRUE, bIMEModeForced, &hNewHKL, &hPreviousHKL)) {
 					if ((hPreviousHKL != JP_IME) && (hNewHKL == JP_IME)) {
 						Cime->vIMEOpenCloseForced(hForeWnd, IMEOPEN);
 					}
@@ -744,11 +759,10 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 		case KEY_OEM_ATTN:			// JP(IME/ENG) 英数/CapsLock(0xf0)
 		case KEY_OEM_FINISH:		// JP(IME/ENG) OEM カタカナ	(0xf1)
 		case KEY_OEM_COPY:			// JP(IME/ENG) OEM ひらがな	(0xf2)
-			if (bEnableEPHelper) {
+			if (bEnableEPHelper) {	
 				PostMessage(hWnd, WM_SYSKEYDOWNUPEX, vk, (0x80000000));
-				return;
 			}
-			break;
+			return;
 		default:
 			return;
 		}
@@ -777,7 +791,7 @@ static void Cls_OnSysKeyDownUpEx(HWND hWnd, UINT vk, BOOL fDown, int cRepeat, UI
 // for Explorer Patcher Simple Window Switcher
 // bForExplorerPatcherSWS()
 //
-BOOL		bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, LPHKL lpNewHKL, LPHKL lpPreviousHKL)
+BOOL		bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, BOOL bIMEModeForcedChange, LPHKL lpNewHKL, LPHKL lpPreviousHKL)
 {
 	if (hForeWnd == NULL)	return FALSE;
 	BOOL	bRet = FALSE;
@@ -785,76 +799,93 @@ BOOL		bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, LPHKL lpNewHKL, L
 	HKL		hPreviousHKL = NULL;
 	DWORD	dwProcessID = 0;
 	DWORD	dwThreadID = 0;
-	dwThreadID = GetWindowThreadProcessId(hForeWnd, &dwProcessID);
-	if ((hkl = GetKeyboardLayout(dwThreadID)) != NULL) {
-		int	iKeyboardType = GetKeyboardType(1);
-		if (iKeyboardType == 2)	hPreviousHKL = hkl;
-		else hPreviousHKL = 0x00000000;
-		if ((bChangeToIME && (hkl != JP_IME)) || (hkl == US_ENG)) {
-			hkl = JP_IME;
-			if (ActivateKeyboardLayout(hkl, KLF_SETFORPROCESS) != 0) {
-				if ((hkl = GetKeyboardLayout(dwThreadID)) != NULL) {				// Re Check
-					if (hkl != JP_IME) {
-						int		iKBList = 0;
-						if ((iKBList = GetKeyboardLayoutList(0, NULL)) != 0) {
-							LPHKL	lpHKL = NULL;
-							if ((lpHKL = new HKL[sizeof(HKL) * iKBList]) != NULL) {
-								ZeroMemory(lpHKL, (sizeof(HKL) * iKBList));
-								if ((iKBList = GetKeyboardLayoutList(iKBList, lpHKL)) != 0) {
-									int	iKB = 0, iJP_IME = 0;
-									for (int i = 0; i < iKBList; i++) {
-										if (lpHKL[i] == hkl)	iKB = i;
-										if (lpHKL[i] == JP_IME)	iJP_IME = i;
-									}
-									while (GetAsyncKeyState(VK_SHIFT) & 0x8000) {
-										Sleep(50);
-									}
-									iKB = iKBList - iKB + iJP_IME;
-									LPINPUT lpInputs = NULL;
-									if ((lpInputs = new INPUT[sizeof(INPUT) * (iKB * 2 + 2)]) != NULL) {
-										ZeroMemory(lpInputs, sizeof(INPUT) * (iKB * 2 + 2));
-										lpInputs[0].type = INPUT_KEYBOARD;	lpInputs[0].ki.wVk = VK_LWIN;
-										int i = 0;
-										for (; i < ((iKB * 2)); i = i + 2) {
-											lpInputs[i + 1].type = INPUT_KEYBOARD;	lpInputs[i + 1].ki.wVk = VK_SPACE;
-											lpInputs[i + 2].type = INPUT_KEYBOARD;	lpInputs[i + 2].ki.wVk = VK_SPACE;	lpInputs[i + 2].ki.dwFlags = KEYEVENTF_KEYUP;
-										}
-										lpInputs[iKB * 2 + 1].type = INPUT_KEYBOARD;	lpInputs[iKB * 2 + 1].ki.wVk = VK_LWIN;	lpInputs[iKB * 2 + 1].ki.dwFlags = KEYEVENTF_KEYUP;
-										if (bSendInputSub((UINT)(iKB * 2 + 2), lpInputs)) {
-											hkl = lpHKL[iJP_IME];
-											if (hkl != NULL) {
-												if (ActivateKeyboardLayout(hkl, KLF_SETFORPROCESS) != 0) {
-													EnumChildWindows(hForeWnd, &bEnumChildProcChangeHKL, (LPARAM)hkl);
-													bRet = TRUE;
-												}
-											}
-										}
-										delete[]	lpInputs;
-									}
+	DWORD	dwInputLocale = 0;
+	if ((dwThreadID = GetWindowThreadProcessId(hForeWnd, &dwProcessID)) != 0) {
+		if ((hkl = GetKeyboardLayout(dwThreadID)) != NULL) {
+			if ((dwInputLocale = Cime->dwGetInputLocale()) != 0) {
+				hkl = (HKL)(((UINT64)hkl & KB_MASK) | (dwInputLocale & LANG_MASK));
+				int	iKeyboardType = GetKeyboardType(1);
+				if (iKeyboardType == 2)	hPreviousHKL = hkl;
+				else hPreviousHKL = US_ENG;
+				if ((bChangeToIME && (hkl != JP_IME)) || (hkl == US_ENG) || bIMEModeForcedChange) {
+					hkl = JP_IME;
+					if (ActivateKeyboardLayout(hkl, (KLF_SETFORPROCESS | KLF_REORDER)) != 0) {
+						//EnumChildWindows(hForeWnd, &bEnumChildProcChangeHKL, (LPARAM)hkl);
+						//Cime->vActivateIME(hForeWnd);
+						if ((hkl = GetKeyboardLayout(dwThreadID)) != NULL) {				// Re Check
+							if (hkl != JP_IME) {
+								if (bChangeHKLbySendInput(JP_IME, hkl)) {
+									hkl = JP_IME;
+									bRet = TRUE;
 								}
-								delete[]	lpHKL;
+							}
+							else {
+								bRet = TRUE;
 							}
 						}
 					}
-					else {
-						EnumChildWindows(hForeWnd, &bEnumChildProcChangeHKL, (LPARAM)hkl);
-						bRet = TRUE;
-					}
 				}
 			}
 		}
-		else {
-			if (hPreviousHKL != JP_IME)	EnumChildWindows(hForeWnd, &bEnumChildProcChangeHKL, (LPARAM)hkl);
-			bRet = TRUE;
-		}
 	}
-	if (bRet)	Cime->vActivateIME(hForeWnd);
+	if (bRet) {
+		EnumChildWindows(hForeWnd, &bEnumChildProcChangeHKL, (LPARAM)hkl);
+		Cime->vActivateIME(hForeWnd);
+	}
 	if (lpNewHKL != NULL)		*lpNewHKL = hkl;
 	if (lpPreviousHKL != NULL)	*lpPreviousHKL = hPreviousHKL;
 	return bRet;
 }
 
 //
+// bChangeHKLbySendInput();
+//
+BOOL	bChangeHKLbySendInput(HKL hNewHKL, HKL hPreviousHKL)
+{
+	BOOL	bRet = FALSE;
+	int		iKBList = 0;
+	if ((iKBList = GetKeyboardLayoutList(0, NULL)) != 0) {
+		LPHKL	lpHKL = NULL;
+		if ((lpHKL = new HKL[sizeof(HKL) * iKBList]) != NULL) {
+			ZeroMemory(lpHKL, (sizeof(HKL) * iKBList));
+			if (GetKeyboardLayoutList(iKBList, lpHKL) != 0) {
+				int	iPreviousKB = 0, iNewKB = 0;
+				for (int i = 0; i < iKBList; i++) {
+					if (lpHKL[i] == hPreviousHKL)	iPreviousKB = i;
+					if (lpHKL[i] == hNewHKL)		iNewKB = i;
+				}
+				//if ((GetAsyncKeyState(VK_SHIFT) & 0x8000)) iKB = iKBList - iKB;
+				while (GetAsyncKeyState(VK_SHIFT) & 0x8000) {
+					Sleep(1);
+				}
+				int iKB = iKBList - iPreviousKB + iNewKB;
+				if (iNewKB != iPreviousKB) {
+					LPINPUT lpInputs = NULL;
+					if ((lpInputs = new INPUT[sizeof(INPUT) * (iKB * 2 + 2)]) != NULL) {
+						ZeroMemory(lpInputs, sizeof(INPUT) * (iKB * 2 + 2));
+						lpInputs[0].type = INPUT_KEYBOARD;	lpInputs[0].ki.wVk = VK_LWIN;
+						int i = 0;
+						for (; i < ((iKB * 2)); i = i + 2) {
+							lpInputs[i + 1].type = INPUT_KEYBOARD;	lpInputs[i + 1].ki.wVk = VK_SPACE;
+							lpInputs[i + 2].type = INPUT_KEYBOARD;	lpInputs[i + 2].ki.wVk = VK_SPACE;	lpInputs[i + 2].ki.dwFlags = KEYEVENTF_KEYUP;
+						}
+						lpInputs[iKB * 2 + 1].type = INPUT_KEYBOARD;	lpInputs[iKB * 2 + 1].ki.wVk = VK_LWIN;	lpInputs[iKB * 2 + 1].ki.dwFlags = KEYEVENTF_KEYUP;
+						if (bSendInputSub((UINT)(iKB * 2 + 2), lpInputs)) {
+							bRet = TRUE;
+						}
+						if (lpInputs)	delete[]	lpInputs;
+					}
+				}
+				else bRet = TRUE;
+
+			}
+			if (lpHKL)	delete[]	lpHKL;
+		}
+	}
+	return bRet;
+}
+
+//
 // bEnumChildProcChangeHKL()
 //
 BOOL CALLBACK bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam)
@@ -887,7 +918,7 @@ BOOL		bCheckExistingJPIME()
 					}
 				}
 			}
-			delete[]	lpHKL;
+			if (lpHKL)	delete[]	lpHKL;
 		}
 	}
 	HWND	hWnd = FindWindow(CLASS_FLUSHMOUSE32, NULL);
@@ -908,18 +939,6 @@ static BOOL		bSendInputSub(UINT cInputs, LPINPUT pInputs)
 }
 
 //
-// lExceptionFilter()
-//
-static LONG WINAPI lExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo)
-{
-	UNREFERENCED_PARAMETER(pExceptionInfo);
-
-	SystemParametersInfo(SPI_SETCURSORS, 0, NULL, 0);
-
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-
-//
 // bStartThreadHookTimer()
 //
 BOOL		bStartThreadHookTimer(HWND hWnd)
@@ -1091,15 +1110,17 @@ CResource::CResource(LPCTSTR lpszResFile)
 	hModRes = NULL;
 	iResourceLoadCount = 0;
 	szResFile = new TCHAR[_MAX_PATH];
-	ZeroMemory(szResFile, _MAX_PATH);
-	_tcsncpy_s(szResFile, _MAX_PATH, lpszResFile, _TRUNCATE);
+	if (szResFile) {
+		ZeroMemory(szResFile, sizeof(TCHAR) * _MAX_PATH);
+		_tcsncpy_s(szResFile, _MAX_PATH, lpszResFile, _TRUNCATE);
+	}
 }
 
 CResource::~CResource()
 {
 	hModRes = NULL;
 	iResourceLoadCount = 0;
-	delete[]	szResFile;
+	if (szResFile)	delete[]	szResFile;
 	szResFile = NULL;
 }
 

--- a/FlushMouse/FlushMouseLIB.h
+++ b/FlushMouse/FlushMouseLIB.h
@@ -47,7 +47,7 @@ private:
 extern BOOL			bWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance);
 extern BOOL			bStartThreadHookTimer(HWND hWnd);
 extern VOID			vStopThreadHookTimer(HWND hWnd);
-extern BOOL			bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, LPHKL lpNewHKL, LPHKL lpPreviousHKL);
+extern BOOL			bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, BOOL bIMEModeForcedChange, LPHKL lpNewHKL, LPHKL lpPreviousHKL);
 extern BOOL			bCheckExistingJPIME();
 
 //

--- a/FlushMouse/FlushMouseSub.cpp
+++ b/FlushMouse/FlushMouseSub.cpp
@@ -18,7 +18,6 @@
 #include "Resource.h"
 #include "..\FlushMouseDLL\GlobalHookDll.h"
 #include "..\FlushMouseDLL\EventlogDll.h"
-#include "..\FlushMouseDLL\EventlogData.h"
 #include "..\FlushMouseDLL32\FlushMouseDll32.h"
 #include "..\MiscLIB\CRegistry.h"
 
@@ -61,26 +60,44 @@ BOOL		bCreateTaskTrayWindow(HWND hWnd, HICON hIcon, LPCTSTR lpszTitle)
 	nIco.guidItem = GUID_NULL;
 	nIco.uFlags = NIF_INFO | NIF_MESSAGE | NIF_ICON | NIF_TIP;
 	nIco.uCallbackMessage = WM_TASKTRAYEX;
-	nIco.dwState = 0;
-	nIco.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON | NIIF_NOSOUND | NIIF_RESPECT_QUIET_TIME | NIIF_LARGE_ICON;
+	nIco.dwState = NIS_HIDDEN | NIS_SHAREDICON;
+	nIco.dwInfoFlags = NIIF_USER | NIIF_LARGE_ICON | NIIF_NOSOUND;
 	nIco.uVersion = NOTIFYICON_VERSION_4;
 	nIco.hIcon = hIcon;
 	if ((nIco.hIcon = LoadIcon(Resource->hLoad(), MAKEINTRESOURCE(IDI_FLUSHMOUSE))) == NULL) {
 		return FALSE;
 	}
 	_tcsncpy_s(nIco.szTip, ARRAYSIZE(nIco.szTip), lpszTitle, _TRUNCATE);
-	if (Shell_NotifyIcon(NIM_ADD, &nIco) == FALSE) {			// Add TaskTray Icon
-		_Post_equals_last_error_ DWORD err = GetLastError();
-		if (err == ERROR_TIMEOUT) {
-			Sleep(1000);
-			if (Shell_NotifyIcon(NIM_ADD, &nIco) == FALSE) {	// Retry once
+	BOOL	bRet = FALSE;
+	try {
+		throw bRet = Shell_NotifyIcon(NIM_ADD, &nIco);
+	}
+	catch (BOOL) {
+		if (!bRet) {
+			_Post_equals_last_error_ DWORD err = GetLastError();
+			if (err == ERROR_TIMEOUT) {
+				Sleep(1000);
+				try {
+					throw bRet = Shell_NotifyIcon(NIM_ADD, &nIco);
+				}
+				catch (BOOL) {
+					if (!bRet) {
+						return FALSE;
+					}
+				}
+				catch (...) {
+					return FALSE;
+				}
+			}
+			else {
 				return FALSE;
 			}
 		}
-		else {
-			return FALSE;
-		}
 	}
+	catch (...) {
+		return FALSE;
+	}
+
 	if ((uTaskbarCreatedMessage = RegisterWindowMessage(_T("TaskbarCreated"))) == 0) {
 		bDestroyTaskTrayWindow(hWnd);
 		return FALSE;
@@ -137,9 +154,16 @@ BOOL		bDestroyTaskTrayWindow(HWND hWnd)
 		nIco.uID = NOTIFYICONDATA_ID;
 		nIco.guidItem = GUID_NULL;
 		nIco.uFlags = 0;
-		if (Shell_NotifyIcon(NIM_DELETE, &nIco) != FALSE) {
-			bTaskTray = FALSE;
-			return TRUE;
+		try {
+			throw Shell_NotifyIcon(NIM_DELETE, &nIco);
+		}
+		catch (BOOL bRet) {
+			if (bRet) {
+				bTaskTray = FALSE;
+				return TRUE;
+			}
+		}
+		catch (...) {
 		}
 	}
 	return FALSE;
@@ -156,11 +180,19 @@ BOOL		bGetTaskTrayWindowRect(HWND hWnd, LPRECT lpRect)
 		nii.hWnd = hWnd;
 		nii.uID = NOTIFYICONDATA_ID;
 		nii.guidItem = GUID_NULL;
-		HRESULT	hResult = E_FAIL;
-		if ((hResult = Shell_NotifyIconGetRect(&nii, lpRect)) != S_OK) {
+		try {
+			throw Shell_NotifyIconGetRect(&nii, lpRect);
+		}
+		catch (HRESULT	hResult) {
+			if (hResult != S_OK) {
+				return FALSE;
+			}
+			return TRUE;
+		}
+		catch (...) {
+			PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
 			return FALSE;
 		}
-		return TRUE;
 	}
 	return FALSE;
 }
@@ -194,6 +226,7 @@ void		Cls_OnTaskTrayEx(HWND hWnd, UINT id, UINT uMsg)
 			SetForegroundWindow(hWnd);
 			APPBARDATA stAppBarData{};
 			stAppBarData.cbSize = sizeof(APPBARDATA);
+			stAppBarData.hWnd = hWnd;
 			SHAppBarMessage(ABM_GETTASKBARPOS, &stAppBarData);
 			UINT		uFlags = 0;
 			switch (stAppBarData.uEdge) {
@@ -221,8 +254,6 @@ void		Cls_OnTaskTrayEx(HWND hWnd, UINT id, UINT uMsg)
 				//EnableMenuItem(hSubMenu, IDR_TT_SETTING, MF_BYCOMMAND | MF_DISABLED);
 			}
 			TrackPopupMenu(hSubMenu, uFlags, pt.x, pt.y, 0, hWnd, NULL);
-			DestroyMenu(hMenu);
-			PostMessage(hWnd, WM_NULL, 0, 0);
 			break;
 	}
 }
@@ -705,12 +736,15 @@ CFlushMouseHook::CFlushMouseHook()
 	bKeyboardHook64 = FALSE;
 	bMouseHook64 = FALSE;
 	bHook32Dll = FALSE;
-	lpstProcessInfomation = NULL;
+	lpstProcessInfomation = new PROCESS_INFORMATION[sizeof(PROCESS_INFORMATION)];
+	if (lpstProcessInfomation)	ZeroMemory(lpstProcessInfomation, sizeof(PROCESS_INFORMATION));
 }
 
 CFlushMouseHook::~CFlushMouseHook()
 {
 	bHookUnset();
+	if (lpstProcessInfomation)	delete[]	lpstProcessInfomation;
+	lpstProcessInfomation = NULL;
 }
 //
 // bHookSet()
@@ -738,69 +772,37 @@ BOOL		CFlushMouseHook::bHookUnset()
 }
 
 //
-// bHook64DllLoad()
-//
-BOOL			CFlushMouseHook::bHook64DllLoad(LPCTSTR lpszDll64Name)
-{
-	DWORD	dwSize = 0;
-	dwSize = ExpandEnvironmentStrings(lpszDll64Name, NULL, 0);
-	LPTSTR	lpszBuffer = new TCHAR[dwSize];
-	ZeroMemory(lpszBuffer, dwSize);
-	dwSize = ExpandEnvironmentStrings(lpszDll64Name, lpszBuffer, dwSize);
-	BOOL		bRet = FALSE;
-	if (hHook64Dll == NULL) {
-		if ((hHook64Dll = LoadLibraryEx(lpszBuffer, NULL, 0)) != NULL) {
-			bRet = TRUE;
-		}
-	}
-	delete[]	lpszBuffer;
-	return bRet;
-}
-
-//
-// bHook64DllUnload()
-//
-BOOL			CFlushMouseHook::bHook64DllUnload()
-{
-	if (hHook64Dll != NULL) {
-		if (!FreeLibrary(hHook64Dll)) {
-			return FALSE;
-		}
-	}
-	hHook64Dll = NULL;
-	return TRUE;
-}
-
-//
 // bHook32DllStart()
 //
 BOOL	 	CFlushMouseHook::bHook32DllStart(HWND hWnd, LPCTSTR lpszExec32Name)
 {
 #define	COMAMANDLINESIZE (sizeof(_T(" ")) * (sizeof(unsigned long long) + 1))
+	BOOL	bRet = FALSE;
 	DWORD	dwSize = 0;
 	dwSize = ExpandEnvironmentStrings(lpszExec32Name, NULL, 0);
 	LPTSTR	lpszBuffer = new TCHAR[dwSize];
-	ZeroMemory(lpszBuffer, dwSize);
-	dwSize = ExpandEnvironmentStrings(lpszExec32Name, lpszBuffer, dwSize);
-
-	LPTSTR	lpszCommandLine = NULL;
-	lpszCommandLine = new TCHAR[dwSize + COMAMANDLINESIZE];
-	ZeroMemory(lpszCommandLine, (dwSize + sizeof(COMAMANDLINESIZE)));
-	_sntprintf_s(lpszCommandLine, (dwSize + COMAMANDLINESIZE), _TRUNCATE, _T("%s %llu"), lpszBuffer, (unsigned long long)hWnd);
-	if (lpszBuffer != NULL)	delete[]		lpszBuffer;
-
-	lpstProcessInfomation = new PROCESS_INFORMATION[sizeof(PROCESS_INFORMATION)];
-	ZeroMemory(lpstProcessInfomation, sizeof(PROCESS_INFORMATION));
-	STARTUPINFO	stStartupInfo{};		stStartupInfo.cb = sizeof(STARTUPINFO);
-	BOOL		bRet = FALSE;
-	if ((bRet = CreateProcess(NULL, lpszCommandLine, NULL, NULL, TRUE,
-		NORMAL_PRIORITY_CLASS, NULL, NULL, &stStartupInfo, lpstProcessInfomation)) == FALSE) {
-			delete[] lpstProcessInfomation;
-	}
-	else {
-		bHook32Dll = TRUE;
+	if (lpszBuffer) {
+		ZeroMemory(lpszBuffer, dwSize);
+		dwSize = ExpandEnvironmentStrings(lpszExec32Name, lpszBuffer, dwSize);
+
+		LPTSTR	lpszCommandLine = NULL;
+		lpszCommandLine = new TCHAR[dwSize + COMAMANDLINESIZE];
+		if (lpszCommandLine) {
+			ZeroMemory(lpszCommandLine, (dwSize + sizeof(COMAMANDLINESIZE)));
+			_sntprintf_s(lpszCommandLine, (dwSize + COMAMANDLINESIZE), _TRUNCATE, _T("%s %llu"), lpszBuffer, (unsigned long long)hWnd);
+			if (lpstProcessInfomation) {
+				STARTUPINFO	stStartupInfo{};		stStartupInfo.cb = sizeof(STARTUPINFO);
+				if ((bRet = CreateProcess(NULL, lpszCommandLine, NULL, NULL, TRUE,
+					NORMAL_PRIORITY_CLASS, NULL, NULL, &stStartupInfo, lpstProcessInfomation)) == FALSE) {
+				}
+				else {
+					bHook32Dll = TRUE;
+				}
+			}
+			delete[]	lpszCommandLine;
+		}
+		delete[]		lpszBuffer;
 	}
-	if (lpszCommandLine != NULL)		delete[]	lpszCommandLine;
 	return bRet;
 }
 
@@ -812,37 +814,38 @@ BOOL 	CFlushMouseHook::bHook32DllStop()
 #define	TIMEOUT	1000 
 	if (!bHook32Dll)	return TRUE;
 	BOOL		bRet = FALSE;
-	if (lpstProcessInfomation->hProcess != NULL) {
-		if (!EnumWindows((WNDENUMPROC)&CFlushMouseHook::bEnumWindowsProcHookStop, (LPARAM)lpstProcessInfomation)) {
-			if (GetLastError() == ERROR_SUCCESS) {
-				DWORD dwRet = WaitForSingleObject(lpstProcessInfomation->hProcess, TIMEOUT);
-				switch (dwRet) {
-				case WAIT_OBJECT_0:
-					bRet = TRUE;
-					break;
-				case WAIT_FAILED:
-				case WAIT_ABANDONED:
-				case WAIT_TIMEOUT:
-				default:
-					if (TerminateProcess(lpstProcessInfomation->hProcess, 0) != 0) {
+	if (lpstProcessInfomation != NULL) {
+		if (lpstProcessInfomation->hProcess != NULL) {
+			if (!EnumWindows((WNDENUMPROC)&CFlushMouseHook::bEnumWindowsProcHookStop, (LPARAM)lpstProcessInfomation)) {
+				if (GetLastError() == ERROR_SUCCESS) {
+					DWORD dwRet = WaitForSingleObject(lpstProcessInfomation->hProcess, TIMEOUT);
+					switch (dwRet) {
+					case WAIT_OBJECT_0:
+						bRet = TRUE;
+						break;
+					case WAIT_FAILED:
+					case WAIT_ABANDONED:
+					case WAIT_TIMEOUT:
+					default:
+						if (TerminateProcess(lpstProcessInfomation->hProcess, 0)) {
+							bRet = TRUE;
+						}
 						bRet = TRUE;
 					}
+					DWORD dwExitCode;
+					if (!GetExitCodeProcess(lpstProcessInfomation->hProcess, &dwExitCode)) {
+						bRet = FALSE;
+					}
+					if (lpstProcessInfomation->hProcess != NULL) {
+						CloseHandle(lpstProcessInfomation->hProcess);
+					}
 				}
-				DWORD dwExitCode;
-				if (!GetExitCodeProcess(lpstProcessInfomation->hProcess, &dwExitCode)) {
-					bRet = FALSE;
-				}
-				if (lpstProcessInfomation->hProcess != NULL) {
-					CloseHandle(lpstProcessInfomation->hProcess);
+				if (lpstProcessInfomation->hThread != NULL) {
+					CloseHandle(lpstProcessInfomation->hThread);
 				}
 			}
-			if (lpstProcessInfomation->hThread != NULL) {
-				CloseHandle(lpstProcessInfomation->hThread);
-			}
 		}
 	}
-	delete[] lpstProcessInfomation;
-	lpstProcessInfomation = NULL;
 	return bRet;
 }
 

--- a/FlushMouse32/FlushMouse32.cpp
+++ b/FlushMouse32/FlushMouse32.cpp
@@ -28,9 +28,8 @@
 //
 // Define
 //
-#define MAX_LOADSTRING 100
 // Timer
-#define PROCINITTIMERVALUE		3000
+#define PROCINITTIMERVALUE		1000
 #define CHECKPROCTIMERID		2
 static UINT     nCheckProcTimerTickValue = PROCINITTIMERVALUE;		// Timer tick
 static UINT_PTR nCheckProcTimerID = CHECKPROCTIMERID;				// Timer ID
@@ -71,7 +70,6 @@ static void				Cls_OnCheckExistingJPIMEEx(HWND hWnd, BOOL bEPHelper);
 // Sub
 static VOID CALLBACK	vCheckProcTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DWORD dwTime);
 static BOOL				bReportEvent(DWORD dwEventID, WORD wCategory);
-static LONG WINAPI		lExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo);
 static void				vMessageBox(HWND hWnd, UINT uID, UINT uType);
 
 //
@@ -87,11 +85,14 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
 	_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif	
 
-	SetUnhandledExceptionFilter(&lExceptionFilter);
+	HANDLE	hHandle = GetCurrentProcess();
+	if (!SetPriorityClass(hHandle, NORMAL_PRIORITY_CLASS)) {
+		return (-1);
+	}
 
 	if (*lpCmdLine == _T('\0')) {
 		hParentWnd = NULL;
-		vMessageBox(NULL, IDS_NOTFORKBY64, MessageBoxTYPE);		// 不正起動のためメッセージを表示
+		vMessageBox(NULL, IDS_NOTFORKBY64, MessageBoxTYPE);
 		return (-1);
 	}
 	else {
@@ -118,7 +119,9 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
 		PostMessage(hWnd, WM_DESTROY, NULL, NULL);
 		for (int i = 3; i > 0; i--) {
 			Sleep(500);
-			if (FindWindow(CLASS_FLUSHMOUSE32, NULL) != NULL) {
+			if ((hWnd = FindWindow(CLASS_FLUSHMOUSE32, NULL)) != NULL) {
+				SetFocus(GetLastActivePopup(hWnd));
+				PostMessage(hWnd, WM_DESTROY, NULL, NULL);
 				if (i == 1) {
 					vMessageBox(NULL, IDS_ALREADYRUN, MessageBoxTYPE);
 					return (-1);
@@ -128,7 +131,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
 		}
 	}
 
-	if (!InitInstance(hInstance, nCmdShow)) {                   // Window作成
+	if (!InitInstance(hInstance, nCmdShow)) {
 		return (-1);
 	}
 	
@@ -254,8 +257,8 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 //
 static void Cls_OnDestroy(HWND hWnd)
 {
-	EXCEPTION_POINTERS ExceptionInfo{};
-	lExceptionFilter(&ExceptionInfo);
+	bKeyboardHookLLUnset32();
+	bMouseHookUnset32();
 
 	if (uCheckProcTimer != NULL) {
 		if (KillTimer(hWnd, nCheckProcTimerID)) {
@@ -273,7 +276,7 @@ static void		Cls_OnCheckExistingJPIMEEx(HWND hWnd, BOOL bEPHelper)
 {
 	UNREFERENCED_PARAMETER(hWnd);
 	if (!bSetEnableEPHelperLL32(bEPHelper)) {
-		DestroyWindow(hWnd);
+		PostMessage(hWnd, WM_DESTROY, (WPARAM)0, (LPARAM)0);
 	}
 }
 
@@ -294,27 +297,25 @@ static VOID CALLBACK vCheckProcTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DW
 			nIco.uID = NOTIFYICONDATA_ID;
 			nIco.guidItem = GUID_NULL;
 			nIco.uFlags = 0;
-			if (Shell_NotifyIcon(NIM_DELETE, &nIco) == FALSE) {
-				bReportEvent(MSG_RESTART_EVENT, APPLICATION32_CATEGORY);
-				PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
+			try {
+				throw Shell_NotifyIcon(NIM_DELETE, &nIco);					// Delete TaskTray Icon
+			}
+			catch (BOOL bRet) {
+				if (!bRet) {
+					return;
+				}
+			}
+			catch (...) {
+				return;
 			}
+			bReportEvent(MSG_RESTART_EVENT, APPLICATION32_CATEGORY);		// FlushMouseが動いていないため再起動する
+			PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);		// Quit
 		}
 	}
 	return;
 }
 
 //
-// lExceptionFilter()
-//
-static LONG WINAPI lExceptionFilter(PEXCEPTION_POINTERS pExceptionInfo)
-{
-	UNREFERENCED_PARAMETER(pExceptionInfo);
-	bKeyboardHookLLUnset32();										// Keyboard Hook LL の解除
-	bMouseHookUnset32();											// Mouse Hook の解除
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-
-//
 // bReportEvent()
 //
 static BOOL	bReportEvent(DWORD dwEventID, WORD wCategory)

--- /dev/null
+++ b/FlushMouse32/FlushMouse32.exe.manifest
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity
+        type="win32"
+        name="FlushMouse32.exe"
+        version="0.2.0.1"
+        processorArchitecture="x86"
+    />
+    <description>FlushMouse Application</description>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 and Windows 11 -->
+			<maxversiontested Id="10.0.19041.0"/>
+			<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+			<!-- DPI Awareness -->
+			<!-- Per Monitor V2 [OS >= Windows 10 Creators Update (1703, 10.0.15063, Redstone 2)] Value: PerMonitorV2 -->
+			<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
+				PerMonitorV2, PerMonitor
+			</dpiAwareness>
+      		<!-- GDI Scaling -->
+			<gdiScaling>true</gdiScaling>
+		</application>
+    </compatibility>
+	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+			<requestedPrivileges>
+				<!-- UAC settings -->
+				<!--requestedExecutionLevel level="requireAdministrator" uiAccess="false"/-->
+				<!--requestedExecutionLevel level="highestAvailable" uiAccess="false"/-->
+				<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+			</requestedPrivileges>
+        </security>
+    </trustInfo>
+</assembly>

--- a/FlushMouse32/FlushMouse32.vcxproj
+++ b/FlushMouse32/FlushMouse32.vcxproj
@@ -219,6 +219,9 @@
       <Project>{3d3f632c-75bb-4830-aa8e-0871c6aa1a72}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="FlushMouse32.exe.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

--- a/FlushMouse32/FlushMouse32.vcxproj.filters
+++ b/FlushMouse32/FlushMouse32.vcxproj.filters
@@ -55,4 +55,7 @@
       <Filter>リソース ファイル</Filter>
     </Image>
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="FlushMouse32.exe.manifest" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

--- a/FlushMouseDLL/EventlogData.h
+++ b/FlushMouseDLL/EventlogData.h
@@ -6,6 +6,7 @@
 // #0000	2023/04/13  JeffyTS  	New edit.
 //
 //
+//
 // Categories of events.
 //
 //
@@ -98,6 +99,15 @@
 #define POWERNOTIFICATION_CATEGORY       ((DWORD)0x00000010L)
 
 //
+// MessageId: TASKSCHDULER_CATEGORY
+//
+// MessageText:
+//
+// TaskSheduler Events
+//
+#define TASKSCHDULER_CATEGORY            ((DWORD)0x00000011L)
+
+//
 // Message definitions.
 //
 //
@@ -143,7 +153,7 @@
 //
 // Thread, Hook and Timer Restarted.
 //
-#define MSG_THREAD_HOOK_TIMER_RESTARTED  ((DWORD)0x40000005L)
+#define MSG_THREAD_HOOK_TIMER_RESTARTED  ((DWORD)0x40000004L)
 
 //
 // MessageId: MSG_QUIT_FLUSHMOUSE
@@ -152,7 +162,25 @@
 //
 // Quit FlushMouse.
 //
-#define MSG_QUIT_FLUSHMOUSE              ((DWORD)0x40000006L)
+#define MSG_QUIT_FLUSHMOUSE              ((DWORD)0x40000005L)
+
+//
+// MessageId: MSG_RESTART_INSTALLER
+//
+// MessageText:
+//
+// Start FlushMouse(Installer).
+//
+#define MSG_RESTART_INSTALLER            ((DWORD)0x00000006L)
+
+//
+// MessageId: MSG_DONE_FLUSHMOUSE
+//
+// MessageText:
+//
+// Quit FlushMouse(Installer).
+//
+#define MSG_DONE_FLUSHMOUSE              ((DWORD)0x00000007L)
 
 //
 // MessageId: MSG_PBT_APMSUSPEND

--- a/FlushMouseDLL/EventlogData.mc
+++ b/FlushMouseDLL/EventlogData.mc
@@ -5,6 +5,7 @@
 ;// -------+-----------+-----------+-------------------------------------------- -
 ;// #0000	2023/04/13  JeffyTS  	New edit.
 ;//
+;//
 
 SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS
 Informational=0x1:STATUS_SEVERITY_INFORMATIONAL
@@ -77,6 +78,16 @@ Language=Japanese
 PowerNotification Events
 .
 
+MessageId=0x11
+SymbolicName=TASKSCHDULER_CATEGORY
+Language=English
+TaskSheduler Events
+.
+
+Language=Japanese
+TaskSheduler Events
+.
+
 
 ;//
 ;// Message definitions.
@@ -130,7 +141,7 @@ Language=Japanese
 Thread, Hook and Timer Stopped.
 .
 
-MessageId=0x0005
+MessageId=0x0004
 Severity=Informational
 Facility=Application
 SymbolicName=MSG_THREAD_HOOK_TIMER_RESTARTED
@@ -142,7 +153,7 @@ Language=Japanese
 Thread, Hook and Timer Restarted.
 .
 
-MessageId=0x0006
+MessageId=0x0005
 Severity=Informational
 Facility=Application
 SymbolicName=MSG_QUIT_FLUSHMOUSE
@@ -154,6 +165,30 @@ Language=Japanese
 FlushMouseを終了します。
 .
 
+MessageId=0x0006
+Severity=Success
+Facility=Application
+SymbolicName=MSG_RESTART_INSTALLER
+Language=English
+Start FlushMouse(Installer).
+.
+
+Language=Japanese
+FlushMouseを起動します(Installer)。
+.
+
+MessageId=0x0007
+Severity=Success
+Facility=Application
+SymbolicName=MSG_DONE_FLUSHMOUSE
+Language=English
+Quit FlushMouse(Installer).
+.
+
+Language=Japanese
+FlushMouseを終了します(Installer)。
+.
+
 MessageId=0x0100
 Severity=Informational
 Facility=Application

--- a/FlushMouseDLL/EventlogDll.h
+++ b/FlushMouseDLL/EventlogDll.h
@@ -12,6 +12,7 @@
 #pragma once
 #include "pch.h"
 #include "FlushMouseDll.h"
+#include "EventlogData.h"
 
 //
 // Global Prototype Define

--- a/FlushMouseDLL/GlobalHookDll.cpp
+++ b/FlushMouseDLL/GlobalHookDll.cpp
@@ -62,6 +62,12 @@ DLLEXPORT BOOL  __stdcall bGlobalHookSet(HWND hWnd)
 		}
 		delete CSharedMem;
 		CSharedMem = NULL;
+		hGLInstance = NULL;
+		hWndGLParent = NULL;
+		hHookGL = NULL;
+		lpDatGlobal = NULL;
+		hPrevWnd = NULL;
+		bSubclassed = FALSE;
 	}
 	return FALSE;
 }
@@ -86,6 +92,12 @@ DLLEXPORT BOOL __stdcall bGlobalHookUnset()
 		}
 		delete CSharedMem;
 		CSharedMem = NULL;
+		hGLInstance = NULL;
+		hWndGLParent = NULL;
+		hHookGL = NULL;
+		lpDatGlobal = NULL;
+		hPrevWnd = NULL;
+		bSubclassed = FALSE;
 	}
 	return bRet;
 }
@@ -119,18 +131,20 @@ static LRESULT CALLBACK lpGlobalHookProc(int nCode, WPARAM wParam, LPARAM lParam
 			if (lpCW->message == WM_HOOKEX) {
 				if (bGlobalHookProcSub()) {
 					if (lpCW->lParam) {
-						if (UnhookWindowsHookEx(hHookGL) != FALSE) {
-							if (!bSubclassed) {
+						if (!bSubclassed) {
+							if (hHookGL == NULL)	break;
+							if (UnhookWindowsHookEx(hHookGL) != FALSE) {
 #define	DLLNAME		_T("FlushMouseDLL.dll")
 								if (LoadLibraryEx(DLLNAME, NULL, 0)) {
 									bSubclassed = TRUE;
 								}
+								hHookGL = NULL;
 							}
 						}
 					}
 					else {
-						if (UnhookWindowsHookEx(hHookGL) != FALSE) {
-							FreeLibrary(hGLInstance);
+						if (bSubclassed) {
+							if (hHookGL == NULL)	break;
 							bSubclassed = FALSE;
 						}
 					}

Binary files a/FlushMouseDLL/MSG00409.bin and b/FlushMouseDLL/MSG00409.bin differ

Binary files a/FlushMouseDLL/MSG00411.bin and b/FlushMouseDLL/MSG00411.bin differ

--- a/FlushMouseDLL32/KeyboardHookDll32.cpp
+++ b/FlushMouseDLL32/KeyboardHookDll32.cpp
@@ -23,8 +23,6 @@
 //
 static LRESULT CALLBACK lpKeyboardHookLLProc(int nCode, WPARAM wParam, LPARAM lParam);
 static BOOL	bKeyboardHookLLProcSub();
-static BOOL	bKBisNotJP();
-static BOOL	bKBisEP();
 
 //
 // Local Data
@@ -62,6 +60,12 @@ DLLEXPORT BOOL  __stdcall bKeyboardHookLLSet32(HWND hWnd)
 		}
 		delete CSharedMemLL;
 		CSharedMemLL = NULL;
+		bOnlyCtrlLL = FALSE;
+		dwPreviousVKLL = 0;
+		hWndKBParentLL = NULL;
+		lpDatKeyboardLL = NULL;
+		bEnableEPHelperLL = FALSE;
+		bStartConvertingLL = FALSE;
 	}
 	return FALSE;
 }
@@ -82,6 +86,12 @@ DLLEXPORT BOOL __stdcall bKeyboardHookLLUnset32()
 		}
 		delete CSharedMemLL;
 		CSharedMemLL = NULL;
+		bOnlyCtrlLL = FALSE;
+		dwPreviousVKLL = 0;
+		hWndKBParentLL = NULL;
+		lpDatKeyboardLL = NULL;
+		bEnableEPHelperLL = FALSE;
+		bStartConvertingLL = FALSE;
 	}
 	return bRet;
 }
@@ -158,7 +168,6 @@ static LRESULT CALLBACK lpKeyboardHookLLProc(int nCode, WPARAM wParam, LPARAM lP
 			case VK_F10:			// (0x79)
 				//case VK_NUMLOCK:		// Num Lock (0x90)
 			case VK_OEM_ATTN:		// OEM 英数/CapsLock (0xf0)
-			case VK_OEM_FINISH:		// OEM カタカナ (0xf1)
 			case VK_OEM_COPY:		// OEM ひらがな (0xf2)
 				//case VK_OEM_AUTO:		// OEM 半角/全角 (0xf3 = VK_OEM_IME_OFF)
 			case VK_OEM_IME_OFF:	// OEM IME OFF (0xf3)
@@ -170,11 +179,21 @@ static LRESULT CALLBACK lpKeyboardHookLLProc(int nCode, WPARAM wParam, LPARAM lP
 					PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, (WM_USER + lpstKBH->vkCode), ((0x80000000 | 0xff000000 & (static_cast<LPARAM>(lpstKBH->flags)) << 24)));
 				}
 				break;
-			case 0xff:				// US(ENG) Convert (0xff)
+			case VK_OEM_FINISH:		// OEM カタカナ (0xf1)
+				bOnlyCtrlLL = FALSE;
+				if (GetAsyncKeyState(VK_SHIFT) & 0x8000) {					// Remove Shift +  Caps Lock
+					if (bKeyboardHookLLProcSub()) {
+						PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, (WM_USER + lpstKBH->vkCode), ((0x80000000 | 0xff000000 & (static_cast<LPARAM>(lpstKBH->flags)) << 24)));
+						return 1;
+					}
+				}
+				break;
+			case VK_FF:				// US(ENG) Convert (0xff)
 				if (GetAsyncKeyState(VK_SHIFT) & 0x8000) {
 					if (bKeyboardHookLLProcSub()) {
 						if (!bEnableEPHelperLL)	break;
 						PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, KEY_OEM_FINISH, ((0x80000000 | 0xff000000 & (static_cast<LPARAM>(lpstKBH->flags)) << 24)));
+						return 1;
 					}
 				}
 				else if (lpstKBH->scanCode == 0x0070) {
@@ -216,34 +235,34 @@ static LRESULT CALLBACK lpKeyboardHookLLProc(int nCode, WPARAM wParam, LPARAM lP
 			case VK_CAPITAL:		// 英数/CapsLock (0x14)
 				bOnlyCtrlLL = FALSE;
 				bStartConvertingLL = FALSE;
-				if (bKBisNotJP() || bKBisEP()) {
-					dwPreviousVKLL = VK_OEM_ATTN;
-					if (bKeyboardHookLLProcSub()) {
-						if (!bEnableEPHelperLL)	break;
-						PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, KEY_OEM_ATTN, (0x7f000000 & (static_cast<LPARAM>(lpstKBH->flags) << 24)));
-					}
-					return 1;
+				dwPreviousVKLL = VK_OEM_ATTN;
+				if (bKeyboardHookLLProcSub()) {
+					if (!bEnableEPHelperLL)	break;
+					PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, KEY_OEM_ATTN, (0x7f000000 & (static_cast<LPARAM>(lpstKBH->flags) << 24)));
 				}
+				return 1;
 				break;
 			case VK_KANJI:			// JP(IME/ENG) Alt + 漢字	(0x19)
 				bOnlyCtrlLL = FALSE;
 				bStartConvertingLL = FALSE;
 				dwPreviousVKLL = VK_KANJI;
-				if (bKeyboardHookLLProcSub()) {
-					PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, KEY_KANJI, (0x7f000000 & (static_cast<LPARAM>(lpstKBH->flags) << 24)));
+				if (GetAsyncKeyState(VK_MENU) & 0x8000) {
+					if (bKeyboardHookLLProcSub()) {
+						PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, KEY_KANJI, (0x7f000000 & (static_cast<LPARAM>(lpstKBH->flags) << 24)));
+					}
+					return 1;
 				}
 				break;
 			case VK_OEM_3:			// JP(IME/ENG) [@] / US(ENG) IME ON (0xc0) = ['] ALT + 半角/全角 or 漢字
 			case VK_OEM_8:			// JP(IME/ENG) [`] / UK(ENG) IME ON (0xdf) = ['] ALT + 半角/全角 or 漢字
 				bOnlyCtrlLL = FALSE;
 				bStartConvertingLL = FALSE;
-				if (bKBisNotJP() || bKBisEP()) {
-					if (bKeyboardHookLLProcSub()) {
-						if (!bEnableEPHelperLL)	break;
-						PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, (WM_USER + lpstKBH->vkCode), (0x7f000000 & (static_cast<LPARAM>(lpstKBH->flags) << 24)));
-					}
-					return 1;
+				if (bKeyboardHookLLProcSub()) {
+					PostMessage(hWndKBParentLL, WM_CHECKIMESTARTCONVEX, (WPARAM)bStartConvertingLL, (WM_USER + lpstKBH->vkCode));
+					if (!bEnableEPHelperLL)	break;
+					PostMessage(hWndKBParentLL, WM_SYSKEYDOWNUPEX, (WM_USER + lpstKBH->vkCode), (0x7f000000 & (static_cast<LPARAM>(lpstKBH->flags) << 24)));
 				}
+					return 1;
 				break;
 			case VK_OEM_ATTN:		// OEM 英数/CapsLock (0xf0)
 			case VK_OEM_FINISH:		// OEM カタカナ (0xf1)
@@ -256,6 +275,7 @@ static LRESULT CALLBACK lpKeyboardHookLLProc(int nCode, WPARAM wParam, LPARAM lP
 				break;
 			case VK_RETURN:			// RETURN (0x0d)
 			case VK_ESCAPE:			// ESC (0x1b)
+			case VK_NONCONVERT:		// 無変換 (0x1d)
 			case VK_INSERT:			// INSERT (0x2d)
 				bOnlyCtrlLL = FALSE;
 				bStartConvertingLL = FALSE;
@@ -287,34 +307,6 @@ static LRESULT CALLBACK lpKeyboardHookLLProc(int nCode, WPARAM wParam, LPARAM lP
 }
 
 //
-// bKBisNotJP()
-//
-static BOOL		bKBisNotJP()
-{
-#define	KB_MASK		0xffff0000
-#define	KB_JP		0x04110000
-
-	DWORD	dProcessID = 0;
-	DWORD	dThreadID = GetWindowThreadProcessId(GetForegroundWindow(), &dProcessID);
-	HKL	hkl = GetKeyboardLayout(dThreadID);
-	if (((UINT64)hkl & KB_MASK) != KB_JP) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-//
-// bKBisEP()
-//
-static BOOL		bKBisEP()
-{
-	if (GetKeyboardType(1) == 0) {
-		return TRUE;
-	}
-	return FALSE;
-}
-
-//
 // bKeyboardHookLLProcSub
 //
 static BOOL	bKeyboardHookLLProcSub()

--- a/FlushMouseDLL32/MouseHookDll32.cpp
+++ b/FlushMouseDLL32/MouseHookDll32.cpp
@@ -55,6 +55,8 @@ DLLEXPORT BOOL  __stdcall bMouseHookSet32(HWND hWnd)
 		}
 		delete CSharedMem;
 		CSharedMem = NULL;
+		hWndMSParent = NULL;
+		lpDatMouse = NULL;
 	}
 	return FALSE;
 }
@@ -75,6 +77,8 @@ DLLEXPORT BOOL __stdcall bMouseHookUnset32()
 		}
 		delete CSharedMem;
 		CSharedMem = NULL;
+		hWndMSParent = NULL;
+		lpDatMouse = NULL;
 	}
 	return bRet;
 }

Binary files /dev/null and b/FlushMouse_x64.msi differ

--- a/MiscLIB/CRegistry.cpp
+++ b/MiscLIB/CRegistry.cpp
@@ -40,7 +40,7 @@ BOOL		CRegistry::bGetSetRegValueDWORD(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szV
 	DWORD	dwDisposition = 0;
 	DWORD	dwLen = sizeof(DWORD);
 	DWORD	dwData = dwInitialData;
-	if ((lStatus = RegCreateKeyEx(hKey, lpszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKeySub, &dwDisposition)) == ERROR_SUCCESS) {
+	if ((lStatus = RegCreateKeyEx(hKey, lpszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS | KEY_WOW64_64KEY, NULL, &hKeySub, &dwDisposition)) == ERROR_SUCCESS) {
 		if (dwDisposition == KEY_QUERY_VALUE) {
 			if ((lStatus = RegSetValueEx(hKeySub, szValue, NULL, REG_DWORD, reinterpret_cast<BYTE*>(&dwData), dwLen)) == ERROR_SUCCESS) {
 				bRet = TRUE;
@@ -72,8 +72,33 @@ BOOL		CRegistry::bReadRegValueDWORD(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szVal
 	BOOL	bRet = FALSE;
 	DWORD	dwData = 0;
 	DWORD	dwLen = sizeof(DWORD);
-	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_READ, &hkResult)) == ERROR_SUCCESS) {
-		if ((lStatus = RegGetValue(hKey, lpszSubKey, szValue, RRF_RT_REG_DWORD, NULL, &dwData, &dwLen)) == ERROR_SUCCESS) {
+	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_READ | KEY_WOW64_64KEY, &hkResult)) == ERROR_SUCCESS) {
+		if ((lStatus = RegGetValue(hKey, lpszSubKey, szValue, RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY, NULL, &dwData, &dwLen)) == ERROR_SUCCESS) {
+			bRet = TRUE;
+		}
+		else {
+			if (lStatus == ERROR_FILE_NOT_FOUND) {
+				bRet = FALSE;
+			}
+		}
+		RegCloseKey(hkResult);
+	}
+	*lpdwData = dwData;
+	return	bRet;
+}
+
+//
+// bReadSystemRegValueDWORD()
+//
+BOOL		CRegistry::bReadSystemRegValueDWORD(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValue, LPDWORD lpdwData)
+{
+	LSTATUS	lStatus = 0;
+	HKEY	hkResult = 0;
+	BOOL	bRet = FALSE;
+	DWORD	dwData = 0;
+	DWORD	dwLen = sizeof(DWORD);
+	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_READ | KEY_WOW64_64KEY, &hkResult)) == ERROR_SUCCESS) {
+		if ((lStatus = RegGetValue(hKey, lpszSubKey, szValue, RRF_RT_REG_DWORD | RRF_SUBKEY_WOW6464KEY, NULL, &dwData, &dwLen)) == ERROR_SUCCESS) {
 			bRet = TRUE;
 		}
 		else {
@@ -96,7 +121,7 @@ BOOL		CRegistry::bSetRegValueDWORD(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValu
 	HKEY	hKeySub = NULL;
 	BOOL	bRet = FALSE;
 	DWORD	dwDisposition = 0;
-	if ((lStatus = RegCreateKeyEx(hKey, lpszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKeySub, &dwDisposition)) == ERROR_SUCCESS) {
+	if ((lStatus = RegCreateKeyEx(hKey, lpszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS | KEY_WOW64_64KEY, NULL, &hKeySub, &dwDisposition)) == ERROR_SUCCESS) {
 		DWORD	dwLen = sizeof(DWORD);
 		if ((lStatus = RegSetValueEx(hKeySub, szValue, NULL, REG_DWORD, reinterpret_cast<BYTE*>(&dwData), dwLen)) == ERROR_SUCCESS) {
 			bRet = TRUE;
@@ -149,7 +174,7 @@ BOOL		CRegistry::bReadRegValueString(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szVa
 	LSTATUS	lStatus = 0;
 	HKEY	hKeySub = NULL;
 	BOOL	bRet = FALSE;
-	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_READ, &hKeySub)) == ERROR_SUCCESS) {
+	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_READ | KEY_WOW64_64KEY, &hKeySub)) == ERROR_SUCCESS) {
 		DWORD	dwLen = 0;
 		if ((lStatus = RegQueryValueEx(hKeySub, szValue, NULL, NULL, NULL, &dwLen)) == ERROR_SUCCESS) {
 			if ((dwLen <= (_MAX_PATH * sizeof(TCHAR)) && (dwLen <= dwDataSize))) {
@@ -172,7 +197,7 @@ BOOL		CRegistry::bGetSetRegValueString(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR sz
 	LSTATUS	lStatus = 0;
 	HKEY	hKeySub = NULL;
 	BOOL	bRet = FALSE;
-	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_READ, &hKeySub)) == ERROR_SUCCESS) {
+	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_READ | KEY_WOW64_64KEY, &hKeySub)) == ERROR_SUCCESS) {
 		DWORD	dwLen = 0;
 		if ((lStatus = RegQueryValueEx(hKeySub, szValue, NULL, NULL, NULL, &dwLen)) == ERROR_SUCCESS) {
 			if ((dwLen <= (_MAX_PATH * sizeof(TCHAR)) && (dwLen <= dwDataSize))) {
@@ -196,7 +221,7 @@ BOOL		CRegistry::bSetRegValueString(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szVal
 	HKEY	hKeySub = NULL;
 	BOOL	bRet = FALSE;
 	DWORD	dwDisposition = 0;
-	if ((lStatus = RegCreateKeyEx(hKey, lpszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKeySub, &dwDisposition)) == ERROR_SUCCESS) {
+	if ((lStatus = RegCreateKeyEx(hKey, lpszSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS | KEY_WOW64_64KEY, NULL, &hKeySub, &dwDisposition)) == ERROR_SUCCESS) {
 		if (dwDataSize <= _MAX_PATH) {
 			if ((lStatus = RegSetValueEx(hKeySub, szValue, NULL, REG_SZ, (LPBYTE)&szData, dwDataSize)) == ERROR_SUCCESS) {
 				bRet = TRUE;
@@ -215,7 +240,7 @@ BOOL		CRegistry::bDeleteRegValue(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValue)
 	LSTATUS	lStatus = 0;
 	HKEY	hKeySub = NULL;
 	BOOL	bRet = FALSE;
-	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_ALL_ACCESS, &hKeySub)) == ERROR_SUCCESS) {
+	if ((lStatus = RegOpenKeyEx(hKey, lpszSubKey, 0, KEY_ALL_ACCESS | KEY_WOW64_64KEY, &hKeySub)) == ERROR_SUCCESS) {
 		if ((lStatus = RegDeleteValue(hKeySub, szValue)) == ERROR_SUCCESS) {
 			bRet = TRUE;
 		}

--- a/MiscLIB/CRegistry.h
+++ b/MiscLIB/CRegistry.h
@@ -30,6 +30,7 @@ public:
 	BOOL		bSetRegValueString(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValue, LPTSTR szData, DWORD dwDataSize);
 
 	BOOL		bReadRegValueDWORD(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValue, LPDWORD lpdwData);
+	BOOL		bReadSystemRegValueDWORD(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValue, LPDWORD lpdwData);
 	BOOL		bReadRegValueDWORDasBOOL(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValue, LPBOOL lpbData);
 	BOOL		bReadRegValueString(HKEY hKey, LPCTSTR lpszSubKey, LPCTSTR szValue, LPTSTR szData, DWORD dwDataSize);
 

--- a/MiscLIB/CSharedMemory.cpp
+++ b/MiscLIB/CSharedMemory.cpp
@@ -33,7 +33,7 @@ CSharedMemory::CSharedMemory(LPCTSTR szSharedMemoryName, DWORD dwDataSize)
 {
 
 	size_t	size = wcsnlen_s(szSharedMemoryName, MAX_LOADSTRING);
-	lpszSharedMemoryName = new TCHAR[size + 1];
+	if ((lpszSharedMemoryName = new TCHAR[size + 1]) == NULL)	return;
 	ZeroMemory(lpszSharedMemoryName, sizeof(TCHAR) * (size + 1));
 	_tcsncpy_s(lpszSharedMemoryName, size + 1, szSharedMemoryName, _TRUNCATE);
 	dwDataByteSize = dwDataSize;
@@ -65,7 +65,7 @@ CSharedMemory::~CSharedMemory()
 			hSharedMem = NULL;
 		}
 	}
-	delete[]	lpszSharedMemoryName;
+	if (lpszSharedMemoryName != NULL)	delete[]	lpszSharedMemoryName;
 	lpszSharedMemoryName = NULL;
 	dwDataByteSize = 0;
 	return;

--- a/MiscLIB/CThread.cpp
+++ b/MiscLIB/CThread.cpp
@@ -12,14 +12,12 @@
 #include "CThread.h"
 
 //
-// CThred::
+// CThread::
 //
 CThread::CThread()
 {
-	lpstThreadData = new THREAD_DATA[sizeof(THREAD_DATA)];
-	ZeroMemory(lpstThreadData, sizeof(THREAD_DATA));
-	lpstThreadData->lpstSA = new SECURITY_ATTRIBUTES[sizeof(SECURITY_ATTRIBUTES)];
-	ZeroMemory(lpstThreadData->lpstSA, sizeof(SECURITY_ATTRIBUTES));
+	if ((lpstThreadData = new THREAD_DATA[sizeof(THREAD_DATA)]) != NULL)	ZeroMemory(lpstThreadData, sizeof(THREAD_DATA));
+	if ((lpstThreadData->lpstSA = new SECURITY_ATTRIBUTES[sizeof(SECURITY_ATTRIBUTES)]) != NULL)	ZeroMemory(lpstThreadData->lpstSA, sizeof(SECURITY_ATTRIBUTES));
 
 	lpstThreadData->lpstSA->nLength = sizeof(SECURITY_ATTRIBUTES);
 	lpstThreadData->lpstSA->lpSecurityDescriptor = NULL;
@@ -39,7 +37,7 @@ CThread::~CThread()
 //
 BOOL 	CThread::bRegister(LPCTSTR lpszThreadName, DWORD dwThreadID, LPTHREAD_START_ROUTINE lpbCallbackRoutine, LPVOID lParamOption, DWORD dwSleepTime)
 {
-	if (lpstThreadData == NULL)	return FALSE;
+	if ((lpstThreadData == NULL) || (lpstThreadData->lpstSA == NULL))	return FALSE;
 	lpstThreadData->lpszThreadName = lpszThreadName;				lpstThreadData->dwThreadID = dwThreadID;
 	lpstThreadData->lpbCallbackRoutine = lpbCallbackRoutine;		lpstThreadData->lParamOption = lParamOption;
 	lpstThreadData->dwSleepTime = dwSleepTime;						lpstThreadData->bThreadSentinel = TRUE;
@@ -57,9 +55,7 @@ BOOL 	CThread::bRegister(LPCTSTR lpszThreadName, DWORD dwThreadID, LPTHREAD_STAR
 //
 BOOL 	CThread::bStart()
 {
-	if ((lpstThreadData == NULL) || (lpstThreadData->hThread == NULL)) {
-		return FALSE;
-	}
+	if ((lpstThreadData == NULL) || (lpstThreadData->lpstSA == NULL) || (lpstThreadData->hThread == NULL))	return FALSE;
 	lpstThreadData->bThreadSentinel = TRUE;
 	DWORD	dwExitCode = 0;
 	if (GetExitCodeThread((HANDLE)lpstThreadData->hThread, &dwExitCode)) {
@@ -89,29 +85,27 @@ BOOL 	CThread::bStart()
 VOID 	CThread::vUnregister()
 {
 #define	TIMEOUT	1000 
-	if ((lpstThreadData == NULL) || (lpstThreadData->hThread == NULL))	return;
+	if ((lpstThreadData == NULL) || (lpstThreadData->lpstSA == NULL) || (lpstThreadData->hEvent == NULL) || (lpstThreadData->hThread == NULL))	return;
 	lpstThreadData->bThreadSentinel = FALSE;
 	DWORD	dwExitCode = 0;
 	if (GetExitCodeThread((HANDLE)lpstThreadData->hThread, &dwExitCode)) {
 		if (dwExitCode == STILL_ACTIVE) {
 			if (ResumeThread(lpstThreadData->hThread) != -1) {
-				if (lpstThreadData->hEvent != NULL) {
-					if (SetEvent(lpstThreadData->hEvent)) {
-						DWORD	dwRet = WaitForSingleObject((HANDLE)lpstThreadData->hThread, TIMEOUT);
-						switch (dwRet) {
-						case WAIT_OBJECT_0:
-							break;
-						case WAIT_ABANDONED:
-						case WAIT_TIMEOUT:
-						case WAIT_FAILED:
-						default:
+				if (SetEvent(lpstThreadData->hEvent)) {
+					DWORD	dwRet = WaitForSingleObject((HANDLE)lpstThreadData->hThread, TIMEOUT);
+					switch (dwRet) {
+					case WAIT_OBJECT_0:
+						break;
+					case WAIT_ABANDONED:
+					case WAIT_TIMEOUT:
+					case WAIT_FAILED:
+					default:
 #pragma warning(push)
 #pragma warning(disable : 6258)
 						if (!TerminateThread(lpstThreadData->hThread, 2)) {
 						}
 #pragma warning(pop)
 						break;
-						}
 					}
 				}
 			}
@@ -129,7 +123,7 @@ unsigned __stdcall	CThread::uThreadProc(void* pArguments)
 {
 	LPTHREAD_DATA lpstThreadData = (LPTHREAD_DATA)pArguments;
 	do {
-		if ((lpstThreadData != NULL) && (lpstThreadData->hEvent != NULL) && (lpstThreadData->hThread != NULL)) {
+		if ((lpstThreadData != NULL) && (lpstThreadData->lpstSA != NULL) && (lpstThreadData->hEvent != NULL) && (lpstThreadData->hThread != NULL)) {
 			DWORD	dwRet = WaitForSingleObject(lpstThreadData->hEvent, INFINITE);
 			switch (dwRet) {
 			case WAIT_OBJECT_0:	

--- a/OSDN Wiki/osdn.txt	
+++ b/OSDN Wiki/osdn.txt	
@@ -2,22 +2,24 @@
 
 [[RepositoryInfo]]
 
-||[[Thumb(FlushMouse.png, size=48x48)]]||'''[[ProjectDescription]](タスクトレイに常駐して、マウスカーソルへIMEモードの表示をするユーティリティです)[[BR]]FlushMouse is a software developed by JeffyTS . It is a mouse gesture tool that allows you to perform various operations by drawing gestures with your mouse .  (by Bing ChatGPT)'''||
+||[[Thumb(FlushMouse.png, size=48x48)]]||'''[[ProjectDescription]](タスクトレイに常駐して、マウスカーソルへIMEモードの表示をするユーティリティです)[[BR]]FlushMouse is a software developed by JeffyTS . It is a mouse gesture tool that allows you to perform various operations by drawing gestures with your mouse .  (by Bing)'''||
 
 [[BR]]
-2023/05/25[[BR]]
-　　　Version 0.9.4.14 をリリースしました[[BR]]
+2023/06/13[[BR]]
+　　　'''Version 1.0.0.1 をリリースしました'''[[BR]]
 [[BR]]
 (主な変更点)[[BR]]
- * 処理のシェイプアップ及び軽微なバグ修正を行いました[[BR]]
+ * 処理のシェイプアップ及びバグ修正を行いました[[BR]]
  * IMEモードの表示の色指定でαチャネルが有効になるようにしてあります(設定画面は作成していません。レジストリを編集できる方は好みの色にしてみてください。ただし、レジストリの編集は十分注意して行ってください)[[BR]]
    * HKEY_CURRENT_USER\Software\JeffyTS\FlushMouse の NearDrawCaretColor と NearDrawMouseColor です。上位バイトから、α B G R の順です[[BR]]
    * αの値は、通常と違って、大きいほうが透明度が高くなります。これは従来と互換性を持たせるためですのでご了承ください。なお、レジストリを変更した方がいたら、お手数をおかけしますが修正をお願いします[[BR]]
    * マウスカーソル右下のモード表示の色は、現状では変更できません。ご了承ください[[BR]]
 [[BR]]
 (今後について)[[BR]]
- * OSDN上ではここまでの機能で開発は終了としたいと考えています(バグ対応は除く)[[BR]]
- * 今後は、プレゼンテーションモードの追加や、マウスカーソルの形状や、表示する内容などをカスタマイズする機能をつけて有償に移行しようと考えています[[BR]]
+ * ~~OSDN上ではここまでの機能で開発は終了としたいと考えています(バグ対応は除く)~~[[BR]]
+ * ~~今後は、プレゼンテーションモードの追加や、マウスカーソルの形状や、表示する内容などをカスタマイズする機能をつけて有償に移行しようと考えています~~[[BR]]
+ * と、上記のように考えていたのですが、この FlushMouse は Microsoft Storeに登録できないやり方を使って処理しているので無理なことが判明しました(フックを使用しいるとどうしてもだめなようです。ただ、SDKなどでだいぶ検証して直させてもらいました)[[BR]]
+ * '''ということで、今後も暇を見つけて、機能向上を目指していきますのでよろしくお願いします'''[[BR]]
 [[BR]]
 ||'''対応OS'''||
 Windows 10 / 11 64bit  (Latest Release Versionで検証しています)[[BR]]

--- a/SetupProject/Product.wxs
+++ b/SetupProject/Product.wxs
@@ -32,14 +32,18 @@
 				 Description="$(var.Description)"
 				 Comments="$(var.Comments)"
 				 Manufacturer="$(var.Manufacturer)" />
+
 		<!-- @@@ for Major Upgrade -->
+		<MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="[ProductName] の新しいバージョンがすでにインストールされています。" />
+		<!-- @@@ for Upgrade -->
+		<Property Id='PREVIOUSVERSIONSINSTALLED' Secure='yes' />
 		<Upgrade Id="{8B8C6810-E467-498D-926C-F4139B2AE8AB}">
-			<UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND'
-					Minimum='$(var.Version)' IncludeMinimum='no' />
-			<UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
-					Minimum='0.3.0' IncludeMinimum='yes'
-					Maximum='$(var.Version)' IncludeMaximum='no' />
+			<!--UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND' Minimum='$(var.Version)' IncludeMinimum='no' /-->
+			<UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND' Minimum='0.0.0.0' IncludeMinimum='yes' Maximum='$(var.Version)' IncludeMaximum='no' />
+			<UpgradeVersion OnlyDetect='yes' Property='SELFFOUND' Minimum='0.0.0.0' IncludeMinimum='yes' Maximum='$(var.Version)' IncludeMaximum='yes' />
+			<UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND' Minimum='$(var.Version)' IncludeMinimum='no' />
 		</Upgrade>
+
 		<!-- Media Template-->
 		<MediaTemplate EmbedCab="yes" />
 
@@ -72,89 +76,129 @@
 		<!-- Condition -->
 		<Condition Message="Windows 10 Anniversary update 以降が必要です"> WindowsBuild &lt; 14390 </Condition>
 		<Condition Message="64bitのWindows 10 Anniversary update 以降が必要です"> NOT (%PROCESSOR_ARCHITECTURE="x86") </Condition>
-		<!-- Verify Dialog for Short cut & Start menu -->
+		<!-- Verify Dialog for Short cut , Start menu & application Launch menu -->
 		<Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT1" Value=" デスクトップにショートカットを作成する" />
 		<Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX1" Value="1" />
 		<Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT2" Value=" スタートメニューに登録する" />
+		<!--Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX2" Value="1" /-->
+		<Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3" Value=" セットアップを終了したら、すぐに $(var.ProductName) を実行する" />
+		<Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3" Value="1" />
+		<!-- Exit Dialog for application Launch -->
 		<!-- Comment out for default Check box off Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX2" Value="2" /-->
 		<!--Property Id="WIXUI_VERIFYDIALOGOPTIONALCOMMENT1" Value=" セットアップが完了したら再起動してください" /-->
 		<!-- Verify Dialog for Uninstall Registry -->
-		<Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3" Value=" $(var.ProductName) の設定情報を削除する" />
+		<Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT4" Value=" $(var.ProductName) の設定情報を削除する" />
+		<!--Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX4" Value="1" /-->
 		<!-- Comment out for default Check box off Property Id="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3" Value="1" /-->
 		<!-- Exit Dialog for application Launch -->
-		<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value=" セットアップを終了したら、すぐに $(var.ProductName) を実行する　　(ただし、全機能を使用するためにはWindowsの再起動が必要です)" />
-		<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" />
+		<!--Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value=" セットアップを終了したら、すぐに $(var.ProductName) を実行する　　(ただし、全機能を使用するためにはWindowsの再起動が必要です)" />
+		<Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOX" Value="1" /-->
 
 		<UI>
 			<!-- WixUtilExtension が必要 -->
 			<!-- Majour Upgrade Dialog-->
 			<Dialog Id="NewerFoundDlg" Width="270" Height="105" 	Title="[ProductName] セットアップ" NoMinimize="yes">
-				<Control Id="MessageText" Type="Text"
-						 X="48" Y="15" Width="205" Height="60" TabSkip="no"
-						 Text="[ProductName] の新しいバージョンがすでにインストールされています。" />
-				<Control Id="Y" Type="PushButton"
-						 X="200" Y="80" Width="56" Height="17" TabSkip="yes"
-						 Text="!(loc.WixUIOK)">
+				<Control Id="MessageText" Type="Text" X="48" Y="15" Width="205" Height="60" TabSkip="no" Text="[ProductName] の新しいバージョンがすでにインストールされています。" />
+				<Control Id="Y" Type="PushButton" X="200" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIOK)">
+					<Publish Event="EndDialog" Value="Return">1</Publish>
+				</Control>
+				<Control Id="NewerFoundDlgIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.ErrorDlgErrorIcon)" />
+			</Dialog>
+			<Dialog Id="SelfFoundDlg" Width="270" Height="105" 	Title="[ProductName] セットアップ" NoMinimize="yes">
+				<Control Id="MessageText" Type="Text" X="48" Y="15" Width="205" Height="60" TabSkip="no" Text="[ProductName] の同じバージョンがすでにインストールされています。" />
+				<Control Id="Y" Type="PushButton" X="200" Y="80" Width="56" Height="17" TabSkip="yes" Text="!(loc.WixUIOK)">
 					<Publish Event="EndDialog" Value="Return">1</Publish>
 				</Control>
-				<Control Id="NewerFoundDlgIcon"
-						 Type="Icon" X="15" Y="15" Width="24" Height="24"
-						 ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32"
-						 Text="!(loc.ErrorDlgErrorIcon)" />
+				<Control Id="SeelfFoundDlgIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="!(loc.ErrorDlgErrorIconTooltip)" FixedSize="yes" IconSize="32" Text="!(loc.ErrorDlgErrorIcon)" />
 			</Dialog>
+			<!-- _VerifyReady Dialog for Launch application -->
+			<!--Publish Dialog="_ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3 = 1 and NOT Installed</Publish-->
 			<!-- _VerifyReady Dialog for remove registry, but publish on _ExitDlg-->
-			<Publish Dialog="_ExitDialog" Control="Finish" Event="DoAction" Value="RemoveReg">WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3 = 1 and Installed</Publish>
+			<Publish Dialog="_ExitDialog" Control="Finish" Event="DoAction" Value="RemoveReg">WIXUI_VERIFYDIALOGOPTIONALCHECKBOX4 = 1 and Installed</Publish>
 			<!-- _Exit Dialog for Launch application -->
-			<Publish Dialog="_ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+			<!--Publish Dialog="_ExitDialog" Control="Finish" Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish-->
 		</UI>
 		<!-- Newer Version Found -->
 		<InstallUISequence>
 			<Show Dialog='NewerFoundDlg' After='FindRelatedProducts'>NEWERFOUND</Show>
-			<Custom Action='WixExitEarlyWithSuccess' After='NewerFoundDlg'>NEWERFOUND</Custom>
+			<Show Dialog='SelfFoundDlg' After='FindRelatedProducts'>SELFFOUND</Show>
 		</InstallUISequence>
 		<InstallExecuteSequence>
-			<Custom Action='WixExitEarlyWithSuccess' After='FindRelatedProducts'>NEWERFOUND</Custom>
-			<RemoveExistingProducts After="InstallFinalize" />
-		</InstallExecuteSequence>
-		<!--CustomAction Id='AlreadyUpdated' Error='[ProductName] は既に、このバージョンに更新されています。' /-->
-		<!--CustomAction Id='NoDowngrade'    Error='[ProductName] の新しいバージョンが既にインストールされています。' /-->
-		<InstallExecuteSequence>
-			<Custom Action="TaskKill" Before="FindRelatedProducts">Installed</Custom>
+			<Custom Action="QuitApplication" Before="FindRelatedProducts"></Custom>
+			<!--Custom Action='WixExitEarlyWithSuccess' After='NewerFoundDlg'>NEWERFOUND</Custom-->
+			<!--Custom Action='WixExitEarlyWithSuccess' After='SelfFoundDlg'>SELFFOUND</Custom-->
+			<!--Custom Action='WixExitEarlyWithSuccess' After='FindRelatedProducts'>NEWERFOUND</Custom-->
+			<Custom Action='AlreadyUpdated' After='FindRelatedProducts'>SELFFOUND</Custom>
+			<Custom Action='NoDowngrade' After='FindRelatedProducts'>NEWERFOUND</Custom>
+			<!--RemoveExistingProducts After="InstallFinalize" /-->
+			<!--Custom Action="TaskKill" After="FindRelatedProducts">Installed</Custom-->
+			<Custom Action="QuitApplication2" After="InstallInitialize">Installed</Custom>
+			<!--Custom Action='QuitApplication4' After='InstallInitialize'>Installed</Custom-->
 			<Custom Action='UnregisterTaskScheduler' After='InstallInitialize'>Installed</Custom>
-			<Custom Action='UnregisterEventlog' After='InstallInitialize'>Installed</Custom>
-			<Custom Action='TaskKill_force' After='InstallInitialize'>Installed</Custom>
-			<Custom Action='RegisterTaskScheduler' Before='InstallFinalize'>NOT Installed</Custom>
-			<Custom Action='RegisterEventlog' Before='InstallFinalize'>NOT Installed</Custom>
-			<Custom Action='RemoveReg' After='RemoveExistingProducts'>WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3 = 1 and Installed</Custom>
+			<Custom Action='UnregisterTaskScheduler2' After='InstallInitialize'>Installed</Custom>
+			<!--Custom Action='UnregisterEventlog' After='InstallInitialize'>Installed</Custom-->
+			<!--Custom Action="QuitApplication" After="InstallInitialize">Installed</Custom-->
+			<!--Custom Action="TaskKill" After="InstallInitialize">Installed</Custom-->
+			<!--Custom Action='TaskKill_force' After='InstallInitialize'>Installed</Custom-->
+
+			<Custom Action='RegisterTaskScheduler' Before='InstallFinalize'>(NOT Installed) or REINSTALL</Custom>
+			<Custom Action='RegisterTaskScheduler2' Before='InstallFinalize'>(NOT Installed) or REINSTALL</Custom>
+			<Custom Action='LaunchApplication' After='InstallFinalize'>(WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3 = 1 and NOT Installed) or (WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3 = 1 and REINSTALL)</Custom>
+			<!--Custom Action='LaunchApplication' Before='InstallFinalize'>NOT Installed</Custom-->
+			<!--Custom Action='RegisterEventlog' Before='InstallFinalize'>NOT Installed</Custom-->
+
+			<!--Custom Action="QuitApplication3" Before="RemoveExistingProducts">Installed</Custom-->
+			<Custom Action='RemoveReg' After='RemoveExistingProducts'>WIXUI_VERIFYDIALOGOPTIONALCHECKBOX4 = 1 and Installed</Custom>
 		</InstallExecuteSequence>
 
+		<!-- Version Check -->
+		<CustomAction Id='AlreadyUpdated' Error='[ProductName] は既に、このバージョンに更新されています。' />
+		<CustomAction Id='NoDowngrade'    Error='[ProductName] の新しいバージョンが既にインストールされています。' />
 		<!-- Kill Own Application -->
 		<Binary Id="TASKKILL" SourceFile="C:\Windows\System32\taskkill.exe"> </Binary>
-		<CustomAction Id="TaskKill" BinaryKey="TASKKILL" Execute="immediate" Return="ignore" Impersonate="yes"
+		<CustomAction Id="TaskKill" BinaryKey="TASKKILL" Execute="deferred" Return="ignore" Impersonate="no"
 								ExeCommand=" /IM &quot;$(var.MainExeFileName)&quot;" />
 		<CustomAction Id="TaskKill_force" BinaryKey="TASKKILL" Execute="deferred" Return="asyncWait" Impersonate="no"
 												ExeCommand=" /F /IM &quot;$(var.MainExeFileName)&quot; /IM &quot;$(var.ProductName)32.exe&quot;" />
-		<!-- Application Launch on Exit Dialog -->
-		<CustomAction Id="LaunchApplication" Directory="INSTALLFOLDER"
-								ExeCommand="[INSTALLFOLDER]$(var.MainExeFileName)" Return="asyncNoWait" />
+		<!-- Quit Own Application -->
+		<Binary Id="EVENTCREATE" SourceFile="C:\Windows\System32\eventcreate.exe"> </Binary>
+		<CustomAction Id="QuitApplication" BinaryKey="EVENTCREATE" Execute="firstSequence" Return="ignore" Impersonate="yes"
+								ExeCommand=" /T SUCCESS /ID 7 /L Application /SO FlushMouse /D &quot;Quit FlushMouse(Installer).&quot;" />
+		<CustomAction Id="QuitApplication2" BinaryKey="EVENTCREATE" Execute="firstSequence" Return="ignore" Impersonate="yes"
+								ExeCommand=" /T SUCCESS /ID 7 /L Application /SO FlushMouse /D &quot;Quit FlushMouse(Installer).&quot;" />
+		<CustomAction Id="QuitApplication3" BinaryKey="EVENTCREATE" Execute="firstSequence" Return="ignore" Impersonate="yes"
+								ExeCommand=" /T SUCCESS /ID 7 /L Application /SO FlushMouse /D &quot;Quit FlushMouse(Installer).&quot;" />
+		<!--Binary Id="QUITApplication" SourceFile="C:\Program Files\JeffyTS\FlushMouse\FlushMouse.exe"> </Binary>
+		<CustomAction Id="QuitApplication4" BinaryKey="QUITApplication" Execute="deferred" Return="ignore" Impersonate="no"
+								ExeCommand=" /quit" /-->
+		<!-- Application Launch -->
+		<!--CustomAction Id="LaunchApplication" Directory="INSTALLFOLDER"
+								ExeCommand="[INSTALLFOLDER]$(var.MainExeFileName)" Return="asyncNoWait" /-->
+		<CustomAction Id="LaunchApplication" BinaryKey="EVENTCREATE" Execute="immediate" Return="ignore" Impersonate="yes"
+								ExeCommand=" /T SUCCESS /ID 6 /L Application /SO FlushMouse /D &quot;Start FlushMouse(Installer).&quot;" />
+
 		<!-- Register TaskScheduler -->
 		<Binary Id="REGISTERTaskScheduler" SourceFile="C:\Windows\System32\schtasks.exe"> </Binary>
 		<CustomAction Id="RegisterTaskScheduler" BinaryKey="REGISTERTaskScheduler" Execute="deferred" Return="asyncWait" Impersonate="no"
 								ExeCommand=" /Create /F /TN &quot;$(var.ProductName)&quot; /XML &quot;[INSTALLFOLDER]Register_TaskScheduler.xml&quot;" />
+		<CustomAction Id="RegisterTaskScheduler2" BinaryKey="REGISTERTaskScheduler" Execute="deferred" Return="asyncWait" Impersonate="no"
+								ExeCommand=" /Create /F /TN &quot;$(var.ProductName)Installer&quot; /XML &quot;[INSTALLFOLDER]Register_TaskScheduler2.xml&quot;" />
 		<!-- Unregister TaskScheduler -->
 		<Binary Id="UNREGISTERTaskScheduler" SourceFile="C:\Windows\System32\schtasks.exe"> </Binary>
 		<CustomAction Id="UnregisterTaskScheduler" BinaryKey="UNREGISTERTaskScheduler" Execute="deferred" Return="asyncWait" Impersonate="no"
 								ExeCommand=" /Delete /F /TN &quot;$(var.ProductName)&quot;" />
+		<CustomAction Id="UnregisterTaskScheduler2" BinaryKey="UNREGISTERTaskScheduler" Execute="deferred" Return="asyncWait" Impersonate="no"
+								ExeCommand=" /Delete /F /TN &quot;$(var.ProductName)Installer&quot;" />
 		<!-- Register EventLog -->
-		<Binary Id="REGISTEREventlog" SourceFile="C:\Windows\System32\reg.exe"> </Binary>
+		<!--Binary Id="REGISTEREventlog" SourceFile="C:\Windows\System32\reg.exe"> </Binary>
 		<CustomAction Id="RegisterEventlog" BinaryKey="REGISTEREventlog" Execute="deferred" Return="asyncWait" Impersonate="no"
-								ExeCommand=" IMPORT &quot;[INSTALLFOLDER]Register_Eventlog.reg&quot; /reg:64" />
+								ExeCommand=" IMPORT &quot;[INSTALLFOLDER]Register_Eventlog.reg&quot; /reg:64" /-->
 		<!-- Unegister EventLog -->
-		<Binary Id="UNREGISTEREventlog" SourceFile="C:\Windows\System32\reg.exe"> </Binary>
+		<!--Binary Id="UNREGISTEREventlog" SourceFile="C:\Windows\System32\reg.exe"> </Binary-->
 		<!--CustomAction Id="UnregisterEventlog" BinaryKey="UNREGISTEREventlog" Execute="deferred" Return="asyncWait" Impersonate="no"
 								ExeCommand=" DELETE HKLM\System\CurrentControlSet\Services\Eventlog\Application\&quot;$(var.ProductName)&quot; /f /va" /-->
-		<CustomAction Id="UnregisterEventlog" BinaryKey="UNREGISTEREventlog" Execute="deferred" Return="asyncWait" Impersonate="no"
-								ExeCommand=" DELETE HKLM\System\CurrentControlSet\Services\Eventlog\Application\FlushMouse /f" />
+		<!--CustomAction Id="UnregisterEventlog" BinaryKey="UNREGISTEREventlog" Execute="deferred" Return="asyncWait" Impersonate="no"
+								ExeCommand=" DELETE HKLM\System\CurrentControlSet\Services\Eventlog\Application\FlushMouse /f" /-->
 		<!-- Remove Registry in Uninstall -->
 		<Binary Id="REMOVEREG" SourceFile="C:\Windows\System32\reg.exe"> </Binary>
 		<CustomAction Id="RemoveReg" BinaryKey="REMOVEREG" Execute="immediate" Return="asyncNoWait" Impersonate="yes"
@@ -194,6 +238,7 @@
 		<Feature Id="EssentialFeature" Level="1">
 			<ComponentGroupRef Id="ProductComponents" />
 			<!--ComponentRef Id="AutoStartRegistry" /-->
+			<ComponentRef Id="EventLogRegistry" />
 			<ComponentRef Id="Registries" />
 			<ComponentRef Id="Shortcuts" />
 			<ComponentRef Id="DesktopShortcut" />
@@ -222,6 +267,9 @@
 			<Component Id="Register_TaskScheduler.xml" Guid="{3FA0C6AB-6E9C-4B55-BE44-A02A3B6A0C3E}">
 				<File Id="Register_TaskScheduler.xml" Name="Register_TaskScheduler.xml" Source="$(var.TargetDir04)Register_TaskScheduler.xml" />
 			</Component>
+			<Component Id="Register_TaskScheduler2.xml" Guid="{17BD4844-87C4-4A06-BBF3-86C94D22C5DC}">
+				<File Id="Register_TaskScheduler2.xml" Name="Register_TaskScheduler2.xml" Source="$(var.TargetDir04)Register_TaskScheduler2.xml" />
+			</Component>
 			<Component Id="License.rtf" Guid="{E6E55A92-6BE8-4612-8172-0BC04811D6E1}">
 				<File Id="License.rtf" Name="License.rtf" Source="$(var.TargetDir04)License.rtf" />
 			</Component>
@@ -240,10 +288,18 @@
 			<!-- Registries -->
 			<!-- Auto start by user registry -->
 			<!--Component Id="AutoStartRegistry" Guid="{AE2203C7-DFFF-40AA-873F-39C206583E9C}"-->
-				<!--RegistryKey Root="HKCU" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="no"-->
-					<!--RegistryValue Type="string" Name="$(var.ProductName)" Value="[INSTALLFOLDER]$(var.MainExeFileName)" KeyPath="yes" /-->
-				<!--/RegistryKey-->
+			<!--RegistryKey Root="HKCU" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Run" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="no"-->
+			<!--RegistryValue Type="string" Name="$(var.ProductName)" Value="[INSTALLFOLDER]$(var.MainExeFileName)" KeyPath="yes" /-->
+			<!--/RegistryKey-->
 			<!--/Component-->
+			<!-- EventLog registry -->
+			<Component Id="EventLogRegistry" Guid="{B5A28410-C07F-43BD-BA17-D15F0331986B}">
+				<RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\$(var.ProductName)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
+					<RegistryValue Type="integer" Name="CustomSource" Value="00000001"/>
+					<RegistryValue Type="integer" Name="TypesSupported" Value="00000007"/>
+					<RegistryValue Type="expandable" Name="EventMessageFile" Value="%ProgramFiles%\$(var.Manufacturer)\$(var.ProductName)\FlushMouseDLL.dll"/>
+				</RegistryKey>
+			</Component>
 			<!-- App registries -->
 			<Component Id="Registries" Guid="{05B14589-18DE-4AE3-B6D8-EB65FA40B46D}">
 				<RegistryKey Root="HKLM" Key="$(var.AppRegKey)" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="no">

--- a/SetupProject/Readme.txt
+++ b/SetupProject/Readme.txt
@@ -9,6 +9,7 @@
             FlushMouseDLL32.dll
             Register_Eventlog.reg
             Register_TaskScheduler.xml
+            Register_TaskScheduler2.xml
             License.rtf
             Readme.txt
             

Binary files a/SetupProject/Register_TaskScheduler.xml and b/SetupProject/Register_TaskScheduler.xml differ

Binary files /dev/null and b/SetupProject/Register_TaskScheduler2.xml differ

--- a/SetupProject/SetupProject.wixproj
+++ b/SetupProject/SetupProject.wixproj
@@ -20,6 +20,8 @@
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
     <CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
+    <SuppressValidation>False</SuppressValidation>
+    <SuppressIces>ICE61</SuppressIces>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DefineConstants>Debug</DefineConstants>
@@ -45,6 +47,7 @@
     <Content Include="Readme.txt" />
     <Content Include="Register_Eventlog.reg" />
     <Content Include="Register_TaskScheduler.xml" />
+    <Content Include="Register_TaskScheduler2.xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FlushMouse32\FlushMouse32.vcxproj">
@@ -90,6 +93,9 @@
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
+  <PropertyGroup>
+    <PostBuildEvent>copy "$(TargetDir)ja-JP\$(TargetFileName)" "$(SolutionDir)$(TargetFileName)"</PostBuildEvent>
+  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.

--- a/SetupProject/_ExitDialog.wxs
+++ b/SetupProject/_ExitDialog.wxs
@@ -5,27 +5,27 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <UI>
-            <Dialog Id="_ExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
-                <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
-                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
-                <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
-                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-                <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
-                <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
-                <Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
+			<Dialog Id="_ExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
+				<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
+				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
+				<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
+				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+				<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
+				<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
+				<!--Control Id="OptionalText" Type="Text" X="135" Y="110" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Hidden="yes" Text="[WIXUI_EXITDIALOGOPTIONALTEXT]">
                     <Condition Action="show">WIXUI_EXITDIALOGOPTIONALTEXT AND NOT Installed</Condition>
-                </Control>
+                </Control-->
 				<!--Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="190" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]"-->
 				<!--Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="100" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
 						<Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
                 </Control-->
-				<Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="100" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
+				<!--Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="100" Width="220" Height="40" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
 						<Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT Installed</Condition>
-                </Control>
+                </Control-->
 			</Dialog>
 
-            <InstallUISequence>
+			<InstallUISequence>
                 <Show Dialog="_ExitDialog" OnExit="success" Overridable="yes" />
             </InstallUISequence>
 

--- a/SetupProject/_VerifyReadyDlg.wxs
+++ b/SetupProject/_VerifyReadyDlg.wxs
@@ -7,19 +7,22 @@
         <UI>
             <Dialog Id="_VerifyReadyDlg" Width="370" Height="270" Title="!(loc.VerifyReadyDlg_Title)" TrackDiskSpace="yes">
                 <!--@@@ start-->
-                <!-- Install -->
-				<Control Id="OptionalCheckBox1" Type="CheckBox" X="80" Y="150" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX1" CheckBoxValue="1" Text="[WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT1]">
-					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3 AND NOT Installed</Condition>
+				<!-- Install -->
+				<Control Id="OptionalCheckBox1" Type="CheckBox" X="80" Y="145" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX1" CheckBoxValue="1" Text="[WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT1]">
+					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT1 AND NOT Installed</Condition>
+				</Control>
+				<Control Id="OptionalCheckBox2" Type="CheckBox" X="80" Y="160" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX2" CheckBoxValue="1" Text="[WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT2]">
+					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT2 AND NOT Installed</Condition>
 				</Control>
-				<Control Id="OptionalCheckBox2" Type="CheckBox" X="80" Y="170" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX2" CheckBoxValue="1" Text="[WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT2]">
+				<Control Id="OptionalCheckBox3" Type="CheckBox" X="80" Y="175" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3" CheckBoxValue="1" Text="[WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3]">
 					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3 AND NOT Installed</Condition>
 				</Control>
 				<Control Id="Comment1" Type="Text" X="80" Y="190" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCOMMENT1" Text="[WIXUI_VERIFYDIALOGOPTIONALCOMMENT1]">
-					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3 AND NOT Installed</Condition>
+					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCOMMENT1 AND NOT Installed</Condition>
 				</Control>
 				<!-- Uninstall -->
-				<Control Id="OptionalCheckBox3" Type="CheckBox" X="80" Y="170" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX3" CheckBoxValue="1" Text="[WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3]">
-					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT3 AND Installed</Condition>
+				<Control Id="OptionalCheckBox4" Type="CheckBox" X="80" Y="175" Width="220" Height="20" Hidden="yes" Property="WIXUI_VERIFYDIALOGOPTIONALCHECKBOX4" CheckBoxValue="1" Text="[WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT4]">
+					<Condition Action="show">WIXUI_VERIFYDIALOGOPTIONALCHECKBOXTEXT4 AND Installed</Condition>
 				</Control>
 				<!--@@@ end-->
 				<Control Id="Install" Type="PushButton" ElevationShield="yes" X="212" Y="243" Width="80" Height="17" Default="yes" Hidden="yes" Disabled="yes" Text="!(loc.VerifyReadyDlgInstall)">

--- a/version.h
+++ b/version.h
@@ -6,13 +6,13 @@
 // #0000	2023/03/17  JeffyTS  	New edit.
 //
 
-#define MAJOR_VERSION		0
-#define MINOR_VERSION		9
-#define BUILD_VERSION		4
-#define REVISON_VERSION		14
+#define MAJOR_VERSION		1
+#define MINOR_VERSION		0
+#define BUILD_VERSION		0
+#define REVISON_VERSION		1
 
-#define FILE_VERSION_STRING		VALUE	"FileVersion",		"0.9.4.14"
-#define PRODUCT_VERSION_STRING	VALUE	"ProductVersion",	"0.9.4.14"
+#define FILE_VERSION_STRING		VALUE	"FileVersion",		"1.0.0.1"
+#define PRODUCT_VERSION_STRING	VALUE	"ProductVersion",	"1.0.0.1"
 
 #define FILE_VERSION		MAJOR_VERSION, MINOR_VERSION, BUILD_VERSION, REVISON_VERSION
 #define PRODUCT_VERSION		MAJOR_VERSION, MINOR_VERSION, BUILD_VERSION, REVISON_VERSION

--- a/version.wxi
+++ b/version.wxi
@@ -1,5 +1,5 @@
 <Include>
 	<!-- for wix Setup Project -->
-	<?define Version = "0.9.4.14" ?>
+	<?define Version = "1.0.0.1" ?>
 </Include>