Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/01: [FREELDR] Don't insert a driver into the BootDriver list twice (#755)
by Timo Kreuzer 18 Aug '18

18 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81a9ce44e9a1945c069e2… commit 81a9ce44e9a1945c069e26cc7cd48c3dc91645c8 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 18 16:41:30 2018 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 18 16:41:30 2018 +0200 [FREELDR] Don't insert a driver into the BootDriver list twice (#755) This happened for the livecd, where the cdfs driver was inserted twice - once since it is the driver for the boot device, and the 2nd time, because it was specified in the registry - which was then initialized twice by the kernel, leading to a name conflict when trying to create another device object, which resulted in the newly created device object to be dereferenced again and the driver unloaded. This can be seen from the debug message "(ntoskrnl\mm\ARM3\sysldr.c:955) Leaking drive [...] --- boot/freeldr/freeldr/ntldr/wlregistry.c | 50 +++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index b280250142..bf194027cf 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -684,6 +684,46 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, FrLdrHeapFree(GroupNameBuffer, TAG_WLDR_NAME); } +static +BOOLEAN +InsertInBootDriverList( + PLIST_ENTRY BootDriverListHead, + PBOOT_DRIVER_LIST_ENTRY BootDriverEntry) +{ + PBOOT_DRIVER_LIST_ENTRY DriverEntry; + PLIST_ENTRY ListEntry; + + ASSERT(BootDriverEntry->FilePath.Buffer != NULL); + ASSERT(BootDriverEntry->RegistryPath.Buffer != NULL); + + for (ListEntry = BootDriverListHead->Flink; + ListEntry != BootDriverListHead; + ListEntry = ListEntry->Flink) + { + DriverEntry = CONTAINING_RECORD(ListEntry, + BOOT_DRIVER_LIST_ENTRY, + Link); + if ((DriverEntry->FilePath.Buffer != NULL) && + RtlEqualUnicodeString(&BootDriverEntry->FilePath, + &DriverEntry->FilePath, + TRUE)) + { + return FALSE; + } + + if ((DriverEntry->RegistryPath.Buffer != NULL) && + RtlEqualUnicodeString(&BootDriverEntry->RegistryPath, + &DriverEntry->RegistryPath, + TRUE)) + { + return FALSE; + } + } + + InsertTailList(BootDriverListHead, &BootDriverEntry->Link); + return TRUE; +} + BOOLEAN WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, LPWSTR RegistryPath, @@ -782,8 +822,14 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, if (!NT_SUCCESS(Status)) return FALSE; - // Insert entry at top of the list - InsertTailList(BootDriverListHead, &BootDriverEntry->Link); + // Insert entry into the list + if (!InsertInBootDriverList(BootDriverListHead, BootDriverEntry)) + { + // It was already there, so delete our entry + if (BootDriverEntry->FilePath.Buffer) FrLdrHeapFree(BootDriverEntry->FilePath.Buffer, TAG_WLDR_NAME); + if (BootDriverEntry->RegistryPath.Buffer) FrLdrHeapFree(BootDriverEntry->RegistryPath.Buffer, TAG_WLDR_NAME); + FrLdrHeapFree(BootDriverEntry, TAG_WLDR_BDE); + } return TRUE; }

1 0

01/01: [WLNOTIFY] Add SCard, Termsrv and Wlballon notifications and remove the test notifications
by Eric Kohl 18 Aug '18

18 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df849213a26763b8a251e… commit df849213a26763b8a251e04bdb4ce16bd99e5538 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 18 16:14:09 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 18 16:18:36 2018 +0200 [WLNOTIFY] Add SCard, Termsrv and Wlballon notifications and remove the test notifications --- boot/bootdata/hivesft.inf | 52 +++++++++++---- dll/win32/wlnotify/CMakeLists.txt | 4 +- dll/win32/wlnotify/precomp.h | 8 ++- dll/win32/wlnotify/scard.c | 82 ++++++++++++++++++++++++ dll/win32/wlnotify/{test.c => termserv.c} | 102 ++++++------------------------ dll/win32/wlnotify/wlballoon.c | 51 +++++++++++++++ dll/win32/wlnotify/wlnotify.spec | 40 ++++-------- 7 files changed, 213 insertions(+), 126 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 4e4e81653d..bfd34a22d0 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 6cbf00ce86..5f890399d6 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 c744968f84..04c440dc93 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(a)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 0000000000..8eaa313070 --- /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(a)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 8f8705547a..d33eb41d0b 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,10 @@ 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); @@ -62,30 +62,12 @@ TestLockEvent( 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( +TSEventPostShell( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartupEvent\n"); + DPRINT("TSEventPostShell\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -96,13 +78,12 @@ TestStartupEvent( DPRINT("pStatusCallback: %p\n", pInfo->pStatusCallback); } - VOID WINAPI -TestShutdownEvent( +TSEventReconnect( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestShutdownEvent\n"); + DPRINT("TSEventReconnect\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -116,10 +97,10 @@ TestShutdownEvent( VOID WINAPI -TestStartScreenSaverEvent( +TSEventShutdown( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartScreenSaverEvent\n"); + DPRINT("TSEventShutdown\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -133,10 +114,10 @@ TestStartScreenSaverEvent( VOID WINAPI -TestStopScreenSaverEvent( +TSEventStartShell( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStopScreenSaverEvent\n"); + DPRINT("TSEventStartShell\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -150,10 +131,10 @@ TestStopScreenSaverEvent( VOID WINAPI -TestStartShellEvent( +TSEventStartup( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TestStartShellEvent\n"); + DPRINT("TSEventStartup\n"); DPRINT("Size: %lu\n", pInfo->Size); DPRINT("Flags: %lx\n", pInfo->Flags); DPRINT("UserName: %S\n", pInfo->UserName); @@ -165,53 +146,6 @@ TestStartShellEvent( } -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 0000000000..c6ced7105b --- /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 2eb0b647c1..15b6f7c7cc 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)

1 0

01/01: [NETSHELL] Fix the too long texts
by Katayama Hirofumi MZ 18 Aug '18

18 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0725098c74b0e4ddee927… commit 0725098c74b0e4ddee927002169d394e0c024467 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 18 11:11:31 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 18 13:18:03 2018 +0200 [NETSHELL] Fix the too long texts --- dll/shellext/netshell/lang/en-US.rc | 4 ++-- dll/shellext/netshell/lang/ru-RU.rc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/shellext/netshell/lang/en-US.rc b/dll/shellext/netshell/lang/en-US.rc index 9f87a692d4..5274f06ca3 100644 --- a/dll/shellext/netshell/lang/en-US.rc +++ b/dll/shellext/netshell/lang/en-US.rc @@ -169,8 +169,8 @@ BEGIN IDS_NETWORKSETTINGSSUBTITLE "Installs network software used to connect to other networks, computers, and the Internet." IDS_NETWORKCOMPONENTTITLE "Network Components" IDS_NETWORKCOMPONENTSUBTITLE "Determine which networking components are used on your computer. To add new components, click on Install." - IDS_NETWORKDOMAINTITLE "Workgroup or Computer Domain" - IDS_NETWORKDOMAINSUBTITLE "A domain is a group of computers defined by a network administrator. A workgroup is a group of computers sharing the same workgroup name." + IDS_NETWORKDOMAINTITLE "Workgroup or Network Domain" + IDS_NETWORKDOMAINSUBTITLE "Specify how the computer will be used - as part of a workgroup or as part of a network domain." IDS_REACTOS_SETUP "ReactOS Setup" IDS_WZD_DOMAIN_NAME "Setup cannot continue until you\nenter the name of your domain\nor workgroup." END diff --git a/dll/shellext/netshell/lang/ru-RU.rc b/dll/shellext/netshell/lang/ru-RU.rc index 8d741bdf5f..55f564d0bc 100644 --- a/dll/shellext/netshell/lang/ru-RU.rc +++ b/dll/shellext/netshell/lang/ru-RU.rc @@ -170,7 +170,7 @@ BEGIN IDS_NETWORKCOMPONENTTITLE "Сетевые компоненты" IDS_NETWORKCOMPONENTSUBTITLE "Определяет, какие сетевые компоненты используются на вашем компьютере. Чтобы добавить новые, нажмите кнопку Установить." IDS_NETWORKDOMAINTITLE "Рабочая группа или сетевой домен" - IDS_NETWORKDOMAINSUBTITLE "Сетевой домен - это группа компьютеров, определенная сетевым администратором. Рабочая группа - это группа компьютеров, у которых одинаковое имя рабочей группы." + IDS_NETWORKDOMAINSUBTITLE "Укажите, как будет использоваться компьютер - в составе рабочей группы или как часть сетевого домена." IDS_REACTOS_SETUP "Установка ReactOS" IDS_WZD_DOMAIN_NAME "Невозможно продолжить установку, т.к. вы\nне ввели имя вашей рабочей группы или домена." END

1 0

01/01: [FREELDR] Fix calculation of page lookup table (#761)
by Timo Kreuzer 18 Aug '18

18 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6da93539a96b2ad1c5935… commit 6da93539a96b2ad1c59350a9e50c665901b7b5cd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 18 12:16:33 2018 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 18 12:16:33 2018 +0200 [FREELDR] Fix calculation of page lookup table (#761) On x64 we only map 1GB of pages, so adjust MM_MAX_PAGE accordingly and also respect that value when searching for the best location of the page lookup table. CORE-11048 #resolve --- boot/freeldr/freeldr/include/mm.h | 3 +-- boot/freeldr/freeldr/lib/mm/meminit.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/boot/freeldr/freeldr/include/mm.h b/boot/freeldr/freeldr/include/mm.h index d29fe6087f..adc13d0ebf 100644 --- a/boot/freeldr/freeldr/include/mm.h +++ b/boot/freeldr/freeldr/include/mm.h @@ -58,8 +58,7 @@ typedef struct _FREELDR_MEMORY_DESCRIPTOR #define MM_PAGE_SIZE 4096 #define MM_PAGE_MASK 0xFFF #define MM_PAGE_SHIFT 12 -// FIXME: freeldr implementation uses ULONG for page numbers -#define MM_MAX_PAGE 0xFFFFFFFFFFFFF +#define MM_MAX_PAGE 0x3FFFF /* freeldr only maps 1 GB */ #define MM_SIZE_TO_PAGES(a) \ ( ((a) >> MM_PAGE_SHIFT) + ((a) & MM_PAGE_MASK ? 1 : 0) ) diff --git a/boot/freeldr/freeldr/lib/mm/meminit.c b/boot/freeldr/freeldr/lib/mm/meminit.c index bbf7a571fe..164236c81c 100644 --- a/boot/freeldr/freeldr/lib/mm/meminit.c +++ b/boot/freeldr/freeldr/lib/mm/meminit.c @@ -415,13 +415,15 @@ PVOID MmFindLocationForPageLookupTable(PFN_NUMBER TotalPageCount) { const FREELDR_MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; SIZE_T PageLookupTableSize; - PFN_NUMBER PageLookupTablePages; - PFN_NUMBER PageLookupTableStartPage = 0; + PFN_NUMBER RequiredPages; + PFN_NUMBER CandidateBasePage = 0; + PFN_NUMBER CandidatePageCount; + PFN_NUMBER PageLookupTableEndPage; PVOID PageLookupTableMemAddress = NULL; // Calculate how much pages we need to keep the page lookup table PageLookupTableSize = TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM); - PageLookupTablePages = PageLookupTableSize / MM_PAGE_SIZE; + RequiredPages = PageLookupTableSize / MM_PAGE_SIZE; // Search the highest memory block big enough to contain lookup table while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) @@ -429,22 +431,28 @@ PVOID MmFindLocationForPageLookupTable(PFN_NUMBER TotalPageCount) // Continue, if memory is not free if (MemoryDescriptor->MemoryType != LoaderFree) continue; - // Continue, if the block is not big enough? - if (MemoryDescriptor->PageCount < PageLookupTablePages) continue; + // Continue, if the block is not big enough + if (MemoryDescriptor->PageCount < RequiredPages) continue; // Continue, if it is not at a higher address than previous address - if (MemoryDescriptor->BasePage < PageLookupTableStartPage) continue; + if (MemoryDescriptor->BasePage < CandidateBasePage) continue; // Continue, if the address is too high - if (MemoryDescriptor->BasePage >= MM_MAX_PAGE) continue; + if (MemoryDescriptor->BasePage + RequiredPages >= MM_MAX_PAGE) continue; // Memory block is more suitable than the previous one - PageLookupTableStartPage = MemoryDescriptor->BasePage; - PageLookupTableMemAddress = (PVOID)((ULONG_PTR) - (MemoryDescriptor->BasePage + MemoryDescriptor->PageCount) * MM_PAGE_SIZE - - PageLookupTableSize); + CandidateBasePage = MemoryDescriptor->BasePage; + CandidatePageCount = MemoryDescriptor->PageCount; } + // Calculate the end address for the lookup table + PageLookupTableEndPage = min(CandidateBasePage + CandidatePageCount, + MM_MAX_PAGE); + + // Calculate the virtual address + PageLookupTableMemAddress = (PVOID)((PageLookupTableEndPage * PAGE_SIZE) + - PageLookupTableSize); + TRACE("MmFindLocationForPageLookupTable() returning 0x%x\n", PageLookupTableMemAddress); return PageLookupTableMemAddress;

1 0

01/01: [USER32] Fix copying from WNDCLASS to WNDCLASSEX This must be done field by field, since the alignment of the structures is different on _WIN64
by Timo Kreuzer 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=27c3a4d26a9f00cea3def… commit 27c3a4d26a9f00cea3def9d9fc547ff6ea863424 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Aug 17 14:50:22 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 17 22:13:18 2018 +0200 [USER32] Fix copying from WNDCLASS to WNDCLASSEX This must be done field by field, since the alignment of the structures is different on _WIN64 --- win32ss/user/user32/windows/class.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index 7208b36c10..c7da5f523c 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -1595,7 +1595,19 @@ RegisterClassA(CONST WNDCLASSA *lpWndClass) if (lpWndClass == NULL) return 0; - RtlCopyMemory(&Class.style, lpWndClass, sizeof(WNDCLASSA)); + /* These MUST be copied manually, since on 64 bit architectures the + alignment of the members is different between the 2 structs! */ + Class.style = lpWndClass->style; + Class.lpfnWndProc = lpWndClass->lpfnWndProc; + Class.cbClsExtra = lpWndClass->cbClsExtra; + Class.cbWndExtra = lpWndClass->cbWndExtra; + Class.hInstance = lpWndClass->hInstance; + Class.hIcon = lpWndClass->hIcon; + Class.hCursor = lpWndClass->hCursor; + Class.hbrBackground = lpWndClass->hbrBackground; + Class.lpszMenuName = lpWndClass->lpszMenuName; + Class.lpszClassName = lpWndClass->lpszClassName; + Class.cbSize = sizeof(WNDCLASSEXA); Class.hIconSm = NULL; @@ -1613,7 +1625,19 @@ RegisterClassW(CONST WNDCLASSW *lpWndClass) if (lpWndClass == NULL) return 0; - RtlCopyMemory(&Class.style, lpWndClass, sizeof(WNDCLASSW)); + /* These MUST be copied manually, since on 64 bit architectures the + alignment of the members is different between the 2 structs! */ + Class.style = lpWndClass->style; + Class.lpfnWndProc = lpWndClass->lpfnWndProc; + Class.cbClsExtra = lpWndClass->cbClsExtra; + Class.cbWndExtra = lpWndClass->cbWndExtra; + Class.hInstance = lpWndClass->hInstance; + Class.hIcon = lpWndClass->hIcon; + Class.hCursor = lpWndClass->hCursor; + Class.hbrBackground = lpWndClass->hbrBackground; + Class.lpszMenuName = lpWndClass->lpszMenuName; + Class.lpszClassName = lpWndClass->lpszClassName; + Class.cbSize = sizeof(WNDCLASSEXW); Class.hIconSm = NULL;

1 0

01/01: [NTOS:PS] Fix an issue with PROCESS_DEVICEMAP_INFORMATION size on 64 bit builds
by Timo Kreuzer 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=094a90ad4e7f14b67cc5e… commit 094a90ad4e7f14b67cc5e532347e738b95189cec Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Feb 10 23:57:27 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 17 22:08:37 2018 +0200 [NTOS:PS] Fix an issue with PROCESS_DEVICEMAP_INFORMATION size on 64 bit builds The PROCESS_DEVICEMAP_INFORMATION union has 2 fields, one is a handle, the other one is a structure of 36 bytes (independent of architecture). The handle forces 64 bit alignment on 64 bit builds, making the structure 4 bytes bigger than on 32 bit builds. The site is checked in NtQueryInformationProcess (case ProcessDeviceMap). The expected size on x64 is the size of the Query structure without alignment. autocheck correctly passes the site of the Query union member, while smss passes [...] --- base/system/smss/pagefile.c | 4 ++-- dll/win32/kernel32/client/file/disk.c | 11 ++++++----- ntoskrnl/ps/query.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/base/system/smss/pagefile.c b/base/system/smss/pagefile.c index bd4df1a5c9..6af9b21495 100644 --- a/base/system/smss/pagefile.c +++ b/base/system/smss/pagefile.c @@ -837,8 +837,8 @@ SmpCreateVolumeDescriptors(VOID) /* Query the device map so we can get the drive letters */ Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDeviceMap, - &ProcessInformation, - sizeof(ProcessInformation), + &ProcessInformation.Query, + sizeof(ProcessInformation.Query), NULL); if (!NT_SUCCESS(Status)) { diff --git a/dll/win32/kernel32/client/file/disk.c b/dll/win32/kernel32/client/file/disk.c index 7fe8061666..12751c6b1a 100644 --- a/dll/win32/kernel32/client/file/disk.c +++ b/dll/win32/kernel32/client/file/disk.c @@ -115,8 +115,8 @@ GetLogicalDrives(VOID) /* Get the Device Map for this Process */ Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDeviceMap, - &ProcessDeviceMapInfo, - sizeof(ProcessDeviceMapInfo), + &ProcessDeviceMapInfo.Query, + sizeof(ProcessDeviceMapInfo.Query), NULL); /* Return the Drive Map */ @@ -557,9 +557,10 @@ GetDriveTypeW(IN LPCWSTR lpRootPathName) PROCESS_DEVICEMAP_INFORMATION DeviceMap; /* Query the device map */ - Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDeviceMap, - &DeviceMap, - sizeof(PROCESS_DEVICEMAP_INFORMATION), + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDeviceMap, + &DeviceMap.Query, + sizeof(DeviceMap.Query), NULL); /* Zero output if we failed */ if (!NT_SUCCESS(Status)) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 7a1767d54f..1f605be334 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -564,7 +564,7 @@ NtQueryInformationProcess(IN HANDLE ProcessHandle, /* DOS Device Map */ case ProcessDeviceMap: - if (ProcessInformationLength != sizeof(PROCESS_DEVICEMAP_INFORMATION)) + if (ProcessInformationLength != RTL_FIELD_SIZE(PROCESS_DEVICEMAP_INFORMATION, Query)) { if (ProcessInformationLength == sizeof(PROCESS_DEVICEMAP_INFORMATION_EX)) {

1 0

03/03: [USER32] Implement support for the MB_SERVICE_NOTIFICATION flag in the MessageBox*() APIs.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36174f926bc40b2b2f7d6… commit 36174f926bc40b2b2f7d61db8d9187e2a20d9886 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 17 21:49:16 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 21:50:09 2018 +0200 [USER32] Implement support for the MB_SERVICE_NOTIFICATION flag in the MessageBox*() APIs. --- win32ss/user/user32/windows/messagebox.c | 82 ++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/win32ss/user/user32/windows/messagebox.c b/win32ss/user/user32/windows/messagebox.c index 8dc135fa39..658ba763b4 100644 --- a/win32ss/user/user32/windows/messagebox.c +++ b/win32ss/user/user32/windows/messagebox.c @@ -30,6 +30,8 @@ */ #include <user32.h> +#include <ndk/exfuncs.h> + #include <ntstrsafe.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); @@ -454,6 +456,86 @@ MessageBoxTimeoutIndirectW( MSGBTNINFO Buttons; LPCWSTR ButtonText[MSGBOXEX_MAXBTNS]; + // TODO: Check whether the caller is an NT 3.x app and if so, check + // instead for the MB_SERVICE_NOTIFICATION_NT3X flag and adjust it. + if (lpMsgBoxParams->dwStyle & MB_SERVICE_NOTIFICATION) + { + NTSTATUS Status; + UNICODE_STRING CaptionU, TextU; + ULONG Response = ResponseNotHandled; /* HARDERROR_RESPONSE */ + ULONG_PTR MsgBoxParams[4] = + { + (ULONG_PTR)&TextU, + (ULONG_PTR)&CaptionU, + /* + * Retrieve the message box flags. Note that we filter out + * MB_SERVICE_NOTIFICATION to not enter an infinite recursive + * loop when we will call MessageBox() later on. + */ + lpMsgBoxParams->dwStyle & ~MB_SERVICE_NOTIFICATION, + dwTimeout + }; + + /* hwndOwner must be NULL */ + if (lpMsgBoxParams->hwndOwner != NULL) + { + ERR("MessageBoxTimeoutIndirectW(MB_SERVICE_NOTIFICATION): hwndOwner is not NULL!\n"); + return 0; + } + + // + // FIXME: TODO: Implement the special case for Terminal Services. + // + + RtlInitUnicodeString(&CaptionU, lpMsgBoxParams->lpszCaption); + RtlInitUnicodeString(&TextU, lpMsgBoxParams->lpszText); + + Status = NtRaiseHardError(STATUS_SERVICE_NOTIFICATION | HARDERROR_OVERRIDE_ERRORMODE, + ARRAYSIZE(MsgBoxParams), + (1 | 2), + MsgBoxParams, + OptionOk, /* NOTE: This parameter is ignored */ + &Response); + if (!NT_SUCCESS(Status)) + { + ERR("MessageBoxTimeoutIndirectW(MB_SERVICE_NOTIFICATION): NtRaiseHardError failed, Status = 0x%08lx\n", Status); + return 0; + } + + /* Map the returned response to the buttons */ + switch (Response) + { + /* Not handled */ + case ResponseReturnToCaller: + case ResponseNotHandled: + break; + + case ResponseAbort: + return IDABORT; + case ResponseCancel: + return IDCANCEL; + case ResponseIgnore: + return IDIGNORE; + case ResponseNo: + return IDNO; + case ResponseOk: + return IDOK; + case ResponseRetry: + return IDRETRY; + case ResponseYes: + return IDYES; + case ResponseTryAgain: + return IDTRYAGAIN; + case ResponseContinue: + return IDCONTINUE; + + /* Not handled */ + default: + break; + } + return 0; + } + ZeroMemory(&mbd, sizeof(mbd)); memcpy(&mbd.mbp, lpMsgBoxParams, sizeof(mbd.mbp)); mbd.wLanguageId = (WORD)lpMsgBoxParams->dwLanguageId;

1 0

02/03: [ROSTESTS] Add a test for the MB_SERVICE_NOTIFICATION flag of the MessageBox*() APIs.
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c035f4648ba3aa610fb9a… commit c035f4648ba3aa610fb9ab77645103931e7e02dd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 17 21:46:50 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 21:50:08 2018 +0200 [ROSTESTS] Add a test for the MB_SERVICE_NOTIFICATION flag of the MessageBox*() APIs. --- .../rostests/win32/user32/messagebox/messagebox.c | 39 ++++++++++++++++++---- .../rostests/win32/user32/messagebox/resource.h | 4 +-- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/modules/rostests/win32/user32/messagebox/messagebox.c b/modules/rostests/win32/user32/messagebox/messagebox.c index 40913e6142..ce4fcebd16 100644 --- a/modules/rostests/win32/user32/messagebox/messagebox.c +++ b/modules/rostests/win32/user32/messagebox/messagebox.c @@ -1,7 +1,8 @@ /* * PROJECT: ReactOS Tests * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * PURPOSE: Tests the undocumented user32.dll API SoftModalMessageBox(). + * PURPOSE: Tests the undocumented user32.dll API SoftModalMessageBox() + * and the MB_SERVICE_NOTIFICATION flag of the MessageBox*() APIs. * COPYRIGHT: Copyright 2018 Hermes Belusca-Maito */ @@ -63,16 +64,16 @@ C_ASSERT(sizeof(MSGBOXDATA) == 0x4C); #endif -typedef int (WINAPI *SOFTMODALMESSAGEBOX)(LPMSGBOXDATA lpMsgBoxData); -// int WINAPI SoftModalMessageBox(IN LPMSGBOXDATA lpMsgBoxData); -SOFTMODALMESSAGEBOX SoftModalMessageBox = NULL; - // // Example taken from http://rsdn.org/forum/winapi/3273168.1 // See also http://www.vbforums.com/showthread.php?840593-Message-Box-with-Four-Buttons // -int wmain(int argc, WCHAR* argv[]) +void TestSoftModalMsgBox(void) { + typedef int (WINAPI *SOFTMODALMESSAGEBOX)(LPMSGBOXDATA lpMsgBoxData); + // int WINAPI SoftModalMessageBox(IN LPMSGBOXDATA lpMsgBoxData); + SOFTMODALMESSAGEBOX SoftModalMessageBox = NULL; + MSGBOXDATA data; int res = 0; @@ -113,8 +114,32 @@ int wmain(int argc, WCHAR* argv[]) else { res = SoftModalMessageBox(&data); - printf("Returned value = %i\n\n", res); + printf("Returned value = %i\n", res); } +} + +void TestMsgBoxServiceNotification(void) +{ + int res; + + res = MessageBoxW(NULL, L"Hello World!", L"MB_SERVICE_NOTIFICATION", + MB_YESNOCANCEL | MB_DEFBUTTON3 | MB_ICONINFORMATION | /* MB_DEFAULT_DESKTOP_ONLY | */ MB_SERVICE_NOTIFICATION); + printf("Returned value = %i\n", res); +} + +int wmain(int argc, WCHAR* argv[]) +{ + printf("Testing SoftModalMessageBox()...\n"); + TestSoftModalMsgBox(); + printf("\n"); + + printf("Press any key to continue...\n"); + _getch(); + printf("\n"); + + printf("Testing MB_SERVICE_NOTIFICATION...\n"); + TestMsgBoxServiceNotification(); + printf("\n"); printf("Press any key to quit...\n"); _getch(); diff --git a/modules/rostests/win32/user32/messagebox/resource.h b/modules/rostests/win32/user32/messagebox/resource.h index 6e6ee36e09..f914328d68 100644 --- a/modules/rostests/win32/user32/messagebox/resource.h +++ b/modules/rostests/win32/user32/messagebox/resource.h @@ -1,2 +1,2 @@ -#define IDS_RES_CAPTION 101 -#define IDS_RES_MESSAGE 102 +#define IDS_RES_CAPTION 101 +#define IDS_RES_MESSAGE 102

1 0

01/03: [ROSTESTS] Rename the "softmodalmsgbox" test to "messagebox".
by Hermès Bélusca-Maïto 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8f08f3e9b134eb149aee… commit f8f08f3e9b134eb149aee8ea7af1a7add749d386 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 17 21:44:44 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Aug 17 21:50:07 2018 +0200 [ROSTESTS] Rename the "softmodalmsgbox" test to "messagebox". --- modules/rostests/win32/user32/CMakeLists.txt | 2 +- modules/rostests/win32/user32/messagebox/CMakeLists.txt | 5 +++++ .../{softmodalmsgbox/softmodalmsgbox.c => messagebox/messagebox.c} | 0 .../{softmodalmsgbox/softmodalmsgbox.rc => messagebox/messagebox.rc} | 0 .../rostests/win32/user32/{softmodalmsgbox => messagebox}/resource.h | 0 modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt | 5 ----- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt index 205afbc403..097f5261f5 100644 --- a/modules/rostests/win32/user32/CMakeLists.txt +++ b/modules/rostests/win32/user32/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(biditext) +add_subdirectory(messagebox) add_subdirectory(paintdesktop) -add_subdirectory(softmodalmsgbox) add_subdirectory(sysicon) add_subdirectory(winstation) diff --git a/modules/rostests/win32/user32/messagebox/CMakeLists.txt b/modules/rostests/win32/user32/messagebox/CMakeLists.txt new file mode 100644 index 0000000000..a989b491dc --- /dev/null +++ b/modules/rostests/win32/user32/messagebox/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(messagebox messagebox.c messagebox.rc) +set_module_type(messagebox win32cui UNICODE) +add_importlibs(messagebox user32 msvcrt kernel32) +add_rostests_file(TARGET messagebox SUBDIR suppl) diff --git a/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.c b/modules/rostests/win32/user32/messagebox/messagebox.c similarity index 100% rename from modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.c rename to modules/rostests/win32/user32/messagebox/messagebox.c diff --git a/modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.rc b/modules/rostests/win32/user32/messagebox/messagebox.rc similarity index 100% rename from modules/rostests/win32/user32/softmodalmsgbox/softmodalmsgbox.rc rename to modules/rostests/win32/user32/messagebox/messagebox.rc diff --git a/modules/rostests/win32/user32/softmodalmsgbox/resource.h b/modules/rostests/win32/user32/messagebox/resource.h similarity index 100% rename from modules/rostests/win32/user32/softmodalmsgbox/resource.h rename to modules/rostests/win32/user32/messagebox/resource.h diff --git a/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt b/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt deleted file mode 100644 index 310a01e518..0000000000 --- a/modules/rostests/win32/user32/softmodalmsgbox/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ - -add_executable(softmodalmsgbox softmodalmsgbox.c softmodalmsgbox.rc) -set_module_type(softmodalmsgbox win32cui UNICODE) -add_importlibs(softmodalmsgbox user32 msvcrt kernel32) -add_rostests_file(TARGET softmodalmsgbox SUBDIR suppl)

1 0

01/01: [NTOS:OB] Rename object types to their official names to satisfy WinDbg
by Timo Kreuzer 17 Aug '18

17 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c909db295f72693e481c… commit 2c909db295f72693e481c9c1ae01ad7695aecc3b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Feb 13 21:33:04 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 17 20:28:45 2018 +0200 [NTOS:OB] Rename object types to their official names to satisfy WinDbg - Rename ObDirectoryType to ObpDirectoryObjectType and remove it from NDK (this is not exported!) - Rename ObSymbolicLinkType to ObpSymbolicLinkObjectType - Remove duplicated ObpTypeObjectType from ob.h --- ntoskrnl/include/internal/ob.h | 4 ++-- ntoskrnl/ob/devicemap.c | 2 +- ntoskrnl/ob/obdir.c | 8 ++++---- ntoskrnl/ob/obhandle.c | 4 ++-- ntoskrnl/ob/obinit.c | 12 ++++++------ ntoskrnl/ob/oblife.c | 4 ++-- ntoskrnl/ob/oblink.c | 12 ++++++------ ntoskrnl/ob/obname.c | 8 ++++---- ntoskrnl/ob/obref.c | 2 +- ntoskrnl/ob/obsecure.c | 2 +- sdk/include/ndk/obtypes.h | 1 - 11 files changed, 29 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/include/internal/ob.h b/ntoskrnl/include/internal/ob.h index 374f4a2c3e..e6f9c56292 100644 --- a/ntoskrnl/include/internal/ob.h +++ b/ntoskrnl/include/internal/ob.h @@ -601,8 +601,8 @@ extern ULONG ObpTraceLevel; extern KEVENT ObpDefaultObject; extern KGUARDED_MUTEX ObpDeviceMapLock; extern POBJECT_TYPE ObpTypeObjectType; -extern POBJECT_TYPE ObSymbolicLinkType; -extern POBJECT_TYPE ObpTypeObjectType; +extern POBJECT_TYPE ObpDirectoryObjectType; +extern POBJECT_TYPE ObpSymbolicLinkObjectType; extern POBJECT_DIRECTORY ObpRootDirectoryObject; extern POBJECT_DIRECTORY ObpTypeDirectoryObject; extern PHANDLE_TABLE ObpKernelHandleTable; diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index d79f7f6b4a..32f45fa4a6 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -25,7 +25,7 @@ ObpCreateDeviceMap(IN HANDLE DirectoryHandle) Status = ObReferenceObjectByHandle(DirectoryHandle, DIRECTORY_TRAVERSE, - ObDirectoryType, + ObpDirectoryObjectType, KeGetPreviousMode(), (PVOID*)&DirectoryObject, NULL); diff --git a/ntoskrnl/ob/obdir.c b/ntoskrnl/ob/obdir.c index b2f1f14382..3c62411fed 100644 --- a/ntoskrnl/ob/obdir.c +++ b/ntoskrnl/ob/obdir.c @@ -18,7 +18,7 @@ #include <debug.h> BOOLEAN ObpLUIDDeviceMapsEnabled; -POBJECT_TYPE ObDirectoryType = NULL; +POBJECT_TYPE ObpDirectoryObjectType = NULL; /* PRIVATE FUNCTIONS ******************************************************/ @@ -383,7 +383,7 @@ NtOpenDirectoryObject(OUT PHANDLE DirectoryHandle, /* Open the directory object */ Status = ObOpenObjectByName(ObjectAttributes, - ObDirectoryType, + ObpDirectoryObjectType, PreviousMode, NULL, DesiredAccess, @@ -520,7 +520,7 @@ NtQueryDirectoryObject(IN HANDLE DirectoryHandle, /* Get a reference to directory */ Status = ObReferenceObjectByHandle(DirectoryHandle, DIRECTORY_QUERY, - ObDirectoryType, + ObpDirectoryObjectType, PreviousMode, (PVOID*)&Directory, NULL); @@ -756,7 +756,7 @@ NtCreateDirectoryObject(OUT PHANDLE DirectoryHandle, /* Create the object */ Status = ObCreateObject(PreviousMode, - ObDirectoryType, + ObpDirectoryObjectType, ObjectAttributes, PreviousMode, NULL, diff --git a/ntoskrnl/ob/obhandle.c b/ntoskrnl/ob/obhandle.c index d753a68fad..057cdecd7f 100644 --- a/ntoskrnl/ob/obhandle.c +++ b/ntoskrnl/ob/obhandle.c @@ -3095,7 +3095,7 @@ ObInsertObject(IN PVOID Object, { /* Check if this was a symbolic link */ if (OBJECT_TO_OBJECT_HEADER(InsertObject)->Type == - ObSymbolicLinkType) + ObpSymbolicLinkObjectType) { /* Dereference it */ ObDereferenceObject(InsertObject); @@ -3129,7 +3129,7 @@ ObInsertObject(IN PVOID Object, else { /* Check if this is a symbolic link */ - if (ObjectType == ObSymbolicLinkType) + if (ObjectType == ObpSymbolicLinkObjectType) { /* Create the internal name */ ObpCreateSymbolicLinkName(Object); diff --git a/ntoskrnl/ob/obinit.c b/ntoskrnl/ob/obinit.c index dcda078d30..dcc2448a4a 100644 --- a/ntoskrnl/ob/obinit.c +++ b/ntoskrnl/ob/obinit.c @@ -282,8 +282,8 @@ ObInitSystem(VOID) ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; ObjectTypeInitializer.DeleteProcedure = NULL; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); - ObDirectoryType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObpDirectoryObjectType); + ObpDirectoryObjectType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; /* Create 'symbolic link' object type */ RtlInitUnicodeString(&Name, L"SymbolicLink"); @@ -292,8 +292,8 @@ ObInitSystem(VOID) ObjectTypeInitializer.ValidAccessMask = SYMBOLIC_LINK_ALL_ACCESS; ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); - ObSymbolicLinkType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObpSymbolicLinkObjectType); + ObpSymbolicLinkObjectType->TypeInfo.ValidAccessMask &= ~SYNCHRONIZE; /* Phase 0 initialization complete */ ObpInitializationPhase++; @@ -321,7 +321,7 @@ ObPostPhase0: /* Get a handle to it */ Status = ObReferenceObjectByHandle(Handle, 0, - ObDirectoryType, + ObpDirectoryObjectType, KernelMode, (PVOID*)&ObpRootDirectoryObject, NULL); @@ -372,7 +372,7 @@ ObPostPhase0: /* Get a handle to it */ Status = ObReferenceObjectByHandle(Handle, 0, - ObDirectoryType, + ObpDirectoryObjectType, KernelMode, (PVOID*)&ObpTypeDirectoryObject, NULL); diff --git a/ntoskrnl/ob/oblife.c b/ntoskrnl/ob/oblife.c index 2bfc35a089..56dbcae421 100644 --- a/ntoskrnl/ob/oblife.c +++ b/ntoskrnl/ob/oblife.c @@ -1563,7 +1563,7 @@ NtQueryObject(IN HANDLE ObjectHandle, BasicInfo->SecurityDescriptorSize = 0; /* FIXME*/ /* Check if this is a symlink */ - if (ObjectHeader->Type == ObSymbolicLinkType) + if (ObjectHeader->Type == ObpSymbolicLinkObjectType) { /* Return the creation time */ BasicInfo->CreationTime.QuadPart = @@ -1798,7 +1798,7 @@ NtSetInformationObject(IN HANDLE ObjectHandle, /* Get the object directory */ Status = ObReferenceObjectByHandle(ObjectHandle, 0, - ObDirectoryType, + ObpDirectoryObjectType, PreviousMode, (PVOID*)&Directory, NULL); diff --git a/ntoskrnl/ob/oblink.c b/ntoskrnl/ob/oblink.c index 2631bd7e65..f8fbe5ad50 100644 --- a/ntoskrnl/ob/oblink.c +++ b/ntoskrnl/ob/oblink.c @@ -15,7 +15,7 @@ /* GLOBALS ******************************************************************/ -POBJECT_TYPE ObSymbolicLinkType = NULL; +POBJECT_TYPE ObpSymbolicLinkObjectType = NULL; /* PRIVATE FUNCTIONS *********************************************************/ @@ -150,12 +150,12 @@ ObpParseSymbolicLinkToIoDeviceObject(IN POBJECT_DIRECTORY SymbolicLinkDirectory, if (! *Object) break; - if (OBJECT_TO_OBJECT_HEADER(*Object)->Type == ObDirectoryType) + if (OBJECT_TO_OBJECT_HEADER(*Object)->Type == ObpDirectoryObjectType) { /* Make this current directory, and continue search */ *Directory = (POBJECT_DIRECTORY)*Object; } - else if (OBJECT_TO_OBJECT_HEADER(*Object)->Type == ObSymbolicLinkType && + else if (OBJECT_TO_OBJECT_HEADER(*Object)->Type == ObpSymbolicLinkObjectType && (((POBJECT_SYMBOLIC_LINK)*Object)->DosDeviceDriveIndex == 0)) { /* Symlink points to another initialized symlink, ask caller to reparse */ @@ -574,7 +574,7 @@ NtCreateSymbolicLinkObject(OUT PHANDLE LinkHandle, /* Create the object */ Status = ObCreateObject(PreviousMode, - ObSymbolicLinkType, + ObpSymbolicLinkObjectType, ObjectAttributes, PreviousMode, NULL, @@ -696,7 +696,7 @@ NtOpenSymbolicLinkObject(OUT PHANDLE LinkHandle, /* Open the object */ Status = ObOpenObjectByName(ObjectAttributes, - ObSymbolicLinkType, + ObpSymbolicLinkObjectType, PreviousMode, NULL, DesiredAccess, @@ -784,7 +784,7 @@ NtQuerySymbolicLinkObject(IN HANDLE LinkHandle, /* Reference the object */ Status = ObReferenceObjectByHandle(LinkHandle, SYMBOLIC_LINK_QUERY, - ObSymbolicLinkType, + ObpSymbolicLinkObjectType, PreviousMode, (PVOID *)&SymlinkObject, NULL); diff --git a/ntoskrnl/ob/obname.c b/ntoskrnl/ob/obname.c index 32e48941f7..bf559477d8 100644 --- a/ntoskrnl/ob/obname.c +++ b/ntoskrnl/ob/obname.c @@ -306,7 +306,7 @@ ObpDeleteNameCheck(IN PVOID Object) ObpDeleteEntryDirectory(&Context); /* Check if this is a symbolic link */ - if (ObjectType == ObSymbolicLinkType) + if (ObjectType == ObpSymbolicLinkObjectType) { /* Remove internal name */ ObpDeleteSymbolicLinkName(Object); @@ -434,7 +434,7 @@ ObpLookupObjectName(IN HANDLE RootHandle OPTIONAL, } /* Don't parse a Directory */ - if (ObjectHeader->Type != ObDirectoryType) + if (ObjectHeader->Type != ObpDirectoryObjectType) { /* Make sure the Object Type has a parse routine */ ParseRoutine = ObjectHeader->Type->TypeInfo.ParseProcedure; @@ -745,7 +745,7 @@ ParseFromRoot: /* Check create access for the object */ if (!ObCheckCreateObjectAccess(Directory, - ObjectType == ObDirectoryType ? + ObjectType == ObpDirectoryObjectType ? DIRECTORY_CREATE_SUBDIRECTORY : DIRECTORY_CREATE_OBJECT, AccessState, @@ -988,7 +988,7 @@ ReparseObject: else { /* We still have a name; check if this is a directory object */ - if (ObjectHeader->Type == ObDirectoryType) + if (ObjectHeader->Type == ObpDirectoryObjectType) { /* Check if we have a referenced parent directory */ if (ReferencedParentDirectory) diff --git a/ntoskrnl/ob/obref.c b/ntoskrnl/ob/obref.c index d6b29d343b..099903d630 100644 --- a/ntoskrnl/ob/obref.c +++ b/ntoskrnl/ob/obref.c @@ -395,7 +395,7 @@ ObReferenceObjectByPointer(IN PVOID Object, * NOTE: Unless it's a symbolic link (Caz Yokoyama [MSFT]) */ if ((Header->Type != ObjectType) && ((AccessMode != KernelMode) || - (ObjectType == ObSymbolicLinkType))) + (ObjectType == ObpSymbolicLinkObjectType))) { /* Invalid type */ return STATUS_OBJECT_TYPE_MISMATCH; diff --git a/ntoskrnl/ob/obsecure.c b/ntoskrnl/ob/obsecure.c index 3009c44896..135b7b2f5e 100644 --- a/ntoskrnl/ob/obsecure.c +++ b/ntoskrnl/ob/obsecure.c @@ -561,7 +561,7 @@ ObAssignSecurity(IN PACCESS_STATE AccessState, Status = SeAssignSecurity(SecurityDescriptor, AccessState->SecurityDescriptor, &NewDescriptor, - (Type == ObDirectoryType), + (Type == ObpDirectoryObjectType), &AccessState->SubjectSecurityContext, &Type->TypeInfo.GenericMapping, PagedPool); diff --git a/sdk/include/ndk/obtypes.h b/sdk/include/ndk/obtypes.h index 034f101188..6a483f6175 100644 --- a/sdk/include/ndk/obtypes.h +++ b/sdk/include/ndk/obtypes.h @@ -544,7 +544,6 @@ typedef struct _OBJECT_SYMBOLIC_LINK // // Kernel Exports // -extern POBJECT_TYPE NTSYSAPI ObDirectoryType; extern PDEVICE_MAP NTSYSAPI ObSystemDeviceMap; #endif // !NTOS_MODE_USER

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2018