From 9130e7d347313d51ad329eaa99d9a22549375f29 Mon Sep 17 00:00:00 2001 From: Xiomara Jayasena Date: Thu, 6 Aug 2009 10:25:00 -0700 Subject: [PATCH 1/7] Added tag jdk7-b68 for changeset a3946f62adaa --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 7dc9b1b0dc4..887ebba35be 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -42,3 +42,4 @@ c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66 c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67 +e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68 From d66b689a4b09422eaf74d61d89be950c2e193ac2 Mon Sep 17 00:00:00 2001 From: Xiomara Jayasena Date: Thu, 6 Aug 2009 10:25:01 -0700 Subject: [PATCH 2/7] Added tag jdk7-b68 for changeset 0589e2ed45b3 --- corba/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/corba/.hgtags b/corba/.hgtags index 3e1753626fb..28557923b83 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -42,3 +42,4 @@ d20e45cd539f20405ff843652069cfd7550c5ab3 jdk7-b63 97fd9b42f5c2d342b90d18f0a2b57e4117e39415 jdk7-b65 a821e059a961bcb02830280d51f6dd030425c066 jdk7-b66 a12ea7c7b497b4ba7830550095ef633bd6f43971 jdk7-b67 +5182bcc9c60cac429d1f7988676cec7320752be3 jdk7-b68 From 8fae4c547c8ebb42718b9c31a2ff9cab0273fe1b Mon Sep 17 00:00:00 2001 From: Xiomara Jayasena Date: Thu, 6 Aug 2009 10:25:05 -0700 Subject: [PATCH 3/7] Added tag jdk7-b68 for changeset 4ae7310eb37d --- hotspot/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/hotspot/.hgtags b/hotspot/.hgtags index ad4c8f2596c..a7ee64a37aa 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -42,3 +42,4 @@ ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66 18f526145aea355a9320b724373386fc2170f183 jdk7-b67 +d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68 From 314304f9ba59ec1a3a5a16b635bc2d7cfef46230 Mon Sep 17 00:00:00 2001 From: Xiomara Jayasena Date: Thu, 6 Aug 2009 10:25:10 -0700 Subject: [PATCH 4/7] Added tag jdk7-b68 for changeset 8cfea160b2e5 --- jaxp/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxp/.hgtags b/jaxp/.hgtags index f196582041b..4391dbd2d7d 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -42,3 +42,4 @@ a10eec7a1edf536f39b5828d8623054dbc62c2b7 jdk7-b64 008c662e0ee9a91aebb75e46b97de979083d5c1c jdk7-b65 22f9d5d5b5fe0f47048f41e6c6e54fee5edad0ec jdk7-b66 a033af8d824a408d3ac602205ecdefc128749e1e jdk7-b67 +83b2a9331383f9db7a49350d4cb13b7635f6b861 jdk7-b68 From a79bbfdcfef794597024b86dac830ab7a0041a9f Mon Sep 17 00:00:00 2001 From: Xiomara Jayasena Date: Thu, 6 Aug 2009 10:25:11 -0700 Subject: [PATCH 5/7] Added tag jdk7-b68 for changeset 7df0da9e6d70 --- jaxws/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 36dc0d6feff..900795887f8 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -42,3 +42,4 @@ aaa25dfd3de68c6f1a1d3ef8c45fd99f76bca6dd jdk7-b64 aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65 fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66 faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67 +845fa487f0f72a9f232ead8315c0087a477a5a31 jdk7-b68 From 6ceaf265fd953f005fef09a62aef4ed76c318c1b Mon Sep 17 00:00:00 2001 From: Xiomara Jayasena Date: Thu, 6 Aug 2009 10:25:18 -0700 Subject: [PATCH 6/7] Added tag jdk7-b68 for changeset a02edc83f1b4 --- jdk/.hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/.hgtags b/jdk/.hgtags index 73634a197c7..1d2a3d286ba 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -42,3 +42,4 @@ a50217eb3ee10b9f9547e0708e5c9625405083ef jdk7-b64 382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66 a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67 +b23d905cb5d3b382295240d28ab0bfb266b4503c jdk7-b68 From 792cd2a88a9eb88aae1f4b682cbe439513bbd6e2 Mon Sep 17 00:00:00 2001 From: Tim Bell Date: Thu, 6 Aug 2009 17:16:31 -0700 Subject: [PATCH 7/7] 6865853: Additional code changes needed to build deploy using WXP SP2 and Visual Studio 2008 Reviewed-by: ohair --- jdk/src/windows/native/sun/jkernel/kernel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jdk/src/windows/native/sun/jkernel/kernel.cpp b/jdk/src/windows/native/sun/jkernel/kernel.cpp index 354b47cf2b5..e67bb3a0595 100644 --- a/jdk/src/windows/native/sun/jkernel/kernel.cpp +++ b/jdk/src/windows/native/sun/jkernel/kernel.cpp @@ -116,11 +116,11 @@ char* getStringPlatformChars(JNIEnv* env, jstring jstr) { char *result = NULL; size_t len; const jchar* utf16 = env->GetStringChars(jstr, NULL); - len = wcstombs(NULL, utf16, env->GetStringLength(jstr) * 4) + 1; + len = wcstombs(NULL, (const wchar_t*)utf16, env->GetStringLength(jstr) * 4) + 1; if (len == -1) return NULL; result = (char*) malloc(len); - if (wcstombs(result, utf16, len) == -1) + if (wcstombs(result, (const wchar_t*)utf16, len) == -1) return NULL; env->ReleaseStringChars(jstr, utf16); return result; @@ -640,7 +640,7 @@ JNIEXPORT void JNICALL Java_sun_jkernel_DownloadManager_startBackgroundDownloadW } -void getParent(const TCHAR *path, TCHAR *dest) { +void getParent(TCHAR *path, TCHAR *dest) { char* lastSlash = max(strrchr(path, '\\'), strrchr(path, '/')); if (lastSlash == NULL) { *dest = NULL;