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 | |
| 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
185 files changed, 229 insertions, 280 deletions
diff --git a/include/delphi/m_options.inc b/include/delphi/m_options.inc index 568d5e62e0..2643237a05 100644 --- a/include/delphi/m_options.inc +++ b/include/delphi/m_options.inc @@ -52,7 +52,6 @@ const type
POPTIONSDIALOGPAGE = ^TOPTIONSDIALOGPAGE;
TOPTIONSDIALOGPAGE = record
- cbSize :int;
position :int; // a position number, lower numbers are topmost
szTitle :TChar; // [TRANSLATED-BY-CORE]
pfnDlgProc :pointer;
diff --git a/include/m_options.h b/include/m_options.h index 1deed0242b..f3ca337f44 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -57,7 +57,6 @@ DLUs. // are translated by the core, which may lead to double translation.
// Use LPGEN instead which are just dummy wrappers/markers for "lpgen.pl".
typedef struct {
- int cbSize;
int position; //a position number, lower numbers are topmost
union {
char* pszTitle; // [TRANSLATED-BY-CORE]
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 6ca8e7d629..36a6af0d05 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -709,7 +709,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA int OptInit(WPARAM wParam, LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst; odp.flags = ODPF_BOLDGROUPS; odp.pszGroup = LPGEN("Contacts"); @@ -1104,7 +1104,7 @@ static INT_PTR CALLBACK DlgProcAvatarProtoInfo(HWND hwndDlg, UINT msg, WPARAM wP int OnDetailsInit(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 };
odp.hIcon = g_hIcon; odp.hInstance = g_hInst; odp.pszTitle = LPGEN("Avatar"); diff --git a/plugins/Actman/i_opt_dlg.inc b/plugins/Actman/i_opt_dlg.inc index e7a9e206ef..8ec24e42ac 100644 --- a/plugins/Actman/i_opt_dlg.inc +++ b/plugins/Actman/i_opt_dlg.inc @@ -24,7 +24,6 @@ begin DoInitCommonControls(ICC_USEREX_CLASSES);
FillChar(odp,SizeOf(odp),0);
- odp.cbSize :=SizeOf(odp);
odp.flags :=ODPF_BOLDGROUPS;
odp.Position :=900003000;
odp.hInstance :=hInstance;
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 07c5fbf2d2..ac3cdbf80e 100644 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -1135,7 +1135,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int OptInit(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index b40d61b69f..cc343e2f45 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -939,7 +939,7 @@ static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara static int AssocListOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ASSOCLIST);
odp.position = 900000100; /* network opts = 900000000 */
diff --git a/plugins/AuthState/src/options.cpp b/plugins/AuthState/src/options.cpp index 99a3b95c59..bf1abe47e1 100644 --- a/plugins/AuthState/src/options.cpp +++ b/plugins/AuthState/src/options.cpp @@ -71,7 +71,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int onOptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszGroup = LPGEN("Icons");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_AUTHSTATE_OPT);
diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp index 91a8394d3d..034ac95dcd 100644 --- a/plugins/AutoRun/src/main.cpp +++ b/plugins/AutoRun/src/main.cpp @@ -102,7 +102,7 @@ static INT_PTR CALLBACK DlgProcAutorunOpts(HWND hwndDlg, UINT msg, WPARAM wParam static int AutorunOptInitialise(WPARAM wParam,LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100100000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AUTORUN);
diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp index 32f142be2b..3f50077c07 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -105,7 +105,7 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L static int ShutdownOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SHUTDOWN);
odp.position = 900000002;
diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index ce5fae76b1..37f8a9ef38 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -146,7 +146,7 @@ static INT_PTR CALLBACK PopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA int OptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.ptszGroup = LPGENT("History"); // group to put your item under
odp.ptszTitle = LPGENT("Avatar"); // name of the item
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 6a04f16dea..f8bfc9bbdf 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -296,7 +296,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara int OptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pszTitle = ModuleName;
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index f421dc1104..f27278c14d 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -119,7 +119,7 @@ Options::~Options() int Options::InitOptions(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index defc925837..c00713880b 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -478,7 +478,7 @@ static INT_PTR CALLBACK EngineDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP static int MessageOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = hInst;
odp.pszGroup = BOLTUN_GROUP;
diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 292751a024..3a597f4175 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -431,7 +431,7 @@ static INT_PTR CALLBACK PopupOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP */
static int OptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.ptszGroup = LPGENT("Contacts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPANEL);
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index f490a77a10..7a58be7869 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -95,7 +95,7 @@ int MsgAck(WPARAM wParam, LPARAM lParam) int BuddyPounceOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 14a5ddc50d..c50e995702 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -80,7 +80,7 @@ static int OnDbChanged(WPARAM hContact, LPARAM lparam) static int OnInitOptions(WPARAM wparam, LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 955000000; odp.hInstance = g_hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 79f0882351..0affb1e21a 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -140,7 +140,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN_OPTION_FORM);
odp.pszTitle = ModuleName;
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index 9a5145a03d..b953dc8abb 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -264,7 +264,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(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/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index ed9443b887..34f9a93111 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -227,7 +227,7 @@ static UINT expertOnlyControls[] = { IDC_ALWAYSSTATUS }; 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/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index cbc295cbec..131850c74f 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -307,7 +307,7 @@ static UINT expertOnlyControls[] = 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/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 7c19710bd2..16a41b358c 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -1820,7 +1820,7 @@ static clist_opt_items[] = int ClcOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
odp.pszTitle = LPGEN("Contact list");
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index eee5976960..6bac4ae659 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -937,7 +937,7 @@ static row_opt_items[] = int CListOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -200000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ITEMS);
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index d4c1458a0a..7dd64c6a5e 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -49,7 +49,7 @@ int SkinOptInit(WPARAM wParam, LPARAM) { if (!g_CluiData.fDisableSkinEngine) { //Tabbed settings - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -200000000; odp.hInstance = g_hInst; odp.pfnDlgProc = DlgSkinOpts; diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 04d3bb9b0c..9948c37ed3 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -513,7 +513,7 @@ static INT_PTR CALLBACK DlgProcIcons(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPar int ClcOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp index 49ca54b2e9..b579d937de 100644 --- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp +++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp @@ -598,7 +598,7 @@ INT_PTR CALLBACK DlgProcConnectionNotifyOpts(HWND hwndDlg, UINT msg, WPARAM wPar //options page on miranda called
int ConnectionNotifyOptInit(WPARAM wParam,LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DIALOG);
odp.ptszTitle = _T(PLUGINNAME);
diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index 50c07efb08..b6954c0387 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1077,7 +1077,7 @@ static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM static int OptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pszGroup = LPGEN("Services");
diff --git a/plugins/CountryFlags/src/options.cpp b/plugins/CountryFlags/src/options.cpp index ebb9d560fc..f87979b172 100644 --- a/plugins/CountryFlags/src/options.cpp +++ b/plugins/CountryFlags/src/options.cpp @@ -82,7 +82,7 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L int OnOptionsInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXTRAIMG);
odp.position = 900000002;
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 253d28612e..108d48910a 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -202,7 +202,7 @@ static int FoldersPathChanged(WPARAM, LPARAM) int OptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index 5a945e7d3e..0e202dc457 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -284,7 +284,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP static int OnOptionsInit(PVOID obj, WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp index 7c74985b66..a9ed2f4046 100644 --- a/plugins/DbEditorPP/src/main_window.cpp +++ b/plugins/DbEditorPP/src/main_window.cpp @@ -556,7 +556,6 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break;
case MENU_OPEN_OPTIONS:
OPENOPTIONSDIALOG odp = { 0 };
- odp.cbSize = sizeof(odp);
odp.pszGroup = "Database";
odp.pszPage = modFullname;
odp.pszTab = 0;
diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp index 37a4d0fa29..2662c222a5 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -61,7 +61,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) INT OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS);
odp.pszGroup = LPGEN("Database");
diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp index 35e3b01844..4c5f399de6 100644 --- a/plugins/Db_autobackups/src/options.cpp +++ b/plugins/Db_autobackups/src/options.cpp @@ -386,8 +386,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int OptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
-
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = g_hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/Dropbox/src/dropbox_events.cpp b/plugins/Dropbox/src/dropbox_events.cpp index cd96ff99ed..7698d5dc9e 100644 --- a/plugins/Dropbox/src/dropbox_events.cpp +++ b/plugins/Dropbox/src/dropbox_events.cpp @@ -69,7 +69,7 @@ int CDropbox::OnContactDeleted(void *obj, WPARAM hContact, LPARAM) int CDropbox::OnOptionsInitialized(void *obj, WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = g_hInstance;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index e02896dde0..e3138961d6 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -78,7 +78,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) //add the exchange options dialog to miranda
int OnOptionsInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXCHANGE);
diff --git a/plugins/FTPFileYM/src/options.cpp b/plugins/FTPFileYM/src/options.cpp index 0ab1f702ad..e7503416cb 100644 --- a/plugins/FTPFileYM/src/options.cpp +++ b/plugins/FTPFileYM/src/options.cpp @@ -246,7 +246,7 @@ INT_PTR CALLBACK Options::DlgProcOptsAdvanced(HWND hwndDlg, UINT msg, WPARAM wPa int Options::InitOptions(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/FavContacts/src/options.cpp b/plugins/FavContacts/src/options.cpp index 2dc5ac89b1..0d6c8f7eac 100644 --- a/plugins/FavContacts/src/options.cpp +++ b/plugins/FavContacts/src/options.cpp @@ -259,7 +259,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA int ProcessOptInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 72165723c6..4bc31d1a8f 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -143,7 +143,7 @@ INT_PTR OnRecvMessage(WPARAM wParam, LPARAM lParam) int OnOptInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.ptszTitle = _T(SERVICE_TITLE);
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index cd49c08c2a..c3f62ba8bb 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -115,7 +115,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP int OnOptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.ptszGroup = LPGENT("Icons");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG);
diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index de2ef4bde8..b913ee7822 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -334,7 +334,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP int OnOptionsInitialize(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FLTCONT);
odp.pszTitle = LPGEN("Floating Contacts");
diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index d63123d627..23e1fc2a4a 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -248,7 +248,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM l static int OnOptionsInitialize(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FOLDERS);
diff --git a/plugins/GmailNotifier/src/options.cpp b/plugins/GmailNotifier/src/options.cpp index 718d850118..77705618a2 100644 --- a/plugins/GmailNotifier/src/options.cpp +++ b/plugins/GmailNotifier/src/options.cpp @@ -272,10 +272,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp;
-
- memset(&odp, 0, sizeof(odp));
- odp.cbSize = sizeof(odp);
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index c06e583bea..6d092f2251 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -1338,7 +1338,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 900000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_HTTP_SERVER);
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index 6c374a238e..2f94d2ec47 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -100,7 +100,7 @@ extern "C" __declspec(dllexport) int Unload(void) int InitOptionsDlg(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszGroup = LPGEN("History");
odp.pszTitle = LPGEN("History Linklist");
diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 0f0bfa7b52..42e29069ff 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -194,7 +194,7 @@ namespace mu {
void addPage(WPARAM addInfo, const TCHAR* pszGroup, const TCHAR* pszTitle, const TCHAR* pszTab, DLGPROC pfnDlgProc, const char* pszTemplate, HINSTANCE hInstance, DWORD flags /* = ODPF_BOLDGROUPS */)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.ptszTitle = const_cast<TCHAR*>(pszTitle);
odp.pfnDlgProc = pfnDlgProc;
odp.pszTemplate = const_cast<char*>(pszTemplate);
diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp index 9f13d45b8a..6b4699a0ef 100644 --- a/plugins/HistorySweeperLight/src/options.cpp +++ b/plugins/HistorySweeperLight/src/options.cpp @@ -274,7 +274,7 @@ INT_PTR CALLBACK DlgProcHSOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa int HSOptInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HISTORYSWEEPER);
odp.pszTitle = ModuleName;
diff --git a/plugins/IEHistory/src/events.cpp b/plugins/IEHistory/src/events.cpp index 960a1ba4bc..d6e21fe421 100644 --- a/plugins/IEHistory/src/events.cpp +++ b/plugins/IEHistory/src/events.cpp @@ -37,16 +37,13 @@ int UnhookEvents() int OnOptionsInitialize(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100000000; -// odp.ptszTitle = _T("IEHistory"); odp.ptszTitle = LPGENT("History"); odp.pfnDlgProc = OptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HISTORY); odp.hInstance = hInstance; -// odp.ptszGroup = LPGENT("Message sessions"); -// odp.groupPosition = 910000000; - odp.flags=ODPF_BOLDGROUPS|ODPF_TCHAR; + odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; Options_AddPage(wParam,&odp); return 0; } diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 59fd621c06..8cf97390bb 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -438,7 +438,7 @@ static bool BrowseFile(HWND hwndDlg, char *filter, char *defExt, char *path, int int IEViewOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInstance;
odp.ptszGroup = LPGENT("Message sessions");
odp.ptszTitle = LPGENT("IEView");
diff --git a/plugins/IgnoreState/src/options.cpp b/plugins/IgnoreState/src/options.cpp index c928736353..bf8d5032ef 100644 --- a/plugins/IgnoreState/src/options.cpp +++ b/plugins/IgnoreState/src/options.cpp @@ -104,7 +104,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int onOptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.flags = ODPF_BOLDGROUPS;
odp.pszGroup = LPGEN("Icons");
diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index a1c9c335ae..72bf91d5f6 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -89,7 +89,7 @@ BYTE trillianLedsMsg, trillianLedsURL, trillianLedsFile, trillianLedsOther; // ** int InitializeOptions(WPARAM wParam,LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pszTitle = LPGEN("Keyboard Flash"); diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp index e4df1f5020..2c6f5c0d75 100644 --- a/plugins/ListeningTo/src/options.cpp +++ b/plugins/ListeningTo/src/options.cpp @@ -74,7 +74,7 @@ static OptPageControl playersControls[] = { int InitOptionsCallback(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index 2234d685ec..9526c144f7 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -1354,7 +1354,7 @@ INT_PTR CALLBACK DlgProcLotusNotifyOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L //options page on miranda called
int LotusNotifyOptInit(WPARAM wParam,LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DIALOG);
odp.ptszTitle = _A2T(PLUGINNAME);
diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp index cfbb1ae6e2..698d7cce15 100644 --- a/plugins/MenuItemEx/src/options.cpp +++ b/plugins/MenuItemEx/src/options.cpp @@ -103,7 +103,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) int OptionsInit(WPARAM wparam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 955000000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp index f810f1a5b1..f729e9d448 100644 --- a/plugins/MirFox/src/MirandaOptions.cpp +++ b/plugins/MirFox/src/MirandaOptions.cpp @@ -674,7 +674,7 @@ INT_PTR CALLBACK DlgProcOpts_Tab3(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM */
int OptInit(WPARAM wParam, LPARAM) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.ptszTitle = LPGENT(PLUGIN_OPTIONS_NAME);
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp index fed648e2c4..c1105f4bd8 100644 --- a/plugins/MirOTR/src/options.cpp +++ b/plugins/MirOTR/src/options.cpp @@ -103,7 +103,7 @@ void LoadOptions() { extern "C" int OpenOptions(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100; odp.hInstance = hInst; odp.ptszGroup = LPGENT("Services"); diff --git a/plugins/MirandaG15/src/CConfig.cpp b/plugins/MirandaG15/src/CConfig.cpp index 22a14ac5a9..70b40b89ba 100644 --- a/plugins/MirandaG15/src/CConfig.cpp +++ b/plugins/MirandaG15/src/CConfig.cpp @@ -249,44 +249,35 @@ void CConfig::OnConnectionChanged() { int CConfig::InitOptionsDialog(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp;
- memset(&odp, 0, sizeof(odp));
- odp.cbSize = sizeof(odp);
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 847000000;
odp.hInstance = hInstance;
odp.pszGroup = LPGEN("MirandaG15");
- odp.flags = ODPF_BOLDGROUPS;
+ odp.flags = ODPF_BOLDGROUPS;
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_FONTS);
odp.pszTitle = LPGEN("Appearance");
odp.pszGroup = LPGEN("MirandaG15");
odp.pfnDlgProc = CConfig::AppearanceDlgProc;
-
Options_AddPage(wParam, &odp);
// ---------------------
-
odp.pszTemplate = MAKEINTRESOURCEA(IDD_NOTIFICATIONS);
odp.pszTitle = LPGEN("Notifications");
odp.pfnDlgProc = CConfig::NotificationsDlgProc;
-
Options_AddPage(wParam, &odp);
// ---------------------
-
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CHAT);
odp.pszTitle = LPGEN("Chat sessions");
odp.pfnDlgProc = CConfig::ChatDlgProc;
-
Options_AddPage(wParam, &odp);
// ---------------------
-
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CLIST);
odp.pszTitle = LPGEN("Contact list");
odp.pfnDlgProc = CConfig::ContactlistDlgProc;
-
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index f372f30eeb..7147bab282 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -183,7 +183,7 @@ int HookedInit(WPARAM wParam, LPARAM lParam) int HookedOptions(WPARAM wParam, LPARAM lParam)
{
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.ptszTitle = LPGENT("MessagePopup");
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 0c14b89862..7a424b9df0 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -1402,7 +1402,7 @@ int OptionsInitialize(WPARAM wParam,LPARAM /*lParam*/) {
bUnaplyedChanges = FALSE;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT);
diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp index 650120ebba..139b3160b5 100644 --- a/plugins/MyDetails/src/options.cpp +++ b/plugins/MyDetails/src/options.cpp @@ -161,7 +161,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int InitOptionsCallback(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -200000000;
odp.hInstance = hInst;
odp.pfnDlgProc = DlgProcOpts;
diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp index 409f0ead19..8395553414 100644 --- a/plugins/NewEventNotify/src/options.cpp +++ b/plugins/NewEventNotify/src/options.cpp @@ -289,7 +289,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L int OptionsAdd(HINSTANCE hInst, WPARAM addInfo)
{
if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
odp.pszTitle = LPGEN("Event Notify");
diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index 50e35d5245..c6e0c8c08b 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -599,7 +599,7 @@ INT_PTR CALLBACK DlgProcFiltering(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam) int UserInfoInitialise(WPARAM wParam, LPARAM lParam)
{
if (lParam) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_SOUNDS);
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index 950486472f..448aadeb32 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -1222,7 +1222,7 @@ INT_PTR CALLBACK DlgProcLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int OptionsInitialize(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index d6f3c6f847..a00a351dc0 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -39,7 +39,7 @@ BOOL CheckStateStoreDB(HWND hwndDlg, int idCtrl, const char* szSetting) int GpgOptInit(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG);
odp.ptszTitle = _T(szGPGModuleName);
diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp index bae5366085..40882267b7 100644 --- a/plugins/NewsAggregator/Src/Options.cpp +++ b/plugins/NewsAggregator/Src/Options.cpp @@ -585,7 +585,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA int OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/NoHistory/src/options.cpp b/plugins/NoHistory/src/options.cpp index d116fad726..8a31611b15 100644 --- a/plugins/NoHistory/src/options.cpp +++ b/plugins/NoHistory/src/options.cpp @@ -218,7 +218,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int OptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;
odp.position = -790000000;
odp.hInstance = hInst;
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 679df4eb7a..6c8df00ec8 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -61,7 +61,7 @@ int LCStatus = ID_STATUS_OFFLINE; //=====================================================
int NimcOptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pszGroup = LPGEN("Plugins");
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 5ee0629b34..7799f7a0c4 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -115,7 +115,7 @@ void InitIcons(void) int OnOptInitialise(WPARAM w, LPARAM L)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 900002000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_STNOTEOPTIONS);
diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp index 20ecc668e3..577e0f560b 100644 --- a/plugins/NotifyAnything/src/options.cpp +++ b/plugins/NotifyAnything/src/options.cpp @@ -171,7 +171,7 @@ void load_settings() int OptionsInitialize(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.pszTemplate = MAKEINTRESOURCEA(NA_OPTIONS);
odp.pfnDlgProc = DlgProcOpts;
odp.pszTitle = LPGEN("Notify Anything");
diff --git a/plugins/Nudge/src/options.cpp b/plugins/Nudge/src/options.cpp index 7f06e491e1..b4e1a0d61b 100644 --- a/plugins/Nudge/src/options.cpp +++ b/plugins/Nudge/src/options.cpp @@ -379,7 +379,7 @@ static INT_PTR CALLBACK DlgProcNudgeOpt(HWND hwnd, UINT msg, WPARAM wParam, LPAR int NudgeOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NUDGE);
diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp index a8bb9049a9..66e3601d8b 100644 --- a/plugins/PackUpdater/Src/Options.cpp +++ b/plugins/PackUpdater/Src/Options.cpp @@ -385,7 +385,7 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) int OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp index 0fc63c36b6..f64d148b51 100644 --- a/plugins/PasteIt/src/Options.cpp +++ b/plugins/PasteIt/src/Options.cpp @@ -761,7 +761,7 @@ void Options::SetCodepageCB(HWND hwndCB, unsigned int codepage) int Options::InitOptions(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp index 7d0814e7ce..8d6ef33cc4 100644 --- a/plugins/Ping/src/options.cpp +++ b/plugins/Ping/src/options.cpp @@ -499,7 +499,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR int PingOptInit(WPARAM wParam,LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;
odp.ptszGroup = LPGENT("Network");
diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index 8dea14b3c7..ee191b7977 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -390,7 +390,7 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) int OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index e508e4e35e..b77d93d3a8 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -146,9 +146,9 @@ extern "C" __declspec(dllexport) int Load(void) extern "C" __declspec(dllexport) int Unload(void)
{
UnloadCheck();
-#if MIRANDA_VER >= 0x0A00
- UnloadListNew();
-#endif
+ #if MIRANDA_VER >= 0x0A00
+ UnloadListNew();
+ #endif
UnloadNetlib();
return 0;
}
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 395792e278..302fe6f860 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -60,7 +60,7 @@ HANDLE hTTButton; static int OptionsInitialize(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.groupPosition = 910000000;
odp.hInstance = hInst;
diff --git a/plugins/QuickContacts/src/options.cpp b/plugins/QuickContacts/src/options.cpp index 1e69ce13df..e35b06d414 100644 --- a/plugins/QuickContacts/src/options.cpp +++ b/plugins/QuickContacts/src/options.cpp @@ -49,7 +49,7 @@ void LoadOptions() int InitOptionsCallback(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance=hInst;
odp.ptszGroup = LPGENT("Contacts");
odp.ptszTitle = LPGENT("Quick Contacts");
diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp index 436aef9b1b..6074f8e0a8 100644 --- a/plugins/QuickMessages/src/options.cpp +++ b/plugins/QuickMessages/src/options.cpp @@ -1138,7 +1138,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) int OptionsInit(WPARAM wparam,LPARAM lparam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 940000000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/QuickReplies/src/options.cpp b/plugins/QuickReplies/src/options.cpp index bb5e38d058..1854484fad 100644 --- a/plugins/QuickReplies/src/options.cpp +++ b/plugins/QuickReplies/src/options.cpp @@ -171,7 +171,7 @@ int OnOptInitialized(WPARAM wParam, LPARAM lParam) char tabName[32];
mir_snprintf(tabName, SIZEOF(tabName), "%s %x", Translate("Button"), iNumber + 1);
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.pszGroup = LPGEN("Message sessions");
odp.pszTitle = LPGEN("Quick Replies");
odp.pszTab = tabName;
diff --git a/plugins/QuickSearch/quicksearch.dpr b/plugins/QuickSearch/quicksearch.dpr index 1deb4c5f3d..bb363cc6b7 100644 --- a/plugins/QuickSearch/quicksearch.dpr +++ b/plugins/QuickSearch/quicksearch.dpr @@ -141,7 +141,6 @@ var odp:TOPTIONSDIALOGPAGE;
begin
ZeroMemory(@odp,sizeof(odp));
- odp.cbSize :=SizeOf(odp); //for 0.6+ compatibility
odp.Position :=900003000;
odp.hInstance :=hInstance;
odp.pszTemplate:=PAnsiChar(IDD_DIALOG1);
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index a2e01a22e6..6693535fe9 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -387,7 +387,7 @@ namespace const CModuleInfo::TQuotesProvidersPtr& pProviders = CModuleInfo::GetQuoteProvidersPtr();
const CQuotesProviders::TQuotesProviders& rapProviders = pProviders->GetProviders();
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInstance;
odp.ptszTitle = _T(QUOTES_PROTOCOL_NAME);
diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp index ee43fab9da..52abaa46df 100644 --- a/plugins/Quotes/src/QuoteInfoDlg.cpp +++ b/plugins/Quotes/src/QuoteInfoDlg.cpp @@ -127,7 +127,7 @@ int QuotesEventFunc_OnUserInfoInit(WPARAM wp, LPARAM lp) g_hContact = hContact;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInstance;
odp.hIcon = Quotes_LoadIconEx(ICON_STR_MAIN);
odp.pfnDlgProc = QuoteInfoDlgProc;
diff --git a/plugins/RecentContacts/src/options.cpp b/plugins/RecentContacts/src/options.cpp index 31462b55db..e73e67e49c 100644 --- a/plugins/RecentContacts/src/options.cpp +++ b/plugins/RecentContacts/src/options.cpp @@ -63,7 +63,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int onOptInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszGroup = LPGEN("Contacts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_LASTUC_OPT);
diff --git a/plugins/SMS/src/options.cpp b/plugins/SMS/src/options.cpp index e380b25c4e..63420cb407 100644 --- a/plugins/SMS/src/options.cpp +++ b/plugins/SMS/src/options.cpp @@ -88,7 +88,7 @@ INT_PTR CALLBACK DlgProcEditorOptions(HWND hWndDlg, UINT msg, WPARAM wParam, LPA int OptInitialise(WPARAM wParam,LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = ssSMSSettings.hInstance;
odp.pszGroup = LPGEN("Events");
diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index f98ebcd74a..8559d96745 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -731,7 +731,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg,UINT uMsg,WPARAM wParam static int OptionsInitialize(WPARAM wParam, LPARAM)
{
if (g_dat.popupInstalled) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000002;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index b3f39905d5..9bf514bd3d 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -952,7 +952,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam int OptInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInst;
odp.pszTitle = LPGEN("Message sessions");
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index d59beef298..8e98b92d8b 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1686,7 +1686,7 @@ BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv) int onRegisterOptions(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSTAB);
odp.pszTitle = (char*)MODULENAME;
diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index 3feae47a6c..393659d271 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -162,7 +162,7 @@ void RefreshPopupOptionsDlg(HWND hec, HWND hdc, HWND hss, HWND hsr, HWND hks, HW int onRegisterPopOptions(WPARAM wParam, LPARAM)
{
if (bPopupExists) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP);
odp.pszTitle = (char*)MODULENAME;
diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp index c8fdc3be3b..2564337948 100644 --- a/plugins/SeenPlugin/src/options.cpp +++ b/plugins/SeenPlugin/src/options.cpp @@ -431,7 +431,7 @@ INT_PTR CALLBACK OptsSettingsDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM int OptionsInit(WPARAM wparam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInstance;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp index b3e6820606..165521e6f5 100644 --- a/plugins/Sessions/Src/Options.cpp +++ b/plugins/Sessions/Src/Options.cpp @@ -490,7 +490,7 @@ static INT_PTR CALLBACK OptionsProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM l int OptionsInit(WPARAM wparam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 955000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/SimpleAR/src/Options.cpp b/plugins/SimpleAR/src/Options.cpp index 4e3c63b98a..40b6b01bdd 100644 --- a/plugins/SimpleAR/src/Options.cpp +++ b/plugins/SimpleAR/src/Options.cpp @@ -150,7 +150,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara INT OptInit(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTION);
diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp index 73ce676ee0..d3e4b3be7b 100644 --- a/plugins/SimpleStatusMsg/src/options.cpp +++ b/plugins/SimpleStatusMsg/src/options.cpp @@ -1667,7 +1667,7 @@ int InitOptions(WPARAM wParam, LPARAM lParam) if (accounts->statusCount == 0)
return 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/SkypeStatusChange/src/options.cpp b/plugins/SkypeStatusChange/src/options.cpp index 4e22bacc57..f2ed13bfc0 100644 --- a/plugins/SkypeStatusChange/src/options.cpp +++ b/plugins/SkypeStatusChange/src/options.cpp @@ -305,7 +305,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hdlg,UINT msg,WPARAM wp,LPARAM lp) int SSC_OptInitialise(WPARAM wp, LPARAM lp)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hModule;
odp.pszTitle = LPGEN("Change Skype status");
diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index 3c9a5df1af..d4147c36f2 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -53,7 +53,7 @@ static INT_PTR CALLBACK DlgProcSmileysOptions(HWND hwndDlg, UINT msg, WPARAM wPa //Init and de-init functions, called from main
int SmileysOptionsInitialize(WPARAM addInfo, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMILEYS);
diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp index 5ddc02b327..dee33a833c 100644 --- a/plugins/Spamotron/src/options.cpp +++ b/plugins/Spamotron/src/options.cpp @@ -555,7 +555,7 @@ extern INT_PTR CALLBACK DlgProcOptionsPopups(HWND optDlg, UINT msg, WPARAM wPara int OnOptInitialize(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.ptszGroup = LPGENT("Message sessions");
odp.ptszTitle = _T(PLUGIN_NAME);
diff --git a/plugins/SpellChecker/src/options.cpp b/plugins/SpellChecker/src/options.cpp index 346b226282..a1f855ef59 100644 --- a/plugins/SpellChecker/src/options.cpp +++ b/plugins/SpellChecker/src/options.cpp @@ -55,7 +55,7 @@ static OptPageControl autoReplaceControls[] = { int InitOptionsCallback(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszGroup = LPGEN("Message sessions");
odp.pszTitle = LPGEN("Spell Checker");
@@ -65,7 +65,6 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) Options_AddPage(wParam, &odp);
memset(&odp, 0, sizeof(odp));
- odp.cbSize = sizeof(odp);
odp.hInstance = hInst;
odp.pszGroup = LPGEN("Message sessions");
odp.pszTitle = LPGEN("Auto-replacements");
diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index 762ea4d531..398dd337db 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -429,7 +429,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int OptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszGroup = LPGEN("Skins");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPLASH_OPT);
diff --git a/plugins/StartPosition/src/main.cpp b/plugins/StartPosition/src/main.cpp index 6ae5109a03..d4c1b2e4e6 100644 --- a/plugins/StartPosition/src/main.cpp +++ b/plugins/StartPosition/src/main.cpp @@ -193,7 +193,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pszGroup = LPGEN("Contact list");
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 23809db898..155ff045ea 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -351,8 +351,7 @@ HANDLE GetIconHandle(char *szIcon) int InitializeOptions(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = {sizeof(odp)};
- odp.position = 0;
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SSOPT);
odp.pszGroup = LPGEN("Events");//FIXME: move to...Group?
diff --git a/plugins/StatusChange/src/main.cpp b/plugins/StatusChange/src/main.cpp index a012ac24ec..55d017c908 100644 --- a/plugins/StatusChange/src/main.cpp +++ b/plugins/StatusChange/src/main.cpp @@ -312,7 +312,7 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w int StatusChangeOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.ptszTitle = LPGENT("Status Change");
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp index 100a2acc05..cdc9c8e603 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp @@ -513,7 +513,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayTabs(HWND hwndDlg, UINT msg, WPARAM wPara int AutoAwayOptInitialise(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 1000000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TABS);
diff --git a/plugins/StatusPlugins/KeepStatus/options.cpp b/plugins/StatusPlugins/KeepStatus/options.cpp index 4b97f46b87..c533847b03 100644 --- a/plugins/StatusPlugins/KeepStatus/options.cpp +++ b/plugins/StatusPlugins/KeepStatus/options.cpp @@ -565,7 +565,7 @@ INT_PTR CALLBACK PopupOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l int OptionsInit(WPARAM wparam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.ptszGroup = LPGENT("Status");
odp.ptszTitle = LPGENT("KeepStatus");
@@ -576,7 +576,6 @@ int OptionsInit(WPARAM wparam, LPARAM) if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
memset(&odp, 0, sizeof(odp));
- odp.cbSize = sizeof(odp);
odp.position = 150000000;
odp.ptszGroup = LPGENT("Popups");
odp.groupPosition = 910000000;
diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp index ddd6ccd3c0..ff3281f171 100644 --- a/plugins/StatusPlugins/StartupStatus/options.cpp +++ b/plugins/StatusPlugins/StartupStatus/options.cpp @@ -889,7 +889,7 @@ INT_PTR CALLBACK addProfileDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lP int OptionsInit(WPARAM wparam,LPARAM lparam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszGroup = LPGEN("Status");
odp.pszTitle = LPGEN("StartupStatus");
diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp index 23e9a601d1..0548dff6fc 100755 --- a/plugins/StopSpamMod/src/options.cpp +++ b/plugins/StopSpamMod/src/options.cpp @@ -350,7 +350,7 @@ INT_PTR CALLBACK AdvancedDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar HINSTANCE hInst;
MIRANDA_HOOK_EVENT(ME_OPT_INITIALISE, w, l)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.ptszGroup = LPGENT("Message sessions");
odp.ptszTitle = LPGENT("StopSpam");
odp.position = -1;
diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp index 4b1e883190..a7af0917a4 100644 --- a/plugins/StopSpamPlus/src/events.cpp +++ b/plugins/StopSpamPlus/src/events.cpp @@ -163,7 +163,7 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_FILTER_ADD, w, l) MIRANDA_HOOK_EVENT(ME_OPT_INITIALISE, w, l)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.pszGroup = LPGEN("Message sessions");
odp.pszTitle = pluginName;
odp.position = -1;
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 72ea66691f..66a9240eea 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -1271,7 +1271,7 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) if (PluginConfig.g_bPopupAvail)
TN_OptionsInitialize(wParam, lParam);
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInst;
odp.pszTitle = LPGEN("Message sessions");
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index e40fcbfadf..e931c1b9d0 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -503,7 +503,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int TN_OptionsInitialize(WPARAM wParam, LPARAM)
{
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TYPINGNOTIFYPOPUP);
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index ed108c4ca4..c20d0645ea 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -2310,7 +2310,7 @@ INT_PTR CALLBACK DlgProcOptsTraytip(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int OptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.flags = ODPF_BOLDGROUPS;
odp.position = -790000000;
odp.hInstance = hInst;
diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 4b6db0329e..55fadc002f 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -269,7 +269,7 @@ int CTooltipNotify::ContactSettingChanged(WPARAM hContact, LPARAM lParam) int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = g_hInstDLL;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp index fbfacab88c..97d94636c1 100644 --- a/plugins/TopToolBar/src/ttbopt.cpp +++ b/plugins/TopToolBar/src/ttbopt.cpp @@ -546,7 +546,7 @@ static INT_PTR CALLBACK ButOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR int TTBOptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszGroup = LPGEN("Contact list");
odp.position = -1000000000;
diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index 1ce4742b12..4d63814a8b 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -342,7 +342,7 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, int TrafficCounterOptInitialise(WPARAM wParam,LPARAM lParam)
{
// Main options page
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 900000000;
odp.groupPosition = 1;
odp.hInstance = hInst;
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp index 40efabafce..15b6bf5f8a 100644 --- a/plugins/UserInfoEx/src/classPsTree.cpp +++ b/plugins/UserInfoEx/src/classPsTree.cpp @@ -127,7 +127,7 @@ int CPsTree::AddDummyItem(LPCSTR pszGroup) psh._pPages = _pItems; psh._numPages = _numItems; - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = ghInst; odp.flags = ODPF_TCHAR; odp.ptszTitle = mir_utf8decodeT(pszGroup); diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 6ebf3bba69..265a885574 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -352,11 +352,6 @@ static INT_PTR AddPage(WPARAM wParam, LPARAM lParam) if (pPsh == NULL || odp == NULL || pPsh->_dwSize != sizeof(CPsHdr))
return 1;
- if (odp->cbSize != sizeof(OPTIONSDIALOGPAGE) && odp->cbSize != OPTIONPAGE_OLD_SIZE) {
- MsgErr(NULL, LPGENT("The page to add has invalid size %d bytes!"), odp->cbSize);
- return 1;
- }
-
// try to check whether the flag member is initialized or not
odp->flags = odp->flags > (ODPF_UNICODE | ODPF_BOLDGROUPS | ODPF_ICON | PSPF_PROTOPREPENDED) ? 0 : odp->flags;
@@ -511,7 +506,7 @@ static int InitDetails(WPARAM wParam, LPARAM lParam) if (!(pPsh->_dwFlags & PSF_PROTOPAGESONLY)) {
BYTE bChangeDetailsEnabled = myGlobals.CanChangeDetails && db_get_b(NULL, MODNAME, SET_PROPSHEET_CHANGEMYDETAILS, FALSE);
if (lParam || bChangeDetailsEnabled) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = ghInst;
odp.flags = ODPF_ICON | ODPF_TCHAR;
odp.ptszGroup = IcoLib_GetDefaultIconFileName();
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index ee7a3547bb..10e733a507 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -1039,12 +1039,11 @@ static int OnInitOptions(WPARAM wParam, LPARAM lParam) {
DlgContactInfoInitTreeIcons();
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 95400;
odp.hInstance = ghInst;
odp.pszTitle = LPGEN(MODULELONGNAME);
odp.pszGroup = LPGEN("Contacts");
- odp.cbSize = sizeof(odp);
// Common page
odp.pszTab = LPGEN("Common");
diff --git a/plugins/Variables/src/options.cpp b/plugins/Variables/src/options.cpp index e13dee1341..fa37d39af6 100644 --- a/plugins/Variables/src/options.cpp +++ b/plugins/Variables/src/options.cpp @@ -129,7 +129,7 @@ static INT_PTR CALLBACK SetOptsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA int OptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 150000000;
odp.pszGroup = LPGEN("Services");
odp.groupPosition = 910000000;
diff --git a/plugins/Watrack/i_opt_dlg.inc b/plugins/Watrack/i_opt_dlg.inc index 9a1e588173..5721158705 100644 --- a/plugins/Watrack/i_opt_dlg.inc +++ b/plugins/Watrack/i_opt_dlg.inc @@ -20,7 +20,6 @@ begin SendMessage(hwndTooltip,TTM_SETMAXTIPWIDTH,0,300);
FillChar(odp,SizeOf(odp),0);
- odp.cbSize :=SizeOf(odp);
odp.Position :=900003000;
odp.hInstance :=hInstance;
odp.szTitle.a :=PluginName;
diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index ca9462a12d..2aca70bc74 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -363,7 +363,6 @@ var odp:TOPTIONSDIALOGPAGE;
begin
FillChar(odp,SizeOf(odp),0);
- odp.cbSize :=SizeOf(odp);
odp.flags :=ODPF_BOLDGROUPS;
odp.Position :=900003000;
odp.hInstance :=hInstance;
diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp index 03471e3c83..3b59f516f6 100755 --- a/plugins/Watrack_MPD/src/options.cpp +++ b/plugins/Watrack_MPD/src/options.cpp @@ -68,7 +68,7 @@ static INT_PTR CALLBACK DlgProcWaMpdOpts(HWND hwndDlg, UINT msg, WPARAM wParam, int WaMpdOptInit(WPARAM wParam,LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WA_MPD); odp.ptszTitle = LPGENT("Winamp Track"); diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 3e4c31725e..77cc37b97a 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -256,7 +256,7 @@ void SaveOptions(void) // register the weather option pages
int OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
// plugin options
diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp index 22c76a6169..d773ded4fb 100644 --- a/plugins/Weather/src/weather_userinfo.cpp +++ b/plugins/Weather/src/weather_userinfo.cpp @@ -33,7 +33,7 @@ information // lParam = current contact
int UserInfoInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.position = 100000000;
odp.ptszTitle = _T(WEATHERPROTONAME);
diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index 1e4d2b8cdd..e040bac561 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -303,7 +303,7 @@ void CALLBACK Countdownfunc(HWND, UINT, UINT_PTR, DWORD) static int OptInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
odp.ptszGroup = LPGENT("Network");
diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index 24858892f9..3f078ea11d 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -42,7 +42,7 @@ static int OnTopToolBarModuleLoaded(WPARAM, LPARAM) static int OnOptionsInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WWI);
diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp index 7febec32e0..294372504a 100644 --- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp +++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp @@ -475,7 +475,7 @@ int InitTopToolbar(WPARAM,LPARAM) int OptionsInit(WPARAM wparam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 945000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index 47a432fdc5..4a5c831517 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -69,8 +69,7 @@ int protocolAck(WPARAM, LPARAM lParam) int dialogOptionsInitialise(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
-
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.ptszGroup = LPGENT("Speak");
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp index a1bbfa7eb9..b67dcfb15a 100644 --- a/plugins/XSoundNotify/src/options.cpp +++ b/plugins/XSoundNotify/src/options.cpp @@ -239,7 +239,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l INT OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index 8f6f0c062d..aed070df27 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -162,7 +162,7 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = YAMNVar.hInst;
odp.pszGroup = LPGEN("Network");
odp.pszTitle = LPGEN("YAMN");
diff --git a/plugins/YAPP/src/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp index 32298027df..1af80729c7 100644 --- a/plugins/YAPP/src/notify_imp.cpp +++ b/plugins/YAPP/src/notify_imp.cpp @@ -92,7 +92,7 @@ INT_PTR CALLBACK DlgProcPopups(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam int NotifyOptionsInitialize(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
odp.pszTitle = LPGEN("YAPP Popups");
diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp index 7f876ed288..5da4abb113 100644 --- a/plugins/YAPP/src/options.cpp +++ b/plugins/YAPP/src/options.cpp @@ -473,7 +473,7 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam int OptInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.flags = ODPF_BOLDGROUPS;
odp.position = -790000000;
odp.hInstance = hInst;
diff --git a/plugins/YARelay/src/options.cpp b/plugins/YARelay/src/options.cpp index fd73f25142..3215b2eb94 100644 --- a/plugins/YARelay/src/options.cpp +++ b/plugins/YARelay/src/options.cpp @@ -191,7 +191,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, */
int OptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.position = -1;
odp.pszGroup = LPGEN("Message sessions");
diff --git a/plugins/YahooGroups/src/hooked_events.cpp b/plugins/YahooGroups/src/hooked_events.cpp index c09ad2a71d..d213c0a719 100644 --- a/plugins/YahooGroups/src/hooked_events.cpp +++ b/plugins/YahooGroups/src/hooked_events.cpp @@ -53,7 +53,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) int OnOptionsInitialise(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp index 467b66356d..09e18df031 100644 --- a/plugins/ZeroNotification/src/main.cpp +++ b/plugins/ZeroNotification/src/main.cpp @@ -209,7 +209,7 @@ static INT_PTR CALLBACK DlgProcNoSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam //Called when the user opened the options dialog
static int OptionsInitialize(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_TCHAR;
diff --git a/plugins/mRadio/i_optdlg.inc b/plugins/mRadio/i_optdlg.inc index 20e8b86786..52df888dd8 100644 --- a/plugins/mRadio/i_optdlg.inc +++ b/plugins/mRadio/i_optdlg.inc @@ -620,7 +620,6 @@ var odp:TOPTIONSDIALOGPAGE;
begin
FillChar(odp,SizeOf(odp),0);
- odp.cbSize :=SizeOf(odp);
odp.flags :=ODPF_BOLDGROUPS;
odp.Position :=900003000;
odp.hInstance :=hInstance;
diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index c46259b5eb..5db4ffcf3b 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -405,7 +405,7 @@ xxx: int OptionsInit(WPARAM wparam,LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position=150000000;
odp.groupPosition=950000000;
odp.hInstance=hI;
diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp index cc7c1f693a..02294d8587 100644 --- a/protocols/AimOscar/src/ui.cpp +++ b/protocols/AimOscar/src/ui.cpp @@ -746,7 +746,7 @@ int CAimProto::OnUserInfoInit(WPARAM wParam,LPARAM lParam) {
if (!lParam)//hContact
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -1900000000;
odp.flags = ODPF_USERINFOTAB | ODPF_TCHAR;
odp.hInstance = hInstance;
@@ -1130,7 +1130,7 @@ static INT_PTR CALLBACK privacy_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP int CAimProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 1003000;
odp.hInstance = hInstance;
odp.ptszGroup = LPGENT("Network");
diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index 26f40d39ab..2186c18e55 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -281,7 +281,7 @@ INT_PTR CALLBACK EMPDlgProcMainOpts(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR int __cdecl EMPCreateOptionsDlg(WPARAM wParam,LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 100000000;
odp.hInstance = g_hInstance;
odp.pszTemplate = MAKEINTRESOURCE(IDD_EMP_FORM_OPT);
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index f3d5cdc222..009dfba478 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -491,7 +491,7 @@ int FacebookProto::OnPreShutdown(WPARAM, LPARAM) int FacebookProto::OnOptionsInit(WPARAM wParam, LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInstance; odp.ptszTitle = m_tszUserName; odp.dwInitParam = LPARAM(this); diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp index 89099c4fd1..053faf2bba 100644 --- a/protocols/GTalkExt/src/options.cpp +++ b/protocols/GTalkExt/src/options.cpp @@ -229,7 +229,7 @@ INT_PTR CALLBACK PopupsOptionsDlgProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM int OptionsInitialization(WPARAM wParam, LPARAM)
{
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.ptszTitle = MAIL_NOTIFICATIONS;
odp.pfnDlgProc = PopupsOptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPSETTINGS);
@@ -243,7 +243,7 @@ int OptionsInitialization(WPARAM wParam, LPARAM) LPCSTR szProto = g_accs[i]->m_pa->szModuleName;
PROTOACCOUNT *pa = ProtoGetAccount(szProto);
if (pa != NULL) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.ptszTitle = pa->tszAccountName;
odp.pfnDlgProc = AccOptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAILSETTINGS);
diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index 420ab088fe..88d5a1cd30 100644 --- a/protocols/Gadu-Gadu/src/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp @@ -153,7 +153,7 @@ static void SetValue(HWND hwndDlg, int idCtrl, MCONTACT hContact, char *szModule int GGPROTO::options_init(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.flags = ODPF_TCHAR; odp.position = 1003000; odp.hInstance = hInstance; @@ -933,7 +933,7 @@ int GGPROTO::details_init(WPARAM wParam, LPARAM lParam) pszTemplate = MAKEINTRESOURCEA(IDD_INFO_GG); } - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.flags = ODPF_DONTTRANSLATE | ODPF_TCHAR; odp.hInstance = hInstance; odp.pfnDlgProc = gg_detailsdlgproc; @@ -1025,13 +1025,13 @@ INT_PTR CALLBACK gg_acc_mgr_guidlgproc(HWND hwndDlg, UINT msg, WPARAM wParam, LP } } break; - case IDC_UIN:
+ case IDC_UIN: case IDC_PASSWORD: - case IDC_EMAIL:
- if (HIWORD(wParam) == EN_CHANGE && (HWND)lParam == GetFocus()) {
- SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
- break;
- }
+ case IDC_EMAIL: + if (HIWORD(wParam) == EN_CHANGE && (HWND)lParam == GetFocus()) { + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + break; + } } break; diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 21f13227e5..3900273b4e 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1658,7 +1658,6 @@ void CIgnorePrefsDlg::UpdateList() int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.cbSize = sizeof(odp);
odp.ptszTitle = m_tszUserName;
odp.ptszGroup = LPGENT("Network");
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp index ffcdbdc785..6ea082678e 100644 --- a/protocols/IRCG/src/userinfo.cpp +++ b/protocols/IRCG/src/userinfo.cpp @@ -208,7 +208,7 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam) db_free(&dbv);
}
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.flags = ODPF_DONTTRANSLATE;
odp.pszTitle = m_szModuleName;
odp.hIcon = NULL;
diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp index bbd19d4793..322019553f 100644 --- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp @@ -267,7 +267,7 @@ int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) if ((!IsICQContact(lParam)) && lParam)
return 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE;
odp.hInstance = hInst;
odp.dwInitParam = LPARAM(this);
diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index 1b7bcfadaf..c4a38e135c 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -523,7 +523,7 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -800000000;
odp.hInstance = hInst;
odp.ptszGroup = LPGENT("Network");
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index f935c44fdf..c36fd611c3 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -1507,7 +1507,6 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleRosterControl(WPARAM, LPARAM) int CJabberProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.cbSize = sizeof(odp);
odp.ptszGroup = LPGENT("Network");
odp.ptszTitle = m_tszUserName;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index 34b9ad249c..8f480a3075 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -812,7 +812,7 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) char *szProto = GetContactProto(hContact); if (szProto != NULL && !strcmp(szProto, m_szModuleName)) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.dwInitParam = (LPARAM)this; diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 0c277f266a..40afc18c2a 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -1188,7 +1188,7 @@ void CJabberProto::OnUserInfoInit_VCard(WPARAM wParam, LPARAM) m_bPhotoChanged = FALSE;
m_szPhotoFileName[0] = 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.dwInitParam = (LPARAM)this;
odp.flags = ODPF_TCHAR | ODPF_USERINFOTAB | ODPF_DONTTRANSLATE;
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index c95222ca4a..1b1eb5a148 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -128,7 +128,7 @@ INT_PTR CALLBACK MraPopupDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, LPAR int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM)
{
if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.dwInitParam = (LPARAM)this;
odp.position = 100000000;
odp.hInstance = g_hInstance;
diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index 5223b4c4ab..caba58dd7a 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -212,7 +212,7 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.dwInitParam = (LPARAM)this;
odp.hInstance = g_hInstance;
odp.ptszTitle = m_tszUserName;
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index a69cff522b..a05c96c4d7 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -616,7 +616,7 @@ INT_PTR CALLBACK DlgDeleteContactUI(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int CMsnProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN);
diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index 5dab83480b..ba156b0de6 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -183,7 +183,7 @@ int OmegleProto::OnModulesLoaded(WPARAM wParam,LPARAM lParam) int OmegleProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInstance;
odp.ptszTitle = m_tszUserName;
odp.dwInitParam = LPARAM(this);
diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp index 6aa4d2a4e6..f86fdbdd96 100644 --- a/protocols/Sametime/src/options.cpp +++ b/protocols/Sametime/src/options.cpp @@ -347,7 +347,7 @@ static INT_PTR CALLBACK DlgProcOptNet(HWND hwndDlg, UINT msg, WPARAM wParam, LPA int CSametimeProto::OptInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTNET);
diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp index de3dc10367..7d7acc1e96 100644 --- a/protocols/SkypeClassic/src/skypeopt.cpp +++ b/protocols/SkypeClassic/src/skypeopt.cpp @@ -47,11 +47,9 @@ static HBITMAP hAvatar = NULL; extern BOOL PopupServiceExists;
extern BOOL (WINAPI *MyEnableThemeDialogTexture)(HANDLE, DWORD);
-int RegisterOptions(WPARAM wParam, LPARAM) {
- OPTIONSDIALOGPAGE odp;
-
- memset(&odp, 0, sizeof(odp));
- odp.cbSize = sizeof(odp);
+int RegisterOptions(WPARAM wParam, LPARAM)
+{
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pszGroup = "Network";
@@ -732,10 +730,9 @@ INT_PTR CALLBACK OptionsDefaultDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L int OnDetailsInit( WPARAM wParam, LPARAM lParam )
{
- OPTIONSDIALOGPAGE odp = {0};
MCONTACT hContact = (MCONTACT)lParam;
- odp.cbSize = sizeof(odp);
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hIcon = NULL;
odp.hInstance = hInst;
diff --git a/protocols/Steam/src/steam_events.cpp b/protocols/Steam/src/steam_events.cpp index 7a31c566cd..2da994ebfc 100644 --- a/protocols/Steam/src/steam_events.cpp +++ b/protocols/Steam/src/steam_events.cpp @@ -36,18 +36,18 @@ INT_PTR CSteamProto::OnAccountManagerInit(WPARAM wParam, LPARAM lParam) int CSteamProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInstance; odp.ptszTitle = m_tszUserName; odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; odp.ptszGroup = LPGENT("Network"); odp.ptszTab = LPGENT("Account"); - odp.pDialog = new CSteamOptionsMain(this, IDD_OPT_MAIN);
+ odp.pDialog = new CSteamOptionsMain(this, IDD_OPT_MAIN); Options_AddPage(wParam, &odp); odp.ptszTab = LPGENT("Blocked contacts"); - odp.pDialog = new CSteamOptionsBlockList(this);
+ odp.pDialog = new CSteamOptionsBlockList(this); Options_AddPage(wParam, &odp); return 0; } diff --git a/protocols/Tlen/src/tlen_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp index ead41cad56..6442ecf019 100644 --- a/protocols/Tlen/src/tlen_opt.cpp +++ b/protocols/Tlen/src/tlen_opt.cpp @@ -84,7 +84,7 @@ static void MarkChanges(int i, HWND hWnd) { int TlenProtocol::OptionsInit(WPARAM wParam, LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.ptszGroup = LPGENT("Network"); odp.ptszTitle = m_tszUserName; diff --git a/protocols/Tlen/src/tlen_userinfo.cpp b/protocols/Tlen/src/tlen_userinfo.cpp index 80304d0ddb..dc1414196d 100644 --- a/protocols/Tlen/src/tlen_userinfo.cpp +++ b/protocols/Tlen/src/tlen_userinfo.cpp @@ -133,7 +133,7 @@ int TlenProtocol::UserInfoInit(WPARAM wParam, LPARAM lParam) MCONTACT hContact = (MCONTACT) lParam;
char *szProto = GetContactProto(hContact);
if ((szProto != NULL && !strcmp(szProto, m_szModuleName)) || !lParam) {
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.flags = ODPF_TCHAR;
odp.pfnDlgProc = TlenUserInfoDlgProc;
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 1bdd3f9f1b..91b19d317a 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -511,7 +511,6 @@ void CToxOptionsNodeList::OnApply() int CToxProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.cbSize = sizeof(odp);
odp.ptszTitle = m_tszUserName;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
odp.ptszGroup = LPGENT("Network");
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 20cfcc14c5..b7e32117dc 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -290,7 +290,7 @@ int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM) int TwitterProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 271828;
odp.hInstance = g_hInstance;
odp.ptszGroup = LPGENT("Network");
diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index f2da107e70..e87594c40f 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -615,7 +615,7 @@ INT_PTR CALLBACK CVkProto::OptionsViewProc(HWND hwndDlg, UINT uMsg, WPARAM wPara int CVkProto::OnOptionsInit(WPARAM wParam, LPARAM)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.ptszTitle = m_tszUserName;
odp.dwInitParam = LPARAM(this);
diff --git a/protocols/WhatsApp/src/dialogs.cpp b/protocols/WhatsApp/src/dialogs.cpp index ca55809538..67832c93ee 100644 --- a/protocols/WhatsApp/src/dialogs.cpp +++ b/protocols/WhatsApp/src/dialogs.cpp @@ -100,7 +100,7 @@ INT_PTR WhatsAppProto::SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam) int WhatsAppProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.ptszTitle = m_tszUserName;
odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;
odp.ptszGroup = LPGENT("Network");
diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp index 0095be37d5..1e5813467b 100644 --- a/protocols/Xfire/src/options.cpp +++ b/protocols/Xfire/src/options.cpp @@ -1092,7 +1092,7 @@ int OptInit(WPARAM wParam, LPARAM) { ghwndDlg2 = NULL; - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hinstance; odp.ptszTitle = LPGENT("XFire"); odp.ptszGroup = LPGENT("Network"); diff --git a/protocols/Xfire/src/userdetails.cpp b/protocols/Xfire/src/userdetails.cpp index 0279678928..2b3cdb9681 100644 --- a/protocols/Xfire/src/userdetails.cpp +++ b/protocols/Xfire/src/userdetails.cpp @@ -422,7 +422,7 @@ int OnDetailsInit(WPARAM wParam, LPARAM lParam) if (!IsXFireContact(lParam))
return 0;
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hinstance;
odp.pfnDlgProc = DlgProcUserDetails;
odp.position = -1900000000;
diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp index d1d928c349..e157362e95 100644 --- a/protocols/Yahoo/src/options.cpp +++ b/protocols/Yahoo/src/options.cpp @@ -362,7 +362,7 @@ static INT_PTR CALLBACK DlgProcYahooOptsIgnore(HWND hwndDlg, UINT msg, WPARAM wP int __cdecl CYahooProto::OnOptionsInit(WPARAM wParam,LPARAM) { - OPTIONSDIALOGPAGE odp = { sizeof(odp) }; + OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -790000000; odp.hInstance = hInstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_YAHOO); diff --git a/protocols/Yahoo/src/user_info.cpp b/protocols/Yahoo/src/user_info.cpp index 40a035284c..cb5cf88283 100644 --- a/protocols/Yahoo/src/user_info.cpp +++ b/protocols/Yahoo/src/user_info.cpp @@ -113,7 +113,7 @@ static INT_PTR CALLBACK YahooUserInfoDlgProc( HWND hwndDlg, UINT msg, WPARAM wPa int __cdecl CYahooProto::OnUserInfoInit( WPARAM wParam, LPARAM lParam )
{
- OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInstance;
odp.dwInitParam = (LPARAM)this;
odp.flags = ODPF_TCHAR | ODPF_DONTTRANSLATE;
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);
|