X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=mbswrapper.h;h=80a084818bf97633df7cf048160eb9ce8299fbd8;hb=dc9efb9a37f8901f0b3acc84a4036fe885bea33b;hp=cb4f3ab9de2f5061f0ce75d8e38fdaded34bd1f1;hpb=f9a20c32d16076be27e54bff43e4eb98795c5fa4;p=ffftp%2Fffftp.git

diff --git a/mbswrapper.h b/mbswrapper.h
index cb4f3ab..80a0848 100644
--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -14,6 +14,9 @@
 #undef WinMain
 #define WinMain WinMainM
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow);
+#undef LoadLibrary
+#define LoadLibrary LoadLibraryM
+HMODULE LoadLibraryM(LPCSTR lpLibFileName);
 #undef CreateFile
 #define CreateFile CreateFileM
 HANDLE CreateFileM(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
@@ -62,15 +65,15 @@ BOOL SetWindowTextM(HWND hWnd, LPCSTR lpString);
 #undef DragQueryFile
 #define DragQueryFile DragQueryFileM
 UINT DragQueryFileM(HDROP hDrop, UINT iFile, LPSTR lpszFile, UINT cch);
+#undef GetCommandLine
+#define GetCommandLine GetCommandLineM
+LPSTR GetCommandLineM();
 #undef GetCurrentDirectory
 #define GetCurrentDirectory GetCurrentDirectoryM
 DWORD GetCurrentDirectoryM(DWORD nBufferLength, LPSTR lpBuffer);
 #undef SetCurrentDirectory
 #define SetCurrentDirectory SetCurrentDirectoryM
 BOOL SetCurrentDirectoryM(LPCSTR lpPathName);
-#undef SetDllDirectory
-#define SetDllDirectory SetDllDirectoryM
-BOOL SetDllDirectoryM(LPCSTR lpPathName);
 #undef GetTempPath
 #define GetTempPath GetTempPathM
 DWORD GetTempPathM(DWORD nBufferLength, LPSTR lpBuffer);
@@ -204,15 +207,17 @@ FILE * fopenM(const char * _Filename, const char * _Mode);
 
 int MtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count);
 int WtoM(LPSTR pDst, int size, LPCWSTR pSrc, int count);
+int AtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count);
 int WtoA(LPSTR pDst, int size, LPCWSTR pSrc, int count);
 int TerminateStringM(LPSTR lpString, int size);
 int TerminateStringW(LPWSTR lpString, int size);
-int TerminateStringA(LPWSTR lpString, int size);
+int TerminateStringA(LPSTR lpString, int size);
 size_t GetMultiStringLengthM(LPCSTR lpString);
 size_t GetMultiStringLengthW(LPCWSTR lpString);
-size_t GetMultiStringLengthA(LPCWSTR lpString);
+size_t GetMultiStringLengthA(LPCSTR lpString);
 int MtoWMultiString(LPWSTR pDst, int size, LPCSTR pSrc);
 int WtoMMultiString(LPSTR pDst, int size, LPCWSTR pSrc);
+int AtoWMultiString(LPWSTR pDst, int size, LPCSTR pSrc);
 int WtoAMultiString(LPSTR pDst, int size, LPCWSTR pSrc);
 char* AllocateStringM(int size);
 wchar_t* AllocateStringW(int size);
@@ -222,6 +227,7 @@ wchar_t* DuplicateMtoWBuffer(LPCSTR lpString, int c, int size);
 wchar_t* DuplicateMtoWMultiString(LPCSTR lpString);
 wchar_t* DuplicateMtoWMultiStringBuffer(LPCSTR lpString, int size);
 char* DuplicateWtoM(LPCWSTR lpString, int c);
+wchar_t* DuplicateAtoW(LPCSTR lpString, int c);
 char* DuplicateWtoA(LPCWSTR lpString, int c);
 void FreeDuplicatedString(void* p);