Changeset 38633 in vbox

Timestamp:

Sep 5, 2011 11:33:01 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73840

Message:

VBoxService: Fixed German Umlauts handling in toolbox, minimized/adjusted log locking.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (3 diffs)
• VBoxServiceControlExec.cpp (modified) (1 diff)
• VBoxServiceInternal.h (modified) (1 diff)
• VBoxServiceToolBox.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -218 +218 @@
  *
  * @returns 1
+ * @param   iLevel      Minimum log level required to display this message.
  * @param   pszFormat   The message text.
  * @param   ...         Format arguments.
@@ -223 +224 @@
 void VBoxServiceVerbose(int iLevel, const char *pszFormat, ...)
 {
+    if (iLevel <= g_cVerbosity)
+    {
 #ifdef DEBUG
-    int rc = RTCritSectEnter(&g_csLog);
-    if (RT_SUCCESS(rc))
-    {
-#endif
-        if (iLevel <= g_cVerbosity)
-        {
-#ifdef DEBUG
+        int rc = RTCritSectEnter(&g_csLog);
+        if (RT_SUCCESS(rc))
+        {
             const char *pszThreadName = RTThreadSelfName();
             AssertPtr(pszThreadName);
@@ -245 +244 @@
             LogRel(("%s: %N", g_pszProgName, pszFormat, &va));
             va_end(va);
+#ifdef DEBUG
+            RTCritSectLeave(&g_csLog);
         }
-#ifdef DEBUG
-        int rc2 = RTCritSectLeave(&g_csLog);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-#endif
+#endif
+    }
 }
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

@@ -612 +612 @@
                    && cbRead)
             {
-                VBoxServiceVerbose(5, "[%u]: %s\n", pData->uPID, szBuf);
+#ifdef DEBUG
+                int rc2 = RTCritSectEnter(&g_csLog);
+                if (RT_SUCCESS(rc2))
+                {
+#endif
+                    RTStrmWriteEx(g_pStdOut, szBuf, cbRead, NULL /* No partial write. */);
+#ifdef DEBUG
+                    rc2 = RTCritSectLeave(&g_csLog);
+                    if (RT_SUCCESS(rc))
+                        rc = rc2;
+                }
+#endif
                 cbOffset += cbRead;
                 if (!cbLeft)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -276 +276 @@
 extern VBOXSERVICE  g_AutoMount;
 #endif
+#ifdef DEBUG
+extern RTCRITSECT   g_csLog; /* For guest process stdout dumping. */
+#endif
 
 extern RTEXITCODE   VBoxServiceSyntax(const char *pszFormat, ...);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp

@@ -1185 +1185 @@
 
     /*
+     * The input is ASSUMED to be in the current process codeset (NT guarantees
+     * ACP, unixy systems doesn't guarantee anything).  This loop converts all
+     * the argv[*] strings to UTF-8, which is a tad ugly but who cares.
+     * (As a rule all strings in VirtualBox are UTF-8.)
+     */
+    for (int i = 0; i < argc; i++)
+    {
+        char *pszConverted;
+        int rc = RTStrCurrentCPToUtf8(&pszConverted, argv[i]);
+        if (RT_SUCCESS(rc))
+            argv[i] = pszConverted;
+        else
+        {
+            RTMsgError("Failed to convert argument %d to UTF-8, rc=%Rrc\n",
+                       i + 1, rc);
+
+            /* Conversion was not possible,probably due to invalid characters.
+             * Keep in mind that we do RTStrFree on the whole array below. */
+            argv[i] = RTStrDup(argv[i]);
+        }
+    }
+
+    /*
      * Invoke the handler.
      */
     RTMsgSetProgName("VBoxService/%s", pszTool);
     *prcExit = pfnHandler(argc, argv);
+
+    /*
+     * Free converted argument vector
+     */
+    for (int i = 0; i < argc; i++)
+    {
+        RTStrFree(argv[i]);
+        argv[i] = NULL;
+    }
     return true;