Ros-diffs August 2018

ros-diffs@reactos.org

32 participants
304 discussions

01/01: [CDROM] Set proper status on disk verify

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1ac347825fe4d47ba206… commit c1ac347825fe4d47ba206d94c9f91130e0c78dd8 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Aug 19 11:11:21 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Aug 19 11:11:21 2018 +0200 [CDROM] Set proper status on disk verify This avoids an assert under certain conditions in CDFS. Check cdrom_new for reference. CORE-14873 --- drivers/storage/class/cdrom/cdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/class/cdrom/cdrom.c b/drivers/storage/class/cdrom/cdrom.c index 69ddd19f9d..a1c477ef9e 100644 --- a/drivers/storage/class/cdrom/cdrom.c +++ b/drivers/storage/class/cdrom/cdrom.c @@ -7156,7 +7156,7 @@ Return Value: // upon completion of the read capacity. // - IrpToComplete->IoStatus.Status = STATUS_VERIFY_REQUIRED; + IrpToComplete->IoStatus.Status = STATUS_IO_DEVICE_ERROR; IoMarkIrpPending(IrpToComplete); IoCallDriver(DeviceExtension->PortDeviceObject, irp);

6 years, 4 months

02/02: [FASTFAT] Don't delay any other close once shutdown has started

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=901c47ed1405fd7fc2c31… commit 901c47ed1405fd7fc2c31f54e6dc65ec2fb0728e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Aug 19 09:55:38 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Aug 19 09:56:12 2018 +0200 [FASTFAT] Don't delay any other close once shutdown has started --- drivers/filesystems/fastfat/close.c | 3 ++- drivers/filesystems/fastfat/iface.c | 1 + drivers/filesystems/fastfat/shutdown.c | 1 + drivers/filesystems/fastfat/vfat.h | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c index 0c313e6629..d8f85a85a4 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/fastfat/close.c @@ -183,7 +183,8 @@ VfatCloseFile( } /* If we have to close immediately, or if delaying failed, close */ - if (!BooleanFlagOn(pFcb->Flags, FCB_DELAYED_CLOSE) || !NT_SUCCESS(VfatPostCloseFile(DeviceExt, FileObject))) + if (VfatGlobalData->ShutdownStarted || !BooleanFlagOn(pFcb->Flags, FCB_DELAYED_CLOSE) || + !NT_SUCCESS(VfatPostCloseFile(DeviceExt, FileObject))) { VfatCommonCloseFile(DeviceExt, pFcb); } diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/fastfat/iface.c index e99409c669..c98e64f02b 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/fastfat/iface.c @@ -101,6 +101,7 @@ DriverEntry( InitializeListHead(&VfatGlobalData->CloseListHead); VfatGlobalData->CloseCount = 0; VfatGlobalData->CloseWorkerRunning = FALSE; + VfatGlobalData->ShutdownStarted = FALSE; VfatGlobalData->CloseWorkItem = IoAllocateWorkItem(DeviceObject); if (VfatGlobalData->CloseWorkItem == NULL) { diff --git a/drivers/filesystems/fastfat/shutdown.c b/drivers/filesystems/fastfat/shutdown.c index c363aefa16..c9e2bd5431 100644 --- a/drivers/filesystems/fastfat/shutdown.c +++ b/drivers/filesystems/fastfat/shutdown.c @@ -61,6 +61,7 @@ VfatShutdown( FsRtlEnterFileSystem(); /* FIXME: block new mount requests */ + VfatGlobalData->ShutdownStarted = TRUE; if (DeviceObject == VfatGlobalData->DeviceObject) { diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 834427e1b8..993d5f9fb9 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -417,6 +417,7 @@ typedef struct LIST_ENTRY CloseListHead; BOOLEAN CloseWorkerRunning; PIO_WORKITEM CloseWorkItem; + BOOLEAN ShutdownStarted; } VFAT_GLOBAL_DATA, *PVFAT_GLOBAL_DATA; extern PVFAT_GLOBAL_DATA VfatGlobalData;

6 years, 4 months

01/02: [FASTFAT] Magic values--

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4fe7aafe106c2f711058e… commit 4fe7aafe106c2f711058ec15857f05e925fd662f Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Aug 19 09:55:03 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Aug 19 09:56:12 2018 +0200 [FASTFAT] Magic values-- --- drivers/filesystems/fastfat/dirwr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/fastfat/dirwr.c b/drivers/filesystems/fastfat/dirwr.c index b4a2a94b59..ba791fbc60 100644 --- a/drivers/filesystems/fastfat/dirwr.c +++ b/drivers/filesystems/fastfat/dirwr.c @@ -806,9 +806,11 @@ FATAddEntry( { RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster); /* create '.' and '..' */ - RtlCopyMemory(&pFatEntry[0].Attrib, &DirContext.DirEntry.Fat.Attrib, sizeof(FAT_DIR_ENTRY) - 11); + RtlCopyMemory(&pFatEntry[0].Attrib, &DirContext.DirEntry.Fat.Attrib, + sizeof(FAT_DIR_ENTRY) - FIELD_OFFSET(FAT_DIR_ENTRY, Attrib)); RtlCopyMemory(pFatEntry[0].ShortName, ". ", 11); - RtlCopyMemory(&pFatEntry[1].Attrib, &DirContext.DirEntry.Fat.Attrib, sizeof(FAT_DIR_ENTRY) - 11); + RtlCopyMemory(&pFatEntry[1].Attrib, &DirContext.DirEntry.Fat.Attrib, + sizeof(FAT_DIR_ENTRY) - FIELD_OFFSET(FAT_DIR_ENTRY, Attrib)); RtlCopyMemory(pFatEntry[1].ShortName, ".. ", 11); }

6 years, 4 months

02/02: [SCHEDSVC] Add stubs for the wlnotify control codes

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d13bb10151e226df996f… commit 0d13bb10151e226df996f6c1d5b509dbe000446d Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 18 22:23:22 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 18 22:23:22 2018 +0200 [SCHEDSVC] Add stubs for the wlnotify control codes --- base/services/schedsvc/schedsvc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/base/services/schedsvc/schedsvc.c b/base/services/schedsvc/schedsvc.c index 9f38b2cd7c..b08b3e8ede 100644 --- a/base/services/schedsvc/schedsvc.c +++ b/base/services/schedsvc/schedsvc.c @@ -106,6 +106,14 @@ ServiceControlHandler(DWORD dwControl, &ServiceStatus); return ERROR_SUCCESS; + case 128: + TRACE(" Start Shell contol received\n"); + return ERROR_SUCCESS; + + case 129: + TRACE(" Logoff control received\n"); + return ERROR_SUCCESS; + default: TRACE(" Control %lu received\n", dwControl); return ERROR_CALL_NOT_IMPLEMENTED;

6 years, 4 months

01/02: [WLNOTIFY] Use the wine debug method, add wlnotify to the build and fix some typos

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a36ee83592547875d5d7… commit 9a36ee83592547875d5d756e6d0952b47b2fb00f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Aug 18 22:19:14 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Aug 18 22:20:17 2018 +0200 [WLNOTIFY] Use the wine debug method, add wlnotify to the build and fix some typos --- boot/bootdata/hivesft.inf | 2 +- dll/win32/CMakeLists.txt | 1 + dll/win32/wlnotify/CMakeLists.txt | 1 + dll/win32/wlnotify/precomp.h | 3 + dll/win32/wlnotify/scard.c | 77 +++++++------ dll/win32/wlnotify/schedsvc.c | 51 +++++---- dll/win32/wlnotify/senssvc.c | 220 +++++++++++++++++++------------------- dll/win32/wlnotify/termserv.c | 147 +++++++++++++------------ dll/win32/wlnotify/wlballoon.c | 39 ++++--- dll/win32/wlnotify/wlnotify.c | 3 +- 10 files changed, 271 insertions(+), 273 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index bfd34a22d0..c96b3af291 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1385,7 +1385,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp"," 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","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" diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 9906d76c9c..91407c7d04 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -243,6 +243,7 @@ add_subdirectory(winsta) add_subdirectory(wintrust) add_subdirectory(wlanapi) add_subdirectory(wldap32) +add_subdirectory(wlnotify) add_subdirectory(wmi) add_subdirectory(wmiutils) add_subdirectory(wmvcore) diff --git a/dll/win32/wlnotify/CMakeLists.txt b/dll/win32/wlnotify/CMakeLists.txt index 5f890399d6..9a29d0628c 100644 --- a/dll/win32/wlnotify/CMakeLists.txt +++ b/dll/win32/wlnotify/CMakeLists.txt @@ -16,6 +16,7 @@ add_library(wlnotify SHARED ${CMAKE_CURRENT_BINARY_DIR}/wlnotify.def) set_module_type(wlnotify win32dll UNICODE ENTRYPOINT DllMain 12) +target_link_libraries(wlnotify wine) add_importlibs(wlnotify advapi32 kernel32 ntdll) add_pch(wlnotify precomp.h SOURCE) add_cd_file(TARGET wlnotify DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wlnotify/precomp.h b/dll/win32/wlnotify/precomp.h index 04c440dc93..c083b7c317 100644 --- a/dll/win32/wlnotify/precomp.h +++ b/dll/win32/wlnotify/precomp.h @@ -7,3 +7,6 @@ */ #include <windows.h> #include <winwlx.h> +#include <winsvc.h> + +#include <wine/debug.h> diff --git a/dll/win32/wlnotify/scard.c b/dll/win32/wlnotify/scard.c index 8eaa313070..a5b13b7c0b 100644 --- a/dll/win32/wlnotify/scard.c +++ b/dll/win32/wlnotify/scard.c @@ -7,25 +7,24 @@ */ #include "precomp.h" -#include <winsvc.h> -#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify); + 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); + TRACE("SCardResumeCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -34,15 +33,15 @@ 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); + TRACE("SCardStartCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -51,15 +50,15 @@ 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); + TRACE("SCardStopCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -68,15 +67,15 @@ 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); + TRACE("SCardSuspendCertProp\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } /* EOF */ diff --git a/dll/win32/wlnotify/schedsvc.c b/dll/win32/wlnotify/schedsvc.c index ad8bcb5b16..edf89e29ec 100644 --- a/dll/win32/wlnotify/schedsvc.c +++ b/dll/win32/wlnotify/schedsvc.c @@ -9,8 +9,7 @@ #include "precomp.h" #include <winsvc.h> -#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify); VOID @@ -22,33 +21,33 @@ SchedEventLogoff( SC_HANDLE hService = NULL; SERVICE_STATUS ServiceStatus; - DPRINT("SchedStartShellEvent\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); + TRACE("SchedEventLogoff\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); hManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (hManager == NULL) { - DPRINT1("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); + WARN("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); goto done; } hService = OpenServiceW(hManager, L"Schedule", SERVICE_USER_DEFINED_CONTROL); if (hManager == NULL) { - DPRINT1("OpenServiceW() failed (Error %lu)\n", GetLastError()); + WARN("OpenServiceW() failed (Error %lu)\n", GetLastError()); goto done; } if (!ControlService(hService, 129, &ServiceStatus)) { - DPRINT1("ControlService() failed (Error %lu)\n", GetLastError()); + WARN("ControlService() failed (Error %lu)\n", GetLastError()); } done: @@ -69,33 +68,33 @@ SchedStartShell( SC_HANDLE hService = NULL; SERVICE_STATUS ServiceStatus; - DPRINT("SchedStartShellEvent\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); + TRACE("SchedStartShell\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); hManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); if (hManager == NULL) { - DPRINT1("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); + WARN("OpenSCManagerW() failed (Error %lu)\n", GetLastError()); goto done; } hService = OpenServiceW(hManager, L"Schedule", SERVICE_USER_DEFINED_CONTROL); if (hManager == NULL) { - DPRINT1("OpenServiceW() failed (Error %lu)\n", GetLastError()); + WARN("OpenServiceW() failed (Error %lu)\n", GetLastError()); goto done; } if (!ControlService(hService, 128, &ServiceStatus)) { - DPRINT1("ControlService() failed (Error %lu)\n", GetLastError()); + WARN("ControlService() failed (Error %lu)\n", GetLastError()); } done: diff --git a/dll/win32/wlnotify/senssvc.c b/dll/win32/wlnotify/senssvc.c index e238a849a9..9c6ff70cf9 100644 --- a/dll/win32/wlnotify/senssvc.c +++ b/dll/win32/wlnotify/senssvc.c @@ -7,10 +7,8 @@ */ #include "precomp.h" -#include <winsvc.h> -#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify); VOID @@ -18,15 +16,15 @@ WINAPI SensDisconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensDisconnectEvent\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); + TRACE("SensDisconnectEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -35,15 +33,15 @@ WINAPI SensLockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensLockEvent\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); + TRACE("SensLockEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -52,15 +50,15 @@ WINAPI SensLogoffEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensLogoffEvent\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); + TRACE("SensLogoffEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -69,15 +67,15 @@ WINAPI SensLogonEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensLogonEvent\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); + TRACE("SensLogonEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -86,15 +84,15 @@ WINAPI SensPostShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensPostShellEvent\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); + TRACE("SensPostShellEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -103,15 +101,15 @@ WINAPI SensReconnectEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensReconnectEvent\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); + TRACE("SensReconnectEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -120,15 +118,15 @@ WINAPI SensShutdownEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensShutdownEvent\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); + TRACE("SensShutdownEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -137,15 +135,15 @@ WINAPI SensStartScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStartScreenSaverEvent\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); + TRACE("SensStartScreenSaverEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -154,15 +152,15 @@ WINAPI SensStartShellEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStartShellEvent\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); + TRACE("SensStartShellEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -171,15 +169,15 @@ WINAPI SensStartupEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStartupEvent\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); + TRACE("SensStartupEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -188,15 +186,15 @@ WINAPI SensStopScreenSaverEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensStopScreenSaverEvent\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); + TRACE("SensStopScreenSaverEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -205,15 +203,15 @@ WINAPI SensUnlockEvent( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("SensUnlockEvent\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); + TRACE("SensUnlockEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } /* EOF */ diff --git a/dll/win32/wlnotify/termserv.c b/dll/win32/wlnotify/termserv.c index d33eb41d0b..357c2cf162 100644 --- a/dll/win32/wlnotify/termserv.c +++ b/dll/win32/wlnotify/termserv.c @@ -8,8 +8,7 @@ #include "precomp.h" -#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify); VOID @@ -17,15 +16,15 @@ WINAPI TSEventDisconnect( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventDisconnect\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); + TRACE("TSEventDisconnect\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -34,15 +33,15 @@ WINAPI TSEventLogoff( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventLogoff\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); + TRACE("TSEventLogoff\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -51,15 +50,15 @@ WINAPI TSEventLogon( PWLX_NOTIFICATION_INFO pInfo) { - 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); + TRACE("TSEventLogon\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } VOID @@ -67,15 +66,15 @@ 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); + TRACE("TSEventPostShell\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } VOID @@ -83,15 +82,15 @@ 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); - 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); + TRACE("TSEventReconnect\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -100,15 +99,15 @@ WINAPI TSEventShutdown( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventShutdown\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); + TRACE("TSEventShutdown\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -117,15 +116,15 @@ WINAPI TSEventStartShell( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventStartShell\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); + TRACE("TSEventStartShell\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -134,15 +133,15 @@ WINAPI TSEventStartup( PWLX_NOTIFICATION_INFO pInfo) { - DPRINT("TSEventStartup\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); + TRACE("TSEventStartup\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } diff --git a/dll/win32/wlnotify/wlballoon.c b/dll/win32/wlnotify/wlballoon.c index c6ced7105b..8a5a583df3 100644 --- a/dll/win32/wlnotify/wlballoon.c +++ b/dll/win32/wlnotify/wlballoon.c @@ -8,8 +8,7 @@ #include "precomp.h" -#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify); VOID @@ -17,15 +16,15 @@ 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); + TRACE("RegisterTicketExpiredNotificationEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } @@ -34,15 +33,15 @@ 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); + TRACE("UnregisterTicketExpiredNotificationEvent\n"); + TRACE("Size: %lu\n", pInfo->Size); + TRACE("Flags: %lx\n", pInfo->Flags); + TRACE("UserName: %S\n", pInfo->UserName); + TRACE("Domain: %S\n", pInfo->Domain); + TRACE("WindowStation: %S\n", pInfo->WindowStation); + TRACE("hToken: %p\n", pInfo->hToken); + TRACE("hDesktop: %p\n", pInfo->hDesktop); + TRACE("pStatusCallback: %p\n", pInfo->pStatusCallback); } diff --git a/dll/win32/wlnotify/wlnotify.c b/dll/win32/wlnotify/wlnotify.c index 8393e41ee9..38f7137507 100644 --- a/dll/win32/wlnotify/wlnotify.c +++ b/dll/win32/wlnotify/wlnotify.c @@ -8,8 +8,7 @@ #include "precomp.h" -#define _NDEBUG -#include <debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(wlnotify); BOOL

6 years, 4 months

03/03: [FASTFAT] Don't leak statistics on dismount

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=047479e0a25314a184910… commit 047479e0a25314a1849106c5cde89fe46a8ad443 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 18 19:03:03 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 18 19:03:30 2018 +0200 [FASTFAT] Don't leak statistics on dismount --- drivers/filesystems/fastfat/fsctl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index 1cc45b0eec..b70a84cd7e 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -1299,6 +1299,7 @@ VfatDismountVolume( ExReleaseResourceLite(&DeviceExt->FatResource); /* Release a few resources and quit, we're done */ + ExFreePoolWithTag(DeviceExt->Statistics, TAG_STATS); ExDeleteResourceLite(&DeviceExt->DirResource); ExDeleteResourceLite(&DeviceExt->FatResource); ObDereferenceObject(DeviceExt->FATFileObject);

6 years, 4 months

02/03: [FASTFAT] Reduce the usage of the generic allocation tag

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=639e6d635f07ee15a1e6e… commit 639e6d635f07ee15a1e6e906c09d7ad925a33e24 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 18 19:00:42 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 18 19:03:30 2018 +0200 [FASTFAT] Reduce the usage of the generic allocation tag And use tag compatible with MS FastFAT, to use debug with WinDBG --- drivers/filesystems/fastfat/fat.c | 40 ++++++++++++++++++------------------- drivers/filesystems/fastfat/fcb.c | 2 -- drivers/filesystems/fastfat/fsctl.c | 4 ++-- drivers/filesystems/fastfat/vfat.h | 8 +++++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/filesystems/fastfat/fat.c b/drivers/filesystems/fastfat/fat.c index 5842091a30..8d4ecd9cde 100644 --- a/drivers/filesystems/fastfat/fat.c +++ b/drivers/filesystems/fastfat/fat.c @@ -891,7 +891,7 @@ FAT16GetDirtyStatus( * - Allocate a big enough buffer * - And read the disk */ - Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_BUFFER); if (Sector == NULL) { *DirtyStatus = TRUE; @@ -902,7 +902,7 @@ FAT16GetDirtyStatus( if (!NT_SUCCESS(Status)) { *DirtyStatus = TRUE; - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; } #endif @@ -917,7 +917,7 @@ FAT16GetDirtyStatus( #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT CcUnpinData(Context); #else - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); #endif return STATUS_DISK_CORRUPT_ERROR; } @@ -931,7 +931,7 @@ FAT16GetDirtyStatus( #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT CcUnpinData(Context); #else - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); #endif return STATUS_SUCCESS; } @@ -969,7 +969,7 @@ FAT32GetDirtyStatus( * - Allocate a big enough buffer * - And read the disk */ - Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_BUFFER); if (Sector == NULL) { *DirtyStatus = TRUE; @@ -980,7 +980,7 @@ FAT32GetDirtyStatus( if (!NT_SUCCESS(Status)) { *DirtyStatus = TRUE; - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; } #endif @@ -995,7 +995,7 @@ FAT32GetDirtyStatus( #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT CcUnpinData(Context); #else - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); #endif return STATUS_DISK_CORRUPT_ERROR; } @@ -1009,7 +1009,7 @@ FAT32GetDirtyStatus( #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT CcUnpinData(Context); #else - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); #endif return STATUS_SUCCESS; } @@ -1077,7 +1077,7 @@ FAT16SetDirtyStatus( * - Allocate a big enough buffer * - And read the disk */ - Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_BUFFER); if (Sector == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1086,7 +1086,7 @@ FAT16SetDirtyStatus( Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; } #endif @@ -1099,7 +1099,7 @@ FAT16SetDirtyStatus( #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT CcUnpinData(Context); #else - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); #endif return STATUS_DISK_CORRUPT_ERROR; } @@ -1124,7 +1124,7 @@ FAT16SetDirtyStatus( #else /* Write back the boot sector to the disk */ Status = VfatWriteDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; #endif } @@ -1162,7 +1162,7 @@ FAT32SetDirtyStatus( * - Allocate a big enough buffer * - And read the disk */ - Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_BUFFER); if (Sector == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1171,7 +1171,7 @@ FAT32SetDirtyStatus( Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; } #endif @@ -1185,7 +1185,7 @@ FAT32SetDirtyStatus( #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT CcUnpinData(Context); #else - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); #endif return STATUS_DISK_CORRUPT_ERROR; } @@ -1210,7 +1210,7 @@ FAT32SetDirtyStatus( #else /* Write back the boot sector to the disk */ Status = VfatWriteDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; #endif } @@ -1252,7 +1252,7 @@ FAT32UpdateFreeClustersCount( * - Allocate a big enough buffer * - And read the disk */ - Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_VFAT); + Sector = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_BUFFER); if (Sector == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -1261,7 +1261,7 @@ FAT32UpdateFreeClustersCount( Status = VfatReadDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; } #endif @@ -1275,7 +1275,7 @@ FAT32UpdateFreeClustersCount( #ifndef VOLUME_IS_NOT_CACHED_WORK_AROUND_IT CcUnpinData(Context); #else - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); #endif return STATUS_DISK_CORRUPT_ERROR; } @@ -1291,7 +1291,7 @@ FAT32UpdateFreeClustersCount( #else /* Write back the FSINFO sector to the disk */ Status = VfatWriteDisk(DeviceExt->StorageDevice, &Offset, Length, (PUCHAR)Sector, FALSE); - ExFreePoolWithTag(Sector, TAG_VFAT); + ExFreePoolWithTag(Sector, TAG_BUFFER); return Status; #endif } diff --git a/drivers/filesystems/fastfat/fcb.c b/drivers/filesystems/fastfat/fcb.c index 89c8dc2ad2..6befca9128 100644 --- a/drivers/filesystems/fastfat/fcb.c +++ b/drivers/filesystems/fastfat/fcb.c @@ -22,8 +22,6 @@ /* -------------------------------------------------------- DEFINES */ -#define TAG_FCB 'BCFV' - #ifdef KDBG extern UNICODE_STRING DebugFile; #endif diff --git a/drivers/filesystems/fastfat/fsctl.c b/drivers/filesystems/fastfat/fsctl.c index b849bf4119..1cc45b0eec 100644 --- a/drivers/filesystems/fastfat/fsctl.c +++ b/drivers/filesystems/fastfat/fsctl.c @@ -677,7 +677,7 @@ VfatMount( DeviceExt->Statistics = ExAllocatePoolWithTag(NonPagedPool, sizeof(STATISTICS) * VfatGlobalData->NumberProcessors, - TAG_VFAT); + TAG_STATS); if (DeviceExt->Statistics == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; @@ -809,7 +809,7 @@ ByeBye: if (DeviceExt && DeviceExt->SpareVPB) ExFreePoolWithTag(DeviceExt->SpareVPB, TAG_VFAT); if (DeviceExt && DeviceExt->Statistics) - ExFreePoolWithTag(DeviceExt->Statistics, TAG_VFAT); + ExFreePoolWithTag(DeviceExt->Statistics, TAG_STATS); if (Fcb) vfatDestroyFCB(Fcb); if (Ccb) diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index f03d513952..834427e1b8 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -534,11 +534,13 @@ typedef struct _VFATCCB UNICODE_STRING SearchPattern; } VFATCCB, *PVFATCCB; -#define TAG_CCB 'BCCV' -#define TAG_FCB 'BCFV' -#define TAG_IRP 'PRIV' +#define TAG_CCB 'CtaF' +#define TAG_FCB 'FtaF' +#define TAG_IRP 'ItaF' #define TAG_VFAT 'TAFV' #define TAG_CLOSE 'xtaF' +#define TAG_STATS 'VtaF' +#define TAG_BUFFER 'OtaF' #define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry))

6 years, 4 months

01/03: [FASTFAT] Implement delayed close

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50b00f0fcca638a7c205b… commit 50b00f0fcca638a7c205bdf022ade079135e58c6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Aug 18 17:04:02 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Aug 18 19:03:30 2018 +0200 [FASTFAT] Implement delayed close When we're about to close a file (ie, forget everything about it and release any associated structure), actually delay it. This allows keep data fresh in memory for faster reuse in case it would be required. The effective closing will only happen after some time. For specific operations, this will produce a real speed up in ReactOS. For instance, with that patch, Winamp starts within seconds, instead of dozen of minutes. In most cases, it will bring ReactOS to performances it had before fixing the huge leak in FastFAT (commit 94ead99) without leaking the whole FS. For now, due to regressions, this is only activated for files and not for directories. Once it gets fixed, it will be enabled for both. CORE-14826 CORE-14917 --- drivers/filesystems/fastfat/cleanup.c | 24 +++++ drivers/filesystems/fastfat/close.c | 174 ++++++++++++++++++++++++++++------ drivers/filesystems/fastfat/create.c | 38 ++++++++ drivers/filesystems/fastfat/iface.c | 15 +++ drivers/filesystems/fastfat/kdbg.c | 3 +- drivers/filesystems/fastfat/vfat.h | 22 ++++- 6 files changed, 244 insertions(+), 32 deletions(-) diff --git a/drivers/filesystems/fastfat/cleanup.c b/drivers/filesystems/fastfat/cleanup.c index d19fa94703..ae354086e7 100644 --- a/drivers/filesystems/fastfat/cleanup.c +++ b/drivers/filesystems/fastfat/cleanup.c @@ -4,6 +4,7 @@ * FILE: drivers/fs/vfat/cleanup.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -127,6 +128,29 @@ VfatCleanupFile( { IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); } + /* If that's the last open handle we just closed, try to see whether + * we can delay close operation + */ + else if (!BooleanFlagOn(pFcb->Flags, FCB_DELETE_PENDING) && !BooleanFlagOn(pFcb->Flags, FCB_IS_PAGE_FILE) && + !BooleanFlagOn(pFcb->Flags, FCB_IS_FAT) && !BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME)) + { + /* This is only allowed if that's a directory with no open files + * OR if it's a file with no section opened + * FIXME: only allow files for now + */ +#if 0 + if ((vfatFCBIsDirectory(pFcb) && IsListEmpty(&pFcb->ParentListHead)) || + (!vfatFCBIsDirectory(pFcb) && FileObject->SectionObjectPointer->DataSectionObject == NULL && + FileObject->SectionObjectPointer->ImageSectionObject == NULL)) +#else + if (!vfatFCBIsDirectory(pFcb) && FileObject->SectionObjectPointer->DataSectionObject == NULL && + FileObject->SectionObjectPointer->ImageSectionObject == NULL) +#endif + { + DPRINT("Delaying close of: %wZ\n", &pFcb->PathNameU); + SetFlag(pFcb->Flags, FCB_DELAYED_CLOSE); + } + } FileObject->Flags |= FO_CLEANUP_COMPLETE; #ifdef KDBG diff --git a/drivers/filesystems/fastfat/close.c b/drivers/filesystems/fastfat/close.c index bb5cfaae78..0c313e6629 100644 --- a/drivers/filesystems/fastfat/close.c +++ b/drivers/filesystems/fastfat/close.c @@ -4,6 +4,7 @@ * FILE: drivers/filesystems/fastfat/close.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -15,6 +16,143 @@ /* FUNCTIONS ****************************************************************/ +VOID +VfatCommonCloseFile( + PDEVICE_EXTENSION DeviceExt, + PVFATFCB pFcb) +{ + /* Nothing to do for volumes */ + if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME)) + { + return; + } + + /* If cache is still initialized, release it + * This only affects directories + */ + if (pFcb->OpenHandleCount == 0 && BooleanFlagOn(pFcb->Flags, FCB_CACHE_INITIALIZED)) + { + PFILE_OBJECT tmpFileObject; + tmpFileObject = pFcb->FileObject; + if (tmpFileObject != NULL) + { + pFcb->FileObject = NULL; + CcUninitializeCacheMap(tmpFileObject, NULL, NULL); + ClearFlag(pFcb->Flags, FCB_CACHE_INITIALIZED); + ObDereferenceObject(tmpFileObject); + } + } + +#ifdef KDBG + pFcb->Flags |= FCB_CLOSED; +#endif + + /* Release the FCB, we likely cause its deletion */ + vfatReleaseFCB(DeviceExt, pFcb); +} + +VOID +NTAPI +VfatCloseWorker( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PLIST_ENTRY Entry; + PVFATFCB pFcb; + PDEVICE_EXTENSION Vcb; + PVFAT_CLOSE_CONTEXT CloseContext; + BOOLEAN ConcurrentDeletion; + + /* Start removing work items */ + ExAcquireFastMutex(&VfatGlobalData->CloseMutex); + while (!IsListEmpty(&VfatGlobalData->CloseListHead)) + { + Entry = RemoveHeadList(&VfatGlobalData->CloseListHead); + CloseContext = CONTAINING_RECORD(Entry, VFAT_CLOSE_CONTEXT, CloseListEntry); + + /* One less */ + --VfatGlobalData->CloseCount; + /* Reset its entry to detect concurrent deletions */ + InitializeListHead(&CloseContext->CloseListEntry); + ExReleaseFastMutex(&VfatGlobalData->CloseMutex); + + /* Get the elements */ + Vcb = CloseContext->Vcb; + pFcb = CloseContext->Fcb; + ExAcquireResourceExclusiveLite(&Vcb->DirResource, TRUE); + /* If it didn't got deleted in between */ + if (BooleanFlagOn(pFcb->Flags, FCB_DELAYED_CLOSE)) + { + /* Close it! */ + DPRINT("Late closing: %wZ\n", &pFcb->PathNameU); + ClearFlag(pFcb->Flags, FCB_DELAYED_CLOSE); + pFcb->CloseContext = NULL; + VfatCommonCloseFile(Vcb, pFcb); + ConcurrentDeletion = FALSE; + } + else + { + /* Otherwise, mark not to delete it */ + ConcurrentDeletion = TRUE; + } + ExReleaseResourceLite(&Vcb->DirResource); + + /* If we were the fastest, delete the context */ + if (!ConcurrentDeletion) + { + ExFreeToPagedLookasideList(&VfatGlobalData->CloseContextLookasideList, CloseContext); + } + + /* Lock again the list */ + ExAcquireFastMutex(&VfatGlobalData->CloseMutex); + } + + /* We're done, bye! */ + VfatGlobalData->CloseWorkerRunning = FALSE; + ExReleaseFastMutex(&VfatGlobalData->CloseMutex); +} + +NTSTATUS +VfatPostCloseFile( + PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject) +{ + PVFAT_CLOSE_CONTEXT CloseContext; + + /* Allocate a work item */ + CloseContext = ExAllocateFromPagedLookasideList(&VfatGlobalData->CloseContextLookasideList); + if (CloseContext == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Set relevant fields */ + CloseContext->Vcb = DeviceExt; + CloseContext->Fcb = FileObject->FsContext; + CloseContext->Fcb->CloseContext = CloseContext; + + /* Acquire the lock to insert in list */ + ExAcquireFastMutex(&VfatGlobalData->CloseMutex); + + /* One more element */ + InsertTailList(&VfatGlobalData->CloseListHead, &CloseContext->CloseListEntry); + ++VfatGlobalData->CloseCount; + + /* If we have more than 16 items in list, and no worker thread + * start a new one + */ + if (VfatGlobalData->CloseCount > 16 && !VfatGlobalData->CloseWorkerRunning) + { + VfatGlobalData->CloseWorkerRunning = TRUE; + IoQueueWorkItem(VfatGlobalData->CloseWorkItem, VfatCloseWorker, CriticalWorkQueue, NULL); + } + + /* We're done */ + ExReleaseFastMutex(&VfatGlobalData->CloseMutex); + + return STATUS_SUCCESS; +} + /* * FUNCTION: Closes a file */ @@ -25,7 +163,6 @@ VfatCloseFile( { PVFATFCB pFcb; PVFATCCB pCcb; - BOOLEAN IsVolume; NTSTATUS Status = STATUS_SUCCESS; DPRINT("VfatCloseFile(DeviceExt %p, FileObject %p)\n", @@ -40,44 +177,23 @@ VfatCloseFile( return STATUS_SUCCESS; } - IsVolume = BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME); - if (IsVolume) + if (pCcb) { - DPRINT("Volume\n"); - FileObject->FsContext2 = NULL; + vfatDestroyCCB(pCcb); } - else - { - if (pFcb->OpenHandleCount == 0 && BooleanFlagOn(pFcb->Flags, FCB_CACHE_INITIALIZED)) - { - PFILE_OBJECT tmpFileObject; - tmpFileObject = pFcb->FileObject; - if (tmpFileObject != NULL) - { - pFcb->FileObject = NULL; - CcUninitializeCacheMap(tmpFileObject, NULL, NULL); - ClearFlag(pFcb->Flags, FCB_CACHE_INITIALIZED); - ObDereferenceObject(tmpFileObject); - } - } -#ifdef KDBG - pFcb->Flags |= FCB_CLOSED; -#endif - vfatReleaseFCB(DeviceExt, pFcb); + /* If we have to close immediately, or if delaying failed, close */ + if (!BooleanFlagOn(pFcb->Flags, FCB_DELAYED_CLOSE) || !NT_SUCCESS(VfatPostCloseFile(DeviceExt, FileObject))) + { + VfatCommonCloseFile(DeviceExt, pFcb); } FileObject->FsContext2 = NULL; FileObject->FsContext = NULL; FileObject->SectionObjectPointer = NULL; - if (pCcb) - { - vfatDestroyCCB(pCcb); - } - #ifdef ENABLE_SWAPOUT - if (IsVolume && DeviceExt->OpenHandleCount == 0) + if (BooleanFlagOn(pFcb->Flags, FCB_IS_VOLUME) && DeviceExt->OpenHandleCount == 0) { VfatCheckForDismount(DeviceExt, FALSE); } diff --git a/drivers/filesystems/fastfat/create.c b/drivers/filesystems/fastfat/create.c index e2fbccaf9c..6dbf032e6e 100644 --- a/drivers/filesystems/fastfat/create.c +++ b/drivers/filesystems/fastfat/create.c @@ -370,6 +370,44 @@ VfatOpenFile( return STATUS_CANNOT_DELETE; } + /* If that one was marked for closing, remove it */ + if (BooleanFlagOn(Fcb->Flags, FCB_DELAYED_CLOSE)) + { + BOOLEAN ConcurrentDeletion; + PVFAT_CLOSE_CONTEXT CloseContext; + + /* Get the context */ + CloseContext = Fcb->CloseContext; + /* Is someone already taking over? */ + if (CloseContext != NULL) + { + ConcurrentDeletion = FALSE; + /* Lock list */ + ExAcquireFastMutex(&VfatGlobalData->CloseMutex); + /* Check whether it was already removed, if not, do it */ + if (!IsListEmpty(&CloseContext->CloseListEntry)) + { + RemoveEntryList(&CloseContext->CloseListEntry); + --VfatGlobalData->CloseCount; + ConcurrentDeletion = TRUE; + } + ExReleaseFastMutex(&VfatGlobalData->CloseMutex); + + /* It's not delayed anymore! */ + ClearFlag(Fcb->Flags, FCB_DELAYED_CLOSE); + /* Release the extra reference (would have been removed by IRP_MJ_CLOSE) */ + vfatReleaseFCB(DeviceExt, Fcb); + Fcb->CloseContext = NULL; + /* If no concurrent deletion, free work item */ + if (!ConcurrentDeletion) + { + ExFreeToPagedLookasideList(&VfatGlobalData->CloseContextLookasideList, CloseContext); + } + } + + DPRINT("Reusing delayed close FCB for %wZ\n", &Fcb->PathNameU); + } + DPRINT("Attaching FCB to fileObject\n"); Status = vfatAttachFCBToFileObject(DeviceExt, Fcb, FileObject); if (!NT_SUCCESS(Status)) diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/fastfat/iface.c index 41653a2549..e99409c669 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/fastfat/iface.c @@ -21,6 +21,7 @@ * FILE: drivers/fs/vfat/iface.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -95,6 +96,18 @@ DriverEntry( * has been detected: VfatGlobalData->Flags = VFAT_BREAK_ON_CORRUPTION; */ + /* Delayed close support */ + ExInitializeFastMutex(&VfatGlobalData->CloseMutex); + InitializeListHead(&VfatGlobalData->CloseListHead); + VfatGlobalData->CloseCount = 0; + VfatGlobalData->CloseWorkerRunning = FALSE; + VfatGlobalData->CloseWorkItem = IoAllocateWorkItem(DeviceObject); + if (VfatGlobalData->CloseWorkItem == NULL) + { + IoDeleteDevice(DeviceObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + DeviceObject->Flags |= DO_DIRECT_IO; DriverObject->MajorFunction[IRP_MJ_CLOSE] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_CREATE] = VfatBuildRequest; @@ -132,6 +145,8 @@ DriverEntry( NULL, NULL, 0, sizeof(VFATCCB), TAG_CCB, 0); ExInitializeNPagedLookasideList(&VfatGlobalData->IrpContextLookasideList, NULL, NULL, 0, sizeof(VFAT_IRP_CONTEXT), TAG_IRP, 0); + ExInitializePagedLookasideList(&VfatGlobalData->CloseContextLookasideList, + NULL, NULL, 0, sizeof(VFAT_CLOSE_CONTEXT), TAG_CLOSE, 0); ExInitializeResourceLite(&VfatGlobalData->VolumeListLock); InitializeListHead(&VfatGlobalData->VolumeListHead); diff --git a/drivers/filesystems/fastfat/kdbg.c b/drivers/filesystems/fastfat/kdbg.c index b278329299..ef2ded50de 100644 --- a/drivers/filesystems/fastfat/kdbg.c +++ b/drivers/filesystems/fastfat/kdbg.c @@ -109,10 +109,11 @@ vfatKdbgHandler( ListEntry = ListEntry->Flink) { Fcb = CONTAINING_RECORD(ListEntry, VFATFCB, FcbListEntry); - DPRINT1("FCB %p (ref: %d, oc: %d %s %s) for FO %p with path: %.*S\n", + DPRINT1("FCB %p (ref: %d, oc: %d %s %s %s) for FO %p with path: %.*S\n", Fcb, Fcb->RefCount, Fcb->OpenHandleCount, ((Fcb->Flags & FCB_CLEANED_UP) ? "U" : "NU"), ((Fcb->Flags & FCB_CLOSED) ? "C" : "NC"), + ((Fcb->Flags & FCB_DELAYED_CLOSE) ? "D" : "ND"), Fcb->FileObject, Fcb->PathNameU.Length, Fcb->PathNameU.Buffer); } } diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index bec3dc8394..f03d513952 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -269,6 +269,7 @@ typedef struct struct _VFATFCB; struct _VFAT_DIRENTRY_CONTEXT; struct _VFAT_MOVE_CONTEXT; +struct _VFAT_CLOSE_CONTEXT; typedef struct _HASHENTRY { @@ -408,8 +409,14 @@ typedef struct NPAGED_LOOKASIDE_LIST FcbLookasideList; NPAGED_LOOKASIDE_LIST CcbLookasideList; NPAGED_LOOKASIDE_LIST IrpContextLookasideList; + PAGED_LOOKASIDE_LIST CloseContextLookasideList; FAST_IO_DISPATCH FastIoDispatch; CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; + FAST_MUTEX CloseMutex; + ULONG CloseCount; + LIST_ENTRY CloseListHead; + BOOLEAN CloseWorkerRunning; + PIO_WORKITEM CloseWorkItem; } VFAT_GLOBAL_DATA, *PVFAT_GLOBAL_DATA; extern PVFAT_GLOBAL_DATA VfatGlobalData; @@ -420,9 +427,10 @@ extern PVFAT_GLOBAL_DATA VfatGlobalData; #define FCB_IS_PAGE_FILE 0x0008 #define FCB_IS_VOLUME 0x0010 #define FCB_IS_DIRTY 0x0020 +#define FCB_DELAYED_CLOSE 0x0040 #ifdef KDBG -#define FCB_CLEANED_UP 0x0040 -#define FCB_CLOSED 0x0080 +#define FCB_CLEANED_UP 0x0080 +#define FCB_CLOSED 0x0100 #endif #define NODE_TYPE_FCB ((CSHORT)0x0502) @@ -510,6 +518,8 @@ typedef struct _VFATFCB FAST_MUTEX LastMutex; ULONG LastCluster; ULONG LastOffset; + + struct _VFAT_CLOSE_CONTEXT * CloseContext; } VFATFCB, *PVFATFCB; #define CCB_DELETE_ON_CLOSE 0x0001 @@ -528,6 +538,7 @@ typedef struct _VFATCCB #define TAG_FCB 'BCFV' #define TAG_IRP 'PRIV' #define TAG_VFAT 'TAFV' +#define TAG_CLOSE 'xtaF' #define ENTRIES_PER_SECTOR (BLOCKSIZE / sizeof(FATDirEntry)) @@ -588,6 +599,13 @@ typedef struct _VFAT_MOVE_CONTEXT BOOLEAN InPlace; } VFAT_MOVE_CONTEXT, *PVFAT_MOVE_CONTEXT; +typedef struct _VFAT_CLOSE_CONTEXT +{ + PDEVICE_EXTENSION Vcb; + PVFATFCB Fcb; + LIST_ENTRY CloseListEntry; +} VFAT_CLOSE_CONTEXT, *PVFAT_CLOSE_CONTEXT; + FORCEINLINE NTSTATUS VfatMarkIrpContextForQueue(PVFAT_IRP_CONTEXT IrpContext)

6 years, 4 months

01/01: [CLIPBRD] Clipbrd program should accept the quoted file path (#638)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2d2e3433b74ff37c4de2… commit b2d2e3433b74ff37c4de2f8d27d85fc7c0700235 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 19 01:36:47 2018 +0900 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 18 18:36:47 2018 +0200 [CLIPBRD] Clipbrd program should accept the quoted file path (#638) --- base/applications/clipbrd/clipbrd.c | 6 ++++-- base/applications/clipbrd/precomp.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index 280cc6f78e..aa14d44cdc 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -409,6 +409,8 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP UpdateDisplayMenu(); SetDisplayFormat(0); + + DragAcceptFiles(hWnd, TRUE); break; } @@ -733,8 +735,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } /* If the user provided a path to a clipboard data file, try to open it */ - if (lpCmdLine != NULL && *lpCmdLine) - LoadClipboardDataFromFile(lpCmdLine); + if (__argc >= 2) + LoadClipboardDataFromFile(__wargv[1]); while (GetMessageW(&msg, 0, 0, 0)) { diff --git a/base/applications/clipbrd/precomp.h b/base/applications/clipbrd/precomp.h index 7a04b962c4..e5dd1781ab 100644 --- a/base/applications/clipbrd/precomp.h +++ b/base/applications/clipbrd/precomp.h @@ -25,6 +25,7 @@ #include <htmlhelp.h> #include <commdlg.h> #include <winnls.h> +#include <stdlib.h> #include "resources.h" #include "cliputils.h"

6 years, 4 months

01/01: [GDIPLUS] Add sxs registration for 1.0 version. Needed by by some applications with MSVCR90.dll CORE-14695

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cf56e1cb5825917d9b961… commit cf56e1cb5825917d9b96114da515db045f06b545 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Aug 18 10:29:01 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Aug 18 18:25:13 2018 +0200 [GDIPLUS] Add sxs registration for 1.0 version. Needed by by some applications with MSVCR90.dll CORE-14695 --- boot/bootdata/packages/reactos.dff.in | 1 + dll/win32/gdiplus/CMakeLists.txt | 5 +++++ ...ndows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest | 5 +++++ sdk/cmake/CMakeMacros.cmake | 2 ++ 4 files changed, 13 insertions(+) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 2689f50483..a61df365f4 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -78,6 +78,7 @@ Signature = "$ReactOS$" 58 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef 59 = winsxs\x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef 60 = winsxs\x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef +61 = winsxs\x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef .InfEnd diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index 5a6aecf7ff..58ef713dcb 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -36,5 +36,10 @@ add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_pch(gdiplus precomp.h SOURCE) add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) + add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) + +add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) + diff --git a/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest new file mode 100644 index 0000000000..aa78645296 --- /dev/null +++ b/dll/win32/gdiplus/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.14393.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly> diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index a103c74e29..3cfcccf490 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -285,6 +285,8 @@ macro(dir_to_num dir var) set(${var} 59) elseif(${dir} STREQUAL reactos/winsxs/x86_reactos.newapi_6595b64144ccf1df_1.0.0.0_none_deadbeef) set(${var} 60) + elseif(${dir} STREQUAL reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) + set(${var} 61) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

6 years, 4 months

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

Jump to page:

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