Fix bugs of automatic software update.

[ffftp/ffftp.git] / misc.c

diff --git a/misc.c b/misc.c
index 9bb301f..02355e3 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -262,6 +262,27 @@ INT_PTR CALLBACK ExeEscTextDialogProc(HWND hDlg, UINT message, WPARAM wParam, LP
 }\r
 \r
 \r
+// 全設定暗号化対応\r
+// 何らかのボタンが押されたときに終了\r
+INT_PTR CALLBACK AnyButtonDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)\r
+{\r
+       switch (message)\r
+       {\r
+               case WM_INITDIALOG :\r
+                       return(TRUE);\r
+\r
+               case WM_COMMAND :\r
+                       switch(GET_WM_COMMAND_CMD(wParam, lParam))\r
+                       {\r
+                               case BN_CLICKED :\r
+                                       EndDialog(hDlg, GET_WM_COMMAND_ID(wParam, lParam));\r
+                                       break;\r
+                       }\r
+                       return(TRUE);\r
+       }\r
+    return(FALSE);\r
+}\r
+\r
 /*----- 文字列の最後に "\" を付ける -------------------------------------------\r
 *\r
 *      Parameter\r
@@ -1422,7 +1443,7 @@ void FormatIniString(char *Str)
 \r
        while(*Str != NUL)\r
        {\r
-               if((*Str != 0x22) && (*Str != '\n'))\r
+               if((*Str != '\"') && (*Str != '\n'))\r
                        *Put++ = *Str;\r
                Str++;\r
        }\r
@@ -2018,13 +2039,13 @@ HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNum
                                                UnitSizeX = Bitmap.bmWidth;\r
                                        if(UnitSizeY == 0)\r
                                                UnitSizeY = Bitmap.bmHeight;\r
-                                       Width = (Bitmap.bmWidth / UnitSizeX) * ((CalcPixelX(UnitSizeX) * ScaleNumerator) / ScaleDenominator);\r
-                                       Height = (Bitmap.bmHeight / UnitSizeY) * ((CalcPixelY(UnitSizeY) * ScaleNumerator) / ScaleDenominator);\r
+                                       Width = (Bitmap.bmWidth / UnitSizeX) * CalcPixelX((UnitSizeX * ScaleNumerator) / ScaleDenominator);\r
+                                       Height = (Bitmap.bmHeight / UnitSizeY) * CalcPixelY((UnitSizeY * ScaleNumerator) / ScaleDenominator);\r
                                        if(hDstBitmap = CreateCompatibleBitmap(hDC, Width, Height))\r
                                        {\r
                                                hSrcOld = SelectObject(hSrcDC, hBitmap);\r
                                                hDstOld = SelectObject(hDstDC, hDstBitmap);\r
-                                               SetStretchBltMode(hDstDC, HALFTONE);\r
+                                               SetStretchBltMode(hDstDC, COLORONCOLOR);\r
                                                StretchBlt(hDstDC, 0, 0, Width, Height, hSrcDC, 0, 0, Bitmap.bmWidth, Bitmap.bmHeight, SRCCOPY);\r
                                                SelectObject(hSrcDC, hSrcOld);\r
                                                SelectObject(hDstDC, hDstOld);\r