Changeset 92938 in vbox for trunk

Timestamp:

Dec 15, 2021 3:47:00 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage: Use RTMsgWarning instead of LogRel for NLS trouble. Loading NLS should not be under 'Parse the global options' header. Cleanups. bugref:1909

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -562 +562 @@
 #endif
 
+#ifdef VBOX_WITH_VBOXMANAGE_NLS
+    /*
+     * Initialize the translator and associated fun.
+     */
+    util::InitAutoLockSystem();
+    ComObjPtr<VBoxEventListenerImpl> ptrEventListner;
+    PTRCOMPONENT          pTrComponent = NULL;
+    VirtualBoxTranslator *pTranslator  = VirtualBoxTranslator::instance();
+    if (pTranslator != NULL)
+    {
+        char szNlsPath[RTPATH_MAX];
+        vrc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
+        if (RT_SUCCESS(vrc))
+            vrc = RTPathAppend(szNlsPath, sizeof(szNlsPath), "nls" RTPATH_SLASH_STR "VBoxManageNls");
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = pTranslator->registerTranslation(szNlsPath, true, &pTrComponent);
+            if (RT_SUCCESS(vrc))
+            {
+                vrc = pTranslator->i_loadLanguage(NULL);
+                if (RT_SUCCESS(vrc))
+                {
+                    com::Utf8Str strLang = pTranslator->language();
+                    setBuiltInHelpLanguage(strLang.c_str());
+                }
+                else
+                    RTMsgWarning("Load language failed: %Rrc\n", vrc);
+            }
+            else
+                RTMsgWarning("Register translation failed: %Rrc\n", vrc);
+        }
+        else
+            RTMsgWarning("Path constructing failed: %Rrc\n", vrc);
+    }
+#endif
+
     /*
      * Parse the global options
@@ -576 +612 @@
     char      **papszNewArgv          = NULL;
 #endif
-
-#ifdef VBOX_WITH_VBOXMANAGE_NLS
-    ComPtr<IEventListener> pEventListener;
-    PTRCOMPONENT          pTrComponent = NULL;
-    util::InitAutoLockSystem();
-    VirtualBoxTranslator *pTranslator = VirtualBoxTranslator::instance();
-    if (pTranslator != NULL)
-    {
-        char szNlsPath[RTPATH_MAX];
-        vrc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
-        if (RT_SUCCESS(vrc))
-            vrc = RTPathAppend(szNlsPath, sizeof(szNlsPath), "nls" RTPATH_SLASH_STR "VBoxManageNls");
-        if (RT_SUCCESS(vrc))
-        {
-            vrc = pTranslator->registerTranslation(szNlsPath, true, &pTrComponent);
-            if (RT_SUCCESS(vrc))
-            {
-                vrc = pTranslator->i_loadLanguage(NULL);
-                if (RT_SUCCESS(vrc))
-                {
-                    com::Utf8Str strLang = pTranslator->language();
-                    setBuiltInHelpLanguage(strLang.c_str());
-                }
-                else
-                    LogRelFunc(("Load language failed: %Rrc\n", vrc));
-            }
-            else
-                LogRelFunc(("Register translation failed: %Rrc\n", vrc));
-        }
-        else
-            LogRelFunc(("Path constructing failed: %Rrc\n", vrc));
-
-    }
-#endif
-
     for (int i = 1; i < argc || argc <= iCmd; i++)
     {
@@ -812 +813 @@
         {
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
+            /* Load language settings from IVirtualBox. */
             if (pTranslator != NULL)
             {
@@ -821 +823 @@
                 }
                 else
-                {
-                    /* Just log and ignore the language error */
-                    LogRel(("Failed to load API language, %Rhrc", hrc1));
-                }
+                    RTMsgWarning("Failed to load API language: %Rhrc", hrc1);
+
                 /* VirtualBox language events registration. */
                 ComPtr<IEventSource> pES;
@@ -830 +830 @@
                 if (SUCCEEDED(hrc1))
                 {
-                    ComObjPtr<VBoxEventListenerImpl> listener;
-                    listener.createObject();
-                    listener->init(new VBoxEventListener());
-                    pEventListener = listener;
-                    com::SafeArray<VBoxEventType_T> eventTypes;
-                    eventTypes.push_back(VBoxEventType_OnLanguageChanged);
-                    hrc1 = pES->RegisterListener(pEventListener, ComSafeArrayAsInParam(eventTypes), true);
+                    hrc1 = ptrEventListner.createObject();
+                    if (SUCCEEDED(hrc1))
+                        hrc1 = ptrEventListner->init(new VBoxEventListener());
+                    if (SUCCEEDED(hrc1))
+                    {
+                        com::SafeArray<VBoxEventType_T> eventTypes;
+                        eventTypes.push_back(VBoxEventType_OnLanguageChanged);
+                        hrc1 = pES->RegisterListener(ptrEventListner, ComSafeArrayAsInParam(eventTypes), true);
+                    }
                     if (FAILED(hrc1))
                     {
-                        pEventListener.setNull();
-                        LogRel(("Failed to register event listener, %Rhrc", hrc1));
+                        ptrEventListner.setNull();
+                        RTMsgWarning("Failed to register event listener: %Rhrc", hrc1);
                     }
                 }
@@ -900 +902 @@
 #ifdef VBOX_WITH_VBOXMANAGE_NLS
         /* VirtualBox event callback unregistration. */
-        if (pEventListener.isNotNull())
+        if (ptrEventListner.isNotNull())
         {
             ComPtr<IEventSource> pES;
@@ -906 +908 @@
             if (pES.isNotNull())
             {
-                hrc1 = pES->UnregisterListener(pEventListener);
+                hrc1 = pES->UnregisterListener(ptrEventListner);
                 if (FAILED(hrc1))
                     LogRel(("Failed to unregister listener, %Rhrc", hrc1));
             }
-            pEventListener.setNull();
+            ptrEventListner.setNull();
         }
 #endif