Prepare for release of 1.98f.

[ffftp/ffftp.git] / mbswrapper.h

diff --git a/mbswrapper.h b/mbswrapper.h
index 76f336f..0fa455f 100644 (file)
--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -241,8 +241,15 @@ FILE * fopenM(const char * _Filename, const char * _Mode);
 \r
 #endif\r
 \r
+#ifdef FORCE_SJIS_ON_ACTIVE_CODE_PAGE\r
 #undef CP_ACP\r
 #define CP_ACP 932\r
+#endif\r
+\r
+#ifdef EMULATE_UTF8_WCHAR_CONVERSION\r
+#define MultiByteToWideChar MultiByteToWideCharAlternative\r
+#define WideCharToMultiByte WideCharToMultiByteAlternative\r
+#endif\r
 \r
 int MtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count);\r
 int WtoM(LPSTR pDst, int size, LPCWSTR pSrc, int count);\r
@@ -268,12 +275,17 @@ wchar_t* DuplicateMtoWMultiStringBuffer(LPCSTR lpString, int size);
 char* DuplicateWtoM(LPCWSTR lpString, int c);\r
 wchar_t* DuplicateAtoW(LPCSTR lpString, int c);\r
 char* DuplicateWtoA(LPCWSTR lpString, int c);\r
-DWORD GetNextCharM(LPCSTR lpString, LPCSTR* ppNext);\r
+DWORD GetNextCharM(LPCSTR lpString, LPCSTR pLimit, LPCSTR* ppNext);\r
+int PutNextCharM(LPSTR lpString, LPSTR pLimit, LPSTR* ppNext, DWORD Code);\r
+DWORD GetNextCharW(LPCWSTR lpString, LPCWSTR pLimit, LPCWSTR* ppNext);\r
+int PutNextCharW(LPWSTR lpString, LPWSTR pLimit, LPWSTR* ppNext, DWORD Code);\r
 BOOL FixStringM(LPSTR pDst, LPCSTR pSrc);\r
 BOOL FixMultiStringM(LPSTR pDst, LPCSTR pSrc);\r
 BOOL CheckStringM(LPCSTR lpString);\r
 BOOL CheckMultiStringM(LPCSTR lpString);\r
 void FreeDuplicatedString(void* p);\r
+int MultiByteToWideCharAlternative(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr, int cbMultiByte, LPWSTR lpWideCharStr, int cchWideChar);\r
+int WideCharToMultiByteAlternative(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr, int cchWideChar, LPSTR lpMultiByteStr, int cbMultiByte, LPCSTR lpDefaultChar, LPBOOL lpUsedDefaultChar);\r
 \r
 int WINAPI WinMainM(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow);\r
 \r