Merge remote-tracking branch 'origin/upstream'

chenall · Apr 23, 2023 · 9c4c5eb · 9c4c5eb
2 parents afa5a0b + ccd30c8
commit 9c4c5eb
Show file tree

Hide file tree

Showing 170 changed files with 18,547 additions and 4,763 deletions.
diff --git a/desktop-ipc/DesktopServerProto.cpp b/desktop-ipc/DesktopServerProto.cpp
@@ -225,12 +225,12 @@ void DesktopServerProto::readNewClipboard(StringStorage *newClipboard,
   gate->readUTF8(newClipboard);
 }
 
-void DesktopServerProto::sendNewPointerPos(const Point *newPos, UINT8 keyFlag,
+void DesktopServerProto::sendNewPointerPos(const Point newPos, UINT8 keyFlag,
                                            BlockingGate *gate)
 {
   // Send pointer position
-  gate->writeUInt16(newPos->x);
-  gate->writeUInt16(newPos->y);
+  gate->writeUInt16(newPos.x);
+  gate->writeUInt16(newPos.y);
   // Send key flags
   gate->writeUInt8(keyFlag);
 }

diff --git a/desktop-ipc/DesktopServerProto.h b/desktop-ipc/DesktopServerProto.h
@@ -67,7 +67,7 @@ class DesktopServerProto
                                 BlockingGate *gate);
   virtual void readNewClipboard(StringStorage *newClipboard,
                                 BlockingGate *gate);
-  virtual void sendNewPointerPos(const Point *newPos, UINT8 keyFlag,
+  virtual void sendNewPointerPos(const Point newPos, UINT8 keyFlag,
                                  BlockingGate *gate);
   virtual void readNewPointerPos(Point *newPos, UINT8 *keyFlag,
                                  BlockingGate *gate);
@@ -107,6 +107,7 @@ class DesktopServerProto
   static const UINT8 APPLICATION_REGION_REQ = 39;
   static const UINT8 NORMALIZE_RECT_REQ = 40;
   static const UINT8 APPLICATION_CHECK_FOCUS = 41;
+  static const UINT8 DISPLAYS_COORDS_REQ = 42;
 
   static const UINT8 CONFIG_RELOAD_REQ = 50;
   static const UINT8 SOFT_INPUT_ENABLING_REQ = 51;

diff --git a/desktop-ipc/DesktopSrvDispatcher.cpp b/desktop-ipc/DesktopSrvDispatcher.cpp
@@ -38,7 +38,6 @@ DesktopSrvDispatcher::DesktopSrvDispatcher(BlockingGate *gate,
 DesktopSrvDispatcher::~DesktopSrvDispatcher()
 {
   terminate();
-  resume();
   wait();
 }
 

diff --git a/desktop-ipc/UserInputClient.cpp b/desktop-ipc/UserInputClient.cpp
@@ -67,7 +67,7 @@ void UserInputClient::sendInit(BlockingGate *gate)
   gate->writeUInt8(m_sendMouseFlags);
 }
 
-void UserInputClient::setMouseEvent(const Point *newPos, UINT8 keyFlag)
+void UserInputClient::setMouseEvent(const Point newPos, UINT8 keyFlag)
 {
   AutoLock al(m_forwGate);
   try {
@@ -145,6 +145,30 @@ void UserInputClient::getDisplayNumberCoords(Rect *rect,
   } while (!success);
 }
 
+std::vector<Rect> UserInputClient::getDisplaysCoords()
+{
+  std::vector<Rect> res;
+  AutoLock al(m_forwGate);
+  bool success = false;
+  unsigned char number;
+  do {
+    try {
+      res.resize(0);
+      // Send request
+      m_forwGate->writeUInt8(DISPLAYS_COORDS_REQ);
+      number = m_forwGate->readUInt8();
+      for (size_t i = 0; i < number; i++) {
+        Rect rect = readRect(m_forwGate);
+        res.push_back(rect);
+      }
+      success = true;
+    }
+    catch (ReconnectException &) {
+    }
+  } while (!success);
+  return res;
+}
+
 void UserInputClient::getNormalizedRect(Rect *rect)
 {
   AutoLock al(m_forwGate);

diff --git a/desktop-ipc/UserInputClient.h b/desktop-ipc/UserInputClient.h
@@ -42,13 +42,14 @@ class UserInputClient : public UserInput, public DesktopServerProto,
 
   virtual void sendInit(BlockingGate *gate);
   virtual void setNewClipboard(const StringStorage *newClipboard);
-  virtual void setMouseEvent(const Point *newPos, UINT8 keyFlag);
+  virtual void setMouseEvent(const Point newPos, UINT8 keyFlag);
   virtual void setKeyboardEvent(UINT32 keySym, bool down);
   virtual void getCurrentUserInfo(StringStorage *desktopName,
                                   StringStorage *userName);
   virtual void getPrimaryDisplayCoords(Rect *rect);
   virtual void getDisplayNumberCoords(Rect *rect,
                                       unsigned char dispNumber);
+  virtual std::vector<Rect> getDisplaysCoords();
   virtual void getNormalizedRect(Rect *rect);
   virtual void getWindowCoords(HWND hwnd, Rect *rect);
   virtual HWND getWindowHandleByName(const StringStorage *windowName);

diff --git a/desktop-ipc/UserInputServer.cpp b/desktop-ipc/UserInputServer.cpp
@@ -45,6 +45,7 @@ UserInputServer::UserInputServer(BlockingGate *forwGate,
   dispatcher->registerNewHandle(WINDOW_COORDS_REQ, this);
   dispatcher->registerNewHandle(WINDOW_HANDLE_REQ, this);
   dispatcher->registerNewHandle(DISPLAY_NUMBER_COORDS_REQ, this);
+  dispatcher->registerNewHandle(DISPLAYS_COORDS_REQ, this);
   dispatcher->registerNewHandle(APPLICATION_REGION_REQ, this);
   dispatcher->registerNewHandle(APPLICATION_CHECK_FOCUS, this);
   dispatcher->registerNewHandle(NORMALIZE_RECT_REQ, this);
@@ -101,6 +102,9 @@ void UserInputServer::onRequest(UINT8 reqCode, BlockingGate *backGate)
   case DISPLAY_NUMBER_COORDS_REQ:
     ansDisplayNumberCoords(backGate);
     break;
+  case DISPLAYS_COORDS_REQ:
+    ansDisplaysCoords(backGate);
+    break;
   case APPLICATION_REGION_REQ:
     ansApplicationRegion(backGate);
     break;
@@ -133,7 +137,7 @@ void UserInputServer::applyNewPointerPos(BlockingGate *backGate)
   Point newPointerPos;
   UINT8 keyFlags;
   readNewPointerPos(&newPointerPos, &keyFlags, backGate);
-  m_userInput->setMouseEvent(&newPointerPos, keyFlags);
+  m_userInput->setMouseEvent(newPointerPos, keyFlags);
 }
 
 void UserInputServer::applyNewClipboard(BlockingGate *backGate)
@@ -197,6 +201,20 @@ void UserInputServer::ansDisplayNumberCoords(BlockingGate *backGate)
   sendRect(&rect, backGate);
 }
 
+void UserInputServer::ansDisplaysCoords(BlockingGate *backGate)
+{
+  std::vector<Rect> rects = m_userInput->getDisplaysCoords();
+  size_t number = rects.size();
+  if (number > 255) {
+    number = 255;
+  }
+  backGate->writeUInt8((UINT8)number);
+  for (size_t i = 0; i < number; i++) {
+    Rect rect = rects[i];
+    sendRect(&rect, backGate);
+  }
+}
+
 void UserInputServer::ansNormalizeRect(BlockingGate *backGate)
 {
   Rect rect = readRect(backGate);

diff --git a/desktop-ipc/UserInputServer.h b/desktop-ipc/UserInputServer.h
@@ -57,6 +57,7 @@ class UserInputServer: public DesktopServerProto, public ClientListener,
   virtual void ansUserInfo(BlockingGate *backGate);
   virtual void ansWindowHandle(BlockingGate *backGate);
   virtual void ansDisplayNumberCoords(BlockingGate *backGate);
+  virtual void ansDisplaysCoords(BlockingGate *backGate);
   virtual void ansApplicationRegion(BlockingGate *backGate);
   virtual void ansApplicationInFocus(BlockingGate *backGate);
   virtual void ansNormalizeRect(BlockingGate *backGate);

diff --git a/desktop/CursorPositionDetector.cpp b/desktop/CursorPositionDetector.cpp
@@ -60,7 +60,7 @@ void CursorPositionDetector::execute()
     curPoint = m_cursor.getCursorPos();
     if (!m_lastCursorPos.isEqualTo(&curPoint)) {
       m_lastCursorPos = curPoint;
-      m_updateKeeper->setCursorPosChanged(&m_lastCursorPos);
+      m_updateKeeper->setCursorPos(&m_lastCursorPos);
       doUpdate();
     }
     m_sleepTimer.waitForEvent(MOUSE_SLEEP_TIME);

diff --git a/desktop/Desktop.h b/desktop/Desktop.h
@@ -31,6 +31,7 @@
 #include "rfb/PixelFormat.h"
 #include "rfb/FrameBuffer.h"
 #include "fb-update-sender/UpdateRequestListener.h"
+#include <vector>
 
 // This class is a public interface to a desktop.
 class Desktop : public UpdateRequestListener
@@ -51,6 +52,7 @@ class Desktop : public UpdateRequestListener
   virtual void getNormalizedRect(Rect *rect) = 0;
   virtual void getDisplayNumberCoords(Rect *rect,
                                       unsigned char dispNumber) = 0;
+  virtual std::vector<Rect> getDisplaysCoords() = 0;
   virtual void getWindowCoords(HWND hwnd, Rect *rect) = 0;
   virtual HWND getWindowHandleByName(const StringStorage *windowName) = 0;
 

diff --git a/desktop/DesktopBaseImpl.cpp b/desktop/DesktopBaseImpl.cpp
@@ -91,11 +91,27 @@ void DesktopBaseImpl::getDisplayNumberCoords(Rect *rect,
   try {
     m_userInput->getDisplayNumberCoords(rect, dispNumber);
   } catch (Exception &e) {
-	m_log->error(_T("Exception in DesktopBaseImpl::getDisplayNumberCoords: %s"), e.getMessage());
+  	m_log->error(_T("Exception in DesktopBaseImpl::getDisplayNumberCoords: %s"), e.getMessage());
     m_extDeskTermListener->onAbnormalDesktopTerminate();
   }
 }
 
+std::vector<Rect> DesktopBaseImpl::getDisplaysCoords()
+{
+  _ASSERT(m_userInput != 0);
+  _ASSERT(m_extDeskTermListener != 0);
+  m_log->info(_T("get the displays coordinates"));
+  try {
+    return m_userInput->getDisplaysCoords();
+  }
+  catch (Exception &e) {
+    m_log->error(_T("Exception in DesktopBaseImpl::getDisplayCoords: %s"), e.getMessage());
+    m_extDeskTermListener->onAbnormalDesktopTerminate();
+  }
+  return std::vector<Rect>();
+}
+
+
 void DesktopBaseImpl::getNormalizedRect(Rect *rect)
 {
   _ASSERT(m_userInput != 0);
@@ -199,7 +215,7 @@ void DesktopBaseImpl::setMouseEvent(UINT16 x, UINT16 y, UINT8 buttonMask)
   Point point(x, y);
   try {
     if (isRemoteInputAllowed()) {
-      m_userInput->setMouseEvent(&point, buttonMask);
+      m_userInput->setMouseEvent(point, buttonMask);
     }
   } catch (Exception &e) {
 	m_log->error(_T("Exception in DesktopBaseImpl::setMouseEvent %s"), e.getMessage());

diff --git a/desktop/DesktopBaseImpl.h b/desktop/DesktopBaseImpl.h
@@ -57,6 +57,7 @@ class DesktopBaseImpl : public Desktop,
   virtual void getPrimaryDesktopCoords(Rect *rect);
   virtual void getDisplayNumberCoords(Rect *rect,
                                       unsigned char dispNumber);
+  virtual std::vector<Rect> getDisplaysCoords();
   virtual void getNormalizedRect(Rect *rect);
   virtual void getWindowCoords(HWND hwnd, Rect *rect);
   virtual HWND getWindowHandleByName(const StringStorage *windowName);

diff --git a/desktop/HooksUpdateDetector.cpp b/desktop/HooksUpdateDetector.cpp
@@ -37,6 +37,11 @@ HooksUpdateDetector::HooksUpdateDetector(UpdateKeeper *updateKeeper,
   m_hookInstaller(0),
   m_log(log)
 {
+#ifndef _WIN64
+  m_log->debug(_T("Loading the screenhook library for 32bit system"));
+#else
+  m_log->debug(_T("Loading the screenhook library for 64bit system"));
+#endif
   try {
     m_hookInstaller = new HookInstaller();
   } catch (Exception &e) {
@@ -45,7 +50,7 @@ HooksUpdateDetector::HooksUpdateDetector(UpdateKeeper *updateKeeper,
   }
   HINSTANCE hinst = GetModuleHandle(0);
   m_targetWin = new MessageWindow(hinst,
-    HookDefinitions::HOOK_TARGET_WIN_CLASS_NAME);
+  HookDefinitions::HOOK_TARGET_WIN_CLASS_NAME);
 }
 
 HooksUpdateDetector::~HooksUpdateDetector()
@@ -72,6 +77,7 @@ void HooksUpdateDetector::onTerminate()
 void HooksUpdateDetector::start32Loader()
 {
 #ifdef _WIN64
+  m_log->debug(_T("Loading the screenhook library for 32bit system with hookldr.exe"));
   if (!isTerminating()) {
     StringStorage path, folder;
     Environment::getCurrentModuleFolderPath(&folder);
@@ -160,6 +166,7 @@ void HooksUpdateDetector::execute()
           m_updateKeeper->addChangedRect(&rect);
           m_updateTimer.sear();
         }
+//        m_log->debug(_T("Screenhook update rectangle: {x=%d, y=%d, w=%d, h=%d}"), rect.left, rect.top, rect.getWidth(), rect.getHeight());
       } else {
         DispatchMessage(&msg);
       }

diff --git a/desktop/SasUserInput.cpp b/desktop/SasUserInput.cpp
@@ -24,6 +24,7 @@
 
 #include "SasUserInput.h"
 #include "win-system/Environment.h"
+#include "win-system/WTS.h"
 
 #define XK_MISCELLANY
 #include "rfb/keysymdef.h"
@@ -47,7 +48,7 @@ void SasUserInput::sendInit(BlockingGate *gate)
   m_client->sendInit(gate);
 }
 
-void SasUserInput::setMouseEvent(const Point *newPos, UINT8 keyFlag)
+void SasUserInput::setMouseEvent(const Point newPos, UINT8 keyFlag)
 {
   m_client->setMouseEvent(newPos, keyFlag);
 }
@@ -77,10 +78,14 @@ void SasUserInput::setKeyboardEvent(UINT32 keySym, bool down)
   }
 
   if (m_ctrlPressed && m_altPressed && delPressed && m_underVista) {
-    Environment::simulateCtrlAltDelUnderVista(m_log);
-  } else {
-    m_client->setKeyboardEvent(keySym, down);
-  }
+    DWORD sessionId = WTS::getActiveConsoleSessionId(m_log);
+    bool isRdp = WTS::SessionIsRdpSession(sessionId, m_log);
+    if (!isRdp) {
+      Environment::simulateCtrlAltDelUnderVista(m_log);
+      return;
+    }
+  } 
+  m_client->setKeyboardEvent(keySym, down);
 }
 
 void SasUserInput::getCurrentUserInfo(StringStorage *desktopName,
@@ -94,6 +99,11 @@ void SasUserInput::getPrimaryDisplayCoords(Rect *rect)
   m_client->getPrimaryDisplayCoords(rect);
 }
 
+std::vector<Rect> SasUserInput::getDisplaysCoords()
+{
+  return m_client->getDisplaysCoords();
+}
+
 void SasUserInput::getDisplayNumberCoords(Rect *rect,
                                           unsigned char dispNumber)
 {

diff --git a/desktop/SasUserInput.h b/desktop/SasUserInput.h
@@ -38,13 +38,14 @@ class SasUserInput : public UserInput
 
   virtual void sendInit(BlockingGate *gate);
   virtual void setNewClipboard(const StringStorage *newClipboard);
-  virtual void setMouseEvent(const Point *newPos, UINT8 keyFlag);
+  virtual void setMouseEvent(const Point newPos, UINT8 keyFlag);
   virtual void setKeyboardEvent(UINT32 keySym, bool down);
   virtual void getCurrentUserInfo(StringStorage *desktopName,
                                   StringStorage *userName);
   virtual void getPrimaryDisplayCoords(Rect *rect);
   virtual void getDisplayNumberCoords(Rect *rect,
                                       unsigned char dispNumber);
+  virtual std::vector<Rect> getDisplaysCoords();
   virtual void getNormalizedRect(Rect *rect);
   virtual void getWindowCoords(HWND hwnd, Rect *rect);
   virtual HWND getWindowHandleByName(const StringStorage *windowName);

diff --git a/desktop/UpdateHandlerImpl.cpp b/desktop/UpdateHandlerImpl.cpp
@@ -98,6 +98,11 @@ void UpdateHandlerImpl::extract(UpdateContainer *updateContainer)
     if (m_screenDriver->getScreenSizeChanged() || !currentDimension.isEqualTo(&newDimension)) {
       updateContainer->screenSizeChanged = true;
     }
+    m_log->debug(_T("UpdateHandlerImpl::extract: old dims: (%d,%d), new dims: (%d,%d)"), 
+      currentDimension.width,
+      currentDimension.height,
+      newDimension.width,
+      newDimension.height);
     m_log->debug(_T("UpdateHandlerImpl::extract : applyNewScreenProperties()"));
     applyNewScreenProperties();
     {

diff --git a/desktop/UpdateKeeper.cpp b/desktop/UpdateKeeper.cpp
@@ -142,16 +142,16 @@ void UpdateKeeper::setScreenSizeChanged()
   m_updateContainer.screenSizeChanged = true;
 }
 
-void UpdateKeeper::setCursorPosChanged(const Point *curPos)
+void UpdateKeeper::setCursorPosChanged()
 {
   AutoLock al(&m_updContLocMut);
   m_updateContainer.cursorPosChanged = true;
-  m_updateContainer.cursorPos = *curPos;
 }
 
 void UpdateKeeper::setCursorPos(const Point *curPos)
 {
   AutoLock al(&m_updContLocMut);
+  m_updateContainer.cursorPosChanged = true;
   m_updateContainer.cursorPos = *curPos;
 }
 
@@ -188,7 +188,7 @@ void UpdateKeeper::addUpdateContainer(const UpdateContainer *updateContainer)
   }
   setCursorPos(&updateContainer->cursorPos);
   if (updateContainer->cursorPosChanged) {
-    setCursorPosChanged(&updateContainer->cursorPos);
+    setCursorPos(&updateContainer->cursorPos);
   }
   if (updateContainer->cursorShapeChanged) {
     setCursorShapeChanged();

diff --git a/desktop/UpdateKeeper.h b/desktop/UpdateKeeper.h
@@ -61,7 +61,7 @@ class UpdateKeeper : public Lockable
   void setBorderRect(const Rect *borderRect);
 
   void setScreenSizeChanged();
-  void setCursorPosChanged(const Point *curPos);
+  void setCursorPosChanged();
   void setCursorPos(const Point *curPos);
   void setCursorShapeChanged();
 

diff --git a/desktop/UserInput.h b/desktop/UserInput.h
@@ -47,14 +47,15 @@ class UserInput
   virtual void setNewClipboard(const StringStorage *newClipboard) = 0;
   // By the keyFlag argument will be set the mouse button state as described in
   // the rfb protocol.
-  virtual void setMouseEvent(const Point *newPos, UINT8 keyFlag) = 0;
+  virtual void setMouseEvent(const Point newPos, UINT8 keyFlag) = 0;
   virtual void setKeyboardEvent(UINT32 keySym, bool down) = 0;
   virtual void getCurrentUserInfo(StringStorage *desktopName,
                                   StringStorage *userName) = 0;
 
   virtual void getPrimaryDisplayCoords(Rect *rect) = 0;
   virtual void getDisplayNumberCoords(Rect *rect,
                                       unsigned char dispNumber) = 0;
+  virtual std::vector<Rect> getDisplaysCoords() = 0;
   virtual void getNormalizedRect(Rect *rect) = 0;
 
   virtual void getWindowCoords(HWND hwnd, Rect *rect) = 0;