session recording improvements

Author: mamoreau-devolutions

dll/ApiHooks.cpp

@@ -404,9 +404,11 @@ bool WINAPI MsRdpEx_CaptureBlt(
     bool captured = false;
     bool outputMirrorEnabled = false;
     bool videoRecordingEnabled = false;
+    uint32_t videoRecordingQuality = 5;
     bool dumpBitmapUpdates = false;
     IMsRdpExInstance* instance = NULL;
     MsRdpEx_OutputMirror* outputMirror = NULL;
+    CMsRdpExtendedSettings* pExtendedSettings = NULL;
 
     HWND hWnd = WindowFromDC(hdcDst);
 
@@ -418,11 +420,18 @@ bool WINAPI MsRdpEx_CaptureBlt(
     if (!instance)
         goto end;
 
+    if (instance)
+        instance->GetExtendedSettings(&pExtendedSettings);
+
+    if (!pExtendedSettings)
+        goto end;
+
     MsRdpEx_LogPrint(TRACE, "CaptureBlt: hWnd: %p instance: %p", hWnd, instance);
 
-    instance->GetOutputMirrorEnabled(&outputMirrorEnabled);
-    instance->GetVideoRecordingEnabled(&videoRecordingEnabled);
-    instance->GetDumpBitmapUpdates(&dumpBitmapUpdates);
+    outputMirrorEnabled = pExtendedSettings->GetOutputMirrorEnabled();
+    videoRecordingEnabled = pExtendedSettings->GetVideoRecordingEnabled();
+    videoRecordingQuality = pExtendedSettings->GetVideoRecordingQuality();
+    dumpBitmapUpdates = pExtendedSettings->GetDumpBitmapUpdates();
 
     if (!outputMirrorEnabled)
         goto end;
@@ -440,6 +449,17 @@ bool WINAPI MsRdpEx_CaptureBlt(
         outputMirror = MsRdpEx_OutputMirror_New();
         MsRdpEx_OutputMirror_SetDumpBitmapUpdates(outputMirror, dumpBitmapUpdates);
         MsRdpEx_OutputMirror_SetVideoRecordingEnabled(outputMirror, videoRecordingEnabled);
+        MsRdpEx_OutputMirror_SetVideoQualityLevel(outputMirror, videoRecordingQuality);
+
+        char* recordingPath = pExtendedSettings->GetRecordingPath();
+        if (recordingPath) {
+            MsRdpEx_OutputMirror_SetRecordingPath(outputMirror, recordingPath);
+            free(recordingPath);
+        }
+
+        const char* sessionId = pExtendedSettings->GetSessionId();
+        MsRdpEx_OutputMirror_SetSessionId(outputMirror, sessionId);
+
         instance->SetOutputMirrorObject((LPVOID) outputMirror);
     }
 

dll/AxHost/RdpComBase.h

@@ -1,21 +1,9 @@
-#ifndef MSRDPEX_COM_HELPER_H
-#define MSRDPEX_COM_HELPER_H
+#ifndef MSRDPEX_COM_BASE_H
+#define MSRDPEX_COM_BASE_H
 
-#include <MsRdpEx/MsRdpEx.h>
-
-#include <atlbase.h>
-#include <oleidl.h>
-#include <commctrl.h>
-
-#ifndef SafeRelease
-#define SafeRelease(_x) { if ((_x) != nullptr) { (_x)->Release(); (_x) = nullptr; } }
-#endif
-
-#ifndef ToVariantBool
-#define ToVariantBool(_b) ((_b) ? VARIANT_TRUE : VARIANT_FALSE)
-#endif
+#include "../ComHelpers.h"
 
 #include "../com/mstscax.tlh"
 using namespace MSTSCLib;
 
-#endif /* MSRDPEX_COM_HELPER_H */
+#endif /* MSRDPEX_COM_BASE_H */

dll/ComHelpers.h

@@ -0,0 +1,25 @@
+#ifndef MSRDPEX_COM_HELPERS_H
+#define MSRDPEX_COM_HELPERS_H
+
+#include <MsRdpEx/MsRdpEx.h>
+
+#include <atlbase.h>
+#include <oleidl.h>
+#include <commctrl.h>
+
+#ifndef SafeRelease
+#define SafeRelease(_x) { if ((_x) != nullptr) { (_x)->Release(); (_x) = nullptr; } }
+#endif
+
+#ifndef ToVariantBool
+#define ToVariantBool(_b) ((_b) ? VARIANT_TRUE : VARIANT_FALSE)
+#endif
+
+#define VariantInitBool(pv, b)                            \
+    do {                                                  \
+        VariantInit((pv));                                \
+        (pv)->vt = VT_BOOL;                               \
+        (pv)->boolVal = ((b) ? VARIANT_TRUE : VARIANT_FALSE); \
+    } while (0)
+
+#endif /* MSRDPEX_COM_HELPERS_H */

dll/File.c

@@ -33,6 +33,33 @@ const char* MsRdpEx_FileBase(const char* filename)
     return filename;
 }
 
+char* MsRdpEx_FileDir(const char* filename)
+{
+	size_t length;
+	char* separator;
+
+	if (!filename)
+		return NULL;
+
+	separator = strrchr(filename, '\\');
+
+	if (!separator)
+		separator = strrchr(filename, '/');
+
+	if (!separator)
+		return NULL;
+
+	length = (separator - filename) + 1; // include the separator
+	char* dirname = (char*)malloc(length + 1);
+	if (!dirname)
+		return NULL;
+
+	memcpy(dirname, filename, length);
+	dirname[length] = '\0';
+
+	return dirname;
+}
+
 bool MsRdpEx_FileExists(const char* filename)
 {
     bool result = false;
@@ -241,6 +268,32 @@ bool MsRdpEx_MakePath(const char* path, LPSECURITY_ATTRIBUTES lpAttributes)
     return result;
 }
 
+BOOL MsRdpEx_MoveFile(LPCSTR lpExistingFileName, LPCSTR lpNewFileName, DWORD flags)
+{
+	BOOL result = FALSE;
+	LPWSTR lpExistingFileNameW = NULL;
+	LPWSTR lpNewFileNameW = NULL;
+
+	if (!lpExistingFileName)
+		goto cleanup;
+
+	if (MsRdpEx_ConvertToUnicode(CP_UTF8, 0, lpExistingFileName, -1, &lpExistingFileNameW, 0) < 1)
+		goto cleanup;
+
+	if (lpNewFileName)
+	{
+		if (MsRdpEx_ConvertToUnicode(CP_UTF8, 0, lpNewFileName, -1, &lpNewFileNameW, 0) < 1)
+			goto cleanup;
+	}
+
+	result = MoveFileExW(lpExistingFileNameW, lpNewFileNameW, flags);
+
+cleanup:
+	free(lpExistingFileNameW);
+	free(lpNewFileNameW);
+	return result;
+}
+
 uint64_t MsRdpEx_GetUnixTime()
 {
     uint64_t unixTime;

dll/MsRdpClient.cpp

@@ -205,7 +205,10 @@ class CMsRdpClient : public IMsRdpClient10
         }
 
         if (m_pMsRdpExInstance) {
+            IMsRdpExInstance* pMsRdpExInstance = (IMsRdpExInstance*)m_pMsRdpExInstance;
             MsRdpEx_InstanceManager_Remove(m_pMsRdpExInstance);
+            pMsRdpExInstance->Release();
+            pMsRdpExInstance = NULL;
         }
     }
 
@@ -499,6 +502,7 @@ class CMsRdpClient : public IMsRdpClient10
         m_pMsRdpExtendedSettings->LoadRdpFileFromNamedPipe(NULL);
         m_pMsRdpExtendedSettings->PrepareSspiSessionIdHack();
         m_pMsRdpExtendedSettings->PrepareMouseJiggler();
+        m_pMsRdpExtendedSettings->PrepareVideoRecorder();
         m_pMsRdpExtendedSettings->PrepareExtraSystemMenu();
 
         hr = m_pMsTscAx->raw_Connect();

dll/OutputMirror.c

@@ -20,10 +20,13 @@ struct _MsRdpEx_OutputMirror
 	HGDIOBJ hShadowObject;
 	uint32_t captureIndex;
 	uint64_t captureBaseTime;
-	char capturePath[MSRDPEX_MAX_PATH];
 
+	int videoRecordingCount;
 	bool dumpBitmapUpdates;
 	bool videoRecordingEnabled;
+	uint32_t videoQualityLevel;
+	char recordingPath[MSRDPEX_MAX_PATH];
+	char sessionId[MSRDPEX_GUID_STRING_SIZE];
 	MsRdpEx_VideoRecorder* videoRecorder;
 	FILE* frameMetadataFile;
 
@@ -84,7 +87,7 @@ bool MsRdpEx_OutputMirror_DumpFrame(MsRdpEx_OutputMirror* ctx)
 	if (ctx->dumpBitmapUpdates) {
 		char metadata[1024];
 
-		sprintf_s(filename, MSRDPEX_MAX_PATH, "%s\\frame_%04d.bmp", ctx->capturePath, ctx->captureIndex);
+		sprintf_s(filename, MSRDPEX_MAX_PATH, "%s\\%s\\frame_%04d.bmp", ctx->recordingPath, ctx->sessionId, ctx->captureIndex);
 		MsRdpEx_WriteBitmapFile(filename, ctx->bitmapData, ctx->bitmapWidth, ctx->bitmapHeight, ctx->bitsPerPixel);
 
 		sprintf_s(metadata, sizeof(metadata), "%llu|%dx%d|%s|%dx%d|%dx%d\n",
@@ -109,6 +112,21 @@ void MsRdpEx_OutputMirror_SetVideoRecordingEnabled(MsRdpEx_OutputMirror* ctx, bo
 	ctx->videoRecordingEnabled = videoRecordingEnabled;
 }
 
+void MsRdpEx_OutputMirror_SetVideoQualityLevel(MsRdpEx_OutputMirror* ctx, uint32_t videoQualityLevel)
+{
+	ctx->videoQualityLevel = videoQualityLevel;
+}
+
+void MsRdpEx_OutputMirror_SetRecordingPath(MsRdpEx_OutputMirror* ctx, const char* recordingPath)
+{
+	strcpy_s(ctx->recordingPath, MSRDPEX_MAX_PATH, recordingPath);
+}
+
+void MsRdpEx_OutputMirror_SetSessionId(MsRdpEx_OutputMirror* ctx, const char* sessionId)
+{
+	strcpy_s(ctx->sessionId, MSRDPEX_GUID_STRING_SIZE, sessionId);
+}
+
 bool MsRdpEx_OutputMirror_GetShadowBitmap(MsRdpEx_OutputMirror* ctx,
 	HDC* phDC, HBITMAP* phBitmap, uint8_t** pBitmapData,
 	uint32_t* pBitmapWidth, uint32_t* pBitmapHeight, uint32_t* pBitmapStep)
@@ -143,43 +161,45 @@ bool MsRdpEx_OutputMirror_Init(MsRdpEx_OutputMirror* ctx)
 
 	ctx->captureBaseTime = GetTickCount64();
 
-	char* capturePath = MsRdpEx_GetEnv("MSRDPEX_CAPTURE_PATH");
+	char* envRecordingPath = MsRdpEx_GetEnv("MSRDPEX_RECORDING_PATH");
+	if (envRecordingPath) {
+		MsRdpEx_OutputMirror_SetRecordingPath(ctx, envRecordingPath);
+		free(envRecordingPath);
+	}
 
-	if (capturePath) {
-		strcpy_s(ctx->capturePath, MSRDPEX_MAX_PATH, capturePath);
-		free(capturePath);
-	} else {
+	if (MsRdpEx_StringIsNullOrEmpty(ctx->recordingPath)) {
 		const char* appDataPath = MsRdpEx_GetPath(MSRDPEX_APP_DATA_PATH);
-		sprintf_s(ctx->capturePath, MSRDPEX_MAX_PATH, "%s\\capture", appDataPath);
+		sprintf_s(ctx->recordingPath, MSRDPEX_MAX_PATH, "%s\\recordings", appDataPath);
+	}
+
+	if (MsRdpEx_StringIsNullOrEmpty(ctx->sessionId)) {
+		GUID guid;
+		MsRdpEx_GuidGenerate(&guid);
+		MsRdpEx_GuidBinToStr((GUID*)&guid, ctx->sessionId, 0);
 	}
 
 	if (ctx->videoRecordingEnabled) {
+		char outputPath[MSRDPEX_MAX_PATH];
 		char filename[MSRDPEX_MAX_PATH];
-		uint64_t timestamp = MsRdpEx_GetUnixTime();
 
-		MsRdpEx_MakePath(ctx->capturePath, NULL);
+		sprintf_s(outputPath, MSRDPEX_MAX_PATH, "%s\\%s", ctx->recordingPath, ctx->sessionId);
+		MsRdpEx_MakePath(outputPath, NULL);
 
 		ctx->videoRecorder = MsRdpEx_VideoRecorder_New();
 
 		if (ctx->videoRecorder) {
-			char* videoFileName = MsRdpEx_GetEnv("MSRDPEX_VIDEO_FILENAME");
-
-			if (videoFileName) {
-				strcpy_s(filename, MSRDPEX_MAX_PATH, videoFileName);
-				free(videoFileName);
-			} else {
-				sprintf_s(filename, MSRDPEX_MAX_PATH, "%s\\%llu.webm", ctx->capturePath, timestamp);
-			}
-
+			sprintf_s(filename, MSRDPEX_MAX_PATH, "%s\\recording-%d.webm", outputPath, ctx->videoRecordingCount);
+			ctx->videoRecordingCount++;
 			MsRdpEx_VideoRecorder_SetFrameSize(ctx->videoRecorder, ctx->bitmapWidth, ctx->bitmapHeight);
 			MsRdpEx_VideoRecorder_SetFileName(ctx->videoRecorder, filename);
+			MsRdpEx_VideoRecorder_SetVideoQuality(ctx->videoRecorder, ctx->videoQualityLevel);
 			MsRdpEx_VideoRecorder_Init(ctx->videoRecorder);
 		}
 
 		if (ctx->dumpBitmapUpdates) {
 			char metadata[1024];
 			sprintf_s(metadata, sizeof(metadata), "FrameTime|FrameSize|FrameFile|UpdatePos|UpdateSize\n");
-			sprintf_s(filename, MSRDPEX_MAX_PATH, "%s\\frame_meta.psv", ctx->capturePath);
+			sprintf_s(filename, MSRDPEX_MAX_PATH, "%s\\frame_meta.psv", outputPath);
 			ctx->frameMetadataFile = MsRdpEx_FileOpen(filename, "wb");
 			fwrite(metadata, 1, strlen(metadata), ctx->frameMetadataFile);
 		}
@@ -206,6 +226,7 @@ bool MsRdpEx_OutputMirror_Uninit(MsRdpEx_OutputMirror* ctx)
 
 	if (ctx->videoRecorder) {
 		MsRdpEx_VideoRecorder_Uninit(ctx->videoRecorder);
+		MsRdpEx_VideoRecorder_Remux(ctx->videoRecorder, NULL);
 		MsRdpEx_VideoRecorder_Free(ctx->videoRecorder);
 		ctx->videoRecorder = NULL;
 	}
@@ -229,6 +250,7 @@ MsRdpEx_OutputMirror* MsRdpEx_OutputMirror_New()
 
 	ctx->bitsPerPixel = 32;
 	ctx->videoRecordingEnabled = false;
+	ctx->videoQualityLevel = 5;
 	ctx->dumpBitmapUpdates = false;
 
     InitializeCriticalSectionAndSpinCount(&ctx->lock, 4000);