diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-03-29 15:31:25 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-03-29 15:31:25 +0000 |
| commit | 156545d23f92b32673e641650a7cc493f3eecc16 (patch) | |
| tree | 7e75c4fb6e98b75e0e7726c234b1fce547b5b4ad /plugins | |
| parent | bde17379eeb7957f4dbbcb5c21ebdd8d14902b99 (diff) | |
- Fixed compatibility of SendSS and HTTPServer
git-svn-id: http://svn.miranda-ng.org/main/trunk@12540 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ExternalAPI/m_HTTPServer.h | 4 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp | 8 | ||||
| -rw-r--r-- | plugins/SendScreenshotPlus/src/CSendHTTPServer.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/ExternalAPI/m_HTTPServer.h b/plugins/ExternalAPI/m_HTTPServer.h index b9dff5a48a..bbbcca8d2e 100644 --- a/plugins/ExternalAPI/m_HTTPServer.h +++ b/plugins/ExternalAPI/m_HTTPServer.h @@ -25,9 +25,9 @@ typedef struct {
DWORD lStructSize; // Set to sizeof(STFileShareInfo)
- TCHAR * pszSrvPath; // Server path
+ char *pszSrvPath; // Server path
DWORD dwMaxSrvPath; // Buffer allocated for Server path only used when information is requested from HTTP server.
- TCHAR * pszRealPath; // Real path can be relative or complete
+ char *pszRealPath; // Real path can be relative or complete
DWORD dwMaxRealPath;// Buffer allocated for Real path only used when information is requested from HTTP server.
DWORD dwAllowedIP; // The IP address which is allowed to access this share
DWORD dwAllowedMask; // A mask which is applied to IP address to allow other IP addresses
diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp index 8c8ed7d482..8752a9604f 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp @@ -53,7 +53,7 @@ CSendHTTPServer::~CSendHTTPServer(){ int CSendHTTPServer::Send() { if(!m_hContact) return 1; - if (CallService(MS_HTTP_ACCEPT_CONNECTIONS, (WPARAM)true, 0) != 0) { + if (CallService(MS_HTTP_ACCEPT_CONNECTIONS, TRUE, 0) != 0) { Error(LPGENT("Could not start the HTTP Server plugin.")); Exit(ACKRESULT_FAILED); return !m_bAsync; @@ -63,8 +63,8 @@ int CSendHTTPServer::Send() m_pszFileName = GetFileNameA(m_pszFile); } mir_freeAndNil(m_fsi_pszSrvPath); - mir_tstradd(m_fsi_pszSrvPath, _T("/")); - mir_tstradd(m_fsi_pszSrvPath, _A2T(m_pszFileName)); + mir_stradd(m_fsi_pszSrvPath, "/"); + mir_stradd(m_fsi_pszSrvPath, m_pszFileName); replaceStrT(m_fsi_pszRealPath, m_pszFile); @@ -72,7 +72,7 @@ int CSendHTTPServer::Send() m_fsi.lStructSize = sizeof(STFileShareInfo); m_fsi.pszSrvPath = m_fsi_pszSrvPath; m_fsi.nMaxDownloads = -1; // -1 = infinite - m_fsi.pszRealPath = m_fsi_pszRealPath; + m_fsi.pszRealPath = _T2A(m_fsi_pszRealPath); //m_fsi.dwOptions = NULL; //OPT_SEND_LINK only work on single chat; //start Send thread diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h index 0614ab90ea..c5f7b2bfe2 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h @@ -40,7 +40,7 @@ class CSendHTTPServer : public CSend { protected: char* m_pszFileName; - TCHAR* m_fsi_pszSrvPath; + char* m_fsi_pszSrvPath; TCHAR* m_fsi_pszRealPath; STFileShareInfo m_fsi; |