>
> Fixed misspelling: HwDeviceInterface
> Fixed misspelling: GetDxgkInterface
>
> Based on a patch by Sandy Stutsman <sstutsma@xxxxxxxxxx>
>
> Signed-off-by: Sameeh Jubran <sameeh@xxxxxxxxxx>
> ---
> qxldod/QxlDod.cpp | 8 ++++----
> qxldod/QxlDod.h | 14 ++++++++------
> 2 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/qxldod/QxlDod.cpp b/qxldod/QxlDod.cpp
> index 67bb88a..bb187e6 100755
> --- a/qxldod/QxlDod.cpp
> +++ b/qxldod/QxlDod.cpp
> @@ -2327,7 +2327,7 @@ VOID BltBits (
> }
> }
>
> -VgaDevice::VgaDevice(_In_ QxlDod* pQxlDod)
> +VgaDevice::VgaDevice(_In_ QxlDod* pQxlDod) : HwDeviceInterface(pQxlDod)
I just noted this new HwDeviceInterface constructor.
It does not make sense... it requires a new parameter and it's not used.
This hunk should be removed.
> {
> m_pQxlDod = pQxlDod;
> m_ModeInfo = NULL;
> @@ -2944,7 +2944,7 @@ NTSTATUS VgaDevice::Escape(_In_ CONST DXGKARG_ESCAPE*
> pEscap)
> return STATUS_NOT_IMPLEMENTED;
> }
>
> -QxlDevice::QxlDevice(_In_ QxlDod* pQxlDod)
> +QxlDevice::QxlDevice(_In_ QxlDod* pQxlDod) : HwDeviceInterface(pQxlDod)
> {
> m_pQxlDod = pQxlDod;
> m_ModeInfo = NULL;
This too.
> @@ -3180,7 +3180,7 @@ NTSTATUS QxlDevice::SetPowerState(_In_
> DEVICE_POWER_STATE DevicePowerState, DXGK
> NTSTATUS QxlDevice::HWInit(PCM_RESOURCE_LIST pResList,
> DXGK_DISPLAY_INFORMATION* pDispInfo)
> {
> DbgPrint(TRACE_LEVEL_VERBOSE, ("---> %s\n", __FUNCTION__));
> - PDXGKRNL_INTERFACE pDxgkInterface = m_pQxlDod->GetDxgkInterrface();
> + PDXGKRNL_INTERFACE pDxgkInterface = m_pQxlDod->GetDxgkInterface();
> UINT pci_range = QXL_RAM_RANGE_INDEX;
> for (ULONG i = 0; i < pResList->Count; ++i)
> {
> @@ -3357,7 +3357,7 @@ void QxlDevice::QxlClose()
>
> void QxlDevice::UnmapMemory(void)
> {
> - PDXGKRNL_INTERFACE pDxgkInterface = m_pQxlDod->GetDxgkInterrface();
> + PDXGKRNL_INTERFACE pDxgkInterface = m_pQxlDod->GetDxgkInterface();
> if (m_IoMapped && m_IoBase)
> {
> pDxgkInterface->DxgkCbUnmapMemory( pDxgkInterface->DeviceHandle,
> &m_IoBase);
> diff --git a/qxldod/QxlDod.h b/qxldod/QxlDod.h
> index fc3a8ac..3cc9132 100755
> --- a/qxldod/QxlDod.h
> +++ b/qxldod/QxlDod.h
> @@ -212,9 +212,10 @@ typedef struct _CURRENT_BDD_MODE
>
> class QxlDod;
>
> -class HwDeviceIntrface {
> +class HwDeviceInterface {
> public:
> - virtual ~HwDeviceIntrface() {;}
> + HwDeviceInterface(_In_ QxlDod* pQxlDod) {}
And this new constructor.
I think there was a possible future intention but was not implemented.
> + virtual ~HwDeviceInterface() {;}
> virtual NTSTATUS QueryCurrentMode(PVIDEO_MODE RequestedMode) = 0;
> virtual NTSTATUS SetCurrentMode(ULONG Mode) = 0;
> virtual NTSTATUS GetCurrentMode(ULONG* Mode) = 0;
> @@ -261,7 +262,7 @@ protected:
> };
>
> class VgaDevice :
> - public HwDeviceIntrface
> + public HwDeviceInterface
> {
> public:
> VgaDevice(_In_ QxlDod* pQxlDod);
> @@ -434,7 +435,7 @@ typedef struct DpcCbContext {
> #define ALIGN(a, b) (((a) + ((b) - 1)) & ~((b) - 1))
>
> class QxlDevice :
> - public HwDeviceIntrface
> + public HwDeviceInterface
> {
> public:
> QxlDevice(_In_ QxlDod* pQxlDod);
> @@ -591,7 +592,8 @@ private:
>
> D3DDDI_VIDEO_PRESENT_SOURCE_ID m_SystemDisplaySourceId;
> DXGKARG_SETPOINTERSHAPE m_PointerShape;
> - HwDeviceIntrface* m_pHWDevice;
> +
> + HwDeviceInterface* m_pHWDevice;
> DWORD m_VgaCompatible;
> DWORD m_PointerCaps;
> public:
> @@ -686,7 +688,7 @@ public:
> _In_
> UINT
> SourceStride,
> _In_
> INT
> PositionX,
> _In_
> INT
> PositionY);
> - PDXGKRNL_INTERFACE GetDxgkInterrface(void) { return &m_DxgkInterface;}
> + PDXGKRNL_INTERFACE GetDxgkInterface(void) { return &m_DxgkInterface;}
> private:
> VOID CleanUp(VOID);
> NTSTATUS CheckHardware();
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel