アプリケーションからの文字列をUTF-8として扱うよう変更。

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

diff --git a/src/plugin/spiLibrary/spiLibrary.cpp b/src/plugin/spiLibrary/spiLibrary.cpp
index 90cd098..250b6f3 100644 (file)
--- a/src/plugin/spiLibrary/spiLibrary.cpp
+++ b/src/plugin/spiLibrary/spiLibrary.cpp
@@ -161,7 +161,7 @@ int __stdcall LoadPlugin
        {\r
                // SPI\82ð\83\8d\81[\83h\81B\r
                wxString szLibName = szSPIPath + szSPIName;\r
-               g_hLib = ::LoadLibraryA(szLibName.char_str());\r
+               g_hLib = ::LoadLibraryA(szLibName.ToUTF8());\r
                if (g_hLib == NULL)\r
                {\r
                        b = fs.GetNext(& szSPIName);\r
@@ -227,7 +227,7 @@ int __stdcall CheckArchive
                return TPI_ERROR_IO_ARC_READ;\r
        }\r
 \r
-       if (! ((BOOL (PASCAL *)(const char *, unsigned long)) fpProc)(_szArcName.char_str(), (unsigned long) buffer))\r
+       if (! ((BOOL (PASCAL *)(const char *, unsigned long)) fpProc)(_szArcName.ToUTF8(), (unsigned long) buffer))\r
        {\r
                hFile.Close();\r
                return TPI_ERROR_D_UNSUPPORTED;\r
@@ -241,7 +241,7 @@ int __stdcall CheckArchive
        }\r
 \r
        HLOCAL hMemory;\r
-       int nReturnCode = SpiErrorCodeConvert(((int (PASCAL *)(const char *, long, unsigned int, HLOCAL *)) fpProc)(_szArcName.char_str(), 0, 0, & hMemory));\r
+       int nReturnCode = SpiErrorCodeConvert(((int (PASCAL *)(const char *, long, unsigned int, HLOCAL *)) fpProc)(_szArcName.ToUTF8(), 0, 0, & hMemory));\r
        if (nReturnCode == TPI_ERROR_SUCCESS)\r
        {\r
                if (_nFileCount != NULL)\r
@@ -266,7 +266,7 @@ int __stdcall OpenArchive
                return TPI_ERROR_U_USE_LIBRARY;\r
        }\r
 \r
-       int nReturnCode = SpiErrorCodeConvert(((int (PASCAL *)(const char *, long, unsigned int, HLOCAL *)) fpProc)(_szArcName.char_str(), 0, 0, _hArchive));\r
+       int nReturnCode = SpiErrorCodeConvert(((int (PASCAL *)(const char *, long, unsigned int, HLOCAL *)) fpProc)(_szArcName.ToUTF8(), 0, 0, _hArchive));\r
        if (nReturnCode != TPI_ERROR_SUCCESS)\r
        {\r
                return nReturnCode;\r
@@ -439,7 +439,7 @@ int __stdcall Command
 \r
                        // \83t\83@\83C\83\8b\8fo\97Í\82É\82Í\91Î\89\9e\82µ\82Ä\82È\82¢\82Ì\82Å\83\81\83\82\83\8a\8fo\97Í\82Å\91ã\8ds\81B\r
                        HLOCAL hMemory = NULL;\r
-                       nResult = SpiErrorCodeConvert(((int (PASCAL *)(char *, long, char *, unsigned int, FARPROC, long)) fpProc)(_szArcName.char_str(), (long) fiInfo.pCustomInfo, (char *) & hMemory, 0x0100, (FARPROC) CallbackProc, (long) & fiInfo.fnFileName));\r
+                       nResult = SpiErrorCodeConvert(((int (PASCAL *)(char *, long, char *, unsigned int, FARPROC, long)) fpProc)(_szArcName.ToUTF8(), (long) fiInfo.pCustomInfo, (char *) & hMemory, 0x0100, (FARPROC) CallbackProc, (long) & fiInfo.fnFileName));\r
                        if (nResult == TPI_ERROR_SUCCESS && hMemory == NULL)\r
                        {\r
                                nResult = TPI_ERROR_UNDEFINED;\r