root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.0 nopatch

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Spostate altre funzioni secondarie da os_win32 a xvaga


git-svn-id: svn://10.65.10.50/trunk@10961 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2003-03-31 14:34:07 +00:00
parent 6844f12fec
commit f53973f6de
6 changed files with 13 additions and 106 deletions

6
include/dongle.cpp

@ -401,11 +401,11 @@ bool TDongle::eutron_login(bool test_all_keys)
// _eutron_key->command = LOCATING_MODE;
_eutron_key->status = ST_HW_FAILURE; // Don't leave ST_OK = 0 here!
const char* labels[5] = { "AGA.INFORMATICA", "AGA.PRASSI", "AGA.PROCOM",
const char* labels[4] = { "AGA.INFORMATICA", "AGA.PRASSI",
"AGA.CAMPO", "25EBAI" };
TDongleType types[5] = { _aga_dongle, _prassi_dongle, _procom_dongle,
TDongleType types[4] = { _aga_dongle, _prassi_dongle,
_user_dongle, _developer_dongle };
for (int k = test_all_keys ? 0 : 3; k < 5; k++)
for (int k = test_all_keys ? 0 : 3; k < 4; k++)
{
memset(_eutron_key->label, 0, LABEL_LENGTH);
memcpy(_eutron_key->label, labels[k], strlen(labels[k]));

2
include/dongle.h

@ -10,7 +10,7 @@
#endif
enum TDongleHardware { _dongle_unknown, _dongle_hardlock, _dongle_eutron, _dongle_network };
enum TDongleType { _no_dongle, _user_dongle, _developer_dongle, _aga_dongle, _prassi_dongle, _procom_dongle };
enum TDongleType { _no_dongle, _user_dongle, _developer_dongle, _aga_dongle, _prassi_dongle };
enum { MAX_DONGLE_ASSIST = 8 };
class TDongle : public TObject

13
include/os_dep.h

@ -9,13 +9,9 @@
#include <strings.h>
#endif
enum os_type { os_Unknown, os_Win32s, os_Windows, os_Windows95, os_Windows98,
os_WindowsME, os_WindowsNT, os_Windows2000, os_WindowsXP };
os_type os_get_type();
//void os_post_menu_event(WINDOW win, MENU_TAG tag);
void os_post_menu_event(WINDOW win, MENU_TAG tag);
int os_execute(const TFilename& path, bool sync, bool iconizetask, bool showchild);
int os_execute(const TFilename& path, bool sync, bool iconizetask, bool showchild);
unsigned long os_execute_in_window(const TFilename& path, WINDOW win);
bool os_destroy_native_icon(unsigned icon);
@ -33,9 +29,4 @@ bool os_get_default_printer(TString& name);
bool os_dongle_server_running();
bool os_test_network_version();
void os_sleep(long m);
void os_beep(int severity);
#endif

85
include/os_win32.cpp

@ -2,8 +2,6 @@
#define WIN32_LEAN_AND_MEAN
#include <os_dep.h>
#include <winver.h>
#include <ctype.h>
#include <applicat.h>
@ -160,39 +158,6 @@ bool os_spawn_by_menu()
return ok;
}
os_type os_get_type()
{
os_type t = os_Unknown;
OSVERSIONINFO ovi;
if (GetVersionEx(&ovi))
{
switch (ovi.dwPlatformId)
{
case VER_PLATFORM_WIN32s:
t = os_Win32s;
break;
case VER_PLATFORM_WIN32_NT:
t = os_WindowsNT;
break;
case VER_PLATFORM_WIN32_WINDOWS:
t = os_Windows95;
if (ovi.dwMajorVersion == 4 || (ovi.dwMajorVersion > 4 && ovi.dwMinorVersion > 0))
t = os_Windows98;
break;
default:
t = os_Unknown;
break;
}
}
return t;
}
void os_post_menu_event(WINDOW win, MENU_TAG tag)
{
HWND w = (HWND)xvt_vobj_get_attr(win, ATTR_NATIVE_WINDOW);
PostMessage(w, WM_COMMAND, tag, 0L);
}
void os_iconize_window(WINDOW win)
{
HWND hwnd = (HWND)xvt_vobj_get_attr(win, ATTR_NATIVE_WINDOW);
@ -229,41 +194,6 @@ bool os_dongle_server_running()
return a != 0;
}
bool os_test_network_version()
{
if (os_get_type() == os_Windows95)
{
char* VREDIRNAME = "vredir.vxd";
DWORD handle;
DWORD dwSize = GetFileVersionInfoSize(VREDIRNAME,&handle);
if (dwSize)
{
BYTE infoBuffer[512];
GetFileVersionInfo(VREDIRNAME,handle,dwSize,infoBuffer);
long *language;
void * lpBuffer;
UINT Size;
if (VerQueryValue(infoBuffer, "\\VarFileInfo\\Translation", (void **)&language, &Size) && Size!=0)
{
char szName[128];
sprintf(szName, "\\StringFileInfo\\%04x%04x\\FileVersion",LOWORD(*language), HIWORD(*language));
if (VerQueryValue(infoBuffer, szName, &lpBuffer, &Size) && Size!=0)
{
TToken_string v((const char *)lpBuffer,'.');
int subver=atoi(v.get(2));
if (subver >=1111 && subver <=1115)
return error_box("La versione %s del driver di rete '%s' contiene un bug riconosciuto da Microsoft.\nConsultare la documentazione sul sito AGA per eliminare questo inconveniente.",(const char *)lpBuffer, VREDIRNAME);
else
return TRUE;
}
}
}
message_box("Impossibile determinare la versione del driver di rete '%s'",VREDIRNAME);
}
return TRUE;
}
HIDDEN const char* _file_to_find = NULL;
struct TFindWindowInfo
@ -347,18 +277,3 @@ unsigned long os_execute_in_window(const TFilename& path, WINDOW win)
return (unsigned long) w._hwnd;
}
void os_sleep(long m)
{
::Sleep(m);
}
void os_beep(int severity)
{
switch (severity)
{
case 0: MessageBeep(MB_OK); break;
case 1: MessageBeep(MB_ICONEXCLAMATION); break;
default: MessageBeep(MB_ICONSTOP); break;
}
}

2
include/window.cpp

@ -459,7 +459,7 @@ KEY TWindow::run()
{
do_events();
#if XVT_OS == XVT_OS_WIN32
os_sleep(100);
xvt_sys_sleep(10);
#endif
}

11
include/xvtility.cpp

@ -3,7 +3,7 @@
#include <config.h>
#include <controls.h>
#include <mask.h>
#include <os_dep.h>
//#include <os_dep.h>
#include <urldefid.h>
#include <utility.h>
@ -166,10 +166,9 @@ RCT& resize_rect(
// @func Emette un suono di default
void beep(int severity)
{
os_beep(severity);
xvt_sys_beep(severity);
}
///////////////////////////////////////////////////////////
// Event Handling
///////////////////////////////////////////////////////////
@ -269,7 +268,6 @@ void dispatch_event(
xvt_win_dispatch_event(win, (EVENT*)&e);
}
// @doc EXTERNAL
// @func Simula la scelta di una voce di menu
@ -279,7 +277,10 @@ void dispatch_e_menu(
// @xref <f dispatch_e_char> <f dispatch_e_scroll>
{
os_post_menu_event(win, item);
EVENT e; memset(&e, 0, sizeof(e));
e.type = E_COMMAND;
e.v.cmd.tag = item;
xvt_win_post_event(win, &e);
}
// @doc EXTERNAL