Changeset 94773 in vbox for trunk/src/VBox

Timestamp:

May 2, 2022 10:13:10 AM (3 years ago)

Author:

vboxsync

Message:

Revert r151158

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• include/DisplayUtils.h (modified) (2 diffs)
• src-all/DisplayUtils.cpp (modified) (1 diff)
• testcase/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -1066 +1066 @@
 VBoxC_SOURCES += \
         $(VBoxAPIWrap_0_OUTDIR)/VBoxAPI.d \
+        src-all/CryptoUtils.cpp \
         src-all/DisplayPNGUtil.cpp \
         src-all/DisplayResampleImage.cpp \

trunk/src/VBox/Main/include/DisplayUtils.h

@@ -24 +24 @@
 #include "VBox/com/string.h"
 
-#include "CryptoUtils.h"
-
 using namespace com;
 
@@ -35 +33 @@
 #define sSSMDisplayVer5 0x00010005
 
-int readSavedGuestScreenInfo(SsmStream &refSsm, uint32_t u32ScreenId,
+int readSavedGuestScreenInfo(const Utf8Str &strStateFilePath, uint32_t u32ScreenId,
                              uint32_t *pu32OriginX, uint32_t *pu32OriginY,
                              uint32_t *pu32Width, uint32_t *pu32Height, uint16_t *pu16Flags);
 
-int readSavedDisplayScreenshot(&refSsm, uint32_t u32Type, uint8_t **ppu8Data,
+int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data,
                                uint32_t *pcbData, uint32_t *pu32Width, uint32_t *pu32Height);
 void freeSavedDisplayScreenshot(uint8_t *pu8Data);

trunk/src/VBox/Main/src-all/DisplayUtils.cpp

@@ -23 +23 @@
 #include <VBoxVideo.h>
 
-int readSavedDisplayScreenshot(SsmStream &refSsm, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData,
+int readSavedDisplayScreenshot(const Utf8Str &strStateFilePath, uint32_t u32Type, uint8_t **ppu8Data, uint32_t *pcbData,
                                uint32_t *pu32Width, uint32_t *pu32Height)
 {

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -38 +38 @@
         tstBstr \
         tstGuid \
-        tstUnattendedScript
+        tstUnattendedScript \
+        tstVBoxCrypto
   PROGRAMS.linux += \
         $(if $(VBOX_WITH_USB),tstUSBProxyLinux,)
@@ -299 +300 @@
 
 
+#
+# tstVBoxCrypto
+#
+tstVBoxCrypto_TEMPLATE = VBOXMAINCLIENTTSTEXE
+tstVBoxCrypto_SOURCES  = tstVBoxCrypto.cpp
+
+
 
 # generate rules.