From 80dc40d753b49c0df98e4760372a871e429f0d1e Mon Sep 17 00:00:00 2001
From: yoffy <yoffy>
Date: Mon, 8 Mar 2004 08:53:40 +0000
Subject: [PATCH] =?utf8?q?=E3=83=BB=E8=AD=A6=E5=91=8A=E3=81=AE=E6=8E=92?=
 =?utf8?q?=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Giko.pas       |  4 +++-
 GikoSystem.pas |  7 +------
 MojuUtils.pas  | 18 ++++++++++++------
 Setting.pas    |  4 ++++
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Giko.pas b/Giko.pas
index 0eb8c45..6a37411 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -3140,7 +3140,7 @@ var
 //	HtmlName: string;
 	doc: Variant;
 	s: string;
-	OldCursor: TCursor;
+//	OldCursor: TCursor;
 	//i: Integer;
 begin
 	while (Browser.ReadyState <> READYSTATE_COMPLETE) and
@@ -7533,6 +7533,8 @@ begin
 		end;
 	end;
 
+	Result := nil;
+
 end;
 
 procedure TGikoForm.SetToolBarPopup;
diff --git a/GikoSystem.pas b/GikoSystem.pas
index 59688c6..e36c678 100644
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -3201,11 +3201,7 @@ end;
 procedure TGikoSys.ListBoardFile;
 var
 	boardFileList	: TStringList;
-
-	i, iBound			: Integer;
-	j, jBound			: Integer;
-	k, kBound			: Integer;
-	l, lBound			: Integer;
+	i, l					: Integer;
 begin
 
   // BBS ‚ÌŠJ•ú
@@ -3271,7 +3267,6 @@ var
 	i, iBound			: Integer;
 	j, jBound			: Integer;
 	k, kBound			: Integer;
-	l, lBound			: Integer;
 begin
 
   if not FileExists( bbs.FilePath ) then
diff --git a/MojuUtils.pas b/MojuUtils.pas
index fb0d1bd..ec5d11a 100644
--- a/MojuUtils.pas
+++ b/MojuUtils.pas
@@ -104,11 +104,12 @@ begin
     Result := nil;
 end;
 
+{$R-}
 function ReplaceString(const S, OldPattern, NewPattern: string): string;
 var
     ReplaceCount: Integer;
     DestIndex: Integer;
-    i: Integer;
+    i, l: Integer;
     p, e, ps, pe: PChar;
     Count: Integer;
 begin
@@ -130,14 +131,15 @@ begin
     (Length(NewPattern) - Length(OldPattern)) * ReplaceCount);
     p := PChar(S);
     DestIndex := 1;
+    l := Length( NewPattern );
     for i := 0 to ReplaceCount - 1 do begin
         Count := AnsiStrPosEx(p, e, ps, pe) - p;
         Move(p^, Result[DestIndex], Count);
         Inc(p, Count);//p := pp;
         Inc(DestIndex, Count);
-        Move(NewPattern[1], Result[DestIndex], Length(NewPattern));
+        Move(NewPattern[1], Result[DestIndex], l);
         Inc(p, Length(OldPattern));
-        Inc(DestIndex, Length(NewPattern));
+        Inc(DestIndex, l);
     end;
     Move(p^, Result[DestIndex], e - p);
 end;
@@ -146,7 +148,7 @@ function IgnoCaseReplaceString(const S, OldPattern, NewPattern: string): string;
 var
     ReplaceCount: Integer;
     DestIndex: Integer;
-    i: Integer;
+    i, l: Integer;
     p, e{, ps, pe}: PChar;
     p2, e2, ps2, pe2: PChar;
     Count: Integer;
@@ -179,19 +181,23 @@ begin
     (Length(NewPattern) - Length(bufferOldPattern)) * ReplaceCount);
     p2 := PChar(bufferS);
     DestIndex := 1;
+    l := Length( NewPattern );
     for i := 0 to ReplaceCount - 1 do begin
         Count := AnsiStrPosEx(p2, e2, ps2, pe2) - p2;
         Move(p^, Result[DestIndex], Count);
         Inc(p, Count);//p := pp;
         Inc(p2, Count);//p := pp;
         Inc(DestIndex, Count);
-        Move(NewPattern[1], Result[DestIndex], Length(NewPattern));
+        Move(NewPattern[1], Result[DestIndex], l);
         Inc(p, Length(OldPattern));
         Inc(p2, Length(OldPattern));
-        Inc(DestIndex, Length(NewPattern));
+        Inc(DestIndex, l);
     end;
     Move(p^, Result[DestIndex], e - p);
 end;
+{$IFDEF DEBUG}
+{$R+}
+{$ENDIF}
 
 function CustomStringReplace(
 	S ,OldPattern: String;
diff --git a/Setting.pas b/Setting.pas
index 3a303eb..c187ea7 100644
--- a/Setting.pas
+++ b/Setting.pas
@@ -1247,6 +1247,7 @@ begin
 	end;
 end;
 
+{$R-}
 //ƒŠƒXƒgƒJƒ‰ƒ€ƒwƒbƒ_[
 function TSetting.GetBBSColumnWidth(index: Integer): Integer;
 begin
@@ -1262,6 +1263,9 @@ function TSetting.GetBoardColumnWidth(index: Integer): Integer;
 begin
 	Result := IfThen(index in [0..Length(FBoardColumnWidth) - 1], FBoardColumnWidth[index], 0);
 end;
+{$IFDEF DEBUG}
+{$R+}
+{$ENDIF}
 
 procedure TSetting.SetBBSColumnWidth(index: Integer; value: Integer);
 begin
-- 
2.11.0