Changeset 698 in dev for trunk

Timestamp:

Jul 21, 2008, 12:51:44 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

CreateGrayIconで落ちることがあったので、エラーチェックをしっかりと行うようにした。user32.libをGetModuleHandleで得るように変更。

File:

• trunk/ab5.0/abdev/abdev/SubOperation.cpp (modified) (6 diffs)

trunk/ab5.0/abdev/abdev/SubOperation.cpp

@@ -6 +6 @@
 
 void ScreenToClient(HWND hwnd,RECT *pRect){
-    ScreenToClient(hwnd,(POINT *)pRect);
-    ScreenToClient(hwnd,(POINT *)(((long)(void *)pRect)+sizeof(POINT)));
+    ScreenToClient(hwnd,reinterpret_cast<POINT*>(pRect));
+    ScreenToClient(hwnd,reinterpret_cast<POINT*>(reinterpret_cast<char*>(pRect)+sizeof(POINT)));
 }
 void ClientToScreen(HWND hwnd,RECT *pRect){
-    ClientToScreen(hwnd,(POINT *)pRect);
-    ClientToScreen(hwnd,(POINT *)(((long)(void *)pRect)+sizeof(POINT)));
+    ClientToScreen(hwnd,reinterpret_cast<POINT*>(pRect));
+    ClientToScreen(hwnd,reinterpret_cast<POINT*>(reinterpret_cast<char*>(pRect)+sizeof(POINT)));
 }
 
@@ -556 +556 @@
 
     ICONINFO IconInfo;
-    GetIconInfo(hBaseIcon,&IconInfo);
-
+    if(GetIconInfo(hBaseIcon,&IconInfo) == FALSE){
+        return 0;
+    }
 
     //ビットマップを加工
     BITMAP Bitmap;
-    GetObject(IconInfo.hbmColor,sizeof(Bitmap),&Bitmap);
+    if(GetObject(IconInfo.hbmColor,sizeof(Bitmap),&Bitmap) == 0){
+        return 0;
+    }
 
     BITMAPINFO BitmapInfo;
@@ -572 +575 @@
     BitmapInfo.bmiHeader.biCompression=BI_RGB;
 
-    HDC hdc;
-    hdc=GetDC(GetDesktopWindow());
-
-    BYTE *pByte;
-    pByte=(BYTE *)HeapAlloc(hHeap,0,Bitmap.bmWidth*Bitmap.bmHeight*sizeof(COLORREF));
+    HDC hdc=GetDC(0);
+
+    BYTE *pByte=(BYTE *)HeapAlloc(hHeap,0,Bitmap.bmWidth*Bitmap.bmHeight*sizeof(COLORREF));
+    if(pByte==0){
+        return 0;
+    }
     GetDIBits(hdc,
         IconInfo.hbmColor,
@@ -741 +745 @@
     extern FWINLAYER pSetLayeredWindowAttributes;
     extern HINSTANCE hUser32Lib;
-    hUser32Lib=LoadLibrary("user32.dll");
-    pSetLayeredWindowAttributes=(FWINLAYER)GetProcAddress(hUser32Lib,"pSetLayeredWindowAttributes");
+    hUser32Lib=GetModuleHandle("user32.dll");
+    pSetLayeredWindowAttributes=reinterpret_cast<FWINLAYER>(GetProcAddress(hUser32Lib,"SetLayeredWindowAttributes"));
 
 
@@ -1165 +1169 @@
     FreeLibrary(hIconResInst);
     FreeLibrary(hLib_LuxCtrl);
-
-    //アルファブレンド用のAPIを解放
-    extern HINSTANCE hUser32Lib;
-    FreeLibrary(hUser32Lib);
 }
 
@@ -1253 +1253 @@
             }
             else{
-                if(hFind=FindFirstFile(MdiInfo[WndNum]->path.c_str(),&wfd)){
-                    if(hFind==INVALID_HANDLE_VALUE){
-                        if(!SaveDocument(hChild,NULL)) return 0;
-                    }
-                    else FindClose(hFind);
+                hFind=FindFirstFile(MdiInfo[WndNum]->path.c_str(),&wfd);
+                if(hFind==INVALID_HANDLE_VALUE){
+                    if(!SaveDocument(hChild,NULL)) return 0;
                 }
+                else FindClose(hFind);
             }
         }