commit b5ec066d991013f2825c0ce246c8f98f36ca3618
author Jacek Caban <jack@itma.pwr.wroc.pl> Mon Aug 29 10:15:17 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 29 10:15:17 2005 +0000
tree af305339dcf8e7e3763f5bcb60122cd4ea36f32c
parent 87b297ebc2a1deaffd3a5b9230f3dde4d27d4cc0

Move strings to resources.

dlls/mshtml/En.rc

diff --git a/dlls/mshtml/En.rc b/dlls/mshtml/En.rc
index ae20664..f800ca8 100644
--- a/dlls/mshtml/En.rc
+++ b/dlls/mshtml/En.rc
@@ -19,6 +19,12 @@
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
+STRINGTABLE DISCARDABLE
+{
+    IDS_HTMLDISABLED    "HTML rendering is currently disabled."
+    IDS_HTMLDOCUMENT    "HTML Document"
+}
+
 /* FIXME: This should be in shdoclc.dll */
 
 IDR_BROWSE_CONTEXT_MENU MENU

dlls/mshtml/resource.h

diff --git a/dlls/mshtml/resource.h b/dlls/mshtml/resource.h
index e2d34a6..1f02fee 100644
--- a/dlls/mshtml/resource.h
+++ b/dlls/mshtml/resource.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define IDS_HTMLDISABLED    7500
+#define IDS_HTMLDOCUMENT    7501
+
 #define IDR_BROWSE_CONTEXT_MENU  24641
 
 #define IDM_COPY        15

dlls/mshtml/view.c

diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c
index 161d2a0..dda2f4b 100644
--- a/dlls/mshtml/view.c
+++ b/dlls/mshtml/view.c
@@ -28,6 +28,7 @@
 #include "winuser.h"
 #include "wingdi.h"
 #include "ole2.h"
+#include "resource.h"
 
 #include "wine/debug.h"
 
@@ -37,8 +38,6 @@
 
 static const WCHAR wszInternetExplorer_Server[] =
     {'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','_','S','e','r','v','e','r',0};
-static const WCHAR wszHTML_Document[] =
-    {'H','T','M','L',' ','D','o','c','u','m','e','n','t',0};
 
 static ATOM serverwnd_class = 0;
 
@@ -48,6 +47,9 @@
     HBRUSH brush;
     RECT rect;
     HFONT font;
+    WCHAR wszHTMLDisabled[100];
+
+    LoadStringW(hInst, IDS_HTMLDISABLED, wszHTMLDisabled, sizeof(wszHTMLDisabled)/sizeof(WCHAR));
 
     font = CreateFontA(25,0,0,0,400,0,0,0,ANSI_CHARSET,0,0,DEFAULT_QUALITY,DEFAULT_PITCH,NULL);
     brush = CreateSolidBrush(RGB(255,255,255));
@@ -57,8 +59,7 @@
     SelectObject(hdc, font);
     SelectObject(hdc, brush);
     Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom);
-    DrawTextA(hdc, "HTML rendering is currently disabled.",-1, &rect,
-            DT_CENTER | DT_SINGLELINE | DT_VCENTER);
+    DrawTextW(hdc, wszHTMLDisabled,-1, &rect, DT_CENTER | DT_SINGLELINE | DT_VCENTER);
     EndPaint(hwnd, &ps);
 
     DeleteObject(font);
@@ -375,7 +376,10 @@
 
         hres = IOleInPlaceSite_OnUIActivate(This->ipsite);
         if(SUCCEEDED(hres)) {
-            IOleInPlaceFrame_SetActiveObject(This->frame, ACTOBJ(This), wszHTML_Document);
+            OLECHAR wszHTMLDocument[30];
+            LoadStringW(hInst, IDS_HTMLDOCUMENT, wszHTMLDocument,
+                    sizeof(wszHTMLDocument)/sizeof(WCHAR));
+            IOleInPlaceFrame_SetActiveObject(This->frame, ACTOBJ(This), wszHTMLDocument);
         }else {
             FIXME("OnUIActivate failed: %08lx\n", hres);
             IOleInPlaceFrame_Release(This->frame);