Skip to content

Commit df84921

Browse files
EricKohlEricKohl
committed
[WLNOTIFY] Add SCard, Termsrv and Wlballon notifications and remove the test notifications
1 parent 0725098 commit df84921

File tree

7 files changed

+213
-126
lines changed

7 files changed

+213
-126
lines changed

‎boot/bootdata/hivesft.inf

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,20 +1377,44 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultDomainName"
13771377
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,""
13781378
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,""
13791379
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012
1380-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test",,0x00000012
1381-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Disconnect",0x00000000,"TestDisconnectEvent"
1382-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","DlLName",0x00020000,"wlnotify.dll"
1383-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Lock",0x00000000,"TestLockEvent"
1384-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logoff",0x00000000,"TestLogoffEvent"
1385-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Logon",0x00000000,"TestLogonEvent"
1386-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","PostShell",0x00000000,"TestPostShellEvent"
1387-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Reconnect",0x00000000,"TestReconnectEvent"
1388-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Shutdown",0x00000000,"TestShutdownEvent"
1389-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartScreenSaver",0x00000000,"TestStartScreenSaverEvent"
1390-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StartShell",0x00000000,"TestStartShellEvent"
1391-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Startup",0x00000000,"TestStartupEvent"
1392-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","StopScreenSaver",0x00000000,"TestStopScreenSaverEvent"
1393-
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Test","Unlock",0x00000000,"TestUnlockEvent"
1380+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp",,0x00000012
1381+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","DlLName",0x00020000,"wlnotify.dll"
1382+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Lock",0x00000000,"SCardSuspendCertProp"
1383+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Logoff",0x00000000,"SCardStopCertProp"
1384+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Logon",0x00000000,"SCardStartCertProp"
1385+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Unlock",0x00000000,"SCardResumeCertProp"
1386+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule",,0x00000012
1387+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","DlLName",0x00020000,"wlnotify.dll"
1388+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","Logoff",0x00000000,"SchedEventLogOff"
1389+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","StartShell",0x00000000,"SchedStartShell"
1390+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn",,0x00000012
1391+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Disconnect",0x00000000,"SensDisconnectEvent"
1392+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","DlLName",0x00020000,"wlnotify.dll"
1393+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Lock",0x00000000,"SensLockEvent"
1394+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Logoff",0x00000000,"SensLogoffEvent"
1395+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Logon",0x00000000,"SensLogonEvent"
1396+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","PostShell",0x00000000,"SensPostShellEvent"
1397+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Reconnect",0x00000000,"SensReconnectEvent"
1398+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Shutdown",0x00000000,"SensShutdownEvent"
1399+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","StartScreenSaver",0x00000000,"SensStartScreenSaverEvent"
1400+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","StartShell",0x00000000,"SensStartShellEvent"
1401+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Startup",0x00000000,"SensStartupEvent"
1402+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","StopScreenSaver",0x00000000,"SensStopScreenSaverEvent"
1403+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Unlock",0x00000000,"SensUnlockEvent"
1404+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv",,0x00000012
1405+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Disconnect",0x00000000,"TSEventDisconnect"
1406+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","DlLName",0x00020000,"wlnotify.dll"
1407+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Logoff",0x00000000,"TSEventLogoff"
1408+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Logon",0x00000000,"TSEventLogon"
1409+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","PostShell",0x00000000,"TSEventPostShell"
1410+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Reconnect",0x00000000,"TSEventReconnect"
1411+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Shutdown",0x00000000,"TSEventShutdown"
1412+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","StartShell",0x00000000,"TSEventStartShell"
1413+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Startup",0x00000000,"TSEventStartup"
1414+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon",,0x00000012
1415+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","DlLName",0x00020000,"wlnotify.dll"
1416+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","Logoff",0x00000000,"UnregisterTicketExpiredNotificationEvent"
1417+
HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","Logon",0x00000000,"RegisterTicketExpiredNotificationEvent"
13941418

13951419
; Time Zone Servers
13961420
HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org"

‎dll/win32/wlnotify/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
spec2def(wlnotify.dll wlnotify.spec ADD_IMPORTLIB)
33

44
list(APPEND SOURCE
5+
scard.c
56
schedsvc.c
67
senssvc.c
7-
test.c
8+
termserv.c
9+
wlballoon.c
810
wlnotify.c
911
precomp.h)
1012

‎dll/win32/wlnotify/precomp.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
/**/
1+
/*
2+
* PROJECT: ReactOS system libraries
3+
* LICENSE: GPL - See COPYING in the top level directory
4+
* FILE: dll/win32/wlnotify/precomp.h
5+
* PURPOSE: Winlogon notifications common header file
6+
* PROGRAMMER: Eric Kohl <[email protected]>
7+
*/
28
#include <windows.h>
39
#include <winwlx.h>

‎dll/win32/wlnotify/scard.c

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
/*
2+
* PROJECT: ReactOS system libraries
3+
* LICENSE: GPL - See COPYING in the top level directory
4+
* FILE: dll/win32/wlnotify/scard.c
5+
* PURPOSE: SCard logon notifications
6+
* PROGRAMMER: Eric Kohl <[email protected]>
7+
*/
8+
9+
#include "precomp.h"
10+
#include <winsvc.h>
11+
12+
#define _NDEBUG
13+
#include <debug.h>
14+
15+
VOID
16+
WINAPI
17+
SCardResumeCertProp(
18+
PWLX_NOTIFICATION_INFO pInfo)
19+
{
20+
DPRINT("SCardResumeCertProp\n");
21+
DPRINT("Size: %lu\n", pInfo->Size);
22+
DPRINT("Flags: %lx\n", pInfo->Flags);
23+
DPRINT("UserName: %S\n", pInfo->UserName);
24+
DPRINT("Domain: %S\n", pInfo->Domain);
25+
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
26+
DPRINT("hToken: %p\n", pInfo->hToken);
27+
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
28+
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
29+
}
30+
31+
32+
VOID
33+
WINAPI
34+
SCardStartCertProp(
35+
PWLX_NOTIFICATION_INFO pInfo)
36+
{
37+
DPRINT("SCardStartCertProp\n");
38+
DPRINT("Size: %lu\n", pInfo->Size);
39+
DPRINT("Flags: %lx\n", pInfo->Flags);
40+
DPRINT("UserName: %S\n", pInfo->UserName);
41+
DPRINT("Domain: %S\n", pInfo->Domain);
42+
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
43+
DPRINT("hToken: %p\n", pInfo->hToken);
44+
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
45+
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
46+
}
47+
48+
49+
VOID
50+
WINAPI
51+
SCardStopCertProp(
52+
PWLX_NOTIFICATION_INFO pInfo)
53+
{
54+
DPRINT("SCardStopCertProp\n");
55+
DPRINT("Size: %lu\n", pInfo->Size);
56+
DPRINT("Flags: %lx\n", pInfo->Flags);
57+
DPRINT("UserName: %S\n", pInfo->UserName);
58+
DPRINT("Domain: %S\n", pInfo->Domain);
59+
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
60+
DPRINT("hToken: %p\n", pInfo->hToken);
61+
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
62+
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
63+
}
64+
65+
66+
VOID
67+
WINAPI
68+
SCardSuspendCertProp(
69+
PWLX_NOTIFICATION_INFO pInfo)
70+
{
71+
DPRINT("SCardSuspendCertProp\n");
72+
DPRINT("Size: %lu\n", pInfo->Size);
73+
DPRINT("Flags: %lx\n", pInfo->Flags);
74+
DPRINT("UserName: %S\n", pInfo->UserName);
75+
DPRINT("Domain: %S\n", pInfo->Domain);
76+
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
77+
DPRINT("hToken: %p\n", pInfo->hToken);
78+
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
79+
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
80+
}
81+
82+
/* EOF */

‎dll/win32/wlnotify/test.c renamed to ‎dll/win32/wlnotify/termserv.c

Lines changed: 18 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* PROJECT: ReactOS system libraries
33
* LICENSE: GPL - See COPYING in the top level directory
4-
* FILE: dll/win32/wlnotify/test.c
4+
* FILE: dll/win32/wlnotify/termserv.c
55
* PURPOSE: Winlogon notifications
66
* PROGRAMMER: Eric Kohl
77
*/
@@ -14,10 +14,10 @@
1414

1515
VOID
1616
WINAPI
17-
TestLogonEvent(
17+
TSEventDisconnect(
1818
PWLX_NOTIFICATION_INFO pInfo)
1919
{
20-
DPRINT("TestLogonEvent\n");
20+
DPRINT("TSEventDisconnect\n");
2121
DPRINT("Size: %lu\n", pInfo->Size);
2222
DPRINT("Flags: %lx\n", pInfo->Flags);
2323
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -31,10 +31,10 @@ TestLogonEvent(
3131

3232
VOID
3333
WINAPI
34-
TestLogoffEvent(
34+
TSEventLogoff(
3535
PWLX_NOTIFICATION_INFO pInfo)
3636
{
37-
DPRINT("TestLogoffEvent\n");
37+
DPRINT("TSEventLogoff\n");
3838
DPRINT("Size: %lu\n", pInfo->Size);
3939
DPRINT("Flags: %lx\n", pInfo->Flags);
4040
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -48,10 +48,10 @@ TestLogoffEvent(
4848

4949
VOID
5050
WINAPI
51-
TestLockEvent(
51+
TSEventLogon(
5252
PWLX_NOTIFICATION_INFO pInfo)
5353
{
54-
DPRINT("TestLockEvent\n");
54+
DPRINT("TSEventLogon\n");
5555
DPRINT("Size: %lu\n", pInfo->Size);
5656
DPRINT("Flags: %lx\n", pInfo->Flags);
5757
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -62,30 +62,12 @@ TestLockEvent(
6262
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
6363
}
6464

65-
66-
VOID
67-
WINAPI
68-
TestUnlockEvent(
69-
PWLX_NOTIFICATION_INFO pInfo)
70-
{
71-
DPRINT("TestUnlockEvent\n");
72-
DPRINT("Size: %lu\n", pInfo->Size);
73-
DPRINT("Flags: %lx\n", pInfo->Flags);
74-
DPRINT("UserName: %S\n", pInfo->UserName);
75-
DPRINT("Domain: %S\n", pInfo->Domain);
76-
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
77-
DPRINT("hToken: %p\n", pInfo->hToken);
78-
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
79-
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
80-
}
81-
82-
8365
VOID
8466
WINAPI
85-
TestStartupEvent(
67+
TSEventPostShell(
8668
PWLX_NOTIFICATION_INFO pInfo)
8769
{
88-
DPRINT("TestStartupEvent\n");
70+
DPRINT("TSEventPostShell\n");
8971
DPRINT("Size: %lu\n", pInfo->Size);
9072
DPRINT("Flags: %lx\n", pInfo->Flags);
9173
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -96,13 +78,12 @@ TestStartupEvent(
9678
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
9779
}
9880

99-
10081
VOID
10182
WINAPI
102-
TestShutdownEvent(
83+
TSEventReconnect(
10384
PWLX_NOTIFICATION_INFO pInfo)
10485
{
105-
DPRINT("TestShutdownEvent\n");
86+
DPRINT("TSEventReconnect\n");
10687
DPRINT("Size: %lu\n", pInfo->Size);
10788
DPRINT("Flags: %lx\n", pInfo->Flags);
10889
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -116,10 +97,10 @@ TestShutdownEvent(
11697

11798
VOID
11899
WINAPI
119-
TestStartScreenSaverEvent(
100+
TSEventShutdown(
120101
PWLX_NOTIFICATION_INFO pInfo)
121102
{
122-
DPRINT("TestStartScreenSaverEvent\n");
103+
DPRINT("TSEventShutdown\n");
123104
DPRINT("Size: %lu\n", pInfo->Size);
124105
DPRINT("Flags: %lx\n", pInfo->Flags);
125106
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -133,10 +114,10 @@ TestStartScreenSaverEvent(
133114

134115
VOID
135116
WINAPI
136-
TestStopScreenSaverEvent(
117+
TSEventStartShell(
137118
PWLX_NOTIFICATION_INFO pInfo)
138119
{
139-
DPRINT("TestStopScreenSaverEvent\n");
120+
DPRINT("TSEventStartShell\n");
140121
DPRINT("Size: %lu\n", pInfo->Size);
141122
DPRINT("Flags: %lx\n", pInfo->Flags);
142123
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -150,10 +131,10 @@ TestStopScreenSaverEvent(
150131

151132
VOID
152133
WINAPI
153-
TestStartShellEvent(
134+
TSEventStartup(
154135
PWLX_NOTIFICATION_INFO pInfo)
155136
{
156-
DPRINT("TestStartShellEvent\n");
137+
DPRINT("TSEventStartup\n");
157138
DPRINT("Size: %lu\n", pInfo->Size);
158139
DPRINT("Flags: %lx\n", pInfo->Flags);
159140
DPRINT("UserName: %S\n", pInfo->UserName);
@@ -165,53 +146,6 @@ TestStartShellEvent(
165146
}
166147

167148

168-
VOID
169-
WINAPI
170-
TestPostShellEvent(
171-
PWLX_NOTIFICATION_INFO pInfo)
172-
{
173-
DPRINT("TestPostShellEvent\n");
174-
DPRINT("Size: %lu\n", pInfo->Size);
175-
DPRINT("Flags: %lx\n", pInfo->Flags);
176-
DPRINT("UserName: %S\n", pInfo->UserName);
177-
DPRINT("Domain: %S\n", pInfo->Domain);
178-
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
179-
DPRINT("hToken: %p\n", pInfo->hToken);
180-
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
181-
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
182-
}
183-
184-
VOID
185-
WINAPI
186-
TestDisconnectEvent(
187-
PWLX_NOTIFICATION_INFO pInfo)
188-
{
189-
DPRINT("TestDisconnectEvent\n");
190-
DPRINT("Size: %lu\n", pInfo->Size);
191-
DPRINT("Flags: %lx\n", pInfo->Flags);
192-
DPRINT("UserName: %S\n", pInfo->UserName);
193-
DPRINT("Domain: %S\n", pInfo->Domain);
194-
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
195-
DPRINT("hToken: %p\n", pInfo->hToken);
196-
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
197-
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
198-
}
199-
200-
201-
VOID
202-
WINAPI
203-
TestReconnectEvent(
204-
PWLX_NOTIFICATION_INFO pInfo)
205-
{
206-
DPRINT("TestReconnectEvent\n");
207-
DPRINT("Size: %lu\n", pInfo->Size);
208-
DPRINT("Flags: %lx\n", pInfo->Flags);
209-
DPRINT("UserName: %S\n", pInfo->UserName);
210-
DPRINT("Domain: %S\n", pInfo->Domain);
211-
DPRINT("WindowStation: %S\n", pInfo->WindowStation);
212-
DPRINT("hToken: %p\n", pInfo->hToken);
213-
DPRINT("hDesktop: %p\n", pInfo->hDesktop);
214-
DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback);
215-
}
149+
/* TermsrvCreateTempDir */
216150

217151
/* EOF */

0 commit comments

Comments
 (0)