--- a/jdk/src/java.base/share/native/libjli/splashscreen_stubs.c Thu Mar 24 14:00:14 2016 +0530
+++ b/jdk/src/java.base/share/native/libjli/splashscreen_stubs.c Thu Mar 24 14:06:32 2016 +0530
@@ -25,7 +25,7 @@
#include <stdio.h>
#include "splashscreen.h"
-
+#include "jni.h"
extern void* SplashProcAddress(const char* name); /* in java_md.c */
/*
@@ -38,8 +38,10 @@
typedef void (*SplashSetFileJarName_t)(const char* fileName,
const char* jarName);
typedef void (*SplashSetScaleFactor_t)(float scaleFactor);
-typedef char* (*SplashGetScaledImageName_t)(const char* fileName,
- const char* jarName, float* scaleFactor);
+typedef jboolean (*SplashGetScaledImageName_t)(const char* fileName,
+ const char* jarName, float* scaleFactor,
+ char *scaleImageName, const size_t scaleImageNameLength);
+typedef int (*SplashGetScaledImgNameMaxPstfixLen_t)(const char* filename);
/*
* This macro invokes a function from the shared lib.
@@ -60,6 +62,7 @@
#define INVOKE(name,def) _INVOKE(name,def,return)
#define INVOKEV(name) _INVOKE(name, ,;)
+
int DoSplashLoadMemory(void* pdata, int size) {
INVOKE(SplashLoadMemory, 0)(pdata, size);
}
@@ -84,7 +87,13 @@
INVOKEV(SplashSetScaleFactor)(scaleFactor);
}
-char* DoSplashGetScaledImageName(const char* fileName, const char* jarName,
- float* scaleFactor) {
- INVOKE(SplashGetScaledImageName, NULL)(fileName, jarName, scaleFactor);
+jboolean DoSplashGetScaledImageName(const char* fileName, const char* jarName,
+ float* scaleFactor, char *scaledImageName, const size_t scaledImageNameLength) {
+ INVOKE(SplashGetScaledImageName, 0)(fileName, jarName, scaleFactor,
+ scaledImageName, scaledImageNameLength);
}
+
+int DoSplashGetScaledImgNameMaxPstfixLen(const char *fileName) {
+ INVOKE(SplashGetScaledImgNameMaxPstfixLen, 0)(fileName);
+}
+