Changeset 11376 in vbox for trunk

Timestamp:

Aug 13, 2008 7:38:37 AM (16 years ago)

Author:

vboxsync

Message:

RTStrFormat fix for aligned unicode strings.

Location:

trunk/src/VBox/Runtime

Files:

• common/string/strformat.cpp (modified) (4 diffs)
• testcase/tstStrFormat.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/string/strformat.cpp

@@ -476 +476 @@
                                 while (--cchWidth >= cchStr)
                                     cch += pfnOutput(pvArgOutput, " ", 1);
+                            cchWidth -= cchStr;
                             while (cchStr-- > 0)
                             {
@@ -489 +490 @@
 #endif
                             }
-                            while (--cchWidth >= cchStr)
+                            while (--cchWidth >= 0)
                                 cch += pfnOutput(pvArgOutput, " ", 1);
                         }
@@ -508 +509 @@
                                     cch += pfnOutput(pvArgOutput, " ", 1);
 
+                            cchWidth -= cchStr;
                             while (cchStr-- > 0)
                             {
@@ -519 +521 @@
 #endif
                             }
-                            while (--cchWidth >= cchStr)
+                            while (--cchWidth >= 0)
                                 cch += pfnOutput(pvArgOutput, " ", 1);
                         }

trunk/src/VBox/Runtime/testcase/tstStrFormat.cpp

@@ -415 +415 @@
 
 
+    cch = RTStrPrintf(szStr, sizeof(szStr), "%-10ls %-30ls %ls", L"cmd", L"args", L"description");
+    CHECKSTR("cmd        args                           description");
+
+    cch = RTStrPrintf(szStr, sizeof(szStr), "%-10ls %-30ls %ls", L"cmd", L"", L"description");
+    CHECKSTR("cmd                                       description");
+
+
     cch = RTStrPrintf(szStr, sizeof(szStr),  "%*s", 0, "");
     CHECKSTR("");