we're ever closer

Vortesys · Jul 24, 2024 · d43b070 · d43b070
1 parent 16cd962
commit d43b070
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/CscdSvc/hook.c b/CscdSvc/hook.c
@@ -72,6 +72,8 @@ __declspec(dllexport) BOOL CALLBACK InitUserHook(UAPIHK State, PUSERAPIHOOK puah
 		return TRUE;
 	}
 
+	MessageBox(NULL, L"test", L"InitUserHook called", MB_OK);
+
 	OutputDebugString(L"InitUserHook initializing\n");
 
 	/* Store the original functions from user32 */

diff --git a/CscdSvc/svc.c b/CscdSvc/svc.c
@@ -226,9 +226,6 @@ VOID WINAPI SvcMain(DWORD dwArgc, LPTSTR* lpszArgv)
 
     // Perform service-specific initialization and work.
     SvcInit(dwArgc, lpszArgv);
-
-    // On shutdown, terminate the Api Hook
-    RemoveUserHook();
 }
 
 //
@@ -271,11 +268,15 @@ VOID SvcInit(DWORD dwArgc, LPTSTR* lpszArgv)
     // TO_DO: Perform work until service stops.
 
     // Install our user hook, if FALSE then fail.
-    if (InstallUserHook())
+    /*
+    if (!InstallUserHook())
     {
         ReportSvcStatus(SERVICE_STOPPED, GetLastError(), 0);
         return;
     }
+    */
+
+    InstallUserHook();
 
     while (TRUE)
     {
@@ -285,6 +286,13 @@ VOID SvcInit(DWORD dwArgc, LPTSTR* lpszArgv)
         ReportSvcStatus(SERVICE_STOPPED, NO_ERROR, 0);
         return;
     }
+
+    // Kill the user hook
+    if (!RemoveUserHook())
+    {
+        ReportSvcStatus(SERVICE_STOPPED, GetLastError(), 0);
+        return;
+    }
 }
 
 //