Bb57ブランチの修正をトランクにマージ

diff --git a/BrowserRecord.pas b/BrowserRecord.pas
index cd8ced2..9011857 100644 (file)
--- a/BrowserRecord.pas
+++ b/BrowserRecord.pas
@@ -183,37 +183,17 @@ const
 var
        CmdTarget : IOleCommandTarget;
        vaIn, vaOut: OleVariant;
-       PtrGUID: PGUID;
 begin
-       if (Self.Browser <> nil) and (Self.Browser.Document <> nil) then begin
-               //\83u\83\89\83E\83U\82ª\83f\81[\83^\82Ì\93Ç\82Ý\8d\9e\82Ý\92\86\82Ì\8e\9e\82Í\93Ç\82Ý\8d\9e\82Ý\82ð\91Ò\82Â
-               while (Self.Browser.ReadyState <> READYSTATE_COMPLETE) and
-                                       (Self.Browser.ReadyState <> READYSTATE_INTERACTIVE) do begin
-                       Sleep(1);
-                       Application.ProcessMessages;
+       if Assigned(Self.Browser) then begin
+               vaIn  := 0;
+               vaOut := 0;
+               try
+                       CmdTarget := Self.Browser.ControlInterface.Document as IOleCommandTarget;
+                       if Assigned(CmdTarget) then begin
+                               CmdTarget.Exec(@CGID_WebBrowser, HTMLID_FIND, 0, vaIn, vaOut);
+                       end;
+               except
                end;
-        vaIn  := 0;
-        vaOut := 0;
-               New(PtrGUID);
-               PtrGUID^ := CGID_WebBrowser;
-        try
-               try
-                       if Self.Browser.Document
-                    .QueryInterface(IOleCommandTarget, CmdTarget)
-                    = S_OK then begin
-                           if CmdTarget <> nil then begin
-                                   try
-                                           CmdTarget.Exec(PtrGUID, HTMLID_FIND, 0, vaIn, vaOut);
-                                       finally
-                                               CmdTarget._Release;
-                                       end;
-                               end;
-                end;
-                   except
-                   end;
-        finally
-               Dispose(PtrGUID);
-        end;
        end;
 end;
 

diff --git a/gikoNavi.res b/gikoNavi.res
index ba30f18..7ebd250 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ

diff --git a/readme/gikoSetup.iss b/readme/gikoSetup.iss
index 247e2dc..bd0a9ce 100644 (file)
--- a/readme/gikoSetup.iss
+++ b/readme/gikoSetup.iss
@@ -13,8 +13,8 @@ SourceDir=G:\Release
 OutputDir=G:\InnoSetup\Output
 SetupIconFile="G:\gikoNaviSFX_102\MainIcon.ico"
 ; \83M\83R\83i\83r\82Ì\83o\81[\83W\83\87\83\93\82É\82 \82í\82¹\82Ä\82­\82¾\82³\82¢
-VersionInfoVersion=1.56.1.716
-OutputBaseFilename=gikoNavi_b56_setup
+VersionInfoVersion=1.57.1.744
+OutputBaseFilename=gikoNavi_b57_setup
 
 
 [Tasks]

diff --git a/readme/readme.txt b/readme/readme.txt
index 5b434e3..9ae7d78 100644 (file)
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -108,7 +108,7 @@ LICENSE
 ------------------------------
 \97\9a\97ð
 ------------------------------
-2008/XX/XX
+2008/03/08
   Version ÊÞÀ57
   \8fÚ\8d×\90Ý\92è\82É\81A\83X\83\8c\83b\83h\88ê\97\97\93Ç\82Ý\8d\9e\82Ý\8e\9e\82É\83\8d\81[\83J\83\8b\82Ìdat\83t\83@\83C\83\8b\82ð\83`\83F\83b\83N\82µ\82È\82¢\83I\83v\83V\83\87\83\93\82ð\92Ç\89Á
   \83\8c\83X\83|\83b\83v\83A\83b\83v\82Ì\83E\83B\83\93\83h\83E\82ð\83_\83u\83\8b\83N\83\8a\83b\83N\82Å\8fÁ\82¹\82é\82æ\82¤\82É\8fC\90³