diff --git a/Source/uPSRuntime.pas b/Source/uPSRuntime.pas index b59a82f6..ea376374 100644 --- a/Source/uPSRuntime.pas +++ b/Source/uPSRuntime.pas @@ -1,4 +1,4 @@ -{ uPSRuntime.pas } // version: 2022.1104.0615 +{ uPSRuntime.pas } // version: 2022.1123.1400 {----------------------------------------------------------------------------} { RemObjects Pascal Script } {----------------------------------------------------------------------------} @@ -4032,7 +4032,7 @@ function VNGetString(const Src: TPSVariantIFC): string; {$ENDIF} {$ENDIF} {$ELSE} - Result := VNGetAnsiString(Src); + Result := string(VNGetAnsiString(Src)); {$ENDIF} end; @@ -4053,7 +4053,7 @@ procedure VNSetString(const Src: TPSVariantIFC; const Val: string); {$ENDIF} {$ENDIF} {$ELSE} - VNSetAnsiString(Src, Val); + VNSetAnsiString(Src, TbtString(Val)); {$ENDIF} end; @@ -4182,7 +4182,7 @@ function VGetString(const Src: PIFVariant): string; {$ENDIF} {$ENDIF} {$ELSE PS_NOWIDESTRING} - Result := PSGetAnsiString(@PPSVariantData(src).Data, src.FType); + Result := string(PSGetAnsiString(@PPSVariantData(src).Data, src.FType)); {$ENDIF PS_NOWIDESTRING} end; @@ -4205,7 +4205,7 @@ procedure VSetString(const Src: PIFVariant; const Val: string); {$ENDIF} {$ENDIF} {$ELSE PS_NOWIDESTRING} - PSSetAnsiString(@PPSVariantData(src).Data, src.FType, {%H-}Dummy, Val); + PSSetAnsiString(@PPSVariantData(src).Data, src.FType, {%H-}Dummy, TbtString(Val)); {$ENDIF PS_NOWIDESTRING} end; @@ -5080,7 +5080,7 @@ procedure PSSetString(Src: Pointer; aType: TPSTypeRec; var Ok: Boolean; const Va {$ENDIF} {$ENDIF} {$ELSE} - PSSetAnsiString(Src, aType, Ok, Val); + PSSetAnsiString(Src, aType, Ok, TbtString(Val)); {$ENDIF} end; @@ -16475,7 +16475,7 @@ function TPSStack.GetString(ItemNo: Longint): string; // calls the native method GetAnsiString(ItemNo) {$ENDIF} {$ELSE} - GetAnsiString(ItemNo) + string(GetAnsiString(ItemNo)) {$ENDIF} ; end; @@ -16702,7 +16702,7 @@ procedure TPSStack.SetString(ItemNo: Longint; const Data: string); {$ENDIF} {$ENDIF} {$ELSE} - SetAnsiString(ItemNo, Data); + SetAnsiString(ItemNo, TbtString(Data)); {$ENDIF} end;