Changeset 44223 in vbox for trunk/src/VBox/HostServices/SharedFolders/testcase

Timestamp:

Jan 1, 2013 7:25:47 PM (12 years ago)

Author:

vboxsync

Message:

tstSharedFolderService.cpp: Fixed fillTestShflString u16Length bug which for buggy reasons only cause trouble on darwin.

File:

• trunk/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp (modified) (7 diffs)

trunk/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * Testcase for the shared folder service vbsf API.
  *
@@ -12 +11 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2011-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -40 +39 @@
 #include "teststubs.h"
 
+
 /******************************************************************************
 *   Global Variables                                                          *
@@ -45 +45 @@
 static RTTEST g_hTest = NIL_RTTEST;
 
+
 /******************************************************************************
 *   Declarations                                                              *
 ******************************************************************************/
-
 extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *ptable);
+
 
 /******************************************************************************
@@ -103 +104 @@
 
 #define ARRAY_FROM_PATH(a, b) \
-do { \
-    Assert((a) == (a)); /* Constant parameter */ \
-    Assert(sizeof((a)) > 0); \
-    bufferFromPath(a, sizeof(a), b); \
-} while(0)
+    do { \
+        Assert((a) == (a)); /* Constant parameter */ \
+        Assert(sizeof((a)) > 0); \
+        bufferFromPath(a, sizeof(a), b); \
+    } while (0)
+
 
 /******************************************************************************
-*   Stub functions                                                            *
+*   Stub functions and data                                                   *
 ******************************************************************************/
 
@@ -405 +407 @@
 { RTPrintf("%s\n", __PRETTY_FUNCTION__); return 0; }
 
+
 /******************************************************************************
 *   Tests                                                                     *
@@ -485 +488 @@
                                const char *pcszSource)
 {
-    unsigned i;
-    
-    AssertRelease(  strlen(pcszSource) * 2 + 2 < sizeof(*pDest)
-                  - RT_UOFFSETOF(SHFLSTRING, String));
-    pDest->string.u16Size = (uint16_t)strlen(pcszSource) * 2 + 2;
-    pDest->string.u16Length = (uint16_t)strlen(pcszSource);
-    for (i = 0; i < strlen(pcszSource) + 1; ++i)
+    AssertRelease(  strlen(pcszSource) * 2 + 2
+                  < sizeof(*pDest) - RT_UOFFSETOF(SHFLSTRING, String));
+    pDest->string.u16Length = (uint16_t)(strlen(pcszSource) * sizeof(RTUTF16));
+    pDest->string.u16Size   = pDest->string.u16Length + sizeof(RTUTF16);
+    for (unsigned i = 0; i <= pDest->string.u16Length; ++i)
         pDest->string.String.ucs2[i] = (uint16_t)pcszSource[i];
 }