From f341b9f4394ec212ab3c32ae2dadfebace2be68b Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 21 Aug 2009 02:01:13 +0000 Subject: [PATCH] Revert the rev 34 change to webkit_glue::GetLocalizedString() which broke resource loading. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@36 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_webkit_glue_win.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libcef/browser_webkit_glue_win.cc b/libcef/browser_webkit_glue_win.cc index d8f80dbf3..dad6cd4de 100644 --- a/libcef/browser_webkit_glue_win.cc +++ b/libcef/browser_webkit_glue_win.cc @@ -33,17 +33,17 @@ using WebKit::WebSize; namespace webkit_glue { -#define MAX_LOADSTRING 100 - string16 GetLocalizedString(int message_id) { - wchar_t localized[MAX_LOADSTRING]; - int length = LoadString(GetModuleHandle(NULL), message_id, - localized, MAX_LOADSTRING); - if (!length && GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND) { + // Localized resources are provided via webkit_resources.rc and + // webkit_strings_en-US.rc. + const ATLSTRINGRESOURCEIMAGE* image = + AtlGetStringResourceImage(_AtlBaseModule.GetModuleInstance(), + message_id); + if (!image) { NOTREACHED(); return L"No string for this identifier!"; } - return string16(localized, length); + return string16(image->achString, image->nLength); } HCURSOR LoadCursor(int cursor_id) {