Tera TermRevision: 7977
https://osdn.net/projects/ttssh2/scm/svn/commits/7977
Author: zmatsuo
Date: 2019-08-17 00:07:18 +0900 (Sat, 17 Aug 2019)
Log Message:
-----------
画像ファイル読み込みでRelease対象を誤っていたので修正
- 64bitビルドでクラッシュした
- 32bitビルドではなぜか問題なく動作していた
Modified Paths:
--------------
trunk/teraterm/teraterm/vtdisp.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2019-08-16 13:49:20 UTC (rev 7976)
+++ trunk/teraterm/teraterm/vtdisp.c 2019-08-16 15:07:18 UTC (rev 7977)
@@ -195,7 +195,7 @@
static BOOL (WINAPI *BGAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION);
-static HBITMAP GetBitmapHandle(char *File);
+static HBITMAP GetBitmapHandle(const char *File);
//\x95֗\x98\x8A\x94\x81\x99
@@ -730,7 +730,7 @@
// (2011.8.3 yutaka)
// cf. http://www.geocities.jp/ccfjd821/purogu/wpe-ji9.html
// \x82\xB1\x82̊\x94\x82\xCD Windows 2000 \x96\xA2\x96\x9E\x82̏ꍇ\x82ɂ͌Ă\xF1\x82ł͂\xA2\x82\xAF\x82Ȃ\xA2
-static HBITMAP GetBitmapHandle(char *File)
+static HBITMAP GetBitmapHandle(const char *File)
{
OLE_HANDLE hOle = 0;
IStream *iStream=NULL;
@@ -744,7 +744,7 @@
hFile=CreateFile(File,GENERIC_READ,0,NULL,OPEN_EXISTING,0,NULL);
if (hFile == INVALID_HANDLE_VALUE) {
- return (hBitmap);
+ return NULL;
}
nFileSize=GetFileSize(hFile,NULL);
hMem=GlobalAlloc(GMEM_MOVEABLE,nFileSize);
@@ -763,9 +763,9 @@
// \x83v\x83\x8D\x83O\x83\x89\x83\x80\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
// (2015.12.5 yutaka)
if (iPicture == NULL)
- return (hBitmap);
+ return NULL;
- iStream->lpVtbl->Release((IStream *)iPicture);
+ iStream->lpVtbl->Release(iStream);
iPicture->lpVtbl->get_Type(iPicture,&type);
if(type==PICTYPE_BITMAP){
@@ -774,7 +774,7 @@
hBitmap=(HBITMAP)hOle;
- return (hBitmap);
+ return hBitmap;
}
// \x90\xFC\x8C`\x95⊮\x96@\x82ɂ\xE6\x82\xE8\x94\xE4\x8Ar\x93I\x91N\x96\xBE\x82Ƀr\x83b\x83g\x83}\x83b\x83v\x82\xF0\x8Ag\x91\xE5\x81E\x8Fk\x8F\xAC\x82\xB7\x82\xE9\x81B