nefarius/qxl-wddm-dod
1
0
Fork 0
Code Pull Requests Activity

fix bug in the modes initialization list

Browse Source
This commit is contained in:
Vadim Rozenfeld 2014-01-02 20:58:18 +11:00
parent f15bf992ca
commit 965ff992b6
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
qxldod/QxlDod.cpp
View File

@ -109,15 +109,6 @@ NTSTATUS QxlDod::StartDevice(_In_ DXGK_START_INFO* pDxgkStartInfo,
// return Status; // return Status;
// } // }
Status = VbeGetModeList();
if (!NT_SUCCESS(Status))
{
QXL_LOG_ASSERTION1("RegisterHWInfo failed with status 0x%X\n",
Status);
return Status;
}
// This sample driver only uses the frame buffer of the POST device. DxgkCbAcquirePostDisplayOwnership // This sample driver only uses the frame buffer of the POST device. DxgkCbAcquirePostDisplayOwnership
// gives you the frame buffer address and ensures that no one else is drawing to it. Be sure to give it back! // gives you the frame buffer address and ensures that no one else is drawing to it. Be sure to give it back!
Status = m_DxgkInterface.DxgkCbAcquirePostDisplayOwnership(m_DxgkInterface.DeviceHandle, &(m_CurrentModes[0].DispInfo)); Status = m_DxgkInterface.DxgkCbAcquirePostDisplayOwnership(m_DxgkInterface.DeviceHandle, &(m_CurrentModes[0].DispInfo));
@ -127,8 +118,20 @@ NTSTATUS QxlDod::StartDevice(_In_ DXGK_START_INFO* pDxgkStartInfo,
// after a pre-WDDM 1.2 driver. Since we can't draw anything, we should fail to start. // after a pre-WDDM 1.2 driver. Since we can't draw anything, we should fail to start.
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
*pNumberOfViews = MAX_VIEWS;
*pNumberOfChildren = MAX_CHILDREN; DbgPrint(TRACE_LEVEL_INFORMATION, ("<--- %s %dx%d ColorFormat = %d, \n", __FUNCTION__,
m_CurrentModes[0].DispInfo.Width, m_CurrentModes[0].DispInfo.Height, m_CurrentModes[0].DispInfo.ColorFormat));
Status = VbeGetModeList();
if (!NT_SUCCESS(Status))
{
QXL_LOG_ASSERTION1("RegisterHWInfo failed with status 0x%X\n",
Status);
return Status;
}
*pNumberOfViews = MAX_VIEWS;
*pNumberOfChildren = MAX_CHILDREN;
m_Flags.DriverStarted = TRUE; m_Flags.DriverStarted = TRUE;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -2471,9 +2474,13 @@ NTSTATUS QxlDod::VbeGetModeList()
VbeModeInfo = m_ModeInfo + SuitableModeCount; VbeModeInfo = m_ModeInfo + SuitableModeCount;
if (VbeModeInfo->XResolution >= 1024 && UINT Height = m_CurrentModes[0].DispInfo.Height;
VbeModeInfo->YResolution >= 768 && UINT Width = m_CurrentModes[0].DispInfo.Width;
VbeModeInfo->BitsPerPixel == 24 && UINT BitsPerPixel = BPPFromPixelFormat(m_CurrentModes[0].DispInfo.ColorFormat);
if (VbeModeInfo->XResolution >= Width &&
VbeModeInfo->YResolution >= Height &&
VbeModeInfo->BitsPerPixel == BitsPerPixel &&
VbeModeInfo->PhysBasePtr != 0) VbeModeInfo->PhysBasePtr != 0)
{ {
m_ModeNumbers[SuitableModeCount] = ModeTemp; m_ModeNumbers[SuitableModeCount] = ModeTemp;