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.

Added: trunk/reactos/lib/shdocvw/De.rc
Added: trunk/reactos/lib/shdocvw/En.rc
Added: trunk/reactos/lib/shdocvw/Fr.rc
Added: trunk/reactos/lib/shdocvw/Pt.rc

Modified: trunk/reactos/lib/shdocvw/shdocvw.rc
Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c

Property changes on: trunk/reactos/lib/shdocvw/De.rc
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

--- trunk/reactos/lib/shdocvw/shdocvw.rc	2005-03-15 19:40:22 UTC (rev 14101)
+++ trunk/reactos/lib/shdocvw/shdocvw.rc	2005-03-15 21:30:32 UTC (rev 14102)
@@ -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"

--- trunk/reactos/lib/shdocvw/shdocvw_main.c	2005-03-15 19:40:22 UTC (rev 14101)
+++ trunk/reactos/lib/shdocvw/shdocvw_main.c	2005-03-15 21:30:32 UTC (rev 14102)
@@ -130,17 +130,16 @@

  */
 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;