From 0834e40bd7444ba1f1770c60b387cf513b279a4b Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 25 Jun 2012 01:33:02 -0400 Subject: [PATCH] Windows: Remove HELP from afscreds The old .hlp format is no longer supported and the text of the help files is long out of date. Remove the HELP buttons from the dialogs and all references to WM_HELP message processing from the application. Change-Id: I4c735993c7a79d46cbbc49440aa6d77b6861ff85 Reviewed-on: http://gerrit.openafs.org/7648 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/client_creds/advtab.cpp | 4 ---- src/WINNT/client_creds/afscreds.h | 1 - src/WINNT/client_creds/afswiz.cpp | 5 ----- src/WINNT/client_creds/credstab.cpp | 13 ----------- src/WINNT/client_creds/lang/en_US/afscreds.rc | 22 +++++++++---------- src/WINNT/client_creds/main.cpp | 5 ----- src/WINNT/client_creds/mounttab.cpp | 8 ------- 7 files changed, 11 insertions(+), 47 deletions(-) diff --git a/src/WINNT/client_creds/advtab.cpp b/src/WINNT/client_creds/advtab.cpp index 7c38f100b..ba1703b86 100644 --- a/src/WINNT/client_creds/advtab.cpp +++ b/src/WINNT/client_creds/advtab.cpp @@ -82,10 +82,6 @@ BOOL CALLBACK Advanced_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) break; } break; - - case WM_HELP: - WinHelp (hDlg, g.szHelpFile, HELP_CONTEXT, IDH_AFSCREDS_TAB_ADVANCED); - break; } return FALSE; } diff --git a/src/WINNT/client_creds/afscreds.h b/src/WINNT/client_creds/afscreds.h index 01564d611..4fe11c9f6 100644 --- a/src/WINNT/client_creds/afscreds.h +++ b/src/WINNT/client_creds/afscreds.h @@ -87,7 +87,6 @@ typedef struct LPWIZARD pWizard; BOOL fStartup; BOOL fIsWinNT; - TCHAR szHelpFile[ MAX_PATH ]; osi_mutex_t expirationCheckLock; osi_mutex_t credsLock; TCHAR SmbName[ MAXRANDOMNAMELEN ]; diff --git a/src/WINNT/client_creds/afswiz.cpp b/src/WINNT/client_creds/afswiz.cpp index 02baf20d0..8d231170c 100644 --- a/src/WINNT/client_creds/afswiz.cpp +++ b/src/WINNT/client_creds/afswiz.cpp @@ -136,11 +136,6 @@ BOOL CALLBACK WizCommon_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) break; } break; - - case WM_HELP: - if (l.idh) - WinHelp (GetParent(hDlg), g.szHelpFile, HELP_CONTEXT, l.idh); - break; } return FALSE; } diff --git a/src/WINNT/client_creds/credstab.cpp b/src/WINNT/client_creds/credstab.cpp index 6aa366170..0b6b71618 100644 --- a/src/WINNT/client_creds/credstab.cpp +++ b/src/WINNT/client_creds/credstab.cpp @@ -75,15 +75,6 @@ BOOL CALLBACK Creds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) break; } break; - - case WM_HELP: - if (IsWindow (GetDlgItem (hDlg, IDC_CREDS_REMIND))) - WinHelp (hDlg, g.szHelpFile, HELP_CONTEXT, IDH_AFSCREDS_TAB_TOKENS); - else if (IsServiceRunning()) - WinHelp (hDlg, g.szHelpFile, HELP_CONTEXT, IDH_AFSCREDS_TAB_NOTOKENS_RUNNING); - else // (!IsServiceRunning()) - WinHelp (hDlg, g.szHelpFile, HELP_CONTEXT, IDH_AFSCREDS_TAB_NOTOKENS_STOPPED); - break; } return FALSE; @@ -292,10 +283,6 @@ BOOL CALLBACK NewCreds_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) break; } break; - - case WM_HELP: - WinHelp (hDlg, g.szHelpFile, HELP_CONTEXT, IDH_AFSCREDS_NEWTOKENS); - break; } return FALSE; } diff --git a/src/WINNT/client_creds/lang/en_US/afscreds.rc b/src/WINNT/client_creds/lang/en_US/afscreds.rc index 709ce4e6a..ccdfc8257 100644 --- a/src/WINNT/client_creds/lang/en_US/afscreds.rc +++ b/src/WINNT/client_creds/lang/en_US/afscreds.rc @@ -93,10 +93,10 @@ CAPTION "AFS Client" CLASS "AfsCreds" FONT 9, "MS Shell Dlg" BEGIN - RTEXT "AFS Version %s (patch %lu)",IDC_TITLE_VERSION,210,8,90, + RTEXT "Version %s (patch %lu)",IDC_TITLE_VERSION,210,8,90, 8 - LTEXT "Currently logged on to Windows Networking as ""%s""", - IDC_TITLE_NT,7,8,203,8 +// LTEXT "Currently logged on to Windows Networking as ""%s""", +// IDC_TITLE_NT,7,8,203,8 CONTROL "",IDC_TABS,"SysTabControl32",0x0,7,27,293,97 END @@ -113,7 +113,7 @@ BEGIN 51,43,193,10 PUSHBUTTON "&Obtain New Tokens...",IDC_CREDS_OBTAIN,51,63,88,14 PUSHBUTTON "&Discard These Tokens",IDC_CREDS_DESTROY,142,63,92,14 - PUSHBUTTON "Help",9,237,63,45,14 +// PUSHBUTTON "Help",9,237,63,45,14 END IDD_TAB_NOCREDS DIALOG DISCARDABLE 0, 0, 289, 81 @@ -124,7 +124,7 @@ BEGIN IDC_RUNNING,7,9,275,8 LTEXT "The AFS Client is not configured properly, or the AFS Client service is not running.\n\nUse the Advanced tab to start the AFS Client service.", IDC_STOPPED,7,9,275,25 - PUSHBUTTON "Help",9,237,63,45,14 +// PUSHBUTTON "Help",9,237,63,45,14 PUSHBUTTON "&Obtain New Tokens...",IDC_CREDS_OBTAIN,51,63,88,14 END @@ -142,7 +142,7 @@ BEGIN CONTROL "&Always show the AFS Client icon in the taskbar", IDC_STARTUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,65, 204,10 - PUSHBUTTON "Help",9,237,63,45,14 +// PUSHBUTTON "Help",9,237,63,45,14 END IDD_NEWCREDS DIALOG DISCARDABLE 0, 0, 232, 127 @@ -161,7 +161,7 @@ BEGIN ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,69,106,50,14 PUSHBUTTON "Cancel",IDCANCEL,122,106,50,14 - PUSHBUTTON "Help",9,175,106,50,14 +// PUSHBUTTON "Help",9,175,106,50,14 END IDD_NEWCREDS_EXPIRE DIALOG DISCARDABLE 0, 0, 232, 155 @@ -182,7 +182,7 @@ BEGIN IDC_NEWCREDS_TITLE,7,7,218,16 DEFPUSHBUTTON "OK",IDOK,69,134,50,14 PUSHBUTTON "Cancel",IDCANCEL,122,134,50,14 - PUSHBUTTON "Help",9,175,134,50,14 +// PUSHBUTTON "Help",9,175,134,50,14 END IDD_TAB_MOUNT DIALOG DISCARDABLE 0, 0, 289, 81 @@ -198,7 +198,7 @@ BEGIN LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_USETABSTOPS |LBS_NOINTEGRALHEIGHT | WS_TABSTOP, 51,21,231,37 - PUSHBUTTON "Help",9,237,63,45,14 +// PUSHBUTTON "Help",9,237,63,45,14 END IDD_WIZARD DIALOGEX 0, 0, 272, 152 @@ -212,7 +212,7 @@ BEGIN CONTROL "",IDC_LHS,"Static",SS_BLACKFRAME,7,7,76,112 CONTROL "",IDC_RHS,"Static",SS_BLACKFRAME,91,7,174,112 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,125,258,1 - PUSHBUTTON "&Help",9,59,131,50,14 +// PUSHBUTTON "&Help",9,59,131,50,14 PUSHBUTTON "< &Back",IDBACK,112,131,50,14 END @@ -364,7 +364,7 @@ BEGIN 73,105,185,10 DEFPUSHBUTTON "OK",IDOK,112,131,50,14 PUSHBUTTON "Cancel",IDCANCEL,165,131,50,14 - PUSHBUTTON "Help",9,218,131,50,14 +// PUSHBUTTON "Help",9,218,131,50,14 END diff --git a/src/WINNT/client_creds/main.cpp b/src/WINNT/client_creds/main.cpp index 7f3078a70..1aaf481d9 100644 --- a/src/WINNT/client_creds/main.cpp +++ b/src/WINNT/client_creds/main.cpp @@ -245,11 +245,6 @@ BOOL InitApp (LPSTR pszCmdLineA) if (GetVersionEx (&Version)) g.fIsWinNT = (Version.dwPlatformId == VER_PLATFORM_WIN32_NT) ? TRUE : FALSE; - if (!g.fIsWinNT) - lstrcpy (g.szHelpFile, TEXT("afs-light.hlp")); - else - lstrcpy (g.szHelpFile, TEXT("afs-nt.hlp")); - // Initialize winsock etc // WSADATA Data; diff --git a/src/WINNT/client_creds/mounttab.cpp b/src/WINNT/client_creds/mounttab.cpp index 8e9f2ec6a..bda79d8c3 100644 --- a/src/WINNT/client_creds/mounttab.cpp +++ b/src/WINNT/client_creds/mounttab.cpp @@ -98,10 +98,6 @@ BOOL CALLBACK Mount_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) break; } break; - - case WM_HELP: - WinHelp (hDlg, g.szHelpFile, HELP_CONTEXT, IDH_AFSCREDS_TAB_DRIVES); - break; } return FALSE; } @@ -383,10 +379,6 @@ BOOL CALLBACK Mapping_DlgProc (HWND hDlg, UINT msg, WPARAM wp, LPARAM lp) break; } break; - - case WM_HELP: - WinHelp (hDlg, g.szHelpFile, HELP_CONTEXT, IDH_AFSCREDS_MAPDRIVE); - break; } return FALSE; } -- 2.39.5