From 0e3cff3c673e28ba66e84c69d54eea5717c87d65 Mon Sep 17 00:00:00 2001
From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Mon, 16 Nov 2009 11:34:24 +0000
Subject: [PATCH] =?utf8?q?Windows=E4=BE=9D=E5=AD=98=E3=81=AE=E3=82=B3?=
 =?utf8?q?=E3=83=BC=E3=83=89=E3=82=92=E4=B8=80=E9=83=A8=E5=89=8A=E9=99=A4?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@111 9df91469-1e22-0410-86e7-ea8537beb833
---
 src/plugin/calLibrary/calLibrary.cpp |  2 +-
 src/plugin/cuiWrapper/cuiWrapper.cpp | 10 +++++++---
 src/plugin/eggArc/eggArc.cpp         |  2 +-
 src/plugin/rarArc/rarArc.cpp         |  7 +++----
 src/plugin/spiLibrary/spiLibrary.cpp |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/plugin/calLibrary/calLibrary.cpp b/src/plugin/calLibrary/calLibrary.cpp
index fa05188..33500b3 100644
--- a/src/plugin/calLibrary/calLibrary.cpp
+++ b/src/plugin/calLibrary/calLibrary.cpp
@@ -413,7 +413,7 @@ int __stdcall GetPluginInformation
 	{
 		return TPI_ERROR_D_PARAMETER;
 	}
-	switch (LOWORD(_uInfoId))
+	switch (_uInfoId)
 	{
 	case TPI_INFO_VERSION_MAJOR:
 	case TPI_INFO_VERSION_MINOR:
diff --git a/src/plugin/cuiWrapper/cuiWrapper.cpp b/src/plugin/cuiWrapper/cuiWrapper.cpp
index 1ce8b81..b62ce77 100644
--- a/src/plugin/cuiWrapper/cuiWrapper.cpp
+++ b/src/plugin/cuiWrapper/cuiWrapper.cpp
@@ -30,7 +30,9 @@
 #include <wx/stdpaths.h>
 #include <wx/xml/xml.h>
 #include <wx/tokenzr.h>
+#ifdef __WINDOWS__
 #include <windows.h>
+#endif
 #include "cuiWrapper.h"
 
 //******************************************************************************
@@ -54,16 +56,18 @@ wxArrayString g_asOutput;
 //    Entry
 //******************************************************************************
 
+#ifdef __WINDOWS__
 BOOL __stdcall DllMain(HMODULE, DWORD, void *)
 {
 	return TRUE;
 }
+#endif
 
 //******************************************************************************
 //    Inside Functions
 //******************************************************************************
 
-DWORD myExecute(wxString szCommandLine, wxString * szOutput, wxString szCwd, bool bCheckExist = false)
+int myExecute(wxString szCommandLine, wxString * szOutput, wxString szCwd, bool bCheckExist = false)
 {
 #ifdef __LINUX__
 	wxString sz = ::wxGetCwd();
@@ -193,7 +197,7 @@ int __stdcall GetPluginInformation
 	{
 		return TPI_ERROR_D_PARAMETER;
 	}
-	switch (LOWORD(_uInfoId))
+	switch (_uInfoId)
 	{
 	case TPI_INFO_VERSION_MAJOR:
 	case TPI_INFO_VERSION_MINOR:
@@ -514,7 +518,7 @@ int __stdcall Command
 
 	// ƒRƒ}ƒ“ƒhƒ‰ƒCƒ“ŽÀsB
 	wxString szOutput;
-	DWORD nErrorCode = myExecute(g_LibInfo.szExeFile + wxT(" ") + szCommandLineSend, & szOutput, _swInfo->fnDestinationDirectory.GetFullPath());
+	int nErrorCode = myExecute(g_LibInfo.szExeFile + wxT(" ") + szCommandLineSend, & szOutput, _swInfo->fnDestinationDirectory.GetFullPath());
 
 	// ƒŒƒXƒ|ƒ“ƒXƒtƒ@ƒCƒ‹íœB
 	::wxRemoveFile(szResponceFileName);
diff --git a/src/plugin/eggArc/eggArc.cpp b/src/plugin/eggArc/eggArc.cpp
index 7330803..ca9901a 100644
--- a/src/plugin/eggArc/eggArc.cpp
+++ b/src/plugin/eggArc/eggArc.cpp
@@ -165,7 +165,7 @@ int __stdcall GetPluginInformation
 	{
 		return TPI_ERROR_D_PARAMETER;
 	}
-	switch (LOWORD(_uInfoId))
+	switch (_uInfoId)
 	{
 	case TPI_INFO_VERSION_MAJOR:
 	case TPI_INFO_VERSION_MINOR:
diff --git a/src/plugin/rarArc/rarArc.cpp b/src/plugin/rarArc/rarArc.cpp
index 57053f0..f9157f1 100644
--- a/src/plugin/rarArc/rarArc.cpp
+++ b/src/plugin/rarArc/rarArc.cpp
@@ -28,7 +28,6 @@
 #include "../../common/header/plugin-extra.h"
 #include "../../common/library/library.h"
 #include <wx/dynlib.h>
-#include <windows.h>
 #include "rarArc.h"
 
 //******************************************************************************
@@ -47,7 +46,7 @@ RARHeaderDataEx * g_hdInfo;
 //    Callback Wrapper
 //******************************************************************************
 
-int __stdcall CallbackProc(unsigned int msg, long UserData, long P1, long P2)
+int __stdcall CallbackProc(unsigned int msg, long, long P1, long P2)
 {
 	// \‘¢‘Ì‚ð‰Šú‰»B
 	static TPI_PROCESSINFO piInfo;
@@ -149,7 +148,7 @@ int __stdcall GetPluginInformation
 	{
 		return TPI_ERROR_D_PARAMETER;
 	}
-	switch (LOWORD(_uInfoId))
+	switch (_uInfoId)
 	{
 	case TPI_INFO_VERSION_MAJOR:
 	case TPI_INFO_VERSION_MINOR:
@@ -278,7 +277,7 @@ int __stdcall OpenArchive
 	{
 		return TPI_ERROR_U_USE_LIBRARY;
 	}
-	((void (__stdcall *)(void *, FARPROC, LPARAM)) p)(* _hArchive, (FARPROC) CallbackProc, (LPARAM) & g_hdInfo);
+	((void (__stdcall *)(void *, void *, long)) p)(* _hArchive, (void *) CallbackProc, (long) & g_hdInfo);
 
 	return TPI_ERROR_SUCCESS;
 }
diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index e003cab..e2864bf 100644
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -127,7 +127,7 @@ int __stdcall GetPluginInformation
 	{
 		return TPI_ERROR_D_PARAMETER;
 	}
-	switch (LOWORD(_uInfoId))
+	switch (_uInfoId)
 	{
 	case TPI_INFO_VERSION_MAJOR:
 	case TPI_INFO_VERSION_MINOR:
-- 
2.11.0