WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/ Rev 548 and /programs/develop Rev 542

Regard whitespace Rev 548 → Rev 542

/programs/develop/sdk/trunk/uart/uart.inc
File deleted

/programs/develop/open watcom/trunk/clib/crt/errno.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/commode.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/cvtbuf.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/errorno.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/errnovar.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/stackwnt.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/exitwmsg.inc
File deleted

/programs/develop/open watcom/trunk/clib/crt/langenv.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/8087cw.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/argcv.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/initarg.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/xstring.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/chk.asm
File deleted

/programs/develop/open watcom/trunk/clib/crt/87state.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/_8087386.asm
File deleted

/programs/develop/open watcom/trunk/clib/crt/fltused.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/cstrklbi.asm
File deleted

/programs/develop/open watcom/trunk/clib/crt/setefg.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/rtinit.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/fpexcept.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/initfini.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/ftos.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/_8087osi.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/langenv.inc
File deleted

/programs/develop/open watcom/trunk/clib/crt/xinit.inc
File deleted

/programs/develop/open watcom/trunk/clib/crt/initargv.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/save8087.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/farsupp.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/cstrtwnt.asm
File deleted

/programs/develop/open watcom/trunk/clib/crt/stkwnt.asm
File deleted

/programs/develop/open watcom/trunk/clib/crt/variety.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/widechar.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/chk8087.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/stacklow.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/segdefns.asm
File deleted

/programs/develop/open watcom/trunk/clib/crt/crwd386.asm
File deleted

/programs/develop/open watcom/trunk/clib/crt/main2wnt.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/kmain.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/mdef.inc
File deleted

/programs/develop/open watcom/trunk/clib/crt/xfloat.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/langenvd.h
File deleted

/programs/develop/open watcom/trunk/clib/crt/cinit.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/abort.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/xmsgwnt.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/_exit.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/exit.c
File deleted

/programs/develop/open watcom/trunk/clib/crt/___argc.c
File deleted

 /programs/develop/open watcom/trunk/clib/src/hdlman.c
 ,6 → 48,23
 #include "seterrno.h"
 #include "handleio.h"
+#ifdef DLHEAP
+void* _cdecl dlmalloc(size_t);
+void  _cdecl dlfree(void*);
+void _cdecl mf_init();
+#define malloc  dlmalloc
+#define free    dlfree
+#define realloc dlrealloc
+#define lib_malloc   dlmalloc
+#define lib_free     dlfree
+#define lib_realloc  dlrealloc
+#endif
 #undef __getOSHandle
 extern  unsigned    __NFiles;       // the size of the iomode array
 ,7 → 153,6
     return( __OSHandles[ hid ] );
 }
 int __setOSHandle( unsigned hid, HANDLE hdl )
 {
     // call the Win32 API for a standard file handle
 ,11 → 184,24
 HANDLE __NTGetFakeHandle( void )
 {
     HANDLE os_handle;
-    static DWORD fakeHandle = 0x80000000L;
     _AccessFList();
+//    os_handle = CreateEvent( 0, 0, 0, 0 );
+    os_handle = 0;
+    if( os_handle == NULL )
+    {
+        // win32s does not support event handles
+        static DWORD fakeHandle = 0x80000000L;
     fakeHandle++;
     os_handle = (HANDLE)fakeHandle;
+    }
+    else
+    {
+        __FakeHandles = lib_realloc( __FakeHandles, (__topFakeHandle+1) * sizeof( HANDLE ) );
+        __FakeHandles[ __topFakeHandle ] = os_handle;
+        __topFakeHandle++;
+    }
     _ReleaseFList();
     return( os_handle );
 }

 /programs/develop/open watcom/trunk/clib/src/lseekwnt.c
 ,56 → 50,17
 #define INVALID_SET_FILE_POINTER 0xFFFFFFFF
 #endif
-typedef struct
-{
-  char     *name;
-  unsigned int offset;
-}__file_handle;
-typedef struct
-{   DWORD    attr;
-    DWORD    flags;
-    DWORD    cr_time;
-    DWORD    cr_date;
-    DWORD    acc_time;
-    DWORD    acc_date;
-    DWORD    mod_time;
-    DWORD    mod_date;
-    DWORD    size;
-    DWORD    size_high;
-} FILEINFO;
-int _stdcall get_fileinfo(const char *name,FILEINFO* pinfo);
 _WCRTLINK long __lseek( int hid, long offset, int origin )
 {
-    __file_handle *fh;
-    long rc;
+    DWORD               rc;
     __handle_check( hid, -1 );
-    fh = (__file_handle*) __getOSHandle( hid );
-    switch(origin)
-    {
-      case SEEK_SET:
         rc = offset;
-        break;
-      case SEEK_CUR:
-        rc = fh->offset + offset;
-        break;
-      case SEEK_END:
-      {
-        FILEINFO info;
-        get_fileinfo(fh->name,&info);
-        rc = offset + info.size;
-        break;
-      }
-      default:
-        return -1;
-    };
-    fh->offset = rc;
+//    rc = SetFilePointer( __getOSHandle( hid ), offset, 0, origin );
+//    if( rc == INVALID_SET_FILE_POINTER ) {
+//        return( __set_errno_nt() );
+//    }
     return( rc );
 }

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 548 → Rev 542