diff --git a/run.bat b/run.bat new file mode 100644 index 0000000..8a1dd2f --- /dev/null +++ b/run.bat @@ -0,0 +1,6 @@ +@echo off +del /s /q build +python setup.py build + +set PYTHONPATH=.\build\lib.win-amd64-3.7 +python testprograms\sample.py diff --git a/src/module/properties.cc b/src/module/properties.cc index 8428686..01ab9a2 100644 --- a/src/module/properties.cc +++ b/src/module/properties.cc @@ -28,6 +28,7 @@ */ #include + #include #include /*---[ Implement ]----------------------------------------------------------------------------------*/ diff --git a/src/module/windows/init.cc b/src/module/windows/init.cc index 3f3a6bd..30387d3 100644 --- a/src/module/windows/init.cc +++ b/src/module/windows/init.cc @@ -138,13 +138,13 @@ static string savedpath; // https://docs.microsoft.com/en-us/cpp/build/reference/structure-and-constant-definitions?view=vs-2019 + switch (reason) { case dliNoteStartProcessing: { + string installLocation = TN3270::getInstallLocation(); - string datadir = py3270_get_datadir(); - - if(!datadir.empty()) { + if(!installLocation.empty()) { char curdir[4096]; memset(curdir,0,sizeof(curdir)); @@ -155,18 +155,20 @@ savedpath.clear(); } - SetCurrentDirectory(datadir.c_str()); + SetCurrentDirectory(installLocation.c_str()); } - } break; case dliNoteEndProcessing: + if(!savedpath.empty()) { SetCurrentDirectory(savedpath.c_str()); savedpath.clear(); + } + break; case dliNotePreLoadLibrary: diff --git a/testprograms/sample.py b/testprograms/sample.py index 01fba13..9bfa605 100644 --- a/testprograms/sample.py +++ b/testprograms/sample.py @@ -24,39 +24,39 @@ print("Testing python module") print("Using TN3270 Version " + tn3270.version()) print(tn3270.revision()) -#session = tn3270.Session("") -#session.timeout = 10 +session = tn3270.Session("") +session.timeout = 10 -#print("Using tn3270 version " + session.version + " revision " + session.revision) +print("Using tn3270 version " + session.version + " revision " + session.revision) -#print(session.cstate) -#print(session.width) -#print(session.connected) +print(session.cstate) +print(session.width) +print(session.connected) -#print(session.reconnect) +print(session.reconnect) # # Can reconnect? If yes do it! # -#if session.reconnect.activatable: -# print("Reconnecting...") -# session.reconnect().wait(10) +if session.reconnect.activatable: + print("Reconnecting...") + session.reconnect().wait(10) -#print(session.connected) -#print(session.find('sisbb')) -#print(session.count('sisbb')) +print(session.connected) +print(session.find('sisbb')) +print(session.count('sisbb')) -#print('----------------------') -#print(dir(session)) -#print('----------------------') +print('----------------------') +print(dir(session)) +print('----------------------') -#print(session.get(14,22,38)) +print(session.get(14,22,38)) #print("-----------------------------------------------------------------------") #print(session) #print("-----------------------------------------------------------------------") -#session.enter().wait(14,2,"Senha") +session.enter().wait(14,2,"Senha") #session.set("value") -- libgit2 0.21.2