mirror of
https://github.com/reactos/reactos.git
synced 2025-07-26 11:13:56 +00:00
Sync to Wine-20050310:
Jonathan Ernst <Jonathan@ErnstFamily.ch> - Add French resources. Henning Gerhardt <henning.gerhardt@web.de> - Add/updated German resources. Marcelo Duarte <wine-devel@bol.com.br> - Update the resources for Portuguese. - Use "MS Shell Dlg" everywhere except for Japanese. Juan Lang <juan_lang@yahoo.com> - Fix a crash if the Mozilla ActiveX control doesn't implement DllCanUnloadNow. svn path=/trunk/; revision=14102
This commit is contained in:
Gé van Geldorp
parent
cb05e516a2
commit
ef5b410045
6 changed files with 151 additions and 22 deletions
36
reactos/lib/shdocvw/De.rc
Normal file
36
reactos/lib/shdocvw/De.rc
Normal file
|
|
@ -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
|
||||
36
reactos/lib/shdocvw/En.rc
Normal file
36
reactos/lib/shdocvw/En.rc
Normal file
|
|
@ -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
|
||||
36
reactos/lib/shdocvw/Fr.rc
Normal file
36
reactos/lib/shdocvw/Fr.rc
Normal file
|
|
@ -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
|
||||
36
reactos/lib/shdocvw/Pt.rc
Normal file
36
reactos/lib/shdocvw/Pt.rc
Normal file
|
|
@ -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
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue