Index: /trunk/src/VBox/Runtime/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 23959)
+++ /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 23960)
@@ -92,5 +92,5 @@
 	tstSemPingPong \
 	tstRTStrCache \
-	tstStrFormat \
+	tstRTStrFormat \
 	tstStrSimplePattern \
 	tstStrToNum \
@@ -365,5 +365,5 @@
 tstRTStrCache_SOURCES = tstRTStrCache.cpp
 
-tstStrFormat_SOURCES = tstStrFormat.cpp
+tstRTStrFormat_SOURCES = tstRTStrFormat.cpp
 
 tstStrSimplePattern_SOURCES = tstStrSimplePattern.cpp
Index: /trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp	(revision 23960)
+++ /trunk/src/VBox/Runtime/testcase/tstRTStrFormat.cpp	(revision 23960)
@@ -0,0 +1,520 @@
+/* $Id$ */
+/** @file
+ * IPRT Testcase - String formatting.
+ */
+
+/*
+ * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+ * Clara, CA 95054 USA or visit http://www.sun.com if you need
+ * additional information or have any questions.
+ */
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include <iprt/string.h>
+
+#include <iprt/initterm.h>
+#include <iprt/stream.h>
+#include <iprt/test.h>
+#include <iprt/uuid.h>
+
+
+/** See FNRTSTRFORMATTYPE. */
+static DECLCALLBACK(size_t) TstType(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
+                                    const char *pszType, void const *pvValue,
+                                    int cchWidth, int cchPrecision, unsigned fFlags,
+                                    void *pvUser)
+{
+    /* validate */
+    if (strncmp(pszType, "type", 4))
+        RTTestIFailed("pszType=%s expected 'typeN'\n", pszType);
+
+    int iType = pszType[4] - '0';
+    if ((uintptr_t)pvUser != (uintptr_t)TstType + iType)
+        RTTestIFailed("pvValue=%p expected %p\n", pvUser, (void *)((uintptr_t)TstType + iType));
+
+    /* format */
+    size_t cch = pfnOutput(pvArgOutput, pszType, 5);
+    cch += pfnOutput(pvArgOutput, "=", 1);
+    char szNum[64];
+    size_t cchNum = RTStrFormatNumber(szNum, (uintptr_t)pvValue, 10, cchWidth, cchPrecision, fFlags);
+    cch += pfnOutput(pvArgOutput, szNum, cchNum);
+    return cch;
+}
+
+
+int main()
+{
+    RTTEST hTest;
+    int rc = RTTestInitAndCreate("tstRTStrFormat", &hTest);
+    if (rc)
+        return rc;
+    RTTestBanner(hTest);
+
+    uint32_t    u32 = 0x010;
+    uint64_t    u64 = 0x100;
+#define BUF_SIZE    120
+    char       *pszBuf = (char *)RTTestGuardedAllocHead(hTest, BUF_SIZE);
+
+    RTTestSub(hTest, "Basics");
+
+    /* simple */
+    size_t cch = RTStrPrintf(pszBuf, BUF_SIZE, "u32=%d u64=%lld u64=%#llx", u32, u64, u64);
+    if (strcmp(pszBuf, "u32=16 u64=256 u64=0x100"))
+    {
+        RTTestIFailed("error: '%s'\n"
+                      "wanted 'u32=16 u64=256 u64=0x100'\n", pszBuf);
+    }
+
+    /* just big. */
+    u64 = UINT64_C(0x7070605040302010);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "u64=%#llx 42=%d u64=%lld 42=%d", u64, 42, u64, 42);
+    if (strcmp(pszBuf, "u64=0x7070605040302010 42=42 u64=8102081627430068240 42=42"))
+    {
+        RTTestIFailed("error: '%s'\n"
+                      "wanted 'u64=0x8070605040302010 42=42 u64=8102081627430068240 42=42'\n", pszBuf);
+        RTTestIPrintf(RTTESTLVL_FAILURE, "%d\n", (int)(u64 % 10));
+    }
+
+    /* huge and negative. */
+    u64 = UINT64_C(0x8070605040302010);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "u64=%#llx 42=%d u64=%llu 42=%d u64=%lld 42=%d", u64, 42, u64, 42, u64, 42);
+    /* Not sure if this is the correct decimal representation... But both */
+    if (strcmp(pszBuf, "u64=0x8070605040302010 42=42 u64=9255003132036915216 42=42 u64=-9191740941672636400 42=42"))
+    {
+        RTTestIFailed("error: '%s'\n"
+                      "wanted 'u64=0x8070605040302010 42=42 u64=9255003132036915216 42=42 u64=-9191740941672636400 42=42'\n", pszBuf);
+        RTTestIPrintf(RTTESTLVL_FAILURE, "%d\n", (int)(u64 % 10));
+    }
+
+    /* 64-bit value bug. */
+    u64 = 0xa0000000;
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "u64=%#llx 42=%d u64=%lld 42=%d", u64, 42, u64, 42);
+    if (strcmp(pszBuf, "u64=0xa0000000 42=42 u64=2684354560 42=42"))
+        RTTestIFailed("error: '%s'\n"
+                      "wanted 'u64=0xa0000000 42=42 u64=2684354560 42=42'\n", pszBuf);
+
+    /* uuid */
+    RTUUID Uuid;
+    RTUuidCreate(&Uuid);
+    char szCorrect[RTUUID_STR_LENGTH];
+    RTUuidToStr(&Uuid, szCorrect, sizeof(szCorrect));
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%Vuuid", &Uuid);
+    if (strcmp(pszBuf, szCorrect))
+        RTTestIFailed("error:    '%s'\n"
+                      "expected: '%s'\n",
+                      pszBuf, szCorrect);
+
+    /*
+     * allocation
+     */
+    RTTestSub(hTest, "RTStrAPrintf");
+    char *psz = (char *)~0;
+    int cch2 = RTStrAPrintf(&psz, "Hey there! %s%s", "This is a test", "!");
+    if (cch2 < 0)
+        RTTestIFailed("RTStrAPrintf failed, cch2=%d\n", cch2);
+    else if (strcmp(psz, "Hey there! This is a test!"))
+        RTTestIFailed("RTStrAPrintf failed\n"
+                      "got   : '%s'\n"
+                      "wanted: 'Hey there! This is a test!'\n",
+                      psz);
+    else if ((int)strlen(psz) != cch2)
+        RTTestIFailed("RTStrAPrintf failed, cch2 == %d expected %u\n", cch2, strlen(psz));
+    RTStrFree(psz);
+
+#define CHECK42(fmt, arg, out) \
+    do { \
+        cch = RTStrPrintf(pszBuf, BUF_SIZE, fmt " 42=%d " fmt " 42=%d", arg, 42, arg, 42); \
+        if (strcmp(pszBuf, out " 42=42 " out " 42=42")) \
+            RTTestIFailed("at line %d: format '%s'\n" \
+                          "    output: '%s'\n"  \
+                          "    wanted: '%s'\n", \
+                          __LINE__, fmt, pszBuf, out " 42=42 " out " 42=42"); \
+        else if (cch != sizeof(out " 42=42 " out " 42=42") - 1) \
+            RTTestIFailed("at line %d: Invalid length %d returned, expected %u!\n", \
+                          __LINE__, cch, sizeof(out " 42=42 " out " 42=42") - 1); \
+    } while (0)
+
+#define CHECKSTR(Correct) \
+    if (strcmp(pszBuf, Correct)) \
+        RTTestIFailed("error:    '%s'\n" \
+                      "expected: '%s'\n", pszBuf, Correct); \
+
+    /*
+     * Runtime extensions.
+     */
+    RTTestSub(hTest, "Runtime format types (%R*)");
+    CHECK42("%RGi", (RTGCINT)127, "127");
+    CHECK42("%RGi", (RTGCINT)-586589, "-586589");
+
+    CHECK42("%RGp", (RTGCPHYS)0x0000000044505045, "0000000044505045");
+    CHECK42("%RGp", ~(RTGCPHYS)0, "ffffffffffffffff");
+
+    CHECK42("%RGu", (RTGCUINT)586589, "586589");
+    CHECK42("%RGu", (RTGCUINT)1, "1");
+    CHECK42("%RGu", (RTGCUINT)3000000000U, "3000000000");
+
+#if GC_ARCH_BITS == 32
+    CHECK42("%RGv", (RTGCUINTPTR)0, "00000000");
+    CHECK42("%RGv", ~(RTGCUINTPTR)0, "ffffffff");
+    CHECK42("%RGv", (RTGCUINTPTR)0x84342134, "84342134");
+#else
+    CHECK42("%RGv", (RTGCUINTPTR)0, "0000000000000000");
+    CHECK42("%RGv", ~(RTGCUINTPTR)0, "ffffffffffffffff");
+    CHECK42("%RGv", (RTGCUINTPTR)0x84342134, "0000000084342134");
+#endif
+
+    CHECK42("%RGx", (RTGCUINT)0x234, "234");
+    CHECK42("%RGx", (RTGCUINT)0xffffffff, "ffffffff");
+
+    CHECK42("%RRv", (RTRCUINTPTR)0, "00000000");
+    CHECK42("%RRv", ~(RTRCUINTPTR)0, "ffffffff");
+    CHECK42("%RRv", (RTRCUINTPTR)0x84342134, "84342134");
+
+    CHECK42("%RHi", (RTHCINT)127, "127");
+    CHECK42("%RHi", (RTHCINT)-586589, "-586589");
+
+    CHECK42("%RHp", (RTHCPHYS)0x0000000044505045, "0000000044505045");
+    CHECK42("%RHp", ~(RTHCPHYS)0, "ffffffffffffffff");
+
+    CHECK42("%RHu", (RTHCUINT)586589, "586589");
+    CHECK42("%RHu", (RTHCUINT)1, "1");
+    CHECK42("%RHu", (RTHCUINT)3000000000U, "3000000000");
+
+    if (sizeof(void*) == 8)
+    {
+        CHECK42("%RHv", (RTHCUINTPTR)0, "0000000000000000");
+        CHECK42("%RHv", ~(RTHCUINTPTR)0, "ffffffffffffffff");
+        CHECK42("%RHv", (RTHCUINTPTR)0x84342134, "0000000084342134");
+    }
+    else
+    {
+        CHECK42("%RHv", (RTHCUINTPTR)0, "00000000");
+        CHECK42("%RHv", ~(RTHCUINTPTR)0, "ffffffff");
+        CHECK42("%RHv", (RTHCUINTPTR)0x84342134, "84342134");
+    }
+
+    CHECK42("%RHx", (RTHCUINT)0x234, "234");
+    CHECK42("%RHx", (RTHCUINT)0xffffffff, "ffffffff");
+
+    CHECK42("%RI16", (int16_t)1, "1");
+    CHECK42("%RI16", (int16_t)-16384, "-16384");
+
+    CHECK42("%RI32", (int32_t)1123, "1123");
+    CHECK42("%RI32", (int32_t)-86596, "-86596");
+
+    CHECK42("%RI64", (int64_t)112345987345LL, "112345987345");
+    CHECK42("%RI64", (int64_t)-8659643985723459LL, "-8659643985723459");
+
+    CHECK42("%RI8", (int8_t)1, "1");
+    CHECK42("%RI8", (int8_t)-128, "-128");
+
+    CHECK42("%RTfile", (RTFILE)127, "127");
+    CHECK42("%RTfile", (RTFILE)12341234, "12341234");
+
+    CHECK42("%RTfmode", (RTFMODE)0x123403, "00123403");
+
+    CHECK42("%RTfoff", (RTFOFF)12342312, "12342312");
+    CHECK42("%RTfoff", (RTFOFF)-123123123, "-123123123");
+    CHECK42("%RTfoff", (RTFOFF)858694596874568LL, "858694596874568");
+
+    RTFAR16 fp16;
+    fp16.off = 0x34ff;
+    fp16.sel = 0x0160;
+    CHECK42("%RTfp16", fp16, "0160:34ff");
+
+    RTFAR32 fp32;
+    fp32.off = 0xff094030;
+    fp32.sel = 0x0168;
+    CHECK42("%RTfp32", fp32, "0168:ff094030");
+
+    RTFAR64 fp64;
+    fp64.off = 0xffff003401293487ULL;
+    fp64.sel = 0x0ff8;
+    CHECK42("%RTfp64", fp64, "0ff8:ffff003401293487");
+    fp64.off = 0x0;
+    fp64.sel = 0x0;
+    CHECK42("%RTfp64", fp64, "0000:0000000000000000");
+
+    CHECK42("%RTgid", (RTGID)-1, "-1");
+    CHECK42("%RTgid", (RTGID)1004, "1004");
+
+    CHECK42("%RTino", (RTINODE)0, "0000000000000000");
+    CHECK42("%RTino", (RTINODE)0x123412341324ULL, "0000123412341324");
+
+    CHECK42("%RTint", (RTINT)127, "127");
+    CHECK42("%RTint", (RTINT)-586589, "-586589");
+    CHECK42("%RTint", (RTINT)-23498723, "-23498723");
+
+    CHECK42("%RTiop", (RTIOPORT)0x3c4, "03c4");
+    CHECK42("%RTiop", (RTIOPORT)0xffff, "ffff");
+
+    CHECK42("%RTproc", (RTPROCESS)0xffffff, "00ffffff");
+    CHECK42("%RTproc", (RTPROCESS)0x43455443, "43455443");
+
+    if (sizeof(RTUINTPTR) == 8)
+    {
+        CHECK42("%RTptr", (RTUINTPTR)0, "0000000000000000");
+        CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffffffffffff");
+        CHECK42("%RTptr", (RTUINTPTR)0x84342134, "0000000084342134");
+    }
+    else
+    {
+        CHECK42("%RTptr", (RTUINTPTR)0, "00000000");
+        CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffff");
+        CHECK42("%RTptr", (RTUINTPTR)0x84342134, "84342134");
+    }
+
+    if (sizeof(RTCCUINTREG) == 8)
+    {
+        CHECK42("%RTreg", (RTCCUINTREG)0, "0000000000000000");
+        CHECK42("%RTreg", ~(RTCCUINTREG)0, "ffffffffffffffff");
+        CHECK42("%RTreg", (RTCCUINTREG)0x84342134, "0000000084342134");
+        CHECK42("%RTreg", (RTCCUINTREG)0x23484342134ULL, "0000023484342134");
+    }
+    else
+    {
+        CHECK42("%RTreg", (RTCCUINTREG)0, "00000000");
+        CHECK42("%RTreg", ~(RTCCUINTREG)0, "ffffffff");
+        CHECK42("%RTreg", (RTCCUINTREG)0x84342134, "84342134");
+    }
+
+    CHECK42("%RTsel", (RTSEL)0x543, "0543");
+    CHECK42("%RTsel", (RTSEL)0xf8f8, "f8f8");
+
+    if (sizeof(RTSEMEVENT) == 8)
+    {
+        CHECK42("%RTsem", (RTSEMEVENT)0, "0000000000000000");
+        CHECK42("%RTsem", (RTSEMEVENT)0x23484342134ULL, "0000023484342134");
+    }
+    else
+    {
+        CHECK42("%RTsem", (RTSEMEVENT)0, "00000000");
+        CHECK42("%RTsem", (RTSEMEVENT)0x84342134, "84342134");
+    }
+
+    CHECK42("%RTsock", (RTSOCKET)12234, "12234");
+    CHECK42("%RTsock", (RTSOCKET)584854543, "584854543");
+
+    if (sizeof(RTTHREAD) == 8)
+    {
+        CHECK42("%RTthrd", (RTTHREAD)0, "0000000000000000");
+        CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffffffffffff");
+        CHECK42("%RTthrd", (RTTHREAD)0x63484342134ULL, "0000063484342134");
+    }
+    else
+    {
+        CHECK42("%RTthrd", (RTTHREAD)0, "00000000");
+        CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffff");
+        CHECK42("%RTthrd", (RTTHREAD)0x54342134, "54342134");
+    }
+
+    CHECK42("%RTuid", (RTUID)-2, "-2");
+    CHECK42("%RTuid", (RTUID)90344, "90344");
+
+    CHECK42("%RTuint", (RTUINT)584589, "584589");
+    CHECK42("%RTuint", (RTUINT)3, "3");
+    CHECK42("%RTuint", (RTUINT)2400000000U, "2400000000");
+
+    RTUuidCreate(&Uuid);
+    RTUuidToStr(&Uuid, szCorrect, sizeof(szCorrect));
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%RTuuid", &Uuid);
+    if (strcmp(pszBuf, szCorrect))
+        RTTestIFailed("error:    '%s'\n"
+                      "expected: '%s'\n",
+                      pszBuf, szCorrect);
+
+    CHECK42("%RTxint", (RTUINT)0x2345, "2345");
+    CHECK42("%RTxint", (RTUINT)0xffff8fff, "ffff8fff");
+
+    CHECK42("%RU16", (uint16_t)7, "7");
+    CHECK42("%RU16", (uint16_t)46384, "46384");
+
+    CHECK42("%RU32", (uint32_t)1123, "1123");
+    CHECK42("%RU32", (uint32_t)86596, "86596");
+
+    CHECK42("%RU64", (uint64_t)112345987345ULL, "112345987345");
+    CHECK42("%RU64", (uint64_t)8659643985723459ULL, "8659643985723459");
+
+    CHECK42("%RU8", (uint8_t)1, "1");
+    CHECK42("%RU8", (uint8_t)254, "254");
+    CHECK42("%RU8", 256, "0");
+
+    CHECK42("%RX16", (uint16_t)0x7, "7");
+    CHECK42("%RX16", 0x46384, "6384");
+
+    CHECK42("%RX32", (uint32_t)0x1123, "1123");
+    CHECK42("%RX32", (uint32_t)0x49939493, "49939493");
+
+    CHECK42("%RX64", (uint64_t)0x348734, "348734");
+    CHECK42("%RX64", (uint64_t)0x12312312312343fULL, "12312312312343f");
+
+    CHECK42("%RX8", (uint8_t)1, "1");
+    CHECK42("%RX8", (uint8_t)0xff, "ff");
+    CHECK42("%RX8", 0x100, "0");
+
+    /*
+     * Thousand separators.
+     */
+    RTTestSub(hTest, "Thousand Separators (%'*)");
+
+    RTStrFormatNumber(pszBuf,       1, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("1");              memset(pszBuf, '!', BUF_SIZE);
+    RTStrFormatNumber(pszBuf,      10, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("10");             memset(pszBuf, '!', BUF_SIZE);
+    RTStrFormatNumber(pszBuf,     100, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("100");            memset(pszBuf, '!', BUF_SIZE);
+    RTStrFormatNumber(pszBuf,    1000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("1 000");          memset(pszBuf, '!', BUF_SIZE);
+    RTStrFormatNumber(pszBuf,   10000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("10 000");         memset(pszBuf, '!', BUF_SIZE);
+    RTStrFormatNumber(pszBuf,  100000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("100 000");        memset(pszBuf, '!', BUF_SIZE);
+    RTStrFormatNumber(pszBuf, 1000000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("1 000 000");      memset(pszBuf, '!', BUF_SIZE);
+
+    CHECK42("%'u", 1,                              "1");
+    CHECK42("%'u", 10,                            "10");
+    CHECK42("%'u", 100,                          "100");
+    CHECK42("%'u", 1000,                       "1 000");
+    CHECK42("%'u", 10000,                     "10 000");
+    CHECK42("%'u", 100000,                   "100 000");
+    CHECK42("%'u", 1000000,                "1 000 000");
+    CHECK42("%'RU64", _1T,         "1 099 511 627 776");
+    CHECK42("%'RU64", _1E, "1 152 921 504 606 846 976");
+
+    /*
+     * String formatting.
+     */
+    RTTestSub(hTest, "String formatting (%s)");
+
+//            0         1         2         3         4         5         6         7
+//            0....5....0....5....0....5....0....5....0....5....0....5....0....5....0
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10s %-30s %s", "cmd", "args", "description");
+    CHECKSTR("cmd        args                           description");
+
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10s %-30s %s", "cmd", "", "description");
+    CHECKSTR("cmd                                       description");
+
+
+    cch = RTStrPrintf(pszBuf, BUF_SIZE,  "%*s", 0, "");
+    CHECKSTR("");
+
+    /* automatic conversions. */
+    static RTUNICP s_usz1[] = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', 0 }; //assumes ascii.
+    static RTUTF16 s_wsz1[] = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', 0 }; //assumes ascii.
+
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%ls", s_wsz1);
+    CHECKSTR("hello world");
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%Ls", s_usz1);
+    CHECKSTR("hello world");
+
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%.5ls", s_wsz1);
+    CHECKSTR("hello");
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%.5Ls", s_usz1);
+    CHECKSTR("hello");
+
+    /*
+     * Unicode string formatting.
+     */
+    RTTestSub(hTest, "Unicode string formatting (%ls)");
+    static RTUTF16 s_wszEmpty[]  = { 0 }; //assumes ascii.
+    static RTUTF16 s_wszCmd[]    = { 'c', 'm', 'd', 0 }; //assumes ascii.
+    static RTUTF16 s_wszArgs[]   = { 'a', 'r', 'g', 's', 0 }; //assumes ascii.
+    static RTUTF16 s_wszDesc[]   = { 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 0 }; //assumes ascii.
+
+//            0         1         2         3         4         5         6         7
+//            0....5....0....5....0....5....0....5....0....5....0....5....0....5....0
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10ls %-30ls %ls", s_wszCmd, s_wszArgs, s_wszDesc);
+    CHECKSTR("cmd        args                           description");
+
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10ls %-30ls %ls", s_wszCmd, s_wszEmpty, s_wszDesc);
+    CHECKSTR("cmd                                       description");
+
+
+#if 0
+    static RTUNICP s_usz2[] = { 0xc5, 0xc6, 0xf8, 0 };
+    static RTUTF16 s_wsz2[] = { 0xc5, 0xc6, 0xf8, 0 };
+    static char    s_sz2[]  = { 0xc5, 0xc6, 0xf8, 0 };///@todo multibyte tests.
+
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%ls", s_wsz2);
+    CHECKSTR(s_sz2);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%Ls", s_usz2);
+    CHECKSTR(s_sz2);
+#endif
+
+    /*
+     * Custom types.
+     */
+    RTTestSub(hTest, "Custom format types (%R[*])");
+    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type3", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type3",           (void *)((uintptr_t)TstType + 3)), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3]", (void *)1);
+    CHECKSTR("type3=1");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type1", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type1",           (void *)((uintptr_t)TstType + 1)), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1]", (void *)1, (void *)2);
+    CHECKSTR("type3=1 type1=2");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type4", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type4",           (void *)((uintptr_t)TstType + 4)), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4]", (void *)1, (void *)2, (void *)3);
+    CHECKSTR("type3=1 type1=2 type4=3");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type2", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type2",           (void *)((uintptr_t)TstType + 2)), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type2]", (void *)1, (void *)2, (void *)3, (void *)4);
+    CHECKSTR("type3=1 type1=2 type4=3 type2=4");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type5", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type5",           (void *)((uintptr_t)TstType + 5)), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type2] %R[type5]", (void *)1, (void *)2, (void *)3, (void *)4, (void *)5);
+    CHECKSTR("type3=1 type1=2 type4=3 type2=4 type5=5");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type1",           (void *)((uintptr_t)TstType + 1)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type2",           (void *)((uintptr_t)TstType + 2)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type3",           (void *)((uintptr_t)TstType + 3)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type4",           (void *)((uintptr_t)TstType + 4)), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type5",           (void *)((uintptr_t)TstType + 5)), VINF_SUCCESS);
+
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type2] %R[type5]", (void *)10, (void *)20, (void *)30, (void *)40, (void *)50);
+    CHECKSTR("type3=10 type1=20 type4=30 type2=40 type5=50");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type2"), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type5]", (void *)10, (void *)20, (void *)30, (void *)40);
+    CHECKSTR("type3=10 type1=20 type4=30 type5=40");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type5"), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4]", (void *)10, (void *)20, (void *)30);
+    CHECKSTR("type3=10 type1=20 type4=30");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type4"), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1]", (void *)10, (void *)20);
+    CHECKSTR("type3=10 type1=20");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type1"), VINF_SUCCESS);
+    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3]", (void *)10);
+    CHECKSTR("type3=10");
+
+    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type3"), VINF_SUCCESS);
+
+    /*
+     * Summarize and exit.
+     */
+    return RTTestSummaryAndDestroy(hTest);
+}
+
Index: unk/src/VBox/Runtime/testcase/tstStrFormat.cpp
===================================================================
--- /trunk/src/VBox/Runtime/testcase/tstStrFormat.cpp	(revision 23959)
+++ 	(revision )
@@ -1,520 +1,0 @@
-/* $Id$ */
-/** @file
- * IPRT Testcase - String formatting.
- */
-
-/*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- *
- * The contents of this file may alternatively be used under the terms
- * of the Common Development and Distribution License Version 1.0
- * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
- * VirtualBox OSE distribution, in which case the provisions of the
- * CDDL are applicable instead of those of the GPL.
- *
- * You may elect to license modified versions of this file under the
- * terms and conditions of either the GPL or the CDDL or both.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
- * Clara, CA 95054 USA or visit http://www.sun.com if you need
- * additional information or have any questions.
- */
-
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
-#include <iprt/string.h>
-
-#include <iprt/initterm.h>
-#include <iprt/stream.h>
-#include <iprt/test.h>
-#include <iprt/uuid.h>
-
-
-/** See FNRTSTRFORMATTYPE. */
-static DECLCALLBACK(size_t) TstType(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
-                                    const char *pszType, void const *pvValue,
-                                    int cchWidth, int cchPrecision, unsigned fFlags,
-                                    void *pvUser)
-{
-    /* validate */
-    if (strncmp(pszType, "type", 4))
-        RTTestIFailed("pszType=%s expected 'typeN'\n", pszType);
-
-    int iType = pszType[4] - '0';
-    if ((uintptr_t)pvUser != (uintptr_t)TstType + iType)
-        RTTestIFailed("pvValue=%p expected %p\n", pvUser, (void *)((uintptr_t)TstType + iType));
-
-    /* format */
-    size_t cch = pfnOutput(pvArgOutput, pszType, 5);
-    cch += pfnOutput(pvArgOutput, "=", 1);
-    char szNum[64];
-    size_t cchNum = RTStrFormatNumber(szNum, (uintptr_t)pvValue, 10, cchWidth, cchPrecision, fFlags);
-    cch += pfnOutput(pvArgOutput, szNum, cchNum);
-    return cch;
-}
-
-
-int main()
-{
-    RTTEST hTest;
-    int rc = RTTestInitAndCreate("tstStrFormat", &hTest);
-    if (rc)
-        return rc;
-    RTTestBanner(hTest);
-
-    uint32_t    u32 = 0x010;
-    uint64_t    u64 = 0x100;
-#define BUF_SIZE    120
-    char       *pszBuf = (char *)RTTestGuardedAllocHead(hTest, BUF_SIZE);
-
-    RTTestSub(hTest, "Basics");
-
-    /* simple */
-    size_t cch = RTStrPrintf(pszBuf, BUF_SIZE, "u32=%d u64=%lld u64=%#llx", u32, u64, u64);
-    if (strcmp(pszBuf, "u32=16 u64=256 u64=0x100"))
-    {
-        RTTestIFailed("error: '%s'\n"
-                      "wanted 'u32=16 u64=256 u64=0x100'\n", pszBuf);
-    }
-
-    /* just big. */
-    u64 = UINT64_C(0x7070605040302010);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "u64=%#llx 42=%d u64=%lld 42=%d", u64, 42, u64, 42);
-    if (strcmp(pszBuf, "u64=0x7070605040302010 42=42 u64=8102081627430068240 42=42"))
-    {
-        RTTestIFailed("error: '%s'\n"
-                      "wanted 'u64=0x8070605040302010 42=42 u64=8102081627430068240 42=42'\n", pszBuf);
-        RTTestIPrintf(RTTESTLVL_FAILURE, "%d\n", (int)(u64 % 10));
-    }
-
-    /* huge and negative. */
-    u64 = UINT64_C(0x8070605040302010);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "u64=%#llx 42=%d u64=%llu 42=%d u64=%lld 42=%d", u64, 42, u64, 42, u64, 42);
-    /* Not sure if this is the correct decimal representation... But both */
-    if (strcmp(pszBuf, "u64=0x8070605040302010 42=42 u64=9255003132036915216 42=42 u64=-9191740941672636400 42=42"))
-    {
-        RTTestIFailed("error: '%s'\n"
-                      "wanted 'u64=0x8070605040302010 42=42 u64=9255003132036915216 42=42 u64=-9191740941672636400 42=42'\n", pszBuf);
-        RTTestIPrintf(RTTESTLVL_FAILURE, "%d\n", (int)(u64 % 10));
-    }
-
-    /* 64-bit value bug. */
-    u64 = 0xa0000000;
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "u64=%#llx 42=%d u64=%lld 42=%d", u64, 42, u64, 42);
-    if (strcmp(pszBuf, "u64=0xa0000000 42=42 u64=2684354560 42=42"))
-        RTTestIFailed("error: '%s'\n"
-                      "wanted 'u64=0xa0000000 42=42 u64=2684354560 42=42'\n", pszBuf);
-
-    /* uuid */
-    RTUUID Uuid;
-    RTUuidCreate(&Uuid);
-    char szCorrect[RTUUID_STR_LENGTH];
-    RTUuidToStr(&Uuid, szCorrect, sizeof(szCorrect));
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%Vuuid", &Uuid);
-    if (strcmp(pszBuf, szCorrect))
-        RTTestIFailed("error:    '%s'\n"
-                      "expected: '%s'\n",
-                      pszBuf, szCorrect);
-
-    /*
-     * allocation
-     */
-    RTTestSub(hTest, "RTStrAPrintf");
-    char *psz = (char *)~0;
-    int cch2 = RTStrAPrintf(&psz, "Hey there! %s%s", "This is a test", "!");
-    if (cch2 < 0)
-        RTTestIFailed("RTStrAPrintf failed, cch2=%d\n", cch2);
-    else if (strcmp(psz, "Hey there! This is a test!"))
-        RTTestIFailed("RTStrAPrintf failed\n"
-                      "got   : '%s'\n"
-                      "wanted: 'Hey there! This is a test!'\n",
-                      psz);
-    else if ((int)strlen(psz) != cch2)
-        RTTestIFailed("RTStrAPrintf failed, cch2 == %d expected %u\n", cch2, strlen(psz));
-    RTStrFree(psz);
-
-#define CHECK42(fmt, arg, out) \
-    do { \
-        cch = RTStrPrintf(pszBuf, BUF_SIZE, fmt " 42=%d " fmt " 42=%d", arg, 42, arg, 42); \
-        if (strcmp(pszBuf, out " 42=42 " out " 42=42")) \
-            RTTestIFailed("at line %d: format '%s'\n" \
-                          "    output: '%s'\n"  \
-                          "    wanted: '%s'\n", \
-                          __LINE__, fmt, pszBuf, out " 42=42 " out " 42=42"); \
-        else if (cch != sizeof(out " 42=42 " out " 42=42") - 1) \
-            RTTestIFailed("at line %d: Invalid length %d returned, expected %u!\n", \
-                          __LINE__, cch, sizeof(out " 42=42 " out " 42=42") - 1); \
-    } while (0)
-
-#define CHECKSTR(Correct) \
-    if (strcmp(pszBuf, Correct)) \
-        RTTestIFailed("error:    '%s'\n" \
-                      "expected: '%s'\n", pszBuf, Correct); \
-
-    /*
-     * Runtime extensions.
-     */
-    RTTestSub(hTest, "Runtime format types (%R*)");
-    CHECK42("%RGi", (RTGCINT)127, "127");
-    CHECK42("%RGi", (RTGCINT)-586589, "-586589");
-
-    CHECK42("%RGp", (RTGCPHYS)0x0000000044505045, "0000000044505045");
-    CHECK42("%RGp", ~(RTGCPHYS)0, "ffffffffffffffff");
-
-    CHECK42("%RGu", (RTGCUINT)586589, "586589");
-    CHECK42("%RGu", (RTGCUINT)1, "1");
-    CHECK42("%RGu", (RTGCUINT)3000000000U, "3000000000");
-
-#if GC_ARCH_BITS == 32
-    CHECK42("%RGv", (RTGCUINTPTR)0, "00000000");
-    CHECK42("%RGv", ~(RTGCUINTPTR)0, "ffffffff");
-    CHECK42("%RGv", (RTGCUINTPTR)0x84342134, "84342134");
-#else
-    CHECK42("%RGv", (RTGCUINTPTR)0, "0000000000000000");
-    CHECK42("%RGv", ~(RTGCUINTPTR)0, "ffffffffffffffff");
-    CHECK42("%RGv", (RTGCUINTPTR)0x84342134, "0000000084342134");
-#endif
-
-    CHECK42("%RGx", (RTGCUINT)0x234, "234");
-    CHECK42("%RGx", (RTGCUINT)0xffffffff, "ffffffff");
-
-    CHECK42("%RRv", (RTRCUINTPTR)0, "00000000");
-    CHECK42("%RRv", ~(RTRCUINTPTR)0, "ffffffff");
-    CHECK42("%RRv", (RTRCUINTPTR)0x84342134, "84342134");
-
-    CHECK42("%RHi", (RTHCINT)127, "127");
-    CHECK42("%RHi", (RTHCINT)-586589, "-586589");
-
-    CHECK42("%RHp", (RTHCPHYS)0x0000000044505045, "0000000044505045");
-    CHECK42("%RHp", ~(RTHCPHYS)0, "ffffffffffffffff");
-
-    CHECK42("%RHu", (RTHCUINT)586589, "586589");
-    CHECK42("%RHu", (RTHCUINT)1, "1");
-    CHECK42("%RHu", (RTHCUINT)3000000000U, "3000000000");
-
-    if (sizeof(void*) == 8)
-    {
-        CHECK42("%RHv", (RTHCUINTPTR)0, "0000000000000000");
-        CHECK42("%RHv", ~(RTHCUINTPTR)0, "ffffffffffffffff");
-        CHECK42("%RHv", (RTHCUINTPTR)0x84342134, "0000000084342134");
-    }
-    else
-    {
-        CHECK42("%RHv", (RTHCUINTPTR)0, "00000000");
-        CHECK42("%RHv", ~(RTHCUINTPTR)0, "ffffffff");
-        CHECK42("%RHv", (RTHCUINTPTR)0x84342134, "84342134");
-    }
-
-    CHECK42("%RHx", (RTHCUINT)0x234, "234");
-    CHECK42("%RHx", (RTHCUINT)0xffffffff, "ffffffff");
-
-    CHECK42("%RI16", (int16_t)1, "1");
-    CHECK42("%RI16", (int16_t)-16384, "-16384");
-
-    CHECK42("%RI32", (int32_t)1123, "1123");
-    CHECK42("%RI32", (int32_t)-86596, "-86596");
-
-    CHECK42("%RI64", (int64_t)112345987345LL, "112345987345");
-    CHECK42("%RI64", (int64_t)-8659643985723459LL, "-8659643985723459");
-
-    CHECK42("%RI8", (int8_t)1, "1");
-    CHECK42("%RI8", (int8_t)-128, "-128");
-
-    CHECK42("%RTfile", (RTFILE)127, "127");
-    CHECK42("%RTfile", (RTFILE)12341234, "12341234");
-
-    CHECK42("%RTfmode", (RTFMODE)0x123403, "00123403");
-
-    CHECK42("%RTfoff", (RTFOFF)12342312, "12342312");
-    CHECK42("%RTfoff", (RTFOFF)-123123123, "-123123123");
-    CHECK42("%RTfoff", (RTFOFF)858694596874568LL, "858694596874568");
-
-    RTFAR16 fp16;
-    fp16.off = 0x34ff;
-    fp16.sel = 0x0160;
-    CHECK42("%RTfp16", fp16, "0160:34ff");
-
-    RTFAR32 fp32;
-    fp32.off = 0xff094030;
-    fp32.sel = 0x0168;
-    CHECK42("%RTfp32", fp32, "0168:ff094030");
-
-    RTFAR64 fp64;
-    fp64.off = 0xffff003401293487ULL;
-    fp64.sel = 0x0ff8;
-    CHECK42("%RTfp64", fp64, "0ff8:ffff003401293487");
-    fp64.off = 0x0;
-    fp64.sel = 0x0;
-    CHECK42("%RTfp64", fp64, "0000:0000000000000000");
-
-    CHECK42("%RTgid", (RTGID)-1, "-1");
-    CHECK42("%RTgid", (RTGID)1004, "1004");
-
-    CHECK42("%RTino", (RTINODE)0, "0000000000000000");
-    CHECK42("%RTino", (RTINODE)0x123412341324ULL, "0000123412341324");
-
-    CHECK42("%RTint", (RTINT)127, "127");
-    CHECK42("%RTint", (RTINT)-586589, "-586589");
-    CHECK42("%RTint", (RTINT)-23498723, "-23498723");
-
-    CHECK42("%RTiop", (RTIOPORT)0x3c4, "03c4");
-    CHECK42("%RTiop", (RTIOPORT)0xffff, "ffff");
-
-    CHECK42("%RTproc", (RTPROCESS)0xffffff, "00ffffff");
-    CHECK42("%RTproc", (RTPROCESS)0x43455443, "43455443");
-
-    if (sizeof(RTUINTPTR) == 8)
-    {
-        CHECK42("%RTptr", (RTUINTPTR)0, "0000000000000000");
-        CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffffffffffff");
-        CHECK42("%RTptr", (RTUINTPTR)0x84342134, "0000000084342134");
-    }
-    else
-    {
-        CHECK42("%RTptr", (RTUINTPTR)0, "00000000");
-        CHECK42("%RTptr", ~(RTUINTPTR)0, "ffffffff");
-        CHECK42("%RTptr", (RTUINTPTR)0x84342134, "84342134");
-    }
-
-    if (sizeof(RTCCUINTREG) == 8)
-    {
-        CHECK42("%RTreg", (RTCCUINTREG)0, "0000000000000000");
-        CHECK42("%RTreg", ~(RTCCUINTREG)0, "ffffffffffffffff");
-        CHECK42("%RTreg", (RTCCUINTREG)0x84342134, "0000000084342134");
-        CHECK42("%RTreg", (RTCCUINTREG)0x23484342134ULL, "0000023484342134");
-    }
-    else
-    {
-        CHECK42("%RTreg", (RTCCUINTREG)0, "00000000");
-        CHECK42("%RTreg", ~(RTCCUINTREG)0, "ffffffff");
-        CHECK42("%RTreg", (RTCCUINTREG)0x84342134, "84342134");
-    }
-
-    CHECK42("%RTsel", (RTSEL)0x543, "0543");
-    CHECK42("%RTsel", (RTSEL)0xf8f8, "f8f8");
-
-    if (sizeof(RTSEMEVENT) == 8)
-    {
-        CHECK42("%RTsem", (RTSEMEVENT)0, "0000000000000000");
-        CHECK42("%RTsem", (RTSEMEVENT)0x23484342134ULL, "0000023484342134");
-    }
-    else
-    {
-        CHECK42("%RTsem", (RTSEMEVENT)0, "00000000");
-        CHECK42("%RTsem", (RTSEMEVENT)0x84342134, "84342134");
-    }
-
-    CHECK42("%RTsock", (RTSOCKET)12234, "12234");
-    CHECK42("%RTsock", (RTSOCKET)584854543, "584854543");
-
-    if (sizeof(RTTHREAD) == 8)
-    {
-        CHECK42("%RTthrd", (RTTHREAD)0, "0000000000000000");
-        CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffffffffffff");
-        CHECK42("%RTthrd", (RTTHREAD)0x63484342134ULL, "0000063484342134");
-    }
-    else
-    {
-        CHECK42("%RTthrd", (RTTHREAD)0, "00000000");
-        CHECK42("%RTthrd", (RTTHREAD)~(uintptr_t)0, "ffffffff");
-        CHECK42("%RTthrd", (RTTHREAD)0x54342134, "54342134");
-    }
-
-    CHECK42("%RTuid", (RTUID)-2, "-2");
-    CHECK42("%RTuid", (RTUID)90344, "90344");
-
-    CHECK42("%RTuint", (RTUINT)584589, "584589");
-    CHECK42("%RTuint", (RTUINT)3, "3");
-    CHECK42("%RTuint", (RTUINT)2400000000U, "2400000000");
-
-    RTUuidCreate(&Uuid);
-    RTUuidToStr(&Uuid, szCorrect, sizeof(szCorrect));
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%RTuuid", &Uuid);
-    if (strcmp(pszBuf, szCorrect))
-        RTTestIFailed("error:    '%s'\n"
-                      "expected: '%s'\n",
-                      pszBuf, szCorrect);
-
-    CHECK42("%RTxint", (RTUINT)0x2345, "2345");
-    CHECK42("%RTxint", (RTUINT)0xffff8fff, "ffff8fff");
-
-    CHECK42("%RU16", (uint16_t)7, "7");
-    CHECK42("%RU16", (uint16_t)46384, "46384");
-
-    CHECK42("%RU32", (uint32_t)1123, "1123");
-    CHECK42("%RU32", (uint32_t)86596, "86596");
-
-    CHECK42("%RU64", (uint64_t)112345987345ULL, "112345987345");
-    CHECK42("%RU64", (uint64_t)8659643985723459ULL, "8659643985723459");
-
-    CHECK42("%RU8", (uint8_t)1, "1");
-    CHECK42("%RU8", (uint8_t)254, "254");
-    CHECK42("%RU8", 256, "0");
-
-    CHECK42("%RX16", (uint16_t)0x7, "7");
-    CHECK42("%RX16", 0x46384, "6384");
-
-    CHECK42("%RX32", (uint32_t)0x1123, "1123");
-    CHECK42("%RX32", (uint32_t)0x49939493, "49939493");
-
-    CHECK42("%RX64", (uint64_t)0x348734, "348734");
-    CHECK42("%RX64", (uint64_t)0x12312312312343fULL, "12312312312343f");
-
-    CHECK42("%RX8", (uint8_t)1, "1");
-    CHECK42("%RX8", (uint8_t)0xff, "ff");
-    CHECK42("%RX8", 0x100, "0");
-
-    /*
-     * Thousand separators.
-     */
-    RTTestSub(hTest, "Thousand Separators (%'*)");
-
-    RTStrFormatNumber(pszBuf,       1, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("1");              memset(pszBuf, '!', BUF_SIZE);
-    RTStrFormatNumber(pszBuf,      10, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("10");             memset(pszBuf, '!', BUF_SIZE);
-    RTStrFormatNumber(pszBuf,     100, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("100");            memset(pszBuf, '!', BUF_SIZE);
-    RTStrFormatNumber(pszBuf,    1000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("1 000");          memset(pszBuf, '!', BUF_SIZE);
-    RTStrFormatNumber(pszBuf,   10000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("10 000");         memset(pszBuf, '!', BUF_SIZE);
-    RTStrFormatNumber(pszBuf,  100000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("100 000");        memset(pszBuf, '!', BUF_SIZE);
-    RTStrFormatNumber(pszBuf, 1000000, 10, 0, 0, RTSTR_F_THOUSAND_SEP); CHECKSTR("1 000 000");      memset(pszBuf, '!', BUF_SIZE);
-
-    CHECK42("%'u", 1,                              "1");
-    CHECK42("%'u", 10,                            "10");
-    CHECK42("%'u", 100,                          "100");
-    CHECK42("%'u", 1000,                       "1 000");
-    CHECK42("%'u", 10000,                     "10 000");
-    CHECK42("%'u", 100000,                   "100 000");
-    CHECK42("%'u", 1000000,                "1 000 000");
-    CHECK42("%'RU64", _1T,         "1 099 511 627 776");
-    CHECK42("%'RU64", _1E, "1 152 921 504 606 846 976");
-
-    /*
-     * String formatting.
-     */
-    RTTestSub(hTest, "String formatting (%s)");
-
-//            0         1         2         3         4         5         6         7
-//            0....5....0....5....0....5....0....5....0....5....0....5....0....5....0
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10s %-30s %s", "cmd", "args", "description");
-    CHECKSTR("cmd        args                           description");
-
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10s %-30s %s", "cmd", "", "description");
-    CHECKSTR("cmd                                       description");
-
-
-    cch = RTStrPrintf(pszBuf, BUF_SIZE,  "%*s", 0, "");
-    CHECKSTR("");
-
-    /* automatic conversions. */
-    static RTUNICP s_usz1[] = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', 0 }; //assumes ascii.
-    static RTUTF16 s_wsz1[] = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', 0 }; //assumes ascii.
-
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%ls", s_wsz1);
-    CHECKSTR("hello world");
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%Ls", s_usz1);
-    CHECKSTR("hello world");
-
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%.5ls", s_wsz1);
-    CHECKSTR("hello");
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%.5Ls", s_usz1);
-    CHECKSTR("hello");
-
-    /*
-     * Unicode string formatting.
-     */
-    RTTestSub(hTest, "Unicode string formatting (%ls)");
-    static RTUTF16 s_wszEmpty[]  = { 0 }; //assumes ascii.
-    static RTUTF16 s_wszCmd[]    = { 'c', 'm', 'd', 0 }; //assumes ascii.
-    static RTUTF16 s_wszArgs[]   = { 'a', 'r', 'g', 's', 0 }; //assumes ascii.
-    static RTUTF16 s_wszDesc[]   = { 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'i', 'o', 'n', 0 }; //assumes ascii.
-
-//            0         1         2         3         4         5         6         7
-//            0....5....0....5....0....5....0....5....0....5....0....5....0....5....0
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10ls %-30ls %ls", s_wszCmd, s_wszArgs, s_wszDesc);
-    CHECKSTR("cmd        args                           description");
-
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%-10ls %-30ls %ls", s_wszCmd, s_wszEmpty, s_wszDesc);
-    CHECKSTR("cmd                                       description");
-
-
-#if 0
-    static RTUNICP s_usz2[] = { 0xc5, 0xc6, 0xf8, 0 };
-    static RTUTF16 s_wsz2[] = { 0xc5, 0xc6, 0xf8, 0 };
-    static char    s_sz2[]  = { 0xc5, 0xc6, 0xf8, 0 };///@todo multibyte tests.
-
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%ls", s_wsz2);
-    CHECKSTR(s_sz2);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%Ls", s_usz2);
-    CHECKSTR(s_sz2);
-#endif
-
-    /*
-     * Custom types.
-     */
-    RTTestSub(hTest, "Custom format types (%R[*])");
-    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type3", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type3",           (void *)((uintptr_t)TstType + 3)), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3]", (void *)1);
-    CHECKSTR("type3=1");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type1", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type1",           (void *)((uintptr_t)TstType + 1)), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1]", (void *)1, (void *)2);
-    CHECKSTR("type3=1 type1=2");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type4", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type4",           (void *)((uintptr_t)TstType + 4)), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4]", (void *)1, (void *)2, (void *)3);
-    CHECKSTR("type3=1 type1=2 type4=3");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type2", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type2",           (void *)((uintptr_t)TstType + 2)), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type2]", (void *)1, (void *)2, (void *)3, (void *)4);
-    CHECKSTR("type3=1 type1=2 type4=3 type2=4");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeRegister("type5", TstType, (void *)((uintptr_t)TstType)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type5",           (void *)((uintptr_t)TstType + 5)), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type2] %R[type5]", (void *)1, (void *)2, (void *)3, (void *)4, (void *)5);
-    CHECKSTR("type3=1 type1=2 type4=3 type2=4 type5=5");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type1",           (void *)((uintptr_t)TstType + 1)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type2",           (void *)((uintptr_t)TstType + 2)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type3",           (void *)((uintptr_t)TstType + 3)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type4",           (void *)((uintptr_t)TstType + 4)), VINF_SUCCESS);
-    RTTESTI_CHECK_RC(RTStrFormatTypeSetUser("type5",           (void *)((uintptr_t)TstType + 5)), VINF_SUCCESS);
-
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type2] %R[type5]", (void *)10, (void *)20, (void *)30, (void *)40, (void *)50);
-    CHECKSTR("type3=10 type1=20 type4=30 type2=40 type5=50");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type2"), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4] %R[type5]", (void *)10, (void *)20, (void *)30, (void *)40);
-    CHECKSTR("type3=10 type1=20 type4=30 type5=40");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type5"), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1] %R[type4]", (void *)10, (void *)20, (void *)30);
-    CHECKSTR("type3=10 type1=20 type4=30");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type4"), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3] %R[type1]", (void *)10, (void *)20);
-    CHECKSTR("type3=10 type1=20");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type1"), VINF_SUCCESS);
-    cch = RTStrPrintf(pszBuf, BUF_SIZE, "%R[type3]", (void *)10);
-    CHECKSTR("type3=10");
-
-    RTTESTI_CHECK_RC(RTStrFormatTypeDeregister("type3"), VINF_SUCCESS);
-
-    /*
-     * Summarize and exit.
-     */
-    return RTTestSummaryAndDestroy(hTest);
-}
-
