From d600586fdd490aa0c6ae134e110396726aa5d8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Mon, 12 May 2008 12:01:51 +0000 Subject: [PATCH] Use dynamic debug system svn path=/trunk/; revision=33469 --- reactos/dll/win32/kernel32/file/backup.c | 4 +- reactos/dll/win32/kernel32/file/bintype.c | 8 ++-- reactos/dll/win32/kernel32/file/cnotify.c | 4 +- reactos/dll/win32/kernel32/file/copy.c | 29 ++++++------ reactos/dll/win32/kernel32/file/create.c | 13 +++--- reactos/dll/win32/kernel32/file/curdir.c | 13 +++--- reactos/dll/win32/kernel32/file/delete.c | 15 +++--- reactos/dll/win32/kernel32/file/deviceio.c | 7 ++- reactos/dll/win32/kernel32/file/dir.c | 54 +++++++++++----------- reactos/dll/win32/kernel32/file/dosdev.c | 21 ++++----- reactos/dll/win32/kernel32/file/file.c | 33 +++++++------ reactos/dll/win32/kernel32/file/find.c | 21 ++++----- reactos/dll/win32/kernel32/file/hardlink.c | 11 ++--- reactos/dll/win32/kernel32/file/iocompl.c | 5 +- reactos/dll/win32/kernel32/file/lfile.c | 5 +- reactos/dll/win32/kernel32/file/lock.c | 3 +- reactos/dll/win32/kernel32/file/mailslot.c | 12 ++--- reactos/dll/win32/kernel32/file/move.c | 20 ++++---- reactos/dll/win32/kernel32/file/npipe.c | 25 +++++----- reactos/dll/win32/kernel32/file/pipe.c | 8 ++-- reactos/dll/win32/kernel32/file/rw.c | 13 +++--- reactos/dll/win32/kernel32/file/tape.c | 4 +- reactos/dll/win32/kernel32/file/volume.c | 21 ++++----- 23 files changed, 168 insertions(+), 181 deletions(-) diff --git a/reactos/dll/win32/kernel32/file/backup.c b/reactos/dll/win32/kernel32/file/backup.c index 4ee43abd9df..deec20bdfbb 100644 --- a/reactos/dll/win32/kernel32/file/backup.c +++ b/reactos/dll/win32/kernel32/file/backup.c @@ -11,9 +11,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/bintype.c b/reactos/dll/win32/kernel32/file/bintype.c index 210cb981492..0150ec9c0ab 100644 --- a/reactos/dll/win32/kernel32/file/bintype.c +++ b/reactos/dll/win32/kernel32/file/bintype.c @@ -13,9 +13,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -68,7 +68,7 @@ InternalIsOS2OrOldWin(HANDLE hFile, IMAGE_DOS_HEADER *mz, IMAGE_OS2_HEADER *ne) } broken: - DPRINT("InternalIsOS2OrOldWin(): Binary file seems to be broken\n"); + WARN("InternalIsOS2OrOldWin(): Binary file seems to be broken\n"); done: HeapFree(GetProcessHeap(), 0, modtab); @@ -288,7 +288,7 @@ GetBinaryTypeW ( } } - DPRINT1("Invalid binary type returned!\n", BinType); + ERR("Invalid binary type returned!\n", BinType); return FALSE; } diff --git a/reactos/dll/win32/kernel32/file/cnotify.c b/reactos/dll/win32/kernel32/file/cnotify.c index 0315d1044f1..ce0b3227b7a 100644 --- a/reactos/dll/win32/kernel32/file/cnotify.c +++ b/reactos/dll/win32/kernel32/file/cnotify.c @@ -10,9 +10,9 @@ */ #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* * @implemented diff --git a/reactos/dll/win32/kernel32/file/copy.c b/reactos/dll/win32/kernel32/file/copy.c index 7c58babb2ad..8e720f520f6 100644 --- a/reactos/dll/win32/kernel32/file/copy.c +++ b/reactos/dll/win32/kernel32/file/copy.c @@ -13,10 +13,9 @@ /* INCLUDES ****************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -72,11 +71,11 @@ CopyLoop ( switch (ProgressResult) { case PROGRESS_CANCEL: - DPRINT("Progress callback requested cancel\n"); + TRACE("Progress callback requested cancel\n"); errCode = STATUS_REQUEST_ABORTED; break; case PROGRESS_STOP: - DPRINT("Progress callback requested stop\n"); + TRACE("Progress callback requested stop\n"); errCode = STATUS_REQUEST_ABORTED; *KeepDest = TRUE; break; @@ -117,7 +116,7 @@ CopyLoop ( } else { - DPRINT("Error 0x%08x reading writing to dest\n", errCode); + WARN("Error 0x%08x reading writing to dest\n", errCode); } } else if (!NT_SUCCESS(errCode)) @@ -129,7 +128,7 @@ CopyLoop ( } else { - DPRINT("Error 0x%08x reading from source\n", errCode); + WARN("Error 0x%08x reading from source\n", errCode); } } } @@ -137,7 +136,7 @@ CopyLoop ( if (! EndOfFileFound && (NULL != pbCancel && *pbCancel)) { - DPRINT("User requested cancel\n"); + TRACE("User requested cancel\n"); errCode = STATUS_REQUEST_ABORTED; } @@ -148,7 +147,7 @@ CopyLoop ( } else { - DPRINT("Error 0x%08x allocating buffer of %d bytes\n", errCode, RegionSize); + TRACE("Error 0x%08x allocating buffer of %d bytes\n", errCode, RegionSize); } return errCode; @@ -171,7 +170,7 @@ SetLastWriteTime( FileBasicInformation); if (!NT_SUCCESS(errCode)) { - DPRINT("Error 0x%08x obtaining FileBasicInformation\n", errCode); + WARN("Error 0x%08x obtaining FileBasicInformation\n", errCode); } else { @@ -183,7 +182,7 @@ SetLastWriteTime( FileBasicInformation); if (!NT_SUCCESS(errCode)) { - DPRINT("Error 0x%0x setting LastWriteTime\n", errCode); + WARN("Error 0x%0x setting LastWriteTime\n", errCode); } } @@ -230,7 +229,7 @@ CopyFileExW ( FileStandardInformation); if (!NT_SUCCESS(errCode)) { - DPRINT("Status 0x%08x obtaining FileStandardInformation for source\n", errCode); + TRACE("Status 0x%08x obtaining FileStandardInformation for source\n", errCode); SetLastErrorByStatus(errCode); } else @@ -241,7 +240,7 @@ CopyFileExW ( FileBasicInformation); if (!NT_SUCCESS(errCode)) { - DPRINT("Status 0x%08x obtaining FileBasicInformation for source\n", errCode); + TRACE("Status 0x%08x obtaining FileBasicInformation for source\n", errCode); SetLastErrorByStatus(errCode); } else @@ -292,7 +291,7 @@ CopyFileExW ( } else { - DPRINT("Error %d during opening of dest file\n", GetLastError()); + WARN("Error %d during opening of dest file\n", GetLastError()); } } } @@ -300,7 +299,7 @@ CopyFileExW ( } else { - DPRINT("Error %d during opening of source file\n", GetLastError()); + WARN("Error %d during opening of source file\n", GetLastError()); } return RC; diff --git a/reactos/dll/win32/kernel32/file/create.c b/reactos/dll/win32/kernel32/file/create.c index cead6ec10de..397e31c65e8 100644 --- a/reactos/dll/win32/kernel32/file/create.c +++ b/reactos/dll/win32/kernel32/file/create.c @@ -15,10 +15,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); #define SYMLINK_FLAG_RELATIVE 1 @@ -66,7 +65,7 @@ HANDLE STDCALL CreateFileA (LPCSTR lpFileName, PWCHAR FileNameW; HANDLE FileHandle; - DPRINT("CreateFileA(lpFileName %s)\n",lpFileName); + TRACE("CreateFileA(lpFileName %s)\n",lpFileName); if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) return INVALID_HANDLE_VALUE; @@ -104,7 +103,7 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, PVOID EaBuffer = NULL; ULONG EaLength = 0; - DPRINT("CreateFileW(lpFileName %S)\n",lpFileName); + TRACE("CreateFileW(lpFileName %S)\n",lpFileName); /* validate & translate the creation disposition */ switch (dwCreationDisposition) @@ -232,12 +231,12 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, NULL, NULL)) { - DPRINT("Invalid path\n"); + WARN("Invalid path\n"); SetLastError(ERROR_PATH_NOT_FOUND); return INVALID_HANDLE_VALUE; } - DPRINT("NtPathU \'%wZ\'\n", &NtPathU); + TRACE("NtPathU \'%wZ\'\n", &NtPathU); if (hTemplateFile != NULL) { diff --git a/reactos/dll/win32/kernel32/file/curdir.c b/reactos/dll/win32/kernel32/file/curdir.c index 041d96380be..72f8ad90ca3 100644 --- a/reactos/dll/win32/kernel32/file/curdir.c +++ b/reactos/dll/win32/kernel32/file/curdir.c @@ -17,10 +17,9 @@ /* INCLUDES ******************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* GLOBAL VARIABLES **********************************************************/ @@ -90,7 +89,7 @@ SetCurrentDirectoryA ( { PWCHAR PathNameW; - DPRINT("setcurrdir: %s\n",lpPathName); + TRACE("setcurrdir: %s\n",lpPathName); if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) return FALSE; @@ -171,7 +170,7 @@ GetTempPathW ( WCHAR tmp_full_path[MAX_PATH]; UINT ret; - DPRINT("GetTempPathW(%lu,%p)\n", count, path); + TRACE("GetTempPathW(%lu,%p)\n", count, path); if (!(ret = GetEnvironmentVariableW( L"TMP", tmp_path, MAX_PATH ))) if (!(ret = GetEnvironmentVariableW( L"TEMP", tmp_path, MAX_PATH ))) @@ -210,7 +209,7 @@ GetTempPathW ( path[0] = 0; /* avoid returning ambiguous "X:" */ } - DPRINT("GetTempPathW returning %u, %s\n", ret, path); + TRACE("GetTempPathW returning %u, %s\n", ret, path); return ret; } @@ -340,7 +339,7 @@ GetSystemWow64DirectoryW( ) { #ifdef _WIN64 - DPRINT1("GetSystemWow64DirectoryW is UNIMPLEMENTED!\n"); + ERR("GetSystemWow64DirectoryW is UNIMPLEMENTED!\n"); return 0; #else SetLastError(ERROR_CALL_NOT_IMPLEMENTED); diff --git a/reactos/dll/win32/kernel32/file/delete.c b/reactos/dll/win32/kernel32/file/delete.c index 1de7ecff58e..3bb661cc5fe 100644 --- a/reactos/dll/win32/kernel32/file/delete.c +++ b/reactos/dll/win32/kernel32/file/delete.c @@ -12,10 +12,9 @@ /* INCLUDES ****************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -53,7 +52,7 @@ DeleteFileW ( HANDLE FileHandle; NTSTATUS Status; - DPRINT("DeleteFileW (lpFileName %S)\n",lpFileName); + TRACE("DeleteFileW (lpFileName %S)\n",lpFileName); if (!RtlDosPathNameToNtPathName_U (lpFileName, &NtPathU, @@ -64,7 +63,7 @@ DeleteFileW ( return FALSE; } - DPRINT("NtPathU \'%wZ\'\n", &NtPathU); + TRACE("NtPathU \'%wZ\'\n", &NtPathU); InitializeObjectAttributes(&ObjectAttributes, &NtPathU, @@ -90,7 +89,7 @@ DeleteFileW ( if (!NT_SUCCESS(Status)) { - CHECKPOINT; + WARN("Status 0x%08x\n", Status); SetLastErrorByStatus (Status); return FALSE; } @@ -104,7 +103,7 @@ DeleteFileW ( FileDispositionInformation); if (!NT_SUCCESS(Status)) { - CHECKPOINT; + WARN("Status 0x%08x\n", Status); NtClose (FileHandle); SetLastErrorByStatus (Status); return FALSE; @@ -113,7 +112,7 @@ DeleteFileW ( Status = NtClose (FileHandle); if (!NT_SUCCESS (Status)) { - CHECKPOINT; + WARN("Status 0x%08x\n", Status); SetLastErrorByStatus (Status); return FALSE; } diff --git a/reactos/dll/win32/kernel32/file/deviceio.c b/reactos/dll/win32/kernel32/file/deviceio.c index 11d7f52e5f5..31c2f8cea30 100644 --- a/reactos/dll/win32/kernel32/file/deviceio.c +++ b/reactos/dll/win32/kernel32/file/deviceio.c @@ -10,10 +10,9 @@ */ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* * @implemented @@ -179,7 +178,7 @@ GetOverlappedResult ( if (WaitStatus == WAIT_FAILED) { - DPRINT("Wait failed!\n"); + WARN("Wait failed!\n"); /* WaitForSingleObjectEx sets the last error */ return FALSE; } diff --git a/reactos/dll/win32/kernel32/file/dir.c b/reactos/dll/win32/kernel32/file/dir.c index 7f06d5d8817..b5e1dc208e6 100644 --- a/reactos/dll/win32/kernel32/file/dir.c +++ b/reactos/dll/win32/kernel32/file/dir.c @@ -16,9 +16,9 @@ /* INCLUDES ******************************************************************/ #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); UNICODE_STRING DllDirectory = {0, 0, NULL}; @@ -97,7 +97,7 @@ CreateDirectoryW ( HANDLE DirectoryHandle = NULL; NTSTATUS Status; - DPRINT ("lpPathName %S lpSecurityAttributes %p\n", + TRACE ("lpPathName %S lpSecurityAttributes %p\n", lpPathName, lpSecurityAttributes); if (!RtlDosPathNameToNtPathName_U (lpPathName, @@ -134,7 +134,7 @@ CreateDirectoryW ( if (!NT_SUCCESS(Status)) { - DPRINT("NtCreateFile failed with Status %lx\n", Status); + WARN("NtCreateFile failed with Status %lx\n", Status); SetLastErrorByStatus(Status); return FALSE; } @@ -176,7 +176,7 @@ CreateDirectoryExW ( DesiredAccess = FILE_LIST_DIRECTORY | SYNCHRONIZE | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES; - DPRINT ("lpTemplateDirectory %ws lpNewDirectory %ws lpSecurityAttributes %p\n", + TRACE ("lpTemplateDirectory %ws lpNewDirectory %ws lpSecurityAttributes %p\n", lpTemplateDirectory, lpNewDirectory, lpSecurityAttributes); /* @@ -218,14 +218,14 @@ OpenTemplateDir: the directory without FILE_OPEN_REPARSE_POINT */ OpenOptions &= ~FILE_OPEN_REPARSE_POINT; - DPRINT("Reparse points not supported, try with less options\n"); + TRACE("Reparse points not supported, try with less options\n"); /* try again */ goto OpenTemplateDir; } else { - DPRINT1("Failed to open the template directory: 0x%x\n", Status); + WARN("Failed to open the template directory: 0x%x\n", Status); goto CleanupNoNtPath; } } @@ -247,7 +247,7 @@ OpenTemplateDir: &NtTemplatePathU, TRUE)) { - DPRINT1("Both directory paths are the same!\n"); + WARN("Both directory paths are the same!\n"); Status = STATUS_OBJECT_NAME_INVALID; goto Cleanup; } @@ -272,7 +272,7 @@ OpenTemplateDir: FileBasicInformation); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to query the basic directory attributes\n"); + WARN("Failed to query the basic directory attributes\n"); goto Cleanup; } @@ -352,7 +352,7 @@ OpenTemplateDir: if (!NT_SUCCESS(Status)) { - DPRINT1("Querying the EA data failed: 0x%x\n", Status); + WARN("Querying the EA data failed: 0x%x\n", Status); goto Cleanup; } @@ -377,7 +377,7 @@ OpenTemplateDir: (Status == STATUS_INVALID_PARAMETER || Status == STATUS_ACCESS_DENIED)) { /* The FS doesn't seem to support reparse points... */ - DPRINT1("Cannot copy the hardlink, destination doesn\'t support reparse points!\n"); + WARN("Cannot copy the hardlink, destination doesn\'t support reparse points!\n"); } goto Cleanup; @@ -433,7 +433,7 @@ OpenTemplateDir: if (!NT_SUCCESS(Status)) { /* fail, we were unable to read the reparse point data! */ - DPRINT1("Querying or setting the reparse point failed: 0x%x\n", Status); + WARN("Querying or setting the reparse point failed: 0x%x\n", Status); goto Cleanup; } } @@ -501,7 +501,7 @@ RemoveDirectoryA ( { PWCHAR PathNameW; - DPRINT("RemoveDirectoryA(%s)\n",lpPathName); + TRACE("RemoveDirectoryA(%s)\n",lpPathName); if (!(PathNameW = FilenameA2W(lpPathName, FALSE))) return FALSE; @@ -526,7 +526,7 @@ RemoveDirectoryW ( HANDLE DirectoryHandle = NULL; NTSTATUS Status; - DPRINT("lpPathName %S\n", lpPathName); + TRACE("lpPathName %S\n", lpPathName); if (!RtlDosPathNameToNtPathName_U (lpPathName, &NtPathU, @@ -540,7 +540,7 @@ RemoveDirectoryW ( NULL, NULL); - DPRINT("NtPathU '%S'\n", NtPathU.Buffer); + TRACE("NtPathU '%S'\n", NtPathU.Buffer); Status = NtCreateFile (&DirectoryHandle, DELETE, @@ -560,7 +560,7 @@ RemoveDirectoryW ( if (!NT_SUCCESS(Status)) { - CHECKPOINT; + WARN("Status 0x%08x\n", Status); SetLastErrorByStatus (Status); return FALSE; } @@ -601,7 +601,7 @@ GetFullPathNameA ( DWORD ret; LPWSTR FilePartW = NULL; - DPRINT("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " + TRACE("GetFullPathNameA(lpFileName %s, nBufferLength %d, lpBuffer %p, " "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); if (!lpFileName) @@ -635,7 +635,7 @@ GetFullPathNameA ( *lpFilePart = (FilePartW - BufferW) + lpBuffer; } - DPRINT("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", + TRACE("GetFullPathNameA ret: lpBuffer %s lpFilePart %s\n", lpBuffer, (lpFilePart == NULL) ? "NULL" : *lpFilePart); return ret; @@ -656,7 +656,7 @@ GetFullPathNameW ( { ULONG Length; - DPRINT("GetFullPathNameW(lpFileName %S, nBufferLength %d, lpBuffer %p, " + TRACE("GetFullPathNameW(lpFileName %S, nBufferLength %d, lpBuffer %p, " "lpFilePart %p)\n",lpFileName,nBufferLength,lpBuffer,lpFilePart); Length = RtlGetFullPathName_U ((LPWSTR)lpFileName, @@ -664,7 +664,7 @@ GetFullPathNameW ( lpBuffer, lpFilePart); - DPRINT("GetFullPathNameW ret: lpBuffer %S lpFilePart %S Length %ld\n", + TRACE("GetFullPathNameW ret: lpBuffer %S lpFilePart %S Length %ld\n", lpBuffer, (lpFilePart == NULL) ? L"NULL" : *lpFilePart, Length / sizeof(WCHAR)); return Length/sizeof(WCHAR); @@ -732,7 +732,7 @@ GetShortPathNameW ( UNICODE_STRING ustr; WCHAR ustr_buf[8+1+3+1]; - DPRINT("GetShortPathNameW: %S\n",longpath); + TRACE("GetShortPathNameW: %S\n",longpath); if (!longpath) { @@ -1011,7 +1011,7 @@ SearchPathW ( LPCWSTR p; PWCHAR Name; - DPRINT("SearchPath\n"); + TRACE("SearchPath\n"); HasExtension = FALSE; p = lpFileName + wcslen(lpFileName); @@ -1320,11 +1320,11 @@ DWORD STDCALL GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longle return 0; } - DPRINT("GetLongPathNameW(%s,%p,%ld)\n", shortpath, longpath, longlen); + TRACE("GetLongPathNameW(%s,%p,%ld)\n", shortpath, longpath, longlen); if (shortpath[0] == '\\' && shortpath[1] == '\\') { - DPRINT1("ERR: UNC pathname %s\n", shortpath); + WARN("ERR: UNC pathname %s\n", shortpath); lstrcpynW( longpath, shortpath, longlen ); return wcslen(longpath); } @@ -1365,7 +1365,7 @@ DWORD STDCALL GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longle goit = FindFirstFileW(tmplongpath, &wfd); if (goit == INVALID_HANDLE_VALUE) { - DPRINT("not found %s!\n", tmplongpath); + TRACE("not found %s!\n", tmplongpath); SetLastError ( ERROR_FILE_NOT_FOUND ); return 0; } @@ -1384,7 +1384,7 @@ DWORD STDCALL GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longle if (tmplen <= longlen) { wcscpy(longpath, tmplongpath); - DPRINT("returning %s\n", longpath); + TRACE("returning %s\n", longpath); tmplen--; /* length without 0 */ } @@ -1402,7 +1402,7 @@ DWORD STDCALL GetLongPathNameA( LPCSTR shortpath, LPSTR longpath, DWORD longlen WCHAR longpathW[MAX_PATH]; DWORD ret; - DPRINT("GetLongPathNameA %s, %i\n",shortpath,longlen ); + TRACE("GetLongPathNameA %s, %i\n",shortpath,longlen ); if (!(shortpathW = FilenameA2W( shortpath, FALSE ))) return 0; diff --git a/reactos/dll/win32/kernel32/file/dosdev.c b/reactos/dll/win32/kernel32/file/dosdev.c index 6d37aabaec4..e3bb754bb1d 100644 --- a/reactos/dll/win32/kernel32/file/dosdev.c +++ b/reactos/dll/win32/kernel32/file/dosdev.c @@ -12,10 +12,9 @@ /* INCLUDES ******************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS *****************************************************************/ @@ -200,7 +199,7 @@ QueryDosDeviceW( &ObjectAttributes); if (!NT_SUCCESS (Status)) { - DPRINT ("NtOpenDirectoryObject() failed (Status %lx)\n", Status); + WARN ("NtOpenDirectoryObject() failed (Status %lx)\n", Status); SetLastErrorByStatus (Status); return 0; } @@ -222,7 +221,7 @@ QueryDosDeviceW( &ObjectAttributes); if (!NT_SUCCESS (Status)) { - DPRINT ("NtOpenSymbolicLinkObject() failed (Status %lx)\n", Status); + WARN ("NtOpenSymbolicLinkObject() failed (Status %lx)\n", Status); NtClose (DirectoryHandle); SetLastErrorByStatus (Status); return 0; @@ -241,14 +240,14 @@ QueryDosDeviceW( NtClose (DirectoryHandle); if (!NT_SUCCESS (Status)) { - DPRINT ("NtQuerySymbolicLinkObject() failed (Status %lx)\n", Status); + WARN ("NtQuerySymbolicLinkObject() failed (Status %lx)\n", Status); SetLastErrorByStatus (Status); return 0; } - DPRINT ("ReturnLength: %lu\n", ReturnLength); - DPRINT ("TargetLength: %hu\n", UnicodeString.Length); - DPRINT ("Target: '%wZ'\n", &UnicodeString); + TRACE ("ReturnLength: %lu\n", ReturnLength); + TRACE ("TargetLength: %hu\n", UnicodeString.Length); + TRACE ("Target: '%wZ'\n", &UnicodeString); Length = ReturnLength / sizeof(WCHAR); if (Length < ucchMax) @@ -259,7 +258,7 @@ QueryDosDeviceW( } else { - DPRINT ("Buffer is too small\n"); + TRACE ("Buffer is too small\n"); SetLastErrorByStatus (STATUS_BUFFER_TOO_SMALL); return 0; } @@ -300,7 +299,7 @@ QueryDosDeviceW( if (!wcscmp (DirInfo->TypeName.Buffer, L"SymbolicLink")) { - DPRINT ("Name: '%wZ'\n", &DirInfo->Name); + TRACE ("Name: '%wZ'\n", &DirInfo->Name); NameLength = DirInfo->Name.Length / sizeof(WCHAR); if (Length + NameLength + 1 >= ucchMax) diff --git a/reactos/dll/win32/kernel32/file/file.c b/reactos/dll/win32/kernel32/file/file.c index 7285e203ad2..50dfeff582e 100644 --- a/reactos/dll/win32/kernel32/file/file.c +++ b/reactos/dll/win32/kernel32/file/file.c @@ -13,10 +13,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* GLOBALS ******************************************************************/ @@ -233,7 +232,7 @@ OpenFile(LPCSTR lpFileName, PWCHAR FilePart; ULONG Len; - DPRINT("OpenFile('%s', lpReOpenBuff %x, uStyle %x)\n", lpFileName, lpReOpenBuff, uStyle); + TRACE("OpenFile('%s', lpReOpenBuff %x, uStyle %x)\n", lpFileName, lpReOpenBuff, uStyle); if (lpReOpenBuff == NULL) { @@ -385,7 +384,7 @@ SetFilePointer(HANDLE hFile, IO_STATUS_BLOCK IoStatusBlock; LARGE_INTEGER Distance; - DPRINT("SetFilePointer(hFile %x, lDistanceToMove %d, dwMoveMethod %d)\n", + TRACE("SetFilePointer(hFile %x, lDistanceToMove %d, dwMoveMethod %d)\n", hFile,lDistanceToMove,dwMoveMethod); if(IsConsoleHandle(hFile)) @@ -861,7 +860,7 @@ GetFileAttributesExW(LPCWSTR lpFileName, NTSTATUS Status; WIN32_FILE_ATTRIBUTE_DATA* FileAttributeData; - DPRINT("GetFileAttributesExW(%S) called\n", lpFileName); + TRACE("GetFileAttributesExW(%S) called\n", lpFileName); if (fInfoLevelId != GetFileExInfoStandard || lpFileInformation == NULL) @@ -876,7 +875,7 @@ GetFileAttributesExW(LPCWSTR lpFileName, NULL, NULL)) { - DPRINT1 ("Invalid path '%S'\n", lpFileName); + WARN ("Invalid path '%S'\n", lpFileName); SetLastError (ERROR_BAD_PATHNAME); return FALSE; } @@ -895,7 +894,7 @@ GetFileAttributesExW(LPCWSTR lpFileName, RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS (Status)) { - DPRINT ("NtQueryFullAttributesFile() failed (Status %lx)\n", Status); + WARN ("NtQueryFullAttributesFile() failed (Status %lx)\n", Status); SetLastErrorByStatus (Status); return FALSE; } @@ -959,7 +958,7 @@ GetFileAttributesW(LPCWSTR lpFileName) WIN32_FILE_ATTRIBUTE_DATA FileAttributeData; BOOL Result; - DPRINT ("GetFileAttributeW(%S) called\n", lpFileName); + TRACE ("GetFileAttributeW(%S) called\n", lpFileName); Result = GetFileAttributesExW(lpFileName, GetFileExInfoStandard, &FileAttributeData); @@ -1080,7 +1079,7 @@ SetFileAttributesW(LPCWSTR lpFileName, HANDLE FileHandle; NTSTATUS Status; - DPRINT ("SetFileAttributeW(%S, 0x%lx) called\n", lpFileName, dwFileAttributes); + TRACE ("SetFileAttributeW(%S, 0x%lx) called\n", lpFileName, dwFileAttributes); /* Validate and translate the filename */ if (!RtlDosPathNameToNtPathName_U (lpFileName, @@ -1088,11 +1087,11 @@ SetFileAttributesW(LPCWSTR lpFileName, NULL, NULL)) { - DPRINT ("Invalid path\n"); + WARN ("Invalid path\n"); SetLastError (ERROR_BAD_PATHNAME); return FALSE; } - DPRINT ("FileName: \'%wZ\'\n", &FileName); + TRACE ("FileName: \'%wZ\'\n", &FileName); /* build the object attributes */ InitializeObjectAttributes (&ObjectAttributes, @@ -1111,7 +1110,7 @@ SetFileAttributesW(LPCWSTR lpFileName, RtlFreeUnicodeString (&FileName); if (!NT_SUCCESS (Status)) { - DPRINT ("NtOpenFile() failed (Status %lx)\n", Status); + WARN ("NtOpenFile() failed (Status %lx)\n", Status); SetLastErrorByStatus (Status); return FALSE; } @@ -1123,7 +1122,7 @@ SetFileAttributesW(LPCWSTR lpFileName, FileBasicInformation); if (!NT_SUCCESS(Status)) { - DPRINT ("SetFileAttributes NtQueryInformationFile failed with status 0x%08x\n", Status); + WARN ("SetFileAttributes NtQueryInformationFile failed with status 0x%08x\n", Status); NtClose (FileHandle); SetLastErrorByStatus (Status); return FALSE; @@ -1138,7 +1137,7 @@ SetFileAttributesW(LPCWSTR lpFileName, NtClose (FileHandle); if (!NT_SUCCESS(Status)) { - DPRINT ("SetFileAttributes NtSetInformationFile failed with status 0x%08x\n", Status); + WARN ("SetFileAttributes NtSetInformationFile failed with status 0x%08x\n", Status); SetLastErrorByStatus (Status); return FALSE; } @@ -1216,7 +1215,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); if (handle != INVALID_HANDLE_VALUE) { /* We created it */ - DPRINT("created %S\n", buffer); + TRACE("created %S\n", buffer); CloseHandle( handle ); break; } @@ -1227,7 +1226,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR } while (unique != num); } - DPRINT("returning %S\n", buffer); + TRACE("returning %S\n", buffer); return unique; } diff --git a/reactos/dll/win32/kernel32/file/find.c b/reactos/dll/win32/kernel32/file/find.c index d331e8d603b..a2597c273a4 100644 --- a/reactos/dll/win32/kernel32/file/find.c +++ b/reactos/dll/win32/kernel32/file/find.c @@ -12,10 +12,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* TYPES ********************************************************************/ @@ -166,7 +165,7 @@ InternalCopyFindDataA(LPWIN32_FIND_DATAA lpFindFileData, FileNameA.Buffer[FileNameA.Length] = 0; - DPRINT("lpFileInfo->ShortNameLength %d\n", lpFileInfo->ShortNameLength); + TRACE("lpFileInfo->ShortNameLength %d\n", lpFileInfo->ShortNameLength); FileNameU.Length = FileNameU.MaximumLength = lpFileInfo->ShortNameLength; FileNameU.Buffer = lpFileInfo->ShortName; @@ -202,7 +201,7 @@ InternalFindNextFile ( PFILE_BOTH_DIR_INFORMATION Buffer, FoundFile = NULL; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("InternalFindNextFile(%lx, %wZ)\n", hFindFile, SearchPattern); + TRACE("InternalFindNextFile(%lx, %wZ)\n", hFindFile, SearchPattern); if (hFindFile != FIND_DEVICE_HANDLE) { @@ -356,7 +355,7 @@ InternalFindFirstFile ( ULONG DeviceNameInfo; HANDLE hDirectory = NULL; - DPRINT("FindFirstFileW(lpFileName %S)\n", + TRACE("FindFirstFileW(lpFileName %S)\n", lpFileName); RtlZeroMemory(&PathFileName, @@ -422,10 +421,10 @@ InternalFindFirstFile ( RemovedLastChar = TRUE; } - DPRINT("lpFileName: \"%ws\"\n", lpFileName); - DPRINT("NtPathU: \"%wZ\"\n", &NtPathU); - DPRINT("PathFileName: \"%wZ\"\n", &PathFileName); - DPRINT("RelativeTo: 0x%p\n", DirInfo.Handle); + TRACE("lpFileName: \"%ws\"\n", lpFileName); + TRACE("NtPathU: \"%wZ\"\n", &NtPathU); + TRACE("PathFileName: \"%wZ\"\n", &PathFileName); + TRACE("RelativeTo: 0x%p\n", DirInfo.Handle); InitializeObjectAttributes (&ObjectAttributes, &NtPathU, @@ -597,7 +596,7 @@ FindClose ( { PKERNEL32_FIND_DATA_HEADER IHeader; - DPRINT("FindClose(hFindFile %x)\n",hFindFile); + TRACE("FindClose(hFindFile %x)\n",hFindFile); if (hFindFile == FIND_DEVICE_HANDLE) return TRUE; diff --git a/reactos/dll/win32/kernel32/file/hardlink.c b/reactos/dll/win32/kernel32/file/hardlink.c index 4a0f82dedfe..0159720bcc4 100644 --- a/reactos/dll/win32/kernel32/file/hardlink.c +++ b/reactos/dll/win32/kernel32/file/hardlink.c @@ -12,10 +12,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -46,7 +45,7 @@ CreateHardLinkW(LPCWSTR lpFileName, if(RtlDetermineDosPathNameType_U((LPWSTR)lpFileName) == 1 || RtlDetermineDosPathNameType_U((LPWSTR)lpExistingFileName) == 1) { - DPRINT1("CreateHardLinkW() cannot handle UNC Paths!\n"); + WARN("CreateHardLinkW() cannot handle UNC Paths!\n"); SetLastError(ERROR_INVALID_NAME); return FALSE; } @@ -144,13 +143,13 @@ CreateHardLinkW(LPCWSTR lpFileName, } else { - DPRINT1("Unable to open link destination \"%wZ\"!\n", &LinkTarget); + WARN("Unable to open link destination \"%wZ\"!\n", &LinkTarget); SetLastErrorByStatus(Status); } } else { - DPRINT1("Path \"%wZ\" must not be a mapped drive!\n", &LinkDrive); + WARN("Path \"%wZ\" must not be a mapped drive!\n", &LinkDrive); SetLastError(ERROR_INVALID_NAME); } diff --git a/reactos/dll/win32/kernel32/file/iocompl.c b/reactos/dll/win32/kernel32/file/iocompl.c index 87fbc9e9ef0..0477f7137e7 100644 --- a/reactos/dll/win32/kernel32/file/iocompl.c +++ b/reactos/dll/win32/kernel32/file/iocompl.c @@ -10,10 +10,9 @@ */ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* * @implemented diff --git a/reactos/dll/win32/kernel32/file/lfile.c b/reactos/dll/win32/kernel32/file/lfile.c index 2f93f79cdab..d24e2706bd2 100644 --- a/reactos/dll/win32/kernel32/file/lfile.c +++ b/reactos/dll/win32/kernel32/file/lfile.c @@ -10,10 +10,9 @@ */ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* * @implemented diff --git a/reactos/dll/win32/kernel32/file/lock.c b/reactos/dll/win32/kernel32/file/lock.c index 8dc5f72c23c..8e129949739 100644 --- a/reactos/dll/win32/kernel32/file/lock.c +++ b/reactos/dll/win32/kernel32/file/lock.c @@ -14,10 +14,9 @@ /* INCLUDES ****************************************************************/ #include - #include -WINE_DEFAULT_DEBUG_CHANNEL(kernel32); +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/mailslot.c b/reactos/dll/win32/kernel32/file/mailslot.c index 2cad61d0743..1cc68d24f18 100644 --- a/reactos/dll/win32/kernel32/file/mailslot.c +++ b/reactos/dll/win32/kernel32/file/mailslot.c @@ -11,9 +11,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -73,7 +73,7 @@ CreateMailslotW(LPCWSTR lpName, return(INVALID_HANDLE_VALUE); } - DPRINT("Mailslot name: %wZ\n", &MailslotName); + TRACE("Mailslot name: %wZ\n", &MailslotName); if(lpSecurityAttributes) { @@ -115,7 +115,7 @@ CreateMailslotW(LPCWSTR lpName, if (!NT_SUCCESS(Status)) { - DPRINT("NtCreateMailslot failed (Status %x)!\n", Status); + WARN("NtCreateMailslot failed (Status %x)!\n", Status); SetLastErrorByStatus (Status); return(INVALID_HANDLE_VALUE); } @@ -145,7 +145,7 @@ GetMailslotInfo(HANDLE hMailslot, FileMailslotQueryInformation); if (!NT_SUCCESS(Status)) { - DPRINT("NtQueryInformationFile failed (Status %x)!\n", Status); + WARN("NtQueryInformationFile failed (Status %x)!\n", Status); SetLastErrorByStatus (Status); return(FALSE); } @@ -207,7 +207,7 @@ SetMailslotInfo(HANDLE hMailslot, FileMailslotSetInformation); if (!NT_SUCCESS(Status)) { - DPRINT("NtSetInformationFile failed (Status %x)!\n", Status); + WARN("NtSetInformationFile failed (Status %x)!\n", Status); SetLastErrorByStatus (Status); return(FALSE); } diff --git a/reactos/dll/win32/kernel32/file/move.c b/reactos/dll/win32/kernel32/file/move.c index b1ff047e6da..53fac2006d5 100644 --- a/reactos/dll/win32/kernel32/file/move.c +++ b/reactos/dll/win32/kernel32/file/move.c @@ -17,9 +17,9 @@ #include #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* GLOBALS *****************************************************************/ @@ -92,7 +92,7 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) WCHAR *p; NTSTATUS Status; - DPRINT("add_boot_rename_entry( %S, %S, %d ) \n", source, dest, flags); + TRACE("add_boot_rename_entry( %S, %S, %d ) \n", source, dest, flags); if(dest) DestLen = wcslen(dest); @@ -138,7 +138,7 @@ static BOOL add_boot_rename_entry( LPCWSTR source, LPCWSTR dest, DWORD flags ) if (!NT_SUCCESS(Status)) { - DPRINT("NtCreateKey() failed (Status 0x%lx)\n", Status); + WARN("NtCreateKey() failed (Status 0x%lx)\n", Status); if (source_name.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, source_name.Buffer); if (dest_name.Buffer) @@ -243,7 +243,7 @@ MoveFileWithProgressW ( UNICODE_STRING DstPathU; BOOL folder = FALSE; - DPRINT("MoveFileWithProgressW()\n"); + TRACE("MoveFileWithProgressW()\n"); if (dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT) return add_boot_rename_entry( lpExistingFileName, lpNewFileName, dwFlags ); @@ -268,7 +268,7 @@ MoveFileWithProgressW ( NULL, NULL)) { - DPRINT("Invalid destination path\n"); + WARN("Invalid destination path\n"); CloseHandle(hFile); SetLastError(ERROR_PATH_NOT_FOUND); return FALSE; @@ -419,7 +419,7 @@ MoveFileWithProgressW ( FindClose(hFile); /* delete folder */ - DPRINT("MoveFileWithProgressW : Delete folder : %S\n",lpDeleteFile); + TRACE("MoveFileWithProgressW : Delete folder : %S\n",lpDeleteFile); /* remove system folder flag other wise we can not delete the folder */ Attributes = GetFileAttributesW(lpExistingFileName2); @@ -577,7 +577,7 @@ MoveFileWithProgressW ( /* copy file */ - DPRINT("MoveFileWithProgressW : Copy file : %S to %S\n",lpDeleteFile, lpNewFileName2); + TRACE("MoveFileWithProgressW : Copy file : %S to %S\n",lpDeleteFile, lpNewFileName2); RemoveReadOnlyAttributeW(lpDeleteFile); RemoveReadOnlyAttributeW(lpNewFileName2); @@ -592,12 +592,12 @@ MoveFileWithProgressW ( break; /* delete file */ - DPRINT("MoveFileWithProgressW : remove readonly flag from file : %S\n",lpNewFileName2); + TRACE("MoveFileWithProgressW : remove readonly flag from file : %S\n",lpNewFileName2); Result = RemoveReadOnlyAttributeW(lpDeleteFile); if (Result == FALSE) break; - DPRINT("MoveFileWithProgressW : Delete file : %S\n",lpDeleteFile); + TRACE("MoveFileWithProgressW : Delete file : %S\n",lpDeleteFile); Result = DeleteFileW(lpDeleteFile); if (Result == FALSE) break; diff --git a/reactos/dll/win32/kernel32/file/npipe.c b/reactos/dll/win32/kernel32/file/npipe.c index 93ab997ad01..aea91ae30a4 100644 --- a/reactos/dll/win32/kernel32/file/npipe.c +++ b/reactos/dll/win32/kernel32/file/npipe.c @@ -10,10 +10,11 @@ /* INCLUDES *****************************************************************/ #include +#include + +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); -#define NDEBUG //#define USING_PROPER_NPFS_WAIT_SEMANTICS -#include /* FUNCTIONS ****************************************************************/ @@ -103,8 +104,8 @@ CreateNamedPipeW(LPCWSTR lpName, return INVALID_HANDLE_VALUE; } - DPRINT("Pipe name: %wZ\n", &NamedPipeName); - DPRINT("Pipe name: %S\n", NamedPipeName.Buffer); + TRACE("Pipe name: %wZ\n", &NamedPipeName); + TRACE("Pipe name: %S\n", NamedPipeName.Buffer); /* Always case insensitive, check if we got extra attributes */ Attributes = OBJ_CASE_INSENSITIVE; @@ -228,7 +229,7 @@ CreateNamedPipeW(LPCWSTR lpName, if (!NT_SUCCESS(Status)) { /* Failed to create it */ - DPRINT1("NtCreateNamedPipe failed (Status %x)!\n", Status); + WARN("NtCreateNamedPipe failed (Status %x)!\n", Status); SetLastErrorByStatus (Status); return INVALID_HANDLE_VALUE; } @@ -294,7 +295,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, PFILE_PIPE_WAIT_FOR_BUFFER WaitPipeInfo; /* Start by making a unicode string of the name */ - DPRINT("Sent path: %S\n", lpNamedPipeName); + TRACE("Sent path: %S\n", lpNamedPipeName); RtlCreateUnicodeString(&NamedPipeName, lpNamedPipeName); NameLength = NamedPipeName.Length / sizeof(WCHAR); @@ -321,7 +322,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, NewName.Length -= 9 * sizeof(WCHAR); /* Initialize the Dos Devices name */ - DPRINT("NewName: %wZ\n", &NewName); + TRACE("NewName: %wZ\n", &NewName); RtlInitUnicodeString(&DevicePath, L"\\DosDevices\\pipe\\"); } else if (Type == RtlPathTypeRootLocalDevice) @@ -348,7 +349,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, else { /* The name is invalid */ - DPRINT1("Invalid name!\n"); + WARN("Invalid name!\n"); SetLastErrorByStatus(STATUS_OBJECT_PATH_SYNTAX_BAD); return FALSE; } @@ -357,7 +358,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, } else { - DPRINT1("Invalid path type\n"); + WARN("Invalid path type\n"); SetLastErrorByStatus(STATUS_OBJECT_PATH_SYNTAX_BAD); return FALSE; } @@ -373,7 +374,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, } /* Initialize the object attributes */ - DPRINT("Opening: %wZ\n", &DevicePath); + TRACE("Opening: %wZ\n", &DevicePath); InitializeObjectAttributes(&ObjectAttributes, &DevicePath, OBJ_CASE_INSENSITIVE, @@ -390,7 +391,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, if (!NT_SUCCESS(Status)) { /* Fail; couldn't open */ - DPRINT1("Status: %lx\n", Status); + WARN("Status: %lx\n", Status); SetLastErrorByStatus(Status); RtlFreeUnicodeString(&NamedPipeName); RtlFreeHeap(RtlGetProcessHeap(), 0, WaitPipeInfo); @@ -449,7 +450,7 @@ WaitNamedPipeW(LPCWSTR lpNamedPipeName, if (!NT_SUCCESS(Status)) { /* Failure to wait on the pipe */ - DPRINT1("Status: %lx\n", Status); + WARN("Status: %lx\n", Status); SetLastErrorByStatus (Status); return FALSE; } diff --git a/reactos/dll/win32/kernel32/file/pipe.c b/reactos/dll/win32/kernel32/file/pipe.c index c6254501ec1..a44f2c42681 100644 --- a/reactos/dll/win32/kernel32/file/pipe.c +++ b/reactos/dll/win32/kernel32/file/pipe.c @@ -11,9 +11,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* GLOBALS ******************************************************************/ @@ -97,7 +97,7 @@ CreatePipe(PHANDLE hReadPipe, if (!NT_SUCCESS(Status)) { /* Convert error and fail */ - DPRINT1("Status: %lx\n", Status); + WARN("Status: %lx\n", Status); SetLastErrorByStatus(Status); return FALSE; } @@ -112,7 +112,7 @@ CreatePipe(PHANDLE hReadPipe, if (!NT_SUCCESS(Status)) { /* Convert error and fail */ - DPRINT1("Status: %lx\n", Status); + WARN("Status: %lx\n", Status); NtClose(ReadPipeHandle); SetLastErrorByStatus(Status); return FALSE; diff --git a/reactos/dll/win32/kernel32/file/rw.c b/reactos/dll/win32/kernel32/file/rw.c index 91bed98e1ba..f570e571614 100644 --- a/reactos/dll/win32/kernel32/file/rw.c +++ b/reactos/dll/win32/kernel32/file/rw.c @@ -12,10 +12,9 @@ /* INCLUDES ****************************************************************/ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ @@ -31,7 +30,7 @@ WriteFile(IN HANDLE hFile, { NTSTATUS Status; - DPRINT("WriteFile(hFile %x)\n", hFile); + TRACE("WriteFile(hFile %x)\n", hFile); if (lpNumberOfBytesWritten != NULL) { @@ -119,7 +118,7 @@ WriteFile(IN HANDLE hFile, } } - DPRINT("WriteFile() succeeded\n"); + TRACE("WriteFile() succeeded\n"); return TRUE; } @@ -136,7 +135,7 @@ ReadFile(IN HANDLE hFile, { NTSTATUS Status; - DPRINT("ReadFile(hFile %x)\n", hFile); + TRACE("ReadFile(hFile %x)\n", hFile); if (lpNumberOfBytesRead != NULL) { @@ -239,7 +238,7 @@ ReadFile(IN HANDLE hFile, } } - DPRINT("ReadFile() succeeded\n"); + TRACE("ReadFile() succeeded\n"); return TRUE; } diff --git a/reactos/dll/win32/kernel32/file/tape.c b/reactos/dll/win32/kernel32/file/tape.c index 90b7461a91c..2b248ffbda0 100644 --- a/reactos/dll/win32/kernel32/file/tape.c +++ b/reactos/dll/win32/kernel32/file/tape.c @@ -12,9 +12,9 @@ /* INCLUDES *****************************************************************/ #include +#include -#define NDEBUG -#include +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); /* FUNCTIONS ****************************************************************/ diff --git a/reactos/dll/win32/kernel32/file/volume.c b/reactos/dll/win32/kernel32/file/volume.c index 4966ac2f1de..433491e97c5 100644 --- a/reactos/dll/win32/kernel32/file/volume.c +++ b/reactos/dll/win32/kernel32/file/volume.c @@ -20,10 +20,9 @@ */ #include +#include -#define NDEBUG -#include - +WINE_DEFAULT_DEBUG_CHANNEL(kernel32file); #define MAX_DOS_DRIVES 26 @@ -43,7 +42,7 @@ InternalOpenDirW(LPCWSTR DirName, NULL, NULL)) { - DPRINT("Invalid path\n"); + WARN("Invalid path\n"); SetLastError(ERROR_BAD_PATHNAME); return INVALID_HANDLE_VALUE; } @@ -474,7 +473,7 @@ GetDriveTypeW(LPCWSTR lpRootPathName) return DRIVE_FIXED; } - DPRINT1("Returning DRIVE_UNKNOWN for device type %d\n", FileFsDevice.DeviceType); + ERR("Returning DRIVE_UNKNOWN for device type %d\n", FileFsDevice.DeviceType); return DRIVE_UNKNOWN; } @@ -646,8 +645,8 @@ GetVolumeInformationW( FileFsVolume = (PFILE_FS_VOLUME_INFORMATION)Buffer; FileFsAttribute = (PFILE_FS_ATTRIBUTE_INFORMATION)Buffer; - DPRINT("FileFsVolume %p\n", FileFsVolume); - DPRINT("FileFsAttribute %p\n", FileFsAttribute); + TRACE("FileFsVolume %p\n", FileFsVolume); + TRACE("FileFsAttribute %p\n", FileFsAttribute); if (!lpRootPathName || !wcscmp(lpRootPathName, L"")) { @@ -665,7 +664,7 @@ GetVolumeInformationW( return FALSE; } - DPRINT("hFile: %x\n", hFile); + TRACE("hFile: %x\n", hFile); errCode = NtQueryVolumeInformationFile(hFile, &IoStatusBlock, FileFsVolume, @@ -673,7 +672,7 @@ GetVolumeInformationW( FileFsVolumeInformation); if ( !NT_SUCCESS(errCode) ) { - DPRINT("Status: %x\n", errCode); + WARN("Status: %x\n", errCode); CloseHandle(hFile); SetLastErrorByStatus (errCode); return FALSE; @@ -707,7 +706,7 @@ GetVolumeInformationW( CloseHandle(hFile); if (!NT_SUCCESS(errCode)) { - DPRINT("Status: %x\n", errCode); + WARN("Status: %x\n", errCode); SetLastErrorByStatus (errCode); return FALSE; } @@ -824,7 +823,7 @@ SetVolumeLabelW( if (!NT_SUCCESS(Status)) { - DPRINT("Status: %x\n", Status); + WARN("Status: %x\n", Status); CloseHandle(hFile); SetLastErrorByStatus(Status); return FALSE;