commit c21c0645fba83100edf05855baf885ca3b0559ce
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 21 14:53:59 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 21 14:53:59 2013 +0000
tree 998ed5acb158934a8daf82176709529f54dbdd13
parent 7c5e428fc741127c2a1bea78237f8550ce0187fa

Update DirectWrite code so that it is loadable on XP.

This change delay loads GetUserDefaultLocaleName since it is available
in Vista+.

R=reed@google.com

Review URL: https://codereview.chromium.org/23380002

git-svn-id: http://skia.googlecode.com/svn/trunk/src@10847 2bbb7eff-a529-9590-31e7-b0007b416f81

ports/SkFontHost_win_dw.cpp

diff --git a/ports/SkFontHost_win_dw.cpp b/ports/SkFontHost_win_dw.cpp
index e1685e6..fe246db 100644
--- a/ports/SkFontHost_win_dw.cpp
+++ b/ports/SkFontHost_win_dw.cpp
@@ -97,12 +97,6 @@
     SkTDArray<uint8_t> fBits;
 };
 
-typedef HRESULT (WINAPI *DWriteCreateFactoryProc)(
-    __in DWRITE_FACTORY_TYPE factoryType,
-    __in REFIID iid,
-    __out IUnknown **factory
-);
-
 static HRESULT get_dwrite_factory(IDWriteFactory** factory) {
     static IDWriteFactory* gDWriteFactory = NULL;
 
@@ -111,6 +105,7 @@
         return S_OK;
     }
 
+    typedef decltype(DWriteCreateFactory)* DWriteCreateFactoryProc;
     DWriteCreateFactoryProc dWriteCreateFactoryProc =
         reinterpret_cast<DWriteCreateFactoryProc>(
             GetProcAddress(LoadLibraryW(L"dwrite.dll"), "DWriteCreateFactory")
@@ -1847,6 +1842,13 @@
 
 #endif
 
+typedef decltype(GetUserDefaultLocaleName)* GetUserDefaultLocaleNameProc;
+static GetUserDefaultLocaleNameProc GetGetUserDefaultLocaleNameProc() {
+    return reinterpret_cast<GetUserDefaultLocaleNameProc>(
+        GetProcAddress(LoadLibraryW(L"Kernel32.dll"), "GetUserDefaultLocaleName")
+    );
+}
+
 SkFontMgr* SkFontMgr::Factory() {
     IDWriteFactory* factory;
     HRNM(get_dwrite_factory(&factory), "Could not get factory.");
@@ -1857,10 +1859,18 @@
 
     WCHAR localeNameStorage[LOCALE_NAME_MAX_LENGTH];
     WCHAR* localeName = NULL;
-    int localeNameLen = GetUserDefaultLocaleName(localeNameStorage, LOCALE_NAME_MAX_LENGTH);
-    if (localeNameLen) {
-        localeName = localeNameStorage;
-    };
+    int localeNameLen = 0;
+
+    // Dynamically load GetUserDefaultLocaleName function, as it is not available on XP.
+    GetUserDefaultLocaleNameProc getUserDefaultLocaleNameProc = GetGetUserDefaultLocaleNameProc();
+    if (NULL == getUserDefaultLocaleNameProc) {
+        SkDebugf("Could not get GetUserDefaultLocaleName.");
+    } else {
+        localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_NAME_MAX_LENGTH);
+        if (localeNameLen) {
+            localeName = localeNameStorage;
+        };
+    }
 
     return SkNEW_ARGS(SkFontMgr_DirectWrite, (sysFontCollection.get(), localeName, localeNameLen));
 }