<div dir="ltr">This style was used in order to match the current style of VDAgent.</div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Jul 18, 2016 at 10:54 AM, Frediano Ziglio <<a href="mailto:fziglio@redhat.com" target="_blank">fziglio@redhat.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">> > From: Sameeh Jubran <<a href="mailto:sameeh@daynix.com">sameeh@daynix.com</a>> > > This patch adds new ioctl operation to Vdagent in order to update > the driver on Vdagent state. This allows the driver to know > when Vdagent is running and when it is off. > > Signed-off-by: Sameeh Jubran <<a href="mailto:sameeh@daynix.com">sameeh@daynix.com</a>> > Signed-off-by: Dmitry Fleytman <<a href="mailto:dmitry@daynix.com">dmitry@daynix.com</a>> > --- > vdagent/desktop_layout.cpp | 21 +++++++++++++++++++++ > vdagent/desktop_layout.h | 1 + > vdagent/display_configuration.cpp | 15 +++++++++++++++ > vdagent/display_configuration.h | 2 ++ > 4 files changed, 39 insertions(+) > > diff --git a/vdagent/desktop_layout.cpp b/vdagent/desktop_layout.cpp > index 7aff7e7..a8d9e2d 100644 > --- a/vdagent/desktop_layout.cpp > +++ b/vdagent/desktop_layout.cpp > @@ -44,6 +44,7 @@ DesktopLayout::DesktopLayout() > > DesktopLayout::~DesktopLayout() > { > + set_vdagent_running_for_displays(false); > clean_displays(); > if (_display_config){ > delete _display_config; > @@ -122,6 +123,8 @@ void DesktopLayout::set_displays() > DWORD display_id = 0; > int dev_sets = 0; > > + set_vdagent_running_for_displays(true); > + > lock(); > if (!consistent_displays()) { > unlock(); > @@ -276,6 +279,22 @@ bool DesktopLayout::get_qxl_device_id(WCHAR* device_key, > DWORD* device_id) > return key_found; > } > > +void DesktopLayout::set_vdagent_running_for_displays(bool running) > +{ > + DISPLAY_DEVICE dev_info; > + DWORD dev_id = 0; > + lock(); > + ZeroMemory(&dev_info, sizeof(dev_info)); > + dev_info.cb = sizeof(dev_info); > + while (EnumDisplayDevices(NULL, dev_id, &dev_info, 0)) { > + dev_id++; > + if (!(dev_info.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) && > wcsstr(dev_info.DeviceString, L"QXL")) { > + _display_config->set_vdagent_running(dev_info.DeviceName, > running); > + } > + } > + unlock(); > +} > + > bool DesktopLayout::init_dev_mode(LPCTSTR dev_name, DEVMODE* dev_mode, > DisplayMode* mode) > { > ZeroMemory(dev_mode, sizeof(DEVMODE)); > @@ -299,6 +318,8 @@ bool DesktopLayout::init_dev_mode(LPCTSTR dev_name, > DEVMODE* dev_mode, DisplayMo > // update current DisplayMode (so mouse scaling works properly) > mode->_width = dev_mode->dmPelsWidth; > mode->_height = dev_mode->dmPelsHeight; > + > + set_vdagent_running_for_displays(true); > return true; > > } > diff --git a/vdagent/desktop_layout.h b/vdagent/desktop_layout.h > index fd6af76..da5a40b 100644 > --- a/vdagent/desktop_layout.h > +++ b/vdagent/desktop_layout.h > @@ -83,6 +83,7 @@ private: > static bool consistent_displays(); > static bool is_attached(LPCTSTR dev_name); > static bool get_qxl_device_id(WCHAR* device_key, DWORD* device_id); > + void set_vdagent_running_for_displays(bool enable_pointer); > private: > mutex_t _mutex; > Displays _displays; > diff --git a/vdagent/display_configuration.cpp > b/vdagent/display_configuration.cpp > index f20605a..95fd4c3 100644 > --- a/vdagent/display_configuration.cpp > +++ b/vdagent/display_configuration.cpp > @@ -67,6 +67,15 @@ typedef struct WDDM_MONITOR_CONFIG_ESCAPE { > int _ioctl; > QXLHead _head; > } WDDM_MONITOR_CONFIG_ESCAPE; > +typedef struct WDDM_VDAGENT_RUNNING_ESCAPE{ > + WDDM_VDAGENT_RUNNING_ESCAPE(bool running) > + { > + _ioctl = QXL_ESCAPE_VDAGENT_RUNNING; > + _vdagent_state.running = running; > + } > + int _ioctl; > + QXLEscapeVDAgentRunning _vdagent_state; > +} WDDM_VDAGENT_RUNNING_ESCAPE; </div></div>This style is really confusing, it's a mix of C and C++, there is no reason for the typedef. I think also there is some missing empty line and space. Also the choice of all capital is confusing (maybe just me) <div class="HOEnZb"><div class="h5"> > #endif > DisplayConfig* DisplayConfig::create_config() > { > @@ -529,6 +538,12 @@ bool WDDMInterface::escape(LPCTSTR device_name, void* > data, UINT size_data) > return NT_SUCCESS(status); > } > > +bool WDDMInterface::set_vdagent_running(LPCTSTR device_name, bool running) > +{ > + WDDM_VDAGENT_RUNNING_ESCAPE wddm_escape(running); > + return escape(device_name, &wddm_escape, sizeof(wddm_escape)); > +} > + > CCD::CCD() > :_NumPathElements(0) > ,_NumModeElements(0) > diff --git a/vdagent/display_configuration.h > b/vdagent/display_configuration.h > index eeba1c2..06f592a 100644 > --- a/vdagent/display_configuration.h > +++ b/vdagent/display_configuration.h > @@ -132,6 +132,7 @@ public: > DRIVER_TYPE type() { return _driver_type; }; > void set_monitors_config(bool flag) { _send_monitors_config = flag; } > virtual void update_config_path() {}; > + virtual bool set_vdagent_running(LPCTSTR device_name, bool running) { > return false; }; > > protected: > DRIVER_TYPE _driver_type; > @@ -176,6 +177,7 @@ private: > > void close_adapter(D3DKMT_HANDLE handle); > bool escape(LPCTSTR device_name, void* data, UINT sizeData); > + bool set_vdagent_running(LPCTSTR device_name, bool running); > > private: > //GDI Function pointers </div></div>Frediano </blockquote></div> <div> </div>-- <div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr">Respectfully, <div style="font-size:12.8px;color:rgb(136,136,136)">Sameeh Jubran</div><div style="font-size:12.8px;color:rgb(136,136,136)">Mobile: +972 054-2509642</div><div style="font-size:12.8px;color:rgb(136,136,136)"><a href="https://il.linkedin.com/pub/sameeh-jubran/87/747/a8a" title="View public profile" name="UNIQUE_ID_SafeHtmlFilter_UNIQUE_ID_SafeHtmlFilter_UNIQUE_ID_SafeHtmlFilter_14e2c1de96f8c195_UNIQUE_ID_SafeHtmlFilter_SafeHtmlFilter_SafeHtmlFilter_webProfileURL" style="color:rgb(17,85,204);margin:0px;padding:0px;border-width:0px;outline:none;vertical-align:baseline;text-decoration:none" target="_blank">Linkedin</a> Junior Software Engineer @ <a href="http://www.daynix.com" target="_blank">Daynix</a>.</div></div></div></div></div> </div>