Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7494 → Rev 7495

/programs/other/table/mymath.h
File deleted
/programs/other/table/hello.dsp
File deleted
/programs/other/table/hello.dsw
File deleted
/programs/other/table/build.bat
0,0 → 1,8
call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 
@cl /c /O2 /nologo /GS- /GR- /fp:fast *.cpp
@link /nologo /manifest:no /entry:crtStartUp /subsystem:native /base:0 /fixed /align:16 /nodefaultlib hello.obj *.obj
@pe2kos hello.exe hello.kex
@del hello.exe
@del *.obj
pause
/programs/other/table/func.cpp
235,7 → 235,7
Str[j] = 0;
}
 
void *memcpy(void *dst, const void *src, unsigned size)
void *memcpy2(void *dst, const void *src, unsigned size)
{
while (size--)
*((char*)dst+size) = *((char*)src+size);
242,6 → 242,9
return dst;
}
*/
 
 
 
int strcmp(const char *s1, const char *s2)
{
int i;
/programs/other/table/hello.cpp
697,7 → 697,7
 
if (window_drawall==true){
kos_WindowRedrawStatus(1);
kos_DefineAndDrawWindow(10,40,WND_W,WND_H,0x33,0x40FFFFFF,0,0,(Dword)"Table v" TABLE_VERSION);
kos_DefineAndDrawWindow(10,40,WND_W,WND_H,0x73,0x40FFFFFF,0,0,(Dword)"Table v" TABLE_VERSION);
kos_WindowRedrawStatus(2);
 
if (info.rawData[70]&0x04) return; //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
730,11 → 730,11
 
// ñîõðàíèòü
kos_DefineButton(20 + 160, y - 5, 60, 20, SAVE_BUTTON, 0xd0d0d0);
kos_WriteTextToWindow(22 + 160 + (60 - strlen(sSave) * 6) / 2, y + 2, 0, 0x000000, (char*)sSave, strlen(sSave));
kos_WriteTextToWindow(22 + 160 + (60 - strlen(sSave) * 6) / 2, y + 2, 0x80, 0x000000, (char*)sSave, 0);
 
// çàãðóçèòü
kos_DefineButton(90 + 160, y - 5, 60, 20, LOAD_BUTTON, 0xd0d0d0);
kos_WriteTextToWindow(92 + 160 + (60 - strlen(sLoad) * 6) / 2, y + 2, 0, 0x000000, (char*)sLoad, strlen(sLoad));
kos_WriteTextToWindow(92 + 160 + (60 - strlen(sLoad) * 6) / 2, y + 2, 0x80, 0x000000, (char*)sLoad, 0);
 
// ñîçäàòü. òîëüêî ýòó êíîïó âîòêíóòü íåêóäà î_Î
/*
/programs/other/table/kosSyst.cpp
94,7 → 94,7
return RandomSeed;
}
 
#ifdef AUTOBUILD
//#ifdef AUTOBUILD
// Well, not really related to auto-build, but some compilation issue
void memcpy( void *dst, const void *src, size_t bytesCount )
{
118,7 → 118,7
rep stosb
}
}
#endif
//#endif
 
 
//
/programs/other/table/kosSyst.h
122,17 → 122,21
int __cdecl strlen( const char *line );
char * __cdecl strrchr( const char * string, int c );
 
/*
#if _MSC_VER < 1400
extern "C" void * __cdecl memcpy( void *dst, const void *src, size_t bytesCount );
extern "C" void memset( Byte *dst, Byte filler, Dword count );
//#pragma intrinsic(memcpy,memset)
#elif defined AUTOBUILD
*/
void memcpy( void *dst, const void *src, size_t bytesCount );
void memset( Byte *dst, Byte filler, Dword count );
/*
#else
void * __cdecl memcpy( void *dst, const void *src, size_t bytesCount );
void memset( Byte *dst, Byte filler, Dword count );
#endif
*/
 
void sprintf( char *Str, char* Format, ... );
//
/programs/other/table/parser.cpp
318,6 → 318,7
return q - max * func_floor(q / max); // äëÿ ìîäóëÿ
}
 
/*
double func_case(double_list *p)
{
if (!p || !p->next)
368,6 → 369,7
code = cur->code;
return cur->val;
}
*/
 
#define INF_ARGS -1
#define STR_ARG -2
389,7 → 391,7
} func;
 
// the list of functions
const int max_func = 29;
const int max_func = 28;
func functions[max_func] =
{
"", 1, NULL, // íå ïîìíþ, ñ êàêîé öåëüþ
418,7 → 420,7
"or",2,&logic_or,
"xor",2,&logic_xor,
"rand",1,&func_rand,
"case",INF_ARGS,&func_case,
//"case",INF_ARGS,&func_case,
"pi",0,&func_pi,
"eps",0,&func_eps
};