Changeset 153 for trunk/openjdk/jdk/src

Timestamp:

Sep 20, 2010, 3:05:56 PM (15 years ago)

Author:

dmik

Message:

jdk: Adopted and enabled com.security.mscapi package.

File:

• trunk/openjdk/jdk/src/windows/native/sun/security/mscapi/security.cpp (modified) (3 diffs)

trunk/openjdk/jdk/src/windows/native/sun/security/mscapi/security.cpp

@@ -35 +35 @@
 #include <wincrypt.h>
 #include <stdio.h>
-
+#ifdef __WIN32OS2__
+#include <excpt.h>
+#endif
 
 #define OID_EKU_ANY         "2.5.29.37.0"
@@ -843 +845 @@
             pwszContainerName = new WCHAR[dwDataLen];
 
-            if (mbstowcs(pwszContainerName, pszContainerName, dwDataLen) == 0) {
+            if (mbstowcs((wchar_t*)pwszContainerName, pszContainerName, dwDataLen) == 0) {
                 ThrowException(env, KEYSTORE_EXCEPTION, GetLastError());
                 __leave;
@@ -880 +882 @@
             pwszProviderName = new WCHAR[dwDataLen];
 
-            if (mbstowcs(pwszProviderName, pszProviderName, dwDataLen) == 0) {
+            if (mbstowcs((wchar_t*)pwszProviderName, pszProviderName, dwDataLen) == 0) {
                 ThrowException(env, KEYSTORE_EXCEPTION, GetLastError());
                 __leave;