OSDN Git Service

Add files to create 64bit packages.
[ffftp/ffftp.git] / misc.c
diff --git a/misc.c b/misc.c
index ef3cf8e..9bb301f 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -76,6 +76,9 @@ extern HWND hHelpWin;
 \r
 static DIALOGDATA *DialogData;         /* 入力ダイアログデータ */\r
 static int HelpPage;\r
+// 高DPI対応\r
+static int DisplayDPIX;\r
+static int DisplayDPIY;\r
 \r
 \r
 \r
@@ -805,18 +808,44 @@ int AskDirLevel(char *Path)
 \r
 void MakeSizeString(double Size, char *Buf)\r
 {\r
-       if(Size >= (1024*1024))\r
+       // 修正\r
+//     if(Size >= (1024*1024))\r
+//     {\r
+//             Size /= (1024*1024);\r
+//             sprintf(Buf, "%.2fM Bytes", Size);\r
+//     }\r
+//     else if (Size >= 1024)\r
+//     {\r
+//             Size /= 1024;\r
+//             sprintf(Buf, "%.2fK Bytes", Size);\r
+//     }\r
+//     else\r
+//             sprintf(Buf, "%.0f Bytes", Size);\r
+       if(Size >= 1024.0)\r
        {\r
-               Size /= (1024*1024);\r
-               sprintf(Buf, "%.2fM Bytes", Size);\r
-       }\r
-       else if (Size >= 1024)\r
-       {\r
-               Size /= 1024;\r
-               sprintf(Buf, "%.2fK Bytes", Size);\r
+               Size /= 1024.0;\r
+               if(Size >= 1024.0)\r
+               {\r
+                       Size /= 1024.0;\r
+                       if(Size >= 1024.0)\r
+                       {\r
+                               Size /= 1024.0;\r
+                               if(Size >= 1024.0)\r
+                               {\r
+                                       Size /= 1024.0;\r
+                                       sprintf(Buf, "%.2lfT Bytes", Size);\r
+                               }\r
+                               else\r
+                                       sprintf(Buf, "%.2lfG Bytes", Size);\r
+                       }\r
+                       else\r
+                               sprintf(Buf, "%.2lfM Bytes", Size);\r
+               }\r
+               else\r
+                       sprintf(Buf, "%.2lfK Bytes", Size);\r
        }\r
        else\r
-               sprintf(Buf, "%.0f Bytes", Size);\r
+               sprintf(Buf, "%.0lf Bytes", Size);\r
 \r
        return;\r
 }\r
@@ -1110,7 +1139,12 @@ int TimeString2FileTime(char *Time, FILETIME *Buf)
                else\r
                        sTime.wHour = atoi(Time + 12);\r
                sTime.wMinute = atoi(Time + 14);\r
-               sTime.wSecond = 0;\r
+               // タイムスタンプのバグ修正\r
+//             sTime.wSecond = 0;\r
+               if(strlen(Time) >= 19)\r
+                       sTime.wSecond = atoi(Time + 17);\r
+               else\r
+                       sTime.wSecond = 0;\r
                sTime.wMilliseconds = 0;\r
 \r
                SystemTimeToFileTime(&sTime, &fTime);\r
@@ -1132,7 +1166,9 @@ int TimeString2FileTime(char *Time, FILETIME *Buf)
 *              なし\r
 *----------------------------------------------------------------------------*/\r
 \r
-void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist)\r
+// タイムスタンプのバグ修正\r
+//void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist)\r
+void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist, int ShowSeconds)\r
 {\r
        SYSTEMTIME sTime;\r
        FILETIME fTime;\r
@@ -1142,19 +1178,45 @@ void FileTime2TimeString(FILETIME *Time, char *Buf, int Mode, int InfoExist)
                if((Time->dwLowDateTime == 0) && (Time->dwHighDateTime == 0))\r
                        InfoExist = 0;\r
 \r
-               /* "yyyy/mm/dd hh:mm" */\r
+               // タイムスタンプのバグ修正\r
+//             /* "yyyy/mm/dd hh:mm" */\r
+               /* "yyyy/mm/dd hh:mm:ss" */\r
                FileTimeToLocalFileTime(Time, &fTime);\r
                FileTimeToSystemTime(&fTime, &sTime);\r
 \r
-               if(InfoExist & FINFO_DATE)\r
-                       sprintf(Buf, "%04d/%02d/%02d ", sTime.wYear, sTime.wMonth, sTime.wDay);\r
-               else\r
-                       sprintf(Buf, "           ");\r
-\r
-               if(InfoExist & FINFO_TIME)\r
-                       sprintf(Buf+11, "%2d:%02d", sTime.wHour, sTime.wMinute);\r
+               // タイムスタンプのバグ修正\r
+//             if(InfoExist & FINFO_DATE)\r
+//                     sprintf(Buf, "%04d/%02d/%02d ", sTime.wYear, sTime.wMonth, sTime.wDay);\r
+//             else\r
+//                     sprintf(Buf, "           ");\r
+//\r
+//             if(InfoExist & FINFO_TIME)\r
+//                     sprintf(Buf+11, "%2d:%02d", sTime.wHour, sTime.wMinute);\r
+//             else\r
+//                     sprintf(Buf+11, "     ");\r
+               if(InfoExist & (FINFO_DATE | FINFO_TIME))\r
+               {\r
+                       if(InfoExist & FINFO_DATE)\r
+                               sprintf(Buf, "%04d/%02d/%02d ", sTime.wYear, sTime.wMonth, sTime.wDay);\r
+                       else\r
+                               sprintf(Buf, "           ");\r
+                       if(ShowSeconds == YES)\r
+                       {\r
+                               if(InfoExist & FINFO_TIME)\r
+                                       sprintf(Buf+11, "%2d:%02d:%02d", sTime.wHour, sTime.wMinute, sTime.wSecond);\r
+                               else\r
+                                       sprintf(Buf+11, "        ");\r
+                       }\r
+                       else\r
+                       {\r
+                               if(InfoExist & FINFO_TIME)\r
+                                       sprintf(Buf+11, "%2d:%02d", sTime.wHour, sTime.wMinute);\r
+                               else\r
+                                       sprintf(Buf+11, "     ");\r
+                       }\r
+               }\r
                else\r
-                       sprintf(Buf+11, "     ");\r
+                       Buf[0] = NUL;\r
        }\r
        else\r
        {\r
@@ -1207,28 +1269,59 @@ int AttrString2Value(char *Str)
 \r
        Ret = 0;\r
        memset(Tmp, 0, 10);\r
-       strncpy(Tmp, Str, 9);\r
-\r
-       if(Tmp[0] != '-')\r
-               Ret |= 0x400;\r
-       if(Tmp[1] != '-')\r
-               Ret |= 0x200;\r
-       if(Tmp[2] != '-')\r
-               Ret |= 0x100;\r
-\r
-       if(Tmp[3] != '-')\r
-               Ret |= 0x40;\r
-       if(Tmp[4] != '-')\r
-               Ret |= 0x20;\r
-       if(Tmp[5] != '-')\r
-               Ret |= 0x10;\r
-\r
-       if(Tmp[6] != '-')\r
-               Ret |= 0x4;\r
-       if(Tmp[7] != '-')\r
-               Ret |= 0x2;\r
-       if(Tmp[8] != '-')\r
-               Ret |= 0x1;\r
+       // ファイルの属性を数字で表示\r
+//     strncpy(Tmp, Str, 9);\r
+//\r
+//     if(Tmp[0] != '-')\r
+//             Ret |= 0x400;\r
+//     if(Tmp[1] != '-')\r
+//             Ret |= 0x200;\r
+//     if(Tmp[2] != '-')\r
+//             Ret |= 0x100;\r
+//\r
+//     if(Tmp[3] != '-')\r
+//             Ret |= 0x40;\r
+//     if(Tmp[4] != '-')\r
+//             Ret |= 0x20;\r
+//     if(Tmp[5] != '-')\r
+//             Ret |= 0x10;\r
+//\r
+//     if(Tmp[6] != '-')\r
+//             Ret |= 0x4;\r
+//     if(Tmp[7] != '-')\r
+//             Ret |= 0x2;\r
+//     if(Tmp[8] != '-')\r
+//             Ret |= 0x1;\r
+       if(strlen(Str) >= 9)\r
+       {\r
+               strncpy(Tmp, Str, 9);\r
+\r
+               if(Tmp[0] != '-')\r
+                       Ret |= 0x400;\r
+               if(Tmp[1] != '-')\r
+                       Ret |= 0x200;\r
+               if(Tmp[2] != '-')\r
+                       Ret |= 0x100;\r
+\r
+               if(Tmp[3] != '-')\r
+                       Ret |= 0x40;\r
+               if(Tmp[4] != '-')\r
+                       Ret |= 0x20;\r
+               if(Tmp[5] != '-')\r
+                       Ret |= 0x10;\r
+\r
+               if(Tmp[6] != '-')\r
+                       Ret |= 0x4;\r
+               if(Tmp[7] != '-')\r
+                       Ret |= 0x2;\r
+               if(Tmp[8] != '-')\r
+                       Ret |= 0x1;\r
+       }\r
+       else if(strlen(Str) >= 3)\r
+       {\r
+               strncpy(Tmp, Str, 3);\r
+               Ret = strtol(Tmp, NULL, 16);\r
+       }\r
 \r
        return(Ret);\r
 }\r
@@ -1244,30 +1337,62 @@ int AttrString2Value(char *Str)
 *              int 値\r
 *----------------------------------------------------------------------------*/\r
 \r
-void AttrValue2String(int Attr, char *Buf)\r
+// ファイルの属性を数字で表示\r
+//void AttrValue2String(int Attr, char *Buf)\r
+void AttrValue2String(int Attr, char *Buf, int ShowNumber)\r
 {\r
-       strcpy(Buf, "---------");\r
-\r
-       if(Attr & 0x400)\r
-               Buf[0] = 'r';\r
-       if(Attr & 0x200)\r
-               Buf[1] = 'w';\r
-       if(Attr & 0x100)\r
-               Buf[2] = 'x';\r
-\r
-       if(Attr & 0x40)\r
-               Buf[3] = 'r';\r
-       if(Attr & 0x20)\r
-               Buf[4] = 'w';\r
-       if(Attr & 0x10)\r
-               Buf[5] = 'x';\r
-\r
-       if(Attr & 0x4)\r
-               Buf[6] = 'r';\r
-       if(Attr & 0x2)\r
-               Buf[7] = 'w';\r
-       if(Attr & 0x1)\r
-               Buf[8] = 'x';\r
+       // ファイルの属性を数字で表示\r
+//     strcpy(Buf, "---------");\r
+//\r
+//     if(Attr & 0x400)\r
+//             Buf[0] = 'r';\r
+//     if(Attr & 0x200)\r
+//             Buf[1] = 'w';\r
+//     if(Attr & 0x100)\r
+//             Buf[2] = 'x';\r
+//\r
+//     if(Attr & 0x40)\r
+//             Buf[3] = 'r';\r
+//     if(Attr & 0x20)\r
+//             Buf[4] = 'w';\r
+//     if(Attr & 0x10)\r
+//             Buf[5] = 'x';\r
+//\r
+//     if(Attr & 0x4)\r
+//             Buf[6] = 'r';\r
+//     if(Attr & 0x2)\r
+//             Buf[7] = 'w';\r
+//     if(Attr & 0x1)\r
+//             Buf[8] = 'x';\r
+       if(ShowNumber == YES)\r
+       {\r
+               sprintf(Buf, "%03x", Attr);\r
+       }\r
+       else\r
+       {\r
+               strcpy(Buf, "---------");\r
+\r
+               if(Attr & 0x400)\r
+                       Buf[0] = 'r';\r
+               if(Attr & 0x200)\r
+                       Buf[1] = 'w';\r
+               if(Attr & 0x100)\r
+                       Buf[2] = 'x';\r
+\r
+               if(Attr & 0x40)\r
+                       Buf[3] = 'r';\r
+               if(Attr & 0x20)\r
+                       Buf[4] = 'w';\r
+               if(Attr & 0x10)\r
+                       Buf[5] = 'x';\r
+\r
+               if(Attr & 0x4)\r
+                       Buf[6] = 'r';\r
+               if(Attr & 0x2)\r
+                       Buf[7] = 'w';\r
+               if(Attr & 0x1)\r
+                       Buf[8] = 'x';\r
+       }\r
 \r
        return;\r
 }\r
@@ -1841,3 +1966,76 @@ void CalcExtentSize(TRANSPACKET *Pkt, LONGLONG Size)
        }\r
 }\r
 #endif\r
+\r
+// 高DPI対応\r
+void QueryDisplayDPI()\r
+{\r
+       HDC hDC;\r
+       if(DisplayDPIX == 0)\r
+       {\r
+               if(hDC = GetDC(NULL))\r
+               {\r
+                       DisplayDPIX = GetDeviceCaps(hDC, LOGPIXELSX);\r
+                       DisplayDPIY = GetDeviceCaps(hDC, LOGPIXELSY);\r
+                       ReleaseDC(NULL, hDC);\r
+               }\r
+       }\r
+}\r
+\r
+int CalcPixelX(int x)\r
+{\r
+       QueryDisplayDPI();\r
+       return (x * DisplayDPIX + 96 / 2) / 96;\r
+}\r
+\r
+int CalcPixelY(int y)\r
+{\r
+       QueryDisplayDPI();\r
+       return (y * DisplayDPIY + 96 / 2) / 96;\r
+}\r
+\r
+HBITMAP ResizeBitmap(HBITMAP hBitmap, int UnitSizeX, int UnitSizeY, int ScaleNumerator, int ScaleDenominator)\r
+{\r
+       HBITMAP hDstBitmap;\r
+       HDC hDC;\r
+       HDC hSrcDC;\r
+       HDC hDstDC;\r
+       BITMAP Bitmap;\r
+       HGDIOBJ hSrcOld;\r
+       HGDIOBJ hDstOld;\r
+       int Width;\r
+       int Height;\r
+       hDstBitmap = NULL;\r
+       if(hDC = GetDC(NULL))\r
+       {\r
+               if(hSrcDC = CreateCompatibleDC(hDC))\r
+               {\r
+                       if(hDstDC = CreateCompatibleDC(hDC))\r
+                       {\r
+                               if(GetObject(hBitmap, sizeof(BITMAP), &Bitmap) > 0)\r
+                               {\r
+                                       if(UnitSizeX == 0)\r
+                                               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
+                                       if(hDstBitmap = CreateCompatibleBitmap(hDC, Width, Height))\r
+                                       {\r
+                                               hSrcOld = SelectObject(hSrcDC, hBitmap);\r
+                                               hDstOld = SelectObject(hDstDC, hDstBitmap);\r
+                                               SetStretchBltMode(hDstDC, HALFTONE);\r
+                                               StretchBlt(hDstDC, 0, 0, Width, Height, hSrcDC, 0, 0, Bitmap.bmWidth, Bitmap.bmHeight, SRCCOPY);\r
+                                               SelectObject(hSrcDC, hSrcOld);\r
+                                               SelectObject(hDstDC, hDstOld);\r
+                                       }\r
+                               }\r
+                               DeleteDC(hDstDC);\r
+                       }\r
+                       DeleteDC(hSrcDC);\r
+               }\r
+               ReleaseDC(NULL, hDC);\r
+       }\r
+       return hDstBitmap;\r
+}\r
+\r