_fiInfo->fMMOptimize = false;\r
_fiInfo->fMultiVolume = false;\r
_fiInfo->fSolid = false;\r
- _fiInfo->sCompressLevelMin = 0;\r
- _fiInfo->sCompressLevelMax = 0;\r
- _fiInfo->sRecoveryRecordMin = 0;\r
- _fiInfo->sRecoveryRecordMax = 0;\r
+ _fiInfo->nCompressLevelMin = 0;\r
+ _fiInfo->nCompressLevelMax = 0;\r
+ _fiInfo->nRecoveryRecordMin = 0;\r
+ _fiInfo->nRecoveryRecordMax = 0;\r
_fiInfo->szTypeName.Clear();\r
_fiInfo->szSuffix.Clear();\r
_fiInfo->szEngineName.Clear();\r
_fiInfo->szTPIName.Clear();\r
- _fiInfo->llSupportedCommand = 0;\r
- _fiInfo->llTypeId = 0;\r
+ _fiInfo->eSupportedCommand = 0;\r
+ _fiInfo->nTypeId = 0;\r
_fiInfo->pCustomInfo = NULL;\r
\r
GetAPIAddress("GetFormatInformation", p);\r
_fiInfo->tmAccess = 0;\r
_fiInfo->tmCreate = 0;\r
_fiInfo->tmModified = 0;\r
- _fiInfo->uDanger = 0;\r
- _fiInfo->uOSType = 0;\r
- _fiInfo->llPackedSize = 0;\r
- _fiInfo->llUnpackedSize = 0;\r
+ _fiInfo->eDanger = 0;\r
+ _fiInfo->eOSType = 0;\r
+ _fiInfo->nPackedSize = 0;\r
+ _fiInfo->nUnpackedSize = 0;\r
_fiInfo->fnFileName.Clear();\r
_fiInfo->szStoredName.Clear();\r
_fiInfo->szMethod.Clear();\r
_fiInfo->szComment.Clear();\r
_fiInfo->wCompressRatio = 0;\r
- _fiInfo->llFileId = 0;\r
+ _fiInfo->nFileId = 0;\r
_fiInfo->pCustomInfo = NULL;\r
\r
GetAPIAddress("GetFileInformation", p);\r
}\r
\r
// Initialization.\r
+ _aiInfo->fSFX = false;\r
_aiInfo->fSolid = false;\r
_aiInfo->fMMOptimize = false;\r
_aiInfo->fEncryptData = false;\r
_aiInfo->fEncryptHeader = false;\r
- _aiInfo->sCompressLevel = 0;\r
- _aiInfo->sRecoveryRecord= 0;\r
+ _aiInfo->nCompressLevel = 0;\r
+ _aiInfo->nRecoveryRecord= 0;\r
_aiInfo->tmAccess = 0;\r
_aiInfo->tmCreate = 0;\r
_aiInfo->tmModified = 0;\r
- _aiInfo->nSFXType = 0;\r
- _aiInfo->uOSType = 0;\r
- _aiInfo->llFileSize = 0;\r
- _aiInfo->llPackedSize = 0;\r
- _aiInfo->llReadSize = 0;\r
- _aiInfo->llUnpackedSize = 0;\r
- _aiInfo->llSplitSize = 0;\r
+ _aiInfo->eOSType = 0;\r
+ _aiInfo->nFileSize = 0;\r
+ _aiInfo->nPackedSize = 0;\r
+ _aiInfo->nReadSize = 0;\r
+ _aiInfo->nUnpackedSize = 0;\r
+ _aiInfo->nSplitSize = 0;\r
_aiInfo->fnArchive.Clear();\r
_aiInfo->szComment.Clear();\r
_aiInfo->wCompressRatio = 0;\r
_aiInfo->fiInfo.fMMOptimize = false;\r
_aiInfo->fiInfo.fMultiVolume = false;\r
_aiInfo->fiInfo.fSolid = false;\r
- _aiInfo->fiInfo.sCompressLevelMin = 0;\r
- _aiInfo->fiInfo.sCompressLevelMax = 0;\r
- _aiInfo->fiInfo.sRecoveryRecordMin = 0;\r
- _aiInfo->fiInfo.sRecoveryRecordMax = 0;\r
+ _aiInfo->fiInfo.nCompressLevelMin = 0;\r
+ _aiInfo->fiInfo.nCompressLevelMax = 0;\r
+ _aiInfo->fiInfo.nRecoveryRecordMin = 0;\r
+ _aiInfo->fiInfo.nRecoveryRecordMax = 0;\r
_aiInfo->fiInfo.szTypeName.Clear();\r
_aiInfo->fiInfo.szSuffix.Clear();\r
_aiInfo->fiInfo.szEngineName.Clear();\r
_aiInfo->fiInfo.szTPIName.Clear();\r
- _aiInfo->fiInfo.llSupportedCommand = 0;\r
- _aiInfo->fiInfo.llTypeId = 0;\r
+ _aiInfo->fiInfo.eSupportedCommand = 0;\r
+ _aiInfo->fiInfo.nTypeId = 0;\r
_aiInfo->fiInfo.pCustomInfo = NULL;\r
\r
GetAPIAddress("GetArchiveInformation", p);\r
return this->nErrorCode == TPI_ERROR_SUCCESS;\r
}\r
\r
-bool TPIHandle::Command(unsigned int _uCommand, TPI_SWITCHES * _swInfo, const wxString & _szArcName, const wxArrayString & _szFiles)\r
+bool TPIHandle::Command(wxULongLong_t _eCommand, TPI_SWITCHES * _swInfo, const wxString & _szArcName, const wxArrayString & _szFiles)\r
{\r
this->nErrorCode = TPI_ERROR_SUCCESS;\r
GetAPIAddress("Command", p);\r
- this->nErrorCode = ((int (__stdcall *)(unsigned int, TPI_SWITCHES *, const wxString &, const wxArrayString &)) p)(_uCommand, _swInfo, _szArcName, _szFiles);\r
+ this->nErrorCode = ((int (__stdcall *)(wxULongLong_t, TPI_SWITCHES *, const wxString &, const wxArrayString &)) p)(_eCommand, _swInfo, _szArcName, _szFiles);\r
return this->nErrorCode == TPI_ERROR_SUCCESS;\r
}\r
\r
bool GetFileInformation(TPI_FILEINFO *, bool);\r
bool GetArchiveInformation(TPI_ARCHIVEINFO *);\r
\r
- bool Command(unsigned int, TPI_SWITCHES *, const wxString &, const wxArrayString &);\r
+ bool Command(wxULongLong_t, TPI_SWITCHES *, const wxString &, const wxArrayString &);\r
\r
bool SetCallbackProc(TPI_PROC);\r
\r
\r
/**\r
* @defgroup c_process_common イベントコード\r
- * TPI_NOTIFY_COMMON 送信時に、TPI_PROCESSINFO 構造体の uMessage に格納される値。\r
+ * TPI_NOTIFY_COMMON 送信時に、TPI_PROCESSINFO 構造体の eMessage に格納される値。\r
* @sa TPI_NOTIFY_COMMON\r
- * @sa TPI_PROCESSINFO::uMessage\r
+ * @sa TPI_PROCESSINFO::eMessage\r
* @{\r
*/\r
/** 進捗状況についての情報を TPI_PROCESSINFO に格納。 */\r
\r
/**\r
* @defgroup c_process_common_status 進捗状況コード\r
- * TPI_MESSAGE_STATUS が送信された時に、TPI_PROCESSINFO 構造体の uStatus に格納される値。\r
+ * TPI_MESSAGE_STATUS が送信された時に、TPI_PROCESSINFO 構造体の eStatus に格納される値。\r
* @sa TPI_MESSAGE_STATUS\r
- * @sa TPI_PROCESSINFO::uStatus\r
+ * @sa TPI_PROCESSINFO::eStatus\r
* @{\r
*/\r
#define TPI_STATUS_OPENARCHIVE 0x0001 /**< 書庫を開いた。 */\r
\r
/**\r
* @defgroup c_process_common_param パラメータコード\r
- * TPI_MESSAGE_ASK が送信された時に、TPI_PROCESSINFO 構造体の uStatus に格納される値で、要求されているパラメータを示す値。\r
+ * TPI_MESSAGE_ASK が送信された時に、TPI_PROCESSINFO 構造体の eStatus に格納される値で、要求されているパラメータを示す値。\r
* @sa TPI_MESSAGE_STATUS\r
- * @sa TPI_PROCESSINFO::uStatus\r
+ * @sa TPI_PROCESSINFO::eStatus\r
* @{\r
*/\r
#define TPI_PARAM_PASSWORD 0x0001 /**< パスワード。 */\r
/** 対応形式についての情報を格納する構造体。 */\r
typedef struct _TPI_tagFORMATINFO\r
{\r
- bool fArchive; /**< 複数ファイル格納対応ならtrue */\r
- bool fComment; /**< コメント付加対応ならtrue */\r
- bool fEncryptKeyFile; /**< キーファイルによるデータ暗号化に対応しているならtrue */\r
- bool fEncryptPassword; /**< パスワードによるデータ暗号化に対応しているならtrue */\r
- bool fEncryptHeader; /**< ヘッダ暗号化に対応しているならtrue */\r
- bool fMMOptimize; /**< マルチメディアファイル最適化対応ならtrue */\r
- bool fMultiVolume; /**< 分割圧縮対応ならtrue */\r
- bool fSFX; /**< SFX作成対応ならtrue */\r
- bool fSolid; /**< Solid圧縮対応ならtrue */\r
- short sCompressLevelMin; /**< 圧縮レベルの最小値 */\r
- short sCompressLevelMax; /**< 圧縮レベルの最大値 */\r
- short sRecoveryRecordMin; /**< リカバリーレコードの最小値 */\r
- short sRecoveryRecordMax; /**< リカバリーレコードの最大値 */\r
- wxString szTypeName; /**< 形式名 */\r
- wxString szSuffix; /**< 拡張子。複数ある場合は;で区切る */\r
- wxString szEngineName; /**< 内部エンジン名 */\r
- wxString szTPIName; /**< TPI名 */\r
- wxULongLong_t llSupportedCommand; /**< 実装されているコマンドのフラグ */\r
- wxULongLong_t llTypeId; /**< 一意の形式ID */\r
- void * pCustomInfo; /**< 任意の情報を格納 */\r
+ bool fArchive; /**< 複数ファイル格納対応ならtrue */\r
+ bool fComment; /**< コメント付加対応ならtrue */\r
+ bool fEncryptKeyFile; /**< キーファイルによるデータ暗号化に対応しているならtrue */\r
+ bool fEncryptPassword; /**< パスワードによるデータ暗号化に対応しているならtrue */\r
+ bool fEncryptHeader; /**< ヘッダ暗号化に対応しているならtrue */\r
+ bool fMMOptimize; /**< マルチメディアファイル最適化対応ならtrue */\r
+ bool fMultiVolume; /**< 分割圧縮対応ならtrue */\r
+ bool fSFX; /**< SFX作成対応ならtrue */\r
+ bool fSolid; /**< Solid圧縮対応ならtrue */\r
+ unsigned short nCompressLevelMin; /**< 圧縮レベルの最小値 */\r
+ unsigned short nCompressLevelMax; /**< 圧縮レベルの最大値 */\r
+ unsigned short nRecoveryRecordMin; /**< リカバリーレコードの最小値 */\r
+ unsigned short nRecoveryRecordMax; /**< リカバリーレコードの最大値 */\r
+ wxULongLong_t nTypeId; /**< 一意の形式ID */\r
+ wxULongLong_t eSupportedCommand; /**< 実装されているコマンドのフラグ */\r
+ wxString szTypeName; /**< 形式名 */\r
+ wxString szSuffix; /**< 拡張子。複数ある場合は;で区切る */\r
+ wxString szEngineName; /**< 内部エンジン名 */\r
+ wxString szTPIName; /**< TPI名 */\r
+ void * pCustomInfo; /**< 任意の情報を格納 */\r
} TPI_FORMATINFO;\r
\r
/** 特定ファイルについての情報を格納する構造体。 */\r
typedef struct _TPI_tagFILEINFO\r
{\r
+ unsigned short eDanger; /**< セキュリティ警告 */\r
+ unsigned short eOSType; /**< 作成元OS */\r
+ unsigned short wCompressRatio; /**< 圧縮率 */\r
/** 属性 */\r
/** @sa c_file_attribute */\r
unsigned long dwAttribute;\r
- unsigned long dwCRC32; /**< CRC32 */\r
- wxDateTime tmAccess; /**< 最終参照日時 */\r
- wxDateTime tmCreate; /**< 作成日時 */\r
- wxDateTime tmModified; /**< 最終更新日時 */\r
- unsigned int uDanger; /**< セキュリティ警告 */\r
- unsigned int uOSType; /**< 作成元OS */\r
- wxULongLong_t llPackedSize; /**< 格納後のサイズ */\r
- wxULongLong_t llUnpackedSize; /**< 格納前のサイズ */\r
- wxFileName fnFileName; /**< ファイル名 */\r
- wxString szStoredName; /**< 格納された名前 */\r
- wxString szMethod; /**< 格納メソッド */\r
- wxString szComment; /**< コメント */\r
- unsigned short wCompressRatio; /**< 圧縮率 */\r
- wxULongLong_t llFileId; /**< 一意のファイルID */\r
- void * pCustomInfo; /**< 任意の情報を格納 */\r
+ unsigned long dwCRC32; /**< CRC32 */\r
+ wxULongLong_t nPackedSize; /**< 格納後のサイズ */\r
+ wxULongLong_t nUnpackedSize; /**< 格納前のサイズ */\r
+ wxULongLong_t nFileId; /**< 一意のファイルID */\r
+ wxDateTime tmAccess; /**< 最終参照日時 */\r
+ wxDateTime tmCreate; /**< 作成日時 */\r
+ wxDateTime tmModified; /**< 最終更新日時 */\r
+ wxFileName fnFileName; /**< ファイル名 */\r
+ wxString szStoredName; /**< 格納された名前 */\r
+ wxString szMethod; /**< 格納メソッド */\r
+ wxString szComment; /**< コメント */\r
+ void * pCustomInfo; /**< 任意の情報を格納 */\r
} TPI_FILEINFO;\r
\r
/** 書庫についての情報を格納する構造体。 */\r
typedef struct _TPI_tagARCHIVEINFO\r
{\r
- bool fSolid; /**< Solid圧縮されているならtrue */\r
- bool fMMOptimize; /**< マルチメディアファイルに最適化されているならtrue */\r
- bool fEncryptData; /**< データが暗号化されているならtrue */\r
- bool fEncryptHeader; /**< ヘッダが暗号化されているならtrue */\r
- short sCompressLevel; /**< 圧縮レベル(0-9) */\r
- short sRecoveryRecord; /**< リカバリーレコード(0-100) */\r
- wxDateTime tmAccess; /**< 最終参照日時 */\r
- wxDateTime tmCreate; /**< 作成日時 */\r
- wxDateTime tmModified; /**< 最終更新日時 */\r
- int nSFXType; /**< SFXの種類を表す一意の値 */\r
- unsigned int uOSType; /**< 作成元OS */\r
- wxULongLong_t llFileSize; /**< ファイルサイズ */\r
- wxULongLong_t llPackedSize; /**< 格納後のサイズ */\r
- wxULongLong_t llReadSize; /**< 読み込み済みサイズ */\r
- wxULongLong_t llUnpackedSize; /**< 格納前のサイズ */\r
- wxULongLong_t llSplitSize; /**< 分割サイズ */\r
- wxFileName fnArchive; /**< ファイル名 */\r
- wxString szComment; /**< コメント */\r
- unsigned short wCompressRatio; /**< 圧縮率 */\r
- TPI_FORMATINFO fiInfo; /**< 形式に関する情報を格納 */\r
- void * pCustomInfo; /**< 任意の情報を格納 */\r
+ bool fSFX; /**< SFXならtrue */\r
+ bool fSolid; /**< Solid圧縮されているならtrue */\r
+ bool fMMOptimize; /**< マルチメディアファイルに最適化されているならtrue */\r
+ bool fEncryptData; /**< データが暗号化されているならtrue */\r
+ bool fEncryptHeader; /**< ヘッダが暗号化されているならtrue */\r
+ unsigned short eOSType; /**< 作成元OS */\r
+ unsigned short nCompressLevel; /**< 圧縮レベル */\r
+ unsigned short nRecoveryRecord; /**< リカバリーレコード(0-100) */\r
+ unsigned short wCompressRatio; /**< 圧縮率 */\r
+ wxULongLong_t nFileSize; /**< ファイルサイズ */\r
+ wxULongLong_t nPackedSize; /**< 格納後のサイズ */\r
+ wxULongLong_t nReadSize; /**< 読み込み済みサイズ */\r
+ wxULongLong_t nUnpackedSize; /**< 格納前のサイズ */\r
+ wxULongLong_t nSplitSize; /**< 分割サイズ */\r
+ wxDateTime tmAccess; /**< 最終参照日時 */\r
+ wxDateTime tmCreate; /**< 作成日時 */\r
+ wxDateTime tmModified; /**< 最終更新日時 */\r
+ wxFileName fnArchive; /**< ファイル名 */\r
+ wxString szComment; /**< コメント */\r
+ TPI_FORMATINFO fiInfo; /**< 形式に関する情報を格納 */\r
+ void * pCustomInfo; /**< 任意の情報を格納 */\r
} TPI_ARCHIVEINFO;\r
\r
/** 処理についての基本情報を格納する構造体。 */\r
bool fSolid; /**< Solid圧縮をするならtrue */\r
bool fMMOptimize; /**< マルチメディアファイルに最適化するならtrue */\r
bool fEncryptHeader; /**< ヘッダを暗号化するならtrue */\r
+ unsigned short nCompressLevel; /**< 圧縮レベル */\r
+ unsigned short nRecoveryRecord; /**< リカバリーレコード(0-100) */\r
+ wxULongLong_t nArchiveType; /**< 書庫形式を表す一意の数値 */\r
+ wxULongLong_t nSplitSize; /**< 分割サイズ(0のときは分割しない) */\r
wxFileName fnDestinationDirectory; /**< 出力先ディレクトリ */\r
- short sCompressLevel; /**< 圧縮レベル(0-9) */\r
- short sRecoveryRecord; /**< リカバリーレコード(0-100) */\r
- wxULongLong_t llSplitSize; /**< 分割サイズ(0のときは分割しない) */\r
wxString szPassword; /**< パスワード */\r
wxString szKeyFile; /**< キーファイル */\r
wxString szComment; /**< コメント */\r
- int eArchiveType; /**< 書庫形式を表す一意の数値 */\r
void * pCustomSwitches; /**< 任意の情報を格納 */\r
} TPI_SWITCHES;\r
\r
{\r
/** イベントコード。 */\r
/** @sa c_process_common */\r
- unsigned int uMessage;\r
+ unsigned int eMessage;\r
/** 進捗状況コード。 */\r
/** @sa c_process_common_status */\r
- unsigned int uStatus;\r
+ unsigned int eStatus;\r
TPI_FILEINFO fiInfo; /**< 処理中のファイルに関する情報 */\r
- wxULongLong_t llProcessedSize; /**< 処理済サイズ */\r
+ wxULongLong_t nProcessedSize; /**< 処理済サイズ */\r
wxFileName fnDestination; /**< 出力先ファイル */\r
wxString szParam; /**< パラメータを格納 */\r
void * pCustomInfo; /**< 任意の情報を格納 */\r
// *****************************************************************************\r
\r
/** コールバック関数\r
- * @param _uMsg 処理コード。\r
+ * @param _eMsg 処理コード。\r
* @param _pInfo 処理コードにより異なる。\r
* @return コールバック関数の返し値。\r
* @sa c_process\r
* @sa c_callback_return\r
*/\r
-typedef int(__stdcall * TPI_PROC)(unsigned int _uMsg, void * _pInfo);\r
+typedef int(__stdcall * TPI_PROC)(unsigned int _eMsg, void * _pInfo);\r
\r
/// @} callback\r
\r
#endif\r
\r
/** プラグインに関する情報を取得。\r
- * @param _uInfoId 取得する情報を示す数値(情報コード)。\r
- * @param _llSubOption 情報コードにより異なる。\r
+ * @param _eInfoId 取得する情報を示す数値(情報コード)。\r
+ * @param _nSubOption 情報コードにより異なる。\r
* @param _pPtr 結果を格納するバッファへのポインタ。\r
* @return エラーコード。\r
* @sa c_info\r
*/\r
int __stdcall GetPluginInformation\r
(\r
- unsigned int _uInfoId,\r
- wxULongLong_t _llSubOption,\r
+ unsigned int _eInfoId,\r
+ wxULongLong_t _nSubOption,\r
void * _pPtr\r
);\r
\r
\r
/** プラグインを使用するための初期化を行う。\r
* @param _szArcName これから操作する対象となる書庫名。不明な場合はNULLを指定。\r
- * @param _llTypeId 書庫を作成する場合には、その格納形式IDを指定。それ以外の場合は0。\r
+ * @param _nTypeId 書庫を作成する場合には、その格納形式IDを指定。それ以外の場合は0。\r
* @return エラーコード。\r
*/\r
int __stdcall LoadPlugin\r
(\r
const wxString & _szArcName,\r
- wxULongLong_t _llTypeId\r
+ wxULongLong_t _nTypeId\r
);\r
\r
/** プラグインを解放する。\r
\r
/** プラグインが対応しているファイルかどうか確認する。\r
* @param _szArcName 確認する対象となる書庫名。\r
- * @param _llFileCount 書庫に格納されているファイル数を格納するためのポインタ。情報が不要ならばNULLを指定。\r
+ * @param _nFileCount 書庫に格納されているファイル数を格納するためのポインタ。情報が不要ならばNULLを指定。\r
* @return エラーコード。\r
*/\r
int __stdcall CheckArchive\r
(\r
const wxString & _szArcName,\r
- wxULongLong_t * _llFileCount\r
+ wxULongLong_t * _nFileCount\r
);\r
\r
/** 書庫のハンドルを取得する。\r
);\r
\r
/** 各種の書庫操作を行う。\r
- * @param _uCommand 書庫操作の種類を表すコマンドコード。\r
+ * @param _eCommand 書庫操作の種類を表すコマンドコード。\r
* @param _swInfo 書庫操作に必要な情報を格納した構造体へのポインタ。\r
* @param _szArcName 操作する対象となる書庫名。\r
* @param _szFiles 対象ファイル名のリスト。\r
*/\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
szCommandLineSend += wxT("\"") + asFiles[j] + wxT("\" ");\r
}\r
break;\r
- case wxT('4'): szCommandLineSend += wxString::Format(wxT("%d"), swInfo->sCompressLevel); break;\r
- case wxT('5'): szCommandLineSend += wxString::Format(wxT("%d"), swInfo->sRecoveryRecord); break;\r
+ case wxT('4'): szCommandLineSend += wxString::Format(wxT("%d"), swInfo->nCompressLevel); break;\r
+ case wxT('5'): szCommandLineSend += wxString::Format(wxT("%d"), swInfo->nRecoveryRecord); break;\r
case wxT('6'): szCommandLineSend += swInfo->szComment; break;\r
}\r
break;\r
case wxT('4'): szCommandLineSend += ProcessBool(swInfo->fEncryptHeader, szCommandLine, & i); break;\r
case wxT('5'): szCommandLineSend += ProcessBool(swInfo->szPassword != wxEmptyString,szCommandLine, & i, swInfo->szPassword); break;\r
case wxT('6'): szCommandLineSend += ProcessBool(swInfo->szKeyFile != wxEmptyString,szCommandLine, & i, swInfo->szKeyFile); break;\r
- case wxT('7'): szCommandLineSend += ProcessBool(swInfo->llSplitSize != 0, szCommandLine, & i, wxString::Format(wxT("%d"), swInfo->llSplitSize)); break;\r
+ case wxT('7'): szCommandLineSend += ProcessBool(swInfo->nSplitSize != 0, szCommandLine, & i, wxString::Format(wxT("%d"), swInfo->nSplitSize)); break;\r
}\r
break;\r
}\r
\r
#ifdef wxUSE_XML\r
#include <wx/xml/xml.h>\r
-#define CheckSupportedCommand(attr, value) if (xmlLibrary->HasProp(wxT(attr)) || xmlLibrary->HasProp(wxT(attr) wxT("-alt"))) _fiInfo->llSupportedCommand |= value\r
+#define CheckSupportedCommand(attr, value) if (xmlLibrary->HasProp(wxT(attr)) || xmlLibrary->HasProp(wxT(attr) wxT("-alt"))) _fiInfo->eSupportedCommand |= value\r
#define CheckSupportedSwitch(var, value) value = szCmdLine.Find(wxT(var)) != wxNOT_FOUND\r
\r
inline short GetNumValue(wxXmlNode * node, wxString szValue)\r
return (short) l;\r
}\r
\r
-inline void MakeFormatInfo(wxString szTPIName, TPI_FORMATINFO * _fiInfo, wxXmlNode * xmlLibrary, wxULongLong_t llId)\r
+inline void MakeFormatInfo(wxString szTPIName, TPI_FORMATINFO * _fiInfo, wxXmlNode * xmlLibrary, wxULongLong_t nId)\r
{\r
- _fiInfo->fArchive = xmlLibrary->GetPropVal(wxT("archive"), wxT("1")) == wxT("1");\r
- _fiInfo->szTypeName = xmlLibrary->GetPropVal(wxT("typename"),wxEmptyString);\r
- _fiInfo->szSuffix = xmlLibrary->GetPropVal(wxT("suffix"), wxEmptyString);\r
- _fiInfo->szEngineName = xmlLibrary->GetPropVal(wxT("name"), wxEmptyString);\r
- _fiInfo->szTPIName = szTPIName;\r
- _fiInfo->llTypeId = llId;\r
+ _fiInfo->fArchive = xmlLibrary->GetPropVal(wxT("archive"), wxT("1")) == wxT("1");\r
+ _fiInfo->szTypeName = xmlLibrary->GetPropVal(wxT("typename"),wxEmptyString);\r
+ _fiInfo->szSuffix = xmlLibrary->GetPropVal(wxT("suffix"), wxEmptyString);\r
+ _fiInfo->szEngineName = xmlLibrary->GetPropVal(wxT("name"), wxEmptyString);\r
+ _fiInfo->szTPIName = szTPIName;\r
+ _fiInfo->nTypeId = nId;\r
\r
// 対応コマンドを調査。\r
CheckSupportedCommand("create", TPI_COMMAND_CREATE);\r
CheckSupportedSwitch("a6", _fiInfo->fEncryptKeyFile);\r
CheckSupportedSwitch("a7", _fiInfo->fMultiVolume);\r
\r
- _fiInfo->sCompressLevelMin = GetNumValue(xmlLibrary, wxT("level-min"));\r
- _fiInfo->sCompressLevelMax = GetNumValue(xmlLibrary, wxT("level-max"));\r
- _fiInfo->sRecoveryRecordMin = GetNumValue(xmlLibrary, wxT("rr-min"));\r
- _fiInfo->sRecoveryRecordMax = GetNumValue(xmlLibrary, wxT("rr-max"));\r
+ _fiInfo->nCompressLevelMin = GetNumValue(xmlLibrary, wxT("level-min"));\r
+ _fiInfo->nCompressLevelMax = GetNumValue(xmlLibrary, wxT("level-max"));\r
+ _fiInfo->nRecoveryRecordMin = GetNumValue(xmlLibrary, wxT("rr-min"));\r
+ _fiInfo->nRecoveryRecordMax = GetNumValue(xmlLibrary, wxT("rr-max"));\r
}\r
\r
#endif\r
case 0:\r
return this->showFileInfo[i].fnFileName.GetFullName();\r
case 1:\r
- return wxString::Format(wxT("%d"), this->showFileInfo[i].llUnpackedSize);\r
+ return wxString::Format(wxT("%d"), this->showFileInfo[i].nUnpackedSize);\r
case 2:\r
- return wxString::Format(wxT("%d"), this->showFileInfo[i].llPackedSize);\r
+ return wxString::Format(wxT("%d"), this->showFileInfo[i].nPackedSize);\r
case 3:\r
return wxString::Format(wxT("%3.1f%%"), this->showFileInfo[i].wCompressRatio / 10.0);\r
case 4:\r
case 8:\r
return GetFileTypeName(this->showFileInfo[i].fnFileName);\r
case 9:\r
- return wxString::Format(wxT("%d"), this->showFileInfo[i].llFileId);\r
+ return wxString::Format(wxT("%d"), this->showFileInfo[i].nFileId);\r
default:\r
return wxEmptyString;\r
}\r
wxListItemAttr * myListCtrl::OnGetItemAttr(long i) const\r
{\r
return\r
- this->showFileInfo[i].uDanger ? (wxListItemAttr *) & this->atDangerItem : \r
+ this->showFileInfo[i].eDanger ? (wxListItemAttr *) & this->atDangerItem : \r
this->showFileInfo[i].dwAttribute & TPI_ATTRIBUTE_ENCRYPTED ? (wxListItemAttr *) & this->atEncryptedItem : NULL;\r
}\r
\r
TPI_FILEINFO * item1 = * pItem1, * item2 = * pItem2;\r
return (g_fSortAscend ? 1 : -1) * (\r
g_nSortColumn == 0 ? ::wxStricmp(item1->fnFileName.GetFullName(), item2->fnFileName.GetFullName()) : // Filename\r
- g_nSortColumn == 1 ? NumCmp(llUnpackedSize) : // Unpacked\r
- g_nSortColumn == 2 ? NumCmp(llPackedSize) : // Packed\r
+ g_nSortColumn == 1 ? NumCmp(nUnpackedSize) : // Unpacked\r
+ g_nSortColumn == 2 ? NumCmp(nPackedSize) : // Packed\r
g_nSortColumn == 3 ? NumCmp(wCompressRatio) : // Ratio\r
g_nSortColumn == 6 ? NumCmp(tmModified) : // Last modified\r
g_nSortColumn == 7 ? ::wxStricmp(item1->fnFileName.GetPath(), item2->fnFileName.GetPath()) : // Path\r
g_nSortColumn == 8 ? ::wxStricmp(GetFileTypeName(item1->fnFileName), GetFileTypeName(item2->fnFileName)) : // Type\r
- g_nSortColumn == 9 ? NumCmp(llFileId) : // No\r
+ g_nSortColumn == 9 ? NumCmp(nFileId) : // No\r
0);\r
}\r
{\r
do\r
{\r
- if (fiInfo.llSupportedCommand & TPI_COMMAND_CREATE && (this->files.GetCount() == 1 || fiInfo.fArchive))\r
+ if (fiInfo.eSupportedCommand & TPI_COMMAND_CREATE && (this->files.GetCount() == 1 || fiInfo.fArchive))\r
{\r
fiInfo.szTPIName = szTPIName;\r
this->afInfo.Add(fiInfo);\r
}\r
\r
// 作成時/追加時設定。\r
- this->scLevel->SetRange(fiInfo->sCompressLevelMin, fiInfo->sCompressLevelMax);\r
- this->scLevel->SetValue(fiInfo->sCompressLevelMax);\r
- this->scLevel->Enable(fiInfo->sCompressLevelMin != fiInfo->sCompressLevelMax);\r
- this->scRR->SetRange(fiInfo->sRecoveryRecordMin, fiInfo->sRecoveryRecordMax);\r
- this->scRR->SetValue(fiInfo->sRecoveryRecordMin);\r
- this->scRR->Enable(fiInfo->sRecoveryRecordMin != fiInfo->sRecoveryRecordMax);\r
+ this->scLevel->SetRange(fiInfo->nCompressLevelMin, fiInfo->nCompressLevelMax);\r
+ this->scLevel->SetValue(fiInfo->nCompressLevelMax);\r
+ this->scLevel->Enable(fiInfo->nCompressLevelMin != fiInfo->nCompressLevelMax);\r
+ this->scRR->SetRange(fiInfo->nRecoveryRecordMin, fiInfo->nRecoveryRecordMax);\r
+ this->scRR->SetValue(fiInfo->nRecoveryRecordMin);\r
+ this->scRR->Enable(fiInfo->nRecoveryRecordMin != fiInfo->nRecoveryRecordMax);\r
this->cbEncryptHeader->Enable(fiInfo->fEncryptHeader);\r
this->cbSolid->Enable(fiInfo->fSolid);\r
this->cbMMOptimize->Enable(fiInfo->fMMOptimize);\r
return TPI_CALLBACK_CONTINUE;\r
}\r
\r
- switch (piInfo->uMessage)\r
+ switch (piInfo->eMessage)\r
{\r
case TPI_MESSAGE_STATUS:\r
{\r
static int s_nGaugeCounter = 0;\r
- switch (piInfo->uStatus)\r
+ switch (piInfo->eStatus)\r
{\r
case TPI_STATUS_OPENARCHIVE:\r
this->ebSource->ChangeValue(piInfo->fiInfo.fnFileName.GetFullPath());\r
case TPI_STATUS_BEGINPROCESS:\r
this->ebSource->ChangeValue(piInfo->fiInfo.fnFileName.GetFullPath());\r
this->ebTarget->ChangeValue(piInfo->fnDestination.GetFullPath());\r
- if (piInfo->fiInfo.llUnpackedSize > 10000)\r
+ if (piInfo->fiInfo.nUnpackedSize > 10000)\r
{\r
- this->gauge->SetRange(piInfo->fiInfo.llUnpackedSize);\r
+ this->gauge->SetRange(piInfo->fiInfo.nUnpackedSize);\r
this->gauge->SetValue(0);\r
}\r
::wxSafeYield(this, true);\r
case TPI_STATUS_INPROCESS:\r
if (s_nGaugeCounter++ > 100)\r
{\r
- if (piInfo->fiInfo.llUnpackedSize > 10000)\r
+ if (piInfo->fiInfo.nUnpackedSize > 10000)\r
{\r
- this->gauge->SetValue(piInfo->llProcessedSize);\r
+ this->gauge->SetValue(piInfo->nProcessedSize);\r
}\r
::wxSafeYield(this, true);\r
s_nGaugeCounter = 0;\r
}\r
break;\r
case TPI_STATUS_ENDPROCESS:\r
-// this->gauge->SetValue(piInfo->fiInfo.llUnpackedSize.ToULong());\r
+// this->gauge->SetValue(piInfo->fiInfo.nUnpackedSize.ToULong());\r
break;\r
// 書庫ロード時用の独自仕様。\r
case 0x1000:\r
this->ebSource->ChangeValue(piInfo->fiInfo.fnFileName.GetFullPath());\r
- this->gauge->SetRange(piInfo->fiInfo.llUnpackedSize);\r
+ this->gauge->SetRange(piInfo->fiInfo.nUnpackedSize);\r
this->gauge->SetValue(0);\r
break;\r
case 0x1001:\r
// 更新しすぎると低速なので100ファイル毎に更新する。\r
- if (piInfo->llProcessedSize > (unsigned) (this->gauge->GetValue() + 100))\r
+ if (piInfo->nProcessedSize > (unsigned) (this->gauge->GetValue() + 100))\r
{\r
this->ebTarget->ChangeValue(piInfo->fiInfo.fnFileName.GetFullPath());\r
- this->gauge->SetValue(piInfo->llProcessedSize);\r
+ this->gauge->SetValue(piInfo->nProcessedSize);\r
::wxSafeYield(this, true);\r
}\r
break;\r
}\r
case TPI_MESSAGE_ASK:\r
{\r
- switch (piInfo->uStatus)\r
+ switch (piInfo->eStatus)\r
{\r
case TPI_PARAM_PASSWORD:\r
piInfo->szParam = ::wxGetPasswordFromUser(_("Password for:\n") + piInfo->fiInfo.fnFileName.GetFullPath(), wxT("Lychee"), wxEmptyString, this);\r
swInfo.fSolid = mkDlg.cbSolid->IsChecked();\r
swInfo.fMMOptimize = mkDlg.cbMMOptimize->IsChecked();\r
swInfo.fEncryptHeader = mkDlg.cbEncryptHeader->IsChecked();\r
- swInfo.sCompressLevel = mkDlg.scLevel->GetValue();\r
- swInfo.sRecoveryRecord = mkDlg.scRR->GetValue();\r
+ swInfo.nCompressLevel = mkDlg.scLevel->GetValue();\r
+ swInfo.nRecoveryRecord = mkDlg.scRR->GetValue();\r
swInfo.szPassword = mkDlg.tcPassword->GetValue();\r
swInfo.szKeyFile = mkDlg.tcKeyfile->GetValue();\r
swInfo.szComment = mkDlg.tcComment->GetValue();\r
- mkDlg.cbSplitSize->GetValue().ToULongLong(& swInfo.llSplitSize);\r
+ mkDlg.cbSplitSize->GetValue().ToULongLong(& swInfo.nSplitSize);\r
\r
// TPIを読み込み。\r
int nSelected = mkDlg.chType->GetSelection();\r
this->fnArchive = wxFileName(mkDlg.cbDir->GetValue(), mkDlg.cbFileName->GetValue());\r
- if (! tpi.InitLibrary(mkDlg.afInfo[nSelected].szTPIName, this->fnArchive.GetFullPath(), mkDlg.afInfo[nSelected].llTypeId))\r
+ if (! tpi.InitLibrary(mkDlg.afInfo[nSelected].szTPIName, this->fnArchive.GetFullPath(), mkDlg.afInfo[nSelected].nTypeId))\r
{\r
::wxLogError(_("Error: %s!"), wxT("InitLibrary()!"));\r
return;\r
\r
// TPIを読み込み、最初のコールバックを送信。\r
TPI_PROCESSINFO piInfo;\r
- piInfo.uMessage = TPI_MESSAGE_STATUS;\r
- piInfo.uStatus = 0x1000;\r
- piInfo.llProcessedSize = 0;\r
+ piInfo.eMessage = TPI_MESSAGE_STATUS;\r
+ piInfo.eStatus = 0x1000;\r
+ piInfo.nProcessedSize = 0;\r
piInfo.fiInfo.fnFileName = this->fnArchive;\r
- piInfo.fiInfo.llUnpackedSize = this->LoadTPI(this->fnArchive.GetFullPath());\r
- if (piInfo.fiInfo.llUnpackedSize == 0)\r
+ piInfo.fiInfo.nUnpackedSize = this->LoadTPI(this->fnArchive.GetFullPath());\r
+ if (piInfo.fiInfo.nUnpackedSize == 0)\r
{\r
procDlg.Show(false);\r
tpi.FreeLibrary();\r
TPICallbackProc(TPI_NOTIFY_COMMON, & piInfo);\r
\r
// 配列のサイズを確保。\r
- this->fileinfo.Alloc(piInfo.fiInfo.llUnpackedSize);\r
+ this->fileinfo.Alloc(piInfo.fiInfo.nUnpackedSize);\r
\r
// 書庫を開く。\r
if (! tpi.OpenArchive(this->fnArchive.GetFullPath()))\r
// ファイル情報をロード。\r
if (tpi.GetFileInformation(& piInfo.fiInfo, true))\r
{\r
- piInfo.uStatus = 0x1001;\r
+ piInfo.eStatus = 0x1001;\r
do\r
{\r
- piInfo.llProcessedSize++;\r
+ piInfo.nProcessedSize++;\r
if (this->ErrorCheck(TPICallbackProc(TPI_NOTIFY_COMMON, & piInfo)) == TPI_CALLBACK_CANCEL)\r
{\r
procDlg.Show(false);\r
// DTV検査。\r
if (piInfo.fiInfo.fnFileName.GetPathWithSep().Find(wxT("..")) != wxNOT_FOUND)\r
{\r
- piInfo.fiInfo.uDanger = TRUE;\r
+ piInfo.fiInfo.eDanger = TRUE;\r
::wxLogWarning(_("This archive may have Directory Traversal Vulnerability(DTV) problem, and some danger files may be extracted to the unexpected system directory! You should use the \"Ignore file pathes\" option when extracting this archive.\nDanger file is:\n%s"), piInfo.fiInfo.fnFileName.GetFullPath().c_str());\r
}\r
// 空白の連続による拡張子偽装を検査。\r
if (piInfo.fiInfo.fnFileName.GetFullName().Find(wxT(" ")) != wxNOT_FOUND)\r
{\r
- piInfo.fiInfo.uDanger = TRUE;\r
+ piInfo.fiInfo.eDanger = TRUE;\r
::wxLogWarning(_("This archive may contain extension-disguised files whose real extension is hidden by using many blank charactor and you may mistake that it is a \"safe\" file. Don\'t execute these files carelessly.\nDanger file is:\n%s"), piInfo.fiInfo.fnFileName.GetFullPath().c_str());\r
}\r
// Unicode制御文字を検査。\r
{\r
if (piInfo.fiInfo.fnFileName.GetFullName().Find(c) != wxNOT_FOUND)\r
{\r
- piInfo.fiInfo.uDanger = TRUE;\r
+ piInfo.fiInfo.eDanger = TRUE;\r
::wxLogWarning(_("This archive may contain extension-disguised files whose real extension is hidden by using Unicode control character and you may mistake that it is a \"safe\" file. Don\'t execute these files carelessly.\nDanger file is:\n%s"), piInfo.fiInfo.fnFileName.GetFullPath().c_str());\r
}\r
switch (c)\r
// ステータスバー設定。\r
this->statusbar->SetStatusText(this->aiArchive.fiInfo.szTypeName, 0);\r
this->statusbar->SetStatusText(wxString::Format(_("%d file(s)"), this->fileinfo.GetCount()), 1);\r
- this->statusbar->SetStatusText(wxString::Format(_("%dB -> %dB"), this->aiArchive.llUnpackedSize, this->aiArchive.llPackedSize), 2);\r
+ this->statusbar->SetStatusText(wxString::Format(_("%dB -> %dB"), this->aiArchive.nUnpackedSize, this->aiArchive.nPackedSize), 2);\r
this->statusbar->SetStatusText(wxString::Format(wxT("%3.1f%%"), this->aiArchive.wCompressRatio / 10.0), 3);\r
this->statusbar->SetStatusText(this->fnArchive.GetFullPath(), 4);\r
\r
// ツールバー・メニューバー設定。\r
SetMenuToolState("Arc_Close", true);\r
- SetMenuToolState("Arc_Add", (this->aiArchive.fiInfo.llSupportedCommand & TPI_COMMAND_ADD) == TPI_COMMAND_ADD && this->aiArchive.fiInfo.fArchive);\r
- SetMenuToolState("Arc_SFX", (this->aiArchive.fiInfo.llSupportedCommand & TPI_COMMAND_SFX) == TPI_COMMAND_SFX && this->aiArchive.nSFXType == 0);\r
- SetMenuToolState("Arc_UnSFX", (this->aiArchive.fiInfo.llSupportedCommand & TPI_COMMAND_UNSFX) == TPI_COMMAND_UNSFX && this->aiArchive.nSFXType != 0);\r
- SetMenuToolState("Arc_Extract", (this->aiArchive.fiInfo.llSupportedCommand & TPI_COMMAND_EXTRACT)== TPI_COMMAND_EXTRACT);\r
- SetMenuToolState("Arc_Delete", (this->aiArchive.fiInfo.llSupportedCommand & TPI_COMMAND_DELETE) == TPI_COMMAND_DELETE && this->aiArchive.fiInfo.fArchive);\r
- SetMenuToolState("Arc_Test", (this->aiArchive.fiInfo.llSupportedCommand & TPI_COMMAND_TEST) == TPI_COMMAND_TEST);\r
- SetMenuToolState("Arc_Repair", (this->aiArchive.fiInfo.llSupportedCommand & TPI_COMMAND_REPAIR) == TPI_COMMAND_REPAIR);\r
+ SetMenuToolState("Arc_Add", (this->aiArchive.fiInfo.eSupportedCommand & TPI_COMMAND_ADD) == TPI_COMMAND_ADD && this->aiArchive.fiInfo.fArchive);\r
+ SetMenuToolState("Arc_SFX", (this->aiArchive.fiInfo.eSupportedCommand & TPI_COMMAND_SFX) == TPI_COMMAND_SFX && ! this->aiArchive.fSFX);\r
+ SetMenuToolState("Arc_UnSFX", (this->aiArchive.fiInfo.eSupportedCommand & TPI_COMMAND_UNSFX) == TPI_COMMAND_UNSFX && this->aiArchive.fSFX);\r
+ SetMenuToolState("Arc_Extract", (this->aiArchive.fiInfo.eSupportedCommand & TPI_COMMAND_EXTRACT)== TPI_COMMAND_EXTRACT);\r
+ SetMenuToolState("Arc_Delete", (this->aiArchive.fiInfo.eSupportedCommand & TPI_COMMAND_DELETE) == TPI_COMMAND_DELETE && this->aiArchive.fiInfo.fArchive);\r
+ SetMenuToolState("Arc_Test", (this->aiArchive.fiInfo.eSupportedCommand & TPI_COMMAND_TEST) == TPI_COMMAND_TEST);\r
+ SetMenuToolState("Arc_Repair", (this->aiArchive.fiInfo.eSupportedCommand & TPI_COMMAND_REPAIR) == TPI_COMMAND_REPAIR);\r
\r
procDlg.Show(false);\r
}\r
swInfo.fSolid = mkDlg.cbSolid->IsChecked();\r
swInfo.fMMOptimize = mkDlg.cbMMOptimize->IsChecked();\r
swInfo.fEncryptHeader = mkDlg.cbEncryptHeader->IsChecked();\r
- swInfo.sCompressLevel = mkDlg.scLevel->GetValue();\r
- swInfo.sRecoveryRecord = mkDlg.scRR->GetValue();\r
+ swInfo.nCompressLevel = mkDlg.scLevel->GetValue();\r
+ swInfo.nRecoveryRecord = mkDlg.scRR->GetValue();\r
swInfo.szPassword = mkDlg.tcPassword->GetValue();\r
swInfo.szKeyFile = mkDlg.tcKeyfile->GetValue();\r
swInfo.szComment = mkDlg.tcComment->GetValue();\r
wxDynamicLibrary g_hLib;\r
void * g_fpProc;\r
TPI_PROC g_prProc;\r
-wxULongLong_t g_llEngineId;\r
+wxULongLong_t g_nEngineId;\r
\r
//******************************************************************************\r
// Inside Functions\r
hArc->GetProperty(nIndex, kpidCRC, & prop);\r
_fiInfo->dwCRC32 = prop.ulVal;\r
hArc->GetProperty(nIndex, kpidPackSize, & prop);\r
- _fiInfo->llPackedSize = prop.vt == VT_EMPTY ? 0 : prop.vt == VT_UI8 ? prop.uhVal.QuadPart : prop.ulVal;\r
+ _fiInfo->nPackedSize = prop.vt == VT_EMPTY ? 0 : prop.vt == VT_UI8 ? prop.uhVal.QuadPart : prop.ulVal;\r
hArc->GetProperty(nIndex, kpidSize, & prop);\r
- _fiInfo->llUnpackedSize = prop.vt == VT_EMPTY ? 0 : prop.vt == VT_UI8 ? prop.uhVal.QuadPart : prop.ulVal;\r
+ _fiInfo->nUnpackedSize = prop.vt == VT_EMPTY ? 0 : prop.vt == VT_UI8 ? prop.uhVal.QuadPart : prop.ulVal;\r
unsigned int t;\r
hArc->GetProperty(nIndex, kpidMTime, & prop);\r
NWindows::NTime::FileTimeToUnixTime(prop.filetime, t);\r
hArc->GetProperty(nIndex, kpidComment, & prop);\r
_fiInfo->szComment = WC2String(prop.bstrVal);\r
}\r
- _fiInfo->llFileId = nIndex;\r
+ _fiInfo->nFileId = nIndex;\r
return TPI_ERROR_SUCCESS;\r
}\r
\r
_fiInfo->fMultiVolume = false;\r
_fiInfo->fSFX = false;\r
_fiInfo->fSolid = false;\r
- _fiInfo->sCompressLevelMin = 0;\r
- _fiInfo->sCompressLevelMax = 0;\r
- _fiInfo->sRecoveryRecordMin = 0;\r
- _fiInfo->sRecoveryRecordMax = 0;\r
+ _fiInfo->nCompressLevelMin = 0;\r
+ _fiInfo->nCompressLevelMax = 0;\r
+ _fiInfo->nRecoveryRecordMin = 0;\r
+ _fiInfo->nRecoveryRecordMax = 0;\r
_fiInfo->szTypeName.Clear();\r
_fiInfo->szSuffix.Clear();\r
- _fiInfo->szEngineName = g_hLib.CanonicalizeName(wxT("7z"));\r
- _fiInfo->szTPIName = wxT("7zArc");\r
- _fiInfo->llSupportedCommand = TPI_COMMAND_EXTRACT | TPI_COMMAND_TEST;\r
- _fiInfo->llTypeId = nIndex;\r
- _fiInfo->pCustomInfo = NULL;\r
+ _fiInfo->szEngineName = g_hLib.CanonicalizeName(wxT("7z"));\r
+ _fiInfo->szTPIName = wxT("7zArc");\r
+ _fiInfo->eSupportedCommand = TPI_COMMAND_EXTRACT | TPI_COMMAND_TEST;\r
+ _fiInfo->nTypeId = nIndex;\r
+ _fiInfo->pCustomInfo = NULL;\r
wxULongLong_t nBase = nIndex++;\r
if (guidList[nBase] == CLSID_CFormatZip)\r
{\r
_fiInfo->szTypeName = wxT("7-zip");\r
_fiInfo->szSuffix = wxT("zip");\r
- _fiInfo->llSupportedCommand |= TPI_COMMAND_CREATE | TPI_COMMAND_ADD;\r
+ _fiInfo->eSupportedCommand |= TPI_COMMAND_CREATE | TPI_COMMAND_ADD;\r
_fiInfo->fSFX = true;\r
_fiInfo->fMultiVolume = true;\r
_fiInfo->fEncryptPassword = true;\r
- _fiInfo->sCompressLevelMin = 0;\r
- _fiInfo->sCompressLevelMax = 9;\r
+ _fiInfo->nCompressLevelMin = 0;\r
+ _fiInfo->nCompressLevelMax = 9;\r
}\r
else if (guidList[nBase] == CLSID_CFormatBZip2)\r
{\r
_fiInfo->szTypeName = wxT("BZip2");\r
_fiInfo->szSuffix = wxT("bz2");\r
- _fiInfo->llSupportedCommand |= TPI_COMMAND_CREATE;\r
+ _fiInfo->eSupportedCommand |= TPI_COMMAND_CREATE;\r
_fiInfo->fArchive = false;\r
- _fiInfo->sCompressLevelMin = 1;\r
- _fiInfo->sCompressLevelMax = 9;\r
+ _fiInfo->nCompressLevelMin = 1;\r
+ _fiInfo->nCompressLevelMax = 9;\r
}\r
#if 0\r
else if (guidList[nBase] == CLSID_CFormatRar) { _fiInfo->szTypeName = wxT("Rar"); _fiInfo->szSuffix = wxT("rar"); }\r
{\r
_fiInfo->szTypeName = wxT("7z");\r
_fiInfo->szSuffix = wxT("7z");\r
- _fiInfo->llSupportedCommand |= TPI_COMMAND_CREATE | TPI_COMMAND_ADD;\r
+ _fiInfo->eSupportedCommand |= TPI_COMMAND_CREATE | TPI_COMMAND_ADD;\r
_fiInfo->fSFX = true;\r
_fiInfo->fMultiVolume = true;\r
_fiInfo->fSolid = true;\r
_fiInfo->fEncryptPassword = true;\r
_fiInfo->fEncryptHeader = true;\r
_fiInfo->fMultiVolume = true;\r
- _fiInfo->sCompressLevelMin = 0;\r
- _fiInfo->sCompressLevelMax = 9;\r
+ _fiInfo->nCompressLevelMin = 0;\r
+ _fiInfo->nCompressLevelMax = 9;\r
}\r
#ifdef __LINUX__\r
else if (guidList[nBase] == CLSID_CFormatCab) { _fiInfo->szTypeName = wxT("Cab"); _fiInfo->szSuffix = wxT("cab"); _fiInfo->fMultiVolume = true; _fiInfo->fSFX = true; }\r
{\r
_fiInfo->szTypeName = wxT("XZ");\r
_fiInfo->szSuffix = wxT("xz");\r
- _fiInfo->llSupportedCommand |= TPI_COMMAND_CREATE;\r
+ _fiInfo->eSupportedCommand |= TPI_COMMAND_CREATE;\r
_fiInfo->fArchive = false;\r
- _fiInfo->sCompressLevelMin = 0;\r
- _fiInfo->sCompressLevelMax = 9;\r
+ _fiInfo->nCompressLevelMin = 0;\r
+ _fiInfo->nCompressLevelMax = 9;\r
}\r
else if (guidList[nBase] == CLSID_CFormatApm) { _fiInfo->szTypeName = wxT("Apm"); _fiInfo->szSuffix = wxT("apm"); }\r
else if (guidList[nBase] == CLSID_CFormatMslz) { _fiInfo->szTypeName = wxT("MSLZ"); _fiInfo->szSuffix = wxT("xx_"); _fiInfo->fArchive = false; }\r
_fiInfo->szTypeName = wxT("TAR");\r
_fiInfo->szSuffix = wxT("tar");\r
_fiInfo->fSFX = true;\r
- _fiInfo->llSupportedCommand |= TPI_COMMAND_CREATE | TPI_COMMAND_ADD;\r
+ _fiInfo->eSupportedCommand |= TPI_COMMAND_CREATE | TPI_COMMAND_ADD;\r
}\r
#endif\r
else if (guidList[nBase] == CLSID_CFormatGZip)\r
{\r
_fiInfo->szTypeName = wxT("GZip");\r
_fiInfo->szSuffix = wxT("gz");\r
- _fiInfo->llSupportedCommand |= TPI_COMMAND_CREATE;\r
+ _fiInfo->eSupportedCommand |= TPI_COMMAND_CREATE;\r
_fiInfo->fArchive = false;\r
- _fiInfo->sCompressLevelMin = 1;\r
- _fiInfo->sCompressLevelMax = 9;\r
+ _fiInfo->nCompressLevelMin = 1;\r
+ _fiInfo->nCompressLevelMax = 9;\r
}\r
else\r
{\r
\r
STDMETHODIMP CArchiveOpenCallback::CryptoGetTextPassword(BSTR * szPassword)\r
{\r
- this->piInfo.uMessage = TPI_MESSAGE_ASK;\r
- this->piInfo.uStatus = TPI_PARAM_PASSWORD;\r
+ this->piInfo.eMessage = TPI_MESSAGE_ASK;\r
+ this->piInfo.eStatus = TPI_PARAM_PASSWORD;\r
return (g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) == TPI_CALLBACK_CONTINUE) ? ::StringToBstr(this->piInfo.szParam.c_str(), szPassword) : E_ABORT;\r
}\r
\r
return S_OK;\r
}\r
\r
-STDMETHODIMP CArchiveExtractCallback::SetCompleted(const wxULongLong_t * llProcessed)\r
+STDMETHODIMP CArchiveExtractCallback::SetCompleted(const wxULongLong_t * nProcessed)\r
{\r
- this->piInfo.uStatus = TPI_STATUS_INPROCESS;\r
- this->piInfo.llProcessedSize = * llProcessed - this->llCurrentPos;\r
+ this->piInfo.eStatus = TPI_STATUS_INPROCESS;\r
+ this->piInfo.nProcessedSize = * nProcessed - this->llCurrentPos;\r
if (g_prProc == NULL || this->piInfo.fiInfo.szStoredName.IsEmpty() || g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) == TPI_CALLBACK_CONTINUE)\r
{\r
return S_OK;\r
_outFileStream.Release();\r
\r
// 現在位置を記録。\r
- this->llCurrentPos += this->piInfo.fiInfo.llUnpackedSize;\r
+ this->llCurrentPos += this->piInfo.fiInfo.nUnpackedSize;\r
\r
// ファイルの基本情報を取得。\r
- this->piInfo.uMessage = TPI_MESSAGE_STATUS;\r
- this->piInfo.uStatus = TPI_STATUS_BEGINPROCESS;\r
+ this->piInfo.eMessage = TPI_MESSAGE_STATUS;\r
+ this->piInfo.eStatus = TPI_STATUS_BEGINPROCESS;\r
GetFileInformation2(this->hArc, & this->piInfo.fiInfo, nIndex);\r
this->piInfo.fnDestination = wxFileName(swInfo->fnDestinationDirectory.GetFullPath() + wxFileName::GetPathSeparator() + (swInfo->fStoreDirectoryPathes ? this->piInfo.fiInfo.fnFileName.GetPath() : (wxString) wxEmptyString), this->piInfo.fiInfo.fnFileName.GetFullName());\r
\r
{\r
if (this->fTriedPassword || this->swInfo->szPassword.IsEmpty())\r
{\r
- this->piInfo.uMessage = TPI_MESSAGE_ASK;\r
- this->piInfo.uStatus = TPI_PARAM_PASSWORD;\r
+ this->piInfo.eMessage = TPI_MESSAGE_ASK;\r
+ this->piInfo.eStatus = TPI_PARAM_PASSWORD;\r
return (g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) == TPI_CALLBACK_CONTINUE) ? ::StringToBstr(this->piInfo.szParam.c_str(), szPassword) : E_ABORT;\r
}\r
else\r
TPI_SWITCHES * swInfo;\r
\r
private:\r
- wxULongLong_t llCurrentPos;\r
+ wxULongLong_t nCurrentPos;\r
TPI_PROCESSINFO piInfo;\r
};\r
\r
return S_OK;\r
}\r
\r
-STDMETHODIMP CArchiveUpdateCallback::SetCompleted(const wxULongLong_t * llProcessed)\r
+STDMETHODIMP CArchiveUpdateCallback::SetCompleted(const wxULongLong_t * nProcessed)\r
{\r
- this->piInfo.uStatus = TPI_STATUS_INPROCESS;\r
- this->piInfo.llProcessedSize = * llProcessed - this->llCurrentPos;\r
+ this->piInfo.eStatus = TPI_STATUS_INPROCESS;\r
+ this->piInfo.nProcessedSize = * nProcessed - this->nCurrentPos;\r
if (g_prProc == NULL || this->piInfo.fiInfo.szStoredName.IsEmpty() || g_prProc(TPI_NOTIFY_COMMON, & this->piInfo) == TPI_CALLBACK_CONTINUE)\r
{\r
return S_OK;\r
STDMETHODIMP CArchiveUpdateCallback::GetStream(unsigned int nIndex, ISequentialInStream ** inStream)\r
{\r
// 現在位置を記録。\r
- this->llCurrentPos += this->piInfo.fiInfo.llUnpackedSize;\r
+ this->nCurrentPos += this->piInfo.fiInfo.nUnpackedSize;\r
\r
// ファイルの基本情報を取得。\r
NWindows::NCOM::CPropVariant prop;\r
this->GetProperty(nIndex, kpidAttrib, & prop);\r
- this->piInfo.fiInfo.dwAttribute = prop.uintVal;\r
+ this->piInfo.fiInfo.dwAttribute = prop.uintVal;\r
this->GetProperty(nIndex, kpidSize, & prop);\r
- this->piInfo.fiInfo.llUnpackedSize = prop.vt == VT_UI8 ? prop.uhVal.QuadPart : prop.ulVal;\r
+ this->piInfo.fiInfo.nUnpackedSize = prop.vt == VT_UI8 ? prop.uhVal.QuadPart : prop.ulVal;\r
unsigned int t;\r
this->GetProperty(nIndex, kpidMTime, & prop);\r
NWindows::NTime::FileTimeToUnixTime(prop.filetime, t);\r
this->piInfo.fiInfo.tmAccess.Set((time_t) t);\r
this->GetProperty(nIndex, kpidPath, & prop);\r
this->piInfo.fiInfo.szStoredName = WC2String(prop.bstrVal);\r
- this->piInfo.fiInfo.llFileId = nIndex;\r
- this->piInfo.fiInfo.fnFileName = wxFileName(this->piInfo.fiInfo.szStoredName);\r
+ this->piInfo.fiInfo.nFileId = nIndex;\r
+ this->piInfo.fiInfo.fnFileName = wxFileName(this->piInfo.fiInfo.szStoredName);\r
this->piInfo.fiInfo.fnFileName.Normalize(wxPATH_NORM_ALL, this->swInfo->fnDestinationDirectory.GetFullPath());\r
- this->piInfo.uMessage = TPI_MESSAGE_STATUS;\r
- this->piInfo.uStatus = TPI_STATUS_BEGINPROCESS;\r
+ this->piInfo.eMessage = TPI_MESSAGE_STATUS;\r
+ this->piInfo.eStatus = TPI_STATUS_BEGINPROCESS;\r
this->piInfo.fnDestination = wxFileName(this->piInfo.fiInfo.szStoredName);\r
\r
// コールバック関数に送信。\r
\r
STDMETHODIMP CArchiveUpdateCallback::GetVolumeSize(unsigned int, wxULongLong_t * nSplitSize)\r
{\r
- * nSplitSize = this->swInfo->llSplitSize;\r
+ * nSplitSize = this->swInfo->nSplitSize;\r
return S_OK;\r
}\r
\r
int __stdcall LoadPlugin\r
(\r
const wxString & _szArcName,\r
- wxULongLong_t _llTypeId\r
+ wxULongLong_t _nTypeId\r
)\r
{\r
g_hLib.Load(g_hLib.CanonicalizeName(wxT("7z")));\r
\r
if (! ::wxFileExists(_szArcName))\r
{\r
- g_llEngineId = _llTypeId;\r
+ g_nEngineId = _nTypeId;\r
}\r
\r
return TPI_ERROR_SUCCESS;\r
}\r
\r
// 形式の情報を取得。\r
- g_llEngineId = i;\r
+ g_nEngineId = i;\r
TPI_FORMATINFO fiInfo;\r
GetFormatInformation2(& fiInfo, i);\r
\r
{\r
_aiInfo->szComment = WC2String(prop.bstrVal);\r
}\r
- wxULongLong_t n = g_llEngineId;\r
+ wxULongLong_t n = g_nEngineId;\r
GetFormatInformation2(& _aiInfo->fiInfo, n);\r
return TPI_ERROR_SUCCESS;\r
}\r
\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
int nErrorCode;\r
- switch (_uCommand)\r
+ switch (_eCommand)\r
{\r
case TPI_COMMAND_EXTRACT:\r
case TPI_COMMAND_TEST:\r
{\r
if (_szFiles.Index(fiInfo.szStoredName) != wxNOT_FOUND)\r
{\r
- nIndexes.Add(fiInfo.llFileId);\r
+ nIndexes.Add(fiInfo.nFileId);\r
}\r
}\r
while (GetFileInformation(hArc, & fiInfo, false) == TPI_ERROR_SUCCESS);\r
CMyComPtr<IArchiveExtractCallback> extractCallback(extractCallbackSpec);\r
extractCallbackSpec->hArc = hArc;\r
extractCallbackSpec->swInfo = _swInfo;\r
- hArc->Extract(& nIndexes.Front(), nIndexes.Size(), _uCommand == TPI_COMMAND_TEST, extractCallback);\r
+ hArc->Extract(& nIndexes.Front(), nIndexes.Size(), _eCommand == TPI_COMMAND_TEST, extractCallback);\r
nErrorCode = extractCallbackSpec->nErrorCode;\r
CloseArchive(hArc);\r
break;\r
\r
// エンジンを読み込み。\r
IOutArchive * hArc;\r
- if (((unsigned int (__stdcall *)(const GUID *, const GUID *, void **)) g_fpProc)(& guidList[g_llEngineId], & IID_IOutArchive, (void **) & hArc) != S_OK)\r
+ if (((unsigned int (__stdcall *)(const GUID *, const GUID *, void **)) g_fpProc)(& guidList[g_nEngineId], & IID_IOutArchive, (void **) & hArc) != S_OK)\r
{\r
return TPI_ERROR_ARC_UNSUPPORTED;\r
}\r
\r
// 形式情報を取得。\r
TPI_FORMATINFO fiInfo;\r
- wxULongLong_t nIndex = g_llEngineId;\r
+ wxULongLong_t nIndex = g_nEngineId;\r
GetFormatInformation2(& fiInfo, nIndex);\r
\r
// パラメータを設定。\r
NWindows::NCOM::CPropVariant propValues[15];\r
wxString szProp;\r
// 圧縮レベル。\r
- if (fiInfo.sCompressLevelMin != fiInfo.sCompressLevelMax)\r
+ if (fiInfo.nCompressLevelMin != fiInfo.nCompressLevelMax)\r
{\r
- szProp = wxString::Format(wxT("x%d"), _swInfo->sCompressLevel);\r
+ szProp = wxString::Format(wxT("x%d"), _swInfo->nCompressLevel);\r
szProps.Add(szProp.c_str());\r
}\r
// Solid圧縮。\r
\r
// 構造体を初期化。\r
TPI_PROCESSINFO piInfo;\r
- piInfo.uMessage = TPI_MESSAGE_STATUS;\r
+ piInfo.eMessage = TPI_MESSAGE_STATUS;\r
\r
if (_lpEis != NULL)\r
{\r
// EXTRACTINGINFOEXW -> TPI_FILEINFO変換。\r
piInfo.fiInfo.dwCRC32 = ex->dwCRC;\r
piInfo.fiInfo.tmModified.SetFromDOS(ex->wTime | (ex->wDate << 16));\r
- piInfo.fiInfo.llPackedSize = ex->dwCompressedSize;\r
- piInfo.fiInfo.llUnpackedSize = ex->exinfo.dwFileSize;\r
- piInfo.fiInfo.uOSType = ex->uOSType;\r
+ piInfo.fiInfo.nPackedSize = ex->dwCompressedSize;\r
+ piInfo.fiInfo.nUnpackedSize = ex->exinfo.dwFileSize;\r
+ piInfo.fiInfo.eOSType = ex->eOSType;\r
piInfo.fiInfo.wCompressRatio = ex->wRatio;\r
piInfo.fiInfo.szStoredName = WC2String(ex->exinfo.szSourceFileName);\r
piInfo.fiInfo.szMethod = WC2String(ex->szMode);\r
\r
// EXTRACTINGINFOEXW -> TPI_PROCESSINFO変換。\r
- piInfo.llProcessedSize = ex->exinfo.dwWriteSize;\r
+ piInfo.nProcessedSize = ex->exinfo.dwWriteSize;\r
piInfo.fnDestination = wxFileName(WC2String(ex->exinfo.szDestFileName));\r
}\r
else\r
// EXTRACTINGINFOEX -> TPI_FILEINFO変換。\r
piInfo.fiInfo.dwCRC32 = ex->dwCRC;\r
piInfo.fiInfo.tmModified.SetFromDOS(ex->wTime | (ex->wDate << 16));\r
- piInfo.fiInfo.llPackedSize = ex->dwCompressedSize;\r
- piInfo.fiInfo.llUnpackedSize = ex->exinfo.dwFileSize;\r
- piInfo.fiInfo.uOSType = ex->uOSType;\r
+ piInfo.fiInfo.nPackedSize = ex->dwCompressedSize;\r
+ piInfo.fiInfo.nUnpackedSize = ex->exinfo.dwFileSize;\r
+ piInfo.fiInfo.eOSType = ex->eOSType;\r
piInfo.fiInfo.wCompressRatio = ex->wRatio;\r
piInfo.fiInfo.szStoredName = UTF82String(ex->exinfo.szSourceFileName);\r
piInfo.fiInfo.szMethod = UTF82String(ex->szMode);\r
\r
// EXTRACTINGINFOEX -> TPI_PROCESSINFO変換。\r
- piInfo.llProcessedSize = ex->exinfo.dwWriteSize;\r
+ piInfo.nProcessedSize = ex->exinfo.dwWriteSize;\r
piInfo.fnDestination = wxFileName(UTF82String(ex->exinfo.szDestFileName));\r
}\r
piInfo.fiInfo.dwAttribute = 0;\r
piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime);\r
piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime);\r
piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime);\r
- piInfo.fiInfo.llPackedSize = ex->llCompressedSize;\r
- piInfo.fiInfo.llUnpackedSize = ex->llFileSize;\r
- piInfo.fiInfo.uOSType = ex->uOSType;\r
+ piInfo.fiInfo.nPackedSize = ex->llCompressedSize;\r
+ piInfo.fiInfo.nUnpackedSize = ex->llFileSize;\r
+ piInfo.fiInfo.eOSType = ex->eOSType;\r
piInfo.fiInfo.wCompressRatio = ex->wRatio;\r
piInfo.fiInfo.szStoredName = WC2String(ex->exinfo.szSourceFileName);\r
piInfo.fiInfo.szMethod = WC2String(ex->szMode);\r
\r
// EXTRACTINGINFOEX64 -> TPI_PROCESSINFO変換。\r
- piInfo.llProcessedSize = ex->llWriteSize;\r
+ piInfo.nProcessedSize = ex->llWriteSize;\r
piInfo.fnDestination = wxFileName(WC2String(ex->exinfo.szDestFileName));\r
}\r
else\r
piInfo.fiInfo.tmAccess = FileTimeToWxDateTime(& ex->ftAccessTime);\r
piInfo.fiInfo.tmCreate = FileTimeToWxDateTime(& ex->ftCreateTime);\r
piInfo.fiInfo.tmModified = FileTimeToWxDateTime(& ex->ftWriteTime);\r
- piInfo.fiInfo.llPackedSize = ex->llCompressedSize;\r
- piInfo.fiInfo.llUnpackedSize = ex->llFileSize;\r
- piInfo.fiInfo.uOSType = ex->uOSType;\r
+ piInfo.fiInfo.nPackedSize = ex->llCompressedSize;\r
+ piInfo.fiInfo.nUnpackedSize = ex->llFileSize;\r
+ piInfo.fiInfo.eOSType = ex->eOSType;\r
piInfo.fiInfo.wCompressRatio = ex->wRatio;\r
piInfo.fiInfo.szStoredName = UTF82String(ex->exinfo.szSourceFileName);\r
piInfo.fiInfo.szMethod = UTF82String(ex->szMode);\r
\r
// EXTRACTINGINFOEX64 -> TPI_PROCESSINFO変換。\r
- piInfo.llProcessedSize = ex->llWriteSize;\r
+ piInfo.nProcessedSize = ex->llWriteSize;\r
piInfo.fnDestination = wxFileName(UTF82String(ex->exinfo.szDestFileName));\r
}\r
}\r
{\r
case ARCEXTRACT_OPEN:\r
// 当該書庫の処理を開始。\r
- piInfo.uStatus = TPI_STATUS_OPENARCHIVE;\r
+ piInfo.eStatus = TPI_STATUS_OPENARCHIVE;\r
break;\r
case 5:\r
// 当該ファイルの検索中。\r
- piInfo.uStatus = TPI_STATUS_SEEKFILE;\r
+ piInfo.eStatus = TPI_STATUS_SEEKFILE;\r
break;\r
case ARCEXTRACT_BEGIN:\r
// 当該ファイルの処理を開始。\r
- piInfo.uStatus = TPI_STATUS_BEGINPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_BEGINPROCESS;\r
break;\r
case ARCEXTRACT_INPROCESS:\r
// 当該ファイルの処理を実行中。\r
- piInfo.uStatus = TPI_STATUS_INPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_INPROCESS;\r
break;\r
case 6:\r
// 当該ファイルの処理を終了。\r
- piInfo.uStatus = TPI_STATUS_ENDPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_ENDPROCESS;\r
break;\r
case 7:\r
// 当該書庫の検査中。\r
- piInfo.uStatus = TPI_STATUS_TESTARCHIVE;\r
+ piInfo.eStatus = TPI_STATUS_TESTARCHIVE;\r
break;\r
case ARCEXTRACT_COPY:\r
// 当該書庫の書き戻し中。\r
- piInfo.uStatus = TPI_STATUS_COPYARCHIVE;\r
+ piInfo.eStatus = TPI_STATUS_COPYARCHIVE;\r
break;\r
case ARCEXTRACT_END:\r
// 当該書庫の処理を終了。\r
- piInfo.uStatus = TPI_STATUS_CLOSEARCHIVE;\r
+ piInfo.eStatus = TPI_STATUS_CLOSEARCHIVE;\r
break;\r
}\r
\r
if (g_LibInfo.fUnicode)\r
{\r
_fiInfo->dwCRC32 = iiInfoW.dwCRC;\r
- _fiInfo->uOSType = iiInfoW.uOSType;\r
- _fiInfo->llPackedSize = iiInfoW.dwCompressedSize;\r
- _fiInfo->llUnpackedSize = iiInfoW.dwOriginalSize;\r
+ _fiInfo->eOSType = iiInfoW.eOSType;\r
+ _fiInfo->nPackedSize = iiInfoW.dwCompressedSize;\r
+ _fiInfo->nUnpackedSize = iiInfoW.dwOriginalSize;\r
_fiInfo->tmModified.SetFromDOS(MAKELONG(iiInfoW.wTime, iiInfoW.wDate));\r
_fiInfo->szStoredName = WC2String(iiInfoW.szFileName);\r
_fiInfo->szMethod = WC2String(iiInfoW.szMode);\r
else\r
{\r
_fiInfo->dwCRC32 = iiInfo.dwCRC;\r
- _fiInfo->uOSType = iiInfo.uOSType;\r
- _fiInfo->llPackedSize = iiInfo.dwCompressedSize;\r
- _fiInfo->llUnpackedSize = iiInfo.dwOriginalSize;\r
+ _fiInfo->eOSType = iiInfo.eOSType;\r
+ _fiInfo->nPackedSize = iiInfo.dwCompressedSize;\r
+ _fiInfo->nUnpackedSize = iiInfo.dwOriginalSize;\r
_fiInfo->tmModified.SetFromDOS(MAKELONG(iiInfo.wTime, iiInfo.wDate));\r
_fiInfo->szStoredName = UTF82String(iiInfo.szFileName);\r
_fiInfo->szMethod = UTF82String(iiInfo.szMode);\r
_fiInfo->wCompressRatio = iiInfo.wRatio;\r
}\r
- _fiInfo->llFileId = s_nFileId++;\r
+ _fiInfo->nFileId = s_nFileId++;\r
_fiInfo->fnFileName = wxFileName(_fiInfo->szStoredName);\r
// _fiInfo->ftAccessTime = 0;\r
// _fiInfo->ftCreateTime = 0;\r
fpProc = ::GetAPIAddress("GetArcFileSizeEx", false);\r
if (fpProc != NULL)\r
{\r
- ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->llFileSize);\r
+ ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->nFileSize);\r
}\r
else\r
{\r
fpProc = ::GetAPIAddress("GetArcFileSize", false);\r
if (fpProc != NULL)\r
{\r
- _aiInfo->llFileSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
+ _aiInfo->nFileSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
}\r
}\r
\r
fpProc = ::GetAPIAddress("GetArcOriginalSizeEx", false);\r
if (fpProc != NULL)\r
{\r
- ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->llUnpackedSize);\r
+ ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->nUnpackedSize);\r
}\r
else\r
{\r
fpProc = ::GetAPIAddress("GetArcOriginalSize", false);\r
if (fpProc != NULL)\r
{\r
- _aiInfo->llUnpackedSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
+ _aiInfo->nUnpackedSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
}\r
}\r
\r
fpProc = ::GetAPIAddress("GetArcCompressedSizeEx", false);\r
if (fpProc != NULL)\r
{\r
- ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->llPackedSize);\r
+ ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->nPackedSize);\r
}\r
else\r
{\r
fpProc = ::GetAPIAddress("GetArcCompressedSize", false);\r
if (fpProc != NULL)\r
{\r
- _aiInfo->llPackedSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
+ _aiInfo->nPackedSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
}\r
}\r
\r
fpProc = ::GetAPIAddress("GetArcReadSizeEx", false);\r
if (fpProc != NULL)\r
{\r
- ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->llReadSize);\r
+ ((BOOL (__stdcall *)(void *, LONGLONG *)) fpProc)(_hArchive, (LONGLONG *) & _aiInfo->nReadSize);\r
}\r
else\r
{\r
fpProc = ::GetAPIAddress("GetArcReadSize", false);\r
if (fpProc != NULL)\r
{\r
- _aiInfo->llReadSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
+ _aiInfo->nReadSize = ((DWORD (__stdcall *)(void *)) fpProc)(_hArchive);\r
}\r
}\r
\r
fpProc = ::GetAPIAddress("GetArcOSType", false);\r
if (fpProc != NULL)\r
{\r
- _aiInfo->uOSType = ((UINT (__stdcall *)(void *)) fpProc)(_hArchive);\r
+ _aiInfo->eOSType = ((UINT (__stdcall *)(void *)) fpProc)(_hArchive);\r
}\r
\r
fpProc = ::GetAPIAddress("IsSFXFile", false);\r
- if (fpProc != NULL)\r
- {\r
- _aiInfo->nSFXType = ((int (__stdcall *)(void *)) fpProc)(_hArchive);\r
- }\r
- if (fpProc == NULL || _aiInfo->nSFXType < 0)\r
- {\r
- // エラーの場合はとりあえず通常の書庫とみなす。\r
- _aiInfo->nSFXType = 0;\r
- }\r
+ _aiInfo->fSFX = fpProc != NULL && ((int (__stdcall *)(void *)) fpProc)(_hArchive) != 0;\r
\r
// 形式に関する情報を取得。\r
MakeFormatInfo(wxT("calLibrary"), & _aiInfo->fiInfo, & g_LibInfo.node, 0);\r
\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
// APIアドレス取得。\r
g_LibInfoAlt.fRunning\r
= g_LibInfo.node.GetPropVal(\r
- _uCommand == TPI_COMMAND_CREATE ? wxT("create-alt") :\r
- _uCommand == TPI_COMMAND_ADD ? wxT("add-alt") :\r
- _uCommand == TPI_COMMAND_EXTRACT ? wxT("extract-alt") : \r
- _uCommand == TPI_COMMAND_DELETE ? wxT("delete-alt") : \r
- _uCommand == TPI_COMMAND_UPDATE ? wxT("update-alt") : \r
- _uCommand == TPI_COMMAND_TEST ? wxT("test-alt") : \r
- _uCommand == TPI_COMMAND_REPAIR ? wxT("repair-alt") : \r
- _uCommand == TPI_COMMAND_MOVE ? wxT("move-alt") : \r
- _uCommand == TPI_COMMAND_SFX ? wxT("sfx-alt") : \r
- _uCommand == TPI_COMMAND_UNSFX ? wxT("unsfx-alt") : wxEmptyString, & szCommandLine);\r
+ _eCommand == TPI_COMMAND_CREATE ? wxT("create-alt") :\r
+ _eCommand == TPI_COMMAND_ADD ? wxT("add-alt") :\r
+ _eCommand == TPI_COMMAND_EXTRACT ? wxT("extract-alt") : \r
+ _eCommand == TPI_COMMAND_DELETE ? wxT("delete-alt") : \r
+ _eCommand == TPI_COMMAND_UPDATE ? wxT("update-alt") : \r
+ _eCommand == TPI_COMMAND_TEST ? wxT("test-alt") : \r
+ _eCommand == TPI_COMMAND_REPAIR ? wxT("repair-alt") : \r
+ _eCommand == TPI_COMMAND_MOVE ? wxT("move-alt") : \r
+ _eCommand == TPI_COMMAND_SFX ? wxT("sfx-alt") : \r
+ _eCommand == TPI_COMMAND_UNSFX ? wxT("unsfx-alt") : wxEmptyString, & szCommandLine);\r
g_LibInfo.fRunning\r
= g_LibInfo.node.GetPropVal(\r
- _uCommand == TPI_COMMAND_CREATE ? wxT("create") :\r
- _uCommand == TPI_COMMAND_ADD ? wxT("add") :\r
- _uCommand == TPI_COMMAND_EXTRACT ? wxT("extract") : \r
- _uCommand == TPI_COMMAND_DELETE ? wxT("delete") : \r
- _uCommand == TPI_COMMAND_UPDATE ? wxT("update") : \r
- _uCommand == TPI_COMMAND_TEST ? wxT("test") : \r
- _uCommand == TPI_COMMAND_REPAIR ? wxT("repair") : \r
- _uCommand == TPI_COMMAND_MOVE ? wxT("move") : \r
- _uCommand == TPI_COMMAND_SFX ? wxT("sfx") : \r
- _uCommand == TPI_COMMAND_UNSFX ? wxT("unsfx") : wxEmptyString, & szCommandLine);\r
+ _eCommand == TPI_COMMAND_CREATE ? wxT("create") :\r
+ _eCommand == TPI_COMMAND_ADD ? wxT("add") :\r
+ _eCommand == TPI_COMMAND_EXTRACT ? wxT("extract") : \r
+ _eCommand == TPI_COMMAND_DELETE ? wxT("delete") : \r
+ _eCommand == TPI_COMMAND_UPDATE ? wxT("update") : \r
+ _eCommand == TPI_COMMAND_TEST ? wxT("test") : \r
+ _eCommand == TPI_COMMAND_REPAIR ? wxT("repair") : \r
+ _eCommand == TPI_COMMAND_MOVE ? wxT("move") : \r
+ _eCommand == TPI_COMMAND_SFX ? wxT("sfx") : \r
+ _eCommand == TPI_COMMAND_UNSFX ? wxT("unsfx") : wxEmptyString, & szCommandLine);\r
\r
FARPROC fpProc =\r
g_LibInfo.fRunning ? ::GetAPIAddress( "", true) :\r
DWORD dwCompressedSize;\r
DWORD dwCRC;\r
UINT uFlag;\r
- UINT uOSType;\r
+ UINT eOSType;\r
WORD wRatio;\r
WORD wDate;\r
WORD wTime;\r
DWORD dwCompressedSize;\r
DWORD dwCRC;\r
UINT uFlag;\r
- UINT uOSType;\r
+ UINT eOSType;\r
WORD wRatio;\r
WORD wDate;\r
WORD wTime;\r
EXTRACTINGINFO exinfo;\r
DWORD dwCompressedSize;\r
DWORD dwCRC;\r
- UINT uOSType;\r
+ UINT eOSType;\r
WORD wRatio;\r
WORD wDate;\r
WORD wTime;\r
EXTRACTINGINFOW exinfo;\r
DWORD dwCompressedSize;\r
DWORD dwCRC;\r
- UINT uOSType;\r
+ UINT eOSType;\r
WORD wRatio;\r
WORD wDate;\r
WORD wTime;\r
UINT64 llWriteSize;\r
DWORD dwAttributes;\r
DWORD dwCRC;\r
- UINT uOSType;\r
+ UINT eOSType;\r
WORD wRatio;\r
FILETIME ftCreateTime;\r
FILETIME ftAccessTime;\r
UINT64 llWriteSize;\r
DWORD dwAttributes;\r
DWORD dwCRC;\r
- UINT uOSType;\r
+ UINT eOSType;\r
WORD wRatio;\r
FILETIME ftCreateTime;\r
FILETIME ftAccessTime;\r
MakeFormatInfo(wxT("cuiWrapper"), _fiInfo, xmlLibrary, s_nFileId++);\r
if (myExecute(xmlLibrary->GetPropVal(wxT("name"), wxEmptyString), NULL, wxEmptyString) != TPI_ERROR_SUCCESS)\r
{\r
- _fiInfo->llSupportedCommand = 0;\r
+ _fiInfo->eSupportedCommand = 0;\r
}\r
\r
return TPI_ERROR_SUCCESS;\r
_fiInfo->fnFileName = wxFileName::wxFileName(_fiInfo->szStoredName);\r
\r
// サイズ取得。\r
- _fiInfo->llPackedSize = GetSize(piPSize, s_nCurrentLine, asOutput);\r
- _fiInfo->llUnpackedSize = GetSize(piUSize, s_nCurrentLine, asOutput);\r
+ _fiInfo->nPackedSize = GetSize(piPSize, s_nCurrentLine, asOutput);\r
+ _fiInfo->nUnpackedSize = GetSize(piUSize, s_nCurrentLine, asOutput);\r
\r
// 更新時刻取得。\r
if (piDate.nStart != 0 || piDate.nCount != 0)\r
}\r
\r
// 最後に次の行へ進めておく。\r
- _fiInfo->llFileId = s_nFileId++;\r
+ _fiInfo->nFileId = s_nFileId++;\r
s_nCurrentLine += nProcessPerLine;\r
\r
return TPI_ERROR_SUCCESS;\r
\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
// APIアドレス取得。\r
if (! g_LibInfo.node.GetPropVal(\r
- _uCommand == TPI_COMMAND_CREATE ? wxT("create") :\r
- _uCommand == TPI_COMMAND_ADD ? wxT("add") :\r
- _uCommand == TPI_COMMAND_EXTRACT ? wxT("extract") : \r
- _uCommand == TPI_COMMAND_DELETE ? wxT("delete") : \r
- _uCommand == TPI_COMMAND_UPDATE ? wxT("update") : \r
- _uCommand == TPI_COMMAND_TEST ? wxT("test") : \r
- _uCommand == TPI_COMMAND_REPAIR ? wxT("repair") : \r
- _uCommand == TPI_COMMAND_MOVE ? wxT("move") : \r
- _uCommand == TPI_COMMAND_SFX ? wxT("sfx") : \r
- _uCommand == TPI_COMMAND_UNSFX ? wxT("unsfx") : wxEmptyString, & szCommandLine))\r
+ _eCommand == TPI_COMMAND_CREATE ? wxT("create") :\r
+ _eCommand == TPI_COMMAND_ADD ? wxT("add") :\r
+ _eCommand == TPI_COMMAND_EXTRACT ? wxT("extract") : \r
+ _eCommand == TPI_COMMAND_DELETE ? wxT("delete") : \r
+ _eCommand == TPI_COMMAND_UPDATE ? wxT("update") : \r
+ _eCommand == TPI_COMMAND_TEST ? wxT("test") : \r
+ _eCommand == TPI_COMMAND_REPAIR ? wxT("repair") : \r
+ _eCommand == TPI_COMMAND_MOVE ? wxT("move") : \r
+ _eCommand == TPI_COMMAND_SFX ? wxT("sfx") : \r
+ _eCommand == TPI_COMMAND_UNSFX ? wxT("unsfx") : wxEmptyString, & szCommandLine))\r
{\r
g_LibInfo.node.GetPropVal(\r
- _uCommand == TPI_COMMAND_CREATE ? wxT("create-alt") :\r
- _uCommand == TPI_COMMAND_ADD ? wxT("add-alt") :\r
- _uCommand == TPI_COMMAND_EXTRACT ? wxT("extract-alt") : \r
- _uCommand == TPI_COMMAND_DELETE ? wxT("delete-alt") : \r
- _uCommand == TPI_COMMAND_UPDATE ? wxT("update-alt") : \r
- _uCommand == TPI_COMMAND_TEST ? wxT("test-alt") : \r
- _uCommand == TPI_COMMAND_REPAIR ? wxT("repair-alt") : \r
- _uCommand == TPI_COMMAND_MOVE ? wxT("move-alt") : \r
- _uCommand == TPI_COMMAND_SFX ? wxT("sfx-alt") : \r
- _uCommand == TPI_COMMAND_UNSFX ? wxT("unsfx-alt") : wxEmptyString, & szCommandLine);\r
+ _eCommand == TPI_COMMAND_CREATE ? wxT("create-alt") :\r
+ _eCommand == TPI_COMMAND_ADD ? wxT("add-alt") :\r
+ _eCommand == TPI_COMMAND_EXTRACT ? wxT("extract-alt") : \r
+ _eCommand == TPI_COMMAND_DELETE ? wxT("delete-alt") : \r
+ _eCommand == TPI_COMMAND_UPDATE ? wxT("update-alt") : \r
+ _eCommand == TPI_COMMAND_TEST ? wxT("test-alt") : \r
+ _eCommand == TPI_COMMAND_REPAIR ? wxT("repair-alt") : \r
+ _eCommand == TPI_COMMAND_MOVE ? wxT("move-alt") : \r
+ _eCommand == TPI_COMMAND_SFX ? wxT("sfx-alt") : \r
+ _eCommand == TPI_COMMAND_UNSFX ? wxT("unsfx-alt") : wxEmptyString, & szCommandLine);\r
}\r
\r
if (szCommandLine.IsEmpty())\r
{\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
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
_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
_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
\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
{\r
case RAR_VOL_ASK:\r
// 分割書庫の次の部分を要求。\r
- piInfo.uMessage = TPI_MESSAGE_ASK;\r
- piInfo.uStatus = TPI_PARAM_NEXTVOLUME;\r
+ piInfo.eMessage = TPI_MESSAGE_ASK;\r
+ piInfo.eStatus = TPI_PARAM_NEXTVOLUME;\r
piInfo.szParam.Clear();\r
break;\r
case RAR_VOL_NOTIFY:\r
// 分割部分の読み込みを開始。\r
- piInfo.uMessage = TPI_MESSAGE_STATUS;\r
- piInfo.uStatus = TPI_STATUS_OPENARCHIVE;\r
+ piInfo.eMessage = TPI_MESSAGE_STATUS;\r
+ piInfo.eStatus = TPI_STATUS_OPENARCHIVE;\r
piInfo.fiInfo.fnFileName = wxFileName(UTF82String((char *) P1));\r
break;\r
default:\r
}\r
break;\r
case UCM_PROCESSDATA:\r
- piInfo.uMessage = TPI_MESSAGE_STATUS;\r
- piInfo.uStatus = TPI_STATUS_INPROCESS;\r
- piInfo.llProcessedSize += P2;\r
+ piInfo.eMessage = TPI_MESSAGE_STATUS;\r
+ piInfo.eStatus = TPI_STATUS_INPROCESS;\r
+ piInfo.nProcessedSize += P2;\r
break;\r
case UCM_NEEDPASSWORD:\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
piInfo.szParam.Clear();\r
break;\r
default:\r
_fiInfo->szSuffix = wxT("rar");\r
_fiInfo->szEngineName = g_hLib.CanonicalizeName(wxT("unrar"));\r
_fiInfo->szTPIName = wxT("rarArc");\r
- _fiInfo->llTypeId = 0;\r
- _fiInfo->llSupportedCommand = TPI_COMMAND_EXTRACT | TPI_COMMAND_TEST;\r
+ _fiInfo->nTypeId = 0;\r
+ _fiInfo->eSupportedCommand = TPI_COMMAND_EXTRACT | TPI_COMMAND_TEST;\r
_fiInfo->fArchive = true;\r
_fiInfo->fComment = true;\r
_fiInfo->fSFX = true;\r
_fiInfo->dwAttribute |= TPI_ATTRIBUTE_ENCRYPTED;\r
}\r
_fiInfo->dwCRC32 = hdInfo.FileCRC;\r
- _fiInfo->llPackedSize = wxLongLong(hdInfo.PackSizeHigh, hdInfo.PackSize).GetValue();\r
- _fiInfo->llUnpackedSize = wxLongLong(hdInfo.UnpSizeHigh, hdInfo.UnpSize).GetValue();\r
+ _fiInfo->nPackedSize = wxLongLong(hdInfo.PackSizeHigh, hdInfo.PackSize).GetValue();\r
+ _fiInfo->nUnpackedSize = wxLongLong(hdInfo.UnpSizeHigh, hdInfo.UnpSize).GetValue();\r
_fiInfo->tmModified.SetFromDOS(hdInfo.FileTime);\r
- _fiInfo->uOSType = hdInfo.HostOS;\r
+ _fiInfo->eOSType = hdInfo.HostOS;\r
_fiInfo->szStoredName = WC2String(hdInfo.FileNameW);\r
_fiInfo->szMethod.Printf(wxT("%x"), hdInfo.Method);\r
_fiInfo->szComment = UTF82String(hdInfo.CmtBuf);\r
- _fiInfo->llFileId = s_nFileId++;\r
+ _fiInfo->nFileId = s_nFileId++;\r
_fiInfo->fnFileName = wxFileName(_fiInfo->szStoredName);\r
\r
// 次のファイルへ。\r
\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 && _uCommand != TPI_COMMAND_TEST)\r
+ if (_eCommand != TPI_COMMAND_EXTRACT && _eCommand != TPI_COMMAND_TEST)\r
{\r
return TPI_ERROR_U_USE_LIBRARY;\r
}\r
ErrorCodeConvert(\r
((int (__stdcall *)(void *, int, wchar_t *, wchar_t *)) pP)(\r
hArc,\r
- (_szFiles.GetCount() != 0 && _szFiles.Index(wxString(hdInfo.FileNameW)) == wxNOT_FOUND) ? RAR_SKIP : _uCommand == TPI_COMMAND_EXTRACT ? RAR_EXTRACT : RAR_TEST,\r
+ (_szFiles.GetCount() != 0 && _szFiles.Index(wxString(hdInfo.FileNameW)) == wxNOT_FOUND) ? RAR_SKIP : _eCommand == TPI_COMMAND_EXTRACT ? RAR_EXTRACT : RAR_TEST,\r
_swInfo->fStoreDirectoryPathes ? _swInfo->fnDestinationDirectory.GetFullPath().wchar_str() : NULL,\r
_swInfo->fStoreDirectoryPathes ? NULL : (_swInfo->fnDestinationDirectory.GetPathWithSep() + wxFileName(hdInfo.FileNameW).GetFullName()).wchar_str()\r
)\r
{\r
// 構造体を初期化。\r
TPI_PROCESSINFO * piInfo = (TPI_PROCESSINFO *) _lData;\r
- piInfo->llProcessedSize = _nNow;\r
+ piInfo->nProcessedSize = _nNow;\r
\r
// コールバック関数に送信。\r
return g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, piInfo) == TPI_CALLBACK_CANCEL;\r
\r
_fiInfo->dwAttribute = 0;\r
_fiInfo->dwCRC32 = pfiInfo.crc;\r
- _fiInfo->llPackedSize = pfiInfo.compsize;\r
- _fiInfo->llUnpackedSize = pfiInfo.filesize;\r
+ _fiInfo->nPackedSize = pfiInfo.compsize;\r
+ _fiInfo->nUnpackedSize = pfiInfo.filesize;\r
_fiInfo->wCompressRatio = pfiInfo.compsize >= pfiInfo.filesize ? 1000 : (WORD) (1000 * pfiInfo.compsize / pfiInfo.filesize);\r
- _fiInfo->llFileId = nFilePointer++;\r
+ _fiInfo->nFileId = nFilePointer++;\r
_fiInfo->tmModified = pfiInfo.timestamp;\r
_fiInfo->szStoredName = MB2String(pfiInfo.path) + MB2String(pfiInfo.filename);\r
_fiInfo->fnFileName = wxFileName(_fiInfo->szStoredName);\r
}\r
}\r
_aiInfo->fiInfo.szTPIName = wxT("spiLibrary");\r
- _aiInfo->fiInfo.llSupportedCommand = TPI_COMMAND_EXTRACT;\r
+ _aiInfo->fiInfo.eSupportedCommand = TPI_COMMAND_EXTRACT;\r
\r
return TPI_ERROR_SUCCESS;\r
}\r
\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_D_UNSUPPORTED;\r
}\r
// コールバックを送信。\r
wxFileName _fnArcName(_szArcName);\r
TPI_PROCESSINFO piInfo;\r
- piInfo.uMessage = TPI_MESSAGE_STATUS;\r
- piInfo.uStatus = TPI_STATUS_OPENARCHIVE;\r
+ piInfo.eMessage = TPI_MESSAGE_STATUS;\r
+ piInfo.eStatus = TPI_STATUS_OPENARCHIVE;\r
piInfo.fiInfo.fnFileName = _fnArcName;\r
if (CallbackProc(0, 0, (long) & piInfo))\r
{\r
}\r
\r
// 処理実行。\r
- piInfo.uStatus = TPI_STATUS_INPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_INPROCESS;\r
nErrorCode = GetFileInformation(hArchive, & piInfo.fiInfo, true);\r
if (nErrorCode == TPI_ERROR_SUCCESS)\r
{\r
do\r
{\r
// コールバックを送信。\r
- piInfo.uStatus = TPI_STATUS_BEGINPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_BEGINPROCESS;\r
if (CallbackProc(0, 0, (long) & piInfo))\r
{\r
nErrorCode = TPI_ERROR_D_SKIPPED;\r
break;\r
}\r
- piInfo.uStatus = TPI_STATUS_INPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_INPROCESS;\r
\r
// 処理対象かどうか判定。\r
if ((! _szFiles.IsEmpty()) && _szFiles.Index(piInfo.fiInfo.szStoredName) == wxNOT_FOUND)\r
break;\r
}\r
\r
- bool bErrorOccured = hFile.Write(::LocalLock(hMemory), (size_t) piInfo.fiInfo.llUnpackedSize) != piInfo.fiInfo.llUnpackedSize;\r
+ bool bErrorOccured = hFile.Write(::LocalLock(hMemory), (size_t) piInfo.fiInfo.nUnpackedSize) != piInfo.fiInfo.nUnpackedSize;\r
::LocalUnlock(hMemory);\r
::LocalFree(hMemory);\r
hFile.Close();\r
nErrorCode = TPI_ERROR_SUCCESS;\r
\r
// コールバックを送信。\r
- piInfo.uStatus = TPI_STATUS_ENDPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_ENDPROCESS;\r
if (CallbackProc(0, 0, (long) & piInfo))\r
{\r
nErrorCode = TPI_ERROR_D_SKIPPED;\r
{\r
// 構造体を初期化。\r
TPI_PROCESSINFO * piInfo = (TPI_PROCESSINFO *) _lData;\r
- piInfo->llProcessedSize = _nNow;\r
- piInfo->fiInfo.llUnpackedSize = _nMax;\r
+ piInfo->nProcessedSize = _nNow;\r
+ piInfo->fiInfo.nUnpackedSize = _nMax;\r
\r
// コールバック関数に送信。\r
return g_prProc != NULL && g_prProc(TPI_NOTIFY_COMMON, piInfo) == TPI_CALLBACK_CANCEL;\r
}\r
_aiInfo->fiInfo.fArchive = false;\r
_aiInfo->fiInfo.szTPIName = wxT("xpiLibrary");\r
- _aiInfo->fiInfo.llSupportedCommand = TPI_COMMAND_EXTRACT;\r
+ _aiInfo->fiInfo.eSupportedCommand = TPI_COMMAND_EXTRACT;\r
\r
return TPI_ERROR_SUCCESS;\r
}\r
\r
int __stdcall Command\r
(\r
- unsigned int _uCommand,\r
+ wxULongLong_t _eCommand,\r
TPI_SWITCHES * _swInfo,\r
const wxString & _szArcName,\r
const wxArrayString & _asFiles\r
)\r
{\r
- if (_uCommand != TPI_COMMAND_EXTRACT)\r
+ if (_eCommand != TPI_COMMAND_EXTRACT)\r
{\r
return TPI_ERROR_D_UNSUPPORTED;\r
}\r
// コールバックを送信。\r
wxFileName _fnArcName(_szArcName);\r
TPI_PROCESSINFO piInfo;\r
- piInfo.uMessage = TPI_MESSAGE_STATUS;\r
- piInfo.uStatus = TPI_STATUS_OPENARCHIVE;\r
+ piInfo.eMessage = TPI_MESSAGE_STATUS;\r
+ piInfo.eStatus = TPI_STATUS_OPENARCHIVE;\r
piInfo.fiInfo.fnFileName = _fnArcName;\r
if (CallbackProc(0, 0, (long) & piInfo))\r
{\r
}\r
\r
// コールバックを送信。\r
- piInfo.uStatus = TPI_STATUS_BEGINPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_BEGINPROCESS;\r
piInfo.fiInfo.fnFileName = wxFileName(_asFiles[i]);\r
piInfo.fnDestination = piInfo.fiInfo.fnFileName;\r
piInfo.fnDestination.SetPath(_swInfo->fnDestinationDirectory.GetPath());\r
}\r
\r
// 書き込み。\r
- piInfo.uStatus = TPI_STATUS_INPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_INPROCESS;\r
fpProc = ::GetProcAddress(hXPI, "CreatePicture");\r
if (fpProc == NULL)\r
{\r
::FreeLibrary(hXPI);\r
\r
// 最後にコールバックを送信。\r
- piInfo.uStatus = TPI_STATUS_ENDPROCESS;\r
+ piInfo.eStatus = TPI_STATUS_ENDPROCESS;\r
if (CallbackProc(0, 0, (long) & piInfo))\r
{\r
nErrorCode = TPI_ERROR_D_SKIPPED;\r
}\r
\r
// 最終のコールバック。\r
- piInfo.uStatus = TPI_STATUS_CLOSEARCHIVE;\r
+ piInfo.eStatus = TPI_STATUS_CLOSEARCHIVE;\r
piInfo.fiInfo.fnFileName = _fnArcName;\r
if (CallbackProc(0, 0, (long) & piInfo))\r
{\r
OSDN Git Service
