From: Sameeh Jubran <sameeh@xxxxxxxxxx>
Signed-off-by: Sameeh Jubran <sameeh@xxxxxxxxxx>
Signed-off-by: Dmitry Fleytman <dmitry@xxxxxxxxxx>
---
vdagent/CCD.h | 182 +++++++++++++++++++-------------------
vdagent/display_configuration.cpp | 2 +-
vdagent/display_configuration.h | 2 +-
3 files changed, 93 insertions(+), 93 deletions(-)
diff --git a/vdagent/CCD.h b/vdagent/CCD.h
index a457fc1..7b071ee 100644
--- a/vdagent/CCD.h
+++ b/vdagent/CCD.h
@@ -68,103 +68,103 @@ typedef enum {
typedef enum {
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000,
- DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xFFFFFFFF
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER = -1,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HD15 = 0,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SVIDEO = 1,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPOSITE_VIDEO = 2,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_COMPONENT_VIDEO = 3,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DVI = 4,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_HDMI = 5,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_LVDS = 6,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_D_JPN = 8,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDI = 9,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL = 10,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EMBEDDED = 11,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EXTERNAL = 12,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_UDI_EMBEDDED = 13,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_SDTVDONGLE = 14,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_MIRACAST = 15,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_INTERNAL = 0x80000000,
+ DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = 0xFFFFFFFF
} DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY;
typedef enum {
- DISPLAYCONFIG_ROTATION_IDENTITY = 1,
- DISPLAYCONFIG_ROTATION_ROTATE90 = 2,
- DISPLAYCONFIG_ROTATION_ROTATE180 = 3,
- DISPLAYCONFIG_ROTATION_ROTATE270 = 4,
- DISPLAYCONFIG_ROTATION_FORCE_UINT32 = 0xFFFFFFFF
+ DISPLAYCONFIG_ROTATION_IDENTITY = 1,
+ DISPLAYCONFIG_ROTATION_ROTATE90 = 2,
+ DISPLAYCONFIG_ROTATION_ROTATE180 = 3,
+ DISPLAYCONFIG_ROTATION_ROTATE270 = 4,
+ DISPLAYCONFIG_ROTATION_FORCE_UINT32 = 0xFFFFFFFF
} DISPLAYCONFIG_ROTATION;
typedef enum {
- DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED = 0,
- DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE = 1,
- DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED = 2,
- DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_UPPERFIELDFIRST = DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED,
- DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_LOWERFIELDFIRST = 3,
- DISPLAYCONFIG_SCANLINE_ORDERING_FORCE_UINT32 = 0xFFFFFFFF
+ DISPLAYCONFIG_SCANLINE_ORDERING_UNSPECIFIED = 0,
+ DISPLAYCONFIG_SCANLINE_ORDERING_PROGRESSIVE = 1,
+ DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED = 2,
+ DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_UPPERFIELDFIRST = DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED,
+ DISPLAYCONFIG_SCANLINE_ORDERING_INTERLACED_LOWERFIELDFIRST = 3,
+ DISPLAYCONFIG_SCANLINE_ORDERING_FORCE_UINT32 = 0xFFFFFFFF
} DISPLAYCONFIG_SCANLINE_ORDERING;
typedef enum {
- DISPLAYCONFIG_SCALING_IDENTITY = 1,
- DISPLAYCONFIG_SCALING_CENTERED = 2,
- DISPLAYCONFIG_SCALING_STRETCHED = 3,
- DISPLAYCONFIG_SCALING_ASPECTRATIOCENTEREDMAX = 4,
- DISPLAYCONFIG_SCALING_CUSTOM = 5,
- DISPLAYCONFIG_SCALING_PREFERRED = 128,
- DISPLAYCONFIG_SCALING_FORCE_UINT32 = 0xFFFFFFFF
+ DISPLAYCONFIG_SCALING_IDENTITY = 1,
+ DISPLAYCONFIG_SCALING_CENTERED = 2,
+ DISPLAYCONFIG_SCALING_STRETCHED = 3,
+ DISPLAYCONFIG_SCALING_ASPECTRATIOCENTEREDMAX = 4,
+ DISPLAYCONFIG_SCALING_CUSTOM = 5,
+ DISPLAYCONFIG_SCALING_PREFERRED = 128,
+ DISPLAYCONFIG_SCALING_FORCE_UINT32 = 0xFFFFFFFF
} DISPLAYCONFIG_SCALING;
typedef enum {
- DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE = 1,
- DISPLAYCONFIG_MODE_INFO_TYPE_TARGET = 2,
- DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE = 3,
- DISPLAYCONFIG_MODE_INFO_TYPE_FORCE_UINT32 = 0xFFFFFFFF
+ DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE = 1,
+ DISPLAYCONFIG_MODE_INFO_TYPE_TARGET = 2,
+ DISPLAYCONFIG_MODE_INFO_TYPE_DESKTOP_IMAGE = 3,
+ DISPLAYCONFIG_MODE_INFO_TYPE_FORCE_UINT32 = 0xFFFFFFFF
} DISPLAYCONFIG_MODE_INFO_TYPE;
typedef enum {
- DISPLAYCONFIG_PIXELFORMAT_8BPP = 1,
- DISPLAYCONFIG_PIXELFORMAT_16BPP = 2,
- DISPLAYCONFIG_PIXELFORMAT_24BPP = 3,
- DISPLAYCONFIG_PIXELFORMAT_32BPP = 4,
- DISPLAYCONFIG_PIXELFORMAT_NONGDI = 5,
- DISPLAYCONFIG_PIXELFORMAT_FORCE_UINT32 = 0xffffffff
+ DISPLAYCONFIG_PIXELFORMAT_8BPP = 1,
+ DISPLAYCONFIG_PIXELFORMAT_16BPP = 2,
+ DISPLAYCONFIG_PIXELFORMAT_24BPP = 3,
+ DISPLAYCONFIG_PIXELFORMAT_32BPP = 4,
+ DISPLAYCONFIG_PIXELFORMAT_NONGDI = 5,
+ DISPLAYCONFIG_PIXELFORMAT_FORCE_UINT32 = 0xffffffff
} DISPLAYCONFIG_PIXELFORMAT;
typedef enum {
- DISPLAYCONFIG_TOPOLOGY_INTERNAL = 0x00000001,
- DISPLAYCONFIG_TOPOLOGY_CLONE = 0x00000002,
- DISPLAYCONFIG_TOPOLOGY_EXTEND = 0x00000004,
- DISPLAYCONFIG_TOPOLOGY_EXTERNAL = 0x00000008,
- DISPLAYCONFIG_TOPOLOGY_FORCE_UINT32 = 0xFFFFFFFF
+ DISPLAYCONFIG_TOPOLOGY_INTERNAL = 0x00000001,
+ DISPLAYCONFIG_TOPOLOGY_CLONE = 0x00000002,
+ DISPLAYCONFIG_TOPOLOGY_EXTEND = 0x00000004,
+ DISPLAYCONFIG_TOPOLOGY_EXTERNAL = 0x00000008,
+ DISPLAYCONFIG_TOPOLOGY_FORCE_UINT32 = 0xFFFFFFFF
} DISPLAYCONFIG_TOPOLOGY_ID;
typedef struct DISPLAYCONFIG_DEVICE_INFO_HEADER {
- DISPLAYCONFIG_DEVICE_INFO_TYPE type;
- UINT32 size;
- LUID adapterId;
- UINT32 id;
+ DISPLAYCONFIG_DEVICE_INFO_TYPE type;
+ UINT32 size;
+ LUID adapterId;
+ UINT32 id;
} DISPLAYCONFIG_DEVICE_INFO_HEADER;
typedef struct DISPLAYCONFIG_SOURCE_DEVICE_NAME {
- DISPLAYCONFIG_DEVICE_INFO_HEADER header;
- WCHAR viewGdiDeviceName[CCHDEVICENAME];
+ DISPLAYCONFIG_DEVICE_INFO_HEADER header;
+ WCHAR viewGdiDeviceName[CCHDEVICENAME];
} DISPLAYCONFIG_SOURCE_DEVICE_NAME;
typedef struct DISPLAYCONFIG_DESKTOP_IMAGE_INFO {
- POINTL PathSourceSize;
- RECTL DesktopImageRegion;
- RECTL DesktopImageClip;
+ POINTL PathSourceSize;
+ RECTL DesktopImageRegion;
+ RECTL DesktopImageClip;
} DISPLAYCONFIG_DESKTOP_IMAGE_INFO;
typedef struct DISPLAYCONFIG_RATIONAL {
- UINT32 Numerator;
- UINT32 Denominator;
+ UINT32 Numerator;
+ UINT32 Denominator;
} DISPLAYCONFIG_RATIONAL;
typedef struct DISPLAYCONFIG_PATH_SOURCE_INFO {
@@ -208,52 +208,52 @@ typedef struct DISPLAYCONFIG_PATH_INFO {
} DISPLAYCONFIG_PATH_INFO;
typedef struct DISPLAYCONFIG_2DREGION {
- UINT32 cx;
- UINT32 cy;
+ UINT32 cx;
+ UINT32 cy;
} DISPLAYCONFIG_2DREGION;
typedef struct DISPLAYCONFIG_VIDEO_SIGNAL_INFO {
- UINT64 pixelRate;
- DISPLAYCONFIG_RATIONAL hSyncFreq;
- DISPLAYCONFIG_RATIONAL vSyncFreq;
- DISPLAYCONFIG_2DREGION activeSize;
- DISPLAYCONFIG_2DREGION totalSize;
+ UINT64 pixelRate;
+ DISPLAYCONFIG_RATIONAL hSyncFreq;
+ DISPLAYCONFIG_RATIONAL vSyncFreq;
+ DISPLAYCONFIG_2DREGION activeSize;
+ DISPLAYCONFIG_2DREGION totalSize;
- union {
- struct {
- UINT32 videoStandard : 16;
+ union {
+ struct {
+ UINT32 videoStandard : 16;
- UINT32 vSyncFreqDivider : 6;
+ UINT32 vSyncFreqDivider : 6;
- UINT32 reserved : 10;
- } AdditionalSignalInfo;
+ UINT32 reserved : 10;
+ } AdditionalSignalInfo;
- UINT32 videoStandard;
- } DUMMYUNIONNAME;
+ UINT32 videoStandard;
+ } DUMMYUNIONNAME;
- DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering;
+ DISPLAYCONFIG_SCANLINE_ORDERING scanLineOrdering;
} DISPLAYCONFIG_VIDEO_SIGNAL_INFO;
typedef struct DISPLAYCONFIG_TARGET_MODE {
- DISPLAYCONFIG_VIDEO_SIGNAL_INFO targetVideoSignalInfo;
+ DISPLAYCONFIG_VIDEO_SIGNAL_INFO targetVideoSignalInfo;
} DISPLAYCONFIG_TARGET_MODE;
typedef struct DISPLAYCONFIG_SOURCE_MODE {
- UINT32 width;
- UINT32 height;
- DISPLAYCONFIG_PIXELFORMAT pixelFormat;
- POINTL position;
+ UINT32 width;
+ UINT32 height;
+ DISPLAYCONFIG_PIXELFORMAT pixelFormat;
+ POINTL position;
} DISPLAYCONFIG_SOURCE_MODE;
typedef struct DISPLAYCONFIG_MODE_INFO {
- DISPLAYCONFIG_MODE_INFO_TYPE infoType;
- UINT32 id;
- LUID adapterId;
- union {
- DISPLAYCONFIG_TARGET_MODE targetMode;
- DISPLAYCONFIG_SOURCE_MODE sourceMode;
- DISPLAYCONFIG_DESKTOP_IMAGE_INFO desktopImageInfo;
- } DUMMYUNIONNAME;
+ DISPLAYCONFIG_MODE_INFO_TYPE infoType;
+ UINT32 id;
+ LUID adapterId;
+ union {
+ DISPLAYCONFIG_TARGET_MODE targetMode;
+ DISPLAYCONFIG_SOURCE_MODE sourceMode;
+ DISPLAYCONFIG_DESKTOP_IMAGE_INFO desktopImageInfo;
+ } DUMMYUNIONNAME;
} DISPLAYCONFIG_MODE_INFO;
#endif
\ No newline at end of file
diff --git a/vdagent/display_configuration.cpp b/vdagent/display_configuration.cpp
index 95fd4c3..98b3d82 100644
--- a/vdagent/display_configuration.cpp
+++ b/vdagent/display_configuration.cpp
@@ -197,7 +197,7 @@ bool XPDMInterface::update_monitor_config(LPCTSTR device_name, DisplayMode* mode
(LPCSTR) &monitor_config, 0, NULL);
if (err < 0) {
vd_printf("%s: %S can't update monitor config, may have old, old driver",
- __FUNCTION__, device_name);
+ __FUNCTION__, device_name);
}
DeleteDC(hdc);
return (err >= 0);
diff --git a/vdagent/display_configuration.h b/vdagent/display_configuration.h
index 06f592a..67d30e0 100644
--- a/vdagent/display_configuration.h
+++ b/vdagent/display_configuration.h
@@ -106,7 +106,7 @@ private:
PGETDISPLAYCONFIG_BUFFERSIZES _pfnGetDisplayConfigBufferSizes;
PQUERYDISPLAYCONFIG _pfnQueryDisplayConfig;
PSETDISPLAYCONFIG _pfnSetDisplayConfig;
-
+
LONG _error;
bool _primary_detached;
PATH_STATE _path_state;
--
1.8.3.1
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel