From ef5b410045e6e09a30d8d901b36cbcff112ab7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Tue, 15 Mar 2005 21:30:32 +0000 Subject: [PATCH] Sync to Wine-20050310: Jonathan Ernst - Add French resources. Henning Gerhardt - Add/updated German resources. Marcelo Duarte - Update the resources for Portuguese. - Use "MS Shell Dlg" everywhere except for Japanese. Juan Lang - Fix a crash if the Mozilla ActiveX control doesn't implement DllCanUnloadNow. svn path=/trunk/; revision=14102 --- reactos/lib/shdocvw/De.rc | 36 ++++++++++++++++++++++++++++++ reactos/lib/shdocvw/En.rc | 36 ++++++++++++++++++++++++++++++ reactos/lib/shdocvw/Fr.rc | 36 ++++++++++++++++++++++++++++++ reactos/lib/shdocvw/Pt.rc | 36 ++++++++++++++++++++++++++++++ reactos/lib/shdocvw/shdocvw.rc | 22 ++++-------------- reactos/lib/shdocvw/shdocvw_main.c | 7 +++--- 6 files changed, 151 insertions(+), 22 deletions(-) create mode 100644 reactos/lib/shdocvw/De.rc create mode 100644 reactos/lib/shdocvw/En.rc create mode 100644 reactos/lib/shdocvw/Fr.rc create mode 100644 reactos/lib/shdocvw/Pt.rc diff --git a/reactos/lib/shdocvw/De.rc b/reactos/lib/shdocvw/De.rc new file mode 100644 index 00000000000..564d9986073 --- /dev/null +++ b/reactos/lib/shdocvw/De.rc @@ -0,0 +1,36 @@ +/* + * Copyright 2005 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Lade die Mozilla Active X Steuerung" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Abbrechen", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "Diese Anwendung fordert ein ActiveX Browser Objekt an,\n" \ + "aber die Mozilla Active X Steuerung ist nicht installiert." \ + "Möchten Sie, dass es aus dem Internet geladen und installiert wird ?" +END diff --git a/reactos/lib/shdocvw/En.rc b/reactos/lib/shdocvw/En.rc new file mode 100644 index 00000000000..c6d5150ea12 --- /dev/null +++ b/reactos/lib/shdocvw/En.rc @@ -0,0 +1,36 @@ +/* + * Copyright 2004 Mike McCormack for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Downloading the Mozilla Active X control" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Cancel", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "This application is requesting an ActiveX browser object\n" \ + "but the Mozilla Active X control is currently not installed." \ + "Do you wish to download and install it?" +END diff --git a/reactos/lib/shdocvw/Fr.rc b/reactos/lib/shdocvw/Fr.rc new file mode 100644 index 00000000000..cab59b45f47 --- /dev/null +++ b/reactos/lib/shdocvw/Fr.rc @@ -0,0 +1,36 @@ +/* + * Copyright 2004 Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Téléchargement du contrôle ActiveX de Mozilla" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Annuler", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "Cette application requiert un object navigateur ActiveX\n" \ + "mais le contrôle Active X de Mozilla n'est pas installé." \ + "Souhaitez-vous le télécharger et l'installer ?" +END diff --git a/reactos/lib/shdocvw/Pt.rc b/reactos/lib/shdocvw/Pt.rc new file mode 100644 index 00000000000..a0f3796962e --- /dev/null +++ b/reactos/lib/shdocvw/Pt.rc @@ -0,0 +1,36 @@ +/* + * Copyright 2005 Marcelo Duarte + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT + +100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Baixando o controle Mozilla ActiveX" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", 104, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "Cancelar", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +BEGIN + 1001 "Esta aplicação requer um objecto ActiveX do navegador\n" \ + "mas o controle Mozilla ActiveX atualmente não está instalado." \ + "Você deseja baixá-lo e instalá-lo?" +END diff --git a/reactos/lib/shdocvw/shdocvw.rc b/reactos/lib/shdocvw/shdocvw.rc index 6909c380c22..77a8d2d569b 100644 --- a/reactos/lib/shdocvw/shdocvw.rc +++ b/reactos/lib/shdocvw/shdocvw.rc @@ -23,21 +23,7 @@ #include "version.rc" -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT - -100 DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 62 -STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Downloading the Mozilla Active X control" -FONT 8, "Helv" -{ - CONTROL "Progress1",1000,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 - LTEXT "", 104, 10, 30, 200, 10, SS_CENTER - PUSHBUTTON "Cancel", IDCANCEL, 85, 44, 50, 15, WS_GROUP | WS_TABSTOP -} - -STRINGTABLE -BEGIN - 1001 "This application is requesting an ActiveX browser object\n" \ - "but the Mozilla Active X control is currently not installed." \ - "Do you wish to download and install it?" -END +#include "De.rc" +#include "En.rc" +#include "Fr.rc" +#include "Pt.rc" diff --git a/reactos/lib/shdocvw/shdocvw_main.c b/reactos/lib/shdocvw/shdocvw_main.c index b5e16701615..6d4cc4ac894 100644 --- a/reactos/lib/shdocvw/shdocvw_main.c +++ b/reactos/lib/shdocvw/shdocvw_main.c @@ -130,17 +130,16 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) */ HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void) { - HRESULT moz_can_unload = S_FALSE; + HRESULT moz_can_unload = S_OK; fnCanUnloadNow pCanUnloadNow; if (hMozCtl) { pCanUnloadNow = (fnCanUnloadNow) GetProcAddress(hMozCtl, "DllCanUnloadNow"); - moz_can_unload = pCanUnloadNow(); + if (pCanUnloadNow) + moz_can_unload = pCanUnloadNow(); } - else - moz_can_unload = S_OK; if (moz_can_unload == S_OK && SHDOCVW_refCount == 0) return S_OK;