Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FORMATTING] Remove trailing whitespace. Addendum to 34593d93.

Browse source 
Excluded: 3rd-party code (incl. wine) and most of the win32ss.
This commit is contained in:
Hermès Bélusca-Maïto 2021-09-13 03:33:14 +02:00
parent bbabe2489e
commit 9393fc320e
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
701 changed files with 14685 additions and 14693 deletions
Download patch file Download diff file Expand all files Collapse all files

4
win32ss/drivers/displays/framebufacc/screen.c
View file

@ -119,7 +119,7 @@ IntInitScreenInfo(
ULONG ModeInfoSize;
PVIDEO_MODE_INFORMATION ModeInfo, ModeInfoPtr, SelectedMode = NULL;
VIDEO_COLOR_CAPABILITIES ColorCapabilities;
/* hack
/* hack
LOGFONTW SystemFont = {16, 7, 0, 0, 700, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"System"};
LOGFONTW AnsiVariableFont = {12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, VARIABLE_PITCH | FF_DONTCARE, L"MS Sans Serif"};
LOGFONTW AnsiFixedFont = {12, 9, 0, 0, 400, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_STROKE_PRECIS, PROOF_QUALITY, FIXED_PITCH | FF_DONTCARE, L"Courier"};
@ -301,7 +301,7 @@ IntInitScreenInfo(
pGdiInfo->flHTFlags = HT_FLAG_ADDITIVE_PRIMS;
pDevInfo->flGraphicsCaps = 0;
/* hack
/* hack
pDevInfo->lfDefaultFont = SystemFont;
pDevInfo->lfAnsiVarFont = AnsiVariableFont;
pDevInfo->lfAnsiFixFont = AnsiFixedFont;

12
win32ss/drivers/displays/framebufacc/surface.c
View file

@ -21,7 +21,7 @@
#include "framebufacc.h"
BOOL
BOOL
InitSurface(PPDEV ppdev,
BOOL bForcemapping)
{
@ -48,12 +48,12 @@ InitSurface(PPDEV ppdev,
}
/* Check if mapping is need it */
if ((!bForcemapping) &&
if ((!bForcemapping) &&
(!RemappingNeeded))
{
return TRUE;
}
/*
* Map the framebuffer into our memory.
@ -78,7 +78,7 @@ InitSurface(PPDEV ppdev,
/*
* Video memory cached
*
* We maby should only ask max 8MB as cached ?, think of the video ram length is 256MB
* We maby should only ask max 8MB as cached ?, think of the video ram length is 256MB
*/
ppdev->pVideoMemCache = NULL;
@ -203,7 +203,7 @@ DrvEnableSurface(
* Associate the surface with our device.
*/
if (!EngAssociateSurface(hSurface, ppdev->hDevEng, ppdev->dwHooks))
{
EngDeleteSurface(hSurface);
@ -306,7 +306,7 @@ DrvAssertMode(
ppdev->ScreenDelta, NULL);
}
/* if the pRealVideoMem == ppdev->pRealVideoMem are
/* if the pRealVideoMem == ppdev->pRealVideoMem are
* the Result is then TRUE
*/
}

4
win32ss/drivers/displays/vga/main/enable.c
View file

@ -2,8 +2,8 @@
* PROJECT: ReactOS VGA display driver
* LICENSE: GPL - See COPYING in the top level directory
* FILE: win32ss/drivers/displays/vga/main/enable.c
* PURPOSE:
* PROGRAMMERS:
* PURPOSE:
* PROGRAMMERS:
*/
#include <vgaddi.h>

4
win32ss/drivers/displays/vga/objects/bitblt.c
View file

@ -2,8 +2,8 @@
* PROJECT: ReactOS VGA display driver
* LICENSE: GPL - See COPYING in the top level directory
* FILE: win32ss/drivers/displays/vga/objects/bitblt.c
* PURPOSE:
* PROGRAMMERS:
* PURPOSE:
* PROGRAMMERS:
*/
#include <vgaddi.h>

4
win32ss/drivers/displays/vga/objects/copybits.c
View file

@ -2,8 +2,8 @@
* PROJECT: ReactOS VGA display driver
* LICENSE: GPL - See COPYING in the top level directory
* FILE: win32ss/drivers/displays/vga/objects/copybits.c
* PURPOSE:
* PROGRAMMERS:
* PURPOSE:
* PROGRAMMERS:
*/
#include <vgaddi.h>

2
win32ss/drivers/displays/vga/objects/lineto.c
View file

@ -2,7 +2,7 @@
* PROJECT: ReactOS VGA display driver
* LICENSE: GPL - See COPYING in the top level directory
* FILE: win32ss/drivers/displays/vga/objects/lineto.c
* PURPOSE:
* PURPOSE:
* PROGRAMMERS: Copyright (C) 1998-2003 ReactOS Team
*/

6
win32ss/drivers/displays/vga/vgavideo/vgavideo.c
View file

@ -2,8 +2,8 @@
* PROJECT: ReactOS VGA display driver
* LICENSE: GPL - See COPYING in the top level directory
* FILE: win32ss/drivers/displays/vga/vgavideo/vgavideo.c
* PURPOSE:
* PROGRAMMERS:
* PURPOSE:
* PROGRAMMERS:
*/
#include <vgaddi.h>
@ -617,7 +617,7 @@ vgaReadScan( int x, int y, int w, void *b )
data = *vp++;
if (data & 0x80) *bp |= plane_mask;
bp++;
if (data & 0x40) *bp |= plane_mask;
bp++;
if (data & 0x20) *bp |= plane_mask;

2
win32ss/drivers/font/ftfd/enable.c
View file

@ -33,7 +33,7 @@ FtfdEnableDriver(
ULONG cj,
PDRVENABLEDATA pded)
{
FT_Error fterror;
FT_Error fterror;
DbgPrint("FtfdEnableDriver()\n");

4
win32ss/drivers/videoprt/child.c
View file

@ -121,7 +121,7 @@ IntVideoPortChildQueryId(
{
PWCHAR Buffer = NULL, StaticBuffer;
UNICODE_STRING UnicodeStr;
switch (IrpSp->Parameters.QueryId.IdType)
{
case BusQueryDeviceID:
@ -353,7 +353,7 @@ IntVideoPortChildQueryCapabilities(
DeviceCaps->DeviceD2 = FALSE;
DeviceCaps->D1Latency = 0;
DeviceCaps->D2Latency = 0;
DeviceCaps->D3Latency = 0;
DeviceCaps->D3Latency = 0;
switch (ChildExtension->ChildType)
{

4
win32ss/drivers/videoprt/dma.c
View file

@ -224,7 +224,7 @@ VideoPortGetCommonBuffer(IN PVOID HwDeviceExtension,
PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension);
/* maximum palette size */
if (DesiredLength > 262144)
if (DesiredLength > 262144)
{
/* size exceeded */
return NULL;
@ -279,7 +279,7 @@ VideoPortUnmapDmaMemory(
/*
* @implemented
*/
PDMA
PDMA
NTAPI
VideoPortMapDmaMemory(IN PVOID HwDeviceExtension,
IN PVIDEO_REQUEST_PACKET pVrp,

68
win32ss/drivers/videoprt/resource.c
View file

@ -35,7 +35,7 @@ IntVideoPortGetLegacyResources(
{
PCI_COMMON_CONFIG PciConfig;
ULONG ReadLength;
if (!DriverExtension->InitializationData.HwGetLegacyResources &&
!DriverExtension->InitializationData.HwLegacyResourceCount)
{
@ -43,7 +43,7 @@ IntVideoPortGetLegacyResources(
*AccessRangeCount = 0;
return STATUS_SUCCESS;
}
if (DriverExtension->InitializationData.HwGetLegacyResources)
{
ReadLength = HalGetBusData(PCIConfiguration,
@ -56,7 +56,7 @@ IntVideoPortGetLegacyResources(
/* This device doesn't exist */
return STATUS_NO_SUCH_DEVICE;
}
DriverExtension->InitializationData.HwGetLegacyResources(PciConfig.VendorID,
PciConfig.DeviceID,
AccessRanges,
@ -109,16 +109,16 @@ IntVideoPortFilterResourceRequirements(
ResList = ExAllocatePool(NonPagedPool,
ListSize);
if (!ResList) return STATUS_NO_MEMORY;
RtlCopyMemory(ResList, OldResList, OldResList->ListSize);
ASSERT(ResList->AlternativeLists == 1);
ResList->ListSize = ListSize;
ResList->List[0].Count += AccessRangeCount;
CurrentDescriptor = (PIO_RESOURCE_DESCRIPTOR)((PUCHAR)ResList + OldResList->ListSize);
ExFreePool(OldResList);
Irp->IoStatus.Information = 0;
}
@ -129,9 +129,9 @@ IntVideoPortFilterResourceRequirements(
ResList = ExAllocatePool(NonPagedPool,
ListSize);
if (!ResList) return STATUS_NO_MEMORY;
RtlZeroMemory(ResList, ListSize);
/* We need to initialize some fields */
ResList->ListSize = ListSize;
ResList->InterfaceType = DeviceExtension->AdapterInterfaceType;
@ -141,7 +141,7 @@ IntVideoPortFilterResourceRequirements(
ResList->List[0].Version = 1;
ResList->List[0].Revision = 1;
ResList->List[0].Count = AccessRangeCount;
CurrentDescriptor = ResList->List[0].Descriptors;
}
@ -149,17 +149,17 @@ IntVideoPortFilterResourceRequirements(
{
/* This is a required resource */
CurrentDescriptor->Option = 0;
if (AccessRanges[i].RangeInIoSpace)
CurrentDescriptor->Type = CmResourceTypePort;
else
CurrentDescriptor->Type = CmResourceTypeMemory;
CurrentDescriptor->ShareDisposition =
(AccessRanges[i].RangeShareable ? CmResourceShareShared : CmResourceShareDeviceExclusive);
CurrentDescriptor->Flags = 0;
if (CurrentDescriptor->Type == CmResourceTypePort)
{
CurrentDescriptor->u.Port.Length = AccessRanges[i].RangeLength;
@ -179,7 +179,7 @@ IntVideoPortFilterResourceRequirements(
CurrentDescriptor->u.Memory.Alignment = 1;
CurrentDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE;
}
CurrentDescriptor++;
}
@ -584,9 +584,9 @@ VideoPortGetAccessRanges(
ULONG ListSize;
PIO_RESOURCE_REQUIREMENTS_LIST ResReqList;
BOOLEAN DeviceAndVendorFound = FALSE;
TRACE_(VIDEOPRT, "VideoPortGetAccessRanges(%d, %p, %d, %p)\n", NumRequestedResources, RequestedResources, NumAccessRanges, AccessRanges);
DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension);
DriverObject = DeviceExtension->DriverObject;
DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject);
@ -600,13 +600,13 @@ VideoPortGetAccessRanges(
if (DeviceExtension->PhysicalDeviceObject != NULL)
{
PciSlotNumber.u.AsULONG = DeviceExtension->SystemIoSlotNumber;
ReturnedLength = HalGetBusData(PCIConfiguration,
DeviceExtension->SystemIoBusNumber,
PciSlotNumber.u.AsULONG,
&Config,
sizeof(PCI_COMMON_CONFIG));
if (ReturnedLength != sizeof(PCI_COMMON_CONFIG))
{
return ERROR_NOT_ENOUGH_MEMORY;
@ -616,16 +616,16 @@ VideoPortGetAccessRanges(
{
VendorIdToFind = VendorId != NULL ? *(PUSHORT)VendorId : 0;
DeviceIdToFind = DeviceId != NULL ? *(PUSHORT)DeviceId : 0;
if (VendorIdToFind == 0 && DeviceIdToFind == 0)
{
/* We're screwed */
return ERROR_DEV_NOT_EXIST;
}
INFO_(VIDEOPRT, "Looking for VendorId 0x%04x DeviceId 0x%04x\n",
VendorIdToFind, DeviceIdToFind);
/*
* Search for the device id and vendor id on this bus.
*/
@ -652,7 +652,7 @@ VideoPortGetAccessRanges(
PciSlotNumber.u.bits.FunctionNumber,
Config.VendorID,
Config.DeviceID);
if ((VendorIdToFind == 0 || Config.VendorID == VendorIdToFind) &&
(DeviceIdToFind == 0 || Config.DeviceID == DeviceIdToFind))
{
@ -669,7 +669,7 @@ VideoPortGetAccessRanges(
return ERROR_DEV_NOT_EXIST;
}
}
Status = HalAssignSlotResources(&DeviceExtension->RegistryPath,
NULL,
DeviceExtension->DriverObject,
@ -678,7 +678,7 @@ VideoPortGetAccessRanges(
DeviceExtension->SystemIoBusNumber,
PciSlotNumber.u.AsULONG,
&AllocatedResources);
if (!NT_SUCCESS(Status))
{
WARN_(VIDEOPRT, "HalAssignSlotResources failed with status %x.\n",Status);
@ -708,7 +708,7 @@ VideoPortGetAccessRanges(
ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + (NumRequestedResources - 1) * sizeof(IO_RESOURCE_DESCRIPTOR);
ResReqList = ExAllocatePool(NonPagedPool, ListSize);
if (!ResReqList) return ERROR_NOT_ENOUGH_MEMORY;
ResReqList->ListSize = ListSize;
ResReqList->InterfaceType = DeviceExtension->AdapterInterfaceType;
ResReqList->BusNumber = DeviceExtension->SystemIoBusNumber;
@ -717,12 +717,12 @@ VideoPortGetAccessRanges(
ResReqList->List[0].Version = 1;
ResReqList->List[0].Revision = 1;
ResReqList->List[0].Count = NumRequestedResources;
/* Copy in the caller's resource list */
RtlCopyMemory(ResReqList->List[0].Descriptors,
RequestedResources,
NumRequestedResources * sizeof(IO_RESOURCE_DESCRIPTOR));
Status = IoAssignResources(&DeviceExtension->RegistryPath,
NULL,
DeviceExtension->DriverObject,
@ -734,22 +734,22 @@ VideoPortGetAccessRanges(
if (!NT_SUCCESS(Status))
return Status;
if (!DeviceExtension->AllocatedResources)
DeviceExtension->AllocatedResources = AllocatedResources;
}
if (AllocatedResources == NULL)
return ERROR_NOT_ENOUGH_MEMORY;
/* Return the slot number if the caller wants it */
if (Slot != NULL) *Slot = DeviceExtension->SystemIoBusNumber;
FullList = AllocatedResources->List;
ASSERT(AllocatedResources->Count == 1);
INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n",
INFO_(VIDEOPRT, "InterfaceType %u BusNumber List %u Device BusNumber %u Version %u Revision %u\n",
FullList->InterfaceType, FullList->BusNumber, DeviceExtension->SystemIoBusNumber, FullList->PartialResourceList.Version, FullList->PartialResourceList.Revision);
ASSERT(FullList->InterfaceType == PCIBus);
ASSERT(FullList->BusNumber == DeviceExtension->SystemIoBusNumber);
ASSERT(1 == FullList->PartialResourceList.Version);

6
win32ss/gdi/dib/dib16bpp.c
View file

@ -283,7 +283,7 @@ DIB_16BPP_BitBltSrcCopy(PBLTINFO BltInfo)
if (bTopToBottom)
{
/* This sets SourceLine to the bottom line */
SourceLine += BltInfo->SourceSurface->lDelta
SourceLine += BltInfo->SourceSurface->lDelta
* (BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1);
}
@ -314,7 +314,7 @@ DIB_16BPP_BitBltSrcCopy(PBLTINFO BltInfo)
DPRINT("16BPP Case Selected with DestRect Width of '%d'.\n",
BltInfo->DestRect.right - BltInfo->DestRect.left);
DPRINT("BMF_16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("BMF_16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);
@ -576,7 +576,7 @@ DIB_16BPP_BitBltSrcCopy(PBLTINFO BltInfo)
case BMF_24BPP:
DPRINT("BMF_24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("BMF_24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);

4
win32ss/gdi/dib/dib24bpp.c
View file

@ -153,9 +153,9 @@ DIB_24BPP_BitBltSrcCopy(PBLTINFO BltInfo)
if(f1 == 1) {
DEC_OR_INC(SourceLine_4BPP, bLeftToRight, 1);
f1 = 0;
}
}
else
{
{
f1 = 1;
}
DEC_OR_INC(sx, bLeftToRight, 1);

6
win32ss/gdi/dib/dib32bpp.c
View file

@ -81,7 +81,7 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
BltInfo->SourcePoint.x, BltInfo->SourcePoint.y);
/* Do not deal with negative numbers for these values */
if ((BltInfo->DestRect.left < 0) || (BltInfo->DestRect.top < 0) ||
if ((BltInfo->DestRect.left < 0) || (BltInfo->DestRect.top < 0) ||
(BltInfo->DestRect.right < 0) || (BltInfo->DestRect.bottom < 0))
return FALSE;
@ -586,7 +586,7 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
* unless we work with its output which is at the destination site. So in this case
* our new Source becomes the previous outputs Destination.
* Also in we use the same logic when we have corrected for negative lDelta's above
* and already completed a flip from Source to Destination for the first step
* and already completed a flip from Source to Destination for the first step
*/
if (TopToBottomDone || blDeltaAdjustDone)
@ -614,7 +614,7 @@ DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo)
* Then we do a flip in place at the destination location and we are done.
*/
if ((BltInfo->SourcePoint.y != BltInfo->DestRect.top) && // The values are not equal and
(abs(BltInfo->SourcePoint.y - BltInfo->DestRect.top) < (DestHeight + 2)) && // they are NOT seperated by > DestHeight
(abs(BltInfo->SourcePoint.y - BltInfo->DestRect.top) < (DestHeight + 2)) && // they are NOT seperated by > DestHeight
(BltInfo->SourceSurface->pvScan0 == BltInfo->DestSurface->pvScan0)) // and same surface (probably screen)
{
DPRINT("Flips Need Adjustments, so do move here.\n");

8
win32ss/gdi/dib/dib4bpp.c
View file

@ -176,12 +176,12 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
break;
case BMF_8BPP:
DPRINT("8BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("8BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);
SourceBits_8BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 +
SourceBits_8BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 +
(BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x;
if (bTopToBottom)
@ -221,7 +221,7 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
DPRINT("16BPP Case Selected with DestRect Width of '%d'.\n",
BltInfo->DestRect.right - BltInfo->DestRect.left);
DPRINT("BMF_16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("BMF_16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);
@ -269,7 +269,7 @@ DIB_4BPP_BitBltSrcCopy(PBLTINFO BltInfo)
case BMF_24BPP:
DPRINT("24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);

12
win32ss/gdi/dib/dib8bpp.c
View file

@ -175,7 +175,7 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
break;
case BMF_8BPP:
DPRINT("8BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("8BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);
@ -318,7 +318,7 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
if (bTopToBottom)
{
DPRINT("Flip is bTopToBottom.\n");
DWORD Index;
/* Allocate enough pixels for a column in BYTE's */
@ -338,7 +338,7 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
if (OneDone)
{
/* This sets SourceLine to the bottom line of our previous destination */
SourceLine = (PBYTE)BltInfo->DestSurface->pvScan0 +
SourceLine = (PBYTE)BltInfo->DestSurface->pvScan0 +
(BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + BltInfo->DestRect.left +
(BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->DestSurface->lDelta;
}
@ -373,7 +373,7 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
SourceBits -= BltInfo->SourceSurface->lDelta;
Index++;
}
Index = 0;
/* Get the stored pixel and copy then down the column */
@ -399,7 +399,7 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
DPRINT("16BPP Case Selected with DestRect Width of '%d'.\n",
BltInfo->DestRect.right - BltInfo->DestRect.left);
DPRINT("BMF_16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("BMF_16BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);
@ -438,7 +438,7 @@ DIB_8BPP_BitBltSrcCopy(PBLTINFO BltInfo)
break;
case BMF_24BPP:
DPRINT("24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
DPRINT("24BPP-dstRect: (%d,%d)-(%d,%d) and Width of '%d'.\n",
BltInfo->DestRect.left, BltInfo->DestRect.top,
BltInfo->DestRect.right, BltInfo->DestRect.bottom,
BltInfo->DestRect.right - BltInfo->DestRect.left);

32
win32ss/gdi/dib/floodfill.c
View file

@ -1,9 +1,9 @@
/*
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS win32 subsystem
* PURPOSE: Flood filling support
* FILE: win32ss/gdi/dib/floodfill.c
* PROGRAMMER: Gregor Schneider, <grschneider AT gmail DOT com>
* PROGRAMMER: Gregor Schneider <grschneider AT gmail DOT com>
*/
#include <win32k.h>
@ -15,7 +15,7 @@
* This floodfill algorithm is an iterative four neighbors version. It works with an internal stack like data structure.
* The stack is kept in an array, sized for the worst case scenario of having to add all pixels of the surface.
* This avoids having to allocate and free memory blocks all the time. The stack grows from the end of the array towards the start.
* All pixels are checked before being added, against belonging to the fill rule (FLOODFILLBORDER or FLOODFILLSURFACE)
* All pixels are checked before being added, against belonging to the fill rule (FLOODFILLBORDER or FLOODFILLSURFACE)
* and the position in respect to the clip region. This guarantees all pixels lying on the stack belong to the filled surface.
* Further optimisations of the algorithm are possible.
*/
@ -38,7 +38,7 @@ static __inline BOOL initFlood(FLOODINFO *info, RECTL *DstRect)
{
ULONG width = DstRect->right - DstRect->left;
ULONG height = DstRect->bottom - DstRect->top;
info->floodData = ExAllocatePoolWithTag(NonPagedPool, width * height * sizeof(FLOODITEM), TAG_DIB);
info->floodData = ExAllocatePoolWithTag(NonPagedPool, width * height * sizeof(FLOODITEM), TAG_DIB);
if (info->floodData == NULL)
{
return FALSE;
@ -52,11 +52,11 @@ static __inline VOID finalizeFlood(FLOODINFO *info)
ExFreePoolWithTag(info->floodData, TAG_DIB);
}
static __inline VOID addItemFlood(FLOODINFO *info,
ULONG x,
ULONG y,
SURFOBJ *DstSurf,
RECTL *DstRect,
ULONG Color,
ULONG x,
ULONG y,
SURFOBJ *DstSurf,
RECTL *DstRect,
ULONG Color,
BOOL isSurf)
{
if (RECTL_bPointInRect(DstRect,x,y))
@ -83,11 +83,11 @@ static __inline VOID removeItemFlood(FLOODINFO *info)
info->floodLen--;
}
BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ *DstSurf,
BRUSHOBJ *Brush,
RECTL *DstRect,
BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ *DstSurf,
BRUSHOBJ *Brush,
RECTL *DstRect,
POINTL *Origin,
ULONG ConvColor,
ULONG ConvColor,
UINT FillType)
{
ULONG x, y;
@ -111,7 +111,7 @@ BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ *DstSurf,
return FALSE;
}
addItemFlood(&flood, x, y, DstSurf, DstRect, ConvColor, FALSE);
while (flood.floodLen != 0)
while (flood.floodLen != 0)
{
x = flood.floodStart->x;
y = flood.floodStart->y;
@ -119,7 +119,7 @@ BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ *DstSurf,
DibFunctionsForBitmapFormat[DstSurf->iBitmapFormat].DIB_PutPixel(DstSurf, x, y, BrushColor);
if (flood.floodStart - 4 < flood.floodData)
{
{
DPRINT1("Can't finish flooding!\n");
finalizeFlood(&flood);
return FALSE;
@ -144,7 +144,7 @@ BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ *DstSurf,
return FALSE;
}
addItemFlood(&flood, x, y, DstSurf, DstRect, ConvColor, TRUE);
while (flood.floodLen != 0)
while (flood.floodLen != 0)
{
x = flood.floodStart->x;
y = flood.floodStart->y;

2
win32ss/gdi/dib/i386/dib24bpp_hline.s
View file

@ -65,7 +65,7 @@ PUBLIC _DIB_24BPP_HLine
ret
Align4byte:
/* Align to 4-byte address */
/* Align to 4-byte address */
test al, 3
mov ecx, eax
jz loop1

2
win32ss/gdi/dib/i386/dib32bpp_colorfill.s
View file

@ -10,7 +10,7 @@
#include <asm.inc>
.code
/*
/*
* BOOLEAN
* _cdecl
* DIB_32BPP_ColorFill(SURFOBJ* pso, RECTL* prcl, ULONG iColor);

10
win32ss/gdi/dib/i386/dib32bpp_hline.s
View file

@ -20,7 +20,7 @@ _DIB_32BPP_HLine:
mov [esp+8], edi
mov edi, [esp+28]
mov eax, [ecx+36]
mov ebx, [esp+24] // ebx = LONG x2
mov ebx, [esp+24] // ebx = LONG x2
imul eax, edi
mov edi, [ecx+32]
sub ebx, edx // cx = (x2 - x1) ;
@ -30,9 +30,9 @@ _DIB_32BPP_HLine:
cld
mov eax, [esp+32]
mov edi, [esp]
test edi, 3 // Align to fullword boundary
test edi, 3 // Align to fullword boundary
jnz short _save_rest
mov ecx, ebx // Setup count of fullwords to fill
mov ecx, ebx // Setup count of fullwords to fill
rep stosd
mov ebx, [esp+4]
@ -42,9 +42,9 @@ _DIB_32BPP_HLine:
_save_rest:
stosw
ror eax, 16
mov ecx, ebx // Setup count of fullwords to fill
mov ecx, ebx // Setup count of fullwords to fill
dec ecx
rep stosd // The actual fill
rep stosd // The actual fill
shr eax, 16
stosw

2
win32ss/gdi/eng/debug.c
View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE:
* PURPOSE:
* FILE: win32ss/gdi/eng/debug.c
* PROGRAMER: Jason Filby
*/

4
win32ss/gdi/eng/floatobj.h
View file

@ -36,13 +36,13 @@ FLOATOBJ_bConvertToLong(FLOATOBJ *pf, PLONG pl)
{
return FALSE;
}
if (pef->lExp < 2)
{
*pl = 0;
return TRUE;
}
*pl = EngMulDiv(pef->lMant, 1 << (pef->lExp - 2), 0x40000000);
return TRUE;
}

4
win32ss/gdi/eng/stretchblt.c
View file

@ -516,7 +516,7 @@ IntEngStretchBlt(SURFOBJ *psoDest,
else
{
DPRINT("ClipRegion->rclBounds is (%d,%d)-(%d,%d).\n",
ClipRegion->rclBounds.left, ClipRegion->rclBounds.top,
ClipRegion->rclBounds.left, ClipRegion->rclBounds.top,
ClipRegion->rclBounds.right, ClipRegion->rclBounds.bottom);
}
@ -829,7 +829,7 @@ IntEngStretchBlt(SURFOBJ *psoDest,
OutputRect.top = OutputRect.bottom;
OutputRect.bottom = lTmp;
}
DPRINT("Calling EngStretchBltROP: InputRect: (%d,%d)-(%d,%d) and OutputRect: (%d,%d)-(%d,%d)\n",
InputRect.left, InputRect.top, InputRect.right, InputRect.bottom,
OutputRect.left, OutputRect.top, OutputRect.right, OutputRect.bottom);

2
win32ss/gdi/gdi32/CMakeLists.txt
View file

@ -57,7 +57,7 @@ set_module_type(gdi32
target_link_libraries(gdi32
winegdi
wine
wine
win32ksys
dxguid
atan2

2
win32ss/gdi/gdi32/include/gdi32p.h
View file

@ -45,7 +45,7 @@ typedef DWORD
HDC hdc,
LPCWSTR lpString,
INT uCount,
INT nMaxExtent,
INT nMaxExtent,
LPGCP_RESULTSW lpResults,
DWORD dwFlags,
DWORD dwUnused

88
win32ss/gdi/gdi32/misc/misc.c
View file

@ -301,7 +301,7 @@ static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginD
HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc,
INT transparent, COLORREF transcolor)
{
static const BLENDFUNCTION blendFunc =
static const BLENDFUNCTION blendFunc =
{
AC_SRC_OVER, /* BlendOp */
0, /* BlendFlag */
@ -356,11 +356,11 @@ static inline BOOL UXTHEME_Blt(HDC hdcDest, int nXOriginDest, int nYOriginDest,
*
* Stretches or tiles, depending on sizingtype.
*/
static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDst,
static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDst,
int nWidthDst, int nHeightDst,
HDC hdcSrc, int nXOriginSrc, int nYOriginSrc,
HDC hdcSrc, int nXOriginSrc, int nYOriginSrc,
int nWidthSrc, int nHeightSrc,
int sizingtype,
int sizingtype,
INT transparent, COLORREF transcolor)
{
if (sizingtype == ST_TILE)
@ -533,34 +533,34 @@ static HRESULT UXTHEME_DrawImageBackground(HDC hdc, HBITMAP bmpSrc, RECT *prcSrc
/* Upper left corner */
if(!UXTHEME_Blt(hdcDst, 0, 0, sm.cxLeftWidth, sm.cyTopHeight,
hdcSrc, rcSrc.left, rcSrc.top,
hdcSrc, rcSrc.left, rcSrc.top,
transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
/* Upper right corner */
if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, 0,
if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, 0,
sm.cxRightWidth, sm.cyTopHeight,
hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top,
hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top,
transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
/* Lower left corner */
if(!UXTHEME_Blt (hdcDst, 0, dstSize.y-sm.cyBottomHeight,
if(!UXTHEME_Blt (hdcDst, 0, dstSize.y-sm.cyBottomHeight,
sm.cxLeftWidth, sm.cyBottomHeight,
hdcSrc, rcSrc.left, rcSrc.bottom-sm.cyBottomHeight,
hdcSrc, rcSrc.left, rcSrc.bottom-sm.cyBottomHeight,
transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
/* Lower right corner */
if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, dstSize.y-sm.cyBottomHeight,
if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, dstSize.y-sm.cyBottomHeight,
sm.cxRightWidth, sm.cyBottomHeight,
hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.bottom-sm.cyBottomHeight,
hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.bottom-sm.cyBottomHeight,
transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
if ((sizingtype == ST_STRETCH) || (sizingtype == ST_TILE)) {
@ -571,55 +571,55 @@ static HRESULT UXTHEME_DrawImageBackground(HDC hdc, HBITMAP bmpSrc, RECT *prcSrc
if(destCenterWidth > 0) {
/* Center top */
if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0,
if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0,
destCenterWidth, sm.cyTopHeight,
hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top,
srcCenterWidth, sm.cyTopHeight,
hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top,
srcCenterWidth, sm.cyTopHeight,
sizingtype, transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
/* Center bottom */
if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight,
if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight,
destCenterWidth, sm.cyBottomHeight,
hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight,
srcCenterWidth, sm.cyBottomHeight,
hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight,
srcCenterWidth, sm.cyBottomHeight,
sizingtype, transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
}
if(destCenterHeight > 0) {
/* Left center */
if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight,
if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight,
sm.cxLeftWidth, destCenterHeight,
hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight,
sm.cxLeftWidth, srcCenterHeight,
sizingtype,
hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight,
sm.cxLeftWidth, srcCenterHeight,
sizingtype,
transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
/* Right center */
if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight,
if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight,
sm.cxRightWidth, destCenterHeight,
hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight,
sm.cxRightWidth, srcCenterHeight,
hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight,
sm.cxRightWidth, srcCenterHeight,
sizingtype, transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
}
if(destCenterHeight > 0 && destCenterWidth > 0) {
if(!borderonly) {
/* Center */
if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight,
if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight,
destCenterWidth, destCenterHeight,
hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight,
srcCenterWidth, srcCenterHeight,
hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight,
srcCenterWidth, srcCenterHeight,
sizingtype, transparent, transparentcolor)) {
hr = HRESULT_FROM_WIN32(GetLastError());
goto draw_error;
goto draw_error;
}
}
}
@ -667,7 +667,7 @@ GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS)
transparent = ALPHABLEND_FULL;
else if (pDS->drawOption & DS_TRANSPARENTCLR)
transparent = ALPHABLEND_BINARY;
else
else
transparent = ALPHABLEND_NONE;
if (pDS->drawOption & DS_TILE)
@ -690,11 +690,11 @@ GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS)
sm.cyTopHeight = sm.cyBottomHeight = 0;
}
UXTHEME_DrawImageBackground(pDS->hDC,
pDS->hImage,
&pDS->rcSrc,
transparent,
pDS->crTransparent,
UXTHEME_DrawImageBackground(pDS->hDC,
pDS->hImage,
&pDS->rcSrc,
transparent,
pDS->crTransparent,
FALSE,
sizingtype,
&sm,
@ -1045,9 +1045,9 @@ VOID WINAPI GdiInitializeLanguagePack(DWORD InitParam)
Then InitializeLpkHooks (in user32) uses these to replace certain internal functions
and ORs a DWORD being used also by ClientThreadSetup and calls
NtUserOneParam with parameter 54 which is ONEPARAM_ROUTINE_REGISTERLPK
which most likely changes the value of dwLpkEntryPoints in the
which most likely changes the value of dwLpkEntryPoints in the
PROCESSINFO struct */
#if 0
hookfuncs[0] = GetProcAddress(hLpk, "LpkPSMTextOut");
InitializeLpkHooks(hookfuncs);

2
win32ss/gdi/gdi32/objects/font.c
View file

@ -596,7 +596,7 @@ GetCharacterPlacementW(
}
/* Treat the case where no special handling was requested in a fastpath way */
/* copy will do if the GCP_REORDER flag is not set */
/* copy will do if the GCP_REORDER flag is not set */
if (lpResults->lpOutString)
lstrcpynW( lpResults->lpOutString, lpString, nSet );

8
win32ss/gdi/gdi32/objects/utils.c
View file

@ -416,12 +416,12 @@ EnumLogFontExW2A( LPENUMLOGFONTEXA fontA, CONST ENUMLOGFONTEXW *fontW )
/*
* LPK.DLL loader function
*
*
* Returns TRUE if a valid parameter was passed and loading was successful,
* returns FALSE otherwise.
*/
BOOL WINAPI LoadLPK(INT LpkFunctionID)
{
{
if(!hLpk) // Check if the DLL is already loaded
hLpk = LoadLibraryW(L"lpk.dll");
@ -431,7 +431,7 @@ BOOL WINAPI LoadLPK(INT LpkFunctionID)
{
case LPK_INIT:
return TRUE;
case LPK_ETO:
if (!LpkExtTextOut) // Check if the function is already loaded
LpkExtTextOut = (LPKETO) GetProcAddress(hLpk, "LpkExtTextOut");
@ -468,7 +468,7 @@ BOOL WINAPI LoadLPK(INT LpkFunctionID)
return TRUE;
default:
default:
FreeLibrary(hLpk);
return FALSE;
}

4
win32ss/gdi/ntgdi/bitblt.c
View file

@ -1141,7 +1141,7 @@ IntGdiBitBltRgn(
if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
{
RECTL rcrgn;
RECTL rcrgn;
REGION_GetRgnBox(prgnClip, &rcrgn);
IntUpdateBoundsRect(pdc, &rcrgn);
}
@ -1226,7 +1226,7 @@ IntGdiFillRgn(
if (pdc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
{
RECTL rcrgn;
RECTL rcrgn;
REGION_GetRgnBox(prgnClip, &rcrgn);
IntUpdateBoundsRect(pdc, &rcrgn);
}

2
win32ss/gdi/ntgdi/dibobj.c
View file

@ -798,7 +798,7 @@ GreGetDIBitsInternal(
Info->bmiHeader.biSizeImage = DIB_GetDIBImageBytes( Info->bmiHeader.biWidth,
Info->bmiHeader.biHeight,
Info->bmiHeader.biBitCount);
Info->bmiHeader.biCompression = (Info->bmiHeader.biBitCount == 16 || Info->bmiHeader.biBitCount == 32) ?
Info->bmiHeader.biCompression = (Info->bmiHeader.biBitCount == 16 || Info->bmiHeader.biBitCount == 32) ?
BI_BITFIELDS : BI_RGB;
Info->bmiHeader.biXPelsPerMeter = 0;
Info->bmiHeader.biYPelsPerMeter = 0;

12
win32ss/gdi/ntgdi/freetype.c
View file

@ -574,7 +574,7 @@ IntLoadFontSubstList(PLIST_ENTRY pHead)
}
/* query value */
Status = ZwQueryValueKey(KeyHandle, &FromW, KeyValueFullInformation,
Status = ZwQueryValueKey(KeyHandle, &FromW, KeyValueFullInformation,
InfoBuffer, sizeof(InfoBuffer), &Length);
pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer;
if (!NT_SUCCESS(Status) || !pInfo->DataLength)
@ -1780,7 +1780,7 @@ IntLoadFontsInRegistry(VOID)
}
/* query value */
Status = ZwQueryValueKey(KeyHandle, &FontTitleW, KeyValueFullInformation,
Status = ZwQueryValueKey(KeyHandle, &FontTitleW, KeyValueFullInformation,
InfoBuffer, InfoSize, &Length);
if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL)
{
@ -1794,7 +1794,7 @@ IntLoadFontsInRegistry(VOID)
break;
}
/* try again */
Status = ZwQueryValueKey(KeyHandle, &FontTitleW, KeyValueFullInformation,
Status = ZwQueryValueKey(KeyHandle, &FontTitleW, KeyValueFullInformation,
InfoBuffer, InfoSize, &Length);
}
pInfo = (PKEY_VALUE_FULL_INFORMATION)InfoBuffer;
@ -4968,7 +4968,7 @@ GetFontPenalty(const LOGFONTW * LogFont,
if (Long != TM->tmWeight)
{
/* Weight Penalty 3 */
/* The candidate's weight does not match the requested weight.
/* The candidate's weight does not match the requested weight.
Penalty * (weight difference/10) */
GOT_PENALTY("Weight", 3 * (labs(Long - TM->tmWeight) / 10));
}
@ -6317,7 +6317,7 @@ IntExtTextOutW(
FLOATOBJ_Set1(&Scale);
/* do the shift before multiplying to preserve precision */
FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6);
FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6);
TextLeft += FLOATOBJ_GetLong(&Scale);
DPRINT("New TextLeft2: %I64d\n", TextLeft);
}
@ -6581,7 +6581,7 @@ IntExtTextOutW(
FLOATOBJ_Set1(&Scale);
/* do the shift before multiplying to preserve precision */
FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6);
FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6);
TextLeft += FLOATOBJ_GetLong(&Scale);
DPRINT("New TextLeft2: %I64d\n", TextLeft);
}

2
win32ss/gdi/ntgdi/intgdi.h
View file

@ -97,7 +97,7 @@ NTSTATUS
APIENTRY
NtGdiFlushUserBatch(
VOID);
DWORD
APIENTRY
NtDxEngGetRedirectionBitmap(

2
win32ss/gdi/ntgdi/text.c
View file

@ -188,7 +188,7 @@ GreGetTextExtentExW(
return Result;
}
BOOL
BOOL
WINAPI
GreGetTextMetricsW(
_In_ HDC hdc,

6
win32ss/include/ntuser.h
View file

@ -1348,7 +1348,7 @@ NtUserCtxDisplayIOCtl(
DWORD dwUnknown1,
DWORD dwUnknown2,
DWORD dwUnknown3);
DWORD
APIENTRY
NtUserDbgWin32HeapFail(
@ -2830,7 +2830,7 @@ NtUserPaintMenuBar(
HDC hDC,
ULONG left, // x,
ULONG right, // width, // Scale the edge thickness, offset?
ULONG top, // y,
ULONG top, // y,
BOOL bActive); // DWORD Flags); DC_ACTIVE or WS_ACTIVECAPTION, by checking WNDS_ACTIVEFRAME and foreground.
BOOL
@ -3166,7 +3166,7 @@ NTAPI
NtUserSetDbgTag(
DWORD Unknown0,
DWORD Unknown1);
DWORD
APIENTRY
NtUserSetDbgTagCount(

2
win32ss/printing/base/winspool/printers.c
View file

@ -1436,7 +1436,7 @@ EnumPrintersA(DWORD Flags, PSTR Name, DWORD Level, PBYTE pPrinterEnum, DWORD cbB
MultiByteToWideChar(CP_ACP, 0, Name, -1, pwszName, cch + 1);
}
/* Ref: https://stackoverflow.com/questions/41147180/why-enumprintersa-and-enumprintersw-request-the-same-amount-of-memory */
if (!EnumPrintersW(Flags, pwszName, Level, pPrinterEnum, cbBuf, pcbNeeded, pcReturned))
{

2
win32ss/printing/processors/winprint/raw.c
View file

@ -86,7 +86,7 @@ PrintRawJob(PWINPRINT_HANDLE pHandle, PWSTR pwszPrinterAndJob)
Cleanup:
if (pBuffer)
DllFreeSplMem(pBuffer);
if (bStartedDoc)
EndDocPrinter(hPrintMonitor);

2
win32ss/printing/providers/localspl/jobs.c
View file

@ -1475,7 +1475,7 @@ FreeJob(PLOCAL_JOB pJob)
// Free memory for the optional fields if they are present.
if (pJob->pwszOutputFile)
DllFreeSplStr(pJob->pwszOutputFile);
if (pJob->pwszPrintProcessorParameters)
DllFreeSplStr(pJob->pwszPrintProcessorParameters);

2
win32ss/printing/providers/localspl/printers.c
View file

@ -1188,7 +1188,7 @@ _LocalOpenPrinterHandle(PWSTR pwszPrinterName, PWSTR pwszJobParameter, PHANDLE p
goto Failure;
}
// Skip the "Job " string.
// Skip the "Job " string.
pwszJobParameter += 4;
// Skip even more whitespace.

2
win32ss/printing/providers/localspl/printprocessors.c
View file

@ -148,7 +148,7 @@ InitializePrintProcessorList(void)
// Initialize an empty list for our Print Processors.
InitializeListHead(&_PrintProcessorList);
// Prepare the path to the Print Processor directory.
if (!LocalGetPrintProcessorDirectory(NULL, (PWSTR)wszCurrentEnvironment, 1, (PBYTE)wszPrintProcessorPath, sizeof(wszPrintProcessorPath), &cchPrintProcessorPath))
{

2
win32ss/user/ntuser/console.c
View file

@ -1,4 +1,4 @@
/*
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: Console support functions for CONSRV

6
win32ss/user/ntuser/csr.c
View file

@ -1,4 +1,4 @@
/*
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: Interface between Win32k and USERSRV
@ -89,7 +89,7 @@ CsrClientCallServer(IN OUT PCSR_API_MESSAGE ApiMessage,
/* Fill out the Port Message Header */
ApiMessage->Header.u2.ZeroInit = 0;
ApiMessage->Header.u1.s1.TotalLength = FIELD_OFFSET(CSR_API_MESSAGE, Data) + DataLength;
ApiMessage->Header.u1.s1.DataLength = ApiMessage->Header.u1.s1.TotalLength -
ApiMessage->Header.u1.s1.DataLength = ApiMessage->Header.u1.s1.TotalLength -
sizeof(ApiMessage->Header);
/* Fill out the CSR Header */
@ -219,7 +219,7 @@ DWORD UserSystemThreadProc(BOOL bRemoteProcess)
Type = ST_RIT;
else if (gdwPendingSystemThreads & ST_DESKTOP_THREAD)
Type = ST_DESKTOP_THREAD;
else
else
Type = ST_GHOST_THREAD;
ASSERT(Type);

2
win32ss/user/ntuser/csr.h
View file

@ -1,4 +1,4 @@
/*
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: Interface between Win32k and USERSRV

2
win32ss/user/ntuser/guicheck.c
View file

@ -1,4 +1,4 @@
/*
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: GUI state check

2
win32ss/user/ntuser/sysparams.c
View file

@ -949,7 +949,7 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
/* Fixup user's structure size */
metrics->cbSize = sizeof(NONCLIENTMETRICSW);
if (!SpiSet(&gspv.ncm, metrics, sizeof(NONCLIENTMETRICSW), fl))
return 0;

14
win32ss/user/user32/include/user_x.h
View file

@ -84,13 +84,13 @@ static __inline BOOL STATIC_update_uistate(HWND hwnd, BOOL unicode)
static __inline void LoadUserApiHook()
{
if (!gfServerProcess &&
!IsInsideUserApiHook() &&
(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) &&
!RtlIsThreadWithinLoaderCallout())
{
NtUserCallNoParam(NOPARAM_ROUTINE_LOADUSERAPIHOOK);
}
if (!gfServerProcess &&
!IsInsideUserApiHook() &&
(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) &&
!RtlIsThreadWithinLoaderCallout())
{
NtUserCallNoParam(NOPARAM_ROUTINE_LOADUSERAPIHOOK);
}
}
#define UserHasDlgFrameStyle(Style, ExStyle) \

2
win32ss/user/winsrv/consrv/condrv/graphics.c
View file

@ -95,7 +95,7 @@ GRAPHICS_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer,
NewBuffer->ScreenBufferSize.X = (SHORT)GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biWidth ;
NewBuffer->ScreenBufferSize.Y = (SHORT)-GraphicsInfo->Info.lpBitMapInfo->bmiHeader.biHeight;
NewBuffer->OldViewSize = NewBuffer->ViewSize =
NewBuffer->OldViewSize = NewBuffer->ViewSize =
NewBuffer->OldScreenBufferSize = NewBuffer->ScreenBufferSize;
}
else

4
win32ss/user/winsrv/consrv/shutdown.c
View file

@ -16,7 +16,7 @@
/* FUNCTIONS ******************************************************************/
static void
static void
NotifyConsoleProcessForShutdown(IN PCSR_PROCESS CsrProcess,
IN PCONSOLE_PROCESS_DATA ProcessData,
IN ULONG Flags)
@ -25,7 +25,7 @@ NotifyConsoleProcessForShutdown(IN PCSR_PROCESS CsrProcess,
CsrProcess, Flags, CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread);
/* Send a log-off event. In reality this should be way more complex */
ConSrvConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, ProcessData,
ConSrvConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, ProcessData,
ShutdownSettings.WaitToKillAppTimeout);
}

2
win32ss/user/winsrv/usersrv/shutdown.c
View file

@ -755,7 +755,7 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess,
/* Do not kill Winlogon */
if (CsrProcess->ClientId.UniqueProcess == UlongToHandle(LogonProcessId))
{
DPRINT("Not killing Winlogon; CsrProcess->ShutdownFlags = %lu\n",
DPRINT("Not killing Winlogon; CsrProcess->ShutdownFlags = %lu\n",
CsrProcess->ShutdownFlags);
/* Returning CsrShutdownCsrProcess means that we handled this process by doing nothing */