Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[gbrunmar] 31489: Added missing display device state flags to wingdi.h

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sat Dec 29 17:30:56 2007 New Revision: 31489 URL: http://svn.reactos.org/svn/reactos?rev=31489&view=rev Log: Added missing display device state flags to wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Sat Dec 29 17:30:56 2007 @@ -1223,6 +1223,8 @@ #define DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 #define DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 #define DISPLAY_DEVICE_REMOVABLE 0x00000020 +#define DISPLAY_DEVICE_DISCONNECT 0x02000000 +#define DISPLAY_DEVICE_REMOTE 0x04000000 #define DISPLAY_DEVICE_MODESPRUNED 0x08000000 #ifndef RC_INVOKED typedef struct _ABC {

16 years, 8 months

[greatlrd] 31488: update the docummactions of DxEngSetDeviceGammaRamp

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Dec 29 15:48:49 2007 New Revision: 31488 URL: http://svn.reactos.org/svn/reactos?rev=31488&view=rev Log: update the docummactions of DxEngSetDeviceGammaRamp Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sat Dec 29 15:48:49 2007 @@ -291,9 +291,8 @@ * @param PGAMMARAMP Ramp * to set in our gama ramp * -* @param BOOL Unuse -* Info on this are avail at request. at moment ReactOS does not -* does not use it. and problare never need it. +* @param BOOL Test +* Testing the gama or not. FALSE for no test, TRUE for testing * * @return * This return FALSE or TRUE, FALSE for fail, TRUE for success

16 years, 8 months

[dchapyshev] 31487: - Fix typo

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Dec 29 15:33:35 2007 New Revision: 31487 URL: http://svn.reactos.org/svn/reactos?rev=31487&view=rev Log: - Fix typo Modified: trunk/reactos/include/dxsdk/amvideo.h Modified: trunk/reactos/include/dxsdk/amvideo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amvideo.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/amvideo.h (original) +++ trunk/reactos/include/dxsdk/amvideo.h Sat Dec 29 15:33:35 2007 @@ -173,7 +173,7 @@ STDMETHOD(SetCaption)(THIS_ BSTR strCaption) PURE; STDMETHOD(GetCaption)(THIS_ BSTR *pstrCaption) PURE; STDMETHOD(SetDefault)(THIS) PURE; -} +}; #undef INTERFACE #define INTERFACE IQualProp

16 years, 8 months

[jimtabor] 31486: Fix set device gamma ramp. Now we test the range of the ramp.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 29 09:39:06 2007 New Revision: 31486 URL: http://svn.reactos.org/svn/reactos?rev=31486&view=rev Log: Fix set device gamma ramp. Now we test the range of the ramp. Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/objects/icm.c Modified: trunk/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intddraw.h Sat Dec 29 09:39:06 2007 @@ -123,6 +123,6 @@ /* Gammaramp internal prototype */ BOOL FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); -BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); +BOOL FASTCALL IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL); #endif /* _INT_W32k_DDRAW */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sat Dec 29 09:39:06 2007 @@ -303,9 +303,9 @@ * *--*/ BOOL -DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse) -{ - return IntSetDeviceGammaRamp(hPDev, Ramp); +DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) +{ + return IntSetDeviceGammaRamp(hPDev, Ramp, Test); } /************************************************************************/ Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c Sat Dec 29 09:39:06 2007 @@ -245,11 +245,17 @@ return FALSE; } +// +// ICM registry subkey sets internal brightness range, gamma range is 128 or +// 256 when icm is init. +INT IcmGammaRangeSet = 128; // <- make it global + BOOL FASTCALL -IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) -{ - BOOL Ret = FALSE; +IntSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) +{ + WORD IcmGR, i, R, G, B; + BOOL Ret = FALSE, TstPeak; PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; if (!hPDev) return FALSE; @@ -274,15 +280,40 @@ if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) if (RtlCompareMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)) == sizeof(GAMMARAMP)) return TRUE; - + // Verify Ramp is inside range. + IcmGR = -IcmGammaRangeSet; + TstPeak = (Test == FALSE); + for (i = 0; i < 256; i++) + { + R = Ramp->Red[i] / 256; + G = Ramp->Green[i] / 256; + B = Ramp->Blue[i] / 256; + if ( R >= IcmGR) + { + if ( R <= IcmGammaRangeSet + i) + { + if ( G >= IcmGR && + (G <= IcmGammaRangeSet + i) && + B >= IcmGR && + (B <= IcmGammaRangeSet + i) ) continue; + } + } + if (Test) return Ret; // Don't set and return. + // No test override, check max range + if (TstPeak) + { + if ( R != (IcmGR * 256) || + G != (IcmGR * 256) || + B != (IcmGR * 256) ) TstPeak = FALSE; // W/i range. + } + } + // ReactOS allocates a ramp even if it is 8BPP and Palette only. + // This way we have a record of the change in memory. if (!pGDev->pvGammaRamp && !(pGDev->flFlags & PDEV_GAMMARAMP_TABLE)) { // If the above is true and we have nothing allocated, create it. pGDev->pvGammaRamp = ExAllocatePoolWithTag(PagedPool, sizeof(GAMMARAMP), TAG_GDIICM); pGDev->flFlags |= PDEV_GAMMARAMP_TABLE; } - // - // Need to adjust the input Ramp with internal brightness before copy. - // ICM subkey sets internal brightness, gamma range 128 or 256 during icm init. RtlCopyMemory( pGDev->pvGammaRamp, Ramp, sizeof(GAMMARAMP)); Ret = UpdateDeviceGammaRamp(hPDev); @@ -290,7 +321,7 @@ return Ret; } else - return FALSE; + return Ret; } BOOL @@ -341,7 +372,7 @@ return FALSE; } - Ret = IntSetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp); + Ret = IntSetDeviceGammaRamp((HDEV)dc->pPDev, SafeRamp, TRUE); DC_UnlockDc(dc); ExFreePool(SafeRamp); return Ret;

16 years, 8 months

[jimtabor] 31485: Add Get/SetLayout to psdk.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 29 09:34:19 2007 New Revision: 31485 URL: http://svn.reactos.org/svn/reactos?rev=31485&view=rev Log: Add Get/SetLayout to psdk. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h (original) +++ trunk/reactos/include/psdk/wingdi.h Sat Dec 29 09:34:19 2007 @@ -2995,6 +2995,10 @@ BOOL WINAPI SetICMProfileW(HDC,LPWSTR); int WINAPI SetMapMode(HDC,int); DWORD WINAPI SetMapperFlags(HDC,DWORD); +#if (_WIN32_WINNT >= 0x0500) +DWORD WINAPI SetLayout(HDC,DWORD); +DWORD WINAPI GetLayout(HDC); +#endif HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE *); int WINAPI SetMetaRgn(HDC); BOOL WINAPI SetMiterLimit(HDC,FLOAT,PFLOAT);

16 years, 8 months

[jimtabor] 31484: Fix GetkerningPairsA, so it can handle null count and pointer. Fix export problem for user32.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Dec 29 09:27:19 2007 New Revision: 31484 URL: http://svn.reactos.org/svn/reactos?rev=31484&view=rev Log: Fix GetkerningPairsA, so it can handle null count and pointer. Fix export problem for user32. Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Sat Dec 29 09:27:19 2007 @@ -6,6 +6,7 @@ <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>ntdll</library> + <library>user32</library> <library>kernel32</library> <library>advapi32</library> <library>win32ksys</library> Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c Sat Dec 29 09:27:19 2007 @@ -1174,8 +1174,10 @@ } DPRINT("charset %d => codepage %u\n", charset, csi.ciACP); - total_kern_pairs = GetKerningPairsW(hDC, 0, NULL); + total_kern_pairs = NtGdiGetKerningPairs(hDC, 0, NULL); if (!total_kern_pairs) return 0; + + if (!cPairs && !kern_pairA) return total_kern_pairs; kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW)); GetKerningPairsW(hDC, total_kern_pairs, kern_pairW); Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Sat Dec 29 09:27:19 2007 @@ -86,10 +86,7 @@ } } #endif -// return UserRealizePalette(hDC); - -//HACK!!!!! - return NtGdiRealizePalette(hDC); + return UserRealizePalette(hDC); }

16 years, 8 months

[pschweitzer] 31483: Reorganized NTFS driver header : - Renamed Magic (bad !) to jump, and OemName to OEMID - Created structures for BPB and EBPB and used them in BOOT_SECTOR one - Added a field to BOOY_SECTOR structure This is based on Technet doc and Alex Ionescu doc

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Dec 29 00:56:19 2007 New Revision: 31483 URL: http://svn.reactos.org/svn/reactos?rev=31483&view=rev Log: Reorganized NTFS driver header : - Renamed Magic (bad !) to jump, and OemName to OEMID - Created structures for BPB and EBPB and used them in BOOT_SECTOR one - Added a field to BOOY_SECTOR structure This is based on Technet doc and Alex Ionescu doc Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c Sat Dec 29 00:56:19 2007 @@ -20,7 +20,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/ntfs/fsctl.c + * FILE: drivers/filesystems/ntfs/fsctl.c * PURPOSE: NTFS filesystem driver * PROGRAMMER: Eric Kohl * Updated by Valentin Verkhovsky 2003/09/12 @@ -106,8 +106,8 @@ TRUE); if (NT_SUCCESS(Status)) { - DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OemName); - if (RtlCompareMemory(BootSector->OemName, "NTFS ", 8) != 8) + DPRINT1("NTFS-identifier: [%.8s]\n", BootSector->OEMID); + if (RtlCompareMemory(BootSector->OEMID, "NTFS ", 8) != 8) { Status = STATUS_UNRECOGNIZED_VOLUME; } @@ -170,33 +170,33 @@ } /* Read data from the bootsector */ - NtfsInfo->BytesPerSector = BootSector->BytesPerSector; - NtfsInfo->SectorsPerCluster = BootSector->SectorsPerCluster; - NtfsInfo->BytesPerCluster = BootSector->BytesPerSector * BootSector->SectorsPerCluster; - NtfsInfo->SectorCount = BootSector->SectorCount; - - NtfsInfo->MftStart.QuadPart = BootSector->MftLocation; - NtfsInfo->MftMirrStart.QuadPart = BootSector->MftMirrLocation; - NtfsInfo->SerialNumber = BootSector->SerialNumber; - if (BootSector->ClustersPerMftRecord > 0) - NtfsInfo->BytesPerFileRecord = BootSector->ClustersPerMftRecord * NtfsInfo->BytesPerCluster; + NtfsInfo->BytesPerSector = BootSector->BPB.BytesPerSector; + NtfsInfo->SectorsPerCluster = BootSector->BPB.SectorsPerCluster; + NtfsInfo->BytesPerCluster = BootSector->BPB.BytesPerSector * BootSector->BPB.SectorsPerCluster; + NtfsInfo->SectorCount = BootSector->EBPB.SectorCount; + + NtfsInfo->MftStart.QuadPart = BootSector->EBPB.MftLocation; + NtfsInfo->MftMirrStart.QuadPart = BootSector->EBPB.MftMirrLocation; + NtfsInfo->SerialNumber = BootSector->EBPB.SerialNumber; + if (BootSector->EBPB.ClustersPerMftRecord > 0) + NtfsInfo->BytesPerFileRecord = BootSector->EBPB.ClustersPerMftRecord * NtfsInfo->BytesPerCluster; else - NtfsInfo->BytesPerFileRecord = 1 << (-BootSector->ClustersPerMftRecord); + NtfsInfo->BytesPerFileRecord = 1 << (-BootSector->EBPB.ClustersPerMftRecord); //#ifndef NDEBUG DbgPrint("Boot sector information:\n"); - DbgPrint(" BytesPerSector: %hu\n", BootSector->BytesPerSector); - DbgPrint(" SectorsPerCluster: %hu\n", BootSector->SectorsPerCluster); - - DbgPrint(" SectorCount: %I64u\n", BootSector->SectorCount); - - DbgPrint(" MftStart: %I64u\n", BootSector->MftLocation); - DbgPrint(" MftMirrStart: %I64u\n", BootSector->MftMirrLocation); - - DbgPrint(" ClustersPerMftRecord: %lx\n", BootSector->ClustersPerMftRecord); - DbgPrint(" ClustersPerIndexRecord: %lx\n", BootSector->ClustersPerIndexRecord); - - DbgPrint(" SerialNumber: %I64x\n", BootSector->SerialNumber); + DbgPrint(" BytesPerSector: %hu\n", BootSector->BPB.BytesPerSector); + DbgPrint(" SectorsPerCluster: %hu\n", BootSector->BPB.SectorsPerCluster); + + DbgPrint(" SectorCount: %I64u\n", BootSector->EBPB.SectorCount); + + DbgPrint(" MftStart: %I64u\n", BootSector->EBPB.MftLocation); + DbgPrint(" MftMirrStart: %I64u\n", BootSector->EBPB.MftMirrLocation); + + DbgPrint(" ClustersPerMftRecord: %lx\n", BootSector->EBPB.ClustersPerMftRecord); + DbgPrint(" ClustersPerIndexRecord: %lx\n", BootSector->EBPB.ClustersPerIndexRecord); + + DbgPrint(" SerialNumber: %I64x\n", BootSector->EBPB.SerialNumber); //#endif ExFreePool(BootSector); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h Sat Dec 29 00:56:19 2007 @@ -20,28 +20,40 @@ #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #include <pshpack1.h> -typedef struct _BOOT_SECTOR -{ - UCHAR Magic[3]; // 0x00 - UCHAR OemName[8]; // 0x03 +typedef struct _BIOS_PARAMETERS_BLOCK +{ USHORT BytesPerSector; // 0x0B - UCHAR SectorsPerCluster; // 0x0D + UCHAR SectorsPerCluster; // 0x0D UCHAR Unused0[7]; // 0x0E UCHAR MediaId; // 0x15 UCHAR Unused1[2]; // 0x16 - USHORT SectorsPerTrack; - USHORT Heads; - UCHAR Unused2[8]; - UCHAR Unknown0[4]; /* always 80 00 80 00 */ - ULONGLONG SectorCount; - ULONGLONG MftLocation; - ULONGLONG MftMirrLocation; - CHAR ClustersPerMftRecord; - UCHAR Unused3[3]; - CHAR ClustersPerIndexRecord; - UCHAR Unused4[3]; + USHORT SectorsPerTrack; // 0x18 + USHORT Heads; // 0x1A + UCHAR Unused2[8]; // 0x1C +} BIOS_PARAMETERS_BLOCK, *PBIOS_PARAMETERS_BLOCK; + +typedef struct _EXTENDED_BIOS_PARAMETERS_BLOCK +{ + UCHAR Unknown[4]; // 0x24, always 80 00 80 00 + ULONGLONG SectorCount; // 0x28 + ULONGLONG MftLocation; // 0x30 + ULONGLONG MftMirrLocation; // 0x38 + CHAR ClustersPerMftRecord; // 0x40 + UCHAR Unused3[3]; // 0x41 + CHAR ClustersPerIndexRecord; // 0x44 + UCHAR Unused4[3]; // 0x45 ULONGLONG SerialNumber; // 0x48 - UCHAR BootCode[432]; // 0x50 + UCHAR Checksum[4]; // 0x50 +} EXTENDED_BIOS_PARAMETERS_BLOCK, *PEXTENDED_BIOS_PARAMETERS_BLOCK; + +typedef struct _BOOT_SECTOR +{ + UCHAR Jump[3]; // 0x00 + UCHAR OEMID[8]; // 0x03 + BIOS_PARAMETERS_BLOCK BPB; + EXTENDED_BIOS_PARAMETERS_BLOCK EBPB; + UCHAR BootStrap[426]; // 0x54 + USHORT EndSector; // 0x1FE } BOOT_SECTOR, *PBOOT_SECTOR; #include <poppack.h>

16 years, 8 months

[hpoussin] 31482: Use kernel facilities to change debug level at runtime

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Dec 29 00:10:07 2007 New Revision: 31482 URL: http://svn.reactos.org/svn/reactos?rev=31482&view=rev Log: Use kernel facilities to change debug level at runtime Modified: trunk/reactos/drivers/input/sermouse/createclose.c trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/input/sermouse/fdo.c trunk/reactos/drivers/input/sermouse/internaldevctl.c trunk/reactos/drivers/input/sermouse/misc.c trunk/reactos/drivers/input/sermouse/readmouse.c trunk/reactos/drivers/input/sermouse/sermouse.c trunk/reactos/drivers/input/sermouse/sermouse.rbuild trunk/reactos/drivers/serial/serenum/detect.c trunk/reactos/drivers/serial/serenum/fdo.c trunk/reactos/drivers/serial/serenum/misc.c trunk/reactos/drivers/serial/serenum/pdo.c trunk/reactos/drivers/serial/serenum/serenum.c trunk/reactos/drivers/serial/serenum/serenum.rbuild trunk/reactos/drivers/serial/serial/circularbuffer.c trunk/reactos/drivers/serial/serial/cleanup.c trunk/reactos/drivers/serial/serial/close.c trunk/reactos/drivers/serial/serial/create.c trunk/reactos/drivers/serial/serial/devctrl.c trunk/reactos/drivers/serial/serial/info.c trunk/reactos/drivers/serial/serial/misc.c trunk/reactos/drivers/serial/serial/pnp.c trunk/reactos/drivers/serial/serial/power.c trunk/reactos/drivers/serial/serial/rw.c trunk/reactos/drivers/serial/serial/serial.h trunk/reactos/drivers/serial/serial/serial.rbuild Modified: trunk/reactos/drivers/input/sermouse/createclose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/cre… ============================================================================== --- trunk/reactos/drivers/input/sermouse/createclose.c (original) +++ trunk/reactos/drivers/input/sermouse/createclose.c Sat Dec 29 00:10:07 2007 @@ -13,7 +13,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CREATE\n"); + TRACE_(SERMOUSE, "IRP_MJ_CREATE\n"); ASSERT(((PSERMOUSE_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState == dsStarted); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -27,7 +27,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLOSE\n"); + TRACE_(SERMOUSE, "IRP_MJ_CLOSE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -40,7 +40,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLEANUP\n"); + TRACE_(SERMOUSE, "IRP_MJ_CLEANUP\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/input/sermouse/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/det… ============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c (original) +++ trunk/reactos/drivers/input/sermouse/detect.c Sat Dec 29 00:10:07 2007 @@ -39,7 +39,7 @@ &IoStatus); if (Irp == NULL) { - DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + WARN_(SERMOUSE, "IoBuildDeviceIoControlRequest() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -47,7 +47,7 @@ if (Status == STATUS_PENDING) { - DPRINT("Operation pending\n"); + INFO_(SERMOUSE, "Operation pending\n"); KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); Status = IoStatus.Status; } @@ -91,7 +91,7 @@ KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); Status = ioStatus.Status; } - DPRINT("Bytes received: %lu/%lu\n", + INFO_(SERMOUSE, "Bytes received: %lu/%lu\n", ioStatus.Information, BufferSize); *FilledBytes = ioStatus.Information; return Status; @@ -125,7 +125,7 @@ SERMOUSE_MOUSE_TYPE MouseType = mtNone; NTSTATUS Status; - DPRINT("SermouseDetectLegacyDevice(LowerDevice %p)\n", LowerDevice); + TRACE_(SERMOUSE, "SermouseDetectLegacyDevice(LowerDevice %p)\n", LowerDevice); RtlZeroMemory(Buffer, sizeof(Buffer)); @@ -205,7 +205,7 @@ if (Buffer[i] == 'B') { /* Sign for Microsoft Ballpoint */ - DPRINT1("Microsoft Ballpoint device detected. THIS DEVICE IS NOT YET SUPPORTED"); + ERR_(SERMOUSE, "Microsoft Ballpoint device detected. THIS DEVICE IS NOT YET SUPPORTED"); MouseType = mtNone; goto ByeBye; } @@ -220,13 +220,13 @@ switch (Buffer[i + 1]) { case '3': - DPRINT("Microsoft Mouse with 3-buttons detected\n"); + INFO_(SERMOUSE, "Microsoft Mouse with 3-buttons detected\n"); MouseType = mtLogitech; case 'Z': - DPRINT("Microsoft Wheel Mouse detected\n"); + INFO_(SERMOUSE, "Microsoft Wheel Mouse detected\n"); MouseType = mtWheelZ; default: - DPRINT("Microsoft Mouse with 2-buttons detected\n"); + INFO_(SERMOUSE, "Microsoft Mouse with 2-buttons detected\n"); MouseType = mtMicrosoft; } goto ByeBye; Modified: trunk/reactos/drivers/input/sermouse/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo… ============================================================================== --- trunk/reactos/drivers/input/sermouse/fdo.c (original) +++ trunk/reactos/drivers/input/sermouse/fdo.c Sat Dec 29 00:10:07 2007 @@ -18,7 +18,7 @@ PSERMOUSE_DEVICE_EXTENSION DeviceExtension = NULL; NTSTATUS Status; - DPRINT("SermouseAddDevice called. Pdo = 0x%p\n", Pdo); + TRACE_(SERMOUSE, "SermouseAddDevice called. Pdo = 0x%p\n", Pdo); if (Pdo == NULL) return STATUS_SUCCESS; @@ -35,7 +35,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(SERMOUSE, "IoCreateDevice() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -48,7 +48,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + WARN_(SERMOUSE, "IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); goto cleanup; } if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) @@ -90,7 +90,7 @@ MouseType = SermouseDetectLegacyDevice(DeviceExtension->LowerDevice); if (MouseType == mtNone) { - DPRINT("No mouse connected to Fdo %p\n", + WARN_(SERMOUSE, "No mouse connected to Fdo %p\n", DeviceExtension->LowerDevice); return STATUS_DEVICE_NOT_CONNECTED; } @@ -110,7 +110,7 @@ DeviceExtension->AttributesInformation.NumberOfButtons = 3; break; default: - DPRINT("Unknown mouse type 0x%lx\n", MouseType); + WARN_(SERMOUSE, "Unknown mouse type 0x%lx\n", MouseType); ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } @@ -170,7 +170,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + TRACE_(SERMOUSE, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); /* Call lower driver */ Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status)) @@ -184,12 +184,12 @@ case BusRelations: { PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); + TRACE_(SERMOUSE, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); DeviceRelations = ExAllocatePoolWithTag(PagedPool, FIELD_OFFSET(DEVICE_RELATIONS, Objects), SERMOUSE_TAG); if (!DeviceRelations) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(SERMOUSE, "ExAllocatePoolWithTag() failed\n"); Status = STATUS_NO_MEMORY; } else @@ -202,7 +202,7 @@ } default: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + TRACE_(SERMOUSE, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } @@ -211,7 +211,7 @@ } default: { - DPRINT1("IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + TRACE_(SERMOUSE, "IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/input/sermouse/internaldevctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/int… ============================================================================== --- trunk/reactos/drivers/input/sermouse/internaldevctl.c (original) +++ trunk/reactos/drivers/input/sermouse/internaldevctl.c Sat Dec 29 00:10:07 2007 @@ -24,7 +24,7 @@ { case IOCTL_INTERNAL_MOUSE_CONNECT: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_CONNECT\n"); + TRACE_(SERMOUSE, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_CONNECT\n"); DeviceExtension->ConnectData = *((PCONNECT_DATA)Stack->Parameters.DeviceIoControl.Type3InputBuffer); Status = STATUS_SUCCESS; @@ -32,7 +32,7 @@ } case IOCTL_INTERNAL_MOUSE_DISCONNECT: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_DISCONNECT\n"); + TRACE_(SERMOUSE, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_INTERNAL_MOUSE_DISCONNECT\n"); /* Ask read loop to end */ KeSetEvent(&DeviceExtension->StopWorkerThreadEvent, (KPRIORITY)0, FALSE); @@ -41,7 +41,7 @@ } case IOCTL_MOUSE_QUERY_ATTRIBUTES: { - DPRINT("IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_MOUSE_QUERY_ATTRIBUTES\n"); + TRACE_(SERMOUSE, "IRP_MJ_INTERNAL_DEVICE_CONTROL / IOCTL_MOUSE_QUERY_ATTRIBUTES\n"); if (Stack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(MOUSE_ATTRIBUTES)) { *(PMOUSE_ATTRIBUTES)Irp->AssociatedIrp.SystemBuffer = @@ -57,7 +57,7 @@ } default: { - DPRINT1("IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", + WARN_(SERMOUSE, "IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); ASSERT(FALSE); Status = STATUS_INVALID_DEVICE_REQUEST; Modified: trunk/reactos/drivers/input/sermouse/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/mis… ============================================================================== --- trunk/reactos/drivers/input/sermouse/misc.c (original) +++ trunk/reactos/drivers/input/sermouse/misc.c Sat Dec 29 00:10:07 2007 @@ -33,7 +33,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p\n", LowerDevice); + TRACE_(SERMOUSE, "Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); Modified: trunk/reactos/drivers/input/sermouse/readmouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/rea… ============================================================================== --- trunk/reactos/drivers/input/sermouse/readmouse.c (original) +++ trunk/reactos/drivers/input/sermouse/readmouse.c Sat Dec 29 00:10:07 2007 @@ -37,7 +37,7 @@ &IoStatus); if (Irp == NULL) { - DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + WARN_(SERMOUSE, "IoBuildDeviceIoControlRequest() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -45,7 +45,7 @@ if (Status == STATUS_PENDING) { - DPRINT("Operation pending\n"); + INFO_(SERMOUSE, "Operation pending\n"); KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); Status = IoStatus.Status; } @@ -82,7 +82,7 @@ LARGE_INTEGER Zero; NTSTATUS Status; - DPRINT("SermouseDeviceWorker() called\n"); + TRACE_(SERMOUSE, "SermouseDeviceWorker() called\n"); DeviceExtension = (PSERMOUSE_DEVICE_EXTENSION)((PDEVICE_OBJECT)Context)->DeviceExtension; LowerDevice = DeviceExtension->LowerDevice; @@ -169,7 +169,7 @@ for (i = 0; i < ioStatus.Information; i++) { ReceivedByte = Buffer[i]; - DPRINT("ReceivedByte 0x%02x\n", ReceivedByte); + INFO_(SERMOUSE, "ReceivedByte 0x%02x\n", ReceivedByte); /* Synchronize */ if ((ReceivedByte & 0x40) == 0x40) Modified: trunk/reactos/drivers/input/sermouse/sermouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.c (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.c Sat Dec 29 00:10:07 2007 @@ -24,7 +24,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("Irp stub for major function 0x%lx\n", + ERR_(SERMOUSE, "Irp stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; @@ -46,7 +46,7 @@ ParametersRegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersRegistryKey.MaximumLength, SERMOUSE_TAG); if (!ParametersRegistryKey.Buffer) { - DPRINT("ExAllocatePoolWithTag() failed\n"); + WARN_(SERMOUSE, "ExAllocatePoolWithTag() failed\n"); return STATUS_NO_MEMORY; } RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); @@ -103,7 +103,7 @@ (PVOID*)&DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); + WARN_(SERMOUSE, "IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); return Status; } RtlZeroMemory(DriverExtension, sizeof(SERMOUSE_DRIVER_EXTENSION)); @@ -111,7 +111,7 @@ Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) { - DPRINT("ReadRegistryEntries() failed with status 0x%08lx\n", Status); + WARN_(SERMOUSE, "ReadRegistryEntries() failed with status 0x%08lx\n", Status); return Status; } Modified: trunk/reactos/drivers/input/sermouse/sermouse.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.rbuild (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.rbuild Sat Dec 29 00:10:07 2007 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="sermouse" type="kernelmodedriver" installbase="system32/drivers" installname="sermouse.sys"> - <include base="sermouse">.</include> <library>ntoskrnl</library> <library>hal</library> <file>createclose.c</file> Modified: trunk/reactos/drivers/serial/serenum/detect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/det… ============================================================================== --- trunk/reactos/drivers/serial/serenum/detect.c (original) +++ trunk/reactos/drivers/serial/serenum/detect.c Sat Dec 29 00:10:07 2007 @@ -38,7 +38,7 @@ &IoStatus); if (Irp == NULL) { - DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + WARN_(SERENUM, "IoBuildDeviceIoControlRequest() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -46,7 +46,7 @@ if (Status == STATUS_PENDING) { - DPRINT("Operation pending\n"); + INFO_(SERENUM, "Operation pending\n"); KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); Status = IoStatus.Status; } @@ -90,7 +90,7 @@ KeWaitForSingleObject(&event, Suspended, KernelMode, FALSE, NULL); Status = ioStatus.Status; } - DPRINT("Bytes received: %lu/%lu\n", + INFO_(SERENUM, "Bytes received: %lu/%lu\n", ioStatus.Information, BufferSize); *FilledBytes = ioStatus.Information; return Status; @@ -110,7 +110,7 @@ PFDO_DEVICE_EXTENSION FdoDeviceExtension; NTSTATUS Status; - DPRINT("ReportDetectedDevice() called with %wZ (%wZ) detected\n", DeviceId, DeviceDescription); + TRACE_(SERENUM, "ReportDetectedDevice() called with %wZ (%wZ) detected\n", DeviceId, DeviceDescription); Status = IoCreateDevice( DeviceObject->DriverObject, @@ -175,9 +175,14 @@ IN PUCHAR Buffer, IN ULONG BufferLength) { + ANSI_STRING String; + /* FIXME: IsValidPnpIdString not implemented */ - DPRINT1("IsValidPnpIdString() unimplemented\n"); - return STATUS_SUCCESS; + UNIMPLEMENTED; + String.Length = String.MaximumLength = BufferLength; + String.Buffer = (PCHAR)Buffer; + ERR_(SERENUM, "Buffer %Z\n", &String); + return TRUE; } static NTSTATUS @@ -185,13 +190,13 @@ IN PUCHAR Buffer, IN ULONG BufferLength) { - ULONG i; + ANSI_STRING String; + /* FIXME: ReportDetectedPnpDevice not implemented */ - DPRINT1("ReportDetectedPnpDevice() unimplemented\n"); - DPRINT1(""); - for (i = 0; i < BufferLength; i++) - DbgPrint("%c", Buffer[i]); - DbgPrint("\n"); + UNIMPLEMENTED; + String.Length = String.MaximumLength = BufferLength; + String.Buffer = (PCHAR)Buffer; + ERR_(SERENUM, "Buffer %Z\n", &String); /* Call ReportDetectedDevice */ return STATUS_SUCCESS; } @@ -453,7 +458,7 @@ UNICODE_STRING CompatibleIds; NTSTATUS Status; - DPRINT("SerenumDetectLegacyDevice(DeviceObject %p, LowerDevice %p)\n", + TRACE_(SERENUM, "SerenumDetectLegacyDevice(DeviceObject %p, LowerDevice %p)\n", DeviceObject, LowerDevice); Modified: trunk/reactos/drivers/serial/serenum/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/fdo… ============================================================================== --- trunk/reactos/drivers/serial/serenum/fdo.c (original) +++ trunk/reactos/drivers/serial/serenum/fdo.c Sat Dec 29 00:10:07 2007 @@ -18,7 +18,7 @@ PFDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("SerenumAddDevice called. Pdo = %p\n", Pdo); + TRACE_(SERENUM, "SerenumAddDevice called. Pdo = %p\n", Pdo); /* Create new device object */ Status = IoCreateDevice(DriverObject, @@ -30,7 +30,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + WARN_(SERENUM, "IoCreateDevice() failed with status 0x%08lx\n", Status); return Status; } DeviceExtension = (PFDO_DEVICE_EXTENSION)Fdo->DeviceExtension; @@ -44,7 +44,7 @@ &DeviceExtension->SerenumInterfaceName); if (!NT_SUCCESS(Status)) { - DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + WARN_(SERENUM, "IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); IoDeleteDevice(Fdo); return Status; } @@ -56,7 +56,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + WARN_(SERENUM, "IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); IoDeleteDevice(Fdo); return Status; } @@ -79,7 +79,7 @@ PFDO_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("SerenumFdoStartDevice() called\n"); + TRACE_(SERENUM, "SerenumFdoStartDevice() called\n"); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(DeviceExtension->Common.PnpState == dsStopped); @@ -87,7 +87,7 @@ Status = IoSetDeviceInterfaceState(&DeviceExtension->SerenumInterfaceName, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT("IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); + WARN_(SERENUM, "IoSetDeviceInterfaceState() failed with status 0x%08lx\n", Status); return Status; } @@ -177,7 +177,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); /* Call lower driver */ Status = ForwardIrpAndWait(DeviceObject, Irp); if (NT_SUCCESS(Status)) @@ -191,13 +191,13 @@ case BusRelations: { PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); Status = SerenumFdoQueryBusRelations(DeviceObject, &DeviceRelations); Information = (ULONG_PTR)DeviceRelations; break; } default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } @@ -205,12 +205,12 @@ } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* 0xd */ { - DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); return ForwardIrpAndForget(DeviceObject, Irp); } default: { - DPRINT1("IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + TRACE_(SERENUM, "IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/serial/serenum/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/mis… ============================================================================== --- trunk/reactos/drivers/serial/serenum/misc.c (original) +++ trunk/reactos/drivers/serial/serenum/misc.c Sat Dec 29 00:10:07 2007 @@ -115,7 +115,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p\n", LowerDevice); + TRACE_(SERENUM, "Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -142,7 +142,7 @@ LowerDevice = DeviceExtension->LowerDevice; ASSERT(LowerDevice); - DPRINT("Calling lower device 0x%p\n", LowerDevice); + TRACE_(SERENUM, "Calling lower device 0x%p\n", LowerDevice); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); } @@ -160,7 +160,7 @@ Fdo = DeviceExtension->AttachedFdo; ASSERT(Fdo); - DPRINT("Calling attached Fdo 0x%p\n", Fdo); + TRACE_(SERENUM, "Calling attached Fdo 0x%p\n", Fdo); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(Fdo, Irp); } Modified: trunk/reactos/drivers/serial/serenum/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/pdo… ============================================================================== --- trunk/reactos/drivers/serial/serenum/pdo.c (original) +++ trunk/reactos/drivers/serial/serenum/pdo.c Sat Dec 29 00:10:07 2007 @@ -43,28 +43,28 @@ { case BusQueryDeviceID: { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); SourceString = &DeviceExtension->DeviceId; break; } case BusQueryHardwareIDs: { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); SourceString = &DeviceExtension->HardwareIds; break; } case BusQueryCompatibleIDs: - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); SourceString = &DeviceExtension->CompatibleIds; break; case BusQueryInstanceID: { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); SourceString = &DeviceExtension->InstanceId; break; } default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); + WARN_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); ASSERT(FALSE); return STATUS_NOT_SUPPORTED; } @@ -140,7 +140,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); Status = SerenumPdoStartDevice(DeviceObject); break; } @@ -155,14 +155,14 @@ case TargetDeviceRelation: { PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); Status = SerenumPdoQueryDeviceRelations(DeviceObject, &DeviceRelations); Information = (ULONG_PTR)DeviceRelations; break; } default: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + WARN_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); ASSERT(FALSE); Status = STATUS_NOT_IMPLEMENTED; @@ -175,7 +175,7 @@ { PDEVICE_CAPABILITIES DeviceCapabilities; ULONG i; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; /* FIXME: capabilities can change with connected device */ @@ -201,7 +201,7 @@ } case IRP_MN_QUERY_RESOURCES: /* 0xa */ { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); /* Serial devices don't need resources, except the ones of * the serial port. This PDO is the serial device PDO, so * report no resource by not changing Information and @@ -213,7 +213,7 @@ } case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: /* 0xb */ { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); /* Serial devices don't need resources, except the ones of * the serial port. This PDO is the serial device PDO, so * report no resource by not changing Information and @@ -231,7 +231,7 @@ { PUNICODE_STRING Source; PWSTR Description; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); Source = &((PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->DeviceDescription; Description = ExAllocatePoolWithTag(PagedPool, Source->Length + sizeof(WCHAR), SERENUM_TAG); @@ -257,7 +257,7 @@ } default: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown type 0x%lx\n", + WARN_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown type 0x%lx\n", Stack->Parameters.QueryDeviceText.DeviceTextType); ASSERT(FALSE); Status = STATUS_NOT_SUPPORTED; @@ -277,7 +277,7 @@ case IRP_MN_QUERY_BUS_INFORMATION: /* 0x15 */ { PPNP_BUS_INFORMATION BusInfo; - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); + TRACE_(SERENUM, "IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), SERENUM_TAG); if (!BusInfo) @@ -300,7 +300,7 @@ { /* We can't forward request to the lower driver, because * we are a Pdo, so we don't have lower driver... */ - DPRINT1("IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + WARN_(SERENUM, "IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); ASSERT(FALSE); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; Modified: trunk/reactos/drivers/serial/serenum/serenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.c (original) +++ trunk/reactos/drivers/serial/serenum/serenum.c Sat Dec 29 00:10:07 2007 @@ -53,7 +53,7 @@ return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); default: { - DPRINT1("Serenum: FDO stub for major function 0x%lx\n", + WARN_(SERENUM, "FDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); Status = Irp->IoStatus.Status; @@ -74,7 +74,7 @@ return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); default: { - DPRINT1("Serenum: PDO stub for major function 0x%lx\n", + WARN_(SERENUM, "PDO stub for major function 0x%lx\n", IoGetCurrentIrpStackLocation(Irp)->MajorFunction); ASSERT(FALSE); Status = Irp->IoStatus.Status; Modified: trunk/reactos/drivers/serial/serenum/serenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.rbuild (original) +++ trunk/reactos/drivers/serial/serenum/serenum.rbuild Sat Dec 29 00:10:07 2007 @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="serenum" type="kernelmodedriver" installbase="system32/drivers" installname="serenum.sys"> - <include base="serenum">.</include> - <define name="NDEBUG" /> <library>ntoskrnl</library> <library>hal</library> <file>detect.c</file> Modified: trunk/reactos/drivers/serial/serial/circularbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/circ… ============================================================================== --- trunk/reactos/drivers/serial/serial/circularbuffer.c (original) +++ trunk/reactos/drivers/serial/serial/circularbuffer.c Sat Dec 29 00:10:07 2007 @@ -14,7 +14,7 @@ IN PCIRCULAR_BUFFER pBuffer, IN ULONG BufferSize) { - DPRINT("InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + TRACE_(SERIAL, "InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); ASSERT(pBuffer); pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); if (!pBuffer->Buffer) @@ -28,7 +28,7 @@ FreeCircularBuffer( IN PCIRCULAR_BUFFER pBuffer) { - DPRINT("FreeCircularBuffer(pBuffer %p)\n", pBuffer); + TRACE_(SERIAL, "FreeCircularBuffer(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); if (pBuffer->Buffer != NULL) ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); @@ -39,7 +39,7 @@ IsCircularBufferEmpty( IN PCIRCULAR_BUFFER pBuffer) { - DPRINT("IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); + TRACE_(SERIAL, "IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); return (pBuffer->ReadPosition == pBuffer->WritePosition); } @@ -48,7 +48,7 @@ GetNumberOfElementsInCircularBuffer( IN PCIRCULAR_BUFFER pBuffer) { - DPRINT("GetNumberOfElementsInCircularBuffer(pBuffer %p)\n", pBuffer); + TRACE_(SERIAL, "GetNumberOfElementsInCircularBuffer(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); return (pBuffer->WritePosition + pBuffer->Length - pBuffer->ReadPosition) % pBuffer->Length; } @@ -59,7 +59,7 @@ IN UCHAR Entry) { ULONG NextPosition; - DPRINT("PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); + TRACE_(SERIAL, "PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); ASSERT(pBuffer); ASSERT(pBuffer->Length); NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; @@ -75,7 +75,7 @@ IN PCIRCULAR_BUFFER pBuffer, OUT PUCHAR Entry) { - DPRINT("PopCircularBufferEntry(pBuffer %p)\n", pBuffer); + TRACE_(SERIAL, "PopCircularBufferEntry(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); ASSERT(pBuffer->Length); if (IsCircularBufferEmpty(pBuffer)) @@ -92,7 +92,7 @@ { PUCHAR NewBuffer; - DPRINT("IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + TRACE_(SERIAL, "IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); ASSERT(pBuffer); ASSERT(pBuffer->Length); if (pBuffer->Length > NewBufferSize) Modified: trunk/reactos/drivers/serial/serial/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/clea… ============================================================================== --- trunk/reactos/drivers/serial/serial/cleanup.c (original) +++ trunk/reactos/drivers/serial/serial/cleanup.c Sat Dec 29 00:10:07 2007 @@ -14,7 +14,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_CLEANUP\n"); + TRACE_(SERIAL, "IRP_MJ_CLEANUP\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/serial/serial/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/clos… ============================================================================== --- trunk/reactos/drivers/serial/serial/close.c (original) +++ trunk/reactos/drivers/serial/serial/close.c Sat Dec 29 00:10:07 2007 @@ -16,7 +16,7 @@ { PSERIAL_DEVICE_EXTENSION pDeviceExtension; - DPRINT("IRP_MJ_CLOSE\n"); + TRACE_(SERIAL, "IRP_MJ_CLOSE\n"); pDeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; pDeviceExtension->IsOpened = FALSE; Modified: trunk/reactos/drivers/serial/serial/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/crea… ============================================================================== --- trunk/reactos/drivers/serial/serial/create.c (original) +++ trunk/reactos/drivers/serial/serial/create.c Sat Dec 29 00:10:07 2007 @@ -18,7 +18,7 @@ PSERIAL_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("IRP_MJ_CREATE\n"); + TRACE_(SERIAL, "IRP_MJ_CREATE\n"); Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -31,12 +31,12 @@ if(DeviceExtension->IsOpened) { - DPRINT("COM%lu is already opened\n", DeviceExtension->ComPort); + WARN_(SERIAL, "COM%lu is already opened\n", DeviceExtension->ComPort); Status = STATUS_ACCESS_DENIED; goto ByeBye; } - DPRINT("Open COM%lu: successfull\n", DeviceExtension->ComPort); + INFO_(SERIAL, "Open COM%lu: successfull\n", DeviceExtension->ComPort); DeviceExtension->IsOpened = TRUE; Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/serial/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/devc… ============================================================================== --- trunk/reactos/drivers/serial/serial/devctrl.c (original) +++ trunk/reactos/drivers/serial/serial/devctrl.c Sat Dec 29 00:10:07 2007 @@ -64,7 +64,7 @@ if (NT_SUCCESS(Status)) { UCHAR Lcr; - DPRINT("SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BaudRate); + TRACE_(SERIAL, "SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BaudRate); /* Set Bit 7 of LCR to expose baud registers */ Lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)); WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr | SR_LCR_DLAB); @@ -94,7 +94,7 @@ ASSERT(DeviceExtension); ASSERT(NewSettings); - DPRINT("SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", + TRACE_(SERIAL, "SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); /* Verify parameters */ @@ -288,7 +288,7 @@ PUCHAR ComPortBase; NTSTATUS Status; - DPRINT("IRP_MJ_DEVICE_CONTROL dispatch\n"); + TRACE_(SERIAL, "IRP_MJ_DEVICE_CONTROL dispatch\n"); Stack = IoGetCurrentIrpStackLocation(Irp); LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; @@ -304,7 +304,7 @@ { case IOCTL_SERIAL_CLEAR_STATS: { - DPRINT("IOCTL_SERIAL_CLEAR_STATS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_CLEAR_STATS\n"); KeSynchronizeExecution( DeviceExtension->Interrupt, (PKSYNCHRONIZE_ROUTINE)SerialClearPerfStats, @@ -314,7 +314,7 @@ } case IOCTL_SERIAL_CLR_DTR: { - DPRINT("IOCTL_SERIAL_CLR_DTR\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_CLR_DTR\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); @@ -328,7 +328,7 @@ } case IOCTL_SERIAL_CLR_RTS: { - DPRINT("IOCTL_SERIAL_CLR_RTS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_CLR_RTS\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use RTS, return STATUS_INVALID_PARAMETER */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); @@ -344,7 +344,7 @@ { /* Obsolete on Microsoft Windows 2000+ */ PULONG pConfigSize; - DPRINT("IOCTL_SERIAL_CONFIG_SIZE\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_CONFIG_SIZE\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -358,7 +358,7 @@ } case IOCTL_SERIAL_GET_BAUD_RATE: { - DPRINT("IOCTL_SERIAL_GET_BAUD_RATE\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_BAUD_RATE\n"); if (LengthOut < sizeof(SERIAL_BAUD_RATE)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -374,13 +374,13 @@ case IOCTL_SERIAL_GET_CHARS: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_GET_CHARS not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_GET_CHARS not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_GET_COMMSTATUS: { - DPRINT("IOCTL_SERIAL_GET_COMMSTATUS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_COMMSTATUS\n"); if (LengthOut < sizeof(SERIAL_STATUS)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -395,7 +395,7 @@ case IOCTL_SERIAL_GET_DTRRTS: { PULONG pDtrRts; - DPRINT("IOCTL_SERIAL_GET_DTRRTS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_DTRRTS\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -414,13 +414,13 @@ case IOCTL_SERIAL_GET_HANDFLOW: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_GET_LINE_CONTROL: { - DPRINT("IOCTL_SERIAL_GET_LINE_CONTROL\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_LINE_CONTROL\n"); if (LengthOut < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -436,7 +436,7 @@ case IOCTL_SERIAL_GET_MODEM_CONTROL: { PULONG pMCR; - DPRINT("IOCTL_SERIAL_GET_MODEM_CONTROL\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_MODEM_CONTROL\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -451,7 +451,7 @@ case IOCTL_SERIAL_GET_MODEMSTATUS: { PULONG pMSR; - DPRINT("IOCTL_SERIAL_GET_MODEMSTATUS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_MODEMSTATUS\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -465,7 +465,7 @@ } case IOCTL_SERIAL_GET_PROPERTIES: { - DPRINT("IOCTL_SERIAL_GET_PROPERTIES\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_PROPERTIES\n"); if (LengthOut < sizeof(SERIAL_COMMPROP)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -479,7 +479,7 @@ } case IOCTL_SERIAL_GET_STATS: { - DPRINT("IOCTL_SERIAL_GET_STATS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_STATS\n"); if (LengthOut < sizeof(SERIALPERF_STATS)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -495,7 +495,7 @@ } case IOCTL_SERIAL_GET_TIMEOUTS: { - DPRINT("IOCTL_SERIAL_GET_TIMEOUTS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_TIMEOUTS\n"); if (LengthOut != sizeof(SERIAL_TIMEOUTS) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -509,7 +509,7 @@ case IOCTL_SERIAL_GET_WAIT_MASK: { PULONG pWaitMask; - DPRINT("IOCTL_SERIAL_GET_WAIT_MASK\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_GET_WAIT_MASK\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -524,21 +524,21 @@ case IOCTL_SERIAL_IMMEDIATE_CHAR: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_LSRMST_INSERT: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_PURGE: { KIRQL Irql; - DPRINT("IOCTL_SERIAL_PURGE\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_PURGE\n"); /* FIXME: SERIAL_PURGE_RXABORT and SERIAL_PURGE_TXABORT * should stop current request */ if (LengthIn != sizeof(ULONG) || BufferIn == NULL) @@ -588,14 +588,14 @@ case IOCTL_SERIAL_RESET_DEVICE: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_BAUD_RATE: { PULONG pNewBaudRate; - DPRINT("IOCTL_SERIAL_SET_BAUD_RATE\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_BAUD_RATE\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -608,21 +608,21 @@ case IOCTL_SERIAL_SET_BREAK_OFF: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_BREAK_ON: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_CHARS: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_SET_CHARS not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_SET_CHARS not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } @@ -630,7 +630,7 @@ { /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("IOCTL_SERIAL_SET_DTR\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_DTR\n"); if (!(DeviceExtension->MCR & SR_MCR_DTR)) { Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); @@ -647,7 +647,7 @@ } case IOCTL_SERIAL_SET_FIFO_CONTROL: { - DPRINT("IOCTL_SERIAL_SET_FIFO_CONTROL\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_FIFO_CONTROL\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -664,13 +664,13 @@ case IOCTL_SERIAL_SET_HANDFLOW: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_LINE_CONTROL: { - DPRINT("IOCTL_SERIAL_SET_LINE_CONTROL\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_LINE_CONTROL\n"); if (LengthIn < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferIn == NULL) @@ -682,7 +682,7 @@ case IOCTL_SERIAL_SET_MODEM_CONTROL: { PULONG pMCR; - DPRINT("IOCTL_SERIAL_SET_MODEM_CONTROL\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_MODEM_CONTROL\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -728,7 +728,7 @@ { /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("IOCTL_SERIAL_SET_RTS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_RTS\n"); if (!(DeviceExtension->MCR & SR_MCR_RTS)) { Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, ULongToPtr(DeviceExtension->ComPort)); @@ -745,7 +745,7 @@ } case IOCTL_SERIAL_SET_TIMEOUTS: { - DPRINT("IOCTL_SERIAL_SET_TIMEOUTS\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_TIMEOUTS\n"); if (LengthIn != sizeof(SERIAL_TIMEOUTS) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -758,13 +758,13 @@ case IOCTL_SERIAL_SET_WAIT_MASK: { PULONG pWaitMask = (PULONG)BufferIn; - DPRINT("IOCTL_SERIAL_SET_WAIT_MASK\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_SET_WAIT_MASK\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else if (DeviceExtension->WaitOnMaskIrp) /* FIXME: Race condition ; field may be currently in modification */ { - DPRINT("An IRP is already currently processed\n"); + WARN_(SERIAL, "An IRP is already currently processed\n"); Status = STATUS_INVALID_PARAMETER; } else @@ -777,21 +777,21 @@ case IOCTL_SERIAL_SET_XOFF: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_SET_XOFF not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_SET_XOFF not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_XON: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_SET_XON not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_SET_XON not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_WAIT_ON_MASK: { PIRP WaitingIrp; - DPRINT("IOCTL_SERIAL_WAIT_ON_MASK\n"); + TRACE_(SERIAL, "IOCTL_SERIAL_WAIT_ON_MASK\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; @@ -810,7 +810,7 @@ if (WaitingIrp != NULL) { /* Unable to have a 2nd pending IRP for this IOCTL */ - DPRINT("Unable to pend a second IRP for IOCTL_SERIAL_WAIT_ON_MASK\n"); + WARN_(SERIAL, "Unable to pend a second IRP for IOCTL_SERIAL_WAIT_ON_MASK\n"); Status = STATUS_INVALID_PARAMETER; } else @@ -824,14 +824,14 @@ case IOCTL_SERIAL_XOFF_COUNTER: { /* FIXME */ - DPRINT1("IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); + ERR_(SERIAL, "IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } default: { /* Pass Irp to lower driver */ - DPRINT("Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); + TRACE_(SERIAL, "Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDevice, Irp); } Modified: trunk/reactos/drivers/serial/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/info… ============================================================================== --- trunk/reactos/drivers/serial/serial/info.c (original) +++ trunk/reactos/drivers/serial/serial/info.c Sat Dec 29 00:10:07 2007 @@ -32,7 +32,7 @@ { PFILE_STANDARD_INFORMATION StandardInfo = (PFILE_STANDARD_INFORMATION)SystemBuffer; - DPRINT("IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); + TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); if (BufferLength < sizeof(FILE_STANDARD_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!StandardInfo) @@ -54,7 +54,7 @@ ASSERT(PositionInfo); - DPRINT("IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); + TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!PositionInfo) @@ -68,7 +68,7 @@ } default: { - DPRINT("IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); + TRACE_(SERIAL, "IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/serial/serial/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/misc… ============================================================================== --- trunk/reactos/drivers/serial/serial/misc.c (original) +++ trunk/reactos/drivers/serial/serial/misc.c Sat Dec 29 00:10:07 2007 @@ -37,7 +37,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p\n", LowerDevice); + TRACE_(SERIAL, "Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -85,7 +85,7 @@ while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DATA_RECEIVED) { Byte = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - DPRINT("Byte received on COM%lu: 0x%02x\n", + INFO_(SERIAL, "Byte received on COM%lu: 0x%02x\n", DeviceExtension->ComPort, Byte); Status = PushCircularBufferEntry(&DeviceExtension->InputBuffer, Byte); if (NT_SUCCESS(Status)) @@ -126,7 +126,7 @@ if (!NT_SUCCESS(Status)) break; WRITE_PORT_UCHAR(SER_THR(ComPortBase), Byte); - DPRINT("Byte sent to COM%lu: 0x%02x\n", + INFO_(SERIAL, "Byte sent to COM%lu: 0x%02x\n", DeviceExtension->ComPort, Byte); DeviceExtension->SerialPerfStats.TransmittedCount++; } @@ -178,7 +178,7 @@ case SR_IIR_MSR_CHANGE: { UCHAR MSR, IER; - DPRINT("SR_IIR_MSR_CHANGE\n"); + TRACE_(SERIAL, "SR_IIR_MSR_CHANGE\n"); MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); if (MSR & SR_MSR_CTS_CHANGED) @@ -199,12 +199,12 @@ } if (MSR & SR_MSR_RI_CHANGED) { - DPRINT("SR_MSR_RI_CHANGED changed: now %d\n", MSR & SI_MSR_RI); + INFO_(SERIAL, "SR_MSR_RI_CHANGED changed: now %d\n", MSR & SI_MSR_RI); Events |= SERIAL_EV_RING; } if (MSR & SR_MSR_DCD_CHANGED) { - DPRINT("SR_MSR_DCD_CHANGED changed: now %d\n", MSR & SR_MSR_DCD); + INFO_(SERIAL, "SR_MSR_DCD_CHANGED changed: now %d\n", MSR & SR_MSR_DCD); Events |= SERIAL_EV_RLSD; } IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); @@ -215,7 +215,7 @@ } case SR_IIR_THR_EMPTY: { - DPRINT("SR_IIR_THR_EMPTY\n"); + TRACE_(SERIAL, "SR_IIR_THR_EMPTY\n"); KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); Events |= SERIAL_EV_TXEMPTY; @@ -226,7 +226,7 @@ case SR_IIR_DATA_RECEIVED: { ULONG AlreadyReceivedBytes, Limit; - DPRINT("SR_IIR_DATA_RECEIVED\n"); + TRACE_(SERIAL, "SR_IIR_DATA_RECEIVED\n"); KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); Events |= SERIAL_EV_RXCHAR; @@ -247,7 +247,7 @@ case SR_IIR_ERROR: { UCHAR LSR; - DPRINT("SR_IIR_ERROR\n"); + TRACE_(SERIAL, "SR_IIR_ERROR\n"); LSR = READ_PORT_UCHAR(SER_LSR(ComPortBase)); if (LSR & SR_LSR_OVERRUN_ERROR) Modified: trunk/reactos/drivers/serial/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/pnp.… ============================================================================== --- trunk/reactos/drivers/serial/serial/pnp.c (original) +++ trunk/reactos/drivers/serial/serial/pnp.c Sat Dec 29 00:10:07 2007 @@ -27,7 +27,7 @@ static ULONG DeviceNumber = 0; static ULONG ComPortNumber = 1; - DPRINT("SerialAddDeviceInternal()\n"); + TRACE_(SERIAL, "SerialAddDeviceInternal()\n"); ASSERT(DriverObject); ASSERT(Pdo); @@ -44,7 +44,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%08x\n", Status); + WARN_(SERIAL, "IoCreateDevice() failed with status 0x%08x\n", Status); Fdo = NULL; goto ByeBye; } @@ -55,7 +55,7 @@ Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_COMPORT, NULL, &DeviceExtension->SerialInterfaceName); if (!NT_SUCCESS(Status)) { - DPRINT("IoRegisterDeviceInterface() failed with status 0x%08x\n", Status); + WARN_(SERIAL, "IoRegisterDeviceInterface() failed with status 0x%08x\n", Status); goto ByeBye; } @@ -81,7 +81,7 @@ Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); + WARN_(SERIAL, "IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); goto ByeBye; } if (DeviceExtension->LowerDevice->Flags & DO_POWER_PAGABLE) @@ -160,12 +160,12 @@ if (!ResourceList) { - DPRINT("No allocated resources sent to driver\n"); + WARN_(SERIAL, "No allocated resources sent to driver\n"); return STATUS_INSUFFICIENT_RESOURCES; } if (ResourceList->Count != 1) { - DPRINT("Wrong number of allocated resources sent to driver\n"); + WARN_(SERIAL, "Wrong number of allocated resources sent to driver\n"); return STATUS_INSUFFICIENT_RESOURCES; } if (ResourceList->List[0].PartialResourceList.Version != 1 @@ -173,7 +173,7 @@ || ResourceListTranslated->List[0].PartialResourceList.Version != 1 || ResourceListTranslated->List[0].PartialResourceList.Revision != 1) { - DPRINT("Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", + WARN_(SERIAL, "Revision mismatch: %u.%u != 1.1 or %u.%u != 1.1\n", ResourceList->List[0].PartialResourceList.Version, ResourceList->List[0].PartialResourceList.Revision, ResourceListTranslated->List[0].PartialResourceList.Version, @@ -209,7 +209,7 @@ break; } } - DPRINT("New COM port. Base = 0x%lx, Irql = %u\n", + INFO_(SERIAL, "New COM port. Base = 0x%lx, Irql = %u\n", DeviceExtension->BaseAddress, Dirql); if (!DeviceExtension->BaseAddress) return STATUS_INSUFFICIENT_RESOURCES; @@ -220,7 +220,7 @@ /* Test if we are trying to start the serial port used for debugging */ if (*KdComPortInUse == ULongToPtr(DeviceExtension->BaseAddress)) { - DPRINT("Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n"); + INFO_(SERIAL, "Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -236,7 +236,7 @@ Status = SerialSetBaudRate(DeviceExtension, DeviceExtension->BaudRate); if (!NT_SUCCESS(Status)) { - DPRINT("SerialSetBaudRate() failed with status 0x%08x\n", Status); + WARN_(SERIAL, "SerialSetBaudRate() failed with status 0x%08x\n", Status); return Status; } @@ -247,7 +247,7 @@ Status = SerialSetLineControl(DeviceExtension, &DeviceExtension->SerialLineControl); if (!NT_SUCCESS(Status)) { - DPRINT("SerialSetLineControl() failed with status 0x%08x\n", Status); + WARN_(SERIAL, "SerialSetLineControl() failed with status 0x%08x\n", Status); return Status; } @@ -269,7 +269,7 @@ Status = IoCreateSymbolicLink(&LinkName, &DeviceName); if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateSymbolicLink() failed with status 0x%08x\n", Status); + WARN_(SERIAL, "IoCreateSymbolicLink() failed with status 0x%08x\n", Status); return Status; } @@ -282,7 +282,7 @@ Affinity, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT("IoConnectInterrupt() failed with status 0x%08x\n", Status); + WARN_(SERIAL, "IoConnectInterrupt() failed with status 0x%08x\n", Status); IoSetDeviceInterfaceState(&DeviceExtension->SerialInterfaceName, FALSE); IoDeleteSymbolicLink(&LinkName); return Status; @@ -337,7 +337,7 @@ IRP_MN_QUERY_REMOVE_DEVICE 0x1 IRP_MN_REMOVE_DEVICE 0x2 { - DPRINT("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); IoAcquireRemoveLock IoReleaseRemoveLockAndWait pass request to DeviceExtension-LowerDriver @@ -360,7 +360,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState == dsStopped); @@ -379,16 +379,16 @@ { case BusRelations: { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } case RemovalRelations: { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } @@ -396,12 +396,12 @@ } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* (optional) 0xd */ { - DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + TRACE_(SERIAL, "IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); return ForwardIrpAndForget(DeviceObject, Irp); } default: { - DPRINT1("Unknown minor function 0x%x\n", MinorFunction); + TRACE_(SERIAL, "Unknown minor function 0x%x\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/serial/serial/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/powe… ============================================================================== --- trunk/reactos/drivers/serial/serial/power.c (original) +++ trunk/reactos/drivers/serial/serial/power.c Sat Dec 29 00:10:07 2007 @@ -14,7 +14,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("IRP_MJ_POWER dispatch\n"); + TRACE_(SERIAL, "IRP_MJ_POWER dispatch\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/serial/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/rw.c… ============================================================================== --- trunk/reactos/drivers/serial/serial/rw.c (original) +++ trunk/reactos/drivers/serial/serial/rw.c Sat Dec 29 00:10:07 2007 @@ -45,10 +45,10 @@ Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); - DPRINT("UseIntervalTimeout = %s, IntervalTimeout = %lu\n", + INFO_(SERIAL, "UseIntervalTimeout = %s, IntervalTimeout = %lu\n", WorkItemData->UseIntervalTimeout ? "YES" : "NO", WorkItemData->UseIntervalTimeout ? WorkItemData->IntervalTimeout.QuadPart : 0); - DPRINT("UseTotalTimeout = %s\n", + INFO_(SERIAL, "UseTotalTimeout = %s\n", WorkItemData->UseTotalTimeout ? "YES" : "NO"); ObjectCount = 1; @@ -70,7 +70,7 @@ && Length > 0) { PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); - DPRINT("Reading byte from buffer: 0x%02x\n", ReceivedByte); + INFO_(SERIAL, "Reading byte from buffer: 0x%02x\n", ReceivedByte); Buffer[Information++] = ReceivedByte; Length--; @@ -81,7 +81,7 @@ if (WorkItemData->DontWait && !(WorkItemData->ReadAtLeastOneByte && Information == 0)) { - DPRINT("Buffer empty. Don't wait more bytes\n"); + INFO_(SERIAL, "Buffer empty. Don't wait more bytes\n"); break; } @@ -98,7 +98,7 @@ if (Status == STATUS_TIMEOUT /* interval timeout */ || Status == STATUS_WAIT_1) /* total timeout */ { - DPRINT("Timeout when reading bytes. Status = 0x%08lx\n", Status); + TRACE_(SERIAL, "Timeout when reading bytes. Status = 0x%08lx\n", Status); break; } } @@ -122,7 +122,7 @@ PWORKITEM_DATA WorkItemData; PIRP Irp; - DPRINT("SerialReadWorkItem() called\n"); + TRACE_(SERIAL, "SerialReadWorkItem() called\n"); WorkItemData = (PWORKITEM_DATA)pWorkItemData; Irp = WorkItemData->Irp; @@ -148,7 +148,7 @@ PIO_WORKITEM WorkItem; NTSTATUS Status; - DPRINT("IRP_MJ_READ\n"); + TRACE_(SERIAL, "IRP_MJ_READ\n"); Stack = IoGetCurrentIrpStackLocation(Irp); Length = Stack->Parameters.Read.Length; @@ -260,7 +260,7 @@ KIRQL Irql; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("IRP_MJ_WRITE\n"); + TRACE_(SERIAL, "IRP_MJ_WRITE\n"); /* FIXME: pend operation if possible */ /* FIXME: use write timeouts */ @@ -297,7 +297,7 @@ } else { - DPRINT("Buffer overrun on COM%lu\n", DeviceExtension->ComPort); + WARN_(SERIAL, "Buffer overrun on COM%lu\n", DeviceExtension->ComPort); DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; break; } Modified: trunk/reactos/drivers/serial/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seri… ============================================================================== --- trunk/reactos/drivers/serial/serial/serial.h (original) +++ trunk/reactos/drivers/serial/serial/serial.h Sat Dec 29 00:10:07 2007 @@ -11,17 +11,7 @@ #include <ndk/haltypes.h> #include <ntddser.h> #include <stdio.h> - -#if defined(__GNUC__) - #include <debug.h> -#elif defined(_MSC_VER) - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - #define DPRINT - #define CHECKPOINT -#else - #error Unknown compiler! -#endif +#include <debug.h> #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) Modified: trunk/reactos/drivers/serial/serial/serial.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serial/seri… ============================================================================== --- trunk/reactos/drivers/serial/serial/serial.rbuild (original) +++ trunk/reactos/drivers/serial/serial/serial.rbuild Sat Dec 29 00:10:07 2007 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="serial" type="kernelmodedriver" installbase="system32/drivers" installname="serial.sys"> - <define name="NDEBUG" /> <library>ntoskrnl</library> <library>hal</library> <file>circularbuffer.c</file>

16 years, 8 months

[greatlrd] 31481: small bugfix in DxDdCleanupDxGraphics forget set ghsemDummyPage to 0 after it been free

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Dec 28 23:32:30 2007 New Revision: 31481 URL: http://svn.reactos.org/svn/reactos?rev=31481&view=rev Log: small bugfix in DxDdCleanupDxGraphics forget set ghsemDummyPage to 0 after it been free Modified: trunk/reactos/drivers/directx/dxg/main.c Modified: trunk/reactos/drivers/directx/dxg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxg/main.c… ============================================================================== --- trunk/reactos/drivers/directx/dxg/main.c (original) +++ trunk/reactos/drivers/directx/dxg/main.c Fri Dec 28 23:32:30 2007 @@ -14,7 +14,7 @@ #include "dxg_driver.h" ULONG gcMaxDdHmgr = 0; -ULONG gcSizeDdHmgr = 0; +ULONG gcSizeDdHmgr = 0; LONG gcDummyPageRefCnt = 0; HSEMAPHORE ghsemHmgr = NULL; HSEMAPHORE ghsemDummyPage = NULL; @@ -63,7 +63,7 @@ gcDummyPageRefCnt = 0; ghsemDummyPage = NULL; - /* + /* * Setup internal driver functions list we got from dxg driver functions list */ pDxgDrv->iDriverVersion = 0x80000; /* Note 12/1-2004 : DirectX 8 ? */ @@ -77,8 +77,8 @@ } /* - * Check if all drv functions are sorted right - * and if it really are exported + * Check if all drv functions are sorted right + * and if it really are exported */ for (i=1 ; i < DXENG_INDEX_DxEngLoadImage + 1; i++) @@ -119,20 +119,24 @@ return STATUS_NO_MEMORY; } + + + NTSTATUS DxDdCleanupDxGraphics() { DdHmgDestroy(); - if (!ghsemDummyPage) - { - if (!gpDummyPage) + if (ghsemDummyPage != 0 ) + { + if (gpDummyPage != 0 ) { ExFreePoolWithTag(gpDummyPage,0); gpDummyPage = NULL; gcDummyPageRefCnt = 0; } EngDeleteSemaphore(ghsemDummyPage); + ghsemDummyPage = 0; } return 0; @@ -149,7 +153,7 @@ if (gpentDdHmgr) { EngFreeMem(gpentDdHmgr); - gpentDdHmgr = NULL; + gpentDdHmgr = NULL; } if (ghsemHmgr) @@ -179,7 +183,7 @@ if (gpLockShortDelay) { - gpLockShortDelay->QuadPart = ((LONGLONG)-100000); + gpLockShortDelay->HighPart = -1; return TRUE; } @@ -193,3 +197,6 @@ return FALSE; } + + +

16 years, 8 months

[jimtabor] 31480: Implement GetETM.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 28 23:06:09 2007 New Revision: 31480 URL: http://svn.reactos.org/svn/reactos?rev=31480&view=rev Log: Implement GetETM. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Dec 28 23:06:09 2007 @@ -1582,19 +1582,20 @@ return 0; } - - -/* - * @unimplemented +/* + * @implemented */ BOOL STDCALL GetETM(HDC hdc, EXTTEXTMETRIC *petm) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + BOOL Ret = NtGdiGetETM(hdc, petm); + if ( Ret ) + { + if ( petm ) petm->emKernPairs = GetKerningPairsA(hdc, 0, 0); + } + return Ret; } /*

16 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007