Remove FX_DWORD from core/ and delete definition

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 "core/include/fxge/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <windows.h>
@@ skipping 419 matching lines @@
 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,
-                                           FX_DWORD size,
+                                           uint32_t size,
                                            void* pdv,
-                                           FX_DWORD* num_face) {
+                                           uint32_t* num_face) {
   if (m_pGdiAddFontMemResourceEx) {
     return ((FuncType_GdiAddFontMemResourceEx)m_pGdiAddFontMemResourceEx)(
         (PVOID)pFontdata, (DWORD)size, (PVOID)pdv, (DWORD*)num_face);
   }
   return NULL;
 }
 FX_BOOL CGdiplusExt::GdiRemoveFontMemResourceEx(void* handle) {
   if (m_pGdiRemoveFontMemResourseEx) {
     return ((FuncType_GdiRemoveFontMemResourceEx)m_pGdiRemoveFontMemResourseEx)(
         (HANDLE)handle);
@@ skipping 251 matching lines @@
   m_GdiModule = LoadLibraryA("GDI32.DLL");
   if (!m_GdiModule) {
     return;
   }
   m_pGdiAddFontMemResourceEx =
       GetProcAddress(m_GdiModule, "AddFontMemResourceEx");
   m_pGdiRemoveFontMemResourseEx =
       GetProcAddress(m_GdiModule, "RemoveFontMemResourceEx");
 }
 CGdiplusExt::~CGdiplusExt() {}
-LPVOID CGdiplusExt::LoadMemFont(LPBYTE pData, FX_DWORD size) {
+LPVOID CGdiplusExt::LoadMemFont(LPBYTE pData, uint32_t size) {
   GpFontCollection* pCollection = NULL;
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipNewPrivateFontCollection)(&pCollection);
   GpStatus status =
       CallFunc(GdipPrivateAddMemoryFont)(pCollection, pData, size);
   if (status == Ok) {
     return pCollection;
   }
   CallFunc(GdipDeletePrivateFontCollection)(&pCollection);
@@ skipping 77 matching lines @@
   } else {
     *size = 0;
   }
 }
 void CGdiplusExt::GdipSetTextRenderingHint(void* graphics, int mode) {
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipSetTextRenderingHint)((GpGraphics*)graphics,
                                      (TextRenderingHint)mode);
 }
-void CGdiplusExt::GdipSetPageUnit(void* graphics, FX_DWORD unit) {
+void CGdiplusExt::GdipSetPageUnit(void* graphics, uint32_t unit) {
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipSetPageUnit)((GpGraphics*)graphics, (GpUnit)unit);
 }
 FX_BOOL CGdiplusExt::GdipDrawDriverString(void* graphics,
                                           unsigned short* text,
                                           int length,
                                           void* font,
                                           void* brush,
                                           void* positions,
                                           int flags,
                                           const void* matrix) {
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   GpStatus status = CallFunc(GdipDrawDriverString)(
       (GpGraphics*)graphics, (GDIPCONST UINT16*)text, (INT)length,
       (GDIPCONST GpFont*)font, (GDIPCONST GpBrush*)brush,
       (GDIPCONST PointF*)positions, (INT)flags, (GDIPCONST GpMatrix*)matrix);
   if (status == Ok) {
     return TRUE;
   }
   return FALSE;
 }
-void CGdiplusExt::GdipCreateBrush(FX_DWORD fill_argb, void** pBrush) {
+void CGdiplusExt::GdipCreateBrush(uint32_t fill_argb, void** pBrush) {
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipCreateSolidFill)((ARGB)fill_argb, (GpSolidFill**)pBrush);
 }
 void CGdiplusExt::GdipDeleteBrush(void* pBrush) {
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipDeleteBrush)((GpSolidFill*)pBrush);
 }
 void* CGdiplusExt::GdipCreateFontFromCollection(void* pFontCollection,
@@ skipping 62 matching lines @@
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipDeleteGraphics)((GpGraphics*)graphics);
 }
 FX_BOOL CGdiplusExt::StretchBitMask(HDC hDC,
                                     BOOL bMonoDevice,
                                     const CFX_DIBitmap* pBitmap,
                                     int dest_left,
                                     int dest_top,
                                     int dest_width,
                                     int dest_height,
-                                    FX_DWORD argb,
+                                    uint32_t argb,
                                     const FX_RECT* pClipRect,
                                     int flags) {
   ASSERT(pBitmap->GetBPP() == 1);
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   GpGraphics* pGraphics = NULL;
   CallFunc(GdipCreateFromHDC)(hDC, &pGraphics);
   CallFunc(GdipSetPageUnit)(pGraphics, UnitPixel);
   if (flags & FXDIB_NOSMOOTH) {
     CallFunc(GdipSetInterpolationMode)(pGraphics,
@@ skipping 163 matching lines @@
       v2 = pair1;
       return TRUE;
     }
   }
   return FALSE;
 }
 FX_BOOL CGdiplusExt::DrawPath(HDC hDC,
                               const CFX_PathData* pPathData,
                               const CFX_Matrix* pObject2Device,
                               const CFX_GraphStateData* pGraphState,
-                              FX_DWORD fill_argb,
-                              FX_DWORD stroke_argb,
+                              uint32_t fill_argb,
+                              uint32_t stroke_argb,
                               int fill_mode) {
   int nPoints = pPathData->GetPointCount();
   if (nPoints == 0) {
     return TRUE;
   }
   FX_PATHPOINT* pPoints = pPathData->GetPoints();
   GpGraphics* pGraphics = NULL;
   CGdiplusExt& GdiplusExt =
       ((CWin32Platform*)CFX_GEModule::Get()->GetPlatformData())->m_GdiplusExt;
   CallFunc(GdipCreateFromHDC)(hDC, &pGraphics);
@@ skipping 394 matching lines @@
                    dest_pitch);
     }
   }
   CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(
       pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32);
   FX_Free(pData);
   FreeDIBitmap(pInfo);
   return pDIBitmap;
 }
 #endif