From ec36adde2c033cdf5129c9686ed89069c38896aa Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 2 Jun 2012 21:04:18 +0000 Subject: another portion of fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@272 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_full.sln | 14 ++++++++++---- plugins/RecentContacts/RecentContacts.cpp | 17 +++++++++-------- plugins/RecentContacts/options.cpp | 4 ++-- plugins/SimpleStatusMsg/simplestatusmsg_10.vcxproj | 2 -- .../SimpleStatusMsg/simplestatusmsg_10.vcxproj.filters | 6 ------ plugins/SpellChecker/spellchecker.vcxproj | 1 - plugins/SpellChecker/spellchecker.vcxproj.filters | 3 --- 7 files changed, 21 insertions(+), 26 deletions(-) diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 0ffadf74bd..6af0ec94ac 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -287,9 +287,6 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RecentContacts", "..\plugins\RecentContacts\RecentContacts.vcxproj", "{07137F45-8B5F-4561-BEC8-B883E9123785}" EndProject Global - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 @@ -985,6 +982,11 @@ Global {86704897-EABF-439D-BE0E-52CEA67C2C43}.Release|Win32.Build.0 = Release|Win32 {86704897-EABF-439D-BE0E-52CEA67C2C43}.Release|x64.ActiveCfg = Release|x64 {86704897-EABF-439D-BE0E-52CEA67C2C43}.Release|x64.Build.0 = Release|x64 + {63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Debug|Win32.ActiveCfg = Debug|Win32 + {63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Debug|x64.ActiveCfg = Debug|x64 + {63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Debug|x64.Build.0 = Debug|x64 + {63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|Win32.ActiveCfg = Release|Win32 + {63E05ECA-0A63-479E-86BD-2CAF53869BDA}.Release|x64.ActiveCfg = Release|x64 {C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.ActiveCfg = Debug|Win32 {C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|Win32.Build.0 = Debug|Win32 {C5A87409-F08C-4A07-A8F9-1F5D52BA6D72}.Debug|x64.ActiveCfg = Debug|x64 @@ -1427,7 +1429,8 @@ Global {541BE2B3-4320-47B8-AB64-C7F7ED0EFABA}.Release|x64.Build.0 = Release|x64 {07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|Win32.ActiveCfg = Debug|Win32 {07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|Win32.Build.0 = Debug|Win32 - {07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|x64.ActiveCfg = Debug|Win32 + {07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|x64.ActiveCfg = Debug|x64 + {07137F45-8B5F-4561-BEC8-B883E9123785}.Debug|x64.Build.0 = Debug|x64 {07137F45-8B5F-4561-BEC8-B883E9123785}.Release|Win32.ActiveCfg = Release|Win32 {07137F45-8B5F-4561-BEC8-B883E9123785}.Release|Win32.Build.0 = Release|Win32 {07137F45-8B5F-4561-BEC8-B883E9123785}.Release|x64.ActiveCfg = Release|x64 @@ -1436,4 +1439,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection EndGlobal 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 ServiceList(10,0), HookList(10,0); +const INT_PTR boo = 0; +LIST 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 @@ - - 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 @@ Header Files - - Header Files - - - Header Files - Header Files 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 @@ - 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 @@ Header Files - - Header Files - Header Files -- cgit v1.2.3