Commit 002df9e9 authored by Alois SCHLOEGL's avatar Alois SCHLOEGL
Browse files

prepare for transition to 64bits - several variable types need a change;...

 prepare for transition to 64bits - several variable types need a change; remove unsupported, and unused function IsWinNT2000XP()
parent 6606924e
......@@ -13,7 +13,7 @@
#define MAX1401 8 // The number of 1401s that can be supported
extern short asType1401[MAX1401+1]; // The type of the 1401
extern size_t aHand1401[MAX1401+1];
extern void* aHand1401[MAX1401+1];
extern short asDriverType[MAX1401+1];
extern int lLastDriverType;
extern int alDriverVersion[MAX1401+1]; // version/type of each driver
......
......@@ -14,9 +14,9 @@
///////////////////////////////////////////////////////////////////////////////////
// Fnction-ROUTINEN
int IndexOfLastFunction()
XOPIORecParam IndexOfLastFunction()
{
int fCnt = 0;
XOPIORecParam fCnt = 0;
while ( sFunc[fCnt].fnc )
fCnt++;
return fCnt-1;
......@@ -37,16 +37,16 @@ static int DoFunction()
}
static long RegisterFunction()
XOPIORecParam RegisterFunction()
{
// 0409 using 'Direct method' only
int funcIndex;
XOPIORecParam funcIndex;
funcIndex = GetXOPItem(0); // which function invoked ?
if ( funcIndex > IndexOfLastFunction() ) // more functions in xxx.RC
return NIL; // than in sFunc array
return (long)sFunc[funcIndex].fnc; // the function adress is returned
return sFunc[funcIndex].fnc; // the function adress is returned
}
......@@ -54,7 +54,7 @@ static long RegisterFunction()
static void XOPEntry( void )
// This is the entry point from the host application to the XOP for all messages after the INIT message.
{
long result = 0;
int result = 0;
int type = GetXOPMessage();
switch( type )
......@@ -145,8 +145,8 @@ Handle IHC( Handle sIgorString )
// returns C string or 0 in case of error meaning NO_INPUT_STRING or NOMEM
//! after being finished with the C string you MUST REMOVE it with DisposeHandle( Cstring );
{
int len;
Handle pCStr;
size_t len;
Handle pCStr;
if ( !sIgorString ) // error: input string does not exist
{
......
......@@ -4,7 +4,7 @@
typedef struct
{
int (*fnc)();
XOPIORecParam (*fnc)();
} FUNC;
FUNC sFunc[];
......
......@@ -254,7 +254,7 @@ static int iAttached = 0; // counts process attaches so ca
/****************************************************************************
** Windows NT Specific Variables and internal types
****************************************************************************/
size_t aHand1401[MAX1401 + 1] = { 0 }; // handles for 1401s
void* aHand1401[MAX1401 + 1] = { 0 }; // handles for 1401s
#if defined(__WINE__)
static uint32_t aXferEvent[MAX1401+1] = {0}; // transfer events for the 1401s
static uint32_t apAreas[MAX1401][MAX_TRANSAREAS]; // Locked areas
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment