X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2662e49e09dcdddd8c0c571e70893bc702449e93..94e2ed3b8db0220160c0b939782cd46914ec073a:/src/msw/dibutils.cpp

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index e8f639f22c..6ee22bf304 100644
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -48,7 +48,7 @@
 
 #define BFT_ICON   0x4349   /* 'IC' */
 #define BFT_BITMAP 0x4d42   /* 'BM' */
-#define BFT_CURSOR 0x5450   /* 'PT' */
+#define BFT_CURSOR 0x5450   /* 'PT(' */
 
 #ifndef SEEK_CUR
 /* flags for _lseek */
@@ -78,11 +78,11 @@
 
 
 /*
- *  Clear the System Palette so that we can ensure an identity palette 
+ *  Clear the System Palette so that we can ensure an identity palette
  *  mapping for fast performance.
  */
 
-void ClearSystemPalette(void)
+void wxClearSystemPalette(void)
 {
   //*** A dummy palette setup
   struct
@@ -102,7 +102,7 @@ void ClearSystemPalette(void)
   UINT nMapped = 0;
   BOOL bOK = FALSE;
   int  nOK = 0;
-  
+
   // *** Reset everything in the system palette to black
   for(Counter = 0; Counter < 256; Counter++)
   {
@@ -146,7 +146,7 @@ void ClearSystemPalette(void)
  *   bits....
  */
 
-int DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
+int wxDibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
 {
    HFILE               fh;
    OFSTRUCT            of;
@@ -158,36 +158,35 @@ int DibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
    return 0;
   }
 
-  long size = DibSize(lpbi);
+  long size = wxDibSize(lpbi);
 
   // write file header
   BITMAPFILEHEADER bmf;
-  bmf.bfType = 'BM';
+  bmf.bfType = BFT_BITMAP;
   bmf.bfSize = sizeof(bmf) + size;
   bmf.bfReserved1 = 0;
   bmf.bfReserved2 = 0;
-  bmf.bfOffBits = sizeof(bmf) + (char FAR*)(DibPtr(lpbi)) - (char FAR*)lpbi;
-#if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__)
-  if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
-  _hwrite(fh, (LPCSTR)lpbi, size)<0) {
-    _lclose(fh);
-//   printf("la regamos1");
-    return 0;
-  }
-#else
-  if (_hwrite(fh, (LPBYTE)(&bmf), sizeof(bmf))<0 ||
-  _hwrite(fh, (LPBYTE)lpbi, size)<0) {
+  bmf.bfOffBits = sizeof(bmf) + (char FAR*)(wxDibPtr(lpbi)) - (char FAR*)lpbi;
+#if 1 // defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) || wxUSE_NORLANDER_HEADERS
+  #define HWRITE_2ND_ARG_TYPE   LPCSTR
+#else // don't know who needs this...
+  #define HWRITE_2ND_ARG_TYPE   LPBYTE
+#endif
+
+  if ( _hwrite(fh, (HWRITE_2ND_ARG_TYPE)(&bmf), sizeof(bmf)) < 0 ||
+       _hwrite(fh, (HWRITE_2ND_ARG_TYPE)lpbi, size) < 0 )
+  {
     _lclose(fh);
-//   printf("la regamos1");
     return 0;
   }
-#endif
+
+#undef HWRITE_2ND_ARG_TYPE
 
   _lclose(fh);
   return 1;
 }
 
-PDIB DibOpenFile(LPTSTR szFile)
+PDIB wxDibOpenFile(LPTSTR szFile)
 {
    HFILE               fh;
    DWORD               dwLen;
@@ -231,7 +230,7 @@ PDIB DibOpenFile(LPTSTR szFile)
    if (fh == -1)
       return NULL;
 
-   pdib = DibReadBitmapInfo(fh);
+   pdib = wxDibReadBitmapInfo(fh);
 
    if (!pdib)
       return NULL;
@@ -239,7 +238,7 @@ PDIB DibOpenFile(LPTSTR szFile)
     /* How much memory do we need to hold the DIB */
 
     dwBits = pdib->biSizeImage;
-    dwLen  = pdib->biSize + DibPaletteSize(pdib) + dwBits;
+    dwLen  = pdib->biSize + wxDibPaletteSize(pdib) + dwBits;
 
     /* Can we get more memory? */
 
@@ -258,7 +257,7 @@ PDIB DibOpenFile(LPTSTR szFile)
     if (pdib)
     {
       /* read in the bits */
-      _hread(fh, (LPBYTE)pdib + (UINT)pdib->biSize + DibPaletteSize(pdib), dwBits);
+      _hread(fh, (LPBYTE)pdib + (UINT)pdib->biSize + wxDibPaletteSize(pdib), dwBits);
     }
 
     _lclose(fh);
@@ -275,7 +274,7 @@ PDIB DibOpenFile(LPTSTR szFile)
  *  bitmap formats, but will always return a "new" BITMAPINFO.
  */
 
-PDIB DibReadBitmapInfo(HFILE fh)
+PDIB wxDibReadBitmapInfo(HFILE fh)
 {
     DWORD     off;
     int       size;
@@ -322,8 +321,8 @@ PDIB DibReadBitmapInfo(HFILE fh)
             bi.biSize               = sizeof(BITMAPINFOHEADER);
             bi.biWidth              = (DWORD)bc.bcWidth;
             bi.biHeight             = (DWORD)bc.bcHeight;
-            bi.biPlanes             =  (UINT)bc.bcPlanes;
-            bi.biBitCount           =  (UINT)bc.bcBitCount;
+            bi.biPlanes             = (WORD)bc.bcPlanes;
+            bi.biBitCount           = (WORD)bc.bcBitCount;
             bi.biCompression        = BI_RGB;
             bi.biSizeImage          = 0;
             bi.biXPelsPerMeter      = 0;
@@ -336,16 +335,16 @@ PDIB DibReadBitmapInfo(HFILE fh)
             break;
     }
 
-    nNumColors = DibNumColors(&bi);
+    nNumColors = wxDibNumColors(&bi);
 
 #if 0
     if (bi.biSizeImage == 0)
         bi.biSizeImage = DibSizeImage(&bi);
 
     if (bi.biClrUsed == 0)
-        bi.biClrUsed = DibNumColors(&bi);
+        bi.biClrUsed = wxDibNumColors(&bi);
 #else
-    FixBitmapInfo(&bi);
+    wxFixBitmapInfo(&bi);
 #endif
 
     pdib = (PDIB)GlobalAllocPtr(GMEM_MOVEABLE,(LONG)bi.biSize + nNumColors * sizeof(RGBQUAD));
@@ -355,7 +354,7 @@ PDIB DibReadBitmapInfo(HFILE fh)
 
     *pdib = bi;
 
-    pRgb = DibColors(pdib);
+    pRgb = wxDibColors(pdib);
 
     if (nNumColors)
     {
@@ -402,7 +401,7 @@ PDIB DibReadBitmapInfo(HFILE fh)
  *      in the passed palette
  */
 
-BOOL DibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage)
+BOOL wxDibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage)
 {
     PALETTEENTRY       ape[256];
     RGBQUAD FAR *      pRgb;
@@ -416,14 +415,14 @@ BOOL DibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage)
     if (!pdib)
         return FALSE;
 
-    nColors = DibNumColors(pdib);
-    
-    if (nColors == 3 && DibCompression(pdib) == BI_BITFIELDS)
+    nColors = wxDibNumColors(pdib);
+
+    if (nColors == 3 && wxDibCompression(pdib) == BI_BITFIELDS)
         nColors = 0;
 
     if (nColors > 0)
     {
-        pRgb = DibColors(pdib);
+        pRgb = wxDibColors(pdib);
 
         switch (wUsage)
         {
@@ -464,7 +463,7 @@ BOOL DibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage)
  *  given number of bits per pixel
  */
 
-PDIB DibCreate(int bits, int dx, int dy)
+PDIB wxDibCreate(int bits, int dx, int dy)
 {
     LPBITMAPINFOHEADER lpbi ;
     DWORD       dwSizeImage;
@@ -550,7 +549,7 @@ static void xlatClut4(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
 #define RLE_EOF     1
 #define RLE_JMP     2
 
-static void xlatRle8(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
+static void xlatRle8(BYTE FAR *pb, DWORD WXUNUSED(dwSize), BYTE FAR *xlat)
 {
     BYTE    cnt;
     BYTE    b;
@@ -596,7 +595,7 @@ static void xlatRle8(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
     }
 }
 
-static void xlatRle4(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
+static void xlatRle4(BYTE FAR *WXUNUSED(pb), DWORD WXUNUSED(dwSize), BYTE FAR *WXUNUSED(xlat))
 {
 }
 
@@ -616,7 +615,7 @@ static void hmemmove(BYTE _huge *d, BYTE _huge *s, LONG len)
  *  the colors of the given palette.
  */
 
-BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
+BOOL wxDibMapToPalette(PDIB pdib, HPALETTE hpal)
 {
    LPBITMAPINFOHEADER  lpbi;
    PALETTEENTRY        pe;
@@ -632,13 +631,13 @@ BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
       return FALSE;
 
    lpbi   = (LPBITMAPINFOHEADER)pdib;
-   lpRgb  = DibColors(pdib);
+   lpRgb  = wxDibColors(pdib);
 
    GetObject(hpal,sizeof(int),(LPSTR)&nPalColors);
-   nDibColors = DibNumColors(pdib);
+   nDibColors = wxDibNumColors(pdib);
 
    if ((SizeImage = lpbi->biSizeImage) == 0)
-      SizeImage = DibSizeImage(lpbi);
+      SizeImage = wxDibSizeImage(lpbi);
 
    //
    //  build a xlat table. from the current DIB colors to the given
@@ -647,7 +646,7 @@ BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
    for (n=0; n<nDibColors; n++)
       xlat[n] = (BYTE)GetNearestPaletteIndex(hpal,RGB(lpRgb[n].rgbRed,lpRgb[n].rgbGreen,lpRgb[n].rgbBlue));
 
-   lpBits = (LPBYTE)DibPtr(lpbi);
+   lpBits = (LPBYTE)wxDibPtr(lpbi);
    lpbi->biClrUsed = nPalColors;
 
    //
@@ -656,14 +655,14 @@ BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
    if (nPalColors > nDibColors)
    {
       GlobalReAllocPtr(lpbi, lpbi->biSize + nPalColors*sizeof(RGBQUAD) + SizeImage, 0);
-      hmemmove((BYTE _huge *)DibPtr(lpbi), (BYTE _huge *)lpBits, SizeImage);
-      lpBits = (LPBYTE)DibPtr(lpbi);
+      hmemmove((BYTE _huge *)wxDibPtr(lpbi), (BYTE _huge *)lpBits, SizeImage);
+      lpBits = (LPBYTE)wxDibPtr(lpbi);
    }
    else if (nPalColors < nDibColors)
    {
-      hmemcpy(DibPtr(lpbi), lpBits, SizeImage);
+      hmemcpy(wxDibPtr(lpbi), lpBits, SizeImage);
       GlobalReAllocPtr(lpbi, lpbi->biSize + nPalColors*sizeof(RGBQUAD) + SizeImage, 0);
-      lpBits = (LPBYTE)DibPtr(lpbi);
+      lpBits = (LPBYTE)wxDibPtr(lpbi);
    }
 
    //
@@ -704,19 +703,19 @@ BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
 }
 
 
-HPALETTE MakePalette(const BITMAPINFO FAR* Info, UINT flags)
+HPALETTE wxMakePalette(const BITMAPINFO FAR* Info, UINT flags)
 {
   HPALETTE hPalette;
   const RGBQUAD FAR* rgb = Info->bmiColors;
 
-  WORD nColors = Info->bmiHeader.biClrUsed;
+  WORD nColors = (WORD)Info->bmiHeader.biClrUsed;
   if (nColors) {
    LOGPALETTE* logPal = (LOGPALETTE*)
      new BYTE[sizeof(LOGPALETTE) + (nColors-1)*sizeof(PALETTEENTRY)];
 
    logPal->palVersion  = 0x300; // Windows 3.0 version
    logPal->palNumEntries = nColors;
-   for (short n = 0; n < nColors; n++) {
+   for (WORD n = 0; n < nColors; n++) {
     logPal->palPalEntry[n].peRed   = rgb[n].rgbRed;
     logPal->palPalEntry[n].peGreen = rgb[n].rgbGreen;
     logPal->palPalEntry[n].peBlue  = rgb[n].rgbBlue;