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

Only bad people do that, since it's prohibited by the C standards.

Review-Url: https://codereview.chromium.org/2459603004

1 files changed, 13 insertions, 3 deletions

diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index 0cea52b908..1f2bc50f42 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -7,6 +7,8 @@
 #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"
@@ -14,6 +16,12 @@
 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();
@@ -92,15 +100,17 @@ class CGdiplusExt {
                                 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;