https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b1edceae1f10af2fab4f5e0159c5bc1350095a1
commit 9b1edceae1f10af2fab4f5e0159c5bc1350095a1 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sun Sep 12 19:49:54 2021 +0200 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Mon Sep 13 03:52:19 2021 +0200 [REACTOS] Fix some instances of DPRINTs with trailing whitespace before newlines. --- base/system/services/controlset.c | 2 +- boot/freeldr/freeldr/lib/peloader.c | 2 +- boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 2 +- boot/freeldr/freeldr/ntldr/wlregistry.c | 16 +++--- dll/win32/syssetup/install.c | 6 +-- dll/win32/userenv/registry.c | 4 +- drivers/usb/usbport/iface.c | 34 ++++++------- drivers/usb/usbport/usbport.c | 58 +++++++++++----------- .../rostests/apitests/advapi32/RegQueryValueExW.c | 32 ++++++------ modules/rostests/apitests/crt/_vsnprintf.c | 6 +-- modules/rostests/apitests/gdi32/ExtCreateRegion.c | 2 +- modules/rostests/apitests/gdi32/init.c | 4 +- modules/rostests/apitests/ntdll/RtlMemoryStream.c | 16 +++--- .../apitests/setupapi/SetupDiInstallClassExA.c | 8 +-- modules/rostests/apitests/user32/GetKeyState.c | 4 +- modules/rostests/win32/smss/movefile/movefile.cpp | 10 ++-- ntoskrnl/io/iomgr/iofunc.c | 16 +++--- ntoskrnl/io/pnpmgr/pnpmgr.c | 2 +- ntoskrnl/ps/debug.c | 2 +- ntoskrnl/ps/kill.c | 4 +- sdk/include/reactos/shellutils.h | 4 +- sdk/lib/rtl/critical.c | 2 +- sdk/lib/rtl/dbgbuffer.c | 14 +++--- sdk/lib/rtl/exception.c | 2 +- sdk/lib/rtl/heappage.c | 16 +++--- sdk/lib/rtl/process.c | 2 +- sdk/tools/spec2def/spec2def.c | 2 +- 27 files changed, 136 insertions(+), 136 deletions(-) diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c index 1eb0facd545..e34eb2f3528 100644 --- a/base/system/services/controlset.c +++ b/base/system/services/controlset.c @@ -239,7 +239,7 @@ ScmCopyTree( lpNameBuffer); } - DPRINT("ScmCopyTree() done \n"); + DPRINT("ScmCopyTree() done\n"); return ERROR_SUCCESS; } diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 340eba1d2c0..64ef1103562 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -678,7 +678,7 @@ PeLdrAllocateDataTableEntry( /* Insert this DTE to a list in the LPB */ InsertTailList(ModuleListHead, &DataTableEntry->InLoadOrderLinks); - TRACE("Inserting DTE %p, name='%.*S' DllBase=%p \n", DataTableEntry, + TRACE("Inserting DTE %p, name='%.*S' DllBase=%p\n", DataTableEntry, DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer), DataTableEntry->DllBase); diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index a87e1a28f91..759a72f108c 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -324,7 +324,7 @@ MempSetupPaging(IN PFN_NUMBER StartPage, if (KernelMapping) { - if (KernelPT[Page & 0x3ff].Valid) WARN("xxx already mapped \n"); + if (KernelPT[Page & 0x3ff].Valid) WARN("KernelPT already mapped\n"); KernelPT[Page & 0x3ff].PageFrameNumber = Page; KernelPT[Page & 0x3ff].Valid = (Page != 0); KernelPT[Page & 0x3ff].Write = (Page != 0); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index c4a3e0ba9c9..5fbe864d3df 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -540,8 +540,8 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, TRACE_CH(REACTOS, "RegQueryValue(): rc %d\n", (int)rc); if (rc != ERROR_SUCCESS) return; - TRACE_CH(REACTOS, "BufferSize: %d \n", (int)BufferSize); - TRACE_CH(REACTOS, "GroupNameBuffer: '%S' \n", GroupNameBuffer); + TRACE_CH(REACTOS, "BufferSize: %d\n", (int)BufferSize); + TRACE_CH(REACTOS, "GroupNameBuffer: '%S'\n", GroupNameBuffer); /* Loop through each group */ GroupName = GroupNameBuffer; @@ -580,18 +580,18 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, ValueSize = sizeof(ULONG); rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Start: %x \n", (int)StartValue); + //TRACE_CH(REACTOS, " Start: %x\n", (int)StartValue); /* Read the Tag */ ValueSize = sizeof(ULONG); rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Tag: %x \n", (int)TagValue); + //TRACE_CH(REACTOS, " Tag: %x\n", (int)TagValue); /* Read the driver's group */ DriverGroupSize = sizeof(DriverGroup); rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - //TRACE_CH(REACTOS, " Group: '%S' \n", DriverGroup); + //TRACE_CH(REACTOS, " Group: '%S'\n", DriverGroup); /* Make sure it should be started */ if ((StartValue == 0) && @@ -659,18 +659,18 @@ WinLdrScanRegistry(IN OUT PLIST_ENTRY BootDriverListHead, ValueSize = sizeof(ULONG); rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Start: %x \n", (int)StartValue); + //TRACE_CH(REACTOS, " Start: %x\n", (int)StartValue); /* Read the Tag */ ValueSize = sizeof(ULONG); rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - //TRACE_CH(REACTOS, " Tag: %x \n", (int)TagValue); + //TRACE_CH(REACTOS, " Tag: %x\n", (int)TagValue); /* Read the driver's group */ DriverGroupSize = sizeof(DriverGroup); rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - //TRACE_CH(REACTOS, " Group: '%S' \n", DriverGroup); + //TRACE_CH(REACTOS, " Group: '%S'\n", DriverGroup); for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 5feefa3611b..19423f11c97 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -375,7 +375,7 @@ InstallSysSetupInfComponents(VOID) ARRAYSIZE(szNameBuffer), NULL)) { - FatalError("Error while trying to get component name \n"); + FatalError("Error while trying to get component name\n"); return FALSE; } @@ -385,11 +385,11 @@ InstallSysSetupInfComponents(VOID) ARRAYSIZE(szSectionBuffer), NULL)) { - FatalError("Error while trying to get component install section \n"); + FatalError("Error while trying to get component install section\n"); return FALSE; } - DPRINT("Trying to execute install section '%S' from '%S' \n", szSectionBuffer, szNameBuffer); + DPRINT("Trying to execute install section '%S' from '%S'\n", szSectionBuffer, szNameBuffer); hComponentInf = SetupOpenInfFileW(szNameBuffer, NULL, diff --git a/dll/win32/userenv/registry.c b/dll/win32/userenv/registry.c index 7be864cdcb2..a7fc4fee49c 100644 --- a/dll/win32/userenv/registry.c +++ b/dll/win32/userenv/registry.c @@ -68,7 +68,7 @@ CopyKey(HKEY hDstKey, HKEY hDstSubKey; HKEY hSrcSubKey; - DPRINT ("CopyKey() called \n"); + DPRINT ("CopyKey() called\n"); Error = RegQueryInfoKey(hSrcKey, NULL, @@ -268,7 +268,7 @@ CopyKey(HKEY hDstKey, lpNameBuffer); } - DPRINT("CopyKey() done \n"); + DPRINT("CopyKey() done\n"); return TRUE; #endif diff --git a/drivers/usb/usbport/iface.c b/drivers/usb/usbport/iface.c index 89e07f69ff8..464f73992d9 100644 --- a/drivers/usb/usbport/iface.c +++ b/drivers/usb/usbport/iface.c @@ -14,14 +14,14 @@ VOID USB_BUSIFFN USBI_InterfaceReference(IN PVOID BusContext) { - DPRINT("USBI_InterfaceReference \n"); + DPRINT("USBI_InterfaceReference\n"); } VOID USB_BUSIFFN USBI_InterfaceDereference(IN PVOID BusContext) { - DPRINT("USBI_InterfaceDereference \n"); + DPRINT("USBI_InterfaceDereference\n"); } /* USB port driver Interface functions */ @@ -39,7 +39,7 @@ USBHI_CreateUsbDevice(IN PVOID BusContext, PUSB_DEVICE_HANDLE deviceHandle = NULL; NTSTATUS Status; - DPRINT("USBHI_CreateUsbDevice: ... \n"); + DPRINT("USBHI_CreateUsbDevice: ...\n"); PdoDevice = BusContext; PdoExtension = PdoDevice->DeviceExtension; @@ -63,7 +63,7 @@ USBHI_InitializeUsbDevice(IN PVOID BusContext, PDEVICE_OBJECT PdoDevice; PUSBPORT_RHDEVICE_EXTENSION PdoExtension; - DPRINT("USBHI_InitializeUsbDevice \n"); + DPRINT("USBHI_InitializeUsbDevice\n"); PdoDevice = BusContext; PdoExtension = PdoDevice->DeviceExtension; @@ -175,7 +175,7 @@ USBHI_QueryDeviceInformation(IN PVOID BusContext, ULONG ActualLength; ULONG ix; - DPRINT("USBHI_QueryDeviceInformation: ... \n"); + DPRINT("USBHI_QueryDeviceInformation: ...\n"); *LenDataReturned = 0; @@ -431,7 +431,7 @@ USBHI_GetExtendedHubInformation(IN PVOID BusContext, USB_PORT_STATUS_AND_CHANGE PortStatus; ULONG PortAttrX; - DPRINT("USBHI_GetExtendedHubInformation: ... \n"); + DPRINT("USBHI_GetExtendedHubInformation: ...\n"); PdoDevice = BusContext; PdoExtension = PdoDevice->DeviceExtension; @@ -530,7 +530,7 @@ USBHI_GetRootHubSymbolicName(IN PVOID BusContext, PUNICODE_STRING InfoBuffer; NTSTATUS Status; - DPRINT("USBHI_GetRootHubSymbolicName: ... \n"); + DPRINT("USBHI_GetRootHubSymbolicName: ...\n"); PdoDevice = BusContext; @@ -559,7 +559,7 @@ USB_BUSIFFN USBHI_GetDeviceBusContext(IN PVOID BusContext, IN PVOID DeviceHandle) { - DPRINT1("USBHI_GetDeviceBusContext: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBHI_GetDeviceBusContext: UNIMPLEMENTED. FIXME.\n"); return NULL; } @@ -596,7 +596,7 @@ USBHI_RootHubInitNotification(IN PVOID BusContext, PUSBPORT_DEVICE_EXTENSION FdoExtension; KIRQL OldIrql; - DPRINT("USBHI_RootHubInitNotification \n"); + DPRINT("USBHI_RootHubInitNotification\n"); PdoDevice = BusContext; PdoExtension = PdoDevice->DeviceExtension; @@ -619,7 +619,7 @@ USBHI_FlushTransfers(IN PVOID BusContext, PDEVICE_OBJECT PdoDevice; PUSBPORT_RHDEVICE_EXTENSION PdoExtension; - DPRINT("USBHI_FlushTransfers: ... \n"); + DPRINT("USBHI_FlushTransfers: ...\n"); PdoDevice = BusContext; PdoExtension = PdoDevice->DeviceExtension; @@ -633,7 +633,7 @@ USBHI_SetDeviceHandleData(IN PVOID BusContext, IN PVOID DeviceHandle, IN PDEVICE_OBJECT UsbDevicePdo) { - DPRINT1("USBHI_SetDeviceHandleData: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBHI_SetDeviceHandleData: UNIMPLEMENTED. FIXME.\n"); } /* USB bus driver Interface functions */ @@ -644,7 +644,7 @@ USBDI_GetUSBDIVersion(IN PVOID BusContext, OUT PUSBD_VERSION_INFORMATION VersionInfo, OUT PULONG HcdCapabilities) { - DPRINT1("USBDI_GetUSBDIVersion: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBDI_GetUSBDIVersion: UNIMPLEMENTED. FIXME.\n"); } NTSTATUS @@ -652,7 +652,7 @@ USB_BUSIFFN USBDI_QueryBusTime(IN PVOID BusContext, OUT PULONG CurrentFrame) { - DPRINT1("USBDI_QueryBusTime: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBDI_QueryBusTime: UNIMPLEMENTED. FIXME.\n"); return STATUS_SUCCESS; } @@ -661,7 +661,7 @@ USB_BUSIFFN USBDI_SubmitIsoOutUrb(IN PVOID BusContext, IN PURB Urb) { - DPRINT1("USBDI_SubmitIsoOutUrb: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBDI_SubmitIsoOutUrb: UNIMPLEMENTED. FIXME.\n"); return STATUS_SUCCESS; } @@ -754,7 +754,7 @@ USBDI_IsDeviceHighSpeed(IN PVOID BusContext) PUSBPORT_DEVICE_EXTENSION FdoExtension; PUSBPORT_REGISTRATION_PACKET Packet; - DPRINT("USBDI_IsDeviceHighSpeed: ... \n"); + DPRINT("USBDI_IsDeviceHighSpeed: ...\n"); PdoDevice = BusContext; PdoExtension = PdoDevice->DeviceExtension; @@ -773,7 +773,7 @@ USBDI_EnumLogEntry(IN PVOID BusContext, IN ULONG P1, IN ULONG P2) { - DPRINT1("USBDI_EnumLogEntry: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBDI_EnumLogEntry: UNIMPLEMENTED. FIXME.\n"); return STATUS_SUCCESS; } @@ -789,7 +789,7 @@ USBPORT_PdoQueryInterface(IN PDEVICE_OBJECT FdoDevice, UNICODE_STRING GuidBuffer; NTSTATUS Status; - DPRINT("USBPORT_PdoQueryInterface: ... \n"); + DPRINT("USBPORT_PdoQueryInterface: ...\n"); if (IsEqualGUIDAligned(IoStack->Parameters.QueryInterface.InterfaceType, &USB_BUS_INTERFACE_HUB_GUID)) diff --git a/drivers/usb/usbport/usbport.c b/drivers/usb/usbport/usbport.c index cb33998a762..1d6a20ad5f4 100644 --- a/drivers/usb/usbport/usbport.c +++ b/drivers/usb/usbport/usbport.c @@ -256,7 +256,7 @@ USBPORT_SetRegistryKeyValue(IN PDEVICE_OBJECT DeviceObject, HANDLE KeyHandle; NTSTATUS Status; - DPRINT("USBPORT_SetRegistryKeyValue: ValueNameString - %S \n", + DPRINT("USBPORT_SetRegistryKeyValue: ValueNameString - %S\n", ValueNameString); if (UseDriverKey) @@ -416,7 +416,7 @@ USBPORT_GetSetConfigSpaceData(IN PDEVICE_OBJECT FdoDevice, PUSBPORT_DEVICE_EXTENSION FdoExtension; ULONG BytesReadWrite; - DPRINT("USBPORT_GetSetConfigSpaceData ... \n"); + DPRINT("USBPORT_GetSetConfigSpaceData ...\n"); FdoExtension = FdoDevice->DeviceExtension; @@ -463,7 +463,7 @@ USBPORT_ReadWriteConfigSpace(IN PVOID MiniPortExtension, PUSBPORT_DEVICE_EXTENSION FdoExtension; PDEVICE_OBJECT FdoDevice; - DPRINT("USBPORT_ReadWriteConfigSpace: ... \n"); + DPRINT("USBPORT_ReadWriteConfigSpace: ...\n"); //FdoExtension->MiniPortExt = (PVOID)((ULONG_PTR)FdoExtension + sizeof(USBPORT_DEVICE_EXTENSION)); FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - @@ -595,7 +595,7 @@ USBPORT_SoftInterruptDpc(IN PRKDPC Dpc, PDEVICE_OBJECT FdoDevice; PUSBPORT_DEVICE_EXTENSION FdoExtension; - DPRINT_INT("USBPORT_SoftInterruptDpc: ... \n"); + DPRINT_INT("USBPORT_SoftInterruptDpc: ...\n"); FdoDevice = DeferredContext; FdoExtension = FdoDevice->DeviceExtension; @@ -613,7 +613,7 @@ USBPORT_SoftInterrupt(IN PDEVICE_OBJECT FdoDevice) PUSBPORT_DEVICE_EXTENSION FdoExtension; LARGE_INTEGER DueTime = {{0, 0}}; - DPRINT_INT("USBPORT_SoftInterrupt: ... \n"); + DPRINT_INT("USBPORT_SoftInterrupt: ...\n"); FdoExtension = FdoDevice->DeviceExtension; @@ -645,11 +645,11 @@ USBPORT_InvalidateControllerHandler(IN PDEVICE_OBJECT FdoDevice, switch (Type) { case USBPORT_INVALIDATE_CONTROLLER_RESET: - DPRINT1("USBPORT_InvalidateControllerHandler: INVALIDATE_CONTROLLER_RESET UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBPORT_InvalidateControllerHandler: INVALIDATE_CONTROLLER_RESET UNIMPLEMENTED. FIXME.\n"); break; case USBPORT_INVALIDATE_CONTROLLER_SURPRISE_REMOVE: - DPRINT1("USBPORT_InvalidateControllerHandler: INVALIDATE_CONTROLLER_SURPRISE_REMOVE UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBPORT_InvalidateControllerHandler: INVALIDATE_CONTROLLER_SURPRISE_REMOVE UNIMPLEMENTED. FIXME.\n"); break; case USBPORT_INVALIDATE_CONTROLLER_SOFT_INTERRUPT: @@ -692,7 +692,7 @@ USBPORT_NotifyDoubleBuffer(IN PVOID MiniPortExtension, IN PVOID Buffer, IN SIZE_T Length) { - DPRINT1("USBPORT_NotifyDoubleBuffer: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBPORT_NotifyDoubleBuffer: UNIMPLEMENTED. FIXME.\n"); return 0; } @@ -706,7 +706,7 @@ USBPORT_WorkerRequestDpc(IN PRKDPC Dpc, PDEVICE_OBJECT FdoDevice; PUSBPORT_DEVICE_EXTENSION FdoExtension; - DPRINT("USBPORT_WorkerRequestDpc: ... \n"); + DPRINT("USBPORT_WorkerRequestDpc: ...\n"); FdoDevice = DeferredContext; FdoExtension = FdoDevice->DeviceExtension; @@ -771,7 +771,7 @@ USBPORT_FlushDoneTransfers(IN PDEVICE_OBJECT FdoDevice) KIRQL OldIrql; BOOLEAN IsHasTransfers; - DPRINT_CORE("USBPORT_FlushDoneTransfers: ... \n"); + DPRINT_CORE("USBPORT_FlushDoneTransfers: ...\n"); FdoExtension = FdoDevice->DeviceExtension; DoneTransferList = &FdoExtension->DoneTransferList; @@ -829,7 +829,7 @@ USBPORT_TransferFlushDpc(IN PRKDPC Dpc, { PDEVICE_OBJECT FdoDevice; - DPRINT_CORE("USBPORT_TransferFlushDpc: ... \n"); + DPRINT_CORE("USBPORT_TransferFlushDpc: ...\n"); FdoDevice = DeferredContext; USBPORT_FlushDoneTransfers(FdoDevice); } @@ -869,7 +869,7 @@ USBPORT_DpcHandler(IN PDEVICE_OBJECT FdoDevice) LIST_ENTRY List; LONG LockCounter; - DPRINT_CORE("USBPORT_DpcHandler: ... \n"); + DPRINT_CORE("USBPORT_DpcHandler: ...\n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1113,7 +1113,7 @@ USBPORT_SignalWorkerThread(IN PDEVICE_OBJECT FdoDevice) PUSBPORT_DEVICE_EXTENSION FdoExtension; KIRQL OldIrql; - DPRINT_CORE("USBPORT_SignalWorkerThread ... \n"); + DPRINT_CORE("USBPORT_SignalWorkerThread ...\n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1134,7 +1134,7 @@ USBPORT_WorkerThreadHandler(IN PDEVICE_OBJECT FdoDevice) LIST_ENTRY list; BOOLEAN Result; - DPRINT_CORE("USBPORT_WorkerThreadHandler: ... \n"); + DPRINT_CORE("USBPORT_WorkerThreadHandler: ...\n"); FdoExtension = FdoDevice->DeviceExtension; Packet = &FdoExtension->MiniPortInterface->Packet; @@ -1281,7 +1281,7 @@ USBPORT_SynchronizeRootHubCallback(IN PDEVICE_OBJECT FdoDevice, FdoExtension->Flags &= ~USBPORT_FLAG_RH_INIT_CALLBACK; InterlockedCompareExchange(&FdoExtension->RHInitCallBackLock, 0, 1); - DPRINT("USBPORT_SynchronizeRootHubCallback: exit \n"); + DPRINT("USBPORT_SynchronizeRootHubCallback: exit\n"); return; } @@ -1360,7 +1360,7 @@ USBPORT_SynchronizeRootHubCallback(IN PDEVICE_OBJECT FdoDevice, FdoExtension->Flags &= ~USBPORT_FLAG_RH_INIT_CALLBACK; } - DPRINT("USBPORT_SynchronizeRootHubCallback: exit \n"); + DPRINT("USBPORT_SynchronizeRootHubCallback: exit\n"); } VOID @@ -1373,7 +1373,7 @@ USBPORT_WorkerThread(IN PVOID StartContext) LARGE_INTEGER NewTime; KIRQL OldIrql; - DPRINT_CORE("USBPORT_WorkerThread ... \n"); + DPRINT_CORE("USBPORT_WorkerThread ...\n"); FdoDevice = StartContext; FdoExtension = FdoDevice->DeviceExtension; @@ -1400,7 +1400,7 @@ USBPORT_WorkerThread(IN PVOID StartContext) KeAcquireSpinLock(&FdoExtension->WorkerThreadEventSpinLock, &OldIrql); KeClearEvent(&FdoExtension->WorkerThreadEvent); KeReleaseSpinLock(&FdoExtension->WorkerThreadEventSpinLock, OldIrql); - DPRINT_CORE("USBPORT_WorkerThread: run \n"); + DPRINT_CORE("USBPORT_WorkerThread: run\n"); if (FdoExtension->MiniPortFlags & USBPORT_MPFLAG_INTERRUPTS_ENABLED) { @@ -1429,7 +1429,7 @@ USBPORT_CreateWorkerThread(IN PDEVICE_OBJECT FdoDevice) PUSBPORT_DEVICE_EXTENSION FdoExtension; NTSTATUS Status; - DPRINT("USBPORT_CreateWorkerThread ... \n"); + DPRINT("USBPORT_CreateWorkerThread ...\n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1457,7 +1457,7 @@ USBPORT_StopWorkerThread(IN PDEVICE_OBJECT FdoDevice) PUSBPORT_DEVICE_EXTENSION FdoExtension; NTSTATUS Status; - DPRINT("USBPORT_StopWorkerThread ... \n"); + DPRINT("USBPORT_StopWorkerThread ...\n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1774,7 +1774,7 @@ USBPORT_FreeCommonBuffer(IN PDEVICE_OBJECT FdoDevice, PDMA_ADAPTER DmaAdapter; PDMA_OPERATIONS DmaOperations; - DPRINT("USBPORT_FreeCommonBuffer: ... \n"); + DPRINT("USBPORT_FreeCommonBuffer: ...\n"); FdoExtension = FdoDevice->DeviceExtension; @@ -1797,7 +1797,7 @@ USBPORT_FindMiniPort(IN PDRIVER_OBJECT DriverObject) PUSBPORT_MINIPORT_INTERFACE MiniPortInterface; BOOLEAN IsFound = FALSE; - DPRINT("USBPORT_FindMiniPort: ... \n"); + DPRINT("USBPORT_FindMiniPort: ...\n"); KeAcquireSpinLock(&USBPORT_SpinLock, &OldIrql); @@ -1981,7 +1981,7 @@ USBPORT_Unload(IN PDRIVER_OBJECT DriverObject) KeBugCheckEx(BUGCODE_USB_DRIVER, 1, 0, 0, 0); } - DPRINT1("USBPORT_Unload: UNIMPLEMENTED. FIXME. \n"); + DPRINT1("USBPORT_Unload: UNIMPLEMENTED. FIXME.\n"); //MiniPortInterface->DriverUnload(DriverObject); // Call MiniPort _HCI_Unload } @@ -2062,7 +2062,7 @@ USBPORT_AsyncTimerDpc(IN PRKDPC Dpc, PUSBPORT_DEVICE_EXTENSION FdoExtension; PUSBPORT_ASYNC_CALLBACK_DATA AsyncCallbackData; - DPRINT("USBPORT_AsyncTimerDpc: ... \n"); + DPRINT("USBPORT_AsyncTimerDpc: ...\n"); AsyncCallbackData = DeferredContext; FdoDevice = AsyncCallbackData->FdoDevice; @@ -2087,7 +2087,7 @@ USBPORT_RequestAsyncCallback(IN PVOID MiniPortExtension, PUSBPORT_ASYNC_CALLBACK_DATA AsyncCallbackData; LARGE_INTEGER DueTime = {{0, 0}}; - DPRINT("USBPORT_RequestAsyncCallback: ... \n"); + DPRINT("USBPORT_RequestAsyncCallback: ...\n"); FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - sizeof(USBPORT_DEVICE_EXTENSION)); @@ -2141,7 +2141,7 @@ USBPORT_GetMappedVirtualAddress(IN ULONG PhysicalAddress, ULONG Offset; ULONG_PTR VirtualAddress; - DPRINT_CORE("USBPORT_GetMappedVirtualAddress ... \n"); + DPRINT_CORE("USBPORT_GetMappedVirtualAddress ...\n"); Endpoint = (PUSBPORT_ENDPOINT)((ULONG_PTR)MiniPortEndpoint - sizeof(USBPORT_ENDPOINT)); @@ -2168,7 +2168,7 @@ USBPORT_InvalidateEndpoint(IN PVOID MiniPortExtension, PDEVICE_OBJECT FdoDevice; PUSBPORT_ENDPOINT Endpoint; - DPRINT_CORE("USBPORT_InvalidateEndpoint: ... \n"); + DPRINT_CORE("USBPORT_InvalidateEndpoint: ...\n"); FdoExtension = (PUSBPORT_DEVICE_EXTENSION)((ULONG_PTR)MiniPortExtension - sizeof(USBPORT_DEVICE_EXTENSION)); @@ -2332,7 +2332,7 @@ USBPORT_MapTransfer(IN PDEVICE_OBJECT FdoDevice, LIST_ENTRY List; PUSBPORT_TRANSFER transfer; - DPRINT_CORE("USBPORT_MapTransfer: ... \n"); + DPRINT_CORE("USBPORT_MapTransfer: ...\n"); FdoExtension = FdoDevice->DeviceExtension; DmaAdapter = FdoExtension->DmaAdapter; @@ -2493,7 +2493,7 @@ USBPORT_FlushMapTransfers(IN PDEVICE_OBJECT FdoDevice) NTSTATUS Status; PDMA_OPERATIONS DmaOperations; - DPRINT_CORE("USBPORT_FlushMapTransfers: ... \n"); + DPRINT_CORE("USBPORT_FlushMapTransfers: ...\n"); FdoExtension = FdoDevice->DeviceExtension; DmaOperations = FdoExtension->DmaAdapter->DmaOperations; diff --git a/modules/rostests/apitests/advapi32/RegQueryValueExW.c b/modules/rostests/apitests/advapi32/RegQueryValueExW.c index dcabb6e34f1..e97d968ccb1 100644 --- a/modules/rostests/apitests/advapi32/RegQueryValueExW.c +++ b/modules/rostests/apitests/advapi32/RegQueryValueExW.c @@ -77,7 +77,7 @@ START_TEST(RegQueryValueExW) ret = RegQueryValueExW(NULL, NULL, &reserved, NULL, NULL, NULL); ok(ret == ERROR_INVALID_PARAMETER, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); - ok(reserved == 3, "Expected reserved=3, reserved is: %ld \n", reserved); + ok(reserved == 3, "Expected reserved=3, reserved is: %ld\n", reserved); /* NULL handle. NULL value. Reserved not NULL */ type = 666; @@ -88,8 +88,8 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_PARAMETER, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); - ok(reserved == 3, "Expected reserved = 3, reserved is: %ld \n", reserved); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); + ok(reserved == 3, "Expected reserved = 3, reserved is: %ld\n", reserved); /* NULL handle. NULL value */ type = 666; @@ -99,7 +99,7 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_HANDLE, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); /* NULL handle . Inexistent value. Reserved not NULL */ type = 666; @@ -110,8 +110,8 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_PARAMETER, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); - ok(reserved == 3, "Expected reserved = 3, reserved is: %ld \n", reserved); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); + ok(reserved == 3, "Expected reserved = 3, reserved is: %ld\n", reserved); /* NULL handle . Inexistent value. */ type = 666; @@ -121,7 +121,7 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_HANDLE, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); /* NULL handle */ type = 666; @@ -131,7 +131,7 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_HANDLE, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); /* INVALID handle. NULL value. Reserved not NULL */ type = 666; @@ -142,8 +142,8 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_PARAMETER, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); - ok(reserved == 3, "Expected reserved = 3, reserved is: %ld \n", reserved); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); + ok(reserved == 3, "Expected reserved = 3, reserved is: %ld\n", reserved); /* INVALID handle. NULL value.*/ type = 666; @@ -154,7 +154,7 @@ START_TEST(RegQueryValueExW) ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == REG_NONE, "Expected REG_NONE, Type is: %ld\n", type); ok(size == 0, "Expected size = 0, size is: %ld\n", size); - ok(reserved == 3, "Expected reserved = 3, reserved is: %ld \n", reserved); + ok(reserved == 3, "Expected reserved = 3, reserved is: %ld\n", reserved); /* INVALID handle. Non-existent value. Reserved not NULL*/ type = 666; @@ -165,8 +165,8 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_PARAMETER, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); - ok(reserved == 3, "Expected reserved = 3, reserved is: %ld \n", reserved); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); + ok(reserved == 3, "Expected reserved = 3, reserved is: %ld\n", reserved); /* INVALID handle. Non-existent value. */ type = 666; @@ -187,7 +187,7 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_PARAMETER, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); ok(reserved == 3, "Expected reserved = 3, reserved is: %ld\n", reserved); /* VALID handle, Non-existent value */ @@ -230,8 +230,8 @@ START_TEST(RegQueryValueExW) ok(ret == ERROR_INVALID_PARAMETER, "RegQueryValueExW returned: %lx\n", ret); ok(GetLastError() == 0xdeadbeef, "RegQueryValueExW returned: %lx\n", GetLastError()); ok(type == 666, "Expected untouched, Type was set with: %ld\n", type); - ok(size == 666, "Expected untouched, Size was set with: %ld \n", size); - ok(reserved == 3, "Expected reserved = 3, reserved is: %ld \n", reserved); + ok(size == 666, "Expected untouched, Size was set with: %ld\n", size); + ok(reserved == 3, "Expected reserved = 3, reserved is: %ld\n", reserved); /* Existent value */ SetLastError(0xdeadbeef); diff --git a/modules/rostests/apitests/crt/_vsnprintf.c b/modules/rostests/apitests/crt/_vsnprintf.c index 22cec8655a5..d23f6dc2806 100644 --- a/modules/rostests/apitests/crt/_vsnprintf.c +++ b/modules/rostests/apitests/crt/_vsnprintf.c @@ -49,7 +49,7 @@ START_TEST(_vsnprintf) #if defined(TEST_USER32) /* NTDLL doesn't use/set errno */ ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); #else - ok(errno == 0, "Expected 0, got %u \n", errno); + ok(errno == 0, "Expected 0, got %u\n", errno); #endif /* This one is no better */ @@ -69,7 +69,7 @@ START_TEST(_vsnprintf) #if defined(TEST_USER32) /* NTDLL doesn't use/set errno */ ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); #else - ok(errno == 0, "Expected 0, got %u \n", errno); + ok(errno == 0, "Expected 0, got %u\n", errno); #endif /* One more NULL checks */ @@ -80,6 +80,6 @@ START_TEST(_vsnprintf) #if defined(TEST_USER32) /* NTDLL doesn't use/set errno */ ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); #else - ok(errno == 0, "Expected 0, got %u \n", errno); + ok(errno == 0, "Expected 0, got %u\n", errno); #endif } diff --git a/modules/rostests/apitests/gdi32/ExtCreateRegion.c b/modules/rostests/apitests/gdi32/ExtCreateRegion.c index 16fe55f143d..3b3e1f16f83 100644 --- a/modules/rostests/apitests/gdi32/ExtCreateRegion.c +++ b/modules/rostests/apitests/gdi32/ExtCreateRegion.c @@ -31,7 +31,7 @@ InitXFORM( void Test_ExtCreateRegion_Parameters() { hrgn = ExtCreateRegion(NULL, 1, pRgnData); - ok(hrgn != NULL, "ExtCreateRegion failed \n"); + ok(hrgn != NULL, "ExtCreateRegion failed\n"); } #endif // 0 diff --git a/modules/rostests/apitests/gdi32/init.c b/modules/rostests/apitests/gdi32/init.c index ab7d4673eaf..dd4b83c0572 100644 --- a/modules/rostests/apitests/gdi32/init.c +++ b/modules/rostests/apitests/gdi32/init.c @@ -99,7 +99,7 @@ BOOL InitStuff(void) ghpal = CreatePalette((LOGPALETTE*)&gpal); if (!ghpal) { - printf("failed to create a palette \n"); + printf("failed to create a palette\n"); return FALSE; } @@ -110,7 +110,7 @@ BOOL InitStuff(void) !InitPerBitDepth(24, 8, 8, &ghbmp24, &ghdcDIB24, &ghbmpDIB24, &gpvDIB24) || !InitPerBitDepth(32, 8, 8, &ghbmp32, &ghdcDIB32, &ghbmpDIB32, &gpvDIB32)) { - printf("failed to create objects \n"); + printf("failed to create objects\n"); return FALSE; } diff --git a/modules/rostests/apitests/ntdll/RtlMemoryStream.c b/modules/rostests/apitests/ntdll/RtlMemoryStream.c index 0cde75edb49..a98d30e0567 100644 --- a/modules/rostests/apitests/ntdll/RtlMemoryStream.c +++ b/modules/rostests/apitests/ntdll/RtlMemoryStream.c @@ -35,14 +35,14 @@ BOOL CompareStructsAndSaveForLater(PRTL_MEMORY_STREAM pold, PRTL_MEMORY_STREAM p BOOL equal = TRUE; // Compare - if (pold->Vtbl != pnew->Vtbl) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Vtbl changed from %p to %p\n", pold->Vtbl, pnew->Vtbl);} - if (pold->RefCount != pnew->RefCount) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("RefCount changed from %ld to %ld\n", pold->RefCount, pnew->RefCount); } - if (pold->Unk1 != pnew->Unk1) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Unk1 changed from %lu to %lu\n", pold->Unk1, pnew->Unk1); } - if (pold->Current != pnew->Current) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Current changed from %p to %p\n", pold->Current, pnew->Current); } - if (pold->Start != pnew->Start) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("Start changed from %p to %p\n", pold->Start, pnew->Start); } - if (pold->End != pnew->End) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("End changed from %p to %p\n", pold->End, pnew->End); } - if (pold->FinalRelease != pnew->FinalRelease) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("FinalRelease changed from %p to %p\n", pold->FinalRelease, pnew->FinalRelease); } - if (pold->ProcessHandle != pnew->ProcessHandle) { if (equal) { trace("%s: \n", at); equal = FALSE; } trace("ProcessHandle changed from %p to %p\n", pold->ProcessHandle, pnew->ProcessHandle); } + if (pold->Vtbl != pnew->Vtbl) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("Vtbl changed from %p to %p\n", pold->Vtbl, pnew->Vtbl);} + if (pold->RefCount != pnew->RefCount) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("RefCount changed from %ld to %ld\n", pold->RefCount, pnew->RefCount); } + if (pold->Unk1 != pnew->Unk1) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("Unk1 changed from %lu to %lu\n", pold->Unk1, pnew->Unk1); } + if (pold->Current != pnew->Current) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("Current changed from %p to %p\n", pold->Current, pnew->Current); } + if (pold->Start != pnew->Start) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("Start changed from %p to %p\n", pold->Start, pnew->Start); } + if (pold->End != pnew->End) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("End changed from %p to %p\n", pold->End, pnew->End); } + if (pold->FinalRelease != pnew->FinalRelease) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("FinalRelease changed from %p to %p\n", pold->FinalRelease, pnew->FinalRelease); } + if (pold->ProcessHandle != pnew->ProcessHandle) { if (equal) { trace("%s:\n", at); equal = FALSE; } trace("ProcessHandle changed from %p to %p\n", pold->ProcessHandle, pnew->ProcessHandle); } // Save pold->Vtbl = pnew->Vtbl; diff --git a/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c b/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c index 5d00ed90666..fe8e040d9d5 100644 --- a/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c +++ b/modules/rostests/apitests/setupapi/SetupDiInstallClassExA.c @@ -105,7 +105,7 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success\n"); } /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg */ @@ -123,7 +123,7 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success\n"); } /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg];*/ @@ -141,7 +141,7 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success\n"); } /* [Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg; [SampleClassAddReg]HKR;*/ @@ -159,7 +159,7 @@ static void test_SetupDiInstallClassExA(void) { RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM", 0, KEY_ALL_ACCESS, &RegHandle); del = RegDeleteKeyW(RegHandle, L"CurrentControlSet\\Control\\Class\\{3B409830-5F9D-432A-ABF5-7D2E4E102467}"); - ok(del == ERROR_SUCCESS, "Expected success \n"); + ok(del == ERROR_SUCCESS, "Expected success\n"); } /*[Version]Signature+Class+ClassGUID;[ClassInstall32.NT]AddReg;[SampleClassAddReg]HKR;[ClassInstall32.NT.Services]*/ diff --git a/modules/rostests/apitests/user32/GetKeyState.c b/modules/rostests/apitests/user32/GetKeyState.c index e539bdbf918..f30fc88b3a2 100644 --- a/modules/rostests/apitests/user32/GetKeyState.c +++ b/modules/rostests/apitests/user32/GetKeyState.c @@ -107,8 +107,8 @@ void Test_GetKeyState() hKbdHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardProc, GetModuleHandleA( NULL ), 0); hKbdLLHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, GetModuleHandleA( NULL ), 0); - ok(hKbdHook!=NULL," \n"); - ok(hKbdLLHook!=NULL," \n"); + ok(hKbdHook != NULL, "\n"); + ok(hKbdLLHook != NULL, "\n"); keybd_event(VK_LMENU, 0, 0,0); diff --git a/modules/rostests/win32/smss/movefile/movefile.cpp b/modules/rostests/win32/smss/movefile/movefile.cpp index 04442989755..49213797287 100644 --- a/modules/rostests/win32/smss/movefile/movefile.cpp +++ b/modules/rostests/win32/smss/movefile/movefile.cpp @@ -18,11 +18,11 @@ void Usage() { - printf(" Usage: smssTest.exe -g|c|s|d \n \ - g - generate test files \n \ - c - check files after reboot \n \ - s - show registry entry \n \ - d - delete registry value \n"); + printf(" Usage: smssTest.exe -g|c|s|d\n\ + g - generate test files\n\ + c - check files after reboot\n\ + s - show registry entry\n\ + d - delete registry value\n"); } int ShowRegValue() diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 7d0a08c5395..eeb6040cf30 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -30,7 +30,7 @@ IopCleanupAfterException(IN PFILE_OBJECT FileObject, IN PKEVENT LocalEvent OPTIONAL) { PAGED_CODE(); - IOTRACE(IO_API_DEBUG, "IRP: %p. FO: %p \n", Irp, FileObject); + IOTRACE(IO_API_DEBUG, "IRP: %p. FO: %p\n", Irp, FileObject); if (Irp) { @@ -76,7 +76,7 @@ IopFinalizeAsynchronousIo(IN NTSTATUS SynchStatus, { NTSTATUS FinalStatus = SynchStatus; PAGED_CODE(); - IOTRACE(IO_API_DEBUG, "IRP: %p. Status: %lx \n", Irp, SynchStatus); + IOTRACE(IO_API_DEBUG, "IRP: %p. Status: %lx\n", Irp, SynchStatus); /* Make sure the IRP was completed, but returned pending */ if (FinalStatus == STATUS_PENDING) @@ -129,7 +129,7 @@ IopPerformSynchronousRequest(IN PDEVICE_OBJECT DeviceObject, PVOID NormalContext = NULL; KIRQL OldIrql; PAGED_CODE(); - IOTRACE(IO_API_DEBUG, "IRP: %p. DO: %p. FO: %p \n", + IOTRACE(IO_API_DEBUG, "IRP: %p. DO: %p. FO: %p\n", Irp, DeviceObject, FileObject); /* Queue the IRP */ @@ -220,7 +220,7 @@ IopDeviceFsIoControl(IN HANDLE DeviceHandle, PAGED_CODE(); - IOTRACE(IO_CTL_DEBUG, "Handle: %p. CTL: %lx. Type: %lx \n", + IOTRACE(IO_CTL_DEBUG, "Handle: %p. CTL: %lx. Type: %lx\n", DeviceHandle, IoControlCode, IsDevIoCtl); /* Get the access type */ @@ -662,7 +662,7 @@ IopQueryDeviceInformation(IN PFILE_OBJECT FileObject, KEVENT Event; NTSTATUS Status; PAGED_CODE(); - IOTRACE(IO_API_DEBUG, "Handle: %p. CTL: %lx. Type: %lx \n", + IOTRACE(IO_API_DEBUG, "Handle: %p. CTL: %lx. Type: %lx\n", FileObject, InformationClass, File); /* Reference the object */ @@ -1150,7 +1150,7 @@ IoSynchronousPageWrite(IN PFILE_OBJECT FileObject, PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - IOTRACE(IO_API_DEBUG, "FileObject: %p. Mdl: %p. Offset: %p \n", + IOTRACE(IO_API_DEBUG, "FileObject: %p. Mdl: %p. Offset: %p\n", FileObject, Mdl, Offset); /* Is the write originating from Cc? */ @@ -1205,7 +1205,7 @@ IoPageRead(IN PFILE_OBJECT FileObject, PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - IOTRACE(IO_API_DEBUG, "FileObject: %p. Mdl: %p. Offset: %p \n", + IOTRACE(IO_API_DEBUG, "FileObject: %p. Mdl: %p. Offset: %p\n", FileObject, Mdl, Offset); /* Get the Device Object */ @@ -1322,7 +1322,7 @@ IoSetInformation(IN PFILE_OBJECT FileObject, KEVENT Event; NTSTATUS Status; PAGED_CODE(); - IOTRACE(IO_API_DEBUG, "FileObject: %p. Class: %lx. Length: %lx \n", + IOTRACE(IO_API_DEBUG, "FileObject: %p. Class: %lx. Length: %lx\n", FileObject, FileInformationClass, Length); /* Reference the object */ diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index fbbb8fa5e35..1d06943032a 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -2212,7 +2212,7 @@ IoOpenDeviceRegistryKey(IN PDEVICE_OBJECT DeviceObject, if ((DevInstKeyType & (PLUGPLAY_REGKEY_DEVICE | PLUGPLAY_REGKEY_DRIVER)) == 0) { - DPRINT1("IoOpenDeviceRegistryKey(): got wrong params, exiting... \n"); + DPRINT1("IoOpenDeviceRegistryKey(): got wrong params, exiting...\n"); return STATUS_INVALID_PARAMETER; } diff --git a/ntoskrnl/ps/debug.c b/ntoskrnl/ps/debug.c index 0a2f3e05517..0306a027dee 100644 --- a/ntoskrnl/ps/debug.c +++ b/ntoskrnl/ps/debug.c @@ -46,7 +46,7 @@ PspDumpThreads(BOOLEAN IncludeSystem) nThreads++; /* Print the Info */ - DbgPrint("State %u Affinity %08x Priority %d PID.TID %d.%d Name %.8s Stack: \n", + DbgPrint("State %u Affinity %08x Priority %d PID.TID %d.%d Name %.8s Stack:\n", Thread->Tcb.State, Thread->Tcb.Affinity, Thread->Tcb.Priority, diff --git a/ntoskrnl/ps/kill.c b/ntoskrnl/ps/kill.c index 1cf69957989..27d559ff510 100644 --- a/ntoskrnl/ps/kill.c +++ b/ntoskrnl/ps/kill.c @@ -927,7 +927,7 @@ PsExitSpecialApc(IN PKAPC Apc, NTSTATUS Status; PAGED_CODE(); PSTRACE(PS_KILL_DEBUG, - "Apc: %p SystemArgument2: %p \n", Apc, SystemArgument2); + "Apc: %p SystemArgument2: %p\n", Apc, SystemArgument2); /* Don't do anything unless we are in User-Mode */ if (Apc->SystemArgument2) @@ -950,7 +950,7 @@ PspExitNormalApc(IN PVOID NormalContext, PKAPC Apc = (PKAPC)SystemArgument1; PETHREAD Thread = PsGetCurrentThread(); PAGED_CODE(); - PSTRACE(PS_KILL_DEBUG, "SystemArgument2: %p \n", SystemArgument2); + PSTRACE(PS_KILL_DEBUG, "SystemArgument2: %p\n", SystemArgument2); /* This should never happen */ ASSERT(!(((ULONG_PTR)SystemArgument2) & 1)); diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index f1b8461653f..ae8f8dd2519 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -154,7 +154,7 @@ public: { int rc = this->InternalAddRef(); #if DEBUG_CCOMOBJECT_REFCOUNTING - DbgPrint("%s, RefCount is now %d(--)! \n", __FUNCTION__, rc); + DbgPrint("%s, RefCount is now %d(--)!\n", __FUNCTION__, rc); #endif return rc; } @@ -164,7 +164,7 @@ public: int rc = this->InternalRelease(); #if DEBUG_CCOMOBJECT_REFCOUNTING - DbgPrint("%s, RefCount is now %d(--)! \n", __FUNCTION__, rc); + DbgPrint("%s, RefCount is now %d(--)!\n", __FUNCTION__, rc); #endif if (rc == 0) diff --git a/sdk/lib/rtl/critical.c b/sdk/lib/rtl/critical.c index 8ef2c7e9544..f2e88481417 100644 --- a/sdk/lib/rtl/critical.c +++ b/sdk/lib/rtl/critical.c @@ -72,7 +72,7 @@ RtlpCreateCriticalSectionSem(PRTL_CRITICAL_SECTION CriticalSection) hNewEvent = INVALID_HANDLE_VALUE; } - DPRINT("Created Event: %p \n", hNewEvent); + DPRINT("Created Event: %p\n", hNewEvent); /* Exchange the LockSemaphore field with the new handle, if it is still 0 */ if (InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, diff --git a/sdk/lib/rtl/dbgbuffer.c b/sdk/lib/rtl/dbgbuffer.c index 51e742850a4..434a5a7fd52 100644 --- a/sdk/lib/rtl/dbgbuffer.c +++ b/sdk/lib/rtl/dbgbuffer.c @@ -151,7 +151,7 @@ RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, if (!NT_SUCCESS(Status)) { /* failure */ - DPRINT("NtQueryInformationProcess 1 0x%lx \n", Status); + DPRINT("NtQueryInformationProcess 1 0x%lx\n", Status); return Status; } @@ -176,7 +176,7 @@ RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, if (!NT_SUCCESS(Status)) { /* failure */ - DPRINT("NtReadVirtualMemory 1 0x%lx \n", Status); + DPRINT("NtReadVirtualMemory 1 0x%lx\n", Status); return Status; } @@ -194,7 +194,7 @@ RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, if (!NT_SUCCESS(Status)) { /* failure */ - DPRINT("NtReadVirtualMemory 2 0x%lx \n", Status); + DPRINT("NtReadVirtualMemory 2 0x%lx\n", Status); return Status; } @@ -213,7 +213,7 @@ RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, if (!NT_SUCCESS(Status)) { /* failure */ - DPRINT( "NtReadVirtualMemory 3 0x%lx \n", Status); + DPRINT( "NtReadVirtualMemory 3 0x%lx\n", Status); return Status; } @@ -231,7 +231,7 @@ RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, if (!NT_SUCCESS(Status)) { /* failure */ - DPRINT( "NtReadVirtualMemory 3 0x%lx \n", Status); + DPRINT( "NtReadVirtualMemory 3 0x%lx\n", Status); return Status; } @@ -370,7 +370,7 @@ RtlQueryProcessDebugInformation(IN ULONG ProcessId, Buf->OffsetFree = Buf->OffsetFree + LSize; } - DPRINT("QueryProcessDebugInformation end \n"); + DPRINT("QueryProcessDebugInformation end\n"); DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); } else @@ -457,7 +457,7 @@ RtlQueryProcessDebugInformation(IN ULONG ProcessId, Buf->OffsetFree = Buf->OffsetFree + LSize; } - DPRINT("QueryProcessDebugInformation end \n"); + DPRINT("QueryProcessDebugInformation end\n"); DPRINT("QueryDebugInfo : 0x%lx\n", Buf->OffsetFree); } diff --git a/sdk/lib/rtl/exception.c b/sdk/lib/rtl/exception.c index e90b28fac46..63a65e884b5 100644 --- a/sdk/lib/rtl/exception.c +++ b/sdk/lib/rtl/exception.c @@ -227,7 +227,7 @@ static VOID DbgPrint("R0: %lx R1: %lx R2: %lx R3: %lx\n", pc->R0, pc->R1, pc->R2, pc->R3); DbgPrint("R4: %lx R5: %lx R6: %lx R7: %lx\n", pc->R4, pc->R5, pc->R6, pc->R7); DbgPrint("R8: %lx R9: %lx R10: %lx R11: %lx\n", pc->R8, pc->R9, pc->R10, pc->R11); - DbgPrint("R12: %lx \n", pc->R12); + DbgPrint("R12: %lx\n", pc->R12); #else #pragma message ("Unknown architecture") #endif diff --git a/sdk/lib/rtl/heappage.c b/sdk/lib/rtl/heappage.c index 08857e7d6ba..724cccff73f 100644 --- a/sdk/lib/rtl/heappage.c +++ b/sdk/lib/rtl/heappage.c @@ -322,7 +322,7 @@ RtlpDphAllocateVm(PVOID *Base, SIZE_T Size, ULONG Type, ULONG Protection) &Size, Type, Protection); - DPRINT("Page heap: AllocVm (%p, %Ix, %lx) status %lx \n", Base, Size, Type, Status); + DPRINT("Page heap: AllocVm (%p, %Ix, %lx) status %lx\n", Base, Size, Type, Status); /* Check for failures */ if (!NT_SUCCESS(Status)) { @@ -331,7 +331,7 @@ RtlpDphAllocateVm(PVOID *Base, SIZE_T Size, ULONG Type, ULONG Protection) _InterlockedIncrement(&RtlpDphCounter); if (RtlpDphBreakOptions & DPH_BREAK_ON_RESERVE_FAIL) { - DPRINT1("Page heap: AllocVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: AllocVm (%p, %Ix, %lx) failed with %lx\n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -341,7 +341,7 @@ RtlpDphAllocateVm(PVOID *Base, SIZE_T Size, ULONG Type, ULONG Protection) _InterlockedIncrement(&RtlpDphAllocFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_COMMIT_FAIL) { - DPRINT1("Page heap: AllocVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: AllocVm (%p, %Ix, %lx) failed with %lx\n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -358,7 +358,7 @@ RtlpDphFreeVm(PVOID Base, SIZE_T Size, ULONG Type) /* Free the memory */ Status = RtlpSecMemFreeVirtualMemory(NtCurrentProcess(), &Base, &Size, Type); - DPRINT("Page heap: FreeVm (%p, %Ix, %x) status %x \n", Base, Size, Type, Status); + DPRINT("Page heap: FreeVm (%p, %Ix, %lx) status %lx\n", Base, Size, Type, Status); /* Log/report failures */ if (!NT_SUCCESS(Status)) { @@ -367,7 +367,7 @@ RtlpDphFreeVm(PVOID Base, SIZE_T Size, ULONG Type) _InterlockedIncrement(&RtlpDphReleaseFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_RELEASE_FAIL) { - DPRINT1("Page heap: FreeVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: FreeVm (%p, %Ix, %lx) failed with %lx\n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -377,7 +377,7 @@ RtlpDphFreeVm(PVOID Base, SIZE_T Size, ULONG Type) _InterlockedIncrement(&RtlpDphFreeFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_FREE_FAIL) { - DPRINT1("Page heap: FreeVm (%p, %Ix, %x) failed with %x \n", Base, Size, Type, Status); + DPRINT1("Page heap: FreeVm (%p, %Ix, %lx) failed with %lx\n", Base, Size, Type, Status); DbgBreakPoint(); return Status; } @@ -402,7 +402,7 @@ RtlpDphProtectVm(PVOID Base, SIZE_T Size, ULONG Protection) _InterlockedIncrement(&RtlpDphProtectFails); if (RtlpDphBreakOptions & DPH_BREAK_ON_PROTECT_FAIL) { - DPRINT1("Page heap: ProtectVm (%p, %Ix, %x) failed with %x \n", Base, Size, Protection, Status); + DPRINT1("Page heap: ProtectVm (%p, %Ix, %lx) failed with %lx\n", Base, Size, Protection, Status); DbgBreakPoint(); return Status; } @@ -1873,7 +1873,7 @@ RtlpPageHeapFree(HANDLE HeapPtr, { if (RtlpDphBreakOptions & DPH_BREAK_ON_NULL_FREE) { - DPRINT1("Page heap: freeing a null pointer \n"); + DPRINT1("Page heap: freeing a null pointer\n"); DbgBreakPoint(); } return TRUE; diff --git a/sdk/lib/rtl/process.c b/sdk/lib/rtl/process.c index 637046ba8a9..c978e7b2399 100644 --- a/sdk/lib/rtl/process.c +++ b/sdk/lib/rtl/process.c @@ -93,7 +93,7 @@ RtlpInitEnvironment(HANDLE ProcessHandle, PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to reserve 1MB of space \n"); + DPRINT1("Failed to reserve 1MB of space\n"); return Status; } } diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index 573e10d67c6..e5c452d0512 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -439,7 +439,7 @@ OutputLine_stub(FILE *file, EXPORT *pexp) void OutputHeader_asmstub(FILE *file, char *libname) { - fprintf(file, "; File generated automatically, do not edit! \n\n"); + fprintf(file, "; File generated automatically, do not edit!\n\n"); if (giArch == ARCH_X86) {
