hook in main thread

mgth · May 6, 2024 · 16e8a15 · 16e8a15
1 parent b7e2cc4
commit 16e8a15
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 27 deletions.
diff --git a/HLab.Avalonia b/HLab.Avalonia
diff --git a/HLab.Core b/HLab.Core
diff --git a/LittleBigMouse.Hook/Config.h b/LittleBigMouse.Hook/Config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define LOGTOFILE 1
-#define DEBUG_LOG 0
-#define DEBUG_LEVEL 1
+#define DEBUG_LOG 1
+#define DEBUG_LEVEL 0
 
 #define USE_NANOSIGNALSLOT 0
diff --git a/LittleBigMouse.Hook/Daemon/LittleBigMouseDaemon.cpp b/LittleBigMouse.Hook/Daemon/LittleBigMouseDaemon.cpp
@@ -82,8 +82,10 @@ void LittleBigMouseDaemon::Connect()
 
 void LittleBigMouseDaemon::Run(const std::string& path) 
 {
+	LOG_TRACE("Daemon started");
 	// connect to events
 	Connect();
+	LOG_TRACE("Connected");
 
 	//start remote server
 	if(_remoteServer)
@@ -96,14 +98,15 @@ void LittleBigMouseDaemon::Run(const std::string& path)
 			return;
 		}
 	}
-
-	// pump messages
-	if(_hook)
-		_hook->Start();
+	LOG_TRACE("RemoteServer");
 
 	// load layout from file
 	if(!path.empty())
 		LoadFromFile(path);
+
+	// pump messages
+	if(_hook)
+		_hook->RunThread();
 
 	// wait remote server to stop
 	if(_remoteServer)
@@ -318,7 +321,8 @@ void LittleBigMouseDaemon::FocusChanged(const std::string& path)
 		}
 	}
 
-	_remoteServer->Send("<DaemonMessage><Event>FocusChanged</Event><Payload>"+path+"</Payload></DaemonMessage>\n",nullptr);
+	if(_remoteServer)
+		_remoteServer->Send("<DaemonMessage><Event>FocusChanged</Event><Payload>"+path+"</Payload></DaemonMessage>\n",nullptr);
 }
 
 void LittleBigMouseDaemon::ReceiveClientMessage(const std::string& message, RemoteClient* client)

diff --git a/LittleBigMouse.Hook/Hook/Hooker.cpp b/LittleBigMouse.Hook/Hook/Hooker.cpp
@@ -46,11 +46,11 @@ void Hooker::DoHook()
 
 	if(_hookMouse)
 	{
-		//HookMouse();
+		HookMouse();
 	}
 
-	// HookFocusEvent();
-	// HookEventSystemDesktopSwitch();
+	HookFocusEvent();
+	HookEventSystemDesktopSwitch();
 	HookDisplayChange();
 
 }
@@ -70,14 +70,25 @@ int Hooker::Loop()
 {
     MSG msg;
 
-    while (GetMessage(&msg, nullptr, 0, 0))
+	LOG_TRACE("<Hook:Start>");
+
+
+	auto ret = GetMessage(&msg, nullptr, 0, 0);
+    while (ret)
     {
 //        if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg))
         TranslateMessage(&msg);
         DispatchMessage(&msg);
+
+		if(ret == -1)
+		{
+			LOG_DEBUG("<Hook:Error>");
+			(int)msg.wParam;
+		}
+		ret = GetMessage(&msg, nullptr, 0, 0);
     }
 
-    return (int) msg.wParam;
+    return (int)msg.wParam;
 }
 
 
@@ -115,15 +126,21 @@ void Hooker::RunThread()
 
 	while(!Stopping())
 	{
-		//DoSetPriority(_priority); // TODO : Activate this line
+		DoSetPriority(_priority);
+		LOG_TRACE("SetPriority");
+
 
 		DoHook();
+		LOG_TRACE("Hook");
 
 		Loop();
+		LOG_TRACE("Loop");
 
 		DoUnhook();
+		LOG_TRACE("Unhook");
 
-		//DoSetPriority(Below); // TODO : Activate this line
+		DoSetPriority(Below);
+		LOG_TRACE("SetPriority");
 	}
 
 	LOG_TRACE("<Hook:Stopped>");

diff --git a/LittleBigMouse.Hook/Hook/HookerDisplayChanged.cpp b/LittleBigMouse.Hook/Hook/HookerDisplayChanged.cpp
@@ -1,4 +1,5 @@
 #include "Hooker.h"
+#include "Strings/str.h"
 
 #define MAX_LOADSTRING 100
 
@@ -19,7 +20,7 @@ ATOM Hooker::RegisterClassLbm(HINSTANCE hInstance)
     wcex.hCursor        = nullptr; //LoadCursor(nullptr, IDC_ARROW);
     wcex.hbrBackground  = nullptr; //(HBRUSH)(COLOR_WINDOW+1);
     wcex.lpszMenuName   = nullptr; //MAKEINTRESOURCEW(IDC_WINDOWSPROJECT1);
-    wcex.lpszClassName  = szWindowClass;
+    wcex.lpszClassName  = L"HookerDisplayChange";
     wcex.hIconSm        = nullptr; //LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
 
     return RegisterClassExW(&wcex);
@@ -28,9 +29,8 @@ ATOM Hooker::RegisterClassLbm(HINSTANCE hInstance)
 BOOL Hooker::InitInstance(HINSTANCE hInstance)
 {
    _hInst = hInstance; 
-   auto szWindowClass = L"HookerDisplayChange";
 
-   HWND hWnd = CreateWindowW(szWindowClass, szWindowClass, WS_OVERLAPPEDWINDOW,
+   HWND hWnd = CreateWindowW(L"HookerDisplayChange", szWindowClass, WS_OVERLAPPEDWINDOW,
       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, nullptr, nullptr, hInstance, nullptr);
 
    if (!hWnd)
@@ -52,8 +52,6 @@ bool Hooker::HookDisplayChange()
 {
 	LOG_TRACE("<Hook:HookDisplayChange> : CreateHookWindow");
 
-    auto test = this;
-
 	const auto hInstance = GetModuleHandle(nullptr);
 
     auto c = RegisterClassLbm(hInstance);
@@ -66,7 +64,7 @@ bool Hooker::HookDisplayChange()
             FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
                            NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
                            buf, (sizeof(buf) / sizeof(wchar_t)), NULL);
-	        LOG_TRACE("<Hook:HookDisplayChange> : " << buf);
+	        LOG_TRACE("<Hook:HookDisplayChange> : " << ToString(buf));
         #endif
 
         return false;

diff --git a/LittleBigMouse.Hook/Logger/Logger.h b/LittleBigMouse.Hook/Logger/Logger.h
@@ -1,4 +1,5 @@
 #pragma once
+#include "Config.h"
 
 #if _DEBUG && DEBUG_LOG 
 

diff --git a/LittleBigMouse.Hook/Program.cpp b/LittleBigMouse.Hook/Program.cpp
@@ -96,8 +96,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 
     SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2 );
 
-    //RemoteServerSocket server;
-    //MouseEngine engine;
+    RemoteServerSocket server;
+    MouseEngine engine;
     auto hook = Hooker();
 
     auto p = GetParentProcess();
@@ -115,8 +115,8 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	//	}
 	//}
 
-    ///auto daemon = LittleBigMouseDaemon( &server , &engine, &hook );
-    auto daemon = LittleBigMouseDaemon( nullptr , nullptr, &hook );
+    auto daemon = LittleBigMouseDaemon( &server , &engine, &hook );
+    ///auto daemon = LittleBigMouseDaemon( nullptr , nullptr, &hook );
 
     if(uiMode)
     {

diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Plugins/About/AboutMonitorView.axaml b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Plugins/About/AboutMonitorView.axaml
@@ -21,7 +21,7 @@
     <StackPanel VerticalAlignment="Center">
     <TextBlock HorizontalAlignment="Center" Margin="0,0,0,5" Text="Little Big Mouse" FontSize="20" FontWeight="Bold"/>
     <TextBlock HorizontalAlignment="Center" Text="{Binding Version}" TextWrapping="Wrap" FontSize="15"/>
-    <TextBlock HorizontalAlignment="Center" Text="Copyright (C) 2015 - 2023" FontSize="15"/>
+    <TextBlock HorizontalAlignment="Center" Text="Copyright (C) 2015 - 2024" FontSize="15"/>
 	<TextBlock PointerPressed="InputElement_OnPointerPressed" HorizontalAlignment="Center" Margin="0,0,0,20" Text="Mathieu GRENET" FontSize="15"/>
 
     <icons:IconView HorizontalAlignment="Center" Margin="0,0,0,20" Path="Icon/lbm_logo" Height="50"/>

diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Remote/LittleBigMouseClientService.cs b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Remote/LittleBigMouseClientService.cs
@@ -117,6 +117,7 @@ public void LaunchDaemon()
         var processes = Process.GetProcessesByName("LittleBigMouse.Hook");
         foreach (var process in processes)
         {
+            if(process.HasExited) continue;
             Debug.WriteLine($"Already running : {process.ProcessName} {process.Id}");
             return;
         }