Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the "Can't open file" message in ReadDIB so that it actually

Browse Source 
displays the filename instead of garbage.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-03-31 16:40:08 +00:00
parent b207457ce7
commit 40c7a5fc4e
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/msw/dib.cpp
View File

@@ -127,7 +127,7 @@ BOOL WriteDIB(LPSTR szFile, HANDLE hdib)
hdr.bfSize = GlobalSize(hdib) + sizeof(BITMAPFILEHEADER); hdr.bfSize = GlobalSize(hdib) + sizeof(BITMAPFILEHEADER);
hdr.bfReserved1 = 0; hdr.bfReserved1 = 0;
hdr.bfReserved2 = 0; hdr.bfReserved2 = 0;
hdr.bfOffBits = (DWORD) sizeof(BITMAPFILEHEADER) + lpbi->biSize + hdr.bfOffBits = (DWORD) sizeof(BITMAPFILEHEADER) + lpbi->biSize +
PaletteSize(lpbi); PaletteSize(lpbi);
/* Write the file header */ /* Write the file header */
@@ -164,7 +164,7 @@ WORD PaletteSize(VOID FAR * pv)
if (lpbi->biSize == sizeof(BITMAPCOREHEADER)) if (lpbi->biSize == sizeof(BITMAPCOREHEADER))
return NumColors * sizeof(RGBTRIPLE); return NumColors * sizeof(RGBTRIPLE);
else else
return NumColors * sizeof(RGBQUAD); return NumColors * sizeof(RGBQUAD);
} }
@@ -198,7 +198,7 @@ WORD DibNumColors(VOID FAR *pv)
return (WORD) lpbi->biClrUsed; return (WORD) lpbi->biClrUsed;
bits = lpbi->biBitCount; bits = lpbi->biBitCount;
} }
else else
bits = lpbc->bcBitCount; bits = lpbc->bcBitCount;
switch (bits) { switch (bits) {
@@ -412,7 +412,7 @@ DWORD PASCAL lwrite(int fh, VOID FAR *pv, DWORD ul)
* is loaded, the function also creates a bitmap and * is loaded, the function also creates a bitmap and
* palette out of the DIB for a device-dependent form. * palette out of the DIB for a device-dependent form.
* *
* RETURNS : TRUE - DIB loaded and bitmap/palette created * RETURNS : TRUE - DIB loaded and bitmap/palette created
* The DIBINIT structure pointed to by pInfo is * The DIBINIT structure pointed to by pInfo is
* filled with the appropriate handles. * filled with the appropriate handles.
* FALSE - otherwise * FALSE - otherwise
@@ -436,12 +436,12 @@ BOOL ReadDIB(LPSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette)
fh = OpenFile (lpFileName, &of, OF_READ); fh = OpenFile (lpFileName, &of, OF_READ);
if (fh == -1) { if (fh == -1) {
wsprintf(str,"Can't open file '%ls'", (LPSTR)lpFileName); wsprintf(str,"Can't open file '%s'", lpFileName);
MessageBox(NULL, str, "Error", MB_ICONSTOP | MB_OK); MessageBox(NULL, str, "Error", MB_ICONSTOP | MB_OK);
return (0); return (0);
} }
hDIB = GlobalAlloc(GHND, (DWORD)(sizeof(BITMAPINFOHEADER) + hDIB = GlobalAlloc(GHND, (DWORD)(sizeof(BITMAPINFOHEADER) +
256 * sizeof(RGBQUAD))); 256 * sizeof(RGBQUAD)));
if (!hDIB) if (!hDIB)
return(0); return(0);
@@ -497,7 +497,7 @@ BOOL ReadDIB(LPSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette)
* lpbi->biHeight; * lpbi->biHeight;
} }
/* get a proper-sized buffer for header, color table and bits */ /* get a proper-sized buffer for header, color table and bits */
GlobalUnlock(hDIB); GlobalUnlock(hDIB);
hDIB = GlobalReAlloc(hDIB, lpbi->biSize + hDIB = GlobalReAlloc(hDIB, lpbi->biSize +
nNumColors * sizeof(RGBQUAD) + nNumColors * sizeof(RGBQUAD) +
@@ -579,7 +579,7 @@ ErrExit2:
* to be used for a device-dependent representation of * to be used for a device-dependent representation of
* of the image. * of the image.
* *
* RETURNS : TRUE --> success. phPal and phBitmap are filled with * RETURNS : TRUE --> success. phPal and phBitmap are filled with
* appropriate handles. Caller is responsible * appropriate handles. Caller is responsible
* for freeing objects. * for freeing objects.
* FALSE --> unable to create objects. both pointer are * FALSE --> unable to create objects. both pointer are
@@ -608,9 +608,9 @@ BOOL PASCAL MakeBitmapAndPalette(HDC hDC, HANDLE hDIB,
hOldPal = SelectPalette(hDC, hPalette, TRUE); hOldPal = SelectPalette(hDC, hPalette, TRUE);
RealizePalette(hDC); RealizePalette(hDC);
lpBits = (LPSTR)lpInfo + (WORD)lpInfo->biSize + lpBits = (LPSTR)lpInfo + (WORD)lpInfo->biSize +
(WORD)lpInfo->biClrUsed * sizeof(RGBQUAD); (WORD)lpInfo->biClrUsed * sizeof(RGBQUAD);
hBitmap = CreateDIBitmap(hDC, lpInfo, CBM_INIT, lpBits, hBitmap = CreateDIBitmap(hDC, lpInfo, CBM_INIT, lpBits,
(LPBITMAPINFO)lpInfo, DIB_RGB_COLORS); (LPBITMAPINFO)lpInfo, DIB_RGB_COLORS);
SelectPalette(hDC, hOldPal, TRUE); SelectPalette(hDC, hOldPal, TRUE);
@@ -632,11 +632,11 @@ BOOL PASCAL MakeBitmapAndPalette(HDC hDC, HANDLE hDIB,
* * * *
* FUNCTION : MakeDIBPalette(lpInfo) * * FUNCTION : MakeDIBPalette(lpInfo) *
* * * *
* PURPOSE : Given a BITMAPINFOHEADER, create a palette based on * PURPOSE : Given a BITMAPINFOHEADER, create a palette based on
* the color table. * the color table.
* *
* * * *
* RETURNS : non-zero - handle of a corresponding palette * RETURNS : non-zero - handle of a corresponding palette
* zero - unable to create palette * zero - unable to create palette
* * * *
****************************************************************************/ ****************************************************************************/
@@ -644,7 +644,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
{ {
NPLOGPALETTE npPal; NPLOGPALETTE npPal;
RGBQUAD far *lpRGB; RGBQUAD far *lpRGB;
HPALETTE hLogPal; HPALETTE hLogPal;
WORD i; WORD i;
/* since biClrUsed field was filled during the loading of the DIB, /* since biClrUsed field was filled during the loading of the DIB,
@@ -653,10 +653,10 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
if (lpInfo->biClrUsed) if (lpInfo->biClrUsed)
{ {
/* /*
npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) + npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) +
(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY)); (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
*/ */
npPal = (NPLOGPALETTE)malloc(sizeof(LOGPALETTE) + npPal = (NPLOGPALETTE)malloc(sizeof(LOGPALETTE) +
(WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY)); (WORD)lpInfo->biClrUsed * sizeof(PALETTEENTRY));
if (!npPal) if (!npPal)
@@ -680,7 +680,7 @@ HPALETTE MakeDIBPalette(LPBITMAPINFOHEADER lpInfo)
hLogPal = CreatePalette((LPLOGPALETTE)npPal); hLogPal = CreatePalette((LPLOGPALETTE)npPal);
// LocalFree((HANDLE)npPal); // LocalFree((HANDLE)npPal);
free(npPal); free(npPal);
return(hLogPal); return(hLogPal);
} }
@@ -773,7 +773,7 @@ wxBitmap *wxLoadBitmap(char *filename, wxPalette **pal)
// //
// History: Date Reason // History: Date Reason
// 11/07/91 Created // 11/07/91 Created
// //
//--------------------------------------------------------------------- //---------------------------------------------------------------------
void InitBitmapInfoHeader (LPBITMAPINFOHEADER lpBmInfoHdr, void InitBitmapInfoHeader (LPBITMAPINFOHEADER lpBmInfoHdr,
@@ -831,7 +831,7 @@ LPSTR FindDIBBits (LPSTR lpbi)
// //
// History: Date Reason // History: Date Reason
// 6/01/91 Created // 6/01/91 Created
// //
//--------------------------------------------------------------------- //---------------------------------------------------------------------
HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal) HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal)
@@ -854,16 +854,16 @@ HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal)
if (!GetObject (hBitmap, sizeof (Bitmap), (LPSTR) &Bitmap)) if (!GetObject (hBitmap, sizeof (Bitmap), (LPSTR) &Bitmap))
return NULL; return NULL;
InitBitmapInfoHeader (&bmInfoHdr, InitBitmapInfoHeader (&bmInfoHdr,
Bitmap.bmWidth, Bitmap.bmWidth,
Bitmap.bmHeight, Bitmap.bmHeight,
Bitmap.bmPlanes * Bitmap.bmBitsPixel); Bitmap.bmPlanes * Bitmap.bmBitsPixel);
// Now allocate memory for the DIB. Then, set the BITMAPINFOHEADER // Now allocate memory for the DIB. Then, set the BITMAPINFOHEADER
// into this memory, and find out where the bitmap bits go. // into this memory, and find out where the bitmap bits go.
hDIB = GlobalAlloc (GHND, sizeof (BITMAPINFOHEADER) + hDIB = GlobalAlloc (GHND, sizeof (BITMAPINFOHEADER) +
PaletteSize ((LPSTR) &bmInfoHdr) + bmInfoHdr.biSizeImage); PaletteSize ((LPSTR) &bmInfoHdr) + bmInfoHdr.biSizeImage);
if (!hDIB) if (!hDIB)
@@ -896,12 +896,12 @@ HANDLE BitmapToDIB (HBITMAP hBitmap, HPALETTE hPal)
// it party on our bitmap. It will fill in the color table, // it party on our bitmap. It will fill in the color table,
// and bitmap bits of our global memory block. // and bitmap bits of our global memory block.
if (!GetDIBits (hMemDC, if (!GetDIBits (hMemDC,
hBitmap, hBitmap,
0, 0,
Bitmap.bmHeight, Bitmap.bmHeight,
lpBits, lpBits,
(LPBITMAPINFO) lpbmInfoHdr, (LPBITMAPINFO) lpbmInfoHdr,
DIB_RGB_COLORS)) DIB_RGB_COLORS))
{ {
GlobalUnlock (hDIB); GlobalUnlock (hDIB);