diff options
Diffstat (limited to 'ping')
| -rw-r--r-- | ping/options.cpp | 35 | ||||
| -rw-r--r-- | ping/ping_8.vcproj | 2 | ||||
| -rw-r--r-- | ping/pingthread.cpp | 14 |
3 files changed, 19 insertions, 32 deletions
diff --git a/ping/options.cpp b/ping/options.cpp index 56e2d69..7da7639 100644 --- a/ping/options.cpp +++ b/ping/options.cpp @@ -539,36 +539,23 @@ static BOOL CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM int PingOptInit(WPARAM wParam,LPARAM lParam)
{
-#define OPTIONPAGE_OLD_SIZE2 60
- DWORD mirVir = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0);
-
OPTIONSDIALOGPAGE odp = { 0 };
- //odp.cbSize = sizeof(odp);
- odp.cbSize = (mirVir >= 0x00060000 ? sizeof(odp) : OPTIONPAGE_OLD_SIZE2);
- odp.position = -790000000;
+ odp.cbSize = sizeof(odp);
odp.hInstance = hInst;
- odp.pszTemplate = MAKEINTRESOURCE(IDD_DIALOG1);
- odp.pszTitle = Translate("PING");
- odp.pszGroup = Translate("Network");
odp.flags = ODPF_BOLDGROUPS;
- odp.nIDBottomSimpleControl = 0;
+ odp.pszGroup = "Network";
+ odp.pszTitle = "PING";
+
+ odp.pszTab = "Settings";
+ odp.pszTemplate = MAKEINTRESOURCE(IDD_DIALOG1);
odp.pfnDlgProc = DlgProcOpts;
- odp.pszTab = Translate("Settings");
CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp );
- OPTIONSDIALOGPAGE odp2 = { 0 };
- //odp.cbSize = sizeof(odp);
- odp2.cbSize = (mirVir >= 0x00060000 ? sizeof(odp) : OPTIONPAGE_OLD_SIZE2);
- odp2.position = -790000100;
- odp2.hInstance = hInst;
- odp2.pszTemplate = MAKEINTRESOURCE(IDD_DIALOG2);
- odp2.pszTitle = (mirVir >= 0x00060000 ? Translate("PING") : Translate("PING Hosts"));
- odp2.pszGroup = Translate("Network");
- odp2.flags = ODPF_BOLDGROUPS;
- odp2.nIDBottomSimpleControl = 0;
- odp2.pfnDlgProc = DlgProcOpts2;
- odp2.pszTab = Translate("Hosts");
- CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp2 );
+ odp.pszTab = "Hosts";
+ odp.pszTemplate = MAKEINTRESOURCE(IDD_DIALOG2);
+ odp.pfnDlgProc = DlgProcOpts2;
+ CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp );
+
return 0;
}
diff --git a/ping/ping_8.vcproj b/ping/ping_8.vcproj index 6f08f14..a234b86 100644 --- a/ping/ping_8.vcproj +++ b/ping/ping_8.vcproj @@ -78,7 +78,6 @@ Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies="user32.lib gdi32.lib ws2_32.lib shell32.lib comdlg32.lib"
- OutputFile="../../bin/debug/plugins/pingplug.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
@@ -180,7 +179,6 @@ <Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib wsock32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib"
- OutputFile="../../bin/release/plugins/pingplug.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateManifest="true"
diff --git a/ping/pingthread.cpp b/ping/pingthread.cpp index 3c6b2c9..6623b51 100644 --- a/ping/pingthread.cpp +++ b/ping/pingthread.cpp @@ -746,19 +746,21 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return TRUE;
case ID_MENU_OPTIONS:
{
- OPENOPTIONSDIALOG oop;
+ OPENOPTIONSDIALOG oop = {0};
oop.cbSize = sizeof(oop);
- oop.pszGroup = Translate("Network");
- oop.pszPage = Translate("PING");
+ oop.pszGroup = "Network";
+ oop.pszPage = "PING";
+ oop.pszTab = "Settings";
CallService(MS_OPT_OPENOPTIONS, 0, (WPARAM)&oop);
}
return TRUE;
case ID_MENU_DESTINATIONS:
{
- OPENOPTIONSDIALOG oop;
+ OPENOPTIONSDIALOG oop = {0};
oop.cbSize = sizeof(oop);
- oop.pszGroup = Translate("Network");
- oop.pszPage = Translate("PING Hosts");
+ oop.pszGroup = "Network";
+ oop.pszPage = "PING";
+ oop.pszTab = "Hosts";
CallService(MS_OPT_OPENOPTIONS, 0, (WPARAM)&oop);
}
return TRUE;
|