From b9feb10aac946bfe7d6dc7e0ef877e32f38f7ea3 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 20 Mar 2006 23:23:33 +0000 Subject: This commit updates: + the HTMLHelp formatted documentation + the build system to produce separate binaries for Windows 2000 and Windows XP and beyond. Separate binaries are required because we make heavy use of some of the UI features found in XP that don't exist in 2000. If we build only for XP then the binaries won't run on 2000 and if we build for 2000, then the functionality we desire for balloon text and the tracker windows does not work properly on XP or above. (Note for Vista we will need to build three sets of binaries if we want to take advantage of the new functionality that is available only there.) + Add more debugging to the krb4 plug-in and ensure that all checkboxes are initialized. + remove plugins/krb5/krb5util.c which is an unused file + Use mixed case for Alt, Ctrl and Shift text designators + Increment the build number to 1.1.0.1 + Plug a memory leak when dialogs are closed + Add a new Options->Appearance configuration page that can be used to allow user customized font selection. This page will also be used for custom color selection in a future release. ticket: new git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17752 dc483132-0cff-0310-8789-dd5450dbe970 --- src/windows/identity/Makefile | 9 +- src/windows/identity/config/Makefile | 9 + src/windows/identity/config/Makefile.w2k | 290 +++++ src/windows/identity/config/Makefile.w32 | 19 +- src/windows/identity/doc/netidmgr.doc | Bin 1199616 -> 1480192 bytes src/windows/identity/help/Makefile | 3 + src/windows/identity/help/html/act_new_creds.htm | 24 +- src/windows/identity/help/html/act_renew_creds.htm | 27 +- src/windows/identity/help/html/act_set_default.htm | 11 +- .../identity/help/html/concept_cred_pro.htm | 11 +- .../identity/help/html/concept_ident_pro.htm | 11 +- .../identity/help/html/concept_identity.htm | 6 +- src/windows/identity/help/html/concepts.htm | 28 +- src/windows/identity/help/html/copyright.htm | 2 +- src/windows/identity/help/html/howdoi.htm | 7 + .../identity/help/html/images/screen_menu_bar.bmp | Bin 12374 -> 15330 bytes .../help/html/images/screen_menu_credential.bmp | Bin 129846 -> 153574 bytes .../identity/help/html/images/screen_menu_file.bmp | Bin 36838 -> 48334 bytes .../identity/help/html/images/screen_menu_help.bmp | Bin 51414 -> 74574 bytes .../help/html/images/screen_menu_options.bmp | Bin 29494 -> 97638 bytes .../identity/help/html/images/screen_menu_view.bmp | Bin 64854 -> 52054 bytes src/windows/identity/help/html/menu_all.htm | 10 +- src/windows/identity/help/html/menu_credential.htm | 16 +- src/windows/identity/help/html/menu_file.htm | 4 +- src/windows/identity/help/html/menu_help.htm | 19 +- src/windows/identity/help/html/menu_options.htm | 39 +- src/windows/identity/help/html/menu_view.htm | 36 +- src/windows/identity/help/html/use_start.htm | 8 +- src/windows/identity/help/html/using.htm | 7 +- src/windows/identity/help/toc.hhc | 11 +- src/windows/identity/nidmgrdll/Makefile.w2k | 120 ++ src/windows/identity/plugins/krb4/krb4newcreds.c | 16 +- src/windows/identity/plugins/krb5/krb5util.c | 1362 -------------------- src/windows/identity/ui/Makefile | 3 +- src/windows/identity/ui/Makefile.w2k | 91 ++ src/windows/identity/ui/cfg_appear_wnd.c | 435 +++++++ src/windows/identity/ui/cfg_general_wnd.c | 7 + src/windows/identity/ui/configwnd.c | 10 + src/windows/identity/ui/configwnd.h | 6 + src/windows/identity/ui/credwnd.c | 348 +++-- src/windows/identity/ui/credwnd.h | 5 + src/windows/identity/ui/lang/en_us/khapp.rc | 50 + src/windows/identity/ui/mainwnd.c | 9 + src/windows/identity/ui/notifier.c | 24 +- src/windows/identity/ui/resource.h | 21 +- src/windows/identity/uilib/Makefile.w2k | 62 + src/windows/identity/uilib/action.c | 7 +- src/windows/identity/uilib/actions.csv | 1 + src/windows/identity/uilib/khactiondef.h | 2 + 49 files changed, 1642 insertions(+), 1544 deletions(-) create mode 100644 src/windows/identity/config/Makefile.w2k create mode 100644 src/windows/identity/nidmgrdll/Makefile.w2k delete mode 100644 src/windows/identity/plugins/krb5/krb5util.c create mode 100644 src/windows/identity/ui/Makefile.w2k create mode 100644 src/windows/identity/ui/cfg_appear_wnd.c create mode 100644 src/windows/identity/uilib/Makefile.w2k (limited to 'src') diff --git a/src/windows/identity/Makefile b/src/windows/identity/Makefile index d0ff8891a..b3028458e 100644 --- a/src/windows/identity/Makefile +++ b/src/windows/identity/Makefile @@ -39,15 +39,19 @@ MODULE=all #RMAKE=$(MAKECMD) /nologo all KH_NO_WX=1 RMAKE=$(MAKECMD) /nologo all +RMAKE_W2K=$(MAKECMD) /nologo all KHBUILD_W2K=1 !else RMAKE=$(MAKECMD) /nologo etag +RMAKE_W2K=$(MAKECMD) /nologo etag KHBUILD_W2K=1 !endif !else RMAKE=$(MAKECMD) /nologo test +RMAKE_W2K=$(MAKECMD) /nologo test KHBUILD_W2K=1 !endif !else RMAKE=$(MAKECMD) /nologo clean +RMAKE_W2K=$(MAKECMD) /nologo clean KHBUILD_W2K=1 !endif start: @@ -119,6 +123,7 @@ uilib: help $(ECHO) -- Entering $@: $(CD) $@ $(RMAKE) + $(RMAKE_W2K) $(CD) .. $(ECHO) -- Done with $@ @@ -126,6 +131,7 @@ nidmgrdll: uilib $(ECHO) -- Entering $@ $(CD) $@ $(RMAKE) + $(RMAKE_W2K) $(CD) .. $(ECHO) -- Done with $@ @@ -133,6 +139,7 @@ ui: nidmgrdll $(ECHO) -- Entering $@: $(CD) $@ $(RMAKE) + $(RMAKE_W2K) $(CD) .. $(ECHO) -- Done with $@ @@ -173,7 +180,7 @@ afsplugin: plugincommon $(ECHO) -- Done with $@ !endif -finale: krb5plugin doc +finale: krb5plugin $(ECHO) -- Done. pdoc: diff --git a/src/windows/identity/config/Makefile b/src/windows/identity/config/Makefile index 5e242824b..f1ac2ac67 100644 --- a/src/windows/identity/config/Makefile +++ b/src/windows/identity/config/Makefile @@ -72,6 +72,15 @@ mkalldirs: ! endif ! if !exist($(DOCDIR)) -$(MKDIR) $(DOCDIR) +! endif +! if !exist($(OBJDIR)\W2K) + -$(MKDIR) $(OBJDIR)\W2K +! endif +! if !exist($(BINDIR)\W2K) + -$(MKDIR) $(BINDIR)\W2K +! endif +! if !exist($(LIBDIR)\W2K) + -$(MKDIR) $(LIBDIR)\W2K ! endif $(ECHO) Done creating directories. diff --git a/src/windows/identity/config/Makefile.w2k b/src/windows/identity/config/Makefile.w2k new file mode 100644 index 000000000..81c33546a --- /dev/null +++ b/src/windows/identity/config/Makefile.w2k @@ -0,0 +1,290 @@ +# +# Khimaira : Win32 configuration makefile +# This file will be included by all the makefiles +# in the build tree. +# +# Copyright (c) 2004,2005 Massachusetts Institute of Technology +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +!ifndef KHIMAIRA_WIN32_CONFIG +KHIMAIRA_WIN32_CONFIG=1 + +# Environment Variables +# The following environment variables MUST be set: +# KH_ROOT : Root of the source tree. +# KH_BUILD: One of DEBUG or RETAIL +# +# The following environment variables are optional: +# KH_RUNTIME: One of STATIC or DLL, specifies whether the CRT libs +# are linked statically or through MSVCRT.DLL. +# KH_AUXCFLAGS: Optional flags for CL +# KH_RELEASE: Release type. One of OFFICIAL, PRERELEASE, PRIVATE or SPECIAL. +# OFFICIAL : An official release of Khimaira +# PREPRELEASE: A beta/release candidate release +# PRIVATE : Private build +# SPECIAL : Special build. Typically one with non-mainline patches. + +# Version info +NETIDMGR_VERSION_MAJOR=1 +NETIDMGR_VERSION_MINOR=1 +NETIDMGR_VERSION_PATCH=0 +NETIDMGR_VERSION_AUX=1 +NETIDMGR_RELEASEDESC= + +# The API version. This number must be incremented each time the API +# changes. Plugins specify the version of the API that they were +# compiled against and the Module Manager uses the API numbers to +# decide whether the plugin is safe to load or not. +# +# Changes to the API version numbers should be documented in +# apiversion.txt at the root of the source tree. +NETIDMGR_VERSION_API=5 + +# Minimum backwards compatible version. API versions from +# NETIDMGR_VERSION_API_MINCOMPAT through NETIDMGR_VERSION_API +# inclusive, are compatible with this version. +NETIDMGR_VERSION_API_MINCOMPAT=5 + +NETIDMGR_VERSION=$(NETIDMGR_VERSION_MAJOR).$(NETIDMGR_VERSION_MINOR).$(NETIDMGR_VERSION_PATCH).$(NETIDMGR_VERSION_AUX) +NETIDMGR_VERSIONC=$(NETIDMGR_VERSION_MAJOR),$(NETIDMGR_VERSION_MINOR),$(NETIDMGR_VERSION_PATCH),$(NETIDMGR_VERSION_AUX) + +# Source information +NETIDMGR_SRC_COMPANY_1033=Massachusetts Institute of Technology +NETIDMGR_SRC_COPYRIGHT_1033=(C) 2005 Massachusetts Institute of Technology + +# Choose the default build type if one is not set +!if ("$(KH_BUILD)" != "DEBUG") && ("$(KH_BUILD)" != "RETAIL") +! if defined(NODEBUG) && "$(NODEBUG)"=="1" +KH_BUILD=RETAIL +! else +KH_BUILD=DEBUG +! endif +!endif + +!if "$(KH_BUILD)"=="DEBUG" && defined(NODEBUG) && "$(NODEBUG)"=="1" +! error The Khimaira build configuration is set for DEBUG while the Platform SDK build environment is set to RETAIL. +!endif + +# The default release type is PRIVATE is no other type is specified +!if ("$(KH_RELEASE)" != "OFFICIAL") && ("$(KH_RELEASE)" != "PRERELEASE") && ("$(KH_RELEASE)" != "PRIVATE") && ("$(KH_RELEASE)" != "SPECIAL") +KH_RELEASE=PRIVATE +!endif + +# Actual build environment settings + +# See what compiler we are using +# TODO: Update this to support other compilers +!if defined(MSVCVer) && "$(MSVCVer)"=="8.0" +KH_CLVER=vc8 +!else +KH_CLVER=vc7 +!endif + +# Check for required env vars +!ifndef MODULE +! error MODULE must be specified +!endif +!ifndef KH_ROOT +! ifndef PISMERE +! error Either KH_ROOT or PISMERE must be defined +! else +KH_ROOT=$(PISMERE)\athena\auth\krb5\src\windows\identity +! endif +!endif + +!ifdef NODEBUG +OUTPRE_DBG=rel +!else +OUTPRE_DBG=dbg +!endif +OUTPRE1=obj +OUTPRE2=$(OUTPRE1)\$(CPU) +OUTPRE3=$(OUTPRE2)\$(OUTPRE_DBG) +OUTPRE=$(OUTPRE3)^\ + + + +# Output directory structure +DESTROOT=$(KH_ROOT)\obj +OBJROOT=$(KH_ROOT)\obj +SRC=$(KH_ROOT) + +DESTDIR=$(DESTROOT)\$(CPU)\$(OUTPRE_DBG) +OBJDIR=$(OBJROOT)\$(CPU)\$(OUTPRE_DBG) + +OBJ=$(OBJDIR)\$(MODULE) +INCDIR=$(DESTDIR)\inc +#BINDIR=$(DESTDIR)\bin +BINDIR=$(KH_ROOT)\$(OUTPRE)\W2K +#LIBDIR=$(DESTDIR)\lib +LIBDIR=$(KH_ROOT)\$(OUTPRE)\W2K +DOCDIR=$(DESTDIR)\doc + +# Source directories +CONFDIR=$(SRC)\config + +# Setup environment for win32.mak + +!if "$(KH_BUILD)" == "RETAIL" +NODEBUG=1 +!endif + +# Win32.mak +APPVER=5.0 +TARGETOS=WINNT +_WIN32_IE=0x0500 +_WIN32_WINNT=0x0500 +!include + +# Program macros + +CD=cd +RM=del /q +MKDIR=mkdir +RMDIR=rmdir +ECHO=echo +MAKECMD=nmake /nologo +CP=copy /y +LINK=link +CCSV=perl $(SRC)\config\ccsv.pl +MC=mc + +!ifdef KH_DOXYFULLPATH +DOXYGEN=$(KH_DOXYFULLPATH) +!else +DOXYGEN=doxygen +!endif + +!ifdef KH_HHCFULLPATH +HHC=$(KH_HHCFULLPATH) +!else +HHC=hhc +!endif + +!ifdef KH_KFWPATH +KFWINCDIR=$(KH_KFWPATH)\inc +kfwincflags = -I$(KFWINCDIR)\krb5 -I$(KFWINCDIR)\krb5\KerberosIV -I$(KFWINCDIR)\krb4 -I$(KFWINCDIR)\loadfuncs -I$(KFWINCDIR) +KFWLIBDIR=$(KH_KFWPATH)\lib\$(CPU) +!else if defined(PISMERE) +KFWINCDIR=$(PISMERE)\athena\auth\krb5\src\include +kfwincflags = -I$(KFWINCDIR) -I$(PISMERE)\athena\util\loadfuncs -I$(PISMERE)\athena\auth\krb5\src\include\kerberosIV -I$(PISMERE)\athena\auth\krb4\include +KFWLIBDIR=$(PISMERE)\target\lib\$(CPU)\$(OUTPRE_DBG) +!endif + +!ifdef KH_AFSPATH +AFSINCDIR=$(KH_AFSPATH)\include +AFSLIBDIR=$(KH_AFSPATH)\lib +afsincflags=-I$(AFSINCDIR) +!endif + +#EXTLIBDIR=$(SRC)\ext-lib\$(CPU) +#EXTINCDIR=-I$(SRC)\ext-inc + +incflags= -I$(INCDIR) -I$(SRC)\include -I. -I$(OBJ) $(kfwincflags) $(afsincflags) +rincflags= /i $(INCDIR) /i $(SRC)\include /i . +khdefines=-DUNICODE -D_UNICODE +khcwarn=/Wp64 +!ifndef KH_NO_WX +khcwarn=$(khcwarn) /WX +!endif + +#DEBUG_SYMBOLS +ldebug=$(ldebug) /DEBUG +cdebug=$(cdebug) -Os -Zi + +khcflags=$(cdebug) $(cflags) $(incflags) $(khdefines) $(khcwarn) +khlguiflags=$(ldebug) $(guilflags) +khlconflags=$(ldebug) $(conlflags) +khldllguiflags=$(ldebug) $(dlllflags) +khldllconflags=$(ldebug) $(dlllflags) + +!if "$(KH_RUNTIME)" == "STATIC" +khcflags=$(khcflags) $(cvarsmt) +khlguiflags=$(khlguiflags) $(guilibsmt) +khlconflags=$(khlconflags) $(conlibsmt) +khldllguiflags=$(khldllguiflags) $(guilibsmt) +khldllconflags=$(khldllconflags) $(conlibsmt) +!else +khcflags=$(khcflags) $(cvarsdll) +khlguiflags=$(khlguiflags) $(guilibsdll) +khlconflags=$(khlconflags) $(conlibsdll) +khldllguiflags=$(khldllguiflags) $(guilibsdll) +khldllconflags=$(khldllconflags) $(conlibsdll) +!endif + +C2OBJ=$(CC) $(khcflags) $(KH_AUXCFLAGS) /Fo"$@" /c $** + +EXECONLINK=$(LINK) /NOLOGO $(khlconflags) /OUT:$@ $** + +EXEGUILINK=$(LINK) /NOLOGO $(khlguiflags) /OUT:$@ $** + +DLLCONLINK=$(LINK) /NOLOGO $(khldllconflags) /OUT:$@ /IMPLIB:$(LIBDIR)\$(@B).lib $** + +DLLGUILINK=$(LINK) /NOLOGO $(khldllguiflags) /OUT:$@ /IMPLIB:$(LIBDIR)\$(@B).lib $** + +DLLRESLINK=$(LINK) /NOLOGO /DLL /NOENTRY /MACHINE:$(PROCESSOR_ARCHITECTURE) /OUT:$@ $** + +RC2RES=$(RC) $(RFLAGS) $(rincflags) /fo $@ $** + +MC2RC=$(MC) $(MCFLAGS) -h $(OBJ)\ -m 1024 -r $(OBJ)\ -x $(OBJ)\ $** + +{}.c{$(OBJ)}.obj: + $(C2OBJ) + +{$(OBJ)}.c{$(OBJ)}.obj: + $(C2OBJ) + +{}.h{$(INCDIR)}.h: + $(CP) $** $@ + +{}.rc{$(OBJ)}.res: + $(RC2RES) + +{$(OBJ)}.rc{$(OBJ)}.res: + $(RC2RES) + +clean:: +!if exist($(OBJ)) + $(RM) $(OBJ)\ +!endif + +test:: + +mkdirs:: +!if !exist($(LIBDIR)) + $(MKDIR) $(LIBDIR) +!endif +!if !exist($(BINDIR)) + $(MKDIR) $(BINDIR) +!endif +!if !exist($(OBJ)) + $(MKDIR) $(OBJ) +!endif + +TAGFILE = $(SRC)\TAGS + +etag:: + etags -o $(TAGFILE) -a *.c *.h + +.SUFFIXES: .h + +!endif diff --git a/src/windows/identity/config/Makefile.w32 b/src/windows/identity/config/Makefile.w32 index 5d8026420..ed966d7b5 100644 --- a/src/windows/identity/config/Makefile.w32 +++ b/src/windows/identity/config/Makefile.w32 @@ -47,7 +47,7 @@ KHIMAIRA_WIN32_CONFIG=1 NETIDMGR_VERSION_MAJOR=1 NETIDMGR_VERSION_MINOR=1 NETIDMGR_VERSION_PATCH=0 -NETIDMGR_VERSION_AUX=0 +NETIDMGR_VERSION_AUX=1 NETIDMGR_RELEASEDESC= # The API version. This number must be incremented each time the API @@ -142,6 +142,22 @@ DOCDIR=$(DESTDIR)\doc # Source directories CONFDIR=$(SRC)\config +# If we are forcing a Win2K build, we need to adjust the build +# directories and environment. + +!ifdef KHBUILD_W2K + +OBJ=$(OBJ)\W2K +BINDIR=$(BINDIR)\W2K +LIBDIR=$(LIBDIR)\W2K + +APPVER=5.0 +TARGETOS=WINNT +_WIN32_IE=0x0500 +_WIN32_WINNT=0x0500 + +!endif + # Setup environment for win32.mak !if "$(KH_BUILD)" == "RETAIL" @@ -149,6 +165,7 @@ NODEBUG=1 !endif # Win32.mak + !include # Program macros diff --git a/src/windows/identity/doc/netidmgr.doc b/src/windows/identity/doc/netidmgr.doc index f6eda5d5a..4dd61b22e 100755 Binary files a/src/windows/identity/doc/netidmgr.doc and b/src/windows/identity/doc/netidmgr.doc differ diff --git a/src/windows/identity/help/Makefile b/src/windows/identity/help/Makefile index 752ffc996..fa76b026c 100644 --- a/src/windows/identity/help/Makefile +++ b/src/windows/identity/help/Makefile @@ -34,3 +34,6 @@ all: mkdirs $(CHMFILE) $(INCFILES) $(CHMFILE): netidmgr.hhp -$(HHC) netidmgr.hhp $(CP) netidmgr.chm $(CHMFILE) + +clean:: + $(RM) $(CHMFILE) \ No newline at end of file diff --git a/src/windows/identity/help/html/act_new_creds.htm b/src/windows/identity/help/html/act_new_creds.htm index 01917ffdc..f2769e08e 100644 --- a/src/windows/identity/help/html/act_new_creds.htm +++ b/src/windows/identity/help/html/act_new_creds.htm @@ -27,7 +27,6 @@ selected.

Note that the above screenshot is from an instance of NetIDMgr with Kerberos 5, Kerberos 4 and OpenAFS plugins with a Kerberos 5 identity manager. Actual display may be different depending on the plugins that are active.

-

If the Kerberos 5 identity provider is used, the dialog will ask for a username and a realm to determine the identity for which new @@ -43,10 +42,10 @@ dialog is completed.

Expanded view

-

If you click any of the hyperlinks in the credentials summary -window or select the Options >> button, -the dialog will switch to the exanded view. An example of this is -shown below: +

If you click any of the credentials type hyperlinks in the +credentials summary window or select the Options +>> button, the dialog will switch to the exanded view. +An example of this is shown below:

@@ -54,7 +53,6 @@ shown below: alt="Expanded new credentials window" />

Expanded view of the new credetials dialog

-

The expanded view provides access to additional options available for @@ -66,16 +64,14 @@ ticket as well as ticket flags such as renewable or

Credentials summary window

-

-The credentials summary window provides an overview of the credentials -that will be obtained after the successful completion of the new -credentials dialog. The window contains hyperlinks that will take you -to the corresponding credentials option panels where you will be able -to set additional options for each type. +

The credentials summary window provides an overview of the +credentials that will be obtained after the successful completion of +the new credentials dialog. The window contains hyperlinks that will +take you to the corresponding credentials option panels where you will +be able to set additional options for each type.

-

-If there is a problem with the selected identity, the credentials +

If there is a problem with the selected identity, the credentials window will display a message describing the problem. For example:

diff --git a/src/windows/identity/help/html/act_renew_creds.htm b/src/windows/identity/help/html/act_renew_creds.htm index 5e39963da..0bd196ad5 100644 --- a/src/windows/identity/help/html/act_renew_creds.htm +++ b/src/windows/identity/help/html/act_renew_creds.htm @@ -1,11 +1,32 @@ - title - - + Renew Credentials + + +

Renew Credentials

+ +

The renew credentials action can be invoked via the Credential menu or by pressing Ctrl + +R. Additionally, if Monitor credentials +expiration option is enabled for all identities or for a +specific identity, then those credentials will be automatically +renewed before they expire.

+ +

An identity must be selected before invoking the renew credentials +action.

+ +

Not all credentials can be renewed. The actual logic of renewing +the credentials is up to each credentials provider. In general +NetIDMgr will invoke each credentials provider to renew their +respective credentials. For Kerberos 5, if the initial ticket is +renewable and not expired, then it will obtain a renewed initial +ticket. For Kerberos 4, once a renewed Kerberos 5 initial ticket is +obtained, it will try to use a Krb524 translator to obtain a new +Kerberos 4 initial ticket.

+ \ No newline at end of file diff --git a/src/windows/identity/help/html/act_set_default.htm b/src/windows/identity/help/html/act_set_default.htm index 5e39963da..382b3c1ce 100644 --- a/src/windows/identity/help/html/act_set_default.htm +++ b/src/windows/identity/help/html/act_set_default.htm @@ -1,11 +1,16 @@ - title - - + Set As Default Identity + + +

Set As Default Identity

+ +

+

+ \ No newline at end of file diff --git a/src/windows/identity/help/html/concept_cred_pro.htm b/src/windows/identity/help/html/concept_cred_pro.htm index 5e39963da..37fec760c 100644 --- a/src/windows/identity/help/html/concept_cred_pro.htm +++ b/src/windows/identity/help/html/concept_cred_pro.htm @@ -1,11 +1,16 @@ - title - - + NetIDMgr Concepts: Credentials Provider + + +

NetIDMgr Concepts: Credentials Provider

+ +

+

+ \ No newline at end of file diff --git a/src/windows/identity/help/html/concept_ident_pro.htm b/src/windows/identity/help/html/concept_ident_pro.htm index 5e39963da..5c4601c06 100644 --- a/src/windows/identity/help/html/concept_ident_pro.htm +++ b/src/windows/identity/help/html/concept_ident_pro.htm @@ -1,11 +1,16 @@ - title - - + NetIDMgr Concepts: Identity Provider + + +

NetIDMgr Concepts: Identity Provider

+ +

+

+ \ No newline at end of file diff --git a/src/windows/identity/help/html/concept_identity.htm b/src/windows/identity/help/html/concept_identity.htm index 50802d95b..1fb72b5da 100644 --- a/src/windows/identity/help/html/concept_identity.htm +++ b/src/windows/identity/help/html/concept_identity.htm @@ -1,13 +1,13 @@ - Concepts: Identity - + NetIDMgr Concepts: Identity + -

Concepts: Identity

+

NetIDMgr Concepts: Identity

diff --git a/src/windows/identity/help/html/concepts.htm b/src/windows/identity/help/html/concepts.htm index 5e39963da..fd0a2430f 100644 --- a/src/windows/identity/help/html/concepts.htm +++ b/src/windows/identity/help/html/concepts.htm @@ -1,11 +1,33 @@ - title - - + NetIDMgr Concepts + + +

NetIDMgr Concepts

+ +

The Network Identity manager organizes and manages your credentials +based on how they identify you to external services which use those +credentials for authentication. To this end, it is assumed that each +credential will uniquely identify the user to a service as a single +principal or identity. +

+ +

+

+ +

The following topics provider further details:

+ + + \ No newline at end of file diff --git a/src/windows/identity/help/html/copyright.htm b/src/windows/identity/help/html/copyright.htm index 32453f740..b98a1569a 100644 --- a/src/windows/identity/help/html/copyright.htm +++ b/src/windows/identity/help/html/copyright.htm @@ -23,7 +23,7 @@ the same appear on ALL copies of the software and documentation, including modifications that you make for internal use or for distribution:

-

Copyright 1992-2005 by the Massachusetts Institute of Technology. All +

Copyright 1992-2006 by the Massachusetts Institute of Technology. All rights reserved.

THIS SOFTWARE IS PROVIDED "AS IS", AND M.I.T. MAKES NO REPRESENTATIONS diff --git a/src/windows/identity/help/html/howdoi.htm b/src/windows/identity/help/html/howdoi.htm index 3995335a4..7a380c8d2 100644 --- a/src/windows/identity/help/html/howdoi.htm +++ b/src/windows/identity/help/html/howdoi.htm @@ -33,5 +33,12 @@ +

Credentials view

+ + \ No newline at end of file diff --git a/src/windows/identity/help/html/images/screen_menu_bar.bmp b/src/windows/identity/help/html/images/screen_menu_bar.bmp index 947cd10c6..5f80c1967 100644 Binary files a/src/windows/identity/help/html/images/screen_menu_bar.bmp and b/src/windows/identity/help/html/images/screen_menu_bar.bmp differ diff --git a/src/windows/identity/help/html/images/screen_menu_credential.bmp b/src/windows/identity/help/html/images/screen_menu_credential.bmp index eecddd21b..92a1ec3f2 100644 Binary files a/src/windows/identity/help/html/images/screen_menu_credential.bmp and b/src/windows/identity/help/html/images/screen_menu_credential.bmp differ diff --git a/src/windows/identity/help/html/images/screen_menu_file.bmp b/src/windows/identity/help/html/images/screen_menu_file.bmp index a67e59765..4a9054668 100644 Binary files a/src/windows/identity/help/html/images/screen_menu_file.bmp and b/src/windows/identity/help/html/images/screen_menu_file.bmp differ diff --git a/src/windows/identity/help/html/images/screen_menu_help.bmp b/src/windows/identity/help/html/images/screen_menu_help.bmp index 2d5261fb4..dc1a8f6dd 100644 Binary files a/src/windows/identity/help/html/images/screen_menu_help.bmp and b/src/windows/identity/help/html/images/screen_menu_help.bmp differ diff --git a/src/windows/identity/help/html/images/screen_menu_options.bmp b/src/windows/identity/help/html/images/screen_menu_options.bmp index 4fba5d6d3..5762e65d8 100644 Binary files a/src/windows/identity/help/html/images/screen_menu_options.bmp and b/src/windows/identity/help/html/images/screen_menu_options.bmp differ diff --git a/src/windows/identity/help/html/images/screen_menu_view.bmp b/src/windows/identity/help/html/images/screen_menu_view.bmp index 9dfb871c2..e47e54a0a 100644 Binary files a/src/windows/identity/help/html/images/screen_menu_view.bmp and b/src/windows/identity/help/html/images/screen_menu_view.bmp differ diff --git a/src/windows/identity/help/html/menu_all.htm b/src/windows/identity/help/html/menu_all.htm index 8118a8116..2710d5986 100644 --- a/src/windows/identity/help/html/menu_all.htm +++ b/src/windows/identity/help/html/menu_all.htm @@ -18,11 +18,11 @@ highlighted character on the submenu.

- - - - - + + + + +

diff --git a/src/windows/identity/help/html/menu_credential.htm b/src/windows/identity/help/html/menu_credential.htm index b17533ea3..8c537eaba 100644 --- a/src/windows/identity/help/html/menu_credential.htm +++ b/src/windows/identity/help/html/menu_credential.htm @@ -23,13 +23,12 @@ without invoking the Credential menu.

- - - - - - - + + + + + +

@@ -65,9 +64,6 @@ without invoking the Credential menu. See Set As Default Action for more information.

-
  • Allow applications to - search: This action is currently not implemented.
    • -
  • Change password...: Changes the password for the selected identity. However, once the new password dialog opens, you can change the identity for which the diff --git a/src/windows/identity/help/html/menu_file.htm b/src/windows/identity/help/html/menu_file.htm index 91f73dfa8..a7f79fe82 100644 --- a/src/windows/identity/help/html/menu_file.htm +++ b/src/windows/identity/help/html/menu_file.htm @@ -23,8 +23,8 @@ without invoking the File menu.

    - - + +

    diff --git a/src/windows/identity/help/html/menu_help.htm b/src/windows/identity/help/html/menu_help.htm index bceb2a991..d1ac6aed5 100644 --- a/src/windows/identity/help/html/menu_help.htm +++ b/src/windows/identity/help/html/menu_help.htm @@ -21,18 +21,17 @@ the question mark icon in the title bar and then clicking on the dialog box control that you want help with.

    -

    -This is the help menu. While it is ironic that the help menu itself -needs to be explained, we have decided to include it here just for -completeness. It is bad enough that it is the last menu on the menu -bar. We didn't want to pile on any more disrespect by not documenting -it. We encourage you to not read this and just go ahead and click any -item on this menu. If anything unexpected happens, please file a bug -report at kfw-bugs@mit.edu. -

    + + + + + + + +

    - +

    -
  • Debug window...: -Displays a debug window which contains a history of actions and any -debug information for each action that was supplied by each credentials provider
  • +
  • Refresh: Refresh the credentials view. This queries each

    When NetIDMgr is running, it places an icon in the system notification area (sometimes referred to as the "system tray") as -shown in figure 1.

    +shown in figure 1. Details about the state information represented by +the icon can be found     here.

    Clicking on this icon brings up the NetIDMgr window. Right clicking on the icon, on the other hand, brings up a menu.

    @@ -58,7 +59,10 @@ configuration dialog. Only one instance of NetIDMgr can be running at any one time. Attempting to start NetIDMgr while it is still running will not do anything, unless you provide any command line options that trigger -some action in the running application instance. +some action in the running application instance. If more than one +version of NetIDMgr is installed on the system, and the older version +is running at the time the newer version is started, the older version +will exit allowing the newer version to take over.

    diff --git a/src/windows/identity/help/html/using.htm b/src/windows/identity/help/html/using.htm index c3699e841..c09558e91 100644 --- a/src/windows/identity/help/html/using.htm +++ b/src/windows/identity/help/html/using.htm @@ -14,9 +14,9 @@ Depending on how NetIDMgr was installed, it might already be running in the system notification area or it might need to be started manually. See the topic starting NetIDMgr for details. Essentially, to open the NetIDMgr window, -you either have to click the application icon in the system -notification area, select the icon from the start menu, or type -'netidmgr' at a command prompt. +you either have to click the application +icon in the system notification area, select the icon from the +start menu, or type 'netidmgr' at a command prompt.

    @@ -36,6 +36,7 @@ Brief overviews of how to perform common tasks are linked below:

  • Import credentials from the MSLSA cache
  • Renew credentials
  • Change password
    • +
  • Managing the credentials view layout

    • diff --git a/src/windows/identity/help/toc.hhc b/src/windows/identity/help/toc.hhc index 106c22054..c2239b834 100644 --- a/src/windows/identity/help/toc.hhc +++ b/src/windows/identity/help/toc.hhc @@ -61,9 +61,18 @@ +

  • + + + + +
  • + + +
  • - +
      diff --git a/src/windows/identity/nidmgrdll/Makefile.w2k b/src/windows/identity/nidmgrdll/Makefile.w2k new file mode 100644 index 000000000..9dfe2dffb --- /dev/null +++ b/src/windows/identity/nidmgrdll/Makefile.w2k @@ -0,0 +1,120 @@ +# +# Copyright (c) 2004 Massachusetts Institute of Technology +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + + +MODULE=nidmgrdll.w2k +!include <../config/Makefile.w2k> + +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +DLLFILE=$(BINDIR)\nidmgr64.dll +LIBFILE=$(LIBDIR)\nidmgr64.lib +!else +DLLFILE=$(BINDIR)\nidmgr32.dll +LIBFILE=$(LIBDIR)\nidmgr32.lib +!endif + +UTILDIR=$(OBJDIR)\util + +KHERRDIR=$(OBJDIR)\kherr + +KCONFIGDIR=$(OBJDIR)\kconfig + +KMQDIR=$(OBJDIR)\kmq + +KCDBDIR=$(OBJDIR)\kcreddb + +KMMDIR=$(OBJDIR)\kmm + +UIDIR=$(OBJDIR)\uilib.w2k + +OBJFILES= \ + $(OBJ)\dllmain.obj \ + $(UTILDIR)\hashtable.obj \ + $(UTILDIR)\sync.obj \ + $(UTILDIR)\mstring.obj \ + $(UTILDIR)\perfstat.obj \ + $(KHERRDIR)\kherrmain.obj \ + $(KHERRDIR)\kherr.obj \ + $(KCONFIGDIR)\kconfigmain.obj \ + $(KCONFIGDIR)\api.obj \ + $(KMQDIR)\kmqmain.obj \ + $(KMQDIR)\init.obj \ + $(KMQDIR)\msgtype.obj \ + $(KMQDIR)\consumer.obj \ + $(KMQDIR)\publisher.obj \ + $(KMQDIR)\kmqconfig.obj \ + $(KCDBDIR)\buf.obj \ + $(KCDBDIR)\attrib.obj \ + $(KCDBDIR)\credential.obj \ + $(KCDBDIR)\credset.obj \ + $(KCDBDIR)\credtype.obj \ + $(KCDBDIR)\identity.obj \ + $(KCDBDIR)\init.obj \ + $(KCDBDIR)\kcreddbmain.obj \ + $(KCDBDIR)\type.obj \ + $(KCDBDIR)\kcdbconfig.obj \ + $(KMMDIR)\kmmmain.obj \ + $(KMMDIR)\kmm.obj \ + $(KMMDIR)\kmm_plugin.obj \ + $(KMMDIR)\kmm_module.obj \ + $(KMMDIR)\kmm_reg.obj \ + $(KMMDIR)\kmm_registrar.obj \ + $(KMMDIR)\kmmconfig.obj \ + $(UIDIR)\rescache.obj \ + $(UIDIR)\action.obj \ + $(UIDIR)\creddlg.obj \ + $(UIDIR)\alert.obj \ + $(UIDIR)\propsheet.obj \ + $(UIDIR)\propwnd.obj \ + $(UIDIR)\uilibmain.obj \ + $(UIDIR)\actiondef.obj \ + $(UIDIR)\acceldef.obj \ + $(UIDIR)\configui.obj \ + $(UIDIR)\trackerwnd.obj \ + $(UIDIR)\version.obj + +RESFILES= \ + $(OBJ)\nidmgrdll.res \ + $(KCDBDIR)\kcredres.res \ + $(KMMDIR)\kmm_msgs.res \ + +SDKLIBFILES= \ + advapi32.lib \ + strsafe.lib \ + comctl32.lib \ + shlwapi.lib \ + version.lib + +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SCLIB=bufferoverflowu.lib +!else +SCLIB= +!endif + +$(DLLFILE): $(OBJFILES) $(RESFILES) + $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES) $(SCLIB) + +all: mkdirs $(DLLFILE) + +clean:: + $(RM) $(DLLFILE) diff --git a/src/windows/identity/plugins/krb4/krb4newcreds.c b/src/windows/identity/plugins/krb4/krb4newcreds.c index 3a1a72bfa..b3dd7cea7 100644 --- a/src/windows/identity/plugins/krb4/krb4newcreds.c +++ b/src/windows/identity/plugins/krb4/krb4newcreds.c @@ -34,6 +34,7 @@ #include #include +/* method identifiers should be contiguous */ #define K4_METHOD_AUTO 0 #define K4_METHOD_PASSWORD 1 #define K4_METHOD_K524 2 @@ -55,6 +56,7 @@ typedef struct tag_k4_dlg_data { } k4_dlg_data; void k4_update_display(k4_dlg_data * d) { + int i; CheckDlgButton(d->hwnd, IDC_NCK4_OBTAIN, (d->k4_enabled)?BST_CHECKED: BST_UNCHECKED); @@ -75,6 +77,12 @@ void k4_update_display(k4_dlg_data * d) { CheckDlgButton(d->hwnd, method_to_id[d->method], BST_CHECKED); + for (i=0; i < ARRAYLENGTH(method_to_id); i++) { + if (i != d->method && method_to_id[i] != 0) + CheckDlgButton(d->hwnd, method_to_id[d->method], + BST_UNCHECKED); + } + khui_cw_enable_type(d->nc, credtype_id_krb4, d->k4_enabled); } @@ -528,7 +536,6 @@ krb4_msg_newcred(khm_int32 msg_type, khm_int32 msg_subtype, _cstr(ident), _int32(method)); _resolve(); _describe(); - } else if (nc->subtype == KMSG_CRED_RENEW_CREDS) { @@ -547,6 +554,9 @@ krb4_msg_newcred(khm_int32 msg_type, khm_int32 msg_subtype, ident = nc->ctx.identity; if (!k4_should_identity_get_k4(ident)) { + + _reportf(L"Kerberos 4 is not enabled for this identity. Skipping"); + khui_cw_set_response(nc, credtype_id_krb4, KHUI_NC_RESPONSE_FAILED | KHUI_NC_RESPONSE_EXIT); @@ -554,6 +564,9 @@ krb4_msg_newcred(khm_int32 msg_type, khm_int32 msg_subtype, } } else { + + _reportf(L"Kerberos 4 is not within renewal scope. Skipping"); + khui_cw_set_response(nc, credtype_id_krb4, KHUI_NC_RESPONSE_FAILED | KHUI_NC_RESPONSE_EXIT); @@ -572,6 +585,7 @@ krb4_msg_newcred(khm_int32 msg_type, khm_int32 msg_subtype, _describe(); } else { assert(FALSE); + break; } if ((method == K4_METHOD_AUTO || diff --git a/src/windows/identity/plugins/krb5/krb5util.c b/src/windows/identity/plugins/krb5/krb5util.c deleted file mode 100644 index 7be0f8e26..000000000 --- a/src/windows/identity/plugins/krb5/krb5util.c +++ /dev/null @@ -1,1362 +0,0 @@ -/* - * Copyright (c) 2005 Massachusetts Institute of Technology - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/* $Id$ */ - -#include -#include -#include -#include -#include "leashdll.h" -#include -#include -#include - -#include -#include "leasherr.h" -#include "leash-int.h" -#include "leashids.h" - -#include - -#include -#include "reminder.h" - -static char FAR *err_context; - -char KRB_HelpFile[_MAX_PATH] = HELPFILE; - -#define LEN 64 /* Maximum Hostname Length */ - -#define LIFE DEFAULT_TKT_LIFE /* lifetime of ticket in 5-minute units */ - -char * -short_date(dp) - long *dp; -{ - register char *cp; - cp = ctime(dp) + 4; // skip day of week - // cp[15] = '\0'; - cp[12] = '\0'; // Don't display seconds - return (cp); -} - - -static -char* -clean_string( - char* s - ) -{ - char* p = s; - char* b = s; - - if (!s) return s; - - for (p = s; *p; p++) { - switch (*p) { - case '\007': - /* Add more cases here */ - break; - default: - *b = *p; - b++; - } - } - *b = *p; - return s; -} - -static -int -leash_error_message( - const char *error, - int rcL, - int rc4, - int rc5, - int rcA, - char* result_string, - int displayMB - ) -{ - char message[2048]; - char *p = message; - int size = sizeof(message); - int n; - - // XXX: ignore AFS for now. - - if (!rc5 && !rc4 && !rcL) - return 0; - - n = _snprintf(p, size, "%s\n\n", error); - p += n; - size -= n; - - if (rc5 && !result_string) - { - n = _snprintf(p, size, - "Kerberos 5: %s (error %ld)\n", - perror_message(rc5), - rc5 & 255 // XXX: & 255??!!! - ); - p += n; - size -= n; - } - if (rc4 && !result_string) - { - char buffer[1024]; - n = _snprintf(p, size, - "Kerberos 4: %s\n", - err_describe(buffer, rc4) - ); - p += n; - size -= n; - } - if (rcL) - { - char buffer[1024]; - n = _snprintf(p, size, - "\n%s\n", - err_describe(buffer, rcL) - ); - p += n; - size -= n; - } - if (result_string) - { - n = _snprintf(p, size, - "%s\n", - result_string); - p += n; - size -= n; - } - if ( displayMB ) - MessageBox(NULL, message, "Leash", MB_OK | MB_ICONERROR | MB_TASKMODAL | - MB_SETFOREGROUND); - - if (rc5) return rc5; - if (rc4) return rc4; - if (rcL) return rcL; - return 0; -} - - -static -char * -make_postfix( - const char * base, - const char * postfix, - char ** rcopy - ) -{ - int base_size; - int ret_size; - char * copy = 0; - char * ret = 0; - - base_size = strlen(base) + 1; - ret_size = base_size + strlen(postfix) + 1; - copy = PMALLOC(base_size); - ret = PMALLOC(ret_size); - - if (!copy || !ret) - goto cleanup; - - strncpy(copy, base, base_size); - copy[base_size - 1] = 0; - - strncpy(ret, base, base_size); - strncpy(ret + (base_size - 1), postfix, ret_size - (base_size - 1)); - ret[ret_size - 1] = 0; - - cleanup: - if (!copy || !ret) { - if (copy) - PFREE(copy); - if (ret) - PFREE(ret); - copy = ret = 0; - } - // INVARIANT: (ret ==> copy) && (copy ==> ret) - *rcopy = copy; - return ret; -} - -static -long -make_temp_cache_v4( - const char * postfix - ) -{ - static char * old_cache = 0; - - if (!pkrb_set_tkt_string || !ptkt_string || !pdest_tkt) - return 0; // XXX - is this appropriate? - - if (old_cache) { - pdest_tkt(); - pkrb_set_tkt_string(old_cache); - PFREE(old_cache); - old_cache = 0; - } - - if (postfix) - { - char * tmp_cache = make_postfix(ptkt_string(), postfix, &old_cache); - - if (!tmp_cache) - return KFAILURE; - - pkrb_set_tkt_string(tmp_cache); - PFREE(tmp_cache); - } - return 0; -} - -static -long -make_temp_cache_v5( - const char * postfix, - krb5_context * pctx - ) -{ - static krb5_context ctx = 0; - static char * old_cache = 0; - - // INVARIANT: old_cache ==> ctx && ctx ==> old_cache - - if (pctx) - *pctx = 0; - - if (!pkrb5_init_context || !pkrb5_free_context || !pkrb5_cc_resolve || - !pkrb5_cc_default_name || !pkrb5_cc_set_default_name) - return 0; - - if (old_cache) { - krb5_ccache cc = 0; - if (!pkrb5_cc_resolve(ctx, pkrb5_cc_default_name(ctx), &cc)) - pkrb5_cc_destroy(ctx, cc); - pkrb5_cc_set_default_name(ctx, old_cache); - PFREE(old_cache); - old_cache = 0; - } - if (ctx) { - pkrb5_free_context(ctx); - ctx = 0; - } - - if (postfix) - { - char * tmp_cache = 0; - krb5_error_code rc = 0; - - rc = pkrb5_init_context(&ctx); - if (rc) goto cleanup; - - tmp_cache = make_postfix(pkrb5_cc_default_name(ctx), postfix, - &old_cache); - - if (!tmp_cache) { - rc = ENOMEM; - goto cleanup; - } - - rc = pkrb5_cc_set_default_name(ctx, tmp_cache); - - cleanup: - if (rc && ctx) { - pkrb5_free_context(ctx); - ctx = 0; - } - if (tmp_cache) - PFREE(tmp_cache); - if (pctx) - *pctx = ctx; - return rc; - } - return 0; -} - -long -Leash_checkpwd( - char *principal, - char *password - ) -{ - return Leash_int_checkpwd(principal, password, 0); -} - -long -Leash_int_checkpwd( - char * principal, - char * password, - int displayErrors - ) -{ - long rc = 0; - krb5_context ctx = 0; // statically allocated in make_temp_cache_v5 - // XXX - we ignore errors in make_temp_cache_v? This is BAD!!! - make_temp_cache_v4("_checkpwd"); - make_temp_cache_v5("_checkpwd", &ctx); - rc = Leash_int_kinit_ex( ctx, 0, - principal, password, 0, 0, 0, 0, - Leash_get_default_noaddresses(), - Leash_get_default_publicip(), - displayErrors - ); - make_temp_cache_v4(0); - make_temp_cache_v5(0, &ctx); - return rc; -} - -static -long -Leash_changepwd_v5(char * principal, - char * password, - char * newpassword, - char** error_str) -{ - krb5_error_code rc = 0; - int result_code; - krb5_data result_code_string, result_string; - krb5_context context = 0; - krb5_principal princ = 0; - krb5_get_init_creds_opt opts; - krb5_creds creds; - DWORD addressless = 0; - - result_string.data = 0; - result_code_string.data = 0; - - if ( !pkrb5_init_context ) - goto cleanup; - - if (rc = pkrb5_init_context(&context)) { -#if 0 - com_err(argv[0], ret, "initializing kerberos library"); -#endif - goto cleanup; - } - - if (rc = pkrb5_parse_name(context, principal, &princ)) { -#if 0 - com_err(argv[0], ret, "parsing client name"); -#endif - goto cleanup; - } - - pkrb5_get_init_creds_opt_init(&opts); - pkrb5_get_init_creds_opt_set_tkt_life(&opts, 5*60); - pkrb5_get_init_creds_opt_set_renew_life(&opts, 0); - pkrb5_get_init_creds_opt_set_forwardable(&opts, 0); - pkrb5_get_init_creds_opt_set_proxiable(&opts, 0); - - addressless = Leash_get_default_noaddresses(); - if (addressless) - pkrb5_get_init_creds_opt_set_address_list(&opts,NULL); - - - if (rc = pkrb5_get_init_creds_password(context, &creds, princ, password, - 0, 0, 0, "kadmin/changepw", &opts)) { - if (rc == KRB5KRB_AP_ERR_BAD_INTEGRITY) { -#if 0 - com_err(argv[0], 0, - "Password incorrect while getting initial ticket"); -#endif - } - else { -#if 0 - com_err(argv[0], ret, "getting initial ticket"); -#endif - } - goto cleanup; - } - - if (rc = pkrb5_change_password(context, &creds, newpassword, - &result_code, &result_code_string, - &result_string)) { -#if 0 - com_err(argv[0], ret, "changing password"); -#endif - goto cleanup; - } - - if (result_code) { - int len = result_code_string.length + - (result_string.length ? (sizeof(": ") - 1) : 0) + - result_string.length; - if (len && error_str) { - *error_str = PMALLOC(len + 1); - if (*error_str) - _snprintf(*error_str, len + 1, - "%.*s%s%.*s", - result_code_string.length, result_code_string.data, - result_string.length?": ":"", - result_string.length, result_string.data); - } - rc = result_code; - goto cleanup; - } - - cleanup: - if (result_string.data) - pkrb5_free_data_contents(context, &result_string); - - if (result_code_string.data) - pkrb5_free_data_contents(context, &result_code_string); - - if (princ) - pkrb5_free_principal(context, princ); - - if (context) - pkrb5_free_context(context); - - return rc; -} - -static -long -Leash_changepwd_v4( - char * principal, - char * password, - char * newpassword, - char** error_str - ) -{ - long k_errno; - - if (!pkrb_set_tkt_string || !ptkt_string || !pkadm_change_your_password || - !pdest_tkt) - return KFAILURE; - - k_errno = make_temp_cache_v4("_chgpwd"); - if (k_errno) return k_errno; - k_errno = pkadm_change_your_password(principal, password, newpassword, - error_str); - make_temp_cache_v4(0); - return k_errno; -} - -/* - * Leash_changepwd - * - * Try to change the password using one of krb5 or krb4 -- whichever one - * works. We return ok on the first one that works. - */ -long -Leash_changepwd( - char * principal, - char * password, - char * newpassword, - char** result_string - ) -{ - return Leash_int_changepwd(principal, password, newpassword, result_string, 0); -} - -long -Leash_int_changepwd( - char * principal, - char * password, - char * newpassword, - char** result_string, - int displayErrors - ) -{ - char* v5_error_str = 0; - char* v4_error_str = 0; - char* error_str = 0; - int rc4 = 0; - int rc5 = 0; - int rc = 0; - if (hKrb5) - rc = rc5 = Leash_changepwd_v5(principal, password, newpassword, - &v5_error_str); - if (hKrb4 && - Leash_get_default_use_krb4() && - (!hKrb5 || rc5)) - rc = rc4 = Leash_changepwd_v4(principal, password, newpassword, - &v4_error_str); - if (!rc) - return 0; - if (v5_error_str || v4_error_str) { - int len = 0; - char v5_prefix[] = "Kerberos 5: "; - char sep[] = "\n"; - char v4_prefix[] = "Kerberos 4: "; - - clean_string(v5_error_str); - clean_string(v4_error_str); - - if (v5_error_str) - len += sizeof(sep) + sizeof(v5_prefix) + strlen(v5_error_str) + - sizeof(sep); - if (v4_error_str) - len += sizeof(sep) + sizeof(v4_prefix) + strlen(v4_error_str) + - sizeof(sep); - error_str = PMALLOC(len + 1); - if (error_str) { - char* p = error_str; - int size = len + 1; - int n; - if (v5_error_str) { - n = _snprintf(p, size, "%s%s%s%s", - sep, v5_prefix, v5_error_str, sep); - p += n; - size -= n; - } - if (v4_error_str) { - n = _snprintf(p, size, "%s%s%s%s", - sep, v4_prefix, v4_error_str, sep); - p += n; - size -= n; - } - if (result_string) - *result_string = error_str; - } - } - return leash_error_message("Error while changing password.", - rc4, rc4, rc5, 0, error_str, - displayErrors - ); -} - -int (*Lcom_err)(LPSTR,long,LPSTR,...); -LPSTR (*Lerror_message)(long); -LPSTR (*Lerror_table_name)(long); - - -long -Leash_kinit( - char * principal, - char * password, - int lifetime - ) -{ - return Leash_int_kinit_ex( 0, 0, - principal, - password, - lifetime, - Leash_get_default_forwardable(), - Leash_get_default_proxiable(), - Leash_get_default_renew_till(), - Leash_get_default_noaddresses(), - Leash_get_default_publicip(), - 0 - ); -} - -long -Leash_kinit_ex( - char * principal, - char * password, - int lifetime, - int forwardable, - int proxiable, - int renew_life, - int addressless, - unsigned long publicip - ) -{ - return Leash_int_kinit_ex( 0, /* krb5 context */ - 0, /* parent window */ - principal, - password, - lifetime, - forwardable, - proxiable, - renew_life, - addressless, - publicip, - 0 - ); -} - -long -Leash_int_kinit_ex( - krb5_context ctx, - HWND hParent, - char * principal, - char * password, - int lifetime, - int forwardable, - int proxiable, - int renew_life, - int addressless, - unsigned long publicip, - int displayErrors - ) -{ - LPCSTR functionName; - char aname[ANAME_SZ]; - char inst[INST_SZ]; - char realm[REALM_SZ]; - char first_part[256]; - char second_part[256]; - char temp[1024]; - int count; - int i; - int rc4 = 0; - int rc5 = 0; - int rcA = 0; - int rcL = 0; - - if (lifetime < 5) - lifetime = 1; - else - lifetime /= 5; - - if (renew_life > 0 && renew_life < 5) - renew_life = 1; - else - renew_life /= 5; - - /* This should be changed if the maximum ticket lifetime */ - /* changes */ - - if (lifetime > 255) - lifetime = 255; - - err_context = "parsing principal"; - - memset(temp, '\0', sizeof(temp)); - memset(inst, '\0', sizeof(inst)); - memset(realm, '\0', sizeof(realm)); - memset(first_part, '\0', sizeof(first_part)); - memset(second_part, '\0', sizeof(second_part)); - - sscanf(principal, "%[/0-9a-zA-Z._-]@%[/0-9a-zA-Z._-]", first_part, second_part); - strcpy(temp, first_part); - strcpy(realm, second_part); - memset(first_part, '\0', sizeof(first_part)); - memset(second_part, '\0', sizeof(second_part)); - if (sscanf(temp, "%[@0-9a-zA-Z._-]/%[@0-9a-zA-Z._-]", first_part, second_part) == 2) - { - strcpy(aname, first_part); - strcpy(inst, second_part); - } - else - { - count = 0; - i = 0; - for (i = 0; temp[i]; i++) - { - if (temp[i] == '.') - ++count; - } - if (count > 1) - { - strcpy(aname, temp); - } - else - { - if (pkname_parse != NULL) - { - memset(first_part, '\0', sizeof(first_part)); - memset(second_part, '\0', sizeof(second_part)); - sscanf(temp, "%[@/0-9a-zA-Z_-].%[@/0-9a-zA-Z_-]", first_part, second_part); - strcpy(aname, first_part); - strcpy(inst, second_part); - } - else - { - strcpy(aname, temp); - } - } - } - - memset(temp, '\0', sizeof(temp)); - strcpy(temp, aname); - if (strlen(inst) != 0) - { - strcat(temp, "/"); - strcat(temp, inst); - } - if (strlen(realm) != 0) - { - strcat(temp, "@"); - strcat(temp, realm); - } - - rc5 = Leash_krb5_kinit(ctx, hParent, - temp, password, lifetime, - forwardable, - proxiable, - renew_life, - addressless, - publicip - ); - if ( Leash_get_default_use_krb4() ) { - if ( !rc5 ) { - if (!Leash_convert524(ctx)) - rc4 = KFAILURE; - } else { - if (pkname_parse == NULL) - { - goto cleanup; - } - - err_context = "getting realm"; - if (!*realm && (rc4 = (int)(*pkrb_get_lrealm)(realm, 1))) - { - functionName = "krb_get_lrealm()"; - rcL = LSH_FAILEDREALM; - goto cleanup; - } - - err_context = "checking principal"; - if ((!*aname) || (!(rc4 = (int)(*pk_isname)(aname)))) - { - functionName = "krb_get_lrealm()"; - rcL = LSH_INVPRINCIPAL; - goto cleanup; - } - - /* optional instance */ - if (!(rc4 = (int)(*pk_isinst)(inst))) - { - functionName = "k_isinst()"; - rcL = LSH_INVINSTANCE; - goto cleanup; - } - - if (!(rc4 = (int)(*pk_isrealm)(realm))) - { - functionName = "k_isrealm()"; - rcL = LSH_INVREALM; - goto cleanup; - } - - err_context = "fetching ticket"; - rc4 = (*pkrb_get_pw_in_tkt)(aname, inst, realm, "krbtgt", realm, - lifetime, password); - if (rc4) /* XXX: do we want: && (rc != NO_TKT_FIL) as well? */ - { - functionName = "krb_get_pw_in_tkt()"; - rcL = KRBERR(rc4); - goto cleanup; - } - } - } - -#ifndef NO_AFS - if ( !rc5 || (Leash_get_default_use_krb4() && !rc4) ) { - char c; - char *r; - char *t; - for ( r=realm, t=temp; c=*r; r++,t++ ) - *t = isupper(c) ? tolower(c) : c; - *t = '\0'; - - rcA = Leash_afs_klog("afs", temp, realm, lifetime); - if (rcA) - rcA = Leash_afs_klog("afs", "", realm, lifetime); - } -#endif /* NO_AFS */ - - cleanup: - return leash_error_message("Ticket initialization failed.", - rcL, (rc5 && rc4)?KRBERR(rc4):0, rc5, rcA, 0, - displayErrors); -} - -long FAR -Leash_renew(void) -{ - if ( hKrb5 && !LeashKRB5_renew() ) { - int lifetime; - lifetime = Leash_get_default_lifetime() / 5; - if (hKrb4 && Leash_get_default_use_krb4()) - Leash_convert524(0); -#ifndef NO_AFS - { - TicketList * list = NULL, * token; - afs_get_tokens(NULL,&list,NULL); - for ( token = list ; token ; token = token->next ) - Leash_afs_klog("afs", token->realm, "", lifetime); - not_an_API_LeashFreeTicketList(&list); - } -#endif /* NO_AFS */ - return 1; - } - return 0; -} - -static BOOL -GetSecurityLogonSessionData(PSECURITY_LOGON_SESSION_DATA * ppSessionData) -{ - NTSTATUS Status = 0; - HANDLE TokenHandle; - TOKEN_STATISTICS Stats; - DWORD ReqLen; - BOOL Success; - - if (!ppSessionData || !pLsaGetLogonSessionData) - return FALSE; - *ppSessionData = NULL; - - Success = OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &TokenHandle ); - if ( !Success ) - return FALSE; - - Success = GetTokenInformation( TokenHandle, TokenStatistics, &Stats, sizeof(TOKEN_STATISTICS), &ReqLen ); - CloseHandle( TokenHandle ); - if ( !Success ) - return FALSE; - - Status = pLsaGetLogonSessionData( &Stats.AuthenticationId, ppSessionData ); - if ( FAILED(Status) || !ppSessionData ) - return FALSE; - - return TRUE; -} - -// IsKerberosLogon() does not validate whether or not there are valid tickets in the -// cache. It validates whether or not it is reasonable to assume that if we -// attempted to retrieve valid tickets we could do so. Microsoft does not -// automatically renew expired tickets. Therefore, the cache could contain -// expired or invalid tickets. Microsoft also caches the user's password -// and will use it to retrieve new TGTs if the cache is empty and tickets -// are requested. - -static BOOL -IsKerberosLogon(VOID) -{ - PSECURITY_LOGON_SESSION_DATA pSessionData = NULL; - BOOL Success = FALSE; - - if ( GetSecurityLogonSessionData(&pSessionData) ) { - if ( pSessionData->AuthenticationPackage.Buffer ) { - WCHAR buffer[256]; - WCHAR *usBuffer; - int usLength; - - Success = FALSE; - usBuffer = (pSessionData->AuthenticationPackage).Buffer; - usLength = (pSessionData->AuthenticationPackage).Length; - if (usLength < 256) - { - lstrcpyn (buffer, usBuffer, usLength); - lstrcat (buffer,L""); - if ( !lstrcmp(L"Kerberos",buffer) ) - Success = TRUE; - } - } - pLsaFreeReturnBuffer(pSessionData); - } - return Success; -} - - -// This looks really ugly because it is. The result of IsKerberosLogon() -// does not prove whether or not there are Kerberos tickets available to -// be imported. Only the call to khm_krb5_ms2mit() which actually attempts -// to import tickets can do that. However, calling khm_krb5_ms2mit() can -// result in a TGS_REQ being sent to the KDC and since Leash_importable() -// is called quite often we want to avoid this if at all possible. -// Unfortunately, we have be shown at least one case in which the primary -// authentication package was not Kerberos and yet there were Kerberos -// tickets available. Therefore, if IsKerberosLogon() is not TRUE we -// must call khm_krb5_ms2mit() but we still do not want to call it in a -// tight loop so we cache the response and assume it won't change. -long FAR -Leash_importable(void) -{ - if ( IsKerberosLogon() ) - return TRUE; - else { - static int response = -1; - if (response == -1) { - response = khm_krb5_ms2mit(0); - } - return response; - } -} - -long FAR -Leash_import(void) -{ - if ( khm_krb5_ms2mit(1) ) { - int lifetime; - lifetime = Leash_get_default_lifetime() / 5; - if (hKrb4 && Leash_get_default_use_krb4()) - Leash_convert524(0); -#ifndef NO_AFS - { - char c; - char *r; - char *t; - char cell[256]; - char realm[256]; - int i = 0; - int rcA = 0; - - krb5_context ctx = 0; - krb5_error_code code = 0; - krb5_ccache cc = 0; - krb5_principal me = 0; - - if ( !pkrb5_init_context ) - goto cleanup; - - code = pkrb5_init_context(&ctx); - if (code) goto cleanup; - - code = pkrb5_cc_default(ctx, &cc); - if (code) goto cleanup; - - if (code = pkrb5_cc_get_principal(ctx, cc, &me)) - goto cleanup; - - for ( r=realm, t=cell, i=0; ilength; r++,t++,i++ ) { - c = krb5_princ_realm(ctx, me)->data[i]; - *r = c; - *t = isupper(c) ? tolower(c) : c; - } - *r = *t = '\0'; - - rcA = Leash_afs_klog("afs", cell, realm, lifetime); - if (rcA) - rcA = Leash_afs_klog("afs", "", realm, lifetime); - - cleanup: - if (me) - pkrb5_free_principal(ctx, me); - if (cc) - pkrb5_cc_close(ctx, cc); - if (ctx) - pkrb5_free_context(ctx); - } -#endif /* NO_AFS */ - return 1; - } - return 0; -} - -long -Leash_kdestroy(void) -{ - int k_errno; - - Leash_afs_unlog(); - khm_krb5_destroy_identity(NULL); - - if (pdest_tkt != NULL) - { - k_errno = (*pdest_tkt)(); - if (k_errno && (k_errno != RET_TKFIL)) - return KRBERR(k_errno); - } - - return 0; -} - -int com_addr(void) -{ - long ipAddr; - char loc_addr[ADDR_SZ]; - CREDENTIALS cred; - char service[40]; - char instance[40]; -// char addr[40]; - char realm[40]; - struct in_addr LocAddr; - int k_errno; - - if (pkrb_get_cred == NULL) - return(KSUCCESS); - - k_errno = (*pkrb_get_cred)(service,instance,realm,&cred); - if (k_errno) - return KRBERR(k_errno); - - - while(1) { - ipAddr = (*pLocalHostAddr)(); - LocAddr.s_addr = ipAddr; - strcpy(loc_addr,inet_ntoa(LocAddr)); - if ( strcmp(cred.address,loc_addr) != 0) { - Leash_kdestroy (); - break; - } - break; - } // while() - return 0; -} - -long FAR -not_an_API_LeashFreeTicketList(TicketList** ticketList) -{ - TicketList* tempList = *ticketList, *killList; - - //if (tempList == NULL) - //return -1; - - while (tempList) - { - killList = tempList; - - tempList = (TicketList*)tempList->next; - PFREE(killList->theTicket); - if (killList->tktEncType) - PFREE(killList->tktEncType); - if (killList->keyEncType) - PFREE(killList->keyEncType); - if (killList->addrCount) { - int n; - for ( n=0; naddrCount; n++) { - if (killList->addrList[n]) - PFREE(killList->addrList[n]); - } - } - if (killList->addrList) - PFREE(killList->addrList); - if (killList->name) - PFREE(killList->name); - if (killList->inst) - PFREE(killList->inst); - if (killList->realm) - PFREE(killList->realm); - PFREE(killList); - } - - *ticketList = NULL; - return 0; -} - - -long FAR Leash_klist(HWND hlist, TICKETINFO FAR *ticketinfo) -{ - // Don't think this function will be used anymore - ADL 5-15-99 - // Old fucntion to put tickets in a listbox control - // Use function "not_an_API_LeashKRB4GetTickets()" instead! - char pname[ANAME_SZ]; - char pinst[INST_SZ]; - char prealm[REALM_SZ]; - char buf[MAX_K_NAME_SZ+40]; - LPSTR cp; - long expdate; - int k_errno; - CREDENTIALS c; - int newtickets = 0; - int open = 0; - - /* - * Since krb_get_tf_realm will return a ticket_file error, - * we will call tf_init and tf_close first to filter out - * things like no ticket file. Otherwise, the error that - * the user would see would be - * klist: can't find realm of ticket file: No ticket file (tf_util) - * instead of - * klist: No ticket file (tf_util) - */ - if (ptf_init == NULL) - return(KSUCCESS); - - if (hlist) - { - SendMessage(hlist, WM_SETREDRAW, FALSE, 0L); - SendMessage(hlist, LB_RESETCONTENT, 0, 0L); - } - com_addr(); - newtickets = NO_TICKETS; - - err_context = (LPSTR)"tktf1"; - - /* Open ticket file */ - if (k_errno = (*ptf_init)((*ptkt_string)(), R_TKT_FIL)) - { - goto cleanup; - } - /* Close ticket file */ - (void) (*ptf_close)(); - /* - * We must find the realm of the ticket file here before calling - * tf_init because since the realm of the ticket file is not - * really stored in the principal section of the file, the - * routine we use must itself call tf_init and tf_close. - */ - err_context = "tf realm"; - if ((k_errno = (*pkrb_get_tf_realm)((*ptkt_string)(), prealm)) != KSUCCESS) - { - goto cleanup; - } - /* Open ticket file */ - err_context = "tf init"; - if (k_errno = (*ptf_init)((*ptkt_string)(), R_TKT_FIL)) - { - goto cleanup; - } - - open = 1; - err_context = "tf pname"; - /* Get principal name and instance */ - if ((k_errno = (*ptf_get_pname)(pname)) || (k_errno = (*ptf_get_pinst)(pinst))) - { - goto cleanup; - } - - /* - * You may think that this is the obvious place to get the - * realm of the ticket file, but it can't be done here as the - * routine to do this must open the ticket file. This is why - * it was done before tf_init. - */ - - wsprintf((LPSTR)ticketinfo->principal,"%s%s%s%s%s", (LPSTR)pname, - (LPSTR)(pinst[0] ? "." : ""), (LPSTR)pinst, - (LPSTR)(prealm[0] ? "@" : ""), (LPSTR)prealm); - newtickets = GOOD_TICKETS; - - err_context = "tf cred"; - while ((k_errno = (*ptf_get_cred)(&c)) == KSUCCESS) - { - expdate = c.issue_date + c.lifetime * 5L * 60L; - - if (!lstrcmp((LPSTR)c.service, (LPSTR)TICKET_GRANTING_TICKET) && !lstrcmp((LPSTR)c.instance, (LPSTR)prealm)) - { - ticketinfo->issue_date = c.issue_date; - ticketinfo->lifetime = c.lifetime * 5L * 60L; - ticketinfo->renew_till = 0; - } - - cp = (LPSTR)buf; - lstrcpy(cp, (LPSTR)short_date(&c.issue_date)); - cp += lstrlen(cp); - wsprintf(cp,"\t%s\t%s%s%s%s%s", - (LPSTR)short_date(&expdate), (LPSTR)c.service, - (LPSTR)(c.instance[0] ? "." : ""), - (LPSTR)c.instance, (LPSTR)(c.realm[0] ? "@" : ""), - (LPSTR) c.realm); - if (hlist) - SendMessage(hlist, LB_ADDSTRING, 0, (LONG)(LPSTR)buf); - } /* WHILE */ - -cleanup: - - if (open) - (*ptf_close)(); /* close ticket file */ - - if (hlist) - { - SendMessage(hlist, WM_SETREDRAW, TRUE, 0L); - InvalidateRect(hlist, NULL, TRUE); - UpdateWindow(hlist); - } - if (k_errno == EOF) - k_errno = 0; - - /* XXX the if statement directly below was inserted to eliminate - an error 20 on Leash startup. The error occurs from an error - number thrown from krb_get_tf_realm. We believe this change - does not eliminate other errors, but it may. */ - - if (k_errno == RET_NOTKT) - k_errno = 0; - - ticketinfo->btickets = newtickets; - if (k_errno != 0) - return KRBERR(k_errno); - return 0; -} - - - -static BOOL CALLBACK -EnumChildProc(HWND hwnd, LPARAM lParam) -{ - HWND * h = (HWND *)lParam; - *h = hwnd; - return FALSE; -} - - -static HWND -FindFirstChildWindow(HWND parent) -{ - HWND hFirstChild = 0; - EnumChildWindows(parent, EnumChildProc, (LPARAM) &hFirstChild); - return hFirstChild; -} - -void FAR -not_an_API_Leash_AcquireInitialTicketsIfNeeded(krb5_context context, krb5_principal desiredKrb5Principal) -{ - krb5_error_code err; - LSH_DLGINFO_EX dlginfo; - HGLOBAL hData; - HWND hLeash; - HWND hForeground; - char *desiredName = 0; - char *desiredRealm = 0; - char *p; - TicketList * list = NULL; - TICKETINFO ticketinfo; - krb5_context ctx; - char newenv[256]; - char * env = 0; - DWORD dwMsLsaImport = Leash_get_default_mslsa_import(); - - char loginenv[16]; - BOOL prompt; - - GetEnvironmentVariable("KERBEROSLOGIN_NEVER_PROMPT", loginenv, sizeof(loginenv)); - prompt = (GetLastError() == ERROR_ENVVAR_NOT_FOUND); - - if ( !prompt || !pkrb5_init_context ) - return; - - ctx = context; - env = getenv("KRB5CCNAME"); - if ( !env && context ) { - sprintf(newenv,"KRB5CCNAME=%s",pkrb5_cc_default_name(ctx)); - env = (char *)putenv(newenv); - } - - not_an_API_LeashKRB5GetTickets(&ticketinfo,&list,&ctx); - not_an_API_LeashFreeTicketList(&list); - - if ( ticketinfo.btickets != GOOD_TICKETS && - Leash_get_default_mslsa_import() && Leash_importable() ) { - // We have the option of importing tickets from the MSLSA - // but should we? Do the tickets in the MSLSA cache belong - // to the default realm used by Leash? If so, import. - int import = 0; - - if ( dwMsLsaImport == 1 ) { /* always import */ - import = 1; - } else if ( dwMsLsaImport == 2 ) { /* import when realms match */ - krb5_error_code code; - krb5_ccache mslsa_ccache=0; - krb5_principal princ = 0; - char ms_realm[128] = "", *def_realm = 0, *r; - int i; - - if (code = pkrb5_cc_resolve(ctx, "MSLSA:", &mslsa_ccache)) - goto cleanup; - - if (code = pkrb5_cc_get_principal(ctx, mslsa_ccache, &princ)) - goto cleanup; - - for ( r=ms_realm, i=0; ilength; r++, i++ ) { - *r = krb5_princ_realm(ctx, princ)->data[i]; - } - *r = '\0'; - - if (code = pkrb5_get_default_realm(ctx, &def_realm)) - goto cleanup; - - import = !strcmp(def_realm, ms_realm); - - cleanup: - if (def_realm) - pkrb5_free_default_realm(ctx, def_realm); - - if (princ) - pkrb5_free_principal(ctx, princ); - - if (mslsa_ccache) - pkrb5_cc_close(ctx, mslsa_ccache); - } - - if ( import ) { - Leash_import(); - - not_an_API_LeashKRB5GetTickets(&ticketinfo,&list,&ctx); - not_an_API_LeashFreeTicketList(&list); - } - } - - if ( ticketinfo.btickets != GOOD_TICKETS ) - { - /* do we want a specific client principal? */ - if (desiredKrb5Principal != NULL) { - err = pkrb5_unparse_name (ctx, desiredKrb5Principal, &desiredName); - if (!err) { - dlginfo.username = desiredName; - for (p = desiredName; *p && *p != '@'; p++); - if ( *p == '@' ) { - *p = '\0'; - desiredRealm = dlginfo.realm = ++p; - } - } - } - -#ifdef COMMENT - memset(&dlginfo, 0, sizeof(LSH_DLGINFO_EX)); - dlginfo.size = sizeof(LSH_DLGINFO_EX); - dlginfo.dlgtype = DLGTYPE_PASSWD; - dlginfo.title = "Obtain Kerberos Ticket Getting Tickets"; - dlginfo.use_defaults = 1; - - err = Leash_kinit_dlg_ex(NULL, &dlginfo); -#else - /* construct a marshalling of data - * <principal><realm> - * then send to Leash - */ - - hData = GlobalAlloc( GHND, 4096 ); - hForeground = GetForegroundWindow(); - hLeash = FindWindow("LEASH.0WNDCLASS", NULL); - SetForegroundWindow(hLeash); - hLeash = FindFirstChildWindow(hLeash); - if ( hData && hLeash ) { - char * strs = GlobalLock( hData ); - if ( strs ) { - strcpy(strs, "Obtain Kerberos Ticket Getting Tickets"); - strs += strlen(strs) + 1; - if ( desiredName ) { - strcpy(strs, desiredName); - strs += strlen(strs) + 1; - if (desiredRealm) { - strcpy(strs, desiredRealm); - strs += strlen(strs) + 1; - } - } else { - *strs = 0; - strs++; - *strs = 0; - strs++; - } - - GlobalUnlock( hData ); - SendMessage(hLeash, 32809, 0, (LPARAM) hData); - } - - GlobalFree( hData ); - } - SetForegroundWindow(hForeground); -#endif - if (desiredName != NULL) - pkrb5_free_unparsed_name(ctx, desiredName); - } - - if ( !env && context ) - putenv("KRB5CCNAME="); - - if ( !context ) - pkrb5_free_context(ctx); -} diff --git a/src/windows/identity/ui/Makefile b/src/windows/identity/ui/Makefile index c2a78e21b..e09d9f8c7 100644 --- a/src/windows/identity/ui/Makefile +++ b/src/windows/identity/ui/Makefile @@ -52,7 +52,8 @@ OBJFILES= \ $(OBJ)\cfg_general_wnd.obj \ $(OBJ)\cfg_identities_wnd.obj \ $(OBJ)\cfg_notif_wnd.obj \ - $(OBJ)\cfg_plugins_wnd.obj + $(OBJ)\cfg_plugins_wnd.obj \ + $(OBJ)\cfg_appear_wnd.obj RESFILES= \ $(OBJ)\khapp.res \ diff --git a/src/windows/identity/ui/Makefile.w2k b/src/windows/identity/ui/Makefile.w2k new file mode 100644 index 000000000..a64aea7c3 --- /dev/null +++ b/src/windows/identity/ui/Makefile.w2k @@ -0,0 +1,91 @@ +# +# Copyright (c) 2004 Massachusetts Institute of Technology +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + + +MODULE=ui +!include <../config/Makefile.w2k> + +EXEFILE=$(BINDIR)\netidmgr.exe + +OBJFILES= \ + $(OBJ)\main.obj \ + $(OBJ)\mainmenu.obj \ + $(OBJ)\toolbar.obj \ + $(OBJ)\statusbar.obj \ + $(OBJ)\notifier.obj \ + $(OBJ)\timer.obj \ + $(OBJ)\uiconfig.obj \ + $(OBJ)\mainwnd.obj \ + $(OBJ)\credwnd.obj \ + $(OBJ)\htwnd.obj \ + $(OBJ)\passwnd.obj \ + $(OBJ)\newcredwnd.obj \ + $(OBJ)\propertywnd.obj \ + $(OBJ)\credfuncs.obj \ + $(OBJ)\configwnd.obj \ + $(OBJ)\aboutwnd.obj \ + $(OBJ)\reqdaemon.obj \ + $(OBJ)\addrchange.obj \ + $(OBJ)\debugfuncs.obj \ + $(OBJ)\cfg_general_wnd.obj \ + $(OBJ)\cfg_identities_wnd.obj \ + $(OBJ)\cfg_notif_wnd.obj \ + $(OBJ)\cfg_plugins_wnd.obj \ + $(OBJ)\cfg_appear_wnd.obj + +RESFILES= \ + $(OBJ)\khapp.res \ + $(OBJ)\appver.res + +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +LIBFILES=$(LIBDIR)\nidmgr64.lib +!else +LIBFILES=$(LIBDIR)\nidmgr32.lib +!endif + +SDKLIBFILES= \ + comctl32.lib \ + shell32.lib \ + htmlhelp.lib \ + iphlpapi.lib \ + shlwapi.lib + +$(OBJ)\uiconfig.c: uiconfig.csv $(CONFDIR)\csvschema.cfg + $(CCSV) $** $@ + +$(OBJ)\khapp.res: lang\en_us\khapp.rc + $(RC2RES) + +$(OBJ)\appver.res: appver.rc + $(RC2RES) + +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SCLIB=bufferoverflowu.lib +!else +SCLIB= +!endif + +$(EXEFILE): $(OBJFILES) $(RESFILES) $(LIBFILES) + $(EXEGUILINK) $(SDKLIBFILES) $(SCLIB) + +all: mkdirs $(EXEFILE) diff --git a/src/windows/identity/ui/cfg_appear_wnd.c b/src/windows/identity/ui/cfg_appear_wnd.c new file mode 100644 index 000000000..bca270979 --- /dev/null +++ b/src/windows/identity/ui/cfg_appear_wnd.c @@ -0,0 +1,435 @@ +/* + * Copyright (c) 2005 Massachusetts Institute of Technology + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* $Id$ */ + +#include<khmapp.h> +#include<assert.h> + +static int text_sizes[] = { + 4,6,8,9,10,12,14,16,18 +}; + +typedef struct tag_dlg_data { + khui_config_node node; + HWND hwnd; + LOGFONT lf_base; + LOGFONT lf_work; + HFONT c_font_normal; + HFONT c_font_bold; + int size_idx[ARRAYLENGTH(text_sizes)]; +} dlg_data; + +static void +read_params(HWND hwnd, dlg_data * d) { + + HDC hdc; + + hdc = GetWindowDC(hwnd); + + khm_get_cw_element_font(hdc, + NULL, + FALSE, + &d->lf_base); + + d->lf_work = d->lf_base; + + ReleaseDC(hwnd, hdc); +} + + +static void +write_params(dlg_data * d) { + khm_boolean applied = FALSE; + + if (memcmp(&d->lf_work, &d->lf_base, sizeof(LOGFONT))) { + khm_set_cw_element_font(NULL, &d->lf_work); + d->lf_base = d->lf_work; + applied = TRUE; + } + + khui_cfg_set_flags(d->node, + (applied)? KHUI_CNFLAG_APPLIED: 0, + KHUI_CNFLAG_APPLIED | KHUI_CNFLAG_MODIFIED); +} + +static void +check_for_modification(dlg_data * d) { + + khui_cfg_set_flags(d->node, + ((memcmp(&d->lf_work, &d->lf_base, sizeof(LOGFONT)))? + KHUI_CNFLAG_MODIFIED: 0), + KHUI_CNFLAG_MODIFIED); +} + +static void +refresh_view(HWND hwnd, dlg_data * d) { + wchar_t sample[256]; + HFONT hf; + LOGFONT lf; + + LoadString(khm_hInstance, IDS_APR_SAMPLE_TEXT_NORMAL, + sample, ARRAYLENGTH(sample)); + + SetDlgItemText(hwnd, IDC_CFG_SAMPLE_NORMAL, sample); + + LoadString(khm_hInstance, IDS_APR_SAMPLE_TEXT_SEL, + sample, ARRAYLENGTH(sample)); + + SetDlgItemText(hwnd, IDC_CFG_SAMPLE_BOLD, sample); + + lf = d->lf_work; + hf = CreateFontIndirect(&lf); + if (hf == NULL) + return; + + SendDlgItemMessage(hwnd, IDC_CFG_SAMPLE_NORMAL, WM_SETFONT, (WPARAM) hf, TRUE); + + if (d->c_font_normal) + DeleteObject(d->c_font_normal); + + d->c_font_normal = hf; + + lf.lfWeight = FW_BOLD; + + hf = CreateFontIndirect(&lf); + if (hf == NULL) + return; + + SendDlgItemMessage(hwnd, IDC_CFG_SAMPLE_BOLD, WM_SETFONT, (WPARAM) hf, TRUE); + + if (d->c_font_bold) + DeleteObject(d->c_font_bold); + + d->c_font_bold = hf; +} + +struct sel_update_blob { + dlg_data * d; + HDC hdc; +}; + +static int CALLBACK +enum_font_proc(ENUMLOGFONTEXDV * plfe, + ENUMTEXTMETRIC * pntm, + DWORD font_type, + LPARAM lParam) { + struct sel_update_blob * blob = (struct sel_update_blob *) lParam; + LOGFONT * plf = &plfe->elfEnumLogfontEx.elfLogFont; + LRESULT lr; + + lr = SendDlgItemMessage(blob->d->hwnd, + IDC_CFG_FONTS, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM) plf->lfFaceName); + + if (lr == CB_ERR) { + SendDlgItemMessage(blob->d->hwnd, + IDC_CFG_FONTS, + CB_SELECTSTRING, + (WPARAM) -1, + (LPARAM) plfe->elfEnumLogfontEx.elfFullName); + } + + return FALSE; +} + +static void +update_selection(dlg_data * d, BOOL update_fonts, BOOL update_effects) { + LOGFONT lf; + struct sel_update_blob blob; + HDC hdc; + + if (update_fonts) { + + ZeroMemory(&lf, sizeof(lf)); + + lf.lfCharSet = ANSI_CHARSET; + StringCbCopy(lf.lfFaceName, sizeof(lf.lfFaceName), + d->lf_work.lfFaceName); + + hdc = GetWindowDC(d->hwnd); + + blob.d = d; + blob.hdc = hdc; + + EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC) enum_font_proc, + (LPARAM) &blob, 0); + + ReleaseDC(d->hwnd, hdc); + } + + if (update_effects) { + int i; + HDC hdc; + int pt_height; + + if (d->lf_work.lfWeight >= FW_BOLD) + CheckDlgButton(d->hwnd, IDC_CFG_BOLD, BST_CHECKED); + else + CheckDlgButton(d->hwnd, IDC_CFG_BOLD, BST_UNCHECKED); + + if (d->lf_work.lfItalic) + CheckDlgButton(d->hwnd, IDC_CFG_ITALICS, BST_CHECKED); + else + CheckDlgButton(d->hwnd, IDC_CFG_ITALICS, BST_UNCHECKED); + + hdc = GetWindowDC(d->hwnd); + + pt_height = MulDiv(d->lf_work.lfHeight, 72, + GetDeviceCaps(hdc, LOGPIXELSY)); + + + ReleaseDC(d->hwnd, hdc); + + if (pt_height < 0) + pt_height = - pt_height; + + for (i=0; i < ARRAYLENGTH(text_sizes); i++) { + if (text_sizes[i] >= pt_height) + break; + } + + if (i >= ARRAYLENGTH(text_sizes)) + i = ARRAYLENGTH(text_sizes) - 1; + + SendDlgItemMessage(d->hwnd, IDC_CFG_SIZE, CB_SETCURSEL, + d->size_idx[i], 0); + } +} + +static int CALLBACK +enum_font_families_proc(ENUMLOGFONTEXDV * plfe, + ENUMTEXTMETRIC * pntm, + DWORD font_type, + LPARAM lParam) { + + dlg_data * d = (dlg_data *) lParam; + + SendDlgItemMessage(d->hwnd, IDC_CFG_FONTS, + CB_ADDSTRING, 0, + (LPARAM) plfe->elfEnumLogfontEx.elfLogFont.lfFaceName); + + return TRUE; +} + +INT_PTR CALLBACK +khm_cfg_appearance_proc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { + + dlg_data * d; + + switch(uMsg) { + case WM_INITDIALOG: + { + HWND hw_cb; + LOGFONT lf; + HDC hdc; + int i; + wchar_t buf[4]; + + d = PMALLOC(sizeof(*d)); +#ifdef DEBUG + assert(d != NULL); +#endif + +#pragma warning(push) +#pragma warning(disable: 4244) + SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR) d); +#pragma warning(pop) + + ZeroMemory(d, sizeof(*d)); + + d->node = (khui_config_node) lParam; + d->hwnd = hwnd; + + read_params(hwnd, d); + + hw_cb = GetDlgItem(hwnd, IDC_CFG_FONTS); +#ifdef DEBUG + assert(hw_cb); +#endif + SendMessage(hw_cb, CB_RESETCONTENT, 0, 0); + + ZeroMemory(&lf, sizeof(lf)); + lf.lfCharSet = ANSI_CHARSET; + + hdc = GetWindowDC(hwnd); + + EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC) enum_font_families_proc, + (LPARAM) d, 0); + + ReleaseDC(hwnd, hdc); + + + for (i=0; i < ARRAYLENGTH(text_sizes); i++) { + LRESULT idx; + + StringCbPrintf(buf, sizeof(buf), L"%d", text_sizes[i]); + + idx = SendDlgItemMessage(hwnd, IDC_CFG_SIZE, + CB_ADDSTRING, 0, (LPARAM) buf); + + SendDlgItemMessage(hwnd, IDC_CFG_SIZE, + CB_SETITEMDATA, idx, text_sizes[i]); + + d->size_idx[i] = (int) idx; + } + + update_selection(d, TRUE, TRUE); + + refresh_view(hwnd, d); + } + return FALSE; + + case WM_COMMAND: + d = (dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + + if (wParam == MAKEWPARAM(IDC_CFG_FONTS, CBN_SELCHANGE)) { + LRESULT idx; + wchar_t facename[LF_FACESIZE]; + + idx = SendDlgItemMessage(hwnd, IDC_CFG_FONTS, + CB_GETCURSEL, + 0, 0); + + if (idx == CB_ERR) + return TRUE; + + if (SendDlgItemMessage(hwnd, IDC_CFG_FONTS, + CB_GETLBTEXTLEN, idx, 0) + >= ARRAYLENGTH(facename)) + return TRUE; + + SendDlgItemMessage(hwnd, IDC_CFG_FONTS, + CB_GETLBTEXT, idx, + (LPARAM) facename); + + ZeroMemory(d->lf_work.lfFaceName, + sizeof(d->lf_work.lfFaceName)); + + StringCbCopy(d->lf_work.lfFaceName, + sizeof(d->lf_work.lfFaceName), + facename); + + update_selection(d, FALSE, FALSE); + + refresh_view(hwnd, d); + + check_for_modification(d); + + } else if (wParam == MAKEWPARAM(IDC_CFG_BOLD, BN_CLICKED)) { + + if (IsDlgButtonChecked(hwnd, IDC_CFG_BOLD) == BST_CHECKED) { + d->lf_work.lfWeight = FW_BOLD; + } else { + d->lf_work.lfWeight = 0; + } + + refresh_view(hwnd, d); + + check_for_modification(d); + + } else if (wParam == MAKEWPARAM(IDC_CFG_ITALICS, BN_CLICKED)) { + + d->lf_work.lfItalic = + (IsDlgButtonChecked(hwnd, IDC_CFG_ITALICS) == BST_CHECKED); + + refresh_view(hwnd, d); + + check_for_modification(d); + + } else if (wParam == MAKEWPARAM(IDC_CFG_REVERT, BN_CLICKED)) { + HDC hdc; + + hdc = GetWindowDC(hwnd); + + khm_get_cw_element_font(hdc, NULL, TRUE, &d->lf_work); + + ReleaseDC(hwnd, hdc); + + update_selection(d, TRUE, TRUE); + + refresh_view(hwnd, d); + + check_for_modification(d); + + } else if (wParam == MAKEWPARAM(IDC_CFG_SIZE, CBN_SELCHANGE)) { + HDC hdc; + LPARAM idx; + int points; + + idx = SendDlgItemMessage(hwnd, IDC_CFG_SIZE, + CB_GETCURSEL, 0, 0); + if (idx == CB_ERR) + return TRUE; + + points = (int) SendDlgItemMessage(hwnd, IDC_CFG_SIZE, + CB_GETITEMDATA, idx, 0); + + hdc = GetWindowDC(hwnd); + + d->lf_work.lfHeight = -MulDiv(points, + GetDeviceCaps(hdc, LOGPIXELSY), + 72); + + ReleaseDC(hwnd, hdc); + + refresh_view(hwnd, d); + + check_for_modification(d); + } + + return TRUE; + + case WM_DESTROY: + d = (dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + + if (d) { + if (d->c_font_bold) + DeleteObject(d->c_font_bold); + + if (d->c_font_normal) + DeleteObject(d->c_font_normal); + + PFREE(d); + } + return TRUE; + + case KHUI_WM_CFG_NOTIFY: + d = (dlg_data *) (LONG_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + + if (HIWORD(wParam) == WMCFG_APPLY) { + write_params(d); + khui_action_trigger(KHUI_ACTION_LAYOUT_RELOAD, NULL); + } + + return TRUE; + } + + return FALSE; +} diff --git a/src/windows/identity/ui/cfg_general_wnd.c b/src/windows/identity/ui/cfg_general_wnd.c index c01402b84..03c430060 100644 --- a/src/windows/identity/ui/cfg_general_wnd.c +++ b/src/windows/identity/ui/cfg_general_wnd.c @@ -256,6 +256,13 @@ khm_cfg_general_proc(HWND hwnd, return FALSE; + case WM_DESTROY: + d = (dlg_data *) (DWORD_PTR) GetWindowLongPtr(hwnd, DWLP_USER); + if (d) { + PFREE(d); + } + return TRUE; + case WM_COMMAND: d = (dlg_data *) (DWORD_PTR) GetWindowLongPtr(hwnd, DWLP_USER); diff --git a/src/windows/identity/ui/configwnd.c b/src/windows/identity/ui/configwnd.c index 63ec2d5fe..a7da44677 100644 --- a/src/windows/identity/ui/configwnd.c +++ b/src/windows/identity/ui/configwnd.c @@ -894,6 +894,16 @@ void khm_init_config(void) { khui_cfg_register(NULL, ®); + reg.name = L"KhmAppear"; + reg.dlg_template = MAKEINTRESOURCE(IDD_CFG_APPEAR); + reg.dlg_proc = khm_cfg_appearance_proc; + LoadString(khm_hInstance, IDS_CFG_APPEAR_SHORT, + wshort, ARRAYLENGTH(wshort)); + LoadString(khm_hInstance, IDS_CFG_APPEAR_LONG, + wlong, ARRAYLENGTH(wlong)); + + khui_cfg_register(NULL, ®); + reg.name = L"KhmIdentities"; reg.dlg_template = MAKEINTRESOURCE(IDD_CFG_IDENTITIES); reg.dlg_proc = khm_cfg_identities_proc; diff --git a/src/windows/identity/ui/configwnd.h b/src/windows/identity/ui/configwnd.h index 61db340c8..693ec7d72 100644 --- a/src/windows/identity/ui/configwnd.h +++ b/src/windows/identity/ui/configwnd.h @@ -79,4 +79,10 @@ khm_cfg_plugins_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + +INT_PTR CALLBACK +khm_cfg_appearance_proc(HWND hwnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam); #endif diff --git a/src/windows/identity/ui/credwnd.c b/src/windows/identity/ui/credwnd.c index 1d5d6643e..1289561e4 100644 --- a/src/windows/identity/ui/credwnd.c +++ b/src/windows/identity/ui/credwnd.c @@ -33,6 +33,169 @@ khm_int32 khui_cw_flag_id; khm_int32 attr_to_action[KCDB_ATTR_MAX_ID + 1]; +void +khm_set_cw_element_font(wchar_t * name, LOGFONT * pfont) { + khm_handle csp_cw = NULL; + wchar_t * element_name; + + if (name == NULL) + element_name = L"FontBase"; + else + element_name = name; + + if (KHM_FAILED(khc_open_space(NULL, L"CredWindow", KHM_PERM_WRITE, + &csp_cw))) + return; + + khc_write_binary(csp_cw, element_name, pfont, sizeof(LOGFONT)); + + khc_close_space(csp_cw); +} + +void +khm_get_cw_element_font(HDC hdc, wchar_t * name, BOOL use_default, LOGFONT * pfont) { + khm_handle csp_cw = NULL; + khm_size cb; + wchar_t * element_name; + khm_boolean try_derive = FALSE; + + if (name == NULL) + element_name = L"FontBase"; + else + element_name = name; + + if (use_default) + goto _use_defaults; + + if (KHM_FAILED(khc_open_space(NULL, L"CredWindow", 0, + &csp_cw))) + goto _use_defaults; + + cb = sizeof(LOGFONT); + if (KHM_FAILED(khc_read_binary(csp_cw, element_name, pfont, + &cb)) || + cb != sizeof(LOGFONT)) { + try_derive = TRUE; + } + + if (try_derive) { + cb = sizeof(LOGFONT); + if (!name || + KHM_FAILED(khc_read_binary(csp_cw, L"FontBase", pfont, + &cb)) || + cb != sizeof(LOGFONT)) { + khc_close_space(csp_cw); + goto _use_defaults; + } + + if (!wcscmp(name, L"FontHeaderBold") || + !wcscmp(name, L"FontBold")) { + + pfont->lfWeight = FW_BOLD; + + } + } + + khc_close_space(csp_cw); + + return; + + _use_defaults: + + ZeroMemory(pfont, sizeof(*pfont)); + + if (name == NULL) { + LOGFONT lf = { + -MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72), 0, /* width/height */ + 0,0, /* escapement */ + FW_THIN, + FALSE, + FALSE, + FALSE, + DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_SWISS, + L"MS Shell Dlg"}; + + *pfont = lf; + + } else if (!wcscmp(name, L"FontHeader")) { + LOGFONT lf = { + -MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72), 0, /* width/height */ + 0,0, /* escapement */ + FW_THIN, + FALSE, + FALSE, + FALSE, + DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_SWISS, + L"MS Shell Dlg"}; + + *pfont = lf; + + } else if (!wcscmp(name, L"FontHeaderBold")) { + LOGFONT lf = { + -MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72), 0, /* width/height */ + 0,0, /* escapement */ + FW_BOLD, + FALSE, + FALSE, + FALSE, + DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_SWISS, + L"MS Shell Dlg"}; + + *pfont = lf; + + } else if (!wcscmp(name, L"FontNormal")) { + LOGFONT lf = { + -MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72), 0, /* width/height */ + 0,0, /* escapement */ + FW_THIN, + FALSE, + FALSE, + FALSE, + DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_SWISS, + L"MS Shell Dlg"}; + + *pfont = lf; + + } else if (!wcscmp(name, L"FontBold")) { + LOGFONT lf = { + -MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72), 0, /* width/height */ + 0,0, /* escapement */ + FW_BOLD, + FALSE, + FALSE, + FALSE, + DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, + FF_SWISS, + L"MS Shell Dlg"}; + + *pfont = lf; + + } else { +#ifdef DEBUG + assert(FALSE); +#endif + } +} + void cw_refresh_attribs(HWND hwnd) { khm_int32 act; @@ -240,6 +403,7 @@ cw_load_view(khui_credwnd_tbl * tbl, wchar_t * view, HWND hwnd) { wchar_t * iter = NULL; int i; HDC hdc; + LOGFONT log_font; tbl->hwnd = hwnd; @@ -390,64 +554,21 @@ _skip_col: hdc = GetWindowDC(hwnd); - tbl->hf_header = - CreateFont(-MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72),0, /* width/height */ - 0,0, /* escapement */ - FW_THIN, - FALSE, - FALSE, - FALSE, - DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_SWISS, - L"MS Shell Dlg"); + khm_get_cw_element_font(hdc, L"FontHeader", FALSE, &log_font); + tbl->hf_header = CreateFontIndirect(&log_font); if(tbl->hf_header && tbl->hwnd_header) SendMessage(tbl->hwnd_header, WM_SETFONT, (WPARAM) tbl->hf_header, 0); - tbl->hf_bold_header = - CreateFont(-MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72),0, /* width/height */ - 0,0, /* escapement */ - FW_BOLD, - FALSE, - FALSE, - FALSE, - DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_SWISS, - L"MS Shell Dlg"); - - tbl->hf_normal = - CreateFont(-MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72),0, /* width/height */ - 0,0, /* escapement */ - FW_THIN, - FALSE, - FALSE, - FALSE, - DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_SWISS, - L"MS Shell Dlg"); - - tbl->hf_bold = - CreateFont(-MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72),0, /* width/height */ - 0,0, /* escapement */ - FW_BOLD, - FALSE, - FALSE, - FALSE, - DEFAULT_CHARSET, - OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, - DEFAULT_QUALITY, - FF_SWISS, - L"MS Shell Dlg"); + khm_get_cw_element_font(hdc, L"FontHeaderBold", FALSE, &log_font); + tbl->hf_bold_header = CreateFontIndirect(&log_font); + + + khm_get_cw_element_font(hdc, L"FontNormal", FALSE, &log_font); + tbl->hf_normal = CreateFontIndirect(&log_font); + + khm_get_cw_element_font(hdc, L"FontBold", FALSE, &log_font); + tbl->hf_bold = CreateFontIndirect(&log_font); ReleaseDC(hwnd, hdc); @@ -1370,6 +1491,8 @@ cw_unload_view(khui_credwnd_tbl * tbl) khc_close_space(tbl->csp_view); tbl->csp_view = NULL; } + + tbl->cell_height = 0; /* recalculate cell height next time */ } void @@ -1411,6 +1534,26 @@ cw_hditem_from_tbl_col(khui_credwnd_col * col, HDITEM *phi) phi->cxy = col->width; } +int +cw_get_cell_height(HDC hdc, HFONT hf) { + SIZE size; + size_t cbbuf; + wchar_t buf[64]; + HFONT hfold; + + if (hf) + hfold = SelectFont(hdc, hf); + + LoadString(khm_hInstance, IDS_SAMPLE_STRING, buf, sizeof(buf)/sizeof(buf[0])); + StringCchLength(buf, sizeof(buf)/sizeof(buf[0]), &cbbuf); + GetTextExtentPoint32(hdc, buf, (int) cbbuf, &size); + + if (hf) + SelectFont(hdc, hfold); + + return size.cy; +} + /* returns a bitmask indicating which measures were changed */ int cw_update_extents(khui_credwnd_tbl * tbl, @@ -1426,24 +1569,25 @@ cw_update_extents(khui_credwnd_tbl * tbl, if(!tbl->cell_height) { HDC dc; - HFONT hfold; - SIZE size; - size_t cbbuf; - wchar_t buf[64]; + int maxheight = 0; + int height; dc = GetWindowDC(tbl->hwnd); - if(tbl->hf_normal) - hfold = SelectFont(dc, tbl->hf_normal); - LoadString(khm_hInstance, IDS_SAMPLE_STRING, buf, sizeof(buf)/sizeof(buf[0])); - StringCchLength(buf, sizeof(buf)/sizeof(buf[0]), &cbbuf); - GetTextExtentPoint32(dc, buf, (int) cbbuf, &size); + maxheight = cw_get_cell_height(dc, tbl->hf_normal); + height = cw_get_cell_height(dc, tbl->hf_bold); + if (height > maxheight) + maxheight = height; + height = cw_get_cell_height(dc, tbl->hf_header); + if (height > maxheight) + maxheight = height; + height = cw_get_cell_height(dc, tbl->hf_bold_header); + if (height > maxheight) + maxheight = height; - if(tbl->hf_normal) - SelectFont(dc,hfold); ReleaseDC(tbl->hwnd, dc); - tbl->cell_height = size.cy + tbl->vpad * 2; + tbl->cell_height = height + tbl->vpad * 2; } ext_y = (int) tbl->n_rows * tbl->cell_height; @@ -1990,16 +2134,33 @@ cw_handle_header_msg(khui_credwnd_tbl * tbl, LPNMHEADER ph) { int i; for (i=idx; i < tbl->n_cols; i++) { - if (!(tbl->cols[i].flags & - (KHUI_CW_COL_GROUP | - KHUI_CW_COL_SORT_INC | - KHUI_CW_COL_SORT_DEC))) + if (!(tbl->cols[i].flags & KHUI_CW_COL_GROUP)) + break; + + tbl->cols[i].flags &= ~KHUI_CW_COL_GROUP; + + cw_hditem_from_tbl_col(&tbl->cols[idx], &hi); + hi.mask = HDI_FORMAT; + hidx = Header_OrderToIndex(tbl->hwnd_header, i); + Header_SetItem(tbl->hwnd_header, hidx, &hi); + } + + } else if (tbl->cols[idx].flags & + (KHUI_CW_COL_SORT_INC | + KHUI_CW_COL_SORT_DEC)) { + int i; + + /* remove the sort condition from a column */ + + for (i=idx; i < tbl->n_cols; i++) { + if (!tbl->cols[i].flags & + (KHUI_CW_COL_SORT_INC | + KHUI_CW_COL_SORT_DEC)) break; tbl->cols[i].flags &= - ~(KHUI_CW_COL_GROUP | - KHUI_CW_COL_SORT_DEC | - KHUI_CW_COL_SORT_INC); + ~(KHUI_CW_COL_SORT_INC | + KHUI_CW_COL_SORT_DEC); cw_hditem_from_tbl_col(&tbl->cols[idx], &hi); hi.mask = HDI_FORMAT; @@ -2247,8 +2408,14 @@ cw_wm_paint(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) for(i=row_s; i < row_e; i++) { selected = tbl->rows[i].flags & KHUI_CW_ROW_SELECTED; - if(tbl->cursor_row == i) - SelectFont(hdc, tbl->hf_bold); + if(tbl->cursor_row == i) { + if (tbl->rows[i].flags & KHUI_CW_ROW_HEADER) + SelectFont(hdc, tbl->hf_bold_header); + else + SelectFont(hdc, tbl->hf_bold); + } else if (tbl->rows[i].flags & KHUI_CW_ROW_HEADER) { + SelectFont(hdc, tbl->hf_header); + } x = xs; if(tbl->rows[i].flags & KHUI_CW_ROW_HEADER) { @@ -2353,9 +2520,11 @@ cw_wm_paint(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if(tbl->cursor_row == i) { rh.left = tbl->scr_left; rh.right = tbl->scr_left + tbl->ext_width; - DrawFocusRect(hdc, &rh); + } + if (tbl->cursor_row == i || + (tbl->rows[i].flags & KHUI_CW_ROW_HEADER)) { SelectFont(hdc, tbl->hf_normal); } @@ -3964,6 +4133,33 @@ cw_wm_command(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } break; + case KHUI_ACTION_LAYOUT_RELOAD: + { + wchar_t cname[KCONF_MAXCCH_NAME]; + khm_size cb; + + cname[0] = L'\0'; + + if (tbl->csp_view) { + cb = sizeof(cname); + khc_get_config_space_name(tbl->csp_view, + cname, + &cb); + } + + cw_unload_view(tbl); + + cw_load_view(tbl, ((cname[0])?cname: NULL), hwnd); + cw_insert_header_cols(tbl); + + cw_update_creds(tbl); + cw_update_outline(tbl); + cw_update_extents(tbl, TRUE); + + InvalidateRect(tbl->hwnd, NULL, TRUE); + } + break; + case KHUI_ACTION_LAYOUT_ID: { cw_save_view(tbl, NULL); diff --git a/src/windows/identity/ui/credwnd.h b/src/windows/identity/ui/credwnd.h index 0c1e766b5..50b7a114f 100644 --- a/src/windows/identity/ui/credwnd.h +++ b/src/windows/identity/ui/credwnd.h @@ -251,4 +251,9 @@ int cw_update_extents(khui_credwnd_tbl * tbl, khm_boolean update_scroll); void cw_insert_header_cols(khui_credwnd_tbl * tbl); +void khm_get_cw_element_font(HDC hdc, wchar_t * name, BOOL use_default, + LOGFONT * pfont); + +void khm_set_cw_element_font(wchar_t * name, LOGFONT * pfont); + #endif diff --git a/src/windows/identity/ui/lang/en_us/khapp.rc b/src/windows/identity/ui/lang/en_us/khapp.rc index 0a746199b..ceba01f5a 100644 --- a/src/windows/identity/ui/lang/en_us/khapp.rc +++ b/src/windows/identity/ui/lang/en_us/khapp.rc @@ -417,6 +417,31 @@ BEGIN LTEXT "Loaded modules",IDC_STATIC,41,60,52,8 END +IDD_CFG_APPEAR DIALOGEX 0, 0, 255, 182 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU +EXSTYLE WS_EX_CONTROLPARENT +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + GROUPBOX "Font for credentials display",IDC_STATIC,7,7,241,137 + LTEXT "&Font name",IDC_STATIC,17,22,35,8 + COMBOBOX IDC_CFG_FONTS,62,20,178,30,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "&Size",IDC_STATIC,62,43,14,8 + COMBOBOX IDC_CFG_SIZE,87,41,48,14,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + CONTROL "&Bold",IDC_CFG_BOLD,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,162,42,29,10 + CONTROL "&Italics",IDC_CFG_ITALICS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,205,42,35,10 + EDITTEXT IDC_CFG_SAMPLE_NORMAL,62,66,178,21,ES_AUTOHSCROLL | + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, + WS_EX_STATICEDGE + EDITTEXT IDC_CFG_SAMPLE_BOLD,62,91,178,21,ES_AUTOHSCROLL | + ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, + WS_EX_STATICEDGE + PUSHBUTTON "&Revert to default",IDC_CFG_REVERT,168,122,72,14 +END + ///////////////////////////////////////////////////////////////////////////// // @@ -541,6 +566,18 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 163 END + + IDD_CFG_APPEAR, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 248 + VERTGUIDE, 7 + VERTGUIDE, 62 + VERTGUIDE, 240 + VERTGUIDE, 248 + TOPMARGIN, 7 + BOTTOMMARGIN, 175 + END END #endif // APSTUDIO_INVOKED @@ -736,6 +773,19 @@ BEGIN IDS_CFG_P_UNRCNFM "Are you sure you want to unregister plugin %s? In addition to this plugin, any other plugins that are provided by the same module will also be unregistered.\n\nThe plugin will no longer be loaded for subsequent sessions of NetIDMgr." IDS_CFG_P_UNRCNFS "Note that if the plugin was registered by a seprate installer, it should be unregistered by the same installer and not through NetIDMgr.\n\nThe following plugins will be unregistered: %s" IDS_ACTION_LAYOUT_CUST "Custom" + IDS_APR_HEADER_TEXT "Header text" +END + +STRINGTABLE +BEGIN + IDS_APR_HEADER_TEXT_BOLD "Header text (selected)" + IDS_APR_TEXT "Normal text" + IDS_APR_TEXT_BOLD "Normal text (selected)" + IDS_APR_SAMPLE_TEXT_NORMAL "Sample text (normal). 01234567890" + IDS_CFG_APPEAR_SHORT "Appearance" + IDS_CFG_APPEAR_LONG "Appearance" + IDS_ACTION_OPT_APPEAR "Appearance ..." + IDS_APR_SAMPLE_TEXT_SEL "Sample text (selected). 01234567890" END #endif // English (U.S.) resources diff --git a/src/windows/identity/ui/mainwnd.c b/src/windows/identity/ui/mainwnd.c index 84a580ce0..81886fa8e 100644 --- a/src/windows/identity/ui/mainwnd.c +++ b/src/windows/identity/ui/mainwnd.c @@ -273,6 +273,14 @@ khm_main_wnd_proc(HWND hwnd, } break; + case KHUI_ACTION_OPT_APPEAR: { + khui_config_node node = NULL; + + khui_cfg_open(NULL, L"KhmAppear", &node); + khm_show_config_pane(node); + } + break; + case KHUI_ACTION_OPT_NOTIF: { khui_config_node node = NULL; @@ -375,6 +383,7 @@ khm_main_wnd_proc(HWND hwnd, case KHUI_ACTION_LAYOUT_TYPE: case KHUI_ACTION_LAYOUT_LOC: case KHUI_ACTION_LAYOUT_CUST: + case KHUI_ACTION_LAYOUT_RELOAD: /* otherwise fallthrough and bounce to the creds window */ return SendMessage(khm_hwnd_main_cred, uMsg, wParam, lParam); diff --git a/src/windows/identity/ui/notifier.c b/src/windows/identity/ui/notifier.c index cde643ab2..eb46824c7 100644 --- a/src/windows/identity/ui/notifier.c +++ b/src/windows/identity/ui/notifier.c @@ -135,6 +135,27 @@ alert_show_normal(khui_alert * a); static khm_int32 alert_enqueue(khui_alert * a); +/* These are defined for APPVER >= 0x501. We are defining them here + so that we can build with APPVER = 0x500 and use the same binaries + with Win XP. */ + +#ifndef NIN_BALLOONSHOW +#define NIN_BALLOONSHOW (WM_USER + 2) +#endif + +#ifndef NIN_BALLOONHIDE +#define NIN_BALLOONHIDE (WM_USER + 3) +#endif + +#ifndef NIN_BALLOONTIMEOUT +#define NIN_BALLOONTIMEOUT (WM_USER + 4) +#endif + +#ifndef NIN_BALLOONUSERCLICK +#define NIN_BALLOONUSERCLICK (WM_USER + 5) +#endif + + /********************************************************************** Notifier *********************************************************************** @@ -254,7 +275,6 @@ notifier_wnd_proc(HWND hwnd, khm_show_main_window(); break; -#if (_WIN32_IE >= 0x0501) case NIN_BALLOONUSERCLICK: if (current_alert) { if ((current_alert->flags & KHUI_ALERT_FLAG_DEFACTION) && @@ -278,8 +298,6 @@ notifier_wnd_proc(HWND hwnd, current_alert = NULL; } break; -#endif - } } else if (uMsg == WM_TIMER) { if (wParam == KHUI_TRIGGER_TIMER_ID) { diff --git a/src/windows/identity/ui/resource.h b/src/windows/identity/ui/resource.h index 19396fb23..30f67755a 100644 --- a/src/windows/identity/ui/resource.h +++ b/src/windows/identity/ui/resource.h @@ -213,6 +213,7 @@ #define IDS_PISTATE_FAILLOD 209 #define IDI_CFG_PLUGIN_DIS 209 #define IDS_PISTATE_PLACEHOLD 210 +#define IDD_CFG_APPEAR 210 #define IDS_PISTATE_REG 211 #define IDS_PISTATE_HOLD 212 #define IDS_PISTATE_INIT 213 @@ -257,6 +258,15 @@ #define IDS_CFG_P_UNRCNFM 252 #define IDS_CFG_P_UNRCNFS 253 #define IDS_ACTION_LAYOUT_CUST 254 +#define IDS_APR_HEADER_TEXT 255 +#define IDS_APR_HEADER_TEXT_BOLD 256 +#define IDS_APR_TEXT 257 +#define IDS_APR_TEXT_BOLD 258 +#define IDS_APR_SAMPLE_TEXT_NORMAL 259 +#define IDS_CFG_APPEAR_SHORT 260 +#define IDS_CFG_APPEAR_LONG 261 +#define IDS_ACTION_OPT_APPEAR 262 +#define IDS_APR_SAMPLE_TEXT_SEL 263 #define IDC_NC_USERNAME 1007 #define IDC_NC_PASSWORD 1008 #define IDC_NC_CREDTEXT_LABEL 1009 @@ -344,6 +354,13 @@ #define IDC_CFG_LOGPATH 1111 #define IDC_NOTIF_HALFLIFE 1112 #define IDC_CFG_DESTROYALL 1113 +#define IDC_CFG_SAMPLE_NORMAL 1123 +#define IDC_CFG_REVERT 1127 +#define IDC_CFG_FONTS 1128 +#define IDC_CFG_SAMPLE_BOLD 1129 +#define IDC_CFG_SIZE 1130 +#define IDC_CFG_BOLD 1131 +#define IDC_CFG_ITALICS 1132 #define IDA_ACTIVATE_MENU 40003 #define IDA_UP 40004 #define IDA_DOWN 40005 @@ -356,9 +373,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 210 +#define _APS_NEXT_RESOURCE_VALUE 211 #define _APS_NEXT_COMMAND_VALUE 40010 -#define _APS_NEXT_CONTROL_VALUE 1114 +#define _APS_NEXT_CONTROL_VALUE 1133 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/src/windows/identity/uilib/Makefile.w2k b/src/windows/identity/uilib/Makefile.w2k new file mode 100644 index 000000000..d9dcb5a57 --- /dev/null +++ b/src/windows/identity/uilib/Makefile.w2k @@ -0,0 +1,62 @@ +# +# Copyright (c) 2004 Massachusetts Institute of Technology +# +# Permission is hereby granted, free of charge, to any person +# obtaining a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, +# including without limitation the rights to use, copy, modify, merge, +# publish, distribute, sublicense, and/or sell copies of the Software, +# and to permit persons to whom the Software is furnished to do so, +# subject to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + + +MODULE=uilib.w2k +!include <../config/Makefile.w2k> + +UIDLLOBJFILES= \ + $(OBJ)\rescache.obj \ + $(OBJ)\action.obj \ + $(OBJ)\creddlg.obj \ + $(OBJ)\alert.obj \ + $(OBJ)\propsheet.obj \ + $(OBJ)\propwnd.obj \ + $(OBJ)\uilibmain.obj \ + $(OBJ)\actiondef.obj \ + $(OBJ)\acceldef.obj \ + $(OBJ)\configui.obj \ + $(OBJ)\trackerwnd.obj \ + $(OBJ)\version.obj + +INCFILES= \ + $(INCDIR)\khuidefs.h \ + $(INCDIR)\khrescache.h \ + $(INCDIR)\khaction.h \ + $(INCDIR)\khactiondef.h \ + $(INCDIR)\khalerts.h \ + $(INCDIR)\khhtlink.h \ + $(INCDIR)\khnewcred.h \ + $(INCDIR)\khprops.h \ + $(INCDIR)\khconfigui.h \ + $(INCDIR)\khtracker.h \ + $(INCDIR)\khremote.h + +$(OBJ)\actiondef.c: actions.csv actiondef.cfg + $(CCSV) $** $@ + +$(OBJ)\acceldef.c: accel.csv acceldef.cfg + $(CCSV) $** $@ + +all: mkdirs $(INCFILES) $(UIDLLOBJFILES) + diff --git a/src/windows/identity/uilib/action.c b/src/windows/identity/uilib/action.c index 4f68bbfa6..29699476b 100644 --- a/src/windows/identity/uilib/action.c +++ b/src/windows/identity/uilib/action.c @@ -94,6 +94,7 @@ khui_action_ref khui_menu_view[] = { khui_action_ref khui_menu_options[] = { MENU_ACTION(KHUI_ACTION_OPT_KHIM), + MENU_ACTION(KHUI_ACTION_OPT_APPEAR), MENU_ACTION(KHUI_ACTION_OPT_IDENTS), MENU_ACTION(KHUI_ACTION_OPT_NOTIF), MENU_ACTION(KHUI_ACTION_OPT_PLUGINS), @@ -881,18 +882,18 @@ khui_get_cmd_accel_string(khm_int32 cmd, def = &khui_accel_global[i]; if(def->mod & FALT) { - if(FAILED(StringCbCat(buf, bufsiz, L"ALT+"))) + if(FAILED(StringCbCat(buf, bufsiz, L"Alt+"))) return FALSE; } if(def->mod & FCONTROL) { - if(FAILED(StringCbCat(buf, bufsiz, L"CTRL+"))) + if(FAILED(StringCbCat(buf, bufsiz, L"Ctrl+"))) return FALSE; } if(def->mod & FSHIFT) { - if(FAILED(StringCbCat(buf, bufsiz, L"SHIFT+"))) + if(FAILED(StringCbCat(buf, bufsiz, L"Shift+"))) return FALSE; } diff --git a/src/windows/identity/uilib/actions.csv b/src/windows/identity/uilib/actions.csv index 608ca40a2..554977667 100644 --- a/src/windows/identity/uilib/actions.csv +++ b/src/windows/identity/uilib/actions.csv @@ -26,6 +26,7 @@ KHUI_ACTION_OPT_IDENTS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_IDENTS, KHUI_ACTION_OPT_KHIM,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_KHIM,0,IDH_ACTION_OPT_KHIM,0 KHUI_ACTION_OPT_NOTIF,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_NOTIF,0,IDH_ACTION_OPT_NOTIF,0 KHUI_ACTION_OPT_PLUGINS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_PLUGINS,0,IDH_ACTION_OPT_KHIM,0 +KHUI_ACTION_OPT_APPEAR,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_OPT_APPEAR,0,0,0 KHUI_ACTION_HELP_CTX,KHUI_ACTIONTYPE_TRIGGER,,IDB_HELP,0,0,IDB_HELP_SM,0,IDS_ACTION_HELP_CTX,0,0,0 KHUI_ACTION_HELP_CONTENTS,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_CONTENTS,0,0,0 KHUI_ACTION_HELP_INDEX,KHUI_ACTIONTYPE_TRIGGER,,0,0,0,0,0,IDS_ACTION_HELP_INDEX,0,0,0 diff --git a/src/windows/identity/uilib/khactiondef.h b/src/windows/identity/uilib/khactiondef.h index a5d4799e8..68bbf9137 100644 --- a/src/windows/identity/uilib/khactiondef.h +++ b/src/windows/identity/uilib/khactiondef.h @@ -63,6 +63,8 @@ #define KHUI_ACTION_IMPORT (KHUI_ACTION_BASE + 28) #define KHUI_ACTION_OPT_PLUGINS (KHUI_ACTION_BASE + 29) #define KHUI_ACTION_LAYOUT_CUST (KHUI_ACTION_BASE + 30) +#define KHUI_ACTION_OPT_APPEAR (KHUI_ACTION_BASE + 31) +#define KHUI_ACTION_LAYOUT_RELOAD (KHUI_ACTION_BASE + 32) /*@}*/ /*! \name Pseudo actions -- cgit