pull up r18320 from trunk
authorTom Yu <tlyu@mit.edu>
Fri, 21 Jul 2006 23:57:49 +0000 (23:57 +0000)
committerTom Yu <tlyu@mit.edu>
Fri, 21 Jul 2006 23:57:49 +0000 (23:57 +0000)
 r18320@cathode-dark-space:  jaltman | 2006-07-03 01:23:16 -0400
 ticket: new
 subject: GetModuleHandle needs extension on Win64

   cc_mslsa.c:  some versions of Win64 require the extension
     to be specified as part of the parameter to GetModuleHandle()
     in order to find a match.

ticket: 3977

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18365 dc483132-0cff-0310-8789-dd5450dbe970

src/lib/krb5/ccache/cc_mslsa.c

index 46fa507b31b1683065c82034631c2165aa1fe9c8..4bb6d752bf35bebf61b1af6acf996591a11fe265 100644 (file)
@@ -148,9 +148,12 @@ is_broken_wow64(void)
     {
        BOOL isWow64 = FALSE;
        OSVERSIONINFO Version;
-       LPFN_ISWOW64PROCESS fnIsWow64Process = 
-           (LPFN_ISWOW64PROCESS)GetProcAddress(GetModuleHandle("kernel32"),
-                                               "IsWow64Process");
+       HANDLE h1 = NULL;
+       LPFN_ISWOW64PROCESS fnIsWow64Process = NULL;
+               
+       h1 = GetModuleHandle(L"kernel32.dll");
+       fnIsWow64Process = 
+           (LPFN_ISWOW64PROCESS)GetProcAddress(h1, "IsWow64Process");
 
        /* If we don't find the fnIsWow64Process function then we 
         * are not running in a broken Wow64