From bc9c1724bd4682ae1cd2548cda95154bb67e58ad Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 23 Jun 2015 10:58:54 +0000
Subject: [PATCH] Tentando identificar falha na inicialização da jni em windows

---
 pw3270.cbp                |  5 +++++
 src/java/Makefile.in      |  3 ++-
 src/java/plugin.cc        | 21 +++++++++++++--------
 src/pw3270/v3270/widget.c | 30 +++++++++++++++++++++++++++++-
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/pw3270.cbp b/pw3270.cbp
index d45a25c..9e9b764 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -110,6 +110,11 @@
 			<Option target="Debug" />
 			<Option target="Release" />
 		</Unit>
+		<Unit filename="src/java/call.c">
+			<Option compilerVar="CC" />
+			<Option target="Debug" />
+			<Option target="Release" />
+		</Unit>
 		<Unit filename="src/java/clipboard.cc">
 			<Option target="Debug" />
 			<Option target="Release" />
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index e8c6686..bec6b63 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -83,7 +83,7 @@ CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
 # PW3270_LIBS		?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
 PW3270_CFLAGS	?= -I../include
 
-PLUGIN_CFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \
+PLUGIN_CFLAGS=@CXXFLAGS@ -Wno-deprecated-declarations @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \
 				-DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ $(PW3270_CFLAGS)
 
 PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @JVM_LIBS@
@@ -204,6 +204,7 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \
 		$(CLASS_LIBS) \
 		$(PLUGIN_LIBS) \
 		-L../../.bin/Release@DLLDIR@ -l3270 -lpw3270 \
+		-L$(BINDBG)@DLLDIR@ -ljni3270
 
 #---[ Debug targets ]----------------------------------------------------------
 
diff --git a/src/java/plugin.cc b/src/java/plugin.cc
index 0b8de4a..f4e80d5 100644
--- a/src/java/plugin.cc
+++ b/src/java/plugin.cc
@@ -342,6 +342,9 @@ extern "C" {
 	return 0;
  }
 
+extern "C"
+{
+
  void call_java_program(GtkAction *action, GtkWidget *widget, const gchar *filename)
  {
 
@@ -423,21 +426,26 @@ extern "C" {
 	g_free(myDir);
 	g_free(exports);
 
-#elif defined(DEBUG)
+	rc = JNI_CreateJavaVM(&jvm,(void **)&env,&vm_args);
 
+#else
+
+#if defined(DEBUG)
 	options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.library.path=%s:.bin/Debug:.bin/Debug/lib",JNIDIR);
 	options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.class.path=%s:%s:./src/java/.bin/java",JARDIR,dirname);
-
 #else
-
 	options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.library.path=%s",JNIDIR);
 	options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.class.path=%s:%s",JARDIR,dirname);
-
 #endif // JNIDIR
 
+	rc = JNI_CreateJavaVM(&jvm,(void **)&env,&vm_args);
+
+#endif // _WIn32
+
+	debug("JNI_CreateJavaVM exits with rc=%d",rc);
+
 	g_free(dirname);
 
-	rc = JNI_CreateJavaVM(&jvm,(void **)&env,&vm_args);
 
 	// Release options
 	for(int f=0;f<vm_args.nOptions;f++) {
@@ -536,9 +544,6 @@ extern "C" {
 
  }
 
-
-extern "C"
-{
  LIB3270_EXPORT void pw3270_action_java_activated(GtkAction *action, GtkWidget *widget)
  {
 	gchar *filename = (gchar *) g_object_get_data(G_OBJECT(action),"src");
diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c
index 278f896..6720eeb 100644
--- a/src/pw3270/v3270/widget.c
+++ b/src/pw3270/v3270/widget.c
@@ -665,7 +665,16 @@ static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value
 	switch(ix)
 	{
 	case LIB3270_TOGGLE_CURSOR_POS:
+	case LIB3270_TOGGLE_MONOCASE:
+	case LIB3270_TOGGLE_LINE_WRAP:
 	case LIB3270_TOGGLE_CROSSHAIR:
+	case LIB3270_TOGGLE_BLANK_FILL:
+	case LIB3270_TOGGLE_MARGINED_PASTE:
+	case LIB3270_TOGGLE_SHOW_TIMING:
+	case LIB3270_TOGGLE_RECTANGLE_SELECT:
+	case LIB3270_TOGGLE_UNDERLINE:
+	case LIB3270_TOGGLE_VIEW_FIELD:
+	case LIB3270_TOGGLE_ALTSCREEN:
 		v3270_reload(GTK_WIDGET(session->user_data));
 		gtk_widget_queue_draw(GTK_WIDGET(session->user_data));
 		break;
@@ -689,6 +698,25 @@ static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value
 			gtk_window_fullscreen(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(session->user_data))));
 		else
 			gtk_window_unfullscreen(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(session->user_data))));
+
+		break;
+
+	case LIB3270_TOGGLE_DS_TRACE:
+	case LIB3270_TOGGLE_SCREEN_TRACE:
+	case LIB3270_TOGGLE_EVENT_TRACE:
+	case LIB3270_TOGGLE_RECONNECT:
+	case LIB3270_TOGGLE_SMART_PASTE:
+	case LIB3270_TOGGLE_KEEP_SELECTED:
+	case LIB3270_TOGGLE_CONNECT_ON_STARTUP:
+	case LIB3270_TOGGLE_KP_ALTERNATIVE:
+	case LIB3270_TOGGLE_NETWORK_TRACE:
+	case LIB3270_TOGGLE_BEEP:
+	case LIB3270_TOGGLE_KEEP_ALIVE:
+		break;
+
+	case LIB3270_TOGGLE_COUNT:
+		break;
+
 	}
 #if GTK_CHECK_VERSION(2,26,0)
 	g_object_notify_by_pspec(G_OBJECT(session->user_data), v3270_properties[PROP_TOGGLE+ix]);
@@ -885,7 +913,7 @@ static int emit_print_signal(H3270 *session)
 
 static gboolean activity_tick(v3270 *widget)
 {
-	trace("idle=%d (%d) timeout=%d",time(0) - widget->activity.timestamp,((time(0) - widget->activity.timestamp)/60),widget->activity.disconnect);
+//	trace("idle=%d (%d) timeout=%d",(int) (time(0) - widget->activity.timestamp),(int) (((time(0) - widget->activity.timestamp)/60),widget->activity.disconnect));
 
 	if(widget->activity.disconnect && lib3270_is_connected(widget->host) && ((time(0) - widget->activity.timestamp)/60) >= widget->activity.disconnect)
 		lib3270_disconnect(widget->host);
--
libgit2 0.21.2