Exchange: unified project

git-svn-id: http://svn.miranda-ng.org/main/trunk@13666 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

9 files changed, 18 insertions, 36 deletions

diff --git a/plugins/Exchange/src/MirandaExchange.cpp b/plugins/Exchange/src/MirandaExchange.cpp
index 6061633626..ba0bc86861 100644
--- a/plugins/Exchange/src/MirandaExchange.cpp
+++ b/plugins/Exchange/src/MirandaExchange.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	purpose:	Miranda Exchange Plugin

 *********************************************************************/

 

-#include "commonheaders.h"

+#include "stdafx.h"

 #include "MirandaExchange.h"

 #include "utils.h"

 

@@ -163,9 +163,6 @@ CKeeper::~CKeeper()
 

 CMirandaExchange::CMirandaExchange()

 {

-	UINT  nSize        = 0;

-	short nSizeOfTCHAR = sizeof( TCHAR );

-

 	m_szUsername       = NULL  ;

 	m_szPassword       = NULL  ;

 	m_szExchangeServer = NULL  ;

@@ -426,7 +423,6 @@ HRESULT CMirandaExchange::InitializeAndLogin( LPCTSTR szUsername, LPCTSTR szPass
 	

 	if (!m_bLoginOK || m_lpInbox || NULL == m_lpMAPISession) {

 		HRESULT hr          = S_OK;

-		LPMDB lpMDB         = NULL;

 		MAPIINIT_0 mapiInit = { MAPI_INIT_VERSION , MAPI_MULTITHREAD_NOTIFICATIONS };

 		

 		if ( !m_bNoInitAgain) {

@@ -590,7 +586,7 @@ HRESULT CMirandaExchange::CreateProfile( LPTSTR szProfileName )
 	return hr;

 }

 

-HRESULT CMirandaExchange::isMapiSessionOK( LPMAPISESSION lpSession )

+HRESULT CMirandaExchange::isMapiSessionOK( LPMAPISESSION )

 {

 	return S_OK;

 }

@@ -692,16 +688,6 @@ HRESULT CMirandaExchange::LogOFF()
 HRESULT CMirandaExchange::MarkAsRead( LPTSTR szEntryID )

 {

     LPMESSAGE lpMessage = NULL ;

-

-	SizedSPropTagArray(3,sptaFlags) = 

-	{

-		3, 

-		{	PR_ENTRYID      ,

-			PR_MESSAGE_FLAGS,

-			PR_SENDER_NAME

-		}

-	};

-

 	LPBYTE lpData = NULL ;

 	ULONG  ulC    = 0    ;

 

@@ -730,7 +716,6 @@ HRESULT CMirandaExchange::CheckInFolder( LPMAPIFOLDER lpFolder )
 	LPSRowSet lpRow = NULL;

 	LPSPropValue lpRowProp = NULL;

 	ULONG i = 0L;

-	ULONG *lpcbeid = NULL; 

 	TCHAR* szSenderName = NULL;

 	TCHAR* szSubject = NULL;

 	LPSTR szEntryID = NULL;

@@ -827,7 +812,6 @@ HRESULT CMirandaExchange::CheckInFolder( LPMAPIFOLDER lpFolder )
 			}

 		};

 

-		ULONG ulObjType = 0L;

 

 		hr = MAPICALL( lpFolder)->GetHierarchyTable( MAPI_DEFERRED_ERRORS, &lpTable);

 		if (!FAILED(hr)) {

@@ -852,7 +836,7 @@ HRESULT CMirandaExchange::CheckInFolder( LPMAPIFOLDER lpFolder )
 	return hr;

 }

 

-HRESULT CMirandaExchange::OpenTheMessage( LPTSTR szEntryID )

+HRESULT CMirandaExchange::OpenTheMessage( LPTSTR )

 {

 	//(Default)//// HKEY_CLASSES_ROOT\mailto\shell\open\command

 	HKEY hTheKey;

@@ -888,8 +872,6 @@ HRESULT CMirandaExchange::OpenTheMessage( LPTSTR szEntryID )
 				STARTUPINFO         si;

 				PROCESS_INFORMATION pi;

 				

-				DWORD               dwCode  =   0;

-				

 				memset(&si, 0, sizeof(STARTUPINFO));

 				

 				si.cb           =   sizeof  (   STARTUPINFO);

diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp
index 1292a143aa..754cefb113 100644
--- a/plugins/Exchange/src/dlg_handlers.cpp
+++ b/plugins/Exchange/src/dlg_handlers.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 #include "dlg_handlers.h"

 

 #define MIN_EMAILS_WIDTH 300

diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp
index a0d9cdab37..30a2d1fdc0 100644
--- a/plugins/Exchange/src/emails.cpp
+++ b/plugins/Exchange/src/emails.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 #include "dlg_handlers.h"

 #include "emails.h"

 

@@ -93,7 +93,7 @@ int CExchangeServer::Disconnect()
 //	return -1; //0 on success, != 0 otherwise

 }

 

-int CExchangeServer::DoConnect(TCHAR *user, TCHAR *password, TCHAR *server, int port)

+int CExchangeServer::DoConnect(TCHAR *user, TCHAR *password, TCHAR *server, int)

 {

 	

 	if (bTryConnect)

diff --git a/plugins/Exchange/src/exchange.cpp b/plugins/Exchange/src/exchange.cpp
index 94b199adcf..97ef9250bb 100644
--- a/plugins/Exchange/src/exchange.cpp
+++ b/plugins/Exchange/src/exchange.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

 char ModuleName[] = "ExchangeNotify";

 HINSTANCE hInstance;

@@ -45,7 +45,7 @@ PLUGININFOEX pluginInfo = {
 

 //OLD_MIRANDAPLUGININFO_SUPPORT;

 

-extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD mirandaVersion) 

+extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD) 

 {

 //	Log("%s", "Entering function " __FUNCTION__);

 //	Log("%s", "Leaving function " __FUNCTION__);

@@ -83,7 +83,7 @@ extern "C" int __declspec(dllexport) Unload()
 	return 0;

 }

 

-extern "C" bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

+extern "C" bool WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID)

 {

 	hInstance = hinstDLL; //save global instance

 	if (fdwReason == DLL_PROCESS_ATTACH)

diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp
index c418ecc299..5df16e1cc1 100644
--- a/plugins/Exchange/src/hooked_events.cpp
+++ b/plugins/Exchange/src/hooked_events.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 #include "dlg_handlers.h"

 #include "hooked_events.h"

 

@@ -56,7 +56,7 @@ int UnhookEvents()
 	return 0;

 }

 

-int OnModulesLoaded(WPARAM wParam, LPARAM lParam)

+int OnModulesLoaded(WPARAM, LPARAM)

 {

 

 	UpdateTimers();

@@ -142,7 +142,7 @@ int KillTimers()
 	return 0;

 }

 

-VOID CALLBACK OnCheckTimer(HWND hWnd, UINT msg, UINT_PTR idEvent, DWORD dwTime)

+VOID CALLBACK OnCheckTimer(HWND, UINT, UINT_PTR, DWORD)

 {

 	/*if (exchangeServer.IsConnected())

 		{

@@ -159,7 +159,7 @@ VOID CALLBACK OnCheckTimer(HWND hWnd, UINT msg, UINT_PTR idEvent, DWORD dwTime)
 		}

 }

 

-VOID CALLBACK OnReconnectTimer(HWND hWnd, UINT msg, UINT_PTR idEvent, DWORD dwTime)

+VOID CALLBACK OnReconnectTimer(HWND, UINT, UINT_PTR, DWORD)

 {

 

 	_popupUtil(TranslateT("Forcefully reconnecting to Exchange server ..."));

diff --git a/plugins/Exchange/src/services.cpp b/plugins/Exchange/src/services.cpp
index c6a7beb665..092cb34e13 100644
--- a/plugins/Exchange/src/services.cpp
+++ b/plugins/Exchange/src/services.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 #include "services.h"

 

 int InitServices()

@@ -33,7 +33,7 @@ int DestroyServices()
 	return 0;

 }

 

-int CheckEmailService(WPARAM wParam, LPARAM lParam)

+int CheckEmailService(WPARAM, LPARAM)

 {

 /*

 	if (!exchangeServer.IsConnected())

diff --git a/plugins/Exchange/src/stdafx.cpp b/plugins/Exchange/src/stdafx.cxx
index 048b14e9d2..6fb37564b7 100644
--- a/plugins/Exchange/src/stdafx.cpp
+++ b/plugins/Exchange/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "commonheaders.h"
\ No newline at end of file
+#include "stdafx.h"
\ No newline at end of file
diff --git a/plugins/Exchange/src/commonheaders.h b/plugins/Exchange/src/stdafx.h
index 3fe791c0a1..3fe791c0a1 100644
--- a/plugins/Exchange/src/commonheaders.h
+++ b/plugins/Exchange/src/stdafx.h
diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp
index 9bf2c6277d..d973492787 100644
--- a/plugins/Exchange/src/utils.cpp
+++ b/plugins/Exchange/src/utils.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 #include "utils.h"

 

 #define ___DEB

@@ -34,7 +34,7 @@ int LogInit()
 	return 0;

 }

 

-int Log(char *format, ...)

+int Log(char*, ...)

 {

 #ifdef ___DEBUGG

 	char		str[4096];