AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better error reporting when dynamic loading fails with DirectWrite.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@10869 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2013-08-21 22:41:05 +00:00
parent 7344385b70
commit 42a7829543
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ports/SkFontHost_win_dw.cpp
View File

@ -174,9 +174,12 @@ static HRESULT get_dwrite_factory(IDWriteFactory** factory) {
GetProcAddress(LoadLibraryW(L"dwrite.dll"), "DWriteCreateFactory")
)
;
if (!dWriteCreateFactoryProc) {
return E_UNEXPECTED;
HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
if (!IS_ERROR(hr)) {
hr = ERROR_PROC_NOT_FOUND;
}
return hr;
}
HRM(dWriteCreateFactoryProc(DWRITE_FACTORY_TYPE_SHARED,
@ -1886,10 +1889,18 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {
#endif
typedef decltype(GetUserDefaultLocaleName)* GetUserDefaultLocaleNameProc;
static GetUserDefaultLocaleNameProc GetGetUserDefaultLocaleNameProc() {
return reinterpret_cast<GetUserDefaultLocaleNameProc>(
static HRESULT GetGetUserDefaultLocaleNameProc(GetUserDefaultLocaleNameProc* proc) {
*proc = reinterpret_cast<GetUserDefaultLocaleNameProc>(
GetProcAddress(LoadLibraryW(L"Kernel32.dll"), "GetUserDefaultLocaleName")
);
if (!*proc) {
HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
if (!IS_ERROR(hr)) {
hr = ERROR_PROC_NOT_FOUND;
}
return hr;
}
return S_OK;
}
extern SkFontMgr* SkFontMgr_New_DirectWrite();
@ -1906,9 +1917,10 @@ SkFontMgr* SkFontMgr_New_DirectWrite() {
int localeNameLen = 0;
// Dynamically load GetUserDefaultLocaleName function, as it is not available on XP.
GetUserDefaultLocaleNameProc getUserDefaultLocaleNameProc = GetGetUserDefaultLocaleNameProc();
GetUserDefaultLocaleNameProc getUserDefaultLocaleNameProc = NULL;
HRESULT hr = GetGetUserDefaultLocaleNameProc(&getUserDefaultLocaleNameProc);
if (NULL == getUserDefaultLocaleNameProc) {
SkDebugf("Could not get GetUserDefaultLocaleName.");
SK_TRACEHR(hr, "Could not get GetUserDefaultLocaleName.");
} else {
localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_NAME_MAX_LENGTH);
if (localeNameLen) {