You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2005/09/29 14:07:39 UTC
cvs commit: jakarta-tomcat-connectors/jni/native/src jnilib.c
mturk 2005/09/29 05:07:39
Modified: jni/java/org/apache/tomcat/jni OS.java
jni/native libtcnative.dsp tcnative.dsp
jni/native/include tcn.h
jni/native/os/unix system.c
jni/native/os/win32 libtcnative.rc system.c
jni/native/src jnilib.c
Added: jni/java/org/apache/tomcat/jni Registry.java
jni/native/include tcn_api.h
jni/native/os/win32 logmessages.bin logmessages.mc
registry.c
Log:
Added Windows Registry support and syslog support.
Revision Changes Path
1.9 +35 -8 jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/OS.java
Index: OS.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/OS.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- OS.java 1 Aug 2005 06:34:32 -0000 1.8
+++ OS.java 29 Sep 2005 12:07:38 -0000 1.9
@@ -25,13 +25,20 @@
public class OS {
/* OS Enums */
- private static final int UNIX = 1;
- private static final int NETWARE = 2;
- private static final int WIN32 = 3;
- private static final int WIN64 = 4;
- private static final int LINUX = 5;
- private static final int SOLARIS = 6;
- private static final int BSD = 7;
+ private static final int UNIX = 1;
+ private static final int NETWARE = 2;
+ private static final int WIN32 = 3;
+ private static final int WIN64 = 4;
+ private static final int LINUX = 5;
+ private static final int SOLARIS = 6;
+ private static final int BSD = 7;
+
+ public static final int LOG_EMERG = 1;
+ public static final int LOG_ERROR = 2;
+ public static final int LOG_NOTICE = 3;
+ public static final int LOG_WARN = 4;
+ public static final int LOG_INFO = 5;
+ public static final int LOG_DEBUG = 6;
/**
* Check for OS type.
@@ -107,4 +114,24 @@
*/
public static native int info(long [] inf);
+ /**
+ * Expand environment variables.
+ * @param str String to expand
+ * @return Expanded string with replaced environment variables.
+ */
+ public static native String expand(String str);
+
+ /**
+ * Initialize system logging.
+ * @param domain String that will be prepended to every message
+ */
+ public static native void sysloginit(String domain);
+
+ /**
+ * Log message.
+ * @param level Log message severity. See LOG_XXX enums.
+ * @param message Message to log
+ */
+ public static native void syslog(int level, String message);
+
}
1.1 jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Registry.java
Index: Registry.java
===================================================================
/*
* Copyright 2000-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.tomcat.jni;
/** Windows Registy support
*
* @author Mladen Turk
* @version $Revision: 1.1 $, $Date: 2005/09/29 12:07:38 $
*/
public class Registry {
/* Registry Enums */
public static final int HKEY_CLASSES_ROOT = 1;
public static final int HKEY_CURRENT_CONFIG = 2;
public static final int HKEY_CURRENT_USER = 3;
public static final int HKEY_LOCAL_MACHINE = 4;
public static final int HKEY_USERS = 5;
public static final int KEY_ALL_ACCESS = 0x0001;
public static final int KEY_CREATE_LINK = 0x0002;
public static final int KEY_CREATE_SUB_KEY = 0x0004;
public static final int KEY_ENUMERATE_SUB_KEYS = 0x0008;
public static final int KEY_EXECUTE = 0x0010;
public static final int KEY_NOTIFY = 0x0020;
public static final int KEY_QUERY_VALUE = 0x0040;
public static final int KEY_READ = 0x0080;
public static final int KEY_SET_VALUE = 0x0100;
public static final int KEY_WOW64_64KEY = 0x0200;
public static final int KEY_WOW64_32KEY = 0x0400;
public static final int KEY_WRITE = 0x0800;
public static final int REG_BINARY = 1;
public static final int REG_DWORD = 2;
public static final int REG_EXPAND_SZ = 3;
public static final int REG_MULTI_SZ = 4;
public static final int REG_QWORD = 5;
public static final int REG_SZ = 6;
/**
* Create or open a Registry Key.
* @param name Registry Subkey to open
* @param root Root key, one of HKEY_*
* @param som Access mask that specifies the access rights for the key.
* @return Opened Registry key
*/
public static native long create(int root, String name, int sam, long pool)
throws Error;
/**
* Opens the specified Registry Key.
* @param name Registry Subkey to open
* @param root Root key, one of HKEY_*
* @param som Access mask that specifies the access rights for the key.
* @return Opened Registry key
*/
public static native long open(int root, String name, int sam, long pool)
throws Error;
/**
* Close the specified Registry key.
* @param key The Registry key descriptor to close.
*/
public static native int close(long key);
/**
* Get the Registry key type.
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Value type or negative error value
*/
public static native int getType(long key, String name);
/**
* Get the Registry value for REG_DWORD
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Registry key value
*/
public static native int getValueI(long key, String name)
throws Error;
/**
* Get the Registry value for REG_QWORD or REG_DWORD
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Registry key value
*/
public static native long getValueJ(long key, String name)
throws Error;
/**
* Get the Registry key length.
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Value size or negative error value
*/
public static native int getSize(long key, String name);
/**
* Get the Registry value for REG_SZ or REG_EXPAND_SZ
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Registry key value
*/
public static native String getValueS(long key, String name)
throws Error;
/**
* Get the Registry value for REG_MULTI_SZ
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Registry key value
*/
public static native String[] getValueA(long key, String name)
throws Error;
/**
* Get the Registry value for REG_BINARY
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Registry key value
*/
public static native byte[] getValueB(long key, String name)
throws Error;
/**
* Set the Registry value for REG_DWORD
* @param key The Registry key descriptor to use.
* @param name The name of the value to set
* @param val The the value to set
* @return If the function succeeds, the return value is 0
*/
public static native int setValueI(long key, String name, int val);
/**
* Set the Registry value for REG_QWORD
* @param key The Registry key descriptor to use.
* @param name The name of the value to set
* @param val The the value to set
* @return If the function succeeds, the return value is 0
*/
public static native int setValueJ(long key, String name, int val);
/**
* Set the Registry value for REG_SZ
* @param key The Registry key descriptor to use.
* @param name The name of the value to set
* @param val The the value to set
* @return If the function succeeds, the return value is 0
*/
public static native int setValueS(long key, String name, String val);
/**
* Set the Registry value for REG_EXPAND_SZ
* @param key The Registry key descriptor to use.
* @param name The name of the value to set
* @param val The the value to set
* @return If the function succeeds, the return value is 0
*/
public static native int setValueE(long key, String name, String val);
/**
* Set the Registry value for REG_MULTI_SZ
* @param key The Registry key descriptor to use.
* @param name The name of the value to set
* @param val The the value to set
* @return If the function succeeds, the return value is 0
*/
public static native int setValueA(long key, String name, String[] val);
/**
* Set the Registry value for REG_BINARY
* @param key The Registry key descriptor to use.
* @param name The name of the value to set
* @param val The the value to set
* @return If the function succeeds, the return value is 0
*/
public static native int setValueB(long key, String name, byte[] val);
/**
* Enumerate the Registry subkeys
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Array of all subkey names
*/
public static native String[] enumKeys(long key)
throws Error;
/**
* Enumerate the Registry values
* @param key The Registry key descriptor to use.
* @param name The name of the value to query
* @return Array of all value names
*/
public static native String[] enumValues(long key)
throws Error;
/**
* Delete the Registry value
* @param key The Registry key descriptor to use.
* @param name The name of the value to delete
* @return If the function succeeds, the return value is 0
*/
public static native int deleteValue(long key, String name);
/**
* Delete the Registry subkey
* @param root Root key, one of HKEY_*
* @param name Subkey to delete
* @param onlyIfEmpty If true will not delete a key if
* it contains any subkeys or values
* @return If the function succeeds, the return value is 0
*/
public static native int deleteKey(int root, String name,
boolean onlyIfEmpty);
}
1.14 +14 -6 jakarta-tomcat-connectors/jni/native/libtcnative.dsp
Index: libtcnative.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/libtcnative.dsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libtcnative.dsp 24 Jun 2005 08:21:29 -0000 1.13
+++ libtcnative.dsp 29 Sep 2005 12:07:39 -0000 1.14
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /Zi /O2 /Oy- /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1 /Fd"Release\libtcnative_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1 /Fd"Release\libtcnative_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -52,8 +52,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /out:"Release/libtcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll" /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /out:"Release/libtcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll" /opt:ref
!ELSEIF "$(CFG)" == "libtcnative - Win32 Debug"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include" /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1 /Fd"Debug\libtcnative_src" /FD /c
+# ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include" /I "../apr/include/arch/win32" /I "$(JAVA_HOME)/include" /I "$(JAVA_HOME)/include/win32" /I "../openssl/inc32" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /D "NO_IDEA" /D "NO_RC5" /D "NO_MDC2" /D "OPENSSL_NO_IDEA" /D "OPENSSL_NO_RC5" /D "OPENSSL_NO_MDC2" /D "HAVE_OPENSSL" /D HAVE_SSL_SET_STATE=1 /Fd"Debug\libtcnative_src" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,8 +78,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libtcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll"
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libtcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll"
!ENDIF
@@ -188,6 +188,10 @@
# End Source File
# Begin Source File
+SOURCE=.\include\tcn_api.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\tcn_version.h
# End Source File
# End Group
@@ -200,6 +204,10 @@
# End Source File
# Begin Source File
+SOURCE=.\os\win32\registry.c
+# End Source File
+# Begin Source File
+
SOURCE=.\os\win32\system.c
# End Source File
# End Group
1.14 +12 -4 jakarta-tomcat-connectors/jni/native/tcnative.dsp
Index: tcnative.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/tcnative.dsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tcnative.dsp 24 Jun 2005 08:21:29 -0000 1.13
+++ tcnative.dsp 29 Sep 2005 12:07:39 -0000 1.14
@@ -52,8 +52,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /opt:ref
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /out:"LibR/tcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll" /opt:ref
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /opt:ref
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /out:"LibR/tcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll" /opt:ref
!ELSEIF "$(CFG)" == "tcnative - Win32 Debug"
@@ -78,8 +78,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"LibD/tcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll"
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"LibD/tcnative-1.dll" /libpath:"../openssl/out32" /libpath:"../openssl/out32dll"
!ENDIF
@@ -188,6 +188,10 @@
# End Source File
# Begin Source File
+SOURCE=.\include\tcn_api.h
+# End Source File
+# Begin Source File
+
SOURCE=.\include\tcn_version.h
# End Source File
# End Group
@@ -200,6 +204,10 @@
# End Source File
# Begin Source File
+SOURCE=.\os\win32\registry.c
+# End Source File
+# Begin Source File
+
SOURCE=.\os\win32\system.c
# End Source File
# End Group
1.32 +30 -6 jakarta-tomcat-connectors/jni/native/include/tcn.h
Index: tcn.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/include/tcn.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tcn.h 27 Aug 2005 16:14:50 -0000 1.31
+++ tcn.h 29 Sep 2005 12:07:39 -0000 1.32
@@ -46,7 +46,9 @@
#else
#include <unistd.h>
#endif
-#include <jni.h>
+
+#include "tcn_api.h"
+
#if defined(_DEBUG) || defined(DEBUG)
#include <assert.h>
@@ -65,6 +67,13 @@
#define TCN_EINPROGRESS APR_OS_START_USERERR + 4
#define TCN_ETIMEDOUT APR_OS_START_USERERR + 5
+#define TCN_LOG_EMERG 1
+#define TCN_LOG_ERROR 2
+#define TCN_LOG_NOTICE 3
+#define TCN_LOG_WARN 4
+#define TCN_LOG_INFO 5
+#define TCN_LOG_DEBUG 6
+
#define TCN_ERROR_WRAP(E) \
if (APR_STATUS_IS_TIMEUP(E)) \
(E) = TCN_TIMEUP; \
@@ -100,13 +109,8 @@
#define TCN_IMPARGS JNIEnv *e, jobject o, void *sock
#define TCN_IMPCALL(X) e, o, X->opaque
-#ifdef HAVE_SABLEVM
-#define TCN_IMPLEMENT_CALL(RT, CL, FN) \
- JNIEXPORT RT JNICALL Java_org_apache_tomcat_jni_##CL##_##FN##__J
-#else
#define TCN_IMPLEMENT_CALL(RT, CL, FN) \
JNIEXPORT RT JNICALL Java_org_apache_tomcat_jni_##CL##_##FN
-#endif
#define TCN_IMPLEMENT_METHOD(RT, FN) \
static RT method_##FN
@@ -152,6 +156,7 @@
jstring tcn_new_string(JNIEnv *, const char *);
jstring tcn_new_stringn(JNIEnv *, const char *, size_t);
jbyteArray tcn_new_arrayb(JNIEnv *, const unsigned char *, size_t);
+jobjectArray tcn_new_arrays(JNIEnv *env, size_t len);
char *tcn_get_string(JNIEnv *, jstring);
char *tcn_strdup(JNIEnv *, jstring);
char *tcn_pstrdup(JNIEnv *, jstring, apr_pool_t *);
@@ -233,4 +238,23 @@
#define TCN_MIN(a, b) ((a) < (b) ? (a) : (b))
#define TCN_MAX(a, b) ((a) > (b) ? (a) : (b))
+#ifdef WIN32
+#define TCN_ALLOC_WSTRING(V) \
+ jsize wl##V = (*e)->GetStringLength(e, V); \
+ const jchar *ws##V = V ? (const jchar *)((*e)->GetStringChars(e, V, 0)) : NULL; \
+ jchar *w##V = NULL
+
+#define TCN_INIT_WSTRING(V) \
+ w##V = (jchar *)malloc((wl##V + 1) * sizeof(jchar)); \
+ wcsncpy(w##V, ws##V, wl##V); \
+ w##V[wl##V] = 0
+
+#define TCN_FREE_WSTRING(V) \
+ if (ws##V) (*e)->ReleaseStringChars(e, V, ws##V); \
+ if (ws##V) free (w##V)
+
+#define J2W(V) w##V
+
+#endif
+
#endif /* TCN_H */
1.1 jakarta-tomcat-connectors/jni/native/include/tcn_api.h
Index: tcn_api.h
===================================================================
/* Copyright 2000-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
*
* @author Mladen Turk
* @version $Revision: 1.1 $, $Date: 2005/09/29 12:07:39 $
*/
#ifndef TCN_API_H
#define TCN_API_H
#include "apr.h"
#include "apr_general.h"
#include "apr_pools.h"
#include "apr_portable.h"
#include "apr_network_io.h"
#include "apr_strings.h"
#ifndef APR_HAS_THREADS
#error "Missing APR_HAS_THREADS support from APR."
#endif
#include <jni.h>
/**
* TCN_DECLARE_EXPORT is defined when building the TCN dynamic library,
* so that all public symbols are exported.
*
* TCN_DECLARE_STATIC is defined when including the TCN public headers,
* to provide static linkage when the dynamic library may be unavailable.
*
* TCN_DECLARE_STATIC and TCN_DECLARE_EXPORT are left undefined when
* including the TCN public headers, to import and link the symbols from
* the dynamic TCN library and assure appropriate indirection and calling
* conventions at compile time.
*/
#if !defined(WIN32)
/**
* The public TCN functions are declared with TCN_DECLARE(), so they may
* use the most appropriate calling convention. Public APR functions with
* variable arguments must use TCN_DECLARE_NONSTD().
*
* @deffunc TCN_DECLARE(rettype) apr_func(args);
*/
#define TCN_DECLARE(type) type
/**
* The public TCN functions using variable arguments are declared with
* TCN_DECLARE_NONSTD(), as they must use the C language calling convention.
*
* @deffunc TCN_DECLARE_NONSTD(rettype) apr_func(args, ...);
*/
#define TCN_DECLARE_NONSTD(type) type
/**
* The public TCN variables are declared with TCN_DECLARE_DATA.
* This assures the appropriate indirection is invoked at compile time.
*
* @deffunc TCN_DECLARE_DATA type apr_variable;
* @tip extern TCN_DECLARE_DATA type apr_variable; syntax is required for
* declarations within headers to properly import the variable.
*/
#define TCN_DECLARE_DATA
#elif defined(TCN_DECLARE_STATIC)
#define TCN_DECLARE(type) type __stdcall
#define TCN_DECLARE_NONSTD(type) type
#define TCN_DECLARE_DATA
#elif defined(TCN_DECLARE_EXPORT)
#define TCN_DECLARE(type) __declspec(dllexport) type __stdcall
#define TCN_DECLARE_NONSTD(type) __declspec(dllexport) type
#define TCN_DECLARE_DATA __declspec(dllexport)
#else
/**
* The public TCN functions are declared with TCN_DECLARE(), so they may
* use the most appropriate calling convention. Public APR functions with
* variable arguments must use TCN_DECLARE_NONSTD().
*
*/
#define TCN_DECLARE(type) __declspec(dllimport) type __stdcall
/**
* The public TCN functions using variable arguments are declared with
* TCN_DECLARE_NONSTD(), as they must use the C language calling convention.
*
*/
#define TCN_DECLARE_NONSTD(type) __declspec(dllimport) type
/**
* The public TCN variables are declared with TCN_DECLARE_DATA.
* This assures the appropriate indirection is invoked at compile time.
*
* @remark extern TCN_DECLARE_DATA type apr_variable; syntax is required for
* declarations within headers to properly import the variable.
*/
#define TCN_DECLARE_DATA __declspec(dllimport)
#endif
#if !defined(WIN32) || defined(TCN_MODULE_DECLARE_STATIC)
/**
* Declare a dso module's exported module structure as TCN_MODULE_DECLARE_DATA.
*
* Unless TCN_MODULE_DECLARE_STATIC is defined at compile time, symbols
* declared with TCN_MODULE_DECLARE_DATA are always exported.
* @code
* module TCN_MODULE_DECLARE_DATA mod_tag
* @endcode
*/
#if defined(WIN32)
#define TCN_MODULE_DECLARE(type) type __stdcall
#else
#define TCN_MODULE_DECLARE(type) type
#endif
#define TCN_MODULE_DECLARE_NONSTD(type) type
#define TCN_MODULE_DECLARE_DATA
#else
/**
* TCN_MODULE_DECLARE_EXPORT is a no-op. Unless contradicted by the
* TCN_MODULE_DECLARE_STATIC compile-time symbol, it is assumed and defined.
*/
#define TCN_MODULE_DECLARE_EXPORT
#define TCN_MODULE_DECLARE(type) __declspec(dllexport) type __stdcall
#define TCN_MODULE_DECLARE_NONSTD(type) __declspec(dllexport) type
#define TCN_MODULE_DECLARE_DATA __declspec(dllexport)
#endif
#ifdef __cplusplus
extern "C" {
#endif
/**
* @file tcn_api.h
* @brief
*
* Tomcat Native Public API
*/
/* Return global apr pool
*/
TCN_DECLARE(apr_pool_t *) tcn_get_global_pool(void);
/* Return global String class
*/
TCN_DECLARE(jclass) tcn_get_string_class(void);
/* Return global JVM initalized on JNI_OnLoad
*/
TCN_DECLARE(JavaVM *) tcn_get_java_vm(void);
#ifdef __cplusplus
}
#endif
#endif /* TCN_API_H */
1.11 +63 -1 jakarta-tomcat-connectors/jni/native/os/unix/system.c
Index: system.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/os/unix/system.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- system.c 1 Aug 2005 06:49:53 -0000 1.10
+++ system.c 29 Sep 2005 12:07:39 -0000 1.11
@@ -35,6 +35,9 @@
#include <sys/sysinfo.h>
#endif
+#include <syslog.h>
+#include <stdarg.h>
+
#if defined(sun)
#define MAX_PROC_PATH_LEN 64
#define MAX_CPUS 512
@@ -284,3 +287,62 @@
(*e)->ReleaseLongArrayElements(e, inf, pvals, 0);
return rv;
}
+
+#define LOG_MSG_DOMAIN "Native"
+
+
+TCN_IMPLEMENT_CALL(jstring, OS, expand)(TCN_STDARGS, jstring val)
+{
+ jstring str;
+ TCN_ALLOC_CSTRING(val);
+
+ UNREFERENCED(o);
+
+ /* TODO: Make ${ENVAR} expansion */
+ str = (*e)->NewStringUTF(e, J2S(val));
+
+ TCN_FREE_CSTRING(val);
+ return str;
+}
+
+TCN_IMPLEMENT_CALL(void, OS, sysloginit)(TCN_STDARGS, jstring domain)
+{
+ const char *d;
+ TCN_ALLOC_CSTRING(domain);
+
+ UNREFERENCED(o);
+ if ((d = J2S(domain)) == NULL)
+ d = LOG_MSG_DOMAIN;
+
+ openlog(d, LOG_CONS | LOG_PID, LOG_LOCAL0);
+ TCN_FREE_CSTRING(domain);
+}
+
+TCN_IMPLEMENT_CALL(void, OS, syslog)(TCN_STDARGS, jint level,
+ jstring msg)
+{
+ TCN_ALLOC_CSTRING(msg);
+ int id = LOG_DEBUG;
+ UNREFERENCED(o);
+
+ switch (level) {
+ case TCN_LOG_EMERG:
+ id = LOG_EMERG;
+ break;
+ case TCN_LOG_ERROR:
+ id = LOG_ERR;
+ break;
+ case TCN_LOG_NOTICE:
+ id = LOG_NOTICE;
+ break;
+ case TCN_LOG_WARN:
+ id = LOG_WARN;
+ break;
+ case TCN_LOG_INFO:
+ id = LOG_INFO;
+ break;
+ }
+ syslog (id, "%s", J2S(msg));
+
+ TCN_FREE_CSTRING(msg);
+}
1.3 +3 -0 jakarta-tomcat-connectors/jni/native/os/win32/libtcnative.rc
Index: libtcnative.rc
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/os/win32/libtcnative.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libtcnative.rc 7 Jun 2005 13:11:35 -0000 1.2
+++ libtcnative.rc 29 Sep 2005 12:07:39 -0000 1.3
@@ -1,5 +1,8 @@
#include <windows.h>
+LANGUAGE 0x9,0x1
+1 11 logmessages.bin
+
#define TCN_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
"Foundation or its licensors, as applicable."
1.10 +183 -3 jakarta-tomcat-connectors/jni/native/os/win32/system.c
Index: system.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/os/win32/system.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- system.c 1 Aug 2005 06:34:33 -0000 1.9
+++ system.c 29 Sep 2005 12:07:39 -0000 1.10
@@ -44,6 +44,7 @@
static SYSTEM_INFO dll_system_info;
static HANDLE h_kernel = NULL;
static HANDLE h_ntdll = NULL;
+static char dll_file_name[MAX_PATH];
typedef BOOL (WINAPI *pfnGetSystemTimes)(LPFILETIME, LPFILETIME, LPFILETIME);
typedef NTSTATUS (WINAPI *pfnNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG);
@@ -83,6 +84,7 @@
h_ntdll = NULL;
}
}
+ GetModuleFileName(instance, dll_file_name, sizeof(dll_file_name));
break;
/** The attached process creates a new thread.
*/
@@ -116,6 +118,146 @@
}
+TCN_IMPLEMENT_CALL(jstring, OS, syserror)(TCN_STDARGS, jint err)
+{
+ jstring str;
+ void *buf;
+
+ UNREFERENCED(o);
+ if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ err,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPTSTR)&buf,
+ 0,
+ NULL)) {
+ str = AJP_TO_JSTRING("Unknown Error");
+ }
+ else {
+ str = AJP_TO_JSTRING((const char *)buf);
+ LocalFree(buf);
+ }
+ return str;
+}
+
+TCN_IMPLEMENT_CALL(jstring, OS, expand)(TCN_STDARGS, jstring val)
+{
+ jstring str;
+ jchar buf[TCN_BUFFER_SZ] = L"";
+ DWORD len;
+ TCN_ALLOC_WSTRING(val);
+
+ UNREFERENCED(o);
+ TCN_INIT_WSTRING(val);
+
+ len = ExpandEnvironmentStringsW(J2W(val), buf, TCN_BUFFER_SZ - 1);
+ if (len > (TCN_BUFFER_SZ - 1)) {
+ jchar *dbuf = malloc((len + 1) * 2);
+ ExpandEnvironmentStringsW(J2W(val), dbuf, len);
+ str = (*e)->NewString(e, dbuf, wcslen(dbuf));
+ free(dbuf);
+ }
+ else
+ str = (*e)->NewString(e, buf, wcslen(buf));
+
+ TCN_FREE_WSTRING(val);
+ return str;
+}
+
+#define LOG_MSG_EMERG 0xC0000001L
+#define LOG_MSG_ERROR 0xC0000002L
+#define LOG_MSG_NOTICE 0x80000003L
+#define LOG_MSG_WARN 0x80000004L
+#define LOG_MSG_INFO 0x40000005L
+#define LOG_MSG_DEBUG 0x00000006L
+#define LOG_MSG_DOMAIN "Native"
+
+static char log_domain[MAX_PATH] = "Native";
+
+static void init_log_source(const char *domain)
+{
+ HKEY key;
+ DWORD ts;
+ char event_key[MAX_PATH];
+
+ strcpy(event_key, "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\");
+ strcat(event_key, domain);
+ if (!RegCreateKey(HKEY_LOCAL_MACHINE, event_key, &key)) {
+ RegSetValueEx(key, "EventMessageFile", 0, REG_SZ, (LPBYTE)&dll_file_name[0],
+ strlen(dll_file_name) + 1);
+ ts = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
+
+ RegSetValueEx(key, "TypesSupported", 0, REG_DWORD, (LPBYTE) &ts, sizeof(DWORD));
+ RegCloseKey(key);
+ }
+ strcpy(log_domain, domain);
+}
+
+TCN_IMPLEMENT_CALL(void, OS, sysloginit)(TCN_STDARGS, jstring domain)
+{
+ const char *d;
+ TCN_ALLOC_CSTRING(domain);
+
+ UNREFERENCED(o);
+
+ if ((d = J2S(domain)) == NULL)
+ d = LOG_MSG_DOMAIN;
+ init_log_source(d);
+
+ TCN_FREE_CSTRING(domain);
+}
+
+TCN_IMPLEMENT_CALL(void, OS, syslog)(TCN_STDARGS, jint level,
+ jstring msg)
+{
+ TCN_ALLOC_CSTRING(msg);
+ DWORD id = LOG_MSG_DEBUG;
+ WORD il = EVENTLOG_SUCCESS;
+ HANDLE source;
+ const char *messages[1];
+ UNREFERENCED(o);
+
+ switch (level) {
+ case TCN_LOG_EMERG:
+ id = LOG_MSG_EMERG;
+ il = EVENTLOG_ERROR_TYPE;
+ break;
+ case TCN_LOG_ERROR:
+ id = LOG_MSG_ERROR;
+ il = EVENTLOG_ERROR_TYPE;
+ break;
+ case TCN_LOG_NOTICE:
+ id = LOG_MSG_NOTICE;
+ il = EVENTLOG_WARNING_TYPE;
+ break;
+ case TCN_LOG_WARN:
+ id = LOG_MSG_WARN;
+ il = EVENTLOG_WARNING_TYPE;
+ break;
+ case TCN_LOG_INFO:
+ id = LOG_MSG_INFO;
+ il = EVENTLOG_INFORMATION_TYPE;
+ break;
+ }
+
+ messages[0] = J2S(msg);
+ source = RegisterEventSource(NULL, log_domain);
+
+ if (source != NULL) {
+ ReportEvent(source, il,
+ 0,
+ id,
+ NULL,
+ 1, 0,
+ messages, NULL);
+ DeregisterEventSource(source);
+ }
+
+ TCN_FREE_CSTRING(msg);
+}
+
TCN_IMPLEMENT_CALL(jboolean, OS, is)(TCN_STDARGS, jint type)
{
UNREFERENCED_STDARGS;
@@ -221,8 +363,39 @@
static DWORD WINAPI password_thread(void *data)
{
tcn_pass_cb_t *cb = (tcn_pass_cb_t *)data;
- MSG msg;
- HWND hwnd = CreateDialog(dll_instance, MAKEINTRESOURCE(1001), NULL, NULL);
+ MSG msg;
+ HWINSTA hwss;
+ HWINSTA hwsu;
+ HDESK hwds;
+ HDESK hwdu;
+ HWND hwnd;
+
+ /* Ensure connection to service window station and desktop, and
+ * save their handles.
+ */
+ GetDesktopWindow();
+ hwss = GetProcessWindowStation();
+ hwds = GetThreadDesktop(GetCurrentThreadId());
+
+ /* Impersonate the client and connect to the User's
+ * window station and desktop.
+ */
+ hwsu = OpenWindowStation("WinSta0", FALSE, MAXIMUM_ALLOWED);
+ if (hwsu == NULL) {
+ ExitThread(1);
+ return 1;
+ }
+ SetProcessWindowStation(hwsu);
+ hwdu = OpenDesktop("Default", 0, FALSE, MAXIMUM_ALLOWED);
+ if (hwdu == NULL) {
+ SetProcessWindowStation(hwss);
+ CloseWindowStation(hwsu);
+ ExitThread(1);
+ return 1;
+ }
+ SetThreadDesktop(hwdu);
+
+ hwnd = CreateDialog(dll_instance, MAKEINTRESOURCE(1001), NULL, NULL);
if (hwnd != NULL)
ShowWindow(hwnd, SW_SHOW);
else {
@@ -253,6 +426,13 @@
else
Sleep(100);
}
+ /* Restore window station and desktop.
+ */
+ SetThreadDesktop(hwds);
+ SetProcessWindowStation(hwss);
+ CloseDesktop(hwdu);
+ CloseWindowStation(hwsu);
+
ExitThread(0);
return 0;
}
1.1 jakarta-tomcat-connectors/jni/native/os/win32/logmessages.bin
<<Binary file>>
1.1 jakarta-tomcat-connectors/jni/native/os/win32/logmessages.mc
Index: logmessages.mc
===================================================================
MessageId=0x1
Severity=Error
SymbolicName=LOG_MSG_EMERG
Language=English
Emerg: %1
.
MessageId=0x2
Severity=Error
SymbolicName=LOG_MSG_ERROR
Language=English
Error: %1
.
MessageId=0x3
Severity=Warning
SymbolicName=LOG_MSG_NOTICE
Language=English
Notice: %1
.
MessageId=0x4
Severity=Warning
SymbolicName=LOG_MSG_WARN
Language=English
Warn: %1
.
MessageId=0x5
Severity=Informational
SymbolicName=LOG_MSG_INFO
Language=English
Info: %1
.
MessageId=0x6
Severity=Success
SymbolicName=LOG_MSG_DEBUG
Language=English
Debug: %1
.
1.1 jakarta-tomcat-connectors/jni/native/os/win32/registry.c
Index: registry.c
===================================================================
/* Copyright 2000-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
*
* @author Mladen Turk
* @version $Revision: 1.1 $, $Date: 2005/09/29 12:07:39 $
*/
#define _WIN32_WINNT 0x0500
#include <windows.h>
#include <shlwapi.h>
#include "apr.h"
#include "apr_pools.h"
#include "apr_arch_misc.h" /* for apr_os_level */
#include "apr_arch_atime.h" /* for FileTimeToAprTime */
#include "tcn.h"
#define SAFE_CLOSE_KEY(k) \
if ((k) != NULL && (k) != INVALID_HANDLE_VALUE) { \
RegCloseKey((k)); \
(k) = NULL; \
}
typedef struct {
apr_pool_t *pool;
HKEY root;
HKEY key;
} tcn_nt_registry_t;
#define TCN_HKEY_CLASSES_ROOT 1
#define TCN_HKEY_CURRENT_CONFIG 2
#define TCN_HKEY_CURRENT_USER 3
#define TCN_HKEY_LOCAL_MACHINE 4
#define TCN_HKEY_USERS 5
static const struct {
HKEY k;
} TCN_KEYS[] = {
INVALID_HANDLE_VALUE,
HKEY_CLASSES_ROOT,
HKEY_CURRENT_CONFIG,
HKEY_CURRENT_USER,
HKEY_LOCAL_MACHINE,
HKEY_USERS,
INVALID_HANDLE_VALUE
};
#define TCN_KEY_ALL_ACCESS 0x0001
#define TCN_KEY_CREATE_LINK 0x0002
#define TCN_KEY_CREATE_SUB_KEY 0x0004
#define TCN_KEY_ENUMERATE_SUB_KEYS 0x0008
#define TCN_KEY_EXECUTE 0x0010
#define TCN_KEY_NOTIFY 0x0020
#define TCN_KEY_QUERY_VALUE 0x0040
#define TCN_KEY_READ 0x0080
#define TCN_KEY_SET_VALUE 0x0100
#define TCN_KEY_WOW64_64KEY 0x0200
#define TCN_KEY_WOW64_32KEY 0x0400
#define TCN_KEY_WRITE 0x0800
#define TCN_REGSAM(s, x) \
s = 0; \
if (x & TCN_KEY_ALL_ACCESS) \
s |= KEY_ALL_ACCESS; \
if (x & TCN_KEY_CREATE_LINK) \
s |= KEY_CREATE_LINK; \
if (x & TCN_KEY_CREATE_SUB_KEY) \
s |= KEY_CREATE_SUB_KEY; \
if (x & TCN_KEY_ENUMERATE_SUB_KEYS) \
s |= KEY_ENUMERATE_SUB_KEYS; \
if (x & TCN_KEY_EXECUTE) \
s |= KEY_EXECUTE; \
if (x & TCN_KEY_NOTIFY) \
s |= KEY_NOTIFY; \
if (x & TCN_KEY_READ) \
s |= KEY_READ; \
if (x & TCN_KEY_SET_VALUE) \
s |= KEY_SET_VALUE; \
if (x & TCN_KEY_WOW64_64KEY) \
s |= KEY_WOW64_64KEY; \
if (x & TCN_KEY_WOW64_32KEY) \
s |= KEY_WOW64_32KEY; \
if (x & TCN_KEY_WRITE) \
s |= KEY_WRITE
#define TCN_REG_BINARY 1
#define TCN_REG_DWORD 2
#define TCN_REG_EXPAND_SZ 3
#define TCN_REG_MULTI_SZ 4
#define TCN_REG_QWORD 5
#define TCN_REG_SZ 6
static const struct {
DWORD t;
} TCN_REGTYPES[] = {
REG_NONE,
REG_BINARY,
REG_DWORD,
REG_EXPAND_SZ,
REG_MULTI_SZ,
REG_QWORD,
REG_SZ,
REG_NONE
};
static apr_status_t registry_cleanup(void *data)
{
tcn_nt_registry_t *reg = (tcn_nt_registry_t *)data;
if (reg) {
SAFE_CLOSE_KEY(reg->key);
}
return APR_SUCCESS;
}
TCN_IMPLEMENT_CALL(jlong, Registry, create)(TCN_STDARGS, jint root, jstring name,
jint sam, jlong pool)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
tcn_nt_registry_t *reg = NULL;
TCN_ALLOC_WSTRING(name);
HKEY key;
LONG rc;
REGSAM s;
UNREFERENCED(o);
TCN_ASSERT(pool != 0);
if (root < TCN_HKEY_CLASSES_ROOT || root > TCN_HKEY_USERS) {
tcn_ThrowException(e, "Invalid Registry Root Key");
goto cleanup;
}
if (sam < TCN_KEY_ALL_ACCESS || root > TCN_KEY_WRITE) {
tcn_ThrowException(e, "Invalid Registry Key Security");
goto cleanup;
}
reg = (tcn_nt_registry_t *)apr_palloc(p, sizeof(tcn_nt_registry_t));
reg->pool = p;
reg->root = TCN_KEYS[root].k;
reg->key = NULL;
TCN_INIT_WSTRING(name);
TCN_REGSAM(s, sam);
rc = RegCreateKeyExW(reg->root, J2W(name), 0, NULL, REG_OPTION_NON_VOLATILE,
s, NULL, &key, NULL);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
reg->key = key;
apr_pool_cleanup_register(p, (const void *)reg,
registry_cleanup,
apr_pool_cleanup_null);
cleanup:
TCN_FREE_WSTRING(name);
return P2J(reg);
}
TCN_IMPLEMENT_CALL(jlong, Registry, open)(TCN_STDARGS, jint root, jstring name,
jint sam, jlong pool)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
tcn_nt_registry_t *reg = NULL;
TCN_ALLOC_WSTRING(name);
HKEY key;
LONG rc;
REGSAM s;
UNREFERENCED(o);
TCN_ASSERT(pool != 0);
if (root < TCN_HKEY_CLASSES_ROOT || root > TCN_HKEY_USERS) {
tcn_ThrowException(e, "Invalid Registry Root Key");
goto cleanup;
}
if (sam < TCN_KEY_ALL_ACCESS || root > TCN_KEY_WRITE) {
tcn_ThrowException(e, "Invalid Registry Key Security");
goto cleanup;
}
reg = (tcn_nt_registry_t *)apr_palloc(p, sizeof(tcn_nt_registry_t));
reg->pool = p;
reg->root = TCN_KEYS[root].k;
reg->key = NULL;
TCN_INIT_WSTRING(name);
TCN_REGSAM(s, sam);
rc = RegOpenKeyExW(reg->root, J2W(name), 0, s, &key);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
reg->key = key;
apr_pool_cleanup_register(p, (const void *)reg,
registry_cleanup,
apr_pool_cleanup_null);
cleanup:
TCN_FREE_WSTRING(name);
return P2J(reg);
}
TCN_IMPLEMENT_CALL(jint, Registry, close)(TCN_STDARGS, jlong reg)
{
tcn_nt_registry_t *r = J2P(reg, tcn_nt_registry_t *);
UNREFERENCED_STDARGS;
TCN_ASSERT(reg != 0);
registry_cleanup(r);
apr_pool_cleanup_kill(r->pool, r, registry_cleanup);
return APR_SUCCESS;
}
TCN_IMPLEMENT_CALL(jint, Registry, getType)(TCN_STDARGS, jlong key,
jstring name)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD v;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegQueryValueExW(k->key, J2W(name), NULL, &v, NULL, NULL);
if (rc != ERROR_SUCCESS)
v = -rc;
TCN_FREE_WSTRING(name);
switch (v) {
case REG_BINARY:
v = TCN_REG_BINARY;
break;
case REG_DWORD:
v = TCN_REG_DWORD;
break;
case REG_EXPAND_SZ:
v = TCN_REG_EXPAND_SZ;
break;
case REG_MULTI_SZ:
v = TCN_REG_MULTI_SZ;
break;
case REG_QWORD:
v = TCN_REG_QWORD;
break;
case REG_SZ:
v = TCN_REG_SZ;
break;
case REG_DWORD_BIG_ENDIAN:
v = 0;
break;
}
return v;
}
TCN_IMPLEMENT_CALL(jint, Registry, getSize)(TCN_STDARGS, jlong key,
jstring name)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD v;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegQueryValueExW(k->key, J2W(name), NULL, NULL, NULL, &v);
if (rc != ERROR_SUCCESS)
v = -rc;
TCN_FREE_WSTRING(name);
return v;
}
TCN_IMPLEMENT_CALL(jint, Registry, getValueI)(TCN_STDARGS, jlong key,
jstring name)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD t, l;
DWORD v = 0;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegQueryValueExW(k->key, J2W(name), NULL, &t, NULL, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
if (t == REG_DWORD) {
l = sizeof(DWORD);
rc = RegQueryValueExW(k->key, J2W(name), NULL, NULL, (LPBYTE)&v, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
}
else if (t == REG_SZ || t == REG_BINARY ||
t == REG_MULTI_SZ || t == REG_EXPAND_SZ)
v = l;
else {
v = 0;
tcn_ThrowException(e, "Unable to convert the value to integer");
}
cleanup:
TCN_FREE_WSTRING(name);
return v;
}
TCN_IMPLEMENT_CALL(jlong, Registry, getValueJ)(TCN_STDARGS, jlong key,
jstring name)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD t, l;
UINT64 v = 0;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegQueryValueExW(k->key, J2W(name), NULL, &t, NULL, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
if (t == REG_DWORD) {
DWORD tv;
l = sizeof(DWORD);
rc = RegQueryValueExW(k->key, J2W(name), NULL, NULL, (LPBYTE)&tv, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
v = tv;
}
else if (t == REG_QWORD) {
l = sizeof(UINT64);
rc = RegQueryValueExW(k->key, J2W(name), NULL, NULL, (LPBYTE)&v, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
}
else if (t == REG_SZ || t == REG_BINARY ||
t == REG_MULTI_SZ || t == REG_EXPAND_SZ)
v = l;
else {
v = 0;
tcn_ThrowException(e, "Unable to convert the value to long");
}
cleanup:
TCN_FREE_WSTRING(name);
return v;
}
TCN_IMPLEMENT_CALL(jstring, Registry, getValueS)(TCN_STDARGS, jlong key,
jstring name)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD t, l;
jstring v = NULL;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegQueryValueExW(k->key, J2W(name), NULL, &t, NULL, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
if (t == REG_SZ || t == REG_EXPAND_SZ) {
jchar *vw = (jchar *)malloc(l);
rc = RegQueryValueExW(k->key, J2W(name), NULL, NULL, (LPBYTE)vw, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
free(vw);
goto cleanup;
}
v = (*e)->NewString((e), vw, wcslen(vw));
free(vw);
}
cleanup:
TCN_FREE_WSTRING(name);
return v;
}
TCN_IMPLEMENT_CALL(jbyteArray, Registry, getValueB)(TCN_STDARGS, jlong key,
jstring name)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD t, l;
jbyteArray v = NULL;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegQueryValueExW(k->key, J2W(name), NULL, &t, NULL, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
if (t == REG_BINARY) {
BYTE *b = (BYTE *)malloc(l);
rc = RegQueryValueExW(k->key, J2W(name), NULL, NULL, b, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
free(b);
goto cleanup;
}
v = tcn_new_arrayb(e, b, l);
free(b);
}
cleanup:
TCN_FREE_WSTRING(name);
return v;
}
static jsize get_multi_sz_count(LPCWSTR str)
{
LPCWSTR p = str;
jsize cnt = 0;
for ( ; p && *p; p++) {
cnt++;
while (*p)
p++;
}
return cnt;
}
TCN_IMPLEMENT_CALL(jobjectArray, Registry, getValueA)(TCN_STDARGS, jlong key,
jstring name)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD t, l;
jobjectArray v = NULL;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegQueryValueExW(k->key, J2W(name), NULL, &t, NULL, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
if (t == REG_MULTI_SZ) {
jsize cnt = 0;
jchar *p;
jchar *vw = (jchar *)malloc(l);
rc = RegQueryValueExW(k->key, J2W(name), NULL, NULL, (LPBYTE)vw, &l);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
free(vw);
goto cleanup;
}
cnt = get_multi_sz_count(vw);
if (cnt) {
jsize idx = 0;
v = tcn_new_arrays(e, cnt);
for (p = vw ; p && *p; p++) {
jstring s;
jchar *b = p;
while (*p)
p++;
s = (*e)->NewString((e), b, (jsize)(p - b));
(*e)->SetObjectArrayElement((e), v, idx++, s);
}
}
free(vw);
}
cleanup:
TCN_FREE_WSTRING(name);
return v;
}
TCN_IMPLEMENT_CALL(jint, Registry, setValueI)(TCN_STDARGS, jlong key,
jstring name, jint val)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
DWORD v = (DWORD)val;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegSetValueExW(k->key, J2W(name), 0, REG_DWORD, (CONST BYTE *)&v, sizeof(DWORD));
TCN_FREE_WSTRING(name);
return v;
}
TCN_IMPLEMENT_CALL(jint, Registry, setValueJ)(TCN_STDARGS, jlong key,
jstring name, jlong val)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
UINT64 v = (UINT64)val;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
rc = RegSetValueExW(k->key, J2W(name), 0, REG_QWORD, (CONST BYTE *)&v, sizeof(UINT64));
TCN_FREE_WSTRING(name);
return rc;
}
TCN_IMPLEMENT_CALL(jint, Registry, setValueS)(TCN_STDARGS, jlong key,
jstring name, jstring val)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
TCN_ALLOC_WSTRING(val);
LONG rc;
DWORD len;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
TCN_INIT_WSTRING(val);
len = wcslen(J2W(val));
rc = RegSetValueExW(k->key, J2W(name), 0, REG_SZ,
(CONST BYTE *)J2W(val), (len + 1) * 2);
TCN_FREE_WSTRING(name);
TCN_FREE_WSTRING(val);
return rc;
}
TCN_IMPLEMENT_CALL(jint, Registry, setValueE)(TCN_STDARGS, jlong key,
jstring name, jstring val)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
TCN_ALLOC_WSTRING(val);
LONG rc;
DWORD len;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
TCN_INIT_WSTRING(val);
len = wcslen(J2W(val));
rc = RegSetValueExW(k->key, J2W(name), 0, REG_EXPAND_SZ,
(CONST BYTE *)J2W(val), (len + 1) * 2);
TCN_FREE_WSTRING(name);
TCN_FREE_WSTRING(val);
return rc;
}
TCN_IMPLEMENT_CALL(jint, Registry, setValueA)(TCN_STDARGS, jlong key,
jstring name,
jobjectArray vals)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
LONG rc;
jsize i, len;
jsize sl = 0;
jchar *msz, *p;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
TCN_INIT_WSTRING(name);
len = (*e)->GetArrayLength((e), vals);
for (i = 0; i < len; i++) {
jstring s = (jstring)(*e)->GetObjectArrayElement((e), vals, i);
sl += (*e)->GetStringLength((e), s) + 1;
}
sl = (sl + 1) * 2;
p = msz = (jchar *)calloc(1, sl);
for (i = 0; i < len; i++) {
jsize l;
jstring s = (jstring)(*e)->GetObjectArrayElement((e), vals, i);
l = (*e)->GetStringLength((e), s);
wcsncpy(p, (*e)->GetStringChars(e, s, 0), l);
p += l + 1;
}
rc = RegSetValueExW(k->key, J2W(name), 0, REG_MULTI_SZ,
(CONST BYTE *)msz, sl);
TCN_FREE_WSTRING(name);
free(msz);
return rc;
}
TCN_IMPLEMENT_CALL(jint, Registry, setValueB)(TCN_STDARGS, jlong key,
jstring name,
jbyteArray val)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
TCN_ALLOC_WSTRING(name);
jsize nbytes = (*e)->GetArrayLength(e, val);
jbyte *bytes = (*e)->GetByteArrayElements(e, val, NULL);
LONG rc;
rc = RegSetValueExW(k->key, J2W(name), 0, REG_BINARY,
bytes, (DWORD)nbytes);
(*e)->ReleaseByteArrayElements(e, val, bytes, JNI_ABORT);
TCN_FREE_WSTRING(name);
return rc;
}
#define MAX_VALUE_NAME 4096
TCN_IMPLEMENT_CALL(jobjectArray, Registry, enumKeys)(TCN_STDARGS, jlong key)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
LONG rc;
jobjectArray v = NULL;
jsize cnt = 0;
WCHAR achKey[MAX_PATH];
WCHAR achClass[MAX_PATH] = L"";
DWORD cchClassName = MAX_PATH;
DWORD cSubKeys;
DWORD cbMaxSubKey;
DWORD cchMaxClass;
DWORD cValues;
DWORD cchMaxValue;
DWORD cbMaxValueData;
DWORD cbSecurityDescriptor;
FILETIME ftLastWriteTime;
DWORD cchValue = MAX_VALUE_NAME;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
rc = RegQueryInfoKeyW(k->key,
achClass,
&cchClassName,
NULL,
&cSubKeys,
&cbMaxSubKey,
&cchMaxClass,
&cValues,
&cchMaxValue,
&cbMaxValueData,
&cbSecurityDescriptor,
&ftLastWriteTime);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
cnt = cSubKeys;
if (cnt) {
jsize idx = 0;
v = tcn_new_arrays(e, cnt);
for (idx = 0; idx < cnt; idx++) {
jstring s;
DWORD achKeyLen = MAX_PATH;
rc = RegEnumKeyExW(k->key,
idx,
achKey,
&achKeyLen,
NULL,
NULL,
NULL,
&ftLastWriteTime);
if (rc == (DWORD)ERROR_SUCCESS) {
s = (*e)->NewString((e), achKey, wcslen(achKey));
(*e)->SetObjectArrayElement((e), v, idx, s);
}
}
}
cleanup:
return v;
}
TCN_IMPLEMENT_CALL(jobjectArray, Registry, enumValues)(TCN_STDARGS, jlong key)
{
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
LONG rc;
jobjectArray v = NULL;
jsize cnt = 0;
WCHAR achClass[MAX_PATH] = L"";
DWORD cchClassName = MAX_PATH;
DWORD cSubKeys;
DWORD cbMaxSubKey;
DWORD cchMaxClass;
DWORD cValues;
DWORD cchMaxValue;
DWORD cbMaxValueData;
DWORD cbSecurityDescriptor;
FILETIME ftLastWriteTime;
WCHAR achValue[MAX_VALUE_NAME];
DWORD cchValue = MAX_VALUE_NAME;
UNREFERENCED(o);
TCN_ASSERT(key != 0);
/* Get the class name and the value count. */
rc = RegQueryInfoKeyW(k->key,
achClass,
&cchClassName,
NULL,
&cSubKeys,
&cbMaxSubKey,
&cchMaxClass,
&cValues,
&cchMaxValue,
&cbMaxValueData,
&cbSecurityDescriptor,
&ftLastWriteTime);
if (rc != ERROR_SUCCESS) {
tcn_ThrowAPRException(e, APR_FROM_OS_ERROR(rc));
goto cleanup;
}
cnt = cValues;
if (cnt) {
jsize idx = 0;
v = tcn_new_arrays(e, cnt);
for (idx = 0; idx < cnt; idx++) {
jstring s;
cchValue = MAX_VALUE_NAME;
achValue[0] = '\0';
rc = RegEnumValueW(k->key, idx,
achValue,
&cchValue,
NULL,
NULL, // &dwType,
NULL, // &bData,
NULL); // &bcData
if (rc == (DWORD)ERROR_SUCCESS) {
s = (*e)->NewString((e), achValue, wcslen(achValue));
(*e)->SetObjectArrayElement((e), v, idx, s);
}
}
}
cleanup:
return v;
}
TCN_IMPLEMENT_CALL(jint, Registry, deleteKey)(TCN_STDARGS, jint root, jstring name,
jboolean only_if_empty)
{
DWORD rv;
TCN_ALLOC_WSTRING(name);
UNREFERENCED(o);
if (root < TCN_HKEY_CLASSES_ROOT || root > TCN_HKEY_USERS) {
rv = EBADF;
goto cleanup;
}
if (only_if_empty)
rv = SHDeleteEmptyKeyW(TCN_KEYS[root].k, J2W(name));
else
rv = SHDeleteKeyW(TCN_KEYS[root].k, J2W(name));
cleanup:
TCN_FREE_WSTRING(name);
return rv;
}
TCN_IMPLEMENT_CALL(jint, Registry, deleteValue)(TCN_STDARGS, jlong key,
jstring name)
{
LONG rv;
TCN_ALLOC_WSTRING(name);
tcn_nt_registry_t *k = J2P(key, tcn_nt_registry_t *);
UNREFERENCED(o);
rv = RegDeleteValueW(k->key, J2W(name));
TCN_FREE_WSTRING(name);
return (jint)rv;
}
1.15 +27 -2 jakarta-tomcat-connectors/jni/native/src/jnilib.c
Index: jnilib.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/jnilib.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jnilib.c 12 Jul 2005 14:56:11 -0000 1.14
+++ jnilib.c 29 Sep 2005 12:07:39 -0000 1.15
@@ -105,7 +105,7 @@
jstring result;
jbyteArray bytes = 0;
size_t len = l;
-
+
if (!str)
return NULL;
if ((*env)->EnsureLocalCapacity(env, 2) < 0) {
@@ -132,6 +132,10 @@
return bytes;
}
+jobjectArray tcn_new_arrays(JNIEnv *env, size_t len)
+{
+ return (*env)->NewObjectArray(env, (jsize)len, jString_class, NULL);
+}
jstring tcn_new_string(JNIEnv *env, const char *str)
{
@@ -433,3 +437,24 @@
}
return 0;
}
+
+TCN_DECLARE(apr_pool_t *) tcn_get_global_pool()
+{
+ if (!tcn_global_pool) {
+ if (apr_pool_create(&tcn_global_pool, NULL) != APR_SUCCESS) {
+ return NULL;
+ }
+ apr_atomic_init(tcn_global_pool);
+ }
+ return tcn_global_pool;
+}
+
+TCN_DECLARE(jclass) tcn_get_string_class()
+{
+ return jString_class;
+}
+
+TCN_DECLARE(JavaVM *) tcn_get_java_vm()
+{
+ return tcn_global_vm;
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org