Changeset 21 in dev

Timestamp:

Dec 29, 2006, 12:25:04 AM (18 years ago)

Author:

dai_9181

Message:

未対応形式のアイコンファイルを開けないようにした。

Location:

ProjectEditor

Files:

• IconEditor.cpp (modified) (4 diffs)
• IconEditor_Main.cpp (modified) (2 diffs)

ProjectEditor/IconEditor.cpp

@@ -275 +275 @@
         }
         i=GetFileSize(hFile,NULL);
-        buffer=(char *)GlobalAlloc(GMEM_FIXED,i+1);
+        buffer=(char *)HeapAlloc(hHeap,0,i+1);
         ReadFile(hFile,buffer,i,&dw,NULL);
         CloseHandle(hFile);
@@ -283 +283 @@
         pIconDir=(ICONDIR *)buffer;
         IconNum=pIconDir->idCount;
+        bool FileOk = true;
         for(i=0;i<IconNum;i++){
             pIconDirEntry=(ICONDIRENTRY *)(buffer+sizeof(ICONDIR)+sizeof(ICONDIRENTRY)*i);
@@ -290 +291 @@
 
             dwBytesInRes[i]=pIconDirEntry->dwBytesInRes;
+
+            //対応チェック
+            BITMAPINFOHEADER *pBmpInfoHdr=(BITMAPINFOHEADER *)pImageBuffer[i];
+            if( !(pBmpInfoHdr->biBitCount == 4 || pBmpInfoHdr->biBitCount == 8 ) ){
+                //16色、256色以外の場合
+                //未対応
+                FileOk = false;
+            }
         }
 
@@ -295 +304 @@
         lstrcat(str,str2);
         mdic.szTitle=str;
+
+        HeapDefaultFree(buffer);
+
+        if( !FileOk ){
+            for(i=0;i<IconNum;i++){
+                HeapDefaultFree( pImageBuffer[i] );
+            }
+
+            char msg[1024];
+            sprintf( msg, "\"%s\"\n\n16色または256色以外の形式のファイルには対応していません。", filepath );
+            MessageBox( hOwner, msg, "ActiveBasic", MB_OK | MB_ICONEXCLAMATION );
+            return;
+        }
     }
     else{

ProjectEditor/IconEditor_Main.cpp

@@ -309 +309 @@
     pBmpInfoHdr=(BITMAPINFOHEADER *)MdiInfo[WndNum].MdiIconEditInfo->pIconImage[MdiInfo[WndNum].MdiIconEditInfo->SelectIconNum];
 
+    if( !(pBmpInfoHdr->biBitCount == 4 || pBmpInfoHdr->biBitCount == 8 ) ){
+        //16色、256色以外の場合
+        //未対応
+        return;
+    }
+
     hPen=CreatePen(PS_SOLID,0,RGB(200,200,200));
     hOldPen=(HPEN)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hPen);
@@ -362 +368 @@
             ////////////////
             // 通常ピクセル
-            switch(pBmpInfoHdr->biBitCount){
-                case 4:     //16色
-                    i2=*(pBuffer+i/2);
-                    if(i%2==0) i2>>=4;
-                    i2&=0x0F;
-                    ColorRef=RGB(pRgbq[i2].rgbRed,pRgbq[i2].rgbGreen,pRgbq[i2].rgbBlue);
-                    break;
-                case 8:     //256色
-                    i2=pBuffer[i];
-                    ColorRef=RGB(pRgbq[i2].rgbRed,pRgbq[i2].rgbGreen,pRgbq[i2].rgbBlue);
-                    break;
-            }
+            if( pBmpInfoHdr->biBitCount == 4 ){
+                //16色
+                i2=*(pBuffer+i/2);
+                if(i%2==0) i2>>=4;
+                i2&=0x0F;
+                ColorRef=RGB(pRgbq[i2].rgbRed,pRgbq[i2].rgbGreen,pRgbq[i2].rgbBlue);
+            }
+            else if( pBmpInfoHdr->biBitCount == 8 ){
+                //256色
+                i2=pBuffer[i];
+                ColorRef=RGB(pRgbq[i2].rgbRed,pRgbq[i2].rgbGreen,pRgbq[i2].rgbBlue);
+                break;
+            }
+
             hBrush=CreateSolidBrush(ColorRef);
             hOldBrush=(HBRUSH)SelectObject(MdiInfo[WndNum].MdiIconEditInfo->memdc,hBrush);