WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/fp Rev 623 and /programs/develop/fp Rev 643

Regard whitespace Rev 623 → Rev 643

/programs/develop/fp/examples/build
Property changes:
Added: svn:ignore
+*.exe
+*.kex
+*.a
+*.o
+*.ppu
+*.log

 /programs/develop/fp/examples/example.pp
 ,10 → 1,13
-{$codepage cp866}
+{  FreePascal 2.2.0 ª®¤¨à®¢ª  cp866 ¥ à¥ «¨§®¢  . }
+{-$codepage cp866}
 {$mode objfpc}
 {$smartlink on}
 {$apptype console}
 {   ¤ ë© ¬®¬¥â à áá¬ âà¨¢ ¥âáï ¢ë¯®«¥¨¥ ¯à¨«®¤¥¨ï â®«ìª® ª ª ª®á®«ì®¥,
-  â.¥. ¤¨à¥ªâ¨¢  concole ®¡ï§ â¥«ì , ¯®¢¥¤¥¨¥ ¯à®£à ¬¬ë ¯à¨ ®âáãâáâ¢¨¨ íâ®©
+  â.¥. ¤¨à¥ªâ¨¢  console ®¡ï§ â¥«ì , ¯®¢¥¤¥¨¥ ¯à®£à ¬¬ë ¯à¨ ®âáãâáâ¢¨¨ íâ®©
   ¤¨à¥ªâ¨¢ë ¯à¥¤®¯à¥¤¥«¨âì ¥«ì§ï.  à â¨à®¢ ® ¥«ì§ï ¨á¯®«ì§®¢ âì äãªæ¨¨
   Write, WriteLn, Read, ReadLn ®â®á¨â¥«ì® áâ ¤ àâ®© ª®á®«¨ ¢¢®¤ /¢ë¢®¤ .
 }
 ,13 → 24,13
 { ë¢®¤ á®¤¥à¦¨¬®£® ®ª  ¯à¨«®¦¥¨ï }
 begin
   kos_begindraw();
-  {®¯à¥¤¥«¥¨¥ ¯ à ¬¥âà®¢ ®ª  (0)}
+  {®¯à¥¤¥«¥¨¥ ¯ à ¬¥âà®¢ ®ª }
   kos_definewindow(200, 200, 200, 50, $23AABBCC);
   {kos_definewindow ¥ ¨¬¥¥â ¯ à ¬¥âà  ¤«ï ¢ë¢®¤  § £®«®¢ª ,
-   ¤¥« ¥¬ íâ® ®â¤¥«ì®© äãªæ¨¥©}
-  {kos_setcaption, ®â®¡à ¦¥¨¥ § £®«®¢ª  ®ª  (71.1)}
+   ¤¥« ¥¬ íâ® ®â¤¥«ì®© äãªæ¨¥© kos_setcaption}
+  {®â®¡à ¦¥¨¥ § £®«®¢ª  ®ª }
   kos_setcaption(' ');
-  {¢ë¢®¤ á®®¡é¥¨ï (4)}
+  {¢ë¢®¤ á®®¡é¥¨ï}
   kos_drawtext(3, 8, ' ¦¬¨â¥ «î¡ãî ª« ¢¨èã...');
   kos_enddraw();
 end;
 ,7 → 47,7
   Notes[1] := Key shr 8;
   Notes[2] := $00;
   {¢®á¯à®¨§¢®¤¨¬}
-  kos_speak(@Notes);
+  kos_speaker(@Notes);
 end;
 ,20 → 56,22
 var
  Button: DWord;
 begin
-  {¯®«ãç¨âì ª®¤  ¦ â®© ª«¨ë¨è¨}
+  {¯®«ãç¨âì ª®¤  ¦ â®© ª«¨¢¨è¨}
   Button := kos_getbutton();
-  {¥á«¨ X, â® § ¢¥àè¥¨¥ ¯à¨«®¦¥¨ï}
-  Result := Button = 1;
+  {¥á«¨ [x], â® ¢¥àãâì «®¦ì,   § ç¨â á¯à®¢®æ¨à®¢ âì § ªàëâ¨¥ ¯à¨«®¦¥¨ï}
+  Result := Button <> 1;
 end;
 function ProcessMessage: Boolean;
-{ @return: ®§¢à é ¥â False, ¥á«¨ ¡ë«® á®¡ëâ¨¥ ª § ¢¥àè¥¨î ¯à¨«®¦¥¨ï.
+{ ¦¨¤ ¨¥ ¨ ®¡à ¡®âª  á®¡ëâ¨©.
+  @return: ®§¢à é ¥â False, ¥á«¨ ¡ë«® á®¡ëâ¨¥ ª § ¢¥àè¥¨î ¯à¨«®¦¥¨ï.
   @rtype: True ¨«¨ False }
 var
   Event: DWord;
 begin
-  Result := False;
+  Result := True;
   {®¦¨¤ ¥¬ á®¡ëâ¨ï ®â á¨áâ¥¬ë}
   Event := kos_getevent();
   case Event of
 ,7 → 78,7
     SE_PAINT   : DoPaint;  {¯¥à¥à¨á®¢ª  ®ª }
     SE_KEYBOARD: DoKey;    {á®¡ëâ¨¥ ®â ª« ¢¨ âãàë}
     SE_BUTTON  : Result := DoButton; {á®¡ë¨¥ ®â ª®¯ª¨, ¬®¦¥â ®¯à¥¤¥«¨âì
-                                      § ¢¥àè¥¨¥ ¯à¨«®¦¥¨ï, ¥á«¨ ¢¥à¥â True}
+                                      § ¢¥àè¥¨¥ ¯à¨«®¦¥¨ï, ¥á«¨ ¢¥à¥â False}
   end;
 end;
 ,17 → 88,14
 var
   ThreadSlot: TThreadSlot;
 begin
-  {á¤¥« âì íâ® ®ª®  ªâ¨¢ë¬}
-  ThreadSlot := kos_getthreadslot(ThreadID);
-  kos_setactivewindow(ThreadSlot);
   { áâà ¨¢ ¥¬ á®¡ëâ¨ï, ª®â®àë¥ ¬ë £®â®¢ë ®¡à ¡ âë¢ âì}
   kos_maskevents(ME_PAINT or ME_KEYBOARD or ME_BUTTON);
-  {£« ¢ë© æ¨ª«}
-  while not ProcessMessage do;
+  {®¡à ¡®âª  á®¡ëâ¨©}
+  while ProcessMessage do;
 end;
 begin
-  WriteLn('Look for a new window, I''m just a konsole, hi mike ;-)');
+  WriteLn('Look for a new window, I''m just a konsole ;-)');
   MainLoop;
 end.

/programs/develop/fp/examples
Property changes:
Added: svn:ignore
+*.exe
+*.kex
+*.a
+*.o
+*.ppu
+*.log

/programs/develop/fp/exe2kos
Property changes:
Modified: svn:ignore
*.exe
+*.kex
+*.a
*.o
*.ppu
*.log

 /programs/develop/fp/readme-ru.txt
 ,7 → 1,7
 Codepage: cp866
-¥ªãé¨© ª®¤  ¤ ¯â¨à®¢  ¨ ¯à®¢¥àï«áï â®«ìª®   FreePascal 2.3.1 (SVN 8373) ¯à¨
-ª®¬¯¨«ïæ¨¨ ¨§ Windows.
+¥ªãé¨© ª®¤  ¤ ¯â¨à®¢  ¨ ¯à®¢¥àï«áï â®«ìª®   FreePascal 2.2.0 ¯à¨ ª®¬¯¨«ïæ¨¨
+¨§ Windows.
 «ï ª®¬¯¨«¨à®¢ ¨ï ¢¥àá¨¨ RTL ¤«ï KolibriOS ¢ ¬ ¥®¡å®¤¨¬® ¨¬¥âì ãáâ ®¢«¥ë©
 ã á¥¡ï FreePascal á ¨áå®¤ë¬¨ ª®¤ ¬¨ RTL ãª § ®© ¢ëè¥ ¢¥àá¨¨. âªà®©â¥ ä ©«

 /programs/develop/fp/rtl/_defines.inc
 ,5 → 5,7
 {$undef os2}
 {$undef linux}
+{$undef DISABLE_NO_THREAD_MANAGER}
+{$undef debug_mt}
 {$define EMULATOR}
-{$undef debug_mt}

 /programs/develop/fp/rtl/kos.inc
 ,7 → 594,7
 { Sound }
-function kos_speak(notes: Pointer): Boolean; assembler; register;
+function kos_speaker(notes: Pointer): Boolean; assembler; register;
 asm
   pushl %esi
   pushl %ebx

/programs/develop/fp/rtl/kos_stdio.inc
151,6 → 151,7
FThreadID := BeginThread(TThreadFunc(@KonsoleThreadMain), @Self);
if FThreadID <> 0 then
{XXX: ¬®¦¥â § ¢¨áãâì}
{®, â ª ¨ ¥áâì ¢ 2.2.0.}
while not FOpened do ThreadSwitch;
end;

 /programs/develop/fp/rtl/kosh.inc
 ,7 → 142,7
 { Sound }
-function kos_speak(notes: Pointer): Boolean;
+function kos_speaker(notes: Pointer): Boolean;
 { Work with hardware }
 function kos_readport(index: DWord): DWord;

 /programs/develop/fp/rtl/systhrd.inc
 ,7 → 185,7
   if not IsMultiThread then
   begin
     TLSKey := TLSAlloc();
-    InitThreadVars(@SysRelocateThreadVar); {XXX: must be @SysRelocateThreadvar}
+    InitThreadVars(@SysRelocateThreadVar);
     IsMultiThread := True;
   end;
 ,7 → 287,52
 end;
+{*****************************************************************************
+                           Heap Mutex Protection
+*****************************************************************************}
+{$ifndef HAS_MT_MEMORYMANAGER}
 var
+  HeapMutex: TRTLCriticalSection;
+procedure KosHeapMutexInit;
+begin
+  InitCriticalSection(HeapMutex);
+end;
+procedure KosHeapMutexDone;
+begin
+  DoneCriticalSection(HeapMutex);
+end;
+procedure KosHeapMutexLock;
+begin
+  EnterCriticalSection(HeapMutex);
+end;
+procedure KosHeapMutexUnlock;
+begin
+  LeaveCriticalSection(HeapMutex);
+end;
+const
+  KosMemoryMutexManager: TMemoryMutexManager = (
+    MutexInit  : @KosHeapMutexInit;
+    MutexDone  : @KosHeapMutexDone;
+    MutexLock  : @KosHeapMutexLock;
+    MutexUnlock: @KosHeapMutexUnlock);
+procedure InitHeapMutexes;
+begin
+  SetMemoryMutexManager(KosMemoryMutexManager);
+end;
+{$endif HAS_MT_MEMORYMANAGER}
+var
   KosThreadManager: TThreadManager;
 procedure InitSystemThreads;
 ,5 → 381,8
     SemaphorePost          := @NoSemaphorePost;
   end;
   SetThreadManager(KosThreadManager);
+{$ifndef HAS_MT_MEMORYMANAGER}
+  InitHeapMutexes;
+{$endif HAS_MT_MEMORYMANAGER}
   ThreadID := GetCurrentThreadID;
 end;

 /programs/develop/fp/rtl/sysutils.pp
 ,7 → 161,7
   ReleaseFileRecord(Handle);
 end;
-function FileTruncate(Handle: THandle; Size: Int64): Boolean;
+function FileTruncate(Handle: THandle; Size: Longint): Boolean;
 begin
   Result := False;
 end;

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 623 → Rev 643