|
@@ -616,13 +616,6 @@ end;
|
|
TSemaphore
|
|
TSemaphore
|
|
---------------------------------------------------------------------}
|
|
---------------------------------------------------------------------}
|
|
|
|
|
|
-function NilPChar(Const aName : String) : PChar; inline;
|
|
|
|
-begin
|
|
|
|
- Result:=Nil;
|
|
|
|
- if aName='' then
|
|
|
|
- Result:=PChar(aName);
|
|
|
|
-end;
|
|
|
|
-
|
|
|
|
constructor TSemaphore.Create(aUseCOMWait: boolean = false);
|
|
constructor TSemaphore.Create(aUseCOMWait: boolean = false);
|
|
|
|
|
|
begin
|
|
begin
|
|
@@ -638,7 +631,7 @@ var
|
|
begin
|
|
begin
|
|
{$IFDEF WINDOWS}
|
|
{$IFDEF WINDOWS}
|
|
inherited Create(aUseCOMWait);
|
|
inherited Create(aUseCOMWait);
|
|
- PN:=NilPchar(aName);
|
|
|
|
|
|
+ PN:=Pchar(Pointer(aName));
|
|
{$IF SIZEOF(CHAR)=1}
|
|
{$IF SIZEOF(CHAR)=1}
|
|
FHandle:=TEventHandle(CreateSemaphoreA(aAttributes,aInitial,aMaximum,PN));
|
|
FHandle:=TEventHandle(CreateSemaphoreA(aAttributes,aInitial,aMaximum,PN));
|
|
{$ELSE}
|
|
{$ELSE}
|
|
@@ -670,7 +663,7 @@ begin
|
|
Create(Nil,1,1,aName,aUseCOMWait);
|
|
Create(Nil,1,1,aName,aUseCOMWait);
|
|
{$ELSE WINDOWS}
|
|
{$ELSE WINDOWS}
|
|
inherited Create(aUseCOMWait);
|
|
inherited Create(aUseCOMWait);
|
|
- PN:=NilPChar(aName);
|
|
|
|
|
|
+ PN:=PChar(Pointer(aName));
|
|
{$IF SIZEOF(CHAR)=1}
|
|
{$IF SIZEOF(CHAR)=1}
|
|
FHandle:=TEventHandle(OpenSemaphoreA(aAccess,aInherit,PN));
|
|
FHandle:=TEventHandle(OpenSemaphoreA(aAccess,aInherit,PN));
|
|
{$ELSE}
|
|
{$ELSE}
|
|
@@ -863,7 +856,7 @@ begin
|
|
{$ELSE}
|
|
{$ELSE}
|
|
{$IFDEF WINDOWS}
|
|
{$IFDEF WINDOWS}
|
|
inherited Create(aUseCOMWait);
|
|
inherited Create(aUseCOMWait);
|
|
- PN:=NilPChar(aName);
|
|
|
|
|
|
+ PN:=PChar(Pointer(aName));
|
|
{$IF SIZEOF(CHAR)=1}
|
|
{$IF SIZEOF(CHAR)=1}
|
|
FHandle:=TEventHandle(CreateMutexA(aAttributes,aInitialOwner,PN));
|
|
FHandle:=TEventHandle(CreateMutexA(aAttributes,aInitialOwner,PN));
|
|
{$ELSE}
|
|
{$ELSE}
|
|
@@ -890,7 +883,7 @@ begin
|
|
{$ELSE}
|
|
{$ELSE}
|
|
{$IFDEF WINDOWS}
|
|
{$IFDEF WINDOWS}
|
|
inherited Create(aUseCOMWait);
|
|
inherited Create(aUseCOMWait);
|
|
- PN:=NilPChar(aName);
|
|
|
|
|
|
+ PN:=PChar(Pointer(aName));
|
|
{$IF SIZEOF(CHAR)=1}
|
|
{$IF SIZEOF(CHAR)=1}
|
|
FHandle:=TEventHandle(OpenMutexA(aAccess,aInherit,PN));
|
|
FHandle:=TEventHandle(OpenMutexA(aAccess,aInherit,PN));
|
|
{$ELSE}
|
|
{$ELSE}
|