Download as
Browse Code »

Commit 8ffcbcc41841a5437b44ad88d2b748ee98dab0a0

Authored by perry.werneck@gmail.com
1 parent 06e0c8a7
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Acertando funções hllapi e empacotamento windows

Showing 5 changed files with 60 additions and 13 deletions   Show diff stats
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2013-02-21 17:02-0300\n" 8 +"POT-Creation-Date: 2013-02-25 07:46-0300\n"
9 "PO-Revision-Date: 2013-01-14 09:49-0200\n" 9 "PO-Revision-Date: 2013-01-14 09:49-0200\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português <>\n" 11 "Language-Team: Português <>\n"
src/include/pw3270/hllapi.h
  Diff comments   View file @8ffcbcc
@@ -88,6 +88,9 @@ extern &quot;C&quot; { @@ -88,6 +88,9 @@ extern &quot;C&quot; {
88 __declspec (dllexport) int __stdcall hllapi_cmp_text_at(LPWORD rc, WORD row, WORD col, LPSTR text); 88 __declspec (dllexport) int __stdcall hllapi_cmp_text_at(LPWORD rc, WORD row, WORD col, LPSTR text);
89 __declspec (dllexport) int __stdcall hllapi_wait_for_ready(LPWORD rc, WORD seconds); 89 __declspec (dllexport) int __stdcall hllapi_wait_for_ready(LPWORD rc, WORD seconds);
90 __declspec (dllexport) int __stdcall hllapi_wait(LPWORD rc, WORD seconds); 90 __declspec (dllexport) int __stdcall hllapi_wait(LPWORD rc, WORD seconds);
  91 + __declspec (dllexport) int __stdcall hllapi_pfkey(LPWORD rc, WORD key);
  92 + __declspec (dllexport) int __stdcall hllapi_pakey(LPWORD rc, WORD key);
  93 +
91 94
92 #else 95 #else
93 LIB3270_EXPORT int hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc); 96 LIB3270_EXPORT int hllapi(const unsigned long *func, char *str, unsigned short *length, unsigned short *rc);
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @8ffcbcc
@@ -84,14 +84,14 @@ ifeq ($(LIB3270_MODE),Debug) @@ -84,14 +84,14 @@ ifeq ($(LIB3270_MODE),Debug)
84 PW3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -lpw3270" 84 PW3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -lpw3270"
85 PW3270_CFLAGS="-I../../../src/include" 85 PW3270_CFLAGS="-I../../../src/include"
86 LIB3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -l3270" 86 LIB3270_LIBS="-L../../../.bin/Debug@DLLDIR@ -l3270"
87 - LIB270_CFLAGS=-I../../../src/include 87 + LIB3270_CFLAGS=-I../../../src/include
88 endif 88 endif
89 89
90 ifeq ($(LIB3270_MODE),Release) 90 ifeq ($(LIB3270_MODE),Release)
91 PW3270_LIBS="-L../../../.bin/Release@DLLDIR@ -lpw3270" 91 PW3270_LIBS="-L../../../.bin/Release@DLLDIR@ -lpw3270"
92 PW3270_CFLAGS="-I../../../src/include" 92 PW3270_CFLAGS="-I../../../src/include"
93 LIB3270_LIBS="-L../../../.bin/Release@DLLDIR@ -l3270" 93 LIB3270_LIBS="-L../../../.bin/Release@DLLDIR@ -l3270"
94 - LIB270_CFLAGS=-I../../../src/include 94 + LIB3270_CFLAGS=-I../../../src/include
95 endif 95 endif
96 96
97 ifeq ($(LIB3270_MODE),Default) 97 ifeq ($(LIB3270_MODE),Default)
src/plugins/remotectl/Makefile.in
  Diff comments   View file @8ffcbcc
@@ -58,20 +58,42 @@ XGETTEXT=@XGETTEXT@ @@ -58,20 +58,42 @@ XGETTEXT=@XGETTEXT@
58 DLL_FLAGS=@DLL_FLAGS@ 58 DLL_FLAGS=@DLL_FLAGS@
59 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall 59 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
60 60
61 -PW3270_LIBS ?= `pkg-config --libs lib3270`  
62 -PW3270_CFLAGS ?= `pkg-config --cflags lib3270` 61 +LIB3270_MODE ?= Default
  62 +
  63 +ifeq ($(LIB3270_MODE),Debug)
  64 + PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -lpw3270 -l3270
  65 + PW3270_CFLAGS=-I../../../src/include
  66 + LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270
  67 + LIB3270_CFLAGS=-I../../../src/include
  68 +endif
  69 +
  70 +ifeq ($(LIB3270_MODE),Release)
  71 + PW3270_LIBS=-L../../../.bin/Release@DLLDIR@ -lpw3270 -l3270
  72 + PW3270_CFLAGS=-I../../../src/include
  73 + LIB3270_LIBS=-L../../../.bin/Release@DLLDIR@ -l3270
  74 + LIB3270_CFLAGS=-I../../../src/include
  75 +endif
  76 +
  77 +ifeq ($(LIB3270_MODE),Default)
  78 + LIB3270_LIBS ?= `pkg-config --libs lib3270`
  79 + LIB3270_CFLAGS ?= `pkg-config --cflags lib3270`
  80 + PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270`
  81 + PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270`
  82 +endif
  83 +
  84 +
63 GTK_CFLAGS ?= @GTK_CFLAGS@ @GTKMAC_CFLAGS@ 85 GTK_CFLAGS ?= @GTK_CFLAGS@ @GTKMAC_CFLAGS@
64 GTK_LIBS ?= @GTK_LIBS@ @GTKMAC_LIBS@ 86 GTK_LIBS ?= @GTK_LIBS@ @GTKMAC_LIBS@
65 87
66 $(OBJDBG)/%.o: %.c $(DEPENDS) 88 $(OBJDBG)/%.o: %.c $(DEPENDS)
67 @echo " CC `basename $@`" 89 @echo " CC `basename $@`"
68 @$(MKDIR) `dirname $@` 90 @$(MKDIR) `dirname $@`
69 - @$(CC) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< 91 + @$(CC) $(CFLAGS) $(DEBUG_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
70 92
71 $(OBJRLS)/%.o: %.c $(DEPENDS) 93 $(OBJRLS)/%.o: %.c $(DEPENDS)
72 @echo " CC `basename $@`" 94 @echo " CC `basename $@`"
73 @$(MKDIR) `dirname $@` 95 @$(MKDIR) `dirname $@`
74 - @$(CC) $(CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< 96 + @$(CC) $(CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $<
75 97
76 98
77 #---[ Release targets ]-------------------------------------------------------- 99 #---[ Release targets ]--------------------------------------------------------
src/plugins/remotectl/calls.c
  Diff comments   View file @8ffcbcc
@@ -52,12 +52,14 @@ @@ -52,12 +52,14 @@
52 static char * (*get_text)(H3270 *h, int row, int col, int len) = NULL; 52 static char * (*get_text)(H3270 *h, int row, int col, int len) = NULL;
53 static void * (*release_memory)(void *p) = NULL; 53 static void * (*release_memory)(void *p) = NULL;
54 static int (*action_enter)(H3270 *h) = NULL; 54 static int (*action_enter)(H3270 *h) = NULL;
55 - static int (*set_text_at)(H3270 *h, int row, int col, const unsigned char *str) = NULL; 55 + static int (*set_text_at)(H3270 *h, int row, int col, const unsigned char *str) = NULL;
56 static int (*cmp_text_at)(H3270 *h, int row, int col, const char *text) = NULL; 56 static int (*cmp_text_at)(H3270 *h, int row, int col, const char *text) = NULL;
  57 + static int (*pfkey)(H3270 *hSession, int key) = NULL;
  58 + static int (*pakey)(H3270 *hSession, int key) = NULL;
57 59
58 static const struct _entry_point 60 static const struct _entry_point
59 { 61 {
60 - void **ptr; 62 + void **call;
61 const char * name; 63 const char * name;
62 } entry_point[] = 64 } entry_point[] =
63 { 65 {
@@ -74,6 +76,8 @@ @@ -74,6 +76,8 @@
74 { (void **) &action_enter, "lib3270_enter" }, 76 { (void **) &action_enter, "lib3270_enter" },
75 { (void **) &set_text_at, "lib3270_set_string_at" }, 77 { (void **) &set_text_at, "lib3270_set_string_at" },
76 { (void **) &cmp_text_at, "lib3270_cmp_text_at" }, 78 { (void **) &cmp_text_at, "lib3270_cmp_text_at" },
  79 + { (void **) &pfkey, "lib3270_pfkey" },
  80 + { (void **) &pakey, "lib3270_pakey" },
77 81
78 { NULL, NULL } 82 { NULL, NULL }
79 }; 83 };
@@ -108,7 +112,7 @@ @@ -108,7 +112,7 @@
108 hllapi_deinit(); 112 hllapi_deinit();
109 return ENOENT; 113 return ENOENT;
110 } 114 }
111 - *entry_point[f].ptr = ptr; 115 + *entry_point[f].call = ptr;
112 } 116 }
113 117
114 // Get session handle 118 // Get session handle
@@ -117,7 +121,7 @@ @@ -117,7 +121,7 @@
117 return 0; 121 return 0;
118 } 122 }
119 123
120 - // Set entry pointers to pipe based calls 124 + // Set entry points to pipe based calls
121 125
122 126
123 return -1; 127 return -1;
@@ -132,8 +136,7 @@ @@ -132,8 +136,7 @@
132 session_free(hSession); 136 session_free(hSession);
133 137
134 for(f=0;entry_point[f].name;f++) 138 for(f=0;entry_point[f].name;f++)
135 - *entry_point[f].ptr = NULL;  
136 - 139 + *entry_point[f].call = NULL;
137 140
138 if(hModule != NULL) 141 if(hModule != NULL)
139 { 142 {
@@ -250,3 +253,22 @@ @@ -250,3 +253,22 @@
250 return 0; 253 return 0;
251 } 254 }
252 255
  256 + __declspec (dllexport) int __stdcall hllapi_pfkey(LPWORD rc, WORD key)
  257 + {
  258 + if(!(pfkey && hSession))
  259 + return EINVAL;
  260 +
  261 + *rc = (WORD) pfkey(hSession,key);
  262 +
  263 + return 0;
  264 + }
  265 +
  266 + __declspec (dllexport) int __stdcall hllapi_pakey(LPWORD rc, WORD key)
  267 + {
  268 + if(!(pfkey && hSession))
  269 + return EINVAL;
  270 +
  271 + *rc = (WORD) pakey(hSession,key);
  272 +
  273 + return 0;
  274 + }