Commit: 26bbcab399b63f3129c38ae3752f559fa1326b93 - FlushMouse (git)

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

Commit MetaInfo

• Révision: 26bbcab399b63f3129c38ae3752f559fa1326b93 (tree)
• l'heure: 2023-07-05 13:20:41
• Auteur: JeffyTS <jeffyts@outl...>
• Commiter: JeffyTS

Message de Log

1.1.1.7

Change Summary

• modified: FlushMouse/CommonDef.h
• modified: FlushMouse/Cursor.cpp
• modified: FlushMouse/Cursor.h
• modified: FlushMouse/FlushMouse.cpp
• modified: FlushMouse/FlushMouse.h
• modified: FlushMouse/FlushMouse.vcxproj
• modified: FlushMouse/FlushMouse.vcxproj.filters
• modified: FlushMouse/FlushMouseLIB.cpp
• modified: FlushMouse/FlushMouseLIB.h
• modified: FlushMouse/FlushMouseSub.cpp
• modified: FlushMouse/FlushMouseSub.h
• add: FlushMouse/Ime.cpp
• add: FlushMouse/Ime.h
• modified: FlushMouse/Profile.cpp
• modified: FlushMouse/Profile.h
• add: FlushMouse/TaskTray.cpp
• add: FlushMouse/TaskTray.h
• modified: FlushMouse32/FlushMouse32.cpp
• modified: FlushMouse32/FlushMouse32.h
• modified: FlushMouseCursor/FlushMouseCursor.cpp
• modified: FlushMouseCursor/FlushMouseCursor.h
• modified: FlushMouseDLL/EventlogData.h
• modified: FlushMouseDLL/EventlogData.mc
• modified: FlushMouseDLL/EventlogDll.cpp
• modified: FlushMouseDLL/FlushMouseDll.cpp
• modified: FlushMouseDLL/FlushMouseDll.h
• modified: FlushMouseDLL/GlobalHookDll.cpp
• modified: FlushMouseDLL/GlobalHookDll.h
• modified: FlushMouseDLL/KeyboardHookDll.cpp
• modified: FlushMouseDLL/KeyboardHookDll.h
• modified: FlushMouseDLL/MSG00409.bin
• modified: FlushMouseDLL/MSG00411.bin
• modified: FlushMouseDLL32/MouseHookDll32.cpp
• modified: FlushMouse_x64.msi
• add: OSDN Wiki/README.md
• modified: OSDN Wiki/osdn.txt
• modified: version.h
• modified: version.wxi

Modification

--- a/FlushMouse/CommonDef.h
+++ b/FlushMouse/CommonDef.h
@@ -1,9 +1,10 @@
-// CommonDef.h
+//
+// CommonDef.h
 //		Copyright (C) 1993 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0001	2023/04/27  JeffyTS		New edit
+// #0000		2023/04/27  JeffyTS		New edit
 //
 
 //
@@ -17,8 +18,18 @@
 //
 #define MAX_LOADSTRING 100
 
+// Files
+#define	FULL_FLUSHMOUSE_EXE		L"%ProgramFiles%\\JeffyTS\\FlushMouse\\FlushMouse.exe"
+#define	FULL_FLUSHMOUSE32_EXE	L"%ProgramFiles%\\JeffyTS\\FlushMouse\\FlushMouse32.exe"
+#define FULL_FLUSHMOUSE_DLL		L"%ProgramFiles%\\JeffyTS\\FlushMouse\\FlushMouseDLL.dll"
+#define	FULL_FLUSHMOUSE32_DLL	L"%ProgramFiles%\\JeffyTS\\FlushMouse\\FlushMouseDLL32.dll"
+#define	FLUSHMOUSE_EXE			L"FlushMouse.exe"
+#define	FLUSHMOUSE32_EXE			L"FlushMouse32.exe"
+#define FLUSHMOUSE_DLL			L"FlushMouseDLL.dll"
+#define FLUSHMOUSE32_DLL			L"FlushMouseDLL32.dll"
+
 // Window Class
-#define	CLASS_FLUSHMOUSE		L"FlushMouse-{E598B54C-A36A-4CDF-BC77-7082CEEDAA46}"
+#define	CLASS_FLUSHMOUSE			L"FlushMouse-{E598B54C-A36A-4CDF-BC77-7082CEEDAA46}"
 #define CLASS_FLUSHMOUSE32		L"FlushMouse32-{E598B54C-A36A-4CDF-BC77-7082CEEDAA46}"
 
 // for IME

--- a/FlushMouse/Cursor.cpp
+++ b/FlushMouse/Cursor.cpp
@@ -1,9 +1,10 @@
-// Cursor.cpp
+//
+// Cursor.cpp
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/03/03  JeffyTS  	New edit.
+// #0000		2022/03/03  JeffyTS  	New edit.
 //
 
 // Include
@@ -12,16 +13,20 @@
 #include "pch.h"
 #include "Profile.h"
 #include "Cursor.h"
-#include "CommonDef.h"
 #include "FlushMouseLIB.h"
+#include "CommonDef.h"
 #include "..\FlushMouseDLL\EventlogDll.h"
 #include "..\MiscLIB\CRegistry.h"
 
 //
+// Library
+//
+
+//
 // Define
 //
-#define FLUSHMOUSECURSORDIR	_T("\\JeffyTS\\FlushMouse\\")
-#define FLUSHMOUSECURSORDAT	_T("FlushMouseCursor.dat")
+#define FLUSHMOUSECURSORDIR			_T("\\JeffyTS\\FlushMouse\\")
+#define FLUSHMOUSECURSORDAT			_T("FlushMouseCursor.dat")
 
 // IME Cursor Change Thread
 #define IMECURSORCHANGETHREADID		1
@@ -45,412 +50,12 @@
 //
 
 //
-// Class CIME
-//
-CIME::CIME()
-{
-	lpstVirtualDesktop = new VIRTUALDESKTOP[sizeof(VIRTUALDESKTOP)];
-	ZeroMemory(lpstVirtualDesktop, sizeof(VIRTUALDESKTOP));
-	bGetVirtualDesktopSize();
-}
-CIME::~CIME()
-{
-	if (lpstVirtualDesktop != NULL)	delete[]	lpstVirtualDesktop;
-	lpstVirtualDesktop = NULL;
-}
-
-//
-// bIsIMEOpen()
-//
-BOOL		CIME::bIsIMEOpen(HWND hWndObserved)
-{
-	HWND    hIMWnd = NULL;
-	if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
-		if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_GETOPENSTATUS, (LPARAM)NULL) != 0) {
-			return TRUE;			// IME Open
-		}
-	}
-	return FALSE;					// IME Close
-}
-
-//
-// vIMEOpenCloseForced()
-//
-VOID		CIME::vIMEOpenCloseForced(HWND hWndObserved, DWORD dwIMEOpenClose)
-{
-	if (hWndObserved == NULL)	return;
-	LPARAM	lParam = (LPARAM)dwIMEOpenClose;
-	EnumChildWindows(hWndObserved, &bEnumChildProcIMEOpenClose, lParam);
-	return;
-}
-
-//
-// vIMEConvertModeChangeForced()
-//
-VOID		CIME::vIMEConvertModeChangeForced(HWND hWndObserved, DWORD dwConvertMode)
-{
-	if (hWndObserved == NULL)	return;
-	LPARAM	lParam = (LPARAM)dwConvertMode;
-	EnumChildWindows(hWndObserved, &bEnumChildProcIMEConvertMode, lParam);
-	return;
-}
-
-//
-// bEnumChildProcIMEConvertMode()
-//
-BOOL CALLBACK CIME::bEnumChildProcIMEConvertMode(HWND hWndObserved, LPARAM lParam)
-{
-	if (hWndObserved == NULL)	return FALSE;
-	HWND    hIMWnd = NULL;
-	if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
-		if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_SETOPENSTATUS, (LPARAM)TRUE) == 0) {
-			if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_SETCONVERSIONMODE, (LPARAM)lParam) == 0) {
-			}
-		}
-	}
-	return TRUE;
-}
-
-//
-// bEnumChildProcIMEOpenClose()
-//
-BOOL CALLBACK CIME::bEnumChildProcIMEOpenClose(HWND hWndObserved, LPARAM lParam)
-{
-	if (hWndObserved == NULL)	return FALSE;
-	HWND    hIMWnd = NULL;
-	if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
-		if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_SETOPENSTATUS, lParam) == 0) {
-		}
-	}
-	return TRUE;
-}
-
-//
-// dwIMEMode()
-//
-DWORD		CIME::dwIMEMode(HWND hWndObserved, BOOL bForceHiragana)
-{
-	if (hWndObserved != NULL) {
-		HWND    hIMWnd = NULL;
-		HKL		hkl = NULL;
-		DWORD	dwInputLocale = 0;
-		DWORD   dwConvertMode = 0;
-		if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
-			if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_GETOPENSTATUS, NULL) != 0) {
-				if ((dwConvertMode = (DWORD)SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_GETCONVERSIONMODE, NULL)) != 0) {
-					switch (dwConvertMode) {
-					case IME_CMODE_NATIVE:
-						dwConvertMode = IMEOFF;
-						break;
-					case ZENHIRA_IMEON:
-					case (ZENHIRA_IMEON ^ IME_CMODE_ROMAN):
-						dwConvertMode = ZENHIRA_IMEON;
-						break;
-					case HANEISU_IMEON:
-					case (HANEISU_IMEON ^ IME_CMODE_ROMAN):
-						dwConvertMode = HANEISU_IMEON;
-						break;
-					case HANKANA_IMEON:
-					case (HANKANA_IMEON ^ IME_CMODE_ROMAN):
-						dwConvertMode = HANKANA_IMEON;
-						break;
-					case ZENEISU_IMEON:
-					case (ZENEISU_IMEON ^ IME_CMODE_ROMAN):
-						dwConvertMode = ZENEISU_IMEON;
-						break;
-					case ZENKANA_IMEON:
-					case (ZENKANA_IMEON ^ IME_CMODE_ROMAN):
-						dwConvertMode = ZENKANA_IMEON;
-						break;
-					default:
-						dwConvertMode = IMEOFF;
-					}
-					if ((bForceHiragana != FALSE) && (dwConvertMode != ZENHIRA_IMEON)) {
-						vIMEConvertModeChangeForced(hWndObserved, ZENHIRA_IMEON);
-						dwConvertMode = ZENHIRA_IMEON;
-						return ZENHIRA_IMEON;
-					}
-					if ((hkl = Cime->hklGetInputLocale(hWndObserved)) != (HKL)0) {
-						if ((dwInputLocale = Cime->dwGetInputLocale()) != 0) {
-							if ((hkl = (HKL)(((UINT64)hkl & KB_MASK) | (dwInputLocale & LANG_MASK))) != JP_IME) {	// Not JP IME KB
-								dwConvertMode = IMEOFF;					// IMEOFFとする
-							}
-						}
-					}
-					return dwConvertMode;
-				}
-			}
-		}
-	}
-	return IMEOFF;
-}
-
-//
-// vActivateIME()
-//
-VOID		CIME::vActivateIME(HWND hWndObserved)
-{
-	EnumChildWindows(hWndObserved, &bEnumChildProcActivateIME, NULL);
-}
-
-// 
-// bEnumChildProcActivateIME()
-// 
-BOOL CALLBACK CIME::bEnumChildProcActivateIME(HWND hWnd, LPARAM lParam)
-{
-	UNREFERENCED_PARAMETER(lParam);
-
-	HWND	hIMWnd = ImmGetDefaultIMEWnd(hWnd);
-	if (hIMWnd != NULL) {
-		SendMessage(hIMWnd, WM_ACTIVATE, (WPARAM)WA_ACTIVE, (LPARAM)NULL);
-		LPTSTR	lpszBuffer = new TCHAR[_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);
-				if (lpszBuffer != NULL)	delete[] lpszBuffer;
-				return TRUE;
-			}
-		}
-		if (lpszBuffer != NULL)	delete[] lpszBuffer;
-	}
-	return TRUE;
-}
-
-//
-// bMoveIMEToolbar()
-//
-BOOL		CIME::bMoveIMEToolbar()
-{
-	if (bExistIMEToolbar()) {
-		while ((GetAsyncKeyState(VK_MENU) & 0x8000) || (GetAsyncKeyState(VK_CONTROL) & 0x8000)) {
-			Sleep(50);
-		}
-		HWND	hIMEWnd = FindWindow(_T("ApplicationFrameWindow"), NULL);
-		if (hIMEWnd != NULL) {
-			POINT	ptCursor{};
-			if (GetCursorPos(&ptCursor)) {
-				RECT	rc{};
-				if (GetWindowRect(hIMEWnd, &rc)) {
-					HMONITOR hMonitor = NULL;
-					if ((hMonitor = MonitorFromPoint(ptCursor, MONITOR_DEFAULTTONEAREST)) != NULL) {
-						UINT		dpiCursorX = 0, dpiCursorY = 0;
-						if ((GetDpiForMonitor(hMonitor, MDT_EFFECTIVE_DPI, &dpiCursorX, &dpiCursorY)) == S_OK) {
-							if ((hMonitor = MonitorFromPoint(ptCursor, MONITOR_DEFAULTTONEAREST)) != NULL) {
-								UINT		dpiToolbarX = 0, dpiToolbarY = 0;
-								if ((GetDpiForMonitor(hMonitor, MDT_EFFECTIVE_DPI, &dpiToolbarX, &dpiToolbarY)) == S_OK) {
-									// Drawも直す必要あり
-									LONG	CursorMarginX = 0, CursorMarginY = 0;
-									if ((rc.right - rc.left) > (rc.bottom - rc.top)) {
-										CursorMarginX = 10 * ((dpiCursorX + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI);
-										CursorMarginY = 16 * ((dpiCursorY + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI);
-									}
-									else {
-										CursorMarginX = 16 * ((dpiCursorX + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI);
-										CursorMarginY = 10 * ((dpiCursorY + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI);
-									}
-									Sleep(10);
-									double	rcLeft = 0, rcTop = 0;
-									if ((rc.right - rc.left) > (rc.bottom - rc.top)) {
-										rcLeft = (LONG)((double)rc.left + (6.0 * ((double)dpiToolbarX + (double)USER_DEFAULT_SCREEN_DPI - 1.0) / (double)USER_DEFAULT_SCREEN_DPI));
-										rcTop = (LONG)((double)rc.top + (9.0 * ((double)dpiToolbarX + (double)USER_DEFAULT_SCREEN_DPI - 1.0) / (double)USER_DEFAULT_SCREEN_DPI));
-									}
-									else {
-										rcLeft = (LONG)((double)rc.left + (9.0 * ((double)dpiToolbarX + (double)USER_DEFAULT_SCREEN_DPI - 1.0) / (double)USER_DEFAULT_SCREEN_DPI));
-										rcTop = (LONG)((double)rc.top + (6.0 * ((double)dpiToolbarX + (double)USER_DEFAULT_SCREEN_DPI - 1.0) / (double)USER_DEFAULT_SCREEN_DPI));
-									}
-									double	px0 = lpstVirtualDesktop->rcMonitorSize.left;
-									double	py0 = lpstVirtualDesktop->rcMonitorSize.top;
-									double	cx = lpstVirtualDesktop->rcMonitorSize.right - lpstVirtualDesktop->rcMonitorSize.left;
-									double	cy = lpstVirtualDesktop->rcMonitorSize.bottom - lpstVirtualDesktop->rcMonitorSize.top;
-									LONG	xCursor = (LONG)(((((double)ptCursor.x - px0) * 65536.0) + cx - 1.0) / cx);
-									LONG	yCursor = (LONG)(((((double)ptCursor.y - py0) * 65536.0) + cy - 1.0) / cy);
-									LONG	xToolbar = (LONG)(((((double)rcLeft - px0) * 65536.0) + cx - 1.0) / cx);
-									LONG	yToolbar = (LONG)(((((double)rcTop - py0) * 65536.0) + cy - 1.0) / cy);
-									LPINPUT lpInputs = NULL;
-									if ((lpInputs = new INPUT[sizeof(INPUT) * 4]) != NULL) {
-										ZeroMemory(lpInputs, sizeof(INPUT) * 4);
-										UINT	cInputs = (UINT)(0);
-										// #0
-										lpInputs[cInputs].type = INPUT_MOUSE; lpInputs[cInputs].mi.dx = (DWORD)xToolbar; lpInputs[cInputs].mi.dy = (DWORD)yToolbar;
-										lpInputs[cInputs].mi.mouseData = 0; lpInputs[cInputs].mi.time = 0; lpInputs[cInputs].mi.dwExtraInfo = 0;
-										lpInputs[cInputs].mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_VIRTUALDESK;
-										++cInputs;
-										// #1
-										lpInputs[cInputs].type = INPUT_MOUSE; lpInputs[cInputs].mi.dx = (DWORD)xToolbar; lpInputs[cInputs].mi.dy = (DWORD)yToolbar;
-										lpInputs[cInputs].mi.mouseData = 0; lpInputs[cInputs].mi.time = 0; lpInputs[cInputs].mi.dwExtraInfo = 0;
-										lpInputs[cInputs].mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
-										++cInputs;
-										// #2
-										lpInputs[cInputs].type = INPUT_MOUSE; lpInputs[cInputs].mi.dx = (DWORD)xCursor; lpInputs[cInputs].mi.dy = (DWORD)yCursor;
-										lpInputs[cInputs].mi.mouseData = 0; lpInputs[cInputs].mi.time = 0; lpInputs[cInputs].mi.dwExtraInfo = 0;
-										lpInputs[cInputs].mi.dwFlags = MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_VIRTUALDESK;
-										++cInputs;
-										// #3
-										lpInputs[cInputs].type = INPUT_MOUSE; lpInputs[cInputs].mi.dx = (DWORD)xCursor; lpInputs[cInputs].mi.dy = (DWORD)yCursor;
-										lpInputs[cInputs].mi.mouseData = 0; lpInputs[cInputs].mi.time = 0; lpInputs[cInputs].mi.dwExtraInfo = 0;
-										lpInputs[cInputs].mi.dwFlags = MOUSEEVENTF_LEFTUP;
-										++cInputs;
-										if (SendInput(cInputs, lpInputs, sizeof(INPUT)) == cInputs) {
-											Sleep(10);
-										}
-										delete[]	lpInputs;
-									}
-								}
-							}
-						}
-					}
-				}
-				else {
-					return FALSE;
-				}
-			}
-			else {
-				return FALSE;
-			}
-		}
-		else {
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-//
-// bGetVirtualDesktopSize()
-//
-BOOL			CIME::bGetVirtualDesktopSize()
-{
-	BOOL	bRet = FALSE;
-	if (lpstVirtualDesktop != NULL) {
-		ZeroMemory(lpstVirtualDesktop, sizeof(VIRTUALDESKTOP));
-		if (EnumDisplayMonitors(NULL, NULL, (MONITORENUMPROC)&bGetVirtualDesktopSizeEnumProc, (LPARAM)lpstVirtualDesktop) != 0) {
-			bRet = TRUE;
-		}
-		else {
-			_Post_equals_last_error_ DWORD	err = GetLastError();
-			if ((err == ERROR_INVALID_PARAMETER) || (err == ERROR_SUCCESS)) {
-				bRet = TRUE;
-			}
-			else if (err == ERROR_ACCESS_DENIED) {
-				bRet = TRUE;
-			}
-			else {
-			}
-		}
-	}
-	return bRet;
-}
-
-//
-// bGetVirtualDesktopSizeEnumProc()
-//
-BOOL		CIME::bGetVirtualDesktopSizeEnumProc(HMONITOR hMonitor, HDC hDC, LPCRECT lprcClip, LPARAM lParam)
-{
-	UNREFERENCED_PARAMETER(hDC);
-	UNREFERENCED_PARAMETER(lprcClip);
-	LPVIRTUALDESKTOP	lpstVirtualDesktop = (LPVIRTUALDESKTOP)lParam;
-	MONITORINFO	stMonInfo{};	stMonInfo.cbSize = sizeof(MONITORINFO);
-	if (GetMonitorInfo(hMonitor, &stMonInfo) != 0) {
-		if (stMonInfo.rcMonitor.left <= lpstVirtualDesktop->rcMonitorSize.left)		lpstVirtualDesktop->rcMonitorSize.left = stMonInfo.rcMonitor.left;
-		if (stMonInfo.rcMonitor.right >= lpstVirtualDesktop->rcMonitorSize.right)	lpstVirtualDesktop->rcMonitorSize.right = stMonInfo.rcMonitor.right;
-		if (stMonInfo.rcMonitor.top <= lpstVirtualDesktop->rcMonitorSize.top)		lpstVirtualDesktop->rcMonitorSize.top = stMonInfo.rcMonitor.top;
-		if (stMonInfo.rcMonitor.bottom >= lpstVirtualDesktop->rcMonitorSize.bottom)	lpstVirtualDesktop->rcMonitorSize.bottom = stMonInfo.rcMonitor.bottom;
-		++lpstVirtualDesktop->iNumOfMonitors;
-		return TRUE;
-	}
-	return FALSE;
-}
-
-//
-// bExistIMEToolbar()
-//
-BOOL		CIME::bExistIMEToolbar()
-{
-#define SUBKEY	_T("Software\\AppDataLow\\software\\Microsoft\\ime\\15.0\\IMEJP\\MSIME")
-#define VALUE	_T("ToolBarEnabled")
-	CRegistry* CReg = new CRegistry;
-	DWORD	dwToolBar = 0;
-	if (!CReg->bReadRegValueDWORD(HKEY_CURRENT_USER, SUBKEY, VALUE, &dwToolBar)) {
-	}
-	delete	CReg;
-	if ((bIsNewIME() == TRUE) && (dwToolBar != 0))	return TRUE;
-	else return FALSE;
-#undef SUBKEY
-#undef VALUE
-}
-
-//
-// bIsNewIME()
-//
-BOOL		CIME::bIsNewIME()
-{
-#define SUBKEY	_T("Software\\Microsoft\\input\\tsf\\tsf3override\\{03b5835f-f03c-411b-9ce2-aa23e1171e36}")
-#define VALUE	_T("NoTsf3Override2")
-	CRegistry* CReg = new CRegistry;
-	DWORD	dwCTF = 0;
-	if (!CReg->bReadRegValueDWORD(HKEY_CURRENT_USER, SUBKEY, VALUE, &dwCTF)) {
-		// ERROR_FILE_NOT_FOUND
-		dwCTF = 0;
-	}
-	delete	CReg;
-	if (dwCTF != 0)	return FALSE;
-	else			return TRUE;
-#undef SUBKEY
-#undef VALUE
-}
-
-//
-// 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()
 {
 	this->hMainWnd = NULL;
 
-	// DLL data の初期化
 	hModDll = NULL;
 	iCursorDataLoadCount = 0;
 
@@ -460,6 +65,7 @@ CCursor::CCursor()
 	stIMECursorData.bDrawNearCaret = FALSE;
 	stIMECursorData.lpszLoadDatName = NULL;
 	stIMECursorData.lpstFlushMouseCursor = (LPFLUSHMOUSECURSOR)&stFlushMouseCursor;
+
 	stIMECursorData.hWnd = NULL;
 
 	IMECursorChangeThread = NULL;
@@ -472,27 +78,27 @@ CCursor::CCursor()
 CCursor::~CCursor()
 {
 	if (DrawIMEModeCaretThread != NULL) {
-		delete	DrawIMEModeCaretThread;				// Draw IME Mode near by Caret cursor Threadの後始末
+		delete	DrawIMEModeCaretThread;
 		DrawIMEModeCaretThread = NULL;
 	}
 	if (CaretWindow != NULL) {
-		delete	CaretWindow;						// Draw Window near by Caret cursorの削除
+		delete	CaretWindow;	
 		CaretWindow = NULL;
 	}
 	if (DrawIMEModeThread != NULL) {
-		delete	DrawIMEModeThread;					// Draw IME Mode near by Mouse cursor Threadの後始末
+		delete	DrawIMEModeThread;
 		DrawIMEModeThread = NULL;
 	}
 	if (CursorWindow != NULL) {
-		delete	CursorWindow;						// Draw Window near by Mouse cursorの削除
+		delete	CursorWindow;
 		CursorWindow = NULL;
 	}
 	if (IMECursorChangeThread != NULL) {
-		delete	IMECursorChangeThread;				// IME Cursor Change Threadの後始末
+		delete	IMECursorChangeThread;
 		IMECursorChangeThread = NULL;
 	}
 	if (stIMECursorData.lpszLoadDatName != NULL) {
-		delete[]	stIMECursorData.lpszLoadDatName;
+		delete []	stIMECursorData.lpszLoadDatName;
 		stIMECursorData.lpszLoadDatName = NULL;
 	}
 }
@@ -528,7 +134,7 @@ BOOL			CCursor::bInitialize(HWND hWnd)
 	if (!bChangeFlushMouseCursor(IMEOFF, &stIMECursorData)) return FALSE;
 	if (!bRegisterIMECursorChangeThread(hWnd)) return FALSE;
 	
-#define	WINDOWCLASS		_T("FlushMouseCursorWindow-{9395A3BE-4280-4AA1-9099-ADD712F982A1}")
+#define	WINDOWCLASS		_T("FlushMouseCursorWindow-{E598B54C-A36A-4CDF-BC77-7082CEEDAA46}")
 	if (CursorWindow == NULL) {
 		CursorWindow = new CCursorWindow;
 		if (!CursorWindow->bRegister((HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE), WINDOWCLASS, stIMECursorData.dwNearDrawMouseColor))		return FALSE;
@@ -536,8 +142,7 @@ BOOL			CCursor::bInitialize(HWND hWnd)
 		DrawIMEModeThread = new CThread;
 	}
 #undef WINDOWCLASS
-
-#define	WINDOWCLASS		_T("FlushMouseCaretWindow-{D40AF72E-E0D9-47DA-8A0E-7E29F6F763E4}")
+#define	WINDOWCLASS		_T("FlushMouseCaretWindow-{E598B54C-A36A-4CDF-BC77-7082CEEDAA46}")
 	if (CaretWindow == NULL) {
 		CaretWindow = new CCursorWindow;
 		if (!CaretWindow->bRegister((HINSTANCE)GetWindowLongPtr(hWnd, GWLP_HINSTANCE), WINDOWCLASS, stIMECursorData.dwNearDrawCaretColor))	return FALSE;
@@ -548,7 +153,6 @@ BOOL			CCursor::bInitialize(HWND hWnd)
 
 	if (!bRegisterDrawIMEModeThread(hWnd))	return FALSE;
 	if (!bStartIMECursorChangeThread(hWnd))	return FALSE;
-
 	return TRUE;
 }
 
@@ -559,43 +163,52 @@ LPTSTR		CCursor::lpszGetCursorDataName()
 {
 	LPTSTR	lpszCursorDataName = NULL;
 	LPTSTR	lpszBuffer = new TCHAR[_MAX_PATH];
-	ZeroMemory(lpszBuffer, _MAX_PATH);
-	DWORD	dwSize = 0;
-	GetCurrentDirectory(_MAX_PATH, lpszBuffer);
-	_tcsncat_s(lpszBuffer, _MAX_PATH, _T("\\"), sizeof(_T("\\")));
-	_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDAT, sizeof(FLUSHMOUSECURSORDAT));
-	dwSize = ExpandEnvironmentStrings(lpszBuffer, NULL, 0);
-	lpszCursorDataName = new TCHAR[dwSize];
-	ZeroMemory(lpszCursorDataName, dwSize);
-	dwSize = ExpandEnvironmentStrings(lpszBuffer, lpszCursorDataName, dwSize);
-	if (GetFileAttributes(lpszCursorDataName) == INVALID_FILE_ATTRIBUTES) {					// Try Current Dir
-		delete []	lpszCursorDataName;
+	if (lpszBuffer) {
 		ZeroMemory(lpszBuffer, _MAX_PATH);
-		_tcsncat_s(lpszBuffer, _MAX_PATH, _T("%APPDATA%"), sizeof(_T("%APPDATA%")));
-		_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDIR, sizeof(FLUSHMOUSECURSORDIR));
+		DWORD	dwSize = 0;
+		GetCurrentDirectory(_MAX_PATH, lpszBuffer);
+		_tcsncat_s(lpszBuffer, _MAX_PATH, _T("\\"), sizeof(_T("\\")));
 		_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDAT, sizeof(FLUSHMOUSECURSORDAT));
 		dwSize = ExpandEnvironmentStrings(lpszBuffer, NULL, 0);
 		lpszCursorDataName = new TCHAR[dwSize];
-		ZeroMemory(lpszCursorDataName, dwSize);
-		dwSize = ExpandEnvironmentStrings(lpszBuffer, lpszCursorDataName, dwSize);
-		if (GetFileAttributes(lpszCursorDataName) == INVALID_FILE_ATTRIBUTES) {				// Try %APPDATA% Dir
-			delete []	lpszCursorDataName;
-			ZeroMemory(lpszBuffer, _MAX_PATH);
-			_tcsncat_s(lpszBuffer, _MAX_PATH, _T("%ALLUSERSPROFILE%"), sizeof(_T("%ALLUSERSPROFILE%")));
-			_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDIR, sizeof(FLUSHMOUSECURSORDIR));
-			_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDAT, sizeof(FLUSHMOUSECURSORDAT));
-			dwSize = ExpandEnvironmentStrings(lpszBuffer, NULL, 0);
-			lpszCursorDataName = new TCHAR[dwSize];
+		if (lpszCursorDataName) {
 			ZeroMemory(lpszCursorDataName, dwSize);
 			dwSize = ExpandEnvironmentStrings(lpszBuffer, lpszCursorDataName, dwSize);
-			if (GetFileAttributes(lpszCursorDataName) == INVALID_FILE_ATTRIBUTES) {			// Try %ALLUSERSPROFILE% Dir
-				delete []	lpszBuffer;
-				delete []	lpszCursorDataName;
-				return NULL;
+			if (GetFileAttributes(lpszCursorDataName) == INVALID_FILE_ATTRIBUTES) {	
+				delete[]	lpszCursorDataName;
+				lpszCursorDataName = NULL;
+				ZeroMemory(lpszBuffer, _MAX_PATH);
+				_tcsncat_s(lpszBuffer, _MAX_PATH, _T("%APPDATA%"), sizeof(_T("%APPDATA%")));
+				_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDIR, sizeof(FLUSHMOUSECURSORDIR));
+				_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDAT, sizeof(FLUSHMOUSECURSORDAT));
+				dwSize = ExpandEnvironmentStrings(lpszBuffer, NULL, 0);
+				lpszCursorDataName = new TCHAR[dwSize];
+				if (lpszCursorDataName) {
+					ZeroMemory(lpszCursorDataName, dwSize);
+					dwSize = ExpandEnvironmentStrings(lpszBuffer, lpszCursorDataName, dwSize);
+					if (GetFileAttributes(lpszCursorDataName) == INVALID_FILE_ATTRIBUTES) {
+						delete[]	lpszCursorDataName;
+						lpszCursorDataName = NULL;
+						ZeroMemory(lpszBuffer, _MAX_PATH);
+						_tcsncat_s(lpszBuffer, _MAX_PATH, _T("%ALLUSERSPROFILE%"), sizeof(_T("%ALLUSERSPROFILE%")));
+						_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDIR, sizeof(FLUSHMOUSECURSORDIR));
+						_tcsncat_s(lpszBuffer, _MAX_PATH, FLUSHMOUSECURSORDAT, sizeof(FLUSHMOUSECURSORDAT));
+						dwSize = ExpandEnvironmentStrings(lpszBuffer, NULL, 0);
+						lpszCursorDataName = new TCHAR[dwSize];
+						if (lpszCursorDataName) {
+							ZeroMemory(lpszCursorDataName, dwSize);
+							dwSize = ExpandEnvironmentStrings(lpszBuffer, lpszCursorDataName, dwSize);
+							if (GetFileAttributes(lpszCursorDataName) == INVALID_FILE_ATTRIBUTES) {
+								delete[]	lpszCursorDataName;
+								lpszCursorDataName = NULL;
+							}
+						}
+					}
+				}
 			}
 		}
+		delete[]	lpszBuffer;
 	}
-	delete []	lpszBuffer;
 	return lpszCursorDataName;
 }
 
@@ -639,6 +252,16 @@ BOOL		CCursor::bStartDrawIMEModeThreadWait(HWND hWndObserved)
 }
 
 //
+// bStartDrawIMEModeThreadWaitEventForeGround()
+//
+BOOL		CCursor::bStartDrawIMEModeThreadWaitEventForeGround(HWND hWndObserved)
+{
+	stIMECursorData.bDrawIMEModeWait = TRUE;
+	stIMECursorData.dwWaitWaveTime = 100;
+	return _bStartDrawIMEModeThread(hWndObserved);
+}
+
+//
 // bStartDrawIMEModeThreadWaitDblClk()
 //
 BOOL		CCursor::bStartDrawIMEModeThreadWaitDblClk(HWND hWndObserved)
@@ -649,17 +272,17 @@ BOOL		CCursor::bStartDrawIMEModeThreadWaitDblClk(HWND hWndObserved)
 }
 
 //
-// _bStartDrawIMEModeThreadWait()
+// _bStartDrawIMEModeThread()
 //
 BOOL		CCursor::_bStartDrawIMEModeThread(HWND hWndObserved)
 {
-	if ((Cursor == NULL) || (DrawIMEModeThread == NULL))	return FALSE;
+	if ((Cursor == NULL) || (DrawIMEModeThread == NULL))		return FALSE;
 	stIMECursorData.hWnd = _hGetCaretPosByAccessibleObjectFromWindow(hWndObserved, &stIMECursorData.rcCaret);
 	stIMECursorData.hWndObserved = hWndObserved;
 	stIMECursorData.bDisplayFocusWindowIME = bDisplayFocusWindowIME;
 	if (!DrawIMEModeThread->bStart()) {
 		if (DrawIMEModeThread != NULL) {
-			delete	DrawIMEModeThread;					// Draw IME Mode Threadの後始末
+			delete	DrawIMEModeThread;
 			DrawIMEModeThread = NULL;
 		}
 		DrawIMEModeThread = new CThread;
@@ -673,7 +296,7 @@ BOOL		CCursor::_bStartDrawIMEModeThread(HWND hWndObserved)
 //
 BOOL		CCursor::bShowHideCursor(HWND hWndObserved, BOOL bShow)
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	if (bShow) {
 		bRet = bStartDrawIMEModeThread(hWndObserved);
 	}
@@ -688,10 +311,10 @@ BOOL		CCursor::bShowHideCursor(HWND hWndObserved, BOOL bShow)
 //
 BOOL		CCursor::bGetCaretPos(HWND hWnd, LPPOINT lpCaretPos)
 {
-	BOOL	bRet = FALSE;
-	RECT	rc{};
+	BOOL		bRet = FALSE;
+	RECT		rc{};
 	lpCaretPos->x = 0;	lpCaretPos->y = 0;
-	if (_hGetCaretPosByGuiThreadInfo(hWnd, &rc) != NULL) {
+	if (_hGetCaretPosByAccessibleObjectFromWindow(hWnd, &rc) != NULL) {
 		bRet = TRUE;
 	}
 	if (stIMECursorData.hWnd != NULL) {
@@ -738,14 +361,11 @@ BOOL		CCursor::bCursorDllUnload()
 //
 BOOL		CCursor::bSystemCursorLoad()
 {
-	// Set Flush Mouse Cursor to System
 	if (!bChangeFlushMouseCursor(IMEOFF, &stIMECursorData))		return FALSE;
 	
-	// Set Other Mouse Cursor to System
 	int	i = 0;
 	while (stAllMouseCursor[i].id != (DWORD)(-1)) {
 		if (stAllMouseCursor[i].bReadReg) {
-			// Get Other System Cursor Filename from Registry
 			if (!bGetMouseRegValue(stAllMouseCursor[i].szRegValue, stAllMouseCursor[i].szFile))		return FALSE;
 		}
 		i++;
@@ -772,7 +392,7 @@ BOOL		CCursor::bRegisterIMECursorChangeThread(HWND hWndObserved)
 BOOL		CCursor::bIMECursorChangeRoutine(LPVOID lpvParam)
 {
 	LPIMECURSORDATA	lpstCursorData = (LPIMECURSORDATA)lpvParam;
-	CCursor* This = reinterpret_cast<CCursor*>(lpvParam);
+	CCursor	*This = reinterpret_cast<CCursor*>(lpvParam);
 	BOOL		bRet = TRUE;
 	if (lpstCursorData->bDisplayIMEModeOnCursor) {
 		This->bIsIMECursorChanged(lpstCursorData);
@@ -808,16 +428,19 @@ BOOL		CCursor::bRegisterDrawIMEModeThread(HWND hWndObserved)
 BOOL WINAPI	CCursor::bDrawIMEModeRoutine(LPVOID lpvParam)
 {
 	LPIMECURSORDATA	lpstCursorData = (LPIMECURSORDATA)lpvParam;
-	CCursor* This = reinterpret_cast<CCursor*>(lpvParam);
+	CCursor	*This = reinterpret_cast<CCursor*>(lpvParam);
+	BOOL		bRet = TRUE;
 	This->bIsIMECursorChanged(lpstCursorData);
 	if (!This->bDrawIMEModeOnDisplay(lpstCursorData)) {
 		_Post_equals_last_error_ DWORD err = GetLastError();
 		if (err == ERROR_ACCESS_DENIED) {
-			return FALSE;
+			bRet = TRUE;
+		}
+		else {
+			bRet = FALSE;
 		}
-		return FALSE;
 	}
-	return	TRUE;
+	return	bRet;
 }
 
 //
@@ -830,7 +453,7 @@ BOOL		CCursor::bIsIMECursorChanged(LPIMECURSORDATA lpstCursorData)
 	dwIMEMode = Cime->dwIMEMode(lpstCursorData->hWndObserved, lpstCursorData->bForceHiragana);
 	if (lpstCursorData->dwIMEModeCursor == dwIMEMode) return FALSE;
 	lpstCursorData->dwIMEModeCursor = dwIMEMode;
-	return TRUE;
+	return TRUE;	
 }
 
 //
@@ -841,7 +464,7 @@ BOOL		CCursor::bDrawIMEModeOnDisplay(LPIMECURSORDATA lpstCursorData)
 	BOOL		bRet = FALSE;
 	RECT		rc{};
 	if (lpstCursorData->bDrawIMEModeWait) {
-		if (lpstCursorData->dwWaitWaveTime != 0)	Sleep(lpstCursorData->dwWaitWaveTime);
+		if (lpstCursorData->dwWaitWaveTime != 0)		Sleep(lpstCursorData->dwWaitWaveTime);
 	}
 	if (_bCalcDispModeRect(lpstCursorData->iModeSize, lpstCursorData->iModeSize, &rc)) {
 		if (EnumDisplayMonitors(NULL, &rc, (MONITORENUMPROC)&bIconDrawEnumProc, (LPARAM)lpstCursorData) != 0) {
@@ -885,7 +508,6 @@ BOOL		CCursor::bIconDrawEnumProc(HMONITOR hMonitor, HDC hDC, LPCRECT lprcClip, L
 BOOL		CCursor::_bCalcDispModeRect(int iModeSizeX, int iModeSizeY, LPRECT lpRect)
 {
 	POINT	pt{};
-	RECT	rect{};
 	if (GetCursorPos(&pt)) {
 		HMONITOR hMonitor = NULL;
 		if ((hMonitor = MonitorFromPoint(pt, MONITOR_DEFAULTTONEAREST)) != NULL) {
@@ -894,7 +516,6 @@ BOOL		CCursor::_bCalcDispModeRect(int iModeSizeX, int iModeSizeY, LPRECT lpRect)
 				int iIconSizeX = 0, iIconSizeY = 0;
 				iIconSizeX = iModeSizeX * (dpiX + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI + 1;
 				iIconSizeY = iModeSizeY * (dpiY + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI + 1;
-				// Draw near by Mouse cursor Left
 				lpRect->left = pt.x - ((iIconSizeX * 3 + 1) / 2);	lpRect->right = lpRect->left + iIconSizeX;
 				lpRect->top = pt.y - ((iIconSizeY + 1) / 2);		lpRect->bottom = lpRect->top + iIconSizeY;
 				return TRUE;
@@ -913,85 +534,72 @@ BOOL		CCursor::_bCalcDispModeRect(int iModeSizeX, int iModeSizeY, LPRECT lpRect)
 }
 
 //
-// _hGetCarePosByAccessibleObjectFromWindow()
-//
+// _hGetCaretPosByAccessibleObjectFromWindow()
+// 
 HWND		CCursor::_hGetCaretPosByAccessibleObjectFromWindow(HWND hForeWnd, LPRECT lpRect)
 {
+	HWND		hWnd = NULL;
 	POINT	pt{};
-	RECT	rcFore{}, rcTop{};
 	DWORD	dwPID = 0, dwForeThreadID = 0;
 	if (hForeWnd != NULL) {
-		if ((dwForeThreadID = GetWindowThreadProcessId(hForeWnd, &dwPID)) != 0) {
-			GUITHREADINFO	GuiThreadInfo{};	GuiThreadInfo.cbSize = sizeof(GUITHREADINFO);
-			if (GetGUIThreadInfo(dwForeThreadID, &GuiThreadInfo)) {
-				IAccessible* IAccessible = NULL;
-				if (GuiThreadInfo.hwndFocus != NULL) {
-					HRESULT hResult = AccessibleObjectFromWindow(GuiThreadInfo.hwndFocus, (DWORD)OBJID_CARET, IID_IAccessible, (LPVOID*)&IAccessible);
-					if (hResult == S_OK) {
-						SIZE	sz{};
-						VARIANT	variant{};	variant.vt = VT_I4;	variant.lVal = CHILDID_SELF;
-						if ((hResult = IAccessible->accLocation(&pt.x, &pt.y, &sz.cx, &sz.cy, variant)) == S_OK) {
-							IAccessible->Release();
-							lpRect->left = pt.x;	lpRect->top = pt.y;	lpRect->right = pt.x + sz.cx;	lpRect->bottom = pt.y + sz.cy;
-#define	MARGIN		2
-							if (((pt.x == 0) && (pt.y == 0)) || (pt.x <= rcTop.left + MARGIN) || (pt.y <= rcTop.top + MARGIN) || (pt.x <= rcFore.left) || (pt.y <= rcFore.top)) {
-#undef MARGIN
-								lpRect->left = 0;		lpRect->right = 0;
-								lpRect->top = 0;		lpRect->bottom = 0;
-								return NULL;
-							}
-							else {
-								return GuiThreadInfo.hwndFocus;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	return NULL;
-}
-
-//
-// _hGetCaretPosByGuiThreadInfo()
-//
-HWND		CCursor::_hGetCaretPosByGuiThreadInfo(HWND hForeWnd, LPRECT lpRect)
-{
-	POINT	pt{};
-	RECT	rcFore{}, rcTop{};
-	DWORD	dwPID = 0, dwForeThreadID = 0;
-	if (hForeWnd != NULL) {
-		if (GetWindowRect(hForeWnd, &rcFore)) {
 			if ((dwForeThreadID = GetWindowThreadProcessId(hForeWnd, &dwPID)) != 0) {
-				GUITHREADINFO	GuiThreadInfo{};	GuiThreadInfo.cbSize = sizeof(GUITHREADINFO);
-				if (GetGUIThreadInfo(dwForeThreadID, &GuiThreadInfo)) {
-					if (GuiThreadInfo.hwndCaret != NULL) {
-						pt.x = GuiThreadInfo.rcCaret.left;	pt.y = GuiThreadInfo.rcCaret.top;
-						if (ClientToScreen(GuiThreadInfo.hwndCaret, &pt)) {
-							lpRect->left = pt.x;	lpRect->top = pt.y;
-							pt.x = GuiThreadInfo.rcCaret.right;	pt.y = GuiThreadInfo.rcCaret.bottom;
-							if (ClientToScreen(GuiThreadInfo.hwndCaret, &pt)) {
-								lpRect->right = pt.x;	lpRect->bottom = pt.y;
-								if (GetWindowRect(GuiThreadInfo.hwndCaret, &rcTop)) {
-#define	MARGIN		2
-									if (((pt.x == 0) && (pt.y == 0)) || (pt.x <= rcTop.left + MARGIN) || (pt.y <= rcTop.top + MARGIN) || (pt.x <= rcFore.left) || (pt.y <= rcFore.top)) {
-#undef MARGIN
-										lpRect->left = 0;		lpRect->right = 0;
-										lpRect->top = 0;		lpRect->bottom = 0;
-										return NULL;
+				LPGUITHREADINFO	lpGuiThreadInfo = new GUITHREADINFO[sizeof(GUITHREADINFO)];
+				if (lpGuiThreadInfo != NULL) {
+					lpGuiThreadInfo->cbSize = sizeof(GUITHREADINFO);
+					if (GetGUIThreadInfo(dwForeThreadID, lpGuiThreadInfo)) {
+						IAccessible* IAccessible = NULL;
+						if (lpGuiThreadInfo->hwndFocus != NULL) {
+							HRESULT hResult = AccessibleObjectFromWindow(lpGuiThreadInfo->hwndFocus, (DWORD)OBJID_CARET, IID_IAccessible, (LPVOID*)&IAccessible);
+							if (hResult == S_OK) {
+								LPVARIANT	lpVariant = new VARIANT[sizeof(VARIANT)];
+								if (lpVariant != NULL) {
+									SIZE		sz{};
+									lpVariant->vt = VT_I4;	lpVariant->lVal = CHILDID_SELF;
+									if ((hResult = IAccessible->accLocation(&pt.x, &pt.y, &sz.cx, &sz.cy, *lpVariant)) == S_OK) {
+										IAccessible->Release();
+										lpRect->left = pt.x;	lpRect->top = pt.y;	lpRect->right = pt.x + sz.cx;	lpRect->bottom = pt.y + sz.cy;
+										if ((pt.x == 0) && (pt.y == 0) && (sz.cx == 0) && (sz.cy == 0)) {
+											lpRect->left = 0;	lpRect->right = 0;	lpRect->top = 0;	lpRect->bottom = 0;
+											hWnd = NULL;
+										}
+										else {
+											hWnd = lpGuiThreadInfo->hwndFocus;
+										}
 									}
 									else {
-										return GuiThreadInfo.hwndCaret;
+										if (lpGuiThreadInfo->hwndCaret != NULL) {
+											pt.x = lpGuiThreadInfo->rcCaret.left;	pt.y = lpGuiThreadInfo->rcCaret.top;
+											if (ClientToScreen(lpGuiThreadInfo->hwndCaret, &pt)) {
+												lpRect->left = pt.x;	lpRect->top = pt.y;
+												pt.x = lpGuiThreadInfo->rcCaret.right;	pt.y = lpGuiThreadInfo->rcCaret.bottom;
+												if (ClientToScreen(lpGuiThreadInfo->hwndCaret, &pt)) {
+													lpRect->right = pt.x;	lpRect->bottom = pt.y;
+													RECT		rcFore{}, rcTop{};
+													if (GetWindowRect(lpGuiThreadInfo->hwndCaret, &rcTop)) {
+#define	MARGIN		2
+														if (((pt.x == 0) && (pt.y == 0)) || (pt.x <= rcTop.left + MARGIN) || (pt.y <= rcTop.top + MARGIN) || (pt.x <= rcFore.left) || (pt.y <= rcFore.top)) {
+#undef MARGIN
+															lpRect->left = 0;	lpRect->right = 0;	lpRect->top = 0;	lpRect->bottom = 0;
+															hWnd = NULL;
+														}
+														else {
+															hWnd = lpGuiThreadInfo->hwndCaret;
+														}
+													}
+												}
+											}
+										}
 									}
+									delete[]	lpVariant;
 								}
 							}
 						}
 					}
+					delete []	lpGuiThreadInfo;
 				}
 			}
-		}
 	}
-	return NULL;
+	return hWnd;
 }
 
 //
@@ -1012,11 +620,12 @@ BOOL		CCursor::_bAdjustCaretByMonitorDPI(int iModeSizeX, int iModeSizeY, LPRECT
 			lpRect->right = lpRect->left + iIconSizeX;
 			if ((lpRect->bottom - lpRect->top) < iModeSizeY) {
 				lpRect->top = (lpRect->bottom - iIconSizeY) + (DESCENT * (dpiY + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI);
+				lpRect->bottom = lpRect->top + iIconSizeY;
 			}
 			else {
-				lpRect->top = (lpRect->bottom - ((lpRect->bottom - lpRect->top) / 2) - (iIconSizeY / 2));// + (DESCENT * (dpiY + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI);
+				lpRect->top = (lpRect->bottom - ((lpRect->bottom - lpRect->top) / 2 ) - (iIconSizeY / 2));// + (DESCENT * (dpiY + USER_DEFAULT_SCREEN_DPI - 1) / USER_DEFAULT_SCREEN_DPI);
+				lpRect->bottom = lpRect->top + iIconSizeY;
 			}
-			lpRect->bottom = lpRect->top + iIconSizeY;
 #undef DESCENT
 			return TRUE;
 		}
@@ -1024,15 +633,18 @@ BOOL		CCursor::_bAdjustCaretByMonitorDPI(int iModeSizeX, int iModeSizeY, LPRECT
 	return FALSE;
 }
 
+//
+// bDrawIMEModeOnDisplaySub()
+//
 BOOL		CCursor::bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData)
 {
 	Sleep(50);
-
-	BOOL	bFoundCaret = FALSE;
-	RECT	rcCursor{}, rcCaret{};
+	
+	BOOL		bFoundCaret = FALSE;
+	RECT		rcCursor{}, rcCaret{};
 	int		iCursorSizeX = 0, iCursorSizeY = 0, iCaretSizeX = 0, iCaretSizeY = 0;
 	DWORD	dwIMEModeCursor = IMEOFF, dwIMEModeCaret = IMEOFF;
-	HWND	hCaretWnd = NULL;
+	HWND		hCaretWnd = NULL;
 	if (lpstCursorData->bDrawNearCaret != FALSE) {
 		if (lpstCursorData->hWnd != NULL) {
 			rcCaret.left = lpstCursorData->rcCaret.left;	rcCaret.top = lpstCursorData->rcCaret.top;
@@ -1040,7 +652,7 @@ BOOL		CCursor::bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData)
 			hCaretWnd = lpstCursorData->hWnd;
 			bFoundCaret = TRUE;
 		}
-		else if ((hCaretWnd = _hGetCaretPosByGuiThreadInfo(GetForegroundWindow(), &rcCaret)) != NULL) {
+		else if ((hCaretWnd = _hGetCaretPosByAccessibleObjectFromWindow(GetForegroundWindow(), &rcCaret)) != NULL) {
 			bFoundCaret = TRUE;
 		}
 		if (bFoundCaret && (hCaretWnd != NULL)) {
@@ -1088,8 +700,8 @@ BOOL		CCursor::bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData)
 	}
 
 #define	COUNT	10
-	BOOL	bRet = FALSE;
-	int	iCount = 0;
+	BOOL		bRet = FALSE;
+	int		iCount = 0;
 	if (lpstCursorData->dwDisplayModeTime != 0)	iCount = (lpstCursorData->dwDisplayModeTime + (COUNT - 1)) / COUNT;
 	else iCount = COUNT;
 	for (; iCount >= 0; iCount--) {
@@ -1114,12 +726,10 @@ BOOL		CCursor::bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData)
 		Sleep(COUNT);
 		bRet = TRUE;
 	}
-
 	if (!CursorWindow->bSetWindowPos(HWND_BOTTOM, rcCursor.left, rcCursor.top, iCursorSizeX, iCursorSizeY, (SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_ASYNCWINDOWPOS))) {
 		bRet = FALSE;
 	}
 	CursorWindow->vSetModeString(lpstCursorData->lpstFlushMouseCursor[0].szMode);
-
 	if (bFoundCaret) {
 		if (!CaretWindow->bSetWindowPos(HWND_BOTTOM, rcCaret.left, rcCaret.top, iCaretSizeX, iCaretSizeY, (SWP_HIDEWINDOW | SWP_NOACTIVATE | SWP_ASYNCWINDOWPOS))) {
 			bRet = FALSE;
@@ -1134,11 +744,10 @@ BOOL		CCursor::bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData)
 //
 BOOL		CCursor::bGetMouseRegValue(LPCTSTR szValue, LPTSTR szFile)
 {
-// \HKEY_CURRENT_USER\Control Panel\Cursors
 #define MOUSE_HKEY		HKEY_CURRENT_USER
 #define MOUSE_SUBKEY	_T("Control Panel\\Cursors")
-	BOOL		bRet = FALSE;
-	CRegistry* CReg = new CRegistry;
+	BOOL			bRet = FALSE;
+	CRegistry	*CReg = new CRegistry;
 	if (CReg->bReadRegValueString(MOUSE_HKEY, MOUSE_SUBKEY, szValue, szFile, _MAX_PATH)) {
 		bRet = TRUE;
 	}
@@ -1160,7 +769,7 @@ BOOL		CCursor::bChangeFlushMouseCursor(UINT uCurID, LPIMECURSORDATA lpstCursorDa
 	if (bSetSystemCursor((LPMOUSECURSOR)&(lpstCursorData->lpstFlushMouseCursor[i]).stArrow, lpstCursorData->iCursorSize, lpstCursorData->iCursorSize)) {
 		if (bSetSystemCursor((LPMOUSECURSOR) & (lpstCursorData->lpstFlushMouseCursor[i]).stHand, lpstCursorData->iCursorSize, lpstCursorData->iCursorSize)) {
 			if (bSetSystemCursor((LPMOUSECURSOR) & (lpstCursorData->lpstFlushMouseCursor[i]).stIBeam, lpstCursorData->iCursorSize, lpstCursorData->iCursorSize)) {
-				return TRUE;				// Success
+				return TRUE;	
 			}
 		}
 	}
@@ -1172,29 +781,32 @@ BOOL		CCursor::bChangeFlushMouseCursor(UINT uCurID, LPIMECURSORDATA lpstCursorDa
 //
 BOOL		CCursor::bSetSystemCursor(LPMOUSECURSOR lpstMC, int iCursorSizeX, int iCursorSizeY)
 {
-	HCURSOR		hCur;
-	UINT			fuLoad = 0;
-	if (lpstMC->bReadReg) {										// Load Cursor from registry
-		if (lpstMC->szFile[0] == '\0')		return TRUE;
+	HCURSOR	hCur;
+	UINT		fuLoad = 0;
+	if (lpstMC->bReadReg) {
+		if (lpstMC->szFile[0] == '\0')		return TRUE;	
 		fuLoad = (LR_VGACOLOR | LR_DEFAULTSIZE | LR_DEFAULTCOLOR | LR_CREATEDIBSECTION | LR_LOADFROMFILE);
 		if ((hCur = (HCURSOR)LoadImage(NULL, lpstMC->szFile, IMAGE_CURSOR, iCursorSizeX, iCursorSizeY, fuLoad)) == NULL) {
 			return FALSE;
 		}
 	} else {
-		if (lpstMC->uResourceID == 0) {							// Load Cursor from file
+		if (lpstMC->uResourceID == 0) {
 			if (lpstMC->szFile[0] == '\0')		return FALSE;
 			DWORD	dwSize = 0;
 			dwSize = ExpandEnvironmentStrings(lpstMC->szFile, NULL, 0);
 			LPTSTR	lpszBuffer = new TCHAR[dwSize];
-			ZeroMemory(lpszBuffer, dwSize);
-			dwSize = ExpandEnvironmentStrings(lpstMC->szFile, lpszBuffer, dwSize);
-			fuLoad = (LR_VGACOLOR | LR_DEFAULTSIZE | LR_DEFAULTCOLOR | LR_CREATEDIBSECTION | LR_LOADFROMFILE);
-			if ((hCur = (HCURSOR)LoadImage(NULL, lpszBuffer, IMAGE_CURSOR, iCursorSizeX, iCursorSizeY, fuLoad)) == NULL) {
-				delete	[]	lpszBuffer;
-				return FALSE;
+			if (lpszBuffer) {
+				ZeroMemory(lpszBuffer, dwSize);
+				dwSize = ExpandEnvironmentStrings(lpstMC->szFile, lpszBuffer, dwSize);
+				fuLoad = (LR_VGACOLOR | LR_DEFAULTSIZE | LR_DEFAULTCOLOR | LR_CREATEDIBSECTION | LR_LOADFROMFILE);
+				if ((hCur = (HCURSOR)LoadImage(NULL, lpszBuffer, IMAGE_CURSOR, iCursorSizeX, iCursorSizeY, fuLoad)) == NULL) {
+					delete[]	lpszBuffer;
+					return FALSE;
+				}
+				delete[]	lpszBuffer;
 			}
-			delete[]	lpszBuffer;
-		} else {												// Load Cursor from DLL
+			else return FALSE;
+		} else {	
 			HMODULE	hMod = NULL;
 			if ((hMod = hCursorDllLoad()) == NULL)	return FALSE;
 			fuLoad = (LR_VGACOLOR | LR_DEFAULTSIZE | LR_DEFAULTCOLOR | LR_CREATEDIBSECTION);
@@ -1208,11 +820,12 @@ BOOL		CCursor::bSetSystemCursor(LPMOUSECURSOR lpstMC, int iCursorSizeX, int iCur
 				if (!bCursorDllUnload()) return FALSE;
 				return FALSE;
 			}
+			// Unload Cursor data DLL
 			if (!bCursorDllUnload()) return FALSE;
 		}
 	}
 	if (!SetSystemCursor(hCur, lpstMC->id))		return FALSE;
-	DestroyCursor(hCur);
+	DestroyCursor(hCur);	
 	return TRUE;
 }
 
@@ -1231,12 +844,11 @@ CCursorWindow::CCursorWindow()
 CCursorWindow::~CCursorWindow()
 {
 	if (hCursorWindow != NULL)	 {
-		DestroyWindow(hCursorWindow);
-		UnregisterClass(lpszWindowClass, (HINSTANCE)GetWindowLongPtr(hCursorWindow, GWLP_HINSTANCE));
+		PostMessage(hCursorWindow, WM_DESTROY, (WPARAM)0, (LPARAM)0);
 		hCursorWindow = NULL;
 	}
 	if (lpszWindowClass != NULL) {
-		delete[]	lpszWindowClass;
+		delete []	lpszWindowClass;
 		lpszWindowClass = NULL;
 	}
 }
@@ -1248,20 +860,23 @@ BOOL		CCursorWindow::bRegister(HINSTANCE hInstance, LPCTSTR szWindowClassName, C
 {
 	if (hInstance == NULL)	return FALSE;
 	lpszWindowClass = new TCHAR[MAX_LOADSTRING];
-	ZeroMemory(lpszWindowClass, MAX_LOADSTRING);
-	_tcsncpy_s(lpszWindowClass, MAX_LOADSTRING, szWindowClassName, _TRUNCATE);
+	if (lpszWindowClass) {
+		ZeroMemory(lpszWindowClass, MAX_LOADSTRING);
+		_tcsncpy_s(lpszWindowClass, MAX_LOADSTRING, szWindowClassName, _TRUNCATE);
 
-	dwTextColor = dwRGB;
-	if (dwRGB & 0x00000100)	dwBackColor = dwRGB & 0xfffffeff;
-	else dwBackColor = dwRGB | 0x00000100;
+		dwTextColor = dwRGB;
+		if (dwRGB & 0x00000100)	dwBackColor = dwRGB & 0xfffffeff;
+		else dwBackColor = dwRGB | 0x00000100;
 
-	if (!MyRegisterClass(hInstance)) {
-		return FALSE;
-	}
-	if ((hCursorWindow = InitInstance(hInstance, SW_HIDE)) == NULL) {
-		return FALSE;
+		if (!MyRegisterClass(hInstance)) {
+			return FALSE;
+		}
+		if ((hCursorWindow = InitInstance(hInstance, SW_HIDE)) == NULL) {
+			return FALSE;
+		}
+		return TRUE;
 	}
-	return TRUE;
+	return FALSE;
 }
 
 //
@@ -1291,22 +906,22 @@ ATOM CCursorWindow::MyRegisterClass(HINSTANCE hInstance)
 #define CLASSSTYLE (CS_HREDRAW | CS_VREDRAW | CS_NOCLOSE)
 	WNDCLASSEX wcex{};
 	wcex.cbSize = sizeof(WNDCLASSEX);
-	wcex.style = CLASSSTYLE;						// クラススタイル
-	wcex.lpfnWndProc = WndProc;						// Window Proc.
-	wcex.cbClsExtra = 0;							// クラスの補足データなし
-	wcex.cbWndExtra = 0;							// ウィンドウの補足データなし
-	wcex.hInstance = hInstance;						// クラスのウィンドウハンドル
-	wcex.hIcon = NULL;								// アイコンハンドル
-	wcex.hCursor = LoadCursor(NULL, IDC_ARROW);		// マウスカーソルハンドル
-	wcex.hbrBackground = NULL;						// ウィンドウ背景色
-	wcex.lpszMenuName = NULL;						// デフォルトメニュー名
-	wcex.lpszClassName = lpszWindowClass;			// このウインドウクラスにつける名前
-	wcex.hIconSm = NULL;							// 16×16の小さいサイズのアイコン
+	wcex.style = CLASSSTYLE;	
+	wcex.lpfnWndProc = WndProc;
+	wcex.cbClsExtra = 0;	
+	wcex.cbWndExtra = 0;	
+	wcex.hInstance = hInstance;
+	wcex.hIcon = NULL;
+	wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wcex.hbrBackground = NULL;
+	wcex.lpszMenuName = NULL;
+	wcex.lpszClassName = lpszWindowClass;
+	wcex.hIconSm = NULL;	
 
 	ATOM		atom = 0;
 	if ((atom = RegisterClassEx(&wcex)) == 0) {
 		_Post_equals_last_error_ DWORD err = GetLastError();
-		if (err == 1410)		return 1;			// non error
+		if (err == 1410)		return 1;
 	}
 	return atom;
 }
@@ -1319,20 +934,20 @@ HWND CCursorWindow::InitInstance(HINSTANCE hInstance, int nCmdShow)
 #define		EX_WINDOWSTYLE	(WS_EX_LAYERED | WS_EX_NOACTIVATE)
 #define		WINDOWSTYLE		(WS_POPUP)
 
-	HWND		hWnd = NULL;						// ウィンドウのハンドル
+	HWND		hWnd = NULL;	
 	hWnd = CreateWindowEx(
-					EX_WINDOWSTYLE,					// 拡張ウィンドウスタイル
-					lpszWindowClass,				// RegisterClass()呼び出しを参照
-					NULL,							// Title barのテキスト
-					WINDOWSTYLE,					// Window style
-					0, 0,							// 水平・垂直位置
-					0, 0,							// 幅・高さ
-					NULL,							// 親オーバーラップウィンドウ
-					NULL,							// ウィンドウクラスのメニューを使う
-					hInstance,						// 所有インスタンス
-					this);							// 自分のポインタを渡す
+					EX_WINDOWSTYLE,
+					lpszWindowClass,	
+					NULL,
+					WINDOWSTYLE,	
+					0, 0,
+					0, 0,
+					NULL,
+					NULL,
+					hInstance,
+					this);
 	if (!hWnd) {
-		return NULL;								// ウィンドウを作成できなかったときはNULLを返す
+		return NULL;	
 	}
 	ShowWindow(hWnd, nCmdShow);
 	UpdateWindow(hWnd);
@@ -1409,22 +1024,22 @@ void		CCursorWindow::Cls_OnPaint(HWND hWnd)
 		RECT		rc{};
 		if (GetClientRect(hWnd, &rc)) {
 			HBRUSH	hBrush = NULL;
-			if ((hBrush = CreateSolidBrush(dwBackColor & 0x00ffffff)) != NULL) {								// 背景色を設定
+			if ((hBrush = CreateSolidBrush(dwBackColor & 0x00ffffff)) != NULL) {	
 				if (SelectObject(hDC, hBrush) != HGDI_ERROR) {
 					if (FillRect(hDC, &rc, hBrush) != 0) {
 						if (SetBkMode(hDC, TRANSPARENT) != 0) {
 							COLORREF	dwColorPrev = 0;
-							if ((dwColorPrev = SetTextColor(hDC, dwTextColor & 0x00ffffff)) != CLR_INVALID) {	// 文字色を設定
+							if ((dwColorPrev = SetTextColor(hDC, dwTextColor & 0x80ffffff)) != CLR_INVALID) {
 								int	iBkModePrev = 0;
-								if ((iBkModePrev = SetBkMode(hDC, TRANSPARENT)) != 0) {							// 背景モードを設定
+								if ((iBkModePrev = SetBkMode(hDC, TRANSPARENT)) != 0) {
 									if (lpszMode != NULL) {
 										HFONT	hFont = NULL;
 										DWORD	dwUnderline = 0;
 										if (GetKeyState(VK_CAPITAL) & 0x0001) dwUnderline = TRUE;	else dwUnderline = FALSE;
 #define	FONT	_T("Yu Gothic UI")
 										if ((hFont = CreateFont((rc.bottom - rc.top), (rc.right - rc.left) / 2, 0, 0, FW_BOLD, FALSE, dwUnderline, FALSE,
-											SHIFTJIS_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS,
-											PROOF_QUALITY, FIXED_PITCH, FONT)) != NULL) {
+																		SHIFTJIS_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS,
+																					PROOF_QUALITY, FIXED_PITCH, FONT)) != NULL) {
 											HFONT	hFontPrev = NULL;
 											if ((hFontPrev = (HFONT)SelectObject(hDC, hFont)) != NULL) {
 												if (DrawTextEx(hDC, lpszMode, -1, &rc, DT_RIGHT | DT_SINGLELINE | DT_VCENTER, NULL) == 0) {

--- a/FlushMouse/Cursor.h
+++ b/FlushMouse/Cursor.h
@@ -1,15 +1,18 @@
-// Cursor.h
+//
+// Cursor.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/03/12  JeffyTS  	New edit.
+// #0000		2022/03/12  JeffyTS  	New edit.
+//
 
 //
 // Include
 //
 #pragma once
 #include "CommonDef.h"
+#include "Ime.h"
 #include "..\FlushMouseCursor\Resource.h"
 #include "..\MiscLIB\CThread.h"
 
@@ -18,17 +21,6 @@
 //
 #define	IMEMODECHAR		3
 
-// IME mode
-#define IMECLOSE		0x0000
-#define IMEOPEN			0x0001
-#define IMEOFF			(IME_CMODE_ALPHANUMERIC)														// 0x00 : A 英数(直接入力)
-#define HANEISU_IMEON	(IME_CMODE_ROMAN | IME_CMODE_ALPHANUMERIC)										// 0x10 :_A 半角英数 0001 0000
-#define HANKANA_IMEON	(IME_CMODE_ROMAN | IME_CMODE_KATAKANA | IME_CMODE_NATIVE)						// 0x13 :_ｶ 半角カナ 0001 0011
-#define ZENEISU_IMEON	(IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE)											// 0x18 :Ａ 全角英数 0001 1000
-#define ZENHIRA_IMEON	(IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE)						// 0x19 :あ 全角ひら 0001 1001（漢字変換モード)
-#define ZENKANA_IMEON	(IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA | IME_CMODE_NATIVE)	// 0x1B :カ 全角カナ 0001 1011
-#define IMEHIDE			(0x88)																			// 0x88 :■  Hide    1001 1000
-
 #ifndef OCR_NORMAL
 #define OCR_NORMAL			32512		// IDC_ARROW	 (WinUser.h)
 #endif // !OCR_NORMAL
@@ -49,14 +41,14 @@
 #define OCR_NO              32648
 #if(WINVER >= 0x0500)
 #ifndef OCR_HAND
-#define OCR_HAND			32649		// IDC_HAND (WinUser.h)
+#define OCR_HAND				32649		// IDC_HAND (WinUser.h)
 #endif // !OCR_HAND
 #endif /* WINVER >= 0x0500 */
 #ifndef OCR_HELP
 #if(WINVER >= 0x0400)
 #define OCR_APPSTARTING     32650
 #endif /* WINVER >= 0x0400 */
-#define	OCR_HELP			32651		// IDC_HELP (WinUser.h)
+#define	OCR_HELP				32651		// IDC_HELP (WinUser.h)
 #endif // !OCR_HELP
 #ifndef OCR_PIN
 #define OCR_PIN				32671		// IDC_PIN (WinUser.h)
@@ -64,70 +56,62 @@
 #ifndef OCR_PERSON
 #define	OCR_PERSON			32672		// IDC_PERSON (WinUser.h)	
 #endif // !OCR_PERSON
-#define	OCR_HIDE			32896		// Hide Cursor
+#define	OCR_HIDE				32896		// Hide Cursor
 
 //
 // Struct Define
 //
 typedef struct tagMOUSECURSOR {
-	DWORD		id;								// OCR_xxx
-	UINT		uResourceID;					// Resource ID
-	BOOL		bReadReg;						// TRUE = Read from Registry
-	TCHAR		szRegValue[MAX_LOADSTRING];		// Registry Value
-	TCHAR		szFile[_MAX_PATH];				// Cursor File Name
+	DWORD		id;	
+	UINT			uResourceID;
+	BOOL			bReadReg;
+	TCHAR		szRegValue[MAX_LOADSTRING];
+	TCHAR		szFile[_MAX_PATH];
 } MOUSECURSOR, * PMOUSECURSOR, * LPMOUSECURSOR;
 
 typedef struct tagFLUSHMOUSECURSOR {
-	UINT		dwIMEMode;						// IME Mode ID
-	TCHAR		szMode[IMEMODECHAR];			// Mode Display Char
-	MOUSECURSOR	stArrow;						// Arrow MOUSECURSOR
-	MOUSECURSOR	stHand;							// Hand MOUSECURSOR
-	MOUSECURSOR	stIBeam;						// IBeam MOUSECURSOR
+	DWORD		dwIMEMode;
+	TCHAR		szMode[IMEMODECHAR];	
+	MOUSECURSOR	stArrow;	
+	MOUSECURSOR	stHand;
+	MOUSECURSOR	stIBeam;	
 } FLUSHMOUSECURSOR, * PFLUSHMOUSECURSOR, * LPFLUSHMOUSECURSOR;
 
 typedef struct tagIMECursorData
 {
-	// Use in Cursor
-	HWND		hWndObserved;
+	HWND			hWndObserved;
 	DWORD		dwIMEModeCursor;
-	BOOL		bDrawIMEModeWait;
+	//DWORD		dwIMEModeCaret;
+	BOOL			bDrawIMEModeWait;
 	LPCTSTR		lpszLoadDatName;
 	LPFLUSHMOUSECURSOR	lpstFlushMouseCursor;
 
-	// Use in Cursor from Registry
 	int			iCursorSize;
 	int			iModeSize;
 	DWORD		dwInThreadSleepTime;
 	DWORD		dwWaitWaveTime;
 	DWORD		dwDisplayModeTime;
-	BOOL		bDisplayIMEModeOnCursor;
-	BOOL		bForceHiragana;
-	BOOL		bDrawNearCaret;
-	COLORREF	dwNearDrawCaretColor;
-	COLORREF	dwNearDrawMouseColor;
-
-	BOOL		bDenyChangedByApp;
-	BOOL		bUseBigArrow;
-	BOOL		bDisplayFocusWindowIME;
-
-	// Work data for Caret
-	HWND		hWnd;
-	RECT		rcCaret;
+	BOOL			bDisplayIMEModeOnCursor;
+	BOOL			bForceHiragana;
+	BOOL			bDrawNearCaret;
+	COLORREF		dwNearDrawCaretColor;
+	COLORREF		dwNearDrawMouseColor;
+
+	BOOL			bDenyChangedByApp;
+	BOOL			bUseBigArrow;
+	BOOL			bDisplayFocusWindowIME;
+
+	HWND			hWnd;
+	RECT			rcCaret;
 } IMECURSORDATA, * PIMECURSORDATA, * LPIMECURSORDATA;
 
-typedef struct tagVirtualDesktop
-{
-	RECT	rcMonitorSize;
-	int		iNumOfMonitors;
-} VIRTUALDESKTOP, * PVIRTUALDESKTOP, * LPVIRTUALDESKTOP;
-
 //
 // Class CCursorWindow
 //
 class CCursorWindow
 {
 public:
-	CCursorWindow();	
+	CCursorWindow();
 	~CCursorWindow();
 
 public:
@@ -140,6 +124,7 @@ private:
 	HWND			InitInstance(HINSTANCE hInstance, int nCmdShow);
 	static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
 	LRESULT CALLBACK _WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+
 	BOOL			Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct);
 	void			Cls_OnDestroy(HWND hWnd);
 	void			Cls_OnPaint(HWND hWnd);
@@ -147,45 +132,11 @@ private:
 public:
 
 private:
-	LPTSTR			lpszWindowClass;
+	LPTSTR		lpszWindowClass;
 	HWND			hCursorWindow;
-	LPTSTR			lpszMode;
+	LPTSTR		lpszMode;
 	COLORREF		dwTextColor;
 	COLORREF		dwBackColor;
-
-};
-
-//
-// Class CIME
-//
-class CIME
-{
-public:
-	CIME();
-	~CIME();
-
-public:
-	BOOL			bIsIMEOpen(HWND hWndObserved);
-	VOID			vIMEOpenCloseForced(HWND hWndObserved, DWORD dwIMEOpenClose);
-	VOID			vIMEConvertModeChangeForced(HWND hWndObserved, DWORD dwConvertMode);
-	DWORD			dwIMEMode(HWND hWndObserved, BOOL bForceHiragana);
-	VOID			vActivateIME(HWND hWndObserved);
-	BOOL			bMoveIMEToolbar();
-	BOOL			bGetVirtualDesktopSize();
-	BOOL			bIsNewIME();
-	DWORD			dwGetInputLocale();
-	HKL				hklGetInputLocale(HWND hWndObserved);
-
-private:
-	BOOL			bExistIMEToolbar();
-	static BOOL 	bGetVirtualDesktopSizeEnumProc(HMONITOR hMonitor, HDC hDC, LPCRECT lprcClip, LPARAM lParam);
-
-	static BOOL CALLBACK bEnumChildProcIMEOpenClose(HWND hWnd, LPARAM lParam);
-	static BOOL CALLBACK bEnumChildProcIMEConvertMode(HWND hWnd, LPARAM lParam);
-	static BOOL CALLBACK bEnumChildProcActivateIME(HWND hWnd, LPARAM lParam);
-
-private:
-	LPVIRTUALDESKTOP	lpstVirtualDesktop;
 };
 
 //
@@ -202,15 +153,17 @@ public:
 	BOOL			bStartIMECursorChangeThread(HWND hWndObserved);
 	BOOL			bStartDrawIMEModeThread(HWND hWndObserved);
 	BOOL			bStartDrawIMEModeThreadWait(HWND hWndObserved);
+	BOOL			bStartDrawIMEModeThreadWaitEventForeGround(HWND hWndObserved);
 	BOOL			bStartDrawIMEModeThreadWaitDblClk(HWND hWndObserved);
+
 	BOOL			bShowHideCursor(HWND hWndObserved, BOOL bShow);
 	BOOL			bGetCaretPos(HWND hWnd, LPPOINT lpCaretPos);
 
 private:
 	BOOL			_bStartDrawIMEModeThread(HWND hWndObserved);
 
-	LPTSTR			lpszGetCursorDataName();
-	HMODULE			hCursorDllLoad();
+	LPTSTR		lpszGetCursorDataName();
+	HMODULE		hCursorDllLoad();
 	BOOL			bCursorDllUnload();
 	BOOL			bSystemCursorLoad();
 
@@ -222,10 +175,9 @@ private:
 	BOOL			bDrawIMEModeOnDisplay(LPIMECURSORDATA lpstCursorData);
 	BOOL			_bCalcDispModeRect(int iModeSizeX, int iModeSizeY, LPRECT lpRect);
 	HWND			_hGetCaretPosByAccessibleObjectFromWindow(HWND hForeWnd, LPRECT lprcCaret);
-	HWND			_hGetCaretPosByGuiThreadInfo(HWND hForeWnd, LPRECT lpRect);
 	BOOL			_bAdjustCaretByMonitorDPI(int iModeSizeX, int iModeSizeY, LPRECT lprcCaret);
 	BOOL			bDrawIMEModeOnDisplaySub(LPIMECURSORDATA lpstCursorData);
-	static BOOL		bIconDrawEnumProc(HMONITOR hMonitor, HDC hDC, LPCRECT lprcClip, LPARAM lParam);
+	static BOOL	bIconDrawEnumProc(HMONITOR hMonitor, HDC hDC, LPCRECT lprcClip, LPARAM lParam);
 	static BOOL WINAPI	bDrawIMEModeRoutine(LPVOID lpvParam);
 
 	BOOL			bGetMouseRegValue(LPCTSTR szValue, LPTSTR szFile);
@@ -237,66 +189,66 @@ public:
 private:
 	IMECURSORDATA	stIMECursorData;
 
-	HWND			hMainWnd;
+	HWND				hMainWnd;
 	HMODULE			hModDll;
 	int				iCursorDataLoadCount;
 
-	CThread* IMECursorChangeThread;
-	CThread* DrawIMEModeThread;
-	CThread* DrawIMEModeCaretThread;
-	CCursorWindow* CursorWindow;
-	CCursorWindow* CaretWindow;
-
-	MOUSECURSOR	stAllMouseCursor[sizeof(MOUSECURSOR) * 19] = {
-	{ OCR_APPSTARTING, 0, TRUE,  _T("AppStarting"), _T("") },
-	{ OCR_NORMAL,	   0, FALSE, _T("Arrow"),		_T("") },
-	{ OCR_CROSS,	   0, TRUE,  _T("Crosshair"),	_T("") },
-	{ OCR_HAND,		   0, FALSE, _T("Hand"),	    _T("") },
-	{ OCR_HELP,		   0, TRUE,  _T("Help"),	    _T("") },
-	{ OCR_IBEAM,	   0, FALSE, _T("IBeam"),		_T("") },
-	{ OCR_NO,		   0, TRUE,  _T("No"),			_T("") },
-	// { OCR_NWPEN,	   0, TRUE,  _T("NWPen"),		_T("") },
-	// { OCR_PEN,		   0, TRUE,  _T("Pen"),		    _T("") },
-	{ OCR_PERSON,	   0, TRUE,  _T("Person"),		_T("") },
-	{ OCR_PIN,		   0, TRUE,  _T("Pin"),		    _T("") },
-	{ OCR_SIZEALL,	   0, TRUE,  _T("SizeAll"),	    _T("") },
-	{ OCR_SIZENESW,	   0, TRUE,  _T("SizeNESW"),    _T("") },
-	{ OCR_SIZENS,	   0, TRUE,  _T("SizeNS"),		_T("") },
-	{ OCR_SIZENWSE,	   0, TRUE,  _T("SizeNWSE"),    _T("") },
-	{ OCR_SIZEWE,	   0, TRUE,  _T("SizeWE"),		_T("") },
-	{ OCR_UP,		   0, TRUE,  _T("UpArrow"),	    _T("") },
-	{ OCR_WAIT,		   0, TRUE,  _T("Wait"),	    _T("") },
-	{ OCR_HIDE,		   0, TRUE,  _T("Hide"),	    _T("") },
-	{ (DWORD)(-1), 	   0, FALSE, _T(""),		    _T("") }		// Terminater
+	CThread*			IMECursorChangeThread;
+	CThread*			DrawIMEModeThread;
+	CThread*			DrawIMEModeCaretThread;
+	CCursorWindow*	CursorWindow;
+	CCursorWindow*	CaretWindow;
+
+	MOUSECURSOR	stAllMouseCursor[sizeof(MOUSECURSOR) * 20] = {
+		{ OCR_APPSTARTING, 0, TRUE,  _T("AppStarting"), _T("") },
+		{ OCR_NORMAL,	   0, FALSE, _T("Arrow"),		_T("") },
+		{ OCR_CROSS,		   0, TRUE,  _T("Crosshair"),	_T("") },
+		{ OCR_HAND,		   0, FALSE, _T("Hand"),		    _T("") },
+		{ OCR_HELP,		   0, TRUE,  _T("Help"),		    _T("") },
+		{ OCR_IBEAM,		   0, FALSE, _T("IBeam"),		_T("") },
+		{ OCR_NO,		   0, TRUE,  _T("No"),			_T("") },
+		// { OCR_NWPEN,	   0, TRUE,  _T("NWPen"),		_T("") },
+		// { OCR_PEN,      0, TRUE,  _T("Pen"),		    _T("") },
+		{ OCR_PERSON,	   0, TRUE,  _T("Person"),		_T("") },
+		{ OCR_PIN,		   0, TRUE,  _T("Pin"),		    _T("") },
+		{ OCR_SIZEALL,	   0, TRUE,  _T("SizeAll"),	    _T("") },
+		{ OCR_SIZENESW,	   0, TRUE,  _T("SizeNESW"),    _T("") },
+		{ OCR_SIZENS,	   0, TRUE,  _T("SizeNS"),		_T("") },
+		{ OCR_SIZENWSE,	   0, TRUE,  _T("SizeNWSE"),    _T("") },
+		{ OCR_SIZEWE,	   0, TRUE,  _T("SizeWE"),		_T("") },
+		{ OCR_UP,		   0, TRUE,  _T("UpArrow"),	    _T("") },
+		{ OCR_WAIT,		   0, TRUE,  _T("Wait"),		    _T("") },
+		{ OCR_HIDE,		   0, TRUE,  _T("Hide"),		    _T("") },
+		{ (DWORD)(-1), 	   0, FALSE, _T(""),			    _T("") }
 	};
 
-	FLUSHMOUSECURSOR	stFlushMouseCursor[sizeof(FLUSHMOUSECURSOR) * 7] = {
-		{ IMEOFF,			_T("A"),	{OCR_NORMAL, IDC_IMEOFF_ARROW,		  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeOffArrow.cur")},
+	FLUSHMOUSECURSOR	stFlushMouseCursor[sizeof(FLUSHMOUSECURSOR) * 8] = {
+		{ IMEOFF,			_T("A"),		{OCR_NORMAL, IDC_IMEOFF_ARROW,		  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeOffArrow.cur")},
 										{OCR_HAND,   IDC_IMEOFF_HAND,		  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeOffHand.cur")},
 										{OCR_IBEAM,  IDC_IMEOFF_IBEAM,		  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeOffIBeam.cur")}},
-		{ ZENHIRA_IMEON,	_T("あ"),	{OCR_NORMAL, IDC_ZENHIRA_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenHiraOnArrow.cur")},
+		{ ZENHIRA_IMEON,		_T("あ"),	{OCR_NORMAL, IDC_ZENHIRA_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenHiraOnArrow.cur")},
 										{OCR_HAND,   IDC_ZENHIRA_IMEON_HAND,  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenHiraOnHand.cur")},
 										{OCR_IBEAM,  IDC_ZENHIRA_IMEON_IBEAM, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenHiraOnIBeam.cur")}},
-		{ HANEISU_IMEON,	_T("_A"),	{OCR_NORMAL, IDC_HANEISU_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanEisuOnArrow.cur")},
+		{ HANEISU_IMEON,		_T("_A"),	{OCR_NORMAL, IDC_HANEISU_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanEisuOnArrow.cur")},
 										{OCR_HAND,   IDC_HANEISU_IMEON_HAND,  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanEisuOnHand.cur")},
 										{OCR_IBEAM,  IDC_HANEISU_IMEON_IBEAM, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanEisuOnIBeam.cur")}},
-		{ HANKANA_IMEON,	_T("_ｱ"),	{OCR_NORMAL, IDC_HANKANA_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanKanaOnArrow.cur")},
+		{ HANKANA_IMEON,		_T("_ｱ"),	{OCR_NORMAL, IDC_HANKANA_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanKanaOnArrow.cur")},
 										{OCR_HAND,   IDC_HANKANA_IMEON_HAND,  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanKanaOnHand.cur")},
 										{OCR_IBEAM,  IDC_HANKANA_IMEON_IBEAM, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeHanKanaOnIBeam.cur")}},
-		{ ZENEISU_IMEON,	_T("Ａ"),	{OCR_NORMAL, IDC_ZENEISU_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenEisuOnArrow.cur")},
+		{ ZENEISU_IMEON,		_T("Ａ"),	{OCR_NORMAL, IDC_ZENEISU_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenEisuOnArrow.cur")},
 										{OCR_HAND,   IDC_ZENEISU_IMEON_HAND,  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenEisuOnHand.cur")},
 										{OCR_IBEAM,  IDC_ZENEISU_IMEON_IBEAM, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenEisuOnIBeam.cur")}},
-		{ ZENKANA_IMEON,	_T("ア"),	{OCR_NORMAL, IDC_ZENKANA_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenKanaOnArrow.cur")},
+		{ ZENKANA_IMEON,		_T("ア"),	{OCR_NORMAL, IDC_ZENKANA_IMEON_ARROW, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenKanaOnArrow.cur")},
 										{OCR_HAND,   IDC_ZENKANA_IMEON_HAND,  FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenKanaOnHand.cur")},
 										{OCR_IBEAM,  IDC_ZENKANA_IMEON_IBEAM, FALSE, _T(""), _T("%APPDATA%\\JeffyTS\\FlushMouse\\ImeZenKanaOnIBeam.cur")}},
 		{ 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")}},
-		{ (DWORD)(-1),		_T(""),		{0,			 0,						  FALSE, _T(""), _T("")},		// Terminater
-										{0,			 0,						  FALSE, _T(""), _T("")},		// Terminater
-										{0,			 0,						  FALSE, _T(""), _T("")} }		// Terminater
+		{ (DWORD)(-1),		_T(""),		{0,			 0,						  FALSE, _T(""), _T("")},
+										{0,			 0,						  FALSE, _T(""), _T("")},
+										{0,			 0,						  FALSE, _T(""), _T("")} }
 	};
-
 };
 
+
 /* = EOF = */
\ No newline at end of file

--- a/FlushMouse/FlushMouse.cpp
+++ b/FlushMouse/FlushMouse.cpp
@@ -1,4 +1,5 @@
-// FlushMouse.cpp
+//
+// FlushMouse.cpp
 //		for Windows10/11 Win32 API msi Packaage App.
 //		Copyright (C) 1993 JeffyTS
 //
@@ -7,8 +8,8 @@
 //      
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	1993/11/17  JeffyTS  	New edit.
-// #0001	2022/02/04  JeffyTS		Visual Studio 2022 (C++)へ移植
+// #0000		1993/11/17  JeffyTS  	New edit.
+// #0001		2022/02/04  JeffyTS		Visual Studio 2022 (C++)へ移植
 //
 
 //
@@ -21,6 +22,7 @@
 #include "..\version.h"
 #include "FlushMouseLIB.h"
 #include "Resource.h"
+#include "TaskTray.h"
 #include "..\FlushMouseDLL\EventlogDll.h"
 
 #if defined _DEBUG
@@ -41,8 +43,8 @@
 // Global Data
 //
 // Hook
-TCHAR		szFlushMouse64[] = _T("FlushMouseDLL.dll");
-TCHAR		szFlushMouse32[] = _T("FlushMouse32.exe");
+TCHAR		szFlushMouseDLL[] = FLUSHMOUSE_DLL;
+TCHAR		szFlushMouse32[] = FLUSHMOUSE32_EXE;
 
 //
 // Local Data

--- a/FlushMouse/FlushMouse.h
+++ b/FlushMouse/FlushMouse.h
@@ -1,10 +1,11 @@
-// FlushMouse.h
+//
+// FlushMouse.h
 //		Copyright (C) 1993 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	1993/11/17  JeffyTS  	New edit.
-// #0001	2022/02/04  JeffyTS		Visual Studio 2022 (C++)へ移植
+// #0000		1993/11/17  JeffyTS  	New edit.
+// #0001		2022/02/04  JeffyTS		Visual Studio 2022 (C++)へ移植
 //
 
 //
@@ -23,5 +24,8 @@
 //
 // Global Data
 //
+extern TCHAR			szFlushMouseDLL[];
+extern TCHAR			szFlushMouse32[];
+
 
 /* = EOF = */
\ No newline at end of file

--- a/FlushMouse/FlushMouse.vcxproj
+++ b/FlushMouse/FlushMouse.vcxproj
@@ -218,18 +218,22 @@
     <ClInclude Include="FlushMouseLIB.h" />
     <ClInclude Include="FlushMouseSub.h" />
     <ClInclude Include="framework.h" />
+    <ClInclude Include="Ime.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="Profile.h" />
     <ClInclude Include="Resource.h" />
     <ClInclude Include="targetver.h" />
+    <ClInclude Include="TaskTray.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FlushMouse.cpp" />
     <ClCompile Include="Cursor.cpp" />
     <ClCompile Include="FlushMouseLIB.cpp" />
     <ClCompile Include="FlushMouseSub.cpp" />
+    <ClCompile Include="Ime.cpp" />
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="Profile.cpp" />
+    <ClCompile Include="TaskTray.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="FlushMouse.rc" />

--- a/FlushMouse/FlushMouse.vcxproj.filters
+++ b/FlushMouse/FlushMouse.vcxproj.filters
@@ -45,6 +45,12 @@
     <ClInclude Include="CommonDef.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="Ime.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
+    <ClInclude Include="TaskTray.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FlushMouse.cpp">
@@ -65,6 +71,12 @@
     <ClCompile Include="FlushMouseLIB.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="Ime.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
+    <ClCompile Include="TaskTray.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="FlushMouse.rc">

--- a/FlushMouse/FlushMouseLIB.cpp
+++ b/FlushMouse/FlushMouseLIB.cpp
@@ -1,9 +1,10 @@
+//
 // FlushMouseLIB.cpp
 //		Copyright (C) 1993 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/07/09  JeffyTS  	New edit.
+// #0000		2022/07/09  JeffyTS  	New edit.
 //
 
 //
@@ -14,6 +15,7 @@
 #include "FlushMouseLIB.h"
 #include "FlushMouseSub.h"
 #include "Cursor.h"
+#include "TaskTray.h"
 #include "Profile.h"
 #include "Resource.h"
 #include "CommonDef.h"
@@ -36,13 +38,13 @@
 // Global Data
 //
 // Hook
-TCHAR		szTitle[MAX_LOADSTRING]{};					// タイトル バーのテキスト
+TCHAR	szTitle[MAX_LOADSTRING]{};
 HWND		hMainWnd = NULL;
 
-CProfile	* Profile = NULL;							// Profile class
-CCursor		* Cursor = NULL;							// Cursor class
-CResource	* Resource = NULL;							// Resource class
-CIME		* Cime = NULL;								// IME class
+CProfile		*Profile = NULL;
+CCursor		*Cursor = NULL;	
+CResource	*Resource = NULL;
+CIME			*Cime = NULL;
 
 // Use in FlushMouse from Registry
 BOOL		bDisplayIMEModeOnCursor = TRUE;
@@ -62,24 +64,24 @@ BOOL		bIMEModeForced = FALSE;
 // Timer for Cursor
 #define FOCUSINITTIMERVALUE		200
 #define CHECKFOCUSTIMERID		1
-static UINT     nCheckFocusTimerTickValue = FOCUSINITTIMERVALUE;	// Timer tick
-static UINT_PTR nCheckFocusTimerID = CHECKFOCUSTIMERID;				// Timer ID
+static UINT     nCheckFocusTimerTickValue = FOCUSINITTIMERVALUE;
+static UINT_PTR nCheckFocusTimerID = CHECKFOCUSTIMERID;
 static UINT_PTR	uCheckFocusTimer = NULL;
 // Timer for Poc
 #define PROCINITTIMERVALUE		1000
 #define CHECKPROCTIMERID		2
-static UINT     nCheckProcTimerTickValue = PROCINITTIMERVALUE;		// Timer tick
-static UINT_PTR nCheckProcTimerID = CHECKPROCTIMERID;				// Timer ID
+static UINT     nCheckProcTimerTickValue = PROCINITTIMERVALUE;
+static UINT_PTR nCheckProcTimerID = CHECKPROCTIMERID;
 static UINT_PTR	uCheckProcTimer = NULL;
 
 // Hook
-static CFlushMouseHook* FlushMouseHook = NULL;
+static CFlushMouseHook		*FlushMouseHook = NULL;
 
-// Event Handler
-static CEventHook* EventHook = NULL;
+// Event Handler	
+static CEventHook			*EventHook = NULL;
 
 // for PowerNotification
-static CPowerNotification* PowerNotification = NULL;
+static CPowerNotification	*PowerNotification = NULL;
 
 //
 // Global Prototype Define
@@ -115,9 +117,9 @@ static void		Cls_OnCheckExistingJPIMEEx(HWND hWnd, BOOL bEPHelper);
 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 BOOL CALLBACK	bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam);
+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 BOOL CALLBACK		bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam);
 
 //
 //  bWinMain()
@@ -263,6 +265,9 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 {
 	UNREFERENCED_PARAMETER(lpCreateStruct);
 #define MessageBoxTYPE (MB_ICONSTOP | MB_OK)
+
+	hMainWnd = hWnd;
+
 	Cime = new CIME;
 	
 	Profile = new CProfile;
@@ -274,7 +279,6 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 
 	vGetSetProfileData();
 
-	// Create Task Tray
 	HICON	hIcon = NULL;
 	if ((hIcon = LoadIcon(Resource->hLoad(), MAKEINTRESOURCE(IDI_FLUSHMOUSE))) != NULL) {
 		if (bCreateTaskTrayWindow(hWnd, hIcon, szTitle) == FALSE) {
@@ -293,7 +297,6 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 		return FALSE;
 	}
 
-	// for PowerNotification
 	PowerNotification = new CPowerNotification(hWnd);
 	if (!PowerNotification) {
 		vMessageBox(hWnd, IDS_NOTRREGISTEVH, MessageBoxTYPE);
@@ -321,7 +324,14 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 //
 static void Cls_OnDestroy(HWND hWnd)
 {
+	vDestroyWindow(hWnd);
+}
 
+//
+// vDestroyWindow()
+//
+void		vDestroyWindow(HWND hWnd)
+{
 	vStopThreadHookTimer(hWnd);
 
 	SystemParametersInfo(SPI_SETCURSORS, 0, NULL, 0);
@@ -340,12 +350,6 @@ static void Cls_OnDestroy(HWND hWnd)
 		PowerNotification = NULL;
 	}
 
-	if (Resource != NULL) {
-		Resource->bUnload();
-		delete Resource;
-		Resource = NULL;
-	}
-
 	if (Cime != NULL) {
 		delete Cime;
 		Cime = NULL;
@@ -443,15 +447,11 @@ static void Cls_OnLButtonUpEx(HWND hWnd, int x, int y, HWND hForeground)
 	UNREFERENCED_PARAMETER(x);
 	UNREFERENCED_PARAMETER(y);
 	UNREFERENCED_PARAMETER(hForeground);
-	if (bMoveIMEToolbar && (GetAsyncKeyState(VK_MENU) & 0x8000) && (GetAsyncKeyState(VK_CONTROL) & 0x8000)) {
-		if (!Cime->bMoveIMEToolbar()) {
-		}
-	}
 	if (bDoModeDispByMouseBttnUp) {
 		HWND	hWndObserved = NULL;
 		POINT	pt{};
 		if (GetCursorPos(&pt)) {
-			RECT	rc{};
+			RECT		rc{};
 			if ((hWndObserved = WindowFromPoint(pt)) == NULL)	return;	
 			if (FindWindow(L"Shell_TrayWnd", NULL) == GetForegroundWindow()) {
 				if (bGetTaskTrayWindowRect(hWnd, &rc) == FALSE)	return;
@@ -482,12 +482,12 @@ static void		Cls_OnEventForegroundEx(HWND hWnd, DWORD dwEvent, HWND hForeWnd)
 	if (EventHook->hFormerWnd != hForeWnd) {
 		EventHook->hFormerWnd = hForeWnd;
 		if (hWnd != hForeWnd) {
-			HWND	hWndObserved = NULL;
+			HWND		hWndObserved = NULL;
+			POINT	pt{};
 			if (bDisplayFocusWindowIME) {
-				hWndObserved = hWnd;
+				hWndObserved = hForeWnd;
 			}
 			else {
-				POINT	pt{};
 				if (GetCursorPos(&pt)) {
 					if ((hWndObserved = WindowFromPoint(pt)) == NULL)	return;
 				}
@@ -502,14 +502,13 @@ static void		Cls_OnEventForegroundEx(HWND hWnd, DWORD dwEvent, HWND hForeWnd)
 				Cime->vIMEOpenCloseForced(hForeWnd, IMECLOSE);
 			}
 			if (!Cursor->bStartIMECursorChangeThread(hWndObserved))	return;
-			POINT	pt{};
 			if (GetCursorPos(&pt)) {
-				RECT	rc{};
-				if (FindWindow(L"Shell_TrayWnd", NULL) == GetForegroundWindow()) {
+				RECT		rc{};
+				if (FindWindow(L"Shell_TrayWnd", NULL) == hForeWnd) {
 					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->bStartDrawIMEModeThreadWait(hForeWnd))	return;
+				if (!Cursor->bStartDrawIMEModeThreadWaitEventForeGround(hForeWnd))	return;
 			}
 		}
 	}
@@ -524,7 +523,7 @@ static void		Cls_OnCheckIMEStartConvertingEx(HWND hWnd, BOOL bStartConverting, D
 	UNREFERENCED_PARAMETER(hWnd);
 	UNREFERENCED_PARAMETER(vkCode);
 
-	HWND	hWndObserved = GetForegroundWindow();
+	HWND		hWndObserved = GetForegroundWindow();
 	POINT	pt{};
 	if (Cursor->bGetCaretPos(hWndObserved, &pt)) {
 		if ((pt.x != 0) && (pt.y != 0)) {
@@ -532,7 +531,7 @@ static void		Cls_OnCheckIMEStartConvertingEx(HWND hWnd, BOOL bStartConverting, D
 		}
 	}
 	if (Cime->dwIMEMode(hWndObserved, FALSE) != IMEOFF)	bIMEInConverting = bStartConverting;
-	else												bIMEInConverting = FALSE;
+	else													bIMEInConverting = FALSE;
 }
 
 //
@@ -822,7 +821,7 @@ void		Cls_OnCheckExistingJPIMEEx(HWND hWnd, BOOL bEPHelper)
 //
 static BOOL		bKBisEP()
 {
-	if (GetKeyboardType(1) == 0) {		// EP Keyboard
+	if (GetKeyboardType(1) == 0) {
 		_Post_equals_last_error_ DWORD err = GetLastError();
 		if (err != 0) {
 		}
@@ -831,21 +830,19 @@ static BOOL		bKBisEP()
 		}
 	}
 
-	// 2nd Check
 	DWORD	dProcessID = 0;
 	DWORD	dThreadID = GetWindowThreadProcessId(GetForegroundWindow(), &dProcessID);
 	if (dThreadID != 0) {
 		HKL	hkl = GetKeyboardLayout(dThreadID);
-		if (hkl == US_ENG) {			// EP Keyboard
+		if (hkl == US_ENG) {	
 			return TRUE;
 		}
 	}
 
-	// 3rd Check
 #define SUBKEY	_T("SOFTWARE\\Microsoft\\Input\\Locales")
 #define VALUE	_T("InputLocale")
-	DWORD	dwInputLocale = 0;
-	CRegistry* CReg = new CRegistry;
+	DWORD		dwInputLocale = 0;
+	CRegistry	*CReg = new CRegistry;
 	if (CReg) {
 		if (!CReg->bReadSystemRegValueDWORD(HKEY_LOCAL_MACHINE, SUBKEY, VALUE, &dwInputLocale)) {
 		}
@@ -864,7 +861,7 @@ static BOOL		bKBisEP()
 BOOL		bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, BOOL bIMEModeForcedChange, LPHKL lpNewHKL, LPHKL lpPreviousHKL)
 {
 	if (hForeWnd == NULL)	return FALSE;
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	HKL		hkl = NULL;
 	HKL		hPreviousHKL = NULL;
 	DWORD	dwProcessID = 0;
@@ -912,7 +909,7 @@ BOOL		bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, BOOL bIMEModeForc
 //
 BOOL	bChangeHKLbySendInput(HKL hNewHKL, HKL hPreviousHKL)
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	int		iKBList = 0;
 	if ((iKBList = GetKeyboardLayoutList(0, NULL)) != 0) {
 		LPHKL	lpHKL = NULL;
@@ -960,7 +957,7 @@ BOOL	bChangeHKLbySendInput(HKL hNewHKL, HKL hPreviousHKL)
 //
 BOOL CALLBACK bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam)
 {
-	HWND	hIMWnd = NULL;
+	HWND		hIMWnd = NULL;
 	if (ActivateKeyboardLayout((HKL)lParam, KLF_SETFORPROCESS) != 0) {
 		if ((hIMWnd = ImmGetDefaultIMEWnd(hWnd)) != NULL) {
 			SendMessage(hIMWnd, WM_INPUTLANGCHANGEREQUEST, (WPARAM)INPUTLANGCHANGE_SYSCHARSET, lParam);
@@ -974,7 +971,7 @@ BOOL CALLBACK bEnumChildProcChangeHKL(HWND hWnd, LPARAM lParam)
 //
 BOOL		bCheckExistingJPIME()
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	LPHKL	lpHKL = NULL;
 	int		iKBList = 0;
 	if ((iKBList = GetKeyboardLayoutList(0, NULL)) != 0) {
@@ -991,8 +988,15 @@ BOOL		bCheckExistingJPIME()
 			if (lpHKL)	delete[]	lpHKL;
 		}
 	}
-	HWND	hWnd = FindWindow(CLASS_FLUSHMOUSE, NULL);
-	if (hWnd != NULL)	PostMessage(hWnd, WM_CHECKEXISTINGJPIMEEX, (WPARAM)bRet, (LPARAM)NULL);
+	HWND		hWnd = FindWindow(CLASS_FLUSHMOUSE, NULL);
+	if (hWnd != NULL) {
+		if (bEnableEPHelper) {
+			PostMessage(hWnd, WM_CHECKEXISTINGJPIMEEX, (WPARAM)bRet, (LPARAM)NULL);
+		}
+		else {
+			PostMessage(hWnd, WM_CHECKEXISTINGJPIMEEX, (WPARAM)FALSE, (LPARAM)NULL);
+		}
+	}
 	return bRet;
 }
 
@@ -1030,7 +1034,7 @@ BOOL		bStartThreadHookTimer(HWND hWnd)
 	// Register Hook
 	if (FlushMouseHook == NULL) {
 		FlushMouseHook = new CFlushMouseHook;
-		if (!FlushMouseHook->bHookSet(hWnd, szFlushMouse64, szFlushMouse32)) {
+		if (!FlushMouseHook->bHookSet(hWnd, szFlushMouseDLL, szFlushMouse32)) {
 			vMessageBox(hWnd, IDS_NOTREGISTERHOOK, MessageBoxTYPE);
 			PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
 			return FALSE;
@@ -1038,7 +1042,7 @@ BOOL		bStartThreadHookTimer(HWND hWnd)
 	}
 
 	// Set Timer
-	BOOL	bBool = FALSE;
+	BOOL		bBool = FALSE;
 	if (SetUserObjectInformation(GetCurrentProcess(), UOI_TIMERPROC_EXCEPTION_SUPPRESSION, &bBool, sizeof(BOOL)) != FALSE) {
 		// Set Timer for Cursor
 		if (uCheckFocusTimer == NULL) {
@@ -1159,14 +1163,39 @@ static VOID CALLBACK vCheckProcTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DW
 
 	if (uTimerID == nCheckProcTimerID) {
 		if (FindWindow(CLASS_FLUSHMOUSE32, NULL) == NULL) {
+			vDestroyWindow(hWnd);
 			bReportEvent(MSG_DETECT_FLUSHMOUSE_STOP, APPLICATION_CATEGORY);
+			bCreateProcess(FLUSHMOUSE_EXE);
 			bReportEvent(MSG_RESTART_EVENT, APPLICATION_CATEGORY);
-			PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
 		}
 	}
 }
 
 //
+// bCreateProcess()
+//
+BOOL	 	bCreateProcess(LPCTSTR lpszExecName)
+{
+	BOOL		bRet = FALSE;
+	DWORD	dwSize = 0;
+	dwSize = ExpandEnvironmentStrings(lpszExecName, NULL, 0);
+	LPTSTR	lpszBuffer = new TCHAR[dwSize];
+	if (lpszBuffer) {
+		ZeroMemory(lpszBuffer, dwSize);
+		dwSize = ExpandEnvironmentStrings(lpszExecName, lpszBuffer, dwSize);
+		PROCESS_INFORMATION	ProcessInfomation{};
+		STARTUPINFO	StartupInfo{};		StartupInfo.cb = sizeof(STARTUPINFO);
+		if (CreateProcess(lpszBuffer, NULL, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo, &ProcessInfomation) != FALSE) {
+			CloseHandle(ProcessInfomation.hProcess);
+			CloseHandle(ProcessInfomation.hThread);
+			bRet = TRUE;
+		}
+		delete[]		lpszBuffer;
+	}
+	return bRet;
+}
+
+//
 // Class CResource
 //
 CResource::CResource()

--- a/FlushMouse/FlushMouseLIB.h
+++ b/FlushMouse/FlushMouseLIB.h
@@ -32,7 +32,7 @@ private:
 
 public:
 	HMODULE	hLoad();
-	BOOL	bUnload();
+	BOOL		bUnload();
 
 private:
 	LPTSTR	szResFile;
@@ -45,18 +45,20 @@ private:
 // Global Prototype Define
 //
 extern BOOL			bWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance);
+extern VOID			vDestroyWindow(HWND hWnd);
 extern BOOL			bStartThreadHookTimer(HWND hWnd);
 extern VOID			vStopThreadHookTimer(HWND hWnd);
+extern BOOL	 		bCreateProcess(LPCTSTR lpszExecName);
 extern BOOL			bForExplorerPatcherSWS(HWND hForeWnd, BOOL bChangeToIME, BOOL bIMEModeForcedChange, LPHKL lpNewHKL, LPHKL lpPreviousHKL);
 extern BOOL			bCheckExistingJPIME();
 
 //
 // Global Data
 //
-extern TCHAR		szFlushMouse64[];
-extern TCHAR		szFlushMouse32[];
+extern TCHAR			szFlushMouseDLL[];
+extern TCHAR			szFlushMouse32[];
 
-extern TCHAR		szTitle[];
+extern TCHAR			szTitle[];
 extern HWND			hMainWnd;
 
 extern BOOL			bOffChangedFocus;
@@ -72,7 +74,7 @@ extern BOOL			bIMEModeForced;
 
 extern CProfile		*Profile;
 extern CCursor		*Cursor;
-extern CResource	*Resource;
+extern CResource		*Resource;
 extern CIME			*Cime;
 
 /* = EOF = */
\ No newline at end of file

--- a/FlushMouse/FlushMouseSub.cpp
+++ b/FlushMouse/FlushMouseSub.cpp
@@ -11,11 +11,10 @@
 //
 #pragma once
 #include "pch.h"
-#include "FlushMouseLIB.h"
 #include "FlushMouseSub.h"
+#include "FlushMouseLIB.h"
+#include "TaskTray.h"
 #include "CommonDef.h"
-#include "Profile.h"
-#include "Resource.h"
 #include "..\FlushMouseDLL\GlobalHookDll.h"
 #include "..\FlushMouseDLL\KeyboardHookDll.h"
 #include "..\FlushMouseDLL\EventlogDll.h"
@@ -29,501 +28,14 @@
 //
 // Global Data
 //
-HWND		hAboutDlg = NULL;
-HWND		hSettingDlg = NULL;
-BOOL		bIMEInConverting = FALSE;
 
 //
 // Local Data
 //
-static BOOL		bTaskTray = FALSE;
-static UINT		uTaskbarCreatedMessage = 0;
 
 //
 // Local Prototype Define
 //
-static INT_PTR CALLBACK SettingDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-static BOOL		bInitDlgCenter(HWND hDlg, HICON hIcon, DWORD dwICC);
-static BOOL		bSetCheckDlgButton(HWND hDlg, int iIDButton, BOOL bCheck);
-static VOID		vSetTrackbar(HWND hDlg, int iIDTrackbar, int iRangeMin, int iRangeMax, int iTickFreq, int iPos, int iPageSize);
-static BOOL		bGetDlgButtonChecked(HWND hDlg, int iIDButton);
-static DWORD	dwGetTrackbarPos(HWND hDlg, int iIDTrackbar);
-
-//
-// bCreateTaskTrayWindow()
-//
-BOOL		bCreateTaskTrayWindow(HWND hWnd, HICON hIcon, LPCTSTR lpszTitle)
-{
-	NOTIFYICONDATA   nIco{};
-	nIco.cbSize = sizeof(NOTIFYICONDATA);
-	nIco.hWnd = hWnd;
-	nIco.uID = NOTIFYICONDATA_ID;
-	nIco.guidItem = GUID_NULL;
-	nIco.uFlags = NIF_INFO | NIF_MESSAGE | NIF_ICON | NIF_TIP;
-	nIco.uCallbackMessage = WM_TASKTRAYEX;
-	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);
-	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;
-			}
-		}
-	}
-	catch (...) {
-		return FALSE;
-	}
-
-	if ((uTaskbarCreatedMessage = RegisterWindowMessage(_T("TaskbarCreated"))) == 0) {
-		bDestroyTaskTrayWindow(hWnd);
-		return FALSE;
-	}
-	bTaskTray = TRUE;
-	return TRUE;
-}
-
-//
-// bReCreateTaskTrayWindow()
-//
-BOOL		bReCreateTaskTrayWindow(HWND hWnd, UINT message)
-{
-	if (message == uTaskbarCreatedMessage) {
-		if (bDestroyTaskTrayWindow(hWnd)) {
-			bTaskTray = FALSE;
-		}
-		HICON	hIcon = NULL;
-		if ((hIcon = LoadIcon(Resource->hLoad(), MAKEINTRESOURCE(IDI_FLUSHMOUSE))) != NULL) {
-			if (bCreateTaskTrayWindow(hWnd, hIcon, szTitle) == FALSE) {
-				bTaskTray = TRUE;
-				vStopThreadHookTimer(hWnd);
-				if (!bStartThreadHookTimer(hWnd)) {
-					bReportEvent(MSG_THREAD_HOOK_TIMER_RESTART_FAILED, APPLICATION_CATEGORY);// Eventlog
-					PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
-				}
-				bReportEvent(MSG_THREAD_HOOK_TIMER_RESTARTED, APPLICATION_CATEGORY);
-				return TRUE;
-			}
-			else {
-				if (bDestroyTaskTrayWindow(hWnd)) {
-					bTaskTray = FALSE;
-				}
-				bReportEvent(MSG_TASKTRAY_REGISTER_FAILD, APPLICATION_CATEGORY);// Eventlog
-				bReportEvent(MSG_RESTART_EVENT, APPLICATION_CATEGORY);
-				return TRUE;
-			}
-		}
-		else {
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-//
-// bDestroyTaskTrayWindow()
-// 
-BOOL		bDestroyTaskTrayWindow(HWND hWnd)
-{
-	if (bTaskTray != FALSE) {
-		NOTIFYICONDATA nIco{};
-		nIco.cbSize = sizeof(NOTIFYICONDATA);
-		nIco.hWnd = hWnd;
-		nIco.uID = NOTIFYICONDATA_ID;
-		nIco.guidItem = GUID_NULL;
-		nIco.uFlags = 0;
-		try {
-			throw Shell_NotifyIcon(NIM_DELETE, &nIco);
-		}
-		catch (BOOL bRet) {
-			if (bRet) {
-				bTaskTray = FALSE;
-				return TRUE;
-			}
-			else {
-				return FALSE;
-			}
-		}
-		catch (...) {
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-//
-// bGetTaskTrayWindowRect()
-// 
-BOOL		bGetTaskTrayWindowRect(HWND hWnd, LPRECT lpRect)
-{
-	if (bTaskTray != FALSE) {
-		NOTIFYICONIDENTIFIER	nii{};
-		nii.cbSize = sizeof(NOTIFYICONIDENTIFIER);
-		nii.hWnd = hWnd;
-		nii.uID = NOTIFYICONDATA_ID;
-		nii.guidItem = GUID_NULL;
-		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 FALSE;
-}
-
-//
-// WM_TASKTRAYEX
-// Cls_OnTaskTrayEx()
-//
-void		Cls_OnTaskTrayEx(HWND hWnd, UINT id, UINT uMsg)
-{
-	if (id != NOTIFYICONDATA_ID) {
-		return;
-	}
-	switch (uMsg) {
-		case WM_LBUTTONDOWN:
-			if (bOffChangedFocus) {
-				Cime->vIMEOpenCloseForced(hWnd, IMECLOSE);
-			}
-			[[fallthrough]];						// fallthrough is explicit
-			//break;
-		case WM_RBUTTONDOWN:
-			bDisplayIMEModeOnCursor = FALSE;
-			bDoModeDispByMouseBttnUp = FALSE;
-			bDrawNearCaret = FALSE;
-
-			// Display menu when left & right button is clicked on task tray icon.
-			POINT pt{};
-			GetCursorPos(&pt);
-			HMENU hMenu = LoadMenu(Resource->hLoad(), MAKEINTRESOURCE(IDR_TT_MENU));
-			HMENU hSubMenu = GetSubMenu(hMenu, 0);
-			SetForegroundWindow(hWnd);
-			APPBARDATA stAppBarData{};
-			stAppBarData.cbSize = sizeof(APPBARDATA);
-			stAppBarData.hWnd = hWnd;
-			SHAppBarMessage(ABM_GETTASKBARPOS, &stAppBarData);
-			UINT		uFlags = 0;
-			switch (stAppBarData.uEdge) {
-				case ABE_TOP:
-					uFlags = TPM_RIGHTALIGN | TPM_TOPALIGN;
-					if (pt.y < stAppBarData.rc.bottom)	pt.y = stAppBarData.rc.bottom;
-					break;
-				case ABE_BOTTOM:
-					uFlags = TPM_RIGHTALIGN | TPM_BOTTOMALIGN;
-					if (pt.y > stAppBarData.rc.top)	pt.y = stAppBarData.rc.top;
-					break;
-				case ABE_LEFT:
-					uFlags = TPM_LEFTALIGN | TPM_BOTTOMALIGN;
-					if (pt.x < stAppBarData.rc.right)	pt.x = stAppBarData.rc.right;
-					break;
-				case ABE_RIGHT:
-					uFlags = TPM_RIGHTALIGN | TPM_BOTTOMALIGN;
-					if (pt.x > stAppBarData.rc.left)		pt.x = stAppBarData.rc.left;
-					break;
-			}
-			if (hAboutDlg != NULL) {
-				//EnableMenuItem(hSubMenu, IDR_TT_ABOUT, MF_BYCOMMAND | MF_DISABLED);
-			}
-			if (hSettingDlg != NULL) {
-				//EnableMenuItem(hSubMenu, IDR_TT_SETTING, MF_BYCOMMAND | MF_DISABLED);
-			}
-			TrackPopupMenu(hSubMenu, uFlags, pt.x, pt.y, 0, hWnd, NULL);
-			break;
-	}
-}
-
-//
-// vSettingDialog()
-//
-VOID		vSettingDialog(HWND hWnd)
-{
-	if (hSettingDlg != NULL) {
-		SetForegroundWindow(hSettingDlg);
-		return;
-	}
-	DialogBox(Resource->hLoad(), MAKEINTRESOURCE(IDD_SETTING), hWnd, SettingDlg);
-}
-
-//
-// SettingDlg()
-//
-static INT_PTR CALLBACK SettingDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-	UNREFERENCED_PARAMETER(lParam);
-	switch (message) {
-		case WM_INITDIALOG:
-			hSettingDlg = hDlg;
-			{	// Initialize
-				HICON	hIcon = (HICON)LoadImage(Resource->hLoad(), MAKEINTRESOURCE(IDI_SMALL), IMAGE_ICON, 16, 16, 0);
-				bInitDlgCenter(hDlg, hIcon, (ICC_BAR_CLASSES | ICC_HOTKEY_CLASS));
-			}
-			{	// Combo Box
-				TCHAR       lpText[MAX_LOADSTRING];
-				if (LoadString(Resource->hLoad(), IDS_CMBX_LIST01, lpText, MAX_LOADSTRING) == 0)		return (INT_PTR)FALSE;
-				SendDlgItemMessage(hDlg, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)lpText);
-				if (LoadString(Resource->hLoad(), IDS_CMBX_LIST02, lpText, MAX_LOADSTRING) == 0)		return (INT_PTR)FALSE;
-				SendDlgItemMessage(hDlg, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)lpText);
-			}
-			{	// Check Box
-				bSetCheckDlgButton(hDlg, IDC_CHECK1, Profile->lpstAppRegData->bDisplayIMEModeOnCursor);
-				bSetCheckDlgButton(hDlg, IDC_CHECK2, Profile->lpstAppRegData->bOffChangedFocus);
-				bSetCheckDlgButton(hDlg, IDC_CHECK3, Profile->lpstAppRegData->bForceHiragana);
-				bSetCheckDlgButton(hDlg, IDC_CHECK4, Profile->lpstAppRegData->bDoModeDispByIMEKeyDown);
-				bSetCheckDlgButton(hDlg, IDC_CHECK5, Profile->lpstAppRegData->bDoModeDispByMouseBttnUp);
-				bSetCheckDlgButton(hDlg, IDC_CHECK6, Profile->lpstAppRegData->bDoModeDispByCtrlUp);
-				bSetCheckDlgButton(hDlg, IDC_CHECK7, Profile->lpstAppRegData->bDrawNearCaret);
-				bSetCheckDlgButton(hDlg, IDC_CHECK8, Profile->lpstAppRegData->bEnableEPHelper);
-			}
-			{	// Track Bar
-				vSetTrackbar(hDlg, IDC_SLIDER1, 16, 64, 8, Profile->lpstAppRegData->iCursorSize, 8);
-				vSetTrackbar(hDlg, IDC_SLIDER2, 8, 64, 8, Profile->lpstAppRegData->iModeSize, 8);
-				vSetTrackbar(hDlg, IDC_SLIDER3, 100, 800, 70, Profile->lpstAppRegData->dwDisplayModeTime, 70);
-				vSetTrackbar(hDlg, IDC_SLIDER4, 0, 1000, 100, Profile->lpstAppRegData->dwWaitWaveTime, 100);
-				if (IsDlgButtonChecked(hDlg, IDC_CHECK3) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK4) == 0) {
-					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), FALSE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), FALSE);
-				}
-				else {
-					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), TRUE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), TRUE);
-				}
-				if (IsDlgButtonChecked(hDlg, IDC_CHECK4) != 0)	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), TRUE);
-				else EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), FALSE);
-			}
-			{	// 既定の動作
-				if (Profile->lpstAppRegData->bDisplayFocusWindowIME) {
-					SendDlgItemMessage(hDlg, IDC_COMBO1, CB_SETCURSEL, 0, 0);
-					//EnableWindow(GetDlgItem(hDlg, IDC_CHECK2), TRUE);
-				}
-				else {
-					SendDlgItemMessage(hDlg, IDC_COMBO1, CB_SETCURSEL, 1, 0);
-					//CheckDlgButton(hDlg, IDC_CHECK2, BST_UNCHECKED);
-					//EnableWindow(GetDlgItem(hDlg, IDC_CHECK2), FALSE);
-				}
-			}
-			SetFocus(GetDlgItem(hDlg, IDC_CHECK1));
-			return (INT_PTR)TRUE;
-		case WM_HSCROLL:
-			{	// Track Bar
-				if ((GetDlgItem(hDlg, IDC_SLIDER1) == (HWND)lParam)
-					|| (GetDlgItem(hDlg, IDC_SLIDER2) == (HWND)lParam)
-					|| (GetDlgItem(hDlg, IDC_SLIDER3) == (HWND)lParam)
-					|| (GetDlgItem(hDlg, IDC_SLIDER4) == (HWND)lParam)) {
-					EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), TRUE);
-				}
-			}
-			break;
-		case WM_CTLCOLORDLG:
-			return (INT_PTR)GetStockObject(WHITE_BRUSH);							// 背景の色
-		case WM_CTLCOLORSTATIC:
-		case WM_CTLCOLOREDIT:
-			SetBkMode(((HDC)wParam), TRANSPARENT);
-			SetTextColor(((HDC)wParam), RGB(0, 0, 0));								// 文字の色
-			return (INT_PTR)GetStockObject(WHITE_BRUSH);							// 背景の色
-		case WM_COMMAND:
-			switch (LOWORD(wParam)) {
-			case IDC_CHECK4:
-			case IDC_CHECK5:
-			case IDC_CHECK6:
-				if (IsDlgButtonChecked(hDlg, IDC_CHECK4) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK5) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK6) == 0) {
-					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), FALSE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), FALSE);
-				}
-				else {
-					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), TRUE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), TRUE);
-				}
-				if (IsDlgButtonChecked(hDlg, IDC_CHECK6) != 0)	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), TRUE);
-				else EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), FALSE);
-				[[fallthrough]];						// fallthrough is explicit
-			case IDC_CHECK1:
-			case IDC_CHECK2:
-			case IDC_CHECK3:
-			case IDC_CHECK7:
-			case IDC_CHECK8:
-				EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), TRUE);
-				break;
-			case IDC_COMBO1:
-				if (HIWORD(wParam) == CBN_SELCHANGE) {
-					switch (SendDlgItemMessage(hDlg, IDC_COMBO1, CB_GETCURSEL, 0, 0)) {
-					case 0:
-						//EnableWindow(GetDlgItem(hDlg, IDC_CHECK2), TRUE);
-						break;
-					case 1:
-						if (IsDlgButtonChecked(hDlg, IDC_CHECK2) != 0) {
-							//CheckDlgButton(hDlg, IDC_CHECK2, BST_UNCHECKED);
-						}
-						//EnableWindow(GetDlgItem(hDlg, IDC_CHECK2), FALSE);
-						break;
-					default:
-						break;
-					}
-					EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), TRUE);
-				}
-				break;
-			case IDC_BUTTON1:
-				SetFocus(GetDlgItem(hDlg, IDC_CHECK1));
-				if (IsDlgButtonChecked(hDlg, IDC_CHECK4) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK5) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK6) == 0) {
-					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), FALSE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), FALSE);
-				}
-				else {
-					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), TRUE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), TRUE);
-				}
-				if (IsDlgButtonChecked(hDlg, IDC_CHECK6) != 0)	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), TRUE);
-				else EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), FALSE);
-				[[fallthrough]];						// fallthrough is explicit
-			case IDOK:
-				Profile->lpstAppRegData->bDisplayIMEModeOnCursor = bGetDlgButtonChecked(hDlg, IDC_CHECK1);
-				Profile->lpstAppRegData->bOffChangedFocus = bGetDlgButtonChecked(hDlg, IDC_CHECK2);
-				Profile->lpstAppRegData->bForceHiragana = bGetDlgButtonChecked(hDlg, IDC_CHECK3);
-				Profile->lpstAppRegData->bDoModeDispByIMEKeyDown = bGetDlgButtonChecked(hDlg, IDC_CHECK4);
-				Profile->lpstAppRegData->bDoModeDispByMouseBttnUp = bGetDlgButtonChecked(hDlg, IDC_CHECK5);
-				Profile->lpstAppRegData->bDoModeDispByCtrlUp = bGetDlgButtonChecked(hDlg, IDC_CHECK6);
-				Profile->lpstAppRegData->bDrawNearCaret = bGetDlgButtonChecked(hDlg, IDC_CHECK7);
-				Profile->lpstAppRegData->bEnableEPHelper = bGetDlgButtonChecked(hDlg, IDC_CHECK8);
-				Profile->lpstAppRegData->iCursorSize = (int)dwGetTrackbarPos(hDlg, IDC_SLIDER1);
-				Profile->lpstAppRegData->iModeSize = (int)dwGetTrackbarPos(hDlg, IDC_SLIDER2);
-				Profile->lpstAppRegData->dwDisplayModeTime = dwGetTrackbarPos(hDlg, IDC_SLIDER3);
-				Profile->lpstAppRegData->dwWaitWaveTime = dwGetTrackbarPos(hDlg, IDC_SLIDER4);
-				switch (SendDlgItemMessage(hDlg, IDC_COMBO1, CB_GETCURSEL, 0, 0)) {
-					case 0:
-						Profile->lpstAppRegData->bDisplayFocusWindowIME = TRUE;
-						break;
-					case 1:
-						Profile->lpstAppRegData->bDisplayFocusWindowIME = FALSE;
-						break;
-					default:
-						break;
-				}
-				if (Profile != NULL) {
-					Profile->bSetProfileData();								// Set Registry data
-				}
-				vStopThreadHookTimer(hMainWnd);
-				if (!bStartThreadHookTimer(hMainWnd)) {
-					PostMessage(hMainWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
-					return (INT_PTR)FALSE;
-				}
-				if (LOWORD(wParam) == IDC_BUTTON1) {
-					EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), FALSE);
-					return (INT_PTR)FALSE;
-				}
-				[[fallthrough]];						// fallthrough is explicit
-			case IDCANCEL:
-				EndDialog(hDlg, LOWORD(wParam));
-				if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))	hSettingDlg = NULL;
-				return (INT_PTR)TRUE;
-			}
-	}
-	return (INT_PTR)FALSE;
-}
-
-//
-// bInitDlgCenter()
-//
-static BOOL		bInitDlgCenter(HWND hDlg, HICON hIcon, DWORD dwICC)
-{
-	int cx = GetSystemMetrics(SM_CXSCREEN);
-	int	cy = GetSystemMetrics(SM_CYSCREEN);
-	RECT		rc{};
-	GetWindowRect(hDlg, (LPRECT)&rc);
-	rc.right = rc.right - rc.left + 1;	rc.bottom = rc.bottom - rc.top + 1;
-	rc.left = (cx - rc.right) / 2;		rc.top = (cy - rc.bottom) / 2;
-	MoveWindow(hDlg, rc.left, rc.top, rc.right, rc.bottom, TRUE);
-	SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
-
-	// Initialize
-	INITCOMMONCONTROLSEX stICC{};
-	stICC.dwSize = sizeof(INITCOMMONCONTROLSEX);
-	stICC.dwICC = dwICC;
-	return InitCommonControlsEx(&stICC);
-}
-
-//
-// bSetCheckDlgButton()
-//
-static BOOL		bSetCheckDlgButton(HWND hDlg, int iIDButton, BOOL bCheck)
-{
-	UINT		uCheck = 0;
-	if (bCheck) uCheck = BST_CHECKED;
-	else			uCheck = BST_UNCHECKED;
-	if (!CheckDlgButton(hDlg, iIDButton, uCheck)) {
-		return FALSE;
-	}
-	return TRUE;
-}
-
-//
-// vSetTrackbar()
-//
-static VOID		vSetTrackbar(HWND hDlg, int iIDTrackbar, int iRangeMin, int iRangeMax, int iTickFreq, int iPos, int iPageSize)
-{
-	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETRANGE, TRUE, MAKELPARAM(iRangeMin, iRangeMax));
-	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETTICFREQ, iTickFreq, 0);
-	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETPOS, TRUE, iPos);
-	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETPAGESIZE, 0, iPageSize);
-}
-
-//
-// bGetDlgButtonChecked()
-//
-static BOOL		bGetDlgButtonChecked(HWND hDlg, int iIDButton)
-{
-	if (IsDlgButtonChecked(hDlg, iIDButton) == 0)	return FALSE;
-	else return TRUE;
-}
-
-//
-// dwGetTrackbarPos()
-//
-static DWORD		dwGetTrackbarPos(HWND hDlg, int iIDTrackbar)
-{
-	return (DWORD)SendDlgItemMessage(hDlg, iIDTrackbar, TBM_GETPOS, NULL, NULL);
-}
-
-//
-// vGetSetProfileData()
-//
-VOID			vGetSetProfileData()
-{
-	bDisplayIMEModeOnCursor = Profile->lpstAppRegData->bDisplayIMEModeOnCursor;
-	bOffChangedFocus = Profile->lpstAppRegData->bOffChangedFocus;
-	bDisplayFocusWindowIME = Profile->lpstAppRegData->bDisplayFocusWindowIME;
-	bDoModeDispByIMEKeyDown = Profile->lpstAppRegData->bDoModeDispByIMEKeyDown;
-	bDoModeDispByMouseBttnUp = Profile->lpstAppRegData->bDoModeDispByMouseBttnUp;
-	bDoModeDispByCtrlUp = Profile->lpstAppRegData->bDoModeDispByCtrlUp;
-	bDrawNearCaret = Profile->lpstAppRegData->bDrawNearCaret;
-	bEnableEPHelper = Profile->lpstAppRegData->bEnableEPHelper;
-	bMoveIMEToolbar = Profile->lpstAppRegData->bMoveIMEToolbar;
-	bIMEModeForced = Profile->lpstAppRegData->bIMEModeForced;
-}
 
 //
 // class CPowerNotification
@@ -583,11 +95,16 @@ BOOL		CPowerNotification::PowerBroadcast(HWND hWnd, ULONG Type, POWERBROADCAST_S
 			case 0:
 				bReportEvent(MSG_PBT_APMPOWERSTATUSCHANGE_AC_OFF, POWERNOTIFICATION_CATEGORY);
 				Sleep(3000);
-				bReportEvent(MSG_RESTART_EVENT, POWERNOTIFICATION_CATEGORY);
-				bDestroyTaskTrayWindow(hWnd);
+				vDestroyWindow(hWnd);
+				bCreateProcess(FLUSHMOUSE_EXE);
+				bReportEvent(MSG_RESTART_EVENT, POWERNOTIFICATION_CATEGORY);	
 				break;
 			case 1:
 				bReportEvent(MSG_PBT_APMPOWERSTATUSCHANGE_AC_ON, POWERNOTIFICATION_CATEGORY);
+				Sleep(3000);
+				vDestroyWindow(hWnd);
+				bCreateProcess(FLUSHMOUSE_EXE);
+				bReportEvent(MSG_RESTART_EVENT, POWERNOTIFICATION_CATEGORY);	
 				break;
 			default:
 				break;
@@ -637,19 +154,19 @@ BOOL		CEventHook::bEventSet()
 {
 #define	EVENT_FLAGS		(WINEVENT_OUTOFCONTEXT)
 	hEventHook = SetWinEventHook(
-		EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND,	// Range of events
-		NULL,												// Handle to DLL.
-		&vHandleEvent,										// The callback.
-		0, 0,												// Process and thread IDs of interest (0 = all)
-		EVENT_FLAGS);										// Flags.
+		EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND,
+		NULL,
+		&vHandleEvent,
+		0, 0,
+		EVENT_FLAGS);
 	if (hEventHook == NULL)	return FALSE;
 
 	hEventHookIME = SetWinEventHook(
-		EVENT_OBJECT_TEXTSELECTIONCHANGED, EVENT_OBJECT_TEXTEDIT_CONVERSIONTARGETCHANGED,	// Range of events
-		NULL,												// Handle to DLL.
-		&vHandleEventIME,									// The callback.
-		0, 0,												// Process and thread IDs of interest (0 = all)
-		EVENT_FLAGS);										// Flags.
+		EVENT_OBJECT_TEXTSELECTIONCHANGED, EVENT_OBJECT_TEXTEDIT_CONVERSIONTARGETCHANGED,
+		NULL,
+		&vHandleEventIME,
+		0, 0,
+		EVENT_FLAGS);
 	if (hEventHookIME == NULL)	return FALSE;
 
 	return TRUE;
@@ -741,8 +258,10 @@ CFlushMouseHook::CFlushMouseHook()
 CFlushMouseHook::~CFlushMouseHook()
 {
 	bHookUnset();
-	if (lpstProcessInfomation)	delete[]	lpstProcessInfomation;
-	lpstProcessInfomation = NULL;
+	if (lpstProcessInfomation) {
+		delete[]	lpstProcessInfomation;
+		lpstProcessInfomation = NULL;
+	}
 }
 //
 // bHookSet()
@@ -778,7 +297,7 @@ BOOL		CFlushMouseHook::bHookUnset()
 BOOL	 	CFlushMouseHook::bHook32DllStart(HWND hWnd, LPCTSTR lpszExec32Name)
 {
 #define	COMAMANDLINESIZE (sizeof(_T(" ")) * (sizeof(unsigned long long) + 1))
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	DWORD	dwSize = 0;
 	dwSize = ExpandEnvironmentStrings(lpszExec32Name, NULL, 0);
 	LPTSTR	lpszBuffer = new TCHAR[dwSize];
@@ -813,7 +332,7 @@ BOOL	 	CFlushMouseHook::bHook32DllStart(HWND hWnd, LPCTSTR lpszExec32Name)
 BOOL 	CFlushMouseHook::bHook32DllStop()
 {
 #define	TIMEOUT	1000 
-	if (!bHook32Dll)	return TRUE;
+	if (!bHook32Dll)		return TRUE;
 	BOOL		bRet = FALSE;
 	if (lpstProcessInfomation != NULL) {
 		if (lpstProcessInfomation->hProcess != NULL) {

--- a/FlushMouse/FlushMouseSub.h
+++ b/FlushMouse/FlushMouseSub.h
@@ -1,9 +1,10 @@
-// FlushMouseSub.h
+//
+// FlushMouseSub.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/03/03  JeffyTS  	New edit.
+// #0000		2022/03/03  JeffyTS  	New edit.
 //
 
 //
@@ -23,22 +24,10 @@
 //
 // Global Data
 //
-extern HWND		hAboutDlg;
-extern HWND		hSettingDlg;
-extern BOOL		bIMEInConverting;
 
 //
 // Global Prototype Define
 //
-extern BOOL 	bCreateTaskTrayWindow(HWND hWnd, HICON hIcon, LPCTSTR lpszTitile);
-extern BOOL		bReCreateTaskTrayWindow(HWND hWnd, UINT message);
-extern BOOL		bDestroyTaskTrayWindow(HWND hWnd);
-extern BOOL		bGetTaskTrayWindowRect(HWND hWnd, LPRECT lpRect);
-extern void		Cls_OnTaskTrayEx(HWND hWnd, UINT id, UINT uMsg);
-extern void		vMessageBox(HWND hWnd, UINT uID, UINT uType);
-extern VOID		vAboutDialog(HWND hWnd);
-extern VOID		vSettingDialog(HWND hWnd);
-extern VOID		vGetSetProfileData();
 
 //
 // class CEventHook
@@ -46,8 +35,9 @@ extern VOID		vGetSetProfileData();
 class CEventHook
 {
 public:
-				CEventHook();
-				~CEventHook();
+	CEventHook();
+	~CEventHook();
+
 	BOOL		bEventSet();
 	BOOL		bEventUnset();
 
@@ -56,7 +46,7 @@ private:
 	static void CALLBACK vHandleEventIME(HWINEVENTHOOK hook, DWORD event, HWND hwnd, LONG idObject, LONG idChild, DWORD dwEventThread, DWORD dwmsEventTime);
 
 public:
-	HWND			hFormerWnd;
+	HWND				hFormerWnd;
 
 private:
 	HWINEVENTHOOK	hEventHook;
@@ -71,12 +61,13 @@ class CPowerNotification
 public:
 	CPowerNotification(HWND hWnd);
 	~CPowerNotification();
+
 	BOOL		PowerBroadcast(HWND hWnd, ULONG Type, POWERBROADCAST_SETTING* lpSetting);
 
 private:
-	HPOWERNOTIFY	hSuspendResumeNotification;
-	HPOWERNOTIFY	hPowerSettingNotification;
-	GUID			guidPowerSettingNotification;
+	HPOWERNOTIFY		hSuspendResumeNotification;
+	HPOWERNOTIFY		hPowerSettingNotification;
+	GUID				guidPowerSettingNotification;
 };
 
 //
@@ -97,10 +88,10 @@ private:
 
 private:
 	HMODULE		hHook64Dll;
-	BOOL		bGlobalHook64;
-	BOOL		bKeyboardHookLL64;
-	BOOL		bMouseHook64;
-	BOOL		bHook32Dll;
+	BOOL			bGlobalHook64;
+	BOOL			bKeyboardHookLL64;
+	BOOL			bMouseHook64;
+	BOOL			bHook32Dll;
 
 private:
 	LPPROCESS_INFORMATION	lpstProcessInfomation;

--- /dev/null
+++ b/FlushMouse/Ime.cpp
@@ -0,0 +1,327 @@
+//
+// Ime.cpp
+//		Copyright (C) 2022 JeffyTS
+//
+// No.      Date		    Name		    Reason & Document
+// -------+-----------+-----------+-------------------------------------------- -
+// #0000		2022/03/03  JeffyTS  	New edit.
+// #0001		2023/06/30	JeffyTS		Divided from cursor.cpp
+//
+
+// Include
+//
+#pragma once
+#include "pch.h"
+#include "Ime.h"
+#include "CommonDef.h"
+#include "..\MiscLIB\CRegistry.h"
+
+//
+// Library
+//
+
+//
+// Define
+//
+
+//
+// Struct Define
+//
+
+//
+// Class Define
+
+//
+// Local Data
+//
+
+//
+// Class CIME
+// 
+CIME::CIME()
+{
+	lpstVirtualDesktop = new VIRTUALDESKTOP[sizeof(VIRTUALDESKTOP)];
+	if (lpstVirtualDesktop != NULL) {
+		ZeroMemory(lpstVirtualDesktop, sizeof(VIRTUALDESKTOP));
+		bGetVirtualDesktopSize();
+	}
+}
+CIME::~CIME()
+{
+	if (lpstVirtualDesktop != NULL)	delete[]	lpstVirtualDesktop;
+	lpstVirtualDesktop = NULL;
+}
+
+//
+// bIsIMEOpen()
+//
+BOOL		CIME::bIsIMEOpen(HWND hWndObserved)
+{
+	HWND    hIMWnd = NULL;
+	if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
+		if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_GETOPENSTATUS, (LPARAM)NULL) != 0) {
+			return TRUE;	
+		}
+	}
+	return FALSE;
+}
+
+//
+// vIMEOpenCloseForced()
+//
+VOID		CIME::vIMEOpenCloseForced(HWND hWndObserved, DWORD dwIMEOpenClose)
+{
+	if (hWndObserved == NULL)	return;
+	LPARAM	lParam = (LPARAM)dwIMEOpenClose;
+	EnumChildWindows(hWndObserved, &bEnumChildProcIMEOpenClose, lParam);
+	return;
+}
+
+//
+// vIMEConvertModeChangeForced()
+//
+VOID		CIME::vIMEConvertModeChangeForced(HWND hWndObserved, DWORD dwConvertMode)
+{
+	if (hWndObserved == NULL)	return;
+	LPARAM	lParam = (LPARAM)dwConvertMode;
+	EnumChildWindows(hWndObserved, &bEnumChildProcIMEConvertMode, lParam);
+	return;
+}
+
+//
+// bEnumChildProcIMEConvertMode()
+//
+BOOL CALLBACK CIME::bEnumChildProcIMEConvertMode(HWND hWndObserved, LPARAM lParam)
+{
+	if (hWndObserved == NULL)	return FALSE;
+	HWND    hIMWnd = NULL;
+	if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
+		if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_SETOPENSTATUS, (LPARAM)TRUE) == 0) {	
+			if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_SETCONVERSIONMODE, (LPARAM)lParam) == 0) {
+			}
+		}
+	}
+	return TRUE;	
+}
+
+//
+// bEnumChildProcIMEOpenClose()
+//
+BOOL CALLBACK CIME::bEnumChildProcIMEOpenClose(HWND hWndObserved, LPARAM lParam)
+{
+	if (hWndObserved == NULL)	return FALSE;
+	HWND    hIMWnd = NULL;
+	if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
+		if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_SETOPENSTATUS, lParam) == 0) {
+		}
+	}
+	return TRUE;	
+}
+
+//
+// dwIMEMode()
+//
+DWORD		CIME::dwIMEMode(HWND hWndObserved, BOOL bForceHiragana)
+{
+	if (hWndObserved != NULL) {
+		HWND    hIMWnd = NULL;
+		HKL		hkl = NULL;
+		DWORD	dwInputLocale = 0;
+		DWORD   dwConvertMode = 0;
+		if ((hIMWnd = ImmGetDefaultIMEWnd(hWndObserved)) != NULL) {
+			if (SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_GETOPENSTATUS, NULL) != 0) {
+				if ((dwConvertMode = (DWORD)SendMessage(hIMWnd, WM_IME_CONTROL, (WPARAM)IMC_GETCONVERSIONMODE, NULL)) != 0) {
+					switch (dwConvertMode) {
+					case IME_CMODE_NATIVE:
+						dwConvertMode = IMEOFF;
+						break;
+					case ZENHIRA_IMEON:
+					case (ZENHIRA_IMEON ^ IME_CMODE_ROMAN):
+						dwConvertMode = ZENHIRA_IMEON;
+						break;
+					case HANEISU_IMEON:
+					case (HANEISU_IMEON ^ IME_CMODE_ROMAN):
+						dwConvertMode = HANEISU_IMEON;
+						break;
+					case HANKANA_IMEON:
+					case (HANKANA_IMEON ^ IME_CMODE_ROMAN):
+						dwConvertMode = HANKANA_IMEON;
+						break;
+					case ZENEISU_IMEON:
+					case (ZENEISU_IMEON ^ IME_CMODE_ROMAN):
+						dwConvertMode = ZENEISU_IMEON;
+						break;
+					case ZENKANA_IMEON:
+					case (ZENKANA_IMEON ^ IME_CMODE_ROMAN):
+						dwConvertMode = ZENKANA_IMEON;
+						break;
+					default:
+						dwConvertMode = IMEOFF;
+					}
+					if ((bForceHiragana != FALSE) && (dwConvertMode != ZENHIRA_IMEON)) {
+						vIMEConvertModeChangeForced(hWndObserved, ZENHIRA_IMEON);
+						dwConvertMode = ZENHIRA_IMEON;
+					}
+					if ((hkl = hklGetInputLocale(hWndObserved)) != (HKL)0) {
+						if ((dwInputLocale = dwGetInputLocale()) != 0) {
+							if ((hkl = (HKL)(((UINT64)hkl & KB_MASK) | (dwInputLocale & LANG_MASK))) != JP_IME) {
+								dwConvertMode = IMEOFF;
+							}
+						}
+					}
+					return dwConvertMode;
+				}
+			}
+		}
+	}
+	return IMEOFF;
+}
+
+//
+// vActivateIME()
+//
+VOID		CIME::vActivateIME(HWND hWndObserved)
+{
+	EnumChildWindows(hWndObserved, &bEnumChildProcActivateIME, NULL);
+}
+
+// 
+// bEnumChildProcActivateIME()
+// 
+BOOL CALLBACK CIME::bEnumChildProcActivateIME(HWND hWnd, LPARAM lParam)
+{
+	UNREFERENCED_PARAMETER(lParam);
+
+	HWND	hIMWnd = ImmGetDefaultIMEWnd(hWnd);
+	if (hIMWnd != NULL) {
+		SendMessage(hIMWnd, WM_ACTIVATE, (WPARAM)WA_ACTIVE, (LPARAM)NULL);
+		LPTSTR	lpszBuffer = new TCHAR[_MAX_PATH];
+		if (lpszBuffer) {
+			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);
+					delete[] lpszBuffer;
+					return TRUE;
+				}
+			}
+			delete[] lpszBuffer;
+		}
+	}
+	return TRUE;
+}
+
+
+//
+// bGetVirtualDesktopSize()
+//
+BOOL			CIME::bGetVirtualDesktopSize()
+{
+	BOOL		bRet = FALSE;
+	if (lpstVirtualDesktop != NULL) {
+		ZeroMemory(lpstVirtualDesktop, sizeof(VIRTUALDESKTOP));
+		if (EnumDisplayMonitors(NULL, NULL, (MONITORENUMPROC)&bGetVirtualDesktopSizeEnumProc, (LPARAM)lpstVirtualDesktop) != 0) {
+			bRet = TRUE;
+		}
+		else {
+			_Post_equals_last_error_ DWORD	err = GetLastError();
+			if ((err == ERROR_INVALID_PARAMETER) || (err == ERROR_SUCCESS)) {
+				bRet = TRUE;
+			}
+			else if (err == ERROR_ACCESS_DENIED) {
+				// error but be able to On Sleep
+				bRet = TRUE;
+			}
+		}
+	}
+	return bRet;
+}
+
+//
+// bGetVirtualDesktopSizeEnumProc()
+//
+BOOL		CIME::bGetVirtualDesktopSizeEnumProc(HMONITOR hMonitor, HDC hDC, LPCRECT lprcClip, LPARAM lParam)
+{
+	UNREFERENCED_PARAMETER(hDC);
+	UNREFERENCED_PARAMETER(lprcClip);
+	LPVIRTUALDESKTOP	lpstVirtualDesktop = (LPVIRTUALDESKTOP)lParam;
+	//CIME* This = reinterpret_cast<CIME*>(lParam);
+	MONITORINFO	stMonInfo{};	stMonInfo.cbSize = sizeof(MONITORINFO);
+	if (GetMonitorInfo(hMonitor, &stMonInfo) != 0) {
+		if (stMonInfo.rcMonitor.left <= lpstVirtualDesktop->rcMonitorSize.left)		lpstVirtualDesktop->rcMonitorSize.left = stMonInfo.rcMonitor.left;
+		if (stMonInfo.rcMonitor.right >= lpstVirtualDesktop->rcMonitorSize.right)	lpstVirtualDesktop->rcMonitorSize.right = stMonInfo.rcMonitor.right;
+		if (stMonInfo.rcMonitor.top <= lpstVirtualDesktop->rcMonitorSize.top)		lpstVirtualDesktop->rcMonitorSize.top = stMonInfo.rcMonitor.top;
+		if (stMonInfo.rcMonitor.bottom >= lpstVirtualDesktop->rcMonitorSize.bottom)	lpstVirtualDesktop->rcMonitorSize.bottom = stMonInfo.rcMonitor.bottom;
+		++lpstVirtualDesktop->iNumOfMonitors;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+//
+// bIsNewIME()
+// 
+//
+BOOL		CIME::bIsNewIME()
+{
+#define SUBKEY	_T("Software\\Microsoft\\input\\tsf\\tsf3override\\{03b5835f-f03c-411b-9ce2-aa23e1171e36}")
+#define VALUE	_T("NoTsf3Override2")
+	CRegistry* CReg = new CRegistry;
+	if (CReg) {
+		DWORD	dwCTF = 0;
+		if (!CReg->bReadSystemRegValueDWORD(HKEY_CURRENT_USER, SUBKEY, VALUE, &dwCTF)) {
+			dwCTF = 0;
+		}
+		delete	CReg;
+		if (dwCTF != 0)	return FALSE;
+		else			return TRUE;
+	}
+	return FALSE;
+#undef SUBKEY
+#undef VALUE
+}
+
+//
+// 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
+}
+
+/* = EOF = */
\ No newline at end of file

--- /dev/null
+++ b/FlushMouse/Ime.h
@@ -0,0 +1,72 @@
+// Ime.h
+//		Copyright (C) 2022 JeffyTS
+//
+// No.      Date		    Name		    Reason & Document
+// -------+-----------+-----------+-------------------------------------------- -
+// #0000		2022/03/12  JeffyTS  	New edit.
+// #0001		2023/06/30	JeffyTS		Divided from cursor.h
+
+//
+// Include
+//
+#pragma once
+#include "pch.h"
+
+//
+// Define
+//
+#define	IMEMODECHAR		3
+
+// IME mode
+#define IMECLOSE			0x0000
+#define IMEOPEN			0x0001
+#define IMEOFF			(IME_CMODE_ALPHANUMERIC)															// 0x00 : A 英数(直接入力)
+#define HANEISU_IMEON	(IME_CMODE_ROMAN | IME_CMODE_ALPHANUMERIC)										// 0x10 :_A 半角英数 0001 0000
+#define HANKANA_IMEON	(IME_CMODE_ROMAN | IME_CMODE_KATAKANA | IME_CMODE_NATIVE)						// 0x13 :_ｶ 半角カナ 0001 0011
+#define ZENEISU_IMEON	(IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE)											// 0x18 :Ａ 全角英数 0001 1000
+#define ZENHIRA_IMEON	(IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE | IME_CMODE_NATIVE)						// 0x19 :あ 全角ひら 0001 1001（漢字変換モード)
+#define ZENKANA_IMEON	(IME_CMODE_ROMAN | IME_CMODE_FULLSHAPE | IME_CMODE_KATAKANA | IME_CMODE_NATIVE)	// 0x1B :カ 全角カナ 0001 1011
+#define IMEHIDE			(0x88)																			// 0x88 :■  Hide    1001 1000
+
+//
+// Struct Define
+//
+typedef struct tagVirtualDesktop
+{
+	RECT		rcMonitorSize;
+	int		iNumOfMonitors;
+} VIRTUALDESKTOP, * PVIRTUALDESKTOP, * LPVIRTUALDESKTOP;
+
+//
+// Class CIME
+//
+class CIME
+{
+public:
+	CIME();
+	~CIME();
+
+public:
+	BOOL			bIsIMEOpen(HWND hWndObserved);
+	VOID			vIMEOpenCloseForced(HWND hWndObserved, DWORD dwIMEOpenClose);
+	VOID			vIMEConvertModeChangeForced(HWND hWndObserved, DWORD dwConvertMode);
+	DWORD		dwIMEMode(HWND hWndObserved, BOOL bForceHiragana);
+	VOID			vActivateIME(HWND hWndObserved);
+	BOOL			bGetVirtualDesktopSize();
+	BOOL			bIsNewIME();
+	DWORD		dwGetInputLocale();
+	HKL			hklGetInputLocale(HWND hWndObserved);
+
+private:
+	static BOOL 	bGetVirtualDesktopSizeEnumProc(HMONITOR hMonitor, HDC hDC, LPCRECT lprcClip, LPARAM lParam);
+
+	static BOOL CALLBACK bEnumChildProcIMEOpenClose(HWND hWnd, LPARAM lParam);
+	static BOOL CALLBACK bEnumChildProcIMEConvertMode(HWND hWnd, LPARAM lParam);
+	static BOOL CALLBACK bEnumChildProcActivateIME(HWND hWnd, LPARAM lParam);
+
+private:
+	LPVIRTUALDESKTOP	lpstVirtualDesktop;
+};
+
+
+/* = EOF = */
\ No newline at end of file

--- a/FlushMouse/Profile.cpp
+++ b/FlushMouse/Profile.cpp
@@ -1,9 +1,10 @@
-// Profile.cpp
+//
+// Profile.cpp
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/03/23  JeffyTS  	New edit.
+// #0000		2022/03/23  JeffyTS  	New edit.
 //
 
 //

--- a/FlushMouse/Profile.h
+++ b/FlushMouse/Profile.h
@@ -1,9 +1,10 @@
-// Profile.h
+//
+// Profile.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/03/23  JeffyTS  	New edit.
+// #0000		2022/03/23  JeffyTS  	New edit.
 //
 
 //

--- /dev/null
+++ b/FlushMouse/TaskTray.cpp
@@ -0,0 +1,527 @@
+//
+// TaskTray.cpp
+//		Copyright (C) 2022 JeffyTS
+//
+// No.      Date		    Name		    Reason & Document
+// -------+-----------+-----------+-------------------------------------------- -
+// #0000		2022/03/03  JeffyTS  	New edit.
+// #0001		2023/06/30	JeffyTS		Divided from FlushMouseSub.cpp
+//
+
+// Include
+//
+#pragma once
+#include "pch.h"
+#include "TaskTray.h"
+#include "CommonDef.h"
+#include "Resource.h"
+#include "FlushMouseLIB.h"
+#include "..\FlushMouseDLL\EventlogDll.h"
+
+//
+// Library
+//
+
+//
+// Define
+//
+
+//
+// Struct Define
+//
+
+//
+// Global Data
+//
+HWND		hAboutDlg = NULL;
+HWND		hSettingDlg = NULL;
+BOOL		bIMEInConverting = FALSE;
+
+//
+// Local Data
+//
+static BOOL		bTaskTray = FALSE;
+static UINT		uTaskbarCreatedMessage = 0;
+
+//
+// Local Prototype Define
+//
+static INT_PTR CALLBACK SettingDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+static BOOL		bInitDlgCenter(HWND hDlg, HICON hIcon, DWORD dwICC);
+static BOOL		bSetCheckDlgButton(HWND hDlg, int iIDButton, BOOL bCheck);
+static VOID		vSetTrackbar(HWND hDlg, int iIDTrackbar, int iRangeMin, int iRangeMax, int iTickFreq, int iPos, int iPageSize);
+static BOOL		bGetDlgButtonChecked(HWND hDlg, int iIDButton);
+static DWORD		dwGetTrackbarPos(HWND hDlg, int iIDTrackbar);
+
+//
+// bCreateTaskTrayWindow()
+//
+BOOL		bCreateTaskTrayWindow(HWND hWnd, HICON hIcon, LPCTSTR lpszTitle)
+{
+	NOTIFYICONDATA   nIco{};
+	nIco.cbSize = sizeof(NOTIFYICONDATA);
+	nIco.hWnd = hWnd;
+	nIco.uID = NOTIFYICONDATA_ID;
+	nIco.guidItem = GUID_NULL;
+	nIco.uFlags = NIF_INFO | NIF_MESSAGE | NIF_ICON | NIF_TIP;
+	nIco.uCallbackMessage = WM_TASKTRAYEX;
+	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);
+	try {
+		throw Shell_NotifyIcon(NIM_ADD, &nIco);
+	}
+	catch (BOOL bRet) {
+		if (!bRet) {
+			_Post_equals_last_error_ DWORD err = GetLastError();
+			if (err == ERROR_TIMEOUT) {
+				Sleep(1000);
+				try {
+					throw Shell_NotifyIcon(NIM_ADD, &nIco);
+				}
+				catch (BOOL bRet) {
+					if (!bRet) {
+						return FALSE;
+					}
+				}
+				catch (...) {
+					return FALSE;
+				}
+			}
+			else {
+				return FALSE;
+			}
+		}
+	}
+	catch (...) {
+		return FALSE;
+	}
+
+	if ((uTaskbarCreatedMessage = RegisterWindowMessage(_T("TaskbarCreated"))) == 0) {
+		bDestroyTaskTrayWindow(hWnd);
+		return FALSE;
+	}
+	bTaskTray = TRUE;
+	return TRUE;
+}
+
+
+//
+// bReCreateTaskTrayWindow()
+//
+BOOL		bReCreateTaskTrayWindow(HWND hWnd, UINT message)
+{
+	if (message == uTaskbarCreatedMessage) {	
+		if (bDestroyTaskTrayWindow(hWnd)) {
+			bTaskTray = FALSE;
+		}
+		HICON	hIcon = NULL;
+		if ((hIcon = LoadIcon(Resource->hLoad(), MAKEINTRESOURCE(IDI_FLUSHMOUSE))) != NULL) {
+			if (bCreateTaskTrayWindow(hWnd, hIcon, szTitle)) {
+				bTaskTray = TRUE;
+				vStopThreadHookTimer(hWnd);
+				if (!bStartThreadHookTimer(hWnd)) {
+					bReportEvent(MSG_THREAD_HOOK_TIMER_RESTART_FAILED, APPLICATION_CATEGORY);
+					PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
+				}
+				bReportEvent(MSG_THREAD_HOOK_TIMER_RESTARTED, APPLICATION_CATEGORY);
+				return TRUE;
+			}
+			else {
+				if (bDestroyTaskTrayWindow(hWnd)) {
+					bTaskTray = FALSE;
+				}
+				bReportEvent(MSG_TASKTRAY_REGISTER_FAILD, APPLICATION_CATEGORY);
+				bReportEvent(MSG_RESTART_EVENT, APPLICATION_CATEGORY);
+				return TRUE;
+			}
+		}
+		else {
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//
+// bDestroyTaskTrayWindow()
+// 
+BOOL		bDestroyTaskTrayWindow(HWND hWnd)
+{
+	if (bTaskTray != FALSE) {
+		NOTIFYICONDATA nIco{};
+		nIco.cbSize = sizeof(NOTIFYICONDATA);
+		nIco.hWnd = hWnd;
+		nIco.uID = NOTIFYICONDATA_ID;
+		nIco.guidItem = GUID_NULL;
+		nIco.uFlags = 0;
+		try {
+			throw Shell_NotifyIcon(NIM_DELETE, &nIco);
+		}
+		catch (BOOL bRet) {
+			if (bRet) {
+				bTaskTray = FALSE;
+				return TRUE;
+			}
+			else {
+				return FALSE;
+			}
+		}
+		catch (...) {
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//
+// bGetTaskTrayWindowRect()
+// 
+BOOL		bGetTaskTrayWindowRect(HWND hWnd, LPRECT lpRect)
+{
+	if (bTaskTray != FALSE) {
+		NOTIFYICONIDENTIFIER	nii{};
+		nii.cbSize = sizeof(NOTIFYICONIDENTIFIER);
+		nii.hWnd = hWnd;
+		nii.uID = NOTIFYICONDATA_ID;
+		nii.guidItem = GUID_NULL;
+#ifdef _DEBUG
+		HRESULT	hResult = E_FAIL;
+		if ((hResult = Shell_NotifyIconGetRect(&nii, lpRect)) != S_OK) {
+			return FALSE;
+		}
+		return TRUE;
+	}
+#else
+		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;
+		}
+	}
+#endif // _DEBUG
+	return FALSE;
+}
+
+//
+// WM_TASKTRAYEX
+// Cls_OnTaskTrayEx()
+//
+void		Cls_OnTaskTrayEx(HWND hWnd, UINT id, UINT uMsg)
+{
+	if (id != NOTIFYICONDATA_ID) {
+		return;
+	}
+	switch (uMsg) {
+	case WM_LBUTTONDOWN:
+		if (bOffChangedFocus) {
+			Cime->vIMEOpenCloseForced(hWnd, IMECLOSE);
+		}
+		[[fallthrough]];	
+		//break;
+	case WM_RBUTTONDOWN:
+		bDisplayIMEModeOnCursor = FALSE;
+		bDoModeDispByMouseBttnUp = FALSE;
+		bDrawNearCaret = FALSE;
+
+		POINT pt{};
+		GetCursorPos(&pt);
+		HMENU hMenu = LoadMenu(Resource->hLoad(), MAKEINTRESOURCE(IDR_TT_MENU));
+		HMENU hSubMenu = GetSubMenu(hMenu, 0);
+		SetForegroundWindow(hWnd);
+		APPBARDATA stAppBarData{};
+		stAppBarData.cbSize = sizeof(APPBARDATA);
+		stAppBarData.hWnd = hWnd;
+		SHAppBarMessage(ABM_GETTASKBARPOS, &stAppBarData);
+		UINT		uFlags = 0;
+		switch (stAppBarData.uEdge) {
+			case ABE_TOP:
+				uFlags = TPM_RIGHTALIGN | TPM_TOPALIGN;
+				if (pt.y < stAppBarData.rc.bottom)	pt.y = stAppBarData.rc.bottom;
+				break;
+			case ABE_BOTTOM:
+				uFlags = TPM_RIGHTALIGN | TPM_BOTTOMALIGN;
+				if (pt.y > stAppBarData.rc.top)	pt.y = stAppBarData.rc.top;
+				break;
+			case ABE_LEFT:
+				uFlags = TPM_LEFTALIGN | TPM_BOTTOMALIGN;
+				if (pt.x < stAppBarData.rc.right)	pt.x = stAppBarData.rc.right;
+				break;
+			case ABE_RIGHT:
+				uFlags = TPM_RIGHTALIGN | TPM_BOTTOMALIGN;
+				if (pt.x > stAppBarData.rc.left)		pt.x = stAppBarData.rc.left;
+				break;
+		}
+		TrackPopupMenu(hSubMenu, uFlags, pt.x, pt.y, 0, hWnd, NULL);
+		break;
+	}
+}
+
+//
+// vSettingDialog()
+//
+VOID		vSettingDialog(HWND hWnd)
+{
+	if (hSettingDlg != NULL) {
+		SetForegroundWindow(hSettingDlg);
+		return;
+	}
+	DialogBox(Resource->hLoad(), MAKEINTRESOURCE(IDD_SETTING), hWnd, SettingDlg);
+}
+
+//
+// SettingDlg()
+//
+static INT_PTR CALLBACK SettingDlg(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	UNREFERENCED_PARAMETER(lParam);
+	switch (message) {
+		case WM_INITDIALOG:
+			hSettingDlg = hDlg;
+			{
+				HICON	hIcon = (HICON)LoadImage(Resource->hLoad(), MAKEINTRESOURCE(IDI_SMALL), IMAGE_ICON, 16, 16, 0);
+				bInitDlgCenter(hDlg, hIcon, (ICC_BAR_CLASSES | ICC_HOTKEY_CLASS));
+			}
+			{
+				TCHAR       lpText[MAX_LOADSTRING];
+				if (LoadString(Resource->hLoad(), IDS_CMBX_LIST01, lpText, MAX_LOADSTRING) == 0)		return (INT_PTR)FALSE;
+				SendDlgItemMessage(hDlg, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)lpText);
+				if (LoadString(Resource->hLoad(), IDS_CMBX_LIST02, lpText, MAX_LOADSTRING) == 0)		return (INT_PTR)FALSE;
+				SendDlgItemMessage(hDlg, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)lpText);
+			}
+			{
+				bSetCheckDlgButton(hDlg, IDC_CHECK1, Profile->lpstAppRegData->bDisplayIMEModeOnCursor);
+				bSetCheckDlgButton(hDlg, IDC_CHECK2, Profile->lpstAppRegData->bOffChangedFocus);
+				bSetCheckDlgButton(hDlg, IDC_CHECK3, Profile->lpstAppRegData->bForceHiragana);
+				bSetCheckDlgButton(hDlg, IDC_CHECK4, Profile->lpstAppRegData->bDoModeDispByIMEKeyDown);
+				bSetCheckDlgButton(hDlg, IDC_CHECK5, Profile->lpstAppRegData->bDoModeDispByMouseBttnUp);
+				bSetCheckDlgButton(hDlg, IDC_CHECK6, Profile->lpstAppRegData->bDoModeDispByCtrlUp);
+				bSetCheckDlgButton(hDlg, IDC_CHECK7, Profile->lpstAppRegData->bDrawNearCaret);
+				bSetCheckDlgButton(hDlg, IDC_CHECK8, Profile->lpstAppRegData->bEnableEPHelper);
+			}
+			{
+				vSetTrackbar(hDlg, IDC_SLIDER1, 16, 64, 8, Profile->lpstAppRegData->iCursorSize, 8);
+				vSetTrackbar(hDlg, IDC_SLIDER2, 8, 64, 8, Profile->lpstAppRegData->iModeSize, 8);
+				vSetTrackbar(hDlg, IDC_SLIDER3, 100, 800, 70, Profile->lpstAppRegData->dwDisplayModeTime, 70);
+				vSetTrackbar(hDlg, IDC_SLIDER4, 0, 1000, 100, Profile->lpstAppRegData->dwWaitWaveTime, 100);
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK3) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK4) == 0) {
+					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), FALSE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), FALSE);
+				}
+				else {
+					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), TRUE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), TRUE);
+				}
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK4) != 0)	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), TRUE);
+				else EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), FALSE);
+			}
+			{
+				if (Profile->lpstAppRegData->bDisplayFocusWindowIME) {
+					SendDlgItemMessage(hDlg, IDC_COMBO1, CB_SETCURSEL, 0, 0);
+				}
+				else {
+					SendDlgItemMessage(hDlg, IDC_COMBO1, CB_SETCURSEL, 1, 0);
+				}
+			}
+			SetFocus(GetDlgItem(hDlg, IDC_CHECK1));
+			return (INT_PTR)TRUE;
+		case WM_HSCROLL:
+			{	// Track Bar
+				if ((GetDlgItem(hDlg, IDC_SLIDER1) == (HWND)lParam)
+						|| (GetDlgItem(hDlg, IDC_SLIDER2) == (HWND)lParam)
+						|| (GetDlgItem(hDlg, IDC_SLIDER3) == (HWND)lParam)
+						|| (GetDlgItem(hDlg, IDC_SLIDER4) == (HWND)lParam)) {
+					EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), TRUE);
+				}
+			}
+		break;
+		case WM_CTLCOLORDLG:
+			return (INT_PTR)GetStockObject(WHITE_BRUSH);
+		case WM_CTLCOLORSTATIC:
+		case WM_CTLCOLOREDIT:
+			SetBkMode(((HDC)wParam), TRANSPARENT);
+			SetTextColor(((HDC)wParam), RGB(0, 0, 0));
+			return (INT_PTR)GetStockObject(WHITE_BRUSH);	
+		case WM_COMMAND:
+			switch (LOWORD(wParam)) {
+			case IDC_CHECK4:
+			case IDC_CHECK5:
+			case IDC_CHECK6:
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK4) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK5) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK6) == 0) {
+					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), FALSE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), FALSE);
+				}
+				else {
+					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), TRUE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), TRUE);
+				}
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK6) != 0)	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), TRUE);
+				else EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), FALSE);
+				[[fallthrough]];	
+			case IDC_CHECK1:
+			case IDC_CHECK2:
+			case IDC_CHECK3:
+			case IDC_CHECK7:
+			case IDC_CHECK8:
+				EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), TRUE);
+				break;
+			case IDC_COMBO1:
+				if (HIWORD(wParam) == CBN_SELCHANGE) {
+					switch (SendDlgItemMessage(hDlg, IDC_COMBO1, CB_GETCURSEL, 0, 0)) {
+					case 0:
+						break;
+					case 1:
+						if (IsDlgButtonChecked(hDlg, IDC_CHECK2) != 0) {
+						}
+						break;
+					default:
+						break;
+					}
+					EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), TRUE);
+				}
+				break;
+			case IDC_BUTTON1:
+				SetFocus(GetDlgItem(hDlg, IDC_CHECK1));
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK4) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK5) == 0 && IsDlgButtonChecked(hDlg, IDC_CHECK6) == 0) {
+					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), FALSE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), FALSE);
+				}
+				else {
+					EnableWindow(GetDlgItem(hDlg, IDC_SLIDER2), TRUE);	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER3), TRUE);
+				}
+				if (IsDlgButtonChecked(hDlg, IDC_CHECK6) != 0)	EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), TRUE);
+				else EnableWindow(GetDlgItem(hDlg, IDC_SLIDER4), FALSE);
+				[[fallthrough]];						// fallthrough is explicit
+			case IDOK:
+				Profile->lpstAppRegData->bDisplayIMEModeOnCursor = bGetDlgButtonChecked(hDlg, IDC_CHECK1);
+				Profile->lpstAppRegData->bOffChangedFocus = bGetDlgButtonChecked(hDlg, IDC_CHECK2);
+				Profile->lpstAppRegData->bForceHiragana = bGetDlgButtonChecked(hDlg, IDC_CHECK3);
+				Profile->lpstAppRegData->bDoModeDispByIMEKeyDown = bGetDlgButtonChecked(hDlg, IDC_CHECK4);
+				Profile->lpstAppRegData->bDoModeDispByMouseBttnUp = bGetDlgButtonChecked(hDlg, IDC_CHECK5);
+				Profile->lpstAppRegData->bDoModeDispByCtrlUp = bGetDlgButtonChecked(hDlg, IDC_CHECK6);
+				Profile->lpstAppRegData->bDrawNearCaret = bGetDlgButtonChecked(hDlg, IDC_CHECK7);
+				Profile->lpstAppRegData->bEnableEPHelper = bGetDlgButtonChecked(hDlg, IDC_CHECK8);
+				Profile->lpstAppRegData->iCursorSize = (int)dwGetTrackbarPos(hDlg, IDC_SLIDER1);
+				Profile->lpstAppRegData->iModeSize = (int)dwGetTrackbarPos(hDlg, IDC_SLIDER2);
+				Profile->lpstAppRegData->dwDisplayModeTime = dwGetTrackbarPos(hDlg, IDC_SLIDER3);
+				Profile->lpstAppRegData->dwWaitWaveTime = dwGetTrackbarPos(hDlg, IDC_SLIDER4);
+				switch (SendDlgItemMessage(hDlg, IDC_COMBO1, CB_GETCURSEL, 0, 0)) {
+					case 0:
+						Profile->lpstAppRegData->bDisplayFocusWindowIME = TRUE;
+						break;
+					case 1:
+						Profile->lpstAppRegData->bDisplayFocusWindowIME = FALSE;
+						break;
+					default:
+						break;
+				}
+				if (Profile != NULL) {
+					Profile->bSetProfileData();
+				}
+				vStopThreadHookTimer(hMainWnd);
+				if (!bStartThreadHookTimer(hMainWnd)) {
+					PostMessage(hMainWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
+					return (INT_PTR)FALSE;
+				}
+				if (LOWORD(wParam) == IDC_BUTTON1) {
+					EnableWindow(GetDlgItem(hDlg, IDC_BUTTON1), FALSE);
+					return (INT_PTR)FALSE;
+				}
+				[[fallthrough]];	
+			case IDCANCEL:
+				EndDialog(hDlg, LOWORD(wParam));
+				if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))	hSettingDlg = NULL;
+				return (INT_PTR)TRUE;
+			}
+	}
+	return (INT_PTR)FALSE;
+}
+
+//
+// bInitDlgCenter()
+//
+static BOOL		bInitDlgCenter(HWND hDlg, HICON hIcon, DWORD dwICC)
+{
+	int cx = GetSystemMetrics(SM_CXSCREEN);
+	int	cy = GetSystemMetrics(SM_CYSCREEN);
+	RECT		rc{};
+	GetWindowRect(hDlg, (LPRECT)&rc);
+	rc.right = rc.right - rc.left + 1;	rc.bottom = rc.bottom - rc.top + 1;
+	rc.left = (cx - rc.right) / 2;		rc.top = (cy - rc.bottom) / 2;
+	MoveWindow(hDlg, rc.left, rc.top, rc.right, rc.bottom, TRUE);
+	SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
+
+	INITCOMMONCONTROLSEX stICC{};
+	stICC.dwSize = sizeof(INITCOMMONCONTROLSEX);
+	stICC.dwICC = dwICC;
+	return InitCommonControlsEx(&stICC);
+}
+
+//
+// bSetCheckDlgButton()
+//
+static BOOL		bSetCheckDlgButton(HWND hDlg, int iIDButton, BOOL bCheck)
+{
+	UINT		uCheck = 0;
+	if (bCheck) uCheck = BST_CHECKED;
+	else			uCheck = BST_UNCHECKED;
+	if (!CheckDlgButton(hDlg, iIDButton, uCheck)) {
+		return FALSE;
+	}
+	return TRUE;
+}
+
+//
+// vSetTrackbar()
+//
+static VOID		vSetTrackbar(HWND hDlg, int iIDTrackbar, int iRangeMin, int iRangeMax, int iTickFreq, int iPos, int iPageSize)
+{
+	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETRANGE, TRUE, MAKELPARAM(iRangeMin, iRangeMax));
+	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETTICFREQ, iTickFreq, 0);	
+	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETPOS, TRUE, iPos);
+	SendDlgItemMessage(hDlg, iIDTrackbar, TBM_SETPAGESIZE, 0, iPageSize);
+}
+
+//
+// bGetDlgButtonChecked()
+//
+static BOOL		bGetDlgButtonChecked(HWND hDlg, int iIDButton)
+{
+	if (IsDlgButtonChecked(hDlg, iIDButton) == 0)	return FALSE;
+	else return TRUE;
+}
+
+//
+// dwGetTrackbarPos()
+//
+static DWORD		dwGetTrackbarPos(HWND hDlg, int iIDTrackbar)
+{
+	return (DWORD)SendDlgItemMessage(hDlg, iIDTrackbar, TBM_GETPOS, NULL, NULL);
+}
+
+//
+// vGetSetProfileData()
+//
+VOID			vGetSetProfileData()
+{
+	bDisplayIMEModeOnCursor = Profile->lpstAppRegData->bDisplayIMEModeOnCursor;
+	bOffChangedFocus = Profile->lpstAppRegData->bOffChangedFocus;
+	bDisplayFocusWindowIME = Profile->lpstAppRegData->bDisplayFocusWindowIME;
+	bDoModeDispByIMEKeyDown = Profile->lpstAppRegData->bDoModeDispByIMEKeyDown;
+	bDoModeDispByMouseBttnUp = Profile->lpstAppRegData->bDoModeDispByMouseBttnUp;
+	bDoModeDispByCtrlUp = Profile->lpstAppRegData->bDoModeDispByCtrlUp;
+	bDrawNearCaret = Profile->lpstAppRegData->bDrawNearCaret;
+	bEnableEPHelper = Profile->lpstAppRegData->bEnableEPHelper;
+	bMoveIMEToolbar = Profile->lpstAppRegData->bMoveIMEToolbar;
+	bIMEModeForced = Profile->lpstAppRegData->bIMEModeForced;
+}
+
+/* = EOF = */

--- /dev/null
+++ b/FlushMouse/TaskTray.h
@@ -0,0 +1,37 @@
+//
+// TaskTray.h
+//		Copyright (C) 2022 JeffyTS
+//
+// No.      Date		    Name		    Reason & Document
+// -------+-----------+-----------+-------------------------------------------- -
+// #0000		2022/03/03  JeffyTS  	New edit.
+// #0001		2023/06/30	JeffyTS		Divided from FlushMouseSub.h
+
+//
+// Include
+//
+#pragma once
+#include "pch.h"
+
+//
+// Global Data
+//
+extern HWND		hAboutDlg;
+extern HWND		hSettingDlg;
+extern BOOL		bIMEInConverting;
+
+//
+// Global Prototype Define
+//
+extern BOOL 		bCreateTaskTrayWindow(HWND hWnd, HICON hIcon, LPCTSTR lpszTitile);
+extern BOOL		bReCreateTaskTrayWindow(HWND hWnd, UINT message);
+extern BOOL		bDestroyTaskTrayWindow(HWND hWnd);
+extern BOOL		bGetTaskTrayWindowRect(HWND hWnd, LPRECT lpRect);
+extern void		Cls_OnTaskTrayEx(HWND hWnd, UINT id, UINT uMsg);
+extern void		vMessageBox(HWND hWnd, UINT uID, UINT uType);
+extern VOID		vAboutDialog(HWND hWnd);
+extern VOID		vSettingDialog(HWND hWnd);
+extern VOID		vGetSetProfileData();
+
+
+/* = EOF = */
\ No newline at end of file

--- a/FlushMouse32/FlushMouse32.cpp
+++ b/FlushMouse32/FlushMouse32.cpp
@@ -1,9 +1,10 @@
-// FlushMouse32.cpp
+//
+// FlushMouse32.cpp
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/04/06  JeffyTS  	New edit.
+// #0000		2022/04/06  JeffyTS  	New edit.
 //
 
 //
@@ -45,10 +46,9 @@ static UINT_PTR	uCheckProcTimer = NULL;
 //
 // Local Data
 //
-static TCHAR		szTitle[MAX_LOADSTRING]{};			// タイトル バーのテキスト
-//static TCHAR		szWindowClass[]{ CLASS_FLUSHMOUSE32 };	// メイン ウィンドウ クラス名
-static HINSTANCE	hInst = NULL;						// 現在のインターフェイス
-static HWND			hParentWnd = NULL;					// 親のWindow Handle
+static TCHAR			szTitle[MAX_LOADSTRING]{};
+static HINSTANCE		hInst = NULL;
+static HWND			hParentWnd = NULL;
 
 //
 // Global Prototype Define
@@ -68,6 +68,7 @@ static void				Cls_OnDestroy(HWND hWnd);
 // Sub
 static VOID CALLBACK	vCheckProcTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DWORD dwTime);
 static BOOL				bReportEvent(DWORD dwEventID, WORD wCategory);
+static BOOL	 			bCreateProcess(LPCTSTR lpszExecName);
 static void				vMessageBox(HWND hWnd, UINT uID, UINT uType);
 
 //
@@ -177,7 +178,7 @@ static BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 	UNREFERENCED_PARAMETER(nCmdShow);
 #define		WINDOWSTYLE		WS_OVERLAPPEDWINDOW  | WS_HSCROLL | WS_VSCROLL // | WS_VISIBLE // WS_MINIMIZE | WS_SYSMENU
 	hInst = hInstance;							// グローバル変数にインスタンス ハンドルを格納する
-	HWND	hWnd = NULL;						// メインウィンドウのハンドル
+	HWND		hWnd = NULL;						// メインウィンドウのハンドル
 	hWnd = CreateWindowEx(
 							WS_DISABLED,		// Disabled Window
 							CLASS_FLUSHMOUSE32,	// RegisterClass()呼び出しを参照
@@ -223,7 +224,7 @@ static BOOL Cls_OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct)
 		return FALSE;
 	}
 
-	BOOL	bBool = FALSE;
+	BOOL		bBool = FALSE;
 	if (SetUserObjectInformation(GetCurrentProcess(), UOI_TIMERPROC_EXCEPTION_SUPPRESSION, &bBool, sizeof(BOOL)) != FALSE) {
 		// Set Timer for Proc
 		if (uCheckProcTimer == NULL) {
@@ -281,14 +282,13 @@ static VOID CALLBACK vCheckProcTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DW
 			}
 			catch (BOOL bRet) {
 				if (!bRet) {
-					return;
 				}
 			}
 			catch (...) {
-				return;
 			}
 			bReportEvent(MSG_DETECT_FLUSHMOUSE_STOP, APPLICATION32_CATEGORY);
-			bReportEvent(MSG_RESTART_EVENT, APPLICATION32_CATEGORY);
+			bCreateProcess(FLUSHMOUSE_EXE);
+			bReportEvent(MSG_RESTART_EVENT, APPLICATION32_CATEGORY);	
 			PostMessage(hWnd, WM_DESTROY, (WPARAM)NULL, (LPARAM)NULL);
 		}
 	}
@@ -300,7 +300,7 @@ static VOID CALLBACK vCheckProcTimerProc(HWND hWnd, UINT uMsg, UINT uTimerID, DW
 //
 static BOOL	bReportEvent(DWORD dwEventID, WORD wCategory)
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	HANDLE	hEvent = RegisterEventSource(NULL, _T("FlushMouse"));
 	if (hEvent != NULL) {
 		if (ReportEvent(hEvent, (0x0000000c & (dwEventID >> 28)), wCategory, dwEventID, NULL, 0, 0, NULL, NULL) != 0) {
@@ -316,6 +316,30 @@ static BOOL	bReportEvent(DWORD dwEventID, WORD wCategory)
 }
 
 //
+// bCreateProcess()
+//
+static BOOL	 	bCreateProcess(LPCTSTR lpszExecName)
+{
+	BOOL		bRet = FALSE;
+	DWORD	dwSize = 0;
+	dwSize = ExpandEnvironmentStrings(lpszExecName, NULL, 0);
+	LPTSTR	lpszBuffer = new TCHAR[dwSize];
+	if (lpszBuffer) {
+		ZeroMemory(lpszBuffer, dwSize);
+		dwSize = ExpandEnvironmentStrings(lpszExecName, lpszBuffer, dwSize);
+		PROCESS_INFORMATION	ProcessInfomation{};
+		STARTUPINFO	StartupInfo{};		StartupInfo.cb = sizeof(STARTUPINFO);
+		if (CreateProcess(lpszBuffer, NULL, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, &StartupInfo, &ProcessInfomation) != FALSE) {
+			CloseHandle(ProcessInfomation.hProcess);
+			CloseHandle(ProcessInfomation.hThread);
+			bRet = TRUE;
+		}
+		delete[]		lpszBuffer;
+	}
+	return bRet;
+}
+
+//
 // vMessageBox()
 //
 static void vMessageBox(HWND hWnd, UINT uID, UINT uType)

--- a/FlushMouse32/FlushMouse32.h
+++ b/FlushMouse32/FlushMouse32.h
@@ -1,9 +1,10 @@
-// FlushMouse32.h
+//
+// FlushMouse32.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/04/06  JeffyTS  	New edit.
+// #0000		2022/04/06  JeffyTS  	New edit.
 //
 
 //

--- a/FlushMouseCursor/FlushMouseCursor.cpp
+++ b/FlushMouseCursor/FlushMouseCursor.cpp
@@ -1,4 +1,5 @@
-// FlushMouseCursor.cpp
+//
+// FlushMouseCursor.cpp
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document

--- a/FlushMouseCursor/FlushMouseCursor.h
+++ b/FlushMouseCursor/FlushMouseCursor.h
@@ -1,9 +1,10 @@
-// FlushMouseCursor.h
+//
+// FlushMouseCursor.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/03/17  JeffyTS  	New edit.
+// #0000		2022/03/17  JeffyTS  	New edit.
 //
 
 //

--- a/FlushMouseDLL/EventlogData.h
+++ b/FlushMouseDLL/EventlogData.h
@@ -1,3 +1,4 @@
+//
 // Eventlog.mc
 //		Copyright (C) 2023 JeffyTS
 //
@@ -108,13 +109,13 @@
 #define POWERNOTIFICATION_CATEGORY       ((DWORD)0x00000010L)
 
 //
-// MessageId: TASKSCHDULER_CATEGORY
+// MessageId: TASKSCHEDULER_CATEGORY
 //
 // MessageText:
 //
-// TaskSheduler Events
+// TaskScheduler Events
 //
-#define TASKSCHDULER_CATEGORY            ((DWORD)0x00000011L)
+#define TASKSCHEDULER_CATEGORY           ((DWORD)0x00000011L)
 
 //
 // Message definitions.
@@ -259,7 +260,7 @@
 //
 // MessageText:
 //
-// Resumeed from Susped (APM).
+// Resumed from Suspend (APM).
 //
 #define MSG_PBT_APMRESUMESUSPEND         ((DWORD)0x40000102L)
 

--- a/FlushMouseDLL/EventlogData.mc
+++ b/FlushMouseDLL/EventlogData.mc
@@ -1,3 +1,4 @@
+;//
 ;// Eventlog.mc
 ;//		Copyright (C) 2023 JeffyTS
 ;//
@@ -89,13 +90,13 @@ PowerNotification Events
 .
 
 MessageId=0x11
-SymbolicName=TASKSCHDULER_CATEGORY
+SymbolicName=TASKSCHEDULER_CATEGORY
 Language=English
-TaskSheduler Events
+TaskScheduler Events
 .
 
 Language=Japanese
-TaskSheduler Events
+TaskScheduler Events
 .
 
 
@@ -291,11 +292,11 @@ Severity=Informational
 Facility=Application
 SymbolicName=MSG_PBT_APMRESUMESUSPEND
 Language=English
-Resumeed from Susped (APM).
+Resumed from Suspend (APM).
 .
 
 Language=Japanese
-Resumeed from Susped (APM).
+Resumed from Suspend (APM).
 .
 
 MessageId=0x0103

--- a/FlushMouseDLL/EventlogDll.cpp
+++ b/FlushMouseDLL/EventlogDll.cpp
@@ -18,7 +18,7 @@
 //
 DLLEXPORT BOOL  __stdcall 	bReportEvent(DWORD dwEventID, WORD wCategory)
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	HANDLE	hEvent = RegisterEventSource(NULL, _T("FlushMouse"));
 	if (hEvent != NULL) {
 		if (ReportEvent(hEvent, (0x0000000c & (dwEventID >> 28)), wCategory, dwEventID, NULL, 0, 0, NULL, NULL) != 0) {

--- a/FlushMouseDLL/FlushMouseDll.cpp
+++ b/FlushMouseDLL/FlushMouseDll.cpp
@@ -1,9 +1,10 @@
-// FlushMouseDll.cpp : DLL アプリケーションのエントリ ポイントを定義します。
+//
+// FlushMouseDll.cpp
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/02/12  JeffyTS  	New edit.
+// #0000		2022/02/12  JeffyTS  	New edit.
 //
 
 //

--- a/FlushMouseDLL/FlushMouseDll.h
+++ b/FlushMouseDLL/FlushMouseDll.h
@@ -1,4 +1,5 @@
-// FlushMouseDll.h
+//
+// FlushMouseDll.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document

--- a/FlushMouseDLL/GlobalHookDll.cpp
+++ b/FlushMouseDLL/GlobalHookDll.cpp
@@ -1,4 +1,5 @@
-// GlobalHookDll.cpp
+//
+// GlobalHookDll.cpp
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
@@ -77,7 +78,7 @@ DLLEXPORT BOOL  __stdcall bGlobalHookSet(HWND hWnd)
 //
 DLLEXPORT BOOL __stdcall bGlobalHookUnset()
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	if (CSharedMem != NULL) {
 		if ((lpDatGlobal = (LPGLOBAL_SHAREDMEM)CSharedMem->lpvSharedMemoryRead()) != NULL) {
 			if (lpDatGlobal->hWnd) {

--- a/FlushMouseDLL/GlobalHookDll.h
+++ b/FlushMouseDLL/GlobalHookDll.h
@@ -1,4 +1,5 @@
-// GlobalHookDll.h
+//
+// GlobalHookDll.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document

--- a/FlushMouseDLL/KeyboardHookDll.cpp
+++ b/FlushMouseDLL/KeyboardHookDll.cpp
@@ -1,9 +1,10 @@
-// KeyboardHookDll.cpp
+//
+// KeyboardHookDll.cpp
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2022/02/12  JeffyTS  	New edit.
+// #0000		2022/02/12  JeffyTS  	New edit.
 //
 
 //
@@ -26,12 +27,12 @@
 #pragma comment(linker, "/SECTION:FLUSHMOUSEDLL_SEG,RWS")
 #pragma data_seg("FLUSHMOUSEDLL_SEG")
 static BOOL		bOnlyCtrlLL = FALSE;
-static DWORD	dwPreviousVKLL = 0;
+static DWORD		dwPreviousVKLL = 0;
 static HWND		hWndKBParentLL = NULL;
 static LPKEYBOARDLL_SHAREDMEM	lpDatKeyboardLL = NULL;
 static BOOL		bEnableEPHelperLL = FALSE;
 static BOOL		bStartConvertingLL = FALSE;
-static CSharedMemory	*CSharedMemLL = NULL;
+static CSharedMemory		*CSharedMemLL = NULL;
 #pragma data_seg()
 
 //
@@ -78,7 +79,7 @@ DLLEXPORT BOOL  __stdcall bKeyboardHookLLSet(HWND hWnd)
 //
 DLLEXPORT BOOL __stdcall bKeyboardHookLLUnset()
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	if (CSharedMemLL != NULL) {
 		if ((lpDatKeyboardLL = (LPKEYBOARDLL_SHAREDMEM)CSharedMemLL->lpvSharedMemoryRead()) != NULL) {
 			if (lpDatKeyboardLL->hHook) {
@@ -103,7 +104,7 @@ DLLEXPORT BOOL __stdcall bKeyboardHookLLUnset()
 //
 DLLEXPORT BOOL __stdcall bSetEnableEPHelperLL64(BOOL bEPHelper)
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	bEnableEPHelperLL = bEPHelper;
 	if (CSharedMemLL != NULL) {
 		if ((lpDatKeyboardLL = (LPKEYBOARDLL_SHAREDMEM)CSharedMemLL->lpvSharedMemoryRead()) != NULL) {
@@ -362,23 +363,8 @@ static BOOL	bKeyboardHookLLProcSub()
 		}
 	}
 	hWndKBParentLL = lpDatKeyboardLL->hWnd;
-	bEnableEPHelperLL = lpDatKeyboardLL->bEnableEPHelper;		// @@@ for Explorer Patcher Simple Window Switcher
+	bEnableEPHelperLL = lpDatKeyboardLL->bEnableEPHelper;
 	return TRUE;
-	/*
-	if ((hWndKBParentLL == NULL) || (lpDatKeyboardLL == NULL)) {
-		if (lpDatKeyboardLL == NULL) {
-			if ((lpDatKeyboardLL = (LPKEYBOARDLL_SHAREDMEM)lpvSharedMemoryOpen(KEYBOARDHOOKLLMEM, sizeof(KEYBOARDLL_SHAREDMEM))) == NULL) {
-				return	FALSE;
-			}
-		}
-		if (lpDatKeyboardLL->hWnd == NULL) {
-			return	FALSE;
-		}
-		hWndKBParentLL = lpDatKeyboardLL->hWnd;
-		bEnableEPHelperLL = lpDatKeyboardLL->bEnableEPHelper;		// @@@ for Explorer Patcher Simple Window Switcher
-	}
-	return TRUE;
-	*/
 }
 
 /* = EOF = */
\ No newline at end of file

--- a/FlushMouseDLL/KeyboardHookDll.h
+++ b/FlushMouseDLL/KeyboardHookDll.h
@@ -1,4 +1,5 @@
-// KeyboardHookDll.h
+//
+// KeyboardHookDll.h
 //		Copyright (C) 2022 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document

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/MouseHookDll32.cpp
+++ b/FlushMouseDLL32/MouseHookDll32.cpp
@@ -66,7 +66,7 @@ DLLEXPORT BOOL  __stdcall bMouseHookSet32(HWND hWnd)
 //
 DLLEXPORT BOOL __stdcall bMouseHookUnset32()
 {
-	BOOL	bRet = FALSE;
+	BOOL		bRet = FALSE;
 	if (CSharedMem != NULL) {
 		if ((lpDatMouse = (LPMOUSE_SHAREDMEM32)CSharedMem->lpvSharedMemoryRead()) != NULL) {
 			if (lpDatMouse->hHook) {

Binary files a/FlushMouse_x64.msi and b/FlushMouse_x64.msi differ

--- /dev/null
+++ b/OSDN Wiki/README.md	
@@ -0,0 +1,16 @@
+
+# FlushMouse　![Icon](https://osdn.net/users/jeffyts/pf/FlushMouse/wiki/FrontPage/thumb/48x48/FlushMouse.png)
+
+**タスクトレイに常駐して、マウスカーソルへIMEモードの表示をするユーティリティです**
+
+**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)**
+
+
+
+
+使い方については [OSDN/FlushMouse](https://osdn.net/users/jeffyts/pf/FlushMouse/wiki/FrontPage "https://osdn.net/users/JeffyTS/pf/FlushMouse/wiki/FrontPage)") を参照してください (どちらにも同じソースとバイナリが置いてあります)
+
+![Cursors](https://osdn.net/users/jeffyts/pf/FlushMouse/wiki/FrontPage/thumb/230x181/Cursors.png)
+
+![SettingDialog](https://osdn.net/users/jeffyts/pf/FlushMouse/wiki/FrontPage/thumb/572x645/SettingDlg.png)
+

--- a/OSDN Wiki/osdn.txt	
+++ b/OSDN Wiki/osdn.txt	
@@ -5,12 +5,11 @@
 ||[[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/06/28[[BR]]
-　　　'''Version 1.1.0.3 をリリースしました'''[[BR]]
+2023/07/05[[BR]]
+　　　'''Version 1.1.1.7 をリリースしました'''[[BR]]
 [[BR]]
 (主な変更点)[[BR]]
- * キャレット位置の取得方法を見直しました。これで、Chromium Edge や Chrome など多数のアプリでキャレットの左側に IME のモードを表示できるようになりました[[BR]]
- * その他、細かい処理の見直しや、バグの修正をしました[[BR]]
+ * 細かい処理の見直しや、バグの修正をしました[[BR]]
 [[BR]]
  * IMEモードの表示の色指定でαチャネルが有効になるようにしてあります(設定画面は作成していません。レジストリを編集できる方は好みの色にしてみてください  (ただし、レジストリの編集は十分注意して行ってください)[[BR]]
    * HKEY_CURRENT_USER\Software\JeffyTS\FlushMouse の NearDrawCaretColor と NearDrawMouseColor です。上位バイトから、α B G R の順です[[BR]]

--- a/version.h
+++ b/version.h
@@ -1,18 +1,19 @@
+//
 // version.h
 //		Copyright (C) 2023 JeffyTS
 //
 // No.      Date		    Name		    Reason & Document
 // -------+-----------+-----------+-------------------------------------------- -
-// #0000	2023/03/17  JeffyTS  	New edit.
+// #0000		2023/03/17  JeffyTS  	New edit.
 //
 
 #define MAJOR_VERSION		1
 #define MINOR_VERSION		1
-#define BUILD_VERSION		0
-#define REVISON_VERSION		3
+#define BUILD_VERSION		1
+#define REVISON_VERSION		7
 
-#define FILE_VERSION_STRING		VALUE	"FileVersion",		"1.1.0.3"
-#define PRODUCT_VERSION_STRING	VALUE	"ProductVersion",	"1.1.0.3"
+#define FILE_VERSION_STRING		VALUE	"FileVersion",		"1.1.1.7"
+#define PRODUCT_VERSION_STRING	VALUE	"ProductVersion",	"1.1.1.7"
 
 #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,6 @@
 <Include>
 	<!-- for wix Setup Project -->
-	<?define Version = "1.0.2.6" ?>
+	<!-- Copyright (C) 2023 JeffyTS -->
+	<?define Version = "1.1.1.7" ?>
 </Include>