stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6865853: Additional code changes needed to build deploy using WXP SP2 and Visual Studio 2008

Browse Source 
Reviewed-by: ohair
This commit is contained in:
Tim Bell 2009-08-06 17:16:31 -07:00
parent 800a49f4a0
commit 792cd2a88a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/windows/native/sun/jkernel/kernel.cpp
View File

@ -116,11 +116,11 @@ char* getStringPlatformChars(JNIEnv* env, jstring jstr) {
char *result = NULL; char *result = NULL;
size_t len; size_t len;
const jchar* utf16 = env->GetStringChars(jstr, NULL); 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) if (len == -1)
return NULL; return NULL;
result = (char*) malloc(len); result = (char*) malloc(len);
if (wcstombs(result, utf16, len) == -1) if (wcstombs(result, (const wchar_t*)utf16, len) == -1)
return NULL; return NULL;
env->ReleaseStringChars(jstr, utf16); env->ReleaseStringChars(jstr, utf16);
return result; 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, '/')); char* lastSlash = max(strrchr(path, '\\'), strrchr(path, '/'));
if (lastSlash == NULL) { if (lastSlash == NULL) {
*dest = NULL; *dest = NULL;