From 70ff34438f5103c492b5c69b5e98dc0c194c9bd7 Mon Sep 17 00:00:00 2001 From: Sean Kaim Date: Wed, 8 Jun 2016 10:00:23 -0400 Subject: [PATCH] Update component check for GeckoFx --- .../Http/Connection.Protocol.HTTPBase.cs | 4 +- .../Resources/Language/Language.Designer.cs | 2 +- mRemoteV1/Resources/Language/Language.de.resx | 2 +- mRemoteV1/Resources/Language/Language.el.resx | 2 +- mRemoteV1/Resources/Language/Language.es.resx | 2 +- mRemoteV1/Resources/Language/Language.fr.resx | 2 +- mRemoteV1/Resources/Language/Language.it.resx | 2 +- .../Resources/Language/Language.ja-JP.resx | 2 +- .../Resources/Language/Language.nb-NO.resx | 2 +- mRemoteV1/Resources/Language/Language.nl.resx | 2 +- mRemoteV1/Resources/Language/Language.pl.resx | 2 +- .../Resources/Language/Language.pt-BR.resx | 2 +- mRemoteV1/Resources/Language/Language.pt.resx | 2 +- mRemoteV1/Resources/Language/Language.resx | 2 +- mRemoteV1/Resources/Language/Language.ru.resx | 2 +- mRemoteV1/Resources/Language/Language.uk.resx | 2 +- .../Resources/Language/Language.zh-CN.resx | 2 +- .../Resources/Language/Language.zh-TW.resx | 2 +- mRemoteV1/UI/Window/ComponentsCheckWindow.cs | 44 ++++++++++--------- mRemoteV1/mRemoteV1.csproj | 12 +++-- 20 files changed, 52 insertions(+), 42 deletions(-) diff --git a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs index 2c078429..6a1de38a 100644 --- a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs +++ b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs @@ -25,7 +25,9 @@ namespace mRemoteNG.Connection.Protocol.Http { if (RenderingEngine == RenderingEngine.Gecko) { - Xpcom.Initialize("Firefox"); + if(!Xpcom.IsInitialized) + Xpcom.Initialize("Firefox"); + Control = new GeckoWebBrowser(); } else diff --git a/mRemoteV1/Resources/Language/Language.Designer.cs b/mRemoteV1/Resources/Language/Language.Designer.cs index 681a329b..7777a8c4 100644 --- a/mRemoteV1/Resources/Language/Language.Designer.cs +++ b/mRemoteV1/Resources/Language/Language.Designer.cs @@ -608,7 +608,7 @@ namespace mRemoteNG { } /// - /// Looks up a localized string similar to XULrunner was found and seems to be installed properly.. + /// Looks up a localized string similar to GeckoFx was found and seems to be installed properly.. /// internal static string strCcGeckoOK { get { diff --git a/mRemoteV1/Resources/Language/Language.de.resx b/mRemoteV1/Resources/Language/Language.de.resx index cd12fbca..628e37dc 100644 --- a/mRemoteV1/Resources/Language/Language.de.resx +++ b/mRemoteV1/Resources/Language/Language.de.resx @@ -299,7 +299,7 @@ Wenn der Download abgeschlossen ist, entpacken Sie das Paket (Der Speicherort is Wenn Sie noch immer Probleme mit der Gecko Engine in mRemote haben, konsultieren Sie bitte das mRemoteNG-Forum: http://forum.mremoteng.org/ - XULrunner wurde gefunden und scheint korrekt installiert zu sein. + GeckoFx wurde gefunden und scheint korrekt installiert zu sein. ICA benötigt eine funktionierende XenDesktop-Online-Plugin-Installation und dass die Datei wfica.ocx korrekt registriert ist. Hier können Sie das Plugin herunterladen: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.el.resx b/mRemoteV1/Resources/Language/Language.el.resx index b8496b2d..b1f9b8c4 100644 --- a/mRemoteV1/Resources/Language/Language.el.resx +++ b/mRemoteV1/Resources/Language/Language.el.resx @@ -290,7 +290,7 @@ Για να χρησιμοποιήσετε το μηχανισμό απόδοσης Gecko πρέπει να έχετε XULrunner 1.8.1.x και ο δρόμος για την εγκατάσταση ορίστε στις επιλογές σας. Μπορείτε να κατεβάσετε XULrunner 1.8.1.3 εδώ: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ όταν ολοκληρώσετε τη λήψη κάντε εξαγωγή του πακέτου για την πορεία της επιλογής σας. Στη συνέχεια, στο mRemoteNG πηγαίνετε στο εργαλεία - επιλογές - προηγμένες και πληκτρολογήσει τη σωστή διαδρομή στο πεδίο διαδρομή XULrunner. Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή χρησιμοποιούν την μηχανή Gecko στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/ - Το XULrunner βρέθηκε και φαίνεται να έχει εγκατασταθεί σωστά. + Το GeckoFx βρέθηκε και φαίνεται να έχει εγκατασταθεί σωστά. ICA απαιτεί ότι είναι εγκατεστημένο το XenDesktop Online Plugin και ότι καταχωρείται η βιβλιοθήκη wfica.ocx. Μπορείτε να κατεβάσετε τον πελάτη εδώ: http://www.citrix.com/download/ αν έχετε το XenDesktop Online Plugin εγκατασταθεί και ο έλεγχος συνεχίσει να αποτυγχάνει, προσπαθήστε να εγγραφείτε wfica.ocx με μη αυτόματο τρόπο. Να κάνει αυτό ανοίγω πάνω στο τρέχω διάλογος (έναρξη - Run) και πληκτρολογήστε τα παρακάτω: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (όπου c:\Program Files\Citrix\ICA Client\ είναι η διαδρομή στην εγκατάσταση XenDesktop Online Plugin). Εάν είστε ακόμα δεν είναι σε θέση να περάσει ο έλεγχος αυτός ή να χρησιμοποιήσετε ICA στο mRemoteNG συμβουλευτείτε το mRemoteNG φόρουμ στο http://forum.mremoteng.org/" diff --git a/mRemoteV1/Resources/Language/Language.es.resx b/mRemoteV1/Resources/Language/Language.es.resx index f24ff293..36a2f5b6 100644 --- a/mRemoteV1/Resources/Language/Language.es.resx +++ b/mRemoteV1/Resources/Language/Language.es.resx @@ -299,7 +299,7 @@ Cuando haya concluido la descarga, extraiga el paquete en un directorio de su el Si continúa sin funcionar la comprobación ó no puede utilizar el motor Gecko en mRemoteNG, consulte el Foro de mRemoteNG en http://forum.mremoteng.org/ - XULrunner ha sido localizado y parece estar instalado correctamente. + GeckoFx ha sido localizado y parece estar instalado correctamente. ICA necesita que esté instalado XenDesktop Online Plugin y que la librería wfica.ocx esté registrada. Puede descargar el cliente aquí: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.fr.resx b/mRemoteV1/Resources/Language/Language.fr.resx index 93d03f60..73fb7d62 100644 --- a/mRemoteV1/Resources/Language/Language.fr.resx +++ b/mRemoteV1/Resources/Language/Language.fr.resx @@ -293,7 +293,7 @@ Veuillez utiliser le menu Fichier - Ouvrir un fichier de connexion pour les fich Pour utiliser le moteur de rendu Gecko, vous devez avoir XULrunner 1.8.1.x et le chemin d'accès correctement renseigné dans vos Options. Vous pouvez télécharger XULrunner 1.8.1.3 ici : ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ Lorsque vous avez terminé le téléchargement, extraire le package vers le chemin de votre choix. Puis dans mRemoteNG, allez dans Outils - Options - Avancées et entrez le chemin d'accès correct dans "chemin de XULrunner". Si vous n'êtes toujours pas en mesure de passer cette vérification ou d'utiliser le moteur Gecko dans mRemoteNG, veuillez consulter le Forum de mRemoteNG sur http://forum.mremoteng.org/ - XULRunner a été trouvé et semble être installé correctement. + GeckoFx a été trouvé et semble être installé correctement. ICA requiert l'installation du Plugin XenDesktop Online, ainsi que l'enregistrement de la librairie wfica.ocx. Vous pouvez télécharger le client ici : http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.it.resx b/mRemoteV1/Resources/Language/Language.it.resx index d1dfa802..b8fda473 100644 --- a/mRemoteV1/Resources/Language/Language.it.resx +++ b/mRemoteV1/Resources/Language/Language.it.resx @@ -297,7 +297,7 @@ Quando il download è terminato, è sufficiente estrarre il pacchetto in una car Se il controllo fallisce o risulta impossibile utilizzare il motore di rendering Gecko con mRemoteNG, per favore consultare il forum di mRemoteNG all'indirizzo http://forum.mremoteng.org/ - XULrunner è stato rilevato e sembra installato correttamente. + GeckoFx è stato rilevato e sembra installato correttamente. ICA richiede che il plugin XenDesktop Online sia installato e che la libreria wfica.ocx sia registrata. Il client è scaricabile all'indirizzo http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.ja-JP.resx b/mRemoteV1/Resources/Language/Language.ja-JP.resx index ed054ea7..b99be7ee 100644 --- a/mRemoteV1/Resources/Language/Language.ja-JP.resx +++ b/mRemoteV1/Resources/Language/Language.ja-JP.resx @@ -306,7 +306,7 @@ When you are finished downloading extract the package to a path of your choice. If you are still not able to pass this check or use the Gecko Engine in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/ - XULrunner was found and seems to be installed properly. + GeckoFx was found and seems to be installed properly. ICA requires that the XenDesktop Online Plugin is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.nb-NO.resx b/mRemoteV1/Resources/Language/Language.nb-NO.resx index 746d165c..67fb482a 100644 --- a/mRemoteV1/Resources/Language/Language.nb-NO.resx +++ b/mRemoteV1/Resources/Language/Language.nb-NO.resx @@ -299,7 +299,7 @@ Når nedlastingen er ferdig, pakk den ut til et passende sted. I mRemoteNG, gå Hvis du fremdeles ikke passerer denne kontrollen eller brukre Gecko-renderingsmotoren i mRemoteNG, vennligst konsulter mRemoteNG-forumet på http://forum.mremoteng.org/ - XULrunner ble funnet å ser ut til å være korrekt installert. + GeckoFx ble funnet å ser ut til å være korrekt installert. ICA krever at XenDesktop Online Plugin er installert og at wfica.ocx-biblioteket er registrert. Du kan laste ned klienten herfra: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.nl.resx b/mRemoteV1/Resources/Language/Language.nl.resx index 486df665..6699f822 100644 --- a/mRemoteV1/Resources/Language/Language.nl.resx +++ b/mRemoteV1/Resources/Language/Language.nl.resx @@ -299,7 +299,7 @@ Wanneer de download van het pakket is voltooid kunt u deze uitpakken naar een wi Als u nog steeds niet in staat bent om de langs check te komen gebruik dan de Gecko Engine in mRemoteNG of raadpleeg mRemoteNG Forum op http://forum.mremoteng.org/ - XULrunner werd gevonden en lijkt correct te zijn geïnstalleerd. + GeckoFx werd gevonden en lijkt correct te zijn geïnstalleerd. ICA vereist dat de XenDesktop Online Plugin is geïnstalleerd is en dat de wfica.ocx bibliotheek is geregistreerd. U kunt de cliënt van deze locatie downloaden: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.pl.resx b/mRemoteV1/Resources/Language/Language.pl.resx index 3de582ad..bfeb5a38 100644 --- a/mRemoteV1/Resources/Language/Language.pl.resx +++ b/mRemoteV1/Resources/Language/Language.pl.resx @@ -295,7 +295,7 @@ Jeśli nadal nie można sprawdzić lub użyć fukcji Sesji (RDP) skonsultuj to n Aby użyć Gecko Rendering Engine, musisz mieć XULrunner 1.8.1.x oraz podać ścieżkę instalacji w opcjach. XULrunner 1.8.1.3 możesz pobrać ze ftp: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ Po zakończeniu pobierania wypakuj pakiet do właściwego katalogu. Następnie w mRemoteNG przejdź do menu Narzędzia - Opcje - Zaawansowane i wprowadź poprawną ścieżkę w polu Ścieżka XULrunner. Jeśli to nadal nie pomogło prosimy o kontakt na mRemoteNG Forum na stronie http://forum.mremoteng.org/ - XULrunner został znaleziony i wydaje się być zainstalowany prawidłowo. + GeckoFx został znaleziony i wydaje się być zainstalowany prawidłowo. ICA wymaga zainstalowania wtyczki Online XenDesktop, i aby była zarejestrowana biblioteka wfica.ocx. Możesz pobrać klienta tutaj: http://www.citrix.com/download/ Jeżeli masz zainstalowany Plugin Online XenDesktop a nadal nie działa, spróbuj ręcznie zarejestrować bibliotekę wfica.ocx. Aby to zrobić wybierz polecenie Uruchom (Start - Uruchom) i wprowadź w linii komend: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (gdzie c:\Program Files\Citrix\ICA Client\ jest ścieżką instalacji XenDesktop Online Plugin). Jeśli nadal nie można użyć ICA w mRemoteNG prosimy o kontakt mRemoteNG Forum na http://forum.mremoteng.org/ diff --git a/mRemoteV1/Resources/Language/Language.pt-BR.resx b/mRemoteV1/Resources/Language/Language.pt-BR.resx index dbb75877..e2748bb4 100644 --- a/mRemoteV1/Resources/Language/Language.pt-BR.resx +++ b/mRemoteV1/Resources/Language/Language.pt-BR.resx @@ -296,7 +296,7 @@ Em seguida, emtre no mRemoteNG e vá em ferramentas - opções - avançadas e di Se ainda não conseguir passar esta verificação ou usar o motor Gecko em mRemoteNG por favor consultar o fórum de mRemoteNG em http://forum.mremoteng.org/ - XULrunner foi encontrado e aparenta estar instalado corretamente. + GeckoFx foi encontrado e aparenta estar instalado corretamente. ICA requer que o XenDesktop Online Plugin esteja instalado e a biblioteca wfica.ocs registrada. Você pode baixar o cliente aqui: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.pt.resx b/mRemoteV1/Resources/Language/Language.pt.resx index 269d8bca..273199a3 100644 --- a/mRemoteV1/Resources/Language/Language.pt.resx +++ b/mRemoteV1/Resources/Language/Language.pt.resx @@ -292,7 +292,7 @@ Para usar o motor de renderização Gecko, você precisará ter o XULrunner 1.8.1.x e o caminho configurado nas opções. Você pode baixar o XULrunner 1.8.1.3 em: ftp://ftp.mozilla.org/pub/xulrunner/releases/1.8.1.3/contrib/win32/ quando terminar de descarregar, extraia o pacote para um caminho de sua escolha. Em seguida, em mRemoteNG vá em ferramentas - opções - avançadas e digite o caminho correto no campo caminho XULrunner. Se você ainda não pode executar esta seleção ou usar o motor Gecko em mRemoteNG, por favor, consulte o fórum de mRemoteNG em http://forum.mremoteng.org/ - XULrunner foi encontrado e aparenta estar instalado corretamente. + GeckoFx foi encontrado e aparenta estar instalado corretamente. ICA requer que o XenDesktop Online Plugin esteja instalado e a biblioteca wfica registrada. Você pode baixar o cliente aqui: http://www.citrix.com/download/ se você tiver o Plugin Online XenDesktop instalado e a verificação ainda falhar, tente registrar manualmente o wfica. Para fazer isso abra a caixa de diálogo Executar (Iniciar - Executar) e digite o seguinte: regsvr32 "c:\Program Files\Citrix\ICA Client\wfica.ocx" (onde c:\Program Files\Citrix\ICA Client\ é o caminho para a instalação do Plugin Online do XenDesktop). Se você ainda não pode passar essa verificação ou usar ICA em mRemoteNG, por favor, consulte o fórum de mRemoteNG no http://forum.mremoteng.org/" diff --git a/mRemoteV1/Resources/Language/Language.resx b/mRemoteV1/Resources/Language/Language.resx index bb6c8a01..4c3d91a8 100644 --- a/mRemoteV1/Resources/Language/Language.resx +++ b/mRemoteV1/Resources/Language/Language.resx @@ -305,7 +305,7 @@ When you are finished downloading extract the package to a path of your choice. If you are still not able to pass this check or use the Gecko Engine in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/ - XULrunner was found and seems to be installed properly. + GeckoFx was found and seems to be installed properly. ICA requires that the XenDesktop Online Plugin is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.ru.resx b/mRemoteV1/Resources/Language/Language.ru.resx index dfc1bbbf..6bc1963a 100644 --- a/mRemoteV1/Resources/Language/Language.ru.resx +++ b/mRemoteV1/Resources/Language/Language.ru.resx @@ -299,7 +299,7 @@ Если у вас ничего не получилось обратитесь на форум mRemoteNG http://forum.mremoteng.org/ - XULRunner был найден и установлен правильно. + GeckoFx был найден и установлен правильно. ICA требуется установленный XenDesktop Online Plugin и зарегистрированная библиотека wfica.ocx. Вы можете скачать клиент здесь: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.uk.resx b/mRemoteV1/Resources/Language/Language.uk.resx index 8d32a793..53b4cce1 100644 --- a/mRemoteV1/Resources/Language/Language.uk.resx +++ b/mRemoteV1/Resources/Language/Language.uk.resx @@ -296,7 +296,7 @@ mRemoteNG завантажиться з цим компонентом, але н Якщо у вас нічого не вийшло зверніться на форум mRemoteNG http://forum.mremoteng.org/ - XULRunner було знайдено і встановлено правильно. + GeckoFx було знайдено і встановлено правильно. ICA потрібний встановлений XenDesktop Online Plugin і зареєстрована бібліотека wfica.ocx. Ви можете завантажити клієнт тут: http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.zh-CN.resx b/mRemoteV1/Resources/Language/Language.zh-CN.resx index ed27b0b0..fe02fdd6 100644 --- a/mRemoteV1/Resources/Language/Language.zh-CN.resx +++ b/mRemoteV1/Resources/Language/Language.zh-CN.resx @@ -295,7 +295,7 @@ 如果执行此操作后，依然无法通过Gecko渲染引擎的检测，请在mRemoteNG论坛中咨询，地址是：http://forum.mremoteng.org/ - 发现XULrunner组件。 + 发现GeckoFx组件。 启用ICA需要提前安装 XenDesktop Online 插件，并正确注册wfica.ocx库文件。您可以在此下载此插件：http://www.citrix.com/download/ diff --git a/mRemoteV1/Resources/Language/Language.zh-TW.resx b/mRemoteV1/Resources/Language/Language.zh-TW.resx index adb3f60c..d17a2dbe 100644 --- a/mRemoteV1/Resources/Language/Language.zh-TW.resx +++ b/mRemoteV1/Resources/Language/Language.zh-TW.resx @@ -287,7 +287,7 @@ 找到 EOLWTSCOM 並似乎正確註冊。 - 找到 XULrunner 並似乎正確註冊。 + 找到 GeckoFx 並似乎正確註冊。 找到所有 ICA 元件並似乎正確註冊。 diff --git a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs index 7e30c750..73352a53 100644 --- a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs +++ b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs @@ -4,6 +4,7 @@ using WeifenLuo.WinFormsUI.Docking; using System.IO; using mRemoteNG.App; using System.Threading; +using Gecko; using mRemoteNG.App.Info; using mRemoteNG.Connection.Protocol.RDP; @@ -578,30 +579,31 @@ namespace mRemoteNG.UI.Window bool GeckoBad = false; - - if (Settings.Default.XULRunnerPath == "") - { - GeckoBad = true; - } - - if (Directory.Exists(Convert.ToString(Settings.Default.XULRunnerPath))) - { - if (File.Exists(Path.Combine(Convert.ToString(Settings.Default.XULRunnerPath), "xpcom.dll")) == false) - { - GeckoBad = true; - } - } - else - { - GeckoBad = true; - } - - if (GeckoBad == false) + var GeckoFxPath = Path.Combine(GeneralAppInfo.HomePath, "Firefox"); + + if(File.Exists(Path.Combine(GeneralAppInfo.HomePath, "Geckofx-Core.dll"))) + { + if (Directory.Exists(GeckoFxPath)) + { + if (!File.Exists(Path.Combine(GeckoFxPath, "xul.dll"))) + { + GeckoBad = true; + } + } + else + { + GeckoBad = true; + } + } + + if (GeckoBad == false) { pbCheck5.Image = Resources.Good_Symbol; lblCheck5.ForeColor = Color.DarkOliveGreen; lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " + Language.strCcCheckSucceeded; - txtCheck5.Text = Language.strCcGeckoOK; + if (!Xpcom.IsInitialized) + Xpcom.Initialize("Firefox"); + txtCheck5.Text = Language.strCcGeckoOK + " Version: " + Xpcom.XulRunnerVersion; } else { @@ -611,7 +613,7 @@ namespace mRemoteNG.UI.Window txtCheck5.Text = Language.strCcGeckoFailed; Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Gecko " + errorMsg, true); - Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "XULrunner was not found in " + Settings.Default.XULRunnerPath, true); + Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "GeckoFx was not found in " + GeckoFxPath, true); } } diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index b836cd49..65cab2e2 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -504,7 +504,9 @@ - + + Designer + IPTextBox.cs @@ -550,7 +552,9 @@ Designer - + + Designer + Designer @@ -568,7 +572,9 @@ Designer - + + Designer + Designer