From 8c854cedee89586ed2bf6b2cc3e9b1af0b049cae Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Sun, 29 Apr 2018 14:05:09 +0000
Subject: [PATCH] * more case fixes, mantis #32832 manually done.
git-svn-id: trunk@38865 -
---
rtl/inc/heap.inc | 30 +++++++++----------
rtl/inc/thread.inc | 70 ++++++++++++++++++++++-----------------------
rtl/inc/threadh.inc | 18 ++++++------
3 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/rtl/inc/heap.inc b/rtl/inc/heap.inc
index d5e15dfbb1..4c84885f8e 100644
--- a/rtl/inc/heap.inc
+++ b/rtl/inc/heap.inc
@@ -795,7 +795,7 @@ begin
or assigned(orphaned_freelists.waitvar) or (orphaned_freelists.oscount > 0)) then
begin
{$ifdef FPC_HAS_FEATURE_THREADING}
- entercriticalsection(heap_lock);
+ EnterCriticalSection(heap_lock);
{$endif}
finish_waitfixedlist(@orphaned_freelists);
finish_waitvarlist(@orphaned_freelists);
@@ -821,7 +821,7 @@ begin
end;
end;
{$ifdef FPC_HAS_FEATURE_THREADING}
- leavecriticalsection(heap_lock);
+ LeaveCriticalSection(heap_lock);
{$endif}
end;
if poc = nil then
@@ -1105,24 +1105,24 @@ end;
procedure waitfree_fixed(pmc: pmemchunk_fixed; poc: poschunk);
begin
{$ifdef FPC_HAS_FEATURE_THREADING}
- entercriticalsection(heap_lock);
+ EnterCriticalSection(heap_lock);
{$endif}
pmc^.next_fixed := poc^.freelists^.waitfixed;
poc^.freelists^.waitfixed := pmc;
{$ifdef FPC_HAS_FEATURE_THREADING}
- leavecriticalsection(heap_lock);
+ LeaveCriticalSection(heap_lock);
{$endif}
end;
procedure waitfree_var(pmcv: pmemchunk_var);
begin
{$ifdef FPC_HAS_FEATURE_THREADING}
- entercriticalsection(heap_lock);
+ EnterCriticalSection(heap_lock);
{$endif}
pmcv^.next_var := pmcv^.freelists^.waitvar;
pmcv^.freelists^.waitvar := pmcv;
{$ifdef FPC_HAS_FEATURE_THREADING}
- leavecriticalsection(heap_lock);
+ LeaveCriticalSection(heap_lock);
{$endif}
end;
@@ -1246,11 +1246,11 @@ begin
if loc_freelists^.waitfixed = nil then
exit(false);
{$ifdef FPC_HAS_FEATURE_THREADING}
- entercriticalsection(heap_lock);
+ EnterCriticalSection(heap_lock);
{$endif}
finish_waitfixedlist(loc_freelists);
{$ifdef FPC_HAS_FEATURE_THREADING}
- leavecriticalsection(heap_lock);
+ LeaveCriticalSection(heap_lock);
{$endif}
result := true;
end;
@@ -1274,11 +1274,11 @@ begin
if loc_freelists^.waitvar = nil then
exit;
{$ifdef FPC_HAS_FEATURE_THREADING}
- entercriticalsection(heap_lock);
+ EnterCriticalSection(heap_lock);
{$endif}
finish_waitvarlist(loc_freelists);
{$ifdef FPC_HAS_FEATURE_THREADING}
- leavecriticalsection(heap_lock);
+ LeaveCriticalSection(heap_lock);
{$endif}
end;
@@ -1518,9 +1518,9 @@ var
begin
if heap_lock_use > 0 then
begin
- entercriticalsection(heap_lock);
+ EnterCriticalSection(heap_lock);
inc(heap_lock_use);
- leavecriticalsection(heap_lock);
+ LeaveCriticalSection(heap_lock);
end;
loc_freelists := @freelists;
fillchar(loc_freelists^,sizeof(tfreelists),0);
@@ -1589,7 +1589,7 @@ begin
{$ifdef FPC_HAS_FEATURE_THREADING}
if heap_lock_use > 0 then
begin
- entercriticalsection(heap_lock);
+ EnterCriticalSection(heap_lock);
finish_waitfixedlist(loc_freelists);
finish_waitvarlist(loc_freelists);
end;
@@ -1622,9 +1622,9 @@ begin
end;
dec(heap_lock_use);
last_thread := heap_lock_use = 0;
- leavecriticalsection(heap_lock);
+ LeaveCriticalSection(heap_lock);
if last_thread then
- donecriticalsection(heap_lock);
+ DoneCriticalSection(heap_lock);
end;
{$endif}
{$ifdef SHOW_MEM_USAGE}
diff --git a/rtl/inc/thread.inc b/rtl/inc/thread.inc
index 05f95d5220..98d233ccd1 100644
--- a/rtl/inc/thread.inc
+++ b/rtl/inc/thread.inc
@@ -269,65 +269,65 @@ begin
result:=currenttm.BasicEventCreate(EventAttributes,AManualReset,InitialState, Name);
end;
-procedure basiceventdestroy(state:peventstate);
+procedure BasicEventDestroy(state:peventstate);
begin
- currenttm.basiceventdestroy(state);
+ currenttm.BasicEventDestroy(state);
end;
-procedure basiceventResetEvent(state:peventstate);
+procedure BasicEventResetEvent(state:peventstate);
begin
- currenttm.basiceventResetEvent(state);
+ currenttm.BasicEventResetEvent(state);
end;
-procedure basiceventSetEvent(state:peventstate);
+procedure BasicEventSetEvent(state:peventstate);
begin
- currenttm.basiceventSetEvent(state);
+ currenttm.BasicEventSetEvent(state);
end;
-function basiceventWaitFor(Timeout : Cardinal;state:peventstate) : longint;
+function BasicEventWaitFor(Timeout : Cardinal;state:peventstate) : longint;
begin
- result:=currenttm.basiceventWaitFor(Timeout,state);
+ result:=currenttm.BasicEventWaitFor(Timeout,state);
end;
function RTLEventCreate :PRTLEvent;
begin
- result:=currenttm.rtleventcreate();
+ result:=currenttm.RTLEventCreate();
end;
-procedure RTLeventdestroy(state:pRTLEvent);
+procedure RTLeventDestroy(state:pRTLEvent);
begin
- currenttm.rtleventdestroy(state);
+ currenttm.RTLEventDestroy(state);
end;
procedure RTLeventSetEvent(state:pRTLEvent);
begin
- currenttm.rtleventsetEvent(state);
+ currenttm.RTLEventSetEvent(state);
end;
procedure RTLeventResetEvent(state:pRTLEvent);
begin
- currenttm.rtleventResetEvent(state);
+ currenttm.RTLEventResetEvent(state);
end;
procedure RTLeventWaitFor(state:pRTLEvent);
begin
- currenttm.rtleventWaitFor(state);
+ currenttm.RTLEventWaitFor(state);
end;
procedure RTLeventWaitFor(state:pRTLEvent;timeout : longint);
begin
- currenttm.rtleventWaitForTimeout(state,timeout);
+ currenttm.RTLEventWaitForTimeout(state,timeout);
end;
{ ---------------------------------------------------------------------
@@ -521,16 +521,16 @@ const
AllocateThreadVars : @NoThreadError;
ReleaseThreadVars : @NoThreadError;
BasicEventCreate : TBasicEventCreateHandler(@NoThreadError);
- basiceventdestroy : TBasicEventHandler(@NoThreadError);
- basiceventResetEvent : TBasicEventHandler(@NoThreadError);
- basiceventSetEvent : TBasicEventHandler(@NoThreadError);
- basiceventWaitFor : TBasicEventWaitForHandler(@NoThreadError);
- rtlEventCreate : TRTLCreateEventHandler(@NoThreadError);
- rtleventdestroy : TRTLEventHandler(@NoThreadError);
- rtleventSetEvent : TRTLEventHandler(@NoThreadError);
- rtleventResetEvent : TRTLEventHandler(@NoThreadError);
- rtleventWaitFor : TRTLEventHandler(@NoThreadError);
- rtleventwaitfortimeout : TRTLEventHandlerTimeout(@NoThreadError);
+ BasicEventdestroy : TBasicEventHandler(@NoThreadError);
+ BasicEventResetEvent : TBasicEventHandler(@NoThreadError);
+ BasicEventSetEvent : TBasicEventHandler(@NoThreadError);
+ BasicEventWaitFor : TBasicEventWaitForHandler(@NoThreadError);
+ RTLEventCreate : TRTLCreateEventHandler(@NoThreadError);
+ RTLEventdestroy : TRTLEventHandler(@NoThreadError);
+ RTLEventSetEvent : TRTLEventHandler(@NoThreadError);
+ RTLEventResetEvent : TRTLEventHandler(@NoThreadError);
+ RTLEventWaitFor : TRTLEventHandler(@NoThreadError);
+ RTLEventwaitfortimeout : TRTLEventHandlerTimeout(@NoThreadError);
{$else EMBEDDED}
BeginThread : @NoBeginThread;
EndThread : @NoEndThread;
@@ -553,16 +553,16 @@ const
AllocateThreadVars : @NoThreadError;
ReleaseThreadVars : @NoThreadError;
BasicEventCreate : @NoBasicEventCreate;
- basiceventdestroy : @NoBasicEvent;
- basiceventResetEvent : @NoBasicEvent;
- basiceventSetEvent : @NoBasicEvent;
- basiceventWaitFor : @NoBasiceventWaitFor;
- rtlEventCreate : @NoRTLEventCreate;
- rtleventdestroy : @NoRTLevent;
- rtleventSetEvent : @NoRTLevent;
- rtleventResetEvent : @NoRTLEvent;
- rtleventWaitFor : @NoRTLEvent;
- rtleventwaitfortimeout : @NoRTLEventWaitForTimeout;
+ BasicEventDestroy : @NoBasicEvent;
+ BasicEventResetEvent : @NoBasicEvent;
+ BasicEventSetEvent : @NoBasicEvent;
+ BasicEventWaitFor : @NoBasiceventWaitFor;
+ RTLEventCreate : @NoRTLEventCreate;
+ RTLEventDestroy : @NoRTLevent;
+ RTLEventSetEvent : @NoRTLevent;
+ RTLEventResetEvent : @NoRTLEvent;
+ RTLEventWaitFor : @NoRTLEvent;
+ RTLEventWaitforTimeout : @NoRTLEventWaitForTimeout;
{$endif EMBEDDED}
);
diff --git a/rtl/inc/threadh.inc b/rtl/inc/threadh.inc
index 3dc04c6aa3..30942afc80 100644
--- a/rtl/inc/threadh.inc
+++ b/rtl/inc/threadh.inc
@@ -158,15 +158,15 @@ procedure EnterCriticalSection(var cs : TRTLCriticalSection);
procedure LeaveCriticalSection(var cs : TRTLCriticalSection);
function TryEnterCriticalSection(var cs : TRTLCriticalSection):longint;
function BasicEventCreate(EventAttributes : Pointer; AManualReset,InitialState : Boolean;const Name : ansistring):pEventState;
-procedure basiceventdestroy(state:peventstate);
-procedure basiceventResetEvent(state:peventstate);
-procedure basiceventSetEvent(state:peventstate);
-function basiceventWaitFor(Timeout : Cardinal;state:peventstate) : longint;
+procedure BasicEventDestroy(state:peventstate);
+procedure BasicEventResetEvent(state:peventstate);
+procedure BasicEventSetEvent(state:peventstate);
+function BasicEventWaitFor(Timeout : Cardinal;state:peventstate) : longint;
function RTLEventCreate :PRTLEvent;
-procedure RTLeventdestroy(state:pRTLEvent);
-procedure RTLeventSetEvent(state:pRTLEvent);
-procedure RTLeventResetEvent(state:pRTLEvent);
-procedure RTLeventWaitFor(state:pRTLEvent);
-procedure RTLeventWaitFor(state:pRTLEvent;timeout : longint);
+procedure RTLEventDestroy(state:pRTLEvent);
+procedure RTLEventSetEvent(state:pRTLEvent);
+procedure RTLEventResetEvent(state:pRTLEvent);
+procedure RTLEventWaitFor(state:pRTLEvent);
+procedure RTLEventWaitFor(state:pRTLEvent;timeout : longint);