diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf
index 4e4e81653d6..bfd34a22d0d 100644
--- a/boot/bootdata/hivesft.inf
+++ b/boot/bootdata/hivesft.inf
@@ -1377,20 +1377,44 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomainName"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,""
 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"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp",,0x00000012
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","DlLName",0x00020000,"wlnotify.dll"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Lock",0x00000000,"SCardSuspendCertProp"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Logoff",0x00000000,"SCardStopCertProp"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Logon",0x00000000,"SCardStartCertProp"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Unlock",0x00000000,"SCardResumeCertProp"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule",,0x00000012
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","DlLName",0x00020000,"wlnotify.dll"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","Logoff",0x00000000,"SchedEventLogOff"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","StartShell",0x00000000,"SchedStartShell"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn",,0x00000012
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Disconnect",0x00000000,"SensDisconnectEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","DlLName",0x00020000,"wlnotify.dll"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Lock",0x00000000,"SensLockEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Logoff",0x00000000,"SensLogoffEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Logon",0x00000000,"SensLogonEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","PostShell",0x00000000,"SensPostShellEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Reconnect",0x00000000,"SensReconnectEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Shutdown",0x00000000,"SensShutdownEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","StartScreenSaver",0x00000000,"SensStartScreenSaverEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","StartShell",0x00000000,"SensStartShellEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Startup",0x00000000,"SensStartupEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","StopScreenSaver",0x00000000,"SensStopScreenSaverEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Unlock",0x00000000,"SensUnlockEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv",,0x00000012
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Disconnect",0x00000000,"TSEventDisconnect"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","DlLName",0x00020000,"wlnotify.dll"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Logoff",0x00000000,"TSEventLogoff"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Logon",0x00000000,"TSEventLogon"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","PostShell",0x00000000,"TSEventPostShell"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Reconnect",0x00000000,"TSEventReconnect"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Shutdown",0x00000000,"TSEventShutdown"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","StartShell",0x00000000,"TSEventStartShell"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Startup",0x00000000,"TSEventStartup"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon",,0x00000012
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","DlLName",0x00020000,"wlnotify.dll"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","Logoff",0x00000000,"UnregisterTicketExpiredNotificationEvent"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","Logon",0x00000000,"RegisterTicketExpiredNotificationEvent"
 
 ; Time Zone Servers
 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org"
diff --git a/dll/win32/wlnotify/CMakeLists.txt b/dll/win32/wlnotify/CMakeLists.txt
index 6cbf00ce864..5f890399d6d 100644
--- a/dll/win32/wlnotify/CMakeLists.txt
+++ b/dll/win32/wlnotify/CMakeLists.txt
@@ -2,9 +2,11 @@
 spec2def(wlnotify.dll wlnotify.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
+    scard.c
     schedsvc.c
     senssvc.c
-    test.c
+    termserv.c
+    wlballoon.c
     wlnotify.c
     precomp.h)
 
diff --git a/dll/win32/wlnotify/precomp.h b/dll/win32/wlnotify/precomp.h
index c744968f842..04c440dc93f 100644
--- a/dll/win32/wlnotify/precomp.h
+++ b/dll/win32/wlnotify/precomp.h
@@ -1,3 +1,9 @@
-/**/
+/*
+ * PROJECT:     ReactOS system libraries
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        dll/win32/wlnotify/precomp.h
+ * PURPOSE:     Winlogon notifications common header file
+ * PROGRAMMER:  Eric Kohl <eric.kohl@reactos.org>
+ */
 #include <windows.h>
 #include <winwlx.h>
diff --git a/dll/win32/wlnotify/scard.c b/dll/win32/wlnotify/scard.c
new file mode 100644
index 00000000000..8eaa3130709
--- /dev/null
+++ b/dll/win32/wlnotify/scard.c
@@ -0,0 +1,82 @@
+/*
+ * PROJECT:     ReactOS system libraries
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        dll/win32/wlnotify/scard.c
+ * PURPOSE:     SCard logon notifications
+ * PROGRAMMER:  Eric Kohl <eric.kohl@reactos.org>
+ */
+
+#include "precomp.h"
+#include <winsvc.h>
+
+#define _NDEBUG
+#include <debug.h>
+
+VOID
+WINAPI
+SCardResumeCertProp(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("SCardResumeCertProp\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
+SCardStartCertProp(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("SCardStartCertProp\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
+SCardStopCertProp(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("SCardStopCertProp\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
+SCardSuspendCertProp(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("SCardSuspendCertProp\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/dll/win32/wlnotify/test.c b/dll/win32/wlnotify/termserv.c
similarity index 60%
rename from dll/win32/wlnotify/test.c
rename to dll/win32/wlnotify/termserv.c
index 8f8705547a1..d33eb41d0ba 100644
--- a/dll/win32/wlnotify/test.c
+++ b/dll/win32/wlnotify/termserv.c
@@ -1,7 +1,7 @@
 /*
  * PROJECT:     ReactOS system libraries
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        dll/win32/wlnotify/test.c
+ * FILE:        dll/win32/wlnotify/termserv.c
  * PURPOSE:     Winlogon notifications
  * PROGRAMMER:  Eric Kohl
  */
@@ -14,10 +14,10 @@
 
 VOID
 WINAPI
-TestLogonEvent(
+TSEventDisconnect(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT("TestLogonEvent\n");
+    DPRINT("TSEventDisconnect\n");
     DPRINT("Size: %lu\n", pInfo->Size);
     DPRINT("Flags: %lx\n", pInfo->Flags);
     DPRINT("UserName: %S\n", pInfo->UserName);
@@ -31,10 +31,10 @@ TestLogonEvent(
 
 VOID
 WINAPI
-TestLogoffEvent(
+TSEventLogoff(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT("TestLogoffEvent\n");
+    DPRINT("TSEventLogoff\n");
     DPRINT("Size: %lu\n", pInfo->Size);
     DPRINT("Flags: %lx\n", pInfo->Flags);
     DPRINT("UserName: %S\n", pInfo->UserName);
@@ -48,10 +48,42 @@ TestLogoffEvent(
 
 VOID
 WINAPI
-TestLockEvent(
+TSEventLogon(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT("TestLockEvent\n");
+    DPRINT("TSEventLogon\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
+TSEventPostShell(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TSEventPostShell\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
+TSEventReconnect(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("TSEventReconnect\n");
     DPRINT("Size: %lu\n", pInfo->Size);
     DPRINT("Flags: %lx\n", pInfo->Flags);
     DPRINT("UserName: %S\n", pInfo->UserName);
@@ -65,10 +97,10 @@ TestLockEvent(
 
 VOID
 WINAPI
-TestUnlockEvent(
+TSEventShutdown(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT("TestUnlockEvent\n");
+    DPRINT("TSEventShutdown\n");
     DPRINT("Size: %lu\n", pInfo->Size);
     DPRINT("Flags: %lx\n", pInfo->Flags);
     DPRINT("UserName: %S\n", pInfo->UserName);
@@ -82,10 +114,10 @@ TestUnlockEvent(
 
 VOID
 WINAPI
-TestStartupEvent(
+TSEventStartShell(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT("TestStartupEvent\n");
+    DPRINT("TSEventStartShell\n");
     DPRINT("Size: %lu\n", pInfo->Size);
     DPRINT("Flags: %lx\n", pInfo->Flags);
     DPRINT("UserName: %S\n", pInfo->UserName);
@@ -99,10 +131,10 @@ TestStartupEvent(
 
 VOID
 WINAPI
-TestShutdownEvent(
+TSEventStartup(
     PWLX_NOTIFICATION_INFO pInfo)
 {
-    DPRINT("TestShutdownEvent\n");
+    DPRINT("TSEventStartup\n");
     DPRINT("Size: %lu\n", pInfo->Size);
     DPRINT("Flags: %lx\n", pInfo->Flags);
     DPRINT("UserName: %S\n", pInfo->UserName);
@@ -114,104 +146,6 @@ TestShutdownEvent(
 }
 
 
-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("TestPostShellEvent\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);
-}
+/* TermsrvCreateTempDir */
 
 /* EOF */
diff --git a/dll/win32/wlnotify/wlballoon.c b/dll/win32/wlnotify/wlballoon.c
new file mode 100644
index 00000000000..c6ced7105b6
--- /dev/null
+++ b/dll/win32/wlnotify/wlballoon.c
@@ -0,0 +1,51 @@
+/*
+ * PROJECT:     ReactOS system libraries
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        dll/win32/wlnotify/wlballoon.c
+ * PURPOSE:     Winlogon notifications
+ * PROGRAMMER:  Eric Kohl
+ */
+
+#include "precomp.h"
+
+#define _NDEBUG
+#include <debug.h>
+
+
+VOID
+WINAPI
+RegisterTicketExpiredNotificationEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("RegisterTicketExpiredNotificationEvent\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
+UnregisterTicketExpiredNotificationEvent(
+    PWLX_NOTIFICATION_INFO pInfo)
+{
+    DPRINT("UnregisterTicketExpiredNotificationEvent\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);
+}
+
+
+/* ShowNotificationBallonW */
+
+/* EOF */
diff --git a/dll/win32/wlnotify/wlnotify.spec b/dll/win32/wlnotify/wlnotify.spec
index 2eb0b647c1a..15b6f7c7cc1 100644
--- a/dll/win32/wlnotify/wlnotify.spec
+++ b/dll/win32/wlnotify/wlnotify.spec
@@ -1,8 +1,8 @@
-;@ stub RegisterTicketExpiredNotificationEvent
-;@ stub SCardResumeCertProp
-;@ stub SCardStartCertProp
-;@ stub SCardStopCertProp
-;@ stub SCardSuspendCertProp
+@ stdcall RegisterTicketExpiredNotificationEvent(ptr)
+@ stdcall SCardResumeCertProp(ptr)
+@ stdcall SCardStartCertProp(ptr)
+@ stdcall SCardStopCertProp(ptr)
+@ stdcall SCardSuspendCertProp(ptr)
 @ stdcall SchedEventLogoff(ptr)
 @ stdcall SchedStartShell(ptr)
 @ stdcall SensDisconnectEvent(ptr)
@@ -18,25 +18,13 @@
 @ stdcall SensStopScreenSaverEvent(ptr)
 @ stdcall SensUnlockEvent(ptr)
 ;@ stub ShowNotificationBallonW
-@ 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)
-;@ stub TSEventDisconnect
-;@ stub TSEventLogoff
-;@ stub TSEventLogon
-;@ stub TSEventPostShell
-;@ stub TSEventReconnect
-;@ stub TSEventShutdown
-;@ stub TSEventStartShell
-;@ stub TSEventStartup
+@ stdcall TSEventDisconnect(ptr)
+@ stdcall TSEventLogoff(ptr)
+@ stdcall TSEventLogon(ptr)
+@ stdcall TSEventPostShell(ptr)
+@ stdcall TSEventReconnect(ptr)
+@ stdcall TSEventShutdown(ptr)
+@ stdcall TSEventStartShell(ptr)
+@ stdcall TSEventStartup(ptr)
 ;@ stub TermsrvCreateTempDir
-;@ stub UnregisterTicketExpiredNotificationEvent
+@ stdcall UnregisterTicketExpiredNotificationEvent(ptr)