Stop casting function pointers to data pointers in fx_win32_gdipext.cpp.

core/fxge/win32/fx_win32_gdipext.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <windows.h>
 
 #include <algorithm>
 
@@ skipping 416 matching lines @@
     GDIPCONST WCHAR* str,
     INT length,
     GDIPCONST GpFont* font,
     GDIPCONST RectF* layoutRect,
     GDIPCONST GpStringFormat* stringFormat,
     GDIPCONST GpBrush* brush);
 typedef GpStatus(WINGDIPAPI* FuncType_GdipSetPenTransform)(GpPen* pen,
                                                            GpMatrix* matrix);
 #define CallFunc(funcname) \
   ((FuncType_##funcname)GdiplusExt.m_Functions[FuncId_##funcname])
-typedef HANDLE(__stdcall* FuncType_GdiAddFontMemResourceEx)(PVOID pbFont,
-                                                            DWORD cbFont,
-                                                            PVOID pdv,
-                                                            DWORD* pcFonts);
-typedef BOOL(__stdcall* FuncType_GdiRemoveFontMemResourceEx)(HANDLE handle);
+
 void* CGdiplusExt::GdiAddFontMemResourceEx(void* pFontdata,
                                            uint32_t size,
                                            void* pdv,
                                            uint32_t* num_face) {
-  if (m_pGdiAddFontMemResourceEx) {
-    return ((FuncType_GdiAddFontMemResourceEx)m_pGdiAddFontMemResourceEx)(
-        (PVOID)pFontdata, (DWORD)size, (PVOID)pdv, (DWORD*)num_face);
-  }
-  return nullptr;
+  if (!m_pGdiAddFontMemResourceEx)
+    return nullptr;
+
+  return m_pGdiAddFontMemResourceEx((PVOID)pFontdata, (DWORD)size, (PVOID)pdv,
+                                    (DWORD*)num_face);
 }
+
 FX_BOOL CGdiplusExt::GdiRemoveFontMemResourceEx(void* handle) {
-  if (m_pGdiRemoveFontMemResourseEx) {
-    return ((FuncType_GdiRemoveFontMemResourceEx)m_pGdiRemoveFontMemResourseEx)(
-        (HANDLE)handle);
-  }
-  return FALSE;
+  return m_pGdiRemoveFontMemResourseEx &&
+         m_pGdiRemoveFontMemResourseEx((HANDLE)handle);
 }
+
 static GpBrush* _GdipCreateBrush(DWORD argb) {
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   GpSolidFill* solidBrush = nullptr;
   CallFunc(GdipCreateSolidFill)((ARGB)argb, &solidBrush);
   return solidBrush;
 }
 static CFX_DIBitmap* _StretchMonoToGray(int dest_width,
                                         int dest_height,
                                         const CFX_DIBitmap* pSource,
@@ skipping 233 matching lines @@
   }
   uintptr_t gdiplusToken;
   GdiplusStartupInput gdiplusStartupInput;
   ((FuncType_GdiplusStartup)m_Functions[FuncId_GdiplusStartup])(
       &gdiplusToken, &gdiplusStartupInput, nullptr);
   m_GdiModule = LoadLibraryA("GDI32.DLL");
   if (!m_GdiModule) {
     return;
   }
   m_pGdiAddFontMemResourceEx =
-      GetProcAddress(m_GdiModule, "AddFontMemResourceEx");
+      reinterpret_cast<FuncType_GdiAddFontMemResourceEx>(
+          GetProcAddress(m_GdiModule, "AddFontMemResourceEx"));
   m_pGdiRemoveFontMemResourseEx =
-      GetProcAddress(m_GdiModule, "RemoveFontMemResourceEx");
+      reinterpret_cast<FuncType_GdiRemoveFontMemResourceEx>(
+          GetProcAddress(m_GdiModule, "RemoveFontMemResourceEx"));
 }
 CGdiplusExt::~CGdiplusExt() {}
 LPVOID CGdiplusExt::LoadMemFont(LPBYTE pData, uint32_t size) {
   GpFontCollection* pCollection = nullptr;
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipNewPrivateFontCollection)(&pCollection);
   GpStatus status =
       CallFunc(GdipPrivateAddMemoryFont)(pCollection, pData, size);
   if (status == Ok) {
@@ skipping 792 matching lines @@
       FXSYS_memcpy(pData + dest_pitch * i, pInfo->pScan0 + pInfo->Stride * i,
                    dest_pitch);
     }
   }
   CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(
       pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32);
   FX_Free(pData);
   FreeDIBitmap(pInfo);
   return pDIBitmap;
 }