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

core/fxge/win32/win32_int.h

 // 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
 
 #ifndef CORE_FXGE_WIN32_WIN32_INT_H_
 #define CORE_FXGE_WIN32_WIN32_INT_H_
 
+#include <windows.h>
+
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/ifx_renderdevicedriver.h"
 #include "core/fxge/win32/dwrite_int.h"
 
 struct FXTEXT_CHARPOS;
 struct WINDIB_Open_Args_;
 
+typedef HANDLE(__stdcall* FuncType_GdiAddFontMemResourceEx)(PVOID pbFont,
+                                                            DWORD cbFont,
+                                                            PVOID pdv,
+                                                            DWORD* pcFonts);
+typedef BOOL(__stdcall* FuncType_GdiRemoveFontMemResourceEx)(HANDLE handle);
+
 class CGdiplusExt {
  public:
   CGdiplusExt();
   ~CGdiplusExt();
   void Load();
   FX_BOOL IsAvailable() { return !!m_hModule; }
   FX_BOOL StretchBitMask(HDC hDC,
                          BOOL bMonoDevice,
                          const CFX_DIBitmap* pBitmap,
                          int dest_left,
@@ skipping 58 matching lines @@
                                      int fontstyle);
   void GdipDeleteFont(void* pFont);
   FX_BOOL GdipCreateBitmap(CFX_DIBitmap* pBitmap, void** bitmap);
   void GdipDisposeImage(void* bitmap);
   void GdipGetFontSize(void* pFont, FX_FLOAT* size);
   void* GdiAddFontMemResourceEx(void* pFontdata,
                                 uint32_t size,
                                 void* pdv,
                                 uint32_t* num_face);
   FX_BOOL GdiRemoveFontMemResourceEx(void* handle);
-  void* m_Functions[100];
-  void* m_pGdiAddFontMemResourceEx;
-  void* m_pGdiRemoveFontMemResourseEx;
   CFX_DIBitmap* LoadDIBitmap(WINDIB_Open_Args_ args);
 
+  FARPROC m_Functions[100];
+  FuncType_GdiAddFontMemResourceEx m_pGdiAddFontMemResourceEx;
+  FuncType_GdiRemoveFontMemResourceEx m_pGdiRemoveFontMemResourseEx;
+
  protected:
   HMODULE m_hModule;
   HMODULE m_GdiModule;
 };
+
 class CWin32Platform {
  public:
   FX_BOOL m_bHalfTone;
   CGdiplusExt m_GdiplusExt;
   CDWriteExt m_DWriteExt;
 };
 
 class CGdiDeviceDriver : public IFX_RenderDeviceDriver {
  protected:
   CGdiDeviceDriver(HDC hDC, int device_class);
@@ skipping 133 matching lines @@
                          CFX_Font* pFont,
                          const CFX_Matrix* pObject2Device,
                          FX_FLOAT font_size,
                          uint32_t color) override;
 
   const int m_HorzSize;
   const int m_VertSize;
 };
 
 #endif  // CORE_FXGE_WIN32_WIN32_INT_H_