Bug 1149318 - Fix the calling convention on SkGetUserDefaultLocaleNameProc. r=eihrul, a=sylvestre
authorDavid Major <dmajor@mozilla.com>
Wed, 30 Sep 2015 14:50:28 -0400
changeset 296212 3a47df4bf8197fa89d675cd9161910423c188d7b
parent 296211 ecdf6e8d473d2315e9b44c0e0fcef86760fd0511
child 296213 0bb47dc85ea858f81831f14f46dfb2c8d510b4d9
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerseihrul, sylvestre
bugs1149318
milestone43.0a2
Bug 1149318 - Fix the calling convention on SkGetUserDefaultLocaleNameProc. r=eihrul, a=sylvestre I believe this issue was introduced when https://github.com/google/skia/commit/8124bf072c40c2a2a6d58ae19f1951a59dc4757e was incorrectly pulled in as https://hg.mozilla.org/mozilla-central/rev/3a3820a17f0b, so this needs to be fixed only in the Mozilla repo.
gfx/skia/skia/src/utils/win/SkDWrite.h
--- a/gfx/skia/skia/src/utils/win/SkDWrite.h
+++ b/gfx/skia/skia/src/utils/win/SkDWrite.h
@@ -37,17 +37,17 @@ HRESULT sk_cstring_to_wchar(const char* 
 HRESULT sk_wchar_to_skstring(WCHAR* name, SkString* skname);
 
 ////////////////////////////////////////////////////////////////////////////////
 // Locale
 
 void sk_get_locale_string(IDWriteLocalizedStrings* names, const WCHAR* preferedLocale,
                        SkString* skname);
 
-typedef int (*SkGetUserDefaultLocaleNameProc)(LPWSTR, int);
+typedef int (WINAPI *SkGetUserDefaultLocaleNameProc)(LPWSTR, int);
 HRESULT SkGetGetUserDefaultLocaleNameProc(SkGetUserDefaultLocaleNameProc* proc);
 
 ////////////////////////////////////////////////////////////////////////////////
 // Table handling
 
 class AutoDWriteTable {
 public:
     AutoDWriteTable(IDWriteFontFace* fontFace, UINT32 beTag) : fFontFace(fontFace), fExists(FALSE) {