another portion of fixes

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

6 files changed, 11 insertions, 22 deletions

diff --git a/plugins/RecentContacts/RecentContacts.cpp b/plugins/RecentContacts/RecentContacts.cpp
index 9ec3eb0f04..1303178fd2 100644
--- a/plugins/RecentContacts/RecentContacts.cpp
+++ b/plugins/RecentContacts/RecentContacts.cpp
@@ -25,7 +25,8 @@ HANDLE hMenuItemRemove = NULL;
 HANDLE hOptInitialise = NULL;

 HANDLE hContactSetting = NULL;

 

-LIST<void> ServiceList(10,0), HookList(10,0);

+const INT_PTR boo = 0;

+LIST<void> ServiceList(10,boo), HookList(10,boo);

 

 BOOL IsMessageAPI = FALSE;

 

@@ -178,11 +179,11 @@ void wfree(char **Data)
 

 HWND hwndContactTree = NULL;

 

-BOOL WINAPI ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+LRESULT WINAPI ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	LASTUC_DLG_DATA *DlgDat;

 

-	DlgDat = (LASTUC_DLG_DATA *)GetWindowLong(hDlg, GWL_USERDATA);

+	DlgDat = (LASTUC_DLG_DATA *)GetWindowLong(hDlg, GWLP_USERDATA);

 	HWND hList = GetDlgItem(hDlg, IDC_CONTACTS_LIST);

 	if (hList == NULL)

 		return FALSE;

@@ -212,7 +213,7 @@ BOOL WINAPI ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			ScreenToClient(hDlg, &p);

 			DlgDat->ListUCRect.right = p.x;

 			DlgDat->ListUCRect.bottom = p.y;

-			SetWindowLong(hDlg, GWL_USERDATA, (LONG)DlgDat);

+			SetWindowLong(hDlg, GWLP_USERDATA, (LONG)DlgDat);

 

 			//set listview styles

 			ListView_SetExtendedListViewStyleEx(hList,

@@ -385,7 +386,7 @@ BOOL WINAPI ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPara
 	return FALSE;

 }

 

-int OnMenuCommandShowList(WPARAM wParam, LPARAM lParam)

+INT_PTR OnMenuCommandShowList(WPARAM wParam, LPARAM lParam)

 {

 	cmultimap *contacts = new cmultimap;

 

@@ -572,7 +573,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
       update.cbSize = sizeof(Update);

       update.szComponentName = pluginInfo.shortName;

       update.pbVersion = (BYTE *)CreateVersionString(pluginInfo.version, szVersion);

-      update.cpbVersion = strlen((char *)update.pbVersion);

+      update.cpbVersion = (int)strlen((char *)update.pbVersion);

 

       update.szUpdateURL = UPDATER_AUTOREGISTER;

 

@@ -584,7 +585,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
       update.szBetaVersionURL     = "http://kildor.miranda.im/miranda/recentcontacts.txt";

       update.szBetaChangelogURL   = "http://kildor.miranda.im/miranda/recentcontacts_changes.txt";

       update.pbBetaVersionPrefix  = (BYTE *)"RecentContacts ";

-      update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix);

+      update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix);

 

       CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);

    }

@@ -631,7 +632,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-int ToggleIgnore (WPARAM wParam, LPARAM lParam)

+INT_PTR ToggleIgnore (WPARAM wParam, LPARAM lParam)

 {

 	if (wParam != NULL) {

 		HANDLE hContact = ( HANDLE )wParam;

diff --git a/plugins/RecentContacts/options.cpp b/plugins/RecentContacts/options.cpp
index ad2b6e5359..16ce3320e5 100644
--- a/plugins/RecentContacts/options.cpp
+++ b/plugins/RecentContacts/options.cpp
@@ -4,7 +4,7 @@
 extern HINSTANCE hInst;

 void LoadDBSettings();

 

-BOOL CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+LRESULT CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	char str[32];

 

@@ -19,7 +19,7 @@ BOOL CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		mir_snprintf(str, SIZEOF(str), "%s", LastUCOpt.DateTimeFormat.c_str());

 		SetDlgItemTextA(hwndDlg, IDC_DATETIME, str);

 

-		SetWindowLong(hwndDlg,GWL_USERDATA,lParam);

+		SetWindowLong(hwndDlg,GWLP_USERDATA,lParam);

 		return TRUE;

 

 	case WM_COMMAND:

diff --git a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj
index c0e530ff1a..e1e17c885c 100644
--- a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj
+++ b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj
@@ -190,8 +190,6 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="commonheaders.h" />

-    <ClInclude Include="m_simpleaway.h" />

-    <ClInclude Include="m_simplestatusmsg.h" />

     <ClInclude Include="resource.h" />

     <ClInclude Include="simplestatusmsg.h" />

   </ItemGroup>

diff --git a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters
index ed6adb665f..84705e53ed 100644
--- a/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters
+++ b/plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters
@@ -35,12 +35,6 @@
     <ClInclude Include="commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="m_simpleaway.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="m_simplestatusmsg.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/plugins/SpellChecker/spellchecker.vcxproj b/plugins/SpellChecker/spellchecker.vcxproj
index c45bec758e..7c42df971c 100644
--- a/plugins/SpellChecker/spellchecker.vcxproj
+++ b/plugins/SpellChecker/spellchecker.vcxproj
@@ -178,7 +178,6 @@
     <ClInclude Include="autoreplace.h" />

     <ClInclude Include="commons.h" />

     <ClInclude Include="dictionary.h" />

-    <ClInclude Include="m_spellchecker.h" />

     <ClInclude Include="..\utils\mir_icons.h" />

     <ClInclude Include="..\utils\mir_memory.h" />

     <ClInclude Include="..\utils\mir_options.h" />

diff --git a/plugins/SpellChecker/spellchecker.vcxproj.filters b/plugins/SpellChecker/spellchecker.vcxproj.filters
index 06fc8dfca3..89743ca4ce 100644
--- a/plugins/SpellChecker/spellchecker.vcxproj.filters
+++ b/plugins/SpellChecker/spellchecker.vcxproj.filters
@@ -36,9 +36,6 @@
     <ClInclude Include="dictionary.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="m_spellchecker.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="..\utils\mir_icons.h">

       <Filter>Header Files</Filter>

     </ClInclude>