Normalise line ending
Some files had different line ending (some lines DOS while some others UNIX). Use the same line ending using the nearest ending. Signed-off-by: Frediano Ziglio <fziglio@redhat.com> Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
parent
eae8b8a103
commit
06ab9c9595
@ -3012,10 +3012,10 @@ BOOL QxlDevice::SetVideoModeInfo(UINT Idx, QXLMode* pModeInfo)
|
|||||||
void QxlDevice::UpdateVideoModeInfo(UINT Idx, UINT xres, UINT yres, UINT bpp)
|
void QxlDevice::UpdateVideoModeInfo(UINT Idx, UINT xres, UINT yres, UINT bpp)
|
||||||
{
|
{
|
||||||
PVIDEO_MODE_INFORMATION pMode = NULL;
|
PVIDEO_MODE_INFORMATION pMode = NULL;
|
||||||
UINT bytes_pp = (bpp + 7) / 8;
|
UINT bytes_pp = (bpp + 7) / 8;
|
||||||
ULONG color_bits;
|
ULONG color_bits;
|
||||||
PAGED_CODE();
|
PAGED_CODE();
|
||||||
|
|
||||||
pMode = &m_ModeInfo[Idx];
|
pMode = &m_ModeInfo[Idx];
|
||||||
pMode->VisScreenWidth = xres;
|
pMode->VisScreenWidth = xres;
|
||||||
pMode->VisScreenHeight = yres;
|
pMode->VisScreenHeight = yres;
|
||||||
@ -4401,7 +4401,7 @@ NTSTATUS QxlDevice::SetPointerShape(_In_ CONST DXGKARG_SETPOINTERSHAPE* pSetPoi
|
|||||||
now = chunk->data;
|
now = chunk->data;
|
||||||
end = (UINT8 *)res + CURSOR_ALLOC_SIZE;
|
end = (UINT8 *)res + CURSOR_ALLOC_SIZE;
|
||||||
|
|
||||||
src_end = src + (pSetPointerShape->Pitch * pSetPointerShape->Height * (pSetPointerShape->Flags.Monochrome ? 2 : 1));
|
src_end = src + (pSetPointerShape->Pitch * pSetPointerShape->Height * (pSetPointerShape->Flags.Monochrome ? 2 : 1));
|
||||||
for (; src != src_end; src += pSetPointerShape->Pitch) {
|
for (; src != src_end; src += pSetPointerShape->Pitch) {
|
||||||
PutBytesAlign(&chunk, &now, &end, src, line_size,
|
PutBytesAlign(&chunk, &now, &end, src, line_size,
|
||||||
PAGE_SIZE, 1);
|
PAGE_SIZE, 1);
|
||||||
@ -4442,39 +4442,39 @@ NTSTATUS QxlDevice::Escape(_In_ CONST DXGKARG_ESCAPE* pEscap)
|
|||||||
{
|
{
|
||||||
DbgPrint(TRACE_LEVEL_VERBOSE, ("---> %s\n", __FUNCTION__));
|
DbgPrint(TRACE_LEVEL_VERBOSE, ("---> %s\n", __FUNCTION__));
|
||||||
QXLEscapeSetCustomDisplay *custom_display;
|
QXLEscapeSetCustomDisplay *custom_display;
|
||||||
UINT xres;
|
UINT xres;
|
||||||
UINT yres;
|
UINT yres;
|
||||||
UINT bpp;
|
UINT bpp;
|
||||||
|
|
||||||
if (pEscap->PrivateDriverDataSize != sizeof(QXLEscapeSetCustomDisplay)) {
|
if (pEscap->PrivateDriverDataSize != sizeof(QXLEscapeSetCustomDisplay)) {
|
||||||
DbgPrint(TRACE_LEVEL_ERROR, ("<--> %s Incorrect buffer size %d instead of %d\n", __FUNCTION__, pEscap->PrivateDriverDataSize, sizeof(QXLEscapeSetCustomDisplay)));
|
DbgPrint(TRACE_LEVEL_ERROR, ("<--> %s Incorrect buffer size %d instead of %d\n", __FUNCTION__, pEscap->PrivateDriverDataSize, sizeof(QXLEscapeSetCustomDisplay)));
|
||||||
return STATUS_INVALID_BUFFER_SIZE;
|
return STATUS_INVALID_BUFFER_SIZE;
|
||||||
}
|
}
|
||||||
custom_display = (QXLEscapeSetCustomDisplay*)pEscap->pPrivateDriverData;
|
custom_display = (QXLEscapeSetCustomDisplay*)pEscap->pPrivateDriverData;
|
||||||
xres = custom_display->xres & ~0x3;
|
xres = custom_display->xres & ~0x3;
|
||||||
yres = custom_display->yres & ~0x3;
|
yres = custom_display->yres & ~0x3;
|
||||||
bpp = custom_display->bpp;
|
bpp = custom_display->bpp;
|
||||||
if (bpp != QXL_BPP)
|
if (bpp != QXL_BPP)
|
||||||
{
|
{
|
||||||
bpp = QXL_BPP;
|
bpp = QXL_BPP;
|
||||||
}
|
}
|
||||||
if (xres < MIN_WIDTH_SIZE || yres < MIN_HEIGHT_SIZE)
|
if (xres < MIN_WIDTH_SIZE || yres < MIN_HEIGHT_SIZE)
|
||||||
{
|
{
|
||||||
DbgPrint(TRACE_LEVEL_ERROR, ("%s: xres = %d, yres = %d\n", __FUNCTION__, xres, yres));
|
DbgPrint(TRACE_LEVEL_ERROR, ("%s: xres = %d, yres = %d\n", __FUNCTION__, xres, yres));
|
||||||
return ERROR_INVALID_DATA;
|
return ERROR_INVALID_DATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_CustomMode == (m_ModeCount - 1))
|
if (m_CustomMode == (m_ModeCount - 1))
|
||||||
m_CustomMode = (USHORT)(m_ModeCount - 2);
|
m_CustomMode = (USHORT)(m_ModeCount - 2);
|
||||||
else
|
else
|
||||||
m_CustomMode = (USHORT)(m_ModeCount - 1);
|
m_CustomMode = (USHORT)(m_ModeCount - 1);
|
||||||
|
|
||||||
if ((xres * yres * bpp / 8) > m_RomHdr->surface0_area_size) {
|
if ((xres * yres * bpp / 8) > m_RomHdr->surface0_area_size) {
|
||||||
DbgPrint(TRACE_LEVEL_ERROR, ("%s: Mode (%dx%d#%d) doesn't fit in memory (%d)\n",
|
DbgPrint(TRACE_LEVEL_ERROR, ("%s: Mode (%dx%d#%d) doesn't fit in memory (%d)\n",
|
||||||
__FUNCTION__, xres, yres, bpp, m_RomHdr->surface0_area_size));
|
__FUNCTION__, xres, yres, bpp, m_RomHdr->surface0_area_size));
|
||||||
return STATUS_INVALID_PARAMETER;
|
return STATUS_INVALID_PARAMETER;
|
||||||
}
|
}
|
||||||
UpdateVideoModeInfo(m_CustomMode, xres, yres, bpp);
|
UpdateVideoModeInfo(m_CustomMode, xres, yres, bpp);
|
||||||
DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__));
|
DbgPrint(TRACE_LEVEL_VERBOSE, ("<--- %s\n", __FUNCTION__));
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -273,7 +273,7 @@ public:
|
|||||||
NTSTATUS SetPowerState(DEVICE_POWER_STATE DevicePowerState, DXGK_DISPLAY_INFORMATION* pDispInfo);
|
NTSTATUS SetPowerState(DEVICE_POWER_STATE DevicePowerState, DXGK_DISPLAY_INFORMATION* pDispInfo);
|
||||||
NTSTATUS HWInit(PCM_RESOURCE_LIST pResList, DXGK_DISPLAY_INFORMATION* pDispInfo);
|
NTSTATUS HWInit(PCM_RESOURCE_LIST pResList, DXGK_DISPLAY_INFORMATION* pDispInfo);
|
||||||
NTSTATUS HWClose(void);
|
NTSTATUS HWClose(void);
|
||||||
BOOLEAN EnablePointer(void) { return TRUE; }
|
BOOLEAN EnablePointer(void) { return TRUE; }
|
||||||
NTSTATUS ExecutePresentDisplayOnly(_In_ BYTE* DstAddr,
|
NTSTATUS ExecutePresentDisplayOnly(_In_ BYTE* DstAddr,
|
||||||
_In_ UINT DstBitPerPixel,
|
_In_ UINT DstBitPerPixel,
|
||||||
_In_ BYTE* SrcAddr,
|
_In_ BYTE* SrcAddr,
|
||||||
|
@ -212,7 +212,7 @@ DodSystemDisplayWrite(
|
|||||||
extern int nDebugLevel;
|
extern int nDebugLevel;
|
||||||
void DebugPrintFuncSerial(const char *format, ...);
|
void DebugPrintFuncSerial(const char *format, ...);
|
||||||
|
|
||||||
void DebugPrintFunc(const char *format, ...);
|
void DebugPrintFunc(const char *format, ...);
|
||||||
|
|
||||||
#define DbgPrint(level, line) \
|
#define DbgPrint(level, line) \
|
||||||
if (level > nDebugLevel) {} \
|
if (level > nDebugLevel) {} \
|
||||||
|
@ -336,4 +336,4 @@
|
|||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
Loading…
Reference in New Issue
Block a user