diff --git a/reactos/boot/bootdata/hivesft.inf b/reactos/boot/bootdata/hivesft.inf
index 03b57916b86..f3827877883 100644
--- a/reactos/boot/bootdata/hivesft.inf
+++ b/reactos/boot/bootdata/hivesft.inf
@@ -1105,9 +1105,19 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,""
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test",,0x00000012
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Disconnect",0x00000000,"TestDisconnectEvent"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","DlLName",0x00020000,"wlnotify.dll"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Lock",0x00000000,"TestLockEvent"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logoff",0x00000000,"TestLogoffEvent"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logon",0x00000000,"TestLogonEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","PostShell",0x00000000,"TestPostShellEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Reconnect",0x00000000,"TestReconnectEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Shutdown",0x00000000,"TestShutdownEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartScreenSaver",0x00000000,"TestStartScreenSaverEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartShell",0x00000000,"TestStartShellEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Startup",0x00000000,"TestStartupEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StopScreenSaver",0x00000000,"TestStopScreenSaverEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Unlock",0x00000000,"TestUnlockEvent"
 
 ; Time Zone Servers
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org"
diff --git a/reactos/dll/win32/wlnotify/test.c b/reactos/dll/win32/wlnotify/test.c
index 4e184ff4ea0..e3911d3b758 100644
--- a/reactos/dll/win32/wlnotify/test.c
+++ b/reactos/dll/win32/wlnotify/test.c
@@ -17,15 +17,15 @@ WINAPI
 TestLogonEvent(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT1("TestLogonEvent\n");
-    DPRINT1("Size: %lu\n", pInfo->Size);
-    DPRINT1("Flags: %lx\n", pInfo->Flags);
-    DPRINT1("UserName: %S\n", pInfo->UserName);
-    DPRINT1("Domain: %S\n", pInfo->Domain);
-    DPRINT1("WindowStation: %S\n", pInfo->WindowStation);
-    DPRINT1("hToken: %p\n", pInfo->hToken);
-    DPRINT1("hDesktop: %p\n", pInfo->hDesktop);
-    DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback);
+    DPRINT("TestLogonEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
 }
 
 
@@ -34,15 +34,184 @@ WINAPI
 TestLogoffEvent(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT1("TestLogoffEvent\n");
-    DPRINT1("Size: %lu\n", pInfo->Size);
-    DPRINT1("Flags: %lx\n", pInfo->Flags);
-    DPRINT1("UserName: %S\n", pInfo->UserName);
-    DPRINT1("Domain: %S\n", pInfo->Domain);
-    DPRINT1("WindowStation: %S\n", pInfo->WindowStation);
-    DPRINT1("hToken: %p\n", pInfo->hToken);
-    DPRINT1("hDesktop: %p\n", pInfo->hDesktop);
-    DPRINT1("pStatusCallback: %p\n", pInfo->pStatusCallback);
+    DPRINT("TestLogoffEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestLockEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestLockEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestUnlockEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestUnlockEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestStartupEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestStartupEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestShutdownEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestShutdownEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestStartScreenSaverEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestStartScreenSaverEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestStopScreenSaverEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestStopScreenSaverEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestStartShellEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestStartShellEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestPostShellEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestStartShellEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+VOID
+WINAPI
+TestDisconnectEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestDisconnectEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
+}
+
+
+VOID
+WINAPI
+TestReconnectEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TestReconnectEvent\n");
+    DPRINT("Size: %lu\n", pInfo->Size);
+    DPRINT("Flags: %lx\n", pInfo->Flags);
+    DPRINT("UserName: %S\n", pInfo->UserName);
+    DPRINT("Domain: %S\n", pInfo->Domain);
+    DPRINT("WindowStation: %S\n", pInfo->WindowStation);
+    DPRINT("hToken: %p\n", pInfo->hToken);
+    DPRINT("hDesktop: %p\n", pInfo->hDesktop);
+    DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
 }
 
 /* EOF */
diff --git a/reactos/dll/win32/wlnotify/wlnotify.spec b/reactos/dll/win32/wlnotify/wlnotify.spec
index 8a39ba3d562..bd2d999545e 100644
--- a/reactos/dll/win32/wlnotify/wlnotify.spec
+++ b/reactos/dll/win32/wlnotify/wlnotify.spec
@@ -1,2 +1,12 @@
-@ stdcall TestLogonEvent(ptr)
+@ stdcall TestDisconnectEvent(ptr)
+@ stdcall TestLockEvent(ptr)
 @ stdcall TestLogoffEvent(ptr)
+@ stdcall TestLogonEvent(ptr)
+@ stdcall TestPostShellEvent(ptr)
+@ stdcall TestReconnectEvent(ptr)
+@ stdcall TestShutdownEvent(ptr)
+@ stdcall TestStartScreenSaverEvent(ptr)
+@ stdcall TestStartShellEvent(ptr)
+@ stdcall TestStartupEvent(ptr)
+@ stdcall TestStopScreenSaverEvent(ptr)
+@ stdcall TestUnlockEvent(ptr)