[26231] in CVS-changelog-for-Kerberos-V5
svn rev #25571: trunk/src/ lib/krb5/os/ util/wshelper/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Mon Dec 12 15:46:30 2011
Date: Mon, 12 Dec 2011 15:46:27 -0500
From: tlyu@mit.edu
Message-Id: <201112122046.pBCKkRhL006184@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
http://src.mit.edu/fisheye/changelog/krb5/?cs=25571
Commit By: tlyu
Log Message:
ticket: 7050
subject: kfw: use _WIN64 names where appropriate
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
Changed Files:
U trunk/src/lib/krb5/os/init_os_ctx.c
U trunk/src/util/wshelper/res_init.c
Modified: trunk/src/lib/krb5/os/init_os_ctx.c
===================================================================
--- trunk/src/lib/krb5/os/init_os_ctx.c 2011-12-12 20:46:24 UTC (rev 25570)
+++ trunk/src/lib/krb5/os/init_os_ctx.c 2011-12-12 20:46:27 UTC (rev 25571)
@@ -72,7 +72,11 @@
if (!name)
return ENOMEM;
+#ifdef _WIN64
+ if (!GetModuleFileName(GetModuleHandle("krb5_64"), name, size))
+#else
if (!GetModuleFileName(GetModuleHandle("krb5_32"), name, size))
+#endif
goto cleanup;
p = name + strlen(name);
Modified: trunk/src/util/wshelper/res_init.c
===================================================================
--- trunk/src/util/wshelper/res_init.c 2011-12-12 20:46:24 UTC (rev 25570)
+++ trunk/src/util/wshelper/res_init.c 2011-12-12 20:46:27 UTC (rev 25571)
@@ -759,10 +759,10 @@
if (!hModWSHelp)
{
// Note: these must match the DEF file entries
-#if defined (_WIN32)
- hModWSHelp = GetModuleHandle("WSHELP32");
+#if defined(_WIN64)
+ hModWSHelp = GetModuleHandle( "WSHELP64" );
#else
- hModWSHelp = GetModuleHandle("WSHELPER");
+ hModWSHelp = GetModuleHandle( "WSHELP32" );
#endif
}
return hModWSHelp;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
