add RecordingSessionId setting

Author: mamoreau-devolutions

dll/ApiHooks.cpp

@@ -489,7 +489,10 @@ bool WINAPI MsRdpEx_CaptureBlt(
             free(recordingPipeName);
         }
 
-        const char* sessionId = pExtendedSettings->GetSessionId();
+		const char* sessionId = pExtendedSettings->GetRecordingSessionId();
+        if (!sessionId) {
+            sessionId = pExtendedSettings->GetSessionId();
+        }
         MsRdpEx_OutputMirror_SetSessionId(outputMirror, sessionId);
 
         instance->SetOutputMirrorObject((LPVOID) outputMirror);

dll/RdpSettings.cpp

@@ -654,6 +654,7 @@ CMsRdpExtendedSettings::~CMsRdpExtendedSettings()
 {
     this->SetKdcProxyUrl(NULL);
     this->SetRecordingPath(NULL);
+    this->SetRecordingSessionId(NULL);
     this->SetRecordingPipeName(NULL);
 
     if (m_pMsRdpExtendedSettings)
@@ -831,6 +832,20 @@ HRESULT __stdcall CMsRdpExtendedSettings::put_Property(BSTR bstrPropertyName, VA
         free(propValue);
         hr = S_OK;
     }
+    else if (MsRdpEx_StringEquals(propName, "RecordingSessionId"))
+    {
+        if (pValue->vt != VT_BSTR)
+            goto end;
+
+        char* propValue = _com_util::ConvertBSTRToString(pValue->bstrVal);
+
+        if (propValue) {
+            hr = this->SetRecordingSessionId(propValue);
+        }
+
+        free(propValue);
+        hr = S_OK;
+    }
     else if (MsRdpEx_StringEquals(propName, "RecordingPipeName"))
     {
         if (pValue->vt != VT_BSTR)
@@ -844,7 +859,7 @@ HRESULT __stdcall CMsRdpExtendedSettings::put_Property(BSTR bstrPropertyName, VA
 
         free(propValue);
         hr = S_OK;
-        }
+    }
     else if (MsRdpEx_StringEquals(propName, "DumpBitmapUpdates"))
     {
         if (pValue->vt != VT_BOOL)
@@ -1076,6 +1091,16 @@ HRESULT __stdcall CMsRdpExtendedSettings::SetRecordingPath(const char* recording
     return S_OK;
 }
 
+HRESULT __stdcall CMsRdpExtendedSettings::SetRecordingSessionId(const char* sessionId) {
+    free(m_RecordingSessionId);
+    m_RecordingSessionId = NULL;
+
+    if (sessionId) {
+        m_RecordingSessionId = _strdup(sessionId);
+    }
+    return S_OK;
+}
+
 HRESULT __stdcall CMsRdpExtendedSettings::SetRecordingPipeName(const char* recordingPipeName) {
     free(m_RecordingPipeName);
     m_RecordingPipeName = NULL;
@@ -1370,6 +1395,13 @@ HRESULT CMsRdpExtendedSettings::ApplyRdpFile(void* rdpFilePtr)
             value.vt = VT_BSTR;
             pMsRdpExtendedSettings->put_Property(propName, &value);
         }
+        else if (MsRdpEx_RdpFileEntry_IsMatch(entry, 's', "RecordingSessionId")) {
+            bstr_t propName = _com_util::ConvertStringToBSTR(entry->name);
+            bstr_t propValue = _com_util::ConvertStringToBSTR(entry->value);
+            value.bstrVal = propValue;
+            value.vt = VT_BSTR;
+            pMsRdpExtendedSettings->put_Property(propName, &value);
+        }
         else if (MsRdpEx_RdpFileEntry_IsMatch(entry, 's', "RecordingPipeName")) {
             bstr_t propName = _com_util::ConvertStringToBSTR(entry->name);
             bstr_t propValue = _com_util::ConvertStringToBSTR(entry->value);
@@ -1615,6 +1647,14 @@ char* CMsRdpExtendedSettings::GetRecordingPath()
     return NULL;
 }
 
+char* CMsRdpExtendedSettings::GetRecordingSessionId()
+{
+    if (m_RecordingSessionId)
+        return _strdup(m_RecordingSessionId);
+
+    return NULL;
+}
+
 char* CMsRdpExtendedSettings::GetRecordingPipeName()
 {
     if (m_RecordingPipeName)

dotnet/MsRdpEx_App/MainDlg.cs

@@ -307,6 +307,14 @@ private void ParseRdpFile(string filename, AxMSTSCLib.AxMsRdpClient9NotSafeForSc
                                     transportSettings.GatewayEncryptedAuthCookieSize = (uint)encryptedAuthCookie.Length;
                                 }
                                 break;
+
+                            case "recordingpath":
+                                extendedSettings.set_Property("RecordingPath", value);
+                                break;
+
+                            case "recordingsessionid":
+                                extendedSettings.set_Property("RecordingSessionId", value);
+                                break;
                         }
                     }
                     else if (type == 'i')
@@ -367,6 +375,14 @@ private void ParseRdpFile(string filename, AxMSTSCLib.AxMsRdpClient9NotSafeForSc
                             case "mousejigglermethod":
                                 extendedSettings.set_Property("MouseJigglerMethod", iValue);
                                 break;
+
+                            case "videorecordingenabled":
+                                extendedSettings.set_Property("VideoRecordingEnabled", bValue);
+                                break;
+
+                            case "videorecordingquality":
+                                extendedSettings.set_Property("VideoRecordingQuality", iValue);
+                                break;
                         }
                     }
                 }

include/MsRdpEx/RdpSettings.h

@@ -40,6 +40,7 @@ class CMsRdpExtendedSettings : public IMsRdpExtendedSettings
     HRESULT __stdcall SetGatewayPassword(const char* password);
     HRESULT __stdcall SetKdcProxyUrl(const char* kdcProxyUrl);
     HRESULT __stdcall SetRecordingPath(const char* recordingPath);
+    HRESULT __stdcall SetRecordingSessionId(const char* sessionId);
     HRESULT __stdcall SetRecordingPipeName(const char* recordingPipeName);
     HRESULT __stdcall AttachRdpClient(IMsTscAx* pMsTscAx);
     HRESULT __stdcall ApplyRdpFile(void* rdpFilePtr);
@@ -62,6 +63,7 @@ class CMsRdpExtendedSettings : public IMsRdpExtendedSettings
     bool GetVideoRecordingEnabled();
     uint32_t GetVideoRecordingQuality();
     char* GetRecordingPath();
+    char* GetRecordingSessionId();
     char* GetRecordingPipeName();
     bool GetDumpBitmapUpdates();
     bool GetExtraSystemMenuEnabled();
@@ -87,6 +89,7 @@ class CMsRdpExtendedSettings : public IMsRdpExtendedSettings
     bool m_VideoRecordingEnabled = false;
     uint32_t m_VideoRecordingQuality = 5;
     char* m_RecordingPath = NULL;
+    char* m_RecordingSessionId = NULL;
     char* m_RecordingPipeName = NULL;
     bool m_DumpBitmapUpdates = false;
     bool m_ExtraSystemMenuEnabled = true;