Windows依存のコードを一部削除。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@111 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index fa05188..33500b3 100644 (file)
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -413,7 +413,7 @@ int __stdcall GetPluginInformation
        {\r
                return TPI_ERROR_D_PARAMETER;\r
        }\r
-       switch (LOWORD(_uInfoId))\r
+       switch (_uInfoId)\r
        {\r
        case TPI_INFO_VERSION_MAJOR:\r
        case TPI_INFO_VERSION_MINOR:\r

diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp
index 1ce8b81..b62ce77 100644 (file)
--- a/src/plugin/cuiWrapper/cuiWrapper.cpp
+++ b/src/plugin/cuiWrapper/cuiWrapper.cpp
@@ -30,7 +30,9 @@
 #include <wx/stdpaths.h>\r
 #include <wx/xml/xml.h>\r
 #include <wx/tokenzr.h>\r
+#ifdef __WINDOWS__\r
 #include <windows.h>\r
+#endif\r
 #include "cuiWrapper.h"\r
 \r
 //******************************************************************************\r
@@ -54,16 +56,18 @@ wxArrayString g_asOutput;
 //    Entry\r
 //******************************************************************************\r
 \r
+#ifdef __WINDOWS__\r
 BOOL __stdcall DllMain(HMODULE, DWORD, void *)\r
 {\r
        return TRUE;\r
 }\r
+#endif\r
 \r
 //******************************************************************************\r
 //    Inside Functions\r
 //******************************************************************************\r
 \r
-DWORD myExecute(wxString szCommandLine, wxString * szOutput, wxString szCwd, bool bCheckExist = false)\r
+int myExecute(wxString szCommandLine, wxString * szOutput, wxString szCwd, bool bCheckExist = false)\r
 {\r
 #ifdef __LINUX__\r
        wxString sz = ::wxGetCwd();\r
@@ -193,7 +197,7 @@ int __stdcall GetPluginInformation
        {\r
                return TPI_ERROR_D_PARAMETER;\r
        }\r
-       switch (LOWORD(_uInfoId))\r
+       switch (_uInfoId)\r
        {\r
        case TPI_INFO_VERSION_MAJOR:\r
        case TPI_INFO_VERSION_MINOR:\r
@@ -514,7 +518,7 @@ int __stdcall Command
 \r
        // \83R\83}\83\93\83h\83\89\83C\83\93\8eÀ\8ds\81B\r
        wxString szOutput;\r
-       DWORD nErrorCode = myExecute(g_LibInfo.szExeFile + wxT(" ") + szCommandLineSend, & szOutput, _swInfo->fnDestinationDirectory.GetFullPath());\r
+       int nErrorCode = myExecute(g_LibInfo.szExeFile + wxT(" ") + szCommandLineSend, & szOutput, _swInfo->fnDestinationDirectory.GetFullPath());\r
 \r
        // \83\8c\83X\83|\83\93\83X\83t\83@\83C\83\8b\8dí\8f\9c\81B\r
        ::wxRemoveFile(szResponceFileName);\r

diff --git a/src/plugin/eggArc/eggArc.cpp b/src/plugin/eggArc/eggArc.cpp
index 7330803..ca9901a 100644 (file)
--- a/src/plugin/eggArc/eggArc.cpp
+++ b/src/plugin/eggArc/eggArc.cpp
@@ -165,7 +165,7 @@ int __stdcall GetPluginInformation
        {\r
                return TPI_ERROR_D_PARAMETER;\r
        }\r
-       switch (LOWORD(_uInfoId))\r
+       switch (_uInfoId)\r
        {\r
        case TPI_INFO_VERSION_MAJOR:\r
        case TPI_INFO_VERSION_MINOR:\r

diff --git a/src/plugin/rarArc/rarArc.cpp b/src/plugin/rarArc/rarArc.cpp
index 57053f0..f9157f1 100644 (file)
--- a/src/plugin/rarArc/rarArc.cpp
+++ b/src/plugin/rarArc/rarArc.cpp
@@ -28,7 +28,6 @@
 #include "../../common/header/plugin-extra.h"\r
 #include "../../common/library/library.h"\r
 #include <wx/dynlib.h>\r
-#include <windows.h>\r
 #include "rarArc.h"\r
 \r
 //******************************************************************************\r
@@ -47,7 +46,7 @@ RARHeaderDataEx * g_hdInfo;
 //    Callback Wrapper\r
 //******************************************************************************\r
 \r
-int __stdcall CallbackProc(unsigned int msg, long UserData, long P1, long P2)\r
+int __stdcall CallbackProc(unsigned int msg, long, long P1, long P2)\r
 {\r
        // \8d\\91¢\91Ì\82ð\8f\89\8aú\89»\81B\r
        static TPI_PROCESSINFO piInfo;\r
@@ -149,7 +148,7 @@ int __stdcall GetPluginInformation
        {\r
                return TPI_ERROR_D_PARAMETER;\r
        }\r
-       switch (LOWORD(_uInfoId))\r
+       switch (_uInfoId)\r
        {\r
        case TPI_INFO_VERSION_MAJOR:\r
        case TPI_INFO_VERSION_MINOR:\r
@@ -278,7 +277,7 @@ int __stdcall OpenArchive
        {\r
                return TPI_ERROR_U_USE_LIBRARY;\r
        }\r
-       ((void (__stdcall *)(void *, FARPROC, LPARAM)) p)(* _hArchive, (FARPROC) CallbackProc, (LPARAM) & g_hdInfo);\r
+       ((void (__stdcall *)(void *, void *, long)) p)(* _hArchive, (void *) CallbackProc, (long) & g_hdInfo);\r
 \r
        return TPI_ERROR_SUCCESS;\r
 }\r

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index e003cab..e2864bf 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -127,7 +127,7 @@ int __stdcall GetPluginInformation
        {\r
                return TPI_ERROR_D_PARAMETER;\r
        }\r
-       switch (LOWORD(_uInfoId))\r
+       switch (_uInfoId)\r
        {\r
        case TPI_INFO_VERSION_MAJOR:\r
        case TPI_INFO_VERSION_MINOR:\r