<html> <head> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"> </head> <body text="#000000" bgcolor="#FFFFFF"> Hi, I answer inline <div class="moz-cite-prefix">El 10/02/16 a las 16:33, Frediano Ziglio escribió: </div> <blockquote cite="mid:177889165.22023362.1455118399478.JavaMail.zimbra@redhat.com" type="cite"> <blockquote type="cite"> <pre wrap=""> When a new custom display mode is added, the current WDDM driver notifies a disconnection and reconnection of the virtual monitor to force Windows to update the display modes. This produces an ugly effect, keeping the screen black for up to some seconds and usually not repainting it afterwards. This patch uses the CCD API to update the display modes, and produces just a quick flash followed by a whole screen repaint. For best results, it should be used with a driver that does not update the display modes by itself, but it is still compatible with the current implementation. --- common/vdcommon.h | 40 +++++++++++++++++++++++++++ vdagent/desktop_layout.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 1 deletion(-) diff --git a/common/vdcommon.h b/common/vdcommon.h index f40e68e..29437c3 100644 --- a/common/vdcommon.h +++ b/common/vdcommon.h @@ -102,6 +102,46 @@ private: PFND3DKMT_OPENADAPTERFROMHDC _pD3DKMTOpenAdapterFromHdc; }; +// CCD API +#define SDC_APPLY 0x00000080 +#define SDC_USE_SUPPLIED_DISPLAY_CONFIG 0x00000020 +#define SDC_FORCE_MODE_ENUMERATION 0x00001000 +#define QDC_ALL_PATHS 1 +struct DISPLAYCONFIG_PATH_INFO; +struct DISPLAYCONFIG_MODE_INFO; +struct DISPLAYCONFIG_TOPOLOGY_ID; +typedef LONG (*PFNGETDISPLAYCONFIGBUFFERSIZES)(UINT32, UINT32*, UINT32*); +typedef LONG (*PFNQUERYDISPLAYCONFIG)(UINT32, UINT32*, DISPLAYCONFIG_PATH_INFO*, UINT32*, + DISPLAYCONFIG_MODE_INFO*, DISPLAYCONFIG_TOPOLOGY_ID*); +typedef LONG (*PFNSETDISPLAYCONFIG)(UINT32, DISPLAYCONFIG_PATH_INFO*, UINT32, + DISPLAYCONFIG_MODE_INFO*, UINT32); +class CCDLibrary { +public: + ~CCDLibrary(); + static CCDLibrary& singleton() { + static CCDLibrary instance; + return instance; + } + bool found() { + return _hUser32 && _pGetDisplayConfigBufferSizes && + _pQuieryDisplayConfig && _pSetDisplayConfig; + } + LONG get_display_config_buffer_sizes(UINT32* num_paths, UINT32* num_modes); + LONG query_display_config(UINT32* num_paths, DISPLAYCONFIG_PATH_INFO* paths, + UINT32* num_modes, DISPLAYCONFIG_MODE_INFO* modes); + LONG set_display_config(UINT32 num_paths, DISPLAYCONFIG_PATH_INFO* paths, + UINT32 num_modes, DISPLAYCONFIG_MODE_INFO* modes, + UINT32 flags); + +private: + CCDLibrary(); + + HINSTANCE _hUser32; + PFNGETDISPLAYCONFIGBUFFERSIZES _pGetDisplayConfigBufferSizes; + PFNQUERYDISPLAYCONFIG _pQuieryDisplayConfig; + PFNSETDISPLAYCONFIG _pSetDisplayConfig; +}; + #if defined __GNUC__ #define ALIGN_GCC __attribute__ ((packed)) #define ALIGN_VC diff --git a/vdagent/desktop_layout.cpp b/vdagent/desktop_layout.cpp index b5e8cfa..92493f3 100644 --- a/vdagent/desktop_layout.cpp +++ b/vdagent/desktop_layout.cpp @@ -312,6 +312,70 @@ NTSTATUS D3DKMTLibrary::close_adapter(D3DKMT_HANDLE adapter) return _pD3DKMTCloseAdapter(&func_params); } +CCDLibrary::CCDLibrary() + : _pGetDisplayConfigBufferSizes(NULL) + , _pQuieryDisplayConfig(NULL) + , _pSetDisplayConfig(NULL) +{ + _hUser32 = LoadLibrary(L"User32.dll"); </pre> </blockquote> <pre wrap=""> probably you want a GetModuleHandle, user32 have to be already available.</pre> </blockquote> Ok, I'll send another patch <blockquote cite="mid:177889165.22023362.1455118399478.JavaMail.zimbra@redhat.com" type="cite"> <pre wrap=""> </pre> <blockquote type="cite"> <pre wrap="">+ if (_hUser32) { + _pGetDisplayConfigBufferSizes = (PFNGETDISPLAYCONFIGBUFFERSIZES)GetProcAddress(_hUser32, "GetDisplayConfigBufferSizes"); + _pQuieryDisplayConfig = (PFNQUERYDISPLAYCONFIG)GetProcAddress(_hUser32, "QueryDisplayConfig"); + _pSetDisplayConfig = (PFNSETDISPLAYCONFIG)GetProcAddress(_hUser32, "SetDisplayConfig"); + } +} + + +CCDLibrary::~CCDLibrary() +{ + if (_hUser32) + FreeLibrary(_hUser32); </pre> </blockquote> <pre wrap=""> If you use GetModuleHandle this is not necessary </pre> <blockquote type="cite"> <pre wrap="">+} + +LONG CCDLibrary::get_display_config_buffer_sizes(UINT32* num_paths, UINT32* num_modes) +{ + return _pGetDisplayConfigBufferSizes(QDC_ALL_PATHS, num_paths, num_modes); +} + +LONG CCDLibrary::query_display_config(UINT32* num_paths, DISPLAYCONFIG_PATH_INFO* paths, + UINT32* num_modes, DISPLAYCONFIG_MODE_INFO* modes) +{ + return _pQuieryDisplayConfig(QDC_ALL_PATHS, num_paths, paths, num_modes, modes, NULL); +} + +LONG CCDLibrary::set_display_config(UINT32 num_paths, DISPLAYCONFIG_PATH_INFO* paths, + UINT32 num_modes, DISPLAYCONFIG_MODE_INFO* modes, + UINT32 flags) +{ + return _pSetDisplayConfig(num_paths, paths, num_modes, modes, flags); +} + +static void update_display_modes() +{ + // The trick here is to call SetDisplayConfig with the current config and + // the SDC_FORCE_MODE_ENUMERATION flag + CCDLibrary& ccd = CCDLibrary::singleton(); + if (!ccd.found()) return; + UINT32 num_paths = 0, num_modes = 0; + DISPLAYCONFIG_PATH_INFO * paths; + DISPLAYCONFIG_MODE_INFO * modes; + LONG status = ccd.get_display_config_buffer_sizes(&num_paths, &num_modes); + if (NT_SUCCESS(status)) { + // Being conservative, struct sizes are under 100 bytes + paths = reinterpret_cast<DISPLAYCONFIG_PATH_INFO *>(new char[num_paths * 100]); + modes = reinterpret_cast<DISPLAYCONFIG_MODE_INFO *>(new char[num_modes * 100]); </pre> </blockquote> <pre wrap=""> why not paths = new DISPLAYCONFIG_PATH_INFO[num_paths]; modes = new DISPLAYCONFIG_MODE_INFO[num_modes];</pre> </blockquote> This is to avoid having to fully define both DISPLAYCONFIG_PATH_INFO and DISPLAYCONFIG_MODE_INFO structs. The definition is quite long, and I am not using any of their members. Just filling two buffers with query_display_config and passing them to set_display_config. But if you think it is cleaner to include the full definition, I can do so in the next version of the patch. <blockquote cite="mid:177889165.22023362.1455118399478.JavaMail.zimbra@redhat.com" type="cite"> <pre wrap=""> </pre> <blockquote type="cite"> <pre wrap="">+ status = ccd.query_display_config(&num_paths, paths, &num_modes, modes); + if (NT_SUCCESS(status)) { + ccd.set_display_config(num_paths, paths, num_modes, modes, + SDC_APPLY | + SDC_USE_SUPPLIED_DISPLAY_CONFIG | + SDC_FORCE_MODE_ENUMERATION); + } + delete[] reinterpret_cast<char *>(paths); + delete[] reinterpret_cast<char *>(modes); </pre> </blockquote> <pre wrap=""> and here delete[] paths; delete[] modes;</pre> </blockquote> Same here <blockquote cite="mid:177889165.22023362.1455118399478.JavaMail.zimbra@redhat.com" type="cite"> <pre wrap=""> Frediano </pre> <blockquote type="cite"> <pre wrap="">+ } +} + bool DesktopLayout::init_dev_mode(LPCTSTR dev_name, DEVMODE* dev_mode, DisplayMode* mode, LONG normal_x, LONG normal_y, bool set_pos) { @@ -384,7 +448,9 @@ bool DesktopLayout::init_dev_mode(LPCTSTR dev_name, DEVMODE* dev_mode, DisplayMo vd_printf("escape xres = %d, yres = %d, bpp = %d", custom.xres, custom.yres, custom.bpp); NTSTATUS status = d3dkmt.escape_driver_private(adapter, &custom, sizeof(QXLEscapeSetCustomDisplay)); - if (!NT_SUCCESS(status)) { + if (NT_SUCCESS(status)) { + update_display_modes(); + } else { vd_printf("escape failed with error 0x%08X", status); } } </pre> </blockquote> <pre wrap=""> </pre> </blockquote> <div class="moz-signature">-- <table style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" width="480" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> <td style=" vertical-align:top; padding-right:10;"> <a href="http://flexvdi.com"><img src="cid:part1.07060804.07010106@flexvdi.com" style="vertical-align: top;" height="45" width="151"></a><a href="http://flexvdi.com"> </a> Javier Celaya Software Engineer </td> <td style=" padding-left:18; padding-right:18; padding-top:7; padding-bottom:7;"> <img src="cid:part4.09070809.06030001@flexvdi.com" style="float: left;" height="17" width="17"> <a name="info"></a><a href="mailto:javier.celaya@flexvdi.com">j</a><a class="moz-txt-link-abbreviated" href="mailto:avier.celaya@flexvdi.com">avier.celaya@flexvdi.com</a> <img src="cid:part7.05070402.03000401@flexvdi.com" style="float: left;" height="17" width="17"> <a name="info"></a>+34 876 60 00 73 <img src="cid:part9.07010008.08070801@flexvdi.com" style="float: left;" height="17" width="17"> <a name="info"></a>@j_celaya </td> </tr> </tbody> </table> <table style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px;" border="0" cellpadding="0" cellspacing="2"> </table> </div> </body> </html>