Changeset 33494 in vbox

Timestamp:

Oct 27, 2010 11:39:37 AM (14 years ago)

Author:

vboxsync

Message:

Build fixes.

Location:

trunk

Files:

• include/iprt/isofs.h (modified) (1 diff)
• src/VBox/Main/GuestImpl.cpp (modified) (3 diffs)
• src/VBox/Runtime/r3/isofs.cpp (modified) (1 diff)

trunk/include/iprt/isofs.h

@@ -44 +44 @@
 #define RTISOFS_MAX_PREPARER_ID    128
 #define RTISOFS_MAX_APPLICATION_ID 128
-#define RTISOFS_MAX_STRING_LEN     256
+#define RTISOFS_MAX_STRING_LEN     255
 
 /** Standard ID of volume descriptors. */

trunk/src/VBox/Main/GuestImpl.cpp

@@ -40 +40 @@
 #include <VBox/pgm.h>
 
+#include <memory>
+
 // defines
 /////////////////////////////////////////////////////////////////////////////
@@ -245 +247 @@
                      * system rights, no username/password specified).
                      */
-                    rc = pGuest->executeProcessInternal(Bstr("vbox_cat").raw(),
+                    rc = pGuest->executeProcessInternal(Bstr("vbox_cat"),
                                                         ExecuteProcessFlag_WaitForProcessStartOnly,
                                                         ComSafeArrayAsInParam(args),
@@ -332 +334 @@
                 ComPtr<IProgress> progressInstaller;
                 ULONG uPID;
-                rc = pGuest->executeProcessInternal(Bstr(strInstallerPath).raw(), 0 /* Flags */,
+                rc = pGuest->executeProcessInternal(Bstr(strInstallerPath),
+                                                    0 /* Flags */,
                                                     ComSafeArrayAsInParam(installerArgs),
                                                     ComSafeArrayAsInParam(installerEnv),

trunk/src/VBox/Runtime/r3/isofs.cpp

@@ -333 +333 @@
                     break;
 
-                Assert(   pCurRecord->name_len  > 0
-                       && pCurRecord->name_len <= RTISOFS_MAX_STRING_LEN);
+                Assert(pCurRecord->name_len <= RTISOFS_MAX_STRING_LEN);
                 char *pszName = RTStrAlloc(pCurRecord->name_len + 1);
                 AssertPtr(pszName);