Changeset 351 for trunk/dll/loadbmp.c

Timestamp:

Jul 26, 2006, 9:03:27 PM (19 years ago)

Author:

root

Message:

Check more run time errors

File:

• trunk/dll/loadbmp.c (modified) (6 diffs)

trunk/dll/loadbmp.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Load bitmaps
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2006 Steven H.Levine
+
+  22 Jul 06 SHL Check more run time errors
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
 #define INCL_GPI
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <share.h>
+
 #include "fm3dll.h"
 
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(LOADBITMAP,LoadBitmapFromFile,LoadBitmapFromFileNum)
 
 
-HBITMAP LoadBitmapFromFileNum (USHORT id) {
-
-  char s[CCHMAXPATH];
+HBITMAP LoadBitmapFromFileNum (USHORT id)
+{
+    char s[CCHMAXPATH];
 
   save_dir2(s);
@@ -23 +40 @@
 
 
-HBITMAP LoadBitmapFromFile (CHAR *pszFileName) {
-
+HBITMAP LoadBitmapFromFile (CHAR *pszFileName)
+{
   HBITMAP                 hBmp = (HBITMAP)0;
   FILE                   *File;
@@ -30 +47 @@
   USHORT                  usType = 0;           // #@!!! compiler warnings
   PBITMAPARRAYFILEHEADER2 pbafh2 = NULL;        // (MAM) chng init values to NULL instead of ptr to 0
-  PBITMAPFILEHEADER2      pbfh2  = NULL;                       
-  PBITMAPINFOHEADER2      pbih2  = NULL;                       
-  PBITMAPINFO2            pbmi2  = NULL;                       
-  PBITMAPARRAYFILEHEADER  pbafh  = NULL;                       
-  PBITMAPFILEHEADER       pbfh   = NULL;                       
-  PBITMAPINFOHEADER       pbih   = NULL;                       
+  PBITMAPFILEHEADER2      pbfh2  = NULL;
+  PBITMAPINFOHEADER2      pbih2  = NULL;
+  PBITMAPINFO2            pbmi2  = NULL;
+  PBITMAPARRAYFILEHEADER  pbafh  = NULL;
+  PBITMAPFILEHEADER       pbfh   = NULL;
+  PBITMAPINFOHEADER       pbih   = NULL;
   BOOL                    f2;        // format 1.x or 2.x
   ULONG                   ulOffset;
@@ -56 +73 @@
   /* Next read the bitmap info header........................................*/
   // we allocate enough to hold a complete bitmap array file header
-  pbafh2 = (PBITMAPARRAYFILEHEADER2)malloc(sizeof(*pbafh2) +
-                                             256 * sizeof(RGB2));
+  pbafh2 = xmalloc(sizeof(*pbafh2) + 256 * sizeof(RGB2),pszSrcFile,__LINE__);
   if(!pbafh2)
     goto ExitLoadBMP;
@@ -248 +264 @@
     ulDataSize = (((pbmi2->cBitCount * pbmi2->cx) + 31) / 32) * 4 *
                   pbmi2->cy * pbmi2->cPlanes;
-  pData = (PBYTE)malloc(ulDataSize);
+  pData = xmalloc(ulDataSize,pszSrcFile,__LINE__);
   if(!pData)
     goto ExitLoadBMP;
@@ -263 +279 @@
 
 ExitLoadBMP:
-  if(pData)
-    free(pData);
-  if(pbafh2)
-    free(pbafh2);
+
+  xfree(pData);
+  xfree(pbafh2);
   fclose(File);
   WinReleasePS(hPS);
-  return(hBmp);
+  return hBmp;
 }