diff options
author | George Hazan <george.hazan@gmail.com> | 2015-04-15 15:47:29 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-04-15 15:47:29 +0000 |
commit | a697754351436b6d0066b77b0fd71aeb8c45be3d (patch) | |
tree | c2821a76e17eb003fe14b82b91ccb8b88dbe3adc /src | |
parent | 2e3b0d5d40f1113887bd67e6ba227b780c4293cd (diff) |
after commit #12797 field OPTIONSDIALOGPAGE::cbSize became an atavism, and therefore removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@12840 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
25 files changed, 61 insertions, 72 deletions
diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp index e7ab0681ed..a86f79f917 100644 --- a/src/core/stdaway/src/sendmsg.cpp +++ b/src/core/stdaway/src/sendmsg.cpp @@ -532,7 +532,7 @@ static int AwayMsgOptInitialise(WPARAM wParam, LPARAM) if (protoModeMsgFlags == 0)
return 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 870000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AWAYMSG);
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 105e9127c9..8a5536ec24 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -724,7 +724,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wPar int OptionsInitialize(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS1);
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 9f1fa37802..83e9154511 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -421,7 +421,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, int ClcOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszGroup = LPGEN("Contact list");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index b3c78131f7..c39709e9ee 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -237,7 +237,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP int CListOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -1000000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index 4cd01986b7..5a755bec3c 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -321,7 +321,7 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L int CluiOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);
odp.pszTitle = LPGEN("Window");
diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp index ad8c3560b9..8fc3cfc8b3 100644 --- a/src/core/stdfile/src/fileopts.cpp +++ b/src/core/stdfile/src/fileopts.cpp @@ -224,7 +224,7 @@ static INT_PTR CALLBACK DlgProcFileOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L int FileOptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 900000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILETRANSFER);
diff --git a/src/core/stdidle/src/idle.cpp b/src/core/stdidle/src/idle.cpp index 7e1357e107..169d95148c 100644 --- a/src/core/stdidle/src/idle.cpp +++ b/src/core/stdidle/src/idle.cpp @@ -342,7 +342,7 @@ static INT_PTR CALLBACK IdleOptsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L static int IdleOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_IDLE);
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 74788bd360..f7e1ddeb2a 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -557,7 +557,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam static int OptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGDLG);
diff --git a/src/core/stduserinfo/src/stdinfo.cpp b/src/core/stduserinfo/src/stdinfo.cpp index 9884231150..3b6e387dd0 100644 --- a/src/core/stduserinfo/src/stdinfo.cpp +++ b/src/core/stduserinfo/src/stdinfo.cpp @@ -579,7 +579,7 @@ int DetailsInit(WPARAM wParam, LPARAM lParam) if (GetContactProto(lParam) == 0)
return 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pfnDlgProc = SummaryDlgProc;
diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index 0ed8404af4..132c895318 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -135,14 +135,12 @@ static INT_PTR AddDetailsPage(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE *odp = (OPTIONSDIALOGPAGE*)lParam;
struct DetailsPageInit *opi = (struct DetailsPageInit*)wParam;
- if (odp == NULL || opi == NULL) return 1;
- if (odp->cbSize != sizeof(OPTIONSDIALOGPAGE))
+ if (odp == NULL || opi == NULL)
return 1;
opi->odp = (OPTIONSDIALOGPAGE*)mir_realloc(opi->odp, sizeof(OPTIONSDIALOGPAGE)*(opi->pageCount + 1));
OPTIONSDIALOGPAGE *dst = opi->odp + opi->pageCount;
memset(dst, 0, sizeof(OPTIONSDIALOGPAGE));
- dst->cbSize = sizeof(OPTIONSDIALOGPAGE);
dst->hInstance = odp->hInstance;
dst->pfnDlgProc = odp->pfnDlgProc;
dst->position = odp->position;
diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp index 8d65215a00..fe0a5c5656 100644 --- a/src/modules/clist/contacts.cpp +++ b/src/modules/clist/contacts.cpp @@ -497,7 +497,7 @@ static INT_PTR CALLBACK ContactOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPara static int ContactOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -1000000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTACT);
diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp index 9a70cc4a6c..55e6a34073 100644 --- a/src/modules/clist/genmenuopt.cpp +++ b/src/modules/clist/genmenuopt.cpp @@ -834,7 +834,7 @@ INT_PTR CALLBACK ProtocolOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM int GenMenuOptInit(WPARAM wParam, LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.position = -1000000000; diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp index a8d2be37f6..ca2cbf8448 100644 --- a/src/modules/database/profilemanager.cpp +++ b/src/modules/database/profilemanager.cpp @@ -832,13 +832,9 @@ static INT_PTR CALLBACK DlgProfileManager(HWND hwndDlg, UINT msg, WPARAM wParam, static int AddProfileManagerPage(struct DetailsPageInit *opi, OPTIONSDIALOGPAGE *odp) { - if (odp->cbSize != sizeof(OPTIONSDIALOGPAGE)) - return 1; - opi->odp = (OPTIONSDIALOGPAGE*)mir_realloc(opi->odp, sizeof(OPTIONSDIALOGPAGE)*(opi->pageCount + 1)); OPTIONSDIALOGPAGE *p = opi->odp + opi->pageCount++; - p->cbSize = sizeof(OPTIONSDIALOGPAGE); p->hInstance = odp->hInstance; p->pfnDlgProc = odp->pfnDlgProc; p->position = odp->position; @@ -861,8 +857,6 @@ int getProfileManager(PROFILEMANAGERDATA *pd) DetailsPageInit opi = { 0 }; OPTIONSDIALOGPAGE odp = { 0 }; - odp.cbSize = sizeof(odp); - odp.pszTitle = LPGEN("My profiles"); odp.pfnDlgProc = DlgProfileSelect; odp.pszTemplate = MAKEINTRESOURCEA(IDD_PROFILE_SELECTION); diff --git a/src/modules/extraicons/options_ei.cpp b/src/modules/extraicons/options_ei.cpp index c7fc6a0f11..2250b4c481 100644 --- a/src/modules/extraicons/options_ei.cpp +++ b/src/modules/extraicons/options_ei.cpp @@ -744,7 +744,7 @@ int InitOptionsCallback(WPARAM wParam, LPARAM lParam) if (GetNumberOfSlots() < 1)
return 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszGroup = LPGEN("Contact list");
odp.pszTitle = LPGEN("Extra icons");
diff --git a/src/modules/fonts/FontOptions.cpp b/src/modules/fonts/FontOptions.cpp index 8b9b20f641..2d290d21c2 100644 --- a/src/modules/fonts/FontOptions.cpp +++ b/src/modules/fonts/FontOptions.cpp @@ -1195,7 +1195,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, int OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FONTS);
diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp index cb11ca0066..4318927897 100644 --- a/src/modules/icolib/skin2opts.cpp +++ b/src/modules/icolib/skin2opts.cpp @@ -1038,7 +1038,7 @@ INT_PTR CALLBACK DlgProcIcoLibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM int SkinOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
odp.position = -180000000;
diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp index c686fcab91..b863848109 100644 --- a/src/modules/ignore/ignore.cpp +++ b/src/modules/ignore/ignore.cpp @@ -316,7 +316,7 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM static int IgnoreOptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 900000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_IGNORE);
diff --git a/src/modules/langpack/lpopts.cpp b/src/modules/langpack/lpopts.cpp index 6949a99a19..4adb56ec11 100644 --- a/src/modules/langpack/lpopts.cpp +++ b/src/modules/langpack/lpopts.cpp @@ -199,7 +199,7 @@ INT_PTR CALLBACK DlgLangpackOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int LangpackOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pfnDlgProc = DlgLangpackOpt;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LANGUAGES);
diff --git a/src/modules/metacontacts/meta_options.cpp b/src/modules/metacontacts/meta_options.cpp index 6a550f1ea7..e130463da1 100644 --- a/src/modules/metacontacts/meta_options.cpp +++ b/src/modules/metacontacts/meta_options.cpp @@ -173,7 +173,7 @@ int Meta_ReadOptions(MetaOptions *opt) int Meta_OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp index 40775cb9c4..fff81944d3 100644 --- a/src/modules/netlib/netlibopts.cpp +++ b/src/modules/netlib/netlibopts.cpp @@ -518,7 +518,7 @@ int NetlibOptInitialise(WPARAM wParam, LPARAM) if (optionsCount == 0)
return 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 900000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NETLIB);
diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index a9975328c8..dce2320f71 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -1291,15 +1291,12 @@ static INT_PTR AddOptionsPage(WPARAM wParam, LPARAM lParam) {
OPTIONSDIALOGPAGE *odp = (OPTIONSDIALOGPAGE*)lParam, *dst;
OptionsPageInit *opi = (OptionsPageInit*)wParam;
-
- if (odp == NULL || opi == NULL) return 1;
- if (odp->cbSize != sizeof(OPTIONSDIALOGPAGE))
+ if (odp == NULL || opi == NULL)
return 1;
opi->odp = (OPTIONSDIALOGPAGE*)mir_realloc(opi->odp, sizeof(OPTIONSDIALOGPAGE)*(opi->pageCount + 1));
dst = opi->odp + opi->pageCount;
- memset(dst, 0, sizeof(OPTIONSDIALOGPAGE));
- memcpy(dst, odp, odp->cbSize);
+ memcpy(dst, odp, sizeof(OPTIONSDIALOGPAGE));
if (odp->ptszTitle != NULL) {
if (odp->flags & ODPF_UNICODE)
diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index 61d0205689..bcd549ed1e 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -549,7 +549,7 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar int PluginOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pfnDlgProc = DlgPluginOpt;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PLUGINS);
diff --git a/src/modules/skin/hotkey_opts.cpp b/src/modules/skin/hotkey_opts.cpp index 4c41cc0b72..6a71702630 100644 --- a/src/modules/skin/hotkey_opts.cpp +++ b/src/modules/skin/hotkey_opts.cpp @@ -44,42 +44,42 @@ static TCHAR *sttHokeyVkToName(WORD vkKey) case VK_NUMLOCK: case VK_CAPITAL: case VK_SCROLL: - return _T("");
- case VK_BROWSER_BACK:
- return TranslateT("Browser: Back");
- case VK_BROWSER_FORWARD:
- return TranslateT("Browser: Forward");
- case VK_BROWSER_REFRESH:
- return TranslateT("Browser: Refresh");
- case VK_BROWSER_STOP:
- return TranslateT("Browser: Stop");
- case VK_BROWSER_SEARCH:
- return TranslateT("Browser: Search");
- case VK_BROWSER_FAVORITES:
- return TranslateT("Browser: Fav");
- case VK_BROWSER_HOME:
- return TranslateT("Browser: Home");
- case VK_VOLUME_MUTE:
- return TranslateT("Mute");
- case VK_VOLUME_DOWN:
- return TranslateT("Vol-");
- case VK_VOLUME_UP:
- return TranslateT("Vol+");
- case VK_MEDIA_NEXT_TRACK:
- return TranslateT("Media: Next Track");
- case VK_MEDIA_PREV_TRACK:
- return TranslateT("Media: Prev. Track");
- case VK_MEDIA_STOP:
- return TranslateT("Media: Stop");
- case VK_MEDIA_PLAY_PAUSE:
- return TranslateT("Media: Play/Pause");
- case VK_LAUNCH_MAIL:
- return TranslateT("Mail");
- case VK_LAUNCH_MEDIA_SELECT:
- return TranslateT("Media: Select");
- case VK_LAUNCH_APP1:
- return TranslateT("App 1");
- case VK_LAUNCH_APP2:
+ return _T(""); + case VK_BROWSER_BACK: + return TranslateT("Browser: Back"); + case VK_BROWSER_FORWARD: + return TranslateT("Browser: Forward"); + case VK_BROWSER_REFRESH: + return TranslateT("Browser: Refresh"); + case VK_BROWSER_STOP: + return TranslateT("Browser: Stop"); + case VK_BROWSER_SEARCH: + return TranslateT("Browser: Search"); + case VK_BROWSER_FAVORITES: + return TranslateT("Browser: Fav"); + case VK_BROWSER_HOME: + return TranslateT("Browser: Home"); + case VK_VOLUME_MUTE: + return TranslateT("Mute"); + case VK_VOLUME_DOWN: + return TranslateT("Vol-"); + case VK_VOLUME_UP: + return TranslateT("Vol+"); + case VK_MEDIA_NEXT_TRACK: + return TranslateT("Media: Next Track"); + case VK_MEDIA_PREV_TRACK: + return TranslateT("Media: Prev. Track"); + case VK_MEDIA_STOP: + return TranslateT("Media: Stop"); + case VK_MEDIA_PLAY_PAUSE: + return TranslateT("Media: Play/Pause"); + case VK_LAUNCH_MAIL: + return TranslateT("Mail"); + case VK_LAUNCH_MEDIA_SELECT: + return TranslateT("Media: Select"); + case VK_LAUNCH_APP1: + return TranslateT("App 1"); + case VK_LAUNCH_APP2: return TranslateT("App 2"); case VK_DIVIDE: @@ -1034,7 +1034,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, int HotkeyOptionsInit(WPARAM wParam, LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.flags = ODPF_BOLDGROUPS; odp.position = -180000000; diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index d7ca6a2379..1293e52552 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -434,7 +434,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM static int SkinOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -200000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SOUND);
diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp index c1c6a293d7..6f694ef660 100644 --- a/src/modules/visibility/visibility.cpp +++ b/src/modules/visibility/visibility.cpp @@ -270,7 +270,7 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP static int VisibilityOptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 850000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_VISIBILITY);
|