[ros-diffs] [hpoussin] 33469: Use dynamic debug system
hpoussin at svn.reactos.org
hpoussin at svn.reactos.org
Mon May 12 14:01:52 CEST 2008
Author: hpoussin
Date: Mon May 12 07:01:51 2008
New Revision: 33469
URL: http://svn.reactos.org/svn/reactos?rev=33469&view=rev
Log:
Use dynamic debug system
Modified:
trunk/reactos/dll/win32/kernel32/file/backup.c
trunk/reactos/dll/win32/kernel32/file/bintype.c
trunk/reactos/dll/win32/kernel32/file/cnotify.c
trunk/reactos/dll/win32/kernel32/file/copy.c
trunk/reactos/dll/win32/kernel32/file/create.c
trunk/reactos/dll/win32/kernel32/file/curdir.c
trunk/reactos/dll/win32/kernel32/file/delete.c
trunk/reactos/dll/win32/kernel32/file/deviceio.c
trunk/reactos/dll/win32/kernel32/file/dir.c
trunk/reactos/dll/win32/kernel32/file/dosdev.c
trunk/reactos/dll/win32/kernel32/file/file.c
trunk/reactos/dll/win32/kernel32/file/find.c
trunk/reactos/dll/win32/kernel32/file/hardlink.c
trunk/reactos/dll/win32/kernel32/file/iocompl.c
trunk/reactos/dll/win32/kernel32/file/lfile.c
trunk/reactos/dll/win32/kernel32/file/lock.c
trunk/reactos/dll/win32/kernel32/file/mailslot.c
trunk/reactos/dll/win32/kernel32/file/move.c
trunk/reactos/dll/win32/kernel32/file/npipe.c
trunk/reactos/dll/win32/kernel32/file/pipe.c
trunk/reactos/dll/win32/kernel32/file/rw.c
trunk/reactos/dll/win32/kernel32/file/tape.c
trunk/reactos/dll/win32/kernel32/file/volume.c
Modified: trunk/reactos/dll/win32/kernel32/file/backup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/backup.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/backup.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/backup.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -11,9 +11,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
+#include <wine/debug.h>
-#define NDEBUG
-#include <debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/dll/win32/kernel32/file/bintype.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/bintype.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/bintype.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -13,9 +13,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
@@ -68,7 +68,7 @@
}
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 @@
}
}
- DPRINT1("Invalid binary type returned!\n", BinType);
+ ERR("Invalid binary type returned!\n", BinType);
return FALSE;
}
Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cnotify.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -10,9 +10,9 @@
*/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/*
* @implemented
Modified: trunk/reactos/dll/win32/kernel32/file/copy.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/copy.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/copy.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -13,10 +13,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
@@ -72,11 +71,11 @@
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 @@
}
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 @@
}
else
{
- DPRINT("Error 0x%08x reading from source\n", errCode);
+ WARN("Error 0x%08x reading from source\n", errCode);
}
}
}
@@ -137,7 +136,7 @@
if (! EndOfFileFound && (NULL != pbCancel && *pbCancel))
{
- DPRINT("User requested cancel\n");
+ TRACE("User requested cancel\n");
errCode = STATUS_REQUEST_ABORTED;
}
@@ -148,7 +147,7 @@
}
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 @@
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 @@
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 @@
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 @@
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 @@
}
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 @@
}
else
{
- DPRINT("Error %d during opening of source file\n", GetLastError());
+ WARN("Error %d during opening of source file\n", GetLastError());
}
return RC;
Modified: trunk/reactos/dll/win32/kernel32/file/create.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/create.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/create.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -15,10 +15,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define SYMLINK_FLAG_RELATIVE 1
@@ -66,7 +65,7 @@
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 @@
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 @@
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)
{
Modified: trunk/reactos/dll/win32/kernel32/file/curdir.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/curdir.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/curdir.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -17,10 +17,9 @@
/* INCLUDES ******************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* GLOBAL VARIABLES **********************************************************/
@@ -90,7 +89,7 @@
{
PWCHAR PathNameW;
- DPRINT("setcurrdir: %s\n",lpPathName);
+ TRACE("setcurrdir: %s\n",lpPathName);
if (!(PathNameW = FilenameA2W(lpPathName, FALSE)))
return FALSE;
@@ -171,7 +170,7 @@
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 @@
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 @@
)
{
#ifdef _WIN64
- DPRINT1("GetSystemWow64DirectoryW is UNIMPLEMENTED!\n");
+ ERR("GetSystemWow64DirectoryW is UNIMPLEMENTED!\n");
return 0;
#else
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
Modified: trunk/reactos/dll/win32/kernel32/file/delete.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/delete.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/delete.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/delete.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -12,10 +12,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
+#include <wine/debug.h>
-#define NDEBUG
-#include <debug.h>
-
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
@@ -53,7 +52,7 @@
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 @@
return FALSE;
}
- DPRINT("NtPathU \'%wZ\'\n", &NtPathU);
+ TRACE("NtPathU \'%wZ\'\n", &NtPathU);
InitializeObjectAttributes(&ObjectAttributes,
&NtPathU,
@@ -90,7 +89,7 @@
if (!NT_SUCCESS(Status))
{
- CHECKPOINT;
+ WARN("Status 0x%08x\n", Status);
SetLastErrorByStatus (Status);
return FALSE;
}
@@ -104,7 +103,7 @@
FileDispositionInformation);
if (!NT_SUCCESS(Status))
{
- CHECKPOINT;
+ WARN("Status 0x%08x\n", Status);
NtClose (FileHandle);
SetLastErrorByStatus (Status);
return FALSE;
@@ -113,7 +112,7 @@
Status = NtClose (FileHandle);
if (!NT_SUCCESS (Status))
{
- CHECKPOINT;
+ WARN("Status 0x%08x\n", Status);
SetLastErrorByStatus (Status);
return FALSE;
}
Modified: trunk/reactos/dll/win32/kernel32/file/deviceio.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/deviceio.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/deviceio.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -10,10 +10,9 @@
*/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/*
* @implemented
@@ -179,7 +178,7 @@
if (WaitStatus == WAIT_FAILED)
{
- DPRINT("Wait failed!\n");
+ WARN("Wait failed!\n");
/* WaitForSingleObjectEx sets the last error */
return FALSE;
}
Modified: trunk/reactos/dll/win32/kernel32/file/dir.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/dir.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -16,9 +16,9 @@
/* INCLUDES ******************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
UNICODE_STRING DllDirectory = {0, 0, NULL};
@@ -97,7 +97,7 @@
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 @@
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 @@
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 @@
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 @@
&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 @@
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 @@
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 @@
(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 @@
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 @@
{
PWCHAR PathNameW;
- DPRINT("RemoveDirectoryA(%s)\n",lpPathName);
+ TRACE("RemoveDirectoryA(%s)\n",lpPathName);
if (!(PathNameW = FilenameA2W(lpPathName, FALSE)))
return FALSE;
@@ -526,7 +526,7 @@
HANDLE DirectoryHandle = NULL;
NTSTATUS Status;
- DPRINT("lpPathName %S\n", lpPathName);
+ TRACE("lpPathName %S\n", lpPathName);
if (!RtlDosPathNameToNtPathName_U (lpPathName,
&NtPathU,
@@ -540,7 +540,7 @@
NULL,
NULL);
- DPRINT("NtPathU '%S'\n", NtPathU.Buffer);
+ TRACE("NtPathU '%S'\n", NtPathU.Buffer);
Status = NtCreateFile (&DirectoryHandle,
DELETE,
@@ -560,7 +560,7 @@
if (!NT_SUCCESS(Status))
{
- CHECKPOINT;
+ WARN("Status 0x%08x\n", Status);
SetLastErrorByStatus (Status);
return FALSE;
}
@@ -601,7 +601,7 @@
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 @@
*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 @@
{
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 @@
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 @@
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 @@
LPCWSTR p;
PWCHAR Name;
- DPRINT("SearchPath\n");
+ TRACE("SearchPath\n");
HasExtension = FALSE;
p = lpFileName + wcslen(lpFileName);
@@ -1320,11 +1320,11 @@
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 @@
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 @@
if (tmplen <= longlen)
{
wcscpy(longpath, tmplongpath);
- DPRINT("returning %s\n", longpath);
+ TRACE("returning %s\n", longpath);
tmplen--; /* length without 0 */
}
@@ -1402,7 +1402,7 @@
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;
Modified: trunk/reactos/dll/win32/kernel32/file/dosdev.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/dosdev.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/dosdev.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/dosdev.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -12,10 +12,9 @@
/* INCLUDES ******************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS *****************************************************************/
@@ -200,7 +199,7 @@
&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 @@
&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 @@
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 @@
}
else
{
- DPRINT ("Buffer is too small\n");
+ TRACE ("Buffer is too small\n");
SetLastErrorByStatus (STATUS_BUFFER_TOO_SMALL);
return 0;
}
@@ -300,7 +299,7 @@
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)
Modified: trunk/reactos/dll/win32/kernel32/file/file.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/file.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -13,10 +13,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* GLOBALS ******************************************************************/
@@ -233,7 +232,7 @@
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 @@
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 @@
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 @@
NULL,
NULL))
{
- DPRINT1 ("Invalid path '%S'\n", lpFileName);
+ WARN ("Invalid path '%S'\n", lpFileName);
SetLastError (ERROR_BAD_PATHNAME);
return FALSE;
}
@@ -895,7 +894,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
} while (unique != num);
}
- DPRINT("returning %S\n", buffer);
+ TRACE("returning %S\n", buffer);
return unique;
}
Modified: trunk/reactos/dll/win32/kernel32/file/find.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/find.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/find.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -12,10 +12,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* TYPES ********************************************************************/
@@ -166,7 +165,7 @@
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 @@
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 @@
ULONG DeviceNameInfo;
HANDLE hDirectory = NULL;
- DPRINT("FindFirstFileW(lpFileName %S)\n",
+ TRACE("FindFirstFileW(lpFileName %S)\n",
lpFileName);
RtlZeroMemory(&PathFileName,
@@ -422,10 +421,10 @@
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 @@
{
PKERNEL32_FIND_DATA_HEADER IHeader;
- DPRINT("FindClose(hFindFile %x)\n",hFindFile);
+ TRACE("FindClose(hFindFile %x)\n",hFindFile);
if (hFindFile == FIND_DEVICE_HANDLE)
return TRUE;
Modified: trunk/reactos/dll/win32/kernel32/file/hardlink.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/hardlink.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/hardlink.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/hardlink.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -12,10 +12,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
@@ -46,7 +45,7 @@
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 @@
}
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);
}
Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/iocompl.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/iocompl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/iocompl.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -10,10 +10,9 @@
*/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/*
* @implemented
Modified: trunk/reactos/dll/win32/kernel32/file/lfile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lfile.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/lfile.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/lfile.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -10,10 +10,9 @@
*/
#include <k32.h>
+#include <wine/debug.h>
-#define NDEBUG
-#include <debug.h>
-
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/*
* @implemented
Modified: trunk/reactos/dll/win32/kernel32/file/lock.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lock.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/lock.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/lock.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -14,10 +14,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
-
#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32);
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/dll/win32/kernel32/file/mailslot.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mailslot.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/mailslot.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -11,9 +11,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
@@ -73,7 +73,7 @@
return(INVALID_HANDLE_VALUE);
}
- DPRINT("Mailslot name: %wZ\n", &MailslotName);
+ TRACE("Mailslot name: %wZ\n", &MailslotName);
if(lpSecurityAttributes)
{
@@ -115,7 +115,7 @@
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 @@
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 @@
FileMailslotSetInformation);
if (!NT_SUCCESS(Status))
{
- DPRINT("NtSetInformationFile failed (Status %x)!\n", Status);
+ WARN("NtSetInformationFile failed (Status %x)!\n", Status);
SetLastErrorByStatus (Status);
return(FALSE);
}
Modified: trunk/reactos/dll/win32/kernel32/file/move.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/move.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -17,9 +17,9 @@
#include <k32.h>
#include <malloc.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* GLOBALS *****************************************************************/
@@ -92,7 +92,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
/* 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 @@
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;
Modified: trunk/reactos/dll/win32/kernel32/file/npipe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/npipe.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/npipe.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -10,10 +10,11 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
+
//#define USING_PROPER_NPFS_WAIT_SEMANTICS
-#include <debug.h>
/* FUNCTIONS ****************************************************************/
@@ -103,8 +104,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
else
{
- DPRINT1("Invalid path type\n");
+ WARN("Invalid path type\n");
SetLastErrorByStatus(STATUS_OBJECT_PATH_SYNTAX_BAD);
return FALSE;
}
@@ -373,7 +374,7 @@
}
/* Initialize the object attributes */
- DPRINT("Opening: %wZ\n", &DevicePath);
+ TRACE("Opening: %wZ\n", &DevicePath);
InitializeObjectAttributes(&ObjectAttributes,
&DevicePath,
OBJ_CASE_INSENSITIVE,
@@ -390,7 +391,7 @@
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 @@
if (!NT_SUCCESS(Status))
{
/* Failure to wait on the pipe */
- DPRINT1("Status: %lx\n", Status);
+ WARN("Status: %lx\n", Status);
SetLastErrorByStatus (Status);
return FALSE;
}
Modified: trunk/reactos/dll/win32/kernel32/file/pipe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/pipe.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/pipe.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -11,9 +11,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
+#include <wine/debug.h>
-#define NDEBUG
-#include <debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* GLOBALS ******************************************************************/
@@ -97,7 +97,7 @@
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 @@
if (!NT_SUCCESS(Status))
{
/* Convert error and fail */
- DPRINT1("Status: %lx\n", Status);
+ WARN("Status: %lx\n", Status);
NtClose(ReadPipeHandle);
SetLastErrorByStatus(Status);
return FALSE;
Modified: trunk/reactos/dll/win32/kernel32/file/rw.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/rw.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/rw.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -12,10 +12,9 @@
/* INCLUDES ****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
@@ -31,7 +30,7 @@
{
NTSTATUS Status;
- DPRINT("WriteFile(hFile %x)\n", hFile);
+ TRACE("WriteFile(hFile %x)\n", hFile);
if (lpNumberOfBytesWritten != NULL)
{
@@ -119,7 +118,7 @@
}
}
- DPRINT("WriteFile() succeeded\n");
+ TRACE("WriteFile() succeeded\n");
return TRUE;
}
@@ -136,7 +135,7 @@
{
NTSTATUS Status;
- DPRINT("ReadFile(hFile %x)\n", hFile);
+ TRACE("ReadFile(hFile %x)\n", hFile);
if (lpNumberOfBytesRead != NULL)
{
@@ -239,7 +238,7 @@
}
}
- DPRINT("ReadFile() succeeded\n");
+ TRACE("ReadFile() succeeded\n");
return TRUE;
}
Modified: trunk/reactos/dll/win32/kernel32/file/tape.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/tape.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/tape.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/tape.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -12,9 +12,9 @@
/* INCLUDES *****************************************************************/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
/* FUNCTIONS ****************************************************************/
Modified: trunk/reactos/dll/win32/kernel32/file/volume.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/volume.c?rev=33469&r1=33468&r2=33469&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/file/volume.c [iso-8859-1] Mon May 12 07:01:51 2008
@@ -20,10 +20,9 @@
*/
#include <k32.h>
-
-#define NDEBUG
-#include <debug.h>
-
+#include <wine/debug.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
#define MAX_DOS_DRIVES 26
@@ -43,7 +42,7 @@
NULL,
NULL))
{
- DPRINT("Invalid path\n");
+ WARN("Invalid path\n");
SetLastError(ERROR_BAD_PATHNAME);
return INVALID_HANDLE_VALUE;
}
@@ -474,7 +473,7 @@
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 @@
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 @@
return FALSE;
}
- DPRINT("hFile: %x\n", hFile);
+ TRACE("hFile: %x\n", hFile);
errCode = NtQueryVolumeInformationFile(hFile,
&IoStatusBlock,
FileFsVolume,
@@ -673,7 +672,7 @@
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 @@
CloseHandle(hFile);
if (!NT_SUCCESS(errCode))
{
- DPRINT("Status: %x\n", errCode);
+ WARN("Status: %x\n", errCode);
SetLastErrorByStatus (errCode);
return FALSE;
}
@@ -824,7 +823,7 @@
if (!NT_SUCCESS(Status))
{
- DPRINT("Status: %x\n", Status);
+ WARN("Status: %x\n", Status);
CloseHandle(hFile);
SetLastErrorByStatus(Status);
return FALSE;
More information about the Ros-diffs
mailing list