Fix the parameter type of WebLocalizedString to match the UI_STRING macro

        Reviewed by Sam.

        * WebLocalizableStrings.cpp:
        (WebLocalizedString):
        (WebLocalizedLPCTSTR):
        * WebLocalizableStrings.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27356 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 99126b8d0f030ab0b99b9d71da95e580fa1e67d3..6342909a4dec1a35e6da4fc9968db1650e1d1777 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-01  Adam Roben  <aroben@apple.com>
+
+        Fix the parameter type of WebLocalizedString to match the UI_STRING macro
+
+        Reviewed by Sam.
+
+        * WebLocalizableStrings.cpp:
+        (WebLocalizedString):
+        (WebLocalizedLPCTSTR):
+        * WebLocalizableStrings.h:
+
 2007-11-01  Alexey Proskuryakov  <ap@webkit.org>
 
         Rubber-stamped by Adam Roben.

diff --git a/WebKit/win/WebLocalizableStrings.cpp b/WebKit/win/WebLocalizableStrings.cpp
index 7b9f725b1312b10bd1e62498535f9782db6308b7..625e78e99d8baa2646e5395b387cb7f89d346a84 100644 (file)
--- a/WebKit/win/WebLocalizableStrings.cpp
+++ b/WebKit/win/WebLocalizableStrings.cpp
@@ -94,7 +94,7 @@ void SetWebLocalizedStringMainBundle(CFBundleRef bundle)
     localizedStringsMainBundle = bundle;
 }
 
-CFStringRef WebLocalizedString(WebLocalizableStringsBundle* stringsBundle, const UniChar* key)
+CFStringRef WebLocalizedString(WebLocalizableStringsBundle* stringsBundle, LPCTSTR key)
 {
     static CFStringRef notFound = CFSTR("localized string not found");
 
@@ -116,7 +116,7 @@ CFStringRef WebLocalizedString(WebLocalizableStringsBundle* stringsBundle, const
             stringsBundle->bundle = bundle;
         }
     }
-    CFStringRef keyString = CFStringCreateWithCharacters(0, key, (CFIndex)wcslen(reinterpret_cast<const wchar_t*>(key)));
+    CFStringRef keyString = CFStringCreateWithCharacters(0, reinterpret_cast<const UniChar*>(key), (CFIndex)wcslen(key));
     CFStringRef result = CFCopyLocalizedStringWithDefaultValue(keyString, 0, bundle, notFound, 0);
     CFRelease(keyString);
     ASSERT_WITH_MESSAGE(result != notFound, "could not find localizable string %s in bundle", key);
@@ -133,7 +133,7 @@ LPCTSTR WebLocalizedLPCTSTR(WebLocalizableStringsBundle* stringsBundle, LPCTSTR
     if (stringsBundle && stringsBundle->bundle == WebKitLocalizableStringsBundle.bundle && frameworkLocStrings.contains(keyString))
         return frameworkLocStrings.get(keyString).charactersWithNullTermination();
 
-    CFStringRef cfStr = WebLocalizedString(stringsBundle, reinterpret_cast<const UniChar*>(key));
+    CFStringRef cfStr = WebLocalizedString(stringsBundle, key);
     String str(cfStr);
     if (cfStr)
         CFRelease(cfStr);

diff --git a/WebKit/win/WebLocalizableStrings.h b/WebKit/win/WebLocalizableStrings.h
index 6a291c99ffe187ee0536959509e3f6cdf37d4b6d..06afc0332b6747cb1933ddc42681bd7da87ba69b 100644 (file)
--- a/WebKit/win/WebLocalizableStrings.h
+++ b/WebKit/win/WebLocalizableStrings.h
@@ -37,7 +37,7 @@ typedef struct {
 extern "C" {
 #endif
 
-CFStringRef WebLocalizedString(WebLocalizableStringsBundle *bundle, const UniChar *key);
+CFStringRef WebLocalizedString(WebLocalizableStringsBundle *bundle, LPCTSTR key);
 LPCTSTR WebLocalizedLPCTSTR(WebLocalizableStringsBundle *bundle, LPCTSTR key);
 void SetWebLocalizedStringMainBundle(CFBundleRef bundle);