Prepare for release of 1.98f.

[ffftp/ffftp.git] / mbswrapper.h

diff --git a/mbswrapper.h b/mbswrapper.h
index 6e5e6ce..0fa455f 100644 (file)
--- a/mbswrapper.h
+++ b/mbswrapper.h
@@ -44,6 +44,12 @@ LONG GetWindowLongM(HWND hWnd, int nIndex);
 #undef SetWindowLong\r
 #define SetWindowLong SetWindowLongM\r
 LONG SetWindowLongM(HWND hWnd, int nIndex, LONG dwNewLong);\r
+#undef GetWindowLongPtr\r
+#define GetWindowLongPtr GetWindowLongPtrM\r
+LONG_PTR GetWindowLongPtrM(HWND hWnd, int nIndex);\r
+#undef SetWindowLongPtr\r
+#define SetWindowLongPtr SetWindowLongPtrM\r
+LONG_PTR SetWindowLongPtrM(HWND hWnd, int nIndex, LONG_PTR dwNewLong);\r
 #undef DefWindowProc\r
 #define DefWindowProc DefWindowProcM\r
 LRESULT DefWindowProcM(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);\r
@@ -125,6 +131,9 @@ HINSTANCE FindExecutableM(LPCSTR lpFile, LPCSTR lpDirectory, LPSTR lpResult);
 #undef ShellExecute\r
 #define ShellExecute ShellExecuteM\r
 HINSTANCE ShellExecuteM(HWND hwnd, LPCSTR lpOperation, LPCSTR lpFile, LPCSTR lpParameters, LPCSTR lpDirectory, INT nShowCmd);\r
+#undef ShellExecuteEx\r
+#define ShellExecuteEx ShellExecuteExM\r
+BOOL ShellExecuteExM(LPSHELLEXECUTEINFOA lpExecInfo);\r
 #undef SHBrowseForFolder\r
 #define SHBrowseForFolder SHBrowseForFolderM\r
 PIDLIST_ABSOLUTE SHBrowseForFolderM(LPBROWSEINFOA lpbi);\r
@@ -134,6 +143,9 @@ BOOL SHGetPathFromIDListM(PCIDLIST_ABSOLUTE pidl, LPSTR pszPath);
 #undef SHFileOperation\r
 #define SHFileOperation SHFileOperationM\r
 int SHFileOperationM(LPSHFILEOPSTRUCTA lpFileOp);\r
+#undef SHGetFileInfo\r
+#define SHGetFileInfo SHGetFileInfoM\r
+DWORD_PTR SHGetFileInfoM(LPCSTR pszPath, DWORD dwFileAttributes, SHFILEINFOA *psfi, UINT cbFileInfo, UINT uFlags);\r
 #undef AppendMenu\r
 #define AppendMenu AppendMenuM\r
 BOOL AppendMenuM(HMENU hMenu, UINT uFlags, UINT_PTR uIDNewItem, LPCSTR lpNewItem);\r
@@ -161,6 +173,12 @@ HANDLE SetClipboardDataM(UINT uFormat, HANDLE hMem);
 #undef CopyFile\r
 #define CopyFile CopyFileM\r
 BOOL CopyFileM(LPCSTR lpExistingFileName, LPCSTR lpNewFileName, BOOL bFailIfExists);\r
+#undef MoveFile\r
+#define MoveFile MoveFileM\r
+BOOL MoveFileM(LPCSTR lpExistingFileName, LPCSTR lpNewFileName);\r
+#undef DeleteFile\r
+#define DeleteFile DeleteFileM\r
+BOOL DeleteFileM(LPCSTR lpFileName);\r
 #undef mkdir\r
 #define mkdir _mkdirM\r
 int mkdirM(const char * _Path);\r
@@ -173,6 +191,15 @@ int rmdirM(const char * _Path);
 #undef _rmdir\r
 #define _rmdir _rmdirM\r
 int _rmdirM(const char * _Path);\r
+#undef remove\r
+#define remove removeM\r
+int removeM(const char * _Filename);\r
+#undef _remove\r
+#define _remove _removeM\r
+int _removeM(const char * _Filename);\r
+#undef _unlink\r
+#define _unlink _unlinkM\r
+int _unlinkM(const char * _Filename);\r
 #undef _mbslen\r
 #define _mbslen _mbslenM\r
 size_t _mbslenM(const unsigned char * _Str);\r
@@ -214,6 +241,16 @@ 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
 int AtoW(LPWSTR pDst, int size, LPCSTR pSrc, int count);\r
@@ -238,11 +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 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