From 19dc2fac408bd619f67c2e7ee29b42c81c1150bc Mon Sep 17 00:00:00 2001 From: pete scott Date: Wed, 13 Mar 2013 07:54:00 -0600 Subject: [PATCH] Windows: Replace AFSDbgMsgLog func with macro In order to reduce computation overhead when trace logging is not active replace the AFSDbgMsgLog function call with a macro, AFSDbgTrace. Change-Id: I7bccee0ddffcd8488f81fcebbb970aa15c8dc52e Reviewed-on: http://gerrit.openafs.org/9621 Reviewed-by: Peter Scott Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- .../afsrdr/common/AFSRedirCommonDefines.h | 5 + .../afsrdr/common/AFSRedirCommonStructs.h | 6 + src/WINNT/afsrdr/common/AFSUserIoctl.h | 2 + .../afsrdr/kernel/fs/AFSAuthGroupSupport.cpp | 308 +++--- .../afsrdr/kernel/fs/AFSBTreeSupport.cpp | 8 +- src/WINNT/afsrdr/kernel/fs/AFSCleanup.cpp | 4 +- src/WINNT/afsrdr/kernel/fs/AFSClose.cpp | 4 +- src/WINNT/afsrdr/kernel/fs/AFSCommSupport.cpp | 45 +- src/WINNT/afsrdr/kernel/fs/AFSCreate.cpp | 20 +- src/WINNT/afsrdr/kernel/fs/AFSData.cpp | 2 + src/WINNT/afsrdr/kernel/fs/AFSDevControl.cpp | 4 +- src/WINNT/afsrdr/kernel/fs/AFSDirControl.cpp | 4 +- src/WINNT/afsrdr/kernel/fs/AFSEa.cpp | 8 +- src/WINNT/afsrdr/kernel/fs/AFSFSControl.cpp | 4 +- .../afsrdr/kernel/fs/AFSFastIoSupport.cpp | 36 +- src/WINNT/afsrdr/kernel/fs/AFSFileInfo.cpp | 8 +- src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp | 102 +- src/WINNT/afsrdr/kernel/fs/AFSInit.cpp | 4 +- .../kernel/fs/AFSInternalDevControl.cpp | 4 +- .../afsrdr/kernel/fs/AFSLibrarySupport.cpp | 159 ++-- src/WINNT/afsrdr/kernel/fs/AFSLockControl.cpp | 4 +- src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp | 20 +- .../kernel/fs/AFSNetworkProviderSupport.cpp | 13 +- .../afsrdr/kernel/fs/AFSProcessSupport.cpp | 100 +- src/WINNT/afsrdr/kernel/fs/AFSQuota.cpp | 16 +- src/WINNT/afsrdr/kernel/fs/AFSRDRSupport.cpp | 60 +- src/WINNT/afsrdr/kernel/fs/AFSSecurity.cpp | 16 +- src/WINNT/afsrdr/kernel/fs/AFSShutdown.cpp | 4 +- .../afsrdr/kernel/fs/AFSSystemControl.cpp | 8 +- src/WINNT/afsrdr/kernel/fs/AFSVolumeInfo.cpp | 13 +- src/WINNT/afsrdr/kernel/fs/AFSWrite.cpp | 8 +- .../afsrdr/kernel/fs/Include/AFSCommon.h | 3 + .../afsrdr/kernel/fs/Include/AFSExtern.h | 2 + .../afsrdr/kernel/lib/AFSBTreeSupport.cpp | 28 +- src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp | 164 ++-- src/WINNT/afsrdr/kernel/lib/AFSClose.cpp | 76 +- .../afsrdr/kernel/lib/AFSCommSupport.cpp | 292 +++--- src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp | 504 +++++----- src/WINNT/afsrdr/kernel/lib/AFSData.cpp | 2 + src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp | 30 +- src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp | 172 ++-- src/WINNT/afsrdr/kernel/lib/AFSEa.cpp | 17 +- .../afsrdr/kernel/lib/AFSExtentsSupport.cpp | 396 ++++---- src/WINNT/afsrdr/kernel/lib/AFSFSControl.cpp | 93 +- src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp | 116 +-- src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp | 388 ++++---- .../afsrdr/kernel/lib/AFSFlushBuffers.cpp | 20 +- src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp | 891 +++++++++--------- .../kernel/lib/AFSInternalDevControl.cpp | 4 +- src/WINNT/afsrdr/kernel/lib/AFSIoSupport.cpp | 4 +- .../afsrdr/kernel/lib/AFSLockControl.cpp | 48 +- .../afsrdr/kernel/lib/AFSNameSupport.cpp | 681 ++++++------- .../kernel/lib/AFSNetworkProviderSupport.cpp | 202 ++-- src/WINNT/afsrdr/kernel/lib/AFSQuota.cpp | 16 +- src/WINNT/afsrdr/kernel/lib/AFSRead.cpp | 268 +++--- src/WINNT/afsrdr/kernel/lib/AFSSecurity.cpp | 36 +- src/WINNT/afsrdr/kernel/lib/AFSShutdown.cpp | 4 +- .../afsrdr/kernel/lib/AFSSystemControl.cpp | 8 +- src/WINNT/afsrdr/kernel/lib/AFSVolumeInfo.cpp | 41 +- src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp | 264 +++--- src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp | 289 +++--- .../afsrdr/kernel/lib/Include/AFSExtern.h | 2 + 62 files changed, 3090 insertions(+), 2970 deletions(-) diff --git a/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h b/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h index a5b08f2f6..6e5ea4091 100644 --- a/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h +++ b/src/WINNT/afsrdr/common/AFSRedirCommonDefines.h @@ -233,6 +233,11 @@ static inline void AFSBreakPoint() { #endif +#define AFSDbgTrace(X) \ +{ \ + PAFSDbgLogMsg pTraceFnc = AFSDebugTraceFnc; \ + if( pTraceFnc != NULL) { pTraceFnc X;} \ +} // // Library control device name // diff --git a/src/WINNT/afsrdr/common/AFSRedirCommonStructs.h b/src/WINNT/afsrdr/common/AFSRedirCommonStructs.h index a79b5c886..5da3ce9ae 100644 --- a/src/WINNT/afsrdr/common/AFSRedirCommonStructs.h +++ b/src/WINNT/afsrdr/common/AFSRedirCommonStructs.h @@ -829,6 +829,12 @@ typedef struct _AFS_LIBRARY_INIT_CB } AFSLibraryInitCB; +typedef struct _AFS_TRACE_CONFIG_CB +{ + + PAFSDbgLogMsg AFSDbgLogMsg; + +} AFSDebugTraceConfigCB; #endif diff --git a/src/WINNT/afsrdr/common/AFSUserIoctl.h b/src/WINNT/afsrdr/common/AFSUserIoctl.h index dd5a7e323..35998994f 100644 --- a/src/WINNT/afsrdr/common/AFSUserIoctl.h +++ b/src/WINNT/afsrdr/common/AFSUserIoctl.h @@ -92,4 +92,6 @@ #define IOCTL_AFS_AUTHGROUP_LOGON_CREATE CTL_CODE( FILE_DEVICE_DISK_FILE_SYSTEM, 0x101A, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFS_CONFIG_LIBRARY_TRACE CTL_CODE( FILE_DEVICE_DISK_FILE_SYSTEM, 0x101B, METHOD_BUFFERED, FILE_ANY_ACCESS) + #endif /* _AFS_USER_IOCTL_H */ \ No newline at end of file diff --git a/src/WINNT/afsrdr/kernel/fs/AFSAuthGroupSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSAuthGroupSupport.cpp index a2cd5570e..937357158 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSAuthGroupSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSAuthGroupSupport.cpp @@ -61,22 +61,22 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, if( ulSessionId == (ULONG)-1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to retrieve session ID for PID %I64X\n", __FUNCTION__, - ProcessId); + ProcessId)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, ulSessionId, ProcessId, - ThreadId); + ThreadId)); ntStatus = AFSCheckThreadDacl( AuthGroup); @@ -90,14 +90,14 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, RtlStringFromGUID( *AuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Located AuthGroup %wZ via DACL for Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, &uniGUIDString, ulSessionId, ProcessId, - ThreadId); + ThreadId)); if( uniGUIDString.Buffer != NULL) { @@ -107,11 +107,11 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, try_return( ntStatus = STATUS_SUCCESS); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveAuthGroup Acquiring Control ProcessTree.TreeLock lock %p SHARED %08lX\n", pDeviceExt->Specific.Control.ProcessTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); ntStatus = STATUS_SUCCESS; @@ -126,13 +126,13 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, pProcessCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate process entry for Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, ulSessionId, ProcessId, - ThreadId); + ThreadId)); AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); @@ -166,14 +166,14 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, RtlStringFromGUID( *AuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Located AuthGroup %wZ in thread Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, &uniGUIDString, ulSessionId, ProcessId, - ThreadId); + ThreadId)); if( uniGUIDString.Buffer != NULL) { @@ -196,14 +196,14 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, RtlStringFromGUID( *AuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Located AuthGroup %wZ in process Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, &uniGUIDString, ulSessionId, ProcessId, - ThreadId); + ThreadId)); if( uniGUIDString.Buffer != NULL) { @@ -217,13 +217,13 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, AFSIsNoPAGAuthGroup( pAuthGroup)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s No AuthGroup located, validating process for Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, ulSessionId, ProcessId, - ThreadId); + ThreadId)); pAuthGroup = AFSValidateProcessEntry( PsGetCurrentProcessId(), FALSE); @@ -241,14 +241,14 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, RtlStringFromGUID( *AuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Located AuthGroup %wZ after validation Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, &uniGUIDString, ulSessionId, ProcessId, - ThreadId); + ThreadId)); if( uniGUIDString.Buffer != NULL) { @@ -257,13 +257,13 @@ AFSRetrieveAuthGroup( IN ULONGLONG ProcessId, } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate AuthGroup for Session %08lX PID %I64X TID %I64X\n", __FUNCTION__, ulSessionId, ProcessId, - ThreadId); + ThreadId)); } } @@ -300,11 +300,11 @@ AFSIsLocalSystemAuthGroup( IN GUID *AuthGroup) RtlStringFromGUID( *AuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "%s Checking AuthGroup %wZ\n", __FUNCTION__, - &uniGUIDString); + &uniGUIDString)); AFSAcquireShared( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); @@ -318,11 +318,11 @@ AFSIsLocalSystemAuthGroup( IN GUID *AuthGroup) { bIsLocalSys = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s AuthGroup %wZ is LOCAL SYSTEM\n", __FUNCTION__, - &uniGUIDString); + &uniGUIDString)); } AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); @@ -356,12 +356,12 @@ AFSIsLocalSystemSID( IN UNICODE_STRING *SIDString) bIsLocalSys = TRUE; } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "%s AuthGroup SID %wZ is %sLOCAL SYSTEM\n", __FUNCTION__, SIDString, - bIsLocalSys ? "" : "not "); + bIsLocalSys ? "" : "not ")); } return bIsLocalSys; @@ -391,12 +391,12 @@ AFSIsNoPAGAuthGroup( IN GUID *AuthGroup) bIsNoPAG = TRUE; } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "%s AuthGroup %wZ is %sNoPAG\n", __FUNCTION__, &uniGUIDString, - bIsNoPAG ? "" : "not "); + bIsNoPAG ? "" : "not ")); if( uniGUIDString.Buffer != NULL) { @@ -450,11 +450,11 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) pProcessCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate process CB for PID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); try_return( ntStatus = STATUS_UNSUCCESSFUL); @@ -470,22 +470,22 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate caller SID for PID %I64X Status %08lX\n", __FUNCTION__, ullProcessID, - ntStatus); + ntStatus)); try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Retrieved caller SID %wZ for PID %I64X\n", __FUNCTION__, &uniCallerSID, - ullProcessID); + ullProcessID)); if( CreateSetAuthGroup->SIDLength != 0) @@ -496,12 +496,12 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) uniPassedSIDString.Buffer = CreateSetAuthGroup->SIDString; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Validating passed SID %wZ for PID %I64X\n", __FUNCTION__, &uniPassedSIDString, - ullProcessID); + ullProcessID)); if( RtlCompareUnicodeString( &uniCallerSID, &uniPassedSIDString, @@ -511,47 +511,47 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) if( !BooleanFlagOn( pProcessCB->Flags, AFS_PROCESS_LOCAL_SYSTEM_AUTH)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Caller specified SID %wZ for PID %I64X but caller is not LOCAL SYSTEM AUTHORITY\n", __FUNCTION__, &uniPassedSIDString, - ullProcessID); + ullProcessID)); try_return( ntStatus = STATUS_ACCESS_DENIED); } uniSIDString = uniPassedSIDString; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using passed SID %wZ for PID %I64X\n", __FUNCTION__, &uniSIDString, - ullProcessID); + ullProcessID)); } else { uniSIDString = uniCallerSID; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Caller and passed SID are equal SID %wZ for PID %I64X\n", __FUNCTION__, &uniSIDString, - ullProcessID); + ullProcessID)); } } else { uniSIDString = uniCallerSID; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s No SID passed, using callers SID %wZ for PID %I64X\n", __FUNCTION__, &uniSIDString, - ullProcessID); + ullProcessID)); } ntStatus = RtlHashUnicodeString( &uniSIDString, @@ -562,13 +562,13 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to hash SID %wZ for PID %I64X Status %08lX\n", __FUNCTION__, &uniSIDString, ullProcessID, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -578,12 +578,12 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) if( ulSessionId == (ULONG)-1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to retrieve SessionID PID %I64X Status %08lX\n", __FUNCTION__, ullProcessID, - ntStatus); + ntStatus)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -591,12 +591,12 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) if( CreateSetAuthGroup->SessionId != (ULONG)-1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Checking passed SessionID %08lX for PID %I64X\n", __FUNCTION__, CreateSetAuthGroup->SessionId, - ullProcessID); + ullProcessID)); if( ulSessionId != CreateSetAuthGroup->SessionId) { @@ -604,34 +604,34 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) if( !BooleanFlagOn( pProcessCB->Flags, AFS_PROCESS_LOCAL_SYSTEM_AUTH)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Passed SessionID %08lX for PID %I64X, failed because caller is not LOCAL SYSTEM AUTHORITY\n", __FUNCTION__, CreateSetAuthGroup->SessionId, - ullProcessID); + ullProcessID)); try_return( ntStatus = STATUS_ACCESS_DENIED); } ulSessionId = CreateSetAuthGroup->SessionId; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using passed SessionID %08lX for PID %I64X\n", __FUNCTION__, ulSessionId, - ullProcessID); + ullProcessID)); } } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using callers SessionID %08lX for PID %I64X\n", __FUNCTION__, ulSessionId, - ullProcessID); + ullProcessID)); } ullTableHash = ( ((ULONGLONG)ulSessionId << 32) | ulSIDHash); @@ -654,13 +654,13 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) if( pAuthGroup != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Located AuthGroup for SID %wZ SessionID %08lX for PID %I64X, failing request\n", __FUNCTION__, &uniSIDString, ulSessionId, - ullProcessID); + ullProcessID)); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -690,13 +690,13 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) pLastAuthGroup->Next = pAuthGroup; } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Allocated new AuthGroup for SID %wZ SessionID %08lX for PID %I64X\n", __FUNCTION__, &uniSIDString, ulSessionId, - ullProcessID); + ullProcessID)); if( BooleanFlagOn( CreateSetAuthGroup->Flags, AFS_PAG_FLAGS_THREAD_AUTH_GROUP)) { @@ -729,26 +729,26 @@ AFSCreateSetProcessAuthGroup( AFSAuthGroupRequestCB *CreateSetAuthGroup) pThreadCB->ActiveAuthGroup = &pAuthGroup->AuthGroup; } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Set new AuthGroup for SID %wZ SessionID %08lX for PID %I64X on thread ID %I64X\n", __FUNCTION__, &uniSIDString, ulSessionId, ullProcessID, - ullThreadId); + ullThreadId)); } else if( BooleanFlagOn( CreateSetAuthGroup->Flags, AFS_PAG_FLAGS_SET_AS_ACTIVE)) { pProcessCB->ActiveAuthGroup = &pAuthGroup->AuthGroup; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Set new AuthGroup for SID %wZ SessionID %08lX for PID %I64X on process\n", __FUNCTION__, &uniSIDString, ulSessionId, - ullProcessID); + ullProcessID)); } try_exit: @@ -791,11 +791,11 @@ AFSQueryProcessAuthGroupList( IN GUID *GUIDList, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for PID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); AFSAcquireShared( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); @@ -808,11 +808,11 @@ AFSQueryProcessAuthGroupList( IN GUID *GUIDList, pProcessCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate process entry PID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); try_return( ntStatus = STATUS_UNSUCCESSFUL); @@ -838,12 +838,12 @@ AFSQueryProcessAuthGroupList( IN GUID *GUIDList, GUIDList == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Buffer too small for query, required %08lX for PID %I64X\n", __FUNCTION__, ulRequiredLength, - ullProcessID); + ullProcessID)); *ReturnLength = ulRequiredLength; try_return( ntStatus = STATUS_BUFFER_OVERFLOW); @@ -866,12 +866,12 @@ AFSQueryProcessAuthGroupList( IN GUID *GUIDList, RtlStringFromGUID( pAuthGroup->AuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Adding AuthGroup %wZ for PID %I64X\n", __FUNCTION__, &uniGUIDString, - ullProcessID); + ullProcessID)); if( uniGUIDString.Buffer != NULL) { @@ -925,12 +925,12 @@ AFSSetActiveProcessAuthGroup( IN AFSAuthGroupRequestCB *ActiveAuthGroup) RtlStringFromGUID( ActiveAuthGroup->AuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for ProcessID %I64X AuthGroup GUID %wZ\n", __FUNCTION__, ullProcessID, - &uniGUIDString); + &uniGUIDString)); AFSAcquireShared( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); @@ -943,11 +943,11 @@ AFSSetActiveProcessAuthGroup( IN AFSAuthGroupRequestCB *ActiveAuthGroup) pProcessCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate process entry for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); try_return( ntStatus = STATUS_UNSUCCESSFUL); @@ -976,12 +976,12 @@ AFSSetActiveProcessAuthGroup( IN AFSAuthGroupRequestCB *ActiveAuthGroup) if( pAuthGroup == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Failed to locate AuthGroup for ProcessID %I64X AuthGroup GUID %wZ\n", __FUNCTION__, ullProcessID, - &uniGUIDString); + &uniGUIDString)); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -1017,24 +1017,24 @@ AFSSetActiveProcessAuthGroup( IN AFSAuthGroupRequestCB *ActiveAuthGroup) pThreadCB->ActiveAuthGroup = &pAuthGroup->AuthGroup; } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Set active AuthGroup for ProcessID %I64X AuthGroup GUID %wZ on thread %I64X\n", __FUNCTION__, ullProcessID, &uniGUIDString, - ullThreadId); + ullThreadId)); } else { pProcessCB->ActiveAuthGroup = &pAuthGroup->AuthGroup; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Set active AuthGroup for ProcessID %I64X AuthGroup GUID %wZ on process\n", __FUNCTION__, ullProcessID, - &uniGUIDString); + &uniGUIDString)); } try_exit: @@ -1072,11 +1072,11 @@ AFSResetActiveProcessAuthGroup( IN IN AFSAuthGroupRequestCB *AuthGroup) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); AFSAcquireShared( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); @@ -1089,11 +1089,11 @@ AFSResetActiveProcessAuthGroup( IN IN AFSAuthGroupRequestCB *AuthGroup) pProcessCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate AuthGroup for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); try_return( ntStatus = STATUS_UNSUCCESSFUL); @@ -1121,12 +1121,12 @@ AFSResetActiveProcessAuthGroup( IN IN AFSAuthGroupRequestCB *AuthGroup) pThreadCB = pThreadCB->Next; } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Reset AuthGroup list on thread %I64X for ProcessID %I64X\n", __FUNCTION__, ullThreadId, - ullProcessID); + ullProcessID)); } else { @@ -1140,11 +1140,11 @@ AFSResetActiveProcessAuthGroup( IN IN AFSAuthGroupRequestCB *AuthGroup) pThreadCB = pThreadCB->Next; } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Reset AuthGroup list on process for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); } AFSReleaseResource( &pProcessCB->Lock); @@ -1190,25 +1190,25 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, ullProcessID, - ullThreadId); + ullThreadId)); ntStatus = AFSGetCallerSID( &uniCallerSID, &bImpersonation); if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to retrieve callers SID for ProcessID %I64X ThreadID %I64X Status %08lX\n", __FUNCTION__, ullProcessID, ullThreadId, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1219,11 +1219,11 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque bLocalSystem == FALSE) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s caller is %wZ and LOCAL SYSTEM AUTHORITY required\n", __FUNCTION__, - uniCallerSID); + uniCallerSID)); try_return( ntStatus = STATUS_ACCESS_DENIED); } @@ -1234,10 +1234,10 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque AuthGroupRequestCB->SessionId == (ULONG)-1)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s SID and SessionId are mandatory\n", - __FUNCTION__); + __FUNCTION__)); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -1248,22 +1248,22 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque AuthGroupRequestCB->SessionId != (ULONG)-1)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s SID and SessionId must not be specified\n", - __FUNCTION__); + __FUNCTION__)); try_return( ntStatus = STATUS_INVALID_PARAMETER); } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Retrieved callers SID %wZ for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, &uniCallerSID, ullProcessID, - ullThreadId); + ullThreadId)); if( AuthGroupRequestCB != NULL && AuthGroupRequestCB->SIDLength != 0) @@ -1274,13 +1274,13 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque uniPassedSIDString.Buffer = AuthGroupRequestCB->SIDString; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Checking passed SID %wZ for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, &uniPassedSIDString, ullProcessID, - ullThreadId); + ullThreadId)); if( RtlCompareUnicodeString( &uniCallerSID, &uniPassedSIDString, @@ -1290,51 +1290,51 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque if( !bLocalSystem) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Not using passed SID %wZ for ProcessID %I64X ThreadID %I64X caller is not LOCAL SYSTEM AUTHORITY\n", __FUNCTION__, &uniPassedSIDString, ullProcessID, - ullThreadId); + ullThreadId)); try_return( ntStatus = STATUS_ACCESS_DENIED); } uniSIDString = uniPassedSIDString; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using passed SID %wZ for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, &uniSIDString, ullProcessID, - ullThreadId); + ullThreadId)); } else { uniSIDString = uniCallerSID; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Both SIDs are equal, using callers SID %wZ for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, &uniSIDString, ullProcessID, - ullThreadId); + ullThreadId)); } } else { uniSIDString = uniCallerSID; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using callers SID %wZ for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, &uniSIDString, ullProcessID, - ullThreadId); + ullThreadId)); } ntStatus = RtlHashUnicodeString( &uniSIDString, @@ -1345,14 +1345,14 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to hash SID %wZ for ProcessID %I64X ThreadID %I64X Status %08lX\n", __FUNCTION__, &uniSIDString, ullProcessID, ullThreadId, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1362,12 +1362,12 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque if( ulSessionId == (ULONG)-1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to retrieve session ID for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, ullProcessID, - ullThreadId); + ullThreadId)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -1377,38 +1377,38 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque AuthGroupRequestCB->SessionId != (ULONG)-1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Checking passed SessionID %08lX for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, AuthGroupRequestCB->SessionId, ullProcessID, - ullThreadId); + ullThreadId)); if( ulSessionId != AuthGroupRequestCB->SessionId) { ulSessionId = AuthGroupRequestCB->SessionId; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using passed SessionID %08lX for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, AuthGroupRequestCB->SessionId, ullProcessID, - ullThreadId); + ullThreadId)); } } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using callers SessionID %08lX for ProcessID %I64X ThreadID %I64X\n", __FUNCTION__, ulSessionId, ullProcessID, - ullThreadId); + ullThreadId)); } ullTableHash = ( ((ULONGLONG)ulSessionId << 32) | ulSIDHash); @@ -1424,25 +1424,25 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque pSIDEntryCB != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Located SID entry for SID %wZ SessionID %08lX ProcessID %I64X ThreadID %I64X, updating GUID\n", __FUNCTION__, &uniSIDString, ulSessionId, ullProcessID, - ullThreadId); + ullThreadId)); uniGUID.Buffer = NULL; RtlStringFromGUID( pSIDEntryCB->AuthGroup, &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Updating existing AuthGroup GUID %wZ\n", __FUNCTION__, - &uniGUID); + &uniGUID)); if( uniGUID.Buffer != NULL) { @@ -1456,11 +1456,11 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque RtlStringFromGUID( pSIDEntryCB->AuthGroup, &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Updated existing AuthGroup GUID %wZ\n", __FUNCTION__, - &uniGUID); + &uniGUID)); if( uniGUID.Buffer != NULL) { @@ -1505,13 +1505,13 @@ AFSCreateAuthGroupForSIDorLogonSession( IN AFSAuthGroupRequestCB *AuthGroupReque RtlStringFromGUID( pSIDEntryCB->AuthGroup, &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Created new AuthGroup GUID %wZ SID %wZ Session %08lX\n", __FUNCTION__, &uniGUID, &uniSIDString, - ulSessionId); + ulSessionId)); if( uniGUID.Buffer != NULL) { @@ -1555,45 +1555,45 @@ AFSQueryAuthGroup( IN AFSAuthGroupRequestCB *AuthGroup, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); if( AuthGroup == NULL || AuthGroup->SIDLength == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s No SID specified, retrieving callers SID for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); ntStatus = AFSGetCallerSID( &uniSIDString, &bImpersonation); if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to retrieve callers SID for ProcessID %I64X Status %08lX\n", __FUNCTION__, ullProcessID, - ntStatus); + ntStatus)); try_return( ntStatus); } bReleaseSID = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Retrieved callers SID %wZ for ProcessID %I64X\n", __FUNCTION__, &uniSIDString, - ullProcessID); + ullProcessID)); } else { @@ -1603,12 +1603,12 @@ AFSQueryAuthGroup( IN AFSAuthGroupRequestCB *AuthGroup, uniSIDString.Buffer = AuthGroup->SIDString; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using passed SID %wZ for ProcessID %I64X\n", __FUNCTION__, &uniSIDString, - ullProcessID); + ullProcessID)); } ntStatus = RtlHashUnicodeString( &uniSIDString, @@ -1619,13 +1619,13 @@ AFSQueryAuthGroup( IN AFSAuthGroupRequestCB *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to hash SID %wZ for ProcessID %I64X Status %08lX\n", __FUNCTION__, &uniSIDString, ullProcessID, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1634,43 +1634,43 @@ AFSQueryAuthGroup( IN AFSAuthGroupRequestCB *AuthGroup, AuthGroup->SessionId == -1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s No SessionID specified, retrieving callers for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); ulSessionId = AFSGetSessionId( (HANDLE)ullProcessID, &bImpersonation); if( ulSessionId == (ULONG)-1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to retrieve callers Session ID for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Retrieved callers SessionID %08lX for ProcessID %I64X\n", __FUNCTION__, ulSessionId, - ullProcessID); + ullProcessID)); } else { ulSessionId = AuthGroup->SessionId; - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Using passed SessionID %08lX for ProcessID %I64X\n", __FUNCTION__, ulSessionId, - ullProcessID); + ullProcessID)); } ullTableHash = ( ((ULONGLONG)ulSessionId << 32) | ulSIDHash); @@ -1685,13 +1685,13 @@ AFSQueryAuthGroup( IN AFSAuthGroupRequestCB *AuthGroup, if( pSIDEntryCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate SID entry for SID %wZ SessionID %08lX ProcessID %I64X\n", __FUNCTION__, &uniSIDString, ulSessionId, - ullProcessID); + ullProcessID)); AFSReleaseResource( pDeviceExt->Specific.Control.AuthGroupTree.TreeLock); try_return( ntStatus = STATUS_NOT_FOUND); @@ -1708,12 +1708,12 @@ AFSQueryAuthGroup( IN AFSAuthGroupRequestCB *AuthGroup, RtlStringFromGUID( pSIDEntryCB->AuthGroup, &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Retrieved AuthGroup GUID %wZ for ProcessID %I64X\n", __FUNCTION__, &uniGUID, - ullProcessID); + ullProcessID)); if( uniGUID.Buffer != NULL) { diff --git a/src/WINNT/afsrdr/kernel/fs/AFSBTreeSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSBTreeSupport.cpp index 64b3baced..ddcfd9195 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSBTreeSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSBTreeSupport.cpp @@ -174,9 +174,9 @@ AFSInsertHashEntry( IN AFSBTreeEntry *TopNode, if( pCurrentEntry == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSInsertHashEntry Invalid root node\n"); + "AFSInsertHashEntry Invalid root node\n")); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -245,10 +245,10 @@ AFSInsertHashEntry( IN AFSBTreeEntry *TopNode, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInsertHashEntry Attempt to re-insert a CRC %I64X\n", - FileIDEntry->HashIndex); + FileIDEntry->HashIndex)); ASSERT( FALSE); diff --git a/src/WINNT/afsrdr/kernel/fs/AFSCleanup.cpp b/src/WINNT/afsrdr/kernel/fs/AFSCleanup.cpp index 8ead4b57d..19e89253f 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSCleanup.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSCleanup.cpp @@ -110,9 +110,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSCleanup\n"); + "EXCEPTION - AFSCleanup\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSClose.cpp b/src/WINNT/afsrdr/kernel/fs/AFSClose.cpp index 609adb76f..5d273a3e7 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSClose.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSClose.cpp @@ -79,9 +79,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSClose\n"); + "EXCEPTION - AFSClose\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSCommSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSCommSupport.cpp index b6ab8e6e3..c67cabe2e 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSCommSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSCommSupport.cpp @@ -108,11 +108,11 @@ AFSProcessRequest( IN ULONG RequestType, // Grab the pool resource and check the state // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessRequest Acquiring IrpPoolLock lock %p EXCL %08lX\n", &pCommSrvc->IrpPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->IrpPoolLock, TRUE); @@ -265,10 +265,10 @@ AFSProcessRequest( IN ULONG RequestType, if( AFSIsNoPAGAuthGroup( &pPoolEntry->AuthGroup)) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "AFSProcessRequest NoPAG Auth Group %08lX\n", - PsGetCurrentThread()); + PsGetCurrentThread())); } // @@ -468,6 +468,7 @@ AFSCheckIoctlPermissions( IN ULONG ControlCode) // case IOCTL_AFS_INITIALIZE_LIBRARY_DEVICE: + case IOCTL_AFS_CONFIG_LIBRARY_TRACE: // // Only the kernel can issue this @@ -986,20 +987,20 @@ AFSInitIrpPool() // locks. We also do this in the tear down of the pool // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitIrpPool Acquiring IrpPoolLock lock %p EXCL %08lX\n", &pCommSrvc->IrpPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->IrpPoolLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitIrpPool Acquiring ResultPoolLock lock %p EXCL %08lX\n", &pCommSrvc->ResultPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->ResultPoolLock, TRUE); @@ -1075,20 +1076,20 @@ AFSCleanupIrpPool() // Irp pool then the result pool lock // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupIrpPool Acquiring IrpPoolLock lock %p EXCL %08lX\n", &pCommSrvc->IrpPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->IrpPoolLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupIrpPool Acquiring ResultPoolLock lock %p EXCL %08lX\n", &pCommSrvc->ResultPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->ResultPoolLock, TRUE); @@ -1234,11 +1235,11 @@ AFSInsertRequest( IN AFSCommSrvcCB *CommSrvc, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertRequest Acquiring IrpPoolLock lock %p EXCL %08lX\n", &CommSrvc->IrpPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &CommSrvc->IrpPoolLock, TRUE); @@ -1309,11 +1310,11 @@ AFSProcessIrpRequest( IN PIRP Irp) pRequest = (AFSCommRequest *)Irp->AssociatedIrp.SystemBuffer; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessIrpRequest Acquiring IrpPoolLock lock %p EXCL %08lX\n", &pCommSrvc->IrpPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->IrpPoolLock, TRUE); @@ -1402,11 +1403,11 @@ AFSProcessIrpRequest( IN PIRP Irp) // Grab the lock on the request pool // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessIrpRequest Acquiring IrpPoolLock (WAIT) lock %p EXCL %08lX\n", &pCommSrvc->IrpPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->IrpPoolLock, TRUE); @@ -1622,11 +1623,11 @@ AFSProcessIrpRequest( IN PIRP Irp) pEntry->fLink = NULL; pEntry->bLink = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessIrpRequest Acquiring ResultPoolLock lock %p EXCL %08lX\n", &pCommSrvc->ResultPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->ResultPoolLock, TRUE); @@ -1702,11 +1703,11 @@ AFSProcessIrpResult( IN PIRP Irp) // Go look for our entry // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessIrpResult Acquiring ResultPoolLock lock %p EXCL %08lX\n", &pCommSrvc->ResultPoolLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCommSrvc->ResultPoolLock, TRUE); diff --git a/src/WINNT/afsrdr/kernel/fs/AFSCreate.cpp b/src/WINNT/afsrdr/kernel/fs/AFSCreate.cpp index aebbc704d..9eafa432e 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSCreate.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSCreate.cpp @@ -80,9 +80,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSCreate\n"); + "EXCEPTION - AFSCreate\n")); ntStatus = STATUS_ACCESS_DENIED; @@ -129,21 +129,21 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, RtlStringFromGUID( *pAuthGroup, &uniGUIDString); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s (%p) Located AuthGroup %wZ after validation\n", __FUNCTION__, Irp, - &uniGUIDString); + &uniGUIDString)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s (%p) Failed to locate AuthGroup\n", __FUNCTION__, - Irp); + Irp)); } // @@ -154,10 +154,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, pFileObject->FileName.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) Processing volume open request\n", - Irp); + Irp)); ntStatus = AFSOpenRedirector( Irp); @@ -200,14 +200,14 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, try_exit: if ( pFileObject) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s (%p) File \"%wZ\" AuthGroup '%wZ' ntStatus %08lX\n", __FUNCTION__, Irp, &pFileObject->FileName, &uniGUIDString, - ntStatus); + ntStatus)); } if( uniGUIDString.Buffer != NULL) diff --git a/src/WINNT/afsrdr/kernel/fs/AFSData.cpp b/src/WINNT/afsrdr/kernel/fs/AFSData.cpp index f1cc27aa8..73c418a3e 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSData.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSData.cpp @@ -122,4 +122,6 @@ GUID AFSNoPAGAuthGroup; PAFSSetInformationToken AFSSetInformationToken = NULL; +PAFSDbgLogMsg AFSDebugTraceFnc = NULL; + } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSDevControl.cpp b/src/WINNT/afsrdr/kernel/fs/AFSDevControl.cpp index 3c764d926..af38a7c7c 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSDevControl.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSDevControl.cpp @@ -81,9 +81,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSDevControl\n"); + "EXCEPTION - AFSDevControl\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSDirControl.cpp b/src/WINNT/afsrdr/kernel/fs/AFSDirControl.cpp index c47da01e5..362863b95 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSDirControl.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSDirControl.cpp @@ -108,9 +108,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSDirControl\n"); + "EXCEPTION - AFSDirControl\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSEa.cpp b/src/WINNT/afsrdr/kernel/fs/AFSEa.cpp index 4c5a37705..99a11856f 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSEa.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSEa.cpp @@ -106,9 +106,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueryEA\n"); + "EXCEPTION - AFSQueryEA\n")); AFSDumpTraceFilesFnc(); } @@ -184,9 +184,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetEA\n"); + "EXCEPTION - AFSSetEA\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSFSControl.cpp b/src/WINNT/afsrdr/kernel/fs/AFSFSControl.cpp index f00eec057..0745ba800 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSFSControl.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSFSControl.cpp @@ -99,9 +99,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSFSControl\n"); + "EXCEPTION - AFSFSControl\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp index 926da9da8..366a0090d 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSFastIoSupport.cpp @@ -262,11 +262,11 @@ AFSFastIoAcquireFile( IN struct _FILE_OBJECT *FileObject) AFSFcb *pFcb = (AFSFcb *)FileObject->FsContext; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFastIoAcquireFile Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -283,11 +283,11 @@ AFSFastIoReleaseFile( IN struct _FILE_OBJECT *FileObject) if( ExIsResourceAcquiredExclusiveLite( &pFcb->NPFcb->SectionObjectResource)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFastIoReleaseFile Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); } @@ -416,11 +416,11 @@ AFSFastIoAcquireForModWrite( IN struct _FILE_OBJECT *FileObject, BooleanFlagOn( FileObject->Flags, FO_SYNCHRONOUS_IO))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFastIoAcquireForModWrite Acquired Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); ntStatus = STATUS_SUCCESS; @@ -441,11 +441,11 @@ AFSFastIoReleaseForModWrite( IN struct _FILE_OBJECT *FileObject, NTSTATUS ntStatus = STATUS_SUCCESS; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFastIoReleaseForModWrite Releasing lock %p EXCL %08lX\n", ResourceToRelease, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( ResourceToRelease); @@ -461,11 +461,11 @@ AFSFastIoAcquireForCCFlush( IN struct _FILE_OBJECT *FileObject, NTSTATUS ntStatus = STATUS_FILE_LOCK_CONFLICT; AFSFcb *pFcb = (AFSFcb *)FileObject->FsContext; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFastIoAcquireForCCFlush Acquiring Fcb PagingIo lock %p SHARED %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->PagingResource, TRUE); @@ -473,11 +473,11 @@ AFSFastIoAcquireForCCFlush( IN struct _FILE_OBJECT *FileObject, if( !ExIsResourceAcquiredSharedLite( &pFcb->NPFcb->SectionObjectResource)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFastIoAcquireForCCFlush Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -485,11 +485,11 @@ AFSFastIoAcquireForCCFlush( IN struct _FILE_OBJECT *FileObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFastIoAcquireForCCFlush Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -533,9 +533,9 @@ AFSFastIoReleaseForCCFlush( IN struct _FILE_OBJECT *FileObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSFastIoReleaseForCCFlush Called for non-acquired paging resource Fcb\n"); + "AFSFastIoReleaseForCCFlush Called for non-acquired paging resource Fcb\n")); } if( ExIsResourceAcquiredExclusiveLite( &pFcb->NPFcb->SectionObjectResource) || @@ -547,9 +547,9 @@ AFSFastIoReleaseForCCFlush( IN struct _FILE_OBJECT *FileObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSFastIoReleaseForCCFlush Called for non-acquired SectionObject resource Fcb\n"); + "AFSFastIoReleaseForCCFlush Called for non-acquired SectionObject resource Fcb\n")); } return ntStatus; diff --git a/src/WINNT/afsrdr/kernel/fs/AFSFileInfo.cpp b/src/WINNT/afsrdr/kernel/fs/AFSFileInfo.cpp index bc8742660..888a4ebfe 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSFileInfo.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSFileInfo.cpp @@ -127,9 +127,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueryFileInfo\n"); + "EXCEPTION - AFSQueryFileInfo\n")); ntStatus = STATUS_UNSUCCESSFUL; @@ -229,9 +229,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetFileInfo\n"); + "EXCEPTION - AFSSetFileInfo\n")); ntStatus = STATUS_UNSUCCESSFUL; diff --git a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp index 543348096..4d42de3df 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp @@ -67,7 +67,7 @@ AFSExceptionFilter( IN CHAR *FunctionString, Context = ExceptPtrs->ContextRecord; - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "AFSExceptionFilter (Framework) - EXR %p CXR %p Function %s Code %08lX Address %p Routine %p\n", ExceptRec, @@ -75,7 +75,7 @@ AFSExceptionFilter( IN CHAR *FunctionString, FunctionString, ExceptRec->ExceptionCode, ExceptRec->ExceptionAddress, - (void *)AFSExceptionFilter); + (void *)AFSExceptionFilter)); DbgPrint("**** Exception Caught in AFS Redirector ****\n"); @@ -217,11 +217,11 @@ AFSReleaseResource( IN PERESOURCE Resource) if( Resource != &AFSDbgLogLock) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseResource Releasing lock %p Thread %08lX\n", Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); } ExReleaseResourceLite( Resource); @@ -235,11 +235,11 @@ void AFSConvertToShared( IN PERESOURCE Resource) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSConvertToShared Converting lock %p Thread %08lX\n", Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); ExConvertExclusiveToSharedLite( Resource); @@ -1150,11 +1150,11 @@ AFSSetSysNameInformation( IN AFSSysNameNotificationCB *SysNameInfo, // Process the request // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetSysNameInformation Acquiring SysName lock %p EXCL %08lX\n", pSysNameLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( pSysNameLock, TRUE); @@ -1335,10 +1335,10 @@ AFSSendDeviceIoControl( IN DEVICE_OBJECT *TargetDeviceObject, // Set the completion routine. // - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "Setting AFSIrpComplete as IoCompletion Routine Irp %p\n", - pIrp); + pIrp)); IoSetCompletionRoutine( pIrp, AFSIrpComplete, @@ -1465,13 +1465,13 @@ AFSExAllocatePoolWithTag( IN POOL_TYPE PoolType, if ( bTimeout || pControlDevExt == NULL) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "AFSExAllocatePoolWithTag failure Type %08lX Size %08lX Tag %08lX %08lX\n", PoolType, NumberOfBytes, Tag, - PsGetCurrentThread()); + PsGetCurrentThread())); switch ( Tag ) { @@ -1563,12 +1563,12 @@ AFSShutdownRedirector() __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Shutting down redirector Extent count %08lX Request count %08lX\n", __FUNCTION__, pControlDevExt->Specific.Control.ExtentCount, - pControlDevExt->Specific.Control.OutstandingServiceRequestCount); + pControlDevExt->Specific.Control.OutstandingServiceRequestCount)); // // Set the shutdown flag so the worker is more agressive in tearing down extents @@ -1591,10 +1591,10 @@ AFSShutdownRedirector() if( ntStatus == STATUS_TIMEOUT) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSShutdownRedirector Failed to complete all service requests Remaining count %08lX\n", - pControlDevExt->Specific.Control.OutstandingServiceRequestCount); + pControlDevExt->Specific.Control.OutstandingServiceRequestCount)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1616,10 +1616,10 @@ AFSShutdownRedirector() if( ntStatus == STATUS_TIMEOUT) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSShutdownRedirector Failed to purge all extents Remaining count %08lX\n", - pControlDevExt->Specific.Control.ExtentCount); + pControlDevExt->Specific.Control.ExtentCount)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1634,13 +1634,13 @@ AFSShutdownRedirector() try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Completed shut down of redirector Extent count %08lX Request count %08lX Status %08lX\n", __FUNCTION__, pControlDevExt->Specific.Control.ExtentCount, pControlDevExt->Specific.Control.OutstandingServiceRequestCount, - ntStatus); + ntStatus)); } return ntStatus; @@ -1663,48 +1663,48 @@ AFSAcquireFcbForLazyWrite( IN PVOID Fcb, // Try and acquire the Fcb resource // - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAcquireFcbForLazyWrite Acquiring Fcb %p\n", - Fcb); + Fcb)); // // Try and grab the paging // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAcquireFcbForLazyWrite Attempt to acquire Fcb PagingIo lock %p SHARED %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); if( AFSAcquireShared( &pFcb->NPFcb->PagingResource, Wait)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAcquireFcbForLazyWrite Acquired Fcb PagingIo lock %p SHARED %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); bReleasePaging = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAcquireFcbForLazyWrite Attempt to acquire Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); if( AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, Wait)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAcquireFcbForLazyWrite Acquired Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); bReleaseSectionObject = TRUE; @@ -1743,10 +1743,10 @@ AFSReleaseFcbFromLazyWrite( IN PVOID Fcb) AFSFcb *pFcb = (AFSFcb *)Fcb; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseFcbFromLazyWrite Releasing Fcb %p\n", - Fcb); + Fcb)); IoSetTopLevelIrp( NULL); @@ -1765,21 +1765,21 @@ AFSAcquireFcbForReadAhead( IN PVOID Fcb, BOOLEAN bStatus = FALSE; AFSFcb *pFcb = (AFSFcb *)Fcb; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAcquireFcbForReadAhead Attempt to acquire Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); if( AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, Wait)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAcquireFcbForReadAhead Acquired Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); bStatus = TRUE; @@ -1831,9 +1831,9 @@ AFSGetCallerSID( OUT UNICODE_STRING *SIDString, OUT BOOLEAN *pbImpersonation) if( hToken == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSGetCallerSID Failed to retrieve impersonation or primary token\n"); + "AFSGetCallerSID Failed to retrieve impersonation or primary token\n")); try_return( ntStatus); } @@ -1848,9 +1848,10 @@ AFSGetCallerSID( OUT UNICODE_STRING *SIDString, OUT BOOLEAN *pbImpersonation) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSGetCallerSID Failed to retrieve information Status %08lX\n", ntStatus); + "AFSGetCallerSID Failed to retrieve information Status %08lX\n", + ntStatus)); try_return( ntStatus); } @@ -1866,19 +1867,20 @@ AFSGetCallerSID( OUT UNICODE_STRING *SIDString, OUT BOOLEAN *pbImpersonation) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSGetCallerSID Failed to convert sid to string Status %08lX\n", ntStatus); + "AFSGetCallerSID Failed to convert sid to string Status %08lX\n", + ntStatus)); try_return( ntStatus); } *SIDString = uniSIDString; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSGetCallerSID Successfully retrieved SID %wZ\n", - SIDString); + SIDString)); if ( bPrimaryToken == FALSE && pbImpersonation) @@ -1938,9 +1940,9 @@ AFSGetSessionId( IN HANDLE ProcessId, OUT BOOLEAN *pbImpersonation) if( hToken == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSGetSessionId Failed to retrieve impersonation or primary token\n"); + "AFSGetSessionId Failed to retrieve impersonation or primary token\n")); try_return( ntStatus); } @@ -1956,18 +1958,18 @@ AFSGetSessionId( IN HANDLE ProcessId, OUT BOOLEAN *pbImpersonation) { ulSessionId = (ULONG)-1; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSGetSessionId Failed to retrieve session id Status %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSGetSessionId found %08lX\n", - ulSessionId); + ulSessionId)); if ( bPrimaryToken == FALSE && pbImpersonation) diff --git a/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp b/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp index 2281d801f..5d8774f37 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSInit.cpp @@ -541,9 +541,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSRedirFs DriverEntry\n"); + "EXCEPTION - AFSRedirFs DriverEntry\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSInternalDevControl.cpp b/src/WINNT/afsrdr/kernel/fs/AFSInternalDevControl.cpp index 371f66045..e1707c603 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSInternalDevControl.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSInternalDevControl.cpp @@ -59,9 +59,9 @@ AFSInternalDevControl( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSInternalDevControl\n"); + "EXCEPTION - AFSInternalDevControl\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp index 5de9bc925..6bde1b459 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSLibrarySupport.cpp @@ -59,10 +59,10 @@ AFSLoadLibrary( IN ULONG Flags, // other requests coming through // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Start load library\n", - __FUNCTION__); + __FUNCTION__)); ntStatus = KeWaitForSingleObject( &pDevExt->Specific.Control.LoadLibraryEvent, Executive, @@ -73,10 +73,10 @@ AFSLoadLibrary( IN ULONG Flags, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLoadLibrary Wait for LoadLibraryEvent failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -88,10 +88,10 @@ AFSLoadLibrary( IN ULONG Flags, if( BooleanFlagOn( pDevExt->Specific.Control.LibraryState, AFS_LIBRARY_LOADED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Library already loaded\n", - __FUNCTION__); + __FUNCTION__)); try_return( ntStatus = STATUS_DEVICE_NOT_READY); } @@ -103,9 +103,9 @@ AFSLoadLibrary( IN ULONG Flags, if( pDevExt->Specific.Control.LibraryServicePath.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSLoadLibrary AFS_GENERIC_MEMORY_25_TAG allocation error\n"); + "AFSLoadLibrary AFS_GENERIC_MEMORY_25_TAG allocation error\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -129,11 +129,11 @@ AFSLoadLibrary( IN ULONG Flags, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to load library Status %08lX\n", __FUNCTION__, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -152,10 +152,10 @@ AFSLoadLibrary( IN ULONG Flags, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLoadLibrary IoGetDeviceObjectPointer failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -186,10 +186,10 @@ AFSLoadLibrary( IN ULONG Flags, ClearFlag( pDevExt->Specific.Control.LibraryState, AFS_LIBRARY_QUEUE_CANCELLED); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Completed load library, processing queued requests\n", - __FUNCTION__); + __FUNCTION__)); AFSReleaseResource( &pDevExt->Specific.Control.LibraryStateLock); @@ -201,11 +201,11 @@ AFSLoadLibrary( IN ULONG Flags, try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Library load complete Status %08lX\n", __FUNCTION__, - ntStatus); + ntStatus)); if( !NT_SUCCESS( ntStatus)) { @@ -247,10 +247,10 @@ AFSUnloadLibrary( IN BOOLEAN CancelQueue) // other requests coming through // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Start unload library\n", - __FUNCTION__); + __FUNCTION__)); ntStatus = KeWaitForSingleObject( &pDevExt->Specific.Control.LoadLibraryEvent, Executive, @@ -313,11 +313,11 @@ AFSUnloadLibrary( IN BOOLEAN CancelQueue) ntStatus != STATUS_SUCCESS) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Failed request event Status %08lX\n", __FUNCTION__, - ntStatus); + ntStatus)); SetFlag( pDevExt->Specific.Control.LibraryState, AFS_LIBRARY_LOADED); @@ -328,19 +328,19 @@ AFSUnloadLibrary( IN BOOLEAN CancelQueue) try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Wait for inflight requests to complete %08lX\n", __FUNCTION__, - pDevExt->Specific.Control.InflightLibraryRequests); + pDevExt->Specific.Control.InflightLibraryRequests)); } AFSReleaseResource( &pDevExt->Specific.Control.LibraryStateLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Processing queued results\n", - __FUNCTION__); + __FUNCTION__)); AFSProcessQueuedResults( TRUE); @@ -369,11 +369,11 @@ AFSUnloadLibrary( IN BOOLEAN CancelQueue) try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Library unload complete Status %08lX\n", __FUNCTION__, - ntStatus); + ntStatus)); KeSetEvent( &pDevExt->Specific.Control.LoadLibraryEvent, 0, @@ -398,13 +398,13 @@ AFSCheckLibraryState( IN PIRP Irp) AFSAcquireShared( &pDevExt->Specific.Control.LibraryStateLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Entry State %08lX Irp %p Function %08lX\n", __FUNCTION__, pRDRDevExt->DeviceFlags, Irp, - pIrpSp->MajorFunction); + pIrpSp->MajorFunction)); if( BooleanFlagOn( pRDRDevExt->DeviceFlags, AFS_DEVICE_FLAG_REDIRECTOR_SHUTDOWN)) { @@ -418,31 +418,31 @@ AFSCheckLibraryState( IN PIRP Irp) if( Irp != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Queuing request %p\n", __FUNCTION__, - Irp); + Irp)); ntStatus = AFSQueueLibraryRequest( Irp); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Queued request %p Status %08lX\n", __FUNCTION__, Irp, - ntStatus); + ntStatus)); } else { ntStatus = STATUS_TOO_LATE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Failing request %p\n", __FUNCTION__, - Irp); + Irp)); } try_return( ntStatus); @@ -455,13 +455,13 @@ AFSCheckLibraryState( IN PIRP Irp) try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Completed Irp %p Status %08lX Inflight Count %08lX\n", __FUNCTION__, Irp, ntStatus, - pDevExt->Specific.Control.InflightLibraryRequests); + pDevExt->Specific.Control.InflightLibraryRequests)); AFSReleaseResource( &pDevExt->Specific.Control.LibraryStateLock); } @@ -478,11 +478,11 @@ AFSClearLibraryRequest() __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Inflight Count %08lX\n", __FUNCTION__, - pDevExt->Specific.Control.InflightLibraryRequests); + pDevExt->Specific.Control.InflightLibraryRequests)); if( InterlockedDecrement( &pDevExt->Specific.Control.InflightLibraryRequests) == 0) { @@ -513,12 +513,12 @@ AFSQueueLibraryRequest( IN PIRP Irp) AFSAcquireExcl( &pDevExt->Specific.Control.LibraryQueueLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for Irp %p Function %08lX\n", __FUNCTION__, Irp, - pIrpSp->MajorFunction); + pIrpSp->MajorFunction)); // // Has the load processing timed out and we are no longer @@ -529,11 +529,11 @@ AFSQueueLibraryRequest( IN PIRP Irp) BooleanFlagOn( pRDRDevExt->DeviceFlags, AFS_DEVICE_FLAG_REDIRECTOR_SHUTDOWN)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_ERROR, "%s Library not loaded for Irp %p\n", __FUNCTION__, - Irp); + Irp)); try_return( ntStatus = STATUS_DEVICE_NOT_READY); } @@ -569,12 +569,12 @@ AFSQueueLibraryRequest( IN PIRP Irp) try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Completed for Irp %p Status %08lX\n", __FUNCTION__, Irp, - ntStatus); + ntStatus)); AFSReleaseResource( &pDevExt->Specific.Control.LibraryQueueLock); } @@ -593,10 +593,10 @@ AFSProcessQueuedResults( IN BOOLEAN CancelRequest) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Entry\n", - __FUNCTION__); + __FUNCTION__)); // // Loop through the queue either resubmitting requests or cancelling them @@ -633,11 +633,11 @@ AFSProcessQueuedResults( IN BOOLEAN CancelRequest) pRequest->Irp->IoStatus.Status = STATUS_CANCELLED; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Cancelling request Irp %p\n", __FUNCTION__, - pRequest->Irp); + pRequest->Irp)); IoCompleteRequest( pRequest->Irp, IO_NO_INCREMENT); @@ -645,11 +645,11 @@ AFSProcessQueuedResults( IN BOOLEAN CancelRequest) else { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Resubmitting request Irp %p\n", __FUNCTION__, - pRequest->Irp); + pRequest->Irp)); AFSSubmitLibraryRequest( pRequest->Irp); } @@ -657,10 +657,10 @@ AFSProcessQueuedResults( IN BOOLEAN CancelRequest) ExFreePool( pRequest); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Completed\n", - __FUNCTION__); + __FUNCTION__)); } return ntStatus; @@ -676,12 +676,12 @@ AFSSubmitLibraryRequest( IN PIRP Irp) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY, AFS_TRACE_LEVEL_VERBOSE, "%s Submitting Irp %p Function %08lX\n", __FUNCTION__, Irp, - pIrpSp->MajorFunction); + pIrpSp->MajorFunction)); switch( pIrpSp->MajorFunction) { @@ -916,10 +916,57 @@ AFSInitializeLibrary( IN AFSFileID *GlobalRootFid, if ( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeLibrary AFSSendDeviceIoControl failure %08lX\n", - ntStatus); + ntStatus)); + } + } + + return ntStatus; +} + +NTSTATUS +AFSConfigLibraryDebug() +{ + + NTSTATUS ntStatus = STATUS_SUCCESS; + AFSDebugTraceConfigCB stConfigLib; + AFSDeviceExt *pDevExt; + + __Enter + { + + if ( AFSDeviceObject != NULL && + AFSDeviceObject->DeviceExtension != NULL) + { + + pDevExt = (AFSDeviceExt *)AFSDeviceObject->DeviceExtension; + + if ( pDevExt->Specific.Control.LibraryDeviceObject != NULL) + { + RtlZeroMemory( &stConfigLib, + sizeof( AFSDebugTraceConfigCB)); + + stConfigLib.AFSDbgLogMsg = AFSDebugTraceFnc; + + ntStatus = AFSSendDeviceIoControl( pDevExt->Specific.Control.LibraryDeviceObject, + IOCTL_AFS_CONFIG_LIBRARY_TRACE, + &stConfigLib, + sizeof( AFSDebugTraceConfigCB), + NULL, + 0, + NULL); + + if ( !NT_SUCCESS( ntStatus)) + { + + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, + AFS_TRACE_LEVEL_ERROR, + "AFSInitializeLibrary AFSSendDeviceIoControl failure %08lX\n", + ntStatus)); + } + } } } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSLockControl.cpp b/src/WINNT/afsrdr/kernel/fs/AFSLockControl.cpp index 3de4fae28..8fdea4d24 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSLockControl.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSLockControl.cpp @@ -96,9 +96,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, (ntStatus = GetExceptionCode()), GetExceptionInformation())) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSLockControl\n"); + "EXCEPTION - AFSLockControl\n")); AFSDumpTraceFilesFnc(); diff --git a/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp index 549b57f65..69517f5a2 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSLogSupport.cpp @@ -207,6 +207,10 @@ AFSInitializeDbgLog() AFSDbgLogRemainingLength = AFSDbgBufferLength; ntStatus = STATUS_SUCCESS; + + InterlockedCompareExchangePointer( (PVOID *)&AFSDebugTraceFnc, + (void *)AFSDbgLogMsg, + NULL); } } @@ -387,12 +391,24 @@ AFSConfigureTrace( IN AFSTraceConfigCB *TraceInfo) try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } + InterlockedCompareExchangePointer( (PVOID *)&AFSDebugTraceFnc, + (void *)AFSDbgLogMsg, + NULL); + AFSDbgCurrentBuffer = AFSDbgBuffer; AFSDbgLogRemainingLength = AFSDbgBufferLength; AFSTagInitialLogEntry(); } + else + { + InterlockedCompareExchangePointer( (PVOID *)&AFSDebugTraceFnc, + NULL, + (void *)AFSDbgLogMsg); + } + + AFSConfigLibraryDebug(); } try_exit: @@ -484,7 +500,7 @@ AFSTagInitialLogEntry() RtlTimeToTimeFields( &liLocalTime, &timeFields); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "AFS Log Initialized %d-%d-%d %d:%d Level %d Subsystems %08lX\n", timeFields.Month, @@ -493,7 +509,7 @@ AFSTagInitialLogEntry() timeFields.Hour, timeFields.Minute, AFSTraceLevel, - AFSTraceComponent); + AFSTraceComponent)); return; } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSNetworkProviderSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSNetworkProviderSupport.cpp index ad654df1f..623b432ca 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSNetworkProviderSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSNetworkProviderSupport.cpp @@ -52,22 +52,22 @@ AFSAddConnectionEx( IN UNICODE_STRING *RemoteName, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnectionEx Acquiring AFSProviderListLock lock %p EXCL %08lX\n", &pRDRDevExt->Specific.RDR.ProviderListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pRDRDevExt->Specific.RDR.ProviderListLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnectionEx remote name %wZ display type %08lX flags %08lX\n", RemoteName, DisplayType, - Flags); + Flags)); // // If this is a server, start in the enum list, otherwise @@ -134,9 +134,10 @@ AFSAddConnectionEx( IN UNICODE_STRING *RemoteName, uniRemoteName.Length -= sizeof( WCHAR); } - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSAddConnectionEx Inserting remote name %wZ\n", &uniRemoteName); + "AFSAddConnectionEx Inserting remote name %wZ\n", + &uniRemoteName)); // // Allocate a new node and add it to our list diff --git a/src/WINNT/afsrdr/kernel/fs/AFSProcessSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSProcessSupport.cpp index 9ff88e571..3ff9bcf99 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSProcessSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSProcessSupport.cpp @@ -103,21 +103,21 @@ AFSProcessCreate( IN HANDLE ParentId, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Acquiring Control ProcessTree.TreeLock lock %p EXCL %08lX\n", pDeviceExt->Specific.Control.ProcessTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_PROCESS_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PROCESS_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Parent %08lX Process %08lX %08lX\n", ParentId, ProcessId, - PsGetCurrentThread()); + PsGetCurrentThread())); pProcessCB = AFSInitializeProcessCB( (ULONGLONG)ParentId, (ULONGLONG)ProcessId); @@ -139,12 +139,12 @@ AFSProcessCreate( IN HANDLE ParentId, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_PROCESS_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PROCESS_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate Initialization failure for Parent %08lX Process %08lX %08lX\n", ParentId, ProcessId, - PsGetCurrentThread()); + PsGetCurrentThread())); } AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); @@ -166,11 +166,11 @@ AFSProcessDestroy( IN HANDLE ProcessId) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessDestroy Acquiring Control ProcessTree.TreeLock lock %p EXCL %08lX\n", pDeviceExt->Specific.Control.ProcessTree.TreeLock, - PsGetCurrentThreadId()); + PsGetCurrentThreadId())); AFSAcquireExcl( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); @@ -178,11 +178,11 @@ AFSProcessDestroy( IN HANDLE ProcessId) // It's a remove so pull the entry // - AFSDbgLogMsg( AFS_SUBSYSTEM_PROCESS_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PROCESS_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessDestroy Process %08lX %08lX\n", ProcessId, - PsGetCurrentThread()); + PsGetCurrentThread())); ntStatus = AFSLocateHashEntry( pDeviceExt->Specific.Control.ProcessTree.TreeHead, (ULONGLONG)ProcessId, @@ -225,12 +225,12 @@ AFSProcessDestroy( IN HANDLE ProcessId) } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_PROCESS_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PROCESS_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSProcessDestroy Process %08lX not found in ProcessTree Status %08lX %08lX\n", ProcessId, ntStatus, - PsGetCurrentThread()); + PsGetCurrentThread())); } AFSReleaseResource( pDeviceExt->Specific.Control.ProcessTree.TreeLock); @@ -274,21 +274,21 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, if ( !bProcessTreeLocked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateProcessEntry Acquiring Control ProcessTree.TreeLock lock %p SHARED %08lX\n", pDeviceExt->Specific.Control.ProcessTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Entry for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); ntStatus = AFSLocateHashEntry( pDeviceExt->Specific.Control.ProcessTree.TreeHead, ullProcessID, @@ -325,11 +325,11 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, pProcessCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate process entry for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -348,11 +348,11 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, if( pProcessCB->ParentProcessId != 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Locating process entry for Parent ProcessID %I64X\n", __FUNCTION__, - pProcessCB->ParentProcessId); + pProcessCB->ParentProcessId)); ntStatus = AFSLocateHashEntry( pDeviceExt->Specific.Control.ProcessTree.TreeHead, (ULONGLONG)pProcessCB->ParentProcessId, @@ -364,21 +364,21 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, AFSAcquireExcl( &pParentProcessCB->Lock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Located process entry for Parent ProcessID %I64X\n", __FUNCTION__, - pProcessCB->ParentProcessId); + pProcessCB->ParentProcessId)); } } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s No parent ID for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); } AFSAcquireExcl( &pProcessCB->Lock, @@ -411,11 +411,11 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to locate callers SID for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); try_return( ntStatus); } @@ -425,22 +425,22 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, if( ulSessionId == (ULONG)-1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to retrieve session ID for ProcessID %I64X\n", __FUNCTION__, - ullProcessID); + ullProcessID)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Retrieved callers SID %wZ for ProcessID %I64X Session %08lX\n", __FUNCTION__, &uniSIDString, ullProcessID, - ulSessionId); + ulSessionId)); // // If there is an Auth Group for the current process, @@ -460,14 +460,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, RtlStringFromGUID( *pAuthGroup, &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Located valid AuthGroup GUID %wZ for SID %wZ ProcessID %I64X Session %08lX\n", __FUNCTION__, &uniGUID, &uniSIDString, ullProcessID, - ulSessionId); + ulSessionId)); if( uniGUID.Buffer != NULL) { @@ -512,14 +512,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, RtlStringFromGUID( *(pProcessCB->ActiveAuthGroup), &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s PID %I64X Session %08lX inherited Active AuthGroup %wZ from thread %I64X\n", __FUNCTION__, ullProcessID, ulSessionId, &uniGUID, - pParentThreadCB->ThreadId); + pParentThreadCB->ThreadId)); if( uniGUID.Buffer != NULL) { @@ -541,14 +541,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, RtlStringFromGUID( *(pProcessCB->ActiveAuthGroup), &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s PID %I64X Session %08lX inherited Active AuthGroup %wZ from parent PID %I64X\n", __FUNCTION__, ullProcessID, ulSessionId, &uniGUID, - pParentProcessCB->TreeEntry.HashIndex); + pParentProcessCB->TreeEntry.HashIndex)); if( uniGUID.Buffer != NULL) { @@ -570,14 +570,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, RtlStringFromGUID( *(pProcessCB->ActiveAuthGroup), &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Returning(1) Active AuthGroup %wZ for SID %wZ PID %I64X Session %08lX\n", __FUNCTION__, &uniGUID, &uniSIDString, ullProcessID, - ulSessionId); + ulSessionId)); if( uniGUID.Buffer != NULL) { @@ -601,14 +601,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to hash SID %wZ for PID %I64X Session %08lX Status %08lX\n", __FUNCTION__, &uniSIDString, ullProcessID, ulSessionId, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -663,14 +663,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, RtlStringFromGUID( pSIDEntryCB->AuthGroup, &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s SID %wZ PID %I64X Session %08lX generated NEW AG %wZ\n", __FUNCTION__, &uniSIDString, ullProcessID, ulSessionId, - &uniGUID); + &uniGUID)); if( uniGUID.Buffer != NULL) { @@ -705,14 +705,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, RtlStringFromGUID( pSIDEntryCB->AuthGroup, &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s SID %wZ PID %I64X Session %08lX assigned AG %wZ\n", __FUNCTION__, &uniSIDString, ullProcessID, ulSessionId, - &uniGUID); + &uniGUID)); if( uniGUID.Buffer != NULL) { @@ -728,12 +728,12 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, { SetFlag( pProcessCB->Flags, AFS_PROCESS_LOCAL_SYSTEM_AUTH); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Setting PID %I64X Session %08lX with LOCAL SYSTEM AUTHORITY\n", __FUNCTION__, ullProcessID, - ulSessionId); + ulSessionId)); } // @@ -747,14 +747,14 @@ AFSValidateProcessEntry( IN HANDLE ProcessId, RtlStringFromGUID( *(pProcessCB->ActiveAuthGroup), &uniGUID); - AFSDbgLogMsg( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_AUTHGROUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Returning(2) Active AuthGroup %wZ for SID %wZ PID %I64X Session %08lX\n", __FUNCTION__, &uniGUID, &uniSIDString, ullProcessID, - ulSessionId); + ulSessionId)); if( uniGUID.Buffer != NULL) { @@ -817,11 +817,11 @@ AFSIs64BitProcess( IN ULONGLONG ProcessId) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSIs64BitProcess Acquiring Control ProcessTree.TreeLock lock %p SHARED %08lX\n", pDeviceExt->Specific.Control.ProcessTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( pDeviceExt->Specific.Control.ProcessTree.TreeLock, TRUE); diff --git a/src/WINNT/afsrdr/kernel/fs/AFSQuota.cpp b/src/WINNT/afsrdr/kernel/fs/AFSQuota.cpp index 50c33337f..1414a1421 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSQuota.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSQuota.cpp @@ -52,10 +52,10 @@ AFSQueryQuota( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryQuota Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -64,9 +64,9 @@ AFSQueryQuota( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueryQuota\n"); + "EXCEPTION - AFSQueryQuota\n")); AFSDumpTraceFilesFnc(); } @@ -88,10 +88,10 @@ AFSSetQuota( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetQuota Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -99,9 +99,9 @@ AFSSetQuota( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetQuota\n"); + "EXCEPTION - AFSSetQuota\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSRDRSupport.cpp b/src/WINNT/afsrdr/kernel/fs/AFSRDRSupport.cpp index 05372eb8c..8a6ef4211 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSRDRSupport.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSRDRSupport.cpp @@ -71,10 +71,10 @@ AFSInitRDRDevice() if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitRDRDevice IoCreateDevice failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -117,10 +117,10 @@ AFSInitRDRDevice() if ( !NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitRDRDevice AFSInitRdrFcb failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -151,10 +151,10 @@ AFSInitRDRDevice() 0); if ( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitRDRDevice FsRtlRegisterUncProvider failure %08lX\n", - ntStatus); + ntStatus)); } } else @@ -171,10 +171,10 @@ AFSInitRDRDevice() } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitRDRDevice FsRtlRegisterUncProvider failure %08lX\n", - ntStatus); + ntStatus)); } } @@ -372,10 +372,10 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeRedirector AFSLoadLibrary failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -404,9 +404,9 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) if( AFSDumpFileLocation.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeRedirector AFS_GENERIC_MEMORY_23_TAG allocation error\n"); + "AFSInitializeRedirector AFS_GENERIC_MEMORY_23_TAG allocation error\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -584,10 +584,10 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) RedirInitInfo->CacheFileNameLength == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeRedirector Unable to initialize cache file %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -598,9 +598,9 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) if( RedirInitInfo->CacheFileNameLength == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeRedirector CacheMdl == NULL\n"); + "AFSInitializeRedirector CacheMdl == NULL\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -619,9 +619,9 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) if( pDevExt->Specific.RDR.CacheFile.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeRedirector AFS_GENERIC_MEMORY_24_TAG allocation failure\n"); + "AFSInitializeRedirector AFS_GENERIC_MEMORY_24_TAG allocation failure\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -654,10 +654,10 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeRedirector ZwOpenFile failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -676,10 +676,10 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeRedirector ObReferenceObjectByHandle failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -699,10 +699,10 @@ AFSInitializeRedirector( IN AFSRedirectorInitInfo *RedirInitInfo) if ( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeRedirector AFSInitializeLibrary failure %08lX\n", - ntStatus); + ntStatus)); } try_exit: @@ -885,9 +885,9 @@ AFSInitRdrFcb( OUT AFSFcb **RdrFcb) if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitRdrFcb Failed to allocate the root fcb\n"); + "AFSInitRdrFcb Failed to allocate the root fcb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -905,9 +905,9 @@ AFSInitRdrFcb( OUT AFSFcb **RdrFcb) if( pNPFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitRdrFcb Failed to allocate the non-paged fcb\n"); + "AFSInitRdrFcb Failed to allocate the non-paged fcb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -929,11 +929,11 @@ AFSInitRdrFcb( OUT AFSFcb **RdrFcb) ExInitializeResourceLite( &pNPFcb->Resource); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitRootFcb Acquiring Fcb lock %p EXCL %08lX\n", &pNPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); ExInitializeResourceLite( &pNPFcb->PagingResource); diff --git a/src/WINNT/afsrdr/kernel/fs/AFSSecurity.cpp b/src/WINNT/afsrdr/kernel/fs/AFSSecurity.cpp index 2c477fb7b..b946348eb 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSSecurity.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSSecurity.cpp @@ -53,10 +53,10 @@ AFSSetSecurity( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetSecurity Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); if( DeviceObject == AFSDeviceObject) { @@ -123,9 +123,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetSecurity\n"); + "EXCEPTION - AFSSetSecurity\n")); AFSDumpTraceFilesFnc(); } @@ -148,10 +148,10 @@ AFSQuerySecurity( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQuerySecurity Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); if( DeviceObject == AFSDeviceObject) { @@ -218,9 +218,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQuerySecurity\n"); + "EXCEPTION - AFSQuerySecurity\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSShutdown.cpp b/src/WINNT/afsrdr/kernel/fs/AFSShutdown.cpp index 073aed18a..e5940cc0a 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSShutdown.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSShutdown.cpp @@ -82,9 +82,9 @@ AFSShutdown( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSShutdown\n"); + "EXCEPTION - AFSShutdown\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSSystemControl.cpp b/src/WINNT/afsrdr/kernel/fs/AFSSystemControl.cpp index 83627f6af..740a6068d 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSSystemControl.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSSystemControl.cpp @@ -52,10 +52,10 @@ AFSSystemControl( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSSystemControl Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -64,9 +64,9 @@ AFSSystemControl( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSystemControl\n"); + "EXCEPTION - AFSSystemControl\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSVolumeInfo.cpp b/src/WINNT/afsrdr/kernel/fs/AFSVolumeInfo.cpp index 49646ca06..07ac857b8 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSVolumeInfo.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSVolumeInfo.cpp @@ -99,9 +99,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueryVolumeInfo\n"); + "EXCEPTION - AFSQueryVolumeInfo\n")); AFSDumpTraceFilesFnc(); } @@ -123,9 +123,10 @@ AFSSetVolumeInfo( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSSetVolumeInfo Entry for FO %p\n", pIrpSp->FileObject); + "AFSSetVolumeInfo Entry for FO %p\n", + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -134,9 +135,9 @@ AFSSetVolumeInfo( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetVolumeInfo\n"); + "EXCEPTION - AFSSetVolumeInfo\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/fs/AFSWrite.cpp b/src/WINNT/afsrdr/kernel/fs/AFSWrite.cpp index 1ada0128f..aa0ca1c8c 100644 --- a/src/WINNT/afsrdr/kernel/fs/AFSWrite.cpp +++ b/src/WINNT/afsrdr/kernel/fs/AFSWrite.cpp @@ -130,10 +130,10 @@ AFSWrite( IN PDEVICE_OBJECT DeviceObject, IoCopyCurrentIrpStackLocationToNext( Irp); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "Setting AFSWriteComplete as IoCompletion Routine Irp %p\n", - Irp); + Irp)); IoSetCompletionRoutine( Irp, AFSWriteComplete, NULL, TRUE, TRUE, TRUE); @@ -188,11 +188,11 @@ AFSWriteComplete( IN PDEVICE_OBJECT DeviceObject, IoMarkIrpPending(Irp); } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSWriteComplete Irp %p%s\n", Irp, - bPending ? " PENDING" : ""); + bPending ? " PENDING" : "")); return STATUS_CONTINUE_COMPLETION; } diff --git a/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h b/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h index ca79a13e3..432fd2cad 100644 --- a/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h +++ b/src/WINNT/afsrdr/kernel/fs/Include/AFSCommon.h @@ -743,6 +743,9 @@ NTSTATUS AFSInitializeLibrary( IN AFSFileID *GlobalRootFid, IN BOOLEAN QueueRootEnumeration); +NTSTATUS +AFSConfigLibraryDebug( void); + // // AFSRDRSupport.cpp Prototypes // diff --git a/src/WINNT/afsrdr/kernel/fs/Include/AFSExtern.h b/src/WINNT/afsrdr/kernel/fs/Include/AFSExtern.h index 524c851f2..67edae8c5 100644 --- a/src/WINNT/afsrdr/kernel/fs/Include/AFSExtern.h +++ b/src/WINNT/afsrdr/kernel/fs/Include/AFSExtern.h @@ -105,6 +105,8 @@ extern void *AFSDumpBuffer; extern ULONG AFSDumpBufferLength; +extern PAFSDbgLogMsg AFSDebugTraceFnc; + } #endif /* _AFS_EXTERN_H */ diff --git a/src/WINNT/afsrdr/kernel/lib/AFSBTreeSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSBTreeSupport.cpp index 45afde09d..03689f46e 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSBTreeSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSBTreeSupport.cpp @@ -294,9 +294,9 @@ AFSInsertCaseSensitiveDirEntry( IN AFSDirectoryCB *RootNode, if( pCurrentEntry == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSInsertCaseSensitiveDirEntry Invalid root node\n"); + "AFSInsertCaseSensitiveDirEntry Invalid root node\n")); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -365,11 +365,11 @@ AFSInsertCaseSensitiveDirEntry( IN AFSDirectoryCB *RootNode, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertCaseSensitiveDirEntry Collision with DE %p for %wZ\n", pCurrentEntry, - &pCurrentEntry->NameInformation.FileName); + &pCurrentEntry->NameInformation.FileName)); ntStatus = STATUS_UNSUCCESSFUL; @@ -405,9 +405,9 @@ AFSInsertCaseInsensitiveDirEntry( IN AFSDirectoryCB *RootNode, if( pCurrentEntry == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSInsertCaseInsensitiveDirEntry Invalid root node\n"); + "AFSInsertCaseInsensitiveDirEntry Invalid root node\n")); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1009,9 +1009,9 @@ AFSInsertShortNameDirEntry( IN AFSDirectoryCB *RootNode, if( pCurrentEntry == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSInsertShortNameDirEntry Invalid root node\n"); + "AFSInsertShortNameDirEntry Invalid root node\n")); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1082,12 +1082,12 @@ AFSInsertShortNameDirEntry( IN AFSDirectoryCB *RootNode, ntStatus = STATUS_UNSUCCESSFUL; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertShortNameDirEntry Collision with DE %p for shortname %S and %wZ\n", pCurrentEntry, pCurrentEntry->NameInformation.ShortName, - &pCurrentEntry->NameInformation.FileName); + &pCurrentEntry->NameInformation.FileName)); break; } @@ -1384,9 +1384,9 @@ AFSInsertHashEntry( IN AFSBTreeEntry *TopNode, if( pCurrentEntry == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSInsertHashEntry Invalid root node\n"); + "AFSInsertHashEntry Invalid root node\n")); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1455,10 +1455,10 @@ AFSInsertHashEntry( IN AFSBTreeEntry *TopNode, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInsertHashEntry Attempt to re-insert a CRC %I64X\n", - FileIDEntry->HashIndex); + FileIDEntry->HashIndex)); ntStatus = STATUS_UNSUCCESSFUL; diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp index df613cad0..6f2bcf169 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSCleanup.cpp @@ -152,11 +152,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, case AFS_ROOT_ALL: { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Acquiring GlobalRoot lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -169,11 +169,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (RootAll) Decrement handle count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); AFSReleaseResource( &pFcb->NPFcb->Resource); @@ -183,11 +183,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, case AFS_IOCTL_FCB: { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Acquiring PIOCtl lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -204,22 +204,22 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (IOCtl) Decrement child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); } AFSReleaseResource( &pFcb->NPFcb->Resource); lCount = InterlockedDecrement( &pFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (IOCtl) Decrement handle count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); break; } @@ -235,11 +235,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, // We may be performing some cleanup on the Fcb so grab it exclusive to ensure no collisions // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -263,7 +263,7 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, if( !NT_SUCCESS( stIoSB.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCleanup CcFlushCache failure %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", &pCcb->FullFileName, @@ -272,7 +272,7 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, stIoSB.Status, - stIoSB.Information); + stIoSB.Information)); ntStatus = stIoSB.Status; } @@ -288,13 +288,13 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCleanup CcPurgeCacheSection failure FID %08lX-%08lX-%08lX-%08lX\n", pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); SetFlag( pObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -309,14 +309,14 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSCleanup Cc FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); SetFlag( pObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -326,30 +326,30 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, // Uninitialize the cache map. This call is unconditional. // - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Tearing down cache map for Fcb %p FileObject %p\n", pFcb, - pFileObject); + pFileObject)); CcUninitializeCacheMap( pFileObject, NULL, NULL); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Acquiring Fcb lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -469,11 +469,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, ntStatus != STATUS_OBJECT_NAME_NOT_FOUND) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCleanup Failed to notify service of deleted file %wZ Status %08lX\n", &pCcb->FullFileName, - ntStatus); + ntStatus)); ntStatus = STATUS_SUCCESS; @@ -491,11 +491,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, // Stop anything possibly in process // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Acquiring Fcb extents lock %p EXCL %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -512,20 +512,20 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, AFSDeleteFcbExtents( pFcb); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Releasing Fcb extents lock %p EXCL %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Setting DELETE flag in file %wZ Dir Entry %p\n", &pCcb->FullFileName, - pCcb->DirectoryCB); + pCcb->DirectoryCB)); SetFlag( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_DELETED); @@ -560,11 +560,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, if( !BooleanFlagOn( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup DE %p for %wZ removing entry\n", pCcb->DirectoryCB, - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); AFSRemoveNameEntry( pParentObjectInfo, pCcb->DirectoryCB); @@ -572,11 +572,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup DE %p for %wZ NOT removing entry due to flag set\n", pCcb->DirectoryCB, - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); } AFSReleaseResource( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -591,11 +591,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, if( !BooleanFlagOn( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup DE %p for %wZ NOT removing entry due to pParentObjectInfo == NULL\n", pCcb->DirectoryCB, - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); } } } @@ -745,21 +745,21 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (File) Decrement child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); } lCount = InterlockedDecrement( &pFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (File) Decrement handle count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); if( BooleanFlagOn( pFcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE)) { @@ -770,11 +770,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Setting Purge on Close Increment count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); ClearFlag( pFcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); @@ -817,11 +817,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, // We may be performing some cleanup on the Fcb so grab it exclusive to ensure no collisions // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Acquiring Dcb lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -912,11 +912,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, ntStatus != STATUS_OBJECT_NAME_NOT_FOUND) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCleanup Failed to notify service of deleted directory %wZ Status %08lX\n", &pCcb->FullFileName, - ntStatus); + ntStatus)); ntStatus = STATUS_SUCCESS; @@ -927,11 +927,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, ntStatus = STATUS_SUCCESS; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Setting DELETE flag in directory %wZ Dir Entry %p\n", &pCcb->FullFileName, - pCcb->DirectoryCB); + pCcb->DirectoryCB)); SetFlag( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_DELETED); @@ -972,11 +972,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup DE %p for %wZ NOT removing entry due to flag set\n", pCcb->DirectoryCB, - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); } AFSReleaseResource( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -991,11 +991,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, if( !BooleanFlagOn( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup DE %p for %wZ NOT removing entry due to pParentObjectInfo == NULL\n", pCcb->DirectoryCB, - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); } } } @@ -1105,20 +1105,20 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (Dir) Decrement child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); } lCount = InterlockedDecrement( &pFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (Dir) Decrement handle count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); AFSReleaseResource( &pFcb->NPFcb->Resource); @@ -1135,11 +1135,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, // We may be performing some cleanup on the Fcb so grab it exclusive to ensure no collisions // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (MP/SL) Acquiring Dcb lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -1230,11 +1230,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, ntStatus != STATUS_OBJECT_NAME_NOT_FOUND) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCleanup Failed to notify service of deleted MP/SL %wZ Status %08lX\n", &pCcb->FullFileName, - ntStatus); + ntStatus)); ntStatus = STATUS_SUCCESS; @@ -1245,11 +1245,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, ntStatus = STATUS_SUCCESS; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Setting DELETE flag in MP/SL %wZ Dir Entry %p\n", &pCcb->FullFileName, - pCcb->DirectoryCB); + pCcb->DirectoryCB)); SetFlag( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_DELETED); @@ -1289,11 +1289,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup DE %p for %wZ NOT removing entry due to flag set\n", pCcb->DirectoryCB, - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); } AFSReleaseResource( pParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -1309,11 +1309,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, if( !BooleanFlagOn( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup DE %p for %wZ NOT removing entry due to pParentObjectInfo == NULL\n", pCcb->DirectoryCB, - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); } } } @@ -1415,20 +1415,20 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (MP/SL) Decrement child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); } lCount = InterlockedDecrement( &pFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (MP/SL) Decrement handle count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); AFSReleaseResource( &pFcb->NPFcb->Resource); @@ -1438,11 +1438,11 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, case AFS_SPECIAL_SHARE_FCB: { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup Acquiring SPECIAL SHARE lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -1459,20 +1459,20 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (Share) Decrement child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); } lCount = InterlockedDecrement( &pFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanup (Share) Decrement handle count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); AFSReleaseResource( &pFcb->NPFcb->Resource); @@ -1481,10 +1481,10 @@ AFSCleanup( IN PDEVICE_OBJECT LibDeviceObject, default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCleanup Processing unknown node type %d\n", - pFcb->Header.NodeTypeCode); + pFcb->Header.NodeTypeCode)); break; } @@ -1523,9 +1523,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSCleanup\n"); + "EXCEPTION - AFSCleanup\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSClose.cpp b/src/WINNT/afsrdr/kernel/lib/AFSClose.cpp index e18459cef..1dd061ffc 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSClose.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSClose.cpp @@ -104,11 +104,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, AFSPIOCtlOpenCloseRequestCB stPIOCtlClose; AFSFileID stParentFileId; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Acquiring GlobalRoot lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -171,22 +171,22 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose (IOCtl) Decrement child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); + pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount)); } AFSReleaseResource( &pFcb->NPFcb->Resource); lCount = InterlockedDecrement( &pFcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose (IOCtl) Decrement count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -196,11 +196,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, case AFS_ROOT_ALL: { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Acquiring Special Root ALL lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -218,11 +218,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pFcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose (RootAll) Decrement count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -248,11 +248,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, // We may be performing some cleanup on the Fcb so grab it exclusive to ensure no collisions // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Acquiring Dcb lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -352,11 +352,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, // Stop anything possibly in process // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Acquiring Fcb extents lock %p EXCL %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -367,11 +367,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, 0, FALSE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Releasing Fcb extents lock %p EXCL %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource); } @@ -388,13 +388,13 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pDirCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose (Other) Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pDirCB->NameInformation.FileName, pDirCB, pCcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -402,7 +402,7 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, pDirCB->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Deleting dir entry %p (%p) for %wZ FID %08lX-%08lX-%08lX-%08lX\n", pDirCB, @@ -411,7 +411,7 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); // // Remove and delete the directory entry from the parent list @@ -429,10 +429,10 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, if( BooleanFlagOn( pObjectInfo->Flags, AFS_OBJECT_INSERTED_HASH_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Removing object %p from volume tree\n", - pObjectInfo); + pObjectInfo)); AFSRemoveHashEntry( &pObjectInfo->VolumeCB->ObjectInfoTree.TreeHead, &pObjectInfo->TreeEntry); @@ -454,13 +454,13 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pDirCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose (Other2) Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pDirCB->NameInformation.FileName, pDirCB, pCcb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -476,11 +476,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Decrement child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); + pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount)); } // @@ -489,11 +489,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pFcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Decrement count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -518,11 +518,11 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, &pObjectInfo->ParentFileId); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose Acquiring Special Share lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -569,22 +569,22 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, lCount = InterlockedDecrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose (Share) Decrement child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); } AFSReleaseResource( &pFcb->NPFcb->Resource); lCount = InterlockedDecrement( &pFcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSClose (Share) Decrement count on Fcb %p Cnt %d\n", pFcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -593,10 +593,10 @@ AFSClose( IN PDEVICE_OBJECT LibDeviceObject, default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSClose Processing unknown node type %d\n", - pFcb->Header.NodeTypeCode); + pFcb->Header.NodeTypeCode)); break; } @@ -613,9 +613,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSClose\n"); + "EXCEPTION - AFSClose\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp index e37fe17c6..85285dcbf 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSCommSupport.cpp @@ -77,14 +77,14 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, &uniGUID); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Enumerating FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ\n", ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, - &uniGUID); + &uniGUID)); if( AuthGroup != NULL) { @@ -175,7 +175,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, AFSAcquireExcl( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Directory Complete FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX Status %08lX\n", ObjectInfoCB->FileId.Cell, @@ -186,7 +186,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pDirEnumResponse->SnapshotDataVersion.LowPart, pDirEnumResponse->CurrentDataVersion.HighPart, pDirEnumResponse->CurrentDataVersion.LowPart, - ntStatus); + ntStatus)); ObjectInfoCB->DataVersion = pDirEnumResponse->SnapshotDataVersion; @@ -197,13 +197,13 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, ObjectInfoCB->DataVersion.QuadPart = (ULONGLONG)-1; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Force Verify due to DV change during enumeration FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); } AFSReleaseResource( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -211,7 +211,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Failed to enumerate directory FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ Status %08lX\n", ObjectInfoCB->FileId.Cell, @@ -219,7 +219,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, &uniGUID, - ntStatus); + ntStatus)); } break; @@ -229,7 +229,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pCurrentDirEntry = (AFSDirEnumEntry *)pDirEnumResponse->Entry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Enumerating FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX\n", ObjectInfoCB->FileId.Cell, @@ -239,7 +239,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pDirEnumResponse->SnapshotDataVersion.HighPart, pDirEnumResponse->SnapshotDataVersion.LowPart, pDirEnumResponse->CurrentDataVersion.HighPart, - pDirEnumResponse->CurrentDataVersion.LowPart); + pDirEnumResponse->CurrentDataVersion.LowPart)); // // Remove the leading header from the processed length @@ -320,11 +320,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory calling AFSPerformObjectInvalidate Increment count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); AFSPerformObjectInvalidate( pObjectInfo, AFS_INVALIDATE_DATA_VERSION); @@ -349,7 +349,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pDirNode->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -361,7 +361,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pCurrentDirEntry->FileId.Cell, pCurrentDirEntry->FileId.Volume, pCurrentDirEntry->FileId.Vnode, - pCurrentDirEntry->FileId.Unique); + pCurrentDirEntry->FileId.Unique)); AFSDeleteDirEntry( ObjectInfoCB, pDirNode); @@ -371,7 +371,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -383,7 +383,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pCurrentDirEntry->FileId.Cell, pCurrentDirEntry->FileId.Volume, pCurrentDirEntry->FileId.Vnode, - pCurrentDirEntry->FileId.Unique); + pCurrentDirEntry->FileId.Unique)); AFSRemoveNameEntry( ObjectInfoCB, pDirNode); @@ -413,14 +413,14 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, if( pDirNode->ObjectInformation->FileType == AFS_FILE_TYPE_DIRECTORY) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Setting VERIFY on entry %wZ for FID %08lX-%08lX-%08lX-%08lX\n", &uniDirName, pDirNode->ObjectInformation->FileId.Cell, pDirNode->ObjectInformation->FileId.Volume, pDirNode->ObjectInformation->FileId.Vnode, - pDirNode->ObjectInformation->FileId.Unique); + pDirNode->ObjectInformation->FileId.Unique)); AFSAcquireExcl( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -472,7 +472,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Initialized short name %wZ for DE %p for %wZ FID %08lX-%08lX-%08lX-%08lX\n", &uniShortName, @@ -481,7 +481,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pCurrentDirEntry->FileId.Cell, pCurrentDirEntry->FileId.Volume, pCurrentDirEntry->FileId.Vnode, - pCurrentDirEntry->FileId.Unique); + pCurrentDirEntry->FileId.Unique)); } else { @@ -510,20 +510,20 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead = pDirNode; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Insert DE %p to head of case sensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Insert DE %p to case sensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); if( !NT_SUCCESS( AFSInsertCaseSensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead, pDirNode))) @@ -556,11 +556,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, if( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Insert DE %p to head of case insensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead = pDirNode; @@ -569,11 +569,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Insert DE %p to case insensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); AFSInsertCaseInsensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead, pDirNode); @@ -598,7 +598,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, InterlockedIncrement( &ObjectInfoCB->Specific.Directory.DirectoryNodeCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n", &pDirNode->NameInformation.FileName, @@ -606,7 +606,7 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); if( pDirNode->Type.Data.ShortNameTreeEntry.HashIndex != 0) { @@ -618,11 +618,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, if( ObjectInfoCB->Specific.Directory.ShortNameTree == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Insert DE %p to head of shortname tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); ObjectInfoCB->Specific.Directory.ShortNameTree = pDirNode; @@ -636,11 +636,11 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, { SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory Insert DE %p to shortname tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } } } @@ -670,10 +670,10 @@ AFSEnumerateDirectory( IN GUID *AuthGroup, pDirQueryCB->EnumHandle = pDirEnumResponse->EnumHandle; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateDirectory EnumHandle %08lX\n", - pDirQueryCB->EnumHandle); + pDirQueryCB->EnumHandle)); } try_exit: @@ -701,14 +701,14 @@ try_exit: // content in the event it is re-enumerated // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSEnumerateDirectory Resetting content for FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, - ntStatus); + ntStatus)); AFSResetDirectoryContent( ObjectInfoCB); } @@ -759,10 +759,10 @@ AFSEnumerateDirectoryNoResponse( IN GUID *AuthGroup, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSEnumerateDirectoryNoResponse Failed to enumerate directory Status %08lX\n", - ntStatus); + ntStatus)); } } } @@ -807,14 +807,14 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, &uniGUID); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Verifying content for FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ\n", ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, - &uniGUID); + &uniGUID)); if( AuthGroup != NULL) { @@ -897,7 +897,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, AFSAcquireExcl( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Directory Complete FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX Status %08lX\n", ObjectInfoCB->FileId.Cell, @@ -908,7 +908,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pDirEnumResponse->SnapshotDataVersion.LowPart, pDirEnumResponse->CurrentDataVersion.HighPart, pDirEnumResponse->CurrentDataVersion.LowPart, - ntStatus); + ntStatus)); ntStatus = STATUS_SUCCESS; @@ -919,13 +919,13 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->DataVersion.QuadPart = (ULONGLONG)-1; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Force Verify due to DV change during enumeration FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); } else { @@ -938,7 +938,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSVerifyDirectoryContent Failed to enumerate directory FID %08lX-%08lX-%08lX-%08lX AuthGroup %wZ Status %08lX\n", ObjectInfoCB->FileId.Cell, @@ -946,7 +946,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, &uniGUID, - ntStatus); + ntStatus)); } break; @@ -956,7 +956,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pCurrentDirEntry = (AFSDirEnumEntry *)pDirEnumResponse->Entry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent EnumResponse FID %08lX-%08lX-%08lX-%08lX Snapshot-DV %08lX:%08lX Current-DV %08lX:%08lX\n", ObjectInfoCB->FileId.Cell, @@ -966,7 +966,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pDirEnumResponse->SnapshotDataVersion.HighPart, pDirEnumResponse->SnapshotDataVersion.LowPart, pDirEnumResponse->CurrentDataVersion.HighPart, - pDirEnumResponse->CurrentDataVersion.LowPart); + pDirEnumResponse->CurrentDataVersion.LowPart)); // // Remove the leading header from the processed length @@ -1042,7 +1042,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, if( pCurrentDirEntry->ShortNameLength > 0 && pDirNode->NameInformation.ShortNameLength > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name %S New short name %S\n", &uniDirName, @@ -1052,13 +1052,13 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, pDirNode->NameInformation.ShortName, - pCurrentDirEntry->ShortName); + pCurrentDirEntry->ShortName)); } else if( pCurrentDirEntry->ShortNameLength == 0 && pDirNode->NameInformation.ShortNameLength > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name %S New short name NULL\n", &uniDirName, @@ -1067,12 +1067,12 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, - pDirNode->NameInformation.ShortName); + pDirNode->NameInformation.ShortName)); } else if( pCurrentDirEntry->ShortNameLength > 0 && pDirNode->NameInformation.ShortNameLength == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name NULL New short name %S\n", &uniDirName, @@ -1081,11 +1081,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, ObjectInfoCB->FileId.Unique, - pCurrentDirEntry->ShortName); + pCurrentDirEntry->ShortName)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Verified entry %wZ (%wZ) parent FID %08lX-%08lX-%08lX-%08lX old short name NULL New short name NULL\n", &uniDirName, @@ -1093,7 +1093,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); } // @@ -1116,11 +1116,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent calling AFSQueueInvalidateObject Increment count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); if ( !NT_SUCCESS( AFSQueueInvalidateObject( pObjectInfo, AFS_INVALIDATE_DATA_VERSION))) @@ -1129,11 +1129,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, lCount = AFSObjectInfoDecrement( pObjectInfo, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent AFSQueueInvalidateObject failed Decrement count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } } else @@ -1168,7 +1168,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, // File name matches but FileID does not. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Processing dir entry %p %wZ with different FID, same name in parent FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -1176,7 +1176,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); // // Need to tear down this entry and rebuild it below @@ -1186,7 +1186,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pDirNode->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -1198,7 +1198,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pCurrentDirEntry->FileId.Cell, pCurrentDirEntry->FileId.Volume, pCurrentDirEntry->FileId.Vnode, - pCurrentDirEntry->FileId.Unique); + pCurrentDirEntry->FileId.Unique)); AFSDeleteDirEntry( ObjectInfoCB, pDirNode); @@ -1208,7 +1208,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSVerifyDirectoryContent Different FIDs - removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -1220,7 +1220,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pCurrentDirEntry->FileId.Cell, pCurrentDirEntry->FileId.Volume, pCurrentDirEntry->FileId.Vnode, - pCurrentDirEntry->FileId.Unique); + pCurrentDirEntry->FileId.Unique)); AFSRemoveNameEntry( ObjectInfoCB, pDirNode); @@ -1229,14 +1229,14 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent New entry %wZ for parent FID %08lX-%08lX-%08lX-%08lX\n", &uniDirName, ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); } pDirNode = AFSInitDirEntry( ObjectInfoCB, @@ -1259,14 +1259,14 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, if( pDirNode->ObjectInformation->FileType == AFS_FILE_TYPE_DIRECTORY) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Setting VERIFY on entry %wZ for FID %08lX-%08lX-%08lX-%08lX\n", &uniDirName, pDirNode->ObjectInformation->FileId.Cell, pDirNode->ObjectInformation->FileId.Volume, pDirNode->ObjectInformation->FileId.Vnode, - pDirNode->ObjectInformation->FileId.Unique); + pDirNode->ObjectInformation->FileId.Unique)); AFSAcquireExcl( pDirNode->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -1310,7 +1310,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Initialized short name %wZ for DE %p for %wZ FID %08lX-%08lX-%08lX-%08lX\n", &uniShortName, @@ -1319,7 +1319,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, pCurrentDirEntry->FileId.Cell, pCurrentDirEntry->FileId.Volume, pCurrentDirEntry->FileId.Vnode, - pCurrentDirEntry->FileId.Unique); + pCurrentDirEntry->FileId.Unique)); } else { @@ -1350,11 +1350,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead = pDirNode; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Insert DE %p to head of case sensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } else { @@ -1362,11 +1362,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, if( !NT_SUCCESS( AFSInsertCaseSensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead, pDirNode))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Failed to insert DE %p to case sensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); // // Delete this dir entry and continue on @@ -1390,11 +1390,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Insert DE %p to case sensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } } @@ -1407,11 +1407,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_CASE_INSENSTIVE_LIST_HEAD); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Insert DE %p to head of case insensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } else { @@ -1419,11 +1419,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, AFSInsertCaseInsensitiveDirEntry( ObjectInfoCB->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead, pDirNode); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Insert DE %p to case insensitive tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } if( ObjectInfoCB->Specific.Directory.DirectoryNodeListHead == NULL) @@ -1445,7 +1445,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, InterlockedIncrement( &ObjectInfoCB->Specific.Directory.DirectoryNodeCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n", &pDirNode->NameInformation.FileName, @@ -1453,7 +1453,7 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); if( pDirNode->Type.Data.ShortNameTreeEntry.HashIndex != 0) { @@ -1467,11 +1467,11 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, ObjectInfoCB->Specific.Directory.ShortNameTree = pDirNode; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Insert DE %p to head of shortname tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); } @@ -1481,22 +1481,22 @@ AFSVerifyDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB, if( !NT_SUCCESS( AFSInsertShortNameDirEntry( ObjectInfoCB->Specific.Directory.ShortNameTree, pDirNode))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Failed to insert DE %p (%08lX) to shortname tree for %wZ\n", pDirNode, pDirNode->Type.Data.ShortNameTreeEntry.HashIndex, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } else { SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyDirectoryContent Insert DE %p to shortname tree for %wZ\n", pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } } } @@ -1650,7 +1650,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, if( ParentObjectInfo->DataVersion.QuadPart != pResultCB->ParentDataVersion.QuadPart - 1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSNotifyFileCreate Raced with an invalidate call and a re-enumeration for entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version (%08lX:%08lX != %08lX:%08lX - 1)\n", FileName, @@ -1661,7 +1661,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, ParentObjectInfo->DataVersion.HighPart, ParentObjectInfo->DataVersion.LowPart, pResultCB->ParentDataVersion.HighPart, - pResultCB->ParentDataVersion.LowPart); + pResultCB->ParentDataVersion.LowPart)); // // We raced so go and lookup the directory entry in the parent @@ -1677,11 +1677,11 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, if( pDirNode != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyFileCreate Located dir entry %p for file %wZ\n", pDirNode, - FileName); + FileName)); if ( AFSIsEqualFID( &pDirNode->ObjectInformation->FileId, &pResultCB->DirEnum.FileId)) @@ -1699,7 +1699,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, // same as the one that was created for us by the file server. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNotifyFileCreate Found matching name entry %wZ DE %p FID %08lX-%08lX-%08lX-%08lX != FID %08lX-%08lX-%08lX-%08lX\n", FileName, @@ -1711,13 +1711,13 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, pResultCB->DirEnum.FileId.Cell, pResultCB->DirEnum.FileId.Volume, pResultCB->DirEnum.FileId.Vnode, - pResultCB->DirEnum.FileId.Unique); + pResultCB->DirEnum.FileId.Unique)); if( pDirNode->DirOpenReferenceCount <= 0 && pDirNode->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyFileCreate Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -1729,7 +1729,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, pResultCB->DirEnum.FileId.Cell, pResultCB->DirEnum.FileId.Volume, pResultCB->DirEnum.FileId.Vnode, - pResultCB->DirEnum.FileId.Unique); + pResultCB->DirEnum.FileId.Unique)); AFSDeleteDirEntry( ParentObjectInfo, pDirNode); @@ -1739,7 +1739,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyFileCreate Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -1751,7 +1751,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, pResultCB->DirEnum.FileId.Cell, pResultCB->DirEnum.FileId.Volume, pResultCB->DirEnum.FileId.Vnode, - pResultCB->DirEnum.FileId.Unique); + pResultCB->DirEnum.FileId.Unique)); AFSRemoveNameEntry( ParentObjectInfo, pDirNode); @@ -1771,10 +1771,10 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, ParentObjectInfo->DataVersion.QuadPart = (ULONGLONG)-1; } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyFileCreate Creating new entry %wZ\n", - FileName); + FileName)); // // Initialize the directory entry @@ -1828,12 +1828,12 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyFileCreate Initialized short name %wZ for DE %p for %wZ\n", &uniShortName, pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } else { @@ -1853,7 +1853,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, ParentObjectInfo->DataVersion = pResultCB->ParentDataVersion; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyFileCreate entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version %08lX:%08lX\n", FileName, @@ -1861,7 +1861,7 @@ AFSNotifyFileCreate( IN GUID *AuthGroup, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, ParentObjectInfo->FileId.Unique, - ParentObjectInfo->DataVersion.QuadPart); + ParentObjectInfo->DataVersion.QuadPart)); } // @@ -1877,12 +1877,12 @@ try_exit: lCount = InterlockedIncrement( &(*DirNode)->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyFileCreate Increment count on %wZ DE %p Cnt %d\n", &(*DirNode)->NameInformation.FileName, *DirNode, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -1967,14 +1967,14 @@ AFSUpdateFileInformation( IN AFSFileID *ParentFid, if( ntStatus != STATUS_SUCCESS) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSUpdateFileInformation failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, ObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2053,7 +2053,7 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB, if( ntStatus != STATUS_SUCCESS) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNotifyDelete failed ParentFID %08lX-%08lX-%08lX-%08lX %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", stDelete.ParentId.Cell, @@ -2065,7 +2065,7 @@ AFSNotifyDelete( IN AFSDirectoryCB *DirectoryCB, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2210,14 +2210,14 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, if( ntStatus != STATUS_SUCCESS) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNotifyHardLink failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, ObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2261,7 +2261,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSNotifyHardLink Raced with an invalidate call and a re-enumeration for entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version (%08lX:%08lX != %08lX:%08lX - 1)\n", TargetName, @@ -2272,7 +2272,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, TargetParentObjectInfo->DataVersion.HighPart, TargetParentObjectInfo->DataVersion.LowPart, pResultCB->TargetParentDataVersion.HighPart, - pResultCB->TargetParentDataVersion.LowPart); + pResultCB->TargetParentDataVersion.LowPart)); // // We raced so go and lookup the directory entry in the parent @@ -2288,11 +2288,11 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, if( pDirNode != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyHardLink Located dir entry %p for file %wZ\n", pDirNode, - TargetName); + TargetName)); if ( AFSIsEqualFID( &pDirNode->ObjectInformation->FileId, &pResultCB->DirEnum.FileId)) @@ -2308,7 +2308,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, // same as the one that was created for us by the file server. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNotifyHardLink Found matching name entry %wZ DE %p FID %08lX-%08lX-%08lX-%08lX != FID %08lX-%08lX-%08lX-%08lX\n", TargetName, @@ -2320,13 +2320,13 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, pResultCB->DirEnum.FileId.Cell, pResultCB->DirEnum.FileId.Volume, pResultCB->DirEnum.FileId.Vnode, - pResultCB->DirEnum.FileId.Unique); + pResultCB->DirEnum.FileId.Unique)); if( pDirNode->DirOpenReferenceCount <= 0 && pDirNode->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyHardLink Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -2338,7 +2338,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, pResultCB->DirEnum.FileId.Cell, pResultCB->DirEnum.FileId.Volume, pResultCB->DirEnum.FileId.Vnode, - pResultCB->DirEnum.FileId.Unique); + pResultCB->DirEnum.FileId.Unique)); AFSDeleteDirEntry( TargetParentObjectInfo, pDirNode); @@ -2348,7 +2348,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, SetFlag( pDirNode->Flags, AFS_DIR_ENTRY_DELETED); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyHardLink Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -2360,7 +2360,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, pResultCB->DirEnum.FileId.Cell, pResultCB->DirEnum.FileId.Volume, pResultCB->DirEnum.FileId.Vnode, - pResultCB->DirEnum.FileId.Unique); + pResultCB->DirEnum.FileId.Unique)); AFSRemoveNameEntry( TargetParentObjectInfo, pDirNode); @@ -2384,10 +2384,10 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, // Create the hard link entry // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyHardLink Creating new entry %wZ\n", - TargetName); + TargetName)); // // Initialize the directory entry @@ -2435,12 +2435,12 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, pDirNode->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyHardLink Initialized short name %wZ for DE %p for %wZ\n", &uniShortName, pDirNode, - &pDirNode->NameInformation.FileName); + &pDirNode->NameInformation.FileName)); } else { @@ -2460,7 +2460,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, TargetParentObjectInfo->DataVersion = pResultCB->TargetParentDataVersion; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyHardLink entry %wZ ParentFID %08lX-%08lX-%08lX-%08lX Version %08lX:%08lX\n", TargetName, @@ -2468,7 +2468,7 @@ AFSNotifyHardLink( IN AFSObjectInfoCB *ObjectInfo, TargetParentObjectInfo->FileId.Volume, TargetParentObjectInfo->FileId.Vnode, TargetParentObjectInfo->FileId.Unique, - TargetParentObjectInfo->DataVersion.QuadPart); + TargetParentObjectInfo->DataVersion.QuadPart)); } try_exit: @@ -2478,12 +2478,12 @@ try_exit: lCount = InterlockedIncrement( &pDirNode->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyHardLink Increment count on %wZ DE %p Cnt %d\n", &pDirNode->NameInformation.FileName, pDirNode, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -2583,14 +2583,14 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo, if( ntStatus != STATUS_SUCCESS) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNotifyRename failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, ObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2651,12 +2651,12 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo, uniShortName.MaximumLength = uniShortName.Length; uniShortName.Buffer = DirectoryCB->NameInformation.ShortName; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyRename Update old short name %wZ for DE %p for %wZ\n", &uniShortName, DirectoryCB, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); DirectoryCB->NameInformation.ShortNameLength = pRenameResultCB->DirEnum.ShortNameLength; @@ -2668,12 +2668,12 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo, uniShortName.MaximumLength = uniShortName.Length; uniShortName.Buffer = DirectoryCB->NameInformation.ShortName; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyRename Initialized short name %wZ for DE %p for %wZ\n", &uniShortName, DirectoryCB, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); } else { @@ -2684,12 +2684,12 @@ AFSNotifyRename( IN AFSObjectInfoCB *ObjectInfo, uniShortName.MaximumLength = uniShortName.Length; uniShortName.Buffer = DirectoryCB->NameInformation.ShortName; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyRename Removing old short name %wZ for DE %p for %wZ\n", &uniShortName, DirectoryCB, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); DirectoryCB->NameInformation.ShortNameLength = 0; @@ -3598,14 +3598,14 @@ AFSCreateSymlink( IN GUID *AuthGroup, if ( ntStatus == STATUS_FILE_DELETED ) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCreateSymlink failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, ObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); SetFlag( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY); @@ -3618,14 +3618,14 @@ AFSCreateSymlink( IN GUID *AuthGroup, else if( ntStatus != STATUS_SUCCESS) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCreateSymlink failed FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, ObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp index 87415b3b5..c306a73b2 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSCreate.cpp @@ -71,10 +71,10 @@ AFSCreate( IN PDEVICE_OBJECT LibDeviceObject, pFileObject->FileName.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCreate (%p) Processing control device open request\n", - Irp); + Irp)); ntStatus = AFSControlDeviceCreate( Irp); @@ -84,10 +84,10 @@ AFSCreate( IN PDEVICE_OBJECT LibDeviceObject, if( AFSRDRDeviceObject == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCreate (%p) Invalid request to open before library is initialized\n", - Irp); + Irp)); try_return( ntStatus = STATUS_DEVICE_NOT_READY); } @@ -102,9 +102,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSCreate\n"); + "EXCEPTION - AFSCreate\n")); ntStatus = STATUS_ACCESS_DENIED; @@ -201,10 +201,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( BooleanFlagOn( pDeviceExt->DeviceFlags, AFS_DEVICE_FLAG_REDIRECTOR_SHUTDOWN)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCommonCreate (%p) Open request after shutdown\n", - Irp); + Irp)); try_return( ntStatus = STATUS_TOO_LATE); } @@ -217,10 +217,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to enumerate global root Status %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -245,12 +245,12 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, uniFileName.Length > 0 ? AFS_TRACE_LEVEL_ERROR : AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) Failed to parse name \"%wZ\" Status %08lX\n", Irp, &uniFileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -342,10 +342,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to open root IOCtl Fcb Status %08lX\n", - ntStatus); + ntStatus)); } } else if( pParentDirectoryCB != NULL) @@ -363,10 +363,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to open special share Fcb Status %08lX\n", - ntStatus); + ntStatus)); } } } @@ -381,10 +381,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to open root Status %08lX\n", - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -415,12 +415,12 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, ntStatus = STATUS_OBJECT_NAME_NOT_FOUND; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) Invalid name %wZ Status %08lX\n", Irp, &uniFileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -468,12 +468,12 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Decrement count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); pVolumeCB = pNewVolumeCB; @@ -497,13 +497,13 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, lCount = InterlockedDecrement( &pParentDirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate DecrementX count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirectoryCB->NameInformation.FileName, pParentDirectoryCB, pCcb, - lCount); + lCount)); } pParentDirectoryCB = pNewParentDirectoryCB; @@ -532,12 +532,12 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, // branch // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) Failed to locate name entry for %wZ Status %08lX\n", Irp, &uniFileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -603,12 +603,12 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, ntStatus != STATUS_OBJECT_NAME_NOT_FOUND) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) Failing access to symlink %wZ Status %08lX\n", Irp, &uniFileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -628,13 +628,13 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, lCount = InterlockedIncrement( &pDirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Increment0 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirectoryCB->NameInformation.FileName, pDirectoryCB, pCcb, - lCount); + lCount)); bReleaseDir = TRUE; } @@ -658,13 +658,13 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, lCount = InterlockedIncrement( &pParentDirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Increment1 count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirectoryCB->NameInformation.FileName, pParentDirectoryCB, pCcb, - lCount); + lCount)); bReleaseParentDir = TRUE; } @@ -700,11 +700,11 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to open target directory %wZ Status %08lX\n", &pParentDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -716,22 +716,22 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( pDirectoryCB == NULL || !BooleanFlagOn( pDirectoryCB->ObjectInformation->FileAttributes, FILE_ATTRIBUTE_REPARSE_POINT)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) Reparse open request but attribute not set for %wZ DirCB %p Type %08lX\n", Irp, &uniFileName, pDirectoryCB, - pDirectoryCB ? pDirectoryCB->ObjectInformation->FileType : 0); + pDirectoryCB ? pDirectoryCB->ObjectInformation->FileType : 0)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) Opening as reparse point %wZ Type %08lX\n", Irp, &uniFileName, - pDirectoryCB->ObjectInformation->FileType); + pDirectoryCB->ObjectInformation->FileType)); bOpenedReparsePoint = TRUE; } @@ -759,19 +759,19 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( pDirectoryCB != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Object name collision on create of %wZ Status %08lX\n", &pDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Object name collision on create Status %08lX\n", - ntStatus); + ntStatus)); } try_return( ntStatus = STATUS_OBJECT_NAME_COLLISION); @@ -794,12 +794,12 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to create of %wZ in directory %wZ Status %08lX\n", &uniComponentName, &pParentDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -835,21 +835,21 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to IOCtl open on %wZ Status %08lX\n", &uniComponentName, - ntStatus); + ntStatus)); } } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate (%p) File %wZ name not found\n", Irp, - &uniFileName); + &uniFileName)); ntStatus = STATUS_OBJECT_NAME_NOT_FOUND; } @@ -871,10 +871,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( BooleanFlagOn( ulOptions, FILE_DELETE_ON_CLOSE )) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate (%p) Attempt to open root as delete on close\n", - Irp); + Irp)); try_return( ntStatus = STATUS_CANNOT_DELETE); } @@ -886,10 +886,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( bOpenTargetDirectory) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate (%p) Attempt to open root as target directory\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -907,12 +907,12 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed to open volume root %08lX-%08lX Status %08lX\n", pVolumeCB->ObjectInformation.FileId.Cell, pVolumeCB->ObjectInformation.FileId.Volume, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -925,10 +925,10 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( pDirectoryCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failing access to %wZ Name not found\n", - &uniFileName); + &uniFileName)); try_return( ntStatus = STATUS_OBJECT_NAME_NOT_FOUND); } @@ -954,11 +954,11 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed overwrite/supersede on %wZ Status %08lX\n", &pDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -979,11 +979,11 @@ AFSCommonCreate( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate Failed open on %wZ Status %08lX\n", &pDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); } try_exit: @@ -1036,13 +1036,13 @@ try_exit: lCount = pCcb->DirectoryCB->DirOpenReferenceCount; - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Count on %wZ DE %p Ccb %p Cnt %d\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB, pCcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -1069,13 +1069,13 @@ try_exit: // If we make it here then init the FO for the request. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCommonCreate (%p) FileObject %p FsContext %p FsContext2 %p\n", Irp, pFileObject, pFcb, - pCcb); + pCcb)); pFileObject->FsContext = (void *)pFcb; @@ -1144,13 +1144,13 @@ try_exit: else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate (%p) Returning with NULL Fcb FileObject %p FsContext %p FsContext2 %p\n", Irp, pFileObject, pFcb, - pCcb); + pCcb)); } } else @@ -1159,13 +1159,13 @@ try_exit: ntStatus == STATUS_REPARSE) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonCreate (%p) STATUS_REPARSE FileObject %p FsContext %p FsContext2 %p\n", Irp, pFileObject, pFcb, - pCcb); + pCcb)); } // @@ -1203,12 +1203,12 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Decrement count on Volume %08lX Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); } if ( bReleaseDir) @@ -1220,13 +1220,13 @@ try_exit: lCount = InterlockedDecrement( &pDirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pDirectoryCB->NameInformation.FileName, pDirectoryCB, pCcb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -1240,13 +1240,13 @@ try_exit: lCount = InterlockedDecrement( &pParentDirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonCreate Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirectoryCB->NameInformation.FileName, pParentDirectoryCB, pCcb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -1285,10 +1285,10 @@ AFSOpenAFSRoot( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenAFSRoot (%p) Failed to allocate Ccb\n", - Irp); + Irp)); try_return( ntStatus); } @@ -1299,19 +1299,19 @@ AFSOpenAFSRoot( IN PIRP Irp, lCount = InterlockedIncrement( &AFSGlobalRoot->RootFcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenAFSRoot Increment count on Fcb %p Cnt %d\n", AFSGlobalRoot->RootFcb, - lCount); + lCount)); lCount = InterlockedIncrement( &AFSGlobalRoot->RootFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenAFSRoot Increment handle count on Fcb %p Cnt %d\n", AFSGlobalRoot->RootFcb, - lCount); + lCount)); *Fcb = AFSGlobalRoot->RootFcb; @@ -1364,11 +1364,11 @@ AFSOpenRoot( IN PIRP Irp, ntStatus = STATUS_FILE_IS_A_DIRECTORY; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenRoot (%p) Attempt to open root as file Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1385,11 +1385,11 @@ AFSOpenRoot( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenRoot (%p) Failed to validate root entry Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1436,14 +1436,14 @@ AFSOpenRoot( IN PIRP Irp, &uniGUID); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenRoot (%p) Failed open in service volume %08lX-%08lX AuthGroup %wZ Status %08lX\n", Irp, VolumeCB->ObjectInformation.FileId.Cell, VolumeCB->ObjectInformation.FileId.Volume, &uniGUID, - ntStatus); + ntStatus)); if( AuthGroup != NULL) { @@ -1472,11 +1472,11 @@ AFSOpenRoot( IN PIRP Irp, AFSReleaseResource( VolumeCB->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenRoot (%p) Failed to enumerate directory Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1500,11 +1500,11 @@ AFSOpenRoot( IN PIRP Irp, lCount = InterlockedIncrement( &VolumeCB->RootFcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenRoot Increment count on Fcb %p Cnt %d\n", VolumeCB->RootFcb, - lCount); + lCount)); bReleaseFcb = TRUE; @@ -1524,11 +1524,11 @@ AFSOpenRoot( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenRoot (%p) Access check failure Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1546,11 +1546,11 @@ AFSOpenRoot( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenRoot (%p) Failed to allocate Ccb Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1586,11 +1586,11 @@ AFSOpenRoot( IN PIRP Irp, lCount = InterlockedIncrement( &VolumeCB->RootFcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenRoot Increment handle count on Fcb %p Cnt %d\n", VolumeCB->RootFcb, - lCount); + lCount)); // // Indicate the object is held @@ -1615,11 +1615,11 @@ try_exit: lCount = InterlockedDecrement( &VolumeCB->RootFcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenRoot Decrement count on Fcb %p Cnt %d\n", VolumeCB->RootFcb, - lCount); + lCount)); } AFSReleaseResource( VolumeCB->RootFcb->Header.Resource); @@ -1699,20 +1699,20 @@ AFSProcessCreate( IN PIRP Irp, ulAttributes |= FILE_ATTRIBUTE_DIRECTORY; } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate (%p) Creating file %wZ Attributes %08lX\n", Irp, FullFileName, - ulAttributes); + ulAttributes)); if( BooleanFlagOn( VolumeCB->VolumeInformation.Characteristics, FILE_READ_ONLY_DEVICE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate Request failed due to read only volume %wZ\n", - FullFileName); + FullFileName)); try_return( ntStatus = STATUS_MEDIA_WRITE_PROTECTED); } @@ -1734,12 +1734,12 @@ AFSProcessCreate( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate (%p) Failed to create directory entry %wZ Status %08lX\n", Irp, FullFileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1752,7 +1752,7 @@ AFSProcessCreate( IN PIRP Irp, pObjectInfo->FileType == AFS_FILE_TYPE_UNKNOWN) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate (%p) Evaluating object %wZ FID %08lX-%08lX-%08lX-%08lX\n", Irp, @@ -1760,7 +1760,7 @@ AFSProcessCreate( IN PIRP Irp, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); ntStatus = AFSEvaluateNode( AuthGroup, pDirEntry); @@ -1774,7 +1774,7 @@ AFSProcessCreate( IN PIRP Irp, if ( !BooleanFlagOn( pObjectInfo->Flags, AFS_OBJECT_FLAGS_PARENT_FID)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate (%p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT %08lX-%08lX-%08lX-%08lX != NULL Status %08lX\n", Irp, @@ -1787,12 +1787,12 @@ AFSProcessCreate( IN PIRP Irp, pParentObjectInfo->FileId.Volume, pParentObjectInfo->FileId.Vnode, pParentObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); } else if ( AFSIsEqualFID( &pParentObjectInfo->FileId, &pObjectInfo->ParentFileId)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate (%p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT %08lX-%08lX-%08lX-%08lX Status %08lX\n", Irp, @@ -1805,12 +1805,12 @@ AFSProcessCreate( IN PIRP Irp, pParentObjectInfo->FileId.Volume, pParentObjectInfo->FileId.Vnode, pParentObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate (%p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT %08lX-%08lX-%08lX-%08lX != %08lX-%08lX-%08lX-%08lX Status %08lX\n", Irp, @@ -1827,13 +1827,13 @@ AFSProcessCreate( IN PIRP Irp, pObjectInfo->ParentFileId.Volume, pObjectInfo->ParentFileId.Vnode, pObjectInfo->ParentFileId.Unique, - ntStatus); + ntStatus)); } } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate (%p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", Irp, @@ -1842,7 +1842,7 @@ AFSProcessCreate( IN PIRP Irp, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -1869,12 +1869,12 @@ AFSProcessCreate( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate (%p) Failed to initialize fcb %wZ Status %08lX\n", Irp, FullFileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1887,11 +1887,11 @@ AFSProcessCreate( IN PIRP Irp, lCount = InterlockedIncrement( &(*Fcb)->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Increment count on Fcb %p Cnt %d\n", *Fcb, - lCount); + lCount)); bReleaseFcb = TRUE; @@ -1907,12 +1907,12 @@ AFSProcessCreate( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessCreate (%p) Failed to initialize ccb %wZ Status %08lX\n", Irp, FullFileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2002,11 +2002,11 @@ AFSProcessCreate( IN PIRP Irp, lCount = InterlockedIncrement( &(*Fcb)->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Increment handle count on Fcb %p Cnt %d\n", (*Fcb), - lCount); + lCount)); // // Increment the open reference and handle on the parent node @@ -2014,19 +2014,19 @@ AFSProcessCreate( IN PIRP Irp, lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Increment child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Increment child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); if( ulOptions & FILE_DELETE_ON_CLOSE) { @@ -2035,12 +2035,12 @@ AFSProcessCreate( IN PIRP Irp, // Mark it for delete on close // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate (%p) Setting PENDING_DELETE flag in DirEntry %p Name %wZ\n", Irp, pDirEntry, - FullFileName); + FullFileName)); SetFlag( pDirEntry->Flags, AFS_DIR_ENTRY_PENDING_DELETE); } @@ -2074,11 +2074,11 @@ try_exit: lCount = InterlockedDecrement( &(*Fcb)->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Decrement count on Fcb %p Cnt %d\n", *Fcb, - lCount); + lCount)); } AFSReleaseResource( &(*Fcb)->NPFcb->Resource); @@ -2094,12 +2094,12 @@ try_exit: lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Decrement count on %wZ DE %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -2110,12 +2110,12 @@ try_exit: if( bFileCreated) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessCreate Create failed, removing DE %p from parent object %p Status %08lX\n", pDirEntry, pParentObjectInfo, - ntStatus); + ntStatus)); // // Remove the dir entry from the parent @@ -2199,11 +2199,11 @@ AFSOpenTargetDirectory( IN PIRP Irp, pFileObject = pIrpSp->FileObject; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenTargetDirectory (%p) Processing file %wZ\n", Irp, - TargetName); + TargetName)); pParentObject = ParentDirectoryCB->ObjectInformation; @@ -2227,12 +2227,12 @@ AFSOpenTargetDirectory( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenTargetDirectory (%p) Failed to initialize fcb %wZ Status %08lX\n", Irp, &ParentDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2245,11 +2245,11 @@ AFSOpenTargetDirectory( IN PIRP Irp, lCount = InterlockedIncrement( &pParentObject->Fcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenTargetDirectory Increment count on Fcb %p Cnt %d\n", pParentObject->Fcb, - lCount); + lCount)); bReleaseFcb = TRUE; @@ -2269,12 +2269,12 @@ AFSOpenTargetDirectory( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenTargetDirectory (%p) Access check failure %wZ Status %08lX\n", Irp, &ParentDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2292,12 +2292,12 @@ AFSOpenTargetDirectory( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenTargetDirectory (%p) Failed to initialize ccb %wZ Status %08lX\n", Irp, &ParentDirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2358,11 +2358,11 @@ AFSOpenTargetDirectory( IN PIRP Irp, lCount = InterlockedIncrement( &pParentObject->Fcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenTargetDirectory Increment handle count on Fcb %p Cnt %d\n", pParentObject->Fcb, - lCount); + lCount)); // // Increment the open reference and handle on the parent node @@ -2379,19 +2379,19 @@ AFSOpenTargetDirectory( IN PIRP Irp, lCount = InterlockedIncrement( &pGrandParentObject->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenTargetDirectory Increment child open handle count on Parent object %p Cnt %d\n", pGrandParentObject, - lCount); + lCount)); lCount = InterlockedIncrement( &pGrandParentObject->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenTargetDirectory Increment child open ref count on Parent object %p Cnt %d\n", pGrandParentObject, - lCount); + lCount)); AFSReleaseObjectInfo( &pGrandParentObject); } @@ -2410,11 +2410,11 @@ try_exit: lCount = InterlockedDecrement( &pParentObject->Fcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenTargetDirectory Decrement count on Fcb %p Cnt %d\n", pParentObject->Fcb, - lCount); + lCount)); } AFSReleaseResource( &pParentObject->Fcb->NPFcb->Resource); @@ -2493,12 +2493,12 @@ AFSProcessOpen( IN PIRP Irp, ntStatus = STATUS_DELETE_PENDING; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Entry pending delete %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2521,12 +2521,12 @@ AFSProcessOpen( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Failed to validate entry %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2547,12 +2547,12 @@ AFSProcessOpen( IN PIRP Irp, ntStatus = STATUS_CANNOT_DELETE; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Cannot delete entry %wZ marked for delete on close Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2567,12 +2567,12 @@ AFSProcessOpen( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Failed to init fcb on %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2591,11 +2591,11 @@ AFSProcessOpen( IN PIRP Irp, lCount = InterlockedIncrement( &pObjectInfo->Fcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen Increment2 count on Fcb %p Cnt %d\n", pObjectInfo->Fcb, - lCount); + lCount)); // // Check access on the entry @@ -2613,12 +2613,12 @@ AFSProcessOpen( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Failed to check share access on %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2641,11 +2641,11 @@ AFSProcessOpen( IN PIRP Irp, BOOLEAN bMmFlushed; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -2653,11 +2653,11 @@ AFSProcessOpen( IN PIRP Irp, bMmFlushed = MmFlushImageSection( &pObjectInfo->Fcb->NPFcb->SectionObjectPointers, MmFlushForWrite); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->Fcb->NPFcb->SectionObjectResource); @@ -2667,12 +2667,12 @@ AFSProcessOpen( IN PIRP Irp, ntStatus = BooleanFlagOn(ulOptions, FILE_DELETE_ON_CLOSE) ? STATUS_CANNOT_DELETE : STATUS_SHARING_VIOLATION; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Failed to flush image section %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2683,12 +2683,12 @@ AFSProcessOpen( IN PIRP Irp, ntStatus = STATUS_NOT_A_DIRECTORY; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Attempt to open file as directory %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2704,12 +2704,12 @@ AFSProcessOpen( IN PIRP Irp, ntStatus = STATUS_FILE_IS_A_DIRECTORY; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Attempt to open directory as file %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2760,12 +2760,12 @@ AFSProcessOpen( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Failed open in service %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2787,14 +2787,14 @@ AFSProcessOpen( IN PIRP Irp, ntStatus = STATUS_ACCESS_DENIED; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Failed to check access from service Desired %08lX Granted %08lX Entry %wZ Status %08lX\n", Irp, *pDesiredAccess, stOpenResultCB.GrantedAccess, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2811,12 +2811,12 @@ AFSProcessOpen( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOpen (%p) Failed to initialize ccb %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2848,11 +2848,11 @@ AFSProcessOpen( IN PIRP Irp, lCount = InterlockedIncrement( &pObjectInfo->Fcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen Increment handle count on Fcb %p Cnt %d\n", pObjectInfo->Fcb, - lCount); + lCount)); // // Increment the open reference and handle on the parent node @@ -2860,19 +2860,19 @@ AFSProcessOpen( IN PIRP Irp, lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen Increment child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen Increment child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); if( BooleanFlagOn( ulOptions, FILE_DELETE_ON_CLOSE)) { @@ -2881,12 +2881,12 @@ AFSProcessOpen( IN PIRP Irp, // Mark it for delete on close // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen (%p) Setting PENDING_DELETE flag in DirEntry %p Name %wZ\n", Irp, DirectoryCB, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); SetFlag( DirectoryCB->Flags, AFS_DIR_ENTRY_PENDING_DELETE); } @@ -2918,11 +2918,11 @@ try_exit: lCount = InterlockedDecrement( &pObjectInfo->Fcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOpen Decrement2 count on Fcb %p Cnt %d\n", pObjectInfo->Fcb, - lCount); + lCount)); } AFSReleaseResource( pObjectInfo->Fcb->Header.Resource); @@ -3018,11 +3018,11 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, if( BooleanFlagOn( VolumeCB->VolumeInformation.Characteristics, FILE_READ_ONLY_DEVICE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOverwriteSupersede Request failed on %wZ due to read only volume\n", Irp, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_MEDIA_WRITE_PROTECTED); } @@ -3046,12 +3046,12 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOverwriteSupersede (%p) Failed to validate entry %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3067,12 +3067,12 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOverwriteSupersede (%p) Failed to initialize fcb %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3085,11 +3085,11 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, lCount = InterlockedIncrement( &pObjectInfo->Fcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOverwriteSupersede Increment2 count on Fcb %p Cnt %d\n", pObjectInfo->Fcb, - lCount); + lCount)); bReleaseFcb = TRUE; @@ -3109,22 +3109,22 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOverwriteSupersede (%p) Access check failure %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOverwriteSupercede Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -3137,11 +3137,11 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, bUserMapped = !MmCanFileBeTruncated( &pObjectInfo->Fcb->NPFcb->SectionObjectPointers, &liZero); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOverwriteSupercede Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->Fcb->NPFcb->SectionObjectResource); @@ -3150,12 +3150,12 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, ntStatus = STATUS_USER_MAPPED_FILE; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOverwriteSupersede (%p) File user mapped %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3172,12 +3172,12 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOverwriteSupersede (%p) Failed to initialize ccb %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3242,12 +3242,12 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, pObjectInfo->Fcb->ObjectInformation->EndOfFile = liSaveSize; pObjectInfo->Fcb->ObjectInformation->AllocationSize = liSaveAlloc; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessOverwriteSupersede (%p) Failed to update file information %wZ Status %08lX\n", Irp, &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3306,11 +3306,11 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, lCount = InterlockedIncrement( &pObjectInfo->Fcb->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOverwriteSupersede Increment handle count on Fcb %p Cnt %d\n", pObjectInfo->Fcb, - lCount); + lCount)); // // Increment the open reference and handle on the parent node @@ -3318,19 +3318,19 @@ AFSProcessOverwriteSupersede( IN PDEVICE_OBJECT DeviceObject, lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOverwriteSupersede Increment child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOverwriteSupersede Increment child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); AFSReleaseResource( pObjectInfo->Fcb->Header.Resource); @@ -3372,11 +3372,11 @@ try_exit: lCount = InterlockedDecrement( &pObjectInfo->Fcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessOverwriteSupersede Decrement2 count on Fcb %p Cnt %d\n", pObjectInfo->Fcb, - lCount); + lCount)); } AFSReleaseResource( pObjectInfo->Fcb->Header.Resource); @@ -3490,11 +3490,11 @@ AFSOpenIOCtlFcb( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenIOCtlFcb (%p) Failed to initialize fcb Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3507,11 +3507,11 @@ AFSOpenIOCtlFcb( IN PIRP Irp, lCount = InterlockedIncrement( &(*Fcb)->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenIOCtlFcb Increment count on Fcb %p Cnt %d\n", (*Fcb), - lCount); + lCount)); bReleaseFcb = TRUE; @@ -3527,11 +3527,11 @@ AFSOpenIOCtlFcb( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenIOCtlFcb (%p) Failed to initialize ccb Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3579,11 +3579,11 @@ AFSOpenIOCtlFcb( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenIOCtlFcb (%p) Failed service open Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3594,11 +3594,11 @@ AFSOpenIOCtlFcb( IN PIRP Irp, lCount = InterlockedIncrement( &(*Fcb)->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenIOCtlFcb Increment handle count on Fcb %p Cnt %d\n", (*Fcb), - lCount); + lCount)); // // Increment the open reference and handle on the parent node @@ -3606,19 +3606,19 @@ AFSOpenIOCtlFcb( IN PIRP Irp, lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenIOCtlFcb Increment child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenIOCtlFcb Increment child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); // // Return the open result for this file @@ -3643,11 +3643,11 @@ try_exit: lCount = InterlockedDecrement( &(*Fcb)->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenIOCtlFcb Decrement count on Fcb %p Cnt %d\n", (*Fcb), - lCount); + lCount)); } AFSReleaseResource( &(*Fcb)->NPFcb->Resource); @@ -3698,11 +3698,11 @@ AFSOpenSpecialShareFcb( IN PIRP Irp, pFileObject = pIrpSp->FileObject; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSOpenSpecialShareFcb (%p) Processing Share %wZ open\n", Irp, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); pObjectInfo = DirectoryCB->ObjectInformation; @@ -3727,11 +3727,11 @@ AFSOpenSpecialShareFcb( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenSpecialShareFcb (%p) Failed to initialize fcb Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3759,11 +3759,11 @@ AFSOpenSpecialShareFcb( IN PIRP Irp, lCount = InterlockedIncrement( &(*Fcb)->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenSpecialShareFcb Increment count on Fcb %p Cnt %d\n", (*Fcb), - lCount); + lCount)); bReleaseFcb = TRUE; @@ -3779,11 +3779,11 @@ AFSOpenSpecialShareFcb( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenSpecialShareFcb (%p) Failed to initialize ccb Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3822,22 +3822,22 @@ AFSOpenSpecialShareFcb( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSOpenSpecialShareFcb (%p) Failed service open Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } lCount = InterlockedIncrement( &(*Fcb)->OpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenSpecialShareFcb Increment handle count on Fcb %p Cnt %d\n", (*Fcb), - lCount); + lCount)); // // Increment the open reference and handle on the parent node @@ -3845,19 +3845,19 @@ AFSOpenSpecialShareFcb( IN PIRP Irp, lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenHandleCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenSpecialShareFcb Increment child open handle count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentObjectInfo->Specific.Directory.ChildOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenSpecialShareFcb Increment child open ref count on Parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); // // Return the open result for this file @@ -3878,11 +3878,11 @@ try_exit: lCount = InterlockedDecrement( &(*Fcb)->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSOpenSpecialShareFcb Decrement count on Fcb %p Cnt %d\n", (*Fcb), - lCount); + lCount)); } AFSReleaseResource( &(*Fcb)->NPFcb->Resource); diff --git a/src/WINNT/afsrdr/kernel/lib/AFSData.cpp b/src/WINNT/afsrdr/kernel/lib/AFSData.cpp index b7b25d4e6..c8098ca99 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSData.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSData.cpp @@ -74,6 +74,8 @@ void *AFSLibCacheBaseAddress = NULL; LARGE_INTEGER AFSLibCacheLength = {0,0}; +PAFSDbgLogMsg AFSDebugTraceFnc = NULL; + // // List of 'special' share names we need to handle // diff --git a/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp index 1d56c3476..b66e605a6 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSDevControl.cpp @@ -95,10 +95,10 @@ AFSDevControl( IN PDEVICE_OBJECT LibDeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSDevControl AFSInitializeLibrary failure %08lX\n", - ntStatus); + ntStatus)); break; } @@ -112,10 +112,10 @@ AFSDevControl( IN PDEVICE_OBJECT LibDeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSDevControl AFSInitializeWorkerPool failure %08lX\n", - ntStatus); + ntStatus)); break; } @@ -129,10 +129,10 @@ AFSDevControl( IN PDEVICE_OBJECT LibDeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSDevControl AFSInitializeGlobalDirectoryEntries failure %08lX\n", - ntStatus); + ntStatus)); break; } @@ -142,10 +142,10 @@ AFSDevControl( IN PDEVICE_OBJECT LibDeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSDevControl AFSInitializeSpecialShareNameList failure %08lX\n", - ntStatus); + ntStatus)); break; } @@ -440,6 +440,16 @@ AFSDevControl( IN PDEVICE_OBJECT LibDeviceObject, break; } + case IOCTL_AFS_CONFIG_LIBRARY_TRACE: + { + + InterlockedCompareExchangePointer( (PVOID *)&AFSDebugTraceFnc, + NULL, + (void *)AFSDbgLogMsg); + + break; + } + default: { // @@ -462,10 +472,10 @@ AFSDevControl( IN PDEVICE_OBJECT LibDeviceObject, ntStatus = STATUS_UNSUCCESSFUL; - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSDevControl %08lX\n", - ulIoControlCode); + ulIoControlCode)); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp index ba335bc10..f69fcfc8f 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSDirControl.cpp @@ -88,9 +88,9 @@ AFSDirControl( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSDirControl\n"); + "EXCEPTION - AFSDirControl\n")); AFSDumpTraceFilesFnc(); } @@ -155,10 +155,10 @@ AFSQueryDirectory( IN PIRP Irp) if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory Attempted access (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -168,12 +168,12 @@ AFSQueryDirectory( IN PIRP Irp) pFcb->Header.NodeTypeCode != AFS_ROOT_ALL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory Attempted access (%p) to non-directory Fcb %p NodeType %u\n", Irp, pFcb, - pFcb->Header.NodeTypeCode); + pFcb->Header.NodeTypeCode)); pFcb = NULL; @@ -218,11 +218,11 @@ AFSQueryDirectory( IN PIRP Irp) ClearFlag( pCcb->Flags, CCB_FLAG_DIRECTORY_QUERY_DIRECT_QUERY); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Enumerating content for parent %wZ Mask %wZ Restart Query\n", &pCcb->DirectoryCB->NameInformation.FileName, - &pCcb->MaskName); + &pCcb->MaskName)); if( pCcb->MaskName.Length > 0 && !FsRtlDoesNameContainWildCards( &pCcb->MaskName)) @@ -244,16 +244,16 @@ AFSQueryDirectory( IN PIRP Irp) if( bInitialQuery) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Enumerating content for parent %wZ Initial Query\n", - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Acquiring Dcb lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -349,11 +349,11 @@ AFSQueryDirectory( IN PIRP Irp) else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory FsRtlDoesNameContainWildCards == FALSE parent %wZ Mask %wZ\n", &pCcb->DirectoryCB->NameInformation.FileName, - puniArgFileName); + puniArgFileName)); RtlCopyMemory( pCcb->MaskName.Buffer, puniArgFileName->Buffer, @@ -375,16 +375,16 @@ AFSQueryDirectory( IN PIRP Irp) else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Enumerating content for parent %wZ Subsequent\n", - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Acquiring Dcb lock %p SHARED %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Resource, TRUE); @@ -426,7 +426,7 @@ AFSQueryDirectory( IN PIRP Irp) if( bNonWildcardMatch) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Processing non-wildcard match directly parent %wZ Mask %wZ FID %08lX-%08lX-%08lX-%08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, @@ -434,7 +434,7 @@ AFSQueryDirectory( IN PIRP Irp) pFcb->ObjectInformation->FileId.Cell, pFcb->ObjectInformation->FileId.Volume, pFcb->ObjectInformation->FileId.Vnode, - pFcb->ObjectInformation->FileId.Unique); + pFcb->ObjectInformation->FileId.Unique)); ntStatus = AFSProcessDirectoryQueryDirect( pFcb, pCcb, @@ -445,14 +445,14 @@ AFSQueryDirectory( IN PIRP Irp) try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Enumerating parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, pFcb->ObjectInformation->FileId.Cell, pFcb->ObjectInformation->FileId.Volume, pFcb->ObjectInformation->FileId.Vnode, - pFcb->ObjectInformation->FileId.Unique); + pFcb->ObjectInformation->FileId.Unique)); ntStatus = AFSEnumerateDirectory( &pCcb->AuthGroup, pFcb->ObjectInformation, @@ -461,7 +461,7 @@ AFSQueryDirectory( IN PIRP Irp) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory Failed to enumerate parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, @@ -469,7 +469,7 @@ AFSQueryDirectory( IN PIRP Irp) pFcb->ObjectInformation->FileId.Volume, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -477,14 +477,14 @@ AFSQueryDirectory( IN PIRP Irp) else if( BooleanFlagOn( pFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, pFcb->ObjectInformation->FileId.Cell, pFcb->ObjectInformation->FileId.Volume, pFcb->ObjectInformation->FileId.Vnode, - pFcb->ObjectInformation->FileId.Unique); + pFcb->ObjectInformation->FileId.Unique)); ntStatus = AFSVerifyEntry( &pCcb->AuthGroup, pCcb->DirectoryCB); @@ -492,7 +492,7 @@ AFSQueryDirectory( IN PIRP Irp) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory Failed to verify parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, @@ -500,7 +500,7 @@ AFSQueryDirectory( IN PIRP Irp) pFcb->ObjectInformation->FileId.Volume, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -521,12 +521,12 @@ AFSQueryDirectory( IN PIRP Irp) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory Snapshot directory failure for parent %wZ Mask %wZ Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, &pCcb->MaskName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -571,12 +571,12 @@ AFSQueryDirectory( IN PIRP Irp) AFSReleaseResource( &pCcb->NPCcb->CcbLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory Snapshot directory failure for parent %wZ Mask %wZ Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, &pCcb->MaskName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -607,12 +607,12 @@ AFSQueryDirectory( IN PIRP Irp) AFSReleaseResource( &pFcb->NPFcb->Resource); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory Init PIOCtl directory failure for parent %wZ Mask %wZ Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, &pCcb->MaskName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -630,11 +630,11 @@ AFSQueryDirectory( IN PIRP Irp) } } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Enumerating content for parent %wZ Mask %wZ\n", &pCcb->DirectoryCB->NameInformation.FileName, - &pCcb->MaskName); + &pCcb->MaskName)); } // Check if we need to start from index @@ -717,11 +717,11 @@ AFSQueryDirectory( IN PIRP Irp) default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory (%p) Unknown FileInformationClass %u\n", Irp, - FileInformationClass); + FileInformationClass)); try_return( ntStatus = STATUS_INVALID_INFO_CLASS); } @@ -741,13 +741,13 @@ AFSQueryDirectory( IN PIRP Irp) lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, pCcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -1004,11 +1004,11 @@ AFSQueryDirectory( IN PIRP Irp) } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Insert into parent %wZ Entry %wZ\n", &pCcb->DirectoryCB->NameInformation.FileName, - &pDirEntry->NameInformation.FileName); + &pDirEntry->NameInformation.FileName)); // Zero the base part of the structure. RtlZeroMemory( &pBuffer[ ulNextEntry], @@ -1102,11 +1102,11 @@ AFSQueryDirectory( IN PIRP Irp) default: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryDirectory (%p) Unknown FileInformationClass %u\n", Irp, - FileInformationClass); + FileInformationClass)); try_return( ntStatus = STATUS_INVALID_INFO_CLASS); } @@ -1149,13 +1149,13 @@ try_exit: lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryDirectory Decrement8 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, pCcb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -1206,10 +1206,10 @@ AFSNotifyChangeDirectory( IN PIRP Irp) if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNotifyChangeDirectory Attempted access (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -1219,11 +1219,11 @@ AFSNotifyChangeDirectory( IN PIRP Irp) pFcb->Header.NodeTypeCode != AFS_ROOT_ALL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNotifyChangeDirectory NodeTypeCode !AFS_DIRECTORY_FCB && !AFS_ROOT_FCB %wZ NodeTypeCode 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, - pFcb->Header.NodeTypeCode); + pFcb->Header.NodeTypeCode)); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -1232,11 +1232,11 @@ AFSNotifyChangeDirectory( IN PIRP Irp) ulCompletionFilter = pIrpSp->Parameters.NotifyDirectory.CompletionFilter; bWatchTree = BooleanFlagOn( pIrpSp->Flags, SL_WATCH_TREE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNotifyChangeDirectory Acquiring Dcb lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -1318,14 +1318,14 @@ AFSLocateNextDirEntry( IN AFSObjectInfoCB *ObjectInfo, pDirEntry = ObjectInfo->Specific.Directory.PIOCtlDirectoryCB; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Returning PIOctl entry %wZ in parent FID %08lX-%08lX-%08lX-%08lX\n", &pDirEntry->NameInformation.FileName, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); } Ccb->CurrentDirIndex++; @@ -1344,14 +1344,14 @@ AFSLocateNextDirEntry( IN AFSObjectInfoCB *ObjectInfo, pDirEntry = AFSGlobalDotDirEntry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Returning1 snapshot entry %wZ in parent FID %08lX-%08lX-%08lX-%08lX\n", &pDirEntry->NameInformation.FileName, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); } else if( Ccb->CurrentDirIndex == (ULONG)AFS_DIR_ENTRY_DOT_DOT_INDEX) { @@ -1362,14 +1362,14 @@ AFSLocateNextDirEntry( IN AFSObjectInfoCB *ObjectInfo, pDirEntry = AFSGlobalDotDotDirEntry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Returning2 snapshot entry %wZ in parent FID %08lX-%08lX-%08lX-%08lX\n", &pDirEntry->NameInformation.FileName, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); } else { @@ -1387,10 +1387,10 @@ AFSLocateNextDirEntry( IN AFSObjectInfoCB *ObjectInfo, ulCount = Ccb->CurrentDirIndex; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry CurrentDirIndex %08lX\n", - ulCount); + ulCount)); // // Get to a valid entry @@ -1401,10 +1401,10 @@ AFSLocateNextDirEntry( IN AFSObjectInfoCB *ObjectInfo, pDirEntry = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Searching for hash %08lX\n", - pSnapshotEntry->NameHash); + pSnapshotEntry->NameHash)); if( pSnapshotEntry->NameHash == 0) { @@ -1423,7 +1423,7 @@ AFSLocateNextDirEntry( IN AFSObjectInfoCB *ObjectInfo, if( pDirEntry != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Returning3 snapshot entry %wZ (%08lX) in parent FID %08lX-%08lX-%08lX-%08lX\n", &pDirEntry->NameInformation.FileName, @@ -1431,32 +1431,32 @@ AFSLocateNextDirEntry( IN AFSObjectInfoCB *ObjectInfo, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Returning3 NO snapshot entry in parent FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); } break; } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Entry %08lX not found in parent FID %08lX-%08lX-%08lX-%08lX\n", pSnapshotEntry->NameHash, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); pSnapshotEntry++; @@ -1473,13 +1473,13 @@ try_exit: lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNextDirEntry Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, Ccb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -1680,7 +1680,7 @@ AFSSnapshotDirectory( IN AFSFcb *Fcb, (ULONG)pDirEntry->CaseSensitiveTreeEntry.HashIndex)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSnapshotDirectory Snapshot (%08lX) Inserting entry %wZ (%08lX) Flags %08lX in parent FID %08lX-%08lX-%08lX-%08lX\n", pSnapshotHdr->EntryCount, @@ -1690,7 +1690,7 @@ AFSSnapshotDirectory( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, - Fcb->ObjectInformation->FileId.Unique); + Fcb->ObjectInformation->FileId.Unique)); pSnapshotEntry->NameHash = (ULONG)pDirEntry->CaseSensitiveTreeEntry.HashIndex; @@ -1699,7 +1699,7 @@ AFSSnapshotDirectory( IN AFSFcb *Fcb, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSnapshotDirectory Snapshot (%08lX) Skipping entry %wZ (%08lX) Flags %08lX in parent FID %08lX-%08lX-%08lX-%08lX\n", pSnapshotHdr->EntryCount, @@ -1709,7 +1709,7 @@ AFSSnapshotDirectory( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, - Fcb->ObjectInformation->FileId.Unique); + Fcb->ObjectInformation->FileId.Unique)); } pDirEntry = (AFSDirectoryCB *)pDirEntry->ListEntry.fLink; @@ -1798,13 +1798,13 @@ AFSFsRtlNotifyFullChangeDirectory( IN AFSObjectInfoCB *ObjectInfo, Ccb->NotifyMask.Length = (USHORT)sztLength; } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NOTIF_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NOTIF_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFsRtlNotifyFullChangeDirectory Registering notification on %wZ Irp %p Filter %08lX Tree %02lX\n", &Ccb->NotifyMask, NotifyIrp, CompletionFilter, - WatchTree); + WatchTree)); FsRtlNotifyFilterChangeDirectory( pDeviceExt->Specific.Control.NotifySync, &pDeviceExt->Specific.Control.DirNotifyList, @@ -1921,7 +1921,7 @@ AFSFsRtlNotifyFullReportChange( IN AFSObjectInfoCB *ParentObjectInfo, usNameOffset = uniName.Length - uniComponentName.Length; - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NOTIF_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NOTIF_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFsRtlNotifyFullReportChange Notification call for %wZ Filter %08lX Action %08lX Offset %08lX Len %08lX CompLen %08lX\n", &uniName, @@ -1929,7 +1929,7 @@ AFSFsRtlNotifyFullReportChange( IN AFSObjectInfoCB *ParentObjectInfo, NotificationAction, usNameOffset, uniName.Length, - uniComponentName.Length); + uniComponentName.Length)); FsRtlNotifyFilterReportChange( pDeviceExt->Specific.Control.NotifySync, &pDeviceExt->Specific.Control.DirNotifyList, @@ -1991,10 +1991,10 @@ AFSIsNameInSnapshot( IN AFSSnapshotHdr *SnapshotHdr, bIsInSnapshot = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSIsNameInSnapshot Hash index %08lX already in snapshot\n", - HashIndex); + HashIndex)); break; } @@ -2046,7 +2046,7 @@ AFSProcessDirectoryQueryDirect( IN AFSFcb *Fcb, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessDirectoryQueryDirect Failed to locate non-wildcard match directly parent %wZ Mask %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, @@ -2055,7 +2055,7 @@ AFSProcessDirectoryQueryDirect( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus = STATUS_NO_SUCH_FILE); } @@ -2116,11 +2116,11 @@ AFSProcessDirectoryQueryDirect( IN AFSFcb *Fcb, default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessDirectoryQueryDirect (%p) Unknown FileInformationClass %u\n", Irp, - pIrpSp->Parameters.QueryDirectory.FileInformationClass); + pIrpSp->Parameters.QueryDirectory.FileInformationClass)); try_return( ntStatus = STATUS_INVALID_INFO_CLASS); } @@ -2216,11 +2216,11 @@ AFSProcessDirectoryQueryDirect( IN AFSFcb *Fcb, default: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessDirectoryQueryDirect (%p) Unknown FileInformationClass %u\n", Irp, - pIrpSp->Parameters.QueryDirectory.FileInformationClass); + pIrpSp->Parameters.QueryDirectory.FileInformationClass)); try_return( ntStatus = STATUS_INVALID_INFO_CLASS); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp b/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp index 2ed0defed..39cdcd26f 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSEa.cpp @@ -63,9 +63,10 @@ AFSQueryEA( IN PDEVICE_OBJECT LibDeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueryEa Entry for FO %p\n", pIrpSp->FileObject); + "AFSQueryEa Entry for FO %p\n", + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -74,9 +75,9 @@ AFSQueryEA( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueryEA\n"); + "EXCEPTION - AFSQueryEA\n")); AFSDumpTraceFilesFnc(); } @@ -109,9 +110,9 @@ AFSSetEA( IN PDEVICE_OBJECT LibDeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSSetEa Entry for FO %p\n", pIrpSp->FileObject); + "AFSSetEa Entry for FO %p\n", pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -120,9 +121,9 @@ AFSSetEA( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetEA\n"); + "EXCEPTION - AFSSetEA\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp index 415751367..5e2c04689 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp @@ -58,11 +58,11 @@ VOID AFSLockForExtentsTrim( IN AFSFcb *Fcb) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockForExtentsTrim Acquiring Fcb extents lock %p EXCL %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &Fcb->NPFcb->Specific.File.ExtentsResource, TRUE ); @@ -76,11 +76,11 @@ BOOLEAN AFSLockForExtentsTrimNoWait( IN AFSFcb *Fcb) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockForExtentsTrimNoWait Attempting to acquire Fcb extent lock %p EXCL %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); if (!AFSAcquireExcl( &Fcb->NPFcb->Specific.File.ExtentsResource, FALSE )) { @@ -88,11 +88,11 @@ AFSLockForExtentsTrimNoWait( IN AFSFcb *Fcb) // Couldn't lock immediately // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockForExtentsTrimNoWait Refused to wait for Fcb extent lock %p EXCL %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); return FALSE; } @@ -265,7 +265,7 @@ AFSTearDownFcbExtents( IN AFSFcb *Fcb, ASSERT( dirtyCount >= 0); } - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSTearDownFcbExtents Releasing extent %p fid %08lX-%08lX-%08lX-%08lX Offset %08lX-%08lX Len %08lX\n", pEntry, @@ -275,7 +275,7 @@ AFSTearDownFcbExtents( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Unique, pEntry->FileOffset.HighPart, pEntry->FileOffset.LowPart, - pEntry->Size); + pEntry->Size)); pRelease->FileExtents[ulReleaseCount].Length = pEntry->Size; pRelease->FileExtents[ulReleaseCount].DirtyLength = pEntry->Size; @@ -336,14 +336,14 @@ AFSTearDownFcbExtents( IN AFSFcb *Fcb, // were released (if AFS_EXTENT_FLAG_RELEASE was set). Log the error so it is known. // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSTearDownFcbExtents AFS_REQUEST_TYPE_RELEASE_FILE_EXTENTS failed fid %08lX-%08lX-%08lX-%08lX Status %08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); } } @@ -385,11 +385,11 @@ try_exit: if (locked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSTearDownFcbExtents Releasing Fcb extent lock %p thread %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &Fcb->NPFcb->Specific.File.ExtentsResource ); } @@ -466,7 +466,7 @@ AFSDeleteFcbExtents( IN AFSFcb *Fcb) ASSERT( dirtyCount >= 0); } - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteFcbExtents Deleting extent %p fid %08lX-%08lX-%08lX-%08lX Offset %08lX-%08lX Len %08lX\n", pEntry, @@ -476,7 +476,7 @@ AFSDeleteFcbExtents( IN AFSFcb *Fcb) Fcb->ObjectInformation->FileId.Unique, pEntry->FileOffset.HighPart, pEntry->FileOffset.LowPart, - pEntry->Size); + pEntry->Size)); AFSFreeExtent( Fcb, pEntry); @@ -521,11 +521,11 @@ try_exit: if (locked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteFcbExtents Releasing Fcb extent lock %p thread %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &Fcb->NPFcb->Specific.File.ExtentsResource ); } @@ -814,9 +814,9 @@ BOOLEAN AFSDoExtentsMapRegion(IN AFSFcb *Fcb, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSDoExtentsMapRegion\n"); + "EXCEPTION - AFSDoExtentsMapRegion\n")); AFSDumpTraceFilesFnc(); } @@ -884,11 +884,11 @@ AFSRequestExtentsAsync( IN AFSFcb *Fcb, // Check if we are already mapped // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRequestExtentsAsync Acquiring Fcb extents lock %p SHARED %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pNPFcb->Specific.File.ExtentsResource, TRUE ); @@ -900,11 +900,11 @@ AFSRequestExtentsAsync( IN AFSFcb *Fcb, KeClearEvent( &pNPFcb->Specific.File.ExtentsRequestComplete ); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRequestExtentsAsync Releasing Fcb extents lock %p SHARED %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource ); @@ -949,7 +949,7 @@ AFSRequestExtentsAsync( IN AFSFcb *Fcb, KeClearEvent( &pNPFcb->Specific.File.ExtentsRequestComplete ); - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRequestExtentsAsync Request extents for fid %08lX-%08lX-%08lX-%08lX Offset %08lX Len %08lX Thread %08lX\n", Fcb->ObjectInformation->FileId.Cell, @@ -958,7 +958,7 @@ AFSRequestExtentsAsync( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Unique, request.ByteOffset.LowPart, request.Length, - PsGetCurrentThread()); + PsGetCurrentThread())); ntStatus = AFSProcessRequest( AFS_REQUEST_TYPE_REQUEST_FILE_EXTENTS, 0, @@ -1039,11 +1039,11 @@ AFSProcessExtentsResult( IN AFSFcb *Fcb, // Grab the extents exclusive for the duration // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentsResult Acquiring Fcb extent lock %p EXCL %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pNPFcb->Specific.File.ExtentsResource, TRUE ); @@ -1194,7 +1194,7 @@ AFSProcessExtentsResult( IN AFSFcb *Fcb, pExtent->CacheOffset = pFileExtents->CacheOffset; pExtent->Size = pFileExtents->Length; - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentsResult Received extent for fid %08lX-%08lX-%08lX-%08lX File Offset %I64X Cache Offset %I64X Len %08lX\n", Fcb->ObjectInformation->FileId.Cell, @@ -1203,7 +1203,7 @@ AFSProcessExtentsResult( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Unique, pFileExtents->FileOffset.QuadPart, pFileExtents->CacheOffset.QuadPart, - pFileExtents->Length); + pFileExtents->Length)); InterlockedExchangeAdd( &pControlDevExt->Specific.Control.ExtentsHeldLength, (LONG)(pExtent->Size/1024)); @@ -1377,11 +1377,11 @@ try_exit: 0, FALSE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentsResult Releasing Fcb extent lock %p EXCL %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource ); } @@ -1403,21 +1403,21 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Acquiring RDR VolumeTreeLock lock %p SHARED %08lX\n", &pDevExt->Specific.RDR.VolumeTreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Set extents for fid %08lX-%08lX-%08lX-%08lX\n", SetExtents->FileId.Cell, SetExtents->FileId.Volume, SetExtents->FileId.Vnode, - SetExtents->FileId.Unique); + SetExtents->FileId.Unique)); // // Locate the volume node @@ -1435,11 +1435,11 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); @@ -1448,14 +1448,14 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) pVolumeCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessSetFileExtents Set extents for fid %08lX-%08lX-%08lX-%08lX Failed to locate volume Status %08lX\n", SetExtents->FileId.Cell, SetExtents->FileId.Volume, SetExtents->FileId.Vnode, SetExtents->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1483,11 +1483,11 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Increment count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -1496,7 +1496,7 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) pObjectInfo == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessSetFileExtents Set extents for hash %I64X fid %08lX-%08lX-%08lX-%08lX Failed to locate file in volume %p\n", ullIndex, @@ -1504,7 +1504,7 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) SetExtents->FileId.Volume, SetExtents->FileId.Vnode, SetExtents->FileId.Unique, - pVolumeCB); + pVolumeCB)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1518,20 +1518,20 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) if( SetExtents->ResultStatus != STATUS_SUCCESS) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessSetFileExtents Set extents failure fid %08lX-%08lX-%08lX-%08lX ResultStatus %08lX\n", SetExtents->FileId.Cell, SetExtents->FileId.Volume, SetExtents->FileId.Vnode, SetExtents->FileId.Unique, - SetExtents->ResultStatus); + SetExtents->ResultStatus)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Acquiring Fcb extents lock %p EXCL %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -1542,11 +1542,11 @@ AFSProcessSetFileExtents( IN AFSSetFileExtentsCB *SetExtents ) 0, FALSE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Releasing Fcb extent lock %p EXCL %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource); @@ -1565,11 +1565,11 @@ try_exit: lCount = AFSObjectInfoDecrement( pObjectInfo, AFS_OBJECT_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Decrement count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } if ( pVolumeCB) @@ -1578,11 +1578,11 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessSetFileExtents Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } } @@ -1614,9 +1614,9 @@ AFSReleaseSpecifiedExtents( IN AFSReleaseFileExtentsCB *Extents, if (BufferSize < (Extents->ExtentCount * sizeof( AFSFileExtentCB))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSReleaseSpecifiedExtents Buffer too small\n"); + "AFSReleaseSpecifiedExtents Buffer too small\n")); try_return( ntStatus = STATUS_BUFFER_TOO_SMALL); } @@ -1682,11 +1682,11 @@ AFSReleaseSpecifiedExtents( IN AFSReleaseFileExtentsCB *Extents, // We don't have the extent asked for so return UNKNOWN // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseSpecifiedExtents Located UNKNOWN extent Offset %I64X Len %08lX\n", Extents->FileExtents[ulExtentCount].FileOffset.QuadPart, - Extents->FileExtents[ulExtentCount].Length); + Extents->FileExtents[ulExtentCount].Length)); FileExtents[*ExtentCount].Flags = AFS_EXTENT_FLAG_UNKNOWN; @@ -1709,11 +1709,11 @@ AFSReleaseSpecifiedExtents( IN AFSReleaseFileExtentsCB *Extents, else if( pExtent->ActiveCount > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseSpecifiedExtents Located IN_USE extent Offset %I64X Len %08lX\n", Extents->FileExtents[ulExtentCount].FileOffset.QuadPart, - Extents->FileExtents[ulExtentCount].Length); + Extents->FileExtents[ulExtentCount].Length)); FileExtents[*ExtentCount].Flags = AFS_EXTENT_FLAG_IN_USE; @@ -1758,7 +1758,7 @@ AFSReleaseSpecifiedExtents( IN AFSReleaseFileExtentsCB *Extents, FileExtents[*ExtentCount].CacheOffset = pExtent->CacheOffset; FileExtents[*ExtentCount].FileOffset = pExtent->FileOffset; - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseSpecifiedExtents Releasing extent %p fid %08lX-%08lX-%08lX-%08lX Offset %I64X Len %08lX\n", pExtent, @@ -1767,7 +1767,7 @@ AFSReleaseSpecifiedExtents( IN AFSReleaseFileExtentsCB *Extents, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, FileExtents[*ExtentCount].FileOffset.QuadPart, - FileExtents[*ExtentCount].Length); + FileExtents[*ExtentCount].Length)); if( BooleanFlagOn( pExtent->Flags, AFS_EXTENT_DIRTY)) { @@ -1827,11 +1827,11 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) pRDRDeviceExt = (AFSDeviceExt *)AFSRDRDeviceObject->DeviceExtension; pControlDeviceExt = (AFSDeviceExt *)AFSControlDeviceObject->DeviceExtension; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Acquiring RDR VolumeListLock lock %p SHARED %08lX\n", &pRDRDeviceExt->Specific.RDR.VolumeListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pRDRDeviceExt->Specific.RDR.VolumeListLock, TRUE); @@ -1850,21 +1850,21 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); AFSReleaseResource( &pRDRDeviceExt->Specific.RDR.VolumeListLock); bReleaseVolumeListLock = FALSE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Acquiring VolumeRoot ObjectInfoTree lock %p SHARED %08lX\n", pVolumeCB->ObjectInfoTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( pVolumeCB->ObjectInfoTree.TreeLock, TRUE); @@ -1872,11 +1872,11 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); if( NULL == LastFcb) { @@ -1931,11 +1931,11 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) if( pFcb->Specific.File.ExtentCount == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Releasing Fcb extent lock %p thread %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource); @@ -1949,11 +1949,11 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) if( pFcb->Specific.File.QueuedFlushCount > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Releasing Fcb extent lock %p thread %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource(&pFcb->NPFcb->Specific.File.ExtentsResource); @@ -1975,11 +1975,11 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) if( pFcb->OpenHandleCount > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Releasing Fcb extent lock %p thread %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource(&pFcb->NPFcb->Specific.File.ExtentsResource); @@ -1997,12 +1997,12 @@ AFSFindFcbToClean(ULONG IgnoreTime, AFSFcb *LastFcb, BOOLEAN Block) lCount = AFSObjectInfoIncrement( pFcb->ObjectInformation, AFS_OBJECT_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSFindFcbToClean Increment count on Fcb %p object %pCnt %d\n", pFcb, pFcb->ObjectInformation, - lCount); + lCount)); bLocatedEntry = TRUE; @@ -2055,23 +2055,23 @@ AFSProcessExtentFailure( PIRP Irp) if( pIrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof( AFSExtentFailureCB)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessExtentFailure Input buffer too small\n"); + "AFSProcessExtentFailure Input buffer too small\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER); } pFailureCB = (AFSExtentFailureCB *)Irp->AssociatedIrp.SystemBuffer; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessExtentFailure Service Reports Failure fid %08lX-%08lX-%08lX-%08lX Status %08lX\n", pFailureCB->FileId.Cell, pFailureCB->FileId.Volume, pFailureCB->FileId.Vnode, pFailureCB->FileId.Unique, - pFailureCB->FailureStatus); + pFailureCB->FailureStatus)); AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock, TRUE); @@ -2091,11 +2091,11 @@ AFSProcessExtentFailure( PIRP Irp) lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); @@ -2104,19 +2104,19 @@ AFSProcessExtentFailure( PIRP Irp) pVolumeCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessExtentFailure Invalid volume index %I64X status %08X\n", - ullIndex, ntStatus); + ullIndex, ntStatus)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Acquiring VolumeRoot FileIDTree.TreeLock lock %p SHARED %08lX\n", pVolumeCB->ObjectInfoTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( pVolumeCB->ObjectInfoTree.TreeLock, TRUE); @@ -2142,11 +2142,11 @@ AFSProcessExtentFailure( PIRP Irp) lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Increment count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -2158,27 +2158,27 @@ AFSProcessExtentFailure( PIRP Irp) if( pObjectInfo == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessExtentFailure Invalid file index %I64X\n", - ullIndex); + ullIndex)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessExtentFailure Fcb dealocated for %I64X\n", - ullIndex); + ullIndex)); } try_return( ntStatus = STATUS_UNSUCCESSFUL); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Acquiring Fcb extent lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -2193,22 +2193,22 @@ AFSProcessExtentFailure( PIRP Irp) 0, FALSE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Releasing Fcb extent lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource); lCount = AFSObjectInfoDecrement( pObjectInfo, AFS_OBJECT_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Decrement count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); try_exit: @@ -2218,11 +2218,11 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessExtentFailure Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } } @@ -2259,9 +2259,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) sizeof( AFSReleaseFileExtentsCB)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessReleaseFileExtents INPUT Buffer too small\n"); + "AFSProcessReleaseFileExtents INPUT Buffer too small\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER ); } @@ -2270,9 +2270,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) sizeof(AFSReleaseFileExtentsResultCB)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessReleaseFileExtents OUTPUT Buffer too small [1]\n"); + "AFSProcessReleaseFileExtents OUTPUT Buffer too small [1]\n")); // // Must have space for one extent in one file @@ -2284,9 +2284,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) if (pExtents->ExtentCount == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessReleaseFileExtents Extent count zero\n"); + "AFSProcessReleaseFileExtents Extent count zero\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -2297,13 +2297,13 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) pExtents->FileId.Unique != 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Processing FID %08lX:%08lX:%08lX:%08lX\n", pExtents->FileId.Cell, pExtents->FileId.Volume, pExtents->FileId.Vnode, - pExtents->FileId.Unique); + pExtents->FileId.Unique)); if( pIrpSp->Parameters.DeviceIoControl.InputBufferLength < ( FIELD_OFFSET( AFSReleaseFileExtentsCB, ExtentCount) + sizeof(ULONG)) || @@ -2312,22 +2312,22 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) sizeof (AFSFileExtentCB) * pExtents->ExtentCount)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessReleaseFileExtents Buffer too small for FID %08lX:%08lx:%08lX:%08lX\n", pExtents->FileId.Cell, pExtents->FileId.Volume, pExtents->FileId.Vnode, - pExtents->FileId.Unique); + pExtents->FileId.Unique)); try_return( ntStatus = STATUS_INVALID_PARAMETER ); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Acquiring RDR VolumeTreeLock lock %p SHARED %08lX\n", &pDevExt->Specific.RDR.VolumeTreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock, TRUE); @@ -2347,11 +2347,11 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); @@ -2360,19 +2360,19 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) pVolumeCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessReleaseFileExtents Invalid volume index %I64X status %08X\n", - ullIndex, ntStatus); + ullIndex, ntStatus)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Acquiring VolumeRoot FileIDTree.TreeLock lock %p SHARED %08lX\n", pVolumeCB->ObjectInfoTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( pVolumeCB->ObjectInfoTree.TreeLock, TRUE); @@ -2397,11 +2397,11 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Increment count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -2410,10 +2410,10 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) pObjectInfo == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessReleaseFileExtents Invalid file index %I64X\n", - ullIndex); + ullIndex)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -2423,13 +2423,13 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessReleaseFileExtents Fcb not initialied (NO EXTENTS) for FID %08lX:%08lx:%08lX:%08lX\n", pExtents->FileId.Cell, pExtents->FileId.Volume, pExtents->FileId.Vnode, - pExtents->FileId.Unique); + pExtents->FileId.Unique)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -2445,9 +2445,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) // Locate an Fcb to trim down // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSProcessReleaseFileExtents Searching for a Fcb to Trim Down\n"); + "AFSProcessReleaseFileExtents Searching for a Fcb to Trim Down\n")); pFcb = AFSFindFcbToClean( 0, NULL, FALSE); @@ -2460,9 +2460,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessReleaseFileExtents Failed to locate Fcb for release ...\n"); + "AFSProcessReleaseFileExtents Failed to locate Fcb for release ...\n")); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -2481,9 +2481,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) if (ulSz > pIrpSp->Parameters.DeviceIoControl.OutputBufferLength) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessReleaseFileExtents OUTPUT Buffer too small [2]\n"); + "AFSProcessReleaseFileExtents OUTPUT Buffer too small [2]\n")); try_return( ntStatus = STATUS_BUFFER_TOO_SMALL ); } @@ -2494,9 +2494,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) if (NULL == pResult) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSProcessReleaseFileExtents Failed to allocate result block\n"); + "AFSProcessReleaseFileExtents Failed to allocate result block\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES ); } @@ -2558,10 +2558,10 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessReleaseFileExtents Failed to release extents Status %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus ); } @@ -2569,9 +2569,9 @@ AFSProcessReleaseFileExtents( IN PIRP Irp) if( pExtents->ExtentCount == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessReleaseFileExtents Failed to release ANY extents\n"); + "AFSProcessReleaseFileExtents Failed to release ANY extents\n")); } ulSz = sizeof(AFSReleaseFileExtentsResultCB); @@ -2590,11 +2590,11 @@ try_exit: if( bLocked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Releasing Fcb extent lock %p thread %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); } @@ -2623,11 +2623,11 @@ try_exit: lCount = AFSObjectInfoDecrement( pObjectInfo, AFS_OBJECT_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Decrement count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } if ( pVolumeCB) @@ -2636,11 +2636,11 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_EXTENTS); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessReleaseFileExtents Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } } @@ -2899,7 +2899,7 @@ AFSFlushExtents( IN AFSFcb *Fcb, pRelease->FileExtents[count].Flags |= AFS_EXTENT_FLAG_MD5_SET; #endif - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFlushExtents Releasing DIRTY extent %p fid %08lX-%08lX-%08lX-%08lX Offset %I64X Len %08lX\n", pExtent, @@ -2908,7 +2908,7 @@ AFSFlushExtents( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, pExtent->FileOffset.QuadPart, - pExtent->Size); + pExtent->Size)); pRelease->FileExtents[count].Flags |= AFS_EXTENT_FLAG_RELEASE; @@ -2929,9 +2929,9 @@ AFSFlushExtents( IN AFSFcb *Fcb, if( count == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSFlushExtents No more dirty extents found\n"); + "AFSFlushExtents No more dirty extents found\n")); break; } @@ -2944,11 +2944,11 @@ AFSFlushExtents( IN AFSFcb *Fcb, pRelease->ExtentCount = count; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFlushExtents Releasing(1) Fcb extents lock %p SHARED %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource); bExtentsLocked = FALSE; @@ -2977,14 +2977,14 @@ AFSFlushExtents( IN AFSFcb *Fcb, // were released (if AFS_EXTENT_FLAG_RELEASE was set). Log the error so it is known. // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSFlushExtents AFS_REQUEST_TYPE_RELEASE_FILE_EXTENTS failed fid %08lX-%08lX-%08lX-%08lX Status %08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); } @@ -3014,11 +3014,11 @@ try_exit: if (bExtentsLocked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFlushExtents Releasing(2) Fcb extents lock %p SHARED %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource ); } @@ -3154,7 +3154,7 @@ AFSReleaseExtentsWithFlush( IN AFSFcb *Fcb, pRelease->FileExtents[count].Flags = AFS_EXTENT_FLAG_RELEASE; - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseExtentsWithFlush Releasing extent %p fid %08lX-%08lX-%08lX-%08lX Offset %I64X Len %08lX\n", pExtent, @@ -3163,7 +3163,7 @@ AFSReleaseExtentsWithFlush( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, pExtent->FileOffset.QuadPart, - pExtent->Size); + pExtent->Size)); pRelease->FileExtents[count].Length = pExtent->Size; pRelease->FileExtents[count].DirtyLength = pExtent->Size; @@ -3212,9 +3212,9 @@ AFSReleaseExtentsWithFlush( IN AFSFcb *Fcb, if( count == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSReleaseExtentsWithFlush No more dirty extents found\n"); + "AFSReleaseExtentsWithFlush No more dirty extents found\n")); break; } @@ -3235,11 +3235,11 @@ AFSReleaseExtentsWithFlush( IN AFSFcb *Fcb, // le. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseExtentsWithFlush Releasing Fcb extents lock %p thread %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource); bExtentsLocked = FALSE; @@ -3264,14 +3264,14 @@ AFSReleaseExtentsWithFlush( IN AFSFcb *Fcb, // were released (if AFS_EXTENT_FLAG_RELEASE was set). Log the error so it is known. // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSReleaseExtentsWithFlush AFS_REQUEST_TYPE_RELEASE_FILE_EXTENTS failed fid %08lX-%08lX-%08lX-%08lX Status %08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); } } @@ -3280,11 +3280,11 @@ try_exit: if (bExtentsLocked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseExtentsWithFlush Releasing Fcb extents lock %p thread %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource ); } @@ -3407,7 +3407,7 @@ AFSReleaseCleanExtents( IN AFSFcb *Fcb, pRelease->FileExtents[count].Flags = AFS_EXTENT_FLAG_RELEASE; - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseCleanExtents Releasing extent %p fid %08lX-%08lX-%08lX-%08lX Offset %I64X Len %08lX\n", pExtent, @@ -3416,7 +3416,7 @@ AFSReleaseCleanExtents( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, pExtent->FileOffset.QuadPart, - pExtent->Size); + pExtent->Size)); pRelease->FileExtents[count].Length = pExtent->Size; pRelease->FileExtents[count].DirtyLength = pExtent->Size; @@ -3445,9 +3445,9 @@ AFSReleaseCleanExtents( IN AFSFcb *Fcb, if( count == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSReleaseCleanExtents No more dirty extents found\n"); + "AFSReleaseCleanExtents No more dirty extents found\n")); break; } @@ -3468,11 +3468,11 @@ AFSReleaseCleanExtents( IN AFSFcb *Fcb, // le. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseCleanExtents Releasing Fcb extents lock %p thread %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource); bExtentsLocked = FALSE; @@ -3497,14 +3497,14 @@ AFSReleaseCleanExtents( IN AFSFcb *Fcb, // were released (if AFS_EXTENT_FLAG_RELEASE was set). Log the error so it is known. // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSReleaseCleanExtents AFS_REQUEST_TYPE_RELEASE_FILE_EXTENTS failed fid %08lX-%08lX-%08lX-%08lX Status %08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); } } @@ -3513,11 +3513,11 @@ try_exit: if (bExtentsLocked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseCleanExtents Releasing Fcb extents lock %p thread %08lX\n", &pNPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->Specific.File.ExtentsResource ); } @@ -3546,11 +3546,11 @@ AFSMarkDirty( IN AFSFcb *Fcb, BOOLEAN bInsertTail = FALSE, bInsertHead = FALSE; LONG lCount; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSMarkDirty Acquiring Fcb extents lock %p SHARED %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); ASSERT( ExIsResourceAcquiredLite( &pNPFcb->Specific.File.ExtentsResource)); @@ -3600,11 +3600,11 @@ AFSMarkDirty( IN AFSFcb *Fcb, if( !BooleanFlagOn( pExtent->Flags, AFS_EXTENT_DIRTY)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSMarkDirty Marking extent offset %I64X Length %08lX DIRTY\n", pExtent->FileOffset.QuadPart, - pExtent->Size); + pExtent->Size)); pExtent->DirtyList.fLink = NULL; pExtent->DirtyList.bLink = NULL; @@ -3679,11 +3679,11 @@ AFSMarkDirty( IN AFSFcb *Fcb, pCurrentExtent = pExtent; } - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_ACTIVE_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_ACTIVE_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSMarkDirty Decrement count on extent %08lX Cnt %d\n", pExtent, - pExtent->ActiveCount); + pExtent->ActiveCount)); if( DerefExtents) { @@ -3699,20 +3699,20 @@ AFSMarkDirty( IN AFSFcb *Fcb, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSMarkDirty\n"); + "EXCEPTION - AFSMarkDirty\n")); AFSDumpTraceFilesFnc(); } AFSReleaseResource( &pNPFcb->Specific.File.DirtyExtentsListLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSMarkDirty Releasing Fcb extents lock %p SHARED %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); return; } @@ -3920,7 +3920,7 @@ AFSTrimExtents( IN AFSFcb *Fcb, AFSReleaseResource( &pNPFcb->Specific.File.DirtyExtentsListLock); } - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSTrimExtents Releasing extent %p fid %08lX-%08lX-%08lX-%08lX Offset %I64X Len %08lX\n", pExtent, @@ -3929,7 +3929,7 @@ AFSTrimExtents( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, pExtent->FileOffset.QuadPart, - pExtent->Size); + pExtent->Size)); ASSERT( pExtent->ActiveCount == 0); @@ -3949,11 +3949,11 @@ try_exit: if (locked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSTrimExtents Releasing Fcb extents lock %p thread %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &Fcb->NPFcb->Specific.File.ExtentsResource ); } @@ -4017,7 +4017,7 @@ AFSTrimSpecifiedExtents( IN AFSFcb *Fcb, } - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSTrimSpecifiedExtents Releasing extent %p fid %08lX-%08lX-%08lX-%08lX Offset %I64X Len %08lX\n", pExtent, @@ -4026,7 +4026,7 @@ AFSTrimSpecifiedExtents( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, pExtent->FileOffset.QuadPart, - pExtent->Size); + pExtent->Size)); ASSERT( pExtent->ActiveCount == 0); @@ -4070,11 +4070,11 @@ AFSReferenceActiveExtents( IN AFSExtent *StartExtent, lCount = InterlockedIncrement( &pExtent->ActiveCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_ACTIVE_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_ACTIVE_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSReferenceActiveExtents Increment count on extent %08lX Cnt %d\n", pExtent, - lCount); + lCount)); pExtent = pNextExtent; @@ -4103,11 +4103,11 @@ AFSDereferenceActiveExtents( IN AFSExtent *StartExtent, lCount = InterlockedDecrement( &pExtent->ActiveCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_ACTIVE_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_ACTIVE_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSDereferenceActiveExtents Decrement count on extent %08lX Cnt %d\n", pExtent, - lCount); + lCount)); pExtent = pNextExtent; @@ -4285,11 +4285,11 @@ AFSSetupMD5Hash( IN AFSFcb *Fcb, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetupMD5Hash Acquiring Fcb extents lock %p SHARED %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &Fcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -4412,19 +4412,19 @@ AFSSetupMD5Hash( IN AFSFcb *Fcb, liByteOffset.QuadPart += ulCurrentLen; } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetupMD5Hash Releasing Fcb extents lock %p SHARED %08lX\n", &Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); } __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetupMD5Hash\n"); + "EXCEPTION - AFSSetupMD5Hash\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSFSControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSFSControl.cpp index 9950fa105..991e40de9 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSFSControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSFSControl.cpp @@ -79,9 +79,9 @@ AFSFSControl( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSFSControl\n"); + "EXCEPTION - AFSFSControl\n")); AFSDumpTraceFilesFnc(); } @@ -175,9 +175,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) pCcb->DirectoryCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Invalid Fcb\n"); + "AFSProcessUserFsRequest Invalid Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -226,9 +226,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) case FSCTL_LOCK_VOLUME: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_LOCK_VOLUME request\n"); + "AFSProcessUserFsRequest Processing FSCTL_LOCK_VOLUME request\n")); ntStatus = STATUS_NOT_IMPLEMENTED; @@ -237,9 +237,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) case FSCTL_UNLOCK_VOLUME: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_UNLOCK_VOLUME request\n"); + "AFSProcessUserFsRequest Processing FSCTL_UNLOCK_VOLUME request\n")); ntStatus = STATUS_NOT_IMPLEMENTED; @@ -248,9 +248,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) case FSCTL_DISMOUNT_VOLUME: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_DISMOUNT_VOLUME request\n"); + "AFSProcessUserFsRequest Processing FSCTL_DISMOUNT_VOLUME request\n")); ntStatus = STATUS_NOT_IMPLEMENTED; @@ -259,9 +259,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) case FSCTL_MARK_VOLUME_DIRTY: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_MARK_VOLUME_DIRTY request\n"); + "AFSProcessUserFsRequest Processing FSCTL_MARK_VOLUME_DIRTY request\n")); ntStatus = STATUS_NOT_IMPLEMENTED; @@ -270,9 +270,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) case FSCTL_IS_VOLUME_DIRTY: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_IS_VOLUME_DIRTY request\n"); + "AFSProcessUserFsRequest Processing FSCTL_IS_VOLUME_DIRTY request\n")); ntStatus = STATUS_NOT_IMPLEMENTED; @@ -281,9 +281,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) case FSCTL_IS_VOLUME_MOUNTED: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_IS_VOLUME_MOUNTED request\n"); + "AFSProcessUserFsRequest Processing FSCTL_IS_VOLUME_MOUNTED request\n")); ntStatus = STATUS_NOT_IMPLEMENTED; @@ -292,9 +292,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) case FSCTL_IS_PATHNAME_VALID: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_IS_PATHNAME_VALID request\n"); + "AFSProcessUserFsRequest Processing FSCTL_IS_PATHNAME_VALID request\n")); ntStatus = STATUS_SUCCESS; @@ -306,9 +306,9 @@ AFSProcessUserFsRequest( IN PIRP Irp) #endif case FSCTL_CSC_INTERNAL: { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing FSCTL_CSC_INTERNAL request\n"); + "AFSProcessUserFsRequest Processing FSCTL_CSC_INTERNAL request\n")); ntStatus = STATUS_INVALID_DEVICE_REQUEST; @@ -325,12 +325,12 @@ AFSProcessUserFsRequest( IN PIRP Irp) BOOLEAN bRelative = FALSE; WCHAR * PathBuffer = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSProcessUserFsRequest Processing FSCTL_GET_REPARSE_POINT request %wZ Type 0x%x Attrib 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, - pCcb->DirectoryCB->ObjectInformation->FileAttributes); + pCcb->DirectoryCB->ObjectInformation->FileAttributes)); // // Check if we have the reparse entry set on the entry @@ -399,14 +399,14 @@ AFSProcessUserFsRequest( IN PIRP Irp) SetFlag( pCcb->DirectoryCB->ObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessUserFsRequest Verifying symlink %wZ FID %08lX-%08lX-%08lX-%08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileId.Cell, pCcb->DirectoryCB->ObjectInformation->FileId.Volume, pCcb->DirectoryCB->ObjectInformation->FileId.Vnode, - pCcb->DirectoryCB->ObjectInformation->FileId.Unique); + pCcb->DirectoryCB->ObjectInformation->FileId.Unique)); ntStatus = AFSVerifyEntry( &pCcb->AuthGroup, pCcb->DirectoryCB); @@ -414,7 +414,7 @@ AFSProcessUserFsRequest( IN PIRP Irp) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessUserFsRequest Failed to verify symlink %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, @@ -422,7 +422,7 @@ AFSProcessUserFsRequest( IN PIRP Irp) pCcb->DirectoryCB->ObjectInformation->FileId.Volume, pCcb->DirectoryCB->ObjectInformation->FileId.Vnode, pCcb->DirectoryCB->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); AFSReleaseResource( &pCcb->DirectoryCB->NonPaged->Lock); @@ -674,12 +674,12 @@ AFSProcessUserFsRequest( IN PIRP Irp) ULONGLONG ullIndex = 0; LONG lCount; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessUserFsRequest Processing FSCTL_SET_REPARSE_POINT request %wZ Type 0x%x Attrib 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, - pCcb->DirectoryCB->ObjectInformation->FileAttributes); + pCcb->DirectoryCB->ObjectInformation->FileAttributes)); if( ulInputBufferLen < FIELD_OFFSET( REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer.DataBuffer)) { @@ -791,10 +791,10 @@ AFSProcessUserFsRequest( IN PIRP Irp) uniTargetName.Buffer = (WCHAR *)((char *)pReparseBuffer->MountPointReparseBuffer.PathBuffer + pReparseBuffer->MountPointReparseBuffer.PrintNameOffset); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSProcessUserFsRequest IO_REPARSE_TAG_MOUNT_POINT request %wZ\n", - &uniTargetName); + &uniTargetName)); ntStatus = STATUS_IO_REPARSE_DATA_INVALID; @@ -812,10 +812,10 @@ AFSProcessUserFsRequest( IN PIRP Irp) uniTargetName.Buffer = (WCHAR *)((char *)pReparseBuffer->SymbolicLinkReparseBuffer.PathBuffer + pReparseBuffer->SymbolicLinkReparseBuffer.SubstituteNameOffset); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSProcessUserFsRequest IO_REPARSE_TAG_SYMLINK request %wZ\n", - &uniTargetName); + &uniTargetName)); break; } @@ -856,11 +856,11 @@ AFSProcessUserFsRequest( IN PIRP Irp) lCount = AFSObjectInfoIncrement( pParentObjectInfo, AFS_OBJECT_REFERENCE_DIRENTRY); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessUserFsRequest Increment count on object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); } AFSReleaseResource( pCcb->DirectoryCB->ObjectInformation->VolumeCB->ObjectInfoTree.TreeLock); @@ -875,22 +875,22 @@ AFSProcessUserFsRequest( IN PIRP Irp) pCcb->DirectoryCB->ObjectInformation, &uniTargetName); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSProcessUserFsRequest Processed FSCTL_SET_REPARSE_POINT request %wZ Type 0x%x Attrib 0x%x Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, pCcb->DirectoryCB->ObjectInformation->FileAttributes, - ntStatus); + ntStatus)); lCount = AFSObjectInfoDecrement( pParentObjectInfo, AFS_OBJECT_REFERENCE_DIRENTRY); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessUserFsRequest Decrement count on object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); break; } @@ -900,12 +900,12 @@ AFSProcessUserFsRequest( IN PIRP Irp) REPARSE_GUID_DATA_BUFFER *pReparseBuffer = (REPARSE_GUID_DATA_BUFFER *)Irp->AssociatedIrp.SystemBuffer; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSProcessUserFsRequest Processing FSCTL_DELETE_REPARSE_POINT request %wZ Type 0x%x Attrib 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, - pCcb->DirectoryCB->ObjectInformation->FileAttributes); + pCcb->DirectoryCB->ObjectInformation->FileAttributes)); // // Check if we have the reparse entry set on the entry @@ -975,9 +975,10 @@ AFSProcessUserFsRequest( IN PIRP Irp) default : { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, - "AFSProcessUserFsRequest Processing default (%08lX) request\n", ulFsControlCode); + "AFSProcessUserFsRequest Processing default (%08lX) request\n", + ulFsControlCode)); ntStatus = STATUS_INVALID_DEVICE_REQUEST; @@ -1019,10 +1020,10 @@ AFSProcessShareFsCtrl( IN IRP *Irp, case FSCTL_PIPE_TRANSCEIVE: { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessShareFsCtrl On pipe %wZ Class FSCTL_PIPE_TRANSCEIVE\n", - &Ccb->DirectoryCB->NameInformation.FileName); + &Ccb->DirectoryCB->NameInformation.FileName)); ntStatus = AFSNotifyPipeTransceive( Ccb, ulInputBufferLen, @@ -1034,11 +1035,11 @@ AFSProcessShareFsCtrl( IN IRP *Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessShareFsCtrl Failure on pipe %wZ Class FSCTL_PIPE_TRANSCEIVE Status %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); } break; diff --git a/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp index 6c771b782..c0a124f9a 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSFcbSupport.cpp @@ -81,14 +81,14 @@ AFSInitFcb( IN AFSDirectoryCB *DirEntry) // Allocate the Fcb and the nonpaged portion of the Fcb. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSInitFcb Initializing fcb for %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); usFcbLength = sizeof( AFSFcb); @@ -99,9 +99,9 @@ AFSInitFcb( IN AFSDirectoryCB *DirEntry) if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitFcb Failed to allocate fcb\n"); + "AFSInitFcb Failed to allocate fcb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -118,9 +118,9 @@ AFSInitFcb( IN AFSDirectoryCB *DirEntry) if( pNPFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitFcb Failed to allocate non-paged fcb\n"); + "AFSInitFcb Failed to allocate non-paged fcb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -156,11 +156,11 @@ AFSInitFcb( IN AFSDirectoryCB *DirEntry) // Grab the Fcb for processing // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitFcb Acquiring Fcb lock %p EXCL %08lX\n", &pNPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pNPFcb->Resource, TRUE); @@ -277,18 +277,18 @@ AFSInitFcb( IN AFSDirectoryCB *DirEntry) if ( InterlockedCompareExchangePointer( (PVOID *)&pObjectInfo->Fcb, pFcb, NULL) != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInitFcb Raced Fcb %p pFcb %p Name %wZ\n", pObjectInfo->Fcb, pFcb, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitFcb Acquiring Fcb lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->NonPagedInfo->ObjectInfoLock); @@ -300,11 +300,11 @@ AFSInitFcb( IN AFSDirectoryCB *DirEntry) AFSReleaseResource( &pObjectInfo->NonPagedInfo->ObjectInfoLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitFcb Initialized Fcb %p Name %wZ\n", &pObjectInfo->Fcb, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); try_exit: @@ -314,10 +314,10 @@ try_exit: if ( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitFcb Failed to initialize fcb Status %08lX\n", - ntStatus); + ntStatus)); } if( pFcb != NULL) @@ -399,10 +399,10 @@ AFSInitVolume( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitVolume AFSRetrieveVolumeInformation(RootFid) failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -436,12 +436,12 @@ AFSInitVolume( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitVolume Increment count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); AFSReleaseResource( pDeviceExt->Specific.RDR.VolumeTree.TreeLock); @@ -476,9 +476,9 @@ AFSInitVolume( IN GUID *AuthGroup, if( pVolumeCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitVolume Failed to allocate the root volume cb\n"); + "AFSInitVolume Failed to allocate the root volume cb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -497,9 +497,9 @@ AFSInitVolume( IN GUID *AuthGroup, if( pNonPagedVcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitVolume Failed to allocate the root non paged volume cb\n"); + "AFSInitVolume Failed to allocate the root non paged volume cb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -518,9 +518,9 @@ AFSInitVolume( IN GUID *AuthGroup, if( pNonPagedObject == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitVolume Failed to allocate the root non paged object cb\n"); + "AFSInitVolume Failed to allocate the root non paged object cb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -545,12 +545,12 @@ AFSInitVolume( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitVolume Initializing volume %p Reason %u count %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); AFSAcquireExcl( pVolumeCB->VolumeLock, TRUE); @@ -565,10 +565,10 @@ AFSInitVolume( IN GUID *AuthGroup, try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitVolume AFS_DIR_ENTRY_TAG allocated %p\n", - pVolumeCB->DirectoryCB); + pVolumeCB->DirectoryCB)); pNonPagedDirEntry = (AFSNonPagedDirectoryCB *)AFSExAllocatePoolWithTag( NonPagedPool, sizeof( AFSNonPagedDirectoryCB), @@ -717,10 +717,10 @@ try_exit: if( pVolumeCB->DirectoryCB != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitVolume AFS_DIR_ENTRY_TAG deallocating %p\n", - pVolumeCB->DirectoryCB); + pVolumeCB->DirectoryCB)); AFSExFreePoolWithTag( pVolumeCB->DirectoryCB, AFS_DIR_ENTRY_TAG); } @@ -835,10 +835,10 @@ AFSRemoveVolume( IN AFSVolumeCB *VolumeCB) AFSExFreePoolWithTag( VolumeCB->ObjectInformation.Specific.Directory.PIOCtlDirectoryCB->NonPaged, AFS_DIR_ENTRY_NP_TAG); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveVolume (pioctl) AFS_DIR_ENTRY_TAG deallocating %p\n", - VolumeCB->ObjectInformation.Specific.Directory.PIOCtlDirectoryCB); + VolumeCB->ObjectInformation.Specific.Directory.PIOCtlDirectoryCB)); AFSExFreePoolWithTag( VolumeCB->ObjectInformation.Specific.Directory.PIOCtlDirectoryCB, AFS_DIR_ENTRY_TAG); } @@ -893,10 +893,10 @@ AFSRemoveVolume( IN AFSVolumeCB *VolumeCB) AFSExFreePoolWithTag( VolumeCB->DirectoryCB->NonPaged, AFS_DIR_ENTRY_NP_TAG); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveVolume AFS_DIR_ENTRY_TAG deallocating %p\n", - VolumeCB->DirectoryCB); + VolumeCB->DirectoryCB)); AFSExFreePoolWithTag( VolumeCB->DirectoryCB, AFS_DIR_ENTRY_TAG); } @@ -975,9 +975,9 @@ AFSInitRootFcb( IN ULONGLONG ProcessID, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitRootFcb Failed to allocate the root fcb\n"); + "AFSInitRootFcb Failed to allocate the root fcb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -996,9 +996,9 @@ AFSInitRootFcb( IN ULONGLONG ProcessID, if( pNPFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitRootFcb Failed to allocate the non-paged fcb\n"); + "AFSInitRootFcb Failed to allocate the non-paged fcb\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -1026,11 +1026,11 @@ AFSInitRootFcb( IN ULONGLONG ProcessID, ExInitializeResourceLite( &pNPFcb->CcbListLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitRootFcb Acquiring Fcb lock %p EXCL %08lX\n", &pNPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pNPFcb->Resource, TRUE); @@ -1059,17 +1059,17 @@ AFSInitRootFcb( IN ULONGLONG ProcessID, if ( InterlockedCompareExchangePointer( (PVOID *)&VolumeCB->ObjectInformation.Fcb, pFcb, NULL) != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInitRootFcb Raced Fcb %p pFcb %p\n", VolumeCB->ObjectInformation.Fcb, - pFcb); + pFcb)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitRootFcb Acquiring Fcb lock %p EXCL %08lX\n", &VolumeCB->ObjectInformation.Fcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &VolumeCB->ObjectInformation.NonPagedInfo->ObjectInfoLock); @@ -1083,10 +1083,10 @@ AFSInitRootFcb( IN ULONGLONG ProcessID, AFSReleaseResource( &VolumeCB->ObjectInformation.NonPagedInfo->ObjectInfoLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitRootFcb Initialized Fcb %p\n", - &VolumeCB->ObjectInformation.Fcb); + &VolumeCB->ObjectInformation.Fcb)); try_exit: @@ -1225,10 +1225,10 @@ AFSRemoveFcb( IN AFSFcb **ppFcb) // Uninitialize the file lock if it is a file // - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveFcb Removing Fcb %p\n", - pFcb); + pFcb)); if( pFcb->Header.NodeTypeCode == AFS_FILE_FCB) { @@ -1308,9 +1308,9 @@ AFSInitCcb( IN OUT AFSCcb **Ccb, if( pCcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitCcb Failed to allocate Ccb\n"); + "AFSInitCcb Failed to allocate Ccb\n")); try_return( Status = STATUS_INSUFFICIENT_RESOURCES); } @@ -1329,9 +1329,9 @@ AFSInitCcb( IN OUT AFSCcb **Ccb, if( pCcb->NPCcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitCcb Failed to allocate NPCcb\n"); + "AFSInitCcb Failed to allocate NPCcb\n")); try_return( Status = STATUS_INSUFFICIENT_RESOURCES); } @@ -1342,13 +1342,13 @@ AFSInitCcb( IN OUT AFSCcb **Ccb, lCount = InterlockedIncrement( &pCcb->DirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitCcb Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB, pCcb, - lCount); + lCount)); pCcb->GrantedAccess = GrantedAccess; @@ -1489,13 +1489,13 @@ AFSRemoveCcb( IN AFSFcb *Fcb, lCount = InterlockedDecrement( &Ccb->DirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveCcb Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &Ccb->DirectoryCB->NameInformation.FileName, Ccb->DirectoryCB, Ccb, - lCount); + lCount)); ASSERT( lCount >= 0); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp b/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp index f6a9d6653..55a1a3172 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSFileInfo.cpp @@ -80,10 +80,10 @@ AFSQueryFileInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryFileInfo Attempted access (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -121,11 +121,11 @@ AFSQueryFileInfo( IN PDEVICE_OBJECT LibDeviceObject, // Grab the main shared right off the bat // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueryFileInfo Acquiring Fcb lock %p SHARED %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Resource, TRUE); @@ -139,9 +139,9 @@ AFSQueryFileInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb->Header.NodeTypeCode == AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSQueryFileInfo Processing request against SpecialShare Fcb\n"); + "AFSQueryFileInfo Processing request against SpecialShare Fcb\n")); ntStatus = AFSProcessShareQueryInfo( Irp, pFcb, @@ -151,9 +151,9 @@ AFSQueryFileInfo( IN PDEVICE_OBJECT LibDeviceObject, } else if( pFcb->Header.NodeTypeCode == AFS_IOCTL_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSQueryFileInfo request against PIOCtl Fcb\n"); + "AFSQueryFileInfo request against PIOCtl Fcb\n")); ntStatus = AFSProcessPIOCtlQueryInfo( Irp, pFcb, @@ -165,9 +165,9 @@ AFSQueryFileInfo( IN PDEVICE_OBJECT LibDeviceObject, else if( pFcb->Header.NodeTypeCode == AFS_INVALID_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSQueryFileInfo request against Invalid Fcb\n"); + "AFSQueryFileInfo request against Invalid Fcb\n")); try_return( ntStatus = STATUS_ACCESS_DENIED); } @@ -454,7 +454,7 @@ try_exit: pCcb->DirectoryCB != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryFileInfo Failed to process request for %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, @@ -462,16 +462,16 @@ try_exit: pCcb->DirectoryCB->ObjectInformation->FileId.Volume, pCcb->DirectoryCB->ObjectInformation->FileId.Vnode, pCcb->DirectoryCB->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); } } } __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueryFileInfo\n"); + "EXCEPTION - AFSQueryFileInfo\n")); AFSDumpTraceFilesFnc(); @@ -530,10 +530,10 @@ AFSSetFileInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileInfo Attempted access (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -545,11 +545,11 @@ AFSSetFileInfo( IN PDEVICE_OBJECT LibDeviceObject, // Grab the Fcb EXCL // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetFileInfo Acquiring Fcb lock %p EXCL %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->Resource, TRUE); @@ -563,18 +563,18 @@ AFSSetFileInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb->Header.NodeTypeCode == AFS_IOCTL_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSSetFileInfo Failing request against PIOCtl Fcb\n"); + "AFSSetFileInfo Failing request against PIOCtl Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } else if( pFcb->Header.NodeTypeCode == AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSSetFileInfo Processing request against SpecialShare Fcb\n"); + "AFSSetFileInfo Processing request against SpecialShare Fcb\n")); ntStatus = AFSProcessShareSetInfo( Irp, pFcb, @@ -586,10 +586,10 @@ AFSSetFileInfo( IN PDEVICE_OBJECT LibDeviceObject, if( BooleanFlagOn( pFcb->ObjectInformation->VolumeCB->VolumeInformation.Characteristics, FILE_READ_ONLY_DEVICE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileInfo Request failed due to read only volume\n", - Irp); + Irp)); try_return( ntStatus = STATUS_MEDIA_WRITE_PROTECTED); } @@ -597,9 +597,9 @@ AFSSetFileInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb->Header.NodeTypeCode == AFS_INVALID_FCB && FileInformationClass != FileDispositionInformation) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSSetFileInfo request against Invalid Fcb\n"); + "AFSSetFileInfo request against Invalid Fcb\n")); try_return( ntStatus = STATUS_ACCESS_DENIED); } @@ -733,7 +733,7 @@ try_exit: AFSUnwindFileInfo( pFcb, pCcb); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileInfo Failed to send file info update to service request for %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, @@ -741,7 +741,7 @@ try_exit: pCcb->DirectoryCB->ObjectInformation->FileId.Volume, pCcb->DirectoryCB->ObjectInformation->FileId.Vnode, pCcb->DirectoryCB->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); AFSReleaseResource( &pFcb->NPFcb->Resource); } @@ -754,7 +754,7 @@ try_exit: pCcb->DirectoryCB != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileInfo Failed to process request for %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, @@ -762,16 +762,16 @@ try_exit: pCcb->DirectoryCB->ObjectInformation->FileId.Volume, pCcb->DirectoryCB->ObjectInformation->FileId.Vnode, pCcb->DirectoryCB->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); } } } __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetFileInfo\n"); + "EXCEPTION - AFSSetFileInfo\n")); AFSDumpTraceFilesFnc(); @@ -882,13 +882,13 @@ AFSQueryBasicInfo( IN PIRP Irp, } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSQueryBasicInfo %wZ Type 0x%x Attrib 0x%x -> 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, pCcb->DirectoryCB->ObjectInformation->FileAttributes, - ulFileAttribs); + ulFileAttribs)); Buffer->CreationTime = DirectoryCB->ObjectInformation->CreationTime; Buffer->LastAccessTime = DirectoryCB->ObjectInformation->LastAccessTime; @@ -1007,13 +1007,13 @@ AFSQueryStandardInfo( IN PIRP Irp, TRUE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSQueryStandardInfo %wZ Type 0x%x Attrib 0x%x -> 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, pCcb->DirectoryCB->ObjectInformation->FileAttributes, - ulFileAttribs); + ulFileAttribs)); Buffer->Directory = BooleanFlagOn( ulFileAttribs, FILE_ATTRIBUTE_DIRECTORY); @@ -1523,13 +1523,13 @@ AFSQueryNetworkInfo( IN PIRP Irp, TRUE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSQueryNetworkInfo %wZ Type 0x%x Attrib 0x%x -> 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, pCcb->DirectoryCB->ObjectInformation->FileAttributes, - ulFileAttribs); + ulFileAttribs)); Buffer->CreationTime.QuadPart = DirectoryCB->ObjectInformation->CreationTime.QuadPart; Buffer->LastAccessTime.QuadPart = DirectoryCB->ObjectInformation->LastAccessTime.QuadPart; @@ -1718,13 +1718,13 @@ AFSQueryAttribTagInfo( IN PIRP Irp, TRUE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSAttribTagInfo %wZ Type 0x%x Attrib 0x%x -> 0x%x\n", &pCcb->DirectoryCB->NameInformation.FileName, pCcb->DirectoryCB->ObjectInformation->FileType, pCcb->DirectoryCB->ObjectInformation->FileAttributes, - ulFileAttribs); + ulFileAttribs)); Buffer->FileAttributes = ulFileAttribs; @@ -2059,9 +2059,9 @@ AFSSetDispositionInfo( IN PIRP Irp, if( pFcb->Header.NodeTypeCode == AFS_ROOT_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSSetDispositionInfo Attempt to delete root entry\n"); + "AFSSetDispositionInfo Attempt to delete root entry\n")); try_return( ntStatus = STATUS_CANNOT_DELETE); } @@ -2073,10 +2073,10 @@ AFSSetDispositionInfo( IN PIRP Irp, if( BooleanFlagOn( DirectoryCB->ObjectInformation->FileAttributes, FILE_ATTRIBUTE_READONLY)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetDispositionInfo Attempt to delete read only entry %wZ\n", - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_CANNOT_DELETE); } @@ -2095,11 +2095,11 @@ AFSSetDispositionInfo( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetDispositionInfo Cannot delete entry %wZ Status %08lX\n", &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2121,11 +2121,11 @@ AFSSetDispositionInfo( IN PIRP Irp, if( pFcb->ObjectInformation->Specific.Directory.ChildOpenHandleCount > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetDispositionInfo Attempt to delete directory %wZ with open %u handles\n", &DirectoryCB->NameInformation.FileName, - pFcb->ObjectInformation->Specific.Directory.ChildOpenHandleCount); + pFcb->ObjectInformation->Specific.Directory.ChildOpenHandleCount)); try_return( ntStatus = STATUS_DIRECTORY_NOT_EMPTY); } @@ -2133,19 +2133,19 @@ AFSSetDispositionInfo( IN PIRP Irp, if( !AFSIsDirectoryEmptyForDelete( pFcb)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetDispositionInfo Attempt to delete non-empty directory %wZ\n", - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_DIRECTORY_NOT_EMPTY); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetDispositionInfo Setting PENDING_DELETE on DirEntry %p Name %wZ\n", DirectoryCB, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); SetFlag( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_PENDING_DELETE); } @@ -2153,11 +2153,11 @@ AFSSetDispositionInfo( IN PIRP Irp, { BOOLEAN bMmFlushed; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetDispositionInfo Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -2178,11 +2178,11 @@ AFSSetDispositionInfo( IN PIRP Irp, // which attempts to open the file which is being deleted. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetDispositionInfo Setting PENDING_DELETE on DirEntry %p Name %wZ\n", DirectoryCB, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); SetFlag( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_PENDING_DELETE); @@ -2204,21 +2204,21 @@ AFSSetDispositionInfo( IN PIRP Irp, } } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetDispositionInfo Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); if ( !bMmFlushed) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetDispositionInfo Failed to flush image section for delete Entry %wZ\n", - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_CANNOT_DELETE); } @@ -2229,11 +2229,11 @@ AFSSetDispositionInfo( IN PIRP Irp, pFcb->Header.NodeTypeCode == AFS_INVALID_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetDispositionInfo Setting PENDING_DELETE on DirEntry %p Name %wZ\n", DirectoryCB, - &DirectoryCB->NameInformation.FileName); + &DirectoryCB->NameInformation.FileName)); SetFlag( pCcb->DirectoryCB->Flags, AFS_DIR_ENTRY_PENDING_DELETE); } @@ -2309,9 +2309,9 @@ AFSSetFileLinkInfo( IN PIRP Irp) if( pSrcFcb->Header.NodeTypeCode != AFS_FILE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSSetFileLinkInfo Attempt to non-file (INVALID_PARAMETER)\n"); + "AFSSetFileLinkInfo Attempt to non-file (INVALID_PARAMETER)\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -2334,10 +2334,10 @@ AFSSetFileLinkInfo( IN PIRP Irp) // error. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileLinkInfo Attempt to link %wZ to alternate directory by handle INVALID_PARAMETER\n", - &pSrcCcb->DirectoryCB->NameInformation.FileName); + &pSrcCcb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -2371,11 +2371,11 @@ AFSSetFileLinkInfo( IN PIRP Irp) // will be moved to. Must obtain the TargetParentObject. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileLinkInfo Attempt to link %wZ to alternate directory %wZ (NOT_SAME_DEVICE)\n", &pSrcCcb->DirectoryCB->NameInformation.FileName, - &uniFullTargetName); + &uniFullTargetName)); try_return( ntStatus = STATUS_NOT_SAME_DEVICE); } @@ -2433,10 +2433,10 @@ AFSSetFileLinkInfo( IN PIRP Irp) if( pTargetParentObject->VolumeCB != pSrcObject->VolumeCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileLinkInfo Attempt to link to different volume %wZ\n", - &pSrcCcb->DirectoryCB->NameInformation.FileName); + &pSrcCcb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_NOT_SAME_DEVICE); } @@ -2494,34 +2494,34 @@ AFSSetFileLinkInfo( IN PIRP Irp) lCount = InterlockedIncrement( &pTargetDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetFileLinkInfo Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, pSrcCcb, - lCount); + lCount)); ASSERT( lCount >= 0); if( !pFileLinkInfo->ReplaceIfExists) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileLinkInfo Attempt to link with target collision %wZ Target %wZ\n", &pSrcCcb->DirectoryCB->NameInformation.FileName, - &pTargetDirEntry->NameInformation.FileName); + &pTargetDirEntry->NameInformation.FileName)); try_return( ntStatus = STATUS_OBJECT_NAME_COLLISION); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileLinkInfo Target %wZ exists DE %p Count %d, performing delete of target\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, - lCount); + lCount)); // // Pull the directory entry from the parent @@ -2535,9 +2535,9 @@ AFSSetFileLinkInfo( IN PIRP Irp) } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSSetFileLinkInfo Target does NOT exist, normal linking\n"); + "AFSSetFileLinkInfo Target does NOT exist, normal linking\n")); } // @@ -2558,12 +2558,12 @@ AFSSetFileLinkInfo( IN PIRP Irp) !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetFileLinkInfo Failed link of %wZ to target %wZ Status %08lX\n", &pSrcCcb->DirectoryCB->NameInformation.FileName, &uniTargetName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2619,13 +2619,13 @@ AFSSetFileLinkInfo( IN PIRP Irp) lCount = InterlockedDecrement( &pTargetDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetFileLinkInfo Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, pSrcCcb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -2639,13 +2639,13 @@ AFSSetFileLinkInfo( IN PIRP Irp) lCount = InterlockedDecrement( &pNewTargetDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetFileLinkInfo Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pNewTargetDirEntry->NameInformation.FileName, pNewTargetDirEntry, pSrcCcb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -2734,9 +2734,9 @@ AFSSetRenameInfo( IN PIRP Irp) // Can't rename the root directory // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSSetRenameInfo Attempt to rename root entry\n"); + "AFSSetRenameInfo Attempt to rename root entry\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -2751,10 +2751,10 @@ AFSSetRenameInfo( IN PIRP Irp) if( pSrcFcb->ObjectInformation->Specific.Directory.ChildOpenHandleCount > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Attempt to rename directory with open children %wZ\n", - &pSrcCcb->DirectoryCB->NameInformation.FileName); + &pSrcCcb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_ACCESS_DENIED); } @@ -2780,9 +2780,9 @@ AFSSetRenameInfo( IN PIRP Irp) if ( pRenameInfo->RootDirectory) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSSetRenameInfo Handle provided but no FileObject ntStatus INVALID_PARAMETER\n"); + "AFSSetRenameInfo Handle provided but no FileObject ntStatus INVALID_PARAMETER\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -2816,11 +2816,11 @@ AFSSetRenameInfo( IN PIRP Irp) // will be moved to. Must obtain the TargetParentObject. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Attempt to move %wZ to %wZ -- not yet supported (NOT_SAME_DEVICE)\n", &pSrcCcb->DirectoryCB->NameInformation.FileName, - &uniFullTargetName); + &uniFullTargetName)); try_return( ntStatus = STATUS_NOT_SAME_DEVICE); } @@ -2881,10 +2881,10 @@ AFSSetRenameInfo( IN PIRP Irp) if( pTargetParentObject->VolumeCB != pSrcObject->VolumeCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Attempt to rename directory to different volume %wZ\n", - &pSrcCcb->DirectoryCB->NameInformation.FileName); + &pSrcCcb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_NOT_SAME_DEVICE); } @@ -2951,34 +2951,34 @@ AFSSetRenameInfo( IN PIRP Irp) lCount = InterlockedIncrement( &pTargetDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, pSrcCcb, - lCount); + lCount)); ASSERT( lCount >= 0); if( !bReplaceIfExists) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Attempt to rename directory with target collision %wZ Target %wZ\n", &pSrcCcb->DirectoryCB->NameInformation.FileName, - &pTargetDirEntry->NameInformation.FileName); + &pTargetDirEntry->NameInformation.FileName)); try_return( ntStatus = STATUS_OBJECT_NAME_COLLISION); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Target %wZ exists DE %p Count %d, performing delete of target\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, - lCount); + lCount)); // // Pull the directory entry from the parent @@ -2992,9 +2992,9 @@ AFSSetRenameInfo( IN PIRP Irp) } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSSetRenameInfo Target does NOT exist, normal rename\n"); + "AFSSetRenameInfo Target does NOT exist, normal rename\n")); } // @@ -3031,12 +3031,12 @@ AFSSetRenameInfo( IN PIRP Irp) pSrcCcb->DirectoryCB, !bCommonParent); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Failed rename of %wZ to target %wZ Status %08lX\n", &pSrcCcb->DirectoryCB->NameInformation.FileName, &uniTargetName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3091,12 +3091,12 @@ AFSSetRenameInfo( IN PIRP Irp) pSrcCcb->DirectoryCB, !bCommonParent); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Failed update of dir entry %wZ to target %wZ Status %08lX\n", &pSrcCcb->DirectoryCB->NameInformation.FileName, &uniTargetName, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3177,11 +3177,11 @@ AFSSetRenameInfo( IN PIRP Irp) pSrcCcb->DirectoryCB->Type.Data.ShortNameTreeEntry.HashIndex = AFSGenerateCRC( &uniShortName, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Initialized short name hash for %wZ longname %wZ\n", &uniShortName, - &pSrcCcb->DirectoryCB->NameInformation.FileName); + &pSrcCcb->DirectoryCB->NameInformation.FileName)); } else { @@ -3225,20 +3225,20 @@ AFSSetRenameInfo( IN PIRP Irp) lCount = AFSObjectInfoIncrement( pTargetParentObject, AFS_OBJECT_REFERENCE_CHILD); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Increment count on parent object %p Cnt %d\n", pTargetParentObject, - lCount); + lCount)); lCount = AFSObjectInfoDecrement( pSrcParentObject, AFS_OBJECT_REFERENCE_CHILD); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Decrement count on parent object %p Cnt %d\n", pSrcParentObject, - lCount); + lCount)); pSrcCcb->DirectoryCB->ObjectInformation->ParentFileId = pTargetParentObject->FileId; @@ -3271,11 +3271,11 @@ AFSSetRenameInfo( IN PIRP Irp) if( bTargetEntryExists) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Setting DELETE flag in dir entry %p name %wZ\n", pTargetDirEntry, - &pTargetDirEntry->NameInformation.FileName); + &pTargetDirEntry->NameInformation.FileName)); SetFlag( pTargetDirEntry->Flags, AFS_DIR_ENTRY_DELETED); @@ -3295,13 +3295,13 @@ AFSSetRenameInfo( IN PIRP Irp) lCount = InterlockedDecrement( &pTargetDirEntry->DirOpenReferenceCount); // The count we added above - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, pSrcCcb, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -3309,11 +3309,11 @@ AFSSetRenameInfo( IN PIRP Irp) pTargetDirEntry->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Deleting dir entry %p name %wZ\n", pTargetDirEntry, - &pTargetDirEntry->NameInformation.FileName); + &pTargetDirEntry->NameInformation.FileName)); AFSDeleteDirEntry( pTargetParentObject, pTargetDirEntry); @@ -3351,20 +3351,20 @@ AFSSetRenameInfo( IN PIRP Irp) // permit the locks to be obtained out of order risking a deadlock. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Acquiring Fcb lock %p EXCL %08lX\n", &pTargetFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pTargetFcb->NPFcb->Resource, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pTargetFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pTargetFcb->NPFcb->SectionObjectResource, TRUE); @@ -3377,25 +3377,25 @@ AFSSetRenameInfo( IN PIRP Irp) TRUE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetRenameInfo Failed to delete section for target file %wZ\n", - &uniTargetName); + &uniTargetName)); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pTargetFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pTargetFcb->NPFcb->SectionObjectResource); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Releasing Fcb lock %p EXCL %08lX\n", &pTargetFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pTargetFcb->NPFcb->Resource); } @@ -3422,13 +3422,13 @@ try_exit: lCount = InterlockedDecrement( &pTargetDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetRenameInfo Decrement2 count on %wZ DE %p Ccb %p Cnt %d\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, pSrcCcb, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -3525,11 +3525,11 @@ AFSSetAllocationInfo( IN PIRP Irp, if( pFcb->Header.AllocationSize.QuadPart > pBuffer->AllocationSize.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetAllocationInfo Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -3537,11 +3537,11 @@ AFSSetAllocationInfo( IN PIRP Irp, bUserMapped = !MmCanFileBeTruncated( pFileObject->SectionObjectPointer, &pBuffer->AllocationSize); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetAllocationInfo Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); @@ -3560,11 +3560,11 @@ AFSSetAllocationInfo( IN PIRP Irp, // If this is a truncation we need to grab the paging IO resource. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetAllocationInfo Acquiring Fcb PagingIo lock %p EXCL %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->PagingResource, TRUE); @@ -3609,11 +3609,11 @@ AFSSetAllocationInfo( IN PIRP Irp, // Tell Cc if allocation is increased. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetAllocationInfo Acquiring Fcb PagingIo lock %p EXCL %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->PagingResource, TRUE); @@ -3731,11 +3731,11 @@ AFSSetEndOfFileInfo( IN PIRP Irp, if( pBuffer->EndOfFile.QuadPart < pFcb->Header.FileSize.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetEndOfFileInfo Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -3743,11 +3743,11 @@ AFSSetEndOfFileInfo( IN PIRP Irp, bUserMapped = !MmCanFileBeTruncated( pFileObject->SectionObjectPointer, &pBuffer->EndOfFile); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetEndOfFileInfo Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); @@ -3764,11 +3764,11 @@ AFSSetEndOfFileInfo( IN PIRP Irp, // If this is a truncation we need to grab the paging // IO resource. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetAllocationInfo Acquiring Fcb PagingIo lock %p EXCL %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->PagingResource, TRUE); @@ -3813,11 +3813,11 @@ AFSSetEndOfFileInfo( IN PIRP Irp, // If this is a truncation we need to grab the paging // IO resource. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetAllocationInfo Acquiring Fcb PagingIo lock %p EXCL %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pFcb->NPFcb->PagingResource, TRUE); @@ -3923,11 +3923,11 @@ AFSProcessShareSetInfo( IN IRP *Irp, { ulFileInformationClass = pIrpSp->Parameters.SetFile.FileInformationClass; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessShareSetInfo On pipe %wZ Class %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, - ulFileInformationClass); + ulFileInformationClass)); pPipeInfo = AFSLockSystemBuffer( Irp, pIrpSp->Parameters.SetFile.Length); @@ -3935,10 +3935,10 @@ AFSProcessShareSetInfo( IN IRP *Irp, if( pPipeInfo == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessShareSetInfo Failed to lock buffer on pipe %wZ\n", - &Ccb->DirectoryCB->NameInformation.FileName); + &Ccb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -3955,20 +3955,20 @@ AFSProcessShareSetInfo( IN IRP *Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessShareSetInfo Failed to send request to service on pipe %wZ Status %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessShareSetInfo Completed request on pipe %wZ Class %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, - ulFileInformationClass); + ulFileInformationClass)); try_exit: @@ -3995,11 +3995,11 @@ AFSProcessShareQueryInfo( IN IRP *Irp, ulFileInformationClass = pIrpSp->Parameters.QueryFile.FileInformationClass; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessShareQueryInfo On pipe %wZ Class %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, - ulFileInformationClass); + ulFileInformationClass)); pPipeInfo = AFSLockSystemBuffer( Irp, pIrpSp->Parameters.QueryFile.Length); @@ -4007,10 +4007,10 @@ AFSProcessShareQueryInfo( IN IRP *Irp, if( pPipeInfo == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessShareQueryInfo Failed to lock buffer on pipe %wZ\n", - &Ccb->DirectoryCB->NameInformation.FileName); + &Ccb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -4028,20 +4028,20 @@ AFSProcessShareQueryInfo( IN IRP *Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessShareQueryInfo Failed to send request to service on pipe %wZ Status %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessShareQueryInfo Completed request on pipe %wZ Class %08lX\n", &Ccb->DirectoryCB->NameInformation.FileName, - ulFileInformationClass); + ulFileInformationClass)); try_exit: @@ -4075,9 +4075,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, case FileBasicInformation: { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSProcessPIOCtlQueryInfo (FileBasicInformation)\n"); + "AFSProcessPIOCtlQueryInfo (FileBasicInformation)\n")); if ( *Length >= sizeof( FILE_BASIC_INFORMATION)) { @@ -4102,9 +4102,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, case FileStandardInformation: { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSProcessPIOCtlQueryInfo (FileStandardInformation)\n"); + "AFSProcessPIOCtlQueryInfo (FileStandardInformation)\n")); if ( *Length >= sizeof( FILE_STANDARD_INFORMATION)) { @@ -4137,9 +4137,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, PFILE_NAME_INFORMATION pNameInfo = (PFILE_NAME_INFORMATION)Irp->AssociatedIrp.SystemBuffer; UNICODE_STRING uniName; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSProcessPIOCtlQueryInfo (FileNameInformation)\n"); + "AFSProcessPIOCtlQueryInfo (FileNameInformation)\n")); pFcb = (AFSFcb *)pIrpSp->FileObject->FsContext; pCcb = (AFSCcb *)pIrpSp->FileObject->FsContext2; @@ -4217,10 +4217,10 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, uniName.Buffer = pNameInfo->FileName; } - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessPIOCtlQueryInfo (FileNameInformation) Returning %wZ\n", - &uniName); + &uniName)); } } @@ -4232,9 +4232,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, PFILE_INTERNAL_INFORMATION pInternalInfo = (PFILE_INTERNAL_INFORMATION)Irp->AssociatedIrp.SystemBuffer; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSProcessPIOCtlQueryInfo (FileInternalInformation)\n"); + "AFSProcessPIOCtlQueryInfo (FileInternalInformation)\n")); if( *Length >= sizeof( FILE_INTERNAL_INFORMATION)) { @@ -4258,9 +4258,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileAllInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileAllInformation) Not Implemented\n")); break; } @@ -4269,9 +4269,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileEaInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileEaInformation) Not Implemented\n")); break; } @@ -4280,9 +4280,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FilePositionInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FilePositionInformation) Not Implemented\n")); break; } @@ -4291,9 +4291,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileAlternateNameInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileAlternateNameInformation) Not Implemented\n")); break; } @@ -4302,9 +4302,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileNetworkOpenInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileNetworkOpenInformation) Not Implemented\n")); break; } @@ -4313,9 +4313,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileStreamInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileStreamInformation) Not Implemented\n")); break; } @@ -4324,9 +4324,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileAttributeTagInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileAttributeTagInformation) Not Implemented\n")); break; } @@ -4335,9 +4335,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileRemoteProtocolInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileRemoteProtocolInformation) Not Implemented\n")); break; } @@ -4346,9 +4346,9 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSProcessPIOCtlQueryInfo (FileNetworkPhysicalNameInformation) Not Implemented\n"); + "AFSProcessPIOCtlQueryInfo (FileNetworkPhysicalNameInformation) Not Implemented\n")); break; } @@ -4357,20 +4357,20 @@ AFSProcessPIOCtlQueryInfo( IN IRP *Irp, { ntStatus = STATUS_INVALID_PARAMETER; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSProcessPIOCtlQueryInfo Not handling request %08lX\n", - ulFileInformationClass); + ulFileInformationClass)); break; } } } - AFSDbgLogMsg( AFS_SUBSYSTEM_PIOCTL_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIOCTL_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessPIOCtlQueryInfo ntStatus %08lX\n", - ntStatus); + ntStatus)); return ntStatus; } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSFlushBuffers.cpp b/src/WINNT/afsrdr/kernel/lib/AFSFlushBuffers.cpp index 9ac442485..e9cbc7fa7 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSFlushBuffers.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSFlushBuffers.cpp @@ -60,10 +60,10 @@ AFSFlushBuffers( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSFlushBuffers Attempted access (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -87,11 +87,11 @@ AFSFlushBuffers( IN PDEVICE_OBJECT LibDeviceObject, try_return( ntStatus = STATUS_INVALID_PARAMETER); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFlushBuffers Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -111,7 +111,7 @@ AFSFlushBuffers( IN PDEVICE_OBJECT LibDeviceObject, if (!NT_SUCCESS( iosb.Status )) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSFlushBuffers CcFlushCache [1] failure FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -119,7 +119,7 @@ AFSFlushBuffers( IN PDEVICE_OBJECT LibDeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, iosb.Status, - iosb.Information); + iosb.Information)); try_return( ntStatus = iosb.Status ); } @@ -130,11 +130,11 @@ AFSFlushBuffers( IN PDEVICE_OBJECT LibDeviceObject, try_return( ntStatus = GetExceptionCode()); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFlushBuffers Releasing Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); @@ -162,11 +162,11 @@ try_exit: if ( bReleaseSectionObject) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFlushBuffers Releasing Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp index fb5346589..d607b4f42 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSGeneric.cpp @@ -67,7 +67,7 @@ AFSExceptionFilter( IN CHAR *FunctionString, Context = ExceptPtrs->ContextRecord; - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "AFSExceptionFilter (Library) - EXR %p CXR %p Function %s Code %08lX Address %p Routine %p\n", ExceptRec, @@ -75,7 +75,7 @@ AFSExceptionFilter( IN CHAR *FunctionString, FunctionString, ExceptRec->ExceptionCode, ExceptRec->ExceptionAddress, - (void *)AFSExceptionFilter); + (void *)AFSExceptionFilter)); DbgPrint("**** Exception Caught in AFS Redirector Library ****\n"); @@ -148,13 +148,13 @@ AFSLibExAllocatePoolWithTag( IN POOL_TYPE PoolType, else { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "AFSLibExAllocatePoolWithTag failure Type %08lX Size %08lX Tag %08lX %08lX\n", PoolType, NumberOfBytes, Tag, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSBreakPoint(); } @@ -273,11 +273,11 @@ void AFSReleaseResource( IN PERESOURCE Resource) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSReleaseResource Releasing lock %p Thread %08lX\n", Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); ExReleaseResourceLite( Resource); @@ -290,11 +290,11 @@ void AFSConvertToShared( IN PERESOURCE Resource) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSConvertToShared Converting lock %p Thread %08lX\n", Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); ExConvertExclusiveToSharedLite( Resource); @@ -662,10 +662,10 @@ AFSInitializeGlobalDirectoryEntries() if( pObjectInfoCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeGlobalDirectory AFSAllocateObjectInfo failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -673,11 +673,11 @@ AFSInitializeGlobalDirectoryEntries() lCount = AFSObjectInfoIncrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_GLOBAL); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeGlobalDirectoryEntries Increment count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); ntStatus = STATUS_SUCCESS; @@ -693,17 +693,17 @@ AFSInitializeGlobalDirectoryEntries() AFSDeleteObjectInfo( &pObjectInfoCB); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeGlobalDirectory AFS_DIR_ENTRY_TAG allocation failure\n"); + "AFSInitializeGlobalDirectory AFS_DIR_ENTRY_TAG allocation failure\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeGlobalDirectory AFS_DIR_ENTRY_TAG allocated %p\n", - pDirNode); + pDirNode)); pNonPagedDirEntry = (AFSNonPagedDirectoryCB *)AFSLibExAllocatePoolWithTag( NonPagedPool, sizeof( AFSNonPagedDirectoryCB), @@ -716,9 +716,9 @@ AFSInitializeGlobalDirectoryEntries() AFSDeleteObjectInfo( &pObjectInfoCB); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeGlobalDirectory AFS_DIR_ENTRY_NP_TAG allocation failure\n"); + "AFSInitializeGlobalDirectory AFS_DIR_ENTRY_NP_TAG allocation failure\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -775,10 +775,10 @@ AFSInitializeGlobalDirectoryEntries() if( pObjectInfoCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeGlobalDirectory AFSAllocateObjectInfo (2) failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -786,11 +786,11 @@ AFSInitializeGlobalDirectoryEntries() lCount = AFSObjectInfoIncrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_GLOBAL); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeGlobalDirectoryEntries Increment count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); ntStatus = STATUS_SUCCESS; @@ -804,19 +804,19 @@ AFSInitializeGlobalDirectoryEntries() if( pDirNode == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeGlobalDirectoryEntries AFS_DIR_ENTRY_TAG allocation failure\n"); + "AFSInitializeGlobalDirectoryEntries AFS_DIR_ENTRY_TAG allocation failure\n")); AFSDeleteObjectInfo( &pObjectInfoCB); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeGlobalDirectoryEntries AFS_DIR_ENTRY_TAG allocated %p\n", - pDirNode); + pDirNode)); pNonPagedDirEntry = (AFSNonPagedDirectoryCB *)AFSLibExAllocatePoolWithTag( NonPagedPool, sizeof( AFSNonPagedDirectoryCB), @@ -934,14 +934,14 @@ AFSInitDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitDirEntry Initializing entry %wZ parent FID %08lX-%08lX-%08lX-%08lX\n", FileName, ParentObjectInfo->FileId.Cell, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, - ParentObjectInfo->FileId.Unique); + ParentObjectInfo->FileId.Unique)); // // First thing is to locate/create our object information block @@ -978,22 +978,22 @@ AFSInitDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, bAllocatedObjectCB = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitDirEntry initialized object %p Parent Object %p for %wZ\n", pObjectInfoCB, ParentObjectInfo, - FileName); + FileName)); } lCount = AFSObjectInfoIncrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_DIRENTRY); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitDirEntry Increment count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); AFSReleaseResource( ParentObjectInfo->VolumeCB->ObjectInfoTree.TreeLock); @@ -1018,10 +1018,10 @@ AFSInitDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitDirEntry AFS_DIR_ENTRY_TAG allocated %p\n", - pDirNode); + pDirNode)); pNonPagedDirEntry = (AFSNonPagedDirectoryCB *)AFSExAllocatePoolWithTag( NonPagedPool, sizeof( AFSNonPagedDirectoryCB), @@ -1081,7 +1081,7 @@ AFSInitDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, TRUE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitDirEntry Initialized DE %p for %wZ in parent FID %08lX-%08lX-%08lX-%08lX\n", pDirNode, @@ -1089,7 +1089,7 @@ AFSInitDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, ParentObjectInfo->FileId.Cell, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, - ParentObjectInfo->FileId.Unique); + ParentObjectInfo->FileId.Unique)); if( TargetName != NULL && TargetName->Length > 0) @@ -1215,10 +1215,10 @@ try_exit: if( pDirNode != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitDirEntry AFS_DIR_ENTRY_TAG deallocating %p\n", - pDirNode); + pDirNode)); AFSExFreePoolWithTag( pDirNode, AFS_DIR_ENTRY_TAG); @@ -1235,11 +1235,11 @@ try_exit: lCount = AFSObjectInfoDecrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_DIRENTRY); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitDirEntry Decrement count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); if( bAllocatedObjectCB) { @@ -1486,10 +1486,10 @@ AFSValidateSymLink( IN GUID *AuthGroup, pDirEntry->FileType == AFS_FILE_TYPE_INVALID) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSValidateSymLink Invalid type Status %08lX\n", - STATUS_OBJECT_NAME_NOT_FOUND); + STATUS_OBJECT_NAME_NOT_FOUND)); try_return( ntStatus = STATUS_OBJECT_NAME_NOT_FOUND); } @@ -1620,7 +1620,7 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, ULONG ulFilter = 0; AFSObjectInfoCB * pParentObjectInfo = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateObject Invalidation on node type %d for fid %08lX-%08lX-%08lX-%08lX Reason %d\n", (*ppObjectInfo)->FileType, @@ -1628,7 +1628,7 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, (*ppObjectInfo)->FileId.Unique, - Reason); + Reason)); if ( BooleanFlagOn( (*ppObjectInfo)->Flags, AFS_OBJECT_FLAGS_PARENT_FID)) { @@ -1668,13 +1668,13 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, (*ppObjectInfo)->TargetFileId.Unique = 0; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateObject Setting VERIFY flag on fid %08lX-%08lX-%08lX-%08lX\n", (*ppObjectInfo)->FileId.Cell, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, - (*ppObjectInfo)->FileId.Unique); + (*ppObjectInfo)->FileId.Unique)); SetFlag( (*ppObjectInfo)->Flags, AFS_OBJECT_FLAGS_VERIFY); } @@ -1726,24 +1726,24 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, SetFlag( (*ppObjectInfo)->Flags, AFS_OBJECT_FLAGS_DELETED); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateObject Set DELETE flag on fid %08lX-%08lX-%08lX-%08lX\n", (*ppObjectInfo)->FileId.Cell, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, - (*ppObjectInfo)->FileId.Unique); + (*ppObjectInfo)->FileId.Unique)); if( pParentObjectInfo != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateObject Set VERIFY flag on parent fid %08lX-%08lX-%08lX-%08lX\n", pParentObjectInfo->FileId.Cell, pParentObjectInfo->FileId.Volume, pParentObjectInfo->FileId.Vnode, - pParentObjectInfo->FileId.Unique); + pParentObjectInfo->FileId.Unique)); SetFlag( pParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY); @@ -1782,13 +1782,13 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, (*ppObjectInfo)->Fcb != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateObject Flush/purge file fid %08lX-%08lX-%08lX-%08lX\n", (*ppObjectInfo)->FileId.Cell, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, - (*ppObjectInfo)->FileId.Unique); + (*ppObjectInfo)->FileId.Unique)); AFSAcquireExcl( &(*ppObjectInfo)->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -1804,7 +1804,7 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, if( !NT_SUCCESS( stIoStatus.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInvalidateObject CcFlushCache failure FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", (*ppObjectInfo)->FileId.Cell, @@ -1812,7 +1812,7 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, (*ppObjectInfo)->FileId.Vnode, (*ppObjectInfo)->FileId.Unique, stIoStatus.Status, - stIoStatus.Information); + stIoStatus.Information)); ntStatus = stIoStatus.Status; } @@ -1827,13 +1827,13 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInvalidateObject CcPurgeCacheSection failure FID %08lX-%08lX-%08lX-%08lX\n", (*ppObjectInfo)->FileId.Cell, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, - (*ppObjectInfo)->FileId.Unique); + (*ppObjectInfo)->FileId.Unique)); SetFlag( (*ppObjectInfo)->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -1844,14 +1844,14 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSInvalidateObject Cc FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", (*ppObjectInfo)->FileId.Cell, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, (*ppObjectInfo)->FileId.Unique, - ntStatus); + ntStatus)); SetFlag( (*ppObjectInfo)->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -1874,13 +1874,13 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, if( (*ppObjectInfo)->FileType == AFS_FILE_TYPE_FILE) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateObject Setting VERIFY_DATA flag on fid %08lX-%08lX-%08lX-%08lX\n", (*ppObjectInfo)->FileId.Cell, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, - (*ppObjectInfo)->FileId.Unique); + (*ppObjectInfo)->FileId.Unique)); SetFlag( (*ppObjectInfo)->Flags, AFS_OBJECT_FLAGS_VERIFY_DATA); } @@ -1937,13 +1937,13 @@ AFSInvalidateObject( IN OUT AFSObjectInfoCB **ppObjectInfo, (*ppObjectInfo)->Expiration.QuadPart = 0; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateObject Setting VERIFY flag on fid %08lX-%08lX-%08lX-%08lX\n", (*ppObjectInfo)->FileId.Cell, (*ppObjectInfo)->FileId.Volume, (*ppObjectInfo)->FileId.Vnode, - (*ppObjectInfo)->FileId.Unique); + (*ppObjectInfo)->FileId.Unique)); SetFlag( (*ppObjectInfo)->Flags, AFS_OBJECT_FLAGS_VERIFY); @@ -1989,7 +1989,7 @@ AFSInvalidateCache( IN AFSInvalidateCacheCB *InvalidateCB) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateCache Invalidation FID %08lX-%08lX-%08lX-%08lX Type %d WholeVolume %d Reason %d\n", InvalidateCB->FileID.Cell, @@ -1998,17 +1998,17 @@ AFSInvalidateCache( IN AFSInvalidateCacheCB *InvalidateCB) InvalidateCB->FileID.Unique, InvalidateCB->FileType, InvalidateCB->WholeVolume, - InvalidateCB->Reason); + InvalidateCB->Reason)); // // Need to locate the Fcb for the directory to purge // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateCache Acquiring RDR VolumeTreeLock lock %p SHARED %08lX\n", &pDevExt->Specific.RDR.VolumeTreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); // // Starve any exclusive waiters on this paticular call @@ -2032,11 +2032,11 @@ AFSInvalidateCache( IN AFSInvalidateCacheCB *InvalidateCB) lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_INVALIDATE); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateCache Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); @@ -2045,14 +2045,14 @@ AFSInvalidateCache( IN AFSInvalidateCacheCB *InvalidateCB) pVolumeCB == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInvalidateCache Invalidation FAILURE Unable to locate volume node FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", InvalidateCB->FileID.Cell, InvalidateCB->FileID.Volume, InvalidateCB->FileID.Vnode, InvalidateCB->FileID.Unique, - ntStatus); + ntStatus)); try_return( ntStatus = STATUS_SUCCESS); } @@ -2098,11 +2098,11 @@ AFSInvalidateCache( IN AFSInvalidateCacheCB *InvalidateCB) lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateCache Increment count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -2111,14 +2111,14 @@ AFSInvalidateCache( IN AFSInvalidateCacheCB *InvalidateCB) pObjectInfo == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateCache Invalidation FAILURE Unable to locate object FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", InvalidateCB->FileID.Cell, InvalidateCB->FileID.Volume, InvalidateCB->FileID.Vnode, InvalidateCB->FileID.Unique, - ntStatus); + ntStatus)); try_return( ntStatus = STATUS_SUCCESS); } @@ -2134,11 +2134,11 @@ try_exit: lCount = AFSObjectInfoDecrement( pObjectInfo, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateCache Decrement count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } if ( pVolumeCB != NULL) @@ -2147,11 +2147,11 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_INVALIDATE); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateCache Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } } @@ -2325,11 +2325,11 @@ AFSSubstituteSysName( IN UNICODE_STRING *ComponentName, #endif - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSubstituteSysName Acquiring SysName lock %p SHARED %08lX\n", pSysNameLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( pSysNameLock, TRUE); @@ -2350,11 +2350,11 @@ AFSSubstituteSysName( IN UNICODE_STRING *ComponentName, if( pSysName == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSSubstituteSysName No sysname %wZ Status %08lX\n", &ComponentName, - STATUS_OBJECT_NAME_NOT_FOUND); + STATUS_OBJECT_NAME_NOT_FOUND)); try_return( ntStatus = STATUS_OBJECT_NAME_NOT_FOUND); } @@ -2569,14 +2569,14 @@ AFSInvalidateVolume( IN AFSVolumeCB *VolumeCB, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateVolume Invalidate volume fid %08lX-%08lX-%08lX-%08lX Reason %08lX\n", VolumeCB->ObjectInformation.FileId.Cell, VolumeCB->ObjectInformation.FileId.Volume, VolumeCB->ObjectInformation.FileId.Vnode, VolumeCB->ObjectInformation.FileId.Unique, - Reason); + Reason)); // // Depending on the reason for invalidation then perform work on the node @@ -2612,11 +2612,11 @@ AFSInvalidateVolume( IN AFSVolumeCB *VolumeCB, lCount = AFSObjectInfoIncrement( pCurrentObject, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateVolumeObjects Increment count on object %p Cnt %d\n", pCurrentObject, - lCount); + lCount)); AFSInvalidateObject( &pCurrentObject, Reason); @@ -2627,11 +2627,11 @@ AFSInvalidateVolume( IN AFSVolumeCB *VolumeCB, lCount = AFSObjectInfoDecrement( pCurrentObject, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateVolumeObjects Decrement count on object %p Cnt %d\n", pCurrentObject, - lCount); + lCount)); } } @@ -2654,11 +2654,11 @@ AFSInvalidateVolume( IN AFSVolumeCB *VolumeCB, lCount = AFSObjectInfoIncrement( pCurrentObject, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateVolumeObjects Increment count on object %p Cnt %d\n", pCurrentObject, - lCount); + lCount)); } while( pCurrentObject != NULL) @@ -2676,11 +2676,11 @@ AFSInvalidateVolume( IN AFSVolumeCB *VolumeCB, lCount = AFSObjectInfoIncrement( pNextObject, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateVolumeObjects Increment count on object %p Cnt %d\n", pNextObject, - lCount); + lCount)); } AFSReleaseResource( VolumeCB->ObjectInfoTree.TreeLock); @@ -2694,11 +2694,11 @@ AFSInvalidateVolume( IN AFSVolumeCB *VolumeCB, lCount = AFSObjectInfoDecrement( pCurrentObject, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateVolumeObjects Decrement count on object %p Cnt %d\n", pCurrentObject, - lCount); + lCount)); } AFSAcquireShared( VolumeCB->ObjectInfoTree.TreeLock, @@ -2723,11 +2723,11 @@ AFSInvalidateAllVolumes( VOID) pRDRDeviceExt = (AFSDeviceExt *)AFSRDRDeviceObject->DeviceExtension; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateAllVolumes Acquiring RDR VolumeListLock lock %p SHARED %08lX\n", &pRDRDeviceExt->Specific.RDR.VolumeListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pRDRDeviceExt->Specific.RDR.VolumeListLock, TRUE); @@ -2737,20 +2737,20 @@ AFSInvalidateAllVolumes( VOID) if ( pVolumeCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateAllVolumes Acquiring VolumeRoot ObjectInfoTree lock %p SHARED %08lX\n", pVolumeCB->ObjectInfoTree.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_INVALIDATE); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateAllVolumes Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } while( pVolumeCB != NULL) @@ -2764,11 +2764,11 @@ AFSInvalidateAllVolumes( VOID) lCount = AFSVolumeIncrement( pNextVolumeCB, AFS_VOLUME_REFERENCE_INVALIDATE); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateAllVolumes Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } AFSReleaseResource( &pRDRDeviceExt->Specific.RDR.VolumeListLock); @@ -2783,11 +2783,11 @@ AFSInvalidateAllVolumes( VOID) lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_INVALIDATE); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInvalidateAllVolumes Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); pVolumeCB = pNextVolumeCB; } @@ -2808,14 +2808,14 @@ AFSVerifyEntry( IN GUID *AuthGroup, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSVerifyEntry Verifying entry %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); ntStatus = AFSEvaluateTargetByID( pObjectInfo, AuthGroup, @@ -2825,7 +2825,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSVerifyEntry Evaluate Target failed %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", &DirEntry->NameInformation.FileName, @@ -2833,7 +2833,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2847,7 +2847,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, if ( !BooleanFlagOn( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY_DATA)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry No DV change %I64X for Fcb %wZ FID %08lX-%08lX-%08lX-%08lX\n", pObjectInfo->DataVersion.QuadPart, @@ -2855,7 +2855,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); // // We are ok, just get out @@ -2930,7 +2930,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, if ( pObjectInfo->DataVersion.QuadPart != pDirEnumEntry->DataVersion.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry DV Change %wZ FID %08lX-%08lX-%08lX-%08lX (%08lX != %08lX)\n", &DirEntry->NameInformation.FileName, @@ -2939,8 +2939,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, pObjectInfo->DataVersion.LowPart, - pDirEnumEntry->DataVersion.LowPart - ); + pDirEnumEntry->DataVersion.LowPart)); bPurgeExtents = TRUE; } @@ -2950,14 +2949,14 @@ AFSVerifyEntry( IN GUID *AuthGroup, bPurgeExtents = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry Clearing VERIFY_DATA flag %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); ClearFlag( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY_DATA); } @@ -2965,14 +2964,14 @@ AFSVerifyEntry( IN GUID *AuthGroup, if( pObjectInfo->Fcb != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry Flush/purge entry %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -2988,7 +2987,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( stIoStatus.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSVerifyEntry CcFlushCache failure %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", &DirEntry->NameInformation.FileName, @@ -2997,7 +2996,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, stIoStatus.Status, - stIoStatus.Information); + stIoStatus.Information)); ntStatus = stIoStatus.Status; } @@ -3012,14 +3011,14 @@ AFSVerifyEntry( IN GUID *AuthGroup, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSVerifyEntry CcPurgeCacheSection failure %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); SetFlag( pObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -3029,7 +3028,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, { ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSVerifyEntry CcFlushCache or CcPurgeCacheSection %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", &DirEntry->NameInformation.FileName, @@ -3037,7 +3036,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); SetFlag( pObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -3054,11 +3053,11 @@ AFSVerifyEntry( IN GUID *AuthGroup, // Reacquire the Fcb to purge the cache // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry Acquiring Fcb lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->Resource, TRUE); @@ -3073,7 +3072,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSVerifyEntry Meta Data Update failed %wZ FID %08lX-%08lX-%08lX-%08lX ntStatus %08lX\n", &DirEntry->NameInformation.FileName, @@ -3081,7 +3080,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); break; } @@ -3094,11 +3093,11 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->Fcb->Header.FileSize.QuadPart = pObjectInfo->EndOfFile.QuadPart; pObjectInfo->Fcb->Header.ValidDataLength.QuadPart = pObjectInfo->EndOfFile.QuadPart; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -3111,11 +3110,11 @@ AFSVerifyEntry( IN GUID *AuthGroup, (PCC_FILE_SIZES)&pObjectInfo->Fcb->Header.AllocationSize); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->Fcb->NPFcb->SectionObjectResource); @@ -3134,7 +3133,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSVerifyEntry Meta Data Update failed %wZ FID %08lX-%08lX-%08lX-%08lX ntStatus %08lX\n", &DirEntry->NameInformation.FileName, @@ -3142,19 +3141,19 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); break; } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSVerifyEntry Fcb NULL %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); } ClearFlag( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY); @@ -3173,14 +3172,14 @@ AFSVerifyEntry( IN GUID *AuthGroup, if( BooleanFlagOn( pObjectInfo->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSVerifyEntry Validating directory content for entry %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); AFSAcquireExcl( pObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -3275,7 +3274,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSVerifyEntry Attempt to verify node of type %d %wZ FID %08lX-%08lX-%08lX-%08lX\n", pObjectInfo->FileType, @@ -3283,7 +3282,7 @@ AFSVerifyEntry( IN GUID *AuthGroup, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); break; } @@ -3313,22 +3312,22 @@ AFSSetVolumeState( IN AFSVolumeStatusCB *VolumeStatus) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetVolumeState Marking volume state %d Volume Cell %08lX Volume %08lX\n", VolumeStatus->Online, VolumeStatus->FileID.Cell, - VolumeStatus->FileID.Volume); + VolumeStatus->FileID.Volume)); // // Need to locate the Fcb for the directory to purge // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetVolumeState Acquiring RDR VolumeTreeLock lock %p SHARED %08lX\n", &pDevExt->Specific.RDR.VolumeTreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock, TRUE); @@ -3348,11 +3347,11 @@ AFSSetVolumeState( IN AFSVolumeStatusCB *VolumeStatus) lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_INVALIDATE); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSSetVolumeState Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); @@ -3432,22 +3431,22 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Validating content for FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); if( !ExIsResourceAcquiredLite( ObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Acquiring DirectoryNodeHdr.TreeLock lock %p EXCL %08lX\n", ObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( ObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -3463,14 +3462,14 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, ObjectInfo->Specific.Directory.DirectoryNodeCount > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSValidateDirectoryCache Empty Node List but Non-Zero Node Count %d for dir FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->Specific.Directory.DirectoryNodeCount, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); } // @@ -3496,11 +3495,11 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, pCurrentDirEntry->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Deleting dir entry %p name %wZ\n", pCurrentDirEntry, - &pCurrentDirEntry->NameInformation.FileName); + &pCurrentDirEntry->NameInformation.FileName)); AFSDeleteDirEntry( ObjectInfo, pCurrentDirEntry); @@ -3510,11 +3509,11 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, ClearFlag( pCurrentDirEntry->Flags, AFS_DIR_ENTRY_VALID); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Clear VALID flag on DE %p Reference count %d\n", pCurrentDirEntry, - pCurrentDirEntry->DirOpenReferenceCount); + pCurrentDirEntry->DirOpenReferenceCount)); // // We pull the short name from the parent tree since it could change below @@ -3523,12 +3522,12 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, if( BooleanFlagOn( pCurrentDirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Removing DE %p (%08lX) from shortname tree for %wZ\n", pCurrentDirEntry, pCurrentDirEntry->Type.Data.ShortNameTreeEntry.HashIndex, - &pCurrentDirEntry->NameInformation.FileName); + &pCurrentDirEntry->NameInformation.FileName)); AFSRemoveShortNameDirEntry( &ObjectInfo->Specific.Directory.ShortNameTree, pCurrentDirEntry); @@ -3577,11 +3576,11 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, ObjectInfo->Specific.Directory.ShortNameTree = pCurrentDirEntry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Insert DE %p to head of shortname tree for %wZ\n", pCurrentDirEntry, - &pCurrentDirEntry->NameInformation.FileName); + &pCurrentDirEntry->NameInformation.FileName)); SetFlag( pCurrentDirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); } @@ -3591,22 +3590,22 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, if( !NT_SUCCESS( AFSInsertShortNameDirEntry( ObjectInfo->Specific.Directory.ShortNameTree, pCurrentDirEntry))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Failed to insert DE %p (%08lX) to shortname tree for %wZ\n", pCurrentDirEntry, pCurrentDirEntry->Type.Data.ShortNameTreeEntry.HashIndex, - &pCurrentDirEntry->NameInformation.FileName); + &pCurrentDirEntry->NameInformation.FileName)); } else { SetFlag( pCurrentDirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Insert DE %p to shortname tree for %wZ\n", pCurrentDirEntry, - &pCurrentDirEntry->NameInformation.FileName); + &pCurrentDirEntry->NameInformation.FileName)); } } } @@ -3616,24 +3615,24 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, continue; } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Processing INVALID DE %p Reference count %d\n", pCurrentDirEntry, - pCurrentDirEntry->DirOpenReferenceCount); + pCurrentDirEntry->DirOpenReferenceCount)); if( pCurrentDirEntry->DirOpenReferenceCount <= 0 && pCurrentDirEntry->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Deleting dir entry %wZ from parent FID %08lX-%08lX-%08lX-%08lX\n", &pCurrentDirEntry->NameInformation.FileName, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); AFSDeleteDirEntry( ObjectInfo, pCurrentDirEntry); @@ -3641,7 +3640,7 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateDirectoryCache Setting dir entry %p Name %wZ DELETED in parent FID %08lX-%08lX-%08lX-%08lX\n", pCurrentDirEntry, @@ -3649,7 +3648,7 @@ AFSValidateDirectoryCache( IN AFSObjectInfoCB *ObjectInfo, ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); SetFlag( pCurrentDirEntry->Flags, AFS_DIR_ENTRY_DELETED); @@ -3877,7 +3876,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, // correct order // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSValidateEntry Validating entry %wZ FID %08lX-%08lX-%08lX-%08lX FastCall %u\n", &DirEntry->NameInformation.FileName, @@ -3885,7 +3884,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - FastCall); + FastCall)); // // If this is a fake node then bail since the service knows nothing about it @@ -3912,14 +3911,14 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->Expiration.QuadPart >= liSystemTime.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSValidateEntry Directory entry %wZ FID %08lX-%08lX-%08lX-%08lX VALID\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); try_return( ntStatus); } @@ -3936,7 +3935,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSValidateEntry Failed to evaluate entry FastCall %d %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FastCall, @@ -3945,7 +3944,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); // // Failed validation of node so return access-denied @@ -3954,7 +3953,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry Validating entry FastCall %d %wZ FID %08lX-%08lX-%08lX-%08lX DV %I64X returned DV %I64X FT %d\n", FastCall, @@ -3965,7 +3964,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Unique, pObjectInfo->DataVersion.QuadPart, pDirEnumEntry->DataVersion.QuadPart, - pDirEnumEntry->FileType); + pDirEnumEntry->FileType)); // @@ -4035,11 +4034,11 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, if( !ExIsResourceAcquiredLite( &pCurrentFcb->NPFcb->Resource)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry Acquiring Fcb lock %p EXCL %08lX\n", &pCurrentFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pCurrentFcb->NPFcb->Resource, TRUE); @@ -4052,19 +4051,19 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, IO_STATUS_BLOCK stIoStatus; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSValidateEntry Flush/purge entry %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); if ( pObjectInfo->DataVersion.QuadPart != pDirEnumEntry->DataVersion.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry DV Change %wZ FID %08lX-%08lX-%08lX-%08lX (%08lX != %08lX)\n", &DirEntry->NameInformation.FileName, @@ -4073,8 +4072,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, pObjectInfo->DataVersion.LowPart, - pDirEnumEntry->DataVersion.LowPart - ); + pDirEnumEntry->DataVersion.LowPart)); bPurgeExtents = TRUE; } @@ -4086,23 +4084,23 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, { bPurgeExtents = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSVerifyEntry Clearing VERIFY_DATA flag %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); ClearFlag( pObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY_DATA); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -4124,7 +4122,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, if( !NT_SUCCESS( stIoStatus.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSValidateEntry CcFlushCache failure %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", &DirEntry->NameInformation.FileName, @@ -4133,7 +4131,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, stIoStatus.Status, - stIoStatus.Information); + stIoStatus.Information)); ntStatus = stIoStatus.Status; } @@ -4148,14 +4146,14 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSValidateEntry CcPurgeCacheSection failure %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); SetFlag( pObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -4165,7 +4163,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, { ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSValidateEntry CcFlushCache or CcPurgeCacheSection %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", &DirEntry->NameInformation.FileName, @@ -4173,16 +4171,16 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); SetFlag( pObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->Fcb->NPFcb->SectionObjectResource); @@ -4231,7 +4229,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSValidateEntry Meta Data Update failed %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", &DirEntry->NameInformation.FileName, @@ -4239,7 +4237,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); break; } @@ -4254,11 +4252,11 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, { FILE_OBJECT *pCCFileObject; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -4275,11 +4273,11 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, (PCC_FILE_SIZES)&pObjectInfo->Fcb->Header.AllocationSize); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pObjectInfo->Fcb->NPFcb->SectionObjectResource); } @@ -4298,23 +4296,23 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, // the directory enumeration. // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSValidateEntry Acquiring DirectoryNodeHdr.TreeLock lock %p EXCL %08lX\n", pObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); if( BooleanFlagOn( pObjectInfo->Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSValidateEntry Validating directory content for %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); AFSAcquireExcl( pObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -4328,7 +4326,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSValidateEntry Failed to re-enumerate %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &DirEntry->NameInformation.FileName, @@ -4336,7 +4334,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, pObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); break; } @@ -4360,7 +4358,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSValidateEntry Attempt to verify node of type %d FastCall %d %wZ FID %08lX-%08lX-%08lX-%08lX\n", pObjectInfo->FileType, @@ -4369,7 +4367,7 @@ AFSValidateEntry( IN AFSDirectoryCB *DirEntry, pObjectInfo->FileId.Cell, pObjectInfo->FileId.Volume, pObjectInfo->FileId.Vnode, - pObjectInfo->FileId.Unique); + pObjectInfo->FileId.Unique)); break; } @@ -4422,11 +4420,11 @@ AFSInitializeSpecialShareNameList() lCount = AFSObjectInfoIncrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_GLOBAL); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeSpecialShareNameList (srvsvc) Increment count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); pObjectInfoCB->FileType = (ULONG) AFS_FILE_TYPE_SPECIAL_SHARE_NAME; @@ -4445,10 +4443,10 @@ AFSInitializeSpecialShareNameList() try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeSpecialShareNameList (srvsvc) AFS_DIR_ENTRY_TAG allocated %p\n", - pDirNode); + pDirNode)); pNonPagedDirEntry = (AFSNonPagedDirectoryCB *)AFSLibExAllocatePoolWithTag( NonPagedPool, sizeof( AFSNonPagedDirectoryCB), @@ -4515,11 +4513,11 @@ AFSInitializeSpecialShareNameList() lCount = AFSObjectInfoIncrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_GLOBAL); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeSpecialShareNameList (ipc$) Incrementing count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); pObjectInfoCB->FileType = (ULONG) AFS_FILE_TYPE_SPECIAL_SHARE_NAME; @@ -4538,10 +4536,10 @@ AFSInitializeSpecialShareNameList() try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeSpecialShareNameList (ipc$) AFS_DIR_ENTRY_TAG allocated %p\n", - pDirNode); + pDirNode)); pNonPagedDirEntry = (AFSNonPagedDirectoryCB *)AFSLibExAllocatePoolWithTag( NonPagedPool, sizeof( AFSNonPagedDirectoryCB), @@ -4639,11 +4637,11 @@ AFSGetSpecialShareNameEntry( IN UNICODE_STRING *ShareName, { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSGetSpecialShareNameEntry share name %wZ secondary name %wZ\n", ShareName, - SecondaryName); + SecondaryName)); uniFullShareName = *ShareName; @@ -4759,11 +4757,11 @@ AFSResetDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB) pCurrentDirEntry->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSResetDirectoryContent Deleting dir entry %p for %wZ\n", pCurrentDirEntry, - &pCurrentDirEntry->NameInformation.FileName); + &pCurrentDirEntry->NameInformation.FileName)); AFSDeleteDirEntry( ObjectInfoCB, pCurrentDirEntry); @@ -4771,11 +4769,11 @@ AFSResetDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB) else { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSResetDirectoryContent Setting DELETE flag in dir entry %p for %wZ\n", pCurrentDirEntry, - &pCurrentDirEntry->NameInformation.FileName); + &pCurrentDirEntry->NameInformation.FileName)); SetFlag( pCurrentDirEntry->Flags, AFS_DIR_ENTRY_DELETED); @@ -4798,13 +4796,13 @@ AFSResetDirectoryContent( IN AFSObjectInfoCB *ObjectInfoCB) ObjectInfoCB->Specific.Directory.DirectoryNodeCount = 0; - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSResetDirectoryContent Reset count to 0 on parent FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfoCB->FileId.Cell, ObjectInfoCB->FileId.Volume, ObjectInfoCB->FileId.Vnode, - ObjectInfoCB->FileId.Unique); + ObjectInfoCB->FileId.Unique)); } return ntStatus; @@ -4821,11 +4819,11 @@ AFSEnumerateGlobalRoot( IN GUID *AuthGroup) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateGlobalRoot Acquiring GlobalRoot DirectoryNodeHdr.TreeLock lock %p EXCL %08lX\n", AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -5099,9 +5097,9 @@ AFSInitNameArray( IN AFSDirectoryCB *DirectoryCB, if( pNameArray == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitNameArray Failed to allocate name array\n"); + "AFSInitNameArray Failed to allocate name array\n")); try_return( pNameArray); } @@ -5125,13 +5123,13 @@ AFSInitNameArray( IN AFSDirectoryCB *DirectoryCB, lCount = InterlockedIncrement( &DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitNameArray [NA:%p] Increment count on %wZ DE %p Cnt %d\n", pNameArray, &DirectoryCB->NameInformation.FileName, DirectoryCB, - lCount); + lCount)); pCurrentElement->DirectoryCB = DirectoryCB; @@ -5145,7 +5143,7 @@ AFSInitNameArray( IN AFSDirectoryCB *DirectoryCB, SetFlag( pCurrentElement->Flags, AFS_NAME_ARRAY_FLAG_ROOT_ELEMENT); } - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitNameArray [NA:%p] Element[0] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", pNameArray, @@ -5155,7 +5153,7 @@ AFSInitNameArray( IN AFSDirectoryCB *DirectoryCB, pCurrentElement->FileId.Vnode, pCurrentElement->FileId.Unique, &pCurrentElement->DirectoryCB->NameInformation.FileName, - pCurrentElement->DirectoryCB->ObjectInformation->FileType); + pCurrentElement->DirectoryCB->ObjectInformation->FileType)); } try_exit: @@ -5179,7 +5177,7 @@ AFSPopulateNameArray( IN AFSNameArrayHdr *NameArray, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPopulateNameArray [NA:%p] passed Path %wZ DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5190,7 +5188,7 @@ AFSPopulateNameArray( IN AFSNameArrayHdr *NameArray, DirectoryCB->ObjectInformation->FileId.Vnode, DirectoryCB->ObjectInformation->FileId.Unique, &DirectoryCB->NameInformation.FileName, - DirectoryCB->ObjectInformation->FileType); + DirectoryCB->ObjectInformation->FileType)); // // Init some info in the header @@ -5208,13 +5206,13 @@ AFSPopulateNameArray( IN AFSNameArrayHdr *NameArray, lCount = InterlockedIncrement( &pCurrentElement->DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSPopulateNameArray [NA:%p] Increment count on volume %wZ DE %p Cnt %d\n", NameArray, &pCurrentElement->DirectoryCB->NameInformation.FileName, pCurrentElement->DirectoryCB, - lCount); + lCount)); pCurrentElement->Component = DirectoryCB->ObjectInformation->VolumeCB->DirectoryCB->NameInformation.FileName; @@ -5232,7 +5230,7 @@ AFSPopulateNameArray( IN AFSNameArrayHdr *NameArray, NameArray->LinkCount = 0; - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPopulateNameArray [NA:%p] Element[0] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5242,7 +5240,7 @@ AFSPopulateNameArray( IN AFSNameArrayHdr *NameArray, pCurrentElement->FileId.Vnode, pCurrentElement->FileId.Unique, &pCurrentElement->DirectoryCB->NameInformation.FileName, - pCurrentElement->DirectoryCB->ObjectInformation->FileType); + pCurrentElement->DirectoryCB->ObjectInformation->FileType)); // // If the root is the parent then we are done ... @@ -5277,7 +5275,7 @@ AFSPopulateNameArrayFromRelatedArray( IN AFSNameArrayHdr *NameArray, if ( DirectoryCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPopulateNameArray [NA:%p] passed RelatedNameArray %p DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5288,16 +5286,16 @@ AFSPopulateNameArrayFromRelatedArray( IN AFSNameArrayHdr *NameArray, DirectoryCB->ObjectInformation->FileId.Vnode, DirectoryCB->ObjectInformation->FileId.Unique, &DirectoryCB->NameInformation.FileName, - DirectoryCB->ObjectInformation->FileType); + DirectoryCB->ObjectInformation->FileType)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPopulateNameArray [NA:%p] passed RelatedNameArray %p DE NULL\n", NameArray, - RelatedNameArray); + RelatedNameArray)); } // @@ -5335,17 +5333,17 @@ AFSPopulateNameArrayFromRelatedArray( IN AFSNameArrayHdr *NameArray, lCount = InterlockedIncrement( &pCurrentElement->DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSPopulateNameArrayFromRelatedArray [NA:%p] Increment count on %wZ DE %p Cnt %d\n", NameArray, &pCurrentElement->DirectoryCB->NameInformation.FileName, pCurrentElement->DirectoryCB, - lCount); + lCount)); lCount = InterlockedIncrement( &NameArray->Count); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPopulateNameArrayFromRelatedArray [NA:%p] Element[%d] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5356,7 +5354,7 @@ AFSPopulateNameArrayFromRelatedArray( IN AFSNameArrayHdr *NameArray, pCurrentElement->FileId.Vnode, pCurrentElement->FileId.Unique, &pCurrentElement->DirectoryCB->NameInformation.FileName, - pCurrentElement->DirectoryCB->ObjectInformation->FileType); + pCurrentElement->DirectoryCB->ObjectInformation->FileType)); if( pCurrentElement->DirectoryCB == DirectoryCB || NameArray->Count == RelatedNameArray->Count) @@ -5391,10 +5389,10 @@ AFSFreeNameArray( IN AFSNameArrayHdr *NameArray) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSFreeNameArray [NA:%p]\n", - NameArray); + NameArray)); for ( lElement = 0; lElement < NameArray->Count; lElement++) { @@ -5403,13 +5401,13 @@ AFSFreeNameArray( IN AFSNameArrayHdr *NameArray) lCount = InterlockedDecrement( &pCurrentElement->DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSFreeNameArray [NA:%p] Decrement count on %wZ DE %p Cnt %d\n", NameArray, &pCurrentElement->DirectoryCB->NameInformation.FileName, pCurrentElement->DirectoryCB, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -5432,7 +5430,7 @@ AFSInsertNextElement( IN AFSNameArrayHdr *NameArray, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertNextElement [NA:%p] passed DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5442,15 +5440,15 @@ AFSInsertNextElement( IN AFSNameArrayHdr *NameArray, DirectoryCB->ObjectInformation->FileId.Vnode, DirectoryCB->ObjectInformation->FileId.Unique, &DirectoryCB->NameInformation.FileName, - DirectoryCB->ObjectInformation->FileType); + DirectoryCB->ObjectInformation->FileType)); if( NameArray->Count == (LONG) NameArray->MaxElementCount) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInsertNextElement [NA:%p] Name has reached Maximum Size\n", - NameArray); + NameArray)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -5462,12 +5460,12 @@ AFSInsertNextElement( IN AFSNameArrayHdr *NameArray, &DirectoryCB->ObjectInformation->FileId) ) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInsertNextElement [NA:%p] DE %p recursion Status %08X\n", NameArray, DirectoryCB, - STATUS_ACCESS_DENIED); + STATUS_ACCESS_DENIED)); try_return( ntStatus = STATUS_ACCESS_DENIED); } @@ -5489,13 +5487,13 @@ AFSInsertNextElement( IN AFSNameArrayHdr *NameArray, lCount = InterlockedIncrement( &DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertNextElement [NA:%p] Increment count on %wZ DE %p Cnt %d\n", NameArray, &DirectoryCB->NameInformation.FileName, DirectoryCB, - lCount); + lCount)); ASSERT( lCount > 0); @@ -5513,7 +5511,7 @@ AFSInsertNextElement( IN AFSNameArrayHdr *NameArray, SetFlag( pCurrentElement->Flags, AFS_NAME_ARRAY_FLAG_ROOT_ELEMENT); } - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertNextElement [NA:%p] Element[%d] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5524,7 +5522,7 @@ AFSInsertNextElement( IN AFSNameArrayHdr *NameArray, pCurrentElement->FileId.Vnode, pCurrentElement->FileId.Unique, &pCurrentElement->DirectoryCB->NameInformation.FileName, - pCurrentElement->DirectoryCB->ObjectInformation->FileType); + pCurrentElement->DirectoryCB->ObjectInformation->FileType)); try_exit: @@ -5546,31 +5544,31 @@ AFSBackupEntry( IN AFSNameArrayHdr *NameArray) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSBackupEntry [NA:%p]\n", - NameArray); + NameArray)); if( NameArray->Count == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSBackupEntry [NA:%p] No more entries\n", - NameArray); + NameArray)); try_return( pCurrentElement); } lCount = InterlockedDecrement( &NameArray->CurrentEntry->DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSBackupEntry [NA:%p] Decrement count on %wZ DE %p Cnt %d\n", NameArray, &NameArray->CurrentEntry->DirectoryCB->NameInformation.FileName, NameArray->CurrentEntry->DirectoryCB, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -5582,10 +5580,10 @@ AFSBackupEntry( IN AFSNameArrayHdr *NameArray) { NameArray->CurrentEntry = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSBackupEntry [NA:%p] No more entries\n", - NameArray); + NameArray)); } else { @@ -5598,7 +5596,7 @@ AFSBackupEntry( IN AFSNameArrayHdr *NameArray) pDirectoryCB = pCurrentElement->DirectoryCB; - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSBackupEntry [NA:%p] Returning Element[%d] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5609,7 +5607,7 @@ AFSBackupEntry( IN AFSNameArrayHdr *NameArray) pCurrentElement->FileId.Vnode, pCurrentElement->FileId.Unique, &pCurrentElement->DirectoryCB->NameInformation.FileName, - pCurrentElement->DirectoryCB->ObjectInformation->FileType); + pCurrentElement->DirectoryCB->ObjectInformation->FileType)); // // If the entry we are removing is a volume root, @@ -5647,19 +5645,19 @@ AFSGetParentEntry( IN AFSNameArrayHdr *NameArray) __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetParentEntry [NA:%p]\n", - NameArray); + NameArray)); if( NameArray->Count == 0 || NameArray->Count == 1) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSGetParentEntry [NA:%p] No more entries\n", - NameArray); + NameArray)); try_return( pDirEntry = NULL); } @@ -5668,7 +5666,7 @@ AFSGetParentEntry( IN AFSNameArrayHdr *NameArray) pDirEntry = pElement->DirectoryCB; - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetParentEntry [NA:%p] Returning Element[%d] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5679,7 +5677,7 @@ AFSGetParentEntry( IN AFSNameArrayHdr *NameArray) pElement->FileId.Vnode, pElement->FileId.Unique, &pElement->DirectoryCB->NameInformation.FileName, - pElement->DirectoryCB->ObjectInformation->FileType); + pElement->DirectoryCB->ObjectInformation->FileType)); try_exit: @@ -5701,7 +5699,7 @@ AFSResetNameArray( IN AFSNameArrayHdr *NameArray, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSResetNameArray [NA:%p] passed DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5711,7 +5709,8 @@ AFSResetNameArray( IN AFSNameArrayHdr *NameArray, DirectoryCB->ObjectInformation->FileId.Vnode, DirectoryCB->ObjectInformation->FileId.Unique, &DirectoryCB->NameInformation.FileName, - DirectoryCB->ObjectInformation->FileType); + DirectoryCB->ObjectInformation->FileType)); + // // Dereference previous name array contents // @@ -5723,13 +5722,13 @@ AFSResetNameArray( IN AFSNameArrayHdr *NameArray, lCount = InterlockedDecrement( &pCurrentElement->DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSResetNameArray [NA:%p] Decrement count on %wZ DE %p Cnt %d\n", NameArray, &pCurrentElement->DirectoryCB->NameInformation.FileName, pCurrentElement->DirectoryCB, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -5753,13 +5752,13 @@ AFSResetNameArray( IN AFSNameArrayHdr *NameArray, lCount = InterlockedIncrement( &DirectoryCB->NameArrayReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSResetNameArray [NA:%p] Increment count on %wZ DE %p Cnt %d\n", NameArray, &DirectoryCB->NameInformation.FileName, DirectoryCB, - lCount); + lCount)); pCurrentElement->DirectoryCB = DirectoryCB; @@ -5775,7 +5774,7 @@ AFSResetNameArray( IN AFSNameArrayHdr *NameArray, SetFlag( pCurrentElement->Flags, AFS_NAME_ARRAY_FLAG_ROOT_ELEMENT); } - AFSDbgLogMsg( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_NAME_ARRAY_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSResetNameArray [NA:%p] Element[0] DE %p FID %08lX-%08lX-%08lX-%08lX %wZ Type %d\n", NameArray, @@ -5785,7 +5784,7 @@ AFSResetNameArray( IN AFSNameArrayHdr *NameArray, pCurrentElement->FileId.Vnode, pCurrentElement->FileId.Unique, &pCurrentElement->DirectoryCB->NameInformation.FileName, - pCurrentElement->DirectoryCB->ObjectInformation->FileType); + pCurrentElement->DirectoryCB->ObjectInformation->FileType)); } } @@ -5955,11 +5954,11 @@ AFSInitPIOCtlDirectoryCB( IN AFSObjectInfoCB *ParentObjectInfo) lCount = AFSObjectInfoIncrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_DIRENTRY); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitPIOCtlDirectoryCB Increment count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); pObjectInfoCB->FileType = (ULONG) AFS_FILE_TYPE_PIOCTL; @@ -5977,10 +5976,10 @@ AFSInitPIOCtlDirectoryCB( IN AFSObjectInfoCB *ParentObjectInfo) try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitPIOCtlDirectoryCB AFS_DIR_ENTRY_TAG allocated %p\n", - pDirNode); + pDirNode)); pNonPagedDirEntry = (AFSNonPagedDirectoryCB *)AFSExAllocatePoolWithTag( NonPagedPool, sizeof( AFSNonPagedDirectoryCB), @@ -6028,11 +6027,11 @@ AFSInitPIOCtlDirectoryCB( IN AFSObjectInfoCB *ParentObjectInfo) if ( InterlockedCompareExchangePointer( (PVOID *)&ParentObjectInfo->Specific.Directory.PIOCtlDirectoryCB, pDirNode, NULL) != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSInitPIOCtlDirectoryCB Raced PIOCtlDirectoryCB %p pFcb %p\n", ParentObjectInfo->Specific.Directory.PIOCtlDirectoryCB, - pDirNode); + pDirNode)); try_return( ntStatus = STATUS_REPARSE); } @@ -6045,10 +6044,10 @@ try_exit: if ( pDirNode != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSInitPIOCtlDirectoryCB AFS_DIR_ENTRY_TAG deallocating %p\n", - pDirNode); + pDirNode)); AFSExFreePoolWithTag( pDirNode, AFS_DIR_ENTRY_TAG); } @@ -6067,11 +6066,11 @@ try_exit: lCount = AFSObjectInfoDecrement( pObjectInfoCB, AFS_OBJECT_REFERENCE_DIRENTRY); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitPIOCtlDirectoryCB Decrement count on object %p Cnt %d\n", pObjectInfoCB, - lCount); + lCount)); AFSDeleteObjectInfo( &pObjectInfoCB); } @@ -6313,10 +6312,10 @@ AFSRetrieveFileAttributes( IN AFSDirectoryCB *ParentDirectoryCB, AFSReleaseResource( &DirectoryCB->NonPaged->Lock); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSRetrieveFileAttributes Name %wZ contains invalid server name\n", - &uniFullPathName); + &uniFullPathName)); try_return( ntStatus = STATUS_OBJECT_PATH_INVALID); } @@ -6356,22 +6355,22 @@ AFSRetrieveFileAttributes( IN AFSDirectoryCB *ParentDirectoryCB, lCount = AFSVolumeIncrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveFileAttributes Increment count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveFileAttributes Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); ntStatus = AFSLocateNameEntry( NULL, NULL, @@ -6400,12 +6399,12 @@ AFSRetrieveFileAttributes( IN AFSDirectoryCB *ParentDirectoryCB, lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveFileAttributes Decrement count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); pVolumeCB = pNewVolumeCB; @@ -6424,12 +6423,12 @@ AFSRetrieveFileAttributes( IN AFSDirectoryCB *ParentDirectoryCB, lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveFileAttributes DecrementX count on %wZ DE %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, - lCount); + lCount)); pParentDirEntry = pNewParentDirEntry; @@ -6498,13 +6497,13 @@ try_exit: lCount = InterlockedDecrement( &pDirectoryEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveFileAttributes Decrement1 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirectoryEntry->NameInformation.FileName, pDirectoryEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -6514,13 +6513,13 @@ try_exit: lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveFileAttributes Decrement2 count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -6531,12 +6530,12 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSRetrieveFileAttributes Decrement2 count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); } if( pNameArray != NULL) @@ -6625,11 +6624,11 @@ AFSAllocateObjectInfo( IN AFSObjectInfoCB *ParentObjectInfo, lCount = AFSObjectInfoIncrement( ParentObjectInfo, AFS_OBJECT_REFERENCE_CHILD); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSAllocateObjectInfo Increment count on parent object %p Cnt %d\n", ParentObjectInfo, - lCount); + lCount)); } // @@ -6921,11 +6920,11 @@ AFSDeleteObjectInfo( IN AFSObjectInfoCB **ppObjectInfo) lCount = AFSObjectInfoDecrement( pParentObjectInfo, AFS_OBJECT_REFERENCE_CHILD); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteObjectInfo Decrement count on parent object %p Cnt %d\n", pParentObjectInfo, - lCount); + lCount)); AFSReleaseObjectInfo( &pParentObjectInfo); } @@ -7141,22 +7140,22 @@ AFSEvaluateRootEntry( IN AFSDirectoryCB *DirectoryCB, lCount = AFSVolumeIncrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEvaluateRootEntry Increment count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEvaluateRootEntry Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); ntStatus = AFSLocateNameEntry( NULL, NULL, @@ -7185,12 +7184,12 @@ AFSEvaluateRootEntry( IN AFSDirectoryCB *DirectoryCB, lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEvaluateRootEntry Decrement count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); pVolumeCB = pNewVolumeCB; @@ -7209,12 +7208,12 @@ AFSEvaluateRootEntry( IN AFSDirectoryCB *DirectoryCB, lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEvaluateRootEntry DecrementX count on %wZ DE %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, - lCount); + lCount)); pParentDirEntry = pNewParentDirEntry; @@ -7245,13 +7244,13 @@ try_exit: lCount = InterlockedDecrement( &pDirectoryEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEvaluateRootEntry Decrement1 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirectoryEntry->NameInformation.FileName, pDirectoryEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -7261,13 +7260,13 @@ try_exit: lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEvaluateRootEntry Decrement2 count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -7284,12 +7283,12 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEvaluateRootEntry Decrement2 count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); } if( pNameArray != NULL) @@ -7347,11 +7346,11 @@ AFSCleanupFcb( IN AFSFcb *Fcb, !BooleanFlagOn( Fcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupEntry Acquiring Fcb lock %p SHARED %08lX\n", &Fcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &Fcb->NPFcb->Resource, TRUE); @@ -7359,11 +7358,11 @@ AFSCleanupFcb( IN AFSFcb *Fcb, if( Fcb->OpenReferenceCount > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupEntry Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &Fcb->NPFcb->SectionObjectResource, TRUE); @@ -7379,7 +7378,7 @@ AFSCleanupFcb( IN AFSFcb *Fcb, if( !NT_SUCCESS( stIoStatus.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCleanupFcb CcFlushCache [1] failure FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", Fcb->ObjectInformation->FileId.Cell, @@ -7387,7 +7386,7 @@ AFSCleanupFcb( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, stIoStatus.Status, - stIoStatus.Information); + stIoStatus.Information)); ntStatus = stIoStatus.Status; } @@ -7401,13 +7400,13 @@ AFSCleanupFcb( IN AFSFcb *Fcb, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCleanupFcb CcPurgeCacheSection [1] failure FID %08lX-%08lX-%08lX-%08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, - Fcb->ObjectInformation->FileId.Unique); + Fcb->ObjectInformation->FileId.Unique)); SetFlag( Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -7418,32 +7417,32 @@ AFSCleanupFcb( IN AFSFcb *Fcb, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSCleanupFcb Cc [1] FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); SetFlag( Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupFcb Releasing Fcb SectionObject lock %p EXCL %08lX\n", &Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &Fcb->NPFcb->SectionObjectResource); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupEntry Releasing Fcb lock %p SHARED %08lX\n", &Fcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &Fcb->NPFcb->Resource); @@ -7525,11 +7524,11 @@ AFSCleanupFcb( IN AFSFcb *Fcb, (AFS_SERVER_PURGE_SLEEP * pControlDeviceExt->Specific.Control.FcbPurgeTimeCount.QuadPart)))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupFcb Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); if ( AFSAcquireExcl( &Fcb->NPFcb->SectionObjectResource, ForceFlush)) { @@ -7545,7 +7544,7 @@ AFSCleanupFcb( IN AFSFcb *Fcb, if( !NT_SUCCESS( stIoStatus.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCleanupFcb CcFlushCache [2] failure FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", Fcb->ObjectInformation->FileId.Cell, @@ -7553,7 +7552,7 @@ AFSCleanupFcb( IN AFSFcb *Fcb, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, stIoStatus.Status, - stIoStatus.Information); + stIoStatus.Information)); ntStatus = stIoStatus.Status; } @@ -7568,13 +7567,13 @@ AFSCleanupFcb( IN AFSFcb *Fcb, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCleanupFcb CcPurgeCacheSection [2] failure FID %08lX-%08lX-%08lX-%08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, - Fcb->ObjectInformation->FileId.Unique); + Fcb->ObjectInformation->FileId.Unique)); SetFlag( Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -7585,21 +7584,21 @@ AFSCleanupFcb( IN AFSFcb *Fcb, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSCleanupFcb Cc [2] FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCleanupFcb Releasing Fcb SectionObject lock %p EXCL %08lX\n", &Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &Fcb->NPFcb->SectionObjectResource); @@ -7906,11 +7905,11 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, if( BooleanFlagOn( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ has NOT_IN flag set\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); try_return( ntStatus); } @@ -7921,20 +7920,20 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, // Remove the entry from the parent tree // - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ removing from case sensitive tree\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); AFSRemoveCaseSensitiveDirEntry( &ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead, DirEntry); - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ removing from case insensitive tree\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); AFSRemoveCaseInsensitiveDirEntry( &ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead, DirEntry); @@ -7946,11 +7945,11 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, // From the short name tree // - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ removing from shortname tree\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); AFSRemoveShortNameDirEntry( &ParentObjectInfo->Specific.Directory.ShortNameTree, DirEntry); @@ -7958,11 +7957,11 @@ AFSRemoveNameEntry( IN AFSObjectInfoCB *ParentObjectInfo, ClearFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); } - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveNameEntry DE %p for %wZ setting NOT_IN flag\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); SetFlag( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE); @@ -8005,9 +8004,9 @@ AFSGetAuthenticationId() if( hToken == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_ERROR, - "AFSGetAuthenticationId Failed to retrieve impersonation or primary token\n"); + "AFSGetAuthenticationId Failed to retrieve impersonation or primary token\n")); try_return( ntStatus); } @@ -8022,9 +8021,10 @@ AFSGetAuthenticationId() if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_ERROR, - "AFSGetAuthenticationId Failed to retrieve information Status %08lX\n", ntStatus); + "AFSGetAuthenticationId Failed to retrieve information Status %08lX\n", + ntStatus)); try_return( ntStatus); } @@ -8032,10 +8032,10 @@ AFSGetAuthenticationId() liAuthId.HighPart = pTokenInfo->AuthenticationId.HighPart; liAuthId.LowPart = pTokenInfo->AuthenticationId.LowPart; - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetAuthenticationId Successfully retrieved authentication ID %I64X\n", - liAuthId.QuadPart); + liAuthId.QuadPart)); try_exit: @@ -8212,6 +8212,8 @@ AFSInitializeLibrary( IN AFSLibraryInitCB *LibraryInit) AFSDbgLogMsg = LibraryInit->AFSDbgLogMsg; + AFSDebugTraceFnc = AFSDbgLogMsg; + AFSAddConnectionEx = LibraryInit->AFSAddConnectionEx; AFSExAllocatePoolWithTag = LibraryInit->AFSExAllocatePoolWithTag; @@ -8260,10 +8262,10 @@ AFSInitializeLibrary( IN AFSLibraryInitCB *LibraryInit) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeLibrary AFSInitVolume failure %08lX\n", - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -8274,19 +8276,19 @@ AFSInitializeLibrary( IN AFSLibraryInitCB *LibraryInit) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOAD_LIBRARY | AFS_SUBSYSTEM_INIT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSInitializeLibrary AFSInitRootFcb failure %08lX\n", - ntStatus); + ntStatus)); lCount = AFSVolumeDecrement( AFSGlobalRoot, AFS_VOLUME_REFERENCE_GLOBAL_ROOT); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeLibrary Decrement count on volume %p Cnt %d\n", AFSGlobalRoot, - lCount); + lCount)); AFSReleaseResource( AFSGlobalRoot->VolumeLock); @@ -8317,11 +8319,11 @@ AFSInitializeLibrary( IN AFSLibraryInitCB *LibraryInit) lCount = AFSVolumeDecrement( AFSGlobalRoot, AFS_VOLUME_REFERENCE_GLOBAL_ROOT); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSInitializeLibrary Decrement count on volume %p Cnt %d\n", AFSGlobalRoot, - lCount); + lCount)); AFSReleaseResource( AFSGlobalRoot->VolumeLock); @@ -8500,12 +8502,12 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, lCount = AFSVolumeIncrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Increment count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); } AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); @@ -8524,11 +8526,11 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_STATUS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Increment1 count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } else { @@ -8552,11 +8554,11 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_STATUS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Increment2 count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -8594,10 +8596,10 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, &AFSServerName, TRUE) != 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSGetObjectStatus Name %wZ contains invalid server name\n", - &uniFullPathName); + &uniFullPathName)); try_return( ntStatus = STATUS_OBJECT_PATH_INVALID); } @@ -8631,22 +8633,22 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, lCount = AFSVolumeIncrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Increment2 count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); lCount = InterlockedIncrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); ntStatus = AFSLocateNameEntry( NULL, NULL, @@ -8677,12 +8679,12 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Decrement count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); pVolumeCB = pNewVolumeCB; @@ -8701,12 +8703,12 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus DecrementX count on %wZ DE %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, - lCount); + lCount)); pParentDirEntry = pNewParentDirEntry; @@ -8726,11 +8728,11 @@ AFSGetObjectStatus( IN AFSGetStatusInfoCB *GetStatusInfo, lCount = AFSObjectInfoIncrement( pObjectInfo, AFS_OBJECT_REFERENCE_STATUS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Increment3 count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } // @@ -8780,13 +8782,13 @@ try_exit: lCount = InterlockedDecrement( &pDirectoryEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Decrement1 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirectoryEntry->NameInformation.FileName, pDirectoryEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -8796,13 +8798,13 @@ try_exit: lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Decrement2 count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -8813,11 +8815,11 @@ try_exit: lCount = AFSObjectInfoDecrement( pObjectInfo, AFS_OBJECT_REFERENCE_STATUS); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Decrement count on object %p Cnt %d\n", pObjectInfo, - lCount); + lCount)); } if( pVolumeCB != NULL) @@ -8826,12 +8828,12 @@ try_exit: lCount = AFSVolumeDecrement( pVolumeCB, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetObjectStatus Decrement4 count on volume %p Reason %u Cnt %d\n", pVolumeCB, VolumeReferenceReason, - lCount); + lCount)); } if( pNameArray != NULL) @@ -8862,10 +8864,10 @@ AFSCheckSymlinkAccess( IN AFSDirectoryCB *ParentDirectoryCB, // Search for the entry in the parent // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCheckSymlinkAccess Searching for entry %wZ case sensitive\n", - ComponentName); + ComponentName)); ulCRC = AFSGenerateCRC( ComponentName, FALSE); @@ -8884,10 +8886,10 @@ AFSCheckSymlinkAccess( IN AFSDirectoryCB *ParentDirectoryCB, // Missed so perform a case insensitive lookup // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCheckSymlinkAccess Searching for entry %wZ case insensitive\n", - ComponentName); + ComponentName)); ulCRC = AFSGenerateCRC( ComponentName, TRUE); @@ -8910,10 +8912,10 @@ AFSCheckSymlinkAccess( IN AFSDirectoryCB *ParentDirectoryCB, NULL)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCheckSymlinkAccess Searching for entry %wZ short name\n", - ComponentName); + ComponentName)); AFSLocateShortNameDirEntry( ParentDirectoryCB->ObjectInformation->Specific.Directory.ShortNameTree, ulCRC, @@ -8926,13 +8928,13 @@ AFSCheckSymlinkAccess( IN AFSDirectoryCB *ParentDirectoryCB, { lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCheckSymlinkAccess Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -8942,11 +8944,11 @@ AFSCheckSymlinkAccess( IN AFSDirectoryCB *ParentDirectoryCB, if( pDirEntry == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCheckSymlinkAccess Failed to locate entry %wZ ntStatus %08X\n", ComponentName, - STATUS_OBJECT_NAME_NOT_FOUND); + STATUS_OBJECT_NAME_NOT_FOUND)); try_return( ntStatus = STATUS_OBJECT_NAME_NOT_FOUND); } @@ -8956,22 +8958,22 @@ AFSCheckSymlinkAccess( IN AFSDirectoryCB *ParentDirectoryCB, // denied. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCheckSymlinkAccess Failing symlink access to entry %wZ REPARSE_POINT_NOT_RESOLVED\n", - ComponentName); + ComponentName)); ntStatus = STATUS_REPARSE_POINT_NOT_RESOLVED; lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCheckSymlinkAccess Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -9081,6 +9083,7 @@ AFSCreateDefaultSecurityDescriptor() if( pWorldSID == NULL) { AFSPrint( "AFSCreateDefaultSecurityDescriptor unable to allocate World SID\n"); + try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -9521,11 +9524,11 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, bLocked = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPerformObjectInvalidate Acquiring Fcb extents lock %p SHARED %08lX\n", &ObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &ObjectInfo->Fcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -9573,11 +9576,11 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPerformObjectInvalidation Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &ObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &ObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -9596,13 +9599,13 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSPerformObjectInvalidation CcPurgeCacheSection failure FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); SetFlag( ObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } @@ -9617,23 +9620,23 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSPerformObjectInvalidation FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, ObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); SetFlag( ObjectInfo->Fcb->Flags, AFS_FCB_FLAG_PURGE_ON_CLOSE); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPerformObjectInvalidation Releasing Fcb SectionObject lock %p EXCL %08lX\n", &ObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &ObjectInfo->Fcb->NPFcb->SectionObjectResource); } @@ -9645,11 +9648,11 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, bExtentsLocked = FALSE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPerformObjectInvalidation Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &ObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &ObjectInfo->Fcb->NPFcb->SectionObjectResource, TRUE); @@ -9698,13 +9701,13 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSPerformObjectInvalidation [1] CcPurgeCacheSection failure FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); bPurgeOnClose = TRUE; } @@ -9756,13 +9759,13 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSPerformObjectInvalidation [2] CcPurgeCacheSection failure FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); bPurgeOnClose = TRUE; } @@ -9796,13 +9799,13 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSPerformObjectInvalidation [3] CcPurgeCacheSection failure FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); bPurgeOnClose = TRUE; } @@ -9830,13 +9833,13 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, FALSE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSPerformObjectInvalidation [4] CcPurgeCacheSection failure FID %08lX-%08lX-%08lX-%08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, - ObjectInfo->FileId.Unique); + ObjectInfo->FileId.Unique)); bPurgeOnClose = TRUE; } @@ -9859,21 +9862,21 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSPerformObjectInvalidation FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", ObjectInfo->FileId.Cell, ObjectInfo->FileId.Volume, ObjectInfo->FileId.Vnode, ObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSPerformObjectInvalidation Releasing Fcb SectionObject lock %p EXCL %08lX\n", &ObjectInfo->Fcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &ObjectInfo->Fcb->NPFcb->SectionObjectResource); } @@ -9911,11 +9914,11 @@ AFSPerformObjectInvalidate( IN AFSObjectInfoCB *ObjectInfo, lCount = AFSObjectInfoDecrement( ObjectInfo, AFS_OBJECT_REFERENCE_INVALIDATION); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSPerformObjectInvalidation Decrement count on object %p Cnt %d\n", ObjectInfo, - lCount); + lCount)); } return ntStatus; diff --git a/src/WINNT/afsrdr/kernel/lib/AFSInternalDevControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSInternalDevControl.cpp index c574ee716..afb2304dc 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSInternalDevControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSInternalDevControl.cpp @@ -59,9 +59,9 @@ AFSInternalDevControl( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSInternalDevControl\n"); + "EXCEPTION - AFSInternalDevControl\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSIoSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSIoSupport.cpp index 6d6ccd210..ee756f9b7 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSIoSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSIoSupport.cpp @@ -361,11 +361,11 @@ AFSCompleteIo( IN AFSGatherIo *Gather, if( Gather->CompleteMasterIrp) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCompleteIo Completing Irp %p Status %08lX\n", Gather->MasterIrp, - Gather->Status); + Gather->Status)); AFSCompleteRequest(Gather->MasterIrp, Gather->Status); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSLockControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSLockControl.cpp index ed9de5535..b2298cf25 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSLockControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSLockControl.cpp @@ -67,10 +67,10 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLockControl Attempted access (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -79,11 +79,11 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, // Acquire the main shared for adding the lock control to the list // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockControl Acquiring Fcb lock %p SHARED %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Resource, TRUE); @@ -93,27 +93,27 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb->Header.NodeTypeCode == AFS_IOCTL_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSLockControl Failing request against PIOCtl Fcb\n"); + "AFSLockControl Failing request against PIOCtl Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } else if( pFcb->Header.NodeTypeCode == AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSLockControl Failing request against SpecialShare Fcb\n"); + "AFSLockControl Failing request against SpecialShare Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } else if( pFcb->Header.NodeTypeCode == AFS_INVALID_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSLockControl Failing request against Invalid Fcb\n"); + "AFSLockControl Failing request against Invalid Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -168,11 +168,11 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, // Flush data and then release the locks on the file server // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockControl Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -185,7 +185,7 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, if( !NT_SUCCESS( stIoStatus.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLockControl CcFlushCache [1] failure FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -193,16 +193,16 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, stIoStatus.Status, - stIoStatus.Information); + stIoStatus.Information)); ntStatus = stIoStatus.Status; } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockControl Releasing Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); @@ -236,11 +236,11 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, // Flush the data and then release the file server locks // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockControl Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -249,18 +249,18 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, pIrpSp->Parameters.LockControl.Length->LowPart, &stIoStatus); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLockControl Releasing Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->SectionObjectResource); if( !NT_SUCCESS( stIoStatus.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLockControl CcFlushCache [2] failure FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -268,7 +268,7 @@ AFSLockControl( IN PDEVICE_OBJECT LibDeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, stIoStatus.Status, - stIoStatus.Information); + stIoStatus.Information)); ntStatus = stIoStatus.Status; } @@ -341,9 +341,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation())) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSLockControl\n"); + "EXCEPTION - AFSLockControl\n")); AFSDumpTraceFilesFnc(); diff --git a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp index ea7977c06..376ca2df3 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSNameSupport.cpp @@ -93,11 +93,11 @@ AFSLocateNameEntry( IN GUID *AuthGroup, ASSERT( *OutVolumeCB != VolumeCB); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSLocateNameEntry (FO: %p) Processing full name %wZ\n", FileObject, - RootPathName); + RootPathName)); RtlInitUnicodeString( &uniSysName, L"*@SYS"); @@ -135,13 +135,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment1 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); pCurrentVolume = VolumeCB; @@ -150,12 +150,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); bReleaseCurrentVolume = TRUE; @@ -200,7 +200,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( BooleanFlagOn( pDirEntry->Flags, AFS_DIR_ENTRY_DELETED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Deleted parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -209,7 +209,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - STATUS_FILE_DELETED); + STATUS_FILE_DELETED)); try_return( ntStatus = STATUS_FILE_DELETED); } @@ -217,7 +217,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( BooleanFlagOn( pDirEntry->Flags, AFS_DIR_ENTRY_PENDING_DELETE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Delete pending on %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -226,7 +226,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - STATUS_DELETE_PENDING); + STATUS_DELETE_PENDING)); try_return( ntStatus = STATUS_DELETE_PENDING); } @@ -240,7 +240,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, !AFSIsEnumerationInProcess( pCurrentObject))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -248,7 +248,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Directory TreeLock should be exclusively held @@ -265,7 +265,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to verify parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -274,7 +274,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -288,7 +288,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileType == AFS_FILE_TYPE_UNKNOWN) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Evaluating parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -296,7 +296,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); ntStatus = AFSEvaluateNode( AuthGroup, pDirEntry); @@ -310,7 +310,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if ( !BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_FLAGS_PARENT_FID)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT NULL Status %08lX\n", FileObject, @@ -319,12 +319,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to evaluate object %wZ FID %08lX-%08lX-%08lX-%08lX PARENT %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -337,12 +337,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->ParentFileId.Volume, pCurrentObject->ParentFileId.Vnode, pCurrentObject->ParentFileId.Unique, - ntStatus); + ntStatus)); } } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to evaluate parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -351,7 +351,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -423,7 +423,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, SetFlag( pCurrentObject->Flags, AFS_OBJECT_FLAGS_VERIFY); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Verifying symlink parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -431,7 +431,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Directory TreeLock should be exclusively held @@ -445,7 +445,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to verify symlink parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -454,7 +454,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); AFSReleaseResource( &pDirEntry->NonPaged->Lock); @@ -488,7 +488,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, ntStatus = STATUS_REPARSE_POINT_NOT_RESOLVED; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to retrieve target name for symlink %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -497,7 +497,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); AFSReleaseResource( &pDirEntry->NonPaged->Lock); @@ -507,7 +507,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( AFSIsRelativeName( &pDirEntry->NameInformation.TargetName)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Processing relative symlink target %wZ for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -516,7 +516,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // We'll substitute this name into the current process name @@ -624,13 +624,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement1 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -647,26 +647,26 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment2 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); if ( pParentDirEntry) { lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); pParentDirEntry = NULL; } @@ -680,13 +680,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); } if ( pDirEntry->ObjectInformation->VolumeCB != pCurrentVolume) @@ -695,12 +695,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = AFSVolumeDecrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); pCurrentVolume = pDirEntry->ObjectInformation->VolumeCB; @@ -709,18 +709,18 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); } } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Processing absolute symlink target %wZ for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -729,15 +729,15 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); if ( !AFSIsAbsoluteAFSName( &pDirEntry->NameInformation.TargetName)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry Name %wZ contains invalid server name\n", - &pDirEntry->NameInformation.TargetName); + &pDirEntry->NameInformation.TargetName)); // // The correct response would be STATUS_OBJECT_PATH_INVALID @@ -841,7 +841,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( pCurrentVolume != AFSGlobalRoot) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Current volume not global, resetting for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -849,17 +849,17 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); lCount = AFSVolumeDecrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); pCurrentVolume = AFSGlobalRoot; @@ -868,12 +868,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); } // @@ -882,13 +882,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement2 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -900,13 +900,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment2 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); // // Reset the name array @@ -915,7 +915,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lLinkCount = pNameArray->LinkCount; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Resetting name array for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -923,7 +923,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); AFSResetNameArray( pNameArray, pDirEntry); @@ -935,13 +935,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); pParentDirEntry = NULL; } @@ -991,7 +991,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Building MP target for parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -999,7 +999,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Go retrieve the target entry for this node @@ -1015,7 +1015,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to build MP target for parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -1024,7 +1024,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1034,12 +1034,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = AFSVolumeDecrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement2 count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); pCurrentVolume = pTargetVolume; @@ -1056,13 +1056,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement3 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -1070,13 +1070,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment3 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); // // The name array stores both the mount point and the target. @@ -1091,13 +1091,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); pParentDirEntry = NULL; } @@ -1168,7 +1168,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, ntStatus != STATUS_REPARSE) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to process DFSLink parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -1177,7 +1177,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -1205,7 +1205,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, uniPathName.Length > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Enumerating parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1213,7 +1213,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); AFSAcquireExcl( pCurrentObject->Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -1230,7 +1230,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, AFSReleaseResource( pCurrentObject->Specific.Directory.DirectoryNodeHdr.TreeLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to enumerate parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -1239,7 +1239,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1253,7 +1253,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( uniPathName.Length > 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Encountered file node %wZ FID %08lX-%08lX-%08lX-%08lX in path processing\n", FileObject, @@ -1261,7 +1261,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // The proper error code to return would be STATUS_OBJECT_PATH_INVALID because // one of the components of the path is not a directory. However, returning @@ -1275,7 +1275,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Returning file %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1283,7 +1283,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Pass back the directory entries @@ -1316,7 +1316,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( uniPathName.Length == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Completed processing returning %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1324,7 +1324,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Pass back the directory entries @@ -1395,7 +1395,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, TRUE) == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Backing up entry from %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1403,20 +1403,20 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Need to back up one entry in the name array // lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement4 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -1425,35 +1425,35 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( pDirEntry == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSLocateNameEntry AFSBackupEntry failed\n"); + "AFSLocateNameEntry AFSBackupEntry failed\n")); try_return(ntStatus = STATUS_OBJECT_PATH_INVALID); } lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment4 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); if ( pParentDirEntry) { lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); pParentDirEntry = NULL; } @@ -1470,13 +1470,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); } } @@ -1486,12 +1486,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = AFSVolumeDecrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); pCurrentVolume = pDirEntry->ObjectInformation->VolumeCB; @@ -1500,12 +1500,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); } uniPathName = uniRemainingPath; @@ -1522,13 +1522,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); } pParentDirEntry = pDirEntry; @@ -1552,12 +1552,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, NULL)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSLocateNameEntry (FO: %p) Processing @SYS substitution for %wZ Index %08lX\n", FileObject, &uniComponentName, - ulSubstituteIndex); + ulSubstituteIndex)); ntStatus = AFSSubstituteSysName( &uniComponentName, &uniSearchName, @@ -1566,13 +1566,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if ( NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSLocateNameEntry (FO: %p) Located substitution %wZ for %wZ Index %08lX\n", FileObject, &uniSearchName, &uniComponentName, - ulSubstituteIndex); + ulSubstituteIndex)); // // Go reparse the name again @@ -1587,13 +1587,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to locate substitute string for %wZ Index %08lX Status %08lX\n", FileObject, &uniComponentName, ulSubstituteIndex, - ntStatus); + ntStatus)); if( ntStatus == STATUS_OBJECT_NAME_NOT_FOUND) { @@ -1634,11 +1634,11 @@ AFSLocateNameEntry( IN GUID *AuthGroup, // Generate the CRC on the node and perform a case sensitive lookup // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSLocateNameEntry (FO: %p) Searching for entry %wZ case sensitive\n", FileObject, - &uniSearchName); + &uniSearchName)); ulCRC = AFSGenerateCRC( &uniSearchName, FALSE); @@ -1657,11 +1657,11 @@ AFSLocateNameEntry( IN GUID *AuthGroup, // Missed so perform a case insensitive lookup // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSLocateNameEntry (FO: %p) Searching for entry %wZ case insensitive\n", FileObject, - &uniSearchName); + &uniSearchName)); ulCRC = AFSGenerateCRC( &uniSearchName, TRUE); @@ -1684,11 +1684,11 @@ AFSLocateNameEntry( IN GUID *AuthGroup, NULL)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSLocateNameEntry (FO: %p) Searching for entry %wZ short name\n", FileObject, - &uniSearchName); + &uniSearchName)); AFSLocateShortNameDirEntry( pParentDirEntry->ObjectInformation->Specific.Directory.ShortNameTree, ulCRC, @@ -1747,7 +1747,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, ntStatus = STATUS_OBJECT_PATH_NOT_FOUND; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Returning path not found for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1755,14 +1755,14 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); } else { ntStatus = STATUS_OBJECT_NAME_NOT_FOUND; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Returning name not found for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1770,7 +1770,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Pass back the directory entries @@ -1818,13 +1818,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment5 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -1847,7 +1847,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Verifying(2) parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1855,7 +1855,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pParentDirEntry->ObjectInformation->FileId.Cell, pParentDirEntry->ObjectInformation->FileId.Volume, pParentDirEntry->ObjectInformation->FileId.Vnode, - pParentDirEntry->ObjectInformation->FileId.Unique); + pParentDirEntry->ObjectInformation->FileId.Unique)); // // Directory TreeLock should be exclusively held @@ -1872,7 +1872,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to verify(2) parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -1881,17 +1881,17 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pParentDirEntry->ObjectInformation->FileId.Volume, pParentDirEntry->ObjectInformation->FileId.Vnode, pParentDirEntry->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Reprocessing component %wZ in parent %wZ\n", FileObject, &uniSearchName, - &pParentDirEntry->NameInformation.FileName); + &pParentDirEntry->NameInformation.FileName)); pDirEntry = NULL; @@ -1905,13 +1905,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Increment6 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); } AFSReleaseResource( pParentDirEntry->ObjectInformation->Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -1928,7 +1928,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject = pDirEntry->ObjectInformation; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Deleted entry %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -1936,7 +1936,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // This entry was deleted through the invalidation call back so perform cleanup @@ -1960,13 +1960,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -1974,12 +1974,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pDirEntry->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING|AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING|AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Deleting dir entry %p (%p) for %wZ\n", pDirEntry, pCurrentObject, - &pDirEntry->NameInformation.FileName); + &pDirEntry->NameInformation.FileName)); // // Remove and delete the directory entry from the parent list @@ -1997,10 +1997,10 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( BooleanFlagOn( pCurrentObject->Flags, AFS_OBJECT_INSERTED_HASH_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Removing object %p from volume tree\n", - pCurrentObject); + pCurrentObject)); AFSRemoveHashEntry( &pCurrentObject->VolumeCB->ObjectInfoTree.TreeHead, &pCurrentObject->TreeEntry); @@ -2014,11 +2014,11 @@ AFSLocateNameEntry( IN GUID *AuthGroup, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Setting DELETE flag in dir entry %p for %wZ\n", pDirEntry, - &pDirEntry->NameInformation.FileName); + &pDirEntry->NameInformation.FileName)); SetFlag( pDirEntry->Flags, AFS_DIR_ENTRY_DELETED); @@ -2042,7 +2042,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, ntStatus = STATUS_OBJECT_PATH_NOT_FOUND; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Returning path not found(2) for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -2050,14 +2050,14 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); } else { ntStatus = STATUS_OBJECT_NAME_NOT_FOUND; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Returning name not found(2) for %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -2065,7 +2065,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); // // Pass back the directory entries @@ -2109,13 +2109,13 @@ AFSLocateNameEntry( IN GUID *AuthGroup, BOOLEAN bRelativeOpen = FALSE; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSLocateNameEntry (FO: %p) Substituting %wZ into %wZ Index %08lX\n", FileObject, &uniSearchName, &uniComponentName, - ulSubstituteIndex); + ulSubstituteIndex)); if( FileObject != NULL && FileObject->RelatedFileObject != NULL) @@ -2141,14 +2141,14 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failure to substitute %wZ into %wZ Index %08lX Status %08lX\n", FileObject, &uniSearchName, &uniComponentName, ulSubstituteIndex, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2183,7 +2183,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSLocateNameEntry (FO: %p) Failed to evaluate possible DFS Link %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", FileObject, @@ -2192,7 +2192,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, pCurrentObject->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2202,7 +2202,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, // Update the name array // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Inserting name array entry %wZ FID %08lX-%08lX-%08lX-%08lX\n", FileObject, @@ -2210,7 +2210,7 @@ AFSLocateNameEntry( IN GUID *AuthGroup, pCurrentObject->FileId.Cell, pCurrentObject->FileId.Volume, pCurrentObject->FileId.Vnode, - pCurrentObject->FileId.Unique); + pCurrentObject->FileId.Unique)); ntStatus = AFSInsertNextElement( pNameArray, pDirEntry); @@ -2224,12 +2224,12 @@ AFSLocateNameEntry( IN GUID *AuthGroup, try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry (FO: %p) Completed processing %wZ Status %08lX\n", FileObject, RootPathName, - ntStatus); + ntStatus)); if( ( !NT_SUCCESS( ntStatus) && ntStatus != STATUS_OBJECT_NAME_NOT_FOUND) || @@ -2247,25 +2247,25 @@ try_exit: if( *OutParentDirectoryCB != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Count on Parent %wZ DE %p Ccb %p Cnt %d\n", &(*OutParentDirectoryCB)->NameInformation.FileName, *OutParentDirectoryCB, NULL, - (*OutParentDirectoryCB)->DirOpenReferenceCount); + (*OutParentDirectoryCB)->DirOpenReferenceCount)); } if( *OutDirectoryCB != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Count on %wZ DE %p Ccb %p Cnt %d\n", &(*OutDirectoryCB)->NameInformation.FileName, *OutDirectoryCB, NULL, - (*OutDirectoryCB)->DirOpenReferenceCount); + (*OutDirectoryCB)->DirOpenReferenceCount)); } } @@ -2274,13 +2274,13 @@ try_exit: lCount = InterlockedDecrement( &pDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement6 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirEntry->NameInformation.FileName, pDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -2290,13 +2290,13 @@ try_exit: lCount = InterlockedDecrement( &pParentDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement7 count on %wZ DE %p Ccb %p Cnt %d\n", &pParentDirEntry->NameInformation.FileName, pParentDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -2309,12 +2309,12 @@ try_exit: lCount = AFSVolumeDecrement( pCurrentVolume, VolumeReferenceReason); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSLocateNameEntry Decrement7 count on volume %p Reason %u Cnt %d\n", pCurrentVolume, VolumeReferenceReason, - lCount); + lCount)); bReleaseCurrentVolume = FALSE; } @@ -2349,7 +2349,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCreateDirEntry Creating dir entry in parent %wZ FID %08lX-%08lX-%08lX-%08lX Component %wZ Attribs %08lX\n", &ParentDirCB->NameInformation.FileName, @@ -2358,7 +2358,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, ParentObjectInfo->FileId.Vnode, ParentObjectInfo->FileId.Unique, ComponentName, - Attributes); + Attributes)); // // OK, before inserting the node into the parent tree, issue @@ -2389,7 +2389,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCreateDirEntry Failed to create dir entry in parent %wZ FID %08lX-%08lX-%08lX-%08lX Component %wZ Attribs %08lX Status %08lX\n", &ParentDirCB->NameInformation.FileName, @@ -2399,7 +2399,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, ParentObjectInfo->FileId.Unique, ComponentName, Attributes, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -2419,14 +2419,14 @@ AFSCreateDirEntry( IN GUID *AuthGroup, if( BooleanFlagOn( ParentObjectInfo->Flags, AFS_OBJECT_FLAGS_VERIFY)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCreateDirEntry Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", &ParentDirCB->NameInformation.FileName, ParentObjectInfo->FileId.Cell, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, - ParentObjectInfo->FileId.Unique); + ParentObjectInfo->FileId.Unique)); ntStatus = AFSVerifyEntry( AuthGroup, ParentDirCB); @@ -2434,7 +2434,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCreateDirEntry Failed to verify parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &ParentDirCB->NameInformation.FileName, @@ -2442,7 +2442,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, ParentObjectInfo->FileId.Unique, - ntStatus); + ntStatus)); AFSReleaseResource( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -2469,24 +2469,24 @@ AFSCreateDirEntry( IN GUID *AuthGroup, lCount = InterlockedDecrement( &pDirNode->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCreateDirEntry Decrement count on %wZ DE %p Cnt %d\n", &pDirNode->NameInformation.FileName, pDirNode, - lCount); + lCount)); AFSDeleteDirEntry( ParentObjectInfo, pDirNode); lCount = InterlockedIncrement( &pExistingDirNode->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCreateDirEntry Increment count on %wZ DE %p Cnt %d\n", &pExistingDirNode->NameInformation.FileName, pExistingDirNode, - lCount); + lCount)); *DirEntry = pExistingDirNode; } @@ -2506,7 +2506,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, pExistingDirNode->NameArrayReferenceCount <= 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCreateDirEntry Different FIDs - Deleting DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pExistingDirNode, @@ -2518,7 +2518,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, pDirNode->ObjectInformation->FileId.Cell, pDirNode->ObjectInformation->FileId.Volume, pDirNode->ObjectInformation->FileId.Vnode, - pDirNode->ObjectInformation->FileId.Unique); + pDirNode->ObjectInformation->FileId.Unique)); AFSDeleteDirEntry( ParentObjectInfo, pExistingDirNode); @@ -2528,7 +2528,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, SetFlag( pExistingDirNode->Flags, AFS_DIR_ENTRY_DELETED); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCreateDirEntry Different FIDs - Removing DE %p for %wZ Old FID %08lX-%08lX-%08lX-%08lX New FID %08lX-%08lX-%08lX-%08lX\n", pExistingDirNode, @@ -2540,7 +2540,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, pDirNode->ObjectInformation->FileId.Cell, pDirNode->ObjectInformation->FileId.Volume, pDirNode->ObjectInformation->FileId.Vnode, - pDirNode->ObjectInformation->FileId.Unique); + pDirNode->ObjectInformation->FileId.Unique)); AFSRemoveNameEntry( ParentObjectInfo, pExistingDirNode); @@ -2548,7 +2548,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, } } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSCreateDirEntry Inserting dir entry in parent %wZ FID %08lX-%08lX-%08lX-%08lX Component %wZ\n", &ParentDirCB->NameInformation.FileName, @@ -2556,7 +2556,7 @@ AFSCreateDirEntry( IN GUID *AuthGroup, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, ParentObjectInfo->FileId.Unique, - ComponentName); + ComponentName)); // // Insert the directory node @@ -2599,11 +2599,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, // Insert the node into the directory node tree // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Insert DE %p for %wZ Clearing NOT_IN flag\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); ClearFlag( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE); @@ -2612,11 +2612,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead = DirEntry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Insert DE %p to head of case sensitive tree for %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); } else { @@ -2624,11 +2624,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, AFSInsertCaseSensitiveDirEntry( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseSensitiveTreeHead, DirEntry); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Insert DE %p to case sensitive tree for %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); } if( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead == NULL) @@ -2638,11 +2638,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, SetFlag( DirEntry->Flags, AFS_DIR_ENTRY_CASE_INSENSTIVE_LIST_HEAD); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Insert DE %p to head of case insensitive tree for %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); } else { @@ -2650,11 +2650,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, AFSInsertCaseInsensitiveDirEntry( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.CaseInsensitiveTreeHead, DirEntry); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Insert DE %p to case insensitive tree for %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); } // @@ -2669,11 +2669,11 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, ParentObjectInfo->Specific.Directory.ShortNameTree = DirEntry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Insert DE %p to head of shortname tree for %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); SetFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); } @@ -2683,21 +2683,21 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, if( !NT_SUCCESS( AFSInsertShortNameDirEntry( ParentObjectInfo->Specific.Directory.ShortNameTree, DirEntry))) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Failed to insert DE %p to shortname tree for %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); } else { SetFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_SHORT_NAME); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Insert DE %p to shortname tree for %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); } } } @@ -2709,7 +2709,7 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, // And insert the node into the directory list // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Inserting entry %p %wZ FID %08lX-%08lX-%08lX-%08lX\n", DirEntry, @@ -2717,7 +2717,7 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, DirEntry->ObjectInformation->FileId.Cell, DirEntry->ObjectInformation->FileId.Volume, DirEntry->ObjectInformation->FileId.Vnode, - DirEntry->ObjectInformation->FileId.Unique); + DirEntry->ObjectInformation->FileId.Unique)); if( ParentObjectInfo->Specific.Directory.DirectoryNodeListHead == NULL) { @@ -2738,7 +2738,7 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, lCount = InterlockedIncrement( &ParentObjectInfo->Specific.Directory.DirectoryNodeCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertDirectoryNode Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, @@ -2746,7 +2746,7 @@ AFSInsertDirectoryNode( IN AFSObjectInfoCB *ParentObjectInfo, ParentObjectInfo->FileId.Cell, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, - ParentObjectInfo->FileId.Unique); + ParentObjectInfo->FileId.Unique)); } } @@ -2763,7 +2763,7 @@ AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteDirEntry Deleting dir entry in parent %p Entry %p %wZ FID %08lX-%08lX-%08lX-%08lX RefCount %d\n", ParentObjectInfo, @@ -2773,7 +2773,7 @@ AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, DirEntry->ObjectInformation->FileId.Volume, DirEntry->ObjectInformation->FileId.Vnode, DirEntry->ObjectInformation->FileId.Unique, - DirEntry->DirOpenReferenceCount); + DirEntry->DirOpenReferenceCount)); ASSERT( DirEntry->DirOpenReferenceCount == 0); @@ -2804,11 +2804,11 @@ AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, lCount = AFSObjectInfoDecrement( DirEntry->ObjectInformation, AFS_OBJECT_REFERENCE_DIRENTRY); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteDirEntry Decrement count on object %p Cnt %d\n", DirEntry->ObjectInformation, - lCount); + lCount)); if( BooleanFlagOn( DirEntry->Flags, AFS_DIR_ENTRY_DELETED) && DirEntry->ObjectInformation->Links == 0) @@ -2825,10 +2825,10 @@ AFSDeleteDirEntry( IN AFSObjectInfoCB *ParentObjectInfo, // Free up the dir entry // - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSDeleteDirEntry AFS_DIR_ENTRY_TAG deallocating %p\n", - DirEntry); + DirEntry)); AFSExFreePoolWithTag( DirEntry, AFS_DIR_ENTRY_TAG); } @@ -2849,7 +2849,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, ASSERT( ExIsResourceAcquiredExclusiveLite( ParentObjectInfo->Specific.Directory.DirectoryNodeHdr.TreeLock)); - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveDirNodeFromParent Removing DirEntry %p %wZ FID %08lX-%08lX-%08lX-%08lX from Parent %p\n", DirEntry, @@ -2858,16 +2858,16 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, DirEntry->ObjectInformation->FileId.Volume, DirEntry->ObjectInformation->FileId.Vnode, DirEntry->ObjectInformation->FileId.Unique, - ParentObjectInfo); + ParentObjectInfo)); if( !BooleanFlagOn( DirEntry->Flags, AFS_DIR_ENTRY_NOT_IN_PARENT_TREE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveDirNodeFromParent Removing DirEntry %p name %wZ\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); AFSRemoveNameEntry( ParentObjectInfo, DirEntry); @@ -2875,11 +2875,11 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveDirNodeFromParent DE %p for %wZ NOT removing entry due to flag set\n", DirEntry, - &DirEntry->NameInformation.FileName); + &DirEntry->NameInformation.FileName)); } @@ -2919,7 +2919,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, ClearFlag( DirEntry->Flags, AFS_DIR_ENTRY_INSERTED_ENUM_LIST); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveDirNodeFromParent Removing entry %wZ Dec Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n", &DirEntry->NameInformation.FileName, @@ -2927,7 +2927,7 @@ AFSRemoveDirNodeFromParent( IN AFSObjectInfoCB *ParentObjectInfo, ParentObjectInfo->FileId.Cell, ParentObjectInfo->FileId.Volume, ParentObjectInfo->FileId.Vnode, - ParentObjectInfo->FileId.Unique); + ParentObjectInfo->FileId.Unique)); DirEntry->ListEntry.fLink = NULL; DirEntry->ListEntry.bLink = NULL; @@ -3072,7 +3072,7 @@ AFSParseName( IN PIRP Irp, // No wild cards in the name // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSParseName (%p) Relative open for %wZ FID %08lX-%08lX-%08lX-%08lX component %wZ\n", Irp, @@ -3081,16 +3081,16 @@ AFSParseName( IN PIRP Irp, pRelatedCcb->DirectoryCB->ObjectInformation->FileId.Volume, pRelatedCcb->DirectoryCB->ObjectInformation->FileId.Vnode, pRelatedCcb->DirectoryCB->ObjectInformation->FileId.Unique, - &uniFullName); + &uniFullName)); if( FsRtlDoesNameContainWildCards( &uniFullName)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Component %wZ contains wild cards\n", Irp, - &uniFullName); + &uniFullName)); try_return( ntStatus = STATUS_OBJECT_NAME_INVALID); } @@ -3116,12 +3116,12 @@ AFSParseName( IN PIRP Irp, // The volume has been taken off line so fail the access // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Volume %08lX:%08lX OFFLINE/INVALID\n", Irp, pVolumeCB->ObjectInformation.FileId.Cell, - pVolumeCB->ObjectInformation.FileId.Volume); + pVolumeCB->ObjectInformation.FileId.Volume)); AFSReleaseResource( pVolumeCB->VolumeLock); @@ -3131,12 +3131,12 @@ AFSParseName( IN PIRP Irp, if( BooleanFlagOn( pVolumeCB->ObjectInformation.Flags, AFS_OBJECT_FLAGS_VERIFY)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Verifying root of volume %08lX:%08lX\n", Irp, pVolumeCB->ObjectInformation.FileId.Cell, - pVolumeCB->ObjectInformation.FileId.Volume); + pVolumeCB->ObjectInformation.FileId.Volume)); ntStatus = AFSVerifyVolume( (ULONGLONG)PsGetCurrentProcessId(), pVolumeCB); @@ -3144,11 +3144,11 @@ AFSParseName( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Failed verification of root Status %08lX\n", Irp, - ntStatus); + ntStatus)); AFSReleaseResource( pVolumeCB->VolumeLock); @@ -3161,7 +3161,7 @@ AFSParseName( IN PIRP Irp, if( BooleanFlagOn( pDirEntry->ObjectInformation->Flags, AFS_OBJECT_FLAGS_VERIFY)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Verifying parent %wZ FID %08lX-%08lX-%08lX-%08lX\n", Irp, @@ -3169,7 +3169,7 @@ AFSParseName( IN PIRP Irp, pDirEntry->ObjectInformation->FileId.Cell, pDirEntry->ObjectInformation->FileId.Volume, pDirEntry->ObjectInformation->FileId.Vnode, - pDirEntry->ObjectInformation->FileId.Unique); + pDirEntry->ObjectInformation->FileId.Unique)); // // Directory TreeLock should be exclusively held @@ -3186,7 +3186,7 @@ AFSParseName( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Failed verification of parent %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", Irp, @@ -3195,7 +3195,7 @@ AFSParseName( IN PIRP Irp, pDirEntry->ObjectInformation->FileId.Volume, pDirEntry->ObjectInformation->FileId.Vnode, pDirEntry->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3219,10 +3219,10 @@ AFSParseName( IN PIRP Irp, if( uniFullName.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Failed to allocate full name buffer\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -3282,10 +3282,10 @@ AFSParseName( IN PIRP Irp, if( pNameArray == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Failed to initialize name array\n", - Irp); + Irp)); AFSExFreePoolWithTag( uniFullName.Buffer, 0); @@ -3309,10 +3309,10 @@ AFSParseName( IN PIRP Irp, if( pNameArray == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Failed to initialize name array\n", - Irp); + Irp)); AFSExFreePoolWithTag( uniFullName.Buffer, 0); @@ -3327,10 +3327,10 @@ AFSParseName( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Failed to populate name array\n", - Irp); + Irp)); AFSExFreePoolWithTag( uniFullName.Buffer, 0); @@ -3357,21 +3357,21 @@ AFSParseName( IN PIRP Irp, lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_PARSE_NAME); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); *VolumeCB = pVolumeCB; *ParentDirectoryCB = pDirEntry; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSParseName (%p) Returning full name %wZ\n", Irp, - &uniFullName); + &uniFullName)); try_return( ntStatus); } @@ -3386,11 +3386,11 @@ AFSParseName( IN PIRP Irp, uniFullName.Length < AFSServerName.Length) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Name %wZ contains wild cards or too short\n", Irp, - &uniFullName); + &uniFullName)); try_return( ntStatus = STATUS_OBJECT_NAME_INVALID); } @@ -3459,11 +3459,11 @@ AFSParseName( IN PIRP Irp, TRUE) != 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Name %wZ does not have server name\n", Irp, - &pIrpSp->FileObject->FileName); + &pIrpSp->FileObject->FileName)); try_return( ntStatus = STATUS_BAD_NETWORK_NAME); } @@ -3476,11 +3476,11 @@ AFSParseName( IN PIRP Irp, !AFSIsDriveMapped( pIrpSp->FileObject->FileName.Buffer[ usDriveIndex])) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Name %wZ contains invalid drive mapping\n", Irp, - &pIrpSp->FileObject->FileName); + &pIrpSp->FileObject->FileName)); try_return( ntStatus = STATUS_BAD_NETWORK_NAME); } @@ -3489,20 +3489,20 @@ AFSParseName( IN PIRP Irp, if( FsRtlDoesNameContainWildCards( &uniFullName)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Component %wZ contains wild cards\n", Irp, - &uniFullName); + &uniFullName)); try_return( ntStatus = STATUS_OBJECT_NAME_INVALID); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSParseName (%p) Processing full name %wZ\n", Irp, - &uniFullName); + &uniFullName)); if( uniFullName.Length > 0 && uniFullName.Buffer[ (uniFullName.Length/sizeof( WCHAR)) - 1] == L'\\') @@ -3526,12 +3526,12 @@ AFSParseName( IN PIRP Irp, // The volume has been taken off line so fail the access // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Volume %08lX:%08lX OFFLINE/INVALID\n", Irp, AFSGlobalRoot->ObjectInformation.FileId.Cell, - AFSGlobalRoot->ObjectInformation.FileId.Volume); + AFSGlobalRoot->ObjectInformation.FileId.Volume)); AFSReleaseResource( AFSGlobalRoot->VolumeLock); @@ -3541,12 +3541,12 @@ AFSParseName( IN PIRP Irp, if( BooleanFlagOn( AFSGlobalRoot->ObjectInformation.Flags, AFS_OBJECT_FLAGS_VERIFY)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Verifying root of volume %08lX:%08lX\n", Irp, AFSGlobalRoot->ObjectInformation.FileId.Cell, - AFSGlobalRoot->ObjectInformation.FileId.Volume); + AFSGlobalRoot->ObjectInformation.FileId.Volume)); ntStatus = AFSVerifyVolume( (ULONGLONG)PsGetCurrentProcessId(), AFSGlobalRoot); @@ -3554,11 +3554,11 @@ AFSParseName( IN PIRP Irp, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Failed verification of root Status %08lX\n", Irp, - ntStatus); + ntStatus)); AFSReleaseResource( AFSGlobalRoot->VolumeLock); @@ -3571,23 +3571,23 @@ AFSParseName( IN PIRP Irp, if( !BooleanFlagOn( AFSGlobalRoot->ObjectInformation.Flags, AFS_OBJECT_FLAGS_DIRECTORY_ENUMERATED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Enumerating global root of volume %08lX:%08lX\n", Irp, AFSGlobalRoot->ObjectInformation.FileId.Cell, - AFSGlobalRoot->ObjectInformation.FileId.Volume); + AFSGlobalRoot->ObjectInformation.FileId.Volume)); ntStatus = AFSEnumerateGlobalRoot( AuthGroup); if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Failed enumeraiton of root Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -3602,20 +3602,20 @@ AFSParseName( IN PIRP Irp, uniRemainingPath.Buffer[ 0] == L'\\')) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSParseName (%p) Returning global root access\n", - Irp); + Irp)); lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName Increment2 count on %wZ DE %p Ccb %p Cnt %d\n", &AFSGlobalRoot->DirectoryCB->NameInformation.FileName, AFSGlobalRoot->DirectoryCB, NULL, - lCount); + lCount)); *VolumeCB = NULL; @@ -3650,11 +3650,11 @@ AFSParseName( IN PIRP Irp, if( FsRtlDoesNameContainWildCards( &uniFullName)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSParseName (%p) Component %wZ contains wild cards\n", Irp, - &uniComponentName); + &uniComponentName)); try_return( ntStatus = STATUS_OBJECT_NAME_INVALID); } @@ -3681,20 +3681,20 @@ AFSParseName( IN PIRP Irp, uniRemainingPath.Buffer[ 0] == L'\\')) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSParseName (%p) Returning global root access\n", - Irp); + Irp)); lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName Increment3 count on %wZ DE %p Ccb %p Cnt %d\n", &AFSGlobalRoot->DirectoryCB->NameInformation.FileName, AFSGlobalRoot->DirectoryCB, NULL, - lCount); + lCount)); *VolumeCB = NULL; @@ -3724,20 +3724,20 @@ AFSParseName( IN PIRP Irp, TRUE) == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSParseName (%p) Returning root PIOCtl access\n", - Irp); + Irp)); lCount = InterlockedIncrement( &AFSGlobalRoot->DirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName Increment4 count on %wZ DE %p Ccb %p Cnt %d\n", &AFSGlobalRoot->DirectoryCB->NameInformation.FileName, AFSGlobalRoot->DirectoryCB, NULL, - lCount); + lCount)); ClearFlag( *ParseFlags, AFS_PARSE_FLAG_ROOT_ACCESS); @@ -3752,11 +3752,11 @@ AFSParseName( IN PIRP Irp, &uniRemainingPath)) != NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSParseName (%p) Returning root share name %wZ access\n", Irp, - &uniComponentName); + &uniComponentName)); // // Add in the full share name to pass back @@ -3863,12 +3863,12 @@ AFSParseName( IN PIRP Irp, ntStatus == STATUS_OBJECT_PATH_NOT_FOUND) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) AFSCheckCellName %wZ returned path not found; ntStatus %08X\n", Irp, &uniComponentName, - STATUS_OBJECT_NAME_NOT_FOUND); + STATUS_OBJECT_NAME_NOT_FOUND)); ntStatus = STATUS_OBJECT_NAME_NOT_FOUND; } @@ -3909,10 +3909,10 @@ AFSParseName( IN PIRP Irp, if( pNameArray == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Failed to initialize name array\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -3923,10 +3923,10 @@ AFSParseName( IN PIRP Irp, if ( ntStatus) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Failed to insert name array element\n", - Irp); + Irp)); try_return( ntStatus); } @@ -3987,10 +3987,10 @@ AFSParseName( IN PIRP Irp, if( pNameArray == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName (%p) Failed to initialize name array\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -4064,11 +4064,11 @@ AFSParseName( IN PIRP Irp, lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_PARSE_NAME); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName Increment2 count on global volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); try_exit: @@ -4080,13 +4080,13 @@ try_exit: lCount = InterlockedIncrement( &(*ParentDirectoryCB)->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSParseName Increment1 count on %wZ DE %p Ccb %p Cnt %d\n", &(*ParentDirectoryCB)->NameInformation.FileName, (*ParentDirectoryCB), NULL, - lCount); + lCount)); } } @@ -4188,7 +4188,7 @@ AFSCheckCellName( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCheckCellName entry %wZ does not exist parent FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", CellName, @@ -4196,7 +4196,7 @@ AFSCheckCellName( IN GUID *AuthGroup, AFSGlobalRoot->ObjectInformation.FileId.Volume, AFSGlobalRoot->ObjectInformation.FileId.Vnode, AFSGlobalRoot->ObjectInformation.FileId.Unique, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -4240,22 +4240,22 @@ AFSCheckCellName( IN GUID *AuthGroup, lCount = InterlockedIncrement( &pVolumeCB->DirectoryCB->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCheckCellName Increment1 count on %wZ DE %p Ccb %p Cnt %d\n", &pVolumeCB->DirectoryCB->NameInformation.FileName, pVolumeCB->DirectoryCB, NULL, - lCount); + lCount)); lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_BUILD_ROOT); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCheckCellName Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); } else { @@ -4353,7 +4353,7 @@ AFSCheckCellName( IN GUID *AuthGroup, lCount = InterlockedIncrement( &AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIR_NODE_COUNT, + AFSDbgTrace(( AFS_SUBSYSTEM_DIR_NODE_COUNT, AFS_TRACE_LEVEL_VERBOSE, "AFSCheckCellName Adding entry %wZ Inc Count %d to parent FID %08lX-%08lX-%08lX-%08lX\n", &pDirNode->NameInformation.FileName, @@ -4361,17 +4361,17 @@ AFSCheckCellName( IN GUID *AuthGroup, AFSGlobalRoot->ObjectInformation.FileId.Cell, AFSGlobalRoot->ObjectInformation.FileId.Volume, AFSGlobalRoot->ObjectInformation.FileId.Vnode, - AFSGlobalRoot->ObjectInformation.FileId.Unique); + AFSGlobalRoot->ObjectInformation.FileId.Unique)); lCount = InterlockedIncrement( &pDirNode->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSCheckCellName Increment2 count on %wZ DE %p Ccb %p Cnt %d\n", &pDirNode->NameInformation.FileName, pDirNode, NULL, - lCount); + lCount)); AFSReleaseResource( AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -4416,14 +4416,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, // Loop on each entry, building the chain until we encounter the final target // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildMountPointTarget Building target directory for %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirectoryCB->NameInformation.FileName, DirectoryCB->ObjectInformation->FileId.Cell, DirectoryCB->ObjectInformation->FileId.Volume, DirectoryCB->ObjectInformation->FileId.Vnode, - DirectoryCB->ObjectInformation->FileId.Unique); + DirectoryCB->ObjectInformation->FileId.Unique)); // // Do we need to evaluate the node? @@ -4437,14 +4437,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, // Go evaluate the current target to get the target fid // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildMountPointTarget Evaluating target %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirectoryCB->NameInformation.FileName, DirectoryCB->ObjectInformation->FileId.Cell, DirectoryCB->ObjectInformation->FileId.Volume, DirectoryCB->ObjectInformation->FileId.Vnode, - DirectoryCB->ObjectInformation->FileId.Unique); + DirectoryCB->ObjectInformation->FileId.Unique)); ntStatus = AFSEvaluateTargetByID( DirectoryCB->ObjectInformation, AuthGroup, @@ -4454,11 +4454,12 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSBuildMountPointTarget Failed to evaluate target %wZ Status %08lX\n", &DirectoryCB->NameInformation.FileName, - ntStatus); + ntStatus)); + try_return( ntStatus); } @@ -4466,14 +4467,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, pDirEntry->TargetFileId.Unique == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSBuildMountPointTarget Target %wZ FID %08lX-%08lX-%08lX-%08lX service returned zero FID\n", &DirectoryCB->NameInformation.FileName, DirectoryCB->ObjectInformation->FileId.Cell, DirectoryCB->ObjectInformation->FileId.Volume, DirectoryCB->ObjectInformation->FileId.Vnode, - DirectoryCB->ObjectInformation->FileId.Unique); + DirectoryCB->ObjectInformation->FileId.Unique)); try_return( ntStatus = STATUS_REPARSE_POINT_NOT_RESOLVED); } @@ -4508,19 +4509,19 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, ullIndex = AFSCreateHighIndex( &stTargetFileID); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSBuildMountPointTarget Acquiring RDR VolumeTreeLock lock %p EXCL %08lX\n", &pDevExt->Specific.RDR.VolumeTreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildMountPointTarget Locating volume for target %I64X\n", - ullIndex); + ullIndex)); ntStatus = AFSLocateHashEntry( pDevExt->Specific.RDR.VolumeTree.TreeHead, ullIndex, @@ -4544,14 +4545,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, // Go init the root of the volume // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildMountPointTarget Initializing root for %wZ FID %08lX-%08lX-%08lX-%08lX\n", &DirectoryCB->NameInformation.FileName, DirectoryCB->ObjectInformation->FileId.Cell, DirectoryCB->ObjectInformation->FileId.Volume, DirectoryCB->ObjectInformation->FileId.Vnode, - DirectoryCB->ObjectInformation->FileId.Unique); + DirectoryCB->ObjectInformation->FileId.Unique)); ntStatus = AFSInitVolume( AuthGroup, &stTargetFileID, @@ -4583,11 +4584,11 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_MOUNTPT); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSBuildMountPointTarget Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); } @@ -4617,11 +4618,11 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_MOUNTPT); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSBuildMountPoint Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); AFSReleaseResource( pVolumeCB->VolumeLock); @@ -4641,14 +4642,14 @@ AFSBuildMountPointTarget( IN GUID *AuthGroup, AFSReleaseResource( pVolumeCB->VolumeLock); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildMountPointTarget Evaluated target of %wZ FID %08lX-%08lX-%08lX-%08lX as root volume\n", &pVolumeCB->DirectoryCB->NameInformation.FileName, pVolumeCB->ObjectInformation.FileId.Cell, pVolumeCB->ObjectInformation.FileId.Volume, pVolumeCB->ObjectInformation.FileId.Vnode, - pVolumeCB->ObjectInformation.FileId.Unique); + pVolumeCB->ObjectInformation.FileId.Unique)); *TargetVolumeCB = pVolumeCB; @@ -4680,29 +4681,29 @@ AFSBuildRootVolume( IN GUID *AuthGroup, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildRootVolume Building target volume for FID %08lX-%08lX-%08lX-%08lX\n", FileId->Cell, FileId->Volume, FileId->Vnode, - FileId->Unique); + FileId->Unique)); ullIndex = AFSCreateHighIndex( FileId); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSBuildRootVolume Acquiring RDR VolumeTreeLock lock %p EXCL %08lX\n", &pDevExt->Specific.RDR.VolumeTreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pDevExt->Specific.RDR.VolumeTreeLock, TRUE); - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildRootVolume Locating volume for target %I64X\n", - ullIndex); + ullIndex)); ntStatus = AFSLocateHashEntry( pDevExt->Specific.RDR.VolumeTree.TreeHead, ullIndex, @@ -4726,13 +4727,13 @@ AFSBuildRootVolume( IN GUID *AuthGroup, // Go init the root of the volume // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildRootVolume Initializing root for FID %08lX-%08lX-%08lX-%08lX\n", FileId->Cell, FileId->Volume, FileId->Vnode, - FileId->Unique); + FileId->Unique)); ntStatus = AFSInitVolume( AuthGroup, FileId, @@ -4764,11 +4765,11 @@ AFSBuildRootVolume( IN GUID *AuthGroup, lCount = AFSVolumeIncrement( pVolumeCB, AFS_VOLUME_REFERENCE_BUILD_ROOT); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSBuildRootVolume Increment count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); AFSReleaseResource( &pDevExt->Specific.RDR.VolumeTreeLock); } @@ -4799,11 +4800,11 @@ AFSBuildRootVolume( IN GUID *AuthGroup, lCount = AFSVolumeDecrement( pVolumeCB, AFS_VOLUME_REFERENCE_BUILD_ROOT); - AFSDbgLogMsg( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_VOLUME_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSBuildRootVolume Decrement count on volume %p Cnt %d\n", pVolumeCB, - lCount); + lCount)); AFSReleaseResource( pVolumeCB->VolumeLock); @@ -4823,14 +4824,14 @@ AFSBuildRootVolume( IN GUID *AuthGroup, AFSReleaseResource( pVolumeCB->VolumeLock); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE_2, "AFSBuildRootVolume Evaluated target of %wZ FID %08lX-%08lX-%08lX-%08lX as root volume\n", &pVolumeCB->DirectoryCB->NameInformation.FileName, pVolumeCB->ObjectInformation.FileId.Cell, pVolumeCB->ObjectInformation.FileId.Volume, pVolumeCB->ObjectInformation.FileId.Vnode, - pVolumeCB->ObjectInformation.FileId.Unique); + pVolumeCB->ObjectInformation.FileId.Unique)); *TargetVolumeCB = pVolumeCB; @@ -4887,7 +4888,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, pDirEntry->TargetNameLength == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessDFSLink EvaluateTargetByID failed for Fcb %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &DirEntry->NameInformation.FileName, @@ -4895,7 +4896,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, DirEntry->ObjectInformation->FileId.Volume, DirEntry->ObjectInformation->FileId.Vnode, DirEntry->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); if( NT_SUCCESS( ntStatus)) { @@ -4921,7 +4922,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessDFSLink UpdateTargetName failed for Fcb %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &DirEntry->NameInformation.FileName, @@ -4929,7 +4930,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, DirEntry->ObjectInformation->FileId.Volume, DirEntry->ObjectInformation->FileId.Vnode, DirEntry->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); AFSReleaseResource( &DirEntry->NonPaged->Lock); @@ -4967,7 +4968,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, if( uniReparseName.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSProcessDFSLink uniReparseName.Buffer == NULL Fcb %wZ FID %08lX-%08lX-%08lX-%08lX Status %08lX\n", &DirEntry->NameInformation.FileName, @@ -4975,7 +4976,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, DirEntry->ObjectInformation->FileId.Volume, DirEntry->ObjectInformation->FileId.Vnode, DirEntry->ObjectInformation->FileId.Unique, - STATUS_INSUFFICIENT_RESOURCES); + STATUS_INSUFFICIENT_RESOURCES)); AFSReleaseResource( &DirEntry->NonPaged->Lock); @@ -5054,7 +5055,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, FileObject->FileName = uniReparseName; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSProcessDFSLink Reparsing access to Fcb %wZ FID %08lX-%08lX-%08lX-%08lX to %wZ\n", &DirEntry->NameInformation.FileName, @@ -5062,7 +5063,7 @@ AFSProcessDFSLink( IN AFSDirectoryCB *DirEntry, DirEntry->ObjectInformation->FileId.Volume, DirEntry->ObjectInformation->FileId.Vnode, DirEntry->ObjectInformation->FileId.Unique, - &uniReparseName); + &uniReparseName)); // // Return status reparse ... diff --git a/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp index 872e2ba0f..3cb840b69 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSNetworkProviderSupport.cpp @@ -52,21 +52,21 @@ AFSAddConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection Acquiring AFSProviderListLock lock %p EXCL %08lX\n", &pRDRDevExt->Specific.RDR.ProviderListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); if( ConnectCB->AuthenticationId.QuadPart == 0) { ConnectCB->AuthenticationId = AFSGetAuthenticationId(); - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection Retrieved authentication id %I64X\n", - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } AFSAcquireExcl( &pRDRDevExt->Specific.RDR.ProviderListLock, @@ -115,21 +115,21 @@ AFSAddConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ConnectCB->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection ALREADY_CONNECTED remote name %wZ Local %C authentication id %I64X\n", &uniRemoteName, ConnectCB->LocalName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection ALREADY_CONNECTED remote name %wZ Local (NULL) authentication id %I64X\n", &uniRemoteName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } *ResultStatus = WN_ALREADY_CONNECTED; @@ -164,21 +164,21 @@ AFSAddConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ConnectCB->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection BAD_NETNAME 1 remote name %wZ Local %C authentication id %I64X\n", &uniRemoteName, ConnectCB->LocalName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection BAD_NETNAME 1 remote name %wZ Local (NULL) authentication id %I64X\n", &uniRemoteName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } *ResultStatus = WN_BAD_NETNAME; @@ -198,21 +198,21 @@ AFSAddConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ConnectCB->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection BAD_NETNAME 2 remote name %wZ Local %C authentication id %I64X\n", &uniRemoteName, ConnectCB->LocalName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection BAD_NETNAME 2 remote name %wZ Local (NULL) authentication id %I64X\n", &uniRemoteName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } *ResultStatus = WN_BAD_NETNAME; @@ -230,21 +230,21 @@ AFSAddConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ConnectCB->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection BAD_NETNAME 3 remote name %wZ Local %C authentication id %I64X\n", &uniRemoteName, ConnectCB->LocalName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection BAD_NETNAME 3 remote name %wZ Local (NULL) authentication id %I64X\n", &uniRemoteName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } *ResultStatus = WN_BAD_NETNAME; @@ -309,21 +309,21 @@ AFSAddConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ConnectCB->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection Adding connection remote name %wZ Local %C authentication id %I64X\n", &uniRemoteName, ConnectCB->LocalName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSAddConnection Adding connection remote name %wZ Local (NULL) authentication id %I64X\n", &uniRemoteName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } // @@ -415,21 +415,21 @@ AFSCancelConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, ConnectionResult->Version = AFS_NETWORKPROVIDER_INTERFACE_VERSION_1; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCancelConnection Acquiring AFSProviderListLock lock %p EXCL %08lX\n", &pRDRDevExt->Specific.RDR.ProviderListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); if( ConnectCB->AuthenticationId.QuadPart == 0) { ConnectCB->AuthenticationId = AFSGetAuthenticationId(); - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSCancelConnection Retrieved authentication id %I64X\n", - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } AFSAcquireExcl( &pRDRDevExt->Specific.RDR.ProviderListLock, @@ -463,13 +463,13 @@ AFSCancelConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, TRUE) == 0)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSCancelConnection Checking remote name %wZ to stored %wZ authentication id %I64X - %I64X\n", &uniRemoteName, &pConnection->RemoteName, ConnectCB->AuthenticationId.QuadPart, - pConnection->AuthenticationId.QuadPart); + pConnection->AuthenticationId.QuadPart)); if( ConnectCB->AuthenticationId.QuadPart == pConnection->AuthenticationId.QuadPart && ( ConnectCB->LocalName == L'\0' || @@ -547,36 +547,36 @@ AFSGetConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ConnectCB->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnection Local %C authentication id %I64X\n", ConnectCB->LocalName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnection Local (NULL) authentication id %I64X\n", - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnection Acquiring AFSProviderListLock lock %p SHARED %08lX\n", &pRDRDevExt->Specific.RDR.ProviderListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); if( ConnectCB->AuthenticationId.QuadPart == 0) { ConnectCB->AuthenticationId = AFSGetAuthenticationId(); - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnection Retrieved authentication id %I64X\n", - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } AFSAcquireShared( &pRDRDevExt->Specific.RDR.ProviderListLock, @@ -594,23 +594,23 @@ AFSGetConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( pConnection->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnection Comparing passed in %C to %C authentication id %I64X - %I64X\n", ConnectCB->LocalName, pConnection->LocalName, ConnectCB->AuthenticationId.QuadPart, - pConnection->AuthenticationId.QuadPart); + pConnection->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnection Comparing passed in %C to (NULL) authentication id %I64X - %I64X\n", ConnectCB->LocalName, ConnectCB->AuthenticationId.QuadPart, - pConnection->AuthenticationId.QuadPart); + pConnection->AuthenticationId.QuadPart)); } if( pConnection->LocalName == ConnectCB->LocalName && @@ -626,9 +626,9 @@ AFSGetConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( pConnection == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnection INVALID_PARAMETER\n"); + "AFSGetConnection INVALID_PARAMETER\n")); try_return( ntStatus = STATUS_INVALID_PARAMETER); } @@ -636,9 +636,9 @@ AFSGetConnection( IN AFSNetworkProviderConnectionCB *ConnectCB, if( RemoteNameBufferLength < pConnection->RemoteName.Length) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnection INSUFFICIENT_RESOURCES\n"); + "AFSGetConnection INSUFFICIENT_RESOURCES\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -689,10 +689,10 @@ AFSListConnections( IN OUT AFSNetworkProviderConnectionCB *ConnectCB, ConnectCB->AuthenticationId = AFSGetAuthenticationId(); - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSListConnections Retrieved authentication id %I64X\n", - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } liAuthenticationID.QuadPart = ConnectCB->AuthenticationId.QuadPart; @@ -773,11 +773,11 @@ AFSListConnections( IN OUT AFSNetworkProviderConnectionCB *ConnectCB, } } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSListConnections Acquiring AFSProviderListLock lock %p SHARED %08lX\n", &pRDRDevExt->Specific.RDR.ProviderListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pRDRDevExt->Specific.RDR.ProviderListLock, TRUE); @@ -870,25 +870,25 @@ AFSListConnections( IN OUT AFSNetworkProviderConnectionCB *ConnectCB, if( pConnection->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSListConnections Processing entry %wZ %C authentication id %I64X - %I64X Scope %08lX\n", &pConnection->RemoteName, pConnection->LocalName, liAuthenticationID.QuadPart, pConnection->AuthenticationId.QuadPart, - pConnection->Scope); + pConnection->Scope)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSListConnections Processing entry %wZ NULL LocalName authentication id %I64X - %I64X Scope %08lX\n", &pConnection->RemoteName, liAuthenticationID.QuadPart, pConnection->AuthenticationId.QuadPart, - pConnection->Scope); + pConnection->Scope)); } if( ulScope != RESOURCE_GLOBALNET && @@ -1239,9 +1239,9 @@ AFSEnumerateConnection( IN OUT AFSNetworkProviderConnectionCB *ConnectCB, if( AFSGlobalRoot == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_ERROR, - "AFSEnumerateConnection Global root not yet initialized\n"); + "AFSEnumerateConnection Global root not yet initialized\n")); try_return( ntStatus = STATUS_DEVICE_NOT_READY); } @@ -1253,11 +1253,11 @@ AFSEnumerateConnection( IN OUT AFSNetworkProviderConnectionCB *ConnectCB, // Grab our tree lock shared // - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateConnection Acquiring GlobalRoot DirectoryNodeHdr.TreeLock lock %p SHARED %08lX\n", AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock, TRUE); @@ -1297,13 +1297,13 @@ AFSEnumerateConnection( IN OUT AFSNetworkProviderConnectionCB *ConnectCB, lCount = InterlockedIncrement( &pShareDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateConnection1 Increment count on %wZ DE %p Ccb %p Cnt %d\n", &pShareDirEntry->NameInformation.FileName, pShareDirEntry, NULL, - lCount); + lCount)); AFSReleaseResource( AFSGlobalRoot->ObjectInformation.Specific.Directory.DirectoryNodeHdr.TreeLock); @@ -1398,13 +1398,13 @@ AFSEnumerateConnection( IN OUT AFSNetworkProviderConnectionCB *ConnectCB, lCount = InterlockedDecrement( &pTargetDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateConnection Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pTargetDirEntry->NameInformation.FileName, pTargetDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); @@ -1418,13 +1418,13 @@ try_exit: { lCount = InterlockedDecrement( &pShareDirEntry->DirOpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSEnumerateConnection1 Decrement count on %wZ DE %p Ccb %p Cnt %d\n", &pShareDirEntry->NameInformation.FileName, pShareDirEntry, NULL, - lCount); + lCount)); ASSERT( lCount >= 0); } @@ -1468,29 +1468,29 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, if( ConnectCB->LocalName != L'\0') { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo remote name %wZ Local %C authentication id %I64X\n", &uniRemoteName, ConnectCB->LocalName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } else { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo remote name %wZ Local (NULL) authentication id %I64X\n", &uniRemoteName, - ConnectCB->AuthenticationId.QuadPart); + ConnectCB->AuthenticationId.QuadPart)); } if( AFSGlobalRoot == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_ERROR, - "AFSGetConnectionInfo Global root not yet initialized\n"); + "AFSGetConnectionInfo Global root not yet initialized\n")); try_return( ntStatus = STATUS_DEVICE_NOT_READY); } @@ -1514,9 +1514,10 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, uniFullName.Length -= sizeof( WCHAR); } - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnectionInfo Processing name %wZ\n", &uniFullName); + "AFSGetConnectionInfo Processing name %wZ\n", + &uniFullName)); FsRtlDissectName( uniRemoteName, &uniServerName, @@ -1562,9 +1563,9 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, if( uniRemainingPathLocal.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnectionInfo INSUFFICIENT_RESOURCES\n"); + "AFSGetConnectionInfo INSUFFICIENT_RESOURCES\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -1577,11 +1578,11 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, uniRemainingPath.Length); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo Acquiring AFSProviderListLock lock %p SHARED %08lX\n", &pRDRDevExt->Specific.RDR.ProviderListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pRDRDevExt->Specific.RDR.ProviderListLock, TRUE); @@ -1608,9 +1609,10 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, pConnection = pRDRDevExt->Specific.RDR.ProviderConnectionList; - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnectionInfo Searching for full name %wZ\n", &uniFullName); + "AFSGetConnectionInfo Searching for full name %wZ\n", + &uniFullName)); while( pConnection != NULL) { @@ -1633,9 +1635,10 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, pBestMatch = pConnection; - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnectionInfo Found match for %wZ\n", &pConnection->RemoteName); + "AFSGetConnectionInfo Found match for %wZ\n", + &pConnection->RemoteName)); } uniFullName.Length = usNameLen; @@ -1651,9 +1654,10 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, bEnumerationEntry = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnectionInfo Using best match for %wZ\n", &pConnection->RemoteName); + "AFSGetConnectionInfo Using best match for %wZ\n", + &pConnection->RemoteName)); } if( pConnection == NULL) @@ -1672,9 +1676,10 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, UNICODE_STRING uniFullName; AFSDirEnumEntry *pDirEnumEntry = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnectionInfo No connection for full name %wZ\n", &uniFullName); + "AFSGetConnectionInfo No connection for full name %wZ\n", + &uniFullName)); // // Drop the lock, we will pick it up again later @@ -1695,10 +1700,10 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo Evaluation Failed share name %wZ\n", - uniShareName); + uniShareName)); try_return( ntStatus = STATUS_INVALID_PARAMETER); @@ -1724,9 +1729,9 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, if( uniFullName.Buffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, - "AFSGetConnectionInfo INSUFFICIENT_RESOURCES\n"); + "AFSGetConnectionInfo INSUFFICIENT_RESOURCES\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -1763,11 +1768,11 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, AFSExFreePoolWithTag( uniFullName.Buffer, 0); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo Acquiring AFSProviderListLock lock %p SHARED %08lX\n", &pRDRDevExt->Specific.RDR.ProviderListLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pRDRDevExt->Specific.RDR.ProviderListLock, TRUE); @@ -1786,9 +1791,10 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, if( pConnection == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_ERROR, - "AFSGetConnectionInfo Failed to locate entry for full name %wZ\n", &uniFullName); + "AFSGetConnectionInfo Failed to locate entry for full name %wZ\n", + &uniFullName)); AFSReleaseResource( &pRDRDevExt->Specific.RDR.ProviderListLock); @@ -1805,20 +1811,20 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, uniRemainingPath.Length) { - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo Buffer too small for full name %wZ\n", - &uniFullName); + &uniFullName)); AFSReleaseResource( &pRDRDevExt->Specific.RDR.ProviderListLock); try_return( ntStatus = STATUS_BUFFER_OVERFLOW); } - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo Returning entry Scope %08lX partial name %wZ full name %wZ\n", - pConnection->Scope, &pConnection->RemoteName, &uniFullName); + pConnection->Scope, &pConnection->RemoteName, &uniFullName)); ConnectCB->RemoteNameLength = pConnection->RemoteName.Length; @@ -1851,12 +1857,12 @@ AFSGetConnectionInfo( IN AFSNetworkProviderConnectionCB *ConnectCB, ConnectCB->RemainingPathLength = uniRemainingPathLocal.Length; - AFSDbgLogMsg( AFS_SUBSYSTEM_NETWORK_PROVIDER, + AFSDbgTrace(( AFS_SUBSYSTEM_NETWORK_PROVIDER, AFS_TRACE_LEVEL_VERBOSE, "AFSGetConnectionInfo Returning lengths: remote %u comment %u remaining %u\n", ConnectCB->RemoteNameLength, ConnectCB->CommentLength, - ConnectCB->RemainingPathLength); + ConnectCB->RemainingPathLength)); if( ConnectCB->CommentLength > 0) { diff --git a/src/WINNT/afsrdr/kernel/lib/AFSQuota.cpp b/src/WINNT/afsrdr/kernel/lib/AFSQuota.cpp index 2e0621ce5..156d61f07 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSQuota.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSQuota.cpp @@ -52,10 +52,10 @@ AFSQueryQuota( IN PDEVICE_OBJECT LibDeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueryQuota Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -64,9 +64,9 @@ AFSQueryQuota( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueryQuota\n"); + "EXCEPTION - AFSQueryQuota\n")); AFSDumpTraceFilesFnc(); } @@ -88,10 +88,10 @@ AFSSetQuota( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetQuota Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -99,9 +99,9 @@ AFSSetQuota( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetQuota\n"); + "EXCEPTION - AFSSetQuota\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp b/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp index 15115b946..317406b16 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSRead.cpp @@ -94,10 +94,10 @@ AFSCachedRead( IN PDEVICE_OBJECT DeviceObject, if( pSystemBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedRead (%p) Failed to lock system buffer\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -117,13 +117,13 @@ AFSCachedRead( IN PDEVICE_OBJECT DeviceObject, // Failed to process request. // - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedRead (%p) Failed CcCopyRead() %wZ @ %0I64X Status %08lX\n", Irp, &pFileObject->FileName, liCurrentOffset.QuadPart, - Irp->IoStatus.Status); + Irp->IoStatus.Status)); try_return( ntStatus = Irp->IoStatus.Status); } @@ -132,13 +132,13 @@ AFSCachedRead( IN PDEVICE_OBJECT DeviceObject, { ntStatus = GetExceptionCode(); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedRead (%p) CcCopyRead() Threw exception %wZ @ %0I64X Status %08lX\n", Irp, &pFileObject->FileName, liCurrentOffset.QuadPart, - ntStatus); + ntStatus)); } if( !NT_SUCCESS( ntStatus)) @@ -220,11 +220,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (ulByteCount > pDevExt->Specific.RDR.MaxIo.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Request larger than MaxIO %I64X\n", Irp, - pDevExt->Specific.RDR.MaxIo.QuadPart); + pDevExt->Specific.RDR.MaxIo.QuadPart)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -235,10 +235,10 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if( pSystemBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to map system buffer\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -252,11 +252,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, // Clear up to EOF // - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead (%p) Zeroing to EOF zero byte length %08lX\n", Irp, - zeroCount); + zeroCount)); RtlZeroMemory( ((PCHAR)pSystemBuffer) + ulReadByteCount, zeroCount); } @@ -271,7 +271,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, pStartExtent = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Requesting extents for fid %08lX-%08lX-%08lX-%08lX Offset %I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -279,7 +279,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ulReadByteCount); + ulReadByteCount)); ntStatus = AFSRequestExtentsAsync( pFcb, pCcb, @@ -289,11 +289,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to request extents Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -303,11 +303,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, while (TRUE) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Acquiring Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE ); bLocked = TRUE; @@ -326,11 +326,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, KeClearEvent( &pFcb->NPFcb->Specific.File.ExtentsRequestComplete); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Releasing Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); bLocked= FALSE; @@ -344,7 +344,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if( liCurrentTime.QuadPart - liLastRequestTime.QuadPart >= pControlDevExt->Specific.Control.ExtentRequestTimeCount.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Requesting extents, again, for fid %08lX-%08lX-%08lX-%08lX Offset %I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -352,7 +352,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ulReadByteCount); + ulReadByteCount)); ntStatus = AFSRequestExtentsAsync( pFcb, pCcb, @@ -362,11 +362,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to request extents Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -374,7 +374,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, KeQueryTickCount( &liLastRequestTime); } - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Waiting for extents for fid %08lX-%08lX-%08lX-%08lX Offset %I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -382,14 +382,14 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ulReadByteCount); + ulReadByteCount)); ntStatus = AFSWaitForExtentMapping ( pFcb, pCcb); if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead Failed wait for extents for fid %08lX-%08lX-%08lX-%08lX Offset %I64X Length %08lX Status %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -398,7 +398,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, ulReadByteCount, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -410,7 +410,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, // Thus the list will not move between the start and end. // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Extents mapped for fid %08lX-%08lX-%08lX-%08lX Offset %I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -418,7 +418,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ulReadByteCount); + ulReadByteCount)); ntStatus = AFSGetExtents( pFcb, &StartingByte, @@ -430,21 +430,21 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to retrieve mapped extents Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus ); } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead (%p) Successfully retrieved map extents count %d run count %d\n", Irp, extentsCount, - runCount); + runCount)); if( BooleanFlagOn( AFSLibControlFlags, AFS_REDIR_LIB_FLAGS_NONPERSISTENT_CACHE)) { @@ -460,11 +460,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to process extent run for non-persistent cache Status %08lX\n", Irp, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -481,7 +481,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, ntStatus = STATUS_DEVICE_NOT_READY; - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead Failed to retrieve cache fileobject for fid %08lX-%08lX-%08lX-%08lX Offset %I64X Length %08lX Status %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -490,7 +490,7 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, ulReadByteCount, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -504,10 +504,10 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (NULL == pIoRuns) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to allocate IO run block\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES ); } @@ -532,11 +532,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to initialize IO run block Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus ); } @@ -544,11 +544,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, AFSReferenceActiveExtents( pStartExtent, extentsCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Releasing Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); bLocked = FALSE; @@ -560,16 +560,16 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, if (NULL == pGatherIo) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedRead (%p) Failed to allocate IO gather block\n", - Irp); + Irp)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Acquiring(2) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -619,20 +619,20 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, runCount, pGatherIo); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead (%p) AFSStartIos completed Status %08lX\n", Irp, - ntStatus); + ntStatus)); if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Acquiring(3) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -655,17 +655,17 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, ntStatus = pGatherIo->Status; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead (%p) AFSStartIos wait completed Status %08lX\n", Irp, - ntStatus); + ntStatus)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Acquiring(4) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -674,11 +674,11 @@ AFSNonCachedRead( IN PDEVICE_OBJECT DeviceObject, AFSDereferenceActiveExtents( pStartExtent, extentsCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Releasing Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); bLocked = FALSE; @@ -703,11 +703,11 @@ try_exit: AFSReleaseCacheFileObject( pCacheFileObject); } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead (%p) Completed request Status %08lX\n", Irp, - ntStatus); + ntStatus)); if (NT_SUCCESS(ntStatus) && !bPagingIo && @@ -722,11 +722,11 @@ try_exit: if (bLocked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Releasing Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); } @@ -744,12 +744,12 @@ try_exit: if (bCompleteIrp) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedRead Completing irp %08lX Status %08lX Info %08lX\n", Irp, ntStatus, - Irp->IoStatus.Information); + Irp->IoStatus.Information)); AFSCompleteRequest( Irp, ntStatus ); } @@ -788,11 +788,11 @@ AFSNonCachedReadDirect( IN PDEVICE_OBJECT DeviceObject, if (ulByteCount > pDevExt->Specific.RDR.MaxIo.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedReadDirect (%p) Request larger than MaxIO %I64X\n", Irp, - pDevExt->Specific.RDR.MaxIo.QuadPart); + pDevExt->Specific.RDR.MaxIo.QuadPart)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -803,10 +803,10 @@ AFSNonCachedReadDirect( IN PDEVICE_OBJECT DeviceObject, if( pSystemBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedReadDirect (%p) Failed to map system buffer\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -820,11 +820,11 @@ AFSNonCachedReadDirect( IN PDEVICE_OBJECT DeviceObject, // Clear up to EOF // - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedReadDirect (%p) Zeroing to EOF zero byte length %08lX\n", Irp, - zeroCount); + zeroCount)); RtlZeroMemory( ((PCHAR)pSystemBuffer) + ulReadByteCount, zeroCount); } @@ -881,20 +881,20 @@ AFSNonCachedReadDirect( IN PDEVICE_OBJECT DeviceObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedReadDirect (%p) Failed to send read to service Status %08lX\n", Irp, - ntStatus); + ntStatus)); } try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedReadDirect (%p) Completed request Status %08lX\n", Irp, - ntStatus); + ntStatus)); if (NT_SUCCESS(ntStatus) && !BooleanFlagOn( Irp->Flags, IRP_PAGING_IO) && @@ -906,12 +906,12 @@ try_exit: pFileObject->CurrentByteOffset.QuadPart = StartingByte.QuadPart + ulByteCount; } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedReadDirect Completing irp %08lX Status %08lX Info %08lX\n", Irp, ntStatus, - Irp->IoStatus.Information); + Irp->IoStatus.Information)); AFSCompleteRequest( Irp, ntStatus ); } @@ -1015,10 +1015,10 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if( BooleanFlagOn( pDeviceExt->DeviceFlags, AFS_DEVICE_FLAG_REDIRECTOR_SHUTDOWN)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCommonRead (%p) Open request after shutdown\n", - Irp); + Irp)); try_return( ntStatus = STATUS_TOO_LATE); } @@ -1030,10 +1030,10 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead Attempted read (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -1049,11 +1049,11 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, pFcb->Header.NodeTypeCode != AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead Attempted read (%p) on an invalid node type %08lX\n", Irp, - pFcb->Header.NodeTypeCode); + pFcb->Header.NodeTypeCode)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -1066,13 +1066,13 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if( pFcb->Header.NodeTypeCode == AFS_IOCTL_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Processing file (PIOCTL) Offset %I64X Length %08lX Irp Flags %08lX\n", Irp, liStartingByte.QuadPart, ulByteCount, - Irp->Flags); + Irp->Flags)); ntStatus = AFSIOCtlRead( DeviceObject, Irp); @@ -1082,13 +1082,13 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, else if( pFcb->Header.NodeTypeCode == AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Processing file (SHARE) Offset %I64X Length %08lX Irp Flags %08lX\n", Irp, liStartingByte.QuadPart, ulByteCount, - Irp->Flags); + Irp->Flags)); ntStatus = AFSShareRead( DeviceObject, Irp); @@ -1104,10 +1104,10 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, NULL == pDeviceExt->Specific.RDR.CacheFileObject) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead (%p) Request failed due to AFS cache closed\n", - Irp); + Irp)); try_return( ntStatus = STATUS_TOO_LATE ); } @@ -1115,10 +1115,10 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if( pIrpSp->Parameters.Read.Length == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Request completed due to zero length\n", - Irp); + Irp)); try_return( ntStatus); } @@ -1126,21 +1126,21 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if ( FlagOn(pIrpSp->MinorFunction, IRP_MN_COMPLETE) ) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, TRUE); bReleaseSectionObject = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) IRP_MN_COMPLETE being processed\n", - Irp); + Irp)); CcMdlReadComplete(pIrpSp->FileObject, Irp->MdlAddress); @@ -1171,22 +1171,22 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if( bPagingIo) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead Acquiring Fcb PagingIo lock %p SHARED %08lX\n", &pFcb->NPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->PagingResource, TRUE); bReleasePaging = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -1197,11 +1197,11 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pFcb->NPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->SectionObjectResource, TRUE); @@ -1216,10 +1216,10 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, Irp)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead (%p) Request failed due to lock conflict\n", - Irp); + Irp)); try_return( ntStatus = STATUS_FILE_LOCK_CONFLICT); } @@ -1229,10 +1229,10 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, BooleanFlagOn( pFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead (%p) Request failed due to file deleted\n", - Irp); + Irp)); try_return( ntStatus = STATUS_FILE_DELETED); } @@ -1244,11 +1244,11 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if( liStartingByte.QuadPart >= pFcb->Header.FileSize.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Request beyond EOF %I64X\n", Irp, - pFcb->Header.FileSize.QuadPart); + pFcb->Header.FileSize.QuadPart)); try_return( ntStatus = STATUS_END_OF_FILE); } @@ -1261,11 +1261,11 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, ulByteCount = (ULONG)(pFcb->Header.FileSize.QuadPart - liStartingByte.QuadPart); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Truncated read request to %08lX\n", Irp, - ulByteCount); + ulByteCount)); } // @@ -1275,10 +1275,10 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, if( BooleanFlagOn( pFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_OBJECT_INVALID)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead (%p) Failing request due to INVALID fcb\n", - Irp); + Irp)); Irp->IoStatus.Information = 0; @@ -1301,11 +1301,11 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead Initialize caching on Fcb %p FO %p\n", pFcb, - pFileObject); + pFileObject)); CcInitializeCacheMap( pFileObject, (PCC_FILE_SIZES)&pFcb->Header.AllocationSize, @@ -1324,11 +1324,11 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead (%p) Exception thrown while initializing cache map Status %08lX\n", Irp, - ntStatus); + ntStatus)); } if( !NT_SUCCESS( ntStatus)) @@ -1360,21 +1360,21 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, { ntStatus = GetExceptionCode(); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead (%p) Exception thrown during mdl read Status %08lX\n", Irp, - ntStatus); + ntStatus)); } if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonRead (%p) Failed to process MDL read Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1403,12 +1403,12 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, !bNonCachedIo) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Processing CACHED request Offset %I64X Len %08lX\n", Irp, liStartingByte.QuadPart, - ulByteCount); + ulByteCount)); ntStatus = AFSCachedRead( DeviceObject, Irp, liStartingByte, ulByteCount); } @@ -1439,12 +1439,12 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, bReleaseMain = FALSE; } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Processing NON-CACHED request Offset %I64X Len %08lX\n", Irp, liStartingByte.QuadPart, - ulByteCount); + ulByteCount)); if( BooleanFlagOn( pRDRDevExt->DeviceFlags, AFS_DEVICE_FLAG_DIRECT_SERVICE_IO)) { @@ -1459,11 +1459,11 @@ AFSCommonRead( IN PDEVICE_OBJECT DeviceObject, try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonRead (%p) Process complete Status %08lX\n", Irp, - ntStatus); + ntStatus)); if( bReleasePaging) { @@ -1530,11 +1530,11 @@ AFSIOCtlRead( IN PDEVICE_OBJECT DeviceObject, pCcb = (AFSCcb *)pIrpSp->FileObject->FsContext2; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSIOCtlRead Acquiring Fcb lock %p SHARED %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Resource, TRUE); @@ -1654,11 +1654,11 @@ AFSShareRead( IN PDEVICE_OBJECT DeviceObject, pCcb = (AFSCcb *)pIrpSp->FileObject->FsContext2; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSShareRead On pipe %wZ Length %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, - pIrpSp->Parameters.Read.Length); + pIrpSp->Parameters.Read.Length)); if( pIrpSp->Parameters.Read.Length == 0) { @@ -1683,10 +1683,10 @@ AFSShareRead( IN PDEVICE_OBJECT DeviceObject, if( pBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSShareRead Failed to map buffer on pipe %wZ\n", - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -1722,21 +1722,21 @@ AFSShareRead( IN PDEVICE_OBJECT DeviceObject, ntStatus != STATUS_BUFFER_OVERFLOW) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSShareRead (%p) Failed service read Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSShareRead Completed on pipe %wZ Length read %08lX Status %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, ulBytesReturned, - ntStatus); + ntStatus)); Irp->IoStatus.Information = ulBytesReturned; diff --git a/src/WINNT/afsrdr/kernel/lib/AFSSecurity.cpp b/src/WINNT/afsrdr/kernel/lib/AFSSecurity.cpp index 0140b5543..2ddb70779 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSSecurity.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSSecurity.cpp @@ -52,10 +52,10 @@ AFSSetSecurity( IN PDEVICE_OBJECT LibDeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSSetSecurity Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -63,9 +63,9 @@ AFSSetSecurity( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetSecurity\n"); + "EXCEPTION - AFSSetSecurity\n")); AFSDumpTraceFilesFnc(); } @@ -102,20 +102,20 @@ AFSQuerySecurity( IN PDEVICE_OBJECT LibDeviceObject, pCcb = (AFSCcb *)pFileObject->FsContext2; - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQuerySecurity (%p) Entry for FO %p SI %08lX\n", Irp, pFileObject, - SecurityInformation); + SecurityInformation)); if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQuerySecurity Attempted access (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -123,10 +123,10 @@ AFSQuerySecurity( IN PDEVICE_OBJECT LibDeviceObject, if ( SecurityInformation & SACL_SECURITY_INFORMATION) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQuerySecurity Attempted access (%p) SACL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_ACCESS_DENIED); } @@ -134,9 +134,9 @@ AFSQuerySecurity( IN PDEVICE_OBJECT LibDeviceObject, if( AFSDefaultSD == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQuerySecurity No default SD allocated\n"); + "AFSQuerySecurity No default SD allocated\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -147,9 +147,9 @@ AFSQuerySecurity( IN PDEVICE_OBJECT LibDeviceObject, Irp->UserBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSQuerySecurity Buffer too small\n"); + "AFSQuerySecurity Buffer too small\n")); Irp->IoStatus.Information = (ULONG_PTR)ulSDLength; @@ -163,9 +163,9 @@ AFSQuerySecurity( IN PDEVICE_OBJECT LibDeviceObject, if( pLockedUserBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQuerySecurity Failed to lock user buffer\n"); + "AFSQuerySecurity Failed to lock user buffer\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -187,9 +187,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQuerySecurity\n"); + "EXCEPTION - AFSQuerySecurity\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSShutdown.cpp b/src/WINNT/afsrdr/kernel/lib/AFSShutdown.cpp index 8103793cd..7f68e6ea6 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSShutdown.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSShutdown.cpp @@ -66,9 +66,9 @@ AFSShutdown( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSShutdown\n"); + "EXCEPTION - AFSShutdown\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSSystemControl.cpp b/src/WINNT/afsrdr/kernel/lib/AFSSystemControl.cpp index 83a2d9015..85e1fe9a7 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSSystemControl.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSSystemControl.cpp @@ -51,10 +51,10 @@ AFSSystemControl( IN PDEVICE_OBJECT LibDeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSSystemControl Entry for FO %p\n", - pIrpSp->FileObject); + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -63,9 +63,9 @@ AFSSystemControl( IN PDEVICE_OBJECT LibDeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSystemControl\n"); + "EXCEPTION - AFSSystemControl\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSVolumeInfo.cpp b/src/WINNT/afsrdr/kernel/lib/AFSVolumeInfo.cpp index 6e57fdb35..f27e97e8b 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSVolumeInfo.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSVolumeInfo.cpp @@ -65,9 +65,9 @@ AFSQueryVolumeInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFileObject == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueryVolumeInfo Failing request with NULL FileObject\n"); + "AFSQueryVolumeInfo Failing request with NULL FileObject\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -77,9 +77,9 @@ AFSQueryVolumeInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueryVolumeInfo Failing request with NULL Fcb\n"); + "AFSQueryVolumeInfo Failing request with NULL Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -89,9 +89,9 @@ AFSQueryVolumeInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pObjectInfo == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueryVolumeInfo Failing request with NULL ObjectInformation\n"); + "AFSQueryVolumeInfo Failing request with NULL ObjectInformation\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -114,27 +114,27 @@ AFSQueryVolumeInfo( IN PDEVICE_OBJECT LibDeviceObject, if( pFcb->Header.NodeTypeCode == AFS_IOCTL_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueryVolumeInfo Failing request against PIOCtl Fcb\n"); + "AFSQueryVolumeInfo Failing request against PIOCtl Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } else if( pFcb->Header.NodeTypeCode == AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueryVolumeInfo Failing request against SpecialShare Fcb\n"); + "AFSQueryVolumeInfo Failing request against SpecialShare Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } else if( pFcb->Header.NodeTypeCode == AFS_INVALID_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueryVolumeInfo Failing request against SpecialShare Fcb\n"); + "AFSQueryVolumeInfo Failing request against SpecialShare Fcb\n")); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -198,10 +198,10 @@ AFSQueryVolumeInfo( IN PDEVICE_OBJECT LibDeviceObject, default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSQueryVolumeInfo Invalid class %d\n", - FsInformationClass); + FsInformationClass)); ntStatus = STATUS_INVALID_PARAMETER; @@ -229,14 +229,14 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - AFSQueryVolumeInfo FO %p InfoClass %d FCB %p ObjectInfo %p VolCB %p\n", pFileObject, FsInformationClass, pFcb, pObjectInfo, - pVolumeCB); + pVolumeCB)); AFSDumpTraceFilesFnc(); } @@ -258,9 +258,10 @@ AFSSetVolumeInfo( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, - "AFSSetVolumeInfo Entry for FO %p\n", pIrpSp->FileObject); + "AFSSetVolumeInfo Entry for FO %p\n", + pIrpSp->FileObject)); AFSCompleteRequest( Irp, ntStatus); @@ -269,9 +270,9 @@ AFSSetVolumeInfo( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSSetVolumeInfo\n"); + "EXCEPTION - AFSSetVolumeInfo\n")); AFSDumpTraceFilesFnc(); } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp index 3e8f61808..3841776b0 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSWorker.cpp @@ -82,9 +82,9 @@ AFSInitializeWorkerPool() if( pCurrentWorker == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeWorkerPool Failed to allocate worker context\n"); + "AFSInitializeWorkerPool Failed to allocate worker context\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; @@ -100,9 +100,10 @@ AFSInitializeWorkerPool() if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeWorkerPool Failed to initialize worker thread Status %08lX\n", ntStatus); + "AFSInitializeWorkerPool Failed to initialize worker thread Status %08lX\n", + ntStatus)); ExFreePool( pCurrentWorker); @@ -152,9 +153,9 @@ AFSInitializeWorkerPool() if( pCurrentWorker == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeWorkerPool Failed to allocate IO worker context\n"); + "AFSInitializeWorkerPool Failed to allocate IO worker context\n")); ntStatus = STATUS_INSUFFICIENT_RESOURCES; @@ -170,9 +171,10 @@ AFSInitializeWorkerPool() if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSInitializeWorkerPool Failed to initialize IO worker thread Status %08lX\n", ntStatus); + "AFSInitializeWorkerPool Failed to initialize IO worker thread Status %08lX\n", + ntStatus)); ExFreePool( pCurrentWorker); @@ -679,9 +681,10 @@ AFSWorkerThread( IN PVOID Context) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSWorkerThread Wait for queue items failed Status %08lX\n", ntStatus); + "AFSWorkerThread Wait for queue items failed Status %08lX\n", + ntStatus)); ntStatus = STATUS_SUCCESS; } @@ -761,9 +764,10 @@ AFSWorkerThread( IN PVOID Context) default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSWorkerThread Unknown request type %d\n", pWorkItem->RequestType); + "AFSWorkerThread Unknown request type %d\n", + pWorkItem->RequestType)); break; } @@ -831,9 +835,10 @@ AFSIOWorkerThread( IN PVOID Context) if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSIOWorkerThread Wait for queue items failed Status %08lX\n", ntStatus); + "AFSIOWorkerThread Wait for queue items failed Status %08lX\n", + ntStatus)); ntStatus = STATUS_SUCCESS; } @@ -908,9 +913,10 @@ AFSIOWorkerThread( IN PVOID Context) default: - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSIOWorkerThread Unknown request type %d\n", pWorkItem->RequestType); + "AFSIOWorkerThread Unknown request type %d\n", + pWorkItem->RequestType)); break; } @@ -952,11 +958,11 @@ AFSExamineDirectory( IN AFSObjectInfoCB * pCurrentObject, pCurrentChildObject = pCurrentDirEntry->ObjectInformation; - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING | AFS_SUBSYSTEM_DIRENTRY_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineDirectory Deleting DE %wZ Object %p\n", &pCurrentDirEntry->NameInformation.FileName, - pCurrentChildObject); + pCurrentChildObject)); AFSDeleteDirEntry( pCurrentObject, pCurrentDirEntry); @@ -972,11 +978,11 @@ AFSExamineDirectory( IN AFSObjectInfoCB * pCurrentObject, lCount = AFSObjectInfoIncrement( pCurrentChildObject, AFS_OBJECT_REFERENCE_WORKER); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineDirectory Increment count on object %p Cnt %d\n", pCurrentChildObject, - lCount); + lCount)); if( lCount == 1 && pCurrentChildObject->Fcb != NULL && @@ -1019,11 +1025,11 @@ AFSExamineDirectory( IN AFSObjectInfoCB * pCurrentObject, lCount = AFSObjectInfoDecrement( pCurrentChildObject, AFS_OBJECT_REFERENCE_WORKER); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineDirectory Decrement1 count on object %p Cnt %d\n", pCurrentChildObject, - lCount); + lCount)); if( lCount == 0 && pCurrentChildObject->Fcb != NULL && @@ -1049,20 +1055,20 @@ AFSExamineDirectory( IN AFSObjectInfoCB * pCurrentObject, AFSExFreePoolWithTag( pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB->NonPaged, AFS_DIR_ENTRY_NP_TAG); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineDirectory (pioctl) AFS_DIR_ENTRY_TAG deallocating %p\n", - pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB); + pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB)); AFSExFreePoolWithTag( pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB, AFS_DIR_ENTRY_TAG); } AFSReleaseResource( &pCurrentChildObject->NonPagedInfo->ObjectInfoLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineDirectory Deleting object %p\n", - pCurrentChildObject); + pCurrentChildObject)); AFSDeleteObjectInfo( &pCurrentChildObject); } @@ -1155,20 +1161,20 @@ AFSExamineObjectInfo( IN AFSObjectInfoCB * pCurrentObject, AFSExFreePoolWithTag( pCurrentChildObject->Specific.Directory.PIOCtlDirectoryCB->NonPaged, AFS_DIR_ENTRY_NP_TAG); - AFSDbgLogMsg( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, + AFSDbgTrace(( AFS_SUBSYSTEM_DIRENTRY_ALLOCATION, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineObjectInfo (pioctl) AFS_DIR_ENTRY_TAG deallocating %p\n", - pCurrentObject->Specific.Directory.PIOCtlDirectoryCB); + pCurrentObject->Specific.Directory.PIOCtlDirectoryCB)); AFSExFreePoolWithTag( pCurrentObject->Specific.Directory.PIOCtlDirectoryCB, AFS_DIR_ENTRY_TAG); } AFSReleaseResource( &pCurrentObject->NonPagedInfo->ObjectInfoLock); - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineObjectInfo Deleting deleted object %p\n", - pCurrentObject); + pCurrentObject)); AFSDeleteObjectInfo( &pCurrentObject); } @@ -1202,12 +1208,12 @@ AFSExamineObjectInfo( IN AFSObjectInfoCB * pCurrentObject, if ( pCcb->NameArray) { - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineObjectInfo Found Object %p Fcb %p Ccb %p\n", pCurrentObject, pCurrentObject->Fcb, - pCcb); + pCcb)); } } @@ -1517,11 +1523,11 @@ AFSExamineObjectInfo( IN AFSObjectInfoCB * pCurrentObject, lCount = AFSObjectInfoIncrement( pCurrentObject, AFS_OBJECT_REFERENCE_WORKER); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineObjectInfo Increment3 count on object %p Cnt %d\n", pCurrentObject, - lCount); + lCount)); AFSReleaseResource( pVolumeCB->ObjectInfoTree.TreeLock); @@ -1549,12 +1555,11 @@ AFSExamineObjectInfo( IN AFSObjectInfoCB * pCurrentObject, lCount = AFSObjectInfoDecrement( pCurrentObject, AFS_OBJECT_REFERENCE_WORKER); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineObjectInfo Decrement3 count on object %p Cnt %d\n", pCurrentObject, - lCount); - + lCount)); if ( bTemp == FALSE) { @@ -1693,11 +1698,11 @@ AFSExamineVolume( IN AFSVolumeCB *pVolumeCB) lCount = AFSObjectInfoIncrement( pNextObject, AFS_OBJECT_REFERENCE_WORKER); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineVolume Increment count on object %p Cnt %d\n", pNextObject, - lCount); + lCount)); } } else @@ -1716,11 +1721,11 @@ AFSExamineVolume( IN AFSVolumeCB *pVolumeCB) lCount = AFSObjectInfoDecrement( pNextObject, AFS_OBJECT_REFERENCE_WORKER); - AFSDbgLogMsg( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_OBJECT_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSExamineVolume Decrement count on object %p Cnt %d\n", pNextObject, - lCount); + lCount)); } // @@ -1762,9 +1767,9 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context) BOOLEAN bFcbBusy = FALSE; LONG lCount; - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSPrimaryVolumeWorkerThread Initialized\n"); + "AFSPrimaryVolumeWorkerThread Initialized\n")); // // Initialize the timer for the worker thread @@ -1938,9 +1943,9 @@ AFSPrimaryVolumeWorkerThread( IN PVOID Context) ClearFlag( pPoolContext->State, AFS_WORKER_INITIALIZED); - AFSDbgLogMsg( AFS_SUBSYSTEM_CLEANUP_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_CLEANUP_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, - "AFSPrimaryVolumeWorkerThread Exiting\n"); + "AFSPrimaryVolumeWorkerThread Exiting\n")); lCount = InterlockedDecrement( &pControlDeviceExt->Specific.Control.VolumeWorkerThreadCount); @@ -1967,22 +1972,22 @@ AFSInsertWorkitem( IN AFSWorkItem *WorkItem) pControlDevExt = (AFSDeviceExt *)AFSControlDeviceObject->DeviceExtension; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertWorkitem Acquiring Control QueueLock lock %p EXCL %08lX\n", &pControlDevExt->Specific.Control.QueueLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pControlDevExt->Specific.Control.QueueLock, TRUE); lCount = InterlockedIncrement( &pControlDevExt->Specific.Control.QueueItemCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertWorkitem Inserting work item %p Count %d\n", WorkItem, - lCount); + lCount)); if( pControlDevExt->Specific.Control.QueueTail != NULL) // queue already has nodes { @@ -2018,22 +2023,22 @@ AFSInsertIOWorkitem( IN AFSWorkItem *WorkItem) pControlDevExt = (AFSDeviceExt *)AFSControlDeviceObject->DeviceExtension; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertIOWorkitem Acquiring Control QueueLock lock %p EXCL %08lX\n", &pControlDevExt->Specific.Control.IOQueueLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pControlDevExt->Specific.Control.IOQueueLock, TRUE); lCount = InterlockedIncrement( &pControlDevExt->Specific.Control.IOQueueItemCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertWorkitem Inserting IO work item %p Count %d\n", WorkItem, - lCount); + lCount)); if( pControlDevExt->Specific.Control.IOQueueTail != NULL) // queue already has nodes { @@ -2069,11 +2074,11 @@ AFSInsertWorkitemAtHead( IN AFSWorkItem *WorkItem) pControlDevExt = (AFSDeviceExt *)AFSControlDeviceObject->DeviceExtension; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertWorkitemAtHead Acquiring Control QueueLock lock %p EXCL %08lX\n", &pControlDevExt->Specific.Control.QueueLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pControlDevExt->Specific.Control.QueueLock, TRUE); @@ -2084,11 +2089,11 @@ AFSInsertWorkitemAtHead( IN AFSWorkItem *WorkItem) lCount = InterlockedIncrement( &pControlDevExt->Specific.Control.QueueItemCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSInsertWorkitemAtHead Inserting work item %p Count %d\n", WorkItem, - lCount); + lCount)); // // indicate that the queue has nodes @@ -2113,11 +2118,11 @@ AFSRemoveWorkItem() pControlDevExt = (AFSDeviceExt *)AFSControlDeviceObject->DeviceExtension; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveWorkItem Acquiring Control QueueLock lock %p EXCL %08lX\n", &pControlDevExt->Specific.Control.QueueLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pControlDevExt->Specific.Control.QueueLock, TRUE); @@ -2129,12 +2134,12 @@ AFSRemoveWorkItem() lCount = InterlockedDecrement( &pControlDevExt->Specific.Control.QueueItemCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveWorkItem Removing work item %p Count %d Thread %08lX\n", pWorkItem, lCount, - PsGetCurrentThreadId()); + PsGetCurrentThreadId())); pControlDevExt->Specific.Control.QueueHead = pControlDevExt->Specific.Control.QueueHead->next; @@ -2171,11 +2176,11 @@ AFSRemoveIOWorkItem() pControlDevExt = (AFSDeviceExt *)AFSControlDeviceObject->DeviceExtension; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveIOWorkItem Acquiring Control QueueLock lock %p EXCL %08lX\n", &pControlDevExt->Specific.Control.IOQueueLock, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pControlDevExt->Specific.Control.IOQueueLock, TRUE); @@ -2187,12 +2192,12 @@ AFSRemoveIOWorkItem() lCount = InterlockedDecrement( &pControlDevExt->Specific.Control.IOQueueItemCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSRemoveWorkItem Removing work item %p Count %d Thread %08lX\n", pWorkItem, lCount, - PsGetCurrentThreadId()); + PsGetCurrentThreadId())); pControlDevExt->Specific.Control.IOQueueHead = pControlDevExt->Specific.Control.IOQueueHead->next; @@ -2322,13 +2327,13 @@ AFSQueueFlushExtents( IN AFSFcb *Fcb, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueFlushExtents Queuing request for FID %08lX-%08lX-%08lX-%08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, - Fcb->ObjectInformation->FileId.Unique); + Fcb->ObjectInformation->FileId.Unique)); // // Increment our flush count here just to keep the number of items in the @@ -2340,13 +2345,13 @@ AFSQueueFlushExtents( IN AFSFcb *Fcb, if( lCount > 3) { - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueFlushExtents Max queued items for FID %08lX-%08lX-%08lX-%08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, - Fcb->ObjectInformation->FileId.Unique); + Fcb->ObjectInformation->FileId.Unique)); try_return( ntStatus); } @@ -2354,9 +2359,9 @@ AFSQueueFlushExtents( IN AFSFcb *Fcb, if( BooleanFlagOn( pRDRDeviceExt->DeviceFlags, AFS_DEVICE_FLAG_REDIRECTOR_SHUTDOWN)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueueFlushExtents Failing request, in shutdown\n"); + "AFSQueueFlushExtents Failing request, in shutdown\n")); try_return( ntStatus = STATUS_TOO_LATE); } @@ -2372,9 +2377,9 @@ AFSQueueFlushExtents( IN AFSFcb *Fcb, if( pWorkItem == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueueFlushExtents Failed to allocate work item\n"); + "AFSQueueFlushExtents Failed to allocate work item\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -2410,33 +2415,33 @@ AFSQueueFlushExtents( IN AFSFcb *Fcb, lCount = InterlockedIncrement( &Fcb->OpenReferenceCount); - AFSDbgLogMsg( AFS_SUBSYSTEM_FCB_REF_COUNTING, + AFSDbgTrace(( AFS_SUBSYSTEM_FCB_REF_COUNTING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueFlushExtents Increment count on Fcb %p Cnt %d\n", Fcb, - lCount); + lCount)); - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueFlushExtents Workitem %p for FID %08lX-%08lX-%08lX-%08lX\n", pWorkItem, Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, - Fcb->ObjectInformation->FileId.Unique); + Fcb->ObjectInformation->FileId.Unique)); ntStatus = AFSQueueWorkerRequest( pWorkItem); try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueFlushExtents Request complete Status %08lX FID %08lX-%08lX-%08lX-%08lX\n", Fcb->ObjectInformation->FileId.Cell, Fcb->ObjectInformation->FileId.Volume, Fcb->ObjectInformation->FileId.Vnode, Fcb->ObjectInformation->FileId.Unique, - ntStatus); + ntStatus)); // // Remove the count we added above @@ -2465,17 +2470,18 @@ try_exit: ExFreePoolWithTag( pWorkItem, AFS_WORK_ITEM_TAG); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueueFlushExtents Failed to queue request Status %08lX\n", ntStatus); + "AFSQueueFlushExtents Failed to queue request Status %08lX\n", + ntStatus)); } } __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueueFlushExtents\n"); + "EXCEPTION - AFSQueueFlushExtents\n")); AFSDumpTraceFilesFnc(); } @@ -2499,9 +2505,9 @@ AFSQueueGlobalRootEnumeration() if (NULL == pWorkItem) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueueGlobalRootEnumeration Failed to allocate work item\n"); + "AFSQueueGlobalRootEnumeration Failed to allocate work item\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES ); } @@ -2513,19 +2519,19 @@ AFSQueueGlobalRootEnumeration() pWorkItem->RequestType = AFS_WORK_ENUMERATE_GLOBAL_ROOT; - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueGlobalRootEnumeration Workitem %p\n", - pWorkItem); + pWorkItem)); ntStatus = AFSQueueWorkerRequest( pWorkItem); try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueGlobalRootEnumeration Request complete Status %08lX\n", - ntStatus); + ntStatus)); if( !NT_SUCCESS( ntStatus)) { @@ -2536,18 +2542,18 @@ try_exit: ExFreePoolWithTag( pWorkItem, AFS_WORK_ITEM_TAG); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueueGlobalRootEnumeration Failed to queue request Status %08lX\n", - ntStatus); + ntStatus)); } } __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueueGlobalRootEnumeration\n"); + "EXCEPTION - AFSQueueGlobalRootEnumeration\n")); AFSDumpTraceFilesFnc(); } @@ -2574,9 +2580,9 @@ AFSQueueStartIos( IN PFILE_OBJECT CacheFileObject, if( BooleanFlagOn( pRDRDeviceExt->DeviceFlags, AFS_DEVICE_FLAG_REDIRECTOR_SHUTDOWN)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueueStartIos Failing request, in shutdown\n"); + "AFSQueueStartIos Failing request, in shutdown\n")); try_return( ntStatus = STATUS_TOO_LATE); } @@ -2592,9 +2598,9 @@ AFSQueueStartIos( IN PFILE_OBJECT CacheFileObject, if( pWorkItem == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueueStartIos Failed to allocate work item\n"); + "AFSQueueStartIos Failed to allocate work item\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -2624,19 +2630,19 @@ AFSQueueStartIos( IN PFILE_OBJECT CacheFileObject, pWorkItem->Specific.CacheAccess.GatherIo = GatherIo; - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueStartIos Queuing IO Workitem %p\n", - pWorkItem); + pWorkItem)); ntStatus = AFSQueueIOWorkerRequest( pWorkItem); try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueStartIos Request complete Status %08lX\n", - ntStatus); + ntStatus)); if( !NT_SUCCESS( ntStatus)) { @@ -2651,9 +2657,9 @@ try_exit: __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueueStartIos\n"); + "EXCEPTION - AFSQueueStartIos\n")); AFSDumpTraceFilesFnc(); } @@ -2678,9 +2684,9 @@ AFSQueueInvalidateObject( IN AFSObjectInfoCB *ObjectInfo, if (NULL == pWorkItem) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, - "AFSQueueInvalidateObject Failed to allocate work item\n"); + "AFSQueueInvalidateObject Failed to allocate work item\n")); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES ); } @@ -2696,19 +2702,19 @@ AFSQueueInvalidateObject( IN AFSObjectInfoCB *ObjectInfo, pWorkItem->Specific.Invalidate.InvalidateReason = InvalidateReason; - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueInvalidateObject Workitem %p\n", - pWorkItem); + pWorkItem)); ntStatus = AFSQueueWorkerRequest( pWorkItem); try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSQueueInvalidateObject Request complete Status %08lX\n", - ntStatus); + ntStatus)); if( !NT_SUCCESS( ntStatus)) { @@ -2718,18 +2724,18 @@ try_exit: ExFreePoolWithTag( pWorkItem, AFS_WORK_ITEM_TAG); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSQueueInvalidateObject Failed to queue request Status %08lX\n", - ntStatus); + ntStatus)); } } __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, - "EXCEPTION - AFSQueueInvalidateObject\n"); + "EXCEPTION - AFSQueueInvalidateObject\n")); AFSDumpTraceFilesFnc(); } @@ -2759,10 +2765,10 @@ AFSDeferWrite( IN PDEVICE_OBJECT DeviceObject, if ( NULL == AFSLockSystemBuffer( Irp, BytesToWrite )) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Could not pin user memory item\n", - __FUNCTION__); + __FUNCTION__)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES ); } @@ -2774,10 +2780,10 @@ AFSDeferWrite( IN PDEVICE_OBJECT DeviceObject, if (NULL == pWorkItem) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to allocate work item\n", - __FUNCTION__); + __FUNCTION__)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES ); } @@ -2795,11 +2801,11 @@ AFSDeferWrite( IN PDEVICE_OBJECT DeviceObject, pWorkItem->Specific.AsynchIo.Irp = Irp; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING | AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING | AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s Workitem %p\n", __FUNCTION__, - pWorkItem); + pWorkItem)); CcDeferWrite( FileObject, AFSPostedDeferredWrite, pWorkItem, NULL, BytesToWrite, bRetrying); @@ -2810,21 +2816,21 @@ AFSDeferWrite( IN PDEVICE_OBJECT DeviceObject, __except( AFSExceptionFilter( __FUNCTION__, GetExceptionCode(), GetExceptionInformation()) ) { - AFSDbgLogMsg( 0, + AFSDbgTrace(( 0, 0, "EXCEPTION - %s \n", - __FUNCTION__); + __FUNCTION__)); ntStatus = GetExceptionCode(); } try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "%s complete Status %08lX\n", __FUNCTION__, - ntStatus); + ntStatus)); if( !NT_SUCCESS( ntStatus)) { @@ -2835,11 +2841,11 @@ try_exit: ExFreePoolWithTag( pWorkItem, AFS_WORK_ITEM_TAG); } - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Failed to queue request Status %08lX\n", __FUNCTION__, - ntStatus); + ntStatus)); } return ntStatus; @@ -2855,11 +2861,11 @@ AFSPostedDeferredWrite( IN PVOID Context1, AFSWorkItem *pWorkItem = (AFSWorkItem *) Context1; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING | AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING | AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s Workitem %p\n", __FUNCTION__, - pWorkItem); + pWorkItem)); ntStatus = AFSQueueIOWorkerRequest( pWorkItem); @@ -2870,11 +2876,11 @@ AFSPostedDeferredWrite( IN PVOID Context1, ExFreePoolWithTag( pWorkItem, AFS_WORK_ITEM_TAG); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING | AFS_SUBSYSTEM_WORKER_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING | AFS_SUBSYSTEM_WORKER_PROCESSING, AFS_TRACE_LEVEL_ERROR, "%s (%p) Failed to queue request Status %08lX\n", __FUNCTION__, pWorkItem->Specific.AsynchIo.Irp, - ntStatus); + ntStatus)); } } diff --git a/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp b/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp index ac1f2899d..f8f8c81ec 100644 --- a/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp +++ b/src/WINNT/afsrdr/kernel/lib/AFSWrite.cpp @@ -148,10 +148,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( pFcb == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite Attempted write (%p) when pFcb == NULL\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -165,10 +165,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( BooleanFlagOn( pDeviceExt->DeviceFlags, AFS_DEVICE_FLAG_REDIRECTOR_SHUTDOWN)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCommonWrite (%p) Open request after shutdown\n", - Irp); + Irp)); try_return( ntStatus = STATUS_TOO_LATE); } @@ -183,11 +183,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->Header.NodeTypeCode != AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite Attempted write (%p) on an invalid node type %08lX\n", Irp, - pFcb->Header.NodeTypeCode); + pFcb->Header.NodeTypeCode)); try_return( ntStatus = STATUS_INVALID_DEVICE_REQUEST); } @@ -200,13 +200,13 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( pFcb->Header.NodeTypeCode == AFS_IOCTL_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite (%p) Processing file (PIOCTL) Offset %0I64X Length %08lX Irp Flags %08lX\n", Irp, liStartingByte.QuadPart, ulByteCount, - Irp->Flags); + Irp->Flags)); ntStatus = AFSIOCtlWrite( DeviceObject, Irp); @@ -216,13 +216,13 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, else if( pFcb->Header.NodeTypeCode == AFS_SPECIAL_SHARE_FCB) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite (%p) Processing file (SHARE) Offset %0I64X Length %08lX Irp Flags %08lX\n", Irp, liStartingByte.QuadPart, ulByteCount, - Irp->Flags); + Irp->Flags)); ntStatus = AFSShareWrite( DeviceObject, Irp); @@ -238,10 +238,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, NULL == pDeviceExt->Specific.RDR.CacheFileObject) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (%p) Request failed due to AFS cache closed\n", - Irp); + Irp)); try_return( ntStatus = STATUS_TOO_LATE ); } @@ -250,10 +250,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, BooleanFlagOn( pFcb->ObjectInformation->VolumeCB->VolumeInformation.Characteristics, FILE_READ_ONLY_DEVICE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (%p) Request failed due to read only volume\n", - Irp); + Irp)); try_return( ntStatus = STATUS_ACCESS_DENIED); } @@ -282,10 +282,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( ulByteCount == 0) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite (%p) Request completed due to zero length\n", - Irp); + Irp)); try_return( ntStatus); } @@ -297,10 +297,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( BooleanFlagOn( pFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_OBJECT_INVALID)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (%p) Failing request due to INVALID fcb\n", - Irp); + Irp)); try_return( ntStatus = STATUS_FILE_DELETED); } @@ -309,10 +309,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, BooleanFlagOn( pFcb->ObjectInformation->Flags, AFS_OBJECT_FLAGS_DELETED)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (%p) Request failed due to file deleted\n", - Irp); + Irp)); try_return( ntStatus = STATUS_FILE_DELETED); } @@ -320,10 +320,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( FlagOn( pIrpSp->MinorFunction, IRP_MN_COMPLETE)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite (%p) IRP_MN_COMPLETE being processed\n", - Irp); + Irp)); CcMdlWriteComplete(pFileObject, &pIrpSp->Parameters.Write.ByteOffset, Irp->MdlAddress); @@ -352,11 +352,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( pFileObject->PrivateCacheMap == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pNPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pNPFcb->SectionObjectResource, TRUE); @@ -366,11 +366,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, __try { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Initialize caching on Fcb %p FileObject %p\n", pFcb, - pFileObject); + pFileObject)); CcInitializeCacheMap( pFileObject, (PCC_FILE_SIZES)&pFcb->Header.AllocationSize, @@ -389,18 +389,18 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (%p) Exception thrown while initializing cache map Status %08lX\n", Irp, - ntStatus); + ntStatus)); } - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Releasing Fcb SectionObject lock %p EXCL %08lX\n", &pNPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pNPFcb->SectionObjectResource); @@ -419,13 +419,13 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, bRetry)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_WARNING, "AFSCommonWrite (FO: %p) CcCanIWrite says No room for Offset %0I64X Length %08lX bytes! Deferring%s\n", pFileObject, liStartingByte.QuadPart, ulByteCount, - bRetry ? " RETRY" : ""); + bRetry ? " RETRY" : "")); ntStatus = AFSDeferWrite( DeviceObject, pFileObject, hCallingUser, Irp, ulByteCount, bRetry); @@ -437,11 +437,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (FO: %p) AFSDeferWrite failure Status %08lX\n", pFileObject, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -462,11 +462,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( ullProcessId == (ULONGLONG)AFSSysProcess) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_WARNING, "%s Setting LastWriterExtentProcessId to system process for Fcb %p\n", __FUNCTION__, - pFcb); + pFcb)); } } @@ -490,11 +490,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, //ASSERT( NULL != OnBehalfOf || ExIsResourceAcquiredLite( &pNPFcb->Resource )); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Acquiring Fcb PagingIo lock %p SHARED %08lX\n", &pNPFcb->PagingResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pNPFcb->PagingResource, TRUE); @@ -522,22 +522,22 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, ASSERT( !ExIsResourceAcquiredLite( &pNPFcb->PagingResource )); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Acquiring Fcb lock %p EXCL %08lX\n", &pNPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pNPFcb->Resource, TRUE); bReleaseMain = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Acquiring Fcb SectionObject lock %p EXCL %08lX\n", &pNPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireExcl( &pNPFcb->SectionObjectResource, TRUE); @@ -566,22 +566,22 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, { ASSERT( !ExIsResourceAcquiredLite( &pNPFcb->PagingResource )); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Acquiring Fcb lock %p SHARED %08lX\n", &pNPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pNPFcb->Resource, TRUE); bReleaseMain = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite Acquiring Fcb SectionObject lock %p SHARED %08lX\n", &pNPFcb->SectionObjectResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pNPFcb->SectionObjectResource, TRUE); @@ -615,10 +615,10 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, Irp)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (%p) Request failed due to lock conflict\n", - Irp); + Irp)); try_return( ntStatus = STATUS_FILE_LOCK_CONFLICT); } @@ -631,11 +631,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCommonWrite (%p) Failed extending write request Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus ); } @@ -655,13 +655,13 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, // Main and SectionObject resources held Shared // - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite (%p) Processing CACHED request Offset %0I64X Len %08lX%s\n", Irp, liStartingByte.QuadPart, ulByteCount, - bRetry ? " RETRY" : ""); + bRetry ? " RETRY" : "")); ntStatus = AFSCachedWrite( DeviceObject, Irp, liStartingByte, ulByteCount, bForceFlush); @@ -698,13 +698,13 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, bReleaseMain = FALSE; } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite (%p) Processing NON-CACHED request Offset %0I64X Len %08lX%s\n", Irp, liStartingByte.QuadPart, ulByteCount, - bRetry ? " RETRY" : ""); + bRetry ? " RETRY" : "")); if( BooleanFlagOn( pRDRDevExt->DeviceFlags, AFS_DEVICE_FLAG_DIRECT_SERVICE_IO)) { @@ -719,11 +719,11 @@ AFSCommonWrite( IN PDEVICE_OBJECT DeviceObject, try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSCommonWrite (%p) Process complete Status %08lX\n", Irp, - ntStatus); + ntStatus)); ObDereferenceObject(pFileObject); @@ -793,11 +793,11 @@ AFSIOCtlWrite( IN PDEVICE_OBJECT DeviceObject, pCcb = (AFSCcb *)pIrpSp->FileObject->FsContext2; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSIOCtlWrite Acquiring Fcb lock %p SHARED %08lX\n", &pFcb->NPFcb->Resource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Resource, TRUE); @@ -936,24 +936,24 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, __Enter { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite (FO: %p) StartingByte %08lX:%08lX Length %08lX\n", pFileObject, StartingByte.HighPart, StartingByte.LowPart, - ByteCount); + ByteCount)); if (ByteCount > pDevExt->Specific.RDR.MaxIo.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Request %08lX Actual %08lX larger than MaxIO %I64X\n", Irp, ByteCount, pIrpSp->Parameters.Write.Length, - pDevExt->Specific.RDR.MaxIo.QuadPart); + pDevExt->Specific.RDR.MaxIo.QuadPart)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -967,10 +967,10 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if( pSystemBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to map system buffer\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -980,7 +980,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, // Provoke a get of the extents - if we need to. // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Requesting extents for fid %08lX-%08lX-%08lX-%08lX Offset %0I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -988,7 +988,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ByteCount); + ByteCount)); ntStatus = AFSRequestExtentsAsync( pFcb, pCcb, @@ -998,11 +998,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to request extents Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1012,11 +1012,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, while (TRUE) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Acquiring Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); ASSERT( !ExIsResourceAcquiredLite( &pFcb->NPFcb->Specific.File.ExtentsResource )); @@ -1033,11 +1033,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, KeClearEvent( &pFcb->NPFcb->Specific.File.ExtentsRequestComplete ); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Releasing(1) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); bLocked= FALSE; @@ -1051,7 +1051,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if( liCurrentTime.QuadPart - liLastRequestTime.QuadPart >= pControlDevExt->Specific.Control.ExtentRequestTimeCount.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Requesting extents, again, for fid %08lX-%08lX-%08lX-%08lX Offset %0I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -1059,7 +1059,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ByteCount); + ByteCount)); ntStatus = AFSRequestExtentsAsync( pFcb, pCcb, @@ -1069,11 +1069,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to request extents Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1082,7 +1082,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, } - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Waiting for extents for fid %08lX-%08lX-%08lX-%08lX Offset %0I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -1090,7 +1090,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ByteCount); + ByteCount)); // // Wait for it @@ -1101,7 +1101,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite Failed wait for extents for fid %08lX-%08lX-%08lX-%08lX Offset %0I64X Length %08lX Status %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -1110,7 +1110,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, ByteCount, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1120,7 +1120,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, // As per the read path - // - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Extents located for fid %08lX-%08lX-%08lX-%08lX Offset %0I64X Length %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -1128,7 +1128,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, - ByteCount); + ByteCount)); ntStatus = AFSGetExtents( pFcb, &StartingByte, @@ -1140,21 +1140,21 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to retrieve mapped extents Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus ); } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite (%p) Successfully retrieved map extents count %d run count %d\n", Irp, extentsCount, - runCount); + runCount)); if( BooleanFlagOn( AFSLibControlFlags, AFS_REDIR_LIB_FLAGS_NONPERSISTENT_CACHE)) { @@ -1183,11 +1183,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to process extent run for non-persistent cache Status %08lX\n", Irp, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -1204,7 +1204,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, ntStatus = STATUS_DEVICE_NOT_READY; - AFSDbgLogMsg( AFS_SUBSYSTEM_EXTENT_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_EXTENT_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite Failed to retrieve cache fileobject for fid %08lX-%08lX-%08lX-%08lX Offset %0I64X Length %08lX Status %08lX\n", pFcb->ObjectInformation->FileId.Cell, @@ -1213,7 +1213,7 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Unique, StartingByte.QuadPart, ByteCount, - ntStatus); + ntStatus)); try_return( ntStatus); } @@ -1227,10 +1227,10 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (NULL == pIoRuns) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to allocate IO run block\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES ); } @@ -1255,11 +1255,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to initialize IO run block Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus ); } @@ -1269,11 +1269,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, bDerefExtents = TRUE; - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Releasing(2) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); bLocked = FALSE; @@ -1285,16 +1285,16 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if (NULL == pGatherIo) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWrite (%p) Failed to allocate IO gather block\n", - Irp); + Irp)); - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Acquiring(1) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -1352,20 +1352,20 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, runCount, pGatherIo); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite (%p) AFSStartIos completed Status %08lX\n", Irp, - ntStatus); + ntStatus)); if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Acquiring(2) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -1396,11 +1396,11 @@ AFSNonCachedWrite( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Acquiring(3) Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSAcquireShared( &pFcb->NPFcb->Specific.File.ExtentsResource, TRUE); @@ -1454,14 +1454,14 @@ try_exit: AFSReleaseCacheFileObject( pCacheFileObject); } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite (FO: %p) StartingByte %08lX:%08lX Length %08lX Status %08lX\n", pFileObject, StartingByte.HighPart, StartingByte.LowPart, ByteCount, - ntStatus); + ntStatus)); if (NT_SUCCESS(ntStatus) && !bPagingIo && @@ -1474,11 +1474,11 @@ try_exit: if( bLocked) { - AFSDbgLogMsg( AFS_SUBSYSTEM_LOCK_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_LOCK_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Releasing Fcb extents lock %p SHARED %08lX\n", &pFcb->NPFcb->Specific.File.ExtentsResource, - PsGetCurrentThread()); + PsGetCurrentThread())); AFSReleaseResource( &pFcb->NPFcb->Specific.File.ExtentsResource ); } @@ -1497,12 +1497,12 @@ try_exit: if( bCompleteIrp) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWrite Completing Irp %p Status %08lX Info %08lX\n", Irp, ntStatus, - Irp->IoStatus.Information); + Irp->IoStatus.Information)); AFSCompleteRequest( Irp, ntStatus); } @@ -1537,24 +1537,24 @@ AFSNonCachedWriteDirect( IN PDEVICE_OBJECT DeviceObject, { Irp->IoStatus.Information = 0; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWriteDirect (FO: %p) StartingByte %08lX:%08lX Length %08lX\n", pFileObject, StartingByte.HighPart, StartingByte.LowPart, - ByteCount); + ByteCount)); if (ByteCount > pDevExt->Specific.RDR.MaxIo.QuadPart) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWriteDirect (%p) Request %08lX Actual %08lX larger than MaxIO %I64X\n", Irp, ByteCount, pIrpSp->Parameters.Write.Length, - pDevExt->Specific.RDR.MaxIo.QuadPart); + pDevExt->Specific.RDR.MaxIo.QuadPart)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1568,10 +1568,10 @@ AFSNonCachedWriteDirect( IN PDEVICE_OBJECT DeviceObject, if( pSystemBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWriteDirect (%p) Failed to map system buffer\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -1642,24 +1642,23 @@ AFSNonCachedWriteDirect( IN PDEVICE_OBJECT DeviceObject, else { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSNonCachedWriteDirect (%p) Failed to send write to service Status %08lX\n", Irp, - ntStatus); - + ntStatus)); } try_exit: - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWriteDirect (FO: %p) StartingByte %08lX:%08lX Length %08lX Status %08lX\n", pFileObject, StartingByte.HighPart, StartingByte.LowPart, ByteCount, - ntStatus); + ntStatus)); if (NT_SUCCESS(ntStatus) && !bPagingIo && @@ -1669,12 +1668,12 @@ try_exit: pFileObject->CurrentByteOffset.QuadPart = StartingByte.QuadPart + ByteCount; } - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSNonCachedWriteDirect Completing Irp %p Status %08lX Info %08lX\n", Irp, ntStatus, - Irp->IoStatus.Information); + Irp->IoStatus.Information)); AFSCompleteRequest( Irp, ntStatus); } @@ -1725,11 +1724,11 @@ AFSCachedWrite( IN PDEVICE_OBJECT DeviceObject, { ntStatus = GetExceptionCode(); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedWrite (%p) Exception thrown while preparing mdl write Status %08lX\n", Irp, - ntStatus); + ntStatus)); } if( !NT_SUCCESS( ntStatus)) @@ -1745,11 +1744,11 @@ AFSCachedWrite( IN PDEVICE_OBJECT DeviceObject, Irp->MdlAddress = NULL; - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedWrite (%p) Failed to process MDL write Status %08lX\n", Irp, - ntStatus); + ntStatus)); } try_return( ntStatus); @@ -1787,10 +1786,10 @@ AFSCachedWrite( IN PDEVICE_OBJECT DeviceObject, if( pSystemBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedWrite (%p) Failed to lock system buffer\n", - Irp); + Irp)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -1808,13 +1807,13 @@ AFSCachedWrite( IN PDEVICE_OBJECT DeviceObject, // Failed to process request. // - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedWrite (%p) Failed to issue CcCopyWrite %wZ @ %0I64X Status %08lX\n", Irp, &pFileObject->FileName, liCurrentOffset.QuadPart, - Irp->IoStatus.Status); + Irp->IoStatus.Status)); try_return( ntStatus = STATUS_UNSUCCESSFUL); } @@ -1824,13 +1823,13 @@ AFSCachedWrite( IN PDEVICE_OBJECT DeviceObject, ntStatus = GetExceptionCode(); - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedWrite (%p) CcCopyWrite Threw exception %wZ @ %0I64X Status %08lX\n", Irp, &pFileObject->FileName, liCurrentOffset.QuadPart, - ntStatus); + ntStatus)); } if( !NT_SUCCESS( ntStatus)) @@ -1854,7 +1853,7 @@ AFSCachedWrite( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( iosbFlush.Status)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_IO_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_IO_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSCachedWrite (%p) CcFlushCache failure %wZ FID %08lX-%08lX-%08lX-%08lX Status 0x%08lX Bytes 0x%08lX\n", Irp, @@ -1864,7 +1863,7 @@ AFSCachedWrite( IN PDEVICE_OBJECT DeviceObject, pFcb->ObjectInformation->FileId.Vnode, pFcb->ObjectInformation->FileId.Unique, iosbFlush.Status, - iosbFlush.Information); + iosbFlush.Information)); try_return( ntStatus = iosbFlush.Status); } @@ -2019,11 +2018,11 @@ AFSShareWrite( IN PDEVICE_OBJECT DeviceObject, pCcb = (AFSCcb *)pIrpSp->FileObject->FsContext2; - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSShareWrite On pipe %wZ Length %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, - pIrpSp->Parameters.Write.Length); + pIrpSp->Parameters.Write.Length)); if( pIrpSp->Parameters.Write.Length == 0) { @@ -2045,10 +2044,10 @@ AFSShareWrite( IN PDEVICE_OBJECT DeviceObject, if( pBuffer == NULL) { - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSShareWrite Failed to map buffer on pipe %wZ\n", - &pCcb->DirectoryCB->NameInformation.FileName); + &pCcb->DirectoryCB->NameInformation.FileName)); try_return( ntStatus = STATUS_INSUFFICIENT_RESOURCES); } @@ -2104,20 +2103,20 @@ AFSShareWrite( IN PDEVICE_OBJECT DeviceObject, if( !NT_SUCCESS( ntStatus)) { - AFSDbgLogMsg( AFS_SUBSYSTEM_FILE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_FILE_PROCESSING, AFS_TRACE_LEVEL_ERROR, "AFSShareWrite (%p) Failed service write Status %08lX\n", Irp, - ntStatus); + ntStatus)); try_return( ntStatus); } - AFSDbgLogMsg( AFS_SUBSYSTEM_PIPE_PROCESSING, + AFSDbgTrace(( AFS_SUBSYSTEM_PIPE_PROCESSING, AFS_TRACE_LEVEL_VERBOSE, "AFSShareWrite Completed on pipe %wZ Length read %08lX\n", &pCcb->DirectoryCB->NameInformation.FileName, - stIoResult.BytesProcessed); + stIoResult.BytesProcessed)); Irp->IoStatus.Information = stIoResult.BytesProcessed; diff --git a/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h b/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h index 09cbee082..483261448 100644 --- a/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h +++ b/src/WINNT/afsrdr/kernel/lib/Include/AFSExtern.h @@ -79,6 +79,8 @@ extern PAFSProcessRequest AFSProcessRequest; extern PAFSDbgLogMsg AFSDbgLogMsg; +extern PAFSDbgLogMsg AFSDebugTraceFnc; + extern PAFSAddConnectionEx AFSAddConnectionEx; extern PAFSExAllocatePoolWithTag AFSExAllocatePoolWithTag; -- 2.39.5