From 2c8be9cb16af5cc97f937414851e5bc416c3b3ab Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 31 Mar 2003 14:36:25 +0000
Subject: [PATCH] Patch level         : 2.0 nopatch Files correlati     :
 ba0.exe ba1.exe ba7.exe Ricompilazione Demo : [ ] Commento            :

Adeguato uso funzioni spostate da os_win32


git-svn-id: svn://10.65.10.50/trunk@10962 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba0100.cpp |  5 ++++-
 ba/ba1500.cpp | 24 ++++++++----------------
 ba/ba7100.cpp |  3 +--
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/ba/ba0100.cpp b/ba/ba0100.cpp
index 3f97f4088..3944a823a 100755
--- a/ba/ba0100.cpp
+++ b/ba/ba0100.cpp
@@ -817,7 +817,10 @@ static int get_module_version(TConfig& cfg, void* jolly)
 
 bool TMenu_application::test_network()
 {
-  return ::os_test_network_version();
+  if (!xvt_sys_test_network_version())
+    return error_box(TR("Il driver di rete VREDIR.VXD contiene un bug riconosciuto da Microsoft.\n"
+                        "Consultare la documentazione sul sito AGA per eliminare questo inconveniente."));
+  return true;
 }
 
 bool TMenu_application::test_programs()
diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp
index 871d5be4a..9b2fd193e 100755
--- a/ba/ba1500.cpp
+++ b/ba/ba1500.cpp
@@ -22,7 +22,6 @@
 #define USERADR    26952
 #define AGAADR     26953
 #define PRASSIADR  26954
-#define PROCOMADR  26956
 #define K1         0x4500
 #define LBYTEMASK  0x00FF
 #define UBYTEMASK  0xFF00
@@ -206,7 +205,6 @@ void TRequest_form::update_serno(const TString& num)
   }
   TForm_item& serno = find_field('H', odd_page, FF_DONGLE_SN);
   serno.set(num);
-
 }
 
 void TRequest_form::update_dongle(const TDongle& dongle)
@@ -224,16 +222,13 @@ void TRequest_form::update_dongle(const TDongle& dongle)
 void TRequest_form::update_os()
 {
   TForm_item& os = find_field('H', odd_page, FF_OS);
-  TString stros = "Windows ";
-  
-  switch (::os_get_type())
+  const char* stros = NULL;
+  switch (xvt_sys_get_os_version())
   {       
-  case os_Windows  : stros << "3.1"; break;
-  case os_Windows95: stros << "95"; break;
-  case os_Windows98: stros << "98"; break;
-  case os_WindowsME: stros << "ME"; break;
-  case os_WindowsNT: stros << "NT/2000"; break;
-  default          : break;
+  case XVT_WS_LINUX_GTK: stros = "Linux GTK"; break;
+  case XVT_WS_WIN_95: stros = "Windows 95"; break;
+  case XVT_WS_WIN_98: stros = "Windows 98"; break;
+  default           : stros = "Windows NT/XP"; break;
   }
   os.set(stros);
 }
@@ -1098,7 +1093,7 @@ void TAttivazione_moduli::print_request()
   TWait_cursor hourglass;
   TSheet_field& sheet = _msk->sfield(F_MODULI);
   for (TDongleType owner = _aga_dongle; 
-       owner <= _procom_dongle; 
+       owner <= _prassi_dongle; 
        owner = TDongleType(owner+1))
   {
     int found = 0;
@@ -1123,10 +1118,8 @@ void TAttivazione_moduli::print_request()
         printer().open();      
         switch (owner)
         {
-          case _procom_dongle:
-            form.find_field('H',odd_page,1).set("GEISOFT"); break;
           case _prassi_dongle:
-            form.find_field('H',odd_page,1).set("PR.A.S.S.I."); break;
+            form.find_field('H',odd_page,1).set("Partners"); break;
           default: //case _aga_dongle:
             form.find_field('H',odd_page,1).set("A.G.A."); break;
         }
@@ -1475,7 +1468,6 @@ bool TAttivazione_moduli::create()
   break;
   case _prassi_dongle: 
   case _aga_dongle:
-  case _procom_dongle:
   {
     if (::dongle().hardware() == _dongle_hardlock)
     {
diff --git a/ba/ba7100.cpp b/ba/ba7100.cpp
index 5baac9de7..7915c8ac5 100755
--- a/ba/ba7100.cpp
+++ b/ba/ba7100.cpp
@@ -11,7 +11,6 @@
 #include <recarray.h>
 #include <sheet.h>
 #include <utility.h>
-#include <os_dep.h>
 #include <viswin.h>
 #include <browfile.h>
 
@@ -775,7 +774,7 @@ bool TMailer_mask::exec_app(int & err, const char * appname, TMail_message & msg
   command_line << " /i" << tmp;
   TExternal_app app(command_line);
   err = app.run();
-  os_sleep(1000);
+  xvt_sys_sleep(1000);
   bool ok = err == NOERR;
 
   if (ok)