From 6c407707aeeb0a70992b7bcdefafcfa14693a509 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 21 Nov 2016 16:01:36 +0000 Subject: [PATCH] glazres: search files with Pascal case insensitivity as well git-svn-id: trunk@53401 - --- tools/glazres/glazres.lpi | 9 +++++---- tools/glazres/glazresmain.pp | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/glazres/glazres.lpi b/tools/glazres/glazres.lpi index 522318e268..3600b952c7 100644 --- a/tools/glazres/glazres.lpi +++ b/tools/glazres/glazres.lpi @@ -1,7 +1,7 @@ - + @@ -9,15 +9,16 @@ <ResourceType Value="res"/> <UseXPManifest Value="True"/> + <XPManifest> + <TextName Value="CompanyName.ProductName.AppName"/> + <TextDesc Value="Your application description."/> + </XPManifest> <Icon Value="0"/> </General> <i18n> <EnableI18N Value="True"/> <OutDir Value="languages"/> </i18n> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="2"> <Item1 Name="Debug" Default="True"/> <Item2 Name="Release"> diff --git a/tools/glazres/glazresmain.pp b/tools/glazres/glazresmain.pp index eaa6a23650..0ad3d6ae1f 100644 --- a/tools/glazres/glazresmain.pp +++ b/tools/glazres/glazresmain.pp @@ -63,7 +63,7 @@ type procedure DestEdtAcceptFileName(Sender: TObject; var {%H-}Value: String); procedure DestEdtEditingDone(Sender: TObject); procedure FileListBoxDrawItem(Control: TWinControl; Index: Integer; - ARect: TRect; State: TOwnerDrawState); + ARect: TRect; {%H-}State: TOwnerDrawState); procedure FormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction); procedure FormCreate(Sender: TObject); procedure FormResize(Sender: TObject); @@ -441,7 +441,8 @@ var S:string; ResFileStream, BinFileStream: TFileStreamUtf8; ResMemStream, BinMemStream: TMemoryStream; - ResourceFilename, FullResourceFilename, BinFilename, BinExt, ResourceName, ResourceType: String; + ResourceFilename, FullResourceFilename, BinFilename, BinExt, ResourceName, ResourceType, + ExpS: String; begin FileCount := FileListBox.Count; if FileCount = 0 then @@ -460,7 +461,9 @@ begin AddMessageFmt(ErrFileNotfound,[S]); exit; end; - if CompareFilenamesIgnoreCase(ExpandFileNameUTF8(S), FullResourceFilename) = 0 then + ExpS:=ExpandFileNameUTF8(S); + if (CompareText(ExpS,FullResourceFilename)=0) + or (CompareFilenamesIgnoreCase(ExpandFileNameUTF8(S), FullResourceFilename) = 0) then begin AddMessageFmt(ErrFileIsResource,[S]); exit;