From 5243ce887e6eef028d56029a73bcdca32612cbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20D=C3=ADaz=20Fau?= Date: Mon, 20 Aug 2018 14:56:14 +0200 Subject: [PATCH] Fixed D2010 issues with missing TEncoding types. --- demos/ResponseFilterBrowser/uResponseFilterBrowser.pas | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/demos/ResponseFilterBrowser/uResponseFilterBrowser.pas b/demos/ResponseFilterBrowser/uResponseFilterBrowser.pas index 411f75e1..26ea6e13 100644 --- a/demos/ResponseFilterBrowser/uResponseFilterBrowser.pas +++ b/demos/ResponseFilterBrowser/uResponseFilterBrowser.pas @@ -117,7 +117,9 @@ type procedure ReplaceLogo(data_in: Pointer; data_in_size: NativeUInt; var data_in_read: NativeUInt; data_out: Pointer; data_out_size : NativeUInt; var data_out_written: NativeUInt; var aResult : TCefResponseFilterStatus); procedure UpdateRscEncoding(const aMimeType, aContentType : string); function IsMyResource(const aRequest : ICefRequest) : boolean; + {$IFDEF DELPHI15_UP} procedure GetResponseEncoding(const aContentType: string); + {$ENDIF} public { Public declarations } end; @@ -477,11 +479,13 @@ procedure TResponseFilterBrowserFrm.UpdateRscEncoding(const aMimeType, aContentT begin FRscMimeType := aMimeType; + {$IFDEF DELPHI15_UP} if (aMimeType = 'application/json') or (aMimeType = 'text/json') or (aMimeType = 'text/javascript') or (aMimeType = 'application/javascript') then GetResponseEncoding(aContentType); + {$ENDIF} end; procedure TResponseFilterBrowserFrm.Chromium1ResourceLoadComplete(Sender : TObject; @@ -548,7 +552,7 @@ begin StatusBar1.Panels[1].Text := 'Stream size : ' + inttostr(FStream.Size); SetLength(LAS, FStream.Size); - FStream.Read(LAS[Low(LAS)], FStream.Size); + FStream.Read(LAS[1], FStream.Size); if (FRscEncoding = TEncoding.UTF8) then LS := UTF8Decode(LAS) // UTF8 Here @@ -647,6 +651,7 @@ begin if (aMessage.wParam = 0) and (GlobalCEFApp <> nil) then GlobalCEFApp.OsmodalLoop := False; end; +{$IFDEF DELPHI15_UP} procedure TResponseFilterBrowserFrm.GetResponseEncoding(const aContentType: string); var LEncoding: String; @@ -745,5 +750,6 @@ begin FRscEncoding := TEncoding.Default; end; end; +{$ENDIF} end.