diff options
Diffstat (limited to 'ExternalAPI/m_folders.h')
| -rw-r--r-- | ExternalAPI/m_folders.h | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/ExternalAPI/m_folders.h b/ExternalAPI/m_folders.h index 5070c35..5971cff 100644 --- a/ExternalAPI/m_folders.h +++ b/ExternalAPI/m_folders.h @@ -27,12 +27,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define CURRENT_PROFILE "%current_profile%"
#define MIRANDA_PATH "%miranda_path%"
#define PLUGINS_PATH "%miranda_path%" "\\plugins"
+#define MIRANDA_USERDATA "%miranda_userdata%"
#define TO_WIDE(x) L ## x
#define PROFILE_PATHW L"%profile_path%"
#define CURRENT_PROFILEW L"%current_profile%"
#define MIRANDA_PATHW L"%miranda_path%"
+#define MIRANDA_USERDATAW L"%miranda_userdata%"
#define FOLDER_AVATARS PROFILE_PATH "\\" CURRENT_PROFILE "\\avatars"
#define FOLDER_VCARDS PROFILE_PATH "\\" CURRENT_PROFILE "\\vcards"
@@ -78,16 +80,16 @@ typedef struct{ /*Folders/Register/Path service
wParam - not used, must be 0
- lParam - (LPARAM) (const FOLDERDATA *) - Data structure filled with
+ lParam - (LPARAM) (const FOLDERDATA *) - Data structure filled with
the necessary information.
- Returns a handle to the registered path or 0 on error.
+ Returns a handle to the registered path or 0 on error.
You need to use this to call the other services.
*/
#define MS_FOLDERS_REGISTER_PATH "Folders/Register/Path"
/*Folders/Get/PathSize service
wParam - (WPARAM) (int) - handle to registered path
- lParam - (LPARAM) (int *) - pointer to the variable that receives the size of the path
+ lParam - (LPARAM) (int *) - pointer to the variable that receives the size of the path
string (not including the null character). Depending on the flags set when creating the path
it will either call strlen() or wcslen() to get the length of the string.
Returns the size of the buffer.
@@ -141,7 +143,7 @@ typedef struct{ #ifndef FOLDERS_NO_HELPER_FUNCTIONS
#ifndef M_UTILS_H__
-#error The helper functions require that m_utils.h be included in the project. Please include that file if you want to use the helper functions. If you don't want to use the functions just define FOLDERS_NO_HELPER_FUNCTIONS.
+#error The helper functions require that m_utils.h be included in the project. Please include that file if you want to use the helper functions. If you don''t want to use the functions just define FOLDERS_NO_HELPER_FUNCTIONS.
#endif
//#include "../../../include/newpluginapi.h"
@@ -172,10 +174,10 @@ __inline static HANDLE FoldersRegisterCustomPathW(const char *section, const cha return (HANDLE) CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM) &fd);
}
-__inline static int FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const int size, char *notFound)
+__inline static INT_PTR FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const int size, const char *notFound)
{
FOLDERSGETDATA fgd = {0};
- int res;
+ INT_PTR res;
fgd.cbSize = sizeof(FOLDERSGETDATA);
fgd.nMaxPathSize = size;
fgd.szPath = path;
@@ -186,14 +188,14 @@ __inline static int FoldersGetCustomPath(HANDLE hFolderEntry, char *path, const CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM) notFound, (LPARAM) buffer);
mir_snprintf(path, size, "%s", buffer);
}
-
+
return res;
}
-__inline static int FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW)
+__inline static INT_PTR FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, const int count, const wchar_t *notFoundW)
{
FOLDERSGETDATA fgd = {0};
- int res;
+ INT_PTR res;
fgd.cbSize = sizeof(FOLDERSGETDATA);
fgd.nMaxPathSize = count;
fgd.szPathW = pathW;
@@ -203,14 +205,14 @@ __inline static int FoldersGetCustomPathW(HANDLE hFolderEntry, wchar_t *pathW, c wcsncpy(pathW, notFoundW, count);
pathW[count - 1] = '\0';
}
-
+
return res;
}
-__inline static int FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, const int size, char *notFound, char *fileName)
+__inline static INT_PTR FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, const int size, char *notFound, char *fileName)
{
FOLDERSGETDATA fgd = {0};
- int res;
+ INT_PTR res;
fgd.cbSize = sizeof(FOLDERSGETDATA);
fgd.nMaxPathSize = size;
fgd.szPath = path;
@@ -228,19 +230,19 @@ __inline static int FoldersGetCustomPathEx(HANDLE hFolderEntry, char *path, cons else{
path[0] = '\0';
}
-
+
if (fileName)
{
strcat(path, fileName);
}
-
+
return res;
}
-__inline static int FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW, wchar_t *fileNameW)
+__inline static INT_PTR FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, const int count, wchar_t *notFoundW, wchar_t *fileNameW)
{
FOLDERSGETDATA fgd = {0};
- int res;
+ INT_PTR res;
fgd.cbSize = sizeof(FOLDERSGETDATA);
fgd.nMaxPathSize = count;
fgd.szPathW = pathW;
@@ -250,7 +252,7 @@ __inline static int FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, wcsncpy(pathW, notFoundW, count);
pathW[count - 1] = '\0';
}
-
+
if (wcslen(pathW) > 0)
{
wcscat(pathW, L"\\");
@@ -258,12 +260,12 @@ __inline static int FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, else{
pathW[0] = L'\0';
}
-
+
if (fileNameW)
{
wcscat(pathW, fileNameW);
}
-
+
return res;
}
@@ -279,4 +281,4 @@ __inline static int FoldersGetCustomPathExW(HANDLE hFolderEntry, wchar_t *pathW, #endif
-#endif //M_CUSTOM_FOLDERS_H
+#endif //M_CUSTOM_FOLDERS_H
\ No newline at end of file |