Changeset 91314 in vbox

Timestamp:

Sep 20, 2021 12:29:18 PM (3 years ago)

Author:

vboxsync

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

146975

Message:

Main: bugref:1909: Fixed compilation issues.

Location:

trunk/src/VBox/Main

Files:

• src-client/VirtualBoxClientImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp

@@ -198 +198 @@
 
         char szNlsPath[RTPATH_MAX];
-        rc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
-        if (RT_SUCCESS(rc))
-            rc = RTPathAppend(szNlsPath, sizeof(szNlsPath), "nls" RTPATH_SLASH_STR "VirtualBoxAPI");
-
-        vrc = mData.m_pVBoxTranslator->registerTranslation(szNlsPath, true, &mData.m_pTrComponent);
+        vrc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
         if (RT_SUCCESS(vrc))
-        {
-            rc = i_reloadApiLanguage();
-            if (SUCCEEDED(rc))
-                i_registerEventListener(); /* for updates */
+            vrc = RTPathAppend(szNlsPath, sizeof(szNlsPath), "nls" RTPATH_SLASH_STR "VirtualBoxAPI");
+
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = mData.m_pVBoxTranslator->registerTranslation(szNlsPath, true, &mData.m_pTrComponent);
+            if (RT_SUCCESS(vrc))
+            {
+                rc = i_reloadApiLanguage();
+                if (SUCCEEDED(rc))
+                    i_registerEventListener(); /* for updates */
+                else
+                    LogRelFunc(("i_reloadApiLanguage failed: %Rhrc\n", rc));
+            }
             else
-                LogRelFunc(("i_reloadApiLanguage failed: %Rhrc\n", rc));
+                LogRelFunc(("Register translation failed: %Rrc\n", vrc));
         }
         else
-            LogRelFunc(("Register translation failed: %Rrc\n", vrc));
+            LogRelFunc(("Path constructing failed: %Rrc\n", vrc));
 #endif
         /* Setting up the VBoxSVC watcher thread. If anything goes wrong here it

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -599 +599 @@
 
             char szNlsPath[RTPATH_MAX];
-            rc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
-            if (RT_SUCCESS(rc))
-                rc = RTPathAppend(szNlsPath, sizeof(szNlsPath), "nls" RTPATH_SLASH_STR "VirtualBoxAPI");
-
-            int vrc = m->pVBoxTranslator->registerTranslation(szNlsPath, true, &m->pTrComponent);
+            int vrc = RTPathAppPrivateNoArch(szNlsPath, sizeof(szNlsPath));
+            if (RT_SUCCESS(vrc))
+                vrc = RTPathAppend(szNlsPath, sizeof(szNlsPath), "nls" RTPATH_SLASH_STR "VirtualBoxAPI");
+
             if (RT_SUCCESS(vrc))
             {
-                com::Utf8Str strLocale;
-                HRESULT hrc = m->pSystemProperties->getLanguageId(strLocale);
-                if (SUCCEEDED(hrc))
+                vrc = m->pVBoxTranslator->registerTranslation(szNlsPath, true, &m->pTrComponent);
+                if (RT_SUCCESS(vrc))
                 {
-                    vrc = m->pVBoxTranslator->i_loadLanguage(strLocale.c_str());
-                    if (RT_FAILURE(vrc))
+                    com::Utf8Str strLocale;
+                    HRESULT hrc = m->pSystemProperties->getLanguageId(strLocale);
+                    if (SUCCEEDED(hrc))
                     {
-                        hrc = Global::vboxStatusCodeToCOM(vrc);
-                        LogRel(("Load language failed (%Rhrc).\n", hrc));
+                        vrc = m->pVBoxTranslator->i_loadLanguage(strLocale.c_str());
+                        if (RT_FAILURE(vrc))
+                        {
+                            hrc = Global::vboxStatusCodeToCOM(vrc);
+                            LogRel(("Load language failed (%Rhrc).\n", hrc));
+                        }
+                    }
+                    else
+                    {
+                        LogRel(("Getting language settings failed (%Rhrc).\n", hrc));
+                        m->pVBoxTranslator->release();
+                        m->pVBoxTranslator = NULL;
+                        m->pTrComponent = NULL;
                     }
                 }
                 else
                 {
-                    LogRel(("Getting language settings failed (%Rhrc).\n", hrc));
+                    HRESULT hrc = Global::vboxStatusCodeToCOM(vrc);
+                    LogRel(("Register translation failed (%Rhrc).\n", hrc));
                     m->pVBoxTranslator->release();
                     m->pVBoxTranslator = NULL;
@@ -628 +639 @@
             {
                 HRESULT hrc = Global::vboxStatusCodeToCOM(vrc);
-                LogRel(("Register translation failed (%Rhrc).\n", hrc));
+                LogRel(("Path constructing failed (%Rhrc).\n", hrc));
                 m->pVBoxTranslator->release();
                 m->pVBoxTranslator = NULL;