Index: core/fxge/win32/fx_win32_gdipext.cpp |
diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp |
index 927f0a32e23b2ed28f186d3c66154cd79ee7be64..ef6e01cbead45dbdd45ba6c843a152b052373d0a 100644 |
--- a/core/fxge/win32/fx_win32_gdipext.cpp |
+++ b/core/fxge/win32/fx_win32_gdipext.cpp |
@@ -449,13 +449,13 @@ void* CGdiplusExt::GdiAddFontMemResourceEx(void* pFontdata, |
} |
return nullptr; |
} |
+ |
FX_BOOL CGdiplusExt::GdiRemoveFontMemResourceEx(void* handle) { |
- if (m_pGdiRemoveFontMemResourseEx) { |
- return ((FuncType_GdiRemoveFontMemResourceEx)m_pGdiRemoveFontMemResourseEx)( |
- (HANDLE)handle); |
- } |
- return FALSE; |
+ return m_pGdiRemoveFontMemResourseEx && |
+ ((FuncType_GdiRemoveFontMemResourceEx)m_pGdiRemoveFontMemResourseEx)( |
Tom Sepez
2016/10/28 17:17:17
note: this cast scares me, but for another day.
Lei Zhang
2016/10/28 18:00:52
You may want to check to see if this actually gets
Tom Sepez
2016/10/28 18:06:27
Fixed in a follow-up CL.
|
+ (HANDLE)handle); |
} |
+ |
static GpBrush* _GdipCreateBrush(DWORD argb) { |
CGdiplusExt& GdiplusExt = |
((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt; |