Changeset 335 for trunk/dll/seticon.c

Timestamp:

Jul 25, 2006, 9:03:44 PM (19 years ago)

Author:

root

Message:

Use Runtime_Error

File:

• trunk/dll/seticon.c (modified) (5 diffs)

trunk/dll/seticon.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Edit ICON EA
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2006 Steven H.Levine
+
+  17 Jul 06 SHL Use Runtime_Error
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
+#include <os2.h>
 
-#include <os2.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -8 +22 @@
 #include <ctype.h>
 #include <share.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
 
 #pragma data_seg(DATA2)
+
+static PSZ pszSrcFile = __FILE__;
+
 #pragma alloc_text(MENU,SetIconDlgProc)
 
 
-
-MRESULT EXPENTRY SetIconDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY SetIconDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   switch(msg) {
     case WM_INITDLG:
@@ -43 +60 @@
             icf.cb = sizeof(ICONINFO);
             icf.fFormat = ICON_DATA;
-            if(filename && *filename) {
-              fp = _fsopen(filename,"rb",SH_DENYNO);
-              if(fp) {
+            if (filename && *filename) {
+              fp = xfsopen(filename,"rb",SH_DENYNO,pszSrcFile,__LINE__);
+              if(!fp)
+                break;
+              else {
                 fseek(fp,0L,SEEK_END);
                 icf.cbIconData = ftell(fp);
                 fseek(fp,0L,SEEK_SET);
-                buff = malloc(icf.cbIconData);
-                if(!buff) {
+                buff = xmalloc(icf.cbIconData,pszSrcFile,__LINE__);
+                if (!buff) {
                   fclose(fp);
-                  DosBeep(50,100);
                   break;
                 }
@@ -58 +76 @@
                 icf.pIconData = (PVOID)buff;
                 fclose(fp);
-              }
-              else {
-                DosBeep(50,100);
-                break;
               }
             }
@@ -79 +93 @@
                                      (PICONINFO)((filename && *filename) ?
                                       &icf : NULL)))
-              DosBeep(250,100);
+            {
+              Win_Error(hwnd,hwnd,pszSrcFile,__LINE__,"WinSetSysPointerData");
+            }
             if(buff)
               free(buff);