Remove typdefs for pointer types in fx_system.h

core/src/fxge/win32/fx_win32_device.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 "../../../include/fxge/fx_ge.h"
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include "../../../include/fxge/fx_ge_win32.h"
 #include <crtdbg.h>
 #include "../agg/include/fxfx_agg_clip_liang_barsky.h"
 #include "dwrite_int.h"
 #include "win32_int.h"
 #include "../ge/text_int.h"
 #include "../dib/dib_int.h"
 #include "../agg/include/fx_agg_driver.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "../../../include/fxcodec/fx_codec.h"
 class CWin32FontInfo final : public IFX_SystemFontInfo
 {
 public:
     CWin32FontInfo();
     ~CWin32FontInfo();
     virtual void                Release();
     virtual     FX_BOOL         EnumFontList(CFX_FontMapper* pMapper);
-    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR face, FX_BOOL& bExact);
-    virtual void*               GetFont(FX_LPCSTR face)
+    virtual void*               MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* face, FX_BOOL& bExact);
+    virtual void*               GetFont(const FX_CHAR* face)
     {
         return NULL;
     }
-    virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size);
+    virtual FX_DWORD    GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size);
     virtual void                DeleteFont(void* hFont);
     virtual     FX_BOOL         GetFaceName(void* hFont, CFX_ByteString& name);
     virtual FX_BOOL             GetFontCharset(void* hFont, int& charset);
     FX_BOOL                             IsOpenTypeFromDiv(const LOGFONTA *plf);
     FX_BOOL                             IsSupportFontFormDiv(const LOGFONTA* plf);
     void                                AddInstalledFont(const LOGFONTA *plf, FX_DWORD FontType);
     void                                GetGBPreference(CFX_ByteString& face, int weight, int picth_family);
     void                                GetJapanesePreference(CFX_ByteString& face, int weight, int picth_family);
     CFX_ByteString              FindFont(const CFX_ByteString& name);
     HDC                                 m_hDC;
@@ skipping 103 matching lines @@
     lf.lfCharSet = DEFAULT_CHARSET;
     lf.lfFaceName[0] = 0;
     lf.lfPitchAndFamily = 0;
     EnumFontFamiliesExA(m_hDC, &lf, (FONTENUMPROCA)FontEnumProc, (uintptr_t)this, 0);
     if (pMapper->GetFontEnumerator()) {
         pMapper->GetFontEnumerator()->Finish();
     }
     return TRUE;
 }
 static const struct {
-    FX_LPCSTR   m_pFaceName;
-    FX_LPCSTR   m_pVariantName;
+    const FX_CHAR*      m_pFaceName;
+    const FX_CHAR*      m_pVariantName;
 }
 VariantNames[] = {
     {"DFKai-SB", "\x19\x6A\x77\x69\xD4\x9A"},
 };
 static const struct {
-    FX_LPCSTR   m_pName;
-    FX_LPCSTR   m_pWinName;
+    const FX_CHAR*      m_pName;
+    const FX_CHAR*      m_pWinName;
     FX_BOOL             m_bBold;
     FX_BOOL             m_bItalic;
 }
 Base14Substs[] = {
     {"Courier", "Courier New", FALSE, FALSE},
     {"Courier-Bold", "Courier New", TRUE, FALSE},
     {"Courier-BoldOblique", "Courier New", TRUE, TRUE},
     {"Courier-Oblique", "Courier New", FALSE, TRUE},
     {"Helvetica", "Arial", FALSE, FALSE},
     {"Helvetica-Bold", "Arial", TRUE, FALSE},
@@ skipping 16 matching lines @@
             if (thisname.Mid(1, name.GetLength()) == name) {
                 return m_pMapper->m_InstalledTTFonts[i + 1];
             }
         } else if (thisname.Left(name.GetLength()) == name) {
             return m_pMapper->m_InstalledTTFonts[i];
         }
     }
     return CFX_ByteString();
 }
 struct _FontNameMap {
-    FX_LPCSTR   m_pSubFontName;
-    FX_LPCSTR   m_pSrcFontName;
+    const FX_CHAR*      m_pSubFontName;
+    const FX_CHAR*      m_pSrcFontName;
 };
 const _FontNameMap g_JpFontNameMap[] = {
     {"MS Mincho", "Heiseimin-W3"},
     {"MS Gothic", "Jun101-Light"},
 };
 extern "C" {
     static int compareString(const void* key, const void* element)
     {
-        return FXSYS_stricmp((FX_LPCSTR)key, ((_FontNameMap*)element)->m_pSrcFontName);
+        return FXSYS_stricmp((const FX_CHAR*)key, ((_FontNameMap*)element)->m_pSrcFontName);
     }
 }
 FX_BOOL _GetSubFontName(CFX_ByteString& name)
 {
     int size = sizeof g_JpFontNameMap;
     void* pFontnameMap = (void*)g_JpFontNameMap;
     _FontNameMap* found = (_FontNameMap*)FXSYS_bsearch(name.c_str(), pFontnameMap,
                           size / sizeof (_FontNameMap), sizeof (_FontNameMap), compareString);
     if (found == NULL) {
         return FALSE;
@@ skipping 54 matching lines @@
     }
     if (_GetSubFontName(face)) {
         return;
     }
     if (!(picth_family & FF_ROMAN) && weight > 400) {
         face = "MS PGothic";
     } else {
         face = "MS PMincho";
     }
 }
-void* CWin32FontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, FX_LPCSTR cstr_face, FX_BOOL& bExact)
+void* CWin32FontInfo::MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* cstr_face, FX_BOOL& bExact)
 {
     CFX_ByteString face = cstr_face;
     int iBaseFont;
     for (iBaseFont = 0; iBaseFont < 12; iBaseFont ++)
         if (face == CFX_ByteStringC(Base14Substs[iBaseFont].m_pName)) {
             face = Base14Substs[iBaseFont].m_pWinName;
             weight = Base14Substs[iBaseFont].m_bBold ? FW_BOLD : FW_NORMAL;
             bItalic = Base14Substs[iBaseFont].m_bItalic;
             bExact = TRUE;
             break;
@@ skipping 56 matching lines @@
             break;
     }
     hFont = ::CreateFontA(-10, 0, 0, 0, weight, bItalic, 0, 0, charset, OUT_TT_ONLY_PRECIS,
                           0, 0, subst_pitch_family, face);
     return hFont;
 }
 void CWin32FontInfo::DeleteFont(void* hFont)
 {
     ::DeleteObject(hFont);
 }
-FX_DWORD CWin32FontInfo::GetFontData(void* hFont, FX_DWORD table, FX_LPBYTE buffer, FX_DWORD size)
+FX_DWORD CWin32FontInfo::GetFontData(void* hFont, FX_DWORD table, uint8_t* buffer, FX_DWORD size)
 {
     HFONT hOldFont = (HFONT)::SelectObject(m_hDC, (HFONT)hFont);
     table = FXDWORD_FROM_MSBFIRST(table);
     size = ::GetFontData(m_hDC, table, 0, buffer, size);
     ::SelectObject(m_hDC, hOldFont);
     if (size == GDI_ERROR) {
         return 0;
     }
     return size;
 }
@@ skipping 76 matching lines @@
             return m_Width;
         case FXDC_PIXEL_HEIGHT:
             return m_Height;
         case FXDC_BITS_PIXEL:
             return m_nBitsPerPixel;
         case FXDC_RENDER_CAPS:
             return m_RenderCaps;
     }
     return 0;
 }
-FX_LPVOID CGdiDeviceDriver::GetClipRgn()
+void* CGdiDeviceDriver::GetClipRgn()
 {
     HRGN hClipRgn = CreateRectRgn(0, 0, 1, 1);
     if (::GetClipRgn(m_hDC, hClipRgn) == 0) {
         DeleteObject(hClipRgn);
         hClipRgn = NULL;
     }
-    return (FX_LPVOID)hClipRgn;
+    return (void*)hClipRgn;
 }
 FX_BOOL CGdiDeviceDriver::GDI_SetDIBits(const CFX_DIBitmap* pBitmap1, const FX_RECT* pSrcRect, int left, int top, void* pIccTransform)
 {
     if (m_DeviceClass == FXDC_PRINTER) {
         CFX_DIBitmap* pBitmap = pBitmap1->FlipImage(FALSE, TRUE);
         if (pBitmap == NULL) {
             return FALSE;
         }
         if ((pBitmap->IsCmykImage() || pIccTransform) &&
                 !pBitmap->ConvertFormat(FXDIB_Rgb, pIccTransform)) {
@@ skipping 113 matching lines @@
 
     SelectObject(m_hDC, hOld);
     DeleteObject(hPattern);
 
     return TRUE;
 }
 BOOL CGdiDeviceDriver::GetClipBox(FX_RECT* pRect)
 {
     return ::GetClipBox(m_hDC, (RECT*)pRect);
 }
-FX_BOOL CGdiDeviceDriver::SetClipRgn(FX_LPVOID hRgn)
+FX_BOOL CGdiDeviceDriver::SetClipRgn(void* hRgn)
 {
     ::SelectClipRgn(m_hDC, (HRGN)hRgn);
     return TRUE;
 }
 static HPEN _CreatePen(const CFX_GraphStateData* pGraphState, const CFX_AffineMatrix* pMatrix, FX_DWORD argb)
 {
     FX_FLOAT width;
     FX_FLOAT scale = 1.f;
     if (pMatrix)
         scale = FXSYS_fabs(pMatrix->a) > FXSYS_fabs(pMatrix->b) ?
@@ skipping 309 matching lines @@
         return TRUE;
     }
     HPEN hPen = CreatePen(PS_SOLID, 1, rgb);
     hPen = (HPEN)SelectObject(m_hDC, hPen);
     MoveToEx(m_hDC, FXSYS_round(x1), FXSYS_round(y1), NULL);
     LineTo(m_hDC, FXSYS_round(x2), FXSYS_round(y2));
     hPen = (HPEN)SelectObject(m_hDC, hPen);
     DeleteObject(hPen);
     return TRUE;
 }
-FX_BOOL CGdiDeviceDriver::DeleteDeviceRgn(FX_LPVOID pRgn)
+FX_BOOL CGdiDeviceDriver::DeleteDeviceRgn(void* pRgn)
 {
     DeleteObject((HGDIOBJ)pRgn);
     return TRUE;
 }
 CGdiDisplayDriver::CGdiDisplayDriver(HDC hDC) : CGdiDeviceDriver(hDC, FXDC_DISPLAY)
 {
     CWin32Platform* pPlatform = (CWin32Platform*)CFX_GEModule::Get()->GetPlatformData();
     if (pPlatform->m_GdiplusExt.IsAvailable()) {
         m_RenderCaps |= FXRC_ALPHA_PATH | FXRC_ALPHA_IMAGE;
     }
@@ skipping 228 matching lines @@
 }
 CFX_WinBitmapDevice::CFX_WinBitmapDevice(int width, int height, FXDIB_Format format)
 {
     BITMAPINFOHEADER bmih;
     FXSYS_memset32(&bmih, 0, sizeof (BITMAPINFOHEADER));
     bmih.biSize = sizeof(BITMAPINFOHEADER);
     bmih.biBitCount = format & 0xff;
     bmih.biHeight = -height;
     bmih.biPlanes = 1;
     bmih.biWidth = width;
-    FX_LPBYTE pBuffer;
-    m_hBitmap = CreateDIBSection(NULL, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, (FX_LPVOID*)&pBuffer, NULL, 0);
+    uint8_t* pBuffer;
+    m_hBitmap = CreateDIBSection(NULL, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, (void**)&pBuffer, NULL, 0);
     if (m_hBitmap == NULL) {
         return;
     }
     CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
     pBitmap->Create(width, height, format, pBuffer);
     SetBitmap(pBitmap);
     m_hDC = ::CreateCompatibleDC(NULL);
     m_hOldBitmap = (HBITMAP)SelectObject(m_hDC, m_hBitmap);
     IFX_RenderDeviceDriver* pDriver = new CGdiDisplayDriver(m_hDC);
     SetDeviceDriver(pDriver);
 }
 CFX_WinBitmapDevice::~CFX_WinBitmapDevice()
 {
     if (m_hDC) {
         SelectObject(m_hDC, m_hOldBitmap);
         DeleteDC(m_hDC);
     }
     if (m_hBitmap) {
         DeleteObject(m_hBitmap);
     }
     delete GetBitmap();
 }
 #endif