変数名を変更。

[tpi/lychee.git] / src / plugin / eggArc / eggArc.cpp

diff --git a/src/plugin/eggArc/eggArc.cpp b/src/plugin/eggArc/eggArc.cpp
index ce85a7e..9b2e6a6 100644 (file)
--- a/src/plugin/eggArc/eggArc.cpp
+++ b/src/plugin/eggArc/eggArc.cpp
@@ -46,12 +46,12 @@ UINT __cdecl CallbackProc(void * user, UINT code, void* param)
 {\r
        // 構造体を初期化。\r
        static TPI_PROCESSINFO piInfo;\r
-       piInfo.uMessage = TPI_MESSAGE_STATUS;\r
+       piInfo.eMessage = TPI_MESSAGE_STATUS;\r
 \r
        switch (code)\r
        {\r
        case eggevent::Start::CODE:\r
-               piInfo.uStatus = TPI_STATUS_OPENARCHIVE;\r
+               piInfo.eStatus = TPI_STATUS_OPENARCHIVE;\r
                break;\r
        case eggevent::Extract::CODE:\r
        {\r
@@ -69,25 +69,25 @@ UINT __cdecl CallbackProc(void * user, UINT code, void* param)
                return EGG_ERROR_SUCCESS;\r
        }\r
        case eggevent::ActivityStart::CODE:\r
-               piInfo.uStatus = TPI_STATUS_BEGINPROCESS;\r
+               piInfo.eStatus = TPI_STATUS_BEGINPROCESS;\r
                GetFileInformation(* (void **) user, & piInfo.fiInfo, ((eggevent::ActivityStart *) param)->index == 0);\r
                break;\r
        case eggevent::Progress::CODE:\r
-               piInfo.uStatus = TPI_STATUS_INPROCESS;\r
-               piInfo.llProcessedSize = ((eggevent::Progress *) param)->current * (piInfo.fiInfo.llUnpackedSize / 10000);\r
+               piInfo.eStatus = TPI_STATUS_INPROCESS;\r
+               piInfo.nProcessedSize = ((eggevent::Progress *) param)->current * (piInfo.fiInfo.nUnpackedSize / 10000);\r
                break;\r
        case eggevent::ActivityFinish::CODE:\r
-               piInfo.uStatus = TPI_STATUS_ENDPROCESS;\r
+               piInfo.eStatus = TPI_STATUS_ENDPROCESS;\r
                break;\r
        case eggevent::Finish::CODE:\r
-               piInfo.uStatus = TPI_STATUS_CLOSEARCHIVE;\r
+               piInfo.eStatus = TPI_STATUS_CLOSEARCHIVE;\r
                break;\r
        case eggevent::QueryPassword::CODE:\r
        {\r
                // パスワード問い合わせ。\r
                // TODO : 個別ファイルに対する問い合わせの実装。\r
-               piInfo.uMessage = TPI_MESSAGE_ASK;\r
-               piInfo.uStatus  = TPI_PARAM_PASSWORD;\r
+               piInfo.eMessage = TPI_MESSAGE_ASK;\r
+               piInfo.eStatus  = TPI_PARAM_PASSWORD;\r
 \r
                // コールバック関数に送信。\r
                eggevent::QueryPassword * p = (eggevent::QueryPassword *) param;\r
@@ -191,8 +191,8 @@ int __stdcall GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst)
        _fiInfo->szSuffix     = wxT("egg;alz");\r
        _fiInfo->szEngineName = wxT("UnEGG32.dll");\r
        _fiInfo->szTPIName    = wxT("eggArc");\r
-       _fiInfo->llTypeId     = 0;\r
-       _fiInfo->llSupportedCommand = TPI_COMMAND_EXTRACT;\r
+       _fiInfo->nTypeId      = 0;\r
+       _fiInfo->eSupportedCommand = TPI_COMMAND_EXTRACT;\r
        _fiInfo->fArchive     = true;\r
        _fiInfo->fComment     = true;\r
        _fiInfo->fSFX         = true;\r
@@ -341,13 +341,13 @@ int __stdcall GetFileInformation
                        _fiInfo->dwAttribute |= TPI_ATTRIBUTE_ENCRYPTED;\r
                }\r
                _fiInfo->dwCRC32        = fhInfo.crc;\r
-               _fiInfo->llPackedSize   = fhInfo.packedSize;\r
-               _fiInfo->llUnpackedSize = fhInfo.unpackedSize;\r
+               _fiInfo->nPackedSize    = fhInfo.packedSize;\r
+               _fiInfo->nUnpackedSize  = fhInfo.unpackedSize;\r
                _fiInfo->tmModified     = fhInfo.lastModified;\r
                _fiInfo->szComment      = WC2String(fhInfo.comment);\r
                _fiInfo->szStoredName   = WC2String(fhInfo.fileName);\r
                _fiInfo->szMethod       = fhInfo.method == 2 ? wxT("ALZ") : fhInfo.method == 0 ? wxT("EGG") : wxT("unknown");\r
-               _fiInfo->llFileId       = s_nFileId++;\r
+               _fiInfo->nFileId        = s_nFileId++;\r
                _fiInfo->fnFileName     = wxFileName(_fiInfo->szStoredName);\r
        }\r
 \r
@@ -366,13 +366,13 @@ int __stdcall GetArchiveInformation
 \r
 int __stdcall Command\r
 (\r
-       unsigned int _uCommand,\r
+       wxULongLong_t _eCommand,\r
        TPI_SWITCHES * _swInfo,\r
        const wxString & _szArcName,\r
        const wxArrayString & _szFiles\r
 )\r
 {\r
-       if (_uCommand != TPI_COMMAND_EXTRACT)\r
+       if (_eCommand != TPI_COMMAND_EXTRACT)\r
        {\r
                return TPI_ERROR_U_USE_LIBRARY;\r
        }\r